From c43848cc447b83cde5ca0ddab846925c8a18dab2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:46:13 -0500 Subject: [PATCH 1/9] Clean duplicate labels of map attributes --- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/{House1 => House11}/border.bin | Bin data/maps/{House1 => House11}/map.bin | 0 data/maps/{House2 => House12}/border.bin | Bin data/maps/{House2 => House12}/map.bin | 0 data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../LilycoveCity_MoveDeletersHouse/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- .../maps/PetalburgCity_WallysHouse/header.inc | 2 +- .../Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- .../Route123_BerryMastersHouse/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/_assets.inc | 28 +++++++++--------- data/maps/attributes_table.inc | 4 +-- 27 files changed, 37 insertions(+), 37 deletions(-) rename data/maps/{House1 => House11}/border.bin (100%) rename data/maps/{House1 => House11}/map.bin (100%) rename data/maps/{House2 => House12}/border.bin (100%) rename data/maps/{House2 => House12}/map.bin (100%) diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 2761536b6..da9739789 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,5 +1,5 @@ FallarborTown_House1:: @ 8305D40 - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 0366c201a..ff1949cf9 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,5 +1,5 @@ FallarborTown_House2:: @ 8305D5C - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/House1/border.bin b/data/maps/House11/border.bin similarity index 100% rename from data/maps/House1/border.bin rename to data/maps/House11/border.bin diff --git a/data/maps/House1/map.bin b/data/maps/House11/map.bin similarity index 100% rename from data/maps/House1/map.bin rename to data/maps/House11/map.bin diff --git a/data/maps/House2/border.bin b/data/maps/House12/border.bin similarity index 100% rename from data/maps/House2/border.bin rename to data/maps/House12/border.bin diff --git a/data/maps/House2/map.bin b/data/maps/House12/map.bin similarity index 100% rename from data/maps/House2/map.bin rename to data/maps/House12/map.bin diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 5cfc8540b..f4246c98f 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House1:: @ 830668C - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 599e904d5..f1c7f73b7 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House3:: @ 83066C4 - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index d9cd2c7f0..47d5c21e7 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House4:: @ 83066E0 - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index bcfc3435f..5f6798646 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 30c59da1e..e9acd83bd 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House1:: @ 8306184 - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 9bd7d9c11..37a434405 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House2:: @ 83061BC - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 70f681e7a..5fd23c8ec 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House1:: @ 83067DC - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 62bd6bdec..99140eaa7 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House2:: @ 83067F8 - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 54c6641b6..382f165a4 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House3:: @ 8306868 - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 550ff5a75..530a0e763 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,5 +1,5 @@ OldaleTown_House1:: @ 8305ABC - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index eb1660cf9..2214fbfaf 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,5 +1,5 @@ OldaleTown_House2:: @ 8305AD8 - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index e1f5c1f63..4fe3dfdbc 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House1:: @ 8305F54 - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index e16ac5a7f..47fb229ba 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,5 +1,5 @@ PetalburgCity_WallysHouse:: @ 8305F1C - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index d7333f070..32fbca9a0 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,5 +1,5 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index d64c4b804..2a14f5292 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,5 +1,5 @@ Route119_House:: @ 8307F28 - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 0eb77ca2e..11501e733 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse:: @ 8307ED4 - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 00b9399a3..a5df54962 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -1,5 +1,5 @@ SlateportCity_House2:: @ 83060DC - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index f1aae5a19..7b0ab4ad0 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 - .4byte House2_MapAttributes + .4byte House12_MapAttributes .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index e81adee1b..0e29f4ea6 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_House:: @ 8305E3C - .4byte House1_MapAttributes + .4byte House11_MapAttributes .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc index a9cc15869..af4092f99 100644 --- a/data/maps/_assets.inc +++ b/data/maps/_assets.inc @@ -868,33 +868,33 @@ LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8 .4byte gTileset_Building .4byte gTileset_Lab -House1_MapBorder:: @ 82CDEC0 - .incbin "data/maps/House1/border.bin" +House11_MapBorder:: @ 82CDEC0 + .incbin "data/maps/House11/border.bin" -House1_MapBlockdata:: @ 82CDEC8 - .incbin "data/maps/House1/map.bin" +House11_MapBlockdata:: @ 82CDEC8 + .incbin "data/maps/House11/map.bin" .align 2 -House1_MapAttributes:: @ 82CDF7C +House11_MapAttributes:: @ 82CDF7C .4byte 0xa .4byte 0x9 - .4byte House1_MapBorder - .4byte House1_MapBlockdata + .4byte House11_MapBorder + .4byte House11_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding -House2_MapBorder:: @ 82CDF94 - .incbin "data/maps/House2/border.bin" +House12_MapBorder:: @ 82CDF94 + .incbin "data/maps/House12/border.bin" -House2_MapBlockdata:: @ 82CDF9C - .incbin "data/maps/House2/map.bin" +House12_MapBlockdata:: @ 82CDF9C + .incbin "data/maps/House12/map.bin" .align 2 -House2_MapAttributes:: @ 82CE04C +House12_MapAttributes:: @ 82CE04C .4byte 0xb .4byte 0x8 - .4byte House2_MapBorder - .4byte House2_MapBlockdata + .4byte House12_MapBorder + .4byte House12_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc index 41b0df228..241efb9a6 100644 --- a/data/maps/attributes_table.inc +++ b/data/maps/attributes_table.inc @@ -58,8 +58,8 @@ gMapAttributes:: @ 8304F18 .4byte LittlerootTown_MaysHouse_1F_MapAttributes .4byte LittlerootTown_MaysHouse_2F_MapAttributes .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes - .4byte House1_MapAttributes - .4byte House2_MapAttributes + .4byte House11_MapAttributes + .4byte House12_MapAttributes .4byte PokemonCenter_1F_MapAttributes .4byte PokemonCenter_2F_MapAttributes .4byte PokeMart_MapAttributes From bac57d8d31948ab1262ba1e26185cd8d79e72c7d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:46:31 -0500 Subject: [PATCH 2/9] Move 'map attributes' into 'layouts' --- .../AbandonedShip_CaptainsOffice/border.bin | 0 .../AbandonedShip_CaptainsOffice/layout.inc | 14 + .../AbandonedShip_CaptainsOffice/map.bin | Bin .../AbandonedShip_Corridors_1F/border.bin | 0 .../AbandonedShip_Corridors_1F/layout.inc | 14 + .../AbandonedShip_Corridors_1F/map.bin | 0 .../AbandonedShip_Corridors_B1F/border.bin | 0 .../AbandonedShip_Corridors_B1F/layout.inc | 14 + .../AbandonedShip_Corridors_B1F/map.bin | 0 .../AbandonedShip_Deck/border.bin | 0 data/layouts/AbandonedShip_Deck/layout.inc | 14 + .../AbandonedShip_Deck/map.bin | 0 .../border.bin | 0 .../layout.inc | 14 + .../map.bin | 0 .../AbandonedShip_HiddenFloorRooms/border.bin | 0 .../AbandonedShip_HiddenFloorRooms/layout.inc | 14 + .../AbandonedShip_HiddenFloorRooms/map.bin | 0 .../AbandonedShip_Room_B1F/border.bin | 0 .../layouts/AbandonedShip_Room_B1F/layout.inc | 14 + .../AbandonedShip_Room_B1F/map.bin | 0 .../AbandonedShip_Rooms2_1F/border.bin | 0 .../AbandonedShip_Rooms2_1F/layout.inc | 14 + .../AbandonedShip_Rooms2_1F/map.bin | 0 .../AbandonedShip_Rooms2_B1F/border.bin | 0 .../AbandonedShip_Rooms2_B1F/layout.inc | 14 + .../AbandonedShip_Rooms2_B1F/map.bin | 0 .../AbandonedShip_Rooms_1F/border.bin | 0 .../layouts/AbandonedShip_Rooms_1F/layout.inc | 14 + .../AbandonedShip_Rooms_1F/map.bin | 0 .../AbandonedShip_Rooms_B1F/border.bin | 0 .../AbandonedShip_Rooms_B1F/layout.inc | 14 + .../AbandonedShip_Rooms_B1F/map.bin | 0 .../AbandonedShip_Underwater1/border.bin | 0 .../AbandonedShip_Underwater1/layout.inc | 14 + .../AbandonedShip_Underwater1/map.bin | 0 .../AbandonedShip_Underwater2/border.bin | 0 .../AbandonedShip_Underwater2/layout.inc | 14 + .../AbandonedShip_Underwater2/map.bin | 0 data/{maps => layouts}/AncientTomb/border.bin | 0 data/layouts/AncientTomb/layout.inc | 14 + data/{maps => layouts}/AncientTomb/map.bin | Bin .../AquaHideout_1F/border.bin | 0 data/layouts/AquaHideout_1F/layout.inc | 14 + data/{maps => layouts}/AquaHideout_1F/map.bin | 0 .../AquaHideout_B1F/border.bin | 0 data/layouts/AquaHideout_B1F/layout.inc | 14 + .../{maps => layouts}/AquaHideout_B1F/map.bin | 0 .../AquaHideout_B2F/border.bin | 0 data/layouts/AquaHideout_B2F/layout.inc | 14 + .../{maps => layouts}/AquaHideout_B2F/map.bin | 0 .../BattleTower_BattleRoom/border.bin | Bin .../layouts/BattleTower_BattleRoom/layout.inc | 14 + .../BattleTower_BattleRoom/map.bin | 0 .../BattleTower_Corridor/border.bin | Bin data/layouts/BattleTower_Corridor/layout.inc | 14 + .../BattleTower_Corridor/map.bin | Bin .../BattleTower_Elevator/border.bin | Bin data/layouts/BattleTower_Elevator/layout.inc | 14 + .../BattleTower_Elevator/map.bin | 0 .../BattleTower_Lobby/border.bin | Bin data/layouts/BattleTower_Lobby/layout.inc | 14 + .../BattleTower_Lobby/map.bin | Bin .../BattleTower_Outside/border.bin | 0 data/layouts/BattleTower_Outside/layout.inc | 14 + .../BattleTower_Outside/map.bin | 0 .../CableCarStation}/border.bin | 0 data/layouts/CableCarStation/layout.inc | 14 + .../CableCarStation}/map.bin | Bin .../CaveOfOrigin_1F/border.bin | 0 data/layouts/CaveOfOrigin_1F/layout.inc | 14 + .../{maps => layouts}/CaveOfOrigin_1F/map.bin | 0 .../CaveOfOrigin_B1F/border.bin | 0 data/layouts/CaveOfOrigin_B1F/layout.inc | 14 + .../CaveOfOrigin_B1F/map.bin | 0 .../CaveOfOrigin_B2F/border.bin | 0 data/layouts/CaveOfOrigin_B2F/layout.inc | 14 + .../CaveOfOrigin_B2F/map.bin | 0 .../CaveOfOrigin_B3F/border.bin | 0 data/layouts/CaveOfOrigin_B3F/layout.inc | 14 + .../CaveOfOrigin_B3F/map.bin | 0 .../CaveOfOrigin_B4F/border.bin | 0 data/layouts/CaveOfOrigin_B4F/layout.inc | 14 + .../CaveOfOrigin_B4F/map.bin | 0 .../CaveOfOrigin_Entrance/border.bin | 0 data/layouts/CaveOfOrigin_Entrance/layout.inc | 14 + .../CaveOfOrigin_Entrance/map.bin | 0 .../ContestHall}/border.bin | 0 data/layouts/ContestHall/layout.inc | 14 + .../ContestHall}/map.bin | 0 .../ContestLobby}/border.bin | 0 data/layouts/ContestLobby/layout.inc | 14 + .../ContestLobby}/map.bin | 0 data/{maps => layouts}/DesertRuins/border.bin | 0 data/layouts/DesertRuins/layout.inc | 14 + data/{maps => layouts}/DesertRuins/map.bin | Bin data/{maps => layouts}/DewfordTown/border.bin | 0 data/layouts/DewfordTown/layout.inc | 14 + data/{maps => layouts}/DewfordTown/map.bin | 0 .../DewfordTown_Gym/border.bin | Bin data/layouts/DewfordTown_Gym/layout.inc | 14 + .../{maps => layouts}/DewfordTown_Gym/map.bin | 0 .../DewfordTown_Hall}/border.bin | 0 data/layouts/DewfordTown_Hall/layout.inc | 14 + .../DewfordTown_Hall/map.bin | Bin .../DoubleBattleColosseum}/border.bin | 0 data/layouts/DoubleBattleColosseum/layout.inc | 14 + .../DoubleBattleColosseum/map.bin | 0 .../EverGrandeCity/border.bin | 0 data/layouts/EverGrandeCity/layout.inc | 14 + data/{maps => layouts}/EverGrandeCity/map.bin | Bin .../EverGrandeCity_ChampionsRoom/border.bin | Bin .../EverGrandeCity_ChampionsRoom/layout.inc | 14 + .../EverGrandeCity_ChampionsRoom/map.bin | Bin .../EverGrandeCity_Corridor4}/border.bin | Bin .../EverGrandeCity_Corridor4/layout.inc | 14 + .../EverGrandeCity_Corridor4/map.bin | 0 .../EverGrandeCity_DrakesRoom}/border.bin | Bin .../EverGrandeCity_DrakesRoom/layout.inc | 14 + .../EverGrandeCity_DrakesRoom/map.bin | 0 .../EverGrandeCity_GlaciasRoom}/border.bin | Bin .../EverGrandeCity_GlaciasRoom/layout.inc | 14 + .../EverGrandeCity_GlaciasRoom/map.bin | 0 .../EverGrandeCity_HallOfFame}/border.bin | Bin .../EverGrandeCity_HallOfFame/layout.inc | 14 + .../EverGrandeCity_HallOfFame/map.bin | 0 .../EverGrandeCity_PhoebesRoom}/border.bin | Bin .../EverGrandeCity_PhoebesRoom/layout.inc | 14 + .../EverGrandeCity_PhoebesRoom/map.bin | 0 .../EverGrandeCity_PokemonLeague}/border.bin | 0 .../EverGrandeCity_PokemonLeague/layout.inc | 14 + .../EverGrandeCity_PokemonLeague/map.bin | 0 .../EverGrandeCity_ShortCorridor}/border.bin | Bin .../EverGrandeCity_ShortCorridor/layout.inc | 14 + .../EverGrandeCity_ShortCorridor}/map.bin | 0 .../EverGrandeCity_SidneysRoom/border.bin | Bin .../EverGrandeCity_SidneysRoom/layout.inc | 14 + .../EverGrandeCity_SidneysRoom/map.bin | 0 .../FallarborTown/border.bin | 0 data/layouts/FallarborTown/layout.inc | 14 + data/{maps => layouts}/FallarborTown/map.bin | Bin data/{maps => layouts}/FieryPath/border.bin | 0 data/layouts/FieryPath/layout.inc | 14 + data/{maps => layouts}/FieryPath/map.bin | 0 data/{maps => layouts}/FortreeCity/border.bin | Bin data/layouts/FortreeCity/layout.inc | 14 + data/{maps => layouts}/FortreeCity/map.bin | 0 .../FortreeCity_DecorationShop}/border.bin | 0 .../FortreeCity_DecorationShop/layout.inc | 14 + .../FortreeCity_DecorationShop/map.bin | 0 .../FortreeCity_Gym/border.bin | Bin data/layouts/FortreeCity_Gym/layout.inc | 14 + .../{maps => layouts}/FortreeCity_Gym/map.bin | 0 .../FortreeCity_House1}/border.bin | 0 data/layouts/FortreeCity_House1/layout.inc | 14 + .../FortreeCity_House1/map.bin | 0 .../FortreeCity_House2}/border.bin | 0 data/layouts/FortreeCity_House2/layout.inc | 14 + .../FortreeCity_House2/map.bin | 0 .../GraniteCave_1F/border.bin | 0 data/layouts/GraniteCave_1F/layout.inc | 14 + data/{maps => layouts}/GraniteCave_1F/map.bin | 0 .../GraniteCave_B1F/border.bin | 0 data/layouts/GraniteCave_B1F/layout.inc | 14 + .../{maps => layouts}/GraniteCave_B1F/map.bin | 0 .../GraniteCave_B2F/border.bin | 0 data/layouts/GraniteCave_B2F/layout.inc | 14 + .../{maps => layouts}/GraniteCave_B2F/map.bin | 0 .../GraniteCave_StevensRoom/border.bin | 0 .../GraniteCave_StevensRoom/layout.inc | 14 + .../GraniteCave_StevensRoom/map.bin | 0 .../Harbor}/border.bin | 0 data/layouts/Harbor/layout.inc | 14 + .../Harbor}/map.bin | 0 .../House11 => layouts/House1}/border.bin | Bin data/layouts/House1/layout.inc | 14 + data/{maps/House11 => layouts/House1}/map.bin | 0 .../House12 => layouts/House2}/border.bin | Bin data/layouts/House2/layout.inc | 14 + data/{maps/House12 => layouts/House2}/map.bin | 0 .../House3}/border.bin | 0 data/layouts/House3/layout.inc | 14 + .../House3}/map.bin | 0 .../House4}/border.bin | 0 data/layouts/House4/layout.inc | 14 + .../House4}/map.bin | 0 .../HouseWithBed}/border.bin | 0 data/layouts/HouseWithBed/layout.inc | 14 + .../HouseWithBed}/map.bin | 0 .../InsideOfTruck/border.bin | 0 data/layouts/InsideOfTruck/layout.inc | 14 + data/{maps => layouts}/InsideOfTruck/map.bin | 0 data/{maps => layouts}/IslandCave/border.bin | 0 data/layouts/IslandCave/layout.inc | 14 + data/{maps => layouts}/IslandCave/map.bin | Bin data/{maps => layouts}/JaggedPass/border.bin | 0 data/layouts/JaggedPass/layout.inc | 14 + data/{maps => layouts}/JaggedPass/map.bin | Bin .../LavaridgeTown/border.bin | 0 data/layouts/LavaridgeTown/layout.inc | 14 + data/{maps => layouts}/LavaridgeTown/map.bin | 0 .../LavaridgeTown_Gym_1F/border.bin | Bin data/layouts/LavaridgeTown_Gym_1F/layout.inc | 14 + .../LavaridgeTown_Gym_1F/map.bin | 0 .../LavaridgeTown_Gym_B1F/border.bin | Bin data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 14 + .../LavaridgeTown_Gym_B1F/map.bin | 0 .../LavaridgeTown_HerbShop/border.bin | Bin .../layouts/LavaridgeTown_HerbShop/layout.inc | 14 + .../LavaridgeTown_HerbShop/map.bin | 0 .../border.bin | 0 .../LavaridgeTown_PokemonCenter_1F/layout.inc | 14 + .../LavaridgeTown_PokemonCenter_1F/map.bin | 0 .../{maps => layouts}/LilycoveCity/border.bin | 0 data/layouts/LilycoveCity/layout.inc | 14 + data/{maps => layouts}/LilycoveCity/map.bin | Bin .../LilycoveCity_ContestHall}/border.bin | 0 .../LilycoveCity_ContestHall/layout.inc | 14 + .../LilycoveCity_ContestHall/map.bin | 0 .../LilycoveCity_ContestLobby}/border.bin | 0 .../LilycoveCity_ContestLobby/layout.inc | 14 + .../LilycoveCity_ContestLobby/map.bin | 0 .../LilycoveCity_CoveLilyMotel_1F}/border.bin | 0 .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 14 + .../LilycoveCity_CoveLilyMotel_1F/map.bin | 0 .../LilycoveCity_CoveLilyMotel_2F}/border.bin | 0 .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 14 + .../LilycoveCity_CoveLilyMotel_2F/map.bin | 0 .../border.bin | Bin .../layout.inc | 14 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 14 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 14 + .../LilycoveCity_DepartmentStore_1F/map.bin | 0 .../border.bin | Bin .../layout.inc | 14 + .../LilycoveCity_DepartmentStore_2F/map.bin | 0 .../border.bin | Bin .../layout.inc | 14 + .../LilycoveCity_DepartmentStore_3F/map.bin | 0 .../border.bin | Bin .../layout.inc | 14 + .../LilycoveCity_DepartmentStore_4F/map.bin | 0 .../border.bin | Bin .../layout.inc | 14 + .../LilycoveCity_DepartmentStore_5F/map.bin | Bin .../LilycoveCity_EmptyMap/border.bin | 0 data/layouts/LilycoveCity_EmptyMap/layout.inc | 14 + .../LilycoveCity_EmptyMap/map.bin | 0 .../LilycoveCity_House2}/border.bin | 0 data/layouts/LilycoveCity_House2/layout.inc | 14 + .../LilycoveCity_House2/map.bin | 0 .../border.bin | 0 .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 14 + .../LilycoveCity_LilycoveMuseum_1F/map.bin | 0 .../border.bin | 0 .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 14 + .../LilycoveCity_LilycoveMuseum_2F/map.bin | 0 .../border.bin | 0 .../layout.inc | 14 + .../map.bin | 0 .../LinkContestRoom1}/border.bin | 0 data/layouts/LinkContestRoom1/layout.inc | 14 + .../LinkContestRoom1/map.bin | 0 .../LinkContestRoom2}/border.bin | 0 data/layouts/LinkContestRoom2/layout.inc | 14 + .../LinkContestRoom2/map.bin | 0 .../LinkContestRoom3}/border.bin | 0 data/layouts/LinkContestRoom3/layout.inc | 14 + .../LinkContestRoom3/map.bin | 0 .../LinkContestRoom4}/border.bin | 0 data/layouts/LinkContestRoom4/layout.inc | 14 + .../LinkContestRoom4/map.bin | 0 .../LinkContestRoom5}/border.bin | 0 data/layouts/LinkContestRoom5/layout.inc | 14 + .../LinkContestRoom5/map.bin | 0 .../LinkContestRoom6}/border.bin | 0 data/layouts/LinkContestRoom6/layout.inc | 14 + .../LinkContestRoom6/map.bin | 0 .../LittlerootTown/border.bin | 0 data/layouts/LittlerootTown/layout.inc | 14 + data/{maps => layouts}/LittlerootTown/map.bin | 0 .../border.bin | Bin .../layout.inc | 14 + .../LittlerootTown_BrendansHouse_1F/map.bin | 0 .../border.bin | 0 .../layout.inc | 14 + .../LittlerootTown_BrendansHouse_2F/map.bin | 0 .../LittlerootTown_MaysHouse_1F/border.bin | 0 .../LittlerootTown_MaysHouse_1F/layout.inc | 14 + .../LittlerootTown_MaysHouse_1F/map.bin | 0 .../LittlerootTown_MaysHouse_2F/border.bin | 0 .../LittlerootTown_MaysHouse_2F/layout.inc | 14 + .../LittlerootTown_MaysHouse_2F/map.bin | 0 .../border.bin | 0 .../layout.inc | 14 + .../LittlerootTown_ProfessorBirchsLab/map.bin | 0 .../MagmaHideout_1F}/border.bin | 0 data/layouts/MagmaHideout_1F/layout.inc | 14 + .../{maps => layouts}/MagmaHideout_1F/map.bin | Bin .../MagmaHideout_B1F}/border.bin | 0 data/layouts/MagmaHideout_B1F/layout.inc | 14 + .../MagmaHideout_B1F/map.bin | 0 .../MagmaHideout_B2F}/border.bin | 0 data/layouts/MagmaHideout_B2F/layout.inc | 14 + .../MagmaHideout_B2F/map.bin | 0 .../{maps => layouts}/MauvilleCity/border.bin | 0 data/layouts/MauvilleCity/layout.inc | 14 + data/{maps => layouts}/MauvilleCity/map.bin | Bin .../MauvilleCity_BikeShop/border.bin | 0 data/layouts/MauvilleCity_BikeShop/layout.inc | 14 + .../MauvilleCity_BikeShop/map.bin | 0 .../MauvilleCity_GameCorner/border.bin | Bin .../MauvilleCity_GameCorner/layout.inc | 14 + .../MauvilleCity_GameCorner/map.bin | 0 .../MauvilleCity_Gym/border.bin | Bin data/layouts/MauvilleCity_Gym/layout.inc | 14 + .../MauvilleCity_Gym/map.bin | 0 .../MeteorFalls_1F_1R}/border.bin | 0 data/layouts/MeteorFalls_1F_1R/layout.inc | 14 + .../MeteorFalls_1F_1R/map.bin | 0 .../MeteorFalls_1F_2R}/border.bin | 0 data/layouts/MeteorFalls_1F_2R/layout.inc | 14 + .../MeteorFalls_1F_2R/map.bin | 0 .../MeteorFalls_B1F_1R}/border.bin | 0 data/layouts/MeteorFalls_B1F_1R/layout.inc | 14 + .../MeteorFalls_B1F_1R/map.bin | 0 .../MeteorFalls_B1F_2R}/border.bin | 0 data/layouts/MeteorFalls_B1F_2R/layout.inc | 14 + .../MeteorFalls_B1F_2R/map.bin | 0 .../{maps => layouts}/MossdeepCity/border.bin | 0 data/layouts/MossdeepCity/layout.inc | 14 + data/{maps => layouts}/MossdeepCity/map.bin | Bin .../MossdeepCity_GameCorner_1F/border.bin | Bin .../MossdeepCity_GameCorner_1F/layout.inc | 14 + .../MossdeepCity_GameCorner_1F/map.bin | 0 .../MossdeepCity_GameCorner_B1F/border.bin | Bin .../MossdeepCity_GameCorner_B1F/layout.inc | 14 + .../MossdeepCity_GameCorner_B1F/map.bin | 0 .../MossdeepCity_Gym/border.bin | 0 data/layouts/MossdeepCity_Gym/layout.inc | 14 + .../MossdeepCity_Gym/map.bin | 0 .../MossdeepCity_SpaceCenter_1F}/border.bin | 0 .../MossdeepCity_SpaceCenter_1F/layout.inc | 14 + .../MossdeepCity_SpaceCenter_1F/map.bin | Bin .../MossdeepCity_SpaceCenter_2F}/border.bin | 0 .../MossdeepCity_SpaceCenter_2F/layout.inc | 14 + .../MossdeepCity_SpaceCenter_2F/map.bin | Bin .../MossdeepCity_StevensHouse/border.bin | Bin .../MossdeepCity_StevensHouse/layout.inc | 14 + .../MossdeepCity_StevensHouse/map.bin | 0 data/{maps => layouts}/MtChimney/border.bin | 0 data/layouts/MtChimney/layout.inc | 14 + data/{maps => layouts}/MtChimney/map.bin | 0 .../MtPyre_1F}/border.bin | 0 data/layouts/MtPyre_1F/layout.inc | 14 + data/{maps => layouts}/MtPyre_1F/map.bin | 0 .../MtPyre_2F}/border.bin | 0 data/layouts/MtPyre_2F/layout.inc | 14 + data/{maps => layouts}/MtPyre_2F/map.bin | 0 .../MtPyre_3F}/border.bin | 0 data/layouts/MtPyre_3F/layout.inc | 14 + data/{maps => layouts}/MtPyre_3F/map.bin | 0 .../MtPyre_4F}/border.bin | 0 data/layouts/MtPyre_4F/layout.inc | 14 + data/{maps => layouts}/MtPyre_4F/map.bin | 0 .../MtPyre_5F}/border.bin | 0 data/layouts/MtPyre_5F/layout.inc | 14 + data/{maps => layouts}/MtPyre_5F/map.bin | 0 .../MtPyre_6F}/border.bin | 0 data/layouts/MtPyre_6F/layout.inc | 14 + data/{maps => layouts}/MtPyre_6F/map.bin | 0 .../MtPyre_Exterior/border.bin | Bin data/layouts/MtPyre_Exterior/layout.inc | 14 + .../{maps => layouts}/MtPyre_Exterior/map.bin | Bin .../MtPyre_Summit/border.bin | Bin data/layouts/MtPyre_Summit/layout.inc | 14 + data/{maps => layouts}/MtPyre_Summit/map.bin | Bin .../NewMauville_Entrance/border.bin | Bin data/layouts/NewMauville_Entrance/layout.inc | 14 + .../NewMauville_Entrance/map.bin | 0 .../NewMauville_Inside/border.bin | 0 data/layouts/NewMauville_Inside/layout.inc | 14 + .../NewMauville_Inside/map.bin | 0 data/{maps => layouts}/OldaleTown/border.bin | 0 data/layouts/OldaleTown/layout.inc | 14 + data/{maps => layouts}/OldaleTown/map.bin | 0 .../PacifidlogTown/border.bin | 0 data/layouts/PacifidlogTown/layout.inc | 14 + data/{maps => layouts}/PacifidlogTown/map.bin | 0 .../PacifidlogTown_House1}/border.bin | 0 data/layouts/PacifidlogTown_House1/layout.inc | 14 + .../PacifidlogTown_House1/map.bin | 0 .../PacifidlogTown_House2}/border.bin | 0 data/layouts/PacifidlogTown_House2/layout.inc | 14 + .../PacifidlogTown_House2/map.bin | 0 .../PetalburgCity/border.bin | 0 data/layouts/PetalburgCity/layout.inc | 14 + data/{maps => layouts}/PetalburgCity/map.bin | 0 .../PetalburgCity_Gym/border.bin | 0 data/layouts/PetalburgCity_Gym/layout.inc | 14 + .../PetalburgCity_Gym/map.bin | 0 .../PetalburgWoods/border.bin | 0 data/layouts/PetalburgWoods/layout.inc | 14 + data/{maps => layouts}/PetalburgWoods/map.bin | 0 .../PokeMart}/border.bin | Bin data/layouts/PokeMart/layout.inc | 14 + .../PokeMart}/map.bin | 0 .../PokemonCenter_1F}/border.bin | 0 data/layouts/PokemonCenter_1F/layout.inc | 14 + .../PokemonCenter_1F}/map.bin | 0 .../PokemonCenter_2F}/border.bin | 0 data/layouts/PokemonCenter_2F/layout.inc | 14 + .../PokemonCenter_2F}/map.bin | 0 .../RecordCorner}/border.bin | 0 data/layouts/RecordCorner/layout.inc | 14 + data/{maps => layouts}/RecordCorner/map.bin | 0 data/{maps => layouts}/Route101/border.bin | 0 data/layouts/Route101/layout.inc | 14 + data/{maps => layouts}/Route101/map.bin | 0 data/{maps => layouts}/Route102/border.bin | 0 data/layouts/Route102/layout.inc | 14 + data/{maps => layouts}/Route102/map.bin | 0 data/{maps => layouts}/Route103/border.bin | 0 data/layouts/Route103/layout.inc | 14 + data/{maps => layouts}/Route103/map.bin | 0 data/{maps => layouts}/Route104/border.bin | 0 data/layouts/Route104/layout.inc | 14 + data/{maps => layouts}/Route104/map.bin | Bin .../Route104_MrBrineysHouse}/border.bin | 0 .../Route104_MrBrineysHouse/layout.inc | 14 + .../Route104_MrBrineysHouse/map.bin | 0 .../Route104_PrettyPetalFlowerShop/border.bin | Bin .../Route104_PrettyPetalFlowerShop/layout.inc | 14 + .../Route104_PrettyPetalFlowerShop/map.bin | Bin .../Route104_Prototype/border.bin | 0 data/layouts/Route104_Prototype/layout.inc | 14 + .../Route104_Prototype/map.bin | 0 data/{maps => layouts}/Route105/border.bin | 0 data/layouts/Route105/layout.inc | 14 + data/{maps => layouts}/Route105/map.bin | Bin data/{maps => layouts}/Route106/border.bin | 0 data/layouts/Route106/layout.inc | 14 + data/{maps => layouts}/Route106/map.bin | Bin data/{maps => layouts}/Route107/border.bin | 0 data/layouts/Route107/layout.inc | 14 + data/{maps => layouts}/Route107/map.bin | Bin data/{maps => layouts}/Route108/border.bin | 0 data/layouts/Route108/layout.inc | 14 + data/{maps => layouts}/Route108/map.bin | 0 data/{maps => layouts}/Route109/border.bin | 0 data/layouts/Route109/layout.inc | 14 + data/{maps => layouts}/Route109/map.bin | Bin .../Route109_SeashoreHouse/border.bin | Bin .../layouts/Route109_SeashoreHouse/layout.inc | 14 + .../Route109_SeashoreHouse/map.bin | 0 data/{maps => layouts}/Route110/border.bin | 0 data/layouts/Route110/layout.inc | 14 + data/{maps => layouts}/Route110/map.bin | Bin .../border.bin | Bin .../layout.inc | 14 + .../map.bin | 0 .../Route110_TrickHouseCorridor}/border.bin | 0 .../Route110_TrickHouseCorridor/layout.inc | 14 + .../Route110_TrickHouseCorridor/map.bin | 0 .../Route110_TrickHouseEnd}/border.bin | 0 .../layouts/Route110_TrickHouseEnd/layout.inc | 14 + .../Route110_TrickHouseEnd/map.bin | 0 .../Route110_TrickHouseEntrance}/border.bin | 0 .../Route110_TrickHouseEntrance/layout.inc | 14 + .../Route110_TrickHouseEntrance/map.bin | 0 .../Route110_TrickHousePuzzle1/border.bin | Bin .../Route110_TrickHousePuzzle1/layout.inc | 14 + .../Route110_TrickHousePuzzle1/map.bin | 0 .../Route110_TrickHousePuzzle2/border.bin | Bin .../Route110_TrickHousePuzzle2/layout.inc | 14 + .../Route110_TrickHousePuzzle2/map.bin | 0 .../Route110_TrickHousePuzzle3/border.bin | Bin .../Route110_TrickHousePuzzle3/layout.inc | 14 + .../Route110_TrickHousePuzzle3/map.bin | 0 .../Route110_TrickHousePuzzle4/border.bin | Bin .../Route110_TrickHousePuzzle4/layout.inc | 14 + .../Route110_TrickHousePuzzle4/map.bin | 0 .../Route110_TrickHousePuzzle5/border.bin | Bin .../Route110_TrickHousePuzzle5/layout.inc | 14 + .../Route110_TrickHousePuzzle5/map.bin | 0 .../Route110_TrickHousePuzzle6/border.bin | Bin .../Route110_TrickHousePuzzle6/layout.inc | 14 + .../Route110_TrickHousePuzzle6/map.bin | 0 .../Route110_TrickHousePuzzle7/border.bin | Bin .../Route110_TrickHousePuzzle7/layout.inc | 14 + .../Route110_TrickHousePuzzle7/map.bin | 0 .../Route110_TrickHousePuzzle8/border.bin | Bin .../Route110_TrickHousePuzzle8/layout.inc | 14 + .../Route110_TrickHousePuzzle8/map.bin | 0 data/{maps => layouts}/Route111/border.bin | Bin data/layouts/Route111/layout.inc | 14 + data/{maps => layouts}/Route111/map.bin | Bin data/{maps => layouts}/Route112/border.bin | 0 data/layouts/Route112/layout.inc | 14 + data/{maps => layouts}/Route112/map.bin | Bin data/{maps => layouts}/Route113/border.bin | 0 data/layouts/Route113/layout.inc | 14 + data/{maps => layouts}/Route113/map.bin | 0 data/{maps => layouts}/Route114/border.bin | 0 data/layouts/Route114/layout.inc | 14 + data/{maps => layouts}/Route114/map.bin | Bin .../Route114_FossilManiacsHouse}/border.bin | 0 .../Route114_FossilManiacsHouse/layout.inc | 14 + .../Route114_FossilManiacsHouse/map.bin | 0 .../Route114_FossilManiacsTunnel/border.bin | 0 .../Route114_FossilManiacsTunnel/layout.inc | 14 + .../Route114_FossilManiacsTunnel/map.bin | 0 .../Route114_LanettesHouse}/border.bin | 0 .../layouts/Route114_LanettesHouse/layout.inc | 14 + .../Route114_LanettesHouse/map.bin | 0 data/{maps => layouts}/Route115/border.bin | 0 data/layouts/Route115/layout.inc | 14 + data/{maps => layouts}/Route115/map.bin | Bin data/{maps => layouts}/Route116/border.bin | 0 data/layouts/Route116/layout.inc | 14 + data/{maps => layouts}/Route116/map.bin | Bin .../Route116_TunnelersRestHouse}/border.bin | 0 .../Route116_TunnelersRestHouse/layout.inc | 14 + .../Route116_TunnelersRestHouse/map.bin | 0 data/{maps => layouts}/Route117/border.bin | Bin data/layouts/Route117/layout.inc | 14 + data/{maps => layouts}/Route117/map.bin | 0 .../Route117_PokemonDayCare/border.bin | 0 .../Route117_PokemonDayCare/layout.inc | 14 + .../Route117_PokemonDayCare/map.bin | 0 data/{maps => layouts}/Route118/border.bin | 0 data/layouts/Route118/layout.inc | 14 + data/{maps => layouts}/Route118/map.bin | Bin data/{maps => layouts}/Route119/border.bin | Bin data/layouts/Route119/layout.inc | 14 + data/{maps => layouts}/Route119/map.bin | Bin .../Route119_WeatherInstitute_1F}/border.bin | 0 .../Route119_WeatherInstitute_1F/layout.inc | 14 + .../Route119_WeatherInstitute_1F/map.bin | 0 .../Route119_WeatherInstitute_2F}/border.bin | 0 .../Route119_WeatherInstitute_2F/layout.inc | 14 + .../Route119_WeatherInstitute_2F/map.bin | 0 data/{maps => layouts}/Route120/border.bin | Bin data/layouts/Route120/layout.inc | 14 + data/{maps => layouts}/Route120/map.bin | Bin data/{maps => layouts}/Route121/border.bin | 0 data/layouts/Route121/layout.inc | 14 + data/{maps => layouts}/Route121/map.bin | 0 .../Route121_SafariZoneEntrance/border.bin | Bin .../Route121_SafariZoneEntrance/layout.inc | 14 + .../Route121_SafariZoneEntrance/map.bin | 0 data/{maps => layouts}/Route122/border.bin | 0 data/layouts/Route122/layout.inc | 14 + data/{maps => layouts}/Route122/map.bin | Bin data/{maps => layouts}/Route123/border.bin | Bin data/layouts/Route123/layout.inc | 14 + data/{maps => layouts}/Route123/map.bin | 0 data/{maps => layouts}/Route124/border.bin | 0 data/layouts/Route124/layout.inc | 14 + data/{maps => layouts}/Route124/map.bin | Bin .../border.bin | Bin .../layout.inc | 14 + .../map.bin | 0 data/{maps => layouts}/Route125/border.bin | 0 data/layouts/Route125/layout.inc | 14 + data/{maps => layouts}/Route125/map.bin | Bin data/{maps => layouts}/Route126/border.bin | 0 data/layouts/Route126/layout.inc | 14 + data/{maps => layouts}/Route126/map.bin | Bin data/{maps => layouts}/Route127/border.bin | 0 data/layouts/Route127/layout.inc | 14 + data/{maps => layouts}/Route127/map.bin | Bin data/{maps => layouts}/Route128/border.bin | 0 data/layouts/Route128/layout.inc | 14 + data/{maps => layouts}/Route128/map.bin | Bin data/{maps => layouts}/Route129/border.bin | 0 data/layouts/Route129/layout.inc | 14 + data/{maps => layouts}/Route129/map.bin | Bin data/{maps => layouts}/Route130/border.bin | 0 data/layouts/Route130/layout.inc | 14 + data/{maps => layouts}/Route130/map.bin | 0 data/{maps => layouts}/Route131/border.bin | 0 data/layouts/Route131/layout.inc | 14 + data/{maps => layouts}/Route131/map.bin | 0 data/{maps => layouts}/Route132/border.bin | 0 data/layouts/Route132/layout.inc | 14 + data/{maps => layouts}/Route132/map.bin | Bin data/{maps => layouts}/Route133/border.bin | 0 data/layouts/Route133/layout.inc | 14 + data/{maps => layouts}/Route133/map.bin | 0 data/{maps => layouts}/Route134/border.bin | 0 data/layouts/Route134/layout.inc | 14 + data/{maps => layouts}/Route134/map.bin | Bin .../{maps => layouts}/RustboroCity/border.bin | 0 data/layouts/RustboroCity/layout.inc | 14 + data/{maps => layouts}/RustboroCity/map.bin | Bin .../RustboroCity_CuttersHouse}/border.bin | 0 .../RustboroCity_CuttersHouse/layout.inc | 14 + .../RustboroCity_CuttersHouse/map.bin | 0 .../RustboroCity_DevonCorp_1F}/border.bin | 0 .../RustboroCity_DevonCorp_1F/layout.inc | 14 + .../RustboroCity_DevonCorp_1F/map.bin | 0 .../RustboroCity_DevonCorp_2F}/border.bin | 0 .../RustboroCity_DevonCorp_2F/layout.inc | 14 + .../RustboroCity_DevonCorp_2F/map.bin | 0 .../RustboroCity_DevonCorp_3F}/border.bin | 0 .../RustboroCity_DevonCorp_3F/layout.inc | 14 + .../RustboroCity_DevonCorp_3F/map.bin | 0 .../RustboroCity_Flat1_1F}/border.bin | 0 data/layouts/RustboroCity_Flat1_1F/layout.inc | 14 + .../RustboroCity_Flat1_1F/map.bin | 0 .../RustboroCity_Flat1_2F}/border.bin | 0 data/layouts/RustboroCity_Flat1_2F/layout.inc | 14 + .../RustboroCity_Flat1_2F/map.bin | 0 .../RustboroCity_Flat2_1F}/border.bin | 0 data/layouts/RustboroCity_Flat2_1F/layout.inc | 14 + .../RustboroCity_Flat2_1F/map.bin | Bin .../RustboroCity_Flat2_2F}/border.bin | 0 data/layouts/RustboroCity_Flat2_2F/layout.inc | 14 + .../RustboroCity_Flat2_2F/map.bin | Bin .../RustboroCity_Flat2_3F}/border.bin | 0 data/layouts/RustboroCity_Flat2_3F/layout.inc | 14 + .../RustboroCity_Flat2_3F/map.bin | Bin .../RustboroCity_Gym/border.bin | Bin data/layouts/RustboroCity_Gym/layout.inc | 14 + .../RustboroCity_Gym/map.bin | 0 .../RustboroCity_House}/border.bin | 0 data/layouts/RustboroCity_House/layout.inc | 14 + .../RustboroCity_House}/map.bin | 0 .../RustboroCity_House1}/border.bin | 0 data/layouts/RustboroCity_House1/layout.inc | 14 + .../RustboroCity_House1/map.bin | 0 .../RustboroCity_PokemonSchool/border.bin | 0 .../RustboroCity_PokemonSchool/layout.inc | 14 + .../RustboroCity_PokemonSchool/map.bin | Bin .../RusturfTunnel/border.bin | 0 data/layouts/RusturfTunnel/layout.inc | 14 + data/{maps => layouts}/RusturfTunnel/map.bin | 0 .../SSTidalCorridor}/border.bin | 0 data/layouts/SSTidalCorridor/layout.inc | 14 + .../{maps => layouts}/SSTidalCorridor/map.bin | 0 .../SSTidalLowerDeck}/border.bin | 0 data/layouts/SSTidalLowerDeck/layout.inc | 14 + .../SSTidalLowerDeck/map.bin | 0 .../SSTidalRooms}/border.bin | 0 data/layouts/SSTidalRooms/layout.inc | 14 + data/{maps => layouts}/SSTidalRooms/map.bin | 0 .../SafariZone_Northeast/border.bin | 0 data/layouts/SafariZone_Northeast/layout.inc | 14 + .../SafariZone_Northeast/map.bin | Bin .../SafariZone_Northwest/border.bin | 0 data/layouts/SafariZone_Northwest/layout.inc | 14 + .../SafariZone_Northwest/map.bin | Bin .../SafariZone_RestHouse/border.bin | Bin data/layouts/SafariZone_RestHouse/layout.inc | 14 + .../SafariZone_RestHouse/map.bin | 0 .../SafariZone_Southeast/border.bin | 0 data/layouts/SafariZone_Southeast/layout.inc | 14 + .../SafariZone_Southeast/map.bin | Bin .../SafariZone_Southwest/border.bin | 0 data/layouts/SafariZone_Southwest/layout.inc | 14 + .../SafariZone_Southwest/map.bin | Bin .../{maps => layouts}/ScorchedSlab/border.bin | 0 data/layouts/ScorchedSlab/layout.inc | 14 + data/{maps => layouts}/ScorchedSlab/map.bin | 0 .../SeafloorCavern_Entrance/border.bin | 0 .../SeafloorCavern_Entrance/layout.inc | 14 + .../SeafloorCavern_Entrance/map.bin | 0 .../SeafloorCavern_Room1/border.bin | 0 data/layouts/SeafloorCavern_Room1/layout.inc | 14 + .../SeafloorCavern_Room1/map.bin | 0 .../SeafloorCavern_Room2/border.bin | 0 data/layouts/SeafloorCavern_Room2/layout.inc | 14 + .../SeafloorCavern_Room2/map.bin | 0 .../SeafloorCavern_Room3/border.bin | 0 data/layouts/SeafloorCavern_Room3/layout.inc | 14 + .../SeafloorCavern_Room3/map.bin | 0 .../SeafloorCavern_Room4/border.bin | 0 data/layouts/SeafloorCavern_Room4/layout.inc | 14 + .../SeafloorCavern_Room4/map.bin | 0 .../SeafloorCavern_Room5/border.bin | 0 data/layouts/SeafloorCavern_Room5/layout.inc | 14 + .../SeafloorCavern_Room5/map.bin | 0 .../SeafloorCavern_Room6/border.bin | 0 data/layouts/SeafloorCavern_Room6/layout.inc | 14 + .../SeafloorCavern_Room6/map.bin | 0 .../SeafloorCavern_Room7/border.bin | 0 data/layouts/SeafloorCavern_Room7/layout.inc | 14 + .../SeafloorCavern_Room7/map.bin | 0 .../SeafloorCavern_Room8/border.bin | 0 data/layouts/SeafloorCavern_Room8/layout.inc | 14 + .../SeafloorCavern_Room8/map.bin | 0 .../SeafloorCavern_Room9/border.bin | 0 data/layouts/SeafloorCavern_Room9/layout.inc | 14 + .../SeafloorCavern_Room9/map.bin | 0 .../SealedChamber_InnerRoom/border.bin | Bin .../SealedChamber_InnerRoom/layout.inc | 14 + .../SealedChamber_InnerRoom/map.bin | 0 .../SealedChamber_OuterRoom/border.bin | Bin .../SealedChamber_OuterRoom/layout.inc | 14 + .../SealedChamber_OuterRoom/map.bin | 0 .../SecretBase_BlueCave1/border.bin | 0 data/layouts/SecretBase_BlueCave1/layout.inc | 14 + .../SecretBase_BlueCave1/map.bin | 0 .../SecretBase_BlueCave2/border.bin | 0 data/layouts/SecretBase_BlueCave2/layout.inc | 14 + .../SecretBase_BlueCave2/map.bin | 0 .../SecretBase_BlueCave3/border.bin | 0 data/layouts/SecretBase_BlueCave3/layout.inc | 14 + .../SecretBase_BlueCave3/map.bin | 0 .../SecretBase_BlueCave4/border.bin | 0 data/layouts/SecretBase_BlueCave4/layout.inc | 14 + .../SecretBase_BlueCave4/map.bin | 0 .../SecretBase_BrownCave1/border.bin | 0 data/layouts/SecretBase_BrownCave1/layout.inc | 14 + .../SecretBase_BrownCave1/map.bin | 0 .../SecretBase_BrownCave2/border.bin | 0 data/layouts/SecretBase_BrownCave2/layout.inc | 14 + .../SecretBase_BrownCave2/map.bin | 0 .../SecretBase_BrownCave3/border.bin | 0 data/layouts/SecretBase_BrownCave3/layout.inc | 14 + .../SecretBase_BrownCave3/map.bin | 0 .../SecretBase_BrownCave4/border.bin | 0 data/layouts/SecretBase_BrownCave4/layout.inc | 14 + .../SecretBase_BrownCave4/map.bin | 0 .../SecretBase_RedCave1/border.bin | 0 data/layouts/SecretBase_RedCave1/layout.inc | 14 + .../SecretBase_RedCave1/map.bin | 0 .../SecretBase_RedCave2/border.bin | 0 data/layouts/SecretBase_RedCave2/layout.inc | 14 + .../SecretBase_RedCave2/map.bin | 0 .../SecretBase_RedCave3/border.bin | 0 data/layouts/SecretBase_RedCave3/layout.inc | 14 + .../SecretBase_RedCave3/map.bin | 0 .../SecretBase_RedCave4/border.bin | 0 data/layouts/SecretBase_RedCave4/layout.inc | 14 + .../SecretBase_RedCave4/map.bin | 0 .../SecretBase_Shrub1/border.bin | 0 data/layouts/SecretBase_Shrub1/layout.inc | 14 + .../SecretBase_Shrub1/map.bin | 0 .../SecretBase_Shrub2/border.bin | 0 data/layouts/SecretBase_Shrub2/layout.inc | 14 + .../SecretBase_Shrub2/map.bin | 0 .../SecretBase_Shrub3/border.bin | 0 data/layouts/SecretBase_Shrub3/layout.inc | 14 + .../SecretBase_Shrub3/map.bin | 0 .../SecretBase_Shrub4/border.bin | 0 data/layouts/SecretBase_Shrub4/layout.inc | 14 + .../SecretBase_Shrub4/map.bin | 0 .../SecretBase_Tree1/border.bin | 0 data/layouts/SecretBase_Tree1/layout.inc | 14 + .../SecretBase_Tree1/map.bin | 0 .../SecretBase_Tree2/border.bin | 0 data/layouts/SecretBase_Tree2/layout.inc | 14 + .../SecretBase_Tree2/map.bin | 0 .../SecretBase_Tree3/border.bin | 0 data/layouts/SecretBase_Tree3/layout.inc | 14 + .../SecretBase_Tree3/map.bin | 0 .../SecretBase_Tree4/border.bin | 0 data/layouts/SecretBase_Tree4/layout.inc | 14 + .../SecretBase_Tree4/map.bin | 0 .../SecretBase_YellowCave1/border.bin | 0 .../layouts/SecretBase_YellowCave1/layout.inc | 14 + .../SecretBase_YellowCave1/map.bin | 0 .../SecretBase_YellowCave2/border.bin | 0 .../layouts/SecretBase_YellowCave2/layout.inc | 14 + .../SecretBase_YellowCave2/map.bin | 0 .../SecretBase_YellowCave3/border.bin | 0 .../layouts/SecretBase_YellowCave3/layout.inc | 14 + .../SecretBase_YellowCave3/map.bin | 0 .../SecretBase_YellowCave4/border.bin | 0 .../layouts/SecretBase_YellowCave4/layout.inc | 14 + .../SecretBase_YellowCave4/map.bin | 0 .../ShoalCave_HighTideEntranceRoom/border.bin | 0 .../ShoalCave_HighTideEntranceRoom/layout.inc | 14 + .../ShoalCave_HighTideEntranceRoom/map.bin | 0 .../ShoalCave_HighTideInnerRoom/border.bin | 0 .../ShoalCave_HighTideInnerRoom/layout.inc | 14 + .../ShoalCave_HighTideInnerRoom/map.bin | 0 .../ShoalCave_LowTideEntranceRoom/border.bin | 0 .../ShoalCave_LowTideEntranceRoom/layout.inc | 14 + .../ShoalCave_LowTideEntranceRoom/map.bin | 0 .../ShoalCave_LowTideIceRoom/border.bin | 0 .../ShoalCave_LowTideIceRoom/layout.inc | 14 + .../ShoalCave_LowTideIceRoom/map.bin | 0 .../ShoalCave_LowTideInnerRoom/border.bin | 0 .../ShoalCave_LowTideInnerRoom/layout.inc | 14 + .../ShoalCave_LowTideInnerRoom/map.bin | 0 .../ShoalCave_LowTideLowerRoom/border.bin | 0 .../ShoalCave_LowTideLowerRoom/layout.inc | 14 + .../ShoalCave_LowTideLowerRoom/map.bin | 0 .../ShoalCave_LowTideStairsRoom/border.bin | 0 .../ShoalCave_LowTideStairsRoom/layout.inc | 14 + .../ShoalCave_LowTideStairsRoom/map.bin | 0 .../SingleBattleColosseum}/border.bin | 0 data/layouts/SingleBattleColosseum/layout.inc | 14 + .../SingleBattleColosseum/map.bin | 0 .../SkyPillar_1F}/border.bin | 0 data/layouts/SkyPillar_1F/layout.inc | 14 + data/{maps => layouts}/SkyPillar_1F/map.bin | 0 .../SkyPillar_2F}/border.bin | 0 data/layouts/SkyPillar_2F/layout.inc | 14 + data/{maps => layouts}/SkyPillar_2F/map.bin | 0 .../SkyPillar_3F}/border.bin | 0 data/layouts/SkyPillar_3F/layout.inc | 14 + data/{maps => layouts}/SkyPillar_3F/map.bin | 0 .../SkyPillar_4F}/border.bin | 0 data/layouts/SkyPillar_4F/layout.inc | 14 + data/{maps => layouts}/SkyPillar_4F/map.bin | 0 .../SkyPillar_5F}/border.bin | 0 data/layouts/SkyPillar_5F/layout.inc | 14 + data/{maps => layouts}/SkyPillar_5F/map.bin | 0 .../SkyPillar_Entrance/border.bin | 0 data/layouts/SkyPillar_Entrance/layout.inc | 14 + .../SkyPillar_Entrance/map.bin | 0 .../SkyPillar_Outside/border.bin | 0 data/layouts/SkyPillar_Outside/layout.inc | 14 + .../SkyPillar_Outside/map.bin | 0 .../SkyPillar_Top/border.bin | Bin data/layouts/SkyPillar_Top/layout.inc | 14 + data/{maps => layouts}/SkyPillar_Top/map.bin | 0 .../SlateportCity/border.bin | 0 data/layouts/SlateportCity/layout.inc | 14 + data/{maps => layouts}/SlateportCity/map.bin | Bin .../SlateportCity_OceanicMuseum_1F/border.bin | Bin .../SlateportCity_OceanicMuseum_1F/layout.inc | 14 + .../SlateportCity_OceanicMuseum_1F/map.bin | 0 .../SlateportCity_OceanicMuseum_2F/border.bin | Bin .../SlateportCity_OceanicMuseum_2F/layout.inc | 14 + .../SlateportCity_OceanicMuseum_2F/map.bin | 0 .../SlateportCity_PokemonFanClub/border.bin | Bin .../SlateportCity_PokemonFanClub/layout.inc | 14 + .../SlateportCity_PokemonFanClub/map.bin | Bin .../border.bin | 0 .../layout.inc | 14 + .../SlateportCity_SternsShipyard_1F/map.bin | 0 .../border.bin | 0 .../layout.inc | 14 + .../SlateportCity_SternsShipyard_2F/map.bin | 0 .../SootopolisCity/border.bin | 0 data/layouts/SootopolisCity/layout.inc | 14 + data/{maps => layouts}/SootopolisCity/map.bin | 0 .../SootopolisCity_Gym_1F/border.bin | 0 data/layouts/SootopolisCity_Gym_1F/layout.inc | 14 + .../SootopolisCity_Gym_1F/map.bin | 0 .../SootopolisCity_Gym_B1F/border.bin | 0 .../layouts/SootopolisCity_Gym_B1F/layout.inc | 14 + .../SootopolisCity_Gym_B1F/map.bin | 0 .../SootopolisCity_House1/border.bin | 0 data/layouts/SootopolisCity_House1/layout.inc | 14 + .../SootopolisCity_House1/map.bin | 0 .../SootopolisCity_House2/border.bin | 0 data/layouts/SootopolisCity_House2/layout.inc | 14 + .../SootopolisCity_House2/map.bin | 0 .../SootopolisCity_House3/border.bin | 0 data/layouts/SootopolisCity_House3/layout.inc | 14 + .../SootopolisCity_House3/map.bin | 0 .../SootopolisCity_House8/border.bin | Bin data/layouts/SootopolisCity_House8/layout.inc | 14 + .../SootopolisCity_House8/map.bin | 0 .../SouthernIsland_Exterior/border.bin | 0 .../SouthernIsland_Exterior/layout.inc | 14 + .../SouthernIsland_Exterior/map.bin | 0 .../SouthernIsland_Interior/border.bin | 0 .../SouthernIsland_Interior/layout.inc | 14 + .../SouthernIsland_Interior/map.bin | 0 data/{maps => layouts}/TradeCenter/border.bin | 0 data/layouts/TradeCenter/layout.inc | 14 + data/{maps => layouts}/TradeCenter/map.bin | 0 data/{maps => layouts}/Underwater1/border.bin | 0 data/layouts/Underwater1/layout.inc | 14 + data/{maps => layouts}/Underwater1/map.bin | 0 data/{maps => layouts}/Underwater2/border.bin | 0 data/layouts/Underwater2/layout.inc | 14 + data/{maps => layouts}/Underwater2/map.bin | 0 data/{maps => layouts}/Underwater3/border.bin | 0 data/layouts/Underwater3/layout.inc | 14 + data/{maps => layouts}/Underwater3/map.bin | 0 data/{maps => layouts}/Underwater4/border.bin | 0 data/layouts/Underwater4/layout.inc | 14 + data/{maps => layouts}/Underwater4/map.bin | 0 .../Underwater_Route134/border.bin | 0 data/layouts/Underwater_Route134/layout.inc | 14 + .../Underwater_Route134/map.bin | 0 .../Underwater_SeafloorCavern/border.bin | 0 .../Underwater_SeafloorCavern/layout.inc | 14 + .../Underwater_SeafloorCavern/map.bin | 0 .../Underwater_SealedChamber/border.bin | 0 .../Underwater_SealedChamber/layout.inc | 14 + .../Underwater_SealedChamber/map.bin | 0 .../Underwater_SootopolisCity/border.bin | 0 .../Underwater_SootopolisCity/layout.inc | 14 + .../Underwater_SootopolisCity/map.bin | 0 .../UnknownMap_082CF564/border.bin | 0 data/layouts/UnknownMap_082CF564/layout.inc | 14 + .../UnknownMap_082CF564/map.bin | Bin .../UnknownMap_082D05D8/border.bin | 0 data/layouts/UnknownMap_082D05D8/layout.inc | 14 + .../UnknownMap_082D05D8/map.bin | Bin .../UnknownMap_082D05FC/border.bin | 0 data/layouts/UnknownMap_082D05FC/layout.inc | 14 + .../UnknownMap_082D05FC/map.bin | Bin .../UnknownMap_082E55C8/border.bin | 0 data/layouts/UnknownMap_082E55C8/layout.inc | 14 + .../UnknownMap_082E55C8/map.bin | Bin .../UnknownMap_082E55EC/border.bin | 0 data/layouts/UnknownMap_082E55EC/layout.inc | 14 + .../UnknownMap_082E55EC/map.bin | Bin .../UnknownMap_082E5610/border.bin | 0 data/layouts/UnknownMap_082E5610/layout.inc | 14 + .../UnknownMap_082E5610/map.bin | Bin .../UnknownMap_082E5634/border.bin | 0 data/layouts/UnknownMap_082E5634/layout.inc | 14 + .../UnknownMap_082E5634/map.bin | Bin .../UnknownMap_082E5658/border.bin | 0 data/layouts/UnknownMap_082E5658/layout.inc | 14 + .../UnknownMap_082E5658/map.bin | Bin .../UnknownMap_082E567C/border.bin | 0 data/layouts/UnknownMap_082E567C/layout.inc | 14 + .../UnknownMap_082E567C/map.bin | Bin .../UnknownMap_082E56A0/border.bin | 0 data/layouts/UnknownMap_082E56A0/layout.inc | 14 + .../UnknownMap_082E56A0/map.bin | Bin .../UnknownMap_082E56C4/border.bin | 0 data/layouts/UnknownMap_082E56C4/layout.inc | 14 + .../UnknownMap_082E56C4/map.bin | Bin .../UnknownMap_082E56E8/border.bin | 0 data/layouts/UnknownMap_082E56E8/layout.inc | 14 + .../UnknownMap_082E56E8/map.bin | Bin .../UnknownMap_082E570C/border.bin | 0 data/layouts/UnknownMap_082E570C/layout.inc | 14 + .../UnknownMap_082E570C/map.bin | Bin .../UnknownMap_082E5730/border.bin | 0 data/layouts/UnknownMap_082E5730/layout.inc | 14 + .../UnknownMap_082E5730/map.bin | Bin .../UnknownMap_082E5754/border.bin | 0 data/layouts/UnknownMap_082E5754/layout.inc | 14 + .../UnknownMap_082E5754/map.bin | Bin .../UnknownMap_082E5778/border.bin | 0 data/layouts/UnknownMap_082E5778/layout.inc | 14 + .../UnknownMap_082E5778/map.bin | Bin .../UnknownMap_082E579C/border.bin | 0 data/layouts/UnknownMap_082E579C/layout.inc | 14 + .../UnknownMap_082E579C/map.bin | Bin .../UnknownMap_082EDF30/border.bin | 0 data/layouts/UnknownMap_082EDF30/layout.inc | 14 + .../UnknownMap_082EDF30/map.bin | 0 .../UnknownMap_082FF894/border.bin | 0 data/layouts/UnknownMap_082FF894/layout.inc | 14 + .../UnknownMap_082FF894/map.bin | Bin .../UnknownMap_08302970/border.bin | 0 data/layouts/UnknownMap_08302970/layout.inc | 14 + .../UnknownMap_08302970/map.bin | 0 .../UnknownMap_083041B4/border.bin | 0 data/layouts/UnknownMap_083041B4/layout.inc | 14 + .../UnknownMap_083041B4/map.bin | 0 .../UnknownMap_25_29/border.bin | 0 data/layouts/UnknownMap_25_29/layout.inc | 14 + .../UnknownMap_25_29/map.bin | 0 .../UnknownMap_25_30/border.bin | 0 data/layouts/UnknownMap_25_30/layout.inc | 14 + .../UnknownMap_25_30/map.bin | 0 .../UnknownMap_25_31/border.bin | 0 data/layouts/UnknownMap_25_31/layout.inc | 14 + .../UnknownMap_25_31/map.bin | 0 .../UnknownMap_25_32/border.bin | 0 data/layouts/UnknownMap_25_32/layout.inc | 14 + .../UnknownMap_25_32/map.bin | 0 .../UnknownMap_25_33/border.bin | 0 data/layouts/UnknownMap_25_33/layout.inc | 14 + .../UnknownMap_25_33/map.bin | 0 .../UnknownMap_25_34/border.bin | 0 data/layouts/UnknownMap_25_34/layout.inc | 14 + .../UnknownMap_25_34/map.bin | 0 .../UnreferencedMap/border.bin | 0 data/layouts/UnreferencedMap/layout.inc | 14 + .../{maps => layouts}/UnreferencedMap/map.bin | 0 .../VerdanturfTown/border.bin | Bin data/layouts/VerdanturfTown/layout.inc | 14 + data/{maps => layouts}/VerdanturfTown/map.bin | Bin .../VerdanturfTown_WandasHouse/border.bin | Bin .../VerdanturfTown_WandasHouse/layout.inc | 14 + .../VerdanturfTown_WandasHouse/map.bin | Bin .../VictoryRoad_1F/border.bin | 0 data/layouts/VictoryRoad_1F/layout.inc | 14 + data/{maps => layouts}/VictoryRoad_1F/map.bin | 0 .../VictoryRoad_B1F/border.bin | 0 data/layouts/VictoryRoad_B1F/layout.inc | 14 + .../{maps => layouts}/VictoryRoad_B1F/map.bin | 0 .../VictoryRoad_B2F/border.bin | 0 data/layouts/VictoryRoad_B2F/layout.inc | 14 + .../{maps => layouts}/VictoryRoad_B2F/map.bin | 0 .../AbandonedShip_CaptainsOffice/header.inc | 2 +- .../AbandonedShip_Corridors_1F/header.inc | 2 +- .../AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- .../header.inc | 2 +- .../AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- .../maps/AbandonedShip_Underwater1/header.inc | 2 +- .../maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/BattleTower_BattleRoom/header.inc | 2 +- data/maps/BattleTower_Corridor/header.inc | 2 +- data/maps/BattleTower_Elevator/header.inc | 2 +- data/maps/BattleTower_Lobby/header.inc | 2 +- data/maps/BattleTower_Outside/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_B2F/header.inc | 2 +- data/maps/CaveOfOrigin_B3F/header.inc | 2 +- data/maps/CaveOfOrigin_B4F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- .../DewfordTown_PokemonCenter_1F/header.inc | 2 +- .../DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- .../EverGrandeCity_ChampionsRoom/header.inc | 2 +- data/maps/EverGrandeCity_Corridor1/header.inc | 2 +- data/maps/EverGrandeCity_Corridor2/header.inc | 2 +- data/maps/EverGrandeCity_Corridor3/header.inc | 2 +- data/maps/EverGrandeCity_Corridor4/header.inc | 2 +- data/maps/EverGrandeCity_Corridor5/header.inc | 2 +- .../maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- .../EverGrandeCity_GlaciasRoom/header.inc | 2 +- .../maps/EverGrandeCity_HallOfFame/header.inc | 2 +- .../EverGrandeCity_PhoebesRoom/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../EverGrandeCity_PokemonLeague/header.inc | 2 +- .../EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- .../maps/FallarborTown_ContestHall/header.inc | 2 +- .../FallarborTown_ContestLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- .../FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- .../FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- .../FortreeCity_PokemonCenter_1F/header.inc | 2 +- .../FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- .../maps/LilycoveCity_ContestLobby/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_EmptyMap/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../LilycoveCity_MoveDeletersHouse/header.inc | 2 +- .../LilycoveCity_PokemonCenter_1F/header.inc | 2 +- .../LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../LittlerootTown_MaysHouse_1F/header.inc | 2 +- .../LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_B1F/header.inc | 2 +- data/maps/MagmaHideout_B2F/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- .../MauvilleCity_PokemonCenter_1F/header.inc | 2 +- .../MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- .../MossdeepCity_GameCorner_1F/header.inc | 2 +- .../MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- .../MossdeepCity_PokemonCenter_1F/header.inc | 2 +- .../MossdeepCity_PokemonCenter_2F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_1F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_2F/header.inc | 2 +- .../maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- .../maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- .../OldaleTown_PokemonCenter_1F/header.inc | 2 +- .../OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- .../PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../PetalburgCity_PokemonCenter_2F/header.inc | 2 +- .../maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- .../Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- .../Route110_TrickHouseEntrance/header.inc | 2 +- .../Route110_TrickHousePuzzle1/header.inc | 2 +- .../Route110_TrickHousePuzzle2/header.inc | 2 +- .../Route110_TrickHousePuzzle3/header.inc | 2 +- .../Route110_TrickHousePuzzle4/header.inc | 2 +- .../Route110_TrickHousePuzzle5/header.inc | 2 +- .../Route110_TrickHousePuzzle6/header.inc | 2 +- .../Route110_TrickHousePuzzle7/header.inc | 2 +- .../Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- .../maps/Route111_OldLadysRestStop/header.inc | 2 +- .../Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- .../Route114_FossilManiacsHouse/header.inc | 2 +- .../Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- .../Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- .../Route119_WeatherInstitute_1F/header.inc | 2 +- .../Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- .../Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- .../Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- .../maps/RustboroCity_CuttersHouse/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- .../RustboroCity_PokemonCenter_1F/header.inc | 2 +- .../RustboroCity_PokemonCenter_2F/header.inc | 2 +- .../RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- .../ShoalCave_HighTideEntranceRoom/header.inc | 2 +- .../ShoalCave_HighTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- .../ShoalCave_LowTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideLowerRoom/header.inc | 2 +- .../ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- .../maps/SlateportCity_ContestHall/header.inc | 2 +- .../SlateportCity_ContestLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../SlateportCity_PokemonCenter_2F/header.inc | 2 +- .../SlateportCity_PokemonFanClub/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_House8/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- .../maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- .../maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- .../VerdanturfTown_ContestHall/header.inc | 2 +- .../VerdanturfTown_ContestLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- data/maps/_assets.inc | 5338 +---------------- data/maps/attributes_table.inc | 664 +- 1392 files changed, 5706 insertions(+), 5732 deletions(-) rename data/{maps => layouts}/AbandonedShip_CaptainsOffice/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_CaptainsOffice/layout.inc rename data/{maps => layouts}/AbandonedShip_CaptainsOffice/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Corridors_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Corridors_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Corridors_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Corridors_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Corridors_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Corridors_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Deck/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Deck/layout.inc rename data/{maps => layouts}/AbandonedShip_Deck/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_HiddenFloorCorridors/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc rename data/{maps => layouts}/AbandonedShip_HiddenFloorCorridors/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_HiddenFloorRooms/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc rename data/{maps => layouts}/AbandonedShip_HiddenFloorRooms/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Room_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Room_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Room_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms2_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms2_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms2_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms2_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms2_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Underwater1/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Underwater1/layout.inc rename data/{maps => layouts}/AbandonedShip_Underwater1/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Underwater2/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Underwater2/layout.inc rename data/{maps => layouts}/AbandonedShip_Underwater2/map.bin (100%) rename data/{maps => layouts}/AncientTomb/border.bin (100%) create mode 100644 data/layouts/AncientTomb/layout.inc rename data/{maps => layouts}/AncientTomb/map.bin (100%) rename data/{maps => layouts}/AquaHideout_1F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_1F/layout.inc rename data/{maps => layouts}/AquaHideout_1F/map.bin (100%) rename data/{maps => layouts}/AquaHideout_B1F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_B1F/layout.inc rename data/{maps => layouts}/AquaHideout_B1F/map.bin (100%) rename data/{maps => layouts}/AquaHideout_B2F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_B2F/layout.inc rename data/{maps => layouts}/AquaHideout_B2F/map.bin (100%) rename data/{maps => layouts}/BattleTower_BattleRoom/border.bin (100%) create mode 100644 data/layouts/BattleTower_BattleRoom/layout.inc rename data/{maps => layouts}/BattleTower_BattleRoom/map.bin (100%) rename data/{maps => layouts}/BattleTower_Corridor/border.bin (100%) create mode 100644 data/layouts/BattleTower_Corridor/layout.inc rename data/{maps => layouts}/BattleTower_Corridor/map.bin (100%) rename data/{maps => layouts}/BattleTower_Elevator/border.bin (100%) create mode 100644 data/layouts/BattleTower_Elevator/layout.inc rename data/{maps => layouts}/BattleTower_Elevator/map.bin (100%) rename data/{maps => layouts}/BattleTower_Lobby/border.bin (100%) create mode 100644 data/layouts/BattleTower_Lobby/layout.inc rename data/{maps => layouts}/BattleTower_Lobby/map.bin (100%) rename data/{maps => layouts}/BattleTower_Outside/border.bin (100%) create mode 100644 data/layouts/BattleTower_Outside/layout.inc rename data/{maps => layouts}/BattleTower_Outside/map.bin (100%) rename data/{maps/DewfordTown_Hall => layouts/CableCarStation}/border.bin (100%) create mode 100644 data/layouts/CableCarStation/layout.inc rename data/{maps/Route112_CableCarStation => layouts/CableCarStation}/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_1F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_1F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_1F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_B1F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_B1F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_B1F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_B2F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_B2F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_B2F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_B3F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_B3F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_B3F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_B4F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_B4F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_B4F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_Entrance/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_Entrance/layout.inc rename data/{maps => layouts}/CaveOfOrigin_Entrance/map.bin (100%) rename data/{maps/DewfordTown_House1 => layouts/ContestHall}/border.bin (100%) create mode 100644 data/layouts/ContestHall/layout.inc rename data/{maps/FallarborTown_ContestHall => layouts/ContestHall}/map.bin (100%) rename data/{maps/DewfordTown_House2 => layouts/ContestLobby}/border.bin (100%) create mode 100644 data/layouts/ContestLobby/layout.inc rename data/{maps/FallarborTown_ContestLobby => layouts/ContestLobby}/map.bin (100%) rename data/{maps => layouts}/DesertRuins/border.bin (100%) create mode 100644 data/layouts/DesertRuins/layout.inc rename data/{maps => layouts}/DesertRuins/map.bin (100%) rename data/{maps => layouts}/DewfordTown/border.bin (100%) create mode 100644 data/layouts/DewfordTown/layout.inc rename data/{maps => layouts}/DewfordTown/map.bin (100%) rename data/{maps => layouts}/DewfordTown_Gym/border.bin (100%) create mode 100644 data/layouts/DewfordTown_Gym/layout.inc rename data/{maps => layouts}/DewfordTown_Gym/map.bin (100%) rename data/{maps/DoubleBattleColosseum => layouts/DewfordTown_Hall}/border.bin (100%) create mode 100644 data/layouts/DewfordTown_Hall/layout.inc rename data/{maps => layouts}/DewfordTown_Hall/map.bin (100%) rename data/{maps/EverGrandeCity_PokemonLeague => layouts/DoubleBattleColosseum}/border.bin (100%) create mode 100644 data/layouts/DoubleBattleColosseum/layout.inc rename data/{maps => layouts}/DoubleBattleColosseum/map.bin (100%) rename data/{maps => layouts}/EverGrandeCity/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity/layout.inc rename data/{maps => layouts}/EverGrandeCity/map.bin (100%) rename data/{maps => layouts}/EverGrandeCity_ChampionsRoom/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_ChampionsRoom/map.bin (100%) rename data/{maps/EverGrandeCity_Corridor1 => layouts/EverGrandeCity_Corridor4}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_Corridor4/layout.inc rename data/{maps => layouts}/EverGrandeCity_Corridor4/map.bin (100%) rename data/{maps/EverGrandeCity_Corridor4 => layouts/EverGrandeCity_DrakesRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_DrakesRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_DrakesRoom/map.bin (100%) rename data/{maps/EverGrandeCity_DrakesRoom => layouts/EverGrandeCity_GlaciasRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_GlaciasRoom/map.bin (100%) rename data/{maps/EverGrandeCity_GlaciasRoom => layouts/EverGrandeCity_HallOfFame}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_HallOfFame/layout.inc rename data/{maps => layouts}/EverGrandeCity_HallOfFame/map.bin (100%) rename data/{maps/EverGrandeCity_HallOfFame => layouts/EverGrandeCity_PhoebesRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_PhoebesRoom/map.bin (100%) rename data/{maps/FallarborTown_ContestHall => layouts/EverGrandeCity_PokemonLeague}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_PokemonLeague/layout.inc rename data/{maps => layouts}/EverGrandeCity_PokemonLeague/map.bin (100%) rename data/{maps/EverGrandeCity_PhoebesRoom => layouts/EverGrandeCity_ShortCorridor}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_ShortCorridor/layout.inc rename data/{maps/EverGrandeCity_Corridor1 => layouts/EverGrandeCity_ShortCorridor}/map.bin (100%) rename data/{maps => layouts}/EverGrandeCity_SidneysRoom/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_SidneysRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_SidneysRoom/map.bin (100%) rename data/{maps => layouts}/FallarborTown/border.bin (100%) create mode 100644 data/layouts/FallarborTown/layout.inc rename data/{maps => layouts}/FallarborTown/map.bin (100%) rename data/{maps => layouts}/FieryPath/border.bin (100%) create mode 100644 data/layouts/FieryPath/layout.inc rename data/{maps => layouts}/FieryPath/map.bin (100%) rename data/{maps => layouts}/FortreeCity/border.bin (100%) create mode 100644 data/layouts/FortreeCity/layout.inc rename data/{maps => layouts}/FortreeCity/map.bin (100%) rename data/{maps/FallarborTown_ContestLobby => layouts/FortreeCity_DecorationShop}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_DecorationShop/layout.inc rename data/{maps => layouts}/FortreeCity_DecorationShop/map.bin (100%) rename data/{maps => layouts}/FortreeCity_Gym/border.bin (100%) create mode 100644 data/layouts/FortreeCity_Gym/layout.inc rename data/{maps => layouts}/FortreeCity_Gym/map.bin (100%) rename data/{maps/FortreeCity_DecorationShop => layouts/FortreeCity_House1}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_House1/layout.inc rename data/{maps => layouts}/FortreeCity_House1/map.bin (100%) rename data/{maps/FortreeCity_House1 => layouts/FortreeCity_House2}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_House2/layout.inc rename data/{maps => layouts}/FortreeCity_House2/map.bin (100%) rename data/{maps => layouts}/GraniteCave_1F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_1F/layout.inc rename data/{maps => layouts}/GraniteCave_1F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_B1F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_B1F/layout.inc rename data/{maps => layouts}/GraniteCave_B1F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_B2F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_B2F/layout.inc rename data/{maps => layouts}/GraniteCave_B2F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_StevensRoom/border.bin (100%) create mode 100644 data/layouts/GraniteCave_StevensRoom/layout.inc rename data/{maps => layouts}/GraniteCave_StevensRoom/map.bin (100%) rename data/{maps/FortreeCity_House2 => layouts/Harbor}/border.bin (100%) create mode 100644 data/layouts/Harbor/layout.inc rename data/{maps/SlateportCity_Harbor => layouts/Harbor}/map.bin (100%) rename data/{maps/House11 => layouts/House1}/border.bin (100%) create mode 100644 data/layouts/House1/layout.inc rename data/{maps/House11 => layouts/House1}/map.bin (100%) rename data/{maps/House12 => layouts/House2}/border.bin (100%) create mode 100644 data/layouts/House2/layout.inc rename data/{maps/House12 => layouts/House2}/map.bin (100%) rename data/{maps/LavaridgeTown_PokemonCenter_1F => layouts/House3}/border.bin (100%) create mode 100644 data/layouts/House3/layout.inc rename data/{maps/DewfordTown_House1 => layouts/House3}/map.bin (100%) rename data/{maps/LilycoveCity_ContestHall => layouts/House4}/border.bin (100%) create mode 100644 data/layouts/House4/layout.inc rename data/{maps/DewfordTown_House2 => layouts/House4}/map.bin (100%) rename data/{maps/LilycoveCity_ContestLobby => layouts/HouseWithBed}/border.bin (100%) create mode 100644 data/layouts/HouseWithBed/layout.inc rename data/{maps/PetalburgCity_House2 => layouts/HouseWithBed}/map.bin (100%) rename data/{maps => layouts}/InsideOfTruck/border.bin (100%) create mode 100644 data/layouts/InsideOfTruck/layout.inc rename data/{maps => layouts}/InsideOfTruck/map.bin (100%) rename data/{maps => layouts}/IslandCave/border.bin (100%) create mode 100644 data/layouts/IslandCave/layout.inc rename data/{maps => layouts}/IslandCave/map.bin (100%) rename data/{maps => layouts}/JaggedPass/border.bin (100%) create mode 100644 data/layouts/JaggedPass/layout.inc rename data/{maps => layouts}/JaggedPass/map.bin (100%) rename data/{maps => layouts}/LavaridgeTown/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown/layout.inc rename data/{maps => layouts}/LavaridgeTown/map.bin (100%) rename data/{maps => layouts}/LavaridgeTown_Gym_1F/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_Gym_1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_Gym_1F/map.bin (100%) rename data/{maps => layouts}/LavaridgeTown_Gym_B1F/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_Gym_B1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_Gym_B1F/map.bin (100%) rename data/{maps => layouts}/LavaridgeTown_HerbShop/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_HerbShop/layout.inc rename data/{maps => layouts}/LavaridgeTown_HerbShop/map.bin (100%) rename data/{maps/LilycoveCity_CoveLilyMotel_1F => layouts/LavaridgeTown_PokemonCenter_1F}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_PokemonCenter_1F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity/border.bin (100%) create mode 100644 data/layouts/LilycoveCity/layout.inc rename data/{maps => layouts}/LilycoveCity/map.bin (100%) rename data/{maps/LilycoveCity_CoveLilyMotel_2F => layouts/LilycoveCity_ContestHall}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_ContestHall/layout.inc rename data/{maps => layouts}/LilycoveCity_ContestHall/map.bin (100%) rename data/{maps/LilycoveCity_House2 => layouts/LilycoveCity_ContestLobby}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_ContestLobby/layout.inc rename data/{maps => layouts}/LilycoveCity_ContestLobby/map.bin (100%) rename data/{maps/LilycoveCity_LilycoveMuseum_1F => layouts/LilycoveCity_CoveLilyMotel_1F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_CoveLilyMotel_1F/map.bin (100%) rename data/{maps/LilycoveCity_LilycoveMuseum_2F => layouts/LilycoveCity_CoveLilyMotel_2F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_CoveLilyMotel_2F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStoreElevator/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStoreElevator/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStoreRooftop/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStoreRooftop/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStore_1F/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_1F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStore_2F/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_2F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStore_3F/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_3F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStore_4F/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_4F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStore_5F/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_5F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_EmptyMap/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_EmptyMap/layout.inc rename data/{maps => layouts}/LilycoveCity_EmptyMap/map.bin (100%) rename data/{maps/LilycoveCity_PokemonTrainerFanClub => layouts/LilycoveCity_House2}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_House2/layout.inc rename data/{maps => layouts}/LilycoveCity_House2/map.bin (100%) rename data/{maps/LinkContestRoom1 => layouts/LilycoveCity_LilycoveMuseum_1F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_LilycoveMuseum_1F/map.bin (100%) rename data/{maps/LinkContestRoom2 => layouts/LilycoveCity_LilycoveMuseum_2F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_LilycoveMuseum_2F/map.bin (100%) rename data/{maps/LinkContestRoom3 => layouts/LilycoveCity_PokemonTrainerFanClub}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc rename data/{maps => layouts}/LilycoveCity_PokemonTrainerFanClub/map.bin (100%) rename data/{maps/LinkContestRoom4 => layouts/LinkContestRoom1}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom1/layout.inc rename data/{maps => layouts}/LinkContestRoom1/map.bin (100%) rename data/{maps/LinkContestRoom5 => layouts/LinkContestRoom2}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom2/layout.inc rename data/{maps => layouts}/LinkContestRoom2/map.bin (100%) rename data/{maps/LinkContestRoom6 => layouts/LinkContestRoom3}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom3/layout.inc rename data/{maps => layouts}/LinkContestRoom3/map.bin (100%) rename data/{maps/LittlerootTown_ProfessorBirchsLab => layouts/LinkContestRoom4}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom4/layout.inc rename data/{maps => layouts}/LinkContestRoom4/map.bin (100%) rename data/{maps/MagmaHideout_1F => layouts/LinkContestRoom5}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom5/layout.inc rename data/{maps => layouts}/LinkContestRoom5/map.bin (100%) rename data/{maps/MagmaHideout_B1F => layouts/LinkContestRoom6}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom6/layout.inc rename data/{maps => layouts}/LinkContestRoom6/map.bin (100%) rename data/{maps => layouts}/LittlerootTown/border.bin (100%) create mode 100644 data/layouts/LittlerootTown/layout.inc rename data/{maps => layouts}/LittlerootTown/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_BrendansHouse_1F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc rename data/{maps => layouts}/LittlerootTown_BrendansHouse_1F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_BrendansHouse_2F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc rename data/{maps => layouts}/LittlerootTown_BrendansHouse_2F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_MaysHouse_1F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/layout.inc rename data/{maps => layouts}/LittlerootTown_MaysHouse_1F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_MaysHouse_2F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/layout.inc rename data/{maps => layouts}/LittlerootTown_MaysHouse_2F/map.bin (100%) rename data/{maps/MagmaHideout_B2F => layouts/LittlerootTown_ProfessorBirchsLab}/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc rename data/{maps => layouts}/LittlerootTown_ProfessorBirchsLab/map.bin (100%) rename data/{maps/MeteorFalls_1F_1R => layouts/MagmaHideout_1F}/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_1F/layout.inc rename data/{maps => layouts}/MagmaHideout_1F/map.bin (100%) rename data/{maps/MeteorFalls_1F_2R => layouts/MagmaHideout_B1F}/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_B1F/layout.inc rename data/{maps => layouts}/MagmaHideout_B1F/map.bin (100%) rename data/{maps/MeteorFalls_B1F_1R => layouts/MagmaHideout_B2F}/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_B2F/layout.inc rename data/{maps => layouts}/MagmaHideout_B2F/map.bin (100%) rename data/{maps => layouts}/MauvilleCity/border.bin (100%) create mode 100644 data/layouts/MauvilleCity/layout.inc rename data/{maps => layouts}/MauvilleCity/map.bin (100%) rename data/{maps => layouts}/MauvilleCity_BikeShop/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_BikeShop/layout.inc rename data/{maps => layouts}/MauvilleCity_BikeShop/map.bin (100%) rename data/{maps => layouts}/MauvilleCity_GameCorner/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_GameCorner/layout.inc rename data/{maps => layouts}/MauvilleCity_GameCorner/map.bin (100%) rename data/{maps => layouts}/MauvilleCity_Gym/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_Gym/layout.inc rename data/{maps => layouts}/MauvilleCity_Gym/map.bin (100%) rename data/{maps/MeteorFalls_B1F_2R => layouts/MeteorFalls_1F_1R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_1F_1R/layout.inc rename data/{maps => layouts}/MeteorFalls_1F_1R/map.bin (100%) rename data/{maps/MossdeepCity_SpaceCenter_1F => layouts/MeteorFalls_1F_2R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_1F_2R/layout.inc rename data/{maps => layouts}/MeteorFalls_1F_2R/map.bin (100%) rename data/{maps/MossdeepCity_SpaceCenter_2F => layouts/MeteorFalls_B1F_1R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_B1F_1R/layout.inc rename data/{maps => layouts}/MeteorFalls_B1F_1R/map.bin (100%) rename data/{maps/MtPyre_1F => layouts/MeteorFalls_B1F_2R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_B1F_2R/layout.inc rename data/{maps => layouts}/MeteorFalls_B1F_2R/map.bin (100%) rename data/{maps => layouts}/MossdeepCity/border.bin (100%) create mode 100644 data/layouts/MossdeepCity/layout.inc rename data/{maps => layouts}/MossdeepCity/map.bin (100%) rename data/{maps => layouts}/MossdeepCity_GameCorner_1F/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_GameCorner_1F/layout.inc rename data/{maps => layouts}/MossdeepCity_GameCorner_1F/map.bin (100%) rename data/{maps => layouts}/MossdeepCity_GameCorner_B1F/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/layout.inc rename data/{maps => layouts}/MossdeepCity_GameCorner_B1F/map.bin (100%) rename data/{maps => layouts}/MossdeepCity_Gym/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_Gym/layout.inc rename data/{maps => layouts}/MossdeepCity_Gym/map.bin (100%) rename data/{maps/MtPyre_2F => layouts/MossdeepCity_SpaceCenter_1F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc rename data/{maps => layouts}/MossdeepCity_SpaceCenter_1F/map.bin (100%) rename data/{maps/MtPyre_3F => layouts/MossdeepCity_SpaceCenter_2F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc rename data/{maps => layouts}/MossdeepCity_SpaceCenter_2F/map.bin (100%) rename data/{maps => layouts}/MossdeepCity_StevensHouse/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_StevensHouse/layout.inc rename data/{maps => layouts}/MossdeepCity_StevensHouse/map.bin (100%) rename data/{maps => layouts}/MtChimney/border.bin (100%) create mode 100644 data/layouts/MtChimney/layout.inc rename data/{maps => layouts}/MtChimney/map.bin (100%) rename data/{maps/MtPyre_4F => layouts/MtPyre_1F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_1F/layout.inc rename data/{maps => layouts}/MtPyre_1F/map.bin (100%) rename data/{maps/MtPyre_5F => layouts/MtPyre_2F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_2F/layout.inc rename data/{maps => layouts}/MtPyre_2F/map.bin (100%) rename data/{maps/MtPyre_6F => layouts/MtPyre_3F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_3F/layout.inc rename data/{maps => layouts}/MtPyre_3F/map.bin (100%) rename data/{maps/OldaleTown_PokemonCenter_1F => layouts/MtPyre_4F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_4F/layout.inc rename data/{maps => layouts}/MtPyre_4F/map.bin (100%) rename data/{maps/OldaleTown_PokemonCenter_2F => layouts/MtPyre_5F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_5F/layout.inc rename data/{maps => layouts}/MtPyre_5F/map.bin (100%) rename data/{maps/PacifidlogTown_House1 => layouts/MtPyre_6F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_6F/layout.inc rename data/{maps => layouts}/MtPyre_6F/map.bin (100%) rename data/{maps => layouts}/MtPyre_Exterior/border.bin (100%) create mode 100644 data/layouts/MtPyre_Exterior/layout.inc rename data/{maps => layouts}/MtPyre_Exterior/map.bin (100%) rename data/{maps => layouts}/MtPyre_Summit/border.bin (100%) create mode 100644 data/layouts/MtPyre_Summit/layout.inc rename data/{maps => layouts}/MtPyre_Summit/map.bin (100%) rename data/{maps => layouts}/NewMauville_Entrance/border.bin (100%) create mode 100644 data/layouts/NewMauville_Entrance/layout.inc rename data/{maps => layouts}/NewMauville_Entrance/map.bin (100%) rename data/{maps => layouts}/NewMauville_Inside/border.bin (100%) create mode 100644 data/layouts/NewMauville_Inside/layout.inc rename data/{maps => layouts}/NewMauville_Inside/map.bin (100%) rename data/{maps => layouts}/OldaleTown/border.bin (100%) create mode 100644 data/layouts/OldaleTown/layout.inc rename data/{maps => layouts}/OldaleTown/map.bin (100%) rename data/{maps => layouts}/PacifidlogTown/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown/layout.inc rename data/{maps => layouts}/PacifidlogTown/map.bin (100%) rename data/{maps/PacifidlogTown_House2 => layouts/PacifidlogTown_House1}/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown_House1/layout.inc rename data/{maps => layouts}/PacifidlogTown_House1/map.bin (100%) rename data/{maps/PetalburgCity_House2 => layouts/PacifidlogTown_House2}/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown_House2/layout.inc rename data/{maps => layouts}/PacifidlogTown_House2/map.bin (100%) rename data/{maps => layouts}/PetalburgCity/border.bin (100%) create mode 100644 data/layouts/PetalburgCity/layout.inc rename data/{maps => layouts}/PetalburgCity/map.bin (100%) rename data/{maps => layouts}/PetalburgCity_Gym/border.bin (100%) create mode 100644 data/layouts/PetalburgCity_Gym/layout.inc rename data/{maps => layouts}/PetalburgCity_Gym/map.bin (100%) rename data/{maps => layouts}/PetalburgWoods/border.bin (100%) create mode 100644 data/layouts/PetalburgWoods/layout.inc rename data/{maps => layouts}/PetalburgWoods/map.bin (100%) rename data/{maps/OldaleTown_Mart => layouts/PokeMart}/border.bin (100%) create mode 100644 data/layouts/PokeMart/layout.inc rename data/{maps/OldaleTown_Mart => layouts/PokeMart}/map.bin (100%) rename data/{maps/RecordCorner => layouts/PokemonCenter_1F}/border.bin (100%) create mode 100644 data/layouts/PokemonCenter_1F/layout.inc rename data/{maps/OldaleTown_PokemonCenter_1F => layouts/PokemonCenter_1F}/map.bin (100%) rename data/{maps/Route104_MrBrineysHouse => layouts/PokemonCenter_2F}/border.bin (100%) create mode 100644 data/layouts/PokemonCenter_2F/layout.inc rename data/{maps/OldaleTown_PokemonCenter_2F => layouts/PokemonCenter_2F}/map.bin (100%) rename data/{maps/Route110_TrickHouseCorridor => layouts/RecordCorner}/border.bin (100%) create mode 100644 data/layouts/RecordCorner/layout.inc rename data/{maps => layouts}/RecordCorner/map.bin (100%) rename data/{maps => layouts}/Route101/border.bin (100%) create mode 100644 data/layouts/Route101/layout.inc rename data/{maps => layouts}/Route101/map.bin (100%) rename data/{maps => layouts}/Route102/border.bin (100%) create mode 100644 data/layouts/Route102/layout.inc rename data/{maps => layouts}/Route102/map.bin (100%) rename data/{maps => layouts}/Route103/border.bin (100%) create mode 100644 data/layouts/Route103/layout.inc rename data/{maps => layouts}/Route103/map.bin (100%) rename data/{maps => layouts}/Route104/border.bin (100%) create mode 100644 data/layouts/Route104/layout.inc rename data/{maps => layouts}/Route104/map.bin (100%) rename data/{maps/Route110_TrickHouseEnd => layouts/Route104_MrBrineysHouse}/border.bin (100%) create mode 100644 data/layouts/Route104_MrBrineysHouse/layout.inc rename data/{maps => layouts}/Route104_MrBrineysHouse/map.bin (100%) rename data/{maps => layouts}/Route104_PrettyPetalFlowerShop/border.bin (100%) create mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/layout.inc rename data/{maps => layouts}/Route104_PrettyPetalFlowerShop/map.bin (100%) rename data/{maps => layouts}/Route104_Prototype/border.bin (100%) create mode 100644 data/layouts/Route104_Prototype/layout.inc rename data/{maps => layouts}/Route104_Prototype/map.bin (100%) rename data/{maps => layouts}/Route105/border.bin (100%) create mode 100644 data/layouts/Route105/layout.inc rename data/{maps => layouts}/Route105/map.bin (100%) rename data/{maps => layouts}/Route106/border.bin (100%) create mode 100644 data/layouts/Route106/layout.inc rename data/{maps => layouts}/Route106/map.bin (100%) rename data/{maps => layouts}/Route107/border.bin (100%) create mode 100644 data/layouts/Route107/layout.inc rename data/{maps => layouts}/Route107/map.bin (100%) rename data/{maps => layouts}/Route108/border.bin (100%) create mode 100644 data/layouts/Route108/layout.inc rename data/{maps => layouts}/Route108/map.bin (100%) rename data/{maps => layouts}/Route109/border.bin (100%) create mode 100644 data/layouts/Route109/layout.inc rename data/{maps => layouts}/Route109/map.bin (100%) rename data/{maps => layouts}/Route109_SeashoreHouse/border.bin (100%) create mode 100644 data/layouts/Route109_SeashoreHouse/layout.inc rename data/{maps => layouts}/Route109_SeashoreHouse/map.bin (100%) rename data/{maps => layouts}/Route110/border.bin (100%) create mode 100644 data/layouts/Route110/layout.inc rename data/{maps => layouts}/Route110/map.bin (100%) rename data/{maps/Route110_SeasideCyclingRoadSouthEntrance => layouts/Route110_SeasideCyclingRoadEntrace}/border.bin (100%) create mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc rename data/{maps/Route110_SeasideCyclingRoadSouthEntrance => layouts/Route110_SeasideCyclingRoadEntrace}/map.bin (100%) rename data/{maps/Route110_TrickHouseEntrance => layouts/Route110_TrickHouseCorridor}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseCorridor/layout.inc rename data/{maps => layouts}/Route110_TrickHouseCorridor/map.bin (100%) rename data/{maps/Route112_CableCarStation => layouts/Route110_TrickHouseEnd}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseEnd/layout.inc rename data/{maps => layouts}/Route110_TrickHouseEnd/map.bin (100%) rename data/{maps/Route114_FossilManiacsHouse => layouts/Route110_TrickHouseEntrance}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseEntrance/layout.inc rename data/{maps => layouts}/Route110_TrickHouseEntrance/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle1/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle1/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle1/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle2/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle2/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle2/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle3/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle3/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle3/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle4/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle4/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle4/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle5/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle5/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle5/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle6/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle6/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle6/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle7/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle7/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle7/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle8/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle8/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle8/map.bin (100%) rename data/{maps => layouts}/Route111/border.bin (100%) create mode 100644 data/layouts/Route111/layout.inc rename data/{maps => layouts}/Route111/map.bin (100%) rename data/{maps => layouts}/Route112/border.bin (100%) create mode 100644 data/layouts/Route112/layout.inc rename data/{maps => layouts}/Route112/map.bin (100%) rename data/{maps => layouts}/Route113/border.bin (100%) create mode 100644 data/layouts/Route113/layout.inc rename data/{maps => layouts}/Route113/map.bin (100%) rename data/{maps => layouts}/Route114/border.bin (100%) create mode 100644 data/layouts/Route114/layout.inc rename data/{maps => layouts}/Route114/map.bin (100%) rename data/{maps/Route114_LanettesHouse => layouts/Route114_FossilManiacsHouse}/border.bin (100%) create mode 100644 data/layouts/Route114_FossilManiacsHouse/layout.inc rename data/{maps => layouts}/Route114_FossilManiacsHouse/map.bin (100%) rename data/{maps => layouts}/Route114_FossilManiacsTunnel/border.bin (100%) create mode 100644 data/layouts/Route114_FossilManiacsTunnel/layout.inc rename data/{maps => layouts}/Route114_FossilManiacsTunnel/map.bin (100%) rename data/{maps/Route116_TunnelersRestHouse => layouts/Route114_LanettesHouse}/border.bin (100%) create mode 100644 data/layouts/Route114_LanettesHouse/layout.inc rename data/{maps => layouts}/Route114_LanettesHouse/map.bin (100%) rename data/{maps => layouts}/Route115/border.bin (100%) create mode 100644 data/layouts/Route115/layout.inc rename data/{maps => layouts}/Route115/map.bin (100%) rename data/{maps => layouts}/Route116/border.bin (100%) create mode 100644 data/layouts/Route116/layout.inc rename data/{maps => layouts}/Route116/map.bin (100%) rename data/{maps/Route119_WeatherInstitute_1F => layouts/Route116_TunnelersRestHouse}/border.bin (100%) create mode 100644 data/layouts/Route116_TunnelersRestHouse/layout.inc rename data/{maps => layouts}/Route116_TunnelersRestHouse/map.bin (100%) rename data/{maps => layouts}/Route117/border.bin (100%) create mode 100644 data/layouts/Route117/layout.inc rename data/{maps => layouts}/Route117/map.bin (100%) rename data/{maps => layouts}/Route117_PokemonDayCare/border.bin (100%) create mode 100644 data/layouts/Route117_PokemonDayCare/layout.inc rename data/{maps => layouts}/Route117_PokemonDayCare/map.bin (100%) rename data/{maps => layouts}/Route118/border.bin (100%) create mode 100644 data/layouts/Route118/layout.inc rename data/{maps => layouts}/Route118/map.bin (100%) rename data/{maps => layouts}/Route119/border.bin (100%) create mode 100644 data/layouts/Route119/layout.inc rename data/{maps => layouts}/Route119/map.bin (100%) rename data/{maps/Route119_WeatherInstitute_2F => layouts/Route119_WeatherInstitute_1F}/border.bin (100%) create mode 100644 data/layouts/Route119_WeatherInstitute_1F/layout.inc rename data/{maps => layouts}/Route119_WeatherInstitute_1F/map.bin (100%) rename data/{maps/RustboroCity_CuttersHouse => layouts/Route119_WeatherInstitute_2F}/border.bin (100%) create mode 100644 data/layouts/Route119_WeatherInstitute_2F/layout.inc rename data/{maps => layouts}/Route119_WeatherInstitute_2F/map.bin (100%) rename data/{maps => layouts}/Route120/border.bin (100%) create mode 100644 data/layouts/Route120/layout.inc rename data/{maps => layouts}/Route120/map.bin (100%) rename data/{maps => layouts}/Route121/border.bin (100%) create mode 100644 data/layouts/Route121/layout.inc rename data/{maps => layouts}/Route121/map.bin (100%) rename data/{maps => layouts}/Route121_SafariZoneEntrance/border.bin (100%) create mode 100644 data/layouts/Route121_SafariZoneEntrance/layout.inc rename data/{maps => layouts}/Route121_SafariZoneEntrance/map.bin (100%) rename data/{maps => layouts}/Route122/border.bin (100%) create mode 100644 data/layouts/Route122/layout.inc rename data/{maps => layouts}/Route122/map.bin (100%) rename data/{maps => layouts}/Route123/border.bin (100%) create mode 100644 data/layouts/Route123/layout.inc rename data/{maps => layouts}/Route123/map.bin (100%) rename data/{maps => layouts}/Route124/border.bin (100%) create mode 100644 data/layouts/Route124/layout.inc rename data/{maps => layouts}/Route124/map.bin (100%) rename data/{maps => layouts}/Route124_DivingTreasureHuntersHouse/border.bin (100%) create mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc rename data/{maps => layouts}/Route124_DivingTreasureHuntersHouse/map.bin (100%) rename data/{maps => layouts}/Route125/border.bin (100%) create mode 100644 data/layouts/Route125/layout.inc rename data/{maps => layouts}/Route125/map.bin (100%) rename data/{maps => layouts}/Route126/border.bin (100%) create mode 100644 data/layouts/Route126/layout.inc rename data/{maps => layouts}/Route126/map.bin (100%) rename data/{maps => layouts}/Route127/border.bin (100%) create mode 100644 data/layouts/Route127/layout.inc rename data/{maps => layouts}/Route127/map.bin (100%) rename data/{maps => layouts}/Route128/border.bin (100%) create mode 100644 data/layouts/Route128/layout.inc rename data/{maps => layouts}/Route128/map.bin (100%) rename data/{maps => layouts}/Route129/border.bin (100%) create mode 100644 data/layouts/Route129/layout.inc rename data/{maps => layouts}/Route129/map.bin (100%) rename data/{maps => layouts}/Route130/border.bin (100%) create mode 100644 data/layouts/Route130/layout.inc rename data/{maps => layouts}/Route130/map.bin (100%) rename data/{maps => layouts}/Route131/border.bin (100%) create mode 100644 data/layouts/Route131/layout.inc rename data/{maps => layouts}/Route131/map.bin (100%) rename data/{maps => layouts}/Route132/border.bin (100%) create mode 100644 data/layouts/Route132/layout.inc rename data/{maps => layouts}/Route132/map.bin (100%) rename data/{maps => layouts}/Route133/border.bin (100%) create mode 100644 data/layouts/Route133/layout.inc rename data/{maps => layouts}/Route133/map.bin (100%) rename data/{maps => layouts}/Route134/border.bin (100%) create mode 100644 data/layouts/Route134/layout.inc rename data/{maps => layouts}/Route134/map.bin (100%) rename data/{maps => layouts}/RustboroCity/border.bin (100%) create mode 100644 data/layouts/RustboroCity/layout.inc rename data/{maps => layouts}/RustboroCity/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_1F => layouts/RustboroCity_CuttersHouse}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_CuttersHouse/layout.inc rename data/{maps => layouts}/RustboroCity_CuttersHouse/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_2F => layouts/RustboroCity_DevonCorp_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_1F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_1F/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_3F => layouts/RustboroCity_DevonCorp_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_2F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_2F/map.bin (100%) rename data/{maps/RustboroCity_Flat1_1F => layouts/RustboroCity_DevonCorp_3F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_3F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_3F/map.bin (100%) rename data/{maps/RustboroCity_Flat1_2F => layouts/RustboroCity_Flat1_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat1_1F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat1_1F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_1F => layouts/RustboroCity_Flat1_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat1_2F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat1_2F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_2F => layouts/RustboroCity_Flat2_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_1F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_1F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_3F => layouts/RustboroCity_Flat2_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_2F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_2F/map.bin (100%) rename data/{maps/RustboroCity_House1 => layouts/RustboroCity_Flat2_3F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_3F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_3F/map.bin (100%) rename data/{maps => layouts}/RustboroCity_Gym/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Gym/layout.inc rename data/{maps => layouts}/RustboroCity_Gym/map.bin (100%) rename data/{maps/RustboroCity_House2 => layouts/RustboroCity_House}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_House/layout.inc rename data/{maps/RustboroCity_House2 => layouts/RustboroCity_House}/map.bin (100%) rename data/{maps/SSTidalCorridor => layouts/RustboroCity_House1}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_House1/layout.inc rename data/{maps => layouts}/RustboroCity_House1/map.bin (100%) rename data/{maps => layouts}/RustboroCity_PokemonSchool/border.bin (100%) create mode 100644 data/layouts/RustboroCity_PokemonSchool/layout.inc rename data/{maps => layouts}/RustboroCity_PokemonSchool/map.bin (100%) rename data/{maps => layouts}/RusturfTunnel/border.bin (100%) create mode 100644 data/layouts/RusturfTunnel/layout.inc rename data/{maps => layouts}/RusturfTunnel/map.bin (100%) rename data/{maps/SSTidalLowerDeck => layouts/SSTidalCorridor}/border.bin (100%) create mode 100644 data/layouts/SSTidalCorridor/layout.inc rename data/{maps => layouts}/SSTidalCorridor/map.bin (100%) rename data/{maps/SSTidalRooms => layouts/SSTidalLowerDeck}/border.bin (100%) create mode 100644 data/layouts/SSTidalLowerDeck/layout.inc rename data/{maps => layouts}/SSTidalLowerDeck/map.bin (100%) rename data/{maps/SingleBattleColosseum => layouts/SSTidalRooms}/border.bin (100%) create mode 100644 data/layouts/SSTidalRooms/layout.inc rename data/{maps => layouts}/SSTidalRooms/map.bin (100%) rename data/{maps => layouts}/SafariZone_Northeast/border.bin (100%) create mode 100644 data/layouts/SafariZone_Northeast/layout.inc rename data/{maps => layouts}/SafariZone_Northeast/map.bin (100%) rename data/{maps => layouts}/SafariZone_Northwest/border.bin (100%) create mode 100644 data/layouts/SafariZone_Northwest/layout.inc rename data/{maps => layouts}/SafariZone_Northwest/map.bin (100%) rename data/{maps => layouts}/SafariZone_RestHouse/border.bin (100%) create mode 100644 data/layouts/SafariZone_RestHouse/layout.inc rename data/{maps => layouts}/SafariZone_RestHouse/map.bin (100%) rename data/{maps => layouts}/SafariZone_Southeast/border.bin (100%) create mode 100644 data/layouts/SafariZone_Southeast/layout.inc rename data/{maps => layouts}/SafariZone_Southeast/map.bin (100%) rename data/{maps => layouts}/SafariZone_Southwest/border.bin (100%) create mode 100644 data/layouts/SafariZone_Southwest/layout.inc rename data/{maps => layouts}/SafariZone_Southwest/map.bin (100%) rename data/{maps => layouts}/ScorchedSlab/border.bin (100%) create mode 100644 data/layouts/ScorchedSlab/layout.inc rename data/{maps => layouts}/ScorchedSlab/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Entrance/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Entrance/layout.inc rename data/{maps => layouts}/SeafloorCavern_Entrance/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room1/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room1/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room1/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room2/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room2/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room2/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room3/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room3/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room3/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room4/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room4/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room4/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room5/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room5/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room5/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room6/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room6/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room6/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room7/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room7/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room7/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room8/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room8/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room8/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room9/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room9/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room9/map.bin (100%) rename data/{maps => layouts}/SealedChamber_InnerRoom/border.bin (100%) create mode 100644 data/layouts/SealedChamber_InnerRoom/layout.inc rename data/{maps => layouts}/SealedChamber_InnerRoom/map.bin (100%) rename data/{maps => layouts}/SealedChamber_OuterRoom/border.bin (100%) create mode 100644 data/layouts/SealedChamber_OuterRoom/layout.inc rename data/{maps => layouts}/SealedChamber_OuterRoom/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave1/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave2/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave3/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave4/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave1/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave2/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave3/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave4/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave1/layout.inc rename data/{maps => layouts}/SecretBase_RedCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave2/layout.inc rename data/{maps => layouts}/SecretBase_RedCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave3/layout.inc rename data/{maps => layouts}/SecretBase_RedCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave4/layout.inc rename data/{maps => layouts}/SecretBase_RedCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub1/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub1/layout.inc rename data/{maps => layouts}/SecretBase_Shrub1/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub2/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub2/layout.inc rename data/{maps => layouts}/SecretBase_Shrub2/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub3/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub3/layout.inc rename data/{maps => layouts}/SecretBase_Shrub3/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub4/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub4/layout.inc rename data/{maps => layouts}/SecretBase_Shrub4/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree1/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree1/layout.inc rename data/{maps => layouts}/SecretBase_Tree1/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree2/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree2/layout.inc rename data/{maps => layouts}/SecretBase_Tree2/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree3/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree3/layout.inc rename data/{maps => layouts}/SecretBase_Tree3/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree4/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree4/layout.inc rename data/{maps => layouts}/SecretBase_Tree4/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave1/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave2/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave3/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave4/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave4/map.bin (100%) rename data/{maps => layouts}/ShoalCave_HighTideEntranceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_HighTideEntranceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_HighTideInnerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_HighTideInnerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideEntranceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideEntranceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideIceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideIceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideIceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideInnerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideInnerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideLowerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideLowerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideStairsRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideStairsRoom/map.bin (100%) rename data/{maps/SkyPillar_1F => layouts/SingleBattleColosseum}/border.bin (100%) create mode 100644 data/layouts/SingleBattleColosseum/layout.inc rename data/{maps => layouts}/SingleBattleColosseum/map.bin (100%) rename data/{maps/SkyPillar_2F => layouts/SkyPillar_1F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_1F/layout.inc rename data/{maps => layouts}/SkyPillar_1F/map.bin (100%) rename data/{maps/SkyPillar_3F => layouts/SkyPillar_2F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_2F/layout.inc rename data/{maps => layouts}/SkyPillar_2F/map.bin (100%) rename data/{maps/SkyPillar_4F => layouts/SkyPillar_3F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_3F/layout.inc rename data/{maps => layouts}/SkyPillar_3F/map.bin (100%) rename data/{maps/SkyPillar_5F => layouts/SkyPillar_4F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_4F/layout.inc rename data/{maps => layouts}/SkyPillar_4F/map.bin (100%) rename data/{maps/SlateportCity_Harbor => layouts/SkyPillar_5F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_5F/layout.inc rename data/{maps => layouts}/SkyPillar_5F/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Entrance/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Entrance/layout.inc rename data/{maps => layouts}/SkyPillar_Entrance/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Outside/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Outside/layout.inc rename data/{maps => layouts}/SkyPillar_Outside/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Top/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Top/layout.inc rename data/{maps => layouts}/SkyPillar_Top/map.bin (100%) rename data/{maps => layouts}/SlateportCity/border.bin (100%) create mode 100644 data/layouts/SlateportCity/layout.inc rename data/{maps => layouts}/SlateportCity/map.bin (100%) rename data/{maps => layouts}/SlateportCity_OceanicMuseum_1F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc rename data/{maps => layouts}/SlateportCity_OceanicMuseum_1F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_OceanicMuseum_2F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc rename data/{maps => layouts}/SlateportCity_OceanicMuseum_2F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_PokemonFanClub/border.bin (100%) create mode 100644 data/layouts/SlateportCity_PokemonFanClub/layout.inc rename data/{maps => layouts}/SlateportCity_PokemonFanClub/map.bin (100%) rename data/{maps => layouts}/SlateportCity_SternsShipyard_1F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/layout.inc rename data/{maps => layouts}/SlateportCity_SternsShipyard_1F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_SternsShipyard_2F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/layout.inc rename data/{maps => layouts}/SlateportCity_SternsShipyard_2F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity/border.bin (100%) create mode 100644 data/layouts/SootopolisCity/layout.inc rename data/{maps => layouts}/SootopolisCity/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_Gym_1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_Gym_1F/layout.inc rename data/{maps => layouts}/SootopolisCity_Gym_1F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_Gym_B1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_Gym_B1F/layout.inc rename data/{maps => layouts}/SootopolisCity_Gym_B1F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House1/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House1/layout.inc rename data/{maps => layouts}/SootopolisCity_House1/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House2/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House2/layout.inc rename data/{maps => layouts}/SootopolisCity_House2/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House3/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House3/layout.inc rename data/{maps => layouts}/SootopolisCity_House3/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House8/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House8/layout.inc rename data/{maps => layouts}/SootopolisCity_House8/map.bin (100%) rename data/{maps => layouts}/SouthernIsland_Exterior/border.bin (100%) create mode 100644 data/layouts/SouthernIsland_Exterior/layout.inc rename data/{maps => layouts}/SouthernIsland_Exterior/map.bin (100%) rename data/{maps => layouts}/SouthernIsland_Interior/border.bin (100%) create mode 100644 data/layouts/SouthernIsland_Interior/layout.inc rename data/{maps => layouts}/SouthernIsland_Interior/map.bin (100%) rename data/{maps => layouts}/TradeCenter/border.bin (100%) create mode 100644 data/layouts/TradeCenter/layout.inc rename data/{maps => layouts}/TradeCenter/map.bin (100%) rename data/{maps => layouts}/Underwater1/border.bin (100%) create mode 100644 data/layouts/Underwater1/layout.inc rename data/{maps => layouts}/Underwater1/map.bin (100%) rename data/{maps => layouts}/Underwater2/border.bin (100%) create mode 100644 data/layouts/Underwater2/layout.inc rename data/{maps => layouts}/Underwater2/map.bin (100%) rename data/{maps => layouts}/Underwater3/border.bin (100%) create mode 100644 data/layouts/Underwater3/layout.inc rename data/{maps => layouts}/Underwater3/map.bin (100%) rename data/{maps => layouts}/Underwater4/border.bin (100%) create mode 100644 data/layouts/Underwater4/layout.inc rename data/{maps => layouts}/Underwater4/map.bin (100%) rename data/{maps => layouts}/Underwater_Route134/border.bin (100%) create mode 100644 data/layouts/Underwater_Route134/layout.inc rename data/{maps => layouts}/Underwater_Route134/map.bin (100%) rename data/{maps => layouts}/Underwater_SeafloorCavern/border.bin (100%) create mode 100644 data/layouts/Underwater_SeafloorCavern/layout.inc rename data/{maps => layouts}/Underwater_SeafloorCavern/map.bin (100%) rename data/{maps => layouts}/Underwater_SealedChamber/border.bin (100%) create mode 100644 data/layouts/Underwater_SealedChamber/layout.inc rename data/{maps => layouts}/Underwater_SealedChamber/map.bin (100%) rename data/{maps => layouts}/Underwater_SootopolisCity/border.bin (100%) create mode 100644 data/layouts/Underwater_SootopolisCity/layout.inc rename data/{maps => layouts}/Underwater_SootopolisCity/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082CF564/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082CF564/layout.inc rename data/{maps => layouts}/UnknownMap_082CF564/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082D05D8/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082D05D8/layout.inc rename data/{maps => layouts}/UnknownMap_082D05D8/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082D05FC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082D05FC/layout.inc rename data/{maps => layouts}/UnknownMap_082D05FC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E55C8/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E55C8/layout.inc rename data/{maps => layouts}/UnknownMap_082E55C8/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E55EC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E55EC/layout.inc rename data/{maps => layouts}/UnknownMap_082E55EC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E5610/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E5610/layout.inc rename data/{maps => layouts}/UnknownMap_082E5610/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E5634/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E5634/layout.inc rename data/{maps => layouts}/UnknownMap_082E5634/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E5658/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E5658/layout.inc rename data/{maps => layouts}/UnknownMap_082E5658/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E567C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E567C/layout.inc rename data/{maps => layouts}/UnknownMap_082E567C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E56A0/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E56A0/layout.inc rename data/{maps => layouts}/UnknownMap_082E56A0/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E56C4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E56C4/layout.inc rename data/{maps => layouts}/UnknownMap_082E56C4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E56E8/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E56E8/layout.inc rename data/{maps => layouts}/UnknownMap_082E56E8/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E570C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E570C/layout.inc rename data/{maps => layouts}/UnknownMap_082E570C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E5730/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E5730/layout.inc rename data/{maps => layouts}/UnknownMap_082E5730/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E5754/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E5754/layout.inc rename data/{maps => layouts}/UnknownMap_082E5754/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E5778/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E5778/layout.inc rename data/{maps => layouts}/UnknownMap_082E5778/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082E579C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082E579C/layout.inc rename data/{maps => layouts}/UnknownMap_082E579C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082EDF30/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082EDF30/layout.inc rename data/{maps => layouts}/UnknownMap_082EDF30/map.bin (100%) rename data/{maps => layouts}/UnknownMap_082FF894/border.bin (100%) create mode 100644 data/layouts/UnknownMap_082FF894/layout.inc rename data/{maps => layouts}/UnknownMap_082FF894/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08302970/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08302970/layout.inc rename data/{maps => layouts}/UnknownMap_08302970/map.bin (100%) rename data/{maps => layouts}/UnknownMap_083041B4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_083041B4/layout.inc rename data/{maps => layouts}/UnknownMap_083041B4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_29/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_29/layout.inc rename data/{maps => layouts}/UnknownMap_25_29/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_30/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_30/layout.inc rename data/{maps => layouts}/UnknownMap_25_30/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_31/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_31/layout.inc rename data/{maps => layouts}/UnknownMap_25_31/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_32/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_32/layout.inc rename data/{maps => layouts}/UnknownMap_25_32/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_33/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_33/layout.inc rename data/{maps => layouts}/UnknownMap_25_33/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_34/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_34/layout.inc rename data/{maps => layouts}/UnknownMap_25_34/map.bin (100%) rename data/{maps => layouts}/UnreferencedMap/border.bin (100%) create mode 100644 data/layouts/UnreferencedMap/layout.inc rename data/{maps => layouts}/UnreferencedMap/map.bin (100%) rename data/{maps => layouts}/VerdanturfTown/border.bin (100%) create mode 100644 data/layouts/VerdanturfTown/layout.inc rename data/{maps => layouts}/VerdanturfTown/map.bin (100%) rename data/{maps => layouts}/VerdanturfTown_WandasHouse/border.bin (100%) create mode 100644 data/layouts/VerdanturfTown_WandasHouse/layout.inc rename data/{maps => layouts}/VerdanturfTown_WandasHouse/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_1F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_1F/layout.inc rename data/{maps => layouts}/VictoryRoad_1F/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_B1F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_B1F/layout.inc rename data/{maps => layouts}/VictoryRoad_B1F/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_B2F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_B2F/layout.inc rename data/{maps => layouts}/VictoryRoad_B2F/map.bin (100%) diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/layouts/AbandonedShip_CaptainsOffice/border.bin similarity index 100% rename from data/maps/AbandonedShip_CaptainsOffice/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_CaptainsOffice/map.bin rename to data/layouts/AbandonedShip_CaptainsOffice/map.bin diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/layouts/AbandonedShip_Corridors_1F/border.bin similarity index 100% rename from data/maps/AbandonedShip_Corridors_1F/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Corridors_1F/map.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Corridors_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Corridors_B1F/map.bin rename to data/layouts/AbandonedShip_Corridors_B1F/map.bin diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/layouts/AbandonedShip_Deck/border.bin similarity index 100% rename from data/maps/AbandonedShip_Deck/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Deck/map.bin rename to data/layouts/AbandonedShip_Deck/map.bin diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin similarity index 100% rename from data/maps/AbandonedShip_HiddenFloorCorridors/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_HiddenFloorCorridors/map.bin rename to data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin similarity index 100% rename from data/maps/AbandonedShip_HiddenFloorRooms/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_HiddenFloorRooms/map.bin rename to data/layouts/AbandonedShip_HiddenFloorRooms/map.bin diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/layouts/AbandonedShip_Room_B1F/border.bin similarity index 100% rename from data/maps/AbandonedShip_Room_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Room_B1F/map.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Rooms2_1F/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Rooms2_1F/map.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Rooms2_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Rooms2_B1F/map.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Rooms_1F/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Rooms_1F/map.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Rooms_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Rooms_B1F/map.bin rename to data/layouts/AbandonedShip_Rooms_B1F/map.bin diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/layouts/AbandonedShip_Underwater1/border.bin similarity index 100% rename from data/maps/AbandonedShip_Underwater1/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Underwater1/map.bin rename to data/layouts/AbandonedShip_Underwater1/map.bin diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/layouts/AbandonedShip_Underwater2/border.bin similarity index 100% rename from data/maps/AbandonedShip_Underwater2/border.bin rename to 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 similarity index 100% rename from data/maps/AbandonedShip_Underwater2/map.bin rename to data/layouts/AbandonedShip_Underwater2/map.bin diff --git a/data/maps/AncientTomb/border.bin b/data/layouts/AncientTomb/border.bin similarity index 100% rename from data/maps/AncientTomb/border.bin rename to 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 similarity index 100% rename from data/maps/AncientTomb/map.bin rename to data/layouts/AncientTomb/map.bin diff --git a/data/maps/AquaHideout_1F/border.bin b/data/layouts/AquaHideout_1F/border.bin similarity index 100% rename from data/maps/AquaHideout_1F/border.bin rename to 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 similarity index 100% rename from data/maps/AquaHideout_1F/map.bin rename to data/layouts/AquaHideout_1F/map.bin diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/layouts/AquaHideout_B1F/border.bin similarity index 100% rename from data/maps/AquaHideout_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/AquaHideout_B1F/map.bin rename to data/layouts/AquaHideout_B1F/map.bin diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/layouts/AquaHideout_B2F/border.bin similarity index 100% rename from data/maps/AquaHideout_B2F/border.bin rename to 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 similarity index 100% rename from data/maps/AquaHideout_B2F/map.bin rename to data/layouts/AquaHideout_B2F/map.bin diff --git a/data/maps/BattleTower_BattleRoom/border.bin b/data/layouts/BattleTower_BattleRoom/border.bin similarity index 100% rename from data/maps/BattleTower_BattleRoom/border.bin rename to 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 similarity index 100% rename from data/maps/BattleTower_BattleRoom/map.bin rename to data/layouts/BattleTower_BattleRoom/map.bin diff --git a/data/maps/BattleTower_Corridor/border.bin b/data/layouts/BattleTower_Corridor/border.bin similarity index 100% rename from data/maps/BattleTower_Corridor/border.bin rename to 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 similarity index 100% rename from data/maps/BattleTower_Corridor/map.bin rename to data/layouts/BattleTower_Corridor/map.bin diff --git a/data/maps/BattleTower_Elevator/border.bin b/data/layouts/BattleTower_Elevator/border.bin similarity index 100% rename from data/maps/BattleTower_Elevator/border.bin rename to 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 similarity index 100% rename from data/maps/BattleTower_Elevator/map.bin rename to data/layouts/BattleTower_Elevator/map.bin diff --git a/data/maps/BattleTower_Lobby/border.bin b/data/layouts/BattleTower_Lobby/border.bin similarity index 100% rename from data/maps/BattleTower_Lobby/border.bin rename to 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 similarity index 100% rename from data/maps/BattleTower_Lobby/map.bin rename to data/layouts/BattleTower_Lobby/map.bin diff --git a/data/maps/BattleTower_Outside/border.bin b/data/layouts/BattleTower_Outside/border.bin similarity index 100% rename from data/maps/BattleTower_Outside/border.bin rename to 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 similarity index 100% rename from data/maps/BattleTower_Outside/map.bin rename to data/layouts/BattleTower_Outside/map.bin diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/layouts/CableCarStation/border.bin similarity index 100% rename from data/maps/DewfordTown_Hall/border.bin rename to 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 similarity index 100% rename from data/maps/Route112_CableCarStation/map.bin rename to data/layouts/CableCarStation/map.bin diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/layouts/CaveOfOrigin_1F/border.bin similarity index 100% rename from data/maps/CaveOfOrigin_1F/border.bin rename to 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 similarity index 100% rename from data/maps/CaveOfOrigin_1F/map.bin rename to data/layouts/CaveOfOrigin_1F/map.bin diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/layouts/CaveOfOrigin_B1F/border.bin similarity index 100% rename from data/maps/CaveOfOrigin_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/CaveOfOrigin_B1F/map.bin rename to data/layouts/CaveOfOrigin_B1F/map.bin diff --git a/data/maps/CaveOfOrigin_B2F/border.bin b/data/layouts/CaveOfOrigin_B2F/border.bin similarity index 100% rename from data/maps/CaveOfOrigin_B2F/border.bin rename to 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 similarity index 100% rename from data/maps/CaveOfOrigin_B2F/map.bin rename to data/layouts/CaveOfOrigin_B2F/map.bin diff --git a/data/maps/CaveOfOrigin_B3F/border.bin b/data/layouts/CaveOfOrigin_B3F/border.bin similarity index 100% rename from data/maps/CaveOfOrigin_B3F/border.bin rename to 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 similarity index 100% rename from data/maps/CaveOfOrigin_B3F/map.bin rename to data/layouts/CaveOfOrigin_B3F/map.bin diff --git a/data/maps/CaveOfOrigin_B4F/border.bin b/data/layouts/CaveOfOrigin_B4F/border.bin similarity index 100% rename from data/maps/CaveOfOrigin_B4F/border.bin rename to 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 similarity index 100% rename from data/maps/CaveOfOrigin_B4F/map.bin rename to data/layouts/CaveOfOrigin_B4F/map.bin diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/layouts/CaveOfOrigin_Entrance/border.bin similarity index 100% rename from data/maps/CaveOfOrigin_Entrance/border.bin rename to 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 similarity index 100% rename from data/maps/CaveOfOrigin_Entrance/map.bin rename to data/layouts/CaveOfOrigin_Entrance/map.bin diff --git a/data/maps/DewfordTown_House1/border.bin b/data/layouts/ContestHall/border.bin similarity index 100% rename from data/maps/DewfordTown_House1/border.bin rename to 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 similarity index 100% rename from data/maps/FallarborTown_ContestHall/map.bin rename to data/layouts/ContestHall/map.bin diff --git a/data/maps/DewfordTown_House2/border.bin b/data/layouts/ContestLobby/border.bin similarity index 100% rename from data/maps/DewfordTown_House2/border.bin rename to 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 similarity index 100% rename from data/maps/FallarborTown_ContestLobby/map.bin rename to data/layouts/ContestLobby/map.bin diff --git a/data/maps/DesertRuins/border.bin b/data/layouts/DesertRuins/border.bin similarity index 100% rename from data/maps/DesertRuins/border.bin rename to 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 similarity index 100% rename from data/maps/DesertRuins/map.bin rename to data/layouts/DesertRuins/map.bin diff --git a/data/maps/DewfordTown/border.bin b/data/layouts/DewfordTown/border.bin similarity index 100% rename from data/maps/DewfordTown/border.bin rename to 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 similarity index 100% rename from data/maps/DewfordTown/map.bin rename to data/layouts/DewfordTown/map.bin diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/layouts/DewfordTown_Gym/border.bin similarity index 100% rename from data/maps/DewfordTown_Gym/border.bin rename to 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 similarity index 100% rename from data/maps/DewfordTown_Gym/map.bin rename to data/layouts/DewfordTown_Gym/map.bin diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/layouts/DewfordTown_Hall/border.bin similarity index 100% rename from data/maps/DoubleBattleColosseum/border.bin rename to 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 similarity index 100% rename from data/maps/DewfordTown_Hall/map.bin rename to data/layouts/DewfordTown_Hall/map.bin diff --git a/data/maps/EverGrandeCity_PokemonLeague/border.bin b/data/layouts/DoubleBattleColosseum/border.bin similarity index 100% rename from data/maps/EverGrandeCity_PokemonLeague/border.bin rename to 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 similarity index 100% rename from data/maps/DoubleBattleColosseum/map.bin rename to data/layouts/DoubleBattleColosseum/map.bin diff --git a/data/maps/EverGrandeCity/border.bin b/data/layouts/EverGrandeCity/border.bin similarity index 100% rename from data/maps/EverGrandeCity/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity/map.bin rename to data/layouts/EverGrandeCity/map.bin diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin similarity index 100% rename from data/maps/EverGrandeCity_ChampionsRoom/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_ChampionsRoom/map.bin rename to data/layouts/EverGrandeCity_ChampionsRoom/map.bin diff --git a/data/maps/EverGrandeCity_Corridor1/border.bin b/data/layouts/EverGrandeCity_Corridor4/border.bin similarity index 100% rename from data/maps/EverGrandeCity_Corridor1/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_Corridor4/map.bin rename to data/layouts/EverGrandeCity_Corridor4/map.bin diff --git a/data/maps/EverGrandeCity_Corridor4/border.bin b/data/layouts/EverGrandeCity_DrakesRoom/border.bin similarity index 100% rename from data/maps/EverGrandeCity_Corridor4/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_DrakesRoom/map.bin rename to data/layouts/EverGrandeCity_DrakesRoom/map.bin diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin similarity index 100% rename from data/maps/EverGrandeCity_DrakesRoom/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_GlaciasRoom/map.bin rename to data/layouts/EverGrandeCity_GlaciasRoom/map.bin diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin similarity index 100% rename from data/maps/EverGrandeCity_GlaciasRoom/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_HallOfFame/map.bin rename to data/layouts/EverGrandeCity_HallOfFame/map.bin diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin similarity index 100% rename from data/maps/EverGrandeCity_HallOfFame/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_PhoebesRoom/map.bin rename to data/layouts/EverGrandeCity_PhoebesRoom/map.bin diff --git a/data/maps/FallarborTown_ContestHall/border.bin b/data/layouts/EverGrandeCity_PokemonLeague/border.bin similarity index 100% rename from data/maps/FallarborTown_ContestHall/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_PokemonLeague/map.bin rename to data/layouts/EverGrandeCity_PokemonLeague/map.bin diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/layouts/EverGrandeCity_ShortCorridor/border.bin similarity index 100% rename from data/maps/EverGrandeCity_PhoebesRoom/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_Corridor1/map.bin rename to data/layouts/EverGrandeCity_ShortCorridor/map.bin diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/layouts/EverGrandeCity_SidneysRoom/border.bin similarity index 100% rename from data/maps/EverGrandeCity_SidneysRoom/border.bin rename to 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 similarity index 100% rename from data/maps/EverGrandeCity_SidneysRoom/map.bin rename to data/layouts/EverGrandeCity_SidneysRoom/map.bin diff --git a/data/maps/FallarborTown/border.bin b/data/layouts/FallarborTown/border.bin similarity index 100% rename from data/maps/FallarborTown/border.bin rename to 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 similarity index 100% rename from data/maps/FallarborTown/map.bin rename to data/layouts/FallarborTown/map.bin diff --git a/data/maps/FieryPath/border.bin b/data/layouts/FieryPath/border.bin similarity index 100% rename from data/maps/FieryPath/border.bin rename to 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 similarity index 100% rename from data/maps/FieryPath/map.bin rename to data/layouts/FieryPath/map.bin diff --git a/data/maps/FortreeCity/border.bin b/data/layouts/FortreeCity/border.bin similarity index 100% rename from data/maps/FortreeCity/border.bin rename to 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 similarity index 100% rename from data/maps/FortreeCity/map.bin rename to data/layouts/FortreeCity/map.bin diff --git a/data/maps/FallarborTown_ContestLobby/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin similarity index 100% rename from data/maps/FallarborTown_ContestLobby/border.bin rename to 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 similarity index 100% rename from data/maps/FortreeCity_DecorationShop/map.bin rename to data/layouts/FortreeCity_DecorationShop/map.bin diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/layouts/FortreeCity_Gym/border.bin similarity index 100% rename from data/maps/FortreeCity_Gym/border.bin rename to 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 similarity index 100% rename from data/maps/FortreeCity_Gym/map.bin rename to data/layouts/FortreeCity_Gym/map.bin diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_House1/border.bin similarity index 100% rename from data/maps/FortreeCity_DecorationShop/border.bin rename to 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 similarity index 100% rename from data/maps/FortreeCity_House1/map.bin rename to data/layouts/FortreeCity_House1/map.bin diff --git a/data/maps/FortreeCity_House1/border.bin b/data/layouts/FortreeCity_House2/border.bin similarity index 100% rename from data/maps/FortreeCity_House1/border.bin rename to 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 similarity index 100% rename from data/maps/FortreeCity_House2/map.bin rename to data/layouts/FortreeCity_House2/map.bin diff --git a/data/maps/GraniteCave_1F/border.bin b/data/layouts/GraniteCave_1F/border.bin similarity index 100% rename from data/maps/GraniteCave_1F/border.bin rename to 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 similarity index 100% rename from data/maps/GraniteCave_1F/map.bin rename to data/layouts/GraniteCave_1F/map.bin diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/layouts/GraniteCave_B1F/border.bin similarity index 100% rename from data/maps/GraniteCave_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/GraniteCave_B1F/map.bin rename to data/layouts/GraniteCave_B1F/map.bin diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/layouts/GraniteCave_B2F/border.bin similarity index 100% rename from data/maps/GraniteCave_B2F/border.bin rename to 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 similarity index 100% rename from data/maps/GraniteCave_B2F/map.bin rename to data/layouts/GraniteCave_B2F/map.bin diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/layouts/GraniteCave_StevensRoom/border.bin similarity index 100% rename from data/maps/GraniteCave_StevensRoom/border.bin rename to 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 similarity index 100% rename from data/maps/GraniteCave_StevensRoom/map.bin rename to data/layouts/GraniteCave_StevensRoom/map.bin diff --git a/data/maps/FortreeCity_House2/border.bin b/data/layouts/Harbor/border.bin similarity index 100% rename from data/maps/FortreeCity_House2/border.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity_Harbor/map.bin rename to data/layouts/Harbor/map.bin diff --git a/data/maps/House11/border.bin b/data/layouts/House1/border.bin similarity index 100% rename from data/maps/House11/border.bin rename to 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/House11/map.bin b/data/layouts/House1/map.bin similarity index 100% rename from data/maps/House11/map.bin rename to data/layouts/House1/map.bin diff --git a/data/maps/House12/border.bin b/data/layouts/House2/border.bin similarity index 100% rename from data/maps/House12/border.bin rename to 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/House12/map.bin b/data/layouts/House2/map.bin similarity index 100% rename from data/maps/House12/map.bin rename to data/layouts/House2/map.bin diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/layouts/House3/border.bin similarity index 100% rename from data/maps/LavaridgeTown_PokemonCenter_1F/border.bin rename to 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 similarity index 100% rename from data/maps/DewfordTown_House1/map.bin rename to data/layouts/House3/map.bin diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/layouts/House4/border.bin similarity index 100% rename from data/maps/LilycoveCity_ContestHall/border.bin rename to 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 similarity index 100% rename from data/maps/DewfordTown_House2/map.bin rename to data/layouts/House4/map.bin diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/layouts/HouseWithBed/border.bin similarity index 100% rename from data/maps/LilycoveCity_ContestLobby/border.bin rename to 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 similarity index 100% rename from data/maps/PetalburgCity_House2/map.bin rename to data/layouts/HouseWithBed/map.bin diff --git a/data/maps/InsideOfTruck/border.bin b/data/layouts/InsideOfTruck/border.bin similarity index 100% rename from data/maps/InsideOfTruck/border.bin rename to 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 similarity index 100% rename from data/maps/InsideOfTruck/map.bin rename to data/layouts/InsideOfTruck/map.bin diff --git a/data/maps/IslandCave/border.bin b/data/layouts/IslandCave/border.bin similarity index 100% rename from data/maps/IslandCave/border.bin rename to 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 similarity index 100% rename from data/maps/IslandCave/map.bin rename to data/layouts/IslandCave/map.bin diff --git a/data/maps/JaggedPass/border.bin b/data/layouts/JaggedPass/border.bin similarity index 100% rename from data/maps/JaggedPass/border.bin rename to 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 similarity index 100% rename from data/maps/JaggedPass/map.bin rename to data/layouts/JaggedPass/map.bin diff --git a/data/maps/LavaridgeTown/border.bin b/data/layouts/LavaridgeTown/border.bin similarity index 100% rename from data/maps/LavaridgeTown/border.bin rename to 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 similarity index 100% rename from data/maps/LavaridgeTown/map.bin rename to data/layouts/LavaridgeTown/map.bin diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/layouts/LavaridgeTown_Gym_1F/border.bin similarity index 100% rename from data/maps/LavaridgeTown_Gym_1F/border.bin rename to 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 similarity index 100% rename from data/maps/LavaridgeTown_Gym_1F/map.bin rename to 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 similarity index 100% rename from data/maps/LavaridgeTown_Gym_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/LavaridgeTown_Gym_B1F/map.bin rename to data/layouts/LavaridgeTown_Gym_B1F/map.bin diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin similarity index 100% rename from data/maps/LavaridgeTown_HerbShop/border.bin rename to 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 similarity index 100% rename from data/maps/LavaridgeTown_HerbShop/map.bin rename to data/layouts/LavaridgeTown_HerbShop/map.bin diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin similarity index 100% rename from data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin rename to 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 similarity index 100% rename from data/maps/LavaridgeTown_PokemonCenter_1F/map.bin rename to data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin diff --git a/data/maps/LilycoveCity/border.bin b/data/layouts/LilycoveCity/border.bin similarity index 100% rename from data/maps/LilycoveCity/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity/map.bin rename to data/layouts/LilycoveCity/map.bin diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/layouts/LilycoveCity_ContestHall/border.bin similarity index 100% rename from data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_ContestHall/map.bin rename to data/layouts/LilycoveCity_ContestHall/map.bin diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/layouts/LilycoveCity_ContestLobby/border.bin similarity index 100% rename from data/maps/LilycoveCity_House2/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_ContestLobby/map.bin rename to data/layouts/LilycoveCity_ContestLobby/map.bin diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin similarity index 100% rename from data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin rename to data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin similarity index 100% rename from data/maps/LilycoveCity_DepartmentStoreElevator/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStoreElevator/map.bin rename to data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin similarity index 100% rename from data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin rename to data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_1F/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_1F/map.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_2F/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_2F/map.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_3F/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_3F/map.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_4F/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_4F/map.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_5F/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_DepartmentStore_5F/map.bin rename to data/layouts/LilycoveCity_DepartmentStore_5F/map.bin diff --git a/data/maps/LilycoveCity_EmptyMap/border.bin b/data/layouts/LilycoveCity_EmptyMap/border.bin similarity index 100% rename from data/maps/LilycoveCity_EmptyMap/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_EmptyMap/map.bin rename to data/layouts/LilycoveCity_EmptyMap/map.bin diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/layouts/LilycoveCity_House2/border.bin similarity index 100% rename from data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_House2/map.bin rename to data/layouts/LilycoveCity_House2/map.bin diff --git a/data/maps/LinkContestRoom1/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin similarity index 100% rename from data/maps/LinkContestRoom1/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin rename to data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin diff --git a/data/maps/LinkContestRoom2/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin similarity index 100% rename from data/maps/LinkContestRoom2/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin rename to data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin diff --git a/data/maps/LinkContestRoom3/border.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin similarity index 100% rename from data/maps/LinkContestRoom3/border.bin rename to 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 similarity index 100% rename from data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin rename to data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin diff --git a/data/maps/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom1/border.bin similarity index 100% rename from data/maps/LinkContestRoom4/border.bin rename to 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 similarity index 100% rename from data/maps/LinkContestRoom1/map.bin rename to data/layouts/LinkContestRoom1/map.bin diff --git a/data/maps/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom2/border.bin similarity index 100% rename from data/maps/LinkContestRoom5/border.bin rename to 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 similarity index 100% rename from data/maps/LinkContestRoom2/map.bin rename to data/layouts/LinkContestRoom2/map.bin diff --git a/data/maps/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom3/border.bin similarity index 100% rename from data/maps/LinkContestRoom6/border.bin rename to 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 similarity index 100% rename from data/maps/LinkContestRoom3/map.bin rename to data/layouts/LinkContestRoom3/map.bin diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/layouts/LinkContestRoom4/border.bin similarity index 100% rename from data/maps/LittlerootTown_ProfessorBirchsLab/border.bin rename to 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 similarity index 100% rename from data/maps/LinkContestRoom4/map.bin rename to data/layouts/LinkContestRoom4/map.bin diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/layouts/LinkContestRoom5/border.bin similarity index 100% rename from data/maps/MagmaHideout_1F/border.bin rename to 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 similarity index 100% rename from data/maps/LinkContestRoom5/map.bin rename to data/layouts/LinkContestRoom5/map.bin diff --git a/data/maps/MagmaHideout_B1F/border.bin b/data/layouts/LinkContestRoom6/border.bin similarity index 100% rename from data/maps/MagmaHideout_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/LinkContestRoom6/map.bin rename to data/layouts/LinkContestRoom6/map.bin diff --git a/data/maps/LittlerootTown/border.bin b/data/layouts/LittlerootTown/border.bin similarity index 100% rename from data/maps/LittlerootTown/border.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown/map.bin rename to data/layouts/LittlerootTown/map.bin diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin similarity index 100% rename from data/maps/LittlerootTown_BrendansHouse_1F/border.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown_BrendansHouse_1F/map.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown_BrendansHouse_2F/border.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown_BrendansHouse_2F/map.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown_MaysHouse_1F/border.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown_MaysHouse_1F/map.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown_MaysHouse_2F/border.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown_MaysHouse_2F/map.bin rename to data/layouts/LittlerootTown_MaysHouse_2F/map.bin diff --git a/data/maps/MagmaHideout_B2F/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin similarity index 100% rename from data/maps/MagmaHideout_B2F/border.bin rename to 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 similarity index 100% rename from data/maps/LittlerootTown_ProfessorBirchsLab/map.bin rename to data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/layouts/MagmaHideout_1F/border.bin similarity index 100% rename from data/maps/MeteorFalls_1F_1R/border.bin rename to 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 similarity index 100% rename from data/maps/MagmaHideout_1F/map.bin rename to data/layouts/MagmaHideout_1F/map.bin diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/layouts/MagmaHideout_B1F/border.bin similarity index 100% rename from data/maps/MeteorFalls_1F_2R/border.bin rename to 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 similarity index 100% rename from data/maps/MagmaHideout_B1F/map.bin rename to data/layouts/MagmaHideout_B1F/map.bin diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/layouts/MagmaHideout_B2F/border.bin similarity index 100% rename from data/maps/MeteorFalls_B1F_1R/border.bin rename to 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 similarity index 100% rename from data/maps/MagmaHideout_B2F/map.bin rename to data/layouts/MagmaHideout_B2F/map.bin diff --git a/data/maps/MauvilleCity/border.bin b/data/layouts/MauvilleCity/border.bin similarity index 100% rename from data/maps/MauvilleCity/border.bin rename to 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 similarity index 100% rename from data/maps/MauvilleCity/map.bin rename to data/layouts/MauvilleCity/map.bin diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/layouts/MauvilleCity_BikeShop/border.bin similarity index 100% rename from data/maps/MauvilleCity_BikeShop/border.bin rename to 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 similarity index 100% rename from data/maps/MauvilleCity_BikeShop/map.bin rename to data/layouts/MauvilleCity_BikeShop/map.bin diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/layouts/MauvilleCity_GameCorner/border.bin similarity index 100% rename from data/maps/MauvilleCity_GameCorner/border.bin rename to 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 similarity index 100% rename from data/maps/MauvilleCity_GameCorner/map.bin rename to data/layouts/MauvilleCity_GameCorner/map.bin diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/layouts/MauvilleCity_Gym/border.bin similarity index 100% rename from data/maps/MauvilleCity_Gym/border.bin rename to 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 similarity index 100% rename from data/maps/MauvilleCity_Gym/map.bin rename to data/layouts/MauvilleCity_Gym/map.bin diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/layouts/MeteorFalls_1F_1R/border.bin similarity index 100% rename from data/maps/MeteorFalls_B1F_2R/border.bin rename to 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 similarity index 100% rename from data/maps/MeteorFalls_1F_1R/map.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_SpaceCenter_1F/border.bin rename to 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 similarity index 100% rename from data/maps/MeteorFalls_1F_2R/map.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_SpaceCenter_2F/border.bin rename to 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 similarity index 100% rename from data/maps/MeteorFalls_B1F_1R/map.bin rename to data/layouts/MeteorFalls_B1F_1R/map.bin diff --git a/data/maps/MtPyre_1F/border.bin b/data/layouts/MeteorFalls_B1F_2R/border.bin similarity index 100% rename from data/maps/MtPyre_1F/border.bin rename to 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 similarity index 100% rename from data/maps/MeteorFalls_B1F_2R/map.bin rename to data/layouts/MeteorFalls_B1F_2R/map.bin diff --git a/data/maps/MossdeepCity/border.bin b/data/layouts/MossdeepCity/border.bin similarity index 100% rename from data/maps/MossdeepCity/border.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity/map.bin rename to data/layouts/MossdeepCity/map.bin diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/layouts/MossdeepCity_GameCorner_1F/border.bin similarity index 100% rename from data/maps/MossdeepCity_GameCorner_1F/border.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_GameCorner_1F/map.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_GameCorner_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_GameCorner_B1F/map.bin rename to data/layouts/MossdeepCity_GameCorner_B1F/map.bin diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/layouts/MossdeepCity_Gym/border.bin similarity index 100% rename from data/maps/MossdeepCity_Gym/border.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_Gym/map.bin rename to data/layouts/MossdeepCity_Gym/map.bin diff --git a/data/maps/MtPyre_2F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin similarity index 100% rename from data/maps/MtPyre_2F/border.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_SpaceCenter_1F/map.bin rename to data/layouts/MossdeepCity_SpaceCenter_1F/map.bin diff --git a/data/maps/MtPyre_3F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin similarity index 100% rename from data/maps/MtPyre_3F/border.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_SpaceCenter_2F/map.bin rename to data/layouts/MossdeepCity_SpaceCenter_2F/map.bin diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/layouts/MossdeepCity_StevensHouse/border.bin similarity index 100% rename from data/maps/MossdeepCity_StevensHouse/border.bin rename to 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 similarity index 100% rename from data/maps/MossdeepCity_StevensHouse/map.bin rename to data/layouts/MossdeepCity_StevensHouse/map.bin diff --git a/data/maps/MtChimney/border.bin b/data/layouts/MtChimney/border.bin similarity index 100% rename from data/maps/MtChimney/border.bin rename to 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 similarity index 100% rename from data/maps/MtChimney/map.bin rename to data/layouts/MtChimney/map.bin diff --git a/data/maps/MtPyre_4F/border.bin b/data/layouts/MtPyre_1F/border.bin similarity index 100% rename from data/maps/MtPyre_4F/border.bin rename to 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 similarity index 100% rename from data/maps/MtPyre_1F/map.bin rename to data/layouts/MtPyre_1F/map.bin diff --git a/data/maps/MtPyre_5F/border.bin b/data/layouts/MtPyre_2F/border.bin similarity index 100% rename from data/maps/MtPyre_5F/border.bin rename to 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 similarity index 100% rename from data/maps/MtPyre_2F/map.bin rename to data/layouts/MtPyre_2F/map.bin diff --git a/data/maps/MtPyre_6F/border.bin b/data/layouts/MtPyre_3F/border.bin similarity index 100% rename from data/maps/MtPyre_6F/border.bin rename to 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 similarity index 100% rename from data/maps/MtPyre_3F/map.bin rename to data/layouts/MtPyre_3F/map.bin diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/layouts/MtPyre_4F/border.bin similarity index 100% rename from data/maps/OldaleTown_PokemonCenter_1F/border.bin rename to 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 similarity index 100% rename from data/maps/MtPyre_4F/map.bin rename to data/layouts/MtPyre_4F/map.bin diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/layouts/MtPyre_5F/border.bin similarity index 100% rename from data/maps/OldaleTown_PokemonCenter_2F/border.bin rename to 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 similarity index 100% rename from data/maps/MtPyre_5F/map.bin rename to data/layouts/MtPyre_5F/map.bin diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/layouts/MtPyre_6F/border.bin similarity index 100% rename from data/maps/PacifidlogTown_House1/border.bin rename to 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 similarity index 100% rename from data/maps/MtPyre_6F/map.bin rename to data/layouts/MtPyre_6F/map.bin diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/layouts/MtPyre_Exterior/border.bin similarity index 100% rename from data/maps/MtPyre_Exterior/border.bin rename to 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 similarity index 100% rename from data/maps/MtPyre_Exterior/map.bin rename to data/layouts/MtPyre_Exterior/map.bin diff --git a/data/maps/MtPyre_Summit/border.bin b/data/layouts/MtPyre_Summit/border.bin similarity index 100% rename from data/maps/MtPyre_Summit/border.bin rename to 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 similarity index 100% rename from data/maps/MtPyre_Summit/map.bin rename to data/layouts/MtPyre_Summit/map.bin diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/layouts/NewMauville_Entrance/border.bin similarity index 100% rename from data/maps/NewMauville_Entrance/border.bin rename to 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 similarity index 100% rename from data/maps/NewMauville_Entrance/map.bin rename to data/layouts/NewMauville_Entrance/map.bin diff --git a/data/maps/NewMauville_Inside/border.bin b/data/layouts/NewMauville_Inside/border.bin similarity index 100% rename from data/maps/NewMauville_Inside/border.bin rename to 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 similarity index 100% rename from data/maps/NewMauville_Inside/map.bin rename to data/layouts/NewMauville_Inside/map.bin diff --git a/data/maps/OldaleTown/border.bin b/data/layouts/OldaleTown/border.bin similarity index 100% rename from data/maps/OldaleTown/border.bin rename to 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 similarity index 100% rename from data/maps/OldaleTown/map.bin rename to data/layouts/OldaleTown/map.bin diff --git a/data/maps/PacifidlogTown/border.bin b/data/layouts/PacifidlogTown/border.bin similarity index 100% rename from data/maps/PacifidlogTown/border.bin rename to 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 similarity index 100% rename from data/maps/PacifidlogTown/map.bin rename to data/layouts/PacifidlogTown/map.bin diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House1/border.bin similarity index 100% rename from data/maps/PacifidlogTown_House2/border.bin rename to 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 similarity index 100% rename from data/maps/PacifidlogTown_House1/map.bin rename to data/layouts/PacifidlogTown_House1/map.bin diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin similarity index 100% rename from data/maps/PetalburgCity_House2/border.bin rename to 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 similarity index 100% rename from data/maps/PacifidlogTown_House2/map.bin rename to data/layouts/PacifidlogTown_House2/map.bin diff --git a/data/maps/PetalburgCity/border.bin b/data/layouts/PetalburgCity/border.bin similarity index 100% rename from data/maps/PetalburgCity/border.bin rename to 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 similarity index 100% rename from data/maps/PetalburgCity/map.bin rename to data/layouts/PetalburgCity/map.bin diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/layouts/PetalburgCity_Gym/border.bin similarity index 100% rename from data/maps/PetalburgCity_Gym/border.bin rename to 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 similarity index 100% rename from data/maps/PetalburgCity_Gym/map.bin rename to data/layouts/PetalburgCity_Gym/map.bin diff --git a/data/maps/PetalburgWoods/border.bin b/data/layouts/PetalburgWoods/border.bin similarity index 100% rename from data/maps/PetalburgWoods/border.bin rename to 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 similarity index 100% rename from data/maps/PetalburgWoods/map.bin rename to data/layouts/PetalburgWoods/map.bin diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/layouts/PokeMart/border.bin similarity index 100% rename from data/maps/OldaleTown_Mart/border.bin rename to 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 similarity index 100% rename from data/maps/OldaleTown_Mart/map.bin rename to data/layouts/PokeMart/map.bin diff --git a/data/maps/RecordCorner/border.bin b/data/layouts/PokemonCenter_1F/border.bin similarity index 100% rename from data/maps/RecordCorner/border.bin rename to 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 similarity index 100% rename from data/maps/OldaleTown_PokemonCenter_1F/map.bin rename to data/layouts/PokemonCenter_1F/map.bin diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/layouts/PokemonCenter_2F/border.bin similarity index 100% rename from data/maps/Route104_MrBrineysHouse/border.bin rename to 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 similarity index 100% rename from data/maps/OldaleTown_PokemonCenter_2F/map.bin rename to data/layouts/PokemonCenter_2F/map.bin diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/layouts/RecordCorner/border.bin similarity index 100% rename from data/maps/Route110_TrickHouseCorridor/border.bin rename to 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 similarity index 100% rename from data/maps/RecordCorner/map.bin rename to data/layouts/RecordCorner/map.bin diff --git a/data/maps/Route101/border.bin b/data/layouts/Route101/border.bin similarity index 100% rename from data/maps/Route101/border.bin rename to 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 similarity index 100% rename from data/maps/Route101/map.bin rename to data/layouts/Route101/map.bin diff --git a/data/maps/Route102/border.bin b/data/layouts/Route102/border.bin similarity index 100% rename from data/maps/Route102/border.bin rename to 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 similarity index 100% rename from data/maps/Route102/map.bin rename to data/layouts/Route102/map.bin diff --git a/data/maps/Route103/border.bin b/data/layouts/Route103/border.bin similarity index 100% rename from data/maps/Route103/border.bin rename to 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 similarity index 100% rename from data/maps/Route103/map.bin rename to data/layouts/Route103/map.bin diff --git a/data/maps/Route104/border.bin b/data/layouts/Route104/border.bin similarity index 100% rename from data/maps/Route104/border.bin rename to 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 similarity index 100% rename from data/maps/Route104/map.bin rename to data/layouts/Route104/map.bin diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/layouts/Route104_MrBrineysHouse/border.bin similarity index 100% rename from data/maps/Route110_TrickHouseEnd/border.bin rename to 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 similarity index 100% rename from data/maps/Route104_MrBrineysHouse/map.bin rename to data/layouts/Route104_MrBrineysHouse/map.bin diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin similarity index 100% rename from data/maps/Route104_PrettyPetalFlowerShop/border.bin rename to 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 similarity index 100% rename from data/maps/Route104_PrettyPetalFlowerShop/map.bin rename to data/layouts/Route104_PrettyPetalFlowerShop/map.bin diff --git a/data/maps/Route104_Prototype/border.bin b/data/layouts/Route104_Prototype/border.bin similarity index 100% rename from data/maps/Route104_Prototype/border.bin rename to 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 similarity index 100% rename from data/maps/Route104_Prototype/map.bin rename to data/layouts/Route104_Prototype/map.bin diff --git a/data/maps/Route105/border.bin b/data/layouts/Route105/border.bin similarity index 100% rename from data/maps/Route105/border.bin rename to 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 similarity index 100% rename from data/maps/Route105/map.bin rename to data/layouts/Route105/map.bin diff --git a/data/maps/Route106/border.bin b/data/layouts/Route106/border.bin similarity index 100% rename from data/maps/Route106/border.bin rename to 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 similarity index 100% rename from data/maps/Route106/map.bin rename to data/layouts/Route106/map.bin diff --git a/data/maps/Route107/border.bin b/data/layouts/Route107/border.bin similarity index 100% rename from data/maps/Route107/border.bin rename to 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 similarity index 100% rename from data/maps/Route107/map.bin rename to data/layouts/Route107/map.bin diff --git a/data/maps/Route108/border.bin b/data/layouts/Route108/border.bin similarity index 100% rename from data/maps/Route108/border.bin rename to 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 similarity index 100% rename from data/maps/Route108/map.bin rename to data/layouts/Route108/map.bin diff --git a/data/maps/Route109/border.bin b/data/layouts/Route109/border.bin similarity index 100% rename from data/maps/Route109/border.bin rename to 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 similarity index 100% rename from data/maps/Route109/map.bin rename to data/layouts/Route109/map.bin diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/layouts/Route109_SeashoreHouse/border.bin similarity index 100% rename from data/maps/Route109_SeashoreHouse/border.bin rename to 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 similarity index 100% rename from data/maps/Route109_SeashoreHouse/map.bin rename to data/layouts/Route109_SeashoreHouse/map.bin diff --git a/data/maps/Route110/border.bin b/data/layouts/Route110/border.bin similarity index 100% rename from data/maps/Route110/border.bin rename to 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 similarity index 100% rename from data/maps/Route110/map.bin rename to data/layouts/Route110/map.bin diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin similarity index 100% rename from data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin rename to data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/layouts/Route110_TrickHouseCorridor/border.bin similarity index 100% rename from data/maps/Route110_TrickHouseEntrance/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHouseCorridor/map.bin rename to data/layouts/Route110_TrickHouseCorridor/map.bin diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/layouts/Route110_TrickHouseEnd/border.bin similarity index 100% rename from data/maps/Route112_CableCarStation/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHouseEnd/map.bin rename to data/layouts/Route110_TrickHouseEnd/map.bin diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/layouts/Route110_TrickHouseEntrance/border.bin similarity index 100% rename from data/maps/Route114_FossilManiacsHouse/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHouseEntrance/map.bin rename to data/layouts/Route110_TrickHouseEntrance/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/layouts/Route110_TrickHousePuzzle1/border.bin similarity index 100% rename from data/maps/Route110_TrickHousePuzzle1/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHousePuzzle1/map.bin rename to data/layouts/Route110_TrickHousePuzzle1/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/layouts/Route110_TrickHousePuzzle2/border.bin similarity index 100% rename from data/maps/Route110_TrickHousePuzzle2/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHousePuzzle2/map.bin rename to data/layouts/Route110_TrickHousePuzzle2/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/layouts/Route110_TrickHousePuzzle3/border.bin similarity index 100% rename from data/maps/Route110_TrickHousePuzzle3/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHousePuzzle3/map.bin rename to data/layouts/Route110_TrickHousePuzzle3/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/layouts/Route110_TrickHousePuzzle4/border.bin similarity index 100% rename from data/maps/Route110_TrickHousePuzzle4/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHousePuzzle4/map.bin rename to data/layouts/Route110_TrickHousePuzzle4/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/layouts/Route110_TrickHousePuzzle5/border.bin similarity index 100% rename from data/maps/Route110_TrickHousePuzzle5/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHousePuzzle5/map.bin rename to data/layouts/Route110_TrickHousePuzzle5/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/layouts/Route110_TrickHousePuzzle6/border.bin similarity index 100% rename from data/maps/Route110_TrickHousePuzzle6/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHousePuzzle6/map.bin rename to data/layouts/Route110_TrickHousePuzzle6/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/layouts/Route110_TrickHousePuzzle7/border.bin similarity index 100% rename from data/maps/Route110_TrickHousePuzzle7/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHousePuzzle7/map.bin rename to data/layouts/Route110_TrickHousePuzzle7/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/layouts/Route110_TrickHousePuzzle8/border.bin similarity index 100% rename from data/maps/Route110_TrickHousePuzzle8/border.bin rename to 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 similarity index 100% rename from data/maps/Route110_TrickHousePuzzle8/map.bin rename to data/layouts/Route110_TrickHousePuzzle8/map.bin diff --git a/data/maps/Route111/border.bin b/data/layouts/Route111/border.bin similarity index 100% rename from data/maps/Route111/border.bin rename to 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 similarity index 100% rename from data/maps/Route111/map.bin rename to data/layouts/Route111/map.bin diff --git a/data/maps/Route112/border.bin b/data/layouts/Route112/border.bin similarity index 100% rename from data/maps/Route112/border.bin rename to 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 similarity index 100% rename from data/maps/Route112/map.bin rename to data/layouts/Route112/map.bin diff --git a/data/maps/Route113/border.bin b/data/layouts/Route113/border.bin similarity index 100% rename from data/maps/Route113/border.bin rename to 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 similarity index 100% rename from data/maps/Route113/map.bin rename to data/layouts/Route113/map.bin diff --git a/data/maps/Route114/border.bin b/data/layouts/Route114/border.bin similarity index 100% rename from data/maps/Route114/border.bin rename to 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 similarity index 100% rename from data/maps/Route114/map.bin rename to data/layouts/Route114/map.bin diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/layouts/Route114_FossilManiacsHouse/border.bin similarity index 100% rename from data/maps/Route114_LanettesHouse/border.bin rename to 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 similarity index 100% rename from data/maps/Route114_FossilManiacsHouse/map.bin rename to data/layouts/Route114_FossilManiacsHouse/map.bin diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/layouts/Route114_FossilManiacsTunnel/border.bin similarity index 100% rename from data/maps/Route114_FossilManiacsTunnel/border.bin rename to 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 similarity index 100% rename from data/maps/Route114_FossilManiacsTunnel/map.bin rename to data/layouts/Route114_FossilManiacsTunnel/map.bin diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/layouts/Route114_LanettesHouse/border.bin similarity index 100% rename from data/maps/Route116_TunnelersRestHouse/border.bin rename to 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 similarity index 100% rename from data/maps/Route114_LanettesHouse/map.bin rename to data/layouts/Route114_LanettesHouse/map.bin diff --git a/data/maps/Route115/border.bin b/data/layouts/Route115/border.bin similarity index 100% rename from data/maps/Route115/border.bin rename to 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 similarity index 100% rename from data/maps/Route115/map.bin rename to data/layouts/Route115/map.bin diff --git a/data/maps/Route116/border.bin b/data/layouts/Route116/border.bin similarity index 100% rename from data/maps/Route116/border.bin rename to 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 similarity index 100% rename from data/maps/Route116/map.bin rename to data/layouts/Route116/map.bin diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/layouts/Route116_TunnelersRestHouse/border.bin similarity index 100% rename from data/maps/Route119_WeatherInstitute_1F/border.bin rename to 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 similarity index 100% rename from data/maps/Route116_TunnelersRestHouse/map.bin rename to data/layouts/Route116_TunnelersRestHouse/map.bin diff --git a/data/maps/Route117/border.bin b/data/layouts/Route117/border.bin similarity index 100% rename from data/maps/Route117/border.bin rename to 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 similarity index 100% rename from data/maps/Route117/map.bin rename to data/layouts/Route117/map.bin diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/layouts/Route117_PokemonDayCare/border.bin similarity index 100% rename from data/maps/Route117_PokemonDayCare/border.bin rename to 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 similarity index 100% rename from data/maps/Route117_PokemonDayCare/map.bin rename to data/layouts/Route117_PokemonDayCare/map.bin diff --git a/data/maps/Route118/border.bin b/data/layouts/Route118/border.bin similarity index 100% rename from data/maps/Route118/border.bin rename to 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 similarity index 100% rename from data/maps/Route118/map.bin rename to data/layouts/Route118/map.bin diff --git a/data/maps/Route119/border.bin b/data/layouts/Route119/border.bin similarity index 100% rename from data/maps/Route119/border.bin rename to 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 similarity index 100% rename from data/maps/Route119/map.bin rename to data/layouts/Route119/map.bin diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/layouts/Route119_WeatherInstitute_1F/border.bin similarity index 100% rename from data/maps/Route119_WeatherInstitute_2F/border.bin rename to 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 similarity index 100% rename from data/maps/Route119_WeatherInstitute_1F/map.bin rename to data/layouts/Route119_WeatherInstitute_1F/map.bin diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/layouts/Route119_WeatherInstitute_2F/border.bin similarity index 100% rename from data/maps/RustboroCity_CuttersHouse/border.bin rename to 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 similarity index 100% rename from data/maps/Route119_WeatherInstitute_2F/map.bin rename to data/layouts/Route119_WeatherInstitute_2F/map.bin diff --git a/data/maps/Route120/border.bin b/data/layouts/Route120/border.bin similarity index 100% rename from data/maps/Route120/border.bin rename to 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 similarity index 100% rename from data/maps/Route120/map.bin rename to data/layouts/Route120/map.bin diff --git a/data/maps/Route121/border.bin b/data/layouts/Route121/border.bin similarity index 100% rename from data/maps/Route121/border.bin rename to 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 similarity index 100% rename from data/maps/Route121/map.bin rename to data/layouts/Route121/map.bin diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/layouts/Route121_SafariZoneEntrance/border.bin similarity index 100% rename from data/maps/Route121_SafariZoneEntrance/border.bin rename to 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 similarity index 100% rename from data/maps/Route121_SafariZoneEntrance/map.bin rename to data/layouts/Route121_SafariZoneEntrance/map.bin diff --git a/data/maps/Route122/border.bin b/data/layouts/Route122/border.bin similarity index 100% rename from data/maps/Route122/border.bin rename to 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 similarity index 100% rename from data/maps/Route122/map.bin rename to data/layouts/Route122/map.bin diff --git a/data/maps/Route123/border.bin b/data/layouts/Route123/border.bin similarity index 100% rename from data/maps/Route123/border.bin rename to 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 similarity index 100% rename from data/maps/Route123/map.bin rename to data/layouts/Route123/map.bin diff --git a/data/maps/Route124/border.bin b/data/layouts/Route124/border.bin similarity index 100% rename from data/maps/Route124/border.bin rename to 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 similarity index 100% rename from data/maps/Route124/map.bin rename to data/layouts/Route124/map.bin diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin similarity index 100% rename from data/maps/Route124_DivingTreasureHuntersHouse/border.bin rename to 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 similarity index 100% rename from data/maps/Route124_DivingTreasureHuntersHouse/map.bin rename to data/layouts/Route124_DivingTreasureHuntersHouse/map.bin diff --git a/data/maps/Route125/border.bin b/data/layouts/Route125/border.bin similarity index 100% rename from data/maps/Route125/border.bin rename to 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 similarity index 100% rename from data/maps/Route125/map.bin rename to data/layouts/Route125/map.bin diff --git a/data/maps/Route126/border.bin b/data/layouts/Route126/border.bin similarity index 100% rename from data/maps/Route126/border.bin rename to 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 similarity index 100% rename from data/maps/Route126/map.bin rename to data/layouts/Route126/map.bin diff --git a/data/maps/Route127/border.bin b/data/layouts/Route127/border.bin similarity index 100% rename from data/maps/Route127/border.bin rename to 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 similarity index 100% rename from data/maps/Route127/map.bin rename to data/layouts/Route127/map.bin diff --git a/data/maps/Route128/border.bin b/data/layouts/Route128/border.bin similarity index 100% rename from data/maps/Route128/border.bin rename to 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 similarity index 100% rename from data/maps/Route128/map.bin rename to data/layouts/Route128/map.bin diff --git a/data/maps/Route129/border.bin b/data/layouts/Route129/border.bin similarity index 100% rename from data/maps/Route129/border.bin rename to 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 similarity index 100% rename from data/maps/Route129/map.bin rename to data/layouts/Route129/map.bin diff --git a/data/maps/Route130/border.bin b/data/layouts/Route130/border.bin similarity index 100% rename from data/maps/Route130/border.bin rename to 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 similarity index 100% rename from data/maps/Route130/map.bin rename to data/layouts/Route130/map.bin diff --git a/data/maps/Route131/border.bin b/data/layouts/Route131/border.bin similarity index 100% rename from data/maps/Route131/border.bin rename to 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 similarity index 100% rename from data/maps/Route131/map.bin rename to data/layouts/Route131/map.bin diff --git a/data/maps/Route132/border.bin b/data/layouts/Route132/border.bin similarity index 100% rename from data/maps/Route132/border.bin rename to 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 similarity index 100% rename from data/maps/Route132/map.bin rename to data/layouts/Route132/map.bin diff --git a/data/maps/Route133/border.bin b/data/layouts/Route133/border.bin similarity index 100% rename from data/maps/Route133/border.bin rename to 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 similarity index 100% rename from data/maps/Route133/map.bin rename to data/layouts/Route133/map.bin diff --git a/data/maps/Route134/border.bin b/data/layouts/Route134/border.bin similarity index 100% rename from data/maps/Route134/border.bin rename to 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 similarity index 100% rename from data/maps/Route134/map.bin rename to data/layouts/Route134/map.bin diff --git a/data/maps/RustboroCity/border.bin b/data/layouts/RustboroCity/border.bin similarity index 100% rename from data/maps/RustboroCity/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity/map.bin rename to data/layouts/RustboroCity/map.bin diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin similarity index 100% rename from data/maps/RustboroCity_DevonCorp_1F/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_CuttersHouse/map.bin rename to data/layouts/RustboroCity_CuttersHouse/map.bin diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/layouts/RustboroCity_DevonCorp_1F/border.bin similarity index 100% rename from data/maps/RustboroCity_DevonCorp_2F/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_DevonCorp_1F/map.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_DevonCorp_3F/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_DevonCorp_2F/map.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat1_1F/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_DevonCorp_3F/map.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat1_2F/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat1_1F/map.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat2_1F/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat1_2F/map.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat2_2F/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat2_1F/map.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat2_3F/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat2_2F/map.bin rename to data/layouts/RustboroCity_Flat2_2F/map.bin diff --git a/data/maps/RustboroCity_House1/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin similarity index 100% rename from data/maps/RustboroCity_House1/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Flat2_3F/map.bin rename to data/layouts/RustboroCity_Flat2_3F/map.bin diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/layouts/RustboroCity_Gym/border.bin similarity index 100% rename from data/maps/RustboroCity_Gym/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_Gym/map.bin rename to data/layouts/RustboroCity_Gym/map.bin diff --git a/data/maps/RustboroCity_House2/border.bin b/data/layouts/RustboroCity_House/border.bin similarity index 100% rename from data/maps/RustboroCity_House2/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_House2/map.bin rename to data/layouts/RustboroCity_House/map.bin diff --git a/data/maps/SSTidalCorridor/border.bin b/data/layouts/RustboroCity_House1/border.bin similarity index 100% rename from data/maps/SSTidalCorridor/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_House1/map.bin rename to data/layouts/RustboroCity_House1/map.bin diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/layouts/RustboroCity_PokemonSchool/border.bin similarity index 100% rename from data/maps/RustboroCity_PokemonSchool/border.bin rename to 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 similarity index 100% rename from data/maps/RustboroCity_PokemonSchool/map.bin rename to data/layouts/RustboroCity_PokemonSchool/map.bin diff --git a/data/maps/RusturfTunnel/border.bin b/data/layouts/RusturfTunnel/border.bin similarity index 100% rename from data/maps/RusturfTunnel/border.bin rename to 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 similarity index 100% rename from data/maps/RusturfTunnel/map.bin rename to data/layouts/RusturfTunnel/map.bin diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/layouts/SSTidalCorridor/border.bin similarity index 100% rename from data/maps/SSTidalLowerDeck/border.bin rename to 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 similarity index 100% rename from data/maps/SSTidalCorridor/map.bin rename to data/layouts/SSTidalCorridor/map.bin diff --git a/data/maps/SSTidalRooms/border.bin b/data/layouts/SSTidalLowerDeck/border.bin similarity index 100% rename from data/maps/SSTidalRooms/border.bin rename to 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 similarity index 100% rename from data/maps/SSTidalLowerDeck/map.bin rename to data/layouts/SSTidalLowerDeck/map.bin diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/layouts/SSTidalRooms/border.bin similarity index 100% rename from data/maps/SingleBattleColosseum/border.bin rename to 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 similarity index 100% rename from data/maps/SSTidalRooms/map.bin rename to data/layouts/SSTidalRooms/map.bin diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/layouts/SafariZone_Northeast/border.bin similarity index 100% rename from data/maps/SafariZone_Northeast/border.bin rename to 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 similarity index 100% rename from data/maps/SafariZone_Northeast/map.bin rename to data/layouts/SafariZone_Northeast/map.bin diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/layouts/SafariZone_Northwest/border.bin similarity index 100% rename from data/maps/SafariZone_Northwest/border.bin rename to 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 similarity index 100% rename from data/maps/SafariZone_Northwest/map.bin rename to data/layouts/SafariZone_Northwest/map.bin diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/layouts/SafariZone_RestHouse/border.bin similarity index 100% rename from data/maps/SafariZone_RestHouse/border.bin rename to 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 similarity index 100% rename from data/maps/SafariZone_RestHouse/map.bin rename to data/layouts/SafariZone_RestHouse/map.bin diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/layouts/SafariZone_Southeast/border.bin similarity index 100% rename from data/maps/SafariZone_Southeast/border.bin rename to 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 similarity index 100% rename from data/maps/SafariZone_Southeast/map.bin rename to data/layouts/SafariZone_Southeast/map.bin diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/layouts/SafariZone_Southwest/border.bin similarity index 100% rename from data/maps/SafariZone_Southwest/border.bin rename to 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 similarity index 100% rename from data/maps/SafariZone_Southwest/map.bin rename to data/layouts/SafariZone_Southwest/map.bin diff --git a/data/maps/ScorchedSlab/border.bin b/data/layouts/ScorchedSlab/border.bin similarity index 100% rename from data/maps/ScorchedSlab/border.bin rename to 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 similarity index 100% rename from data/maps/ScorchedSlab/map.bin rename to data/layouts/ScorchedSlab/map.bin diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/layouts/SeafloorCavern_Entrance/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Entrance/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Entrance/map.bin rename to data/layouts/SeafloorCavern_Entrance/map.bin diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/layouts/SeafloorCavern_Room1/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room1/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room1/map.bin rename to data/layouts/SeafloorCavern_Room1/map.bin diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/layouts/SeafloorCavern_Room2/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room2/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room2/map.bin rename to data/layouts/SeafloorCavern_Room2/map.bin diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/layouts/SeafloorCavern_Room3/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room3/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room3/map.bin rename to data/layouts/SeafloorCavern_Room3/map.bin diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/layouts/SeafloorCavern_Room4/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room4/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room4/map.bin rename to data/layouts/SeafloorCavern_Room4/map.bin diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/layouts/SeafloorCavern_Room5/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room5/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room5/map.bin rename to data/layouts/SeafloorCavern_Room5/map.bin diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/layouts/SeafloorCavern_Room6/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room6/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room6/map.bin rename to data/layouts/SeafloorCavern_Room6/map.bin diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/layouts/SeafloorCavern_Room7/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room7/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room7/map.bin rename to data/layouts/SeafloorCavern_Room7/map.bin diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/layouts/SeafloorCavern_Room8/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room8/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room8/map.bin rename to data/layouts/SeafloorCavern_Room8/map.bin diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/layouts/SeafloorCavern_Room9/border.bin similarity index 100% rename from data/maps/SeafloorCavern_Room9/border.bin rename to 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 similarity index 100% rename from data/maps/SeafloorCavern_Room9/map.bin rename to data/layouts/SeafloorCavern_Room9/map.bin diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/layouts/SealedChamber_InnerRoom/border.bin similarity index 100% rename from data/maps/SealedChamber_InnerRoom/border.bin rename to 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 similarity index 100% rename from data/maps/SealedChamber_InnerRoom/map.bin rename to data/layouts/SealedChamber_InnerRoom/map.bin diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/layouts/SealedChamber_OuterRoom/border.bin similarity index 100% rename from data/maps/SealedChamber_OuterRoom/border.bin rename to 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 similarity index 100% rename from data/maps/SealedChamber_OuterRoom/map.bin rename to data/layouts/SealedChamber_OuterRoom/map.bin diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/layouts/SecretBase_BlueCave1/border.bin similarity index 100% rename from data/maps/SecretBase_BlueCave1/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_BlueCave1/map.bin rename to data/layouts/SecretBase_BlueCave1/map.bin diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/layouts/SecretBase_BlueCave2/border.bin similarity index 100% rename from data/maps/SecretBase_BlueCave2/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_BlueCave2/map.bin rename to data/layouts/SecretBase_BlueCave2/map.bin diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/layouts/SecretBase_BlueCave3/border.bin similarity index 100% rename from data/maps/SecretBase_BlueCave3/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_BlueCave3/map.bin rename to data/layouts/SecretBase_BlueCave3/map.bin diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/layouts/SecretBase_BlueCave4/border.bin similarity index 100% rename from data/maps/SecretBase_BlueCave4/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_BlueCave4/map.bin rename to data/layouts/SecretBase_BlueCave4/map.bin diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/layouts/SecretBase_BrownCave1/border.bin similarity index 100% rename from data/maps/SecretBase_BrownCave1/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_BrownCave1/map.bin rename to data/layouts/SecretBase_BrownCave1/map.bin diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/layouts/SecretBase_BrownCave2/border.bin similarity index 100% rename from data/maps/SecretBase_BrownCave2/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_BrownCave2/map.bin rename to data/layouts/SecretBase_BrownCave2/map.bin diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/layouts/SecretBase_BrownCave3/border.bin similarity index 100% rename from data/maps/SecretBase_BrownCave3/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_BrownCave3/map.bin rename to data/layouts/SecretBase_BrownCave3/map.bin diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/layouts/SecretBase_BrownCave4/border.bin similarity index 100% rename from data/maps/SecretBase_BrownCave4/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_BrownCave4/map.bin rename to data/layouts/SecretBase_BrownCave4/map.bin diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/layouts/SecretBase_RedCave1/border.bin similarity index 100% rename from data/maps/SecretBase_RedCave1/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_RedCave1/map.bin rename to data/layouts/SecretBase_RedCave1/map.bin diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/layouts/SecretBase_RedCave2/border.bin similarity index 100% rename from data/maps/SecretBase_RedCave2/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_RedCave2/map.bin rename to data/layouts/SecretBase_RedCave2/map.bin diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/layouts/SecretBase_RedCave3/border.bin similarity index 100% rename from data/maps/SecretBase_RedCave3/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_RedCave3/map.bin rename to data/layouts/SecretBase_RedCave3/map.bin diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/layouts/SecretBase_RedCave4/border.bin similarity index 100% rename from data/maps/SecretBase_RedCave4/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_RedCave4/map.bin rename to data/layouts/SecretBase_RedCave4/map.bin diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/layouts/SecretBase_Shrub1/border.bin similarity index 100% rename from data/maps/SecretBase_Shrub1/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_Shrub1/map.bin rename to data/layouts/SecretBase_Shrub1/map.bin diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/layouts/SecretBase_Shrub2/border.bin similarity index 100% rename from data/maps/SecretBase_Shrub2/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_Shrub2/map.bin rename to data/layouts/SecretBase_Shrub2/map.bin diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/layouts/SecretBase_Shrub3/border.bin similarity index 100% rename from data/maps/SecretBase_Shrub3/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_Shrub3/map.bin rename to data/layouts/SecretBase_Shrub3/map.bin diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/layouts/SecretBase_Shrub4/border.bin similarity index 100% rename from data/maps/SecretBase_Shrub4/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_Shrub4/map.bin rename to data/layouts/SecretBase_Shrub4/map.bin diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/layouts/SecretBase_Tree1/border.bin similarity index 100% rename from data/maps/SecretBase_Tree1/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_Tree1/map.bin rename to data/layouts/SecretBase_Tree1/map.bin diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/layouts/SecretBase_Tree2/border.bin similarity index 100% rename from data/maps/SecretBase_Tree2/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_Tree2/map.bin rename to data/layouts/SecretBase_Tree2/map.bin diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin similarity index 100% rename from data/maps/SecretBase_Tree3/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_Tree3/map.bin rename to data/layouts/SecretBase_Tree3/map.bin diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin similarity index 100% rename from data/maps/SecretBase_Tree4/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_Tree4/map.bin rename to data/layouts/SecretBase_Tree4/map.bin diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/layouts/SecretBase_YellowCave1/border.bin similarity index 100% rename from data/maps/SecretBase_YellowCave1/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_YellowCave1/map.bin rename to data/layouts/SecretBase_YellowCave1/map.bin diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/layouts/SecretBase_YellowCave2/border.bin similarity index 100% rename from data/maps/SecretBase_YellowCave2/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_YellowCave2/map.bin rename to data/layouts/SecretBase_YellowCave2/map.bin diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/layouts/SecretBase_YellowCave3/border.bin similarity index 100% rename from data/maps/SecretBase_YellowCave3/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_YellowCave3/map.bin rename to data/layouts/SecretBase_YellowCave3/map.bin diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/layouts/SecretBase_YellowCave4/border.bin similarity index 100% rename from data/maps/SecretBase_YellowCave4/border.bin rename to 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 similarity index 100% rename from data/maps/SecretBase_YellowCave4/map.bin rename to data/layouts/SecretBase_YellowCave4/map.bin diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin similarity index 100% rename from data/maps/ShoalCave_HighTideEntranceRoom/border.bin rename to 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 similarity index 100% rename from data/maps/ShoalCave_HighTideEntranceRoom/map.bin rename to data/layouts/ShoalCave_HighTideEntranceRoom/map.bin diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin similarity index 100% rename from data/maps/ShoalCave_HighTideInnerRoom/border.bin rename to 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 similarity index 100% rename from data/maps/ShoalCave_HighTideInnerRoom/map.bin rename to data/layouts/ShoalCave_HighTideInnerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin similarity index 100% rename from data/maps/ShoalCave_LowTideEntranceRoom/border.bin rename to 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 similarity index 100% rename from data/maps/ShoalCave_LowTideEntranceRoom/map.bin rename to data/layouts/ShoalCave_LowTideEntranceRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideIceRoom/border.bin b/data/layouts/ShoalCave_LowTideIceRoom/border.bin similarity index 100% rename from data/maps/ShoalCave_LowTideIceRoom/border.bin rename to 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 similarity index 100% rename from data/maps/ShoalCave_LowTideIceRoom/map.bin rename to data/layouts/ShoalCave_LowTideIceRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin similarity index 100% rename from data/maps/ShoalCave_LowTideInnerRoom/border.bin rename to 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 similarity index 100% rename from data/maps/ShoalCave_LowTideInnerRoom/map.bin rename to data/layouts/ShoalCave_LowTideInnerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin similarity index 100% rename from data/maps/ShoalCave_LowTideLowerRoom/border.bin rename to 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 similarity index 100% rename from data/maps/ShoalCave_LowTideLowerRoom/map.bin rename to data/layouts/ShoalCave_LowTideLowerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin similarity index 100% rename from data/maps/ShoalCave_LowTideStairsRoom/border.bin rename to 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 similarity index 100% rename from data/maps/ShoalCave_LowTideStairsRoom/map.bin rename to data/layouts/ShoalCave_LowTideStairsRoom/map.bin diff --git a/data/maps/SkyPillar_1F/border.bin b/data/layouts/SingleBattleColosseum/border.bin similarity index 100% rename from data/maps/SkyPillar_1F/border.bin rename to 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 similarity index 100% rename from data/maps/SingleBattleColosseum/map.bin rename to data/layouts/SingleBattleColosseum/map.bin diff --git a/data/maps/SkyPillar_2F/border.bin b/data/layouts/SkyPillar_1F/border.bin similarity index 100% rename from data/maps/SkyPillar_2F/border.bin rename to 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 similarity index 100% rename from data/maps/SkyPillar_1F/map.bin rename to data/layouts/SkyPillar_1F/map.bin diff --git a/data/maps/SkyPillar_3F/border.bin b/data/layouts/SkyPillar_2F/border.bin similarity index 100% rename from data/maps/SkyPillar_3F/border.bin rename to 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 similarity index 100% rename from data/maps/SkyPillar_2F/map.bin rename to data/layouts/SkyPillar_2F/map.bin diff --git a/data/maps/SkyPillar_4F/border.bin b/data/layouts/SkyPillar_3F/border.bin similarity index 100% rename from data/maps/SkyPillar_4F/border.bin rename to 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 similarity index 100% rename from data/maps/SkyPillar_3F/map.bin rename to data/layouts/SkyPillar_3F/map.bin diff --git a/data/maps/SkyPillar_5F/border.bin b/data/layouts/SkyPillar_4F/border.bin similarity index 100% rename from data/maps/SkyPillar_5F/border.bin rename to 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 similarity index 100% rename from data/maps/SkyPillar_4F/map.bin rename to data/layouts/SkyPillar_4F/map.bin diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/layouts/SkyPillar_5F/border.bin similarity index 100% rename from data/maps/SlateportCity_Harbor/border.bin rename to 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 similarity index 100% rename from data/maps/SkyPillar_5F/map.bin rename to data/layouts/SkyPillar_5F/map.bin diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/layouts/SkyPillar_Entrance/border.bin similarity index 100% rename from data/maps/SkyPillar_Entrance/border.bin rename to 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 similarity index 100% rename from data/maps/SkyPillar_Entrance/map.bin rename to data/layouts/SkyPillar_Entrance/map.bin diff --git a/data/maps/SkyPillar_Outside/border.bin b/data/layouts/SkyPillar_Outside/border.bin similarity index 100% rename from data/maps/SkyPillar_Outside/border.bin rename to 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 similarity index 100% rename from data/maps/SkyPillar_Outside/map.bin rename to data/layouts/SkyPillar_Outside/map.bin diff --git a/data/maps/SkyPillar_Top/border.bin b/data/layouts/SkyPillar_Top/border.bin similarity index 100% rename from data/maps/SkyPillar_Top/border.bin rename to 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 similarity index 100% rename from data/maps/SkyPillar_Top/map.bin rename to data/layouts/SkyPillar_Top/map.bin diff --git a/data/maps/SlateportCity/border.bin b/data/layouts/SlateportCity/border.bin similarity index 100% rename from data/maps/SlateportCity/border.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity/map.bin rename to data/layouts/SlateportCity/map.bin diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin similarity index 100% rename from data/maps/SlateportCity_OceanicMuseum_1F/border.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity_OceanicMuseum_1F/map.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity_OceanicMuseum_2F/border.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity_OceanicMuseum_2F/map.bin rename to data/layouts/SlateportCity_OceanicMuseum_2F/map.bin diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/layouts/SlateportCity_PokemonFanClub/border.bin similarity index 100% rename from data/maps/SlateportCity_PokemonFanClub/border.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity_PokemonFanClub/map.bin rename to data/layouts/SlateportCity_PokemonFanClub/map.bin diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin similarity index 100% rename from data/maps/SlateportCity_SternsShipyard_1F/border.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity_SternsShipyard_1F/map.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity_SternsShipyard_2F/border.bin rename to 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 similarity index 100% rename from data/maps/SlateportCity_SternsShipyard_2F/map.bin rename to data/layouts/SlateportCity_SternsShipyard_2F/map.bin diff --git a/data/maps/SootopolisCity/border.bin b/data/layouts/SootopolisCity/border.bin similarity index 100% rename from data/maps/SootopolisCity/border.bin rename to 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 similarity index 100% rename from data/maps/SootopolisCity/map.bin rename to data/layouts/SootopolisCity/map.bin diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/layouts/SootopolisCity_Gym_1F/border.bin similarity index 100% rename from data/maps/SootopolisCity_Gym_1F/border.bin rename to 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 similarity index 100% rename from data/maps/SootopolisCity_Gym_1F/map.bin rename to 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 similarity index 100% rename from data/maps/SootopolisCity_Gym_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/SootopolisCity_Gym_B1F/map.bin rename to data/layouts/SootopolisCity_Gym_B1F/map.bin diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin similarity index 100% rename from data/maps/SootopolisCity_House1/border.bin rename to 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 similarity index 100% rename from data/maps/SootopolisCity_House1/map.bin rename to data/layouts/SootopolisCity_House1/map.bin diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin similarity index 100% rename from data/maps/SootopolisCity_House2/border.bin rename to 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 similarity index 100% rename from data/maps/SootopolisCity_House2/map.bin rename to data/layouts/SootopolisCity_House2/map.bin diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin similarity index 100% rename from data/maps/SootopolisCity_House3/border.bin rename to 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 similarity index 100% rename from data/maps/SootopolisCity_House3/map.bin rename to data/layouts/SootopolisCity_House3/map.bin diff --git a/data/maps/SootopolisCity_House8/border.bin b/data/layouts/SootopolisCity_House8/border.bin similarity index 100% rename from data/maps/SootopolisCity_House8/border.bin rename to 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 similarity index 100% rename from data/maps/SootopolisCity_House8/map.bin rename to data/layouts/SootopolisCity_House8/map.bin diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/layouts/SouthernIsland_Exterior/border.bin similarity index 100% rename from data/maps/SouthernIsland_Exterior/border.bin rename to 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 similarity index 100% rename from data/maps/SouthernIsland_Exterior/map.bin rename to data/layouts/SouthernIsland_Exterior/map.bin diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/layouts/SouthernIsland_Interior/border.bin similarity index 100% rename from data/maps/SouthernIsland_Interior/border.bin rename to 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 similarity index 100% rename from data/maps/SouthernIsland_Interior/map.bin rename to data/layouts/SouthernIsland_Interior/map.bin diff --git a/data/maps/TradeCenter/border.bin b/data/layouts/TradeCenter/border.bin similarity index 100% rename from data/maps/TradeCenter/border.bin rename to 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 similarity index 100% rename from data/maps/TradeCenter/map.bin rename to data/layouts/TradeCenter/map.bin diff --git a/data/maps/Underwater1/border.bin b/data/layouts/Underwater1/border.bin similarity index 100% rename from data/maps/Underwater1/border.bin rename to 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 similarity index 100% rename from data/maps/Underwater1/map.bin rename to data/layouts/Underwater1/map.bin diff --git a/data/maps/Underwater2/border.bin b/data/layouts/Underwater2/border.bin similarity index 100% rename from data/maps/Underwater2/border.bin rename to 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 similarity index 100% rename from data/maps/Underwater2/map.bin rename to data/layouts/Underwater2/map.bin diff --git a/data/maps/Underwater3/border.bin b/data/layouts/Underwater3/border.bin similarity index 100% rename from data/maps/Underwater3/border.bin rename to 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 similarity index 100% rename from data/maps/Underwater3/map.bin rename to data/layouts/Underwater3/map.bin diff --git a/data/maps/Underwater4/border.bin b/data/layouts/Underwater4/border.bin similarity index 100% rename from data/maps/Underwater4/border.bin rename to 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 similarity index 100% rename from data/maps/Underwater4/map.bin rename to data/layouts/Underwater4/map.bin diff --git a/data/maps/Underwater_Route134/border.bin b/data/layouts/Underwater_Route134/border.bin similarity index 100% rename from data/maps/Underwater_Route134/border.bin rename to 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 similarity index 100% rename from data/maps/Underwater_Route134/map.bin rename to data/layouts/Underwater_Route134/map.bin diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/layouts/Underwater_SeafloorCavern/border.bin similarity index 100% rename from data/maps/Underwater_SeafloorCavern/border.bin rename to 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 similarity index 100% rename from data/maps/Underwater_SeafloorCavern/map.bin rename to data/layouts/Underwater_SeafloorCavern/map.bin diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/layouts/Underwater_SealedChamber/border.bin similarity index 100% rename from data/maps/Underwater_SealedChamber/border.bin rename to 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 similarity index 100% rename from data/maps/Underwater_SealedChamber/map.bin rename to data/layouts/Underwater_SealedChamber/map.bin diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/layouts/Underwater_SootopolisCity/border.bin similarity index 100% rename from data/maps/Underwater_SootopolisCity/border.bin rename to 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 similarity index 100% rename from data/maps/Underwater_SootopolisCity/map.bin rename to data/layouts/Underwater_SootopolisCity/map.bin diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/layouts/UnknownMap_082CF564/border.bin similarity index 100% rename from data/maps/UnknownMap_082CF564/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082CF564/map.bin rename to data/layouts/UnknownMap_082CF564/map.bin diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/layouts/UnknownMap_082D05D8/border.bin similarity index 100% rename from data/maps/UnknownMap_082D05D8/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082D05D8/map.bin rename to data/layouts/UnknownMap_082D05D8/map.bin diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/layouts/UnknownMap_082D05FC/border.bin similarity index 100% rename from data/maps/UnknownMap_082D05FC/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082D05FC/map.bin rename to data/layouts/UnknownMap_082D05FC/map.bin diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/layouts/UnknownMap_082E55C8/border.bin similarity index 100% rename from data/maps/UnknownMap_082E55C8/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E55C8/map.bin rename to data/layouts/UnknownMap_082E55C8/map.bin diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/layouts/UnknownMap_082E55EC/border.bin similarity index 100% rename from data/maps/UnknownMap_082E55EC/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E55EC/map.bin rename to data/layouts/UnknownMap_082E55EC/map.bin diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/layouts/UnknownMap_082E5610/border.bin similarity index 100% rename from data/maps/UnknownMap_082E5610/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E5610/map.bin rename to data/layouts/UnknownMap_082E5610/map.bin diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/layouts/UnknownMap_082E5634/border.bin similarity index 100% rename from data/maps/UnknownMap_082E5634/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E5634/map.bin rename to data/layouts/UnknownMap_082E5634/map.bin diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/layouts/UnknownMap_082E5658/border.bin similarity index 100% rename from data/maps/UnknownMap_082E5658/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E5658/map.bin rename to data/layouts/UnknownMap_082E5658/map.bin diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/layouts/UnknownMap_082E567C/border.bin similarity index 100% rename from data/maps/UnknownMap_082E567C/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E567C/map.bin rename to data/layouts/UnknownMap_082E567C/map.bin diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/layouts/UnknownMap_082E56A0/border.bin similarity index 100% rename from data/maps/UnknownMap_082E56A0/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E56A0/map.bin rename to data/layouts/UnknownMap_082E56A0/map.bin diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/layouts/UnknownMap_082E56C4/border.bin similarity index 100% rename from data/maps/UnknownMap_082E56C4/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E56C4/map.bin rename to data/layouts/UnknownMap_082E56C4/map.bin diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/layouts/UnknownMap_082E56E8/border.bin similarity index 100% rename from data/maps/UnknownMap_082E56E8/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E56E8/map.bin rename to data/layouts/UnknownMap_082E56E8/map.bin diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/layouts/UnknownMap_082E570C/border.bin similarity index 100% rename from data/maps/UnknownMap_082E570C/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E570C/map.bin rename to data/layouts/UnknownMap_082E570C/map.bin diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/layouts/UnknownMap_082E5730/border.bin similarity index 100% rename from data/maps/UnknownMap_082E5730/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E5730/map.bin rename to data/layouts/UnknownMap_082E5730/map.bin diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/layouts/UnknownMap_082E5754/border.bin similarity index 100% rename from data/maps/UnknownMap_082E5754/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E5754/map.bin rename to data/layouts/UnknownMap_082E5754/map.bin diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/layouts/UnknownMap_082E5778/border.bin similarity index 100% rename from data/maps/UnknownMap_082E5778/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E5778/map.bin rename to data/layouts/UnknownMap_082E5778/map.bin diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/layouts/UnknownMap_082E579C/border.bin similarity index 100% rename from data/maps/UnknownMap_082E579C/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082E579C/map.bin rename to data/layouts/UnknownMap_082E579C/map.bin diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/layouts/UnknownMap_082EDF30/border.bin similarity index 100% rename from data/maps/UnknownMap_082EDF30/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082EDF30/map.bin rename to data/layouts/UnknownMap_082EDF30/map.bin diff --git a/data/maps/UnknownMap_082FF894/border.bin b/data/layouts/UnknownMap_082FF894/border.bin similarity index 100% rename from data/maps/UnknownMap_082FF894/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_082FF894/map.bin rename to data/layouts/UnknownMap_082FF894/map.bin diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/layouts/UnknownMap_08302970/border.bin similarity index 100% rename from data/maps/UnknownMap_08302970/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_08302970/map.bin rename to data/layouts/UnknownMap_08302970/map.bin diff --git a/data/maps/UnknownMap_083041B4/border.bin b/data/layouts/UnknownMap_083041B4/border.bin similarity index 100% rename from data/maps/UnknownMap_083041B4/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_083041B4/map.bin rename to data/layouts/UnknownMap_083041B4/map.bin diff --git a/data/maps/UnknownMap_25_29/border.bin b/data/layouts/UnknownMap_25_29/border.bin similarity index 100% rename from data/maps/UnknownMap_25_29/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_29/map.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_30/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_30/map.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_31/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_31/map.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_32/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_32/map.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_33/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_33/map.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_34/border.bin rename to 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 similarity index 100% rename from data/maps/UnknownMap_25_34/map.bin rename to data/layouts/UnknownMap_25_34/map.bin diff --git a/data/maps/UnreferencedMap/border.bin b/data/layouts/UnreferencedMap/border.bin similarity index 100% rename from data/maps/UnreferencedMap/border.bin rename to 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 similarity index 100% rename from data/maps/UnreferencedMap/map.bin rename to data/layouts/UnreferencedMap/map.bin diff --git a/data/maps/VerdanturfTown/border.bin b/data/layouts/VerdanturfTown/border.bin similarity index 100% rename from data/maps/VerdanturfTown/border.bin rename to 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 similarity index 100% rename from data/maps/VerdanturfTown/map.bin rename to data/layouts/VerdanturfTown/map.bin diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/layouts/VerdanturfTown_WandasHouse/border.bin similarity index 100% rename from data/maps/VerdanturfTown_WandasHouse/border.bin rename to 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 similarity index 100% rename from data/maps/VerdanturfTown_WandasHouse/map.bin rename to data/layouts/VerdanturfTown_WandasHouse/map.bin diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin similarity index 100% rename from data/maps/VictoryRoad_1F/border.bin rename to 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 similarity index 100% rename from data/maps/VictoryRoad_1F/map.bin rename to data/layouts/VictoryRoad_1F/map.bin diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/layouts/VictoryRoad_B1F/border.bin similarity index 100% rename from data/maps/VictoryRoad_B1F/border.bin rename to 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 similarity index 100% rename from data/maps/VictoryRoad_B1F/map.bin rename to data/layouts/VictoryRoad_B1F/map.bin diff --git a/data/maps/VictoryRoad_B2F/border.bin b/data/layouts/VictoryRoad_B2F/border.bin similarity index 100% rename from data/maps/VictoryRoad_B2F/border.bin rename to 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 similarity index 100% rename from data/maps/VictoryRoad_B2F/map.bin rename to data/layouts/VictoryRoad_B2F/map.bin diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index e5e3adc3a..74571dc08 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -1,5 +1,5 @@ AbandonedShip_CaptainsOffice:: @ 8307454 - .4byte AbandonedShip_CaptainsOffice_MapAttributes + .4byte AbandonedShip_CaptainsOffice_Layout .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index e2bd23252..4caf26a22 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 064e24e92..c979d2d79 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 1db367db8..5002c48eb 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck:: @ 8307358 - .4byte AbandonedShip_Deck_MapAttributes + .4byte AbandonedShip_Deck_Layout .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index a841ee87c..8d862d16e 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C - .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes + .4byte AbandonedShip_HiddenFloorCorridors_Layout .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 647b22977..9699a3abd 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 - .4byte AbandonedShip_HiddenFloorRooms_MapAttributes + .4byte AbandonedShip_HiddenFloorRooms_Layout .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 7b88baf94..adc37862b 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 44bcd4733..15a2f66da 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 017b1382b..daaca3671 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 7e8dbd5b8..2c017f053 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 6ac6e3794..82f026ba7 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index 6313cf6f1..adbf39015 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1:: @ 8307400 - .4byte AbandonedShip_Underwater1_MapAttributes + .4byte AbandonedShip_Underwater1_Layout .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index c81b78357..66036ff55 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2:: @ 8307470 - .4byte AbandonedShip_Underwater2_MapAttributes + .4byte AbandonedShip_Underwater2_Layout .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 82ac0555d..04ec0679a 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -1,5 +1,5 @@ AncientTomb:: @ 83074E0 - .4byte AncientTomb_MapAttributes + .4byte AncientTomb_Layout .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 94650821d..819590c69 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -1,5 +1,5 @@ AquaHideout_1F:: @ 8306FF4 - .4byte AquaHideout_1F_MapAttributes + .4byte AquaHideout_1F_Layout .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index ef7f4cfdf..e67dba2e5 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -1,5 +1,5 @@ AquaHideout_B1F:: @ 8307010 - .4byte AquaHideout_B1F_MapAttributes + .4byte AquaHideout_B1F_Layout .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 38b3f546f..dc10f234e 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -1,5 +1,5 @@ AquaHideout_B2F:: @ 830702C - .4byte AquaHideout_B2F_MapAttributes + .4byte AquaHideout_B2F_Layout .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 3104824ed..92dee0182 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -1,5 +1,5 @@ BattleTower_BattleRoom:: @ 8307C88 - .4byte BattleTower_BattleRoom_MapAttributes + .4byte BattleTower_BattleRoom_Layout .4byte BattleTower_BattleRoom_MapEvents .4byte BattleTower_BattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index 016e178ac..311ae6862 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -1,5 +1,5 @@ BattleTower_Corridor:: @ 8307C6C - .4byte BattleTower_Corridor_MapAttributes + .4byte BattleTower_Corridor_Layout .4byte BattleTower_Corridor_MapEvents .4byte BattleTower_Corridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index 0a7285261..324b3ecc1 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -1,5 +1,5 @@ BattleTower_Elevator:: @ 8307C50 - .4byte BattleTower_Elevator_MapAttributes + .4byte BattleTower_Elevator_Layout .4byte BattleTower_Elevator_MapEvents .4byte BattleTower_Elevator_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index c8c0b0473..b8d527444 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -1,5 +1,5 @@ BattleTower_Lobby:: @ 8307C34 - .4byte BattleTower_Lobby_MapAttributes + .4byte BattleTower_Lobby_Layout .4byte BattleTower_Lobby_MapEvents .4byte BattleTower_Lobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 01bbc2fd9..a80d3e318 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -1,5 +1,5 @@ BattleTower_Outside:: @ 8307C18 - .4byte BattleTower_Outside_MapAttributes + .4byte BattleTower_Outside_Layout .4byte BattleTower_Outside_MapEvents .4byte BattleTower_Outside_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index b49287535..18901b68b 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F:: @ 8307198 - .4byte CaveOfOrigin_1F_MapAttributes + .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 97e5e68c8..f1e768089 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F:: @ 83071B4 - .4byte CaveOfOrigin_B1F_MapAttributes + .4byte CaveOfOrigin_B1F_Layout .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index 79e76f693..b20d4a577 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B2F:: @ 83071D0 - .4byte CaveOfOrigin_B2F_MapAttributes + .4byte CaveOfOrigin_B2F_Layout .4byte CaveOfOrigin_B2F_MapEvents .4byte CaveOfOrigin_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index 746d187f3..a7e6b8a19 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B3F:: @ 83071EC - .4byte CaveOfOrigin_B3F_MapAttributes + .4byte CaveOfOrigin_B3F_Layout .4byte CaveOfOrigin_B3F_MapEvents .4byte CaveOfOrigin_B3F_MapScripts .4byte 0x0 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/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 606997174..f36fac472 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_Entrance:: @ 830717C - .4byte CaveOfOrigin_Entrance_MapAttributes + .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 79e681666..cd6552519 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -1,5 +1,5 @@ DesertRuins:: @ 8306E18 - .4byte DesertRuins_MapAttributes + .4byte DesertRuins_Layout .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7aed01d94..7bd135bad 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -1,5 +1,5 @@ DewfordTown:: @ 830557C - .4byte DewfordTown_MapAttributes + .4byte DewfordTown_Layout .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 79227e545..72c8a4c04 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -1,5 +1,5 @@ DewfordTown_Gym:: @ 8305B9C - .4byte DewfordTown_Gym_MapAttributes + .4byte DewfordTown_Gym_Layout .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 975a257d8..c7fa7c009 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -1,5 +1,5 @@ DewfordTown_Hall:: @ 8305BB8 - .4byte DewfordTown_Hall_MapAttributes + .4byte DewfordTown_Hall_Layout .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 95a8a8339..71e25e8b9 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -1,5 +1,5 @@ DewfordTown_House1:: @ 8305B48 - .4byte DewfordTown_House1_MapAttributes + .4byte House3_Layout .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 37aac2ead..6ffc05176 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -1,5 +1,5 @@ DewfordTown_House2:: @ 8305BD4 - .4byte DewfordTown_House2_MapAttributes + .4byte House4_Layout .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 9cf0a8f46..b95db3ab0 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index a54a51c94..44fa18f08 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index baf1b8076..86ce13b14 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -1,5 +1,5 @@ DoubleBattleColosseum:: @ 83079CC - .4byte DoubleBattleColosseum_MapAttributes + .4byte DoubleBattleColosseum_Layout .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 0c1f6eab0..4d25d6198 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -1,5 +1,5 @@ EverGrandeCity:: @ 8305528 - .4byte EverGrandeCity_MapAttributes + .4byte EverGrandeCity_Layout .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 154d5ba29..d1f9e4fd1 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 - .4byte EverGrandeCity_ChampionsRoom_MapAttributes + .4byte EverGrandeCity_ChampionsRoom_Layout .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index 68d16484e..0843d41af 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor1:: @ 8306B24 - .4byte EverGrandeCity_Corridor1_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor1_MapEvents .4byte EverGrandeCity_Corridor1_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 0dab21f9a..be2df3915 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor2:: @ 8306B40 - .4byte EverGrandeCity_Corridor2_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor2_MapEvents .4byte EverGrandeCity_Corridor2_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index 3d20a6a41..d3b67d33d 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor3:: @ 8306B5C - .4byte EverGrandeCity_Corridor3_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor3_MapEvents .4byte EverGrandeCity_Corridor3_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 56a5297d7..002f42171 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor4:: @ 8306B78 - .4byte EverGrandeCity_Corridor4_MapAttributes + .4byte EverGrandeCity_Corridor4_Layout .4byte EverGrandeCity_Corridor4_MapEvents .4byte EverGrandeCity_Corridor4_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index 2ca1fef86..b53de1a2e 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor5:: @ 8306B94 - .4byte EverGrandeCity_Corridor5_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor5_MapEvents .4byte EverGrandeCity_Corridor5_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 04c1d9f32..873b3655b 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC - .4byte EverGrandeCity_DrakesRoom_MapAttributes + .4byte EverGrandeCity_DrakesRoom_Layout .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index e0a48f9a6..c64a5ae24 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 - .4byte EverGrandeCity_GlaciasRoom_MapAttributes + .4byte EverGrandeCity_GlaciasRoom_Layout .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index b7816ea86..33928c164 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame:: @ 8306BCC - .4byte EverGrandeCity_HallOfFame_MapAttributes + .4byte EverGrandeCity_HallOfFame_Layout .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index f9ef5a516..83a9eec14 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 - .4byte EverGrandeCity_PhoebesRoom_MapAttributes + .4byte EverGrandeCity_PhoebesRoom_Layout .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 2b72fc661..4450309d0 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index b60e3c3df..6cbd45842 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index cf24b61dc..a78353193 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 - .4byte EverGrandeCity_PokemonLeague_MapAttributes + .4byte EverGrandeCity_PokemonLeague_Layout .4byte EverGrandeCity_PokemonLeague_MapEvents .4byte EverGrandeCity_PokemonLeague_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 7c2ee11f8..03aea95dd 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 - .4byte EverGrandeCity_SidneysRoom_MapAttributes + .4byte EverGrandeCity_SidneysRoom_Layout .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index bd719a36b..48b0414f7 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,5 +1,5 @@ FallarborTown:: @ 83055B4 - .4byte FallarborTown_MapAttributes + .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index aa540e338..9563688ba 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -1,5 +1,5 @@ FallarborTown_ContestHall:: @ 8305CEC - .4byte FallarborTown_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte FallarborTown_ContestHall_MapEvents .4byte FallarborTown_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index 2f25d3675..dc5eafeaa 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -1,5 +1,5 @@ FallarborTown_ContestLobby:: @ 8305CD0 - .4byte FallarborTown_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte FallarborTown_ContestLobby_MapEvents .4byte FallarborTown_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index da9739789..5b6ee96fe 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,5 +1,5 @@ FallarborTown_House1:: @ 8305D40 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index ff1949cf9..d5e0e3faa 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,5 +1,5 @@ FallarborTown_House2:: @ 8305D5C - .4byte House12_MapAttributes + .4byte House2_Layout .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index b60fa85c8..c13e63f04 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -1,5 +1,5 @@ FallarborTown_Mart:: @ 8305CB4 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 8ffb95e0c..36b6adbd5 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 45120890d..09f92a948 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index ccca2e656..d44eeb9ba 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,5 +1,5 @@ FieryPath:: @ 8306EF8 - .4byte FieryPath_MapAttributes + .4byte FieryPath_Layout .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 4c96de2b2..164805b62 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -1,5 +1,5 @@ FortreeCity:: @ 83054B8 - .4byte FortreeCity_MapAttributes + .4byte FortreeCity_Layout .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 5334ca92c..5bbe52710 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -1,5 +1,5 @@ FortreeCity_DecorationShop:: @ 8306504 - .4byte FortreeCity_DecorationShop_MapAttributes + .4byte FortreeCity_DecorationShop_Layout .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 378a73b52..7313a9a9d 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -1,5 +1,5 @@ FortreeCity_Gym:: @ 8306424 - .4byte FortreeCity_Gym_MapAttributes + .4byte FortreeCity_Gym_Layout .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index ad8198c43..299c3d5e6 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -1,5 +1,5 @@ FortreeCity_House1:: @ 8306408 - .4byte FortreeCity_House1_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 3c803636b..404d3560f 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -1,5 +1,5 @@ FortreeCity_House2:: @ 8306494 - .4byte FortreeCity_House2_MapAttributes + .4byte FortreeCity_House2_Layout .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 40bf85478..c1d287181 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -1,5 +1,5 @@ FortreeCity_House3:: @ 83064B0 - .4byte FortreeCity_House3_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index bed750ecb..f498ba201 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -1,5 +1,5 @@ FortreeCity_House4:: @ 83064CC - .4byte FortreeCity_House4_MapAttributes + .4byte FortreeCity_House2_Layout .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index a8bb67d65..2753198b0 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -1,5 +1,5 @@ FortreeCity_House5:: @ 83064E8 - .4byte FortreeCity_House5_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 4b8793d36..9c260e3a0 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -1,5 +1,5 @@ FortreeCity_Mart:: @ 8306478 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index fcafbe2af..4f593492e 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 0421b7880..4b24dcf7d 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_2F:: @ 830645C - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index cf22ded8a..081f54d26 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -1,5 +1,5 @@ GraniteCave_1F:: @ 8306E34 - .4byte GraniteCave_1F_MapAttributes + .4byte GraniteCave_1F_Layout .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 654803312..64c3eac04 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -1,5 +1,5 @@ GraniteCave_B1F:: @ 8306E50 - .4byte GraniteCave_B1F_MapAttributes + .4byte GraniteCave_B1F_Layout .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 4d243f3da..8c382b9bd 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -1,5 +1,5 @@ GraniteCave_B2F:: @ 8306E6C - .4byte GraniteCave_B2F_MapAttributes + .4byte GraniteCave_B2F_Layout .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index fb9b18436..fdd41a95a 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom:: @ 8306E88 - .4byte GraniteCave_StevensRoom_MapAttributes + .4byte GraniteCave_StevensRoom_Layout .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 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/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index f811fe3da..e77e85173 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -1,5 +1,5 @@ IslandCave:: @ 83074C4 - .4byte IslandCave_MapAttributes + .4byte IslandCave_Layout .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 6770756e8..153162e4b 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -1,5 +1,5 @@ JaggedPass:: @ 8306EDC - .4byte JaggedPass_MapAttributes + .4byte JaggedPass_Layout .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index e34eec863..ad901d0ff 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -1,5 +1,5 @@ LavaridgeTown:: @ 8305598 - .4byte LavaridgeTown_MapAttributes + .4byte LavaridgeTown_Layout .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 929b07ae7..81fe4aae7 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index d8a747789..7a1c7c348 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index f44118c5c..3c193937d 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_HerbShop:: @ 8305BF0 - .4byte LavaridgeTown_HerbShop_MapAttributes + .4byte LavaridgeTown_HerbShop_Layout .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index f43ea0bc4..e1e429dc3 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_House:: @ 8305C44 - .4byte LavaridgeTown_House_MapAttributes + .4byte House3_Layout .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 0882a6bf0..a4da19432 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Mart:: @ 8305C60 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 78576d740..626ae4ab9 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 3d86fa588..3ff2df867 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 204e2098d..0bc87004b 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -1,5 +1,5 @@ LilycoveCity:: @ 83054D4 - .4byte LilycoveCity_MapAttributes + .4byte LilycoveCity_Layout .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 47329e0f7..7ab3bd2cd 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -1,5 +1,5 @@ LilycoveCity_ContestHall:: @ 83065AC - .4byte LilycoveCity_ContestHall_MapAttributes + .4byte LilycoveCity_ContestHall_Layout .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 5bf98a32b..b109dab11 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -1,5 +1,5 @@ LilycoveCity_ContestLobby:: @ 8306590 - .4byte LilycoveCity_ContestLobby_MapAttributes + .4byte LilycoveCity_ContestLobby_Layout .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 141fda863..94a1e4434 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 2d6f9de4b..b543a826d 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 3f1a8ada9..d8c3e1d6b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 - .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes + .4byte LilycoveCity_DepartmentStoreElevator_Layout .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 292c621d3..c50694c5e 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 - .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes + .4byte LilycoveCity_DepartmentStoreRooftop_Layout .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index ecfb77604..31798b5e6 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index f10428935..75c8ef43c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 16f453da0..29e214a1d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 169f21d92..595f28d19 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 19b45696c..ae3033a5d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index a83e7139d..6c3149eaf 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -1,5 +1,5 @@ LilycoveCity_EmptyMap:: @ 8306654 - .4byte LilycoveCity_EmptyMap_MapAttributes + .4byte LilycoveCity_EmptyMap_Layout .4byte LilycoveCity_EmptyMap_MapEvents .4byte LilycoveCity_EmptyMap_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 022eb0356..d29ac7057 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor:: @ 8306638 - .4byte LilycoveCity_Harbor_MapAttributes + .4byte Harbor_Layout .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index f4246c98f..ec41783d0 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House1:: @ 830668C - .4byte House11_MapAttributes + .4byte House1_Layout .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 8aac9185c..491e60776 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House2:: @ 83066A8 - .4byte LilycoveCity_House2_MapAttributes + .4byte LilycoveCity_House2_Layout .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index f1c7f73b7..e984e5576 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House3:: @ 83066C4 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 47d5c21e7..0faae2952 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House4:: @ 83066E0 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index d48ffc94f..7f2d6d8a8 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 460ed87f9..5b1207331 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 5f6798646..b30bb8b6e 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index a1eb040ae..32d4df792 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 341ce8590..aacc4ca10 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 4e75b2193..292e02d96 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C - .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes + .4byte LilycoveCity_PokemonTrainerFanClub_Layout .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 43137d33b..c1027addb 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -1,5 +1,5 @@ LilycoveCity_UnusedMart:: @ 8306600 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 9e265d9c9..bc747d21e 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,5 +1,5 @@ LinkContestRoom1:: @ 83079E8 - .4byte LinkContestRoom1_MapAttributes + .4byte LinkContestRoom1_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index f492eab03..e8a4ec4fd 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,5 +1,5 @@ LinkContestRoom2:: @ 8307AAC - .4byte LinkContestRoom2_MapAttributes + .4byte LinkContestRoom2_Layout .4byte LinkContestRoom2_MapEvents .4byte LinkContestRoom2_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 90de4491d..930f19137 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,5 +1,5 @@ LinkContestRoom3:: @ 8307AC8 - .4byte LinkContestRoom3_MapAttributes + .4byte LinkContestRoom3_Layout .4byte LinkContestRoom3_MapEvents .4byte LinkContestRoom3_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 774e55abc..ddc1b2741 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,5 +1,5 @@ LinkContestRoom4:: @ 8307AE4 - .4byte LinkContestRoom4_MapAttributes + .4byte LinkContestRoom4_Layout .4byte LinkContestRoom4_MapEvents .4byte LinkContestRoom4_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 22b90f6c9..681662ee9 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,5 +1,5 @@ LinkContestRoom5:: @ 8307B00 - .4byte LinkContestRoom5_MapAttributes + .4byte LinkContestRoom5_Layout .4byte LinkContestRoom5_MapEvents .4byte LinkContestRoom5_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 773912080..55c417785 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,5 +1,5 @@ LinkContestRoom6:: @ 8307B1C - .4byte LinkContestRoom6_MapAttributes + .4byte LinkContestRoom6_Layout .4byte LinkContestRoom6_MapEvents .4byte LinkContestRoom6_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 5493f6005..73bbf71b5 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -1,5 +1,5 @@ LittlerootTown:: @ 8305544 - .4byte LittlerootTown_MapAttributes + .4byte LittlerootTown_Layout .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 122fdc82a..6f2c31c86 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 449a883cb..d23ea0b30 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 6d6220086..961f411a2 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 44859dd4c..640230c00 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 31fb03c64..44f415d9b 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -1,5 +1,5 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 - .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes + .4byte LittlerootTown_ProfessorBirchsLab_Layout .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 3876e17ec..95e2ded37 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_1F:: @ 8307588 - .4byte MagmaHideout_1F_MapAttributes + .4byte MagmaHideout_1F_Layout .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index 16fe3f2ba..bafc9f112 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_B1F:: @ 83075A4 - .4byte MagmaHideout_B1F_MapAttributes + .4byte MagmaHideout_B1F_Layout .4byte MagmaHideout_B1F_MapEvents .4byte MagmaHideout_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index 3aee695b4..de9b39593 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_B2F:: @ 83075C0 - .4byte MagmaHideout_B2F_MapAttributes + .4byte MagmaHideout_B2F_Layout .4byte MagmaHideout_B2F_MapEvents .4byte MagmaHideout_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index e0e2c4f22..a5eb578c1 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -1,5 +1,5 @@ MauvilleCity:: @ 8305480 - .4byte MauvilleCity_MapAttributes + .4byte MauvilleCity_Layout .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index c99124794..4cf657936 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -1,5 +1,5 @@ MauvilleCity_BikeShop:: @ 8306168 - .4byte MauvilleCity_BikeShop_MapAttributes + .4byte MauvilleCity_BikeShop_Layout .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 653a41544..dfb7bcd0a 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -1,5 +1,5 @@ MauvilleCity_GameCorner:: @ 83061A0 - .4byte MauvilleCity_GameCorner_MapAttributes + .4byte MauvilleCity_GameCorner_Layout .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index efbd61fe0..7be94e661 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym:: @ 830614C - .4byte MauvilleCity_Gym_MapAttributes + .4byte MauvilleCity_Gym_Layout .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index e9acd83bd..b81f735fa 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House1:: @ 8306184 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 37a434405..84180ce98 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House2:: @ 83061BC - .4byte House11_MapAttributes + .4byte House1_Layout .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 7712e16df..e8d2694d1 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -1,5 +1,5 @@ MauvilleCity_Mart:: @ 8306210 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index b6e0a1628..e3cf14b52 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 8787c975e..71c27de3b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index dcb3fbbde..50e5a59cf 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 0d9d797aa..9b07de17c 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index f67ab9ea7..8b5b67256 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 779e6d23a..f3ed76145 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 26b3e1db0..a108fc6d6 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -1,5 +1,5 @@ MossdeepCity:: @ 83054F0 - .4byte MossdeepCity_MapAttributes + .4byte MossdeepCity_Layout .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index d96d383ea..d7f6a2e16 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 7692281f0..fc7a641eb 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index b72bdf62e..2546bc631 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym:: @ 83067C0 - .4byte MossdeepCity_Gym_MapAttributes + .4byte MossdeepCity_Gym_Layout .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 5fd23c8ec..135ce0c71 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House1:: @ 83067DC - .4byte House12_MapAttributes + .4byte House2_Layout .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 99140eaa7..f518be4e0 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House2:: @ 83067F8 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 382f165a4..7e3abf6cd 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House3:: @ 8306868 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 1c0e433bb..90daccd22 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House4:: @ 83068A0 - .4byte MossdeepCity_House4_MapAttributes + .4byte HouseWithBed_Layout .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index c18fca0e3..eb808693c 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -1,5 +1,5 @@ MossdeepCity_Mart:: @ 830684C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 036604eff..a2fff6ade 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index cb42c5c80..9307396ae 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 65ba897fb..6dd396fdd 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 2195ee8e2..53e692407 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 761ea9b73..ecdc32bd1 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -1,5 +1,5 @@ MossdeepCity_StevensHouse:: @ 8306884 - .4byte MossdeepCity_StevensHouse_MapAttributes + .4byte MossdeepCity_StevensHouse_Layout .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index cdc29ce7f..43995f016 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -1,5 +1,5 @@ MtChimney:: @ 8306EC0 - .4byte MtChimney_MapAttributes + .4byte MtChimney_Layout .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index f5207578b..493cc512e 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -1,5 +1,5 @@ MtChimney_CableCarStation:: @ 8306CAC - .4byte MtChimney_CableCarStation_MapAttributes + .4byte CableCarStation_Layout .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index cfdff9591..0e2958753 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,5 +1,5 @@ MtPyre_1F:: @ 8306F14 - .4byte MtPyre_1F_MapAttributes + .4byte MtPyre_1F_Layout .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 914fdabd4..813fa5604 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -1,5 +1,5 @@ MtPyre_2F:: @ 8306F30 - .4byte MtPyre_2F_MapAttributes + .4byte MtPyre_2F_Layout .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index b4a59adbd..941fbbb20 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -1,5 +1,5 @@ MtPyre_3F:: @ 8306F4C - .4byte MtPyre_3F_MapAttributes + .4byte MtPyre_3F_Layout .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 8dcbd4e64..604d0fadc 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,5 +1,5 @@ MtPyre_4F:: @ 8306F68 - .4byte MtPyre_4F_MapAttributes + .4byte MtPyre_4F_Layout .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 0eb7f7bba..f1dc8d7c1 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -1,5 +1,5 @@ MtPyre_5F:: @ 8306F84 - .4byte MtPyre_5F_MapAttributes + .4byte MtPyre_5F_Layout .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 3cab722cd..8d824b4b6 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -1,5 +1,5 @@ MtPyre_6F:: @ 8306FA0 - .4byte MtPyre_6F_MapAttributes + .4byte MtPyre_6F_Layout .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 543e090f0..4a1c86be9 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -1,5 +1,5 @@ MtPyre_Exterior:: @ 8306FBC - .4byte MtPyre_Exterior_MapAttributes + .4byte MtPyre_Exterior_Layout .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index e07d849a6..74be5845e 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,5 +1,5 @@ MtPyre_Summit:: @ 8306FD8 - .4byte MtPyre_Summit_MapAttributes + .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 28ac26ccf..690e3d276 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -1,5 +1,5 @@ NewMauville_Entrance:: @ 8307320 - .4byte NewMauville_Entrance_MapAttributes + .4byte NewMauville_Entrance_Layout .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 9771d7ec7..dd252544f 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -1,5 +1,5 @@ NewMauville_Inside:: @ 830733C - .4byte NewMauville_Inside_MapAttributes + .4byte NewMauville_Inside_Layout .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 22965da3d..8403d61c6 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -1,5 +1,5 @@ OldaleTown:: @ 8305560 - .4byte OldaleTown_MapAttributes + .4byte OldaleTown_Layout .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 530a0e763..4f0142667 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,5 +1,5 @@ OldaleTown_House1:: @ 8305ABC - .4byte House11_MapAttributes + .4byte House1_Layout .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 2214fbfaf..84f544145 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,5 +1,5 @@ OldaleTown_House2:: @ 8305AD8 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index a0e8a8851..c1efeb849 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -1,5 +1,5 @@ OldaleTown_Mart:: @ 8305B2C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 82ced7328..e0695fbaf 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 79e6ca99d..cd42c15a7 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 057e83264..621ac206e 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -1,5 +1,5 @@ PacifidlogTown:: @ 83055EC - .4byte PacifidlogTown_MapAttributes + .4byte PacifidlogTown_Layout .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 7842574f9..81b24d450 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House1:: @ 8305E90 - .4byte PacifidlogTown_House1_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 3fc2aba99..fe0626bf3 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House2:: @ 8305EAC - .4byte PacifidlogTown_House2_MapAttributes + .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 6bf1e6bd6..401c70d5b 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House3:: @ 8305EC8 - .4byte PacifidlogTown_House3_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index df930a533..5e69f1f7e 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House4:: @ 8305EE4 - .4byte PacifidlogTown_House4_MapAttributes + .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index d0fca156f..31bf4de65 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House5:: @ 8305F00 - .4byte PacifidlogTown_House5_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index ef2ddbf4c..872d1ac17 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index b985545a8..734d4225d 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index c1706a55a..42136d835 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,5 +1,5 @@ PetalburgCity:: @ 8305448 - .4byte PetalburgCity_MapAttributes + .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index af00ed5f0..7799ed7df 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -1,5 +1,5 @@ PetalburgCity_Gym:: @ 8305F38 - .4byte PetalburgCity_Gym_MapAttributes + .4byte PetalburgCity_Gym_Layout .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 4fe3dfdbc..66d92403b 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House1:: @ 8305F54 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index fb76b1bfe..fdbf58c38 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House2:: @ 8305F70 - .4byte PetalburgCity_House2_MapAttributes + .4byte HouseWithBed_Layout .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 56275cfaf..fc09d24a5 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -1,5 +1,5 @@ PetalburgCity_Mart:: @ 8305FC4 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 2596fb65d..3af2d5282 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index ac6c77b6a..008c26bf6 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 47fb229ba..22ebc57a3 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,5 +1,5 @@ PetalburgCity_WallysHouse:: @ 8305F1C - .4byte House12_MapAttributes + .4byte House2_Layout .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index b3a981af9..a1eb5618c 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -1,5 +1,5 @@ PetalburgWoods:: @ 8306EA4 - .4byte PetalburgWoods_MapAttributes + .4byte PetalburgWoods_Layout .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index a8322ebee..976ede8cf 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,5 +1,5 @@ RecordCorner:: @ 83079B0 - .4byte RecordCorner_MapAttributes + .4byte RecordCorner_Layout .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 1b4b6b1c4..c50d34519 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,5 +1,5 @@ Route101:: @ 8305608 - .4byte Route101_MapAttributes + .4byte Route101_Layout .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index a4318e2d2..c23ac6567 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,5 +1,5 @@ Route102:: @ 8305624 - .4byte Route102_MapAttributes + .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index b23f9d523..cf7033922 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -1,5 +1,5 @@ Route103:: @ 8305640 - .4byte Route103_MapAttributes + .4byte Route103_Layout .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 71e7059b5..084a2e602 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,5 +1,5 @@ Route104:: @ 830565C - .4byte Route104_MapAttributes + .4byte Route104_Layout .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 3055a73d6..99d99bd8a 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -1,5 +1,5 @@ Route104_MrBrineysHouse:: @ 8306C20 - .4byte Route104_MrBrineysHouse_MapAttributes + .4byte Route104_MrBrineysHouse_Layout .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index 3dae6a068..f98d930ab 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C - .4byte Route104_PrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 7f5115386..87b11e3ba 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,5 +1,5 @@ Route104_Prototype:: @ 8307CF8 - .4byte Route104_Prototype_MapAttributes + .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 51b27eb0a..aecb3c549 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -1,5 +1,5 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 - .4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 344b8f634..a286003c9 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,5 +1,5 @@ Route105:: @ 8305678 - .4byte Route105_MapAttributes + .4byte Route105_Layout .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 494690340..baeb22a8a 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,5 +1,5 @@ Route106:: @ 8305694 - .4byte Route106_MapAttributes + .4byte Route106_Layout .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 382b617ba..dc8a49a79 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -1,5 +1,5 @@ Route107:: @ 83056B0 - .4byte Route107_MapAttributes + .4byte Route107_Layout .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 3214f7b89..d84d77d8e 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -1,5 +1,5 @@ Route108:: @ 83056CC - .4byte Route108_MapAttributes + .4byte Route108_Layout .4byte Route108_MapEvents .4byte Route108_MapScripts .4byte Route108_MapConnections diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index db91d1368..67a9b09c0 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -1,5 +1,5 @@ Route109:: @ 83056E8 - .4byte Route109_MapAttributes + .4byte Route109_Layout .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 064d428bd..7ac57b934 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse:: @ 8307D30 - .4byte Route109_SeashoreHouse_MapAttributes + .4byte Route109_SeashoreHouse_Layout .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 442a02ccb..b2ea0c8bd 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -1,5 +1,5 @@ Route110:: @ 8305704 - .4byte Route110_MapAttributes + .4byte Route110_Layout .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 749ab18e9..523832792 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrace_Layout .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index a4bd0cbd7..6c9a6413a 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrace_Layout .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index f2b2c691d..bde1d5b52 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseCorridor:: @ 8307D84 - .4byte Route110_TrickHouseCorridor_MapAttributes + .4byte Route110_TrickHouseCorridor_Layout .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index d61808d7f..c0a61f038 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd:: @ 8307D68 - .4byte Route110_TrickHouseEnd_MapAttributes + .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 80d6c597f..8ecc26186 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance:: @ 8307D4C - .4byte Route110_TrickHouseEntrance_MapAttributes + .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index c4c87877c..7b5bb82f5 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 - .4byte Route110_TrickHousePuzzle1_MapAttributes + .4byte Route110_TrickHousePuzzle1_Layout .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index d278ca3aa..a21c2f395 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle2:: @ 8307DBC - .4byte Route110_TrickHousePuzzle2_MapAttributes + .4byte Route110_TrickHousePuzzle2_Layout .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 736a1dc19..974573410 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 - .4byte Route110_TrickHousePuzzle3_MapAttributes + .4byte Route110_TrickHousePuzzle3_Layout .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index f4117a578..d400e5eb4 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 - .4byte Route110_TrickHousePuzzle4_MapAttributes + .4byte Route110_TrickHousePuzzle4_Layout .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 7216f556e..700aa68fe 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5:: @ 8307E10 - .4byte Route110_TrickHousePuzzle5_MapAttributes + .4byte Route110_TrickHousePuzzle5_Layout .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 5ffc844bd..8bdef5c7b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle6:: @ 8307E2C - .4byte Route110_TrickHousePuzzle6_MapAttributes + .4byte Route110_TrickHousePuzzle6_Layout .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index cea170daa..2008208ce 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle7:: @ 8307E48 - .4byte Route110_TrickHousePuzzle7_MapAttributes + .4byte Route110_TrickHousePuzzle7_Layout .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 6a4dc7051..ced373d13 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle8:: @ 8307E64 - .4byte Route110_TrickHousePuzzle8_MapAttributes + .4byte Route110_TrickHousePuzzle8_Layout .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 5af1fb1c2..80fa09a0c 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -1,5 +1,5 @@ Route111:: @ 8305720 - .4byte Route111_MapAttributes + .4byte Route111_Layout .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 23f4959a3..60383cf3d 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop:: @ 8306C74 - .4byte Route111_OldLadysRestStop_MapAttributes + .4byte House3_Layout .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 32fbca9a0..985d6d62d 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,5 +1,5 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index f798451d6..9a59e413e 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,5 +1,5 @@ Route112:: @ 830573C - .4byte Route112_MapAttributes + .4byte Route112_Layout .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 3d025fb7b..990e7a5bf 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -1,5 +1,5 @@ Route112_CableCarStation:: @ 8306C90 - .4byte Route112_CableCarStation_MapAttributes + .4byte CableCarStation_Layout .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 5792f97c3..c5dff2d5d 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -1,5 +1,5 @@ Route113:: @ 8305758 - .4byte Route113_MapAttributes + .4byte Route113_Layout .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index a8bfdd35d..860db983c 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -1,5 +1,5 @@ Route113_GlassWorkshop:: @ 8307EB8 - .4byte Route113_GlassWorkshop_MapAttributes + .4byte House4_Layout .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index cfb5f4114..a845c579a 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -1,5 +1,5 @@ Route114:: @ 8305774 - .4byte Route114_MapAttributes + .4byte Route114_Layout .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 2da95c284..8939a6ebd 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse:: @ 8306CC8 - .4byte Route114_FossilManiacsHouse_MapAttributes + .4byte Route114_FossilManiacsHouse_Layout .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index b410c822c..cdd7de9ff 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 - .4byte Route114_FossilManiacsTunnel_MapAttributes + .4byte Route114_FossilManiacsTunnel_Layout .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index a5b7eea50..d40a42513 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse:: @ 8306D00 - .4byte Route114_LanettesHouse_MapAttributes + .4byte Route114_LanettesHouse_Layout .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index b11134e28..ee72fe0b2 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -1,5 +1,5 @@ Route115:: @ 8305790 - .4byte Route115_MapAttributes + .4byte Route115_Layout .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index f4e145bf1..8fbf022a7 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -1,5 +1,5 @@ Route116:: @ 83057AC - .4byte Route116_MapAttributes + .4byte Route116_Layout .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index a52c6cada..b245aa534 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse:: @ 8306D1C - .4byte Route116_TunnelersRestHouse_MapAttributes + .4byte Route116_TunnelersRestHouse_Layout .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 9649f4728..437e59bd6 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,5 +1,5 @@ Route117:: @ 83057C8 - .4byte Route117_MapAttributes + .4byte Route117_Layout .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 567819b48..3df8c8b16 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare:: @ 8306D38 - .4byte Route117_PokemonDayCare_MapAttributes + .4byte Route117_PokemonDayCare_Layout .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 5b1190621..d75021d0a 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -1,5 +1,5 @@ Route118:: @ 83057E4 - .4byte Route118_MapAttributes + .4byte Route118_Layout .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index ef5887676..fd2445e92 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -1,5 +1,5 @@ Route119:: @ 8305800 - .4byte Route119_MapAttributes + .4byte Route119_Layout .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 2a14f5292..245d6c559 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,5 +1,5 @@ Route119_House:: @ 8307F28 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index b392fbc41..654ee2df0 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 9a5c3d9d8..803d3b75b 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 3f8be7e95..912234e0c 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -1,5 +1,5 @@ Route120:: @ 830581C - .4byte Route120_MapAttributes + .4byte Route120_Layout .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index ba2c3d2da..90f1ed359 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,5 +1,5 @@ Route121:: @ 8305838 - .4byte Route121_MapAttributes + .4byte Route121_Layout .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 4a0bbe244..2c53111c8 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -1,5 +1,5 @@ Route121_SafariZoneEntrance:: @ 8306D54 - .4byte Route121_SafariZoneEntrance_MapAttributes + .4byte Route121_SafariZoneEntrance_Layout .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 9889cc813..b6bd5943d 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,5 +1,5 @@ Route122:: @ 8305854 - .4byte Route122_MapAttributes + .4byte Route122_Layout .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index f33ab3e98..84bd53a9f 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -1,5 +1,5 @@ Route123:: @ 8305870 - .4byte Route123_MapAttributes + .4byte Route123_Layout .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 11501e733..d170971fa 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse:: @ 8307ED4 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 6e4466225..f1f361661 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,5 +1,5 @@ Route124:: @ 830588C - .4byte Route124_MapAttributes + .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 472ebc45a..d4a0d938e 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 - .4byte Route124_DivingTreasureHuntersHouse_MapAttributes + .4byte Route124_DivingTreasureHuntersHouse_Layout .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index e7a43a64d..2e07545dc 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,5 +1,5 @@ Route125:: @ 83058A8 - .4byte Route125_MapAttributes + .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index a973af531..ec593c1cb 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,5 +1,5 @@ Route126:: @ 83058C4 - .4byte Route126_MapAttributes + .4byte Route126_Layout .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index a9f887a2b..484ef4e48 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,5 +1,5 @@ Route127:: @ 83058E0 - .4byte Route127_MapAttributes + .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 9ecc76fb7..7461f5796 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -1,5 +1,5 @@ Route128:: @ 83058FC - .4byte Route128_MapAttributes + .4byte Route128_Layout .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 580d69fc7..8cdd83703 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,5 +1,5 @@ Route129:: @ 8305918 - .4byte Route129_MapAttributes + .4byte Route129_Layout .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index a788bf9b5..ade5554f1 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,5 +1,5 @@ Route130:: @ 8305934 - .4byte Route130_MapAttributes + .4byte Route130_Layout .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index e7d9ea231..5dfa4e94c 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -1,5 +1,5 @@ Route131:: @ 8305950 - .4byte Route131_MapAttributes + .4byte Route131_Layout .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index d7ad0b2a4..5d797099e 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,5 +1,5 @@ Route132:: @ 830596C - .4byte Route132_MapAttributes + .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 4c0f718ec..1c0f9f16f 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,5 +1,5 @@ Route133:: @ 8305988 - .4byte Route133_MapAttributes + .4byte Route133_Layout .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 2ca22c40e..8280c31aa 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,5 +1,5 @@ Route134:: @ 83059A4 - .4byte Route134_MapAttributes + .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index d1352ea3e..3b36e6c68 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -1,5 +1,5 @@ RustboroCity:: @ 830549C - .4byte RustboroCity_MapAttributes + .4byte RustboroCity_Layout .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index c3b5a6d7c..b547804b4 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -1,5 +1,5 @@ RustboroCity_CuttersHouse:: @ 8306360 - .4byte RustboroCity_CuttersHouse_MapAttributes + .4byte RustboroCity_CuttersHouse_Layout .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 5539006ff..d5c56227f 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 76bbea60b..930a8e915 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index c3d4549de..335fbd66c 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 68a5697be..1577abe5c 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index f0b29ae0d..18d9323a4 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 5f54f2624..dbfc104eb 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 086947abf..dbdca8d1a 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 42866ebf2..9bac24e13 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 5d18e933b..58b1d7674 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -1,5 +1,5 @@ RustboroCity_Gym:: @ 8306280 - .4byte RustboroCity_Gym_MapAttributes + .4byte RustboroCity_Gym_Layout .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 9ee09b4e3..ec04f80ac 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -1,5 +1,5 @@ RustboroCity_House1:: @ 8306344 - .4byte RustboroCity_House1_MapAttributes + .4byte RustboroCity_House1_Layout .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 0122c6a92..cb9052e3c 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,5 +1,5 @@ RustboroCity_House2:: @ 830637C - .4byte RustboroCity_House2_MapAttributes + .4byte RustboroCity_House_Layout .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 8876f8499..c4fdd2d3c 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,5 +1,5 @@ RustboroCity_House3:: @ 83063EC - .4byte RustboroCity_House3_MapAttributes + .4byte RustboroCity_House_Layout .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 535c3e2fc..fe87573b4 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -1,5 +1,5 @@ RustboroCity_Mart:: @ 83062F0 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 57cb84729..5caf1e5fd 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 838a5e5a9..c25b9338f 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index dfb46b6f1..525731410 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonSchool:: @ 830629C - .4byte RustboroCity_PokemonSchool_MapAttributes + .4byte RustboroCity_PokemonSchool_Layout .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 3e497a1e5..a25ada853 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -1,5 +1,5 @@ RusturfTunnel:: @ 8306DE0 - .4byte RusturfTunnel_MapAttributes + .4byte RusturfTunnel_Layout .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 6370e81ca..716b957f2 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,5 +1,5 @@ SSTidalCorridor:: @ 8307B54 - .4byte SSTidalCorridor_MapAttributes + .4byte SSTidalCorridor_Layout .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 5b6bec321..f41665a91 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -1,5 +1,5 @@ SSTidalLowerDeck:: @ 8307B70 - .4byte SSTidalLowerDeck_MapAttributes + .4byte SSTidalLowerDeck_Layout .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 36bcab75e..c307f86c7 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -1,5 +1,5 @@ SSTidalRooms:: @ 8307B8C - .4byte SSTidalRooms_MapAttributes + .4byte SSTidalRooms_Layout .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 55bef875f..71a878230 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -1,5 +1,5 @@ SafariZone_Northeast:: @ 8307BC4 - .4byte SafariZone_Northeast_MapAttributes + .4byte SafariZone_Northeast_Layout .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index a3c85c6ed..5a85342cb 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -1,5 +1,5 @@ SafariZone_Northwest:: @ 8307BA8 - .4byte SafariZone_Northwest_MapAttributes + .4byte SafariZone_Northwest_Layout .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 3db84b0b7..fd39571cd 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -1,5 +1,5 @@ SafariZone_RestHouse:: @ 8307CDC - .4byte SafariZone_RestHouse_MapAttributes + .4byte SafariZone_RestHouse_Layout .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 1307c9700..e076dd12b 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -1,5 +1,5 @@ SafariZone_Southeast:: @ 8307BFC - .4byte SafariZone_Southeast_MapAttributes + .4byte SafariZone_Southeast_Layout .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 548dc24b7..b1effab36 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -1,5 +1,5 @@ SafariZone_Southwest:: @ 8307BE0 - .4byte SafariZone_Southwest_MapAttributes + .4byte SafariZone_Southwest_Layout .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 16e45546e..ef420a191 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -1,5 +1,5 @@ ScorchedSlab:: @ 830756C - .4byte ScorchedSlab_MapAttributes + .4byte ScorchedSlab_Layout .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index d768c1099..ebb78622b 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance:: @ 8307064 - .4byte SeafloorCavern_Entrance_MapAttributes + .4byte SeafloorCavern_Entrance_Layout .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index affbaf21c..81914c09a 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room1:: @ 8307080 - .4byte SeafloorCavern_Room1_MapAttributes + .4byte SeafloorCavern_Room1_Layout .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 6e0e7455d..b1ce34ce8 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room2:: @ 830709C - .4byte SeafloorCavern_Room2_MapAttributes + .4byte SeafloorCavern_Room2_Layout .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index e2a432cd9..e152c8819 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room3:: @ 83070B8 - .4byte SeafloorCavern_Room3_MapAttributes + .4byte SeafloorCavern_Room3_Layout .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 0416091d4..de65dd9d8 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4:: @ 83070D4 - .4byte SeafloorCavern_Room4_MapAttributes + .4byte SeafloorCavern_Room4_Layout .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 3272c7021..316f0d3c9 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room5:: @ 83070F0 - .4byte SeafloorCavern_Room5_MapAttributes + .4byte SeafloorCavern_Room5_Layout .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 18fab912d..28bbdf424 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room6:: @ 830710C - .4byte SeafloorCavern_Room6_MapAttributes + .4byte SeafloorCavern_Room6_Layout .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index ff7579206..8c79c7ae9 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room7:: @ 8307128 - .4byte SeafloorCavern_Room7_MapAttributes + .4byte SeafloorCavern_Room7_Layout .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index f443c8530..8650c2849 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room8:: @ 8307144 - .4byte SeafloorCavern_Room8_MapAttributes + .4byte SeafloorCavern_Room8_Layout .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 10303ec46..f6625c0a0 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room9:: @ 8307160 - .4byte SeafloorCavern_Room9_MapAttributes + .4byte SeafloorCavern_Room9_Layout .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 6ae714a1f..b80aadc9e 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom:: @ 8307550 - .4byte SealedChamber_InnerRoom_MapAttributes + .4byte SealedChamber_InnerRoom_Layout .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index fe35a8210..7acb97fe9 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom:: @ 8307534 - .4byte SealedChamber_OuterRoom_MapAttributes + .4byte SealedChamber_OuterRoom_Layout .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 24641e4e6..8ed7552b6 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave1:: @ 8307710 - .4byte SecretBase_BlueCave1_MapAttributes + .4byte SecretBase_BlueCave1_Layout .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 599abd34a..ce44afd3b 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave2:: @ 83077B8 - .4byte SecretBase_BlueCave2_MapAttributes + .4byte SecretBase_BlueCave2_Layout .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 2adbdb4e5..361d5dff1 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave3:: @ 8307860 - .4byte SecretBase_BlueCave3_MapAttributes + .4byte SecretBase_BlueCave3_Layout .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 269a276ef..f76cbfce1 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave4:: @ 8307908 - .4byte SecretBase_BlueCave4_MapAttributes + .4byte SecretBase_BlueCave4_Layout .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index b54737d93..0001efcea 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave1:: @ 83076F4 - .4byte SecretBase_BrownCave1_MapAttributes + .4byte SecretBase_BrownCave1_Layout .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index e84bfd2eb..ebe1e2ac6 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave2:: @ 830779C - .4byte SecretBase_BrownCave2_MapAttributes + .4byte SecretBase_BrownCave2_Layout .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 9e0dc78e0..161c19360 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave3:: @ 8307844 - .4byte SecretBase_BrownCave3_MapAttributes + .4byte SecretBase_BrownCave3_Layout .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index d21c844da..9a3fc9269 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave4:: @ 83078EC - .4byte SecretBase_BrownCave4_MapAttributes + .4byte SecretBase_BrownCave4_Layout .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 60df36c7e..3a470fa40 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave1:: @ 83076D8 - .4byte SecretBase_RedCave1_MapAttributes + .4byte SecretBase_RedCave1_Layout .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 5325c424e..fa4f38a53 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave2:: @ 8307780 - .4byte SecretBase_RedCave2_MapAttributes + .4byte SecretBase_RedCave2_Layout .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index a86997805..be46df6b6 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave3:: @ 8307828 - .4byte SecretBase_RedCave3_MapAttributes + .4byte SecretBase_RedCave3_Layout .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 40e830726..8e1d2e2c4 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave4:: @ 83078D0 - .4byte SecretBase_RedCave4_MapAttributes + .4byte SecretBase_RedCave4_Layout .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 3b634c729..ca0f3861c 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub1:: @ 8307764 - .4byte SecretBase_Shrub1_MapAttributes + .4byte SecretBase_Shrub1_Layout .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 1c27f8945..89f1b2ed0 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub2:: @ 830780C - .4byte SecretBase_Shrub2_MapAttributes + .4byte SecretBase_Shrub2_Layout .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index e6e85c9ed..5bc0e51d6 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub3:: @ 83078B4 - .4byte SecretBase_Shrub3_MapAttributes + .4byte SecretBase_Shrub3_Layout .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 1e610463f..e6cbf1428 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub4:: @ 830795C - .4byte SecretBase_Shrub4_MapAttributes + .4byte SecretBase_Shrub4_Layout .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 64722268c..f887c00e7 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree1:: @ 8307748 - .4byte SecretBase_Tree1_MapAttributes + .4byte SecretBase_Tree1_Layout .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index fefd54e68..c36f1ada0 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree2:: @ 83077F0 - .4byte SecretBase_Tree2_MapAttributes + .4byte SecretBase_Tree2_Layout .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 09e55e66d..13890aefb 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree3:: @ 8307898 - .4byte SecretBase_Tree3_MapAttributes + .4byte SecretBase_Tree3_Layout .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index cfb58242e..f91c43add 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree4:: @ 8307940 - .4byte SecretBase_Tree4_MapAttributes + .4byte SecretBase_Tree4_Layout .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 42a63256f..f275c84c4 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave1:: @ 830772C - .4byte SecretBase_YellowCave1_MapAttributes + .4byte SecretBase_YellowCave1_Layout .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index d57acde5c..4ea3e3fa5 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave2:: @ 83077D4 - .4byte SecretBase_YellowCave2_MapAttributes + .4byte SecretBase_YellowCave2_Layout .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index ecb6b7086..a3a6ce97f 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave3:: @ 830787C - .4byte SecretBase_YellowCave3_MapAttributes + .4byte SecretBase_YellowCave3_Layout .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 97de9362b..721ecefb3 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave4:: @ 8307924 - .4byte SecretBase_YellowCave4_MapAttributes + .4byte SecretBase_YellowCave4_Layout .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index e012b1a69..9eacbdc7e 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 - .4byte ShoalCave_HighTideEntranceRoom_MapAttributes + .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index c3f16869b..ab8156fcd 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 - .4byte ShoalCave_HighTideInnerRoom_MapAttributes + .4byte ShoalCave_HighTideInnerRoom_Layout .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index db63a0f9d..0a9b5ee49 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 - .4byte ShoalCave_LowTideEntranceRoom_MapAttributes + .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideEntranceRoom_MapEvents .4byte ShoalCave_LowTideEntranceRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index ba36a090d..59374d231 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideIceRoom:: @ 8307684 - .4byte ShoalCave_LowTideIceRoom_MapAttributes + .4byte ShoalCave_LowTideIceRoom_Layout .4byte ShoalCave_LowTideIceRoom_MapEvents .4byte ShoalCave_LowTideIceRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index c038dafcd..785230fc8 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 - .4byte ShoalCave_LowTideInnerRoom_MapAttributes + .4byte ShoalCave_LowTideInnerRoom_Layout .4byte ShoalCave_LowTideInnerRoom_MapEvents .4byte ShoalCave_LowTideInnerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 6fe4efb01..8d1375a5d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC - .4byte ShoalCave_LowTideLowerRoom_MapAttributes + .4byte ShoalCave_LowTideLowerRoom_Layout .4byte ShoalCave_LowTideLowerRoom_MapEvents .4byte ShoalCave_LowTideLowerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index d3d904731..f47ce07e0 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 - .4byte ShoalCave_LowTideStairsRoom_MapAttributes + .4byte ShoalCave_LowTideStairsRoom_Layout .4byte ShoalCave_LowTideStairsRoom_MapEvents .4byte ShoalCave_LowTideStairsRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index f62205a55..eee3d307d 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -1,5 +1,5 @@ SingleBattleColosseum:: @ 8307978 - .4byte SingleBattleColosseum_MapAttributes + .4byte SingleBattleColosseum_Layout .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 4ccc410da..2afe52190 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -1,5 +1,5 @@ SkyPillar_1F:: @ 8307614 - .4byte SkyPillar_1F_MapAttributes + .4byte SkyPillar_1F_Layout .4byte SkyPillar_1F_MapEvents .4byte SkyPillar_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 1e3b0393d..307e73e95 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -1,5 +1,5 @@ SkyPillar_2F:: @ 8307630 - .4byte SkyPillar_2F_MapAttributes + .4byte SkyPillar_2F_Layout .4byte SkyPillar_2F_MapEvents .4byte SkyPillar_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index bd6d9cb86..f98f5edbc 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -1,5 +1,5 @@ SkyPillar_3F:: @ 830764C - .4byte SkyPillar_3F_MapAttributes + .4byte SkyPillar_3F_Layout .4byte SkyPillar_3F_MapEvents .4byte SkyPillar_3F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 50869e629..c6482dba6 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -1,5 +1,5 @@ SkyPillar_4F:: @ 8307668 - .4byte SkyPillar_4F_MapAttributes + .4byte SkyPillar_4F_Layout .4byte SkyPillar_4F_MapEvents .4byte SkyPillar_4F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 16da8bcf4..ce4aacaef 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -1,5 +1,5 @@ SkyPillar_5F:: @ 83076A0 - .4byte SkyPillar_5F_MapAttributes + .4byte SkyPillar_5F_Layout .4byte SkyPillar_5F_MapEvents .4byte SkyPillar_5F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 89d9becd9..c00189089 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -1,5 +1,5 @@ SkyPillar_Entrance:: @ 83075DC - .4byte SkyPillar_Entrance_MapAttributes + .4byte SkyPillar_Entrance_Layout .4byte SkyPillar_Entrance_MapEvents .4byte SkyPillar_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 44e9a5991..71c9e9968 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -1,5 +1,5 @@ SkyPillar_Outside:: @ 83075F8 - .4byte SkyPillar_Outside_MapAttributes + .4byte SkyPillar_Outside_Layout .4byte SkyPillar_Outside_MapEvents .4byte SkyPillar_Outside_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 0c241fe27..eb158417d 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -1,5 +1,5 @@ SkyPillar_Top:: @ 83076BC - .4byte SkyPillar_Top_MapAttributes + .4byte SkyPillar_Top_Layout .4byte SkyPillar_Top_MapEvents .4byte SkyPillar_Top_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 6575e0de5..75d71276c 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -1,5 +1,5 @@ SlateportCity:: @ 8305464 - .4byte SlateportCity_MapAttributes + .4byte SlateportCity_Layout .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index 64cc06565..5dd0f7be9 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -1,5 +1,5 @@ SlateportCity_ContestHall:: @ 8306034 - .4byte SlateportCity_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte SlateportCity_ContestHall_MapEvents .4byte SlateportCity_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index 440139e64..e758d8bd8 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -1,5 +1,5 @@ SlateportCity_ContestLobby:: @ 8306018 - .4byte SlateportCity_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte SlateportCity_ContestLobby_MapEvents .4byte SlateportCity_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index d7da07b49..479da8d1f 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -1,5 +1,5 @@ SlateportCity_Harbor:: @ 83060C0 - .4byte SlateportCity_Harbor_MapAttributes + .4byte Harbor_Layout .4byte SlateportCity_Harbor_MapEvents .4byte SlateportCity_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 75a5cdb72..9d0a92cf0 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -1,5 +1,5 @@ SlateportCity_House1:: @ 8306050 - .4byte SlateportCity_House1_MapAttributes + .4byte HouseWithBed_Layout .4byte SlateportCity_House1_MapEvents .4byte SlateportCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index a5df54962..34b7c99a5 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -1,5 +1,5 @@ SlateportCity_House2:: @ 83060DC - .4byte House12_MapAttributes + .4byte House2_Layout .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 12f2172be..f591efb9c 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -1,5 +1,5 @@ SlateportCity_Mart:: @ 8306130 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte SlateportCity_Mart_MapEvents .4byte SlateportCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 7aaa2ff91..02821ae8d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 3d9153f56..a8811c29e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index d668f0efc..90e3b2c09 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 36c726d7f..a59bb27c6 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 1672d21b1..14ff57a26 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonFanClub:: @ 830606C - .4byte SlateportCity_PokemonFanClub_MapAttributes + .4byte SlateportCity_PokemonFanClub_Layout .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index c3516151e..c5e7058f8 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 242e061aa..25958807e 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index d5cbae0be..32ea11228 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -1,5 +1,5 @@ SootopolisCity:: @ 830550C - .4byte SootopolisCity_MapAttributes + .4byte SootopolisCity_Layout .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 185bdc970..cc84c036b 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 104ee8215..725a2b07e 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 5ff1eb351..ed43835d4 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House1:: @ 83069B8 - .4byte SootopolisCity_House1_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 1ff5a7df1..eb7d36a34 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House2:: @ 83069D4 - .4byte SootopolisCity_House2_MapAttributes + .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 3c6075fe7..7afa0cc43 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House3:: @ 83069F0 - .4byte SootopolisCity_House3_MapAttributes + .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index f155d1980..d9d34652f 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House4:: @ 8306A0C - .4byte SootopolisCity_House4_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 7cfe101ac..ce3ed3456 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House5:: @ 8306A28 - .4byte SootopolisCity_House5_MapAttributes + .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 536872e88..ab1c28f9a 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House6:: @ 8306A44 - .4byte SootopolisCity_House6_MapAttributes + .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 598a84316..b025f33ec 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House7:: @ 8306A60 - .4byte SootopolisCity_House7_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index 4d6619797..da39efd62 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House8:: @ 8306A7C - .4byte SootopolisCity_House8_MapAttributes + .4byte SootopolisCity_House8_Layout .4byte SootopolisCity_House8_MapEvents .4byte SootopolisCity_House8_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 47505e04d..fbf68127f 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Mart:: @ 830699C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index d0cef1039..5a6ce3973 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 4bdb48a7d..ed64f1f51 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 0579c81bc..6918c9c37 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior:: @ 8307CA4 - .4byte SouthernIsland_Exterior_MapAttributes + .4byte SouthernIsland_Exterior_Layout .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 42cf6db66..afa589d28 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -1,5 +1,5 @@ SouthernIsland_Interior:: @ 8307CC0 - .4byte SouthernIsland_Interior_MapAttributes + .4byte SouthernIsland_Interior_Layout .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 62bac5400..e29e2135d 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,5 +1,5 @@ TradeCenter:: @ 8307994 - .4byte TradeCenter_MapAttributes + .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index cfd06e4ce..52555165b 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -1,5 +1,5 @@ Underwater1:: @ 83059C0 - .4byte Underwater1_MapAttributes + .4byte Underwater1_Layout .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 38446fecc..0c19c9066 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -1,5 +1,5 @@ Underwater2:: @ 83059DC - .4byte Underwater2_MapAttributes + .4byte Underwater2_Layout .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 3cc773730..e952239e2 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -1,5 +1,5 @@ Underwater3:: @ 83059F8 - .4byte Underwater3_MapAttributes + .4byte Underwater3_Layout .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 8fb1e6faa..fb040d771 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -1,5 +1,5 @@ Underwater4:: @ 8305A14 - .4byte Underwater4_MapAttributes + .4byte Underwater4_Layout .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index fbc90290c..f27cb2fa7 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -1,5 +1,5 @@ Underwater_Route134:: @ 83074FC - .4byte Underwater_Route134_MapAttributes + .4byte Underwater_Route134_Layout .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 09f36c16f..13c740fed 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -1,5 +1,5 @@ Underwater_SeafloorCavern:: @ 8307048 - .4byte Underwater_SeafloorCavern_MapAttributes + .4byte Underwater_SeafloorCavern_Layout .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 86ff3384d..0eec2d22e 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber:: @ 8307518 - .4byte Underwater_SealedChamber_MapAttributes + .4byte Underwater_SealedChamber_Layout .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 8aa8bb316..3a672844f 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity:: @ 8306DFC - .4byte Underwater_SootopolisCity_MapAttributes + .4byte Underwater_SootopolisCity_Layout .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 93d3ab03f..dafb7d083 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 96f2e3de2..005b7b40e 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 135e1c4b1..5dae310ff 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 4aaae9710..2dbc00c06 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index e0bebe753..dc57d796b 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index b2c174c06..ccb77b687 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,5 +1,5 @@ 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 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index ee41c767f..5d78f42e1 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -1,5 +1,5 @@ VerdanturfTown:: @ 83055D0 - .4byte VerdanturfTown_MapAttributes + .4byte VerdanturfTown_Layout .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index 1c0179afb..7f6b1d434 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_ContestHall:: @ 8305D94 - .4byte VerdanturfTown_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte VerdanturfTown_ContestHall_MapEvents .4byte VerdanturfTown_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index 31274e19f..c2f763927 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_ContestLobby:: @ 8305D78 - .4byte VerdanturfTown_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte VerdanturfTown_ContestLobby_MapEvents .4byte VerdanturfTown_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 7b0ab4ad0..117166d92 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 0e29f4ea6..0bf8c3e2e 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_House:: @ 8305E3C - .4byte House11_MapAttributes + .4byte House1_Layout .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index db037960c..f2950cc8d 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_Mart:: @ 8305DB0 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 384c8719e..4e4e67840 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 518c11352..3122a827f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index bc31f5457..993693239 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_WandasHouse:: @ 8305E04 - .4byte VerdanturfTown_WandasHouse_MapAttributes + .4byte VerdanturfTown_WandasHouse_Layout .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 21937891e..78b6e3939 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_1F:: @ 8307224 - .4byte VictoryRoad_1F_MapAttributes + .4byte VictoryRoad_1F_Layout .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index ebaa67358..ac2b2eeff 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_B1F:: @ 8307240 - .4byte VictoryRoad_B1F_MapAttributes + .4byte VictoryRoad_B1F_Layout .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 4690acbb7..f38f649a9 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_B2F:: @ 830725C - .4byte VictoryRoad_B2F_MapAttributes + .4byte VictoryRoad_B2F_Layout .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc index af4092f99..aec54aaab 100644 --- a/data/maps/_assets.inc +++ b/data/maps/_assets.inc @@ -1,5006 +1,332 @@ -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 - -House11_MapBorder:: @ 82CDEC0 - .incbin "data/maps/House11/border.bin" - -House11_MapBlockdata:: @ 82CDEC8 - .incbin "data/maps/House11/map.bin" - - .align 2 -House11_MapAttributes:: @ 82CDF7C - .4byte 0xa - .4byte 0x9 - .4byte House11_MapBorder - .4byte House11_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -House12_MapBorder:: @ 82CDF94 - .incbin "data/maps/House12/border.bin" - -House12_MapBlockdata:: @ 82CDF9C - .incbin "data/maps/House12/map.bin" - - .align 2 -House12_MapAttributes:: @ 82CE04C - .4byte 0xb - .4byte 0x8 - .4byte House12_MapBorder - .4byte House12_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 + .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/attributes_table.inc b/data/maps/attributes_table.inc index 241efb9a6..b1a15d7ef 100644 --- a/data/maps/attributes_table.inc +++ b/data/maps/attributes_table.inc @@ -1,334 +1,334 @@ .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 House11_MapAttributes - .4byte House12_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 + .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 From 931feeb9b720ea5151a781905967fedb170b67b1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:04 -0500 Subject: [PATCH 3/9] Move map events into respective data/maps/ directories --- data/{maps/_assets.inc => layouts.inc} | 0 ...attributes_table.inc => layouts_table.inc} | 0 data/map_events.s | 789 +++++++++--------- data/maps.s | 6 +- .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../FieryPath.inc => FieryPath/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../IslandCave.inc => IslandCave/events.inc} | 0 .../JaggedPass.inc => JaggedPass/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../MtChimney.inc => MtChimney/events.inc} | 0 .../events.inc} | 0 .../MtPyre_1F.inc => MtPyre_1F/events.inc} | 0 .../MtPyre_2F.inc => MtPyre_2F/events.inc} | 0 .../MtPyre_3F.inc => MtPyre_3F/events.inc} | 0 .../MtPyre_4F.inc => MtPyre_4F/events.inc} | 0 .../MtPyre_5F.inc => MtPyre_5F/events.inc} | 0 .../MtPyre_6F.inc => MtPyre_6F/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../OldaleTown.inc => OldaleTown/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../Route101.inc => Route101/events.inc} | 0 .../Route102.inc => Route102/events.inc} | 0 .../Route103.inc => Route103/events.inc} | 0 .../Route104.inc => Route104/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../Route105.inc => Route105/events.inc} | 0 .../Route106.inc => Route106/events.inc} | 0 .../Route107.inc => Route107/events.inc} | 0 .../Route108.inc => Route108/events.inc} | 0 .../Route109.inc => Route109/events.inc} | 0 .../events.inc} | 0 .../Route110.inc => Route110/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../Route111.inc => Route111/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../Route112.inc => Route112/events.inc} | 0 .../events.inc} | 0 .../Route113.inc => Route113/events.inc} | 0 .../events.inc} | 0 .../Route114.inc => Route114/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../Route115.inc => Route115/events.inc} | 0 .../Route116.inc => Route116/events.inc} | 0 .../events.inc} | 0 .../Route117.inc => Route117/events.inc} | 0 .../events.inc} | 0 .../Route118.inc => Route118/events.inc} | 0 .../Route119.inc => Route119/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../Route120.inc => Route120/events.inc} | 0 .../Route121.inc => Route121/events.inc} | 0 .../events.inc} | 0 .../Route122.inc => Route122/events.inc} | 0 .../Route123.inc => Route123/events.inc} | 0 .../events.inc} | 0 .../Route124.inc => Route124/events.inc} | 0 .../events.inc} | 0 .../Route125.inc => Route125/events.inc} | 0 .../Route126.inc => Route126/events.inc} | 0 .../Route127.inc => Route127/events.inc} | 0 .../Route128.inc => Route128/events.inc} | 0 .../Route129.inc => Route129/events.inc} | 0 .../Route130.inc => Route130/events.inc} | 0 .../Route131.inc => Route131/events.inc} | 0 .../Route132.inc => Route132/events.inc} | 0 .../Route133.inc => Route133/events.inc} | 0 .../Route134.inc => Route134/events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 .../events.inc} | 0 data/maps/{_groups.inc => groups.inc} | 0 399 files changed, 398 insertions(+), 397 deletions(-) rename data/{maps/_assets.inc => layouts.inc} (100%) rename data/{maps/attributes_table.inc => layouts_table.inc} (100%) rename data/maps/{events/AbandonedShip_CaptainsOffice.inc => AbandonedShip_CaptainsOffice/events.inc} (100%) rename data/maps/{events/AbandonedShip_Corridors_1F.inc => AbandonedShip_Corridors_1F/events.inc} (100%) rename data/maps/{events/AbandonedShip_Corridors_B1F.inc => AbandonedShip_Corridors_B1F/events.inc} (100%) rename data/maps/{events/AbandonedShip_Deck.inc => AbandonedShip_Deck/events.inc} (100%) rename data/maps/{events/AbandonedShip_HiddenFloorCorridors.inc => AbandonedShip_HiddenFloorCorridors/events.inc} (100%) rename data/maps/{events/AbandonedShip_HiddenFloorRooms.inc => AbandonedShip_HiddenFloorRooms/events.inc} (100%) rename data/maps/{events/AbandonedShip_Room_B1F.inc => AbandonedShip_Room_B1F/events.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms2_1F.inc => AbandonedShip_Rooms2_1F/events.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms2_B1F.inc => AbandonedShip_Rooms2_B1F/events.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms_1F.inc => AbandonedShip_Rooms_1F/events.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms_B1F.inc => AbandonedShip_Rooms_B1F/events.inc} (100%) rename data/maps/{events/AbandonedShip_Underwater1.inc => AbandonedShip_Underwater1/events.inc} (100%) rename data/maps/{events/AbandonedShip_Underwater2.inc => AbandonedShip_Underwater2/events.inc} (100%) rename data/maps/{events/AncientTomb.inc => AncientTomb/events.inc} (100%) rename data/maps/{events/AquaHideout_1F.inc => AquaHideout_1F/events.inc} (100%) rename data/maps/{events/AquaHideout_B1F.inc => AquaHideout_B1F/events.inc} (100%) rename data/maps/{events/AquaHideout_B2F.inc => AquaHideout_B2F/events.inc} (100%) rename data/maps/{events/BattleTower_BattleRoom.inc => BattleTower_BattleRoom/events.inc} (100%) rename data/maps/{events/BattleTower_Corridor.inc => BattleTower_Corridor/events.inc} (100%) rename data/maps/{events/BattleTower_Elevator.inc => BattleTower_Elevator/events.inc} (100%) rename data/maps/{events/BattleTower_Lobby.inc => BattleTower_Lobby/events.inc} (100%) rename data/maps/{events/BattleTower_Outside.inc => BattleTower_Outside/events.inc} (100%) rename data/maps/{events/CaveOfOrigin_1F.inc => CaveOfOrigin_1F/events.inc} (100%) rename data/maps/{events/CaveOfOrigin_B1F.inc => CaveOfOrigin_B1F/events.inc} (100%) rename data/maps/{events/CaveOfOrigin_B2F.inc => CaveOfOrigin_B2F/events.inc} (100%) rename data/maps/{events/CaveOfOrigin_B3F.inc => CaveOfOrigin_B3F/events.inc} (100%) rename data/maps/{events/CaveOfOrigin_B4F.inc => CaveOfOrigin_B4F/events.inc} (100%) rename data/maps/{events/CaveOfOrigin_Entrance.inc => CaveOfOrigin_Entrance/events.inc} (100%) rename data/maps/{events/DesertRuins.inc => DesertRuins/events.inc} (100%) rename data/maps/{events/DewfordTown.inc => DewfordTown/events.inc} (100%) rename data/maps/{events/DewfordTown_Gym.inc => DewfordTown_Gym/events.inc} (100%) rename data/maps/{events/DewfordTown_Hall.inc => DewfordTown_Hall/events.inc} (100%) rename data/maps/{events/DewfordTown_House1.inc => DewfordTown_House1/events.inc} (100%) rename data/maps/{events/DewfordTown_House2.inc => DewfordTown_House2/events.inc} (100%) rename data/maps/{events/DewfordTown_PokemonCenter_1F.inc => DewfordTown_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/DewfordTown_PokemonCenter_2F.inc => DewfordTown_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/DoubleBattleColosseum.inc => DoubleBattleColosseum/events.inc} (100%) rename data/maps/{events/EverGrandeCity.inc => EverGrandeCity/events.inc} (100%) rename data/maps/{events/EverGrandeCity_ChampionsRoom.inc => EverGrandeCity_ChampionsRoom/events.inc} (100%) rename data/maps/{events/EverGrandeCity_Corridor1.inc => EverGrandeCity_Corridor1/events.inc} (100%) rename data/maps/{events/EverGrandeCity_Corridor2.inc => EverGrandeCity_Corridor2/events.inc} (100%) rename data/maps/{events/EverGrandeCity_Corridor3.inc => EverGrandeCity_Corridor3/events.inc} (100%) rename data/maps/{events/EverGrandeCity_Corridor4.inc => EverGrandeCity_Corridor4/events.inc} (100%) rename data/maps/{events/EverGrandeCity_Corridor5.inc => EverGrandeCity_Corridor5/events.inc} (100%) rename data/maps/{events/EverGrandeCity_DrakesRoom.inc => EverGrandeCity_DrakesRoom/events.inc} (100%) rename data/maps/{events/EverGrandeCity_GlaciasRoom.inc => EverGrandeCity_GlaciasRoom/events.inc} (100%) rename data/maps/{events/EverGrandeCity_HallOfFame.inc => EverGrandeCity_HallOfFame/events.inc} (100%) rename data/maps/{events/EverGrandeCity_PhoebesRoom.inc => EverGrandeCity_PhoebesRoom/events.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonCenter_1F.inc => EverGrandeCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonCenter_2F.inc => EverGrandeCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonLeague.inc => EverGrandeCity_PokemonLeague/events.inc} (100%) rename data/maps/{events/EverGrandeCity_SidneysRoom.inc => EverGrandeCity_SidneysRoom/events.inc} (100%) rename data/maps/{events/FallarborTown.inc => FallarborTown/events.inc} (100%) rename data/maps/{events/FallarborTown_ContestHall.inc => FallarborTown_ContestHall/events.inc} (100%) rename data/maps/{events/FallarborTown_ContestLobby.inc => FallarborTown_ContestLobby/events.inc} (100%) rename data/maps/{events/FallarborTown_House1.inc => FallarborTown_House1/events.inc} (100%) rename data/maps/{events/FallarborTown_House2.inc => FallarborTown_House2/events.inc} (100%) rename data/maps/{events/FallarborTown_Mart.inc => FallarborTown_Mart/events.inc} (100%) rename data/maps/{events/FallarborTown_PokemonCenter_1F.inc => FallarborTown_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/FallarborTown_PokemonCenter_2F.inc => FallarborTown_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/FieryPath.inc => FieryPath/events.inc} (100%) rename data/maps/{events/FortreeCity.inc => FortreeCity/events.inc} (100%) rename data/maps/{events/FortreeCity_DecorationShop.inc => FortreeCity_DecorationShop/events.inc} (100%) rename data/maps/{events/FortreeCity_Gym.inc => FortreeCity_Gym/events.inc} (100%) rename data/maps/{events/FortreeCity_House1.inc => FortreeCity_House1/events.inc} (100%) rename data/maps/{events/FortreeCity_House2.inc => FortreeCity_House2/events.inc} (100%) rename data/maps/{events/FortreeCity_House3.inc => FortreeCity_House3/events.inc} (100%) rename data/maps/{events/FortreeCity_House4.inc => FortreeCity_House4/events.inc} (100%) rename data/maps/{events/FortreeCity_House5.inc => FortreeCity_House5/events.inc} (100%) rename data/maps/{events/FortreeCity_Mart.inc => FortreeCity_Mart/events.inc} (100%) rename data/maps/{events/FortreeCity_PokemonCenter_1F.inc => FortreeCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/FortreeCity_PokemonCenter_2F.inc => FortreeCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/GraniteCave_1F.inc => GraniteCave_1F/events.inc} (100%) rename data/maps/{events/GraniteCave_B1F.inc => GraniteCave_B1F/events.inc} (100%) rename data/maps/{events/GraniteCave_B2F.inc => GraniteCave_B2F/events.inc} (100%) rename data/maps/{events/GraniteCave_StevensRoom.inc => GraniteCave_StevensRoom/events.inc} (100%) rename data/maps/{events/InsideOfTruck.inc => InsideOfTruck/events.inc} (100%) rename data/maps/{events/IslandCave.inc => IslandCave/events.inc} (100%) rename data/maps/{events/JaggedPass.inc => JaggedPass/events.inc} (100%) rename data/maps/{events/LavaridgeTown.inc => LavaridgeTown/events.inc} (100%) rename data/maps/{events/LavaridgeTown_Gym_1F.inc => LavaridgeTown_Gym_1F/events.inc} (100%) rename data/maps/{events/LavaridgeTown_Gym_B1F.inc => LavaridgeTown_Gym_B1F/events.inc} (100%) rename data/maps/{events/LavaridgeTown_HerbShop.inc => LavaridgeTown_HerbShop/events.inc} (100%) rename data/maps/{events/LavaridgeTown_House.inc => LavaridgeTown_House/events.inc} (100%) rename data/maps/{events/LavaridgeTown_Mart.inc => LavaridgeTown_Mart/events.inc} (100%) rename data/maps/{events/LavaridgeTown_PokemonCenter_1F.inc => LavaridgeTown_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/LavaridgeTown_PokemonCenter_2F.inc => LavaridgeTown_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/LilycoveCity.inc => LilycoveCity/events.inc} (100%) rename data/maps/{events/LilycoveCity_ContestHall.inc => LilycoveCity_ContestHall/events.inc} (100%) rename data/maps/{events/LilycoveCity_ContestLobby.inc => LilycoveCity_ContestLobby/events.inc} (100%) rename data/maps/{events/LilycoveCity_CoveLilyMotel_1F.inc => LilycoveCity_CoveLilyMotel_1F/events.inc} (100%) rename data/maps/{events/LilycoveCity_CoveLilyMotel_2F.inc => LilycoveCity_CoveLilyMotel_2F/events.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStoreElevator.inc => LilycoveCity_DepartmentStoreElevator/events.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStoreRooftop.inc => LilycoveCity_DepartmentStoreRooftop/events.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_1F.inc => LilycoveCity_DepartmentStore_1F/events.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_2F.inc => LilycoveCity_DepartmentStore_2F/events.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_3F.inc => LilycoveCity_DepartmentStore_3F/events.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_4F.inc => LilycoveCity_DepartmentStore_4F/events.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_5F.inc => LilycoveCity_DepartmentStore_5F/events.inc} (100%) rename data/maps/{events/LilycoveCity_EmptyMap.inc => LilycoveCity_EmptyMap/events.inc} (100%) rename data/maps/{events/LilycoveCity_Harbor.inc => LilycoveCity_Harbor/events.inc} (100%) rename data/maps/{events/LilycoveCity_House1.inc => LilycoveCity_House1/events.inc} (100%) rename data/maps/{events/LilycoveCity_House2.inc => LilycoveCity_House2/events.inc} (100%) rename data/maps/{events/LilycoveCity_House3.inc => LilycoveCity_House3/events.inc} (100%) rename data/maps/{events/LilycoveCity_House4.inc => LilycoveCity_House4/events.inc} (100%) rename data/maps/{events/LilycoveCity_LilycoveMuseum_1F.inc => LilycoveCity_LilycoveMuseum_1F/events.inc} (100%) rename data/maps/{events/LilycoveCity_LilycoveMuseum_2F.inc => LilycoveCity_LilycoveMuseum_2F/events.inc} (100%) rename data/maps/{events/LilycoveCity_MoveDeletersHouse.inc => LilycoveCity_MoveDeletersHouse/events.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonCenter_1F.inc => LilycoveCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonCenter_2F.inc => LilycoveCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonTrainerFanClub.inc => LilycoveCity_PokemonTrainerFanClub/events.inc} (100%) rename data/maps/{events/LilycoveCity_UnusedMart.inc => LilycoveCity_UnusedMart/events.inc} (100%) rename data/maps/{events/LinkContestRoom1.inc => LinkContestRoom1/events.inc} (100%) rename data/maps/{events/LinkContestRoom2.inc => LinkContestRoom2/events.inc} (100%) rename data/maps/{events/LinkContestRoom3.inc => LinkContestRoom3/events.inc} (100%) rename data/maps/{events/LinkContestRoom4.inc => LinkContestRoom4/events.inc} (100%) rename data/maps/{events/LinkContestRoom5.inc => LinkContestRoom5/events.inc} (100%) rename data/maps/{events/LinkContestRoom6.inc => LinkContestRoom6/events.inc} (100%) rename data/maps/{events/LittlerootTown.inc => LittlerootTown/events.inc} (100%) rename data/maps/{events/LittlerootTown_BrendansHouse_1F.inc => LittlerootTown_BrendansHouse_1F/events.inc} (100%) rename data/maps/{events/LittlerootTown_BrendansHouse_2F.inc => LittlerootTown_BrendansHouse_2F/events.inc} (100%) rename data/maps/{events/LittlerootTown_MaysHouse_1F.inc => LittlerootTown_MaysHouse_1F/events.inc} (100%) rename data/maps/{events/LittlerootTown_MaysHouse_2F.inc => LittlerootTown_MaysHouse_2F/events.inc} (100%) rename data/maps/{events/LittlerootTown_ProfessorBirchsLab.inc => LittlerootTown_ProfessorBirchsLab/events.inc} (100%) rename data/maps/{events/MagmaHideout_1F.inc => MagmaHideout_1F/events.inc} (100%) rename data/maps/{events/MagmaHideout_B1F.inc => MagmaHideout_B1F/events.inc} (100%) rename data/maps/{events/MagmaHideout_B2F.inc => MagmaHideout_B2F/events.inc} (100%) rename data/maps/{events/MauvilleCity.inc => MauvilleCity/events.inc} (100%) rename data/maps/{events/MauvilleCity_BikeShop.inc => MauvilleCity_BikeShop/events.inc} (100%) rename data/maps/{events/MauvilleCity_GameCorner.inc => MauvilleCity_GameCorner/events.inc} (100%) rename data/maps/{events/MauvilleCity_Gym.inc => MauvilleCity_Gym/events.inc} (100%) rename data/maps/{events/MauvilleCity_House1.inc => MauvilleCity_House1/events.inc} (100%) rename data/maps/{events/MauvilleCity_House2.inc => MauvilleCity_House2/events.inc} (100%) rename data/maps/{events/MauvilleCity_Mart.inc => MauvilleCity_Mart/events.inc} (100%) rename data/maps/{events/MauvilleCity_PokemonCenter_1F.inc => MauvilleCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/MauvilleCity_PokemonCenter_2F.inc => MauvilleCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/MeteorFalls_1F_1R.inc => MeteorFalls_1F_1R/events.inc} (100%) rename data/maps/{events/MeteorFalls_1F_2R.inc => MeteorFalls_1F_2R/events.inc} (100%) rename data/maps/{events/MeteorFalls_B1F_1R.inc => MeteorFalls_B1F_1R/events.inc} (100%) rename data/maps/{events/MeteorFalls_B1F_2R.inc => MeteorFalls_B1F_2R/events.inc} (100%) rename data/maps/{events/MossdeepCity.inc => MossdeepCity/events.inc} (100%) rename data/maps/{events/MossdeepCity_GameCorner_1F.inc => MossdeepCity_GameCorner_1F/events.inc} (100%) rename data/maps/{events/MossdeepCity_GameCorner_B1F.inc => MossdeepCity_GameCorner_B1F/events.inc} (100%) rename data/maps/{events/MossdeepCity_Gym.inc => MossdeepCity_Gym/events.inc} (100%) rename data/maps/{events/MossdeepCity_House1.inc => MossdeepCity_House1/events.inc} (100%) rename data/maps/{events/MossdeepCity_House2.inc => MossdeepCity_House2/events.inc} (100%) rename data/maps/{events/MossdeepCity_House3.inc => MossdeepCity_House3/events.inc} (100%) rename data/maps/{events/MossdeepCity_House4.inc => MossdeepCity_House4/events.inc} (100%) rename data/maps/{events/MossdeepCity_Mart.inc => MossdeepCity_Mart/events.inc} (100%) rename data/maps/{events/MossdeepCity_PokemonCenter_1F.inc => MossdeepCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/MossdeepCity_PokemonCenter_2F.inc => MossdeepCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/MossdeepCity_SpaceCenter_1F.inc => MossdeepCity_SpaceCenter_1F/events.inc} (100%) rename data/maps/{events/MossdeepCity_SpaceCenter_2F.inc => MossdeepCity_SpaceCenter_2F/events.inc} (100%) rename data/maps/{events/MossdeepCity_StevensHouse.inc => MossdeepCity_StevensHouse/events.inc} (100%) rename data/maps/{events/MtChimney.inc => MtChimney/events.inc} (100%) rename data/maps/{events/MtChimney_CableCarStation.inc => MtChimney_CableCarStation/events.inc} (100%) rename data/maps/{events/MtPyre_1F.inc => MtPyre_1F/events.inc} (100%) rename data/maps/{events/MtPyre_2F.inc => MtPyre_2F/events.inc} (100%) rename data/maps/{events/MtPyre_3F.inc => MtPyre_3F/events.inc} (100%) rename data/maps/{events/MtPyre_4F.inc => MtPyre_4F/events.inc} (100%) rename data/maps/{events/MtPyre_5F.inc => MtPyre_5F/events.inc} (100%) rename data/maps/{events/MtPyre_6F.inc => MtPyre_6F/events.inc} (100%) rename data/maps/{events/MtPyre_Exterior.inc => MtPyre_Exterior/events.inc} (100%) rename data/maps/{events/MtPyre_Summit.inc => MtPyre_Summit/events.inc} (100%) rename data/maps/{events/NewMauville_Entrance.inc => NewMauville_Entrance/events.inc} (100%) rename data/maps/{events/NewMauville_Inside.inc => NewMauville_Inside/events.inc} (100%) rename data/maps/{events/OldaleTown.inc => OldaleTown/events.inc} (100%) rename data/maps/{events/OldaleTown_House1.inc => OldaleTown_House1/events.inc} (100%) rename data/maps/{events/OldaleTown_House2.inc => OldaleTown_House2/events.inc} (100%) rename data/maps/{events/OldaleTown_Mart.inc => OldaleTown_Mart/events.inc} (100%) rename data/maps/{events/OldaleTown_PokemonCenter_1F.inc => OldaleTown_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/OldaleTown_PokemonCenter_2F.inc => OldaleTown_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/PacifidlogTown.inc => PacifidlogTown/events.inc} (100%) rename data/maps/{events/PacifidlogTown_House1.inc => PacifidlogTown_House1/events.inc} (100%) rename data/maps/{events/PacifidlogTown_House2.inc => PacifidlogTown_House2/events.inc} (100%) rename data/maps/{events/PacifidlogTown_House3.inc => PacifidlogTown_House3/events.inc} (100%) rename data/maps/{events/PacifidlogTown_House4.inc => PacifidlogTown_House4/events.inc} (100%) rename data/maps/{events/PacifidlogTown_House5.inc => PacifidlogTown_House5/events.inc} (100%) rename data/maps/{events/PacifidlogTown_PokemonCenter_1F.inc => PacifidlogTown_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/PacifidlogTown_PokemonCenter_2F.inc => PacifidlogTown_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/PetalburgCity.inc => PetalburgCity/events.inc} (100%) rename data/maps/{events/PetalburgCity_Gym.inc => PetalburgCity_Gym/events.inc} (100%) rename data/maps/{events/PetalburgCity_House1.inc => PetalburgCity_House1/events.inc} (100%) rename data/maps/{events/PetalburgCity_House2.inc => PetalburgCity_House2/events.inc} (100%) rename data/maps/{events/PetalburgCity_Mart.inc => PetalburgCity_Mart/events.inc} (100%) rename data/maps/{events/PetalburgCity_PokemonCenter_1F.inc => PetalburgCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/PetalburgCity_PokemonCenter_2F.inc => PetalburgCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/PetalburgCity_WallysHouse.inc => PetalburgCity_WallysHouse/events.inc} (100%) rename data/maps/{events/PetalburgWoods.inc => PetalburgWoods/events.inc} (100%) rename data/maps/{events/RecordCorner.inc => RecordCorner/events.inc} (100%) rename data/maps/{events/Route101.inc => Route101/events.inc} (100%) rename data/maps/{events/Route102.inc => Route102/events.inc} (100%) rename data/maps/{events/Route103.inc => Route103/events.inc} (100%) rename data/maps/{events/Route104.inc => Route104/events.inc} (100%) rename data/maps/{events/Route104_MrBrineysHouse.inc => Route104_MrBrineysHouse/events.inc} (100%) rename data/maps/{events/Route104_PrettyPetalFlowerShop.inc => Route104_PrettyPetalFlowerShop/events.inc} (100%) rename data/maps/{events/Route104_Prototype.inc => Route104_Prototype/events.inc} (100%) rename data/maps/{events/Route104_PrototypePrettyPetalFlowerShop.inc => Route104_PrototypePrettyPetalFlowerShop/events.inc} (100%) rename data/maps/{events/Route105.inc => Route105/events.inc} (100%) rename data/maps/{events/Route106.inc => Route106/events.inc} (100%) rename data/maps/{events/Route107.inc => Route107/events.inc} (100%) rename data/maps/{events/Route108.inc => Route108/events.inc} (100%) rename data/maps/{events/Route109.inc => Route109/events.inc} (100%) rename data/maps/{events/Route109_SeashoreHouse.inc => Route109_SeashoreHouse/events.inc} (100%) rename data/maps/{events/Route110.inc => Route110/events.inc} (100%) rename data/maps/{events/Route110_SeasideCyclingRoadNorthEntrance.inc => Route110_SeasideCyclingRoadNorthEntrance/events.inc} (100%) rename data/maps/{events/Route110_SeasideCyclingRoadSouthEntrance.inc => Route110_SeasideCyclingRoadSouthEntrance/events.inc} (100%) rename data/maps/{events/Route110_TrickHouseCorridor.inc => Route110_TrickHouseCorridor/events.inc} (100%) rename data/maps/{events/Route110_TrickHouseEnd.inc => Route110_TrickHouseEnd/events.inc} (100%) rename data/maps/{events/Route110_TrickHouseEntrance.inc => Route110_TrickHouseEntrance/events.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle1.inc => Route110_TrickHousePuzzle1/events.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle2.inc => Route110_TrickHousePuzzle2/events.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle3.inc => Route110_TrickHousePuzzle3/events.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle4.inc => Route110_TrickHousePuzzle4/events.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle5.inc => Route110_TrickHousePuzzle5/events.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle6.inc => Route110_TrickHousePuzzle6/events.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle7.inc => Route110_TrickHousePuzzle7/events.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle8.inc => Route110_TrickHousePuzzle8/events.inc} (100%) rename data/maps/{events/Route111.inc => Route111/events.inc} (100%) rename data/maps/{events/Route111_OldLadysRestStop.inc => Route111_OldLadysRestStop/events.inc} (100%) rename data/maps/{events/Route111_WinstrateFamilysHouse.inc => Route111_WinstrateFamilysHouse/events.inc} (100%) rename data/maps/{events/Route112.inc => Route112/events.inc} (100%) rename data/maps/{events/Route112_CableCarStation.inc => Route112_CableCarStation/events.inc} (100%) rename data/maps/{events/Route113.inc => Route113/events.inc} (100%) rename data/maps/{events/Route113_GlassWorkshop.inc => Route113_GlassWorkshop/events.inc} (100%) rename data/maps/{events/Route114.inc => Route114/events.inc} (100%) rename data/maps/{events/Route114_FossilManiacsHouse.inc => Route114_FossilManiacsHouse/events.inc} (100%) rename data/maps/{events/Route114_FossilManiacsTunnel.inc => Route114_FossilManiacsTunnel/events.inc} (100%) rename data/maps/{events/Route114_LanettesHouse.inc => Route114_LanettesHouse/events.inc} (100%) rename data/maps/{events/Route115.inc => Route115/events.inc} (100%) rename data/maps/{events/Route116.inc => Route116/events.inc} (100%) rename data/maps/{events/Route116_TunnelersRestHouse.inc => Route116_TunnelersRestHouse/events.inc} (100%) rename data/maps/{events/Route117.inc => Route117/events.inc} (100%) rename data/maps/{events/Route117_PokemonDayCare.inc => Route117_PokemonDayCare/events.inc} (100%) rename data/maps/{events/Route118.inc => Route118/events.inc} (100%) rename data/maps/{events/Route119.inc => Route119/events.inc} (100%) rename data/maps/{events/Route119_House.inc => Route119_House/events.inc} (100%) rename data/maps/{events/Route119_WeatherInstitute_1F.inc => Route119_WeatherInstitute_1F/events.inc} (100%) rename data/maps/{events/Route119_WeatherInstitute_2F.inc => Route119_WeatherInstitute_2F/events.inc} (100%) rename data/maps/{events/Route120.inc => Route120/events.inc} (100%) rename data/maps/{events/Route121.inc => Route121/events.inc} (100%) rename data/maps/{events/Route121_SafariZoneEntrance.inc => Route121_SafariZoneEntrance/events.inc} (100%) rename data/maps/{events/Route122.inc => Route122/events.inc} (100%) rename data/maps/{events/Route123.inc => Route123/events.inc} (100%) rename data/maps/{events/Route123_BerryMastersHouse.inc => Route123_BerryMastersHouse/events.inc} (100%) rename data/maps/{events/Route124.inc => Route124/events.inc} (100%) rename data/maps/{events/Route124_DivingTreasureHuntersHouse.inc => Route124_DivingTreasureHuntersHouse/events.inc} (100%) rename data/maps/{events/Route125.inc => Route125/events.inc} (100%) rename data/maps/{events/Route126.inc => Route126/events.inc} (100%) rename data/maps/{events/Route127.inc => Route127/events.inc} (100%) rename data/maps/{events/Route128.inc => Route128/events.inc} (100%) rename data/maps/{events/Route129.inc => Route129/events.inc} (100%) rename data/maps/{events/Route130.inc => Route130/events.inc} (100%) rename data/maps/{events/Route131.inc => Route131/events.inc} (100%) rename data/maps/{events/Route132.inc => Route132/events.inc} (100%) rename data/maps/{events/Route133.inc => Route133/events.inc} (100%) rename data/maps/{events/Route134.inc => Route134/events.inc} (100%) rename data/maps/{events/RustboroCity.inc => RustboroCity/events.inc} (100%) rename data/maps/{events/RustboroCity_CuttersHouse.inc => RustboroCity_CuttersHouse/events.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_1F.inc => RustboroCity_DevonCorp_1F/events.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_2F.inc => RustboroCity_DevonCorp_2F/events.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_3F.inc => RustboroCity_DevonCorp_3F/events.inc} (100%) rename data/maps/{events/RustboroCity_Flat1_1F.inc => RustboroCity_Flat1_1F/events.inc} (100%) rename data/maps/{events/RustboroCity_Flat1_2F.inc => RustboroCity_Flat1_2F/events.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_1F.inc => RustboroCity_Flat2_1F/events.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_2F.inc => RustboroCity_Flat2_2F/events.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_3F.inc => RustboroCity_Flat2_3F/events.inc} (100%) rename data/maps/{events/RustboroCity_Gym.inc => RustboroCity_Gym/events.inc} (100%) rename data/maps/{events/RustboroCity_House1.inc => RustboroCity_House1/events.inc} (100%) rename data/maps/{events/RustboroCity_House2.inc => RustboroCity_House2/events.inc} (100%) rename data/maps/{events/RustboroCity_House3.inc => RustboroCity_House3/events.inc} (100%) rename data/maps/{events/RustboroCity_Mart.inc => RustboroCity_Mart/events.inc} (100%) rename data/maps/{events/RustboroCity_PokemonCenter_1F.inc => RustboroCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/RustboroCity_PokemonCenter_2F.inc => RustboroCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/RustboroCity_PokemonSchool.inc => RustboroCity_PokemonSchool/events.inc} (100%) rename data/maps/{events/RusturfTunnel.inc => RusturfTunnel/events.inc} (100%) rename data/maps/{events/SSTidalCorridor.inc => SSTidalCorridor/events.inc} (100%) rename data/maps/{events/SSTidalLowerDeck.inc => SSTidalLowerDeck/events.inc} (100%) rename data/maps/{events/SSTidalRooms.inc => SSTidalRooms/events.inc} (100%) rename data/maps/{events/SafariZone_Northeast.inc => SafariZone_Northeast/events.inc} (100%) rename data/maps/{events/SafariZone_Northwest.inc => SafariZone_Northwest/events.inc} (100%) rename data/maps/{events/SafariZone_RestHouse.inc => SafariZone_RestHouse/events.inc} (100%) rename data/maps/{events/SafariZone_Southeast.inc => SafariZone_Southeast/events.inc} (100%) rename data/maps/{events/SafariZone_Southwest.inc => SafariZone_Southwest/events.inc} (100%) rename data/maps/{events/ScorchedSlab.inc => ScorchedSlab/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Entrance.inc => SeafloorCavern_Entrance/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room1.inc => SeafloorCavern_Room1/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room2.inc => SeafloorCavern_Room2/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room3.inc => SeafloorCavern_Room3/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room4.inc => SeafloorCavern_Room4/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room5.inc => SeafloorCavern_Room5/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room6.inc => SeafloorCavern_Room6/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room7.inc => SeafloorCavern_Room7/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room8.inc => SeafloorCavern_Room8/events.inc} (100%) rename data/maps/{events/SeafloorCavern_Room9.inc => SeafloorCavern_Room9/events.inc} (100%) rename data/maps/{events/SealedChamber_InnerRoom.inc => SealedChamber_InnerRoom/events.inc} (100%) rename data/maps/{events/SealedChamber_OuterRoom.inc => SealedChamber_OuterRoom/events.inc} (100%) rename data/maps/{events/SecretBase_BlueCave1.inc => SecretBase_BlueCave1/events.inc} (100%) rename data/maps/{events/SecretBase_BlueCave2.inc => SecretBase_BlueCave2/events.inc} (100%) rename data/maps/{events/SecretBase_BlueCave3.inc => SecretBase_BlueCave3/events.inc} (100%) rename data/maps/{events/SecretBase_BlueCave4.inc => SecretBase_BlueCave4/events.inc} (100%) rename data/maps/{events/SecretBase_BrownCave1.inc => SecretBase_BrownCave1/events.inc} (100%) rename data/maps/{events/SecretBase_BrownCave2.inc => SecretBase_BrownCave2/events.inc} (100%) rename data/maps/{events/SecretBase_BrownCave3.inc => SecretBase_BrownCave3/events.inc} (100%) rename data/maps/{events/SecretBase_BrownCave4.inc => SecretBase_BrownCave4/events.inc} (100%) rename data/maps/{events/SecretBase_RedCave1.inc => SecretBase_RedCave1/events.inc} (100%) rename data/maps/{events/SecretBase_RedCave2.inc => SecretBase_RedCave2/events.inc} (100%) rename data/maps/{events/SecretBase_RedCave3.inc => SecretBase_RedCave3/events.inc} (100%) rename data/maps/{events/SecretBase_RedCave4.inc => SecretBase_RedCave4/events.inc} (100%) rename data/maps/{events/SecretBase_Shrub1.inc => SecretBase_Shrub1/events.inc} (100%) rename data/maps/{events/SecretBase_Shrub2.inc => SecretBase_Shrub2/events.inc} (100%) rename data/maps/{events/SecretBase_Shrub3.inc => SecretBase_Shrub3/events.inc} (100%) rename data/maps/{events/SecretBase_Shrub4.inc => SecretBase_Shrub4/events.inc} (100%) rename data/maps/{events/SecretBase_Tree1.inc => SecretBase_Tree1/events.inc} (100%) rename data/maps/{events/SecretBase_Tree2.inc => SecretBase_Tree2/events.inc} (100%) rename data/maps/{events/SecretBase_Tree3.inc => SecretBase_Tree3/events.inc} (100%) rename data/maps/{events/SecretBase_Tree4.inc => SecretBase_Tree4/events.inc} (100%) rename data/maps/{events/SecretBase_YellowCave1.inc => SecretBase_YellowCave1/events.inc} (100%) rename data/maps/{events/SecretBase_YellowCave2.inc => SecretBase_YellowCave2/events.inc} (100%) rename data/maps/{events/SecretBase_YellowCave3.inc => SecretBase_YellowCave3/events.inc} (100%) rename data/maps/{events/SecretBase_YellowCave4.inc => SecretBase_YellowCave4/events.inc} (100%) rename data/maps/{events/ShoalCave_HighTideEntranceRoom.inc => ShoalCave_HighTideEntranceRoom/events.inc} (100%) rename data/maps/{events/ShoalCave_HighTideInnerRoom.inc => ShoalCave_HighTideInnerRoom/events.inc} (100%) rename data/maps/{events/ShoalCave_LowTideEntranceRoom.inc => ShoalCave_LowTideEntranceRoom/events.inc} (100%) rename data/maps/{events/ShoalCave_LowTideIceRoom.inc => ShoalCave_LowTideIceRoom/events.inc} (100%) rename data/maps/{events/ShoalCave_LowTideInnerRoom.inc => ShoalCave_LowTideInnerRoom/events.inc} (100%) rename data/maps/{events/ShoalCave_LowTideLowerRoom.inc => ShoalCave_LowTideLowerRoom/events.inc} (100%) rename data/maps/{events/ShoalCave_LowTideStairsRoom.inc => ShoalCave_LowTideStairsRoom/events.inc} (100%) rename data/maps/{events/SingleBattleColosseum.inc => SingleBattleColosseum/events.inc} (100%) rename data/maps/{events/SkyPillar_1F.inc => SkyPillar_1F/events.inc} (100%) rename data/maps/{events/SkyPillar_2F.inc => SkyPillar_2F/events.inc} (100%) rename data/maps/{events/SkyPillar_3F.inc => SkyPillar_3F/events.inc} (100%) rename data/maps/{events/SkyPillar_4F.inc => SkyPillar_4F/events.inc} (100%) rename data/maps/{events/SkyPillar_5F.inc => SkyPillar_5F/events.inc} (100%) rename data/maps/{events/SkyPillar_Entrance.inc => SkyPillar_Entrance/events.inc} (100%) rename data/maps/{events/SkyPillar_Outside.inc => SkyPillar_Outside/events.inc} (100%) rename data/maps/{events/SkyPillar_Top.inc => SkyPillar_Top/events.inc} (100%) rename data/maps/{events/SlateportCity.inc => SlateportCity/events.inc} (100%) rename data/maps/{events/SlateportCity_ContestHall.inc => SlateportCity_ContestHall/events.inc} (100%) rename data/maps/{events/SlateportCity_ContestLobby.inc => SlateportCity_ContestLobby/events.inc} (100%) rename data/maps/{events/SlateportCity_Harbor.inc => SlateportCity_Harbor/events.inc} (100%) rename data/maps/{events/SlateportCity_House1.inc => SlateportCity_House1/events.inc} (100%) rename data/maps/{events/SlateportCity_House2.inc => SlateportCity_House2/events.inc} (100%) rename data/maps/{events/SlateportCity_Mart.inc => SlateportCity_Mart/events.inc} (100%) rename data/maps/{events/SlateportCity_OceanicMuseum_1F.inc => SlateportCity_OceanicMuseum_1F/events.inc} (100%) rename data/maps/{events/SlateportCity_OceanicMuseum_2F.inc => SlateportCity_OceanicMuseum_2F/events.inc} (100%) rename data/maps/{events/SlateportCity_PokemonCenter_1F.inc => SlateportCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/SlateportCity_PokemonCenter_2F.inc => SlateportCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/SlateportCity_PokemonFanClub.inc => SlateportCity_PokemonFanClub/events.inc} (100%) rename data/maps/{events/SlateportCity_SternsShipyard_1F.inc => SlateportCity_SternsShipyard_1F/events.inc} (100%) rename data/maps/{events/SlateportCity_SternsShipyard_2F.inc => SlateportCity_SternsShipyard_2F/events.inc} (100%) rename data/maps/{events/SootopolisCity.inc => SootopolisCity/events.inc} (100%) rename data/maps/{events/SootopolisCity_Gym_1F.inc => SootopolisCity_Gym_1F/events.inc} (100%) rename data/maps/{events/SootopolisCity_Gym_B1F.inc => SootopolisCity_Gym_B1F/events.inc} (100%) rename data/maps/{events/SootopolisCity_House1.inc => SootopolisCity_House1/events.inc} (100%) rename data/maps/{events/SootopolisCity_House2.inc => SootopolisCity_House2/events.inc} (100%) rename data/maps/{events/SootopolisCity_House3.inc => SootopolisCity_House3/events.inc} (100%) rename data/maps/{events/SootopolisCity_House4.inc => SootopolisCity_House4/events.inc} (100%) rename data/maps/{events/SootopolisCity_House5.inc => SootopolisCity_House5/events.inc} (100%) rename data/maps/{events/SootopolisCity_House6.inc => SootopolisCity_House6/events.inc} (100%) rename data/maps/{events/SootopolisCity_House7.inc => SootopolisCity_House7/events.inc} (100%) rename data/maps/{events/SootopolisCity_House8.inc => SootopolisCity_House8/events.inc} (100%) rename data/maps/{events/SootopolisCity_Mart.inc => SootopolisCity_Mart/events.inc} (100%) rename data/maps/{events/SootopolisCity_PokemonCenter_1F.inc => SootopolisCity_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/SootopolisCity_PokemonCenter_2F.inc => SootopolisCity_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/SouthernIsland_Exterior.inc => SouthernIsland_Exterior/events.inc} (100%) rename data/maps/{events/SouthernIsland_Interior.inc => SouthernIsland_Interior/events.inc} (100%) rename data/maps/{events/TradeCenter.inc => TradeCenter/events.inc} (100%) rename data/maps/{events/Underwater1.inc => Underwater1/events.inc} (100%) rename data/maps/{events/Underwater2.inc => Underwater2/events.inc} (100%) rename data/maps/{events/Underwater3.inc => Underwater3/events.inc} (100%) rename data/maps/{events/Underwater4.inc => Underwater4/events.inc} (100%) rename data/maps/{events/Underwater_Route134.inc => Underwater_Route134/events.inc} (100%) rename data/maps/{events/Underwater_SeafloorCavern.inc => Underwater_SeafloorCavern/events.inc} (100%) rename data/maps/{events/Underwater_SealedChamber.inc => Underwater_SealedChamber/events.inc} (100%) rename data/maps/{events/Underwater_SootopolisCity.inc => Underwater_SootopolisCity/events.inc} (100%) rename data/maps/{events/UnknownMap_25_29.inc => UnknownMap_25_29/events.inc} (100%) rename data/maps/{events/UnknownMap_25_30.inc => UnknownMap_25_30/events.inc} (100%) rename data/maps/{events/UnknownMap_25_31.inc => UnknownMap_25_31/events.inc} (100%) rename data/maps/{events/UnknownMap_25_32.inc => UnknownMap_25_32/events.inc} (100%) rename data/maps/{events/UnknownMap_25_33.inc => UnknownMap_25_33/events.inc} (100%) rename data/maps/{events/UnknownMap_25_34.inc => UnknownMap_25_34/events.inc} (100%) rename data/maps/{events/VerdanturfTown.inc => VerdanturfTown/events.inc} (100%) rename data/maps/{events/VerdanturfTown_ContestHall.inc => VerdanturfTown_ContestHall/events.inc} (100%) rename data/maps/{events/VerdanturfTown_ContestLobby.inc => VerdanturfTown_ContestLobby/events.inc} (100%) rename data/maps/{events/VerdanturfTown_FriendshipRatersHouse.inc => VerdanturfTown_FriendshipRatersHouse/events.inc} (100%) rename data/maps/{events/VerdanturfTown_House.inc => VerdanturfTown_House/events.inc} (100%) rename data/maps/{events/VerdanturfTown_Mart.inc => VerdanturfTown_Mart/events.inc} (100%) rename data/maps/{events/VerdanturfTown_PokemonCenter_1F.inc => VerdanturfTown_PokemonCenter_1F/events.inc} (100%) rename data/maps/{events/VerdanturfTown_PokemonCenter_2F.inc => VerdanturfTown_PokemonCenter_2F/events.inc} (100%) rename data/maps/{events/VerdanturfTown_WandasHouse.inc => VerdanturfTown_WandasHouse/events.inc} (100%) rename data/maps/{events/VictoryRoad_1F.inc => VictoryRoad_1F/events.inc} (100%) rename data/maps/{events/VictoryRoad_B1F.inc => VictoryRoad_B1F/events.inc} (100%) rename data/maps/{events/VictoryRoad_B2F.inc => VictoryRoad_B2F/events.inc} (100%) rename data/maps/{_groups.inc => groups.inc} (100%) diff --git a/data/maps/_assets.inc b/data/layouts.inc similarity index 100% rename from data/maps/_assets.inc rename to data/layouts.inc diff --git a/data/maps/attributes_table.inc b/data/layouts_table.inc similarity index 100% rename from data/maps/attributes_table.inc rename to data/layouts_table.inc 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 similarity index 100% rename from data/maps/events/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/events.inc diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/events.inc diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/events.inc diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Deck.inc rename to data/maps/AbandonedShip_Deck/events.inc diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/events.inc diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/events.inc diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Room_B1F.inc rename to data/maps/AbandonedShip_Room_B1F/events.inc diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/events.inc diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/events.inc diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/events.inc diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/events.inc diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Underwater1.inc rename to data/maps/AbandonedShip_Underwater1/events.inc diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Underwater2.inc rename to data/maps/AbandonedShip_Underwater2/events.inc diff --git a/data/maps/events/AncientTomb.inc b/data/maps/AncientTomb/events.inc similarity index 100% rename from data/maps/events/AncientTomb.inc rename to data/maps/AncientTomb/events.inc diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/events.inc diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/events.inc diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/events.inc diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/BattleTower_BattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleTower_BattleRoom.inc rename to data/maps/BattleTower_BattleRoom/events.inc diff --git a/data/maps/events/BattleTower_Corridor.inc b/data/maps/BattleTower_Corridor/events.inc similarity index 100% rename from data/maps/events/BattleTower_Corridor.inc rename to data/maps/BattleTower_Corridor/events.inc diff --git a/data/maps/events/BattleTower_Elevator.inc b/data/maps/BattleTower_Elevator/events.inc similarity index 100% rename from data/maps/events/BattleTower_Elevator.inc rename to data/maps/BattleTower_Elevator/events.inc diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/BattleTower_Lobby/events.inc similarity index 100% rename from data/maps/events/BattleTower_Lobby.inc rename to data/maps/BattleTower_Lobby/events.inc diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/events.inc similarity index 100% rename from data/maps/events/BattleTower_Outside.inc rename to data/maps/BattleTower_Outside/events.inc diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_1F.inc rename to data/maps/CaveOfOrigin_1F/events.inc diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_B1F.inc rename to data/maps/CaveOfOrigin_B1F/events.inc diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/CaveOfOrigin_B2F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_B2F.inc rename to data/maps/CaveOfOrigin_B2F/events.inc diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/CaveOfOrigin_B3F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_B3F.inc rename to data/maps/CaveOfOrigin_B3F/events.inc diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/CaveOfOrigin_B4F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_B4F.inc rename to data/maps/CaveOfOrigin_B4F/events.inc diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_Entrance.inc rename to data/maps/CaveOfOrigin_Entrance/events.inc diff --git a/data/maps/events/DesertRuins.inc b/data/maps/DesertRuins/events.inc similarity index 100% rename from data/maps/events/DesertRuins.inc rename to data/maps/DesertRuins/events.inc diff --git a/data/maps/events/DewfordTown.inc b/data/maps/DewfordTown/events.inc similarity index 100% rename from data/maps/events/DewfordTown.inc rename to data/maps/DewfordTown/events.inc diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/events.inc similarity index 100% rename from data/maps/events/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/events.inc diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/events.inc similarity index 100% rename from data/maps/events/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/events.inc diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/events.inc similarity index 100% rename from data/maps/events/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/events.inc diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/events.inc similarity index 100% rename from data/maps/events/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/events.inc diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/events.inc diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/DewfordTown_PokemonCenter_2F.inc rename to data/maps/DewfordTown_PokemonCenter_2F/events.inc diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc similarity index 100% rename from data/maps/events/DoubleBattleColosseum.inc rename to data/maps/DoubleBattleColosseum/events.inc diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity.inc rename to data/maps/EverGrandeCity/events.inc diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/events.inc diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/EverGrandeCity_Corridor1/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Corridor1.inc rename to data/maps/EverGrandeCity_Corridor1/events.inc diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/EverGrandeCity_Corridor2/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Corridor2.inc rename to data/maps/EverGrandeCity_Corridor2/events.inc diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/EverGrandeCity_Corridor3/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Corridor3.inc rename to data/maps/EverGrandeCity_Corridor3/events.inc diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/EverGrandeCity_Corridor4/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Corridor4.inc rename to data/maps/EverGrandeCity_Corridor4/events.inc diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/EverGrandeCity_Corridor5/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Corridor5.inc rename to data/maps/EverGrandeCity_Corridor5/events.inc diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/events.inc diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/events.inc diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/events.inc diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/events.inc diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonCenter_2F.inc rename to data/maps/EverGrandeCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/EverGrandeCity_PokemonLeague/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonLeague.inc rename to data/maps/EverGrandeCity_PokemonLeague/events.inc diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/events.inc diff --git a/data/maps/events/FallarborTown.inc b/data/maps/FallarborTown/events.inc similarity index 100% rename from data/maps/events/FallarborTown.inc rename to data/maps/FallarborTown/events.inc diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/events.inc similarity index 100% rename from data/maps/events/FallarborTown_ContestHall.inc rename to data/maps/FallarborTown_ContestHall/events.inc diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/events.inc similarity index 100% rename from data/maps/events/FallarborTown_ContestLobby.inc rename to data/maps/FallarborTown_ContestLobby/events.inc diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/events.inc similarity index 100% rename from data/maps/events/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/events.inc diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/events.inc similarity index 100% rename from data/maps/events/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/events.inc diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/events.inc similarity index 100% rename from data/maps/events/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/events.inc diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/events.inc diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/FallarborTown_PokemonCenter_2F.inc rename to data/maps/FallarborTown_PokemonCenter_2F/events.inc diff --git a/data/maps/events/FieryPath.inc b/data/maps/FieryPath/events.inc similarity index 100% rename from data/maps/events/FieryPath.inc rename to data/maps/FieryPath/events.inc diff --git a/data/maps/events/FortreeCity.inc b/data/maps/FortreeCity/events.inc similarity index 100% rename from data/maps/events/FortreeCity.inc rename to data/maps/FortreeCity/events.inc diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/events.inc similarity index 100% rename from data/maps/events/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/events.inc diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/events.inc similarity index 100% rename from data/maps/events/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/events.inc diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/events.inc diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/events.inc diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/events.inc diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/events.inc diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/events.inc diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/events.inc similarity index 100% rename from data/maps/events/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/events.inc diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/FortreeCity_PokemonCenter_2F.inc rename to data/maps/FortreeCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/events.inc diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_B1F.inc rename to data/maps/GraniteCave_B1F/events.inc diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_B2F.inc rename to data/maps/GraniteCave_B2F/events.inc diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/events.inc similarity index 100% rename from data/maps/events/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/events.inc diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/InsideOfTruck/events.inc similarity index 100% rename from data/maps/events/InsideOfTruck.inc rename to data/maps/InsideOfTruck/events.inc diff --git a/data/maps/events/IslandCave.inc b/data/maps/IslandCave/events.inc similarity index 100% rename from data/maps/events/IslandCave.inc rename to data/maps/IslandCave/events.inc diff --git a/data/maps/events/JaggedPass.inc b/data/maps/JaggedPass/events.inc similarity index 100% rename from data/maps/events/JaggedPass.inc rename to data/maps/JaggedPass/events.inc diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/LavaridgeTown/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown.inc rename to data/maps/LavaridgeTown/events.inc diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/events.inc diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Gym_B1F.inc rename to data/maps/LavaridgeTown_Gym_B1F/events.inc diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/events.inc diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/events.inc diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/events.inc diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/events.inc diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_PokemonCenter_2F.inc rename to data/maps/LavaridgeTown_PokemonCenter_2F/events.inc diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/LilycoveCity/events.inc similarity index 100% rename from data/maps/events/LilycoveCity.inc rename to data/maps/LilycoveCity/events.inc diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/events.inc diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/events.inc diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStoreElevator.inc rename to data/maps/LilycoveCity_DepartmentStoreElevator/events.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/events.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/events.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/events.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/events.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/events.inc diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/LilycoveCity_EmptyMap/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_EmptyMap.inc rename to data/maps/LilycoveCity_EmptyMap/events.inc diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/events.inc diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/events.inc diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/events.inc diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/events.inc diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/events.inc diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/events.inc diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonCenter_2F.inc rename to data/maps/LilycoveCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_UnusedMart.inc rename to data/maps/LilycoveCity_UnusedMart/events.inc diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom1.inc rename to data/maps/LinkContestRoom1/events.inc diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom2.inc rename to data/maps/LinkContestRoom2/events.inc diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom3.inc rename to data/maps/LinkContestRoom3/events.inc diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom4.inc rename to data/maps/LinkContestRoom4/events.inc diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom5.inc rename to data/maps/LinkContestRoom5/events.inc diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom6.inc rename to data/maps/LinkContestRoom6/events.inc diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/LittlerootTown/events.inc similarity index 100% rename from data/maps/events/LittlerootTown.inc rename to data/maps/LittlerootTown/events.inc diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/events.inc diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/events.inc diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/events.inc diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/events.inc diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/events.inc diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_1F.inc rename to data/maps/MagmaHideout_1F/events.inc diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/MagmaHideout_B1F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_B1F.inc rename to data/maps/MagmaHideout_B1F/events.inc diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/MagmaHideout_B2F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_B2F.inc rename to data/maps/MagmaHideout_B2F/events.inc diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/MauvilleCity/events.inc similarity index 100% rename from data/maps/events/MauvilleCity.inc rename to data/maps/MauvilleCity/events.inc diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/events.inc diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/events.inc diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/events.inc diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/events.inc diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/events.inc diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/events.inc diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/events.inc diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/events.inc diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_B1F_1R.inc rename to data/maps/MeteorFalls_B1F_1R/events.inc diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_B1F_2R.inc rename to data/maps/MeteorFalls_B1F_2R/events.inc diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/MossdeepCity/events.inc similarity index 100% rename from data/maps/events/MossdeepCity.inc rename to data/maps/MossdeepCity/events.inc diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/events.inc diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/events.inc diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/events.inc diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/events.inc diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/events.inc diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/events.inc diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/events.inc diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/events.inc diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/events.inc diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/events.inc diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/events.inc diff --git a/data/maps/events/MtChimney.inc b/data/maps/MtChimney/events.inc similarity index 100% rename from data/maps/events/MtChimney.inc rename to data/maps/MtChimney/events.inc diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/events.inc similarity index 100% rename from data/maps/events/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/events.inc diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/MtPyre_1F/events.inc similarity index 100% rename from data/maps/events/MtPyre_1F.inc rename to data/maps/MtPyre_1F/events.inc diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/MtPyre_2F/events.inc similarity index 100% rename from data/maps/events/MtPyre_2F.inc rename to data/maps/MtPyre_2F/events.inc diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/MtPyre_3F/events.inc similarity index 100% rename from data/maps/events/MtPyre_3F.inc rename to data/maps/MtPyre_3F/events.inc diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/MtPyre_4F/events.inc similarity index 100% rename from data/maps/events/MtPyre_4F.inc rename to data/maps/MtPyre_4F/events.inc diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/MtPyre_5F/events.inc similarity index 100% rename from data/maps/events/MtPyre_5F.inc rename to data/maps/MtPyre_5F/events.inc diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/MtPyre_6F/events.inc similarity index 100% rename from data/maps/events/MtPyre_6F.inc rename to data/maps/MtPyre_6F/events.inc diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/events.inc similarity index 100% rename from data/maps/events/MtPyre_Exterior.inc rename to data/maps/MtPyre_Exterior/events.inc diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/events.inc similarity index 100% rename from data/maps/events/MtPyre_Summit.inc rename to data/maps/MtPyre_Summit/events.inc diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc similarity index 100% rename from data/maps/events/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/events.inc diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/events.inc similarity index 100% rename from data/maps/events/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/events.inc diff --git a/data/maps/events/OldaleTown.inc b/data/maps/OldaleTown/events.inc similarity index 100% rename from data/maps/events/OldaleTown.inc rename to data/maps/OldaleTown/events.inc diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/events.inc similarity index 100% rename from data/maps/events/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/events.inc diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/events.inc similarity index 100% rename from data/maps/events/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/events.inc diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/events.inc similarity index 100% rename from data/maps/events/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/events.inc diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/events.inc diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/OldaleTown_PokemonCenter_2F.inc rename to data/maps/OldaleTown_PokemonCenter_2F/events.inc diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/PacifidlogTown/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown.inc rename to data/maps/PacifidlogTown/events.inc diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/events.inc diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/events.inc diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/events.inc diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/events.inc diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/events.inc diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/events.inc diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_PokemonCenter_2F.inc rename to data/maps/PacifidlogTown_PokemonCenter_2F/events.inc diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/PetalburgCity/events.inc similarity index 100% rename from data/maps/events/PetalburgCity.inc rename to data/maps/PetalburgCity/events.inc diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/events.inc diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/events.inc diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/events.inc diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/events.inc diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_PokemonCenter_2F.inc rename to data/maps/PetalburgCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/events.inc diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/PetalburgWoods/events.inc similarity index 100% rename from data/maps/events/PetalburgWoods.inc rename to data/maps/PetalburgWoods/events.inc diff --git a/data/maps/events/RecordCorner.inc b/data/maps/RecordCorner/events.inc similarity index 100% rename from data/maps/events/RecordCorner.inc rename to data/maps/RecordCorner/events.inc diff --git a/data/maps/events/Route101.inc b/data/maps/Route101/events.inc similarity index 100% rename from data/maps/events/Route101.inc rename to data/maps/Route101/events.inc diff --git a/data/maps/events/Route102.inc b/data/maps/Route102/events.inc similarity index 100% rename from data/maps/events/Route102.inc rename to data/maps/Route102/events.inc diff --git a/data/maps/events/Route103.inc b/data/maps/Route103/events.inc similarity index 100% rename from data/maps/events/Route103.inc rename to data/maps/Route103/events.inc diff --git a/data/maps/events/Route104.inc b/data/maps/Route104/events.inc similarity index 100% rename from data/maps/events/Route104.inc rename to data/maps/Route104/events.inc diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/events.inc similarity index 100% rename from data/maps/events/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/events.inc diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc similarity index 100% rename from data/maps/events/Route104_PrettyPetalFlowerShop.inc rename to data/maps/Route104_PrettyPetalFlowerShop/events.inc diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc similarity index 100% rename from data/maps/events/Route104_Prototype.inc rename to data/maps/Route104_Prototype/events.inc diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc similarity index 100% rename from data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc diff --git a/data/maps/events/Route105.inc b/data/maps/Route105/events.inc similarity index 100% rename from data/maps/events/Route105.inc rename to data/maps/Route105/events.inc diff --git a/data/maps/events/Route106.inc b/data/maps/Route106/events.inc similarity index 100% rename from data/maps/events/Route106.inc rename to data/maps/Route106/events.inc diff --git a/data/maps/events/Route107.inc b/data/maps/Route107/events.inc similarity index 100% rename from data/maps/events/Route107.inc rename to data/maps/Route107/events.inc diff --git a/data/maps/events/Route108.inc b/data/maps/Route108/events.inc similarity index 100% rename from data/maps/events/Route108.inc rename to data/maps/Route108/events.inc diff --git a/data/maps/events/Route109.inc b/data/maps/Route109/events.inc similarity index 100% rename from data/maps/events/Route109.inc rename to data/maps/Route109/events.inc diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/events.inc similarity index 100% rename from data/maps/events/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/events.inc diff --git a/data/maps/events/Route110.inc b/data/maps/Route110/events.inc similarity index 100% rename from data/maps/events/Route110.inc rename to data/maps/Route110/events.inc diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc similarity index 100% rename from data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc rename to data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc similarity index 100% rename from data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc rename to data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseCorridor.inc rename to data/maps/Route110_TrickHouseCorridor/events.inc diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/events.inc diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/events.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/events.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/events.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/events.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/events.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/events.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/events.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/events.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/events.inc diff --git a/data/maps/events/Route111.inc b/data/maps/Route111/events.inc similarity index 100% rename from data/maps/events/Route111.inc rename to data/maps/Route111/events.inc diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/events.inc similarity index 100% rename from data/maps/events/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/events.inc diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc similarity index 100% rename from data/maps/events/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/events.inc diff --git a/data/maps/events/Route112.inc b/data/maps/Route112/events.inc similarity index 100% rename from data/maps/events/Route112.inc rename to data/maps/Route112/events.inc diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/events.inc similarity index 100% rename from data/maps/events/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/events.inc diff --git a/data/maps/events/Route113.inc b/data/maps/Route113/events.inc similarity index 100% rename from data/maps/events/Route113.inc rename to data/maps/Route113/events.inc diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/events.inc similarity index 100% rename from data/maps/events/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/events.inc diff --git a/data/maps/events/Route114.inc b/data/maps/Route114/events.inc similarity index 100% rename from data/maps/events/Route114.inc rename to data/maps/Route114/events.inc diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/events.inc similarity index 100% rename from data/maps/events/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/events.inc diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc similarity index 100% rename from data/maps/events/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/events.inc diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/events.inc similarity index 100% rename from data/maps/events/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/events.inc diff --git a/data/maps/events/Route115.inc b/data/maps/Route115/events.inc similarity index 100% rename from data/maps/events/Route115.inc rename to data/maps/Route115/events.inc diff --git a/data/maps/events/Route116.inc b/data/maps/Route116/events.inc similarity index 100% rename from data/maps/events/Route116.inc rename to data/maps/Route116/events.inc diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/events.inc similarity index 100% rename from data/maps/events/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/events.inc diff --git a/data/maps/events/Route117.inc b/data/maps/Route117/events.inc similarity index 100% rename from data/maps/events/Route117.inc rename to data/maps/Route117/events.inc diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/events.inc similarity index 100% rename from data/maps/events/Route117_PokemonDayCare.inc rename to data/maps/Route117_PokemonDayCare/events.inc diff --git a/data/maps/events/Route118.inc b/data/maps/Route118/events.inc similarity index 100% rename from data/maps/events/Route118.inc rename to data/maps/Route118/events.inc diff --git a/data/maps/events/Route119.inc b/data/maps/Route119/events.inc similarity index 100% rename from data/maps/events/Route119.inc rename to data/maps/Route119/events.inc diff --git a/data/maps/events/Route119_House.inc b/data/maps/Route119_House/events.inc similarity index 100% rename from data/maps/events/Route119_House.inc rename to data/maps/Route119_House/events.inc diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc similarity index 100% rename from data/maps/events/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/events.inc diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc similarity index 100% rename from data/maps/events/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/events.inc diff --git a/data/maps/events/Route120.inc b/data/maps/Route120/events.inc similarity index 100% rename from data/maps/events/Route120.inc rename to data/maps/Route120/events.inc diff --git a/data/maps/events/Route121.inc b/data/maps/Route121/events.inc similarity index 100% rename from data/maps/events/Route121.inc rename to data/maps/Route121/events.inc diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/events.inc similarity index 100% rename from data/maps/events/Route121_SafariZoneEntrance.inc rename to data/maps/Route121_SafariZoneEntrance/events.inc diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc similarity index 100% rename from data/maps/events/Route122.inc rename to data/maps/Route122/events.inc diff --git a/data/maps/events/Route123.inc b/data/maps/Route123/events.inc similarity index 100% rename from data/maps/events/Route123.inc rename to data/maps/Route123/events.inc diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/events.inc similarity index 100% rename from data/maps/events/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/events.inc diff --git a/data/maps/events/Route124.inc b/data/maps/Route124/events.inc similarity index 100% rename from data/maps/events/Route124.inc rename to data/maps/Route124/events.inc diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc similarity index 100% rename from data/maps/events/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/events.inc diff --git a/data/maps/events/Route125.inc b/data/maps/Route125/events.inc similarity index 100% rename from data/maps/events/Route125.inc rename to data/maps/Route125/events.inc diff --git a/data/maps/events/Route126.inc b/data/maps/Route126/events.inc similarity index 100% rename from data/maps/events/Route126.inc rename to data/maps/Route126/events.inc diff --git a/data/maps/events/Route127.inc b/data/maps/Route127/events.inc similarity index 100% rename from data/maps/events/Route127.inc rename to data/maps/Route127/events.inc diff --git a/data/maps/events/Route128.inc b/data/maps/Route128/events.inc similarity index 100% rename from data/maps/events/Route128.inc rename to data/maps/Route128/events.inc diff --git a/data/maps/events/Route129.inc b/data/maps/Route129/events.inc similarity index 100% rename from data/maps/events/Route129.inc rename to data/maps/Route129/events.inc diff --git a/data/maps/events/Route130.inc b/data/maps/Route130/events.inc similarity index 100% rename from data/maps/events/Route130.inc rename to data/maps/Route130/events.inc diff --git a/data/maps/events/Route131.inc b/data/maps/Route131/events.inc similarity index 100% rename from data/maps/events/Route131.inc rename to data/maps/Route131/events.inc diff --git a/data/maps/events/Route132.inc b/data/maps/Route132/events.inc similarity index 100% rename from data/maps/events/Route132.inc rename to data/maps/Route132/events.inc diff --git a/data/maps/events/Route133.inc b/data/maps/Route133/events.inc similarity index 100% rename from data/maps/events/Route133.inc rename to data/maps/Route133/events.inc diff --git a/data/maps/events/Route134.inc b/data/maps/Route134/events.inc similarity index 100% rename from data/maps/events/Route134.inc rename to data/maps/Route134/events.inc diff --git a/data/maps/events/RustboroCity.inc b/data/maps/RustboroCity/events.inc similarity index 100% rename from data/maps/events/RustboroCity.inc rename to data/maps/RustboroCity/events.inc diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/events.inc similarity index 100% rename from data/maps/events/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/events.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/events.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/events.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/events.inc diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/events.inc diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/events.inc diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/events.inc diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/events.inc diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/events.inc diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/events.inc diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/events.inc diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/events.inc diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/events.inc diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/events.inc diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonCenter_2F.inc rename to data/maps/RustboroCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/events.inc diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/RusturfTunnel/events.inc similarity index 100% rename from data/maps/events/RusturfTunnel.inc rename to data/maps/RusturfTunnel/events.inc diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/events.inc similarity index 100% rename from data/maps/events/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/events.inc diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/events.inc similarity index 100% rename from data/maps/events/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/events.inc diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/SSTidalRooms/events.inc similarity index 100% rename from data/maps/events/SSTidalRooms.inc rename to data/maps/SSTidalRooms/events.inc diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/events.inc similarity index 100% rename from data/maps/events/SafariZone_Northeast.inc rename to data/maps/SafariZone_Northeast/events.inc diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/events.inc similarity index 100% rename from data/maps/events/SafariZone_Northwest.inc rename to data/maps/SafariZone_Northwest/events.inc diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/events.inc similarity index 100% rename from data/maps/events/SafariZone_RestHouse.inc rename to data/maps/SafariZone_RestHouse/events.inc diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/events.inc similarity index 100% rename from data/maps/events/SafariZone_Southeast.inc rename to data/maps/SafariZone_Southeast/events.inc diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/events.inc similarity index 100% rename from data/maps/events/SafariZone_Southwest.inc rename to data/maps/SafariZone_Southwest/events.inc diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/ScorchedSlab/events.inc similarity index 100% rename from data/maps/events/ScorchedSlab.inc rename to data/maps/ScorchedSlab/events.inc diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Entrance.inc rename to data/maps/SeafloorCavern_Entrance/events.inc diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/events.inc diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room2.inc rename to data/maps/SeafloorCavern_Room2/events.inc diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/events.inc diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/events.inc diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room5.inc rename to data/maps/SeafloorCavern_Room5/events.inc diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room6.inc rename to data/maps/SeafloorCavern_Room6/events.inc diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room7.inc rename to data/maps/SeafloorCavern_Room7/events.inc diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room8.inc rename to data/maps/SeafloorCavern_Room8/events.inc diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room9.inc rename to data/maps/SeafloorCavern_Room9/events.inc diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc similarity index 100% rename from data/maps/events/SealedChamber_InnerRoom.inc rename to data/maps/SealedChamber_InnerRoom/events.inc diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc similarity index 100% rename from data/maps/events/SealedChamber_OuterRoom.inc rename to data/maps/SealedChamber_OuterRoom/events.inc diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave1.inc rename to data/maps/SecretBase_BlueCave1/events.inc diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave2.inc rename to data/maps/SecretBase_BlueCave2/events.inc diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave3.inc rename to data/maps/SecretBase_BlueCave3/events.inc diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave4.inc rename to data/maps/SecretBase_BlueCave4/events.inc diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave1.inc rename to data/maps/SecretBase_BrownCave1/events.inc diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave2.inc rename to data/maps/SecretBase_BrownCave2/events.inc diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave3.inc rename to data/maps/SecretBase_BrownCave3/events.inc diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave4.inc rename to data/maps/SecretBase_BrownCave4/events.inc diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/events.inc diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave2.inc rename to data/maps/SecretBase_RedCave2/events.inc diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave3.inc rename to data/maps/SecretBase_RedCave3/events.inc diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave4.inc rename to data/maps/SecretBase_RedCave4/events.inc diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub1.inc rename to data/maps/SecretBase_Shrub1/events.inc diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub2.inc rename to data/maps/SecretBase_Shrub2/events.inc diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub3.inc rename to data/maps/SecretBase_Shrub3/events.inc diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub4.inc rename to data/maps/SecretBase_Shrub4/events.inc diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree1.inc rename to data/maps/SecretBase_Tree1/events.inc diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree2.inc rename to data/maps/SecretBase_Tree2/events.inc diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree3.inc rename to data/maps/SecretBase_Tree3/events.inc diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree4.inc rename to data/maps/SecretBase_Tree4/events.inc diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave1.inc rename to data/maps/SecretBase_YellowCave1/events.inc diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave2.inc rename to data/maps/SecretBase_YellowCave2/events.inc diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave3.inc rename to data/maps/SecretBase_YellowCave3/events.inc diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave4.inc rename to data/maps/SecretBase_YellowCave4/events.inc diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_HighTideEntranceRoom.inc rename to data/maps/ShoalCave_HighTideEntranceRoom/events.inc diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_HighTideInnerRoom.inc rename to data/maps/ShoalCave_HighTideInnerRoom/events.inc diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/events.inc diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideIceRoom.inc rename to data/maps/ShoalCave_LowTideIceRoom/events.inc diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/events.inc diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/events.inc diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/events.inc diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/events.inc similarity index 100% rename from data/maps/events/SingleBattleColosseum.inc rename to data/maps/SingleBattleColosseum/events.inc diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_1F.inc rename to data/maps/SkyPillar_1F/events.inc diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_2F.inc rename to data/maps/SkyPillar_2F/events.inc diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_3F.inc rename to data/maps/SkyPillar_3F/events.inc diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_4F.inc rename to data/maps/SkyPillar_4F/events.inc diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_5F.inc rename to data/maps/SkyPillar_5F/events.inc diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Entrance.inc rename to data/maps/SkyPillar_Entrance/events.inc diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Outside.inc rename to data/maps/SkyPillar_Outside/events.inc diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Top.inc rename to data/maps/SkyPillar_Top/events.inc diff --git a/data/maps/events/SlateportCity.inc b/data/maps/SlateportCity/events.inc similarity index 100% rename from data/maps/events/SlateportCity.inc rename to data/maps/SlateportCity/events.inc diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/events.inc similarity index 100% rename from data/maps/events/SlateportCity_ContestHall.inc rename to data/maps/SlateportCity_ContestHall/events.inc diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/events.inc similarity index 100% rename from data/maps/events/SlateportCity_ContestLobby.inc rename to data/maps/SlateportCity_ContestLobby/events.inc diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/events.inc similarity index 100% rename from data/maps/events/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/events.inc diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/events.inc similarity index 100% rename from data/maps/events/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/events.inc diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/events.inc similarity index 100% rename from data/maps/events/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/events.inc diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/events.inc similarity index 100% rename from data/maps/events/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/events.inc diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/events.inc diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/events.inc diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonCenter_2F.inc rename to data/maps/SlateportCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/events.inc diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/events.inc diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/events.inc diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/SootopolisCity/events.inc similarity index 100% rename from data/maps/events/SootopolisCity.inc rename to data/maps/SootopolisCity/events.inc diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/events.inc diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/events.inc diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/events.inc diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/events.inc diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/events.inc diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/events.inc diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/events.inc diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/events.inc diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/events.inc diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House8.inc rename to data/maps/SootopolisCity_House8/events.inc diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/events.inc diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/events.inc diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_PokemonCenter_2F.inc rename to data/maps/SootopolisCity_PokemonCenter_2F/events.inc diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/events.inc similarity index 100% rename from data/maps/events/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/events.inc diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/events.inc similarity index 100% rename from data/maps/events/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/events.inc diff --git a/data/maps/events/TradeCenter.inc b/data/maps/TradeCenter/events.inc similarity index 100% rename from data/maps/events/TradeCenter.inc rename to data/maps/TradeCenter/events.inc diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc similarity index 100% rename from data/maps/events/Underwater1.inc rename to data/maps/Underwater1/events.inc diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc similarity index 100% rename from data/maps/events/Underwater2.inc rename to data/maps/Underwater2/events.inc diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc similarity index 100% rename from data/maps/events/Underwater3.inc rename to data/maps/Underwater3/events.inc diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc similarity index 100% rename from data/maps/events/Underwater4.inc rename to data/maps/Underwater4/events.inc diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc similarity index 100% rename from data/maps/events/Underwater_Route134.inc rename to data/maps/Underwater_Route134/events.inc diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/events.inc similarity index 100% rename from data/maps/events/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/events.inc diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc similarity index 100% rename from data/maps/events/Underwater_SealedChamber.inc rename to data/maps/Underwater_SealedChamber/events.inc diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc similarity index 100% rename from data/maps/events/Underwater_SootopolisCity.inc rename to data/maps/Underwater_SootopolisCity/events.inc diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_29.inc rename to data/maps/UnknownMap_25_29/events.inc diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_30.inc rename to data/maps/UnknownMap_25_30/events.inc diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_31.inc rename to data/maps/UnknownMap_25_31/events.inc diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_32.inc rename to data/maps/UnknownMap_25_32/events.inc diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_33.inc rename to data/maps/UnknownMap_25_33/events.inc diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_34.inc rename to data/maps/UnknownMap_25_34/events.inc diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/VerdanturfTown/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown.inc rename to data/maps/VerdanturfTown/events.inc diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_ContestHall.inc rename to data/maps/VerdanturfTown_ContestHall/events.inc diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_ContestLobby.inc rename to data/maps/VerdanturfTown_ContestLobby/events.inc diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/events.inc diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/events.inc diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/events.inc diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_PokemonCenter_2F.inc rename to data/maps/VerdanturfTown_PokemonCenter_2F/events.inc diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/events.inc diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/events.inc diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/events.inc diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/events.inc diff --git a/data/maps/_groups.inc b/data/maps/groups.inc similarity index 100% rename from data/maps/_groups.inc rename to data/maps/groups.inc From 6dc3c869391bb56f5d6f872cf51ab717dfca9f31 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:16 -0500 Subject: [PATCH 4/9] Move map scripts into 'data/maps//scripts.inc' --- data-de/event_scripts.s | 788 +++++++++--------- data/event_scripts.s | 788 +++++++++--------- .../AbandonedShip_CaptainsOffice/scripts.inc} | 0 .../AbandonedShip_Corridors_1F/scripts.inc} | 0 .../AbandonedShip_Corridors_B1F/scripts.inc} | 0 .../AbandonedShip_Deck/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../AbandonedShip_Room_B1F/scripts.inc} | 0 .../AbandonedShip_Rooms2_1F/scripts.inc} | 0 .../AbandonedShip_Rooms2_B1F/scripts.inc} | 0 .../AbandonedShip_Rooms_1F/scripts.inc} | 0 .../AbandonedShip_Rooms_B1F/scripts.inc} | 0 .../AbandonedShip_Underwater1/scripts.inc} | 0 .../AbandonedShip_Underwater2/scripts.inc} | 0 .../AncientTomb/scripts.inc} | 0 .../AquaHideout_1F/scripts.inc} | 0 .../AquaHideout_B1F/scripts.inc} | 0 .../AquaHideout_B2F/scripts.inc} | 0 .../BattleTower_BattleRoom/scripts.inc} | 0 .../BattleTower_Corridor/scripts.inc} | 0 .../BattleTower_Elevator/scripts.inc} | 0 .../BattleTower_Lobby/scripts.inc} | 0 .../BattleTower_Outside/scripts.inc} | 0 .../CaveOfOrigin_1F/scripts.inc} | 0 .../CaveOfOrigin_B1F/scripts.inc} | 0 .../CaveOfOrigin_B2F/scripts.inc} | 0 .../CaveOfOrigin_B3F/scripts.inc} | 0 .../CaveOfOrigin_B4F/scripts.inc} | 0 .../CaveOfOrigin_Entrance/scripts.inc} | 0 .../DesertRuins/scripts.inc} | 0 .../DewfordTown/scripts.inc} | 0 .../DewfordTown_Gym/scripts.inc} | 0 .../DewfordTown_Hall/scripts.inc} | 0 .../DewfordTown_House1/scripts.inc} | 0 .../DewfordTown_House2/scripts.inc} | 0 .../DewfordTown_PokemonCenter_1F/scripts.inc} | 0 .../DewfordTown_PokemonCenter_2F/scripts.inc} | 0 .../DoubleBattleColosseum/scripts.inc} | 0 .../EverGrandeCity/scripts.inc} | 0 .../EverGrandeCity_ChampionsRoom/scripts.inc} | 0 .../EverGrandeCity_Corridor1/scripts.inc} | 0 .../EverGrandeCity_Corridor2/scripts.inc} | 0 .../EverGrandeCity_Corridor3/scripts.inc} | 0 .../EverGrandeCity_Corridor4/scripts.inc} | 0 .../EverGrandeCity_Corridor5/scripts.inc} | 0 .../EverGrandeCity_DrakesRoom/scripts.inc} | 0 .../EverGrandeCity_GlaciasRoom/scripts.inc} | 0 .../EverGrandeCity_HallOfFame/scripts.inc} | 0 .../EverGrandeCity_PhoebesRoom/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../EverGrandeCity_PokemonLeague/scripts.inc} | 0 .../EverGrandeCity_SidneysRoom/scripts.inc} | 0 .../FallarborTown/scripts.inc} | 0 .../FallarborTown_ContestHall/scripts.inc} | 0 .../FallarborTown_ContestLobby/scripts.inc} | 0 .../FallarborTown_House1/scripts.inc} | 0 .../FallarborTown_House2/scripts.inc} | 0 .../FallarborTown_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../FieryPath/scripts.inc} | 0 .../FortreeCity/scripts.inc} | 0 .../FortreeCity_DecorationShop/scripts.inc} | 0 .../FortreeCity_Gym/scripts.inc} | 0 .../FortreeCity_House1/scripts.inc} | 0 .../FortreeCity_House2/scripts.inc} | 0 .../FortreeCity_House3/scripts.inc} | 0 .../FortreeCity_House4/scripts.inc} | 0 .../FortreeCity_House5/scripts.inc} | 0 .../FortreeCity_Mart/scripts.inc} | 0 .../FortreeCity_PokemonCenter_1F/scripts.inc} | 0 .../FortreeCity_PokemonCenter_2F/scripts.inc} | 0 .../GraniteCave_1F/scripts.inc} | 0 .../GraniteCave_B1F/scripts.inc} | 0 .../GraniteCave_B2F/scripts.inc} | 0 .../GraniteCave_StevensRoom/scripts.inc} | 0 .../InsideOfTruck/scripts.inc} | 0 .../IslandCave/scripts.inc} | 0 .../JaggedPass/scripts.inc} | 0 .../LavaridgeTown/scripts.inc} | 0 .../LavaridgeTown_Gym_1F/scripts.inc} | 0 .../LavaridgeTown_Gym_B1F/scripts.inc} | 0 .../LavaridgeTown_HerbShop/scripts.inc} | 0 .../LavaridgeTown_House/scripts.inc} | 0 .../LavaridgeTown_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../LilycoveCity/scripts.inc} | 0 .../LilycoveCity_ContestHall/scripts.inc} | 0 .../LilycoveCity_ContestLobby/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../LilycoveCity_EmptyMap/scripts.inc} | 0 .../LilycoveCity_Harbor/scripts.inc} | 0 .../LilycoveCity_House1/scripts.inc} | 0 .../LilycoveCity_House2/scripts.inc} | 0 .../LilycoveCity_House3/scripts.inc} | 0 .../LilycoveCity_House4/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../LilycoveCity_UnusedMart/scripts.inc} | 0 .../LinkContestRoom1/scripts.inc} | 0 .../LinkContestRoom2/scripts.inc} | 0 .../LinkContestRoom3/scripts.inc} | 0 .../LinkContestRoom4/scripts.inc} | 0 .../LinkContestRoom5/scripts.inc} | 0 .../LinkContestRoom6/scripts.inc} | 0 .../LittlerootTown/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../LittlerootTown_MaysHouse_1F/scripts.inc} | 0 .../LittlerootTown_MaysHouse_2F/scripts.inc} | 0 .../scripts.inc} | 0 .../MagmaHideout_1F/scripts.inc} | 0 .../MagmaHideout_B1F/scripts.inc} | 0 .../MagmaHideout_B2F/scripts.inc} | 0 .../MauvilleCity/scripts.inc} | 0 .../MauvilleCity_BikeShop/scripts.inc} | 0 .../MauvilleCity_GameCorner/scripts.inc} | 0 .../MauvilleCity_Gym/scripts.inc} | 0 .../MauvilleCity_House1/scripts.inc} | 0 .../MauvilleCity_House2/scripts.inc} | 0 .../MauvilleCity_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../MeteorFalls_1F_1R/scripts.inc} | 0 .../MeteorFalls_1F_2R/scripts.inc} | 0 .../MeteorFalls_B1F_1R/scripts.inc} | 0 .../MeteorFalls_B1F_2R/scripts.inc} | 0 .../MossdeepCity/scripts.inc} | 0 .../MossdeepCity_GameCorner_1F/scripts.inc} | 0 .../MossdeepCity_GameCorner_B1F/scripts.inc} | 0 .../MossdeepCity_Gym/scripts.inc} | 0 .../MossdeepCity_House1/scripts.inc} | 0 .../MossdeepCity_House2/scripts.inc} | 0 .../MossdeepCity_House3/scripts.inc} | 0 .../MossdeepCity_House4/scripts.inc} | 0 .../MossdeepCity_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../MossdeepCity_SpaceCenter_1F/scripts.inc} | 0 .../MossdeepCity_SpaceCenter_2F/scripts.inc} | 0 .../MossdeepCity_StevensHouse/scripts.inc} | 0 .../MtChimney/scripts.inc} | 0 .../MtChimney_CableCarStation/scripts.inc} | 0 .../MtPyre_1F/scripts.inc} | 0 .../MtPyre_2F/scripts.inc} | 0 .../MtPyre_3F/scripts.inc} | 0 .../MtPyre_4F/scripts.inc} | 0 .../MtPyre_5F/scripts.inc} | 0 .../MtPyre_6F/scripts.inc} | 0 .../MtPyre_Exterior/scripts.inc} | 0 .../MtPyre_Summit/scripts.inc} | 0 .../NewMauville_Entrance/scripts.inc} | 0 .../NewMauville_Inside/scripts.inc} | 0 .../OldaleTown/scripts.inc} | 0 .../OldaleTown_House1/scripts.inc} | 0 .../OldaleTown_House2/scripts.inc} | 0 .../OldaleTown_Mart/scripts.inc} | 0 .../OldaleTown_PokemonCenter_1F/scripts.inc} | 0 .../OldaleTown_PokemonCenter_2F/scripts.inc} | 0 .../PacifidlogTown/scripts.inc} | 0 .../PacifidlogTown_House1/scripts.inc} | 0 .../PacifidlogTown_House2/scripts.inc} | 0 .../PacifidlogTown_House3/scripts.inc} | 0 .../PacifidlogTown_House4/scripts.inc} | 0 .../PacifidlogTown_House5/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../PetalburgCity/scripts.inc} | 0 .../PetalburgCity_Gym/scripts.inc} | 0 .../PetalburgCity_House1/scripts.inc} | 0 .../PetalburgCity_House2/scripts.inc} | 0 .../PetalburgCity_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../PetalburgCity_WallysHouse/scripts.inc} | 0 .../PetalburgWoods/scripts.inc} | 0 .../RecordCorner/scripts.inc} | 0 .../Route101/scripts.inc} | 0 .../Route102/scripts.inc} | 0 .../Route103/scripts.inc} | 0 .../Route104/scripts.inc} | 0 .../Route104_MrBrineysHouse/scripts.inc} | 0 .../scripts.inc} | 0 .../Route104_Prototype/scripts.inc} | 0 .../scripts.inc} | 0 .../Route105/scripts.inc} | 0 .../Route106/scripts.inc} | 0 .../Route107/scripts.inc} | 0 .../Route108/scripts.inc} | 0 .../Route109/scripts.inc} | 0 .../Route109_SeashoreHouse/scripts.inc} | 0 .../Route110/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../Route110_TrickHouseCorridor/scripts.inc} | 0 .../Route110_TrickHouseEnd/scripts.inc} | 0 .../Route110_TrickHouseEntrance/scripts.inc} | 0 .../Route110_TrickHousePuzzle1/scripts.inc} | 0 .../Route110_TrickHousePuzzle2/scripts.inc} | 0 .../Route110_TrickHousePuzzle3/scripts.inc} | 0 .../Route110_TrickHousePuzzle4/scripts.inc} | 0 .../Route110_TrickHousePuzzle5/scripts.inc} | 0 .../Route110_TrickHousePuzzle6/scripts.inc} | 0 .../Route110_TrickHousePuzzle7/scripts.inc} | 0 .../Route110_TrickHousePuzzle8/scripts.inc} | 0 .../Route111/scripts.inc} | 0 .../Route111_OldLadysRestStop/scripts.inc} | 0 .../scripts.inc} | 0 .../Route112/scripts.inc} | 0 .../Route112_CableCarStation/scripts.inc} | 0 .../Route113/scripts.inc} | 0 .../Route113_GlassWorkshop/scripts.inc} | 0 .../Route114/scripts.inc} | 0 .../Route114_FossilManiacsHouse/scripts.inc} | 0 .../Route114_FossilManiacsTunnel/scripts.inc} | 0 .../Route114_LanettesHouse/scripts.inc} | 0 .../Route115/scripts.inc} | 0 .../Route116/scripts.inc} | 0 .../Route116_TunnelersRestHouse/scripts.inc} | 0 .../Route117/scripts.inc} | 0 .../Route117_PokemonDayCare/scripts.inc} | 0 .../Route118/scripts.inc} | 0 .../Route119/scripts.inc} | 0 .../Route119_House/scripts.inc} | 0 .../Route119_WeatherInstitute_1F/scripts.inc} | 0 .../Route119_WeatherInstitute_2F/scripts.inc} | 0 .../Route120/scripts.inc} | 0 .../Route121/scripts.inc} | 0 .../Route121_SafariZoneEntrance/scripts.inc} | 0 .../Route122/scripts.inc} | 0 .../Route123/scripts.inc} | 0 .../Route123_BerryMastersHouse/scripts.inc} | 0 .../Route124/scripts.inc} | 0 .../scripts.inc} | 0 .../Route125/scripts.inc} | 0 .../Route126/scripts.inc} | 0 .../Route127/scripts.inc} | 0 .../Route128/scripts.inc} | 0 .../Route129/scripts.inc} | 0 .../Route130/scripts.inc} | 0 .../Route131/scripts.inc} | 0 .../Route132/scripts.inc} | 0 .../Route133/scripts.inc} | 0 .../Route134/scripts.inc} | 0 .../RustboroCity/scripts.inc} | 0 .../RustboroCity_CuttersHouse/scripts.inc} | 0 .../RustboroCity_DevonCorp_1F/scripts.inc} | 0 .../RustboroCity_DevonCorp_2F/scripts.inc} | 0 .../RustboroCity_DevonCorp_3F/scripts.inc} | 0 .../RustboroCity_Flat1_1F/scripts.inc} | 0 .../RustboroCity_Flat1_2F/scripts.inc} | 0 .../RustboroCity_Flat2_1F/scripts.inc} | 0 .../RustboroCity_Flat2_2F/scripts.inc} | 0 .../RustboroCity_Flat2_3F/scripts.inc} | 0 .../RustboroCity_Gym/scripts.inc} | 0 .../RustboroCity_House1/scripts.inc} | 0 .../RustboroCity_House2/scripts.inc} | 0 .../RustboroCity_House3/scripts.inc} | 0 .../RustboroCity_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../RustboroCity_PokemonSchool/scripts.inc} | 0 .../RusturfTunnel/scripts.inc} | 0 .../SSTidalCorridor/scripts.inc} | 0 .../SSTidalLowerDeck/scripts.inc} | 0 .../SSTidalRooms/scripts.inc} | 0 .../SafariZone_Northeast/scripts.inc} | 0 .../SafariZone_Northwest/scripts.inc} | 0 .../SafariZone_RestHouse/scripts.inc} | 0 .../SafariZone_Southeast/scripts.inc} | 0 .../SafariZone_Southwest/scripts.inc} | 0 .../ScorchedSlab/scripts.inc} | 0 .../SeafloorCavern_Entrance/scripts.inc} | 0 .../SeafloorCavern_Room1/scripts.inc} | 0 .../SeafloorCavern_Room2/scripts.inc} | 0 .../SeafloorCavern_Room3/scripts.inc} | 0 .../SeafloorCavern_Room4/scripts.inc} | 0 .../SeafloorCavern_Room5/scripts.inc} | 0 .../SeafloorCavern_Room6/scripts.inc} | 0 .../SeafloorCavern_Room7/scripts.inc} | 0 .../SeafloorCavern_Room8/scripts.inc} | 0 .../SeafloorCavern_Room9/scripts.inc} | 0 .../SealedChamber_InnerRoom/scripts.inc} | 0 .../SealedChamber_OuterRoom/scripts.inc} | 0 .../SecretBase_BlueCave1/scripts.inc} | 0 .../SecretBase_BlueCave2/scripts.inc} | 0 .../SecretBase_BlueCave3/scripts.inc} | 0 .../SecretBase_BlueCave4/scripts.inc} | 0 .../SecretBase_BrownCave1/scripts.inc} | 0 .../SecretBase_BrownCave2/scripts.inc} | 0 .../SecretBase_BrownCave3/scripts.inc} | 0 .../SecretBase_BrownCave4/scripts.inc} | 0 .../SecretBase_RedCave1/scripts.inc} | 0 .../SecretBase_RedCave2/scripts.inc} | 0 .../SecretBase_RedCave3/scripts.inc} | 0 .../SecretBase_RedCave4/scripts.inc} | 0 .../SecretBase_Shrub1/scripts.inc} | 0 .../SecretBase_Shrub2/scripts.inc} | 0 .../SecretBase_Shrub3/scripts.inc} | 0 .../SecretBase_Shrub4/scripts.inc} | 0 .../SecretBase_Tree1/scripts.inc} | 0 .../SecretBase_Tree2/scripts.inc} | 0 .../SecretBase_Tree3/scripts.inc} | 0 .../SecretBase_Tree4/scripts.inc} | 0 .../SecretBase_YellowCave1/scripts.inc} | 0 .../SecretBase_YellowCave2/scripts.inc} | 0 .../SecretBase_YellowCave3/scripts.inc} | 0 .../SecretBase_YellowCave4/scripts.inc} | 0 .../scripts.inc} | 0 .../ShoalCave_HighTideInnerRoom/scripts.inc} | 0 .../scripts.inc} | 0 .../ShoalCave_LowTideIceRoom/scripts.inc} | 0 .../ShoalCave_LowTideInnerRoom/scripts.inc} | 0 .../ShoalCave_LowTideLowerRoom/scripts.inc} | 0 .../ShoalCave_LowTideStairsRoom/scripts.inc} | 0 .../SingleBattleColosseum/scripts.inc} | 0 .../SkyPillar_1F/scripts.inc} | 0 .../SkyPillar_2F/scripts.inc} | 0 .../SkyPillar_3F/scripts.inc} | 0 .../SkyPillar_4F/scripts.inc} | 0 .../SkyPillar_5F/scripts.inc} | 0 .../SkyPillar_Entrance/scripts.inc} | 0 .../SkyPillar_Outside/scripts.inc} | 0 .../SkyPillar_Top/scripts.inc} | 0 .../SlateportCity/scripts.inc} | 0 .../SlateportCity_ContestHall/scripts.inc} | 0 .../SlateportCity_ContestLobby/scripts.inc} | 0 .../SlateportCity_Harbor/scripts.inc} | 0 .../SlateportCity_House1/scripts.inc} | 0 .../SlateportCity_House2/scripts.inc} | 0 .../SlateportCity_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../SlateportCity_PokemonFanClub/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../SootopolisCity/scripts.inc} | 0 .../SootopolisCity_Gym_1F/scripts.inc} | 0 .../SootopolisCity_Gym_B1F/scripts.inc} | 0 .../SootopolisCity_House1/scripts.inc} | 0 .../SootopolisCity_House2/scripts.inc} | 0 .../SootopolisCity_House3/scripts.inc} | 0 .../SootopolisCity_House4/scripts.inc} | 0 .../SootopolisCity_House5/scripts.inc} | 0 .../SootopolisCity_House6/scripts.inc} | 0 .../SootopolisCity_House7/scripts.inc} | 0 .../SootopolisCity_House8/scripts.inc} | 0 .../SootopolisCity_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../SouthernIsland_Exterior/scripts.inc} | 0 .../SouthernIsland_Interior/scripts.inc} | 0 .../TradeCenter/scripts.inc} | 0 .../Underwater1/scripts.inc} | 0 .../Underwater2/scripts.inc} | 0 .../Underwater3/scripts.inc} | 0 .../Underwater4/scripts.inc} | 0 .../Underwater_Route134/scripts.inc} | 0 .../Underwater_SeafloorCavern/scripts.inc} | 0 .../Underwater_SealedChamber/scripts.inc} | 0 .../Underwater_SootopolisCity/scripts.inc} | 0 .../UnknownMap_25_29/scripts.inc} | 0 .../UnknownMap_25_30/scripts.inc} | 0 .../UnknownMap_25_31/scripts.inc} | 0 .../UnknownMap_25_32/scripts.inc} | 0 .../UnknownMap_25_33/scripts.inc} | 0 .../UnknownMap_25_34/scripts.inc} | 0 .../VerdanturfTown/scripts.inc} | 0 .../VerdanturfTown_ContestHall/scripts.inc} | 0 .../VerdanturfTown_ContestLobby/scripts.inc} | 0 .../scripts.inc} | 0 .../VerdanturfTown_House/scripts.inc} | 0 .../VerdanturfTown_Mart/scripts.inc} | 0 .../scripts.inc} | 0 .../scripts.inc} | 0 .../VerdanturfTown_WandasHouse/scripts.inc} | 0 .../VictoryRoad_1F/scripts.inc} | 0 .../VictoryRoad_B1F/scripts.inc} | 0 .../VictoryRoad_B2F/scripts.inc} | 0 data/text/maps/Route125.s | 0 data/text/maps/Route126.s | 0 data/text/maps/Route127.s | 0 data/text/maps/Route129.s | 0 data/text/maps/Route130.s | 0 data/text/maps/Route131.s | 0 data/text/maps/Route132.s | 0 data/text/maps/Route133.s | 0 data/text/maps/Route134.s | 0 405 files changed, 788 insertions(+), 788 deletions(-) rename data/{scripts/maps/AbandonedShip_CaptainsOffice.inc => maps/AbandonedShip_CaptainsOffice/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Corridors_1F.inc => maps/AbandonedShip_Corridors_1F/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Corridors_B1F.inc => maps/AbandonedShip_Corridors_B1F/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Deck.inc => maps/AbandonedShip_Deck/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_HiddenFloorCorridors.inc => maps/AbandonedShip_HiddenFloorCorridors/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_HiddenFloorRooms.inc => maps/AbandonedShip_HiddenFloorRooms/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Room_B1F.inc => maps/AbandonedShip_Room_B1F/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms2_1F.inc => maps/AbandonedShip_Rooms2_1F/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms2_B1F.inc => maps/AbandonedShip_Rooms2_B1F/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms_1F.inc => maps/AbandonedShip_Rooms_1F/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms_B1F.inc => maps/AbandonedShip_Rooms_B1F/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Underwater1.inc => maps/AbandonedShip_Underwater1/scripts.inc} (100%) rename data/{scripts/maps/AbandonedShip_Underwater2.inc => maps/AbandonedShip_Underwater2/scripts.inc} (100%) rename data/{scripts/maps/AncientTomb.inc => maps/AncientTomb/scripts.inc} (100%) rename data/{scripts/maps/AquaHideout_1F.inc => maps/AquaHideout_1F/scripts.inc} (100%) rename data/{scripts/maps/AquaHideout_B1F.inc => maps/AquaHideout_B1F/scripts.inc} (100%) rename data/{scripts/maps/AquaHideout_B2F.inc => maps/AquaHideout_B2F/scripts.inc} (100%) rename data/{scripts/maps/BattleTower_BattleRoom.inc => maps/BattleTower_BattleRoom/scripts.inc} (100%) rename data/{scripts/maps/BattleTower_Corridor.inc => maps/BattleTower_Corridor/scripts.inc} (100%) rename data/{scripts/maps/BattleTower_Elevator.inc => maps/BattleTower_Elevator/scripts.inc} (100%) rename data/{scripts/maps/BattleTower_Lobby.inc => maps/BattleTower_Lobby/scripts.inc} (100%) rename data/{scripts/maps/BattleTower_Outside.inc => maps/BattleTower_Outside/scripts.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_1F.inc => maps/CaveOfOrigin_1F/scripts.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_B1F.inc => maps/CaveOfOrigin_B1F/scripts.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_B2F.inc => maps/CaveOfOrigin_B2F/scripts.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_B3F.inc => maps/CaveOfOrigin_B3F/scripts.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_B4F.inc => maps/CaveOfOrigin_B4F/scripts.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_Entrance.inc => maps/CaveOfOrigin_Entrance/scripts.inc} (100%) rename data/{scripts/maps/DesertRuins.inc => maps/DesertRuins/scripts.inc} (100%) rename data/{scripts/maps/DewfordTown.inc => maps/DewfordTown/scripts.inc} (100%) rename data/{scripts/maps/DewfordTown_Gym.inc => maps/DewfordTown_Gym/scripts.inc} (100%) rename data/{scripts/maps/DewfordTown_Hall.inc => maps/DewfordTown_Hall/scripts.inc} (100%) rename data/{scripts/maps/DewfordTown_House1.inc => maps/DewfordTown_House1/scripts.inc} (100%) rename data/{scripts/maps/DewfordTown_House2.inc => maps/DewfordTown_House2/scripts.inc} (100%) rename data/{scripts/maps/DewfordTown_PokemonCenter_1F.inc => maps/DewfordTown_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/DewfordTown_PokemonCenter_2F.inc => maps/DewfordTown_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/DoubleBattleColosseum.inc => maps/DoubleBattleColosseum/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity.inc => maps/EverGrandeCity/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_ChampionsRoom.inc => maps/EverGrandeCity_ChampionsRoom/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Corridor1.inc => maps/EverGrandeCity_Corridor1/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Corridor2.inc => maps/EverGrandeCity_Corridor2/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Corridor3.inc => maps/EverGrandeCity_Corridor3/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Corridor4.inc => maps/EverGrandeCity_Corridor4/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Corridor5.inc => maps/EverGrandeCity_Corridor5/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_DrakesRoom.inc => maps/EverGrandeCity_DrakesRoom/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_GlaciasRoom.inc => maps/EverGrandeCity_GlaciasRoom/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_HallOfFame.inc => maps/EverGrandeCity_HallOfFame/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PhoebesRoom.inc => maps/EverGrandeCity_PhoebesRoom/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonCenter_1F.inc => maps/EverGrandeCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonCenter_2F.inc => maps/EverGrandeCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonLeague.inc => maps/EverGrandeCity_PokemonLeague/scripts.inc} (100%) rename data/{scripts/maps/EverGrandeCity_SidneysRoom.inc => maps/EverGrandeCity_SidneysRoom/scripts.inc} (100%) rename data/{scripts/maps/FallarborTown.inc => maps/FallarborTown/scripts.inc} (100%) rename data/{scripts/maps/FallarborTown_ContestHall.inc => maps/FallarborTown_ContestHall/scripts.inc} (100%) rename data/{scripts/maps/FallarborTown_ContestLobby.inc => maps/FallarborTown_ContestLobby/scripts.inc} (100%) rename data/{scripts/maps/FallarborTown_House1.inc => maps/FallarborTown_House1/scripts.inc} (100%) rename data/{scripts/maps/FallarborTown_House2.inc => maps/FallarborTown_House2/scripts.inc} (100%) rename data/{scripts/maps/FallarborTown_Mart.inc => maps/FallarborTown_Mart/scripts.inc} (100%) rename data/{scripts/maps/FallarborTown_PokemonCenter_1F.inc => maps/FallarborTown_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/FallarborTown_PokemonCenter_2F.inc => maps/FallarborTown_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/FieryPath.inc => maps/FieryPath/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity.inc => maps/FortreeCity/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_DecorationShop.inc => maps/FortreeCity_DecorationShop/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_Gym.inc => maps/FortreeCity_Gym/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_House1.inc => maps/FortreeCity_House1/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_House2.inc => maps/FortreeCity_House2/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_House3.inc => maps/FortreeCity_House3/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_House4.inc => maps/FortreeCity_House4/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_House5.inc => maps/FortreeCity_House5/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_Mart.inc => maps/FortreeCity_Mart/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_PokemonCenter_1F.inc => maps/FortreeCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/FortreeCity_PokemonCenter_2F.inc => maps/FortreeCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/GraniteCave_1F.inc => maps/GraniteCave_1F/scripts.inc} (100%) rename data/{scripts/maps/GraniteCave_B1F.inc => maps/GraniteCave_B1F/scripts.inc} (100%) rename data/{scripts/maps/GraniteCave_B2F.inc => maps/GraniteCave_B2F/scripts.inc} (100%) rename data/{scripts/maps/GraniteCave_StevensRoom.inc => maps/GraniteCave_StevensRoom/scripts.inc} (100%) rename data/{scripts/maps/InsideOfTruck.inc => maps/InsideOfTruck/scripts.inc} (100%) rename data/{scripts/maps/IslandCave.inc => maps/IslandCave/scripts.inc} (100%) rename data/{scripts/maps/JaggedPass.inc => maps/JaggedPass/scripts.inc} (100%) rename data/{scripts/maps/LavaridgeTown.inc => maps/LavaridgeTown/scripts.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Gym_1F.inc => maps/LavaridgeTown_Gym_1F/scripts.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Gym_B1F.inc => maps/LavaridgeTown_Gym_B1F/scripts.inc} (100%) rename data/{scripts/maps/LavaridgeTown_HerbShop.inc => maps/LavaridgeTown_HerbShop/scripts.inc} (100%) rename data/{scripts/maps/LavaridgeTown_House.inc => maps/LavaridgeTown_House/scripts.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Mart.inc => maps/LavaridgeTown_Mart/scripts.inc} (100%) rename data/{scripts/maps/LavaridgeTown_PokemonCenter_1F.inc => maps/LavaridgeTown_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/LavaridgeTown_PokemonCenter_2F.inc => maps/LavaridgeTown_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity.inc => maps/LilycoveCity/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_ContestHall.inc => maps/LilycoveCity_ContestHall/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_ContestLobby.inc => maps/LilycoveCity_ContestLobby/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc => maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc => maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStoreElevator.inc => maps/LilycoveCity_DepartmentStoreElevator/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc => maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_1F.inc => maps/LilycoveCity_DepartmentStore_1F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_2F.inc => maps/LilycoveCity_DepartmentStore_2F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_3F.inc => maps/LilycoveCity_DepartmentStore_3F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_4F.inc => maps/LilycoveCity_DepartmentStore_4F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_5F.inc => maps/LilycoveCity_DepartmentStore_5F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_EmptyMap.inc => maps/LilycoveCity_EmptyMap/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_Harbor.inc => maps/LilycoveCity_Harbor/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_House1.inc => maps/LilycoveCity_House1/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_House2.inc => maps/LilycoveCity_House2/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_House3.inc => maps/LilycoveCity_House3/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_House4.inc => maps/LilycoveCity_House4/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc => maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc => maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_MoveDeletersHouse.inc => maps/LilycoveCity_MoveDeletersHouse/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonCenter_1F.inc => maps/LilycoveCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonCenter_2F.inc => maps/LilycoveCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc => maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc} (100%) rename data/{scripts/maps/LilycoveCity_UnusedMart.inc => maps/LilycoveCity_UnusedMart/scripts.inc} (100%) rename data/{scripts/maps/LinkContestRoom1.inc => maps/LinkContestRoom1/scripts.inc} (100%) rename data/{scripts/maps/LinkContestRoom2.inc => maps/LinkContestRoom2/scripts.inc} (100%) rename data/{scripts/maps/LinkContestRoom3.inc => maps/LinkContestRoom3/scripts.inc} (100%) rename data/{scripts/maps/LinkContestRoom4.inc => maps/LinkContestRoom4/scripts.inc} (100%) rename data/{scripts/maps/LinkContestRoom5.inc => maps/LinkContestRoom5/scripts.inc} (100%) rename data/{scripts/maps/LinkContestRoom6.inc => maps/LinkContestRoom6/scripts.inc} (100%) rename data/{scripts/maps/LittlerootTown.inc => maps/LittlerootTown/scripts.inc} (100%) rename data/{scripts/maps/LittlerootTown_BrendansHouse_1F.inc => maps/LittlerootTown_BrendansHouse_1F/scripts.inc} (100%) rename data/{scripts/maps/LittlerootTown_BrendansHouse_2F.inc => maps/LittlerootTown_BrendansHouse_2F/scripts.inc} (100%) rename data/{scripts/maps/LittlerootTown_MaysHouse_1F.inc => maps/LittlerootTown_MaysHouse_1F/scripts.inc} (100%) rename data/{scripts/maps/LittlerootTown_MaysHouse_2F.inc => maps/LittlerootTown_MaysHouse_2F/scripts.inc} (100%) rename data/{scripts/maps/LittlerootTown_ProfessorBirchsLab.inc => maps/LittlerootTown_ProfessorBirchsLab/scripts.inc} (100%) rename data/{scripts/maps/MagmaHideout_1F.inc => maps/MagmaHideout_1F/scripts.inc} (100%) rename data/{scripts/maps/MagmaHideout_B1F.inc => maps/MagmaHideout_B1F/scripts.inc} (100%) rename data/{scripts/maps/MagmaHideout_B2F.inc => maps/MagmaHideout_B2F/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity.inc => maps/MauvilleCity/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity_BikeShop.inc => maps/MauvilleCity_BikeShop/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity_GameCorner.inc => maps/MauvilleCity_GameCorner/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity_Gym.inc => maps/MauvilleCity_Gym/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity_House1.inc => maps/MauvilleCity_House1/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity_House2.inc => maps/MauvilleCity_House2/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity_Mart.inc => maps/MauvilleCity_Mart/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity_PokemonCenter_1F.inc => maps/MauvilleCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/MauvilleCity_PokemonCenter_2F.inc => maps/MauvilleCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/MeteorFalls_1F_1R.inc => maps/MeteorFalls_1F_1R/scripts.inc} (100%) rename data/{scripts/maps/MeteorFalls_1F_2R.inc => maps/MeteorFalls_1F_2R/scripts.inc} (100%) rename data/{scripts/maps/MeteorFalls_B1F_1R.inc => maps/MeteorFalls_B1F_1R/scripts.inc} (100%) rename data/{scripts/maps/MeteorFalls_B1F_2R.inc => maps/MeteorFalls_B1F_2R/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity.inc => maps/MossdeepCity/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_GameCorner_1F.inc => maps/MossdeepCity_GameCorner_1F/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_GameCorner_B1F.inc => maps/MossdeepCity_GameCorner_B1F/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_Gym.inc => maps/MossdeepCity_Gym/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_House1.inc => maps/MossdeepCity_House1/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_House2.inc => maps/MossdeepCity_House2/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_House3.inc => maps/MossdeepCity_House3/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_House4.inc => maps/MossdeepCity_House4/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_Mart.inc => maps/MossdeepCity_Mart/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_PokemonCenter_1F.inc => maps/MossdeepCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_PokemonCenter_2F.inc => maps/MossdeepCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_SpaceCenter_1F.inc => maps/MossdeepCity_SpaceCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_SpaceCenter_2F.inc => maps/MossdeepCity_SpaceCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/MossdeepCity_StevensHouse.inc => maps/MossdeepCity_StevensHouse/scripts.inc} (100%) rename data/{scripts/maps/MtChimney.inc => maps/MtChimney/scripts.inc} (100%) rename data/{scripts/maps/MtChimney_CableCarStation.inc => maps/MtChimney_CableCarStation/scripts.inc} (100%) rename data/{scripts/maps/MtPyre_1F.inc => maps/MtPyre_1F/scripts.inc} (100%) rename data/{scripts/maps/MtPyre_2F.inc => maps/MtPyre_2F/scripts.inc} (100%) rename data/{scripts/maps/MtPyre_3F.inc => maps/MtPyre_3F/scripts.inc} (100%) rename data/{scripts/maps/MtPyre_4F.inc => maps/MtPyre_4F/scripts.inc} (100%) rename data/{scripts/maps/MtPyre_5F.inc => maps/MtPyre_5F/scripts.inc} (100%) rename data/{scripts/maps/MtPyre_6F.inc => maps/MtPyre_6F/scripts.inc} (100%) rename data/{scripts/maps/MtPyre_Exterior.inc => maps/MtPyre_Exterior/scripts.inc} (100%) rename data/{scripts/maps/MtPyre_Summit.inc => maps/MtPyre_Summit/scripts.inc} (100%) rename data/{scripts/maps/NewMauville_Entrance.inc => maps/NewMauville_Entrance/scripts.inc} (100%) rename data/{scripts/maps/NewMauville_Inside.inc => maps/NewMauville_Inside/scripts.inc} (100%) rename data/{scripts/maps/OldaleTown.inc => maps/OldaleTown/scripts.inc} (100%) rename data/{scripts/maps/OldaleTown_House1.inc => maps/OldaleTown_House1/scripts.inc} (100%) rename data/{scripts/maps/OldaleTown_House2.inc => maps/OldaleTown_House2/scripts.inc} (100%) rename data/{scripts/maps/OldaleTown_Mart.inc => maps/OldaleTown_Mart/scripts.inc} (100%) rename data/{scripts/maps/OldaleTown_PokemonCenter_1F.inc => maps/OldaleTown_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/OldaleTown_PokemonCenter_2F.inc => maps/OldaleTown_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/PacifidlogTown.inc => maps/PacifidlogTown/scripts.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House1.inc => maps/PacifidlogTown_House1/scripts.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House2.inc => maps/PacifidlogTown_House2/scripts.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House3.inc => maps/PacifidlogTown_House3/scripts.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House4.inc => maps/PacifidlogTown_House4/scripts.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House5.inc => maps/PacifidlogTown_House5/scripts.inc} (100%) rename data/{scripts/maps/PacifidlogTown_PokemonCenter_1F.inc => maps/PacifidlogTown_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/PacifidlogTown_PokemonCenter_2F.inc => maps/PacifidlogTown_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/PetalburgCity.inc => maps/PetalburgCity/scripts.inc} (100%) rename data/{scripts/maps/PetalburgCity_Gym.inc => maps/PetalburgCity_Gym/scripts.inc} (100%) rename data/{scripts/maps/PetalburgCity_House1.inc => maps/PetalburgCity_House1/scripts.inc} (100%) rename data/{scripts/maps/PetalburgCity_House2.inc => maps/PetalburgCity_House2/scripts.inc} (100%) rename data/{scripts/maps/PetalburgCity_Mart.inc => maps/PetalburgCity_Mart/scripts.inc} (100%) rename data/{scripts/maps/PetalburgCity_PokemonCenter_1F.inc => maps/PetalburgCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/PetalburgCity_PokemonCenter_2F.inc => maps/PetalburgCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/PetalburgCity_WallysHouse.inc => maps/PetalburgCity_WallysHouse/scripts.inc} (100%) rename data/{scripts/maps/PetalburgWoods.inc => maps/PetalburgWoods/scripts.inc} (100%) rename data/{scripts/maps/RecordCorner.inc => maps/RecordCorner/scripts.inc} (100%) rename data/{scripts/maps/Route101.inc => maps/Route101/scripts.inc} (100%) rename data/{scripts/maps/Route102.inc => maps/Route102/scripts.inc} (100%) rename data/{scripts/maps/Route103.inc => maps/Route103/scripts.inc} (100%) rename data/{scripts/maps/Route104.inc => maps/Route104/scripts.inc} (100%) rename data/{scripts/maps/Route104_MrBrineysHouse.inc => maps/Route104_MrBrineysHouse/scripts.inc} (100%) rename data/{scripts/maps/Route104_PrettyPetalFlowerShop.inc => maps/Route104_PrettyPetalFlowerShop/scripts.inc} (100%) rename data/{scripts/maps/Route104_Prototype.inc => maps/Route104_Prototype/scripts.inc} (100%) rename data/{scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc => maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc} (100%) rename data/{scripts/maps/Route105.inc => maps/Route105/scripts.inc} (100%) rename data/{scripts/maps/Route106.inc => maps/Route106/scripts.inc} (100%) rename data/{scripts/maps/Route107.inc => maps/Route107/scripts.inc} (100%) rename data/{scripts/maps/Route108.inc => maps/Route108/scripts.inc} (100%) rename data/{scripts/maps/Route109.inc => maps/Route109/scripts.inc} (100%) rename data/{scripts/maps/Route109_SeashoreHouse.inc => maps/Route109_SeashoreHouse/scripts.inc} (100%) rename data/{scripts/maps/Route110.inc => maps/Route110/scripts.inc} (100%) rename data/{scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc => maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc} (100%) rename data/{scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc => maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseCorridor.inc => maps/Route110_TrickHouseCorridor/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseEnd.inc => maps/Route110_TrickHouseEnd/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseEntrance.inc => maps/Route110_TrickHouseEntrance/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle1.inc => maps/Route110_TrickHousePuzzle1/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle2.inc => maps/Route110_TrickHousePuzzle2/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle3.inc => maps/Route110_TrickHousePuzzle3/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle4.inc => maps/Route110_TrickHousePuzzle4/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle5.inc => maps/Route110_TrickHousePuzzle5/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle6.inc => maps/Route110_TrickHousePuzzle6/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle7.inc => maps/Route110_TrickHousePuzzle7/scripts.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle8.inc => maps/Route110_TrickHousePuzzle8/scripts.inc} (100%) rename data/{scripts/maps/Route111.inc => maps/Route111/scripts.inc} (100%) rename data/{scripts/maps/Route111_OldLadysRestStop.inc => maps/Route111_OldLadysRestStop/scripts.inc} (100%) rename data/{scripts/maps/Route111_WinstrateFamilysHouse.inc => maps/Route111_WinstrateFamilysHouse/scripts.inc} (100%) rename data/{scripts/maps/Route112.inc => maps/Route112/scripts.inc} (100%) rename data/{scripts/maps/Route112_CableCarStation.inc => maps/Route112_CableCarStation/scripts.inc} (100%) rename data/{scripts/maps/Route113.inc => maps/Route113/scripts.inc} (100%) rename data/{scripts/maps/Route113_GlassWorkshop.inc => maps/Route113_GlassWorkshop/scripts.inc} (100%) rename data/{scripts/maps/Route114.inc => maps/Route114/scripts.inc} (100%) rename data/{scripts/maps/Route114_FossilManiacsHouse.inc => maps/Route114_FossilManiacsHouse/scripts.inc} (100%) rename data/{scripts/maps/Route114_FossilManiacsTunnel.inc => maps/Route114_FossilManiacsTunnel/scripts.inc} (100%) rename data/{scripts/maps/Route114_LanettesHouse.inc => maps/Route114_LanettesHouse/scripts.inc} (100%) rename data/{scripts/maps/Route115.inc => maps/Route115/scripts.inc} (100%) rename data/{scripts/maps/Route116.inc => maps/Route116/scripts.inc} (100%) rename data/{scripts/maps/Route116_TunnelersRestHouse.inc => maps/Route116_TunnelersRestHouse/scripts.inc} (100%) rename data/{scripts/maps/Route117.inc => maps/Route117/scripts.inc} (100%) rename data/{scripts/maps/Route117_PokemonDayCare.inc => maps/Route117_PokemonDayCare/scripts.inc} (100%) rename data/{scripts/maps/Route118.inc => maps/Route118/scripts.inc} (100%) rename data/{scripts/maps/Route119.inc => maps/Route119/scripts.inc} (100%) rename data/{scripts/maps/Route119_House.inc => maps/Route119_House/scripts.inc} (100%) rename data/{scripts/maps/Route119_WeatherInstitute_1F.inc => maps/Route119_WeatherInstitute_1F/scripts.inc} (100%) rename data/{scripts/maps/Route119_WeatherInstitute_2F.inc => maps/Route119_WeatherInstitute_2F/scripts.inc} (100%) rename data/{scripts/maps/Route120.inc => maps/Route120/scripts.inc} (100%) rename data/{scripts/maps/Route121.inc => maps/Route121/scripts.inc} (100%) rename data/{scripts/maps/Route121_SafariZoneEntrance.inc => maps/Route121_SafariZoneEntrance/scripts.inc} (100%) rename data/{scripts/maps/Route122.inc => maps/Route122/scripts.inc} (100%) rename data/{scripts/maps/Route123.inc => maps/Route123/scripts.inc} (100%) rename data/{scripts/maps/Route123_BerryMastersHouse.inc => maps/Route123_BerryMastersHouse/scripts.inc} (100%) rename data/{scripts/maps/Route124.inc => maps/Route124/scripts.inc} (100%) rename data/{scripts/maps/Route124_DivingTreasureHuntersHouse.inc => maps/Route124_DivingTreasureHuntersHouse/scripts.inc} (100%) rename data/{scripts/maps/Route125.inc => maps/Route125/scripts.inc} (100%) rename data/{scripts/maps/Route126.inc => maps/Route126/scripts.inc} (100%) rename data/{scripts/maps/Route127.inc => maps/Route127/scripts.inc} (100%) rename data/{scripts/maps/Route128.inc => maps/Route128/scripts.inc} (100%) rename data/{scripts/maps/Route129.inc => maps/Route129/scripts.inc} (100%) rename data/{scripts/maps/Route130.inc => maps/Route130/scripts.inc} (100%) rename data/{scripts/maps/Route131.inc => maps/Route131/scripts.inc} (100%) rename data/{scripts/maps/Route132.inc => maps/Route132/scripts.inc} (100%) rename data/{scripts/maps/Route133.inc => maps/Route133/scripts.inc} (100%) rename data/{scripts/maps/Route134.inc => maps/Route134/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity.inc => maps/RustboroCity/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_CuttersHouse.inc => maps/RustboroCity_CuttersHouse/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_1F.inc => maps/RustboroCity_DevonCorp_1F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_2F.inc => maps/RustboroCity_DevonCorp_2F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_3F.inc => maps/RustboroCity_DevonCorp_3F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat1_1F.inc => maps/RustboroCity_Flat1_1F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat1_2F.inc => maps/RustboroCity_Flat1_2F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_1F.inc => maps/RustboroCity_Flat2_1F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_2F.inc => maps/RustboroCity_Flat2_2F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_3F.inc => maps/RustboroCity_Flat2_3F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_Gym.inc => maps/RustboroCity_Gym/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_House1.inc => maps/RustboroCity_House1/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_House2.inc => maps/RustboroCity_House2/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_House3.inc => maps/RustboroCity_House3/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_Mart.inc => maps/RustboroCity_Mart/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonCenter_1F.inc => maps/RustboroCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonCenter_2F.inc => maps/RustboroCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonSchool.inc => maps/RustboroCity_PokemonSchool/scripts.inc} (100%) rename data/{scripts/maps/RusturfTunnel.inc => maps/RusturfTunnel/scripts.inc} (100%) rename data/{scripts/maps/SSTidalCorridor.inc => maps/SSTidalCorridor/scripts.inc} (100%) rename data/{scripts/maps/SSTidalLowerDeck.inc => maps/SSTidalLowerDeck/scripts.inc} (100%) rename data/{scripts/maps/SSTidalRooms.inc => maps/SSTidalRooms/scripts.inc} (100%) rename data/{scripts/maps/SafariZone_Northeast.inc => maps/SafariZone_Northeast/scripts.inc} (100%) rename data/{scripts/maps/SafariZone_Northwest.inc => maps/SafariZone_Northwest/scripts.inc} (100%) rename data/{scripts/maps/SafariZone_RestHouse.inc => maps/SafariZone_RestHouse/scripts.inc} (100%) rename data/{scripts/maps/SafariZone_Southeast.inc => maps/SafariZone_Southeast/scripts.inc} (100%) rename data/{scripts/maps/SafariZone_Southwest.inc => maps/SafariZone_Southwest/scripts.inc} (100%) rename data/{scripts/maps/ScorchedSlab.inc => maps/ScorchedSlab/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Entrance.inc => maps/SeafloorCavern_Entrance/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room1.inc => maps/SeafloorCavern_Room1/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room2.inc => maps/SeafloorCavern_Room2/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room3.inc => maps/SeafloorCavern_Room3/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room4.inc => maps/SeafloorCavern_Room4/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room5.inc => maps/SeafloorCavern_Room5/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room6.inc => maps/SeafloorCavern_Room6/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room7.inc => maps/SeafloorCavern_Room7/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room8.inc => maps/SeafloorCavern_Room8/scripts.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room9.inc => maps/SeafloorCavern_Room9/scripts.inc} (100%) rename data/{scripts/maps/SealedChamber_InnerRoom.inc => maps/SealedChamber_InnerRoom/scripts.inc} (100%) rename data/{scripts/maps/SealedChamber_OuterRoom.inc => maps/SealedChamber_OuterRoom/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave1.inc => maps/SecretBase_BlueCave1/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave2.inc => maps/SecretBase_BlueCave2/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave3.inc => maps/SecretBase_BlueCave3/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave4.inc => maps/SecretBase_BlueCave4/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave1.inc => maps/SecretBase_BrownCave1/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave2.inc => maps/SecretBase_BrownCave2/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave3.inc => maps/SecretBase_BrownCave3/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave4.inc => maps/SecretBase_BrownCave4/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave1.inc => maps/SecretBase_RedCave1/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave2.inc => maps/SecretBase_RedCave2/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave3.inc => maps/SecretBase_RedCave3/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave4.inc => maps/SecretBase_RedCave4/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub1.inc => maps/SecretBase_Shrub1/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub2.inc => maps/SecretBase_Shrub2/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub3.inc => maps/SecretBase_Shrub3/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub4.inc => maps/SecretBase_Shrub4/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_Tree1.inc => maps/SecretBase_Tree1/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_Tree2.inc => maps/SecretBase_Tree2/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_Tree3.inc => maps/SecretBase_Tree3/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_Tree4.inc => maps/SecretBase_Tree4/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave1.inc => maps/SecretBase_YellowCave1/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave2.inc => maps/SecretBase_YellowCave2/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave3.inc => maps/SecretBase_YellowCave3/scripts.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave4.inc => maps/SecretBase_YellowCave4/scripts.inc} (100%) rename data/{scripts/maps/ShoalCave_HighTideEntranceRoom.inc => maps/ShoalCave_HighTideEntranceRoom/scripts.inc} (100%) rename data/{scripts/maps/ShoalCave_HighTideInnerRoom.inc => maps/ShoalCave_HighTideInnerRoom/scripts.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideEntranceRoom.inc => maps/ShoalCave_LowTideEntranceRoom/scripts.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideIceRoom.inc => maps/ShoalCave_LowTideIceRoom/scripts.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideInnerRoom.inc => maps/ShoalCave_LowTideInnerRoom/scripts.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideLowerRoom.inc => maps/ShoalCave_LowTideLowerRoom/scripts.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideStairsRoom.inc => maps/ShoalCave_LowTideStairsRoom/scripts.inc} (100%) rename data/{scripts/maps/SingleBattleColosseum.inc => maps/SingleBattleColosseum/scripts.inc} (100%) rename data/{scripts/maps/SkyPillar_1F.inc => maps/SkyPillar_1F/scripts.inc} (100%) rename data/{scripts/maps/SkyPillar_2F.inc => maps/SkyPillar_2F/scripts.inc} (100%) rename data/{scripts/maps/SkyPillar_3F.inc => maps/SkyPillar_3F/scripts.inc} (100%) rename data/{scripts/maps/SkyPillar_4F.inc => maps/SkyPillar_4F/scripts.inc} (100%) rename data/{scripts/maps/SkyPillar_5F.inc => maps/SkyPillar_5F/scripts.inc} (100%) rename data/{scripts/maps/SkyPillar_Entrance.inc => maps/SkyPillar_Entrance/scripts.inc} (100%) rename data/{scripts/maps/SkyPillar_Outside.inc => maps/SkyPillar_Outside/scripts.inc} (100%) rename data/{scripts/maps/SkyPillar_Top.inc => maps/SkyPillar_Top/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity.inc => maps/SlateportCity/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_ContestHall.inc => maps/SlateportCity_ContestHall/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_ContestLobby.inc => maps/SlateportCity_ContestLobby/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_Harbor.inc => maps/SlateportCity_Harbor/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_House1.inc => maps/SlateportCity_House1/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_House2.inc => maps/SlateportCity_House2/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_Mart.inc => maps/SlateportCity_Mart/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_OceanicMuseum_1F.inc => maps/SlateportCity_OceanicMuseum_1F/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_OceanicMuseum_2F.inc => maps/SlateportCity_OceanicMuseum_2F/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonCenter_1F.inc => maps/SlateportCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonCenter_2F.inc => maps/SlateportCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonFanClub.inc => maps/SlateportCity_PokemonFanClub/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_SternsShipyard_1F.inc => maps/SlateportCity_SternsShipyard_1F/scripts.inc} (100%) rename data/{scripts/maps/SlateportCity_SternsShipyard_2F.inc => maps/SlateportCity_SternsShipyard_2F/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity.inc => maps/SootopolisCity/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_Gym_1F.inc => maps/SootopolisCity_Gym_1F/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_Gym_B1F.inc => maps/SootopolisCity_Gym_B1F/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_House1.inc => maps/SootopolisCity_House1/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_House2.inc => maps/SootopolisCity_House2/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_House3.inc => maps/SootopolisCity_House3/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_House4.inc => maps/SootopolisCity_House4/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_House5.inc => maps/SootopolisCity_House5/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_House6.inc => maps/SootopolisCity_House6/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_House7.inc => maps/SootopolisCity_House7/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_House8.inc => maps/SootopolisCity_House8/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_Mart.inc => maps/SootopolisCity_Mart/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_PokemonCenter_1F.inc => maps/SootopolisCity_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/SootopolisCity_PokemonCenter_2F.inc => maps/SootopolisCity_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/SouthernIsland_Exterior.inc => maps/SouthernIsland_Exterior/scripts.inc} (100%) rename data/{scripts/maps/SouthernIsland_Interior.inc => maps/SouthernIsland_Interior/scripts.inc} (100%) rename data/{scripts/maps/TradeCenter.inc => maps/TradeCenter/scripts.inc} (100%) rename data/{scripts/maps/Underwater1.inc => maps/Underwater1/scripts.inc} (100%) rename data/{scripts/maps/Underwater2.inc => maps/Underwater2/scripts.inc} (100%) rename data/{scripts/maps/Underwater3.inc => maps/Underwater3/scripts.inc} (100%) rename data/{scripts/maps/Underwater4.inc => maps/Underwater4/scripts.inc} (100%) rename data/{scripts/maps/Underwater_Route134.inc => maps/Underwater_Route134/scripts.inc} (100%) rename data/{scripts/maps/Underwater_SeafloorCavern.inc => maps/Underwater_SeafloorCavern/scripts.inc} (100%) rename data/{scripts/maps/Underwater_SealedChamber.inc => maps/Underwater_SealedChamber/scripts.inc} (100%) rename data/{scripts/maps/Underwater_SootopolisCity.inc => maps/Underwater_SootopolisCity/scripts.inc} (100%) rename data/{scripts/maps/UnknownMap_25_29.inc => maps/UnknownMap_25_29/scripts.inc} (100%) rename data/{scripts/maps/UnknownMap_25_30.inc => maps/UnknownMap_25_30/scripts.inc} (100%) rename data/{scripts/maps/UnknownMap_25_31.inc => maps/UnknownMap_25_31/scripts.inc} (100%) rename data/{scripts/maps/UnknownMap_25_32.inc => maps/UnknownMap_25_32/scripts.inc} (100%) rename data/{scripts/maps/UnknownMap_25_33.inc => maps/UnknownMap_25_33/scripts.inc} (100%) rename data/{scripts/maps/UnknownMap_25_34.inc => maps/UnknownMap_25_34/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown.inc => maps/VerdanturfTown/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown_ContestHall.inc => maps/VerdanturfTown_ContestHall/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown_ContestLobby.inc => maps/VerdanturfTown_ContestLobby/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc => maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown_House.inc => maps/VerdanturfTown_House/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown_Mart.inc => maps/VerdanturfTown_Mart/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown_PokemonCenter_1F.inc => maps/VerdanturfTown_PokemonCenter_1F/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown_PokemonCenter_2F.inc => maps/VerdanturfTown_PokemonCenter_2F/scripts.inc} (100%) rename data/{scripts/maps/VerdanturfTown_WandasHouse.inc => maps/VerdanturfTown_WandasHouse/scripts.inc} (100%) rename data/{scripts/maps/VictoryRoad_1F.inc => maps/VictoryRoad_1F/scripts.inc} (100%) rename data/{scripts/maps/VictoryRoad_B1F.inc => maps/VictoryRoad_B1F/scripts.inc} (100%) rename data/{scripts/maps/VictoryRoad_B2F.inc => maps/VictoryRoad_B2F/scripts.inc} (100%) delete mode 100644 data/text/maps/Route125.s delete mode 100644 data/text/maps/Route126.s delete mode 100644 data/text/maps/Route127.s delete mode 100644 data/text/maps/Route129.s delete mode 100644 data/text/maps/Route130.s delete mode 100644 data/text/maps/Route131.s delete mode 100644 data/text/maps/Route132.s delete mode 100644 data/text/maps/Route133.s delete mode 100644 data/text/maps/Route134.s diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index f8733305e..cd21ebff2 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,60 +563,60 @@ 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/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/text/maps/PetalburgCity.inc" .include "data/text/maps/SlateportCity.inc" diff --git a/data/event_scripts.s b/data/event_scripts.s index 68e287939..372007438 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,60 +563,60 @@ 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/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/text/maps/PetalburgCity.inc" .include "data/text/maps/SlateportCity.inc" diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Deck.inc rename to data/maps/AbandonedShip_Deck/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Room_B1F.inc rename to data/maps/AbandonedShip_Room_B1F/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Underwater1.inc rename to data/maps/AbandonedShip_Underwater1/scripts.inc diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Underwater2.inc rename to data/maps/AbandonedShip_Underwater2/scripts.inc diff --git a/data/scripts/maps/AncientTomb.inc b/data/maps/AncientTomb/scripts.inc similarity index 100% rename from data/scripts/maps/AncientTomb.inc rename to data/maps/AncientTomb/scripts.inc diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/scripts.inc diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/scripts.inc diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/scripts.inc diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/maps/BattleTower_BattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleTower_BattleRoom.inc rename to data/maps/BattleTower_BattleRoom/scripts.inc diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/maps/BattleTower_Corridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleTower_Corridor.inc rename to data/maps/BattleTower_Corridor/scripts.inc diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/maps/BattleTower_Elevator/scripts.inc similarity index 100% rename from data/scripts/maps/BattleTower_Elevator.inc rename to data/maps/BattleTower_Elevator/scripts.inc diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/maps/BattleTower_Lobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleTower_Lobby.inc rename to data/maps/BattleTower_Lobby/scripts.inc diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/scripts.inc similarity index 100% rename from data/scripts/maps/BattleTower_Outside.inc rename to data/maps/BattleTower_Outside/scripts.inc diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_1F.inc rename to data/maps/CaveOfOrigin_1F/scripts.inc diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_B1F.inc rename to data/maps/CaveOfOrigin_B1F/scripts.inc diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/maps/CaveOfOrigin_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_B2F.inc rename to data/maps/CaveOfOrigin_B2F/scripts.inc diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/maps/CaveOfOrigin_B3F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_B3F.inc rename to data/maps/CaveOfOrigin_B3F/scripts.inc diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_B4F.inc rename to data/maps/CaveOfOrigin_B4F/scripts.inc diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_Entrance.inc rename to data/maps/CaveOfOrigin_Entrance/scripts.inc diff --git a/data/scripts/maps/DesertRuins.inc b/data/maps/DesertRuins/scripts.inc similarity index 100% rename from data/scripts/maps/DesertRuins.inc rename to data/maps/DesertRuins/scripts.inc diff --git a/data/scripts/maps/DewfordTown.inc b/data/maps/DewfordTown/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown.inc rename to data/maps/DewfordTown/scripts.inc diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/scripts.inc diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/scripts.inc diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/scripts.inc diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/scripts.inc diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_PokemonCenter_2F.inc rename to data/maps/DewfordTown_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/scripts.inc similarity index 100% rename from data/scripts/maps/DoubleBattleColosseum.inc rename to data/maps/DoubleBattleColosseum/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity.inc rename to data/maps/EverGrandeCity/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/maps/EverGrandeCity_Corridor1/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Corridor1.inc rename to data/maps/EverGrandeCity_Corridor1/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/maps/EverGrandeCity_Corridor2/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Corridor2.inc rename to data/maps/EverGrandeCity_Corridor2/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/maps/EverGrandeCity_Corridor3/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Corridor3.inc rename to data/maps/EverGrandeCity_Corridor3/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/maps/EverGrandeCity_Corridor4/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Corridor4.inc rename to data/maps/EverGrandeCity_Corridor4/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/maps/EverGrandeCity_Corridor5/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Corridor5.inc rename to data/maps/EverGrandeCity_Corridor5/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc rename to data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonLeague.inc rename to data/maps/EverGrandeCity_PokemonLeague/scripts.inc diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/scripts.inc diff --git a/data/scripts/maps/FallarborTown.inc b/data/maps/FallarborTown/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown.inc rename to data/maps/FallarborTown/scripts.inc diff --git a/data/scripts/maps/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_ContestHall.inc rename to data/maps/FallarborTown_ContestHall/scripts.inc diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_ContestLobby.inc rename to data/maps/FallarborTown_ContestLobby/scripts.inc diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/scripts.inc diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/scripts.inc diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/scripts.inc diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_PokemonCenter_2F.inc rename to data/maps/FallarborTown_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/FieryPath.inc b/data/maps/FieryPath/scripts.inc similarity index 100% rename from data/scripts/maps/FieryPath.inc rename to data/maps/FieryPath/scripts.inc diff --git a/data/scripts/maps/FortreeCity.inc b/data/maps/FortreeCity/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity.inc rename to data/maps/FortreeCity/scripts.inc diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/scripts.inc diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/scripts.inc diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/scripts.inc diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/scripts.inc diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/scripts.inc diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/scripts.inc diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/scripts.inc diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/scripts.inc diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_PokemonCenter_2F.inc rename to data/maps/FortreeCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/scripts.inc diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_B1F.inc rename to data/maps/GraniteCave_B1F/scripts.inc diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_B2F.inc rename to data/maps/GraniteCave_B2F/scripts.inc diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/scripts.inc diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/scripts.inc similarity index 100% rename from data/scripts/maps/InsideOfTruck.inc rename to data/maps/InsideOfTruck/scripts.inc diff --git a/data/scripts/maps/IslandCave.inc b/data/maps/IslandCave/scripts.inc similarity index 100% rename from data/scripts/maps/IslandCave.inc rename to data/maps/IslandCave/scripts.inc diff --git a/data/scripts/maps/JaggedPass.inc b/data/maps/JaggedPass/scripts.inc similarity index 100% rename from data/scripts/maps/JaggedPass.inc rename to data/maps/JaggedPass/scripts.inc diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown.inc rename to data/maps/LavaridgeTown/scripts.inc diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/scripts.inc diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Gym_B1F.inc rename to data/maps/LavaridgeTown_Gym_B1F/scripts.inc diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/scripts.inc diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/scripts.inc diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/scripts.inc diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc rename to data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity.inc b/data/maps/LilycoveCity/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity.inc rename to data/maps/LilycoveCity/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc rename to data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_EmptyMap.inc b/data/maps/LilycoveCity_EmptyMap/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_EmptyMap.inc rename to data/maps/LilycoveCity_EmptyMap/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc rename to data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_UnusedMart.inc rename to data/maps/LilycoveCity_UnusedMart/scripts.inc diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom1.inc rename to data/maps/LinkContestRoom1/scripts.inc diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom2.inc rename to data/maps/LinkContestRoom2/scripts.inc diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom3.inc rename to data/maps/LinkContestRoom3/scripts.inc diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom4.inc rename to data/maps/LinkContestRoom4/scripts.inc diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom5.inc rename to data/maps/LinkContestRoom5/scripts.inc diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom6.inc rename to data/maps/LinkContestRoom6/scripts.inc diff --git a/data/scripts/maps/LittlerootTown.inc b/data/maps/LittlerootTown/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown.inc rename to data/maps/LittlerootTown/scripts.inc diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/scripts.inc diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/scripts.inc diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_1F.inc rename to data/maps/MagmaHideout_1F/scripts.inc diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/maps/MagmaHideout_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_B1F.inc rename to data/maps/MagmaHideout_B1F/scripts.inc diff --git a/data/scripts/maps/MagmaHideout_B2F.inc b/data/maps/MagmaHideout_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_B2F.inc rename to data/maps/MagmaHideout_B2F/scripts.inc diff --git a/data/scripts/maps/MauvilleCity.inc b/data/maps/MauvilleCity/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity.inc rename to data/maps/MauvilleCity/scripts.inc diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/scripts.inc diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/scripts.inc diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/scripts.inc diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/scripts.inc diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/scripts.inc diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/scripts.inc diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/scripts.inc diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/scripts.inc diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_B1F_1R.inc rename to data/maps/MeteorFalls_B1F_1R/scripts.inc diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_B1F_2R.inc rename to data/maps/MeteorFalls_B1F_2R/scripts.inc diff --git a/data/scripts/maps/MossdeepCity.inc b/data/maps/MossdeepCity/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity.inc rename to data/maps/MossdeepCity/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/scripts.inc diff --git a/data/scripts/maps/MtChimney.inc b/data/maps/MtChimney/scripts.inc similarity index 100% rename from data/scripts/maps/MtChimney.inc rename to data/maps/MtChimney/scripts.inc diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/scripts.inc similarity index 100% rename from data/scripts/maps/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/scripts.inc diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_1F.inc rename to data/maps/MtPyre_1F/scripts.inc diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_2F.inc rename to data/maps/MtPyre_2F/scripts.inc diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_3F.inc rename to data/maps/MtPyre_3F/scripts.inc diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_4F.inc rename to data/maps/MtPyre_4F/scripts.inc diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_5F.inc rename to data/maps/MtPyre_5F/scripts.inc diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_6F.inc rename to data/maps/MtPyre_6F/scripts.inc diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_Exterior.inc rename to data/maps/MtPyre_Exterior/scripts.inc diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_Summit.inc rename to data/maps/MtPyre_Summit/scripts.inc diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/scripts.inc diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/scripts.inc similarity index 100% rename from data/scripts/maps/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/scripts.inc diff --git a/data/scripts/maps/OldaleTown.inc b/data/maps/OldaleTown/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown.inc rename to data/maps/OldaleTown/scripts.inc diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/scripts.inc diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/scripts.inc diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/scripts.inc diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_PokemonCenter_2F.inc rename to data/maps/OldaleTown_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown.inc rename to data/maps/PacifidlogTown/scripts.inc diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/scripts.inc diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/scripts.inc diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/scripts.inc diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/scripts.inc diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/scripts.inc diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc rename to data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/PetalburgCity.inc b/data/maps/PetalburgCity/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity.inc rename to data/maps/PetalburgCity/scripts.inc diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/scripts.inc diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/scripts.inc diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/scripts.inc diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/scripts.inc diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc rename to data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/scripts.inc diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgWoods.inc rename to data/maps/PetalburgWoods/scripts.inc diff --git a/data/scripts/maps/RecordCorner.inc b/data/maps/RecordCorner/scripts.inc similarity index 100% rename from data/scripts/maps/RecordCorner.inc rename to data/maps/RecordCorner/scripts.inc diff --git a/data/scripts/maps/Route101.inc b/data/maps/Route101/scripts.inc similarity index 100% rename from data/scripts/maps/Route101.inc rename to data/maps/Route101/scripts.inc diff --git a/data/scripts/maps/Route102.inc b/data/maps/Route102/scripts.inc similarity index 100% rename from data/scripts/maps/Route102.inc rename to data/maps/Route102/scripts.inc diff --git a/data/scripts/maps/Route103.inc b/data/maps/Route103/scripts.inc similarity index 100% rename from data/scripts/maps/Route103.inc rename to data/maps/Route103/scripts.inc diff --git a/data/scripts/maps/Route104.inc b/data/maps/Route104/scripts.inc similarity index 100% rename from data/scripts/maps/Route104.inc rename to data/maps/Route104/scripts.inc diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/scripts.inc diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_PrettyPetalFlowerShop.inc rename to data/maps/Route104_PrettyPetalFlowerShop/scripts.inc diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_Prototype.inc rename to data/maps/Route104_Prototype/scripts.inc diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc diff --git a/data/scripts/maps/Route105.inc b/data/maps/Route105/scripts.inc similarity index 100% rename from data/scripts/maps/Route105.inc rename to data/maps/Route105/scripts.inc diff --git a/data/scripts/maps/Route106.inc b/data/maps/Route106/scripts.inc similarity index 100% rename from data/scripts/maps/Route106.inc rename to data/maps/Route106/scripts.inc diff --git a/data/scripts/maps/Route107.inc b/data/maps/Route107/scripts.inc similarity index 100% rename from data/scripts/maps/Route107.inc rename to data/maps/Route107/scripts.inc diff --git a/data/scripts/maps/Route108.inc b/data/maps/Route108/scripts.inc similarity index 100% rename from data/scripts/maps/Route108.inc rename to data/maps/Route108/scripts.inc diff --git a/data/scripts/maps/Route109.inc b/data/maps/Route109/scripts.inc similarity index 100% rename from data/scripts/maps/Route109.inc rename to data/maps/Route109/scripts.inc diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/scripts.inc diff --git a/data/scripts/maps/Route110.inc b/data/maps/Route110/scripts.inc similarity index 100% rename from data/scripts/maps/Route110.inc rename to data/maps/Route110/scripts.inc diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc rename to data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc rename to data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseCorridor.inc rename to data/maps/Route110_TrickHouseCorridor/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/scripts.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/scripts.inc diff --git a/data/scripts/maps/Route111.inc b/data/maps/Route111/scripts.inc similarity index 100% rename from data/scripts/maps/Route111.inc rename to data/maps/Route111/scripts.inc diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc similarity index 100% rename from data/scripts/maps/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/scripts.inc diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/scripts.inc diff --git a/data/scripts/maps/Route112.inc b/data/maps/Route112/scripts.inc similarity index 100% rename from data/scripts/maps/Route112.inc rename to data/maps/Route112/scripts.inc diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/scripts.inc similarity index 100% rename from data/scripts/maps/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/scripts.inc diff --git a/data/scripts/maps/Route113.inc b/data/maps/Route113/scripts.inc similarity index 100% rename from data/scripts/maps/Route113.inc rename to data/maps/Route113/scripts.inc diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/scripts.inc similarity index 100% rename from data/scripts/maps/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/scripts.inc diff --git a/data/scripts/maps/Route114.inc b/data/maps/Route114/scripts.inc similarity index 100% rename from data/scripts/maps/Route114.inc rename to data/maps/Route114/scripts.inc diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/scripts.inc diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/scripts.inc diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/scripts.inc diff --git a/data/scripts/maps/Route115.inc b/data/maps/Route115/scripts.inc similarity index 100% rename from data/scripts/maps/Route115.inc rename to data/maps/Route115/scripts.inc diff --git a/data/scripts/maps/Route116.inc b/data/maps/Route116/scripts.inc similarity index 100% rename from data/scripts/maps/Route116.inc rename to data/maps/Route116/scripts.inc diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/scripts.inc diff --git a/data/scripts/maps/Route117.inc b/data/maps/Route117/scripts.inc similarity index 100% rename from data/scripts/maps/Route117.inc rename to data/maps/Route117/scripts.inc diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/scripts.inc similarity index 100% rename from data/scripts/maps/Route117_PokemonDayCare.inc rename to data/maps/Route117_PokemonDayCare/scripts.inc diff --git a/data/scripts/maps/Route118.inc b/data/maps/Route118/scripts.inc similarity index 100% rename from data/scripts/maps/Route118.inc rename to data/maps/Route118/scripts.inc diff --git a/data/scripts/maps/Route119.inc b/data/maps/Route119/scripts.inc similarity index 100% rename from data/scripts/maps/Route119.inc rename to data/maps/Route119/scripts.inc diff --git a/data/scripts/maps/Route119_House.inc b/data/maps/Route119_House/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_House.inc rename to data/maps/Route119_House/scripts.inc diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/scripts.inc diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/scripts.inc diff --git a/data/scripts/maps/Route120.inc b/data/maps/Route120/scripts.inc similarity index 100% rename from data/scripts/maps/Route120.inc rename to data/maps/Route120/scripts.inc diff --git a/data/scripts/maps/Route121.inc b/data/maps/Route121/scripts.inc similarity index 100% rename from data/scripts/maps/Route121.inc rename to data/maps/Route121/scripts.inc diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route121_SafariZoneEntrance.inc rename to data/maps/Route121_SafariZoneEntrance/scripts.inc diff --git a/data/scripts/maps/Route122.inc b/data/maps/Route122/scripts.inc similarity index 100% rename from data/scripts/maps/Route122.inc rename to data/maps/Route122/scripts.inc diff --git a/data/scripts/maps/Route123.inc b/data/maps/Route123/scripts.inc similarity index 100% rename from data/scripts/maps/Route123.inc rename to data/maps/Route123/scripts.inc diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/scripts.inc diff --git a/data/scripts/maps/Route124.inc b/data/maps/Route124/scripts.inc similarity index 100% rename from data/scripts/maps/Route124.inc rename to data/maps/Route124/scripts.inc diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc diff --git a/data/scripts/maps/Route125.inc b/data/maps/Route125/scripts.inc similarity index 100% rename from data/scripts/maps/Route125.inc rename to data/maps/Route125/scripts.inc diff --git a/data/scripts/maps/Route126.inc b/data/maps/Route126/scripts.inc similarity index 100% rename from data/scripts/maps/Route126.inc rename to data/maps/Route126/scripts.inc diff --git a/data/scripts/maps/Route127.inc b/data/maps/Route127/scripts.inc similarity index 100% rename from data/scripts/maps/Route127.inc rename to data/maps/Route127/scripts.inc diff --git a/data/scripts/maps/Route128.inc b/data/maps/Route128/scripts.inc similarity index 100% rename from data/scripts/maps/Route128.inc rename to data/maps/Route128/scripts.inc diff --git a/data/scripts/maps/Route129.inc b/data/maps/Route129/scripts.inc similarity index 100% rename from data/scripts/maps/Route129.inc rename to data/maps/Route129/scripts.inc diff --git a/data/scripts/maps/Route130.inc b/data/maps/Route130/scripts.inc similarity index 100% rename from data/scripts/maps/Route130.inc rename to data/maps/Route130/scripts.inc diff --git a/data/scripts/maps/Route131.inc b/data/maps/Route131/scripts.inc similarity index 100% rename from data/scripts/maps/Route131.inc rename to data/maps/Route131/scripts.inc diff --git a/data/scripts/maps/Route132.inc b/data/maps/Route132/scripts.inc similarity index 100% rename from data/scripts/maps/Route132.inc rename to data/maps/Route132/scripts.inc diff --git a/data/scripts/maps/Route133.inc b/data/maps/Route133/scripts.inc similarity index 100% rename from data/scripts/maps/Route133.inc rename to data/maps/Route133/scripts.inc diff --git a/data/scripts/maps/Route134.inc b/data/maps/Route134/scripts.inc similarity index 100% rename from data/scripts/maps/Route134.inc rename to data/maps/Route134/scripts.inc diff --git a/data/scripts/maps/RustboroCity.inc b/data/maps/RustboroCity/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity.inc rename to data/maps/RustboroCity/scripts.inc diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/scripts.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/scripts.inc diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/scripts.inc diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/scripts.inc diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/scripts.inc diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/scripts.inc diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonCenter_2F.inc rename to data/maps/RustboroCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/scripts.inc diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/scripts.inc similarity index 100% rename from data/scripts/maps/RusturfTunnel.inc rename to data/maps/RusturfTunnel/scripts.inc diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/scripts.inc diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/scripts.inc diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalRooms.inc rename to data/maps/SSTidalRooms/scripts.inc diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Northeast.inc rename to data/maps/SafariZone_Northeast/scripts.inc diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Northwest.inc rename to data/maps/SafariZone_Northwest/scripts.inc diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_RestHouse.inc rename to data/maps/SafariZone_RestHouse/scripts.inc diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Southeast.inc rename to data/maps/SafariZone_Southeast/scripts.inc diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Southwest.inc rename to data/maps/SafariZone_Southwest/scripts.inc diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/maps/ScorchedSlab/scripts.inc similarity index 100% rename from data/scripts/maps/ScorchedSlab.inc rename to data/maps/ScorchedSlab/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Entrance.inc rename to data/maps/SeafloorCavern_Entrance/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room2.inc rename to data/maps/SeafloorCavern_Room2/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room5.inc rename to data/maps/SeafloorCavern_Room5/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room6.inc rename to data/maps/SeafloorCavern_Room6/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room7.inc rename to data/maps/SeafloorCavern_Room7/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room8.inc rename to data/maps/SeafloorCavern_Room8/scripts.inc diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room9.inc rename to data/maps/SeafloorCavern_Room9/scripts.inc diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SealedChamber_InnerRoom.inc rename to data/maps/SealedChamber_InnerRoom/scripts.inc diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SealedChamber_OuterRoom.inc rename to data/maps/SealedChamber_OuterRoom/scripts.inc diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave1.inc rename to data/maps/SecretBase_BlueCave1/scripts.inc diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave2.inc rename to data/maps/SecretBase_BlueCave2/scripts.inc diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave3.inc rename to data/maps/SecretBase_BlueCave3/scripts.inc diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave4.inc rename to data/maps/SecretBase_BlueCave4/scripts.inc diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave1.inc rename to data/maps/SecretBase_BrownCave1/scripts.inc diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave2.inc rename to data/maps/SecretBase_BrownCave2/scripts.inc diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave3.inc rename to data/maps/SecretBase_BrownCave3/scripts.inc diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave4.inc rename to data/maps/SecretBase_BrownCave4/scripts.inc diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/scripts.inc diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave2.inc rename to data/maps/SecretBase_RedCave2/scripts.inc diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave3.inc rename to data/maps/SecretBase_RedCave3/scripts.inc diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave4.inc rename to data/maps/SecretBase_RedCave4/scripts.inc diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub1.inc rename to data/maps/SecretBase_Shrub1/scripts.inc diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub2.inc rename to data/maps/SecretBase_Shrub2/scripts.inc diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub3.inc rename to data/maps/SecretBase_Shrub3/scripts.inc diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub4.inc rename to data/maps/SecretBase_Shrub4/scripts.inc diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree1.inc rename to data/maps/SecretBase_Tree1/scripts.inc diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree2.inc rename to data/maps/SecretBase_Tree2/scripts.inc diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree3.inc rename to data/maps/SecretBase_Tree3/scripts.inc diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree4.inc rename to data/maps/SecretBase_Tree4/scripts.inc diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave1.inc rename to data/maps/SecretBase_YellowCave1/scripts.inc diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave2.inc rename to data/maps/SecretBase_YellowCave2/scripts.inc diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave3.inc rename to data/maps/SecretBase_YellowCave3/scripts.inc diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave4.inc rename to data/maps/SecretBase_YellowCave4/scripts.inc diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc rename to data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_HighTideInnerRoom.inc rename to data/maps/ShoalCave_HighTideInnerRoom/scripts.inc diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideIceRoom.inc rename to data/maps/ShoalCave_LowTideIceRoom/scripts.inc diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/scripts.inc diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/scripts.inc diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/scripts.inc diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/scripts.inc similarity index 100% rename from data/scripts/maps/SingleBattleColosseum.inc rename to data/maps/SingleBattleColosseum/scripts.inc diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_1F.inc rename to data/maps/SkyPillar_1F/scripts.inc diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_2F.inc rename to data/maps/SkyPillar_2F/scripts.inc diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_3F.inc rename to data/maps/SkyPillar_3F/scripts.inc diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_4F.inc rename to data/maps/SkyPillar_4F/scripts.inc diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_5F.inc rename to data/maps/SkyPillar_5F/scripts.inc diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Entrance.inc rename to data/maps/SkyPillar_Entrance/scripts.inc diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Outside.inc rename to data/maps/SkyPillar_Outside/scripts.inc diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Top.inc rename to data/maps/SkyPillar_Top/scripts.inc diff --git a/data/scripts/maps/SlateportCity.inc b/data/maps/SlateportCity/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity.inc rename to data/maps/SlateportCity/scripts.inc diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_ContestHall.inc rename to data/maps/SlateportCity_ContestHall/scripts.inc diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_ContestLobby.inc rename to data/maps/SlateportCity_ContestLobby/scripts.inc diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/scripts.inc diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/scripts.inc diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/scripts.inc diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/scripts.inc diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonCenter_2F.inc rename to data/maps/SlateportCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/scripts.inc diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/scripts.inc diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/scripts.inc diff --git a/data/scripts/maps/SootopolisCity.inc b/data/maps/SootopolisCity/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity.inc rename to data/maps/SootopolisCity/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House8.inc rename to data/maps/SootopolisCity_House8/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc rename to data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/scripts.inc diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/scripts.inc similarity index 100% rename from data/scripts/maps/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/scripts.inc diff --git a/data/scripts/maps/TradeCenter.inc b/data/maps/TradeCenter/scripts.inc similarity index 100% rename from data/scripts/maps/TradeCenter.inc rename to data/maps/TradeCenter/scripts.inc diff --git a/data/scripts/maps/Underwater1.inc b/data/maps/Underwater1/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater1.inc rename to data/maps/Underwater1/scripts.inc diff --git a/data/scripts/maps/Underwater2.inc b/data/maps/Underwater2/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater2.inc rename to data/maps/Underwater2/scripts.inc diff --git a/data/scripts/maps/Underwater3.inc b/data/maps/Underwater3/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater3.inc rename to data/maps/Underwater3/scripts.inc diff --git a/data/scripts/maps/Underwater4.inc b/data/maps/Underwater4/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater4.inc rename to data/maps/Underwater4/scripts.inc diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/maps/Underwater_Route134/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_Route134.inc rename to data/maps/Underwater_Route134/scripts.inc diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/scripts.inc diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SealedChamber.inc rename to data/maps/Underwater_SealedChamber/scripts.inc diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SootopolisCity.inc rename to data/maps/Underwater_SootopolisCity/scripts.inc diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_29.inc rename to data/maps/UnknownMap_25_29/scripts.inc diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_30.inc rename to data/maps/UnknownMap_25_30/scripts.inc diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_31.inc rename to data/maps/UnknownMap_25_31/scripts.inc diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_32.inc rename to data/maps/UnknownMap_25_32/scripts.inc diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_33.inc rename to data/maps/UnknownMap_25_33/scripts.inc diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_34.inc rename to data/maps/UnknownMap_25_34/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown.inc rename to data/maps/VerdanturfTown/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_ContestHall.inc rename to data/maps/VerdanturfTown_ContestHall/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_ContestLobby.inc rename to data/maps/VerdanturfTown_ContestLobby/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc rename to data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/scripts.inc diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/scripts.inc diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/scripts.inc diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/scripts.inc diff --git a/data/text/maps/Route125.s b/data/text/maps/Route125.s deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/text/maps/Route126.s b/data/text/maps/Route126.s deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/text/maps/Route127.s b/data/text/maps/Route127.s deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/text/maps/Route129.s b/data/text/maps/Route129.s deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/text/maps/Route130.s b/data/text/maps/Route130.s deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/text/maps/Route131.s b/data/text/maps/Route131.s deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/text/maps/Route132.s b/data/text/maps/Route132.s deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/text/maps/Route133.s b/data/text/maps/Route133.s deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/text/maps/Route134.s b/data/text/maps/Route134.s deleted file mode 100644 index e69de29bb..000000000 From 9d9aef1b42f3ff6923824daf3fe07c562a661ac0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:23 -0500 Subject: [PATCH 5/9] Update file permissions --- .travis/calcrom/calcrom.pl | 0 .travis/calcrom/webhook.sh | 0 asmdiff.sh | 0 asmdiff_de.sh | 0 asmdiff_de_debug.sh | 0 build_tools.sh | 0 build_tools_mac.sh | 0 clean_tools.sh | 0 compare-ruby.sh | 0 compare-sapphire.sh | 0 compare.sh | 0 de_after.sh | 0 de_before.sh | 0 graphics/move_tutor_menu/arrows.png | Bin include/battle_ai_switch_items.h | 0 include/constants/field_effects.h | 0 src/battle/anim/current.c | 0 src/battle/anim/egg.c | 0 src/battle/anim/flying.c | 0 src/battle/anim/ghost.c | 0 src/battle/anim/ground.c | 0 src/battle/anim/ice.c | 0 src/battle/anim/normal.c | 0 src/battle/battle_ai_switch_items.c | 0 src/battle/battle_anim_812C144.c | 0 src/data/field_event_obj/event_object_graphics.h | 0 .../field_event_obj/field_effect_object_graphics.h | 0 27 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 .travis/calcrom/calcrom.pl mode change 100755 => 100644 .travis/calcrom/webhook.sh mode change 100755 => 100644 asmdiff.sh mode change 100755 => 100644 asmdiff_de.sh mode change 100755 => 100644 asmdiff_de_debug.sh mode change 100755 => 100644 build_tools.sh mode change 100755 => 100644 build_tools_mac.sh mode change 100755 => 100644 clean_tools.sh mode change 100755 => 100644 compare-ruby.sh mode change 100755 => 100644 compare-sapphire.sh mode change 100755 => 100644 compare.sh mode change 100755 => 100644 de_after.sh mode change 100755 => 100644 de_before.sh mode change 100755 => 100644 graphics/move_tutor_menu/arrows.png mode change 100755 => 100644 include/battle_ai_switch_items.h mode change 100755 => 100644 include/constants/field_effects.h mode change 100755 => 100644 src/battle/anim/current.c mode change 100755 => 100644 src/battle/anim/egg.c mode change 100755 => 100644 src/battle/anim/flying.c mode change 100755 => 100644 src/battle/anim/ghost.c mode change 100755 => 100644 src/battle/anim/ground.c mode change 100755 => 100644 src/battle/anim/ice.c mode change 100755 => 100644 src/battle/anim/normal.c mode change 100755 => 100644 src/battle/battle_ai_switch_items.c mode change 100755 => 100644 src/battle/battle_anim_812C144.c mode change 100755 => 100644 src/data/field_event_obj/event_object_graphics.h mode change 100755 => 100644 src/data/field_event_obj/field_effect_object_graphics.h diff --git a/.travis/calcrom/calcrom.pl b/.travis/calcrom/calcrom.pl old mode 100755 new mode 100644 diff --git a/.travis/calcrom/webhook.sh b/.travis/calcrom/webhook.sh old mode 100755 new mode 100644 diff --git a/asmdiff.sh b/asmdiff.sh old mode 100755 new mode 100644 diff --git a/asmdiff_de.sh b/asmdiff_de.sh old mode 100755 new mode 100644 diff --git a/asmdiff_de_debug.sh b/asmdiff_de_debug.sh old mode 100755 new mode 100644 diff --git a/build_tools.sh b/build_tools.sh old mode 100755 new mode 100644 diff --git a/build_tools_mac.sh b/build_tools_mac.sh old mode 100755 new mode 100644 diff --git a/clean_tools.sh b/clean_tools.sh old mode 100755 new mode 100644 diff --git a/compare-ruby.sh b/compare-ruby.sh old mode 100755 new mode 100644 diff --git a/compare-sapphire.sh b/compare-sapphire.sh old mode 100755 new mode 100644 diff --git a/compare.sh b/compare.sh old mode 100755 new mode 100644 diff --git a/de_after.sh b/de_after.sh old mode 100755 new mode 100644 diff --git a/de_before.sh b/de_before.sh old mode 100755 new mode 100644 diff --git a/graphics/move_tutor_menu/arrows.png b/graphics/move_tutor_menu/arrows.png old mode 100755 new mode 100644 diff --git a/include/battle_ai_switch_items.h b/include/battle_ai_switch_items.h old mode 100755 new mode 100644 diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h old mode 100755 new mode 100644 diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c old mode 100755 new mode 100644 diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c old mode 100755 new mode 100644 diff --git a/src/battle/battle_ai_switch_items.c b/src/battle/battle_ai_switch_items.c old mode 100755 new mode 100644 diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c old mode 100755 new mode 100644 diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h old mode 100755 new mode 100644 diff --git a/src/data/field_event_obj/field_effect_object_graphics.h b/src/data/field_event_obj/field_effect_object_graphics.h old mode 100755 new mode 100644 From c80206e701bc8a290cb2c01afb12cb2e03bf473a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:33 -0500 Subject: [PATCH 6/9] Rename map attribute structs to MapLayout --- data/layouts_table.inc | 2 +- include/fieldmap.h | 8 +-- include/global.fieldmap.h | 8 +-- include/global.h | 2 +- include/overworld.h | 1 - src/debug/nakamura_debug_menu.c | 8 +-- src/decoration.c | 14 ++--- src/field_camera.c | 52 +++++++-------- src/field_tasks.c | 4 +- src/fieldmap.c | 108 ++++++++++++++++---------------- src/item_use.c | 12 ++-- src/overworld.c | 52 +++++++-------- src/region_map.c | 20 +++--- src/secret_base.c | 6 +- src/shop.c | 8 +-- src/tileset_anim.c | 12 ++-- src/wild_encounter.c | 2 +- 17 files changed, 159 insertions(+), 160 deletions(-) diff --git a/data/layouts_table.inc b/data/layouts_table.inc index b1a15d7ef..cda6e5423 100644 --- a/data/layouts_table.inc +++ b/data/layouts_table.inc @@ -1,5 +1,5 @@ .align 2 -gMapAttributes:: @ 8304F18 +gMapLayouts:: @ 8304F18 .4byte PetalburgCity_Layout .4byte SlateportCity_Layout .4byte MauvilleCity_Layout 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 de817e8e0..b499f55aa 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -42,7 +42,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/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/decoration.c b/src/decoration.c index e31624540..2a70a3835 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; kmap)[(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/field_camera.c b/src/field_camera.c index fa8f1a582..3765107fd 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -28,14 +28,14 @@ struct FieldCamera gFieldCamera; u16 gTotalCameraPixelOffsetY; 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_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 7383bb174..7d0aaf2f8 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/item_use.c b/src/item_use.c index 69fcd51de..e6087d1f9 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/overworld.c b/src/overworld.c index 47e23ad35..6a44afb04 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -86,7 +86,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 *get_mapdata_header(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 warp1_get_mapheader(void) static void set_current_map_header_from_sav1_save_old_name(void) { gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum); - gSaveBlock1.mapDataId = gMapHeader.mapDataId; - gMapHeader.mapData = get_mapdata_header(); + gSaveBlock1.mapLayoutId = gMapHeader.mapLayoutId; + gMapHeader.mapLayout = GetMapLayout(); } static void LoadSaveblockMapHeader(void) { gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum); - gMapHeader.mapData = get_mapdata_header(); + gMapHeader.mapLayout = GetMapLayout(); } void sub_80533CC(void) @@ -419,8 +419,8 @@ void sub_80533CC(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; } } @@ -608,8 +608,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); @@ -784,10 +784,10 @@ u8 Overworld_GetFlashLevel(void) return gSaveBlock1.flashLevel; } -void sub_8053D14(u16 mapDataId) +void sub_8053D14(u16 mapLayoutId) { - gSaveBlock1.mapDataId = mapDataId; - gMapHeader.mapData = get_mapdata_header(); + gSaveBlock1.mapLayoutId = mapLayoutId; + gMapHeader.mapLayout = GetMapLayout(); } static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp) @@ -1558,15 +1558,15 @@ bool32 sub_805483C(u8 *a1) (*a1)++; break; case 6: - sub_8056D28(gMapHeader.mapData); + sub_8056D28(gMapHeader.mapLayout); (*a1)++; break; case 7: - sub_8056D38(gMapHeader.mapData); + sub_8056D38(gMapHeader.mapLayout); (*a1)++; break; case 8: - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*a1)++; break; case 9: @@ -1624,15 +1624,15 @@ bool32 sub_805493C(u8 *a1, u32 a2) (*a1)++; break; case 6: - sub_8056D28(gMapHeader.mapData); + sub_8056D28(gMapHeader.mapLayout); (*a1)++; break; case 7: - sub_8056D38(gMapHeader.mapData); + sub_8056D38(gMapHeader.mapLayout); (*a1)++; break; case 8: - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*a1)++; break; case 9: @@ -1714,15 +1714,15 @@ bool32 sub_8054A9C(u8 *a1) (*a1)++; break; case 5: - sub_8056D28(gMapHeader.mapData); + sub_8056D28(gMapHeader.mapLayout); (*a1)++; break; case 6: - sub_8056D38(gMapHeader.mapData); + sub_8056D38(gMapHeader.mapLayout); (*a1)++; break; case 7: - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*a1)++; break; case 8: 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/secret_base.c b/src/secret_base.c index 60ce80af5..0812d2ac6 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; yheight; y++) + for (y=0; yheight; y++) { - for (x=0; xwidth; x++) + for (x=0; xwidth; 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/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/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) { From ab8373bbd57f1498df89ace04697eb4a2b5bc1d6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:43 -0500 Subject: [PATCH 7/9] Move map text into data/maps/ --- data-de/event_scripts.s | 522 +++++++++--------- data/event_scripts.s | 522 +++++++++--------- .../AbandonedShip_CaptainsOffice/text.inc} | 0 .../AbandonedShip_Corridors_1F/text.inc} | 0 .../AbandonedShip_Corridors_B1F/text.inc} | 0 .../text.inc} | 0 .../AbandonedShip_HiddenFloorRooms/text.inc} | 0 .../AbandonedShip_Rooms2_1F/text.inc} | 0 .../AbandonedShip_Rooms2_B1F/text.inc} | 0 .../AbandonedShip_Rooms_1F/text.inc} | 0 .../AbandonedShip_Rooms_B1F/text.inc} | 0 .../AquaHideout_1F/text.inc} | 0 .../AquaHideout_B1F/text.inc} | 0 .../AquaHideout_B2F/text.inc} | 0 .../BattleTower_BattleRoom/text.inc} | 0 .../BattleTower_Lobby/text.inc} | 0 .../BattleTower_Outside/text.inc} | 0 .../DewfordTown/text.inc} | 0 .../DewfordTown_Gym/text.inc} | 0 .../DewfordTown_Hall/text.inc} | 0 .../DewfordTown_House1/text.inc} | 0 .../DewfordTown_House2/text.inc} | 0 .../DewfordTown_PokemonCenter_1F/text.inc} | 0 .../EverGrandeCity/text.inc} | 0 .../EverGrandeCity_ChampionsRoom/text.inc} | 0 .../EverGrandeCity_DrakesRoom/text.inc} | 0 .../EverGrandeCity_GlaciasRoom/text.inc} | 0 .../EverGrandeCity_HallOfFame/text.inc} | 0 .../EverGrandeCity_PhoebesRoom/text.inc} | 0 .../EverGrandeCity_PokemonCenter_1F/text.inc} | 0 .../EverGrandeCity_PokemonLeague/text.inc} | 0 .../EverGrandeCity_SidneysRoom/text.inc} | 0 .../FallarborTown/text.inc} | 0 .../FallarborTown_ContestHall/text.inc} | 0 .../FallarborTown_ContestLobby/text.inc} | 0 .../FallarborTown_House1/text.inc} | 0 .../FallarborTown_House2/text.inc} | 0 .../FallarborTown_Mart/text.inc} | 0 .../FallarborTown_PokemonCenter_1F/text.inc} | 0 .../FortreeCity/text.inc} | 0 .../FortreeCity_DecorationShop/text.inc} | 0 .../FortreeCity_Gym/text.inc} | 0 .../FortreeCity_House1/text.inc} | 0 .../FortreeCity_House2/text.inc} | 0 .../FortreeCity_House3/text.inc} | 0 .../FortreeCity_House4/text.inc} | 0 .../FortreeCity_House5/text.inc} | 0 .../FortreeCity_Mart/text.inc} | 0 .../FortreeCity_PokemonCenter_1F/text.inc} | 0 .../GraniteCave_1F/text.inc} | 0 .../GraniteCave_StevensRoom/text.inc} | 0 .../InsideOfTruck/text.inc} | 0 .../JaggedPass/text.inc} | 0 .../LavaridgeTown/text.inc} | 0 .../LavaridgeTown_Gym_1F/text.inc} | 0 .../LavaridgeTown_HerbShop/text.inc} | 0 .../LavaridgeTown_House/text.inc} | 0 .../LavaridgeTown_Mart/text.inc} | 0 .../LavaridgeTown_PokemonCenter_1F/text.inc} | 0 .../LilycoveCity/text.inc} | 0 .../LilycoveCity_ContestHall/text.inc} | 0 .../LilycoveCity_ContestLobby/text.inc} | 0 .../LilycoveCity_CoveLilyMotel_1F/text.inc} | 0 .../LilycoveCity_CoveLilyMotel_2F/text.inc} | 0 .../text.inc} | 0 .../LilycoveCity_DepartmentStore_1F/text.inc} | 0 .../LilycoveCity_DepartmentStore_2F/text.inc} | 0 .../LilycoveCity_DepartmentStore_3F/text.inc} | 0 .../LilycoveCity_DepartmentStore_4F/text.inc} | 0 .../LilycoveCity_DepartmentStore_5F/text.inc} | 0 .../LilycoveCity_Harbor/text.inc} | 0 .../LilycoveCity_House1/text.inc} | 0 .../LilycoveCity_House2/text.inc} | 0 .../LilycoveCity_House3/text.inc} | 0 .../LilycoveCity_House4/text.inc} | 0 .../LilycoveCity_LilycoveMuseum_1F/text.inc} | 0 .../LilycoveCity_LilycoveMuseum_2F/text.inc} | 0 .../LilycoveCity_MoveDeletersHouse/text.inc} | 0 .../LilycoveCity_PokemonCenter_1F/text.inc} | 0 .../text.inc} | 0 .../LittlerootTown/text.inc} | 0 .../LittlerootTown_BrendansHouse_1F/text.inc} | 0 .../LittlerootTown_BrendansHouse_2F/text.inc} | 0 .../LittlerootTown_MaysHouse_1F/text.inc} | 0 .../LittlerootTown_MaysHouse_2F/text.inc} | 0 .../text.inc} | 0 .../MauvilleCity/text.inc} | 0 .../MauvilleCity_BikeShop/text.inc} | 0 .../MauvilleCity_GameCorner/text.inc} | 0 .../MauvilleCity_Gym/text.inc} | 0 .../MauvilleCity_House1/text.inc} | 0 .../MauvilleCity_House2/text.inc} | 0 .../MauvilleCity_Mart/text.inc} | 0 .../MauvilleCity_PokemonCenter_1F/text.inc} | 0 .../MauvilleCity_PokemonCenter_2F/text.inc} | 0 .../MeteorFalls_1F_1R/text.inc} | 0 .../MeteorFalls_1F_2R/text.inc} | 0 .../MossdeepCity/text.inc} | 0 .../MossdeepCity_GameCorner_1F/text.inc} | 0 .../MossdeepCity_GameCorner_B1F/text.inc} | 0 .../MossdeepCity_Gym/text.inc} | 0 .../MossdeepCity_House1/text.inc} | 0 .../MossdeepCity_House2/text.inc} | 0 .../MossdeepCity_House3/text.inc} | 0 .../MossdeepCity_House4/text.inc} | 0 .../MossdeepCity_Mart/text.inc} | 0 .../MossdeepCity_PokemonCenter_1F/text.inc} | 0 .../MossdeepCity_PokemonCenter_2F/text.inc} | 0 .../MossdeepCity_SpaceCenter_1F/text.inc} | 0 .../MossdeepCity_SpaceCenter_2F/text.inc} | 0 .../MossdeepCity_StevensHouse/text.inc} | 0 .../MtChimney.inc => maps/MtChimney/text.inc} | 0 .../MtChimney_CableCarStation/text.inc} | 0 .../MtPyre_1F.inc => maps/MtPyre_1F/text.inc} | 0 .../MtPyre_2F.inc => maps/MtPyre_2F/text.inc} | 0 .../MtPyre_3F.inc => maps/MtPyre_3F/text.inc} | 0 .../MtPyre_4F.inc => maps/MtPyre_4F/text.inc} | 0 .../MtPyre_5F.inc => maps/MtPyre_5F/text.inc} | 0 .../MtPyre_6F.inc => maps/MtPyre_6F/text.inc} | 0 .../NewMauville_Entrance/text.inc} | 0 .../NewMauville_Inside/text.inc} | 0 .../OldaleTown/text.inc} | 0 .../OldaleTown_House1/text.inc} | 0 .../OldaleTown_House2/text.inc} | 0 .../OldaleTown_Mart/text.inc} | 0 .../OldaleTown_PokemonCenter_1F/text.inc} | 0 .../PacifidlogTown/text.inc} | 0 .../PacifidlogTown_House1/text.inc} | 0 .../PacifidlogTown_House2/text.inc} | 0 .../PacifidlogTown_House3/text.inc} | 0 .../PacifidlogTown_House4/text.inc} | 0 .../PacifidlogTown_House5/text.inc} | 0 .../PacifidlogTown_PokemonCenter_1F/text.inc} | 0 .../PetalburgCity/text.inc} | 0 .../PetalburgCity_Gym/text.inc} | 0 .../PetalburgCity_House1/text.inc} | 0 .../PetalburgCity_House2/text.inc} | 0 .../PetalburgCity_Mart/text.inc} | 0 .../PetalburgCity_PokemonCenter_1F/text.inc} | 0 .../PetalburgCity_WallysHouse/text.inc} | 0 .../PetalburgWoods/text.inc} | 0 .../Route101.inc => maps/Route101/text.inc} | 0 .../Route102.inc => maps/Route102/text.inc} | 0 .../Route103.inc => maps/Route103/text.inc} | 0 .../Route104.inc => maps/Route104/text.inc} | 0 .../Route104_MrBrineysHouse/text.inc} | 0 .../Route104_Prototype/text.inc} | 0 .../text.inc} | 0 .../Route105.inc => maps/Route105/text.inc} | 0 .../Route106.inc => maps/Route106/text.inc} | 0 .../Route107.inc => maps/Route107/text.inc} | 0 .../Route108.inc => maps/Route108/text.inc} | 0 .../Route109.inc => maps/Route109/text.inc} | 0 .../Route109_SeashoreHouse/text.inc} | 0 .../Route110.inc => maps/Route110/text.inc} | 0 .../text.inc} | 0 .../text.inc} | 0 .../Route110_TrickHouseEnd/text.inc} | 0 .../Route110_TrickHouseEntrance/text.inc} | 0 .../Route110_TrickHousePuzzle1/text.inc} | 0 .../Route110_TrickHousePuzzle2/text.inc} | 0 .../Route110_TrickHousePuzzle3/text.inc} | 0 .../Route110_TrickHousePuzzle4/text.inc} | 0 .../Route110_TrickHousePuzzle5/text.inc} | 0 .../Route110_TrickHousePuzzle6/text.inc} | 0 .../Route110_TrickHousePuzzle7/text.inc} | 0 .../Route110_TrickHousePuzzle8/text.inc} | 0 .../Route111.inc => maps/Route111/text.inc} | 0 .../Route111_OldLadysRestStop/text.inc} | 0 .../Route111_WinstrateFamilysHouse/text.inc} | 0 .../Route112.inc => maps/Route112/text.inc} | 0 .../Route112_CableCarStation/text.inc} | 0 .../Route113.inc => maps/Route113/text.inc} | 0 .../Route113_GlassWorkshop/text.inc} | 0 .../Route114.inc => maps/Route114/text.inc} | 0 .../Route114_FossilManiacsHouse/text.inc} | 0 .../Route114_FossilManiacsTunnel/text.inc} | 0 .../Route114_LanettesHouse/text.inc} | 0 .../Route115.inc => maps/Route115/text.inc} | 0 .../Route116.inc => maps/Route116/text.inc} | 0 .../Route116_TunnelersRestHouse/text.inc} | 0 .../Route117.inc => maps/Route117/text.inc} | 0 .../Route118.inc => maps/Route118/text.inc} | 0 .../Route119.inc => maps/Route119/text.inc} | 0 .../Route119_House/text.inc} | 0 .../Route119_WeatherInstitute_1F/text.inc} | 0 .../Route119_WeatherInstitute_2F/text.inc} | 0 .../Route120.inc => maps/Route120/text.inc} | 0 .../Route121.inc => maps/Route121/text.inc} | 0 .../Route123.inc => maps/Route123/text.inc} | 0 .../Route123_BerryMastersHouse/text.inc} | 0 .../Route124.inc => maps/Route124/text.inc} | 0 .../text.inc} | 0 .../Route128.inc => maps/Route128/text.inc} | 0 .../RustboroCity/text.inc} | 0 .../RustboroCity_CuttersHouse/text.inc} | 0 .../RustboroCity_DevonCorp_1F/text.inc} | 0 .../RustboroCity_DevonCorp_2F/text.inc} | 0 .../RustboroCity_DevonCorp_3F/text.inc} | 0 .../RustboroCity_Flat1_1F/text.inc} | 0 .../RustboroCity_Flat1_2F/text.inc} | 0 .../RustboroCity_Flat2_1F/text.inc} | 0 .../RustboroCity_Flat2_2F/text.inc} | 0 .../RustboroCity_Flat2_3F/text.inc} | 0 .../RustboroCity_Gym/text.inc} | 0 .../RustboroCity_House1/text.inc} | 0 .../RustboroCity_House2/text.inc} | 0 .../RustboroCity_House3/text.inc} | 0 .../RustboroCity_Mart/text.inc} | 0 .../RustboroCity_PokemonCenter_1F/text.inc} | 0 .../RustboroCity_PokemonSchool/text.inc} | 0 .../RusturfTunnel/text.inc} | 0 .../SSTidalCorridor/text.inc} | 0 .../SSTidalLowerDeck/text.inc} | 0 .../SSTidalRooms/text.inc} | 0 .../SeafloorCavern_Room1/text.inc} | 0 .../SeafloorCavern_Room3/text.inc} | 0 .../SeafloorCavern_Room4/text.inc} | 0 .../SecretBase_RedCave1/text.inc} | 0 .../ShoalCave_LowTideEntranceRoom/text.inc} | 0 .../ShoalCave_LowTideInnerRoom/text.inc} | 0 .../ShoalCave_LowTideLowerRoom/text.inc} | 0 .../ShoalCave_LowTideStairsRoom/text.inc} | 0 .../SlateportCity/text.inc} | 0 .../SlateportCity_ContestHall/text.inc} | 0 .../SlateportCity_ContestLobby/text.inc} | 0 .../SlateportCity_Harbor/text.inc} | 0 .../SlateportCity_House1/text.inc} | 0 .../SlateportCity_House2/text.inc} | 0 .../SlateportCity_Mart/text.inc} | 0 .../SlateportCity_OceanicMuseum_1F/text.inc} | 0 .../SlateportCity_OceanicMuseum_2F/text.inc} | 0 .../SlateportCity_PokemonCenter_1F/text.inc} | 0 .../SlateportCity_PokemonFanClub/text.inc} | 0 .../SlateportCity_SternsShipyard_1F/text.inc} | 0 .../SlateportCity_SternsShipyard_2F/text.inc} | 0 .../SootopolisCity/text.inc} | 0 .../SootopolisCity_Gym_1F/text.inc} | 0 .../SootopolisCity_Gym_B1F/text.inc} | 0 .../SootopolisCity_House1/text.inc} | 0 .../SootopolisCity_House2/text.inc} | 0 .../SootopolisCity_House3/text.inc} | 0 .../SootopolisCity_House4/text.inc} | 0 .../SootopolisCity_House5/text.inc} | 0 .../SootopolisCity_House6/text.inc} | 0 .../SootopolisCity_House7/text.inc} | 0 .../SootopolisCity_House8/text.inc} | 0 .../SootopolisCity_Mart/text.inc} | 0 .../SootopolisCity_PokemonCenter_1F/text.inc} | 0 .../SouthernIsland_Exterior/text.inc} | 0 .../SouthernIsland_Interior/text.inc} | 0 .../Underwater_SeafloorCavern/text.inc} | 0 .../VerdanturfTown/text.inc} | 0 .../VerdanturfTown_ContestHall/text.inc} | 0 .../VerdanturfTown_ContestLobby/text.inc} | 0 .../text.inc} | 0 .../VerdanturfTown_House/text.inc} | 0 .../VerdanturfTown_Mart/text.inc} | 0 .../VerdanturfTown_PokemonCenter_1F/text.inc} | 0 .../VerdanturfTown_WandasHouse/text.inc} | 0 .../VictoryRoad_1F/text.inc} | 0 .../VictoryRoad_B1F/text.inc} | 0 .../VictoryRoad_B2F/text.inc} | 0 263 files changed, 522 insertions(+), 522 deletions(-) rename data/{text/maps/AbandonedShip_CaptainsOffice.inc => maps/AbandonedShip_CaptainsOffice/text.inc} (100%) rename data/{text/maps/AbandonedShip_Corridors_1F.inc => maps/AbandonedShip_Corridors_1F/text.inc} (100%) rename data/{text/maps/AbandonedShip_Corridors_B1F.inc => maps/AbandonedShip_Corridors_B1F/text.inc} (100%) rename data/{text/maps/AbandonedShip_HiddenFloorCorridors.inc => maps/AbandonedShip_HiddenFloorCorridors/text.inc} (100%) rename data/{text/maps/AbandonedShip_HiddenFloorRooms.inc => maps/AbandonedShip_HiddenFloorRooms/text.inc} (100%) rename data/{text/maps/AbandonedShip_Rooms2_1F.inc => maps/AbandonedShip_Rooms2_1F/text.inc} (100%) rename data/{text/maps/AbandonedShip_Rooms2_B1F.inc => maps/AbandonedShip_Rooms2_B1F/text.inc} (100%) rename data/{text/maps/AbandonedShip_Rooms_1F.inc => maps/AbandonedShip_Rooms_1F/text.inc} (100%) rename data/{text/maps/AbandonedShip_Rooms_B1F.inc => maps/AbandonedShip_Rooms_B1F/text.inc} (100%) rename data/{text/maps/AquaHideout_1F.inc => maps/AquaHideout_1F/text.inc} (100%) rename data/{text/maps/AquaHideout_B1F.inc => maps/AquaHideout_B1F/text.inc} (100%) rename data/{text/maps/AquaHideout_B2F.inc => maps/AquaHideout_B2F/text.inc} (100%) rename data/{text/maps/BattleTower_BattleRoom.inc => maps/BattleTower_BattleRoom/text.inc} (100%) rename data/{text/maps/BattleTower_Lobby.inc => maps/BattleTower_Lobby/text.inc} (100%) rename data/{text/maps/BattleTower_Outside.inc => maps/BattleTower_Outside/text.inc} (100%) rename data/{text/maps/DewfordTown.inc => maps/DewfordTown/text.inc} (100%) rename data/{text/maps/DewfordTown_Gym.inc => maps/DewfordTown_Gym/text.inc} (100%) rename data/{text/maps/DewfordTown_Hall.inc => maps/DewfordTown_Hall/text.inc} (100%) rename data/{text/maps/DewfordTown_House1.inc => maps/DewfordTown_House1/text.inc} (100%) rename data/{text/maps/DewfordTown_House2.inc => maps/DewfordTown_House2/text.inc} (100%) rename data/{text/maps/DewfordTown_PokemonCenter_1F.inc => maps/DewfordTown_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/EverGrandeCity.inc => maps/EverGrandeCity/text.inc} (100%) rename data/{text/maps/EverGrandeCity_ChampionsRoom.inc => maps/EverGrandeCity_ChampionsRoom/text.inc} (100%) rename data/{text/maps/EverGrandeCity_DrakesRoom.inc => maps/EverGrandeCity_DrakesRoom/text.inc} (100%) rename data/{text/maps/EverGrandeCity_GlaciasRoom.inc => maps/EverGrandeCity_GlaciasRoom/text.inc} (100%) rename data/{text/maps/EverGrandeCity_HallOfFame.inc => maps/EverGrandeCity_HallOfFame/text.inc} (100%) rename data/{text/maps/EverGrandeCity_PhoebesRoom.inc => maps/EverGrandeCity_PhoebesRoom/text.inc} (100%) rename data/{text/maps/EverGrandeCity_PokemonCenter_1F.inc => maps/EverGrandeCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/EverGrandeCity_PokemonLeague.inc => maps/EverGrandeCity_PokemonLeague/text.inc} (100%) rename data/{text/maps/EverGrandeCity_SidneysRoom.inc => maps/EverGrandeCity_SidneysRoom/text.inc} (100%) rename data/{text/maps/FallarborTown.inc => maps/FallarborTown/text.inc} (100%) rename data/{text/maps/FallarborTown_ContestHall.inc => maps/FallarborTown_ContestHall/text.inc} (100%) rename data/{text/maps/FallarborTown_ContestLobby.inc => maps/FallarborTown_ContestLobby/text.inc} (100%) rename data/{text/maps/FallarborTown_House1.inc => maps/FallarborTown_House1/text.inc} (100%) rename data/{text/maps/FallarborTown_House2.inc => maps/FallarborTown_House2/text.inc} (100%) rename data/{text/maps/FallarborTown_Mart.inc => maps/FallarborTown_Mart/text.inc} (100%) rename data/{text/maps/FallarborTown_PokemonCenter_1F.inc => maps/FallarborTown_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/FortreeCity.inc => maps/FortreeCity/text.inc} (100%) rename data/{text/maps/FortreeCity_DecorationShop.inc => maps/FortreeCity_DecorationShop/text.inc} (100%) rename data/{text/maps/FortreeCity_Gym.inc => maps/FortreeCity_Gym/text.inc} (100%) rename data/{text/maps/FortreeCity_House1.inc => maps/FortreeCity_House1/text.inc} (100%) rename data/{text/maps/FortreeCity_House2.inc => maps/FortreeCity_House2/text.inc} (100%) rename data/{text/maps/FortreeCity_House3.inc => maps/FortreeCity_House3/text.inc} (100%) rename data/{text/maps/FortreeCity_House4.inc => maps/FortreeCity_House4/text.inc} (100%) rename data/{text/maps/FortreeCity_House5.inc => maps/FortreeCity_House5/text.inc} (100%) rename data/{text/maps/FortreeCity_Mart.inc => maps/FortreeCity_Mart/text.inc} (100%) rename data/{text/maps/FortreeCity_PokemonCenter_1F.inc => maps/FortreeCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/GraniteCave_1F.inc => maps/GraniteCave_1F/text.inc} (100%) rename data/{text/maps/GraniteCave_StevensRoom.inc => maps/GraniteCave_StevensRoom/text.inc} (100%) rename data/{text/maps/InsideOfTruck.inc => maps/InsideOfTruck/text.inc} (100%) rename data/{text/maps/JaggedPass.inc => maps/JaggedPass/text.inc} (100%) rename data/{text/maps/LavaridgeTown.inc => maps/LavaridgeTown/text.inc} (100%) rename data/{text/maps/LavaridgeTown_Gym_1F.inc => maps/LavaridgeTown_Gym_1F/text.inc} (100%) rename data/{text/maps/LavaridgeTown_HerbShop.inc => maps/LavaridgeTown_HerbShop/text.inc} (100%) rename data/{text/maps/LavaridgeTown_House.inc => maps/LavaridgeTown_House/text.inc} (100%) rename data/{text/maps/LavaridgeTown_Mart.inc => maps/LavaridgeTown_Mart/text.inc} (100%) rename data/{text/maps/LavaridgeTown_PokemonCenter_1F.inc => maps/LavaridgeTown_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/LilycoveCity.inc => maps/LilycoveCity/text.inc} (100%) rename data/{text/maps/LilycoveCity_ContestHall.inc => maps/LilycoveCity_ContestHall/text.inc} (100%) rename data/{text/maps/LilycoveCity_ContestLobby.inc => maps/LilycoveCity_ContestLobby/text.inc} (100%) rename data/{text/maps/LilycoveCity_CoveLilyMotel_1F.inc => maps/LilycoveCity_CoveLilyMotel_1F/text.inc} (100%) rename data/{text/maps/LilycoveCity_CoveLilyMotel_2F.inc => maps/LilycoveCity_CoveLilyMotel_2F/text.inc} (100%) rename data/{text/maps/LilycoveCity_DepartmentStoreRooftop.inc => maps/LilycoveCity_DepartmentStoreRooftop/text.inc} (100%) rename data/{text/maps/LilycoveCity_DepartmentStore_1F.inc => maps/LilycoveCity_DepartmentStore_1F/text.inc} (100%) rename data/{text/maps/LilycoveCity_DepartmentStore_2F.inc => maps/LilycoveCity_DepartmentStore_2F/text.inc} (100%) rename data/{text/maps/LilycoveCity_DepartmentStore_3F.inc => maps/LilycoveCity_DepartmentStore_3F/text.inc} (100%) rename data/{text/maps/LilycoveCity_DepartmentStore_4F.inc => maps/LilycoveCity_DepartmentStore_4F/text.inc} (100%) rename data/{text/maps/LilycoveCity_DepartmentStore_5F.inc => maps/LilycoveCity_DepartmentStore_5F/text.inc} (100%) rename data/{text/maps/LilycoveCity_Harbor.inc => maps/LilycoveCity_Harbor/text.inc} (100%) rename data/{text/maps/LilycoveCity_House1.inc => maps/LilycoveCity_House1/text.inc} (100%) rename data/{text/maps/LilycoveCity_House2.inc => maps/LilycoveCity_House2/text.inc} (100%) rename data/{text/maps/LilycoveCity_House3.inc => maps/LilycoveCity_House3/text.inc} (100%) rename data/{text/maps/LilycoveCity_House4.inc => maps/LilycoveCity_House4/text.inc} (100%) rename data/{text/maps/LilycoveCity_LilycoveMuseum_1F.inc => maps/LilycoveCity_LilycoveMuseum_1F/text.inc} (100%) rename data/{text/maps/LilycoveCity_LilycoveMuseum_2F.inc => maps/LilycoveCity_LilycoveMuseum_2F/text.inc} (100%) rename data/{text/maps/LilycoveCity_MoveDeletersHouse.inc => maps/LilycoveCity_MoveDeletersHouse/text.inc} (100%) rename data/{text/maps/LilycoveCity_PokemonCenter_1F.inc => maps/LilycoveCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/LilycoveCity_PokemonTrainerFanClub.inc => maps/LilycoveCity_PokemonTrainerFanClub/text.inc} (100%) rename data/{text/maps/LittlerootTown.inc => maps/LittlerootTown/text.inc} (100%) rename data/{text/maps/LittlerootTown_BrendansHouse_1F.inc => maps/LittlerootTown_BrendansHouse_1F/text.inc} (100%) rename data/{text/maps/LittlerootTown_BrendansHouse_2F.inc => maps/LittlerootTown_BrendansHouse_2F/text.inc} (100%) rename data/{text/maps/LittlerootTown_MaysHouse_1F.inc => maps/LittlerootTown_MaysHouse_1F/text.inc} (100%) rename data/{text/maps/LittlerootTown_MaysHouse_2F.inc => maps/LittlerootTown_MaysHouse_2F/text.inc} (100%) rename data/{text/maps/LittlerootTown_ProfessorBirchsLab.inc => maps/LittlerootTown_ProfessorBirchsLab/text.inc} (100%) rename data/{text/maps/MauvilleCity.inc => maps/MauvilleCity/text.inc} (100%) rename data/{text/maps/MauvilleCity_BikeShop.inc => maps/MauvilleCity_BikeShop/text.inc} (100%) rename data/{text/maps/MauvilleCity_GameCorner.inc => maps/MauvilleCity_GameCorner/text.inc} (100%) rename data/{text/maps/MauvilleCity_Gym.inc => maps/MauvilleCity_Gym/text.inc} (100%) rename data/{text/maps/MauvilleCity_House1.inc => maps/MauvilleCity_House1/text.inc} (100%) rename data/{text/maps/MauvilleCity_House2.inc => maps/MauvilleCity_House2/text.inc} (100%) rename data/{text/maps/MauvilleCity_Mart.inc => maps/MauvilleCity_Mart/text.inc} (100%) rename data/{text/maps/MauvilleCity_PokemonCenter_1F.inc => maps/MauvilleCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/MauvilleCity_PokemonCenter_2F.inc => maps/MauvilleCity_PokemonCenter_2F/text.inc} (100%) rename data/{text/maps/MeteorFalls_1F_1R.inc => maps/MeteorFalls_1F_1R/text.inc} (100%) rename data/{text/maps/MeteorFalls_1F_2R.inc => maps/MeteorFalls_1F_2R/text.inc} (100%) rename data/{text/maps/MossdeepCity.inc => maps/MossdeepCity/text.inc} (100%) rename data/{text/maps/MossdeepCity_GameCorner_1F.inc => maps/MossdeepCity_GameCorner_1F/text.inc} (100%) rename data/{text/maps/MossdeepCity_GameCorner_B1F.inc => maps/MossdeepCity_GameCorner_B1F/text.inc} (100%) rename data/{text/maps/MossdeepCity_Gym.inc => maps/MossdeepCity_Gym/text.inc} (100%) rename data/{text/maps/MossdeepCity_House1.inc => maps/MossdeepCity_House1/text.inc} (100%) rename data/{text/maps/MossdeepCity_House2.inc => maps/MossdeepCity_House2/text.inc} (100%) rename data/{text/maps/MossdeepCity_House3.inc => maps/MossdeepCity_House3/text.inc} (100%) rename data/{text/maps/MossdeepCity_House4.inc => maps/MossdeepCity_House4/text.inc} (100%) rename data/{text/maps/MossdeepCity_Mart.inc => maps/MossdeepCity_Mart/text.inc} (100%) rename data/{text/maps/MossdeepCity_PokemonCenter_1F.inc => maps/MossdeepCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/MossdeepCity_PokemonCenter_2F.inc => maps/MossdeepCity_PokemonCenter_2F/text.inc} (100%) rename data/{text/maps/MossdeepCity_SpaceCenter_1F.inc => maps/MossdeepCity_SpaceCenter_1F/text.inc} (100%) rename data/{text/maps/MossdeepCity_SpaceCenter_2F.inc => maps/MossdeepCity_SpaceCenter_2F/text.inc} (100%) rename data/{text/maps/MossdeepCity_StevensHouse.inc => maps/MossdeepCity_StevensHouse/text.inc} (100%) rename data/{text/maps/MtChimney.inc => maps/MtChimney/text.inc} (100%) rename data/{text/maps/MtChimney_CableCarStation.inc => maps/MtChimney_CableCarStation/text.inc} (100%) rename data/{text/maps/MtPyre_1F.inc => maps/MtPyre_1F/text.inc} (100%) rename data/{text/maps/MtPyre_2F.inc => maps/MtPyre_2F/text.inc} (100%) rename data/{text/maps/MtPyre_3F.inc => maps/MtPyre_3F/text.inc} (100%) rename data/{text/maps/MtPyre_4F.inc => maps/MtPyre_4F/text.inc} (100%) rename data/{text/maps/MtPyre_5F.inc => maps/MtPyre_5F/text.inc} (100%) rename data/{text/maps/MtPyre_6F.inc => maps/MtPyre_6F/text.inc} (100%) rename data/{text/maps/NewMauville_Entrance.inc => maps/NewMauville_Entrance/text.inc} (100%) rename data/{text/maps/NewMauville_Inside.inc => maps/NewMauville_Inside/text.inc} (100%) rename data/{text/maps/OldaleTown.inc => maps/OldaleTown/text.inc} (100%) rename data/{text/maps/OldaleTown_House1.inc => maps/OldaleTown_House1/text.inc} (100%) rename data/{text/maps/OldaleTown_House2.inc => maps/OldaleTown_House2/text.inc} (100%) rename data/{text/maps/OldaleTown_Mart.inc => maps/OldaleTown_Mart/text.inc} (100%) rename data/{text/maps/OldaleTown_PokemonCenter_1F.inc => maps/OldaleTown_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/PacifidlogTown.inc => maps/PacifidlogTown/text.inc} (100%) rename data/{text/maps/PacifidlogTown_House1.inc => maps/PacifidlogTown_House1/text.inc} (100%) rename data/{text/maps/PacifidlogTown_House2.inc => maps/PacifidlogTown_House2/text.inc} (100%) rename data/{text/maps/PacifidlogTown_House3.inc => maps/PacifidlogTown_House3/text.inc} (100%) rename data/{text/maps/PacifidlogTown_House4.inc => maps/PacifidlogTown_House4/text.inc} (100%) rename data/{text/maps/PacifidlogTown_House5.inc => maps/PacifidlogTown_House5/text.inc} (100%) rename data/{text/maps/PacifidlogTown_PokemonCenter_1F.inc => maps/PacifidlogTown_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/PetalburgCity.inc => maps/PetalburgCity/text.inc} (100%) rename data/{text/maps/PetalburgCity_Gym.inc => maps/PetalburgCity_Gym/text.inc} (100%) rename data/{text/maps/PetalburgCity_House1.inc => maps/PetalburgCity_House1/text.inc} (100%) rename data/{text/maps/PetalburgCity_House2.inc => maps/PetalburgCity_House2/text.inc} (100%) rename data/{text/maps/PetalburgCity_Mart.inc => maps/PetalburgCity_Mart/text.inc} (100%) rename data/{text/maps/PetalburgCity_PokemonCenter_1F.inc => maps/PetalburgCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/PetalburgCity_WallysHouse.inc => maps/PetalburgCity_WallysHouse/text.inc} (100%) rename data/{text/maps/PetalburgWoods.inc => maps/PetalburgWoods/text.inc} (100%) rename data/{text/maps/Route101.inc => maps/Route101/text.inc} (100%) rename data/{text/maps/Route102.inc => maps/Route102/text.inc} (100%) rename data/{text/maps/Route103.inc => maps/Route103/text.inc} (100%) rename data/{text/maps/Route104.inc => maps/Route104/text.inc} (100%) rename data/{text/maps/Route104_MrBrineysHouse.inc => maps/Route104_MrBrineysHouse/text.inc} (100%) rename data/{text/maps/Route104_Prototype.inc => maps/Route104_Prototype/text.inc} (100%) rename data/{text/maps/Route104_PrototypePrettyPetalFlowerShop.inc => maps/Route104_PrototypePrettyPetalFlowerShop/text.inc} (100%) rename data/{text/maps/Route105.inc => maps/Route105/text.inc} (100%) rename data/{text/maps/Route106.inc => maps/Route106/text.inc} (100%) rename data/{text/maps/Route107.inc => maps/Route107/text.inc} (100%) rename data/{text/maps/Route108.inc => maps/Route108/text.inc} (100%) rename data/{text/maps/Route109.inc => maps/Route109/text.inc} (100%) rename data/{text/maps/Route109_SeashoreHouse.inc => maps/Route109_SeashoreHouse/text.inc} (100%) rename data/{text/maps/Route110.inc => maps/Route110/text.inc} (100%) rename data/{text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc => maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc} (100%) rename data/{text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc => maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc} (100%) rename data/{text/maps/Route110_TrickHouseEnd.inc => maps/Route110_TrickHouseEnd/text.inc} (100%) rename data/{text/maps/Route110_TrickHouseEntrance.inc => maps/Route110_TrickHouseEntrance/text.inc} (100%) rename data/{text/maps/Route110_TrickHousePuzzle1.inc => maps/Route110_TrickHousePuzzle1/text.inc} (100%) rename data/{text/maps/Route110_TrickHousePuzzle2.inc => maps/Route110_TrickHousePuzzle2/text.inc} (100%) rename data/{text/maps/Route110_TrickHousePuzzle3.inc => maps/Route110_TrickHousePuzzle3/text.inc} (100%) rename data/{text/maps/Route110_TrickHousePuzzle4.inc => maps/Route110_TrickHousePuzzle4/text.inc} (100%) rename data/{text/maps/Route110_TrickHousePuzzle5.inc => maps/Route110_TrickHousePuzzle5/text.inc} (100%) rename data/{text/maps/Route110_TrickHousePuzzle6.inc => maps/Route110_TrickHousePuzzle6/text.inc} (100%) rename data/{text/maps/Route110_TrickHousePuzzle7.inc => maps/Route110_TrickHousePuzzle7/text.inc} (100%) rename data/{text/maps/Route110_TrickHousePuzzle8.inc => maps/Route110_TrickHousePuzzle8/text.inc} (100%) rename data/{text/maps/Route111.inc => maps/Route111/text.inc} (100%) rename data/{text/maps/Route111_OldLadysRestStop.inc => maps/Route111_OldLadysRestStop/text.inc} (100%) rename data/{text/maps/Route111_WinstrateFamilysHouse.inc => maps/Route111_WinstrateFamilysHouse/text.inc} (100%) rename data/{text/maps/Route112.inc => maps/Route112/text.inc} (100%) rename data/{text/maps/Route112_CableCarStation.inc => maps/Route112_CableCarStation/text.inc} (100%) rename data/{text/maps/Route113.inc => maps/Route113/text.inc} (100%) rename data/{text/maps/Route113_GlassWorkshop.inc => maps/Route113_GlassWorkshop/text.inc} (100%) rename data/{text/maps/Route114.inc => maps/Route114/text.inc} (100%) rename data/{text/maps/Route114_FossilManiacsHouse.inc => maps/Route114_FossilManiacsHouse/text.inc} (100%) rename data/{text/maps/Route114_FossilManiacsTunnel.inc => maps/Route114_FossilManiacsTunnel/text.inc} (100%) rename data/{text/maps/Route114_LanettesHouse.inc => maps/Route114_LanettesHouse/text.inc} (100%) rename data/{text/maps/Route115.inc => maps/Route115/text.inc} (100%) rename data/{text/maps/Route116.inc => maps/Route116/text.inc} (100%) rename data/{text/maps/Route116_TunnelersRestHouse.inc => maps/Route116_TunnelersRestHouse/text.inc} (100%) rename data/{text/maps/Route117.inc => maps/Route117/text.inc} (100%) rename data/{text/maps/Route118.inc => maps/Route118/text.inc} (100%) rename data/{text/maps/Route119.inc => maps/Route119/text.inc} (100%) rename data/{text/maps/Route119_House.inc => maps/Route119_House/text.inc} (100%) rename data/{text/maps/Route119_WeatherInstitute_1F.inc => maps/Route119_WeatherInstitute_1F/text.inc} (100%) rename data/{text/maps/Route119_WeatherInstitute_2F.inc => maps/Route119_WeatherInstitute_2F/text.inc} (100%) rename data/{text/maps/Route120.inc => maps/Route120/text.inc} (100%) rename data/{text/maps/Route121.inc => maps/Route121/text.inc} (100%) rename data/{text/maps/Route123.inc => maps/Route123/text.inc} (100%) rename data/{text/maps/Route123_BerryMastersHouse.inc => maps/Route123_BerryMastersHouse/text.inc} (100%) rename data/{text/maps/Route124.inc => maps/Route124/text.inc} (100%) rename data/{text/maps/Route124_DivingTreasureHuntersHouse.inc => maps/Route124_DivingTreasureHuntersHouse/text.inc} (100%) rename data/{text/maps/Route128.inc => maps/Route128/text.inc} (100%) rename data/{text/maps/RustboroCity.inc => maps/RustboroCity/text.inc} (100%) rename data/{text/maps/RustboroCity_CuttersHouse.inc => maps/RustboroCity_CuttersHouse/text.inc} (100%) rename data/{text/maps/RustboroCity_DevonCorp_1F.inc => maps/RustboroCity_DevonCorp_1F/text.inc} (100%) rename data/{text/maps/RustboroCity_DevonCorp_2F.inc => maps/RustboroCity_DevonCorp_2F/text.inc} (100%) rename data/{text/maps/RustboroCity_DevonCorp_3F.inc => maps/RustboroCity_DevonCorp_3F/text.inc} (100%) rename data/{text/maps/RustboroCity_Flat1_1F.inc => maps/RustboroCity_Flat1_1F/text.inc} (100%) rename data/{text/maps/RustboroCity_Flat1_2F.inc => maps/RustboroCity_Flat1_2F/text.inc} (100%) rename data/{text/maps/RustboroCity_Flat2_1F.inc => maps/RustboroCity_Flat2_1F/text.inc} (100%) rename data/{text/maps/RustboroCity_Flat2_2F.inc => maps/RustboroCity_Flat2_2F/text.inc} (100%) rename data/{text/maps/RustboroCity_Flat2_3F.inc => maps/RustboroCity_Flat2_3F/text.inc} (100%) rename data/{text/maps/RustboroCity_Gym.inc => maps/RustboroCity_Gym/text.inc} (100%) rename data/{text/maps/RustboroCity_House1.inc => maps/RustboroCity_House1/text.inc} (100%) rename data/{text/maps/RustboroCity_House2.inc => maps/RustboroCity_House2/text.inc} (100%) rename data/{text/maps/RustboroCity_House3.inc => maps/RustboroCity_House3/text.inc} (100%) rename data/{text/maps/RustboroCity_Mart.inc => maps/RustboroCity_Mart/text.inc} (100%) rename data/{text/maps/RustboroCity_PokemonCenter_1F.inc => maps/RustboroCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/RustboroCity_PokemonSchool.inc => maps/RustboroCity_PokemonSchool/text.inc} (100%) rename data/{text/maps/RusturfTunnel.inc => maps/RusturfTunnel/text.inc} (100%) rename data/{text/maps/SSTidalCorridor.inc => maps/SSTidalCorridor/text.inc} (100%) rename data/{text/maps/SSTidalLowerDeck.inc => maps/SSTidalLowerDeck/text.inc} (100%) rename data/{text/maps/SSTidalRooms.inc => maps/SSTidalRooms/text.inc} (100%) rename data/{text/maps/SeafloorCavern_Room1.inc => maps/SeafloorCavern_Room1/text.inc} (100%) rename data/{text/maps/SeafloorCavern_Room3.inc => maps/SeafloorCavern_Room3/text.inc} (100%) rename data/{text/maps/SeafloorCavern_Room4.inc => maps/SeafloorCavern_Room4/text.inc} (100%) rename data/{text/maps/SecretBase_RedCave1.inc => maps/SecretBase_RedCave1/text.inc} (100%) rename data/{text/maps/ShoalCave_LowTideEntranceRoom.inc => maps/ShoalCave_LowTideEntranceRoom/text.inc} (100%) rename data/{text/maps/ShoalCave_LowTideInnerRoom.inc => maps/ShoalCave_LowTideInnerRoom/text.inc} (100%) rename data/{text/maps/ShoalCave_LowTideLowerRoom.inc => maps/ShoalCave_LowTideLowerRoom/text.inc} (100%) rename data/{text/maps/ShoalCave_LowTideStairsRoom.inc => maps/ShoalCave_LowTideStairsRoom/text.inc} (100%) rename data/{text/maps/SlateportCity.inc => maps/SlateportCity/text.inc} (100%) rename data/{text/maps/SlateportCity_ContestHall.inc => maps/SlateportCity_ContestHall/text.inc} (100%) rename data/{text/maps/SlateportCity_ContestLobby.inc => maps/SlateportCity_ContestLobby/text.inc} (100%) rename data/{text/maps/SlateportCity_Harbor.inc => maps/SlateportCity_Harbor/text.inc} (100%) rename data/{text/maps/SlateportCity_House1.inc => maps/SlateportCity_House1/text.inc} (100%) rename data/{text/maps/SlateportCity_House2.inc => maps/SlateportCity_House2/text.inc} (100%) rename data/{text/maps/SlateportCity_Mart.inc => maps/SlateportCity_Mart/text.inc} (100%) rename data/{text/maps/SlateportCity_OceanicMuseum_1F.inc => maps/SlateportCity_OceanicMuseum_1F/text.inc} (100%) rename data/{text/maps/SlateportCity_OceanicMuseum_2F.inc => maps/SlateportCity_OceanicMuseum_2F/text.inc} (100%) rename data/{text/maps/SlateportCity_PokemonCenter_1F.inc => maps/SlateportCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/SlateportCity_PokemonFanClub.inc => maps/SlateportCity_PokemonFanClub/text.inc} (100%) rename data/{text/maps/SlateportCity_SternsShipyard_1F.inc => maps/SlateportCity_SternsShipyard_1F/text.inc} (100%) rename data/{text/maps/SlateportCity_SternsShipyard_2F.inc => maps/SlateportCity_SternsShipyard_2F/text.inc} (100%) rename data/{text/maps/SootopolisCity.inc => maps/SootopolisCity/text.inc} (100%) rename data/{text/maps/SootopolisCity_Gym_1F.inc => maps/SootopolisCity_Gym_1F/text.inc} (100%) rename data/{text/maps/SootopolisCity_Gym_B1F.inc => maps/SootopolisCity_Gym_B1F/text.inc} (100%) rename data/{text/maps/SootopolisCity_House1.inc => maps/SootopolisCity_House1/text.inc} (100%) rename data/{text/maps/SootopolisCity_House2.inc => maps/SootopolisCity_House2/text.inc} (100%) rename data/{text/maps/SootopolisCity_House3.inc => maps/SootopolisCity_House3/text.inc} (100%) rename data/{text/maps/SootopolisCity_House4.inc => maps/SootopolisCity_House4/text.inc} (100%) rename data/{text/maps/SootopolisCity_House5.inc => maps/SootopolisCity_House5/text.inc} (100%) rename data/{text/maps/SootopolisCity_House6.inc => maps/SootopolisCity_House6/text.inc} (100%) rename data/{text/maps/SootopolisCity_House7.inc => maps/SootopolisCity_House7/text.inc} (100%) rename data/{text/maps/SootopolisCity_House8.inc => maps/SootopolisCity_House8/text.inc} (100%) rename data/{text/maps/SootopolisCity_Mart.inc => maps/SootopolisCity_Mart/text.inc} (100%) rename data/{text/maps/SootopolisCity_PokemonCenter_1F.inc => maps/SootopolisCity_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/SouthernIsland_Exterior.inc => maps/SouthernIsland_Exterior/text.inc} (100%) rename data/{text/maps/SouthernIsland_Interior.inc => maps/SouthernIsland_Interior/text.inc} (100%) rename data/{text/maps/Underwater_SeafloorCavern.inc => maps/Underwater_SeafloorCavern/text.inc} (100%) rename data/{text/maps/VerdanturfTown.inc => maps/VerdanturfTown/text.inc} (100%) rename data/{text/maps/VerdanturfTown_ContestHall.inc => maps/VerdanturfTown_ContestHall/text.inc} (100%) rename data/{text/maps/VerdanturfTown_ContestLobby.inc => maps/VerdanturfTown_ContestLobby/text.inc} (100%) rename data/{text/maps/VerdanturfTown_FriendshipRatersHouse.inc => maps/VerdanturfTown_FriendshipRatersHouse/text.inc} (100%) rename data/{text/maps/VerdanturfTown_House.inc => maps/VerdanturfTown_House/text.inc} (100%) rename data/{text/maps/VerdanturfTown_Mart.inc => maps/VerdanturfTown_Mart/text.inc} (100%) rename data/{text/maps/VerdanturfTown_PokemonCenter_1F.inc => maps/VerdanturfTown_PokemonCenter_1F/text.inc} (100%) rename data/{text/maps/VerdanturfTown_WandasHouse.inc => maps/VerdanturfTown_WandasHouse/text.inc} (100%) rename data/{text/maps/VictoryRoad_1F.inc => maps/VictoryRoad_1F/text.inc} (100%) rename data/{text/maps/VictoryRoad_B1F.inc => maps/VictoryRoad_B1F/text.inc} (100%) rename data/{text/maps/VictoryRoad_B2F.inc => maps/VictoryRoad_B2F/text.inc} (100%) diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index cd21ebff2..e7464331c 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -618,250 +618,250 @@ EventScript_15F573: .include "data/maps/Route119_House/scripts.inc" .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.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/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: diff --git a/data/event_scripts.s b/data/event_scripts.s index 372007438..4bf5bdc52 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -618,250 +618,250 @@ EventScript_15F573: .include "data/maps/Route119_House/scripts.inc" .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.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/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: diff --git a/data/text/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/text.inc diff --git a/data/text/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/text.inc diff --git a/data/text/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/text.inc diff --git a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/text.inc diff --git a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/text.inc diff --git a/data/text/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/text.inc diff --git a/data/text/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/text.inc diff --git a/data/text/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/text.inc diff --git a/data/text/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/text.inc similarity index 100% rename from data/text/maps/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/text.inc diff --git a/data/text/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/text.inc similarity index 100% rename from data/text/maps/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/text.inc diff --git a/data/text/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/text.inc similarity index 100% rename from data/text/maps/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/text.inc diff --git a/data/text/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/text.inc similarity index 100% rename from data/text/maps/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/text.inc diff --git a/data/text/maps/BattleTower_BattleRoom.inc b/data/maps/BattleTower_BattleRoom/text.inc similarity index 100% rename from data/text/maps/BattleTower_BattleRoom.inc rename to data/maps/BattleTower_BattleRoom/text.inc diff --git a/data/text/maps/BattleTower_Lobby.inc b/data/maps/BattleTower_Lobby/text.inc similarity index 100% rename from data/text/maps/BattleTower_Lobby.inc rename to data/maps/BattleTower_Lobby/text.inc diff --git a/data/text/maps/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/text.inc similarity index 100% rename from data/text/maps/BattleTower_Outside.inc rename to data/maps/BattleTower_Outside/text.inc diff --git a/data/text/maps/DewfordTown.inc b/data/maps/DewfordTown/text.inc similarity index 100% rename from data/text/maps/DewfordTown.inc rename to data/maps/DewfordTown/text.inc diff --git a/data/text/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/text.inc similarity index 100% rename from data/text/maps/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/text.inc diff --git a/data/text/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/text.inc similarity index 100% rename from data/text/maps/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/text.inc diff --git a/data/text/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/text.inc similarity index 100% rename from data/text/maps/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/text.inc diff --git a/data/text/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/text.inc similarity index 100% rename from data/text/maps/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/text.inc diff --git a/data/text/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/text.inc diff --git a/data/text/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity.inc rename to data/maps/EverGrandeCity/text.inc diff --git a/data/text/maps/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/text.inc diff --git a/data/text/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/text.inc diff --git a/data/text/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/text.inc diff --git a/data/text/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/text.inc diff --git a/data/text/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/text.inc diff --git a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/EverGrandeCity_PokemonLeague.inc b/data/maps/EverGrandeCity_PokemonLeague/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity_PokemonLeague.inc rename to data/maps/EverGrandeCity_PokemonLeague/text.inc diff --git a/data/text/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/text.inc similarity index 100% rename from data/text/maps/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/text.inc diff --git a/data/text/maps/FallarborTown.inc b/data/maps/FallarborTown/text.inc similarity index 100% rename from data/text/maps/FallarborTown.inc rename to data/maps/FallarborTown/text.inc diff --git a/data/text/maps/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/text.inc similarity index 100% rename from data/text/maps/FallarborTown_ContestHall.inc rename to data/maps/FallarborTown_ContestHall/text.inc diff --git a/data/text/maps/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/text.inc similarity index 100% rename from data/text/maps/FallarborTown_ContestLobby.inc rename to data/maps/FallarborTown_ContestLobby/text.inc diff --git a/data/text/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/text.inc similarity index 100% rename from data/text/maps/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/text.inc diff --git a/data/text/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/text.inc similarity index 100% rename from data/text/maps/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/text.inc diff --git a/data/text/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/text.inc similarity index 100% rename from data/text/maps/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/text.inc diff --git a/data/text/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/text.inc diff --git a/data/text/maps/FortreeCity.inc b/data/maps/FortreeCity/text.inc similarity index 100% rename from data/text/maps/FortreeCity.inc rename to data/maps/FortreeCity/text.inc diff --git a/data/text/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/text.inc similarity index 100% rename from data/text/maps/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/text.inc diff --git a/data/text/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/text.inc similarity index 100% rename from data/text/maps/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/text.inc diff --git a/data/text/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/text.inc similarity index 100% rename from data/text/maps/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/text.inc diff --git a/data/text/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/text.inc similarity index 100% rename from data/text/maps/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/text.inc diff --git a/data/text/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/text.inc similarity index 100% rename from data/text/maps/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/text.inc diff --git a/data/text/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/text.inc similarity index 100% rename from data/text/maps/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/text.inc diff --git a/data/text/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/text.inc similarity index 100% rename from data/text/maps/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/text.inc diff --git a/data/text/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/text.inc similarity index 100% rename from data/text/maps/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/text.inc diff --git a/data/text/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/text.inc similarity index 100% rename from data/text/maps/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/text.inc diff --git a/data/text/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/text.inc similarity index 100% rename from data/text/maps/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/text.inc diff --git a/data/text/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/text.inc similarity index 100% rename from data/text/maps/InsideOfTruck.inc rename to data/maps/InsideOfTruck/text.inc diff --git a/data/text/maps/JaggedPass.inc b/data/maps/JaggedPass/text.inc similarity index 100% rename from data/text/maps/JaggedPass.inc rename to data/maps/JaggedPass/text.inc diff --git a/data/text/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/text.inc similarity index 100% rename from data/text/maps/LavaridgeTown.inc rename to data/maps/LavaridgeTown/text.inc diff --git a/data/text/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/text.inc similarity index 100% rename from data/text/maps/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/text.inc diff --git a/data/text/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/text.inc similarity index 100% rename from data/text/maps/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/text.inc diff --git a/data/text/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/text.inc similarity index 100% rename from data/text/maps/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/text.inc diff --git a/data/text/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/text.inc similarity index 100% rename from data/text/maps/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/text.inc diff --git a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/text.inc diff --git a/data/text/maps/LilycoveCity.inc b/data/maps/LilycoveCity/text.inc similarity index 100% rename from data/text/maps/LilycoveCity.inc rename to data/maps/LilycoveCity/text.inc diff --git a/data/text/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/text.inc diff --git a/data/text/maps/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/text.inc diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc diff --git a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc diff --git a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/text.inc diff --git a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/text.inc diff --git a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/text.inc diff --git a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/text.inc diff --git a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/text.inc diff --git a/data/text/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/text.inc diff --git a/data/text/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/text.inc diff --git a/data/text/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/text.inc diff --git a/data/text/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/text.inc diff --git a/data/text/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/text.inc diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc diff --git a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/text.inc diff --git a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc similarity index 100% rename from data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc diff --git a/data/text/maps/LittlerootTown.inc b/data/maps/LittlerootTown/text.inc similarity index 100% rename from data/text/maps/LittlerootTown.inc rename to data/maps/LittlerootTown/text.inc diff --git a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc similarity index 100% rename from data/text/maps/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/text.inc diff --git a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc similarity index 100% rename from data/text/maps/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/text.inc diff --git a/data/text/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/text.inc similarity index 100% rename from data/text/maps/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/text.inc diff --git a/data/text/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/text.inc similarity index 100% rename from data/text/maps/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/text.inc diff --git a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc similarity index 100% rename from data/text/maps/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/text.inc diff --git a/data/text/maps/MauvilleCity.inc b/data/maps/MauvilleCity/text.inc similarity index 100% rename from data/text/maps/MauvilleCity.inc rename to data/maps/MauvilleCity/text.inc diff --git a/data/text/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/text.inc similarity index 100% rename from data/text/maps/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/text.inc diff --git a/data/text/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/text.inc similarity index 100% rename from data/text/maps/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/text.inc diff --git a/data/text/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/text.inc similarity index 100% rename from data/text/maps/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/text.inc diff --git a/data/text/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/text.inc similarity index 100% rename from data/text/maps/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/text.inc diff --git a/data/text/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/text.inc similarity index 100% rename from data/text/maps/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/text.inc diff --git a/data/text/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/text.inc similarity index 100% rename from data/text/maps/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/text.inc diff --git a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/text.inc similarity index 100% rename from data/text/maps/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/text.inc diff --git a/data/text/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/text.inc similarity index 100% rename from data/text/maps/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/text.inc diff --git a/data/text/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/text.inc similarity index 100% rename from data/text/maps/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/text.inc diff --git a/data/text/maps/MossdeepCity.inc b/data/maps/MossdeepCity/text.inc similarity index 100% rename from data/text/maps/MossdeepCity.inc rename to data/maps/MossdeepCity/text.inc diff --git a/data/text/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/text.inc diff --git a/data/text/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/text.inc diff --git a/data/text/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/text.inc diff --git a/data/text/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/text.inc diff --git a/data/text/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/text.inc diff --git a/data/text/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/text.inc diff --git a/data/text/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/text.inc diff --git a/data/text/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/text.inc diff --git a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/text.inc diff --git a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/text.inc diff --git a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/text.inc diff --git a/data/text/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/text.inc similarity index 100% rename from data/text/maps/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/text.inc diff --git a/data/text/maps/MtChimney.inc b/data/maps/MtChimney/text.inc similarity index 100% rename from data/text/maps/MtChimney.inc rename to data/maps/MtChimney/text.inc diff --git a/data/text/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/text.inc similarity index 100% rename from data/text/maps/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/text.inc diff --git a/data/text/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/text.inc similarity index 100% rename from data/text/maps/MtPyre_1F.inc rename to data/maps/MtPyre_1F/text.inc diff --git a/data/text/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/text.inc similarity index 100% rename from data/text/maps/MtPyre_2F.inc rename to data/maps/MtPyre_2F/text.inc diff --git a/data/text/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/text.inc similarity index 100% rename from data/text/maps/MtPyre_3F.inc rename to data/maps/MtPyre_3F/text.inc diff --git a/data/text/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/text.inc similarity index 100% rename from data/text/maps/MtPyre_4F.inc rename to data/maps/MtPyre_4F/text.inc diff --git a/data/text/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/text.inc similarity index 100% rename from data/text/maps/MtPyre_5F.inc rename to data/maps/MtPyre_5F/text.inc diff --git a/data/text/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/text.inc similarity index 100% rename from data/text/maps/MtPyre_6F.inc rename to data/maps/MtPyre_6F/text.inc diff --git a/data/text/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/text.inc similarity index 100% rename from data/text/maps/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/text.inc diff --git a/data/text/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/text.inc similarity index 100% rename from data/text/maps/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/text.inc diff --git a/data/text/maps/OldaleTown.inc b/data/maps/OldaleTown/text.inc similarity index 100% rename from data/text/maps/OldaleTown.inc rename to data/maps/OldaleTown/text.inc diff --git a/data/text/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/text.inc similarity index 100% rename from data/text/maps/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/text.inc diff --git a/data/text/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/text.inc similarity index 100% rename from data/text/maps/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/text.inc diff --git a/data/text/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/text.inc similarity index 100% rename from data/text/maps/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/text.inc diff --git a/data/text/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/text.inc diff --git a/data/text/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/text.inc similarity index 100% rename from data/text/maps/PacifidlogTown.inc rename to data/maps/PacifidlogTown/text.inc diff --git a/data/text/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/text.inc similarity index 100% rename from data/text/maps/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/text.inc diff --git a/data/text/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/text.inc similarity index 100% rename from data/text/maps/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/text.inc diff --git a/data/text/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/text.inc similarity index 100% rename from data/text/maps/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/text.inc diff --git a/data/text/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/text.inc similarity index 100% rename from data/text/maps/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/text.inc diff --git a/data/text/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/text.inc similarity index 100% rename from data/text/maps/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/text.inc diff --git a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/text.inc diff --git a/data/text/maps/PetalburgCity.inc b/data/maps/PetalburgCity/text.inc similarity index 100% rename from data/text/maps/PetalburgCity.inc rename to data/maps/PetalburgCity/text.inc diff --git a/data/text/maps/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/text.inc similarity index 100% rename from data/text/maps/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/text.inc diff --git a/data/text/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/text.inc similarity index 100% rename from data/text/maps/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/text.inc diff --git a/data/text/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/text.inc similarity index 100% rename from data/text/maps/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/text.inc diff --git a/data/text/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/text.inc similarity index 100% rename from data/text/maps/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/text.inc diff --git a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/text.inc similarity index 100% rename from data/text/maps/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/text.inc diff --git a/data/text/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/text.inc similarity index 100% rename from data/text/maps/PetalburgWoods.inc rename to data/maps/PetalburgWoods/text.inc diff --git a/data/text/maps/Route101.inc b/data/maps/Route101/text.inc similarity index 100% rename from data/text/maps/Route101.inc rename to data/maps/Route101/text.inc diff --git a/data/text/maps/Route102.inc b/data/maps/Route102/text.inc similarity index 100% rename from data/text/maps/Route102.inc rename to data/maps/Route102/text.inc diff --git a/data/text/maps/Route103.inc b/data/maps/Route103/text.inc similarity index 100% rename from data/text/maps/Route103.inc rename to data/maps/Route103/text.inc diff --git a/data/text/maps/Route104.inc b/data/maps/Route104/text.inc similarity index 100% rename from data/text/maps/Route104.inc rename to data/maps/Route104/text.inc diff --git a/data/text/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/text.inc similarity index 100% rename from data/text/maps/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/text.inc diff --git a/data/text/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/text.inc similarity index 100% rename from data/text/maps/Route104_Prototype.inc rename to data/maps/Route104_Prototype/text.inc diff --git a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc similarity index 100% rename from data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc diff --git a/data/text/maps/Route105.inc b/data/maps/Route105/text.inc similarity index 100% rename from data/text/maps/Route105.inc rename to data/maps/Route105/text.inc diff --git a/data/text/maps/Route106.inc b/data/maps/Route106/text.inc similarity index 100% rename from data/text/maps/Route106.inc rename to data/maps/Route106/text.inc diff --git a/data/text/maps/Route107.inc b/data/maps/Route107/text.inc similarity index 100% rename from data/text/maps/Route107.inc rename to data/maps/Route107/text.inc diff --git a/data/text/maps/Route108.inc b/data/maps/Route108/text.inc similarity index 100% rename from data/text/maps/Route108.inc rename to data/maps/Route108/text.inc diff --git a/data/text/maps/Route109.inc b/data/maps/Route109/text.inc similarity index 100% rename from data/text/maps/Route109.inc rename to data/maps/Route109/text.inc diff --git a/data/text/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/text.inc similarity index 100% rename from data/text/maps/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/text.inc diff --git a/data/text/maps/Route110.inc b/data/maps/Route110/text.inc similarity index 100% rename from data/text/maps/Route110.inc rename to data/maps/Route110/text.inc diff --git a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc similarity index 100% rename from data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc rename to data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc diff --git a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc similarity index 100% rename from data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc rename to data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc diff --git a/data/text/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/text.inc diff --git a/data/text/maps/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/text.inc diff --git a/data/text/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/text.inc diff --git a/data/text/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/text.inc diff --git a/data/text/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/text.inc diff --git a/data/text/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/text.inc diff --git a/data/text/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/text.inc diff --git a/data/text/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/text.inc diff --git a/data/text/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/text.inc diff --git a/data/text/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/text.inc similarity index 100% rename from data/text/maps/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/text.inc diff --git a/data/text/maps/Route111.inc b/data/maps/Route111/text.inc similarity index 100% rename from data/text/maps/Route111.inc rename to data/maps/Route111/text.inc diff --git a/data/text/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/text.inc similarity index 100% rename from data/text/maps/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/text.inc diff --git a/data/text/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/text.inc similarity index 100% rename from data/text/maps/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/text.inc diff --git a/data/text/maps/Route112.inc b/data/maps/Route112/text.inc similarity index 100% rename from data/text/maps/Route112.inc rename to data/maps/Route112/text.inc diff --git a/data/text/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/text.inc similarity index 100% rename from data/text/maps/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/text.inc diff --git a/data/text/maps/Route113.inc b/data/maps/Route113/text.inc similarity index 100% rename from data/text/maps/Route113.inc rename to data/maps/Route113/text.inc diff --git a/data/text/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/text.inc similarity index 100% rename from data/text/maps/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/text.inc diff --git a/data/text/maps/Route114.inc b/data/maps/Route114/text.inc similarity index 100% rename from data/text/maps/Route114.inc rename to data/maps/Route114/text.inc diff --git a/data/text/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/text.inc similarity index 100% rename from data/text/maps/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/text.inc diff --git a/data/text/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/text.inc similarity index 100% rename from data/text/maps/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/text.inc diff --git a/data/text/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/text.inc similarity index 100% rename from data/text/maps/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/text.inc diff --git a/data/text/maps/Route115.inc b/data/maps/Route115/text.inc similarity index 100% rename from data/text/maps/Route115.inc rename to data/maps/Route115/text.inc diff --git a/data/text/maps/Route116.inc b/data/maps/Route116/text.inc similarity index 100% rename from data/text/maps/Route116.inc rename to data/maps/Route116/text.inc diff --git a/data/text/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/text.inc similarity index 100% rename from data/text/maps/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/text.inc diff --git a/data/text/maps/Route117.inc b/data/maps/Route117/text.inc similarity index 100% rename from data/text/maps/Route117.inc rename to data/maps/Route117/text.inc diff --git a/data/text/maps/Route118.inc b/data/maps/Route118/text.inc similarity index 100% rename from data/text/maps/Route118.inc rename to data/maps/Route118/text.inc diff --git a/data/text/maps/Route119.inc b/data/maps/Route119/text.inc similarity index 100% rename from data/text/maps/Route119.inc rename to data/maps/Route119/text.inc diff --git a/data/text/maps/Route119_House.inc b/data/maps/Route119_House/text.inc similarity index 100% rename from data/text/maps/Route119_House.inc rename to data/maps/Route119_House/text.inc diff --git a/data/text/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/text.inc similarity index 100% rename from data/text/maps/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/text.inc diff --git a/data/text/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/text.inc similarity index 100% rename from data/text/maps/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/text.inc diff --git a/data/text/maps/Route120.inc b/data/maps/Route120/text.inc similarity index 100% rename from data/text/maps/Route120.inc rename to data/maps/Route120/text.inc diff --git a/data/text/maps/Route121.inc b/data/maps/Route121/text.inc similarity index 100% rename from data/text/maps/Route121.inc rename to data/maps/Route121/text.inc diff --git a/data/text/maps/Route123.inc b/data/maps/Route123/text.inc similarity index 100% rename from data/text/maps/Route123.inc rename to data/maps/Route123/text.inc diff --git a/data/text/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/text.inc similarity index 100% rename from data/text/maps/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/text.inc diff --git a/data/text/maps/Route124.inc b/data/maps/Route124/text.inc similarity index 100% rename from data/text/maps/Route124.inc rename to data/maps/Route124/text.inc diff --git a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/text.inc similarity index 100% rename from data/text/maps/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/text.inc diff --git a/data/text/maps/Route128.inc b/data/maps/Route128/text.inc similarity index 100% rename from data/text/maps/Route128.inc rename to data/maps/Route128/text.inc diff --git a/data/text/maps/RustboroCity.inc b/data/maps/RustboroCity/text.inc similarity index 100% rename from data/text/maps/RustboroCity.inc rename to data/maps/RustboroCity/text.inc diff --git a/data/text/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/text.inc similarity index 100% rename from data/text/maps/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/text.inc diff --git a/data/text/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/text.inc diff --git a/data/text/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/text.inc diff --git a/data/text/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/text.inc diff --git a/data/text/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/text.inc diff --git a/data/text/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/text.inc diff --git a/data/text/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/text.inc diff --git a/data/text/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/text.inc diff --git a/data/text/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/text.inc diff --git a/data/text/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/text.inc similarity index 100% rename from data/text/maps/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/text.inc diff --git a/data/text/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/text.inc similarity index 100% rename from data/text/maps/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/text.inc diff --git a/data/text/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/text.inc similarity index 100% rename from data/text/maps/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/text.inc diff --git a/data/text/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/text.inc similarity index 100% rename from data/text/maps/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/text.inc diff --git a/data/text/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/text.inc similarity index 100% rename from data/text/maps/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/text.inc diff --git a/data/text/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/text.inc similarity index 100% rename from data/text/maps/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/text.inc diff --git a/data/text/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/text.inc similarity index 100% rename from data/text/maps/RusturfTunnel.inc rename to data/maps/RusturfTunnel/text.inc diff --git a/data/text/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/text.inc similarity index 100% rename from data/text/maps/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/text.inc diff --git a/data/text/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/text.inc similarity index 100% rename from data/text/maps/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/text.inc diff --git a/data/text/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/text.inc similarity index 100% rename from data/text/maps/SSTidalRooms.inc rename to data/maps/SSTidalRooms/text.inc diff --git a/data/text/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/text.inc similarity index 100% rename from data/text/maps/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/text.inc diff --git a/data/text/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/text.inc similarity index 100% rename from data/text/maps/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/text.inc diff --git a/data/text/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/text.inc similarity index 100% rename from data/text/maps/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/text.inc diff --git a/data/text/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/text.inc similarity index 100% rename from data/text/maps/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/text.inc diff --git a/data/text/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/text.inc similarity index 100% rename from data/text/maps/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/text.inc diff --git a/data/text/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/text.inc similarity index 100% rename from data/text/maps/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/text.inc diff --git a/data/text/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/text.inc similarity index 100% rename from data/text/maps/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/text.inc diff --git a/data/text/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/text.inc similarity index 100% rename from data/text/maps/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/text.inc diff --git a/data/text/maps/SlateportCity.inc b/data/maps/SlateportCity/text.inc similarity index 100% rename from data/text/maps/SlateportCity.inc rename to data/maps/SlateportCity/text.inc diff --git a/data/text/maps/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/text.inc similarity index 100% rename from data/text/maps/SlateportCity_ContestHall.inc rename to data/maps/SlateportCity_ContestHall/text.inc diff --git a/data/text/maps/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/text.inc similarity index 100% rename from data/text/maps/SlateportCity_ContestLobby.inc rename to data/maps/SlateportCity_ContestLobby/text.inc diff --git a/data/text/maps/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/text.inc similarity index 100% rename from data/text/maps/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/text.inc diff --git a/data/text/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/text.inc similarity index 100% rename from data/text/maps/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/text.inc diff --git a/data/text/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/text.inc similarity index 100% rename from data/text/maps/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/text.inc diff --git a/data/text/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/text.inc similarity index 100% rename from data/text/maps/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/text.inc diff --git a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc similarity index 100% rename from data/text/maps/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/text.inc diff --git a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc similarity index 100% rename from data/text/maps/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/text.inc diff --git a/data/text/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/text.inc similarity index 100% rename from data/text/maps/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/text.inc diff --git a/data/text/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/text.inc similarity index 100% rename from data/text/maps/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/text.inc diff --git a/data/text/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/text.inc similarity index 100% rename from data/text/maps/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/text.inc diff --git a/data/text/maps/SootopolisCity.inc b/data/maps/SootopolisCity/text.inc similarity index 100% rename from data/text/maps/SootopolisCity.inc rename to data/maps/SootopolisCity/text.inc diff --git a/data/text/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/text.inc diff --git a/data/text/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/text.inc diff --git a/data/text/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/text.inc diff --git a/data/text/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/text.inc diff --git a/data/text/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/text.inc diff --git a/data/text/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/text.inc diff --git a/data/text/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/text.inc diff --git a/data/text/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/text.inc diff --git a/data/text/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/text.inc diff --git a/data/text/maps/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_House8.inc rename to data/maps/SootopolisCity_House8/text.inc diff --git a/data/text/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/text.inc diff --git a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/text.inc diff --git a/data/text/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/text.inc similarity index 100% rename from data/text/maps/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/text.inc diff --git a/data/text/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/text.inc similarity index 100% rename from data/text/maps/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/text.inc diff --git a/data/text/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/text.inc similarity index 100% rename from data/text/maps/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/text.inc diff --git a/data/text/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/text.inc similarity index 100% rename from data/text/maps/VerdanturfTown.inc rename to data/maps/VerdanturfTown/text.inc diff --git a/data/text/maps/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/text.inc similarity index 100% rename from data/text/maps/VerdanturfTown_ContestHall.inc rename to data/maps/VerdanturfTown_ContestHall/text.inc diff --git a/data/text/maps/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/text.inc similarity index 100% rename from data/text/maps/VerdanturfTown_ContestLobby.inc rename to data/maps/VerdanturfTown_ContestLobby/text.inc diff --git a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc similarity index 100% rename from data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc diff --git a/data/text/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/text.inc similarity index 100% rename from data/text/maps/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/text.inc diff --git a/data/text/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/text.inc similarity index 100% rename from data/text/maps/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/text.inc diff --git a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc similarity index 100% rename from data/text/maps/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/text.inc diff --git a/data/text/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/text.inc similarity index 100% rename from data/text/maps/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/text.inc diff --git a/data/text/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/text.inc similarity index 100% rename from data/text/maps/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/text.inc diff --git a/data/text/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/text.inc similarity index 100% rename from data/text/maps/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/text.inc diff --git a/data/text/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/text.inc similarity index 100% rename from data/text/maps/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/text.inc From 2c7a4e1406b078cf9bcc2a16e92a58497390aa17 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:51 -0500 Subject: [PATCH 8/9] Use MUS_ prefix instead of BGM_ prefix for songs --- charmap.txt | 236 ++++++++-------- constants/version.inc | 8 +- data-de/event_scripts.s | 14 +- data/battle_scripts_1.s | 4 +- data/event_scripts.s | 14 +- .../AbandonedShip_CaptainsOffice/header.inc | 2 +- .../AbandonedShip_Corridors_1F/header.inc | 2 +- .../AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- .../header.inc | 2 +- .../AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- .../maps/AbandonedShip_Underwater1/header.inc | 2 +- .../maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- data/maps/BattleTower_BattleRoom/header.inc | 2 +- data/maps/BattleTower_BattleRoom/scripts.inc | 2 +- data/maps/BattleTower_Corridor/header.inc | 2 +- data/maps/BattleTower_Elevator/header.inc | 2 +- data/maps/BattleTower_Lobby/header.inc | 2 +- data/maps/BattleTower_Lobby/scripts.inc | 4 +- data/maps/BattleTower_Outside/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_B2F/header.inc | 2 +- data/maps/CaveOfOrigin_B3F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- .../DewfordTown_PokemonCenter_1F/header.inc | 2 +- .../DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- .../EverGrandeCity_ChampionsRoom/header.inc | 2 +- .../EverGrandeCity_ChampionsRoom/scripts.inc | 6 +- data/maps/EverGrandeCity_Corridor1/header.inc | 2 +- data/maps/EverGrandeCity_Corridor2/header.inc | 2 +- data/maps/EverGrandeCity_Corridor3/header.inc | 2 +- data/maps/EverGrandeCity_Corridor4/header.inc | 2 +- data/maps/EverGrandeCity_Corridor5/header.inc | 2 +- .../maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- .../EverGrandeCity_DrakesRoom/scripts.inc | 2 +- .../EverGrandeCity_GlaciasRoom/header.inc | 2 +- .../EverGrandeCity_GlaciasRoom/scripts.inc | 2 +- .../maps/EverGrandeCity_HallOfFame/header.inc | 2 +- .../EverGrandeCity_PhoebesRoom/header.inc | 2 +- .../EverGrandeCity_PhoebesRoom/scripts.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../EverGrandeCity_PokemonLeague/header.inc | 2 +- .../EverGrandeCity_PokemonLeague/scripts.inc | 2 +- .../EverGrandeCity_SidneysRoom/header.inc | 2 +- .../EverGrandeCity_SidneysRoom/scripts.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- .../maps/FallarborTown_ContestHall/header.inc | 2 +- .../FallarborTown_ContestLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- .../FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- .../FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- .../FortreeCity_PokemonCenter_1F/header.inc | 2 +- .../FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown/scripts.inc | 6 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity/scripts.inc | 4 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- .../maps/LilycoveCity_ContestLobby/header.inc | 2 +- .../LilycoveCity_ContestLobby/scripts.inc | 4 +- .../LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/scripts.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_EmptyMap/header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../LilycoveCity_MoveDeletersHouse/header.inc | 2 +- .../scripts.inc | 2 +- .../LilycoveCity_PokemonCenter_1F/header.inc | 2 +- .../LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- data/maps/LittlerootTown/scripts.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../LittlerootTown_MaysHouse_1F/header.inc | 2 +- .../LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../LittlerootTown_MaysHouse_2F/scripts.inc | 4 +- .../header.inc | 2 +- .../scripts.inc | 4 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_B1F/header.inc | 2 +- data/maps/MagmaHideout_B2F/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- .../MauvilleCity_PokemonCenter_1F/header.inc | 2 +- .../MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- .../MossdeepCity_GameCorner_1F/header.inc | 2 +- .../MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- .../MossdeepCity_PokemonCenter_1F/header.inc | 2 +- .../MossdeepCity_PokemonCenter_2F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_1F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_2F/header.inc | 2 +- .../maps/MossdeepCity_StevensHouse/header.inc | 2 +- .../MossdeepCity_StevensHouse/scripts.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- .../maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown/scripts.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- .../OldaleTown_PokemonCenter_1F/header.inc | 2 +- .../OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity/scripts.inc | 4 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_Gym/scripts.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- .../PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../PetalburgCity_PokemonCenter_2F/header.inc | 2 +- .../maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/PetalburgWoods/scripts.inc | 4 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route101/scripts.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route103/scripts.inc | 4 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- .../Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- data/maps/Route110/scripts.inc | 6 +- .../header.inc | 2 +- .../header.inc | 2 +- .../Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- .../Route110_TrickHouseEntrance/header.inc | 2 +- .../Route110_TrickHouseEntrance/scripts.inc | 2 +- .../Route110_TrickHousePuzzle1/header.inc | 2 +- .../Route110_TrickHousePuzzle2/header.inc | 2 +- .../Route110_TrickHousePuzzle3/header.inc | 2 +- .../Route110_TrickHousePuzzle4/header.inc | 2 +- .../Route110_TrickHousePuzzle5/header.inc | 2 +- .../Route110_TrickHousePuzzle6/header.inc | 2 +- .../Route110_TrickHousePuzzle7/header.inc | 2 +- .../Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- data/maps/Route111/scripts.inc | 4 +- .../maps/Route111_OldLadysRestStop/header.inc | 2 +- .../Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- .../Route114_FossilManiacsHouse/header.inc | 2 +- .../Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- .../Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119/scripts.inc | 4 +- data/maps/Route119_House/header.inc | 2 +- .../Route119_WeatherInstitute_1F/header.inc | 2 +- .../Route119_WeatherInstitute_2F/header.inc | 2 +- .../Route119_WeatherInstitute_2F/scripts.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- .../Route121_SafariZoneEntrance/header.inc | 2 +- .../Route121_SafariZoneEntrance/scripts.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- .../Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- .../maps/RustboroCity_CuttersHouse/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- .../RustboroCity_DevonCorp_2F/scripts.inc | 4 +- .../maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- .../RustboroCity_DevonCorp_3F/scripts.inc | 4 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- .../RustboroCity_PokemonCenter_1F/header.inc | 2 +- .../RustboroCity_PokemonCenter_2F/header.inc | 2 +- .../RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/RusturfTunnel/scripts.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SeafloorCavern_Room9/scripts.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- .../ShoalCave_HighTideEntranceRoom/header.inc | 2 +- .../ShoalCave_HighTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- .../ShoalCave_LowTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideLowerRoom/header.inc | 2 +- .../ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- data/maps/SlateportCity/scripts.inc | 4 +- .../maps/SlateportCity_ContestHall/header.inc | 2 +- .../SlateportCity_ContestLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_Harbor/scripts.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../scripts.inc | 2 +- .../SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../SlateportCity_PokemonCenter_2F/header.inc | 2 +- .../SlateportCity_PokemonFanClub/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- data/maps/SootopolisCity_House8/header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- .../maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- .../maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/UnknownMap_25_34/scripts.inc | 10 +- data/maps/VerdanturfTown/header.inc | 2 +- .../VerdanturfTown_ContestHall/header.inc | 2 +- .../VerdanturfTown_ContestLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- data/scripts/berry_tree.inc | 2 +- data/scripts/contest_hall.inc | 4 +- data/scripts/day_care.inc | 2 +- data/scripts/players_house.inc | 4 +- include/constants/songs.h | 238 ++++++++--------- src/battle/battle_2.c | 8 +- src/battle/battle_setup.c | 36 +-- src/battle/pokeball.c | 2 +- src/berry_blender.c | 6 +- src/bike.c | 4 +- src/cable_car.c | 2 +- src/cable_club.c | 4 +- src/contest.c | 2 +- src/credits.c | 4 +- src/data/battle_strings_en.h | 4 +- src/debug/sound_check_menu.c | 252 +++++++++--------- src/evolution_scene.c | 20 +- src/field_effect.c | 2 +- src/hall_of_fame.c | 2 +- src/main_menu.c | 2 +- src/mauville_man.c | 2 +- src/move_tutor_menu.c | 4 +- src/overworld.c | 24 +- src/party_menu.c | 2 +- src/pokemon_3.c | 30 +-- src/roulette.c | 4 +- src/slot_machine.c | 14 +- src/sound.c | 24 +- src/trade.c | 6 +- 463 files changed, 945 insertions(+), 945 deletions(-) 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/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 e7464331c..a10c2ddb0 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -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/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 4bf5bdc52..1f514321c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -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/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 74571dc08..67112ba78 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -3,7 +3,7 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .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/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index 4caf26a22..c228ebc29 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Corridors_1F:: @ 8307374 .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/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index c979d2d79..bbca3eaba 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .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/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 5002c48eb..84b45db3a 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Deck:: @ 8307358 .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/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index 8d862d16e..99b22902b 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .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/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 9699a3abd..8f5d464a2 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .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/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index adc37862b..335c10f7a 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Room_B1F:: @ 830741C .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/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 15a2f66da..bb6b7be08 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .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/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index daaca3671..538209d37 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .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/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 2c017f053..39866961f 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_1F:: @ 8307390 .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/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 82f026ba7..ac27a4798 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .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/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index adbf39015..bf4004eb2 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Underwater1:: @ 8307400 .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/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index 66036ff55..ad7380354 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -3,7 +3,7 @@ AbandonedShip_Underwater2:: @ 8307470 .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/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 04ec0679a..f559acdd4 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -3,7 +3,7 @@ AncientTomb:: @ 83074E0 .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 282 .byte 83 .byte 0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 819590c69..7fc84658d 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -3,7 +3,7 @@ AquaHideout_1F:: @ 8306FF4 .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/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index e67dba2e5..94abd0406 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -3,7 +3,7 @@ AquaHideout_B1F:: @ 8307010 .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/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index dc10f234e..c700ac8dd 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -3,7 +3,7 @@ AquaHideout_B2F:: @ 830702C .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/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 92dee0182..9712d2535 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -3,7 +3,7 @@ BattleTower_BattleRoom:: @ 8307C88 .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 index f540777ee..22529962a 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special SetBattleTowerParty - playfanfare BGM_ME_ASA + playfanfare MUS_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index 311ae6862..33ab24b7c 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -3,7 +3,7 @@ BattleTower_Corridor:: @ 8307C6C .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/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index 324b3ecc1..0718e7924 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -3,7 +3,7 @@ BattleTower_Elevator:: @ 8307C50 .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/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index b8d527444..ae2eaaa14 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -3,7 +3,7 @@ BattleTower_Lobby:: @ 8307C34 .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 index 24637ee75..28f828bc6 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -82,7 +82,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox BattleTower_Lobby_Text_19A719, 4 @@ -112,7 +112,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare setvar VAR_SPECIAL_4, 9 special BattleTowerUtil diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index a80d3e318..28035f749 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -3,7 +3,7 @@ BattleTower_Outside:: @ 8307C18 .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/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 18901b68b..1797ed327 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_1F:: @ 8307198 .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/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index f1e768089..d9b38b628 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_B1F:: @ 83071B4 .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/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index b20d4a577..1b3bf2902 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_B2F:: @ 83071D0 .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/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index a7e6b8a19..cc196d0c8 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_B3F:: @ 83071EC .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/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index f36fac472..70ad445c4 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -3,7 +3,7 @@ CaveOfOrigin_Entrance:: @ 830717C .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/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index cd6552519..4a9ceab39 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -3,7 +3,7 @@ DesertRuins:: @ 8306E18 .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 132 .byte 82 .byte 0 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7bd135bad..0bd56d96d 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -3,7 +3,7 @@ DewfordTown:: @ 830557C .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/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 72c8a4c04..c5c9540e5 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -3,7 +3,7 @@ DewfordTown_Gym:: @ 8305B9C .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/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index c7fa7c009..38b662f4d 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -3,7 +3,7 @@ DewfordTown_Hall:: @ 8305BB8 .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/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 71e25e8b9..9f56cdf5d 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -3,7 +3,7 @@ DewfordTown_House1:: @ 8305B48 .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/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 6ffc05176..35fd959eb 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -3,7 +3,7 @@ DewfordTown_House2:: @ 8305BD4 .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/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index b95db3ab0..b7630e6c3 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .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/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 44fa18f08..5d0babd91 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .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/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 86ce13b14..bf41ae872 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -3,7 +3,7 @@ DoubleBattleColosseum:: @ 83079CC .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 225 .byte 87 .byte 0 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 4d25d6198..89386b78c 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -3,7 +3,7 @@ EverGrandeCity:: @ 8305528 .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/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index d1f9e4fd1..85afeb078 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .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 index a4406c8e6..7e1f6e6cb 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -38,7 +38,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 end_movement EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playbgm BGM_DAIGO, FALSE + playbgm MUS_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 @@ -67,11 +67,11 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playbgm BGM_GIRL_SUP, FALSE + playbgm MUS_GIRL_SUP, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playbgm BGM_BOY_SUP, FALSE + playbgm MUS_BOY_SUP, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index 0843d41af..c15955ae1 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor1:: @ 8306B24 .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/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index be2df3915..774dd8bf9 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor2:: @ 8306B40 .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/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index d3b67d33d..2799a2256 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor3:: @ 8306B5C .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/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 002f42171..254553ab4 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor4:: @ 8306B78 .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/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index b53de1a2e..176d27e1e 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor5:: @ 8306B94 .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/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 873b3655b..4f5cb96b6 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .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 index 8eb7bbc45..4dad28923 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B - playbgm BGM_SITENNOU, FALSE + playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index c64a5ae24..f0ba099ac 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .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 index a72b84440..17555f2f6 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playbgm BGM_SITENNOU, FALSE + playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 33928c164..3a8c1a263 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .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/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 83a9eec14..8d34dd0ba 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .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 index 2d09f1ebb..5575b99b3 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 - playbgm BGM_SITENNOU, FALSE + playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 4450309d0..489b5bd52 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .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/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 6cbd45842..35167d6c1 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .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/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index a78353193..56bb00438 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .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 index 0138f99f1..a48cf278e 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -61,7 +61,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 - playfanfare BGM_ME_BACHI + playfanfare MUS_ME_BACHI message EverGrandeCity_PokemonLeague_Text_191804 waitmessage waitfanfare diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 03aea95dd..41ea61fd8 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -3,7 +3,7 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .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 index 45a729c0a..2b6cc0571 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD - playbgm BGM_SITENNOU, FALSE + playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index 48b0414f7..e6e0041b6 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -3,7 +3,7 @@ FallarborTown:: @ 83055B4 .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/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index 9563688ba..38f414c10 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -3,7 +3,7 @@ FallarborTown_ContestHall:: @ 8305CEC .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/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index dc5eafeaa..2b8d9a18b 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -3,7 +3,7 @@ FallarborTown_ContestLobby:: @ 8305CD0 .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/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index 5b6ee96fe..e6eacc77c 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -3,7 +3,7 @@ FallarborTown_House1:: @ 8305D40 .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/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index d5e0e3faa..246bc12db 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -3,7 +3,7 @@ FallarborTown_House2:: @ 8305D5C .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/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index c13e63f04..de16583f4 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -3,7 +3,7 @@ FallarborTown_Mart:: @ 8305CB4 .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/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 36b6adbd5..e51dea9cc 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .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/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 09f92a948..91613d680 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .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/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index d44eeb9ba..dcc4d55ea 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -3,7 +3,7 @@ FieryPath:: @ 8306EF8 .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 294 .byte 74 .byte 0 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 164805b62..eb04f8bcb 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -3,7 +3,7 @@ FortreeCity:: @ 83054B8 .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/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 5bbe52710..78b54e060 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -3,7 +3,7 @@ FortreeCity_DecorationShop:: @ 8306504 .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/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 7313a9a9d..9ecaef8b4 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -3,7 +3,7 @@ FortreeCity_Gym:: @ 8306424 .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/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 299c3d5e6..79d0466d7 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -3,7 +3,7 @@ FortreeCity_House1:: @ 8306408 .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/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 404d3560f..44447c390 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -3,7 +3,7 @@ FortreeCity_House2:: @ 8306494 .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/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index c1d287181..aa77bbf4e 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -3,7 +3,7 @@ FortreeCity_House3:: @ 83064B0 .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/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index f498ba201..dcd41d274 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -3,7 +3,7 @@ FortreeCity_House4:: @ 83064CC .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/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 2753198b0..98faa0aee 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -3,7 +3,7 @@ FortreeCity_House5:: @ 83064E8 .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/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 9c260e3a0..a43cd9466 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -3,7 +3,7 @@ FortreeCity_Mart:: @ 8306478 .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/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 4f593492e..97c8403b2 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .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/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 4b24dcf7d..57e8510b8 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .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/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 081f54d26..b3682961a 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -3,7 +3,7 @@ GraniteCave_1F:: @ 8306E34 .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/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 64c3eac04..80af713ad 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -3,7 +3,7 @@ GraniteCave_B1F:: @ 8306E50 .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/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 8c382b9bd..9b3dc1610 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -3,7 +3,7 @@ GraniteCave_B2F:: @ 8306E6C .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/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index fdd41a95a..da9664943 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -3,7 +3,7 @@ GraniteCave_StevensRoom:: @ 8306E88 .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/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index e77e85173..70b8a62c6 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -3,7 +3,7 @@ IslandCave:: @ 83074C4 .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 - .2byte BGM_MABOROSI + .2byte MUS_MABOROSI .2byte 281 .byte 81 .byte 0 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 153162e4b..cb9b61bb3 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -3,7 +3,7 @@ JaggedPass:: @ 8306EDC .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 293 .byte 76 .byte 0 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index ad901d0ff..8e8eaaee6 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -3,7 +3,7 @@ LavaridgeTown:: @ 8305598 .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 index f14601747..c2bf9bb68 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -57,11 +57,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playbgm BGM_GIRL_SUP, TRUE + playbgm MUS_GIRL_SUP, TRUE return LavaridgeTown_EventScript_14E570:: @ 814E570 - playbgm BGM_BOY_SUP, TRUE + playbgm MUS_BOY_SUP, TRUE return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -280,7 +280,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LavaridgeTown_Text_16C2EA waitfanfare waitmessage diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 81fe4aae7..05c0b2dbc 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .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/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 7a1c7c348..0ae5a8634 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .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/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 3c193937d..8ab9e4807 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .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/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index e1e429dc3..5b85bcbac 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_House:: @ 8305C44 .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/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index a4da19432..97c192d21 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_Mart:: @ 8305C60 .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/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 626ae4ab9..27bdfe3f2 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .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/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 3ff2df867..096759809 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .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/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 0bc87004b..2c067668e 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -3,7 +3,7 @@ LilycoveCity:: @ 83054D4 .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 index f632a4d41..081914bda 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -245,7 +245,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playbgm BGM_GIRL_SUP, TRUE + 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 @@ -274,7 +274,7 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playbgm BGM_BOY_SUP, TRUE + 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 diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 7ab3bd2cd..9e690f9a7 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -3,7 +3,7 @@ LilycoveCity_ContestHall:: @ 83065AC .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/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index b109dab11..37415383b 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -3,7 +3,7 @@ LilycoveCity_ContestLobby:: @ 8306590 .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 index 4784a4903..b9297628a 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -77,7 +77,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -249,7 +249,7 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 94a1e4434..15a8aa7d0 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .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/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index b543a826d..a39f3acf0 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .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 index 06b982610..5bfc6a5e7 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -18,7 +18,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag FLAG_TEMP_2 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index d8c3e1d6b..65b573d92 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .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/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index c50694c5e..0131ea7f1 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .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/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 31798b5e6..6f5da636f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .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/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 75c8ef43c..7bc576b3f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .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/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 29e214a1d..402d1a137 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .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/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 595f28d19..57bea5077 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .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/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index ae3033a5d..1159ddeaf 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .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/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index 6c3149eaf..469b52893 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -3,7 +3,7 @@ LilycoveCity_EmptyMap:: @ 8306654 .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/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index d29ac7057..75b924e8f 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor:: @ 8306638 .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/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index ec41783d0..20675582b 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -3,7 +3,7 @@ LilycoveCity_House1:: @ 830668C .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/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 491e60776..1948d4470 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -3,7 +3,7 @@ LilycoveCity_House2:: @ 83066A8 .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/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index e984e5576..df0d576b4 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -3,7 +3,7 @@ LilycoveCity_House3:: @ 83066C4 .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/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 0faae2952..a8d4d1bcc 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -3,7 +3,7 @@ LilycoveCity_House4:: @ 83066E0 .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/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 7f2d6d8a8..3af5b4c90 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .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/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 5b1207331..3ceabddcb 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .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/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index b30bb8b6e..a2216160d 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .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 index 8b8500a9c..4e67762bb 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special DeleteMonMove - playfanfare BGM_ME_WASURE + playfanfare MUS_ME_WASURE waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 releaseall diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index 32d4df792..c94501f23 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .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/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index aacc4ca10..78816dbe9 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .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/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 292e02d96..4445ed0df 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .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/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index c1027addb..fb20ddc79 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -3,7 +3,7 @@ LilycoveCity_UnusedMart:: @ 8306600 .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/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index bc747d21e..7aea3de5f 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -3,7 +3,7 @@ LinkContestRoom1:: @ 83079E8 .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 226 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index e8a4ec4fd..a3d60c4f8 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -3,7 +3,7 @@ LinkContestRoom2:: @ 8307AAC .4byte LinkContestRoom2_MapEvents .4byte LinkContestRoom2_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 233 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 930f19137..4ee1f0e7d 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -3,7 +3,7 @@ LinkContestRoom3:: @ 8307AC8 .4byte LinkContestRoom3_MapEvents .4byte LinkContestRoom3_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 234 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index ddc1b2741..56ee5906c 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -3,7 +3,7 @@ LinkContestRoom4:: @ 8307AE4 .4byte LinkContestRoom4_MapEvents .4byte LinkContestRoom4_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 235 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 681662ee9..fb2a66640 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -3,7 +3,7 @@ LinkContestRoom5:: @ 8307B00 .4byte LinkContestRoom5_MapEvents .4byte LinkContestRoom5_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 236 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 55c417785..db9343180 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -3,7 +3,7 @@ LinkContestRoom6:: @ 8307B1C .4byte LinkContestRoom6_MapEvents .4byte LinkContestRoom6_MapScripts .4byte 0x0 - .2byte BGM_CONTEST0 + .2byte MUS_CONTEST0 .2byte 237 .byte 87 .byte 0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 73bbf71b5..88f6763e3 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -3,7 +3,7 @@ LittlerootTown:: @ 8305544 .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 index 9f328bc4a..e98f73393 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -865,7 +865,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_Text_16AA32 waitfanfare waitmessage diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 6f2c31c86..eebc7b989 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -3,7 +3,7 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .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/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index d23ea0b30..660c1e08e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -3,7 +3,7 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .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/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 961f411a2..329380b39 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -3,7 +3,7 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .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/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 640230c00..cfb150c46 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -3,7 +3,7 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .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 index e716962b7..bcc4ba46b 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -46,7 +46,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 - playbgm BGM_GIRL_SUP, TRUE + playbgm MUS_GIRL_SUP, TRUE applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 @@ -80,7 +80,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 - playbgm BGM_BOY_SUP, TRUE + playbgm MUS_BOY_SUP, TRUE applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 44f415d9b..1961431b9 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -3,7 +3,7 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .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 index 6b2867f54..74d5f9193 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO compare RESULT, YES @@ -153,7 +153,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 95e2ded37..c236bdae1 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -3,7 +3,7 @@ MagmaHideout_1F:: @ 8307588 .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/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index bafc9f112..18a1bd49c 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -3,7 +3,7 @@ MagmaHideout_B1F:: @ 83075A4 .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/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index de9b39593..6cb9a6a47 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -3,7 +3,7 @@ MagmaHideout_B2F:: @ 83075C0 .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/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index a5eb578c1..9ea461f4c 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -3,7 +3,7 @@ MauvilleCity:: @ 8305480 .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/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index 4cf657936..a1e3e56bc 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -3,7 +3,7 @@ MauvilleCity_BikeShop:: @ 8306168 .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/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index dfb7bcd0a..7e9bb00fa 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -3,7 +3,7 @@ MauvilleCity_GameCorner:: @ 83061A0 .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/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index 7be94e661..a52423319 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -3,7 +3,7 @@ MauvilleCity_Gym:: @ 830614C .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/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index b81f735fa..0d464b6c0 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -3,7 +3,7 @@ MauvilleCity_House1:: @ 8306184 .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/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 84180ce98..7a8c72f6e 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -3,7 +3,7 @@ MauvilleCity_House2:: @ 83061BC .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/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index e8d2694d1..169089f69 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -3,7 +3,7 @@ MauvilleCity_Mart:: @ 8306210 .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/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index e3cf14b52..74cc8bfe2 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .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/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 71c27de3b..fd7bf6a2d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .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/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 50e5a59cf..506463120 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_1R:: @ 8306D70 .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/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 9b07de17c..f46645b7e 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_2R:: @ 8306D8C .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/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 8b5b67256..6e34052ce 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -3,7 +3,7 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .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/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index f3ed76145..487cf19e9 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -3,7 +3,7 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .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/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index a108fc6d6..93aeb648a 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -3,7 +3,7 @@ MossdeepCity:: @ 83054F0 .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/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index d7f6a2e16..dc11469e0 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .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/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index fc7a641eb..fd8e210cc 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .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/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 2546bc631..cabaf610a 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -3,7 +3,7 @@ MossdeepCity_Gym:: @ 83067C0 .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/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 135ce0c71..f6815842d 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -3,7 +3,7 @@ MossdeepCity_House1:: @ 83067DC .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/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index f518be4e0..36964f8ee 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -3,7 +3,7 @@ MossdeepCity_House2:: @ 83067F8 .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/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 7e3abf6cd..e395c29f6 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -3,7 +3,7 @@ MossdeepCity_House3:: @ 8306868 .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/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 90daccd22..fe346cb0a 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -3,7 +3,7 @@ MossdeepCity_House4:: @ 83068A0 .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/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index eb808693c..6c8b09d32 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -3,7 +3,7 @@ MossdeepCity_Mart:: @ 830684C .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/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index a2fff6ade..ef51b2588 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .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/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 9307396ae..db24bf9e5 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .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/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 6dd396fdd..bc2152a58 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .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/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 53e692407..46c44758d 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -3,7 +3,7 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .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/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index ecdc32bd1..abbe4b98b 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -3,7 +3,7 @@ MossdeepCity_StevensHouse:: @ 8306884 .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 index d415e7fc9..eb719a33a 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -78,7 +78,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar VAR_SPECIAL_4, RESULT removeobject 2 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 43995f016..690312635 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -3,7 +3,7 @@ MtChimney:: @ 8306EC0 .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 - .2byte BGM_TOZAN + .2byte MUS_TOZAN .2byte 137 .byte 56 .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 493cc512e..9584ed7a2 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -3,7 +3,7 @@ MtChimney_CableCarStation:: @ 8306CAC .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/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index 0e2958753..a75471d53 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -3,7 +3,7 @@ MtPyre_1F:: @ 8306F14 .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/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 813fa5604..081adb3e9 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -3,7 +3,7 @@ MtPyre_2F:: @ 8306F30 .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/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 941fbbb20..253facf61 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -3,7 +3,7 @@ MtPyre_3F:: @ 8306F4C .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/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 604d0fadc..720ff831e 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -3,7 +3,7 @@ MtPyre_4F:: @ 8306F68 .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/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index f1dc8d7c1..dc8d93e29 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -3,7 +3,7 @@ MtPyre_5F:: @ 8306F84 .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/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 8d824b4b6..986c3b538 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -3,7 +3,7 @@ MtPyre_6F:: @ 8306FA0 .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/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 4a1c86be9..0c115cd95 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -3,7 +3,7 @@ MtPyre_Exterior:: @ 8306FBC .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/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 74be5845e..fc8a0a82e 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -3,7 +3,7 @@ MtPyre_Summit:: @ 8306FD8 .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/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 690e3d276..7ca1c1b96 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -3,7 +3,7 @@ NewMauville_Entrance:: @ 8307320 .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/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index dd252544f..44a3d1895 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -3,7 +3,7 @@ NewMauville_Inside:: @ 830733C .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/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 8403d61c6..7f89ef759 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -3,7 +3,7 @@ OldaleTown:: @ 8305560 .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 index 5385272b8..dcac39584 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -38,7 +38,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC 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 + playbgm MUS_TSURETEK, FALSE msgbox OldaleTown_Text_16AEF2, 4 closemessage switch FACING diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 4f0142667..b2b31cb73 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -3,7 +3,7 @@ OldaleTown_House1:: @ 8305ABC .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/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 84f544145..33ad6fcd7 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -3,7 +3,7 @@ OldaleTown_House2:: @ 8305AD8 .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/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index c1efeb849..d74999efb 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -3,7 +3,7 @@ OldaleTown_Mart:: @ 8305B2C .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/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index e0695fbaf..a3bfaff18 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .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/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index cd42c15a7..73c9d23d4 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .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/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 621ac206e..dd589e122 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -3,7 +3,7 @@ PacifidlogTown:: @ 83055EC .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/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 81b24d450..dcf7d338d 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House1:: @ 8305E90 .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/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index fe0626bf3..758c10751 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House2:: @ 8305EAC .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/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 401c70d5b..55427804f 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House3:: @ 8305EC8 .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/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 5e69f1f7e..fbadb5440 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House4:: @ 8305EE4 .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/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 31bf4de65..c8d5bcf3c 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_House5:: @ 8305F00 .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/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 872d1ac17..706a9d8b2 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .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/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 734d4225d..9408e8611 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .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/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 42136d835..ddda0a3b0 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -3,7 +3,7 @@ PetalburgCity:: @ 8305448 .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 index 03013f66c..77b12b556 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - savebgm BGM_TSURETEK + savebgm MUS_TSURETEK return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -181,7 +181,7 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, PetalburgCity_Movement_1A0839 waitmovement 0 - playbgm BGM_TSURETEK, FALSE + playbgm MUS_TSURETEK, FALSE playse SE_PIN applymovement 9, PetalburgCity_Movement_1A0833 waitmovement 0 diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 7799ed7df..6c519b07e 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -3,7 +3,7 @@ PetalburgCity_Gym:: @ 8305F38 .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 index 259d59390..a3fb5c494 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -187,7 +187,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 - playbgm BGM_TSURETEK, FALSE + playbgm MUS_TSURETEK, FALSE compare VAR_SPECIAL_8, 0 call_if_eq PetalburgCity_Gym_EventScript_154835 compare VAR_SPECIAL_8, 1 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 66d92403b..1aaa3ee6d 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -3,7 +3,7 @@ PetalburgCity_House1:: @ 8305F54 .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/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index fdbf58c38..1f115285c 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -3,7 +3,7 @@ PetalburgCity_House2:: @ 8305F70 .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/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index fc09d24a5..21a487898 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -3,7 +3,7 @@ PetalburgCity_Mart:: @ 8305FC4 .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/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 3af2d5282..0c87b4934 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .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/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 008c26bf6..7646fd56e 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .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/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 22ebc57a3..297065253 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -3,7 +3,7 @@ PetalburgCity_WallysHouse:: @ 8305F1C .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/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index a1eb5618c..d473ea6ed 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -3,7 +3,7 @@ PetalburgWoods:: @ 8306EA4 .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 index 1d5fbeaf2..69b85d743 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -13,7 +13,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closemessage - playbgm BGM_EVIL_TEAM, FALSE + playbgm MUS_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 @@ -48,7 +48,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closemessage - playbgm BGM_EVIL_TEAM, FALSE + playbgm MUS_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 976ede8cf..ee1142c85 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -3,7 +3,7 @@ RecordCorner:: @ 83079B0 .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 224 .byte 87 .byte 0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index c50d34519..c3d5606d5 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -3,7 +3,7 @@ Route101:: @ 8305608 .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 index a4af7ceb4..c7f570044 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playbgm BGM_EVENT0, TRUE + playbgm MUS_EVENT0, TRUE msgbox Route101_Text_16D10E, 4 closemessage setobjectxy 2, 0, 15 diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index c23ac6567..a84770fae 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -3,7 +3,7 @@ Route102:: @ 8305624 .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/maps/Route103/header.inc b/data/maps/Route103/header.inc index cf7033922..f0423adeb 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -3,7 +3,7 @@ Route103:: @ 8305640 .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 index 94d0aa8d6..361dc78c3 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, 4 - playbgm BGM_GIRL_SUP, TRUE + playbgm MUS_GIRL_SUP, TRUE applymovement 2, Route103_Movement_1A0839 waitmovement 0 applymovement 2, Route103_Movement_1A0833 @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, 4 - playbgm BGM_BOY_SUP, TRUE + playbgm MUS_BOY_SUP, TRUE applymovement 2, Route103_Movement_1A0839 waitmovement 0 applymovement 2, Route103_Movement_1A0833 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 084a2e602..da47dab56 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -3,7 +3,7 @@ Route104:: @ 830565C .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/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 99d99bd8a..e5a626a43 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -3,7 +3,7 @@ Route104_MrBrineysHouse:: @ 8306C20 .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/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index f98d930ab..30e6625d8 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .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/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 87b11e3ba..3fbbdad95 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -3,7 +3,7 @@ Route104_Prototype:: @ 8307CF8 .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/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index aecb3c549..f7b4982aa 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -3,7 +3,7 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .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/maps/Route105/header.inc b/data/maps/Route105/header.inc index a286003c9..79fedb244 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -3,7 +3,7 @@ Route105:: @ 8305678 .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/maps/Route106/header.inc b/data/maps/Route106/header.inc index baeb22a8a..bf8dd9626 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -3,7 +3,7 @@ Route106:: @ 8305694 .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/maps/Route107/header.inc b/data/maps/Route107/header.inc index dc8a49a79..19ba4ebd6 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -3,7 +3,7 @@ Route107:: @ 83056B0 .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/maps/Route108/header.inc b/data/maps/Route108/header.inc index d84d77d8e..0169859e0 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -3,7 +3,7 @@ Route108:: @ 83056CC .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/maps/Route109/header.inc b/data/maps/Route109/header.inc index 67a9b09c0..95c3cfaeb 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -3,7 +3,7 @@ Route109:: @ 83056E8 .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/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 7ac57b934..6677181f7 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -3,7 +3,7 @@ Route109_SeashoreHouse:: @ 8307D30 .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/maps/Route110/header.inc b/data/maps/Route110/header.inc index b2ea0c8bd..952233450 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -3,7 +3,7 @@ Route110:: @ 8305704 .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 index 8245b3107..36e5cd7a2 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -17,7 +17,7 @@ Route110_MapScript1_14F914:: @ 814F914 end Route110_EventScript_14F92F:: @ 814F92F - savebgm BGM_CYCLING + savebgm MUS_CYCLING return Route110_MapScript2_14F933:: @ 814F933 @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playbgm BGM_GIRL_SUP, TRUE + playbgm MUS_GIRL_SUP, TRUE return Route110_EventScript_14FDAC:: @ 814FDAC - playbgm BGM_BOY_SUP, TRUE + playbgm MUS_BOY_SUP, TRUE return Route110_EventScript_14FDB1:: @ 814FDB1 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 523832792..1fb9928b3 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -3,7 +3,7 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .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/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 6c9a6413a..a4da7397c 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -3,7 +3,7 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .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/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index bde1d5b52..14997e663 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -3,7 +3,7 @@ Route110_TrickHouseCorridor:: @ 8307D84 .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/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index c0a61f038..58ca3e71d 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -3,7 +3,7 @@ Route110_TrickHouseEnd:: @ 8307D68 .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/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 8ecc26186..8146c2fa0 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -3,7 +3,7 @@ Route110_TrickHouseEntrance:: @ 8307D4C .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 index a14ce2e2d..79f52f7bf 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -707,7 +707,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waitmessage diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 7b5bb82f5..18d772089 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .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/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index a21c2f395..489d213d9 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .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/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 974573410..c8b2da4a3 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .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/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index d400e5eb4..b06a1404f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .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/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 700aa68fe..dc42453f4 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .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/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 8bdef5c7b..3377987da 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .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/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 2008208ce..84014fdb5 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .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/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index ced373d13..ede90bbe4 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .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/maps/Route111/header.inc b/data/maps/Route111/header.inc index 80fa09a0c..3dd09e33b 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -3,7 +3,7 @@ Route111:: @ 8305720 .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 index 3e1570aff..e554de5f4 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -219,14 +219,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather WEATHER_SUNNY - fadenewbgm BGM_DOORO_X1 + fadenewbgm MUS_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather WEATHER_SANDSTORM - fadenewbgm BGM_ASHROAD + fadenewbgm MUS_ASHROAD doweather end diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 60383cf3d..8536613b9 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -3,7 +3,7 @@ Route111_OldLadysRestStop:: @ 8306C74 .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/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 985d6d62d..7cac82463 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -3,7 +3,7 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .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/maps/Route112/header.inc b/data/maps/Route112/header.inc index 9a59e413e..dc9a96bd6 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -3,7 +3,7 @@ Route112:: @ 830573C .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/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 990e7a5bf..881f4591d 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -3,7 +3,7 @@ Route112_CableCarStation:: @ 8306C90 .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/maps/Route113/header.inc b/data/maps/Route113/header.inc index c5dff2d5d..9097be2f9 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -3,7 +3,7 @@ Route113:: @ 8305758 .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/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 860db983c..e63be2dee 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -3,7 +3,7 @@ Route113_GlassWorkshop:: @ 8307EB8 .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/maps/Route114/header.inc b/data/maps/Route114/header.inc index a845c579a..afeb34813 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -3,7 +3,7 @@ Route114:: @ 8305774 .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/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 8939a6ebd..cd580f692 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -3,7 +3,7 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .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/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index cdd7de9ff..7cd10eb1a 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -3,7 +3,7 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .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/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index d40a42513..d37f4a323 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -3,7 +3,7 @@ Route114_LanettesHouse:: @ 8306D00 .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/maps/Route115/header.inc b/data/maps/Route115/header.inc index ee72fe0b2..208c24a76 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -3,7 +3,7 @@ Route115:: @ 8305790 .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/maps/Route116/header.inc b/data/maps/Route116/header.inc index 8fbf022a7..27d26658f 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -3,7 +3,7 @@ Route116:: @ 83057AC .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/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index b245aa534..a446833da 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -3,7 +3,7 @@ Route116_TunnelersRestHouse:: @ 8306D1C .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/maps/Route117/header.inc b/data/maps/Route117/header.inc index 437e59bd6..11df4b60f 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -3,7 +3,7 @@ Route117:: @ 83057C8 .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/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 3df8c8b16..0a4f59499 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -3,7 +3,7 @@ Route117_PokemonDayCare:: @ 8306D38 .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/maps/Route118/header.inc b/data/maps/Route118/header.inc index d75021d0a..930a9d860 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -3,7 +3,7 @@ Route118:: @ 83057E4 .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/maps/Route119/header.inc b/data/maps/Route119/header.inc index fd2445e92..98d0ea5f6 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -3,7 +3,7 @@ Route119:: @ 8305800 .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 index b1f2d33bf..fe1ef4e45 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -79,11 +79,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playbgm BGM_GIRL_SUP, TRUE + playbgm MUS_GIRL_SUP, TRUE return Route119_EventScript_151259:: @ 8151259 - playbgm BGM_BOY_SUP, TRUE + playbgm MUS_BOY_SUP, TRUE return Route119_EventScript_15125E:: @ 815125E diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 245d6c559..3a7cdcbbd 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -3,7 +3,7 @@ Route119_House:: @ 8307F28 .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/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index 654ee2df0..b35d3cccf 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .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/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 803d3b75b..b93deba00 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .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 index 32c264acc..0a1a51562 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A getpartysize compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 912234e0c..10f7725b7 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -3,7 +3,7 @@ Route120:: @ 830581C .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/maps/Route121/header.inc b/data/maps/Route121/header.inc index 90f1ed359..918fe47f6 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -3,7 +3,7 @@ Route121:: @ 8305838 .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/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 2c53111c8..0d97afab4 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -3,7 +3,7 @@ Route121_SafariZoneEntrance:: @ 8306D54 .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 index 6e9ae80fd..30cba964b 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waitmessage diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index b6bd5943d..c6a2d4e4d 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -3,7 +3,7 @@ Route122:: @ 8305854 .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/maps/Route123/header.inc b/data/maps/Route123/header.inc index 84bd53a9f..87c3ed8a6 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -3,7 +3,7 @@ Route123:: @ 8305870 .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/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index d170971fa..427ef4720 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -3,7 +3,7 @@ Route123_BerryMastersHouse:: @ 8307ED4 .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/maps/Route124/header.inc b/data/maps/Route124/header.inc index f1f361661..c2c5cd41d 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -3,7 +3,7 @@ Route124:: @ 830588C .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/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index d4a0d938e..259e378de 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .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/maps/Route125/header.inc b/data/maps/Route125/header.inc index 2e07545dc..cb315cc66 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -3,7 +3,7 @@ Route125:: @ 83058A8 .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/maps/Route126/header.inc b/data/maps/Route126/header.inc index ec593c1cb..0539f9007 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -3,7 +3,7 @@ Route126:: @ 83058C4 .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/maps/Route127/header.inc b/data/maps/Route127/header.inc index 484ef4e48..abd4154cc 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -3,7 +3,7 @@ Route127:: @ 83058E0 .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/maps/Route128/header.inc b/data/maps/Route128/header.inc index 7461f5796..df2b21a6e 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -3,7 +3,7 @@ Route128:: @ 83058FC .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/maps/Route129/header.inc b/data/maps/Route129/header.inc index 8cdd83703..a1285fe08 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -3,7 +3,7 @@ Route129:: @ 8305918 .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/maps/Route130/header.inc b/data/maps/Route130/header.inc index ade5554f1..f286a2b81 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -3,7 +3,7 @@ Route130:: @ 8305934 .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/maps/Route131/header.inc b/data/maps/Route131/header.inc index 5dfa4e94c..51b4d9e4f 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -3,7 +3,7 @@ Route131:: @ 8305950 .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/maps/Route132/header.inc b/data/maps/Route132/header.inc index 5d797099e..4f2e2d47f 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -3,7 +3,7 @@ Route132:: @ 830596C .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/maps/Route133/header.inc b/data/maps/Route133/header.inc index 1c0f9f16f..3cd851068 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -3,7 +3,7 @@ Route133:: @ 8305988 .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/maps/Route134/header.inc b/data/maps/Route134/header.inc index 8280c31aa..15fe8168e 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -3,7 +3,7 @@ Route134:: @ 83059A4 .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/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 3b36e6c68..73af7f1fc 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -3,7 +3,7 @@ RustboroCity:: @ 830549C .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/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index b547804b4..c1aa1fc37 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -3,7 +3,7 @@ RustboroCity_CuttersHouse:: @ 8306360 .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/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index d5c56227f..e0148dea7 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F:: @ 830622C .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/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 930a8e915..dbed45197 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .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 index b7b36dd6d..e0b0e30f8 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -138,7 +138,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage @@ -158,7 +158,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index 335fbd66c..b8cadbed2 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .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 index e68269437..cead5e5a2 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 closemessage - playbgm BGM_TSURETEK, FALSE + playbgm MUS_TSURETEK, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 1577abe5c..3d1739875 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat1_1F:: @ 830630C .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/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 18d9323a4..0ae9dd797 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat1_2F:: @ 8306328 .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/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index dbfc104eb..3a9ee86c3 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_1F:: @ 8306398 .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/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index dbdca8d1a..da3544023 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_2F:: @ 83063B4 .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/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 9bac24e13..9d5235d93 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_3F:: @ 83063D0 .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/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 58b1d7674..d98b04da8 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -3,7 +3,7 @@ RustboroCity_Gym:: @ 8306280 .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/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index ec04f80ac..34d733c02 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -3,7 +3,7 @@ RustboroCity_House1:: @ 8306344 .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/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index cb9052e3c..be12d46f8 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -3,7 +3,7 @@ RustboroCity_House2:: @ 830637C .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/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index c4fdd2d3c..7c23668ca 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -3,7 +3,7 @@ RustboroCity_House3:: @ 83063EC .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/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index fe87573b4..88af62f92 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -3,7 +3,7 @@ RustboroCity_Mart:: @ 83062F0 .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/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 5caf1e5fd..9b98aff0c 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .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/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index c25b9338f..ff85dfc1d 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .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/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 525731410..98f0e1b1d 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonSchool:: @ 830629C .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/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index a25ada853..a3d4108ce 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -3,7 +3,7 @@ RusturfTunnel:: @ 8306DE0 .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 index 1aae9faba..13fb80043 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -308,7 +308,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA lock faceplayer - playbgm BGM_EVIL_TEAM, FALSE + 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 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 716b957f2..4f55319d8 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -3,7 +3,7 @@ SSTidalCorridor:: @ 8307B54 .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/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index f41665a91..c52690612 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -3,7 +3,7 @@ SSTidalLowerDeck:: @ 8307B70 .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/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index c307f86c7..09fb99472 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -3,7 +3,7 @@ SSTidalRooms:: @ 8307B8C .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/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 71a878230..b4939c053 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -3,7 +3,7 @@ SafariZone_Northeast:: @ 8307BC4 .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/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 5a85342cb..533f797a5 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -3,7 +3,7 @@ SafariZone_Northwest:: @ 8307BA8 .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/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index fd39571cd..f13ab4f49 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -3,7 +3,7 @@ SafariZone_RestHouse:: @ 8307CDC .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/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index e076dd12b..f60a67472 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -3,7 +3,7 @@ SafariZone_Southeast:: @ 8307BFC .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/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index b1effab36..9a472f3ec 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -3,7 +3,7 @@ SafariZone_Southwest:: @ 8307BE0 .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/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index ef420a191..43b6b24b5 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -3,7 +3,7 @@ ScorchedSlab:: @ 830756C .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 - .2byte BGM_DAN01 + .2byte MUS_DAN01 .2byte 312 .byte 80 .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index ebb78622b..4f48878a8 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Entrance:: @ 8307064 .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/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 81914c09a..411e65b1b 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room1:: @ 8307080 .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/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index b1ce34ce8..a8e6ce80e 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room2:: @ 830709C .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/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index e152c8819..b062079b7 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room3:: @ 83070B8 .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/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index de65dd9d8..bee900fed 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room4:: @ 83070D4 .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/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 316f0d3c9..9e7560fe2 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room5:: @ 83070F0 .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/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 28bbdf424..0b9fdb9d1 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room6:: @ 830710C .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/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index 8c79c7ae9..ee640a183 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room7:: @ 8307128 .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/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 8650c2849..43ff7baa4 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room8:: @ 8307144 .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/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index f6625c0a0..c45181c89 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room9:: @ 8307160 .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 index eb46278dd..74d624141 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -89,7 +89,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 1 .endif - playfanfare BGM_ME_TAMA + playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80818A4 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index b80aadc9e..d919de498 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -3,7 +3,7 @@ SealedChamber_InnerRoom:: @ 8307550 .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/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 7acb97fe9..f40159b44 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -3,7 +3,7 @@ SealedChamber_OuterRoom:: @ 8307534 .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/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 8ed7552b6..08ab9ab97 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -3,7 +3,7 @@ SecretBase_BlueCave1:: @ 8307710 .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/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index ce44afd3b..89546ddaf 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -3,7 +3,7 @@ SecretBase_BlueCave2:: @ 83077B8 .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/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 361d5dff1..67df8c009 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -3,7 +3,7 @@ SecretBase_BlueCave3:: @ 8307860 .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/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index f76cbfce1..7cf1ed137 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -3,7 +3,7 @@ SecretBase_BlueCave4:: @ 8307908 .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/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index 0001efcea..b6d298eb9 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -3,7 +3,7 @@ SecretBase_BrownCave1:: @ 83076F4 .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/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index ebe1e2ac6..3a50de1fa 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -3,7 +3,7 @@ SecretBase_BrownCave2:: @ 830779C .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/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 161c19360..4da609d11 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -3,7 +3,7 @@ SecretBase_BrownCave3:: @ 8307844 .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/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 9a3fc9269..471b29596 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -3,7 +3,7 @@ SecretBase_BrownCave4:: @ 83078EC .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/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 3a470fa40..6508fe62a 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -3,7 +3,7 @@ SecretBase_RedCave1:: @ 83076D8 .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/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index fa4f38a53..f4c61d108 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -3,7 +3,7 @@ SecretBase_RedCave2:: @ 8307780 .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/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index be46df6b6..681f4c403 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -3,7 +3,7 @@ SecretBase_RedCave3:: @ 8307828 .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/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 8e1d2e2c4..77b6e06a7 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -3,7 +3,7 @@ SecretBase_RedCave4:: @ 83078D0 .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/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index ca0f3861c..cc85dea9e 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -3,7 +3,7 @@ SecretBase_Shrub1:: @ 8307764 .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/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 89f1b2ed0..932fcaca5 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -3,7 +3,7 @@ SecretBase_Shrub2:: @ 830780C .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/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 5bc0e51d6..a3a660338 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -3,7 +3,7 @@ SecretBase_Shrub3:: @ 83078B4 .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/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index e6cbf1428..0966db367 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -3,7 +3,7 @@ SecretBase_Shrub4:: @ 830795C .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/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index f887c00e7..1d0ce9509 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree1:: @ 8307748 .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/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index c36f1ada0..7138440cd 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree2:: @ 83077F0 .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/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 13890aefb..d3f49d3e0 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree3:: @ 8307898 .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/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index f91c43add..53a723432 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -3,7 +3,7 @@ SecretBase_Tree4:: @ 8307940 .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/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index f275c84c4..ecf3d4ea2 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -3,7 +3,7 @@ SecretBase_YellowCave1:: @ 830772C .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/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 4ea3e3fa5..cbee83030 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -3,7 +3,7 @@ SecretBase_YellowCave2:: @ 83077D4 .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/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index a3a6ce97f..cea1c9175 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -3,7 +3,7 @@ SecretBase_YellowCave3:: @ 830787C .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/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 721ecefb3..e744080bd 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -3,7 +3,7 @@ SecretBase_YellowCave4:: @ 8307924 .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/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 9eacbdc7e..16287338d 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .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/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index ab8156fcd..63bb3f47e 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .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/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 0a9b5ee49..05cac9619 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .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/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 59374d231..3cc9967fb 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .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/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 785230fc8..be5fb9413 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .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/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 8d1375a5d..5d82ba865 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .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/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index f47ce07e0..976bc6ad9 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .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/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index eee3d307d..99e0b090b 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -3,7 +3,7 @@ SingleBattleColosseum:: @ 8307978 .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 222 .byte 87 .byte 0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 2afe52190..c530fde86 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -3,7 +3,7 @@ SkyPillar_1F:: @ 8307614 .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/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 307e73e95..ce61cf5b8 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -3,7 +3,7 @@ SkyPillar_2F:: @ 8307630 .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/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index f98f5edbc..eaed10d93 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -3,7 +3,7 @@ SkyPillar_3F:: @ 830764C .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/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index c6482dba6..f14e016c8 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -3,7 +3,7 @@ SkyPillar_4F:: @ 8307668 .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/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index ce4aacaef..e4ff00b1a 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -3,7 +3,7 @@ SkyPillar_5F:: @ 83076A0 .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/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index c00189089..84dfe9b5c 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -3,7 +3,7 @@ SkyPillar_Entrance:: @ 83075DC .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/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 71c9e9968..71aa1ad84 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -3,7 +3,7 @@ SkyPillar_Outside:: @ 83075F8 .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/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index eb158417d..aaaf40fc4 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -3,7 +3,7 @@ SkyPillar_Top:: @ 83076BC .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/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 75d71276c..738a383e7 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -3,7 +3,7 @@ SlateportCity:: @ 8305464 .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 index 7d244e633..5583762d3 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -73,7 +73,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 compare RESULT, 0 call_if_eq SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 - playfanfare BGM_FANFA4 + playfanfare MUS_FANFA4 message SlateportCity_Text_1646DD waitfanfare waitmessage @@ -501,7 +501,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0841 waitmovement 0 msgbox SlateportCity_Text_1655E7, 4 - playbgm BGM_EVIL_TEAM, FALSE + playbgm MUS_EVIL_TEAM, FALSE msgbox SlateportCity_Text_1656BC, 4 applymovement 6, SlateportCity_Movement_1A083F applymovement 1, SlateportCity_Movement_1A083F diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index 5dd0f7be9..d327e87c7 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -3,7 +3,7 @@ SlateportCity_ContestHall:: @ 8306034 .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/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index e758d8bd8..0531ef226 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -3,7 +3,7 @@ SlateportCity_ContestLobby:: @ 8306018 .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/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 479da8d1f..5de5d2e5f 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor:: @ 83060C0 .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 index 8ab61661a..872c70352 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -15,7 +15,7 @@ SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 return SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 - savebgm BGM_EVIL_TEAM + savebgm MUS_EVIL_TEAM setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 9d0a92cf0..548424b49 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -3,7 +3,7 @@ SlateportCity_House1:: @ 8306050 .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/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 34b7c99a5..d731c0542 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -3,7 +3,7 @@ SlateportCity_House2:: @ 83060DC .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/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index f591efb9c..d66d2452e 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -3,7 +3,7 @@ SlateportCity_Mart:: @ 8306130 .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/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 02821ae8d..60fe69e70 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -3,7 +3,7 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .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/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index a8811c29e..8baa101fa 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -3,7 +3,7 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .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 index 6947d52b1..ce0bc855f 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closemessage - playbgm BGM_EVIL_TEAM, TRUE + playbgm MUS_EVIL_TEAM, TRUE addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmovement 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 90e3b2c09..35d90cdc2 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .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/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index a59bb27c6..738074ba1 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .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/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 14ff57a26..8094f192f 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonFanClub:: @ 830606C .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/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index c5e7058f8..2d98ef5b8 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -3,7 +3,7 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .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/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 25958807e..e7f1b74b8 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -3,7 +3,7 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .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/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 32ea11228..bd41a5c2b 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -3,7 +3,7 @@ SootopolisCity:: @ 830550C .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 - .2byte BGM_RUNECITY + .2byte MUS_RUNECITY .2byte 8 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index cc84c036b..0583679dc 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_Gym_1F:: @ 830692C .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/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 725a2b07e..ea131c587 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_Gym_B1F:: @ 8306948 .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/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index ed43835d4..924b6a382 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House1:: @ 83069B8 .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/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index eb7d36a34..6360bcf03 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House2:: @ 83069D4 .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/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 7afa0cc43..f7d724e5f 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House3:: @ 83069F0 .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/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index d9d34652f..d18dc2edc 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House4:: @ 8306A0C .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/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index ce3ed3456..f34f45f53 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House5:: @ 8306A28 .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/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index ab1c28f9a..639ea99ba 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House6:: @ 8306A44 .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/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index b025f33ec..1d785ec47 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House7:: @ 8306A60 .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/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index da39efd62..58432de80 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -3,7 +3,7 @@ SootopolisCity_House8:: @ 8306A7C .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/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index fbf68127f..ecf6040c4 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -3,7 +3,7 @@ SootopolisCity_Mart:: @ 830699C .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/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 5a6ce3973..496a40444 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .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/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index ed64f1f51..78a1a486d 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .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/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 6918c9c37..e70d1a97a 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior:: @ 8307CA4 .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/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index afa589d28..2dbee0b85 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -3,7 +3,7 @@ SouthernIsland_Interior:: @ 8307CC0 .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/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index e29e2135d..dc60b2dd1 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -3,7 +3,7 @@ TradeCenter:: @ 8307994 .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 - .2byte BGM_RAINBOW + .2byte MUS_RAINBOW .2byte 223 .byte 87 .byte 0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 52555165b..87e3260c9 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -3,7 +3,7 @@ Underwater1:: @ 83059C0 .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/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 0c19c9066..244cab761 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -3,7 +3,7 @@ Underwater2:: @ 83059DC .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/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index e952239e2..965109718 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -3,7 +3,7 @@ Underwater3:: @ 83059F8 .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/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index fb040d771..6433cde8e 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -3,7 +3,7 @@ Underwater4:: @ 8305A14 .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/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index f27cb2fa7..94328b851 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -3,7 +3,7 @@ Underwater_Route134:: @ 83074FC .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/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 13c740fed..e4a84f835 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -3,7 +3,7 @@ Underwater_SeafloorCavern:: @ 8307048 .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/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 0eec2d22e..f11030bd8 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -3,7 +3,7 @@ Underwater_SealedChamber:: @ 8307518 .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/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 3a672844f..f7626d966 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -3,7 +3,7 @@ Underwater_SootopolisCity:: @ 8306DFC .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/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index dafb7d083..0a2845319 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_29:: @ 8307A04 .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/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 005b7b40e..699998409 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_30:: @ 8307A20 .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/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 5dae310ff..704562ea1 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_31:: @ 8307A3C .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/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 2dbc00c06..ef1d675de 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_32:: @ 8307A58 .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/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index dc57d796b..ba13111f1 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_33:: @ 8307A74 .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/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index ccb77b687..f082e3c09 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -3,7 +3,7 @@ UnknownMap_25_34:: @ 8307A90 .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 index 7377d2298..47599d41b 100644 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ b/data/maps/UnknownMap_25_34/scripts.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - savebgm BGM_TEST1 + savebgm MUS_TEST1 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - savebgm BGM_TEST2 + savebgm MUS_TEST2 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - savebgm BGM_TEST3 + savebgm MUS_TEST3 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - savebgm BGM_TEST4 + savebgm MUS_TEST4 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - savebgm BGM_CONTEST0 + savebgm MUS_CONTEST0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 5d78f42e1..cbba95897 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -3,7 +3,7 @@ VerdanturfTown:: @ 83055D0 .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/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index 7f6b1d434..de3e6848e 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_ContestHall:: @ 8305D94 .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/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index c2f763927..60849fb0a 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .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/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 117166d92..4152aef1b 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .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/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 0bf8c3e2e..838905374 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_House:: @ 8305E3C .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/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index f2950cc8d..7d34f77a7 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_Mart:: @ 8305DB0 .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/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 4e4e67840..7e1269720 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .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/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 3122a827f..c29f42e15 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .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/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 993693239..57e835308 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -3,7 +3,7 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .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/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 78b6e3939..61c47f001 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -3,7 +3,7 @@ VictoryRoad_1F:: @ 8307224 .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/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index ac2b2eeff..b705dc527 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -3,7 +3,7 @@ VictoryRoad_B1F:: @ 8307240 .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/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index f38f649a9..7eb649cfb 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -3,7 +3,7 @@ VictoryRoad_B2F:: @ 830725C .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/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/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/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/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_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 bae6f020a..7dcd8db1b 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/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/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_effect.c b/src/field_effect.c index 91794a07a..98b43aa22 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/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/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 6a44afb04..579d119b0 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 struct UnkTVStruct @@ -831,7 +831,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; } @@ -844,7 +844,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) @@ -854,9 +854,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; } } @@ -871,9 +871,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; } } @@ -891,9 +891,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()) @@ -918,10 +918,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) { 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/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/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/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) { From 8bf4b1a917786c683ac30278108f74d31961274d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 19:45:19 -0500 Subject: [PATCH 9/9] Fix german --- data-de/{maps => layouts}/VictoryRoad_B1F/map.bin | 0 data-de/{maps => layouts}/VictoryRoad_B2F/map.bin | 0 .../AbandonedShip_CaptainsOffice/text.inc} | 0 .../AbandonedShip_Corridors_1F/text.inc} | 0 .../AbandonedShip_Corridors_B1F/text.inc} | 0 .../AbandonedShip_HiddenFloorCorridors/text.inc} | 0 .../AbandonedShip_HiddenFloorRooms/text.inc} | 0 .../AbandonedShip_Rooms2_1F/text.inc} | 0 .../AbandonedShip_Rooms2_B1F/text.inc} | 0 .../AbandonedShip_Rooms_1F/text.inc} | 0 .../AbandonedShip_Rooms_B1F/text.inc} | 0 .../maps/AquaHideout_1F.inc => maps/AquaHideout_1F/text.inc} | 0 .../maps/AquaHideout_B1F.inc => maps/AquaHideout_B1F/text.inc} | 0 .../maps/AquaHideout_B2F.inc => maps/AquaHideout_B2F/text.inc} | 0 .../BattleTower_BattleRoom/text.inc} | 0 .../BattleTower_Lobby.inc => maps/BattleTower_Lobby/text.inc} | 0 .../BattleTower_Outside.inc => maps/BattleTower_Outside/text.inc} | 0 data-de/{text/maps/DewfordTown.inc => maps/DewfordTown/text.inc} | 0 .../maps/DewfordTown_Gym.inc => maps/DewfordTown_Gym/text.inc} | 0 .../maps/DewfordTown_Hall.inc => maps/DewfordTown_Hall/text.inc} | 0 .../DewfordTown_House1.inc => maps/DewfordTown_House1/text.inc} | 0 .../DewfordTown_House2.inc => maps/DewfordTown_House2/text.inc} | 0 .../DewfordTown_PokemonCenter_1F/text.inc} | 0 .../maps/EverGrandeCity.inc => maps/EverGrandeCity/text.inc} | 0 .../EverGrandeCity_ChampionsRoom/text.inc} | 0 .../EverGrandeCity_DrakesRoom/text.inc} | 0 .../EverGrandeCity_GlaciasRoom/text.inc} | 0 .../EverGrandeCity_HallOfFame/text.inc} | 0 .../EverGrandeCity_PhoebesRoom/text.inc} | 0 .../EverGrandeCity_PokemonCenter_1F/text.inc} | 0 .../EverGrandeCity_PokemonLeague/text.inc} | 0 .../EverGrandeCity_SidneysRoom/text.inc} | 0 .../{text/maps/FallarborTown.inc => maps/FallarborTown/text.inc} | 0 .../FallarborTown_ContestHall/text.inc} | 0 .../FallarborTown_ContestLobby/text.inc} | 0 .../FallarborTown_House1/text.inc} | 0 .../FallarborTown_House2/text.inc} | 0 .../FallarborTown_Mart.inc => maps/FallarborTown_Mart/text.inc} | 0 .../FallarborTown_PokemonCenter_1F/text.inc} | 0 data-de/{text/maps/FortreeCity.inc => maps/FortreeCity/text.inc} | 0 .../FortreeCity_DecorationShop/text.inc} | 0 .../maps/FortreeCity_Gym.inc => maps/FortreeCity_Gym/text.inc} | 0 .../FortreeCity_House1.inc => maps/FortreeCity_House1/text.inc} | 0 .../FortreeCity_House2.inc => maps/FortreeCity_House2/text.inc} | 0 .../FortreeCity_House3.inc => maps/FortreeCity_House3/text.inc} | 0 .../FortreeCity_House4.inc => maps/FortreeCity_House4/text.inc} | 0 .../FortreeCity_House5.inc => maps/FortreeCity_House5/text.inc} | 0 .../maps/FortreeCity_Mart.inc => maps/FortreeCity_Mart/text.inc} | 0 .../FortreeCity_PokemonCenter_1F/text.inc} | 0 .../maps/GraniteCave_1F.inc => maps/GraniteCave_1F/text.inc} | 0 .../GraniteCave_StevensRoom/text.inc} | 0 .../{text/maps/InsideOfTruck.inc => maps/InsideOfTruck/text.inc} | 0 data-de/{text/maps/JaggedPass.inc => maps/JaggedPass/text.inc} | 0 .../{text/maps/LavaridgeTown.inc => maps/LavaridgeTown/text.inc} | 0 .../LavaridgeTown_Gym_1F/text.inc} | 0 .../LavaridgeTown_HerbShop/text.inc} | 0 .../LavaridgeTown_House.inc => maps/LavaridgeTown_House/text.inc} | 0 .../LavaridgeTown_Mart.inc => maps/LavaridgeTown_Mart/text.inc} | 0 .../LavaridgeTown_PokemonCenter_1F/text.inc} | 0 .../{text/maps/LilycoveCity.inc => maps/LilycoveCity/text.inc} | 0 .../LilycoveCity_ContestHall/text.inc} | 0 .../LilycoveCity_ContestLobby/text.inc} | 0 .../LilycoveCity_CoveLilyMotel_1F/text.inc} | 0 .../LilycoveCity_CoveLilyMotel_2F/text.inc} | 0 .../LilycoveCity_DepartmentStoreRooftop/text.inc} | 0 .../LilycoveCity_DepartmentStore_1F/text.inc} | 0 .../LilycoveCity_DepartmentStore_2F/text.inc} | 0 .../LilycoveCity_DepartmentStore_3F/text.inc} | 0 .../LilycoveCity_DepartmentStore_4F/text.inc} | 0 .../LilycoveCity_DepartmentStore_5F/text.inc} | 0 .../LilycoveCity_Harbor.inc => maps/LilycoveCity_Harbor/text.inc} | 0 .../LilycoveCity_House1.inc => maps/LilycoveCity_House1/text.inc} | 0 .../LilycoveCity_House2.inc => maps/LilycoveCity_House2/text.inc} | 0 .../LilycoveCity_House3.inc => maps/LilycoveCity_House3/text.inc} | 0 .../LilycoveCity_House4.inc => maps/LilycoveCity_House4/text.inc} | 0 .../LilycoveCity_LilycoveMuseum_1F/text.inc} | 0 .../LilycoveCity_LilycoveMuseum_2F/text.inc} | 0 .../LilycoveCity_MoveDeletersHouse/text.inc} | 0 .../LilycoveCity_PokemonCenter_1F/text.inc} | 0 .../LilycoveCity_PokemonTrainerFanClub/text.inc} | 0 .../maps/LittlerootTown.inc => maps/LittlerootTown/text.inc} | 0 .../LittlerootTown_BrendansHouse_1F/text.inc} | 0 .../LittlerootTown_BrendansHouse_2F/text.inc} | 0 .../LittlerootTown_MaysHouse_1F/text.inc} | 0 .../LittlerootTown_MaysHouse_2F/text.inc} | 0 .../LittlerootTown_ProfessorBirchsLab/text.inc} | 0 .../{text/maps/MauvilleCity.inc => maps/MauvilleCity/text.inc} | 0 .../MauvilleCity_BikeShop/text.inc} | 0 .../MauvilleCity_GameCorner/text.inc} | 0 .../maps/MauvilleCity_Gym.inc => maps/MauvilleCity_Gym/text.inc} | 0 .../MauvilleCity_House1.inc => maps/MauvilleCity_House1/text.inc} | 0 .../MauvilleCity_House2.inc => maps/MauvilleCity_House2/text.inc} | 0 .../MauvilleCity_Mart.inc => maps/MauvilleCity_Mart/text.inc} | 0 .../MauvilleCity_PokemonCenter_1F/text.inc} | 0 .../MauvilleCity_PokemonCenter_2F/text.inc} | 0 .../MeteorFalls_1F_1R.inc => maps/MeteorFalls_1F_1R/text.inc} | 0 .../MeteorFalls_1F_2R.inc => maps/MeteorFalls_1F_2R/text.inc} | 0 .../{text/maps/MossdeepCity.inc => maps/MossdeepCity/text.inc} | 0 .../MossdeepCity_GameCorner_1F/text.inc} | 0 .../maps/MossdeepCity_Gym.inc => maps/MossdeepCity_Gym/text.inc} | 0 .../MossdeepCity_House1.inc => maps/MossdeepCity_House1/text.inc} | 0 .../MossdeepCity_House2.inc => maps/MossdeepCity_House2/text.inc} | 0 .../MossdeepCity_House3.inc => maps/MossdeepCity_House3/text.inc} | 0 .../MossdeepCity_House4.inc => maps/MossdeepCity_House4/text.inc} | 0 .../MossdeepCity_Mart.inc => maps/MossdeepCity_Mart/text.inc} | 0 .../MossdeepCity_PokemonCenter_1F/text.inc} | 0 .../MossdeepCity_PokemonCenter_2F/text.inc} | 0 .../MossdeepCity_SpaceCenter_1F/text.inc} | 0 .../MossdeepCity_SpaceCenter_2F/text.inc} | 0 .../MossdeepCity_StevensHouse/text.inc} | 0 data-de/{text/maps/MtChimney.inc => maps/MtChimney/text.inc} | 0 .../MtChimney_CableCarStation/text.inc} | 0 data-de/{text/maps/MtPyre_1F.inc => maps/MtPyre_1F/text.inc} | 0 data-de/{text/maps/MtPyre_2F.inc => maps/MtPyre_2F/text.inc} | 0 data-de/{text/maps/MtPyre_3F.inc => maps/MtPyre_3F/text.inc} | 0 data-de/{text/maps/MtPyre_4F.inc => maps/MtPyre_4F/text.inc} | 0 data-de/{text/maps/MtPyre_5F.inc => maps/MtPyre_5F/text.inc} | 0 data-de/{text/maps/MtPyre_6F.inc => maps/MtPyre_6F/text.inc} | 0 .../NewMauville_Entrance/text.inc} | 0 .../NewMauville_Inside.inc => maps/NewMauville_Inside/text.inc} | 0 data-de/{text/maps/OldaleTown.inc => maps/OldaleTown/text.inc} | 0 .../OldaleTown_House1.inc => maps/OldaleTown_House1/text.inc} | 0 .../OldaleTown_House2.inc => maps/OldaleTown_House2/text.inc} | 0 .../maps/OldaleTown_Mart.inc => maps/OldaleTown_Mart/text.inc} | 0 .../OldaleTown_PokemonCenter_1F/text.inc} | 0 .../maps/PacifidlogTown.inc => maps/PacifidlogTown/text.inc} | 0 .../PacifidlogTown_House1/text.inc} | 0 .../PacifidlogTown_House2/text.inc} | 0 .../PacifidlogTown_House3/text.inc} | 0 .../PacifidlogTown_House4/text.inc} | 0 .../PacifidlogTown_House5/text.inc} | 0 .../PacifidlogTown_PokemonCenter_1F/text.inc} | 0 .../{text/maps/PetalburgCity.inc => maps/PetalburgCity/text.inc} | 0 .../PetalburgCity_Gym.inc => maps/PetalburgCity_Gym/text.inc} | 0 .../PetalburgCity_House1/text.inc} | 0 .../PetalburgCity_House2/text.inc} | 0 .../PetalburgCity_Mart.inc => maps/PetalburgCity_Mart/text.inc} | 0 .../PetalburgCity_PokemonCenter_1F/text.inc} | 0 .../PetalburgCity_WallysHouse/text.inc} | 0 .../maps/PetalburgWoods.inc => maps/PetalburgWoods/text.inc} | 0 data-de/{text/maps/Route101.inc => maps/Route101/text.inc} | 0 data-de/{text/maps/Route102.inc => maps/Route102/text.inc} | 0 data-de/{text/maps/Route103.inc => maps/Route103/text.inc} | 0 data-de/{text/maps/Route104.inc => maps/Route104/text.inc} | 0 .../Route104_MrBrineysHouse/text.inc} | 0 .../Route104_Prototype.inc => maps/Route104_Prototype/text.inc} | 0 .../Route104_PrototypePrettyPetalFlowerShop/text.inc} | 0 data-de/{text/maps/Route106.inc => maps/Route106/text.inc} | 0 data-de/{text/maps/Route109.inc => maps/Route109/text.inc} | 0 .../Route109_SeashoreHouse/text.inc} | 0 data-de/{text/maps/Route110.inc => maps/Route110/text.inc} | 0 .../Route110_SeasideCyclingRoadNorthEntrance/text.inc} | 0 .../Route110_SeasideCyclingRoadSouthEntrance/text.inc} | 0 .../Route110_TrickHouseEnd/text.inc} | 0 .../Route110_TrickHouseEntrance/text.inc} | 0 .../Route110_TrickHousePuzzle1/text.inc} | 0 .../Route110_TrickHousePuzzle2/text.inc} | 0 .../Route110_TrickHousePuzzle3/text.inc} | 0 .../Route110_TrickHousePuzzle4/text.inc} | 0 .../Route110_TrickHousePuzzle5/text.inc} | 0 .../Route110_TrickHousePuzzle6/text.inc} | 0 .../Route110_TrickHousePuzzle7/text.inc} | 0 .../Route110_TrickHousePuzzle8/text.inc} | 0 data-de/{text/maps/Route111.inc => maps/Route111/text.inc} | 0 .../Route111_OldLadysRestStop/text.inc} | 0 .../Route111_WinstrateFamilysHouse/text.inc} | 0 data-de/{text/maps/Route112.inc => maps/Route112/text.inc} | 0 .../Route112_CableCarStation/text.inc} | 0 data-de/{text/maps/Route113.inc => maps/Route113/text.inc} | 0 .../Route113_GlassWorkshop/text.inc} | 0 data-de/{text/maps/Route114.inc => maps/Route114/text.inc} | 0 .../Route114_FossilManiacsHouse/text.inc} | 0 .../Route114_FossilManiacsTunnel/text.inc} | 0 .../Route114_LanettesHouse/text.inc} | 0 data-de/{text/maps/Route115.inc => maps/Route115/text.inc} | 0 data-de/{text/maps/Route116.inc => maps/Route116/text.inc} | 0 .../Route116_TunnelersRestHouse/text.inc} | 0 data-de/{text/maps/Route117.inc => maps/Route117/text.inc} | 0 data-de/{text/maps/Route118.inc => maps/Route118/text.inc} | 0 data-de/{text/maps/Route119.inc => maps/Route119/text.inc} | 0 .../maps/Route119_House.inc => maps/Route119_House/text.inc} | 0 .../Route119_WeatherInstitute_1F/text.inc} | 0 .../Route119_WeatherInstitute_2F/text.inc} | 0 data-de/{text/maps/Route120.inc => maps/Route120/text.inc} | 0 data-de/{text/maps/Route121.inc => maps/Route121/text.inc} | 0 data-de/{text/maps/Route123.inc => maps/Route123/text.inc} | 0 data-de/{text/maps/Route124.inc => maps/Route124/text.inc} | 0 .../Route124_DivingTreasureHuntersHouse/text.inc} | 0 data-de/{text/maps/Route128.inc => maps/Route128/text.inc} | 0 .../{text/maps/RustboroCity.inc => maps/RustboroCity/text.inc} | 0 .../RustboroCity_CuttersHouse/text.inc} | 0 .../RustboroCity_DevonCorp_1F/text.inc} | 0 .../RustboroCity_DevonCorp_2F/text.inc} | 0 .../RustboroCity_DevonCorp_3F/text.inc} | 0 .../RustboroCity_Flat1_1F/text.inc} | 0 .../RustboroCity_Flat1_2F/text.inc} | 0 .../RustboroCity_Flat2_1F/text.inc} | 0 .../RustboroCity_Flat2_2F/text.inc} | 0 .../RustboroCity_Flat2_3F/text.inc} | 0 .../maps/RustboroCity_Gym.inc => maps/RustboroCity_Gym/text.inc} | 0 .../RustboroCity_House1.inc => maps/RustboroCity_House1/text.inc} | 0 .../RustboroCity_House2.inc => maps/RustboroCity_House2/text.inc} | 0 .../RustboroCity_House3.inc => maps/RustboroCity_House3/text.inc} | 0 .../RustboroCity_Mart.inc => maps/RustboroCity_Mart/text.inc} | 0 .../RustboroCity_PokemonCenter_1F/text.inc} | 0 .../RustboroCity_PokemonSchool/text.inc} | 0 .../{text/maps/RusturfTunnel.inc => maps/RusturfTunnel/text.inc} | 0 .../maps/SSTidalCorridor.inc => maps/SSTidalCorridor/text.inc} | 0 .../maps/SSTidalLowerDeck.inc => maps/SSTidalLowerDeck/text.inc} | 0 .../{text/maps/SSTidalRooms.inc => maps/SSTidalRooms/text.inc} | 0 .../SeafloorCavern_Room1/text.inc} | 0 .../SeafloorCavern_Room3/text.inc} | 0 .../SeafloorCavern_Room4/text.inc} | 0 .../SecretBase_RedCave1.inc => maps/SecretBase_RedCave1/text.inc} | 0 .../ShoalCave_LowTideLowerRoom/text.inc} | 0 .../{text/maps/SlateportCity.inc => maps/SlateportCity/text.inc} | 0 .../SlateportCity_ContestHall/text.inc} | 0 .../SlateportCity_ContestLobby/text.inc} | 0 .../SlateportCity_Harbor/text.inc} | 0 .../SlateportCity_House1/text.inc} | 0 .../SlateportCity_House2/text.inc} | 0 .../SlateportCity_Mart.inc => maps/SlateportCity_Mart/text.inc} | 0 .../SlateportCity_OceanicMuseum_1F/text.inc} | 0 .../SlateportCity_OceanicMuseum_2F/text.inc} | 0 .../SlateportCity_PokemonCenter_1F/text.inc} | 0 .../SlateportCity_PokemonFanClub/text.inc} | 0 .../SlateportCity_SternsShipyard_1F/text.inc} | 0 .../SlateportCity_SternsShipyard_2F/text.inc} | 0 .../maps/SootopolisCity.inc => maps/SootopolisCity/text.inc} | 0 .../SootopolisCity_Gym_1F/text.inc} | 0 .../SootopolisCity_House1/text.inc} | 0 .../SootopolisCity_House2/text.inc} | 0 .../SootopolisCity_House3/text.inc} | 0 .../SootopolisCity_House4/text.inc} | 0 .../SootopolisCity_House5/text.inc} | 0 .../SootopolisCity_House6/text.inc} | 0 .../SootopolisCity_House7/text.inc} | 0 .../SootopolisCity_House8/text.inc} | 0 .../SootopolisCity_Mart.inc => maps/SootopolisCity_Mart/text.inc} | 0 .../SootopolisCity_PokemonCenter_1F/text.inc} | 0 .../Underwater_SeafloorCavern/text.inc} | 0 .../maps/VerdanturfTown.inc => maps/VerdanturfTown/text.inc} | 0 .../VerdanturfTown_ContestHall/text.inc} | 0 .../VerdanturfTown_ContestLobby/text.inc} | 0 .../VerdanturfTown_FriendshipRatersHouse/text.inc} | 0 .../VerdanturfTown_House/text.inc} | 0 .../VerdanturfTown_Mart.inc => maps/VerdanturfTown_Mart/text.inc} | 0 .../VerdanturfTown_PokemonCenter_1F/text.inc} | 0 .../VerdanturfTown_WandasHouse/text.inc} | 0 .../maps/VictoryRoad_1F.inc => maps/VictoryRoad_1F/text.inc} | 0 .../maps/VictoryRoad_B1F.inc => maps/VictoryRoad_B1F/text.inc} | 0 .../maps/VictoryRoad_B2F.inc => maps/VictoryRoad_B2F/text.inc} | 0 252 files changed, 0 insertions(+), 0 deletions(-) rename data-de/{maps => layouts}/VictoryRoad_B1F/map.bin (100%) rename data-de/{maps => layouts}/VictoryRoad_B2F/map.bin (100%) rename data-de/{text/maps/AbandonedShip_CaptainsOffice.inc => maps/AbandonedShip_CaptainsOffice/text.inc} (100%) rename data-de/{text/maps/AbandonedShip_Corridors_1F.inc => maps/AbandonedShip_Corridors_1F/text.inc} (100%) rename data-de/{text/maps/AbandonedShip_Corridors_B1F.inc => maps/AbandonedShip_Corridors_B1F/text.inc} (100%) rename data-de/{text/maps/AbandonedShip_HiddenFloorCorridors.inc => maps/AbandonedShip_HiddenFloorCorridors/text.inc} (100%) rename data-de/{text/maps/AbandonedShip_HiddenFloorRooms.inc => maps/AbandonedShip_HiddenFloorRooms/text.inc} (100%) rename data-de/{text/maps/AbandonedShip_Rooms2_1F.inc => maps/AbandonedShip_Rooms2_1F/text.inc} (100%) rename data-de/{text/maps/AbandonedShip_Rooms2_B1F.inc => maps/AbandonedShip_Rooms2_B1F/text.inc} (100%) rename data-de/{text/maps/AbandonedShip_Rooms_1F.inc => maps/AbandonedShip_Rooms_1F/text.inc} (100%) rename data-de/{text/maps/AbandonedShip_Rooms_B1F.inc => maps/AbandonedShip_Rooms_B1F/text.inc} (100%) rename data-de/{text/maps/AquaHideout_1F.inc => maps/AquaHideout_1F/text.inc} (100%) rename data-de/{text/maps/AquaHideout_B1F.inc => maps/AquaHideout_B1F/text.inc} (100%) rename data-de/{text/maps/AquaHideout_B2F.inc => maps/AquaHideout_B2F/text.inc} (100%) rename data-de/{text/maps/BattleTower_BattleRoom.inc => maps/BattleTower_BattleRoom/text.inc} (100%) rename data-de/{text/maps/BattleTower_Lobby.inc => maps/BattleTower_Lobby/text.inc} (100%) rename data-de/{text/maps/BattleTower_Outside.inc => maps/BattleTower_Outside/text.inc} (100%) rename data-de/{text/maps/DewfordTown.inc => maps/DewfordTown/text.inc} (100%) rename data-de/{text/maps/DewfordTown_Gym.inc => maps/DewfordTown_Gym/text.inc} (100%) rename data-de/{text/maps/DewfordTown_Hall.inc => maps/DewfordTown_Hall/text.inc} (100%) rename data-de/{text/maps/DewfordTown_House1.inc => maps/DewfordTown_House1/text.inc} (100%) rename data-de/{text/maps/DewfordTown_House2.inc => maps/DewfordTown_House2/text.inc} (100%) rename data-de/{text/maps/DewfordTown_PokemonCenter_1F.inc => maps/DewfordTown_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity.inc => maps/EverGrandeCity/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity_ChampionsRoom.inc => maps/EverGrandeCity_ChampionsRoom/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity_DrakesRoom.inc => maps/EverGrandeCity_DrakesRoom/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity_GlaciasRoom.inc => maps/EverGrandeCity_GlaciasRoom/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity_HallOfFame.inc => maps/EverGrandeCity_HallOfFame/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity_PhoebesRoom.inc => maps/EverGrandeCity_PhoebesRoom/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity_PokemonCenter_1F.inc => maps/EverGrandeCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity_PokemonLeague.inc => maps/EverGrandeCity_PokemonLeague/text.inc} (100%) rename data-de/{text/maps/EverGrandeCity_SidneysRoom.inc => maps/EverGrandeCity_SidneysRoom/text.inc} (100%) rename data-de/{text/maps/FallarborTown.inc => maps/FallarborTown/text.inc} (100%) rename data-de/{text/maps/FallarborTown_ContestHall.inc => maps/FallarborTown_ContestHall/text.inc} (100%) rename data-de/{text/maps/FallarborTown_ContestLobby.inc => maps/FallarborTown_ContestLobby/text.inc} (100%) rename data-de/{text/maps/FallarborTown_House1.inc => maps/FallarborTown_House1/text.inc} (100%) rename data-de/{text/maps/FallarborTown_House2.inc => maps/FallarborTown_House2/text.inc} (100%) rename data-de/{text/maps/FallarborTown_Mart.inc => maps/FallarborTown_Mart/text.inc} (100%) rename data-de/{text/maps/FallarborTown_PokemonCenter_1F.inc => maps/FallarborTown_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/FortreeCity.inc => maps/FortreeCity/text.inc} (100%) rename data-de/{text/maps/FortreeCity_DecorationShop.inc => maps/FortreeCity_DecorationShop/text.inc} (100%) rename data-de/{text/maps/FortreeCity_Gym.inc => maps/FortreeCity_Gym/text.inc} (100%) rename data-de/{text/maps/FortreeCity_House1.inc => maps/FortreeCity_House1/text.inc} (100%) rename data-de/{text/maps/FortreeCity_House2.inc => maps/FortreeCity_House2/text.inc} (100%) rename data-de/{text/maps/FortreeCity_House3.inc => maps/FortreeCity_House3/text.inc} (100%) rename data-de/{text/maps/FortreeCity_House4.inc => maps/FortreeCity_House4/text.inc} (100%) rename data-de/{text/maps/FortreeCity_House5.inc => maps/FortreeCity_House5/text.inc} (100%) rename data-de/{text/maps/FortreeCity_Mart.inc => maps/FortreeCity_Mart/text.inc} (100%) rename data-de/{text/maps/FortreeCity_PokemonCenter_1F.inc => maps/FortreeCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/GraniteCave_1F.inc => maps/GraniteCave_1F/text.inc} (100%) rename data-de/{text/maps/GraniteCave_StevensRoom.inc => maps/GraniteCave_StevensRoom/text.inc} (100%) rename data-de/{text/maps/InsideOfTruck.inc => maps/InsideOfTruck/text.inc} (100%) rename data-de/{text/maps/JaggedPass.inc => maps/JaggedPass/text.inc} (100%) rename data-de/{text/maps/LavaridgeTown.inc => maps/LavaridgeTown/text.inc} (100%) rename data-de/{text/maps/LavaridgeTown_Gym_1F.inc => maps/LavaridgeTown_Gym_1F/text.inc} (100%) rename data-de/{text/maps/LavaridgeTown_HerbShop.inc => maps/LavaridgeTown_HerbShop/text.inc} (100%) rename data-de/{text/maps/LavaridgeTown_House.inc => maps/LavaridgeTown_House/text.inc} (100%) rename data-de/{text/maps/LavaridgeTown_Mart.inc => maps/LavaridgeTown_Mart/text.inc} (100%) rename data-de/{text/maps/LavaridgeTown_PokemonCenter_1F.inc => maps/LavaridgeTown_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity.inc => maps/LilycoveCity/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_ContestHall.inc => maps/LilycoveCity_ContestHall/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_ContestLobby.inc => maps/LilycoveCity_ContestLobby/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_CoveLilyMotel_1F.inc => maps/LilycoveCity_CoveLilyMotel_1F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_CoveLilyMotel_2F.inc => maps/LilycoveCity_CoveLilyMotel_2F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_DepartmentStoreRooftop.inc => maps/LilycoveCity_DepartmentStoreRooftop/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_DepartmentStore_1F.inc => maps/LilycoveCity_DepartmentStore_1F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_DepartmentStore_2F.inc => maps/LilycoveCity_DepartmentStore_2F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_DepartmentStore_3F.inc => maps/LilycoveCity_DepartmentStore_3F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_DepartmentStore_4F.inc => maps/LilycoveCity_DepartmentStore_4F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_DepartmentStore_5F.inc => maps/LilycoveCity_DepartmentStore_5F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_Harbor.inc => maps/LilycoveCity_Harbor/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_House1.inc => maps/LilycoveCity_House1/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_House2.inc => maps/LilycoveCity_House2/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_House3.inc => maps/LilycoveCity_House3/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_House4.inc => maps/LilycoveCity_House4/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_LilycoveMuseum_1F.inc => maps/LilycoveCity_LilycoveMuseum_1F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_LilycoveMuseum_2F.inc => maps/LilycoveCity_LilycoveMuseum_2F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_MoveDeletersHouse.inc => maps/LilycoveCity_MoveDeletersHouse/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_PokemonCenter_1F.inc => maps/LilycoveCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/LilycoveCity_PokemonTrainerFanClub.inc => maps/LilycoveCity_PokemonTrainerFanClub/text.inc} (100%) rename data-de/{text/maps/LittlerootTown.inc => maps/LittlerootTown/text.inc} (100%) rename data-de/{text/maps/LittlerootTown_BrendansHouse_1F.inc => maps/LittlerootTown_BrendansHouse_1F/text.inc} (100%) rename data-de/{text/maps/LittlerootTown_BrendansHouse_2F.inc => maps/LittlerootTown_BrendansHouse_2F/text.inc} (100%) rename data-de/{text/maps/LittlerootTown_MaysHouse_1F.inc => maps/LittlerootTown_MaysHouse_1F/text.inc} (100%) rename data-de/{text/maps/LittlerootTown_MaysHouse_2F.inc => maps/LittlerootTown_MaysHouse_2F/text.inc} (100%) rename data-de/{text/maps/LittlerootTown_ProfessorBirchsLab.inc => maps/LittlerootTown_ProfessorBirchsLab/text.inc} (100%) rename data-de/{text/maps/MauvilleCity.inc => maps/MauvilleCity/text.inc} (100%) rename data-de/{text/maps/MauvilleCity_BikeShop.inc => maps/MauvilleCity_BikeShop/text.inc} (100%) rename data-de/{text/maps/MauvilleCity_GameCorner.inc => maps/MauvilleCity_GameCorner/text.inc} (100%) rename data-de/{text/maps/MauvilleCity_Gym.inc => maps/MauvilleCity_Gym/text.inc} (100%) rename data-de/{text/maps/MauvilleCity_House1.inc => maps/MauvilleCity_House1/text.inc} (100%) rename data-de/{text/maps/MauvilleCity_House2.inc => maps/MauvilleCity_House2/text.inc} (100%) rename data-de/{text/maps/MauvilleCity_Mart.inc => maps/MauvilleCity_Mart/text.inc} (100%) rename data-de/{text/maps/MauvilleCity_PokemonCenter_1F.inc => maps/MauvilleCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/MauvilleCity_PokemonCenter_2F.inc => maps/MauvilleCity_PokemonCenter_2F/text.inc} (100%) rename data-de/{text/maps/MeteorFalls_1F_1R.inc => maps/MeteorFalls_1F_1R/text.inc} (100%) rename data-de/{text/maps/MeteorFalls_1F_2R.inc => maps/MeteorFalls_1F_2R/text.inc} (100%) rename data-de/{text/maps/MossdeepCity.inc => maps/MossdeepCity/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_GameCorner_1F.inc => maps/MossdeepCity_GameCorner_1F/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_Gym.inc => maps/MossdeepCity_Gym/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_House1.inc => maps/MossdeepCity_House1/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_House2.inc => maps/MossdeepCity_House2/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_House3.inc => maps/MossdeepCity_House3/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_House4.inc => maps/MossdeepCity_House4/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_Mart.inc => maps/MossdeepCity_Mart/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_PokemonCenter_1F.inc => maps/MossdeepCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_PokemonCenter_2F.inc => maps/MossdeepCity_PokemonCenter_2F/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_SpaceCenter_1F.inc => maps/MossdeepCity_SpaceCenter_1F/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_SpaceCenter_2F.inc => maps/MossdeepCity_SpaceCenter_2F/text.inc} (100%) rename data-de/{text/maps/MossdeepCity_StevensHouse.inc => maps/MossdeepCity_StevensHouse/text.inc} (100%) rename data-de/{text/maps/MtChimney.inc => maps/MtChimney/text.inc} (100%) rename data-de/{text/maps/MtChimney_CableCarStation.inc => maps/MtChimney_CableCarStation/text.inc} (100%) rename data-de/{text/maps/MtPyre_1F.inc => maps/MtPyre_1F/text.inc} (100%) rename data-de/{text/maps/MtPyre_2F.inc => maps/MtPyre_2F/text.inc} (100%) rename data-de/{text/maps/MtPyre_3F.inc => maps/MtPyre_3F/text.inc} (100%) rename data-de/{text/maps/MtPyre_4F.inc => maps/MtPyre_4F/text.inc} (100%) rename data-de/{text/maps/MtPyre_5F.inc => maps/MtPyre_5F/text.inc} (100%) rename data-de/{text/maps/MtPyre_6F.inc => maps/MtPyre_6F/text.inc} (100%) rename data-de/{text/maps/NewMauville_Entrance.inc => maps/NewMauville_Entrance/text.inc} (100%) rename data-de/{text/maps/NewMauville_Inside.inc => maps/NewMauville_Inside/text.inc} (100%) rename data-de/{text/maps/OldaleTown.inc => maps/OldaleTown/text.inc} (100%) rename data-de/{text/maps/OldaleTown_House1.inc => maps/OldaleTown_House1/text.inc} (100%) rename data-de/{text/maps/OldaleTown_House2.inc => maps/OldaleTown_House2/text.inc} (100%) rename data-de/{text/maps/OldaleTown_Mart.inc => maps/OldaleTown_Mart/text.inc} (100%) rename data-de/{text/maps/OldaleTown_PokemonCenter_1F.inc => maps/OldaleTown_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/PacifidlogTown.inc => maps/PacifidlogTown/text.inc} (100%) rename data-de/{text/maps/PacifidlogTown_House1.inc => maps/PacifidlogTown_House1/text.inc} (100%) rename data-de/{text/maps/PacifidlogTown_House2.inc => maps/PacifidlogTown_House2/text.inc} (100%) rename data-de/{text/maps/PacifidlogTown_House3.inc => maps/PacifidlogTown_House3/text.inc} (100%) rename data-de/{text/maps/PacifidlogTown_House4.inc => maps/PacifidlogTown_House4/text.inc} (100%) rename data-de/{text/maps/PacifidlogTown_House5.inc => maps/PacifidlogTown_House5/text.inc} (100%) rename data-de/{text/maps/PacifidlogTown_PokemonCenter_1F.inc => maps/PacifidlogTown_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/PetalburgCity.inc => maps/PetalburgCity/text.inc} (100%) rename data-de/{text/maps/PetalburgCity_Gym.inc => maps/PetalburgCity_Gym/text.inc} (100%) rename data-de/{text/maps/PetalburgCity_House1.inc => maps/PetalburgCity_House1/text.inc} (100%) rename data-de/{text/maps/PetalburgCity_House2.inc => maps/PetalburgCity_House2/text.inc} (100%) rename data-de/{text/maps/PetalburgCity_Mart.inc => maps/PetalburgCity_Mart/text.inc} (100%) rename data-de/{text/maps/PetalburgCity_PokemonCenter_1F.inc => maps/PetalburgCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/PetalburgCity_WallysHouse.inc => maps/PetalburgCity_WallysHouse/text.inc} (100%) rename data-de/{text/maps/PetalburgWoods.inc => maps/PetalburgWoods/text.inc} (100%) rename data-de/{text/maps/Route101.inc => maps/Route101/text.inc} (100%) rename data-de/{text/maps/Route102.inc => maps/Route102/text.inc} (100%) rename data-de/{text/maps/Route103.inc => maps/Route103/text.inc} (100%) rename data-de/{text/maps/Route104.inc => maps/Route104/text.inc} (100%) rename data-de/{text/maps/Route104_MrBrineysHouse.inc => maps/Route104_MrBrineysHouse/text.inc} (100%) rename data-de/{text/maps/Route104_Prototype.inc => maps/Route104_Prototype/text.inc} (100%) rename data-de/{text/maps/Route104_PrototypePrettyPetalFlowerShop.inc => maps/Route104_PrototypePrettyPetalFlowerShop/text.inc} (100%) rename data-de/{text/maps/Route106.inc => maps/Route106/text.inc} (100%) rename data-de/{text/maps/Route109.inc => maps/Route109/text.inc} (100%) rename data-de/{text/maps/Route109_SeashoreHouse.inc => maps/Route109_SeashoreHouse/text.inc} (100%) rename data-de/{text/maps/Route110.inc => maps/Route110/text.inc} (100%) rename data-de/{text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc => maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc} (100%) rename data-de/{text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc => maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHouseEnd.inc => maps/Route110_TrickHouseEnd/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHouseEntrance.inc => maps/Route110_TrickHouseEntrance/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHousePuzzle1.inc => maps/Route110_TrickHousePuzzle1/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHousePuzzle2.inc => maps/Route110_TrickHousePuzzle2/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHousePuzzle3.inc => maps/Route110_TrickHousePuzzle3/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHousePuzzle4.inc => maps/Route110_TrickHousePuzzle4/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHousePuzzle5.inc => maps/Route110_TrickHousePuzzle5/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHousePuzzle6.inc => maps/Route110_TrickHousePuzzle6/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHousePuzzle7.inc => maps/Route110_TrickHousePuzzle7/text.inc} (100%) rename data-de/{text/maps/Route110_TrickHousePuzzle8.inc => maps/Route110_TrickHousePuzzle8/text.inc} (100%) rename data-de/{text/maps/Route111.inc => maps/Route111/text.inc} (100%) rename data-de/{text/maps/Route111_OldLadysRestStop.inc => maps/Route111_OldLadysRestStop/text.inc} (100%) rename data-de/{text/maps/Route111_WinstrateFamilysHouse.inc => maps/Route111_WinstrateFamilysHouse/text.inc} (100%) rename data-de/{text/maps/Route112.inc => maps/Route112/text.inc} (100%) rename data-de/{text/maps/Route112_CableCarStation.inc => maps/Route112_CableCarStation/text.inc} (100%) rename data-de/{text/maps/Route113.inc => maps/Route113/text.inc} (100%) rename data-de/{text/maps/Route113_GlassWorkshop.inc => maps/Route113_GlassWorkshop/text.inc} (100%) rename data-de/{text/maps/Route114.inc => maps/Route114/text.inc} (100%) rename data-de/{text/maps/Route114_FossilManiacsHouse.inc => maps/Route114_FossilManiacsHouse/text.inc} (100%) rename data-de/{text/maps/Route114_FossilManiacsTunnel.inc => maps/Route114_FossilManiacsTunnel/text.inc} (100%) rename data-de/{text/maps/Route114_LanettesHouse.inc => maps/Route114_LanettesHouse/text.inc} (100%) rename data-de/{text/maps/Route115.inc => maps/Route115/text.inc} (100%) rename data-de/{text/maps/Route116.inc => maps/Route116/text.inc} (100%) rename data-de/{text/maps/Route116_TunnelersRestHouse.inc => maps/Route116_TunnelersRestHouse/text.inc} (100%) rename data-de/{text/maps/Route117.inc => maps/Route117/text.inc} (100%) rename data-de/{text/maps/Route118.inc => maps/Route118/text.inc} (100%) rename data-de/{text/maps/Route119.inc => maps/Route119/text.inc} (100%) rename data-de/{text/maps/Route119_House.inc => maps/Route119_House/text.inc} (100%) rename data-de/{text/maps/Route119_WeatherInstitute_1F.inc => maps/Route119_WeatherInstitute_1F/text.inc} (100%) rename data-de/{text/maps/Route119_WeatherInstitute_2F.inc => maps/Route119_WeatherInstitute_2F/text.inc} (100%) rename data-de/{text/maps/Route120.inc => maps/Route120/text.inc} (100%) rename data-de/{text/maps/Route121.inc => maps/Route121/text.inc} (100%) rename data-de/{text/maps/Route123.inc => maps/Route123/text.inc} (100%) rename data-de/{text/maps/Route124.inc => maps/Route124/text.inc} (100%) rename data-de/{text/maps/Route124_DivingTreasureHuntersHouse.inc => maps/Route124_DivingTreasureHuntersHouse/text.inc} (100%) rename data-de/{text/maps/Route128.inc => maps/Route128/text.inc} (100%) rename data-de/{text/maps/RustboroCity.inc => maps/RustboroCity/text.inc} (100%) rename data-de/{text/maps/RustboroCity_CuttersHouse.inc => maps/RustboroCity_CuttersHouse/text.inc} (100%) rename data-de/{text/maps/RustboroCity_DevonCorp_1F.inc => maps/RustboroCity_DevonCorp_1F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_DevonCorp_2F.inc => maps/RustboroCity_DevonCorp_2F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_DevonCorp_3F.inc => maps/RustboroCity_DevonCorp_3F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_Flat1_1F.inc => maps/RustboroCity_Flat1_1F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_Flat1_2F.inc => maps/RustboroCity_Flat1_2F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_Flat2_1F.inc => maps/RustboroCity_Flat2_1F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_Flat2_2F.inc => maps/RustboroCity_Flat2_2F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_Flat2_3F.inc => maps/RustboroCity_Flat2_3F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_Gym.inc => maps/RustboroCity_Gym/text.inc} (100%) rename data-de/{text/maps/RustboroCity_House1.inc => maps/RustboroCity_House1/text.inc} (100%) rename data-de/{text/maps/RustboroCity_House2.inc => maps/RustboroCity_House2/text.inc} (100%) rename data-de/{text/maps/RustboroCity_House3.inc => maps/RustboroCity_House3/text.inc} (100%) rename data-de/{text/maps/RustboroCity_Mart.inc => maps/RustboroCity_Mart/text.inc} (100%) rename data-de/{text/maps/RustboroCity_PokemonCenter_1F.inc => maps/RustboroCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/RustboroCity_PokemonSchool.inc => maps/RustboroCity_PokemonSchool/text.inc} (100%) rename data-de/{text/maps/RusturfTunnel.inc => maps/RusturfTunnel/text.inc} (100%) rename data-de/{text/maps/SSTidalCorridor.inc => maps/SSTidalCorridor/text.inc} (100%) rename data-de/{text/maps/SSTidalLowerDeck.inc => maps/SSTidalLowerDeck/text.inc} (100%) rename data-de/{text/maps/SSTidalRooms.inc => maps/SSTidalRooms/text.inc} (100%) rename data-de/{text/maps/SeafloorCavern_Room1.inc => maps/SeafloorCavern_Room1/text.inc} (100%) rename data-de/{text/maps/SeafloorCavern_Room3.inc => maps/SeafloorCavern_Room3/text.inc} (100%) rename data-de/{text/maps/SeafloorCavern_Room4.inc => maps/SeafloorCavern_Room4/text.inc} (100%) rename data-de/{text/maps/SecretBase_RedCave1.inc => maps/SecretBase_RedCave1/text.inc} (100%) rename data-de/{text/maps/ShoalCave_LowTideLowerRoom.inc => maps/ShoalCave_LowTideLowerRoom/text.inc} (100%) rename data-de/{text/maps/SlateportCity.inc => maps/SlateportCity/text.inc} (100%) rename data-de/{text/maps/SlateportCity_ContestHall.inc => maps/SlateportCity_ContestHall/text.inc} (100%) rename data-de/{text/maps/SlateportCity_ContestLobby.inc => maps/SlateportCity_ContestLobby/text.inc} (100%) rename data-de/{text/maps/SlateportCity_Harbor.inc => maps/SlateportCity_Harbor/text.inc} (100%) rename data-de/{text/maps/SlateportCity_House1.inc => maps/SlateportCity_House1/text.inc} (100%) rename data-de/{text/maps/SlateportCity_House2.inc => maps/SlateportCity_House2/text.inc} (100%) rename data-de/{text/maps/SlateportCity_Mart.inc => maps/SlateportCity_Mart/text.inc} (100%) rename data-de/{text/maps/SlateportCity_OceanicMuseum_1F.inc => maps/SlateportCity_OceanicMuseum_1F/text.inc} (100%) rename data-de/{text/maps/SlateportCity_OceanicMuseum_2F.inc => maps/SlateportCity_OceanicMuseum_2F/text.inc} (100%) rename data-de/{text/maps/SlateportCity_PokemonCenter_1F.inc => maps/SlateportCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/SlateportCity_PokemonFanClub.inc => maps/SlateportCity_PokemonFanClub/text.inc} (100%) rename data-de/{text/maps/SlateportCity_SternsShipyard_1F.inc => maps/SlateportCity_SternsShipyard_1F/text.inc} (100%) rename data-de/{text/maps/SlateportCity_SternsShipyard_2F.inc => maps/SlateportCity_SternsShipyard_2F/text.inc} (100%) rename data-de/{text/maps/SootopolisCity.inc => maps/SootopolisCity/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_Gym_1F.inc => maps/SootopolisCity_Gym_1F/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_House1.inc => maps/SootopolisCity_House1/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_House2.inc => maps/SootopolisCity_House2/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_House3.inc => maps/SootopolisCity_House3/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_House4.inc => maps/SootopolisCity_House4/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_House5.inc => maps/SootopolisCity_House5/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_House6.inc => maps/SootopolisCity_House6/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_House7.inc => maps/SootopolisCity_House7/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_House8.inc => maps/SootopolisCity_House8/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_Mart.inc => maps/SootopolisCity_Mart/text.inc} (100%) rename data-de/{text/maps/SootopolisCity_PokemonCenter_1F.inc => maps/SootopolisCity_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/Underwater_SeafloorCavern.inc => maps/Underwater_SeafloorCavern/text.inc} (100%) rename data-de/{text/maps/VerdanturfTown.inc => maps/VerdanturfTown/text.inc} (100%) rename data-de/{text/maps/VerdanturfTown_ContestHall.inc => maps/VerdanturfTown_ContestHall/text.inc} (100%) rename data-de/{text/maps/VerdanturfTown_ContestLobby.inc => maps/VerdanturfTown_ContestLobby/text.inc} (100%) rename data-de/{text/maps/VerdanturfTown_FriendshipRatersHouse.inc => maps/VerdanturfTown_FriendshipRatersHouse/text.inc} (100%) rename data-de/{text/maps/VerdanturfTown_House.inc => maps/VerdanturfTown_House/text.inc} (100%) rename data-de/{text/maps/VerdanturfTown_Mart.inc => maps/VerdanturfTown_Mart/text.inc} (100%) rename data-de/{text/maps/VerdanturfTown_PokemonCenter_1F.inc => maps/VerdanturfTown_PokemonCenter_1F/text.inc} (100%) rename data-de/{text/maps/VerdanturfTown_WandasHouse.inc => maps/VerdanturfTown_WandasHouse/text.inc} (100%) rename data-de/{text/maps/VictoryRoad_1F.inc => maps/VictoryRoad_1F/text.inc} (100%) rename data-de/{text/maps/VictoryRoad_B1F.inc => maps/VictoryRoad_B1F/text.inc} (100%) rename data-de/{text/maps/VictoryRoad_B2F.inc => maps/VictoryRoad_B2F/text.inc} (100%) diff --git a/data-de/maps/VictoryRoad_B1F/map.bin b/data-de/layouts/VictoryRoad_B1F/map.bin similarity index 100% rename from data-de/maps/VictoryRoad_B1F/map.bin rename to 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 similarity index 100% rename from data-de/maps/VictoryRoad_B2F/map.bin rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_CaptainsOffice.inc rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_Corridors_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_Corridors_B1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_HiddenFloorCorridors.inc rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_HiddenFloorRooms.inc rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_Rooms2_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_Rooms2_B1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_Rooms_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/AbandonedShip_Rooms_B1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/AquaHideout_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/AquaHideout_B1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/AquaHideout_B2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/BattleTower_BattleRoom.inc rename to 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 similarity index 100% rename from data-de/text/maps/BattleTower_Lobby.inc rename to 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 similarity index 100% rename from data-de/text/maps/BattleTower_Outside.inc rename to data-de/maps/BattleTower_Outside/text.inc diff --git a/data-de/text/maps/DewfordTown.inc b/data-de/maps/DewfordTown/text.inc similarity index 100% rename from data-de/text/maps/DewfordTown.inc rename to data-de/maps/DewfordTown/text.inc diff --git a/data-de/text/maps/DewfordTown_Gym.inc b/data-de/maps/DewfordTown_Gym/text.inc similarity index 100% rename from data-de/text/maps/DewfordTown_Gym.inc rename to 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 similarity index 100% rename from data-de/text/maps/DewfordTown_Hall.inc rename to 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 similarity index 100% rename from data-de/text/maps/DewfordTown_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/DewfordTown_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/DewfordTown_PokemonCenter_1F.inc rename to data-de/maps/DewfordTown_PokemonCenter_1F/text.inc diff --git a/data-de/text/maps/EverGrandeCity.inc b/data-de/maps/EverGrandeCity/text.inc similarity index 100% rename from data-de/text/maps/EverGrandeCity.inc rename to data-de/maps/EverGrandeCity/text.inc diff --git a/data-de/text/maps/EverGrandeCity_ChampionsRoom.inc b/data-de/maps/EverGrandeCity_ChampionsRoom/text.inc similarity index 100% rename from data-de/text/maps/EverGrandeCity_ChampionsRoom.inc rename to 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 similarity index 100% rename from data-de/text/maps/EverGrandeCity_DrakesRoom.inc rename to 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 similarity index 100% rename from data-de/text/maps/EverGrandeCity_GlaciasRoom.inc rename to 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 similarity index 100% rename from data-de/text/maps/EverGrandeCity_HallOfFame.inc rename to 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 similarity index 100% rename from data-de/text/maps/EverGrandeCity_PhoebesRoom.inc rename to 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 similarity index 100% rename from data-de/text/maps/EverGrandeCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/EverGrandeCity_PokemonLeague.inc rename to 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 similarity index 100% rename from data-de/text/maps/EverGrandeCity_SidneysRoom.inc rename to data-de/maps/EverGrandeCity_SidneysRoom/text.inc diff --git a/data-de/text/maps/FallarborTown.inc b/data-de/maps/FallarborTown/text.inc similarity index 100% rename from data-de/text/maps/FallarborTown.inc rename to data-de/maps/FallarborTown/text.inc diff --git a/data-de/text/maps/FallarborTown_ContestHall.inc b/data-de/maps/FallarborTown_ContestHall/text.inc similarity index 100% rename from data-de/text/maps/FallarborTown_ContestHall.inc rename to 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 similarity index 100% rename from data-de/text/maps/FallarborTown_ContestLobby.inc rename to 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 similarity index 100% rename from data-de/text/maps/FallarborTown_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/FallarborTown_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/FallarborTown_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/FallarborTown_PokemonCenter_1F.inc rename to data-de/maps/FallarborTown_PokemonCenter_1F/text.inc diff --git a/data-de/text/maps/FortreeCity.inc b/data-de/maps/FortreeCity/text.inc similarity index 100% rename from data-de/text/maps/FortreeCity.inc rename to data-de/maps/FortreeCity/text.inc diff --git a/data-de/text/maps/FortreeCity_DecorationShop.inc b/data-de/maps/FortreeCity_DecorationShop/text.inc similarity index 100% rename from data-de/text/maps/FortreeCity_DecorationShop.inc rename to 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 similarity index 100% rename from data-de/text/maps/FortreeCity_Gym.inc rename to 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 similarity index 100% rename from data-de/text/maps/FortreeCity_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/FortreeCity_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/FortreeCity_House3.inc rename to 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 similarity index 100% rename from data-de/text/maps/FortreeCity_House4.inc rename to 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 similarity index 100% rename from data-de/text/maps/FortreeCity_House5.inc rename to 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 similarity index 100% rename from data-de/text/maps/FortreeCity_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/FortreeCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/GraniteCave_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/GraniteCave_StevensRoom.inc rename to data-de/maps/GraniteCave_StevensRoom/text.inc diff --git a/data-de/text/maps/InsideOfTruck.inc b/data-de/maps/InsideOfTruck/text.inc similarity index 100% rename from data-de/text/maps/InsideOfTruck.inc rename to data-de/maps/InsideOfTruck/text.inc diff --git a/data-de/text/maps/JaggedPass.inc b/data-de/maps/JaggedPass/text.inc similarity index 100% rename from data-de/text/maps/JaggedPass.inc rename to data-de/maps/JaggedPass/text.inc diff --git a/data-de/text/maps/LavaridgeTown.inc b/data-de/maps/LavaridgeTown/text.inc similarity index 100% rename from data-de/text/maps/LavaridgeTown.inc rename to 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 similarity index 100% rename from data-de/text/maps/LavaridgeTown_Gym_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LavaridgeTown_HerbShop.inc rename to 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 similarity index 100% rename from data-de/text/maps/LavaridgeTown_House.inc rename to 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 similarity index 100% rename from data-de/text/maps/LavaridgeTown_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/LavaridgeTown_PokemonCenter_1F.inc rename to data-de/maps/LavaridgeTown_PokemonCenter_1F/text.inc diff --git a/data-de/text/maps/LilycoveCity.inc b/data-de/maps/LilycoveCity/text.inc similarity index 100% rename from data-de/text/maps/LilycoveCity.inc rename to data-de/maps/LilycoveCity/text.inc diff --git a/data-de/text/maps/LilycoveCity_ContestHall.inc b/data-de/maps/LilycoveCity_ContestHall/text.inc similarity index 100% rename from data-de/text/maps/LilycoveCity_ContestHall.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_ContestLobby.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_CoveLilyMotel_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_CoveLilyMotel_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_DepartmentStoreRooftop.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_DepartmentStore_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_DepartmentStore_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_DepartmentStore_3F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_DepartmentStore_4F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_DepartmentStore_5F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_Harbor.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_House3.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_House4.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_LilycoveMuseum_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_LilycoveMuseum_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_MoveDeletersHouse.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LilycoveCity_PokemonTrainerFanClub.inc rename to data-de/maps/LilycoveCity_PokemonTrainerFanClub/text.inc diff --git a/data-de/text/maps/LittlerootTown.inc b/data-de/maps/LittlerootTown/text.inc similarity index 100% rename from data-de/text/maps/LittlerootTown.inc rename to 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 similarity index 100% rename from data-de/text/maps/LittlerootTown_BrendansHouse_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LittlerootTown_BrendansHouse_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LittlerootTown_MaysHouse_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LittlerootTown_MaysHouse_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/LittlerootTown_ProfessorBirchsLab.inc rename to data-de/maps/LittlerootTown_ProfessorBirchsLab/text.inc diff --git a/data-de/text/maps/MauvilleCity.inc b/data-de/maps/MauvilleCity/text.inc similarity index 100% rename from data-de/text/maps/MauvilleCity.inc rename to data-de/maps/MauvilleCity/text.inc diff --git a/data-de/text/maps/MauvilleCity_BikeShop.inc b/data-de/maps/MauvilleCity_BikeShop/text.inc similarity index 100% rename from data-de/text/maps/MauvilleCity_BikeShop.inc rename to 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 similarity index 100% rename from data-de/text/maps/MauvilleCity_GameCorner.inc rename to 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 similarity index 100% rename from data-de/text/maps/MauvilleCity_Gym.inc rename to 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 similarity index 100% rename from data-de/text/maps/MauvilleCity_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/MauvilleCity_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/MauvilleCity_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/MauvilleCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MauvilleCity_PokemonCenter_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MeteorFalls_1F_1R.inc rename to 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 similarity index 100% rename from data-de/text/maps/MeteorFalls_1F_2R.inc rename to data-de/maps/MeteorFalls_1F_2R/text.inc diff --git a/data-de/text/maps/MossdeepCity.inc b/data-de/maps/MossdeepCity/text.inc similarity index 100% rename from data-de/text/maps/MossdeepCity.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_GameCorner_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_Gym.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_House3.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_House4.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_PokemonCenter_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_SpaceCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_SpaceCenter_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MossdeepCity_StevensHouse.inc rename to data-de/maps/MossdeepCity_StevensHouse/text.inc diff --git a/data-de/text/maps/MtChimney.inc b/data-de/maps/MtChimney/text.inc similarity index 100% rename from data-de/text/maps/MtChimney.inc rename to data-de/maps/MtChimney/text.inc diff --git a/data-de/text/maps/MtChimney_CableCarStation.inc b/data-de/maps/MtChimney_CableCarStation/text.inc similarity index 100% rename from data-de/text/maps/MtChimney_CableCarStation.inc rename to 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 similarity index 100% rename from data-de/text/maps/MtPyre_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MtPyre_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MtPyre_3F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MtPyre_4F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MtPyre_5F.inc rename to 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 similarity index 100% rename from data-de/text/maps/MtPyre_6F.inc rename to 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 similarity index 100% rename from data-de/text/maps/NewMauville_Entrance.inc rename to 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 similarity index 100% rename from data-de/text/maps/NewMauville_Inside.inc rename to data-de/maps/NewMauville_Inside/text.inc diff --git a/data-de/text/maps/OldaleTown.inc b/data-de/maps/OldaleTown/text.inc similarity index 100% rename from data-de/text/maps/OldaleTown.inc rename to data-de/maps/OldaleTown/text.inc diff --git a/data-de/text/maps/OldaleTown_House1.inc b/data-de/maps/OldaleTown_House1/text.inc similarity index 100% rename from data-de/text/maps/OldaleTown_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/OldaleTown_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/OldaleTown_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/OldaleTown_PokemonCenter_1F.inc rename to data-de/maps/OldaleTown_PokemonCenter_1F/text.inc diff --git a/data-de/text/maps/PacifidlogTown.inc b/data-de/maps/PacifidlogTown/text.inc similarity index 100% rename from data-de/text/maps/PacifidlogTown.inc rename to data-de/maps/PacifidlogTown/text.inc diff --git a/data-de/text/maps/PacifidlogTown_House1.inc b/data-de/maps/PacifidlogTown_House1/text.inc similarity index 100% rename from data-de/text/maps/PacifidlogTown_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/PacifidlogTown_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/PacifidlogTown_House3.inc rename to 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 similarity index 100% rename from data-de/text/maps/PacifidlogTown_House4.inc rename to 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 similarity index 100% rename from data-de/text/maps/PacifidlogTown_House5.inc rename to 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 similarity index 100% rename from data-de/text/maps/PacifidlogTown_PokemonCenter_1F.inc rename to data-de/maps/PacifidlogTown_PokemonCenter_1F/text.inc diff --git a/data-de/text/maps/PetalburgCity.inc b/data-de/maps/PetalburgCity/text.inc similarity index 100% rename from data-de/text/maps/PetalburgCity.inc rename to data-de/maps/PetalburgCity/text.inc diff --git a/data-de/text/maps/PetalburgCity_Gym.inc b/data-de/maps/PetalburgCity_Gym/text.inc similarity index 100% rename from data-de/text/maps/PetalburgCity_Gym.inc rename to 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 similarity index 100% rename from data-de/text/maps/PetalburgCity_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/PetalburgCity_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/PetalburgCity_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/PetalburgCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/PetalburgCity_WallysHouse.inc rename to data-de/maps/PetalburgCity_WallysHouse/text.inc diff --git a/data-de/text/maps/PetalburgWoods.inc b/data-de/maps/PetalburgWoods/text.inc similarity index 100% rename from data-de/text/maps/PetalburgWoods.inc rename to data-de/maps/PetalburgWoods/text.inc diff --git a/data-de/text/maps/Route101.inc b/data-de/maps/Route101/text.inc similarity index 100% rename from data-de/text/maps/Route101.inc rename to data-de/maps/Route101/text.inc diff --git a/data-de/text/maps/Route102.inc b/data-de/maps/Route102/text.inc similarity index 100% rename from data-de/text/maps/Route102.inc rename to data-de/maps/Route102/text.inc diff --git a/data-de/text/maps/Route103.inc b/data-de/maps/Route103/text.inc similarity index 100% rename from data-de/text/maps/Route103.inc rename to data-de/maps/Route103/text.inc diff --git a/data-de/text/maps/Route104.inc b/data-de/maps/Route104/text.inc similarity index 100% rename from data-de/text/maps/Route104.inc rename to data-de/maps/Route104/text.inc diff --git a/data-de/text/maps/Route104_MrBrineysHouse.inc b/data-de/maps/Route104_MrBrineysHouse/text.inc similarity index 100% rename from data-de/text/maps/Route104_MrBrineysHouse.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route104_Prototype.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc rename to data-de/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc diff --git a/data-de/text/maps/Route106.inc b/data-de/maps/Route106/text.inc similarity index 100% rename from data-de/text/maps/Route106.inc rename to data-de/maps/Route106/text.inc diff --git a/data-de/text/maps/Route109.inc b/data-de/maps/Route109/text.inc similarity index 100% rename from data-de/text/maps/Route109.inc rename to data-de/maps/Route109/text.inc diff --git a/data-de/text/maps/Route109_SeashoreHouse.inc b/data-de/maps/Route109_SeashoreHouse/text.inc similarity index 100% rename from data-de/text/maps/Route109_SeashoreHouse.inc rename to data-de/maps/Route109_SeashoreHouse/text.inc diff --git a/data-de/text/maps/Route110.inc b/data-de/maps/Route110/text.inc similarity index 100% rename from data-de/text/maps/Route110.inc rename to data-de/maps/Route110/text.inc diff --git a/data-de/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data-de/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc similarity index 100% rename from data-de/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHouseEnd.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHouseEntrance.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHousePuzzle1.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHousePuzzle2.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHousePuzzle3.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHousePuzzle4.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHousePuzzle5.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHousePuzzle6.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHousePuzzle7.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route110_TrickHousePuzzle8.inc rename to data-de/maps/Route110_TrickHousePuzzle8/text.inc diff --git a/data-de/text/maps/Route111.inc b/data-de/maps/Route111/text.inc similarity index 100% rename from data-de/text/maps/Route111.inc rename to data-de/maps/Route111/text.inc diff --git a/data-de/text/maps/Route111_OldLadysRestStop.inc b/data-de/maps/Route111_OldLadysRestStop/text.inc similarity index 100% rename from data-de/text/maps/Route111_OldLadysRestStop.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route111_WinstrateFamilysHouse.inc rename to data-de/maps/Route111_WinstrateFamilysHouse/text.inc diff --git a/data-de/text/maps/Route112.inc b/data-de/maps/Route112/text.inc similarity index 100% rename from data-de/text/maps/Route112.inc rename to data-de/maps/Route112/text.inc diff --git a/data-de/text/maps/Route112_CableCarStation.inc b/data-de/maps/Route112_CableCarStation/text.inc similarity index 100% rename from data-de/text/maps/Route112_CableCarStation.inc rename to data-de/maps/Route112_CableCarStation/text.inc diff --git a/data-de/text/maps/Route113.inc b/data-de/maps/Route113/text.inc similarity index 100% rename from data-de/text/maps/Route113.inc rename to data-de/maps/Route113/text.inc diff --git a/data-de/text/maps/Route113_GlassWorkshop.inc b/data-de/maps/Route113_GlassWorkshop/text.inc similarity index 100% rename from data-de/text/maps/Route113_GlassWorkshop.inc rename to data-de/maps/Route113_GlassWorkshop/text.inc diff --git a/data-de/text/maps/Route114.inc b/data-de/maps/Route114/text.inc similarity index 100% rename from data-de/text/maps/Route114.inc rename to data-de/maps/Route114/text.inc diff --git a/data-de/text/maps/Route114_FossilManiacsHouse.inc b/data-de/maps/Route114_FossilManiacsHouse/text.inc similarity index 100% rename from data-de/text/maps/Route114_FossilManiacsHouse.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route114_FossilManiacsTunnel.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route114_LanettesHouse.inc rename to data-de/maps/Route114_LanettesHouse/text.inc diff --git a/data-de/text/maps/Route115.inc b/data-de/maps/Route115/text.inc similarity index 100% rename from data-de/text/maps/Route115.inc rename to data-de/maps/Route115/text.inc diff --git a/data-de/text/maps/Route116.inc b/data-de/maps/Route116/text.inc similarity index 100% rename from data-de/text/maps/Route116.inc rename to data-de/maps/Route116/text.inc diff --git a/data-de/text/maps/Route116_TunnelersRestHouse.inc b/data-de/maps/Route116_TunnelersRestHouse/text.inc similarity index 100% rename from data-de/text/maps/Route116_TunnelersRestHouse.inc rename to data-de/maps/Route116_TunnelersRestHouse/text.inc diff --git a/data-de/text/maps/Route117.inc b/data-de/maps/Route117/text.inc similarity index 100% rename from data-de/text/maps/Route117.inc rename to data-de/maps/Route117/text.inc diff --git a/data-de/text/maps/Route118.inc b/data-de/maps/Route118/text.inc similarity index 100% rename from data-de/text/maps/Route118.inc rename to data-de/maps/Route118/text.inc diff --git a/data-de/text/maps/Route119.inc b/data-de/maps/Route119/text.inc similarity index 100% rename from data-de/text/maps/Route119.inc rename to data-de/maps/Route119/text.inc diff --git a/data-de/text/maps/Route119_House.inc b/data-de/maps/Route119_House/text.inc similarity index 100% rename from data-de/text/maps/Route119_House.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route119_WeatherInstitute_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/Route119_WeatherInstitute_2F.inc rename to data-de/maps/Route119_WeatherInstitute_2F/text.inc diff --git a/data-de/text/maps/Route120.inc b/data-de/maps/Route120/text.inc similarity index 100% rename from data-de/text/maps/Route120.inc rename to data-de/maps/Route120/text.inc diff --git a/data-de/text/maps/Route121.inc b/data-de/maps/Route121/text.inc similarity index 100% rename from data-de/text/maps/Route121.inc rename to data-de/maps/Route121/text.inc diff --git a/data-de/text/maps/Route123.inc b/data-de/maps/Route123/text.inc similarity index 100% rename from data-de/text/maps/Route123.inc rename to data-de/maps/Route123/text.inc diff --git a/data-de/text/maps/Route124.inc b/data-de/maps/Route124/text.inc similarity index 100% rename from data-de/text/maps/Route124.inc rename to data-de/maps/Route124/text.inc diff --git a/data-de/text/maps/Route124_DivingTreasureHuntersHouse.inc b/data-de/maps/Route124_DivingTreasureHuntersHouse/text.inc similarity index 100% rename from data-de/text/maps/Route124_DivingTreasureHuntersHouse.inc rename to data-de/maps/Route124_DivingTreasureHuntersHouse/text.inc diff --git a/data-de/text/maps/Route128.inc b/data-de/maps/Route128/text.inc similarity index 100% rename from data-de/text/maps/Route128.inc rename to data-de/maps/Route128/text.inc diff --git a/data-de/text/maps/RustboroCity.inc b/data-de/maps/RustboroCity/text.inc similarity index 100% rename from data-de/text/maps/RustboroCity.inc rename to data-de/maps/RustboroCity/text.inc diff --git a/data-de/text/maps/RustboroCity_CuttersHouse.inc b/data-de/maps/RustboroCity_CuttersHouse/text.inc similarity index 100% rename from data-de/text/maps/RustboroCity_CuttersHouse.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_DevonCorp_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_DevonCorp_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_DevonCorp_3F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_Flat1_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_Flat1_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_Flat2_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_Flat2_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_Flat2_3F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_Gym.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_House3.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/RustboroCity_PokemonSchool.inc rename to data-de/maps/RustboroCity_PokemonSchool/text.inc diff --git a/data-de/text/maps/RusturfTunnel.inc b/data-de/maps/RusturfTunnel/text.inc similarity index 100% rename from data-de/text/maps/RusturfTunnel.inc rename to data-de/maps/RusturfTunnel/text.inc diff --git a/data-de/text/maps/SSTidalCorridor.inc b/data-de/maps/SSTidalCorridor/text.inc similarity index 100% rename from data-de/text/maps/SSTidalCorridor.inc rename to data-de/maps/SSTidalCorridor/text.inc diff --git a/data-de/text/maps/SSTidalLowerDeck.inc b/data-de/maps/SSTidalLowerDeck/text.inc similarity index 100% rename from data-de/text/maps/SSTidalLowerDeck.inc rename to data-de/maps/SSTidalLowerDeck/text.inc diff --git a/data-de/text/maps/SSTidalRooms.inc b/data-de/maps/SSTidalRooms/text.inc similarity index 100% rename from data-de/text/maps/SSTidalRooms.inc rename to data-de/maps/SSTidalRooms/text.inc diff --git a/data-de/text/maps/SeafloorCavern_Room1.inc b/data-de/maps/SeafloorCavern_Room1/text.inc similarity index 100% rename from data-de/text/maps/SeafloorCavern_Room1.inc rename to 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 similarity index 100% rename from data-de/text/maps/SeafloorCavern_Room3.inc rename to 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 similarity index 100% rename from data-de/text/maps/SeafloorCavern_Room4.inc rename to 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 similarity index 100% rename from data-de/text/maps/SecretBase_RedCave1.inc rename to 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 similarity index 100% rename from data-de/text/maps/ShoalCave_LowTideLowerRoom.inc rename to data-de/maps/ShoalCave_LowTideLowerRoom/text.inc diff --git a/data-de/text/maps/SlateportCity.inc b/data-de/maps/SlateportCity/text.inc similarity index 100% rename from data-de/text/maps/SlateportCity.inc rename to data-de/maps/SlateportCity/text.inc diff --git a/data-de/text/maps/SlateportCity_ContestHall.inc b/data-de/maps/SlateportCity_ContestHall/text.inc similarity index 100% rename from data-de/text/maps/SlateportCity_ContestHall.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_ContestLobby.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_Harbor.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_OceanicMuseum_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_OceanicMuseum_2F.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_PokemonFanClub.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_SternsShipyard_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/SlateportCity_SternsShipyard_2F.inc rename to data-de/maps/SlateportCity_SternsShipyard_2F/text.inc diff --git a/data-de/text/maps/SootopolisCity.inc b/data-de/maps/SootopolisCity/text.inc similarity index 100% rename from data-de/text/maps/SootopolisCity.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_Gym_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_House1.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_House2.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_House3.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_House4.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_House5.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_House6.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_House7.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_House8.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/SootopolisCity_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/Underwater_SeafloorCavern.inc rename to data-de/maps/Underwater_SeafloorCavern/text.inc diff --git a/data-de/text/maps/VerdanturfTown.inc b/data-de/maps/VerdanturfTown/text.inc similarity index 100% rename from data-de/text/maps/VerdanturfTown.inc rename to data-de/maps/VerdanturfTown/text.inc diff --git a/data-de/text/maps/VerdanturfTown_ContestHall.inc b/data-de/maps/VerdanturfTown_ContestHall/text.inc similarity index 100% rename from data-de/text/maps/VerdanturfTown_ContestHall.inc rename to 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 similarity index 100% rename from data-de/text/maps/VerdanturfTown_ContestLobby.inc rename to 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 similarity index 100% rename from data-de/text/maps/VerdanturfTown_FriendshipRatersHouse.inc rename to 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 similarity index 100% rename from data-de/text/maps/VerdanturfTown_House.inc rename to 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 similarity index 100% rename from data-de/text/maps/VerdanturfTown_Mart.inc rename to 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 similarity index 100% rename from data-de/text/maps/VerdanturfTown_PokemonCenter_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/VerdanturfTown_WandasHouse.inc rename to 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 similarity index 100% rename from data-de/text/maps/VictoryRoad_1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/VictoryRoad_B1F.inc rename to 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 similarity index 100% rename from data-de/text/maps/VictoryRoad_B2F.inc rename to data-de/maps/VictoryRoad_B2F/text.inc