diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 17:41:17 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 19:54:21 -0500 |
| commit | 89d35e82a27c7328bf5987b4993b3456bb78f440 (patch) | |
| tree | e98a7ba6af471ac0b6e7237eb2ca159ddb4d2f6f | |
| parent | 4ab87bf8f3fd527d0b5120344f84b73d309693db (diff) | |
Move 'map attributes' into 'layouts'
1848 files changed, 8462 insertions, 8572 deletions
@@ -99,7 +99,7 @@ include graphics_file_rules.mk %.lz: % ; $(GFX) $< $@ %.rl: % ; $(GFX) $< $@ sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress -%.bin: %.aif ; $(AIF) $< $@ +sound/%.bin: sound/%.aif ; $(AIF) $< $@ sound/songs/%.s: sound/songs/%.mid cd $(@D) && ../../$(MID) $(<F) diff --git a/data/layouts.inc b/data/layouts.inc new file mode 100755 index 000000000..e69d50f3e --- /dev/null +++ b/data/layouts.inc @@ -0,0 +1,441 @@ + .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/UnknownMap_08417FC4/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/Mart/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/FallarborTown_LeftoverRSContestLobby/layout.inc" + .include "data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc" + .include "data/layouts/LilycoveCity_House2/layout.inc" + .include "data/layouts/UnknownMap_08428450/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_084294C4/layout.inc" + .include "data/layouts/UnknownMap_084294E8/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/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_ShortHall/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_UnusedRubySapphireMap1/layout.inc" + .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc" + .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc" + .include "data/layouts/CaveOfOrigin_B1F/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_0843E6C0/layout.inc" + .include "data/layouts/UnknownMap_0843E6E4/layout.inc" + .include "data/layouts/UnknownMap_0843E708/layout.inc" + .include "data/layouts/UnknownMap_0843E72C/layout.inc" + .include "data/layouts/UnknownMap_0843E750/layout.inc" + .include "data/layouts/UnknownMap_0843E774/layout.inc" + .include "data/layouts/UnknownMap_0843E798/layout.inc" + .include "data/layouts/UnknownMap_0843E7BC/layout.inc" + .include "data/layouts/UnknownMap_0843E7E0/layout.inc" + .include "data/layouts/UnknownMap_0843E804/layout.inc" + .include "data/layouts/UnknownMap_0843E828/layout.inc" + .include "data/layouts/UnknownMap_0843E84C/layout.inc" + .include "data/layouts/UnknownMap_0843E870/layout.inc" + .include "data/layouts/UnknownMap_0843E894/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_North/layout.inc" + .include "data/layouts/SafariZone_Southwest/layout.inc" + .include "data/layouts/SafariZone_South/layout.inc" + .include "data/layouts/UnknownMap_08447028/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_SeasideCyclingRoadEntrance/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/BattleFrontier_BattleTowerLobby/layout.inc" + .include "data/layouts/BattleFrontier_OutsideWest/layout.inc" + .include "data/layouts/BattleElevator/layout.inc" + .include "data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc" + .include "data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc" + .include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc" + .include "data/layouts/EverGrandeCity_PokemonLeague_1F/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_LotadAndSeedotHouse/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_0845A394/layout.inc" + .include "data/layouts/RustboroCity_Flat1_1F/layout.inc" + .include "data/layouts/RustboroCity_Flat1_2F/layout.inc" + .include "data/layouts/EverGrandeCity_Hall4/layout.inc" + .include "data/layouts/AquaHideout_UnusedRubyMap1/layout.inc" + .include "data/layouts/AquaHideout_UnusedRubyMap2/layout.inc" + .include "data/layouts/AquaHideout_UnusedRubyMap3/layout.inc" + .include "data/layouts/UnknownMap_0845D470/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_0845ECB4/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" + .include "data/layouts/BattleFrontier_BattleDomeLobby/layout.inc" + .include "data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc" + .include "data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc" + .include "data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc" + .include "data/layouts/MagmaHideout_1F/layout.inc" + .include "data/layouts/MagmaHideout_2F_1R/layout.inc" + .include "data/layouts/MagmaHideout_2F_2R/layout.inc" + .include "data/layouts/MagmaHideout_3F_1R/layout.inc" + .include "data/layouts/MagmaHideout_3F_2R/layout.inc" + .include "data/layouts/MagmaHideout_4F/layout.inc" + .include "data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc" + .include "data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc" + .include "data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc" + .include "data/layouts/BattleFrontier_OutsideEast/layout.inc" + .include "data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc" + .include "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc" + .include "data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc" + .include "data/layouts/BattleFrontier_BattlePikeLobby/layout.inc" + .include "data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc" + .include "data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc" + .include "data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc" + .include "data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc" + .include "data/layouts/BattleFrontier_BattleArenaLobby/layout.inc" + .include "data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc" + .include "data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc" + .include "data/layouts/UnknownMap_08469200/layout.inc" + .include "data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc" + .include "data/layouts/UnknownMap_084693AC/layout.inc" + .include "data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc" + .include "data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc" + .include "data/layouts/BattlePyramidSquare01/layout.inc" + .include "data/layouts/BattlePyramidSquare02/layout.inc" + .include "data/layouts/BattlePyramidSquare03/layout.inc" + .include "data/layouts/BattlePyramidSquare04/layout.inc" + .include "data/layouts/BattlePyramidSquare05/layout.inc" + .include "data/layouts/BattlePyramidSquare06/layout.inc" + .include "data/layouts/BattlePyramidSquare07/layout.inc" + .include "data/layouts/BattlePyramidSquare08/layout.inc" + .include "data/layouts/BattlePyramidSquare09/layout.inc" + .include "data/layouts/BattlePyramidSquare10/layout.inc" + .include "data/layouts/BattlePyramidSquare11/layout.inc" + .include "data/layouts/BattlePyramidSquare12/layout.inc" + .include "data/layouts/BattlePyramidSquare13/layout.inc" + .include "data/layouts/BattlePyramidSquare14/layout.inc" + .include "data/layouts/BattlePyramidSquare15/layout.inc" + .include "data/layouts/BattlePyramidSquare16/layout.inc" + .include "data/layouts/BattleFrontier_BattlePyramidTop/layout.inc" + .include "data/layouts/MagmaHideout_3F_3R/layout.inc" + .include "data/layouts/MagmaHideout_2F_3R/layout.inc" + .include "data/layouts/MirageTower_1F/layout.inc" + .include "data/layouts/MirageTower_2F/layout.inc" + .include "data/layouts/MirageTower_3F/layout.inc" + .include "data/layouts/BattleTentLobby/layout.inc" + .include "data/layouts/BattleTentCorridor/layout.inc" + .include "data/layouts/BattleTentBattleRoom/layout.inc" + .include "data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc" + .include "data/layouts/MirageTower_4F/layout.inc" + .include "data/layouts/DesertUnderpass/layout.inc" + .include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc" + .include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc" + .include "data/layouts/UnknownMap_08470BD8/layout.inc" + .include "data/layouts/UnionRoom/layout.inc" + .include "data/layouts/SafariZone_Northeast/layout.inc" + .include "data/layouts/SafariZone_Southeast/layout.inc" + .include "data/layouts/BattleFrontier_RankingHall/layout.inc" + .include "data/layouts/BattleFrontier_Lounge1/layout.inc" + .include "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc" + .include "data/layouts/BattleFrontier_ReceptionGate/layout.inc" + .include "data/layouts/ArtisanCave_B1F/layout.inc" + .include "data/layouts/ArtisanCave_1F/layout.inc" + .include "data/layouts/FarawayIsland_Entrance/layout.inc" + .include "data/layouts/FarawayIsland_Interior/layout.inc" + .include "data/layouts/BirthIsland_Exterior/layout.inc" + .include "data/layouts/IslandHarbor/layout.inc" + .include "data/layouts/Underwater_MarineCave/layout.inc" + .include "data/layouts/MarineCave_Entrance/layout.inc" + .include "data/layouts/TerraCave_Entrance/layout.inc" + .include "data/layouts/TerraCave_End/layout.inc" + .include "data/layouts/Underwater6/layout.inc" + .include "data/layouts/Underwater7/layout.inc" + .include "data/layouts/Underwater5/layout.inc" + .include "data/layouts/MarineCave_End/layout.inc" + .include "data/layouts/TrainerHill_Entrance/layout.inc" + .include "data/layouts/TrainerHill_1F/layout.inc" + .include "data/layouts/TrainerHill_2F/layout.inc" + .include "data/layouts/TrainerHill_3F/layout.inc" + .include "data/layouts/TrainerHill_4F/layout.inc" + .include "data/layouts/TrainerHill_Roof/layout.inc" + .include "data/layouts/AlteringCave/layout.inc" + .include "data/layouts/NavelRock_Exterior/layout.inc" + .include "data/layouts/NavelRock_Entrance/layout.inc" + .include "data/layouts/NavelRock_Top/layout.inc" + .include "data/layouts/NavelRock_Bottom/layout.inc" + .include "data/layouts/NavelRock_LadderRoom1/layout.inc" + .include "data/layouts/NavelRock_LadderRoom2/layout.inc" + .include "data/layouts/NavelRock_B1F/layout.inc" + .include "data/layouts/NavelRock_Fork/layout.inc" + .include "data/layouts/BattleFrontier_Lounge2/layout.inc" + .include "data/layouts/BattleFrontier_ScottsHouse/layout.inc" + .include "data/layouts/MeteorFalls_StevensCave/layout.inc" + .include "data/layouts/UnknownMap_08480DAC/layout.inc" + .include "data/layouts/UnknownMap_08480F54/layout.inc" + .include "data/layouts/UnknownMap_084810FC/layout.inc" + .include "data/layouts/UnknownMap_084812A4/layout.inc" + .include "data/layouts/UnknownMap_0848144C/layout.inc" + .include "data/layouts/UnknownMap_084815F4/layout.inc" + .include "data/layouts/UnknownMap_08481B24/layout.inc" + .include "data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc" + .include "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc" + .include "data/layouts/UnknownMap_08481DBC/layout.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/layouts/AbandonedShip_CaptainsOffice/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/border.bin +++ b/data/layouts/AbandonedShip_CaptainsOffice/border.bin diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc new file mode 100644 index 000000000..8a123be4c --- /dev/null +++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_CaptainsOffice_MapBorder:: + .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin" + + .align 2 +AbandonedShip_CaptainsOffice_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin" + + .align 2 +AbandonedShip_CaptainsOffice_Layout:: + .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 Binary files differindex c9097fa63..c9097fa63 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.bin +++ b/data/layouts/AbandonedShip_CaptainsOffice/map.bin diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/layouts/AbandonedShip_Corridors_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Corridors_1F/border.bin +++ b/data/layouts/AbandonedShip_Corridors_1F/border.bin diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc new file mode 100644 index 000000000..f3704b1cc --- /dev/null +++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Corridors_1F_MapBorder:: + .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin" + + .align 2 +AbandonedShip_Corridors_1F_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin" + + .align 2 +AbandonedShip_Corridors_1F_Layout:: + .4byte 0x12 + .4byte 0xc + .4byte AbandonedShip_Corridors_1F_MapBorder + .4byte AbandonedShip_Corridors_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/layouts/AbandonedShip_Corridors_1F/map.bin index 5ef5ca949..5ef5ca949 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.bin +++ b/data/layouts/AbandonedShip_Corridors_1F/map.bin diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/layouts/AbandonedShip_Corridors_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/border.bin +++ b/data/layouts/AbandonedShip_Corridors_B1F/border.bin diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc new file mode 100644 index 000000000..131caed67 --- /dev/null +++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Corridors_B1F_MapBorder:: + .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin" + + .align 2 +AbandonedShip_Corridors_B1F_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin" + + .align 2 +AbandonedShip_Corridors_B1F_Layout:: + .4byte 0xd + .4byte 0xa + .4byte AbandonedShip_Corridors_B1F_MapBorder + .4byte AbandonedShip_Corridors_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/layouts/AbandonedShip_Corridors_B1F/map.bin index 24b1a7b61..24b1a7b61 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.bin +++ b/data/layouts/AbandonedShip_Corridors_B1F/map.bin diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/layouts/AbandonedShip_Deck/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/AbandonedShip_Deck/border.bin +++ b/data/layouts/AbandonedShip_Deck/border.bin diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc new file mode 100644 index 000000000..81b598fb4 --- /dev/null +++ b/data/layouts/AbandonedShip_Deck/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Deck_MapBorder:: + .incbin "data/layouts/AbandonedShip_Deck/border.bin" + + .align 2 +AbandonedShip_Deck_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Deck/map.bin" + + .align 2 +AbandonedShip_Deck_Layout:: + .4byte 0x17 + .4byte 0x15 + .4byte AbandonedShip_Deck_MapBorder + .4byte AbandonedShip_Deck_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/layouts/AbandonedShip_Deck/map.bin index 67cdde3d7..67cdde3d7 100644 --- a/data/maps/AbandonedShip_Deck/map.bin +++ b/data/layouts/AbandonedShip_Deck/map.bin diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc new file mode 100644 index 000000000..1f7d3117a --- /dev/null +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_HiddenFloorCorridors_MapBorder:: + .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin" + + .align 2 +AbandonedShip_HiddenFloorCorridors_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" + + .align 2 +AbandonedShip_HiddenFloorCorridors_Layout:: + .4byte 0xd + .4byte 0xb + .4byte AbandonedShip_HiddenFloorCorridors_MapBorder + .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin index a4637ccbe..a4637ccbe 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc new file mode 100644 index 000000000..d7b36dd8b --- /dev/null +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_HiddenFloorRooms_MapBorder:: + .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin" + + .align 2 +AbandonedShip_HiddenFloorRooms_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" + + .align 2 +AbandonedShip_HiddenFloorRooms_Layout:: + .4byte 0x2c + .4byte 0xf + .4byte AbandonedShip_HiddenFloorRooms_MapBorder + .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin index b63eeabe6..b63eeabe6 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/layouts/AbandonedShip_Room_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Room_B1F/border.bin +++ b/data/layouts/AbandonedShip_Room_B1F/border.bin diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc new file mode 100644 index 000000000..62c4127f8 --- /dev/null +++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Room_B1F_MapBorder:: + .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin" + + .align 2 +AbandonedShip_Room_B1F_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin" + + .align 2 +AbandonedShip_Room_B1F_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte AbandonedShip_Room_B1F_MapBorder + .4byte AbandonedShip_Room_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/layouts/AbandonedShip_Room_B1F/map.bin index cb8393eb2..cb8393eb2 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.bin +++ b/data/layouts/AbandonedShip_Room_B1F/map.bin diff --git a/data/maps/AbandonedShip_Rooms2_1F/border.bin b/data/layouts/AbandonedShip_Rooms2_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/border.bin +++ b/data/layouts/AbandonedShip_Rooms2_1F/border.bin diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc new file mode 100644 index 000000000..26789691e --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Rooms2_1F_MapBorder:: + .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin" + + .align 2 +AbandonedShip_Rooms2_1F_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin" + + .align 2 +AbandonedShip_Rooms2_1F_Layout:: + .4byte 0x9 + .4byte 0x11 + .4byte AbandonedShip_Rooms2_1F_MapBorder + .4byte AbandonedShip_Rooms2_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/layouts/AbandonedShip_Rooms2_1F/map.bin index c897ce8a0..c897ce8a0 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.bin +++ b/data/layouts/AbandonedShip_Rooms2_1F/map.bin diff --git a/data/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/border.bin +++ b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc new file mode 100644 index 000000000..35b92addd --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Rooms2_B1F_MapBorder:: + .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin" + + .align 2 +AbandonedShip_Rooms2_B1F_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" + + .align 2 +AbandonedShip_Rooms2_B1F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte AbandonedShip_Rooms2_B1F_MapBorder + .4byte AbandonedShip_Rooms2_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin index 7865bb69d..7865bb69d 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.bin +++ b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin diff --git a/data/maps/AbandonedShip_Rooms_1F/border.bin b/data/layouts/AbandonedShip_Rooms_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Rooms_1F/border.bin +++ b/data/layouts/AbandonedShip_Rooms_1F/border.bin diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc new file mode 100644 index 000000000..0109a26f0 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Rooms_1F_MapBorder:: + .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin" + + .align 2 +AbandonedShip_Rooms_1F_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin" + + .align 2 +AbandonedShip_Rooms_1F_Layout:: + .4byte 0x12 + .4byte 0x11 + .4byte AbandonedShip_Rooms_1F_MapBorder + .4byte AbandonedShip_Rooms_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/layouts/AbandonedShip_Rooms_1F/map.bin index 20529b3df..20529b3df 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.bin +++ b/data/layouts/AbandonedShip_Rooms_1F/map.bin diff --git a/data/maps/AbandonedShip_Rooms_B1F/border.bin b/data/layouts/AbandonedShip_Rooms_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/border.bin +++ b/data/layouts/AbandonedShip_Rooms_B1F/border.bin diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc new file mode 100644 index 000000000..40ef7680a --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Rooms_B1F_MapBorder:: + .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin" + + .align 2 +AbandonedShip_Rooms_B1F_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin" + + .align 2 +AbandonedShip_Rooms_B1F_Layout:: + .4byte 0x1b + .4byte 0x8 + .4byte AbandonedShip_Rooms_B1F_MapBorder + .4byte AbandonedShip_Rooms_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/layouts/AbandonedShip_Rooms_B1F/map.bin index b18509507..b18509507 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.bin +++ b/data/layouts/AbandonedShip_Rooms_B1F/map.bin diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/layouts/AbandonedShip_Underwater1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Underwater1/border.bin +++ b/data/layouts/AbandonedShip_Underwater1/border.bin diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc new file mode 100644 index 000000000..5619d0dba --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Underwater1_MapBorder:: + .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" + + .align 2 +AbandonedShip_Underwater1_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" + + .align 2 +AbandonedShip_Underwater1_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte AbandonedShip_Underwater1_MapBorder + .4byte AbandonedShip_Underwater1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/layouts/AbandonedShip_Underwater1/map.bin index 2c73cfe86..2c73cfe86 100644 --- a/data/maps/AbandonedShip_Underwater1/map.bin +++ b/data/layouts/AbandonedShip_Underwater1/map.bin diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/layouts/AbandonedShip_Underwater2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Underwater2/border.bin +++ b/data/layouts/AbandonedShip_Underwater2/border.bin diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc new file mode 100644 index 000000000..1d123c8c7 --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AbandonedShip_Underwater2_MapBorder:: + .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" + + .align 2 +AbandonedShip_Underwater2_MapBlockdata:: + .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" + + .align 2 +AbandonedShip_Underwater2_Layout:: + .4byte 0x15 + .4byte 0x7 + .4byte AbandonedShip_Underwater2_MapBorder + .4byte AbandonedShip_Underwater2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/layouts/AbandonedShip_Underwater2/map.bin index 9dbd5c71a..9dbd5c71a 100644 --- a/data/maps/AbandonedShip_Underwater2/map.bin +++ b/data/layouts/AbandonedShip_Underwater2/map.bin diff --git a/data/maps/AlteringCave/border.bin b/data/layouts/AlteringCave/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/AlteringCave/border.bin +++ b/data/layouts/AlteringCave/border.bin diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc new file mode 100644 index 000000000..e69cc1dd0 --- /dev/null +++ b/data/layouts/AlteringCave/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AlteringCave_MapBorder:: + .incbin "data/layouts/AlteringCave/border.bin" + + .align 2 +AlteringCave_MapBlockdata:: + .incbin "data/layouts/AlteringCave/map.bin" + + .align 2 +AlteringCave_Layout:: + .4byte 0x20 + .4byte 0x18 + .4byte AlteringCave_MapBorder + .4byte AlteringCave_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/AlteringCave/map.bin b/data/layouts/AlteringCave/map.bin index 38bec91fa..38bec91fa 100644 --- a/data/maps/AlteringCave/map.bin +++ b/data/layouts/AlteringCave/map.bin diff --git a/data/maps/AncientTomb/border.bin b/data/layouts/AncientTomb/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/AncientTomb/border.bin +++ b/data/layouts/AncientTomb/border.bin diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc new file mode 100644 index 000000000..7aabb07cc --- /dev/null +++ b/data/layouts/AncientTomb/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AncientTomb_MapBorder:: + .incbin "data/layouts/AncientTomb/border.bin" + + .align 2 +AncientTomb_MapBlockdata:: + .incbin "data/layouts/AncientTomb/map.bin" + + .align 2 +AncientTomb_Layout:: + .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 Binary files differindex 406cf7279..406cf7279 100644 --- a/data/maps/AncientTomb/map.bin +++ b/data/layouts/AncientTomb/map.bin diff --git a/data/maps/AquaHideout_1F/border.bin b/data/layouts/AquaHideout_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_1F/border.bin +++ b/data/layouts/AquaHideout_1F/border.bin diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc new file mode 100644 index 000000000..645be578f --- /dev/null +++ b/data/layouts/AquaHideout_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_1F_MapBorder:: + .incbin "data/layouts/AquaHideout_1F/border.bin" + + .align 2 +AquaHideout_1F_MapBlockdata:: + .incbin "data/layouts/AquaHideout_1F/map.bin" + + .align 2 +AquaHideout_1F_Layout:: + .4byte 0x1c + .4byte 0x1e + .4byte AquaHideout_1F_MapBorder + .4byte AquaHideout_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_1F/map.bin b/data/layouts/AquaHideout_1F/map.bin index 2330fe015..2330fe015 100644 --- a/data/maps/AquaHideout_1F/map.bin +++ b/data/layouts/AquaHideout_1F/map.bin diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/layouts/AquaHideout_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_B1F/border.bin +++ b/data/layouts/AquaHideout_B1F/border.bin diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc new file mode 100644 index 000000000..10cfd2d9b --- /dev/null +++ b/data/layouts/AquaHideout_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_B1F_MapBorder:: + .incbin "data/layouts/AquaHideout_B1F/border.bin" + + .align 2 +AquaHideout_B1F_MapBlockdata:: + .incbin "data/layouts/AquaHideout_B1F/map.bin" + + .align 2 +AquaHideout_B1F_Layout:: + .4byte 0x33 + .4byte 0x18 + .4byte AquaHideout_B1F_MapBorder + .4byte AquaHideout_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/layouts/AquaHideout_B1F/map.bin index 97efacec8..97efacec8 100644 --- a/data/maps/AquaHideout_B1F/map.bin +++ b/data/layouts/AquaHideout_B1F/map.bin diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/layouts/AquaHideout_B2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_B2F/border.bin +++ b/data/layouts/AquaHideout_B2F/border.bin diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc new file mode 100644 index 000000000..188e51fcc --- /dev/null +++ b/data/layouts/AquaHideout_B2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_B2F_MapBorder:: + .incbin "data/layouts/AquaHideout_B2F/border.bin" + + .align 2 +AquaHideout_B2F_MapBlockdata:: + .incbin "data/layouts/AquaHideout_B2F/map.bin" + + .align 2 +AquaHideout_B2F_Layout:: + .4byte 0x22 + .4byte 0x18 + .4byte AquaHideout_B2F_MapBorder + .4byte AquaHideout_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/layouts/AquaHideout_B2F/map.bin index 2e843a8e4..2e843a8e4 100644 --- a/data/maps/AquaHideout_B2F/map.bin +++ b/data/layouts/AquaHideout_B2F/map.bin diff --git a/data/maps/AquaHideout_UnusedRubyMap1/border.bin b/data/layouts/AquaHideout_UnusedRubyMap1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/border.bin +++ b/data/layouts/AquaHideout_UnusedRubyMap1/border.bin diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc new file mode 100644 index 000000000..643993a22 --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_UnusedRubyMap1_MapBorder:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin" + + .align 2 +AquaHideout_UnusedRubyMap1_MapBlockdata:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" + + .align 2 +AquaHideout_UnusedRubyMap1_Layout:: + .4byte 0x1c + .4byte 0x1e + .4byte AquaHideout_UnusedRubyMap1_MapBorder + .4byte AquaHideout_UnusedRubyMap1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.bin b/data/layouts/AquaHideout_UnusedRubyMap1/map.bin Binary files differindex 52c2d57eb..52c2d57eb 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/map.bin +++ b/data/layouts/AquaHideout_UnusedRubyMap1/map.bin diff --git a/data/maps/AquaHideout_UnusedRubyMap2/border.bin b/data/layouts/AquaHideout_UnusedRubyMap2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/border.bin +++ b/data/layouts/AquaHideout_UnusedRubyMap2/border.bin diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc new file mode 100644 index 000000000..6fdf6b31c --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_UnusedRubyMap2_MapBorder:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin" + + .align 2 +AquaHideout_UnusedRubyMap2_MapBlockdata:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" + + .align 2 +AquaHideout_UnusedRubyMap2_Layout:: + .4byte 0x3e + .4byte 0x18 + .4byte AquaHideout_UnusedRubyMap2_MapBorder + .4byte AquaHideout_UnusedRubyMap2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.bin b/data/layouts/AquaHideout_UnusedRubyMap2/map.bin index 1406dde5d..1406dde5d 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/map.bin +++ b/data/layouts/AquaHideout_UnusedRubyMap2/map.bin diff --git a/data/maps/AquaHideout_UnusedRubyMap3/border.bin b/data/layouts/AquaHideout_UnusedRubyMap3/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/border.bin +++ b/data/layouts/AquaHideout_UnusedRubyMap3/border.bin diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc new file mode 100644 index 000000000..070fb2bac --- /dev/null +++ b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +AquaHideout_UnusedRubyMap3_MapBorder:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin" + + .align 2 +AquaHideout_UnusedRubyMap3_MapBlockdata:: + .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" + + .align 2 +AquaHideout_UnusedRubyMap3_Layout:: + .4byte 0x22 + .4byte 0x18 + .4byte AquaHideout_UnusedRubyMap3_MapBorder + .4byte AquaHideout_UnusedRubyMap3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.bin b/data/layouts/AquaHideout_UnusedRubyMap3/map.bin index 68afb0063..68afb0063 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/map.bin +++ b/data/layouts/AquaHideout_UnusedRubyMap3/map.bin diff --git a/data/maps/ArtisanCave_1F/border.bin b/data/layouts/ArtisanCave_1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ArtisanCave_1F/border.bin +++ b/data/layouts/ArtisanCave_1F/border.bin diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc new file mode 100644 index 000000000..7a5d63690 --- /dev/null +++ b/data/layouts/ArtisanCave_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ArtisanCave_1F_MapBorder:: + .incbin "data/layouts/ArtisanCave_1F/border.bin" + + .align 2 +ArtisanCave_1F_MapBlockdata:: + .incbin "data/layouts/ArtisanCave_1F/map.bin" + + .align 2 +ArtisanCave_1F_Layout:: + .4byte 0x15 + .4byte 0x16 + .4byte ArtisanCave_1F_MapBorder + .4byte ArtisanCave_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ArtisanCave_1F/map.bin b/data/layouts/ArtisanCave_1F/map.bin index 2009f24f4..2009f24f4 100644 --- a/data/maps/ArtisanCave_1F/map.bin +++ b/data/layouts/ArtisanCave_1F/map.bin diff --git a/data/maps/ArtisanCave_B1F/border.bin b/data/layouts/ArtisanCave_B1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ArtisanCave_B1F/border.bin +++ b/data/layouts/ArtisanCave_B1F/border.bin diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc new file mode 100644 index 000000000..97e409473 --- /dev/null +++ b/data/layouts/ArtisanCave_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ArtisanCave_B1F_MapBorder:: + .incbin "data/layouts/ArtisanCave_B1F/border.bin" + + .align 2 +ArtisanCave_B1F_MapBlockdata:: + .incbin "data/layouts/ArtisanCave_B1F/map.bin" + + .align 2 +ArtisanCave_B1F_Layout:: + .4byte 0x2e + .4byte 0x36 + .4byte ArtisanCave_B1F_MapBorder + .4byte ArtisanCave_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ArtisanCave_B1F/map.bin b/data/layouts/ArtisanCave_B1F/map.bin index c5ce45c52..c5ce45c52 100644 --- a/data/maps/ArtisanCave_B1F/map.bin +++ b/data/layouts/ArtisanCave_B1F/map.bin diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin b/data/layouts/BattleElevator/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin +++ b/data/layouts/BattleElevator/border.bin diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc new file mode 100644 index 000000000..b101dbdda --- /dev/null +++ b/data/layouts/BattleElevator/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleElevator_MapBorder:: + .incbin "data/layouts/BattleElevator/border.bin" + + .align 2 +BattleElevator_MapBlockdata:: + .incbin "data/layouts/BattleElevator/map.bin" + + .align 2 +BattleElevator_Layout:: + .4byte 0x5 + .4byte 0x7 + .4byte BattleElevator_MapBorder + .4byte BattleElevator_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.bin b/data/layouts/BattleElevator/map.bin index 16dfe34ab..16dfe34ab 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.bin +++ b/data/layouts/BattleElevator/map.bin diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin b/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/border.bin +++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc new file mode 100644 index 000000000..6b0f61b5f --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleArenaBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleArenaBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleArenaBattleRoom_Layout:: + .4byte 0x10 + .4byte 0xb + .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder + .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleArena diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin index 526de2248..526de2248 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin +++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin diff --git a/data/maps/BattleFrontier_BattleArenaLobby/border.bin b/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/border.bin +++ b/data/layouts/BattleFrontier_BattleArenaCorridor/border.bin diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc new file mode 100644 index 000000000..c984be1fb --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleArenaCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin" + + .align 2 +BattleFrontier_BattleArenaCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" + + .align 2 +BattleFrontier_BattleArenaCorridor_Layout:: + .4byte 0x12 + .4byte 0xe + .4byte BattleFrontier_BattleArenaCorridor_MapBorder + .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleArena diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin b/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin index 1b124b610..1b124b610 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.bin +++ b/data/layouts/BattleFrontier_BattleArenaCorridor/map.bin diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleArenaLobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin +++ b/data/layouts/BattleFrontier_BattleArenaLobby/border.bin diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc new file mode 100644 index 000000000..bda4799ec --- /dev/null +++ b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleArenaLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin" + + .align 2 +BattleFrontier_BattleArenaLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" + + .align 2 +BattleFrontier_BattleArenaLobby_Layout:: + .4byte 0x10 + .4byte 0xd + .4byte BattleFrontier_BattleArenaLobby_MapBorder + .4byte BattleFrontier_BattleArenaLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleArena diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.bin b/data/layouts/BattleFrontier_BattleArenaLobby/map.bin index 2792d7979..2792d7979 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.bin +++ b/data/layouts/BattleFrontier_BattleArenaLobby/map.bin diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin b/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/border.bin +++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc new file mode 100644 index 000000000..3ed732898 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleDomeBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleDomeBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleDomeBattleRoom_Layout:: + .4byte 0x14 + .4byte 0xa + .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder + .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleDome diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin index ffb450f3c..ffb450f3c 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin +++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin diff --git a/data/maps/BattleFrontier_BattleDomeLobby/border.bin b/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/border.bin +++ b/data/layouts/BattleFrontier_BattleDomeCorridor/border.bin diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc new file mode 100644 index 000000000..f4354caf0 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleDomeCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin" + + .align 2 +BattleFrontier_BattleDomeCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" + + .align 2 +BattleFrontier_BattleDomeCorridor_Layout:: + .4byte 0x30 + .4byte 0x7 + .4byte BattleFrontier_BattleDomeCorridor_MapBorder + .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleDome diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin b/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin index 2a9c49675..2a9c49675 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.bin +++ b/data/layouts/BattleFrontier_BattleDomeCorridor/map.bin diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleDomeLobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin +++ b/data/layouts/BattleFrontier_BattleDomeLobby/border.bin diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc new file mode 100644 index 000000000..d9127802a --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleDomeLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin" + + .align 2 +BattleFrontier_BattleDomeLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" + + .align 2 +BattleFrontier_BattleDomeLobby_Layout:: + .4byte 0x17 + .4byte 0x11 + .4byte BattleFrontier_BattleDomeLobby_MapBorder + .4byte BattleFrontier_BattleDomeLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleDome diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.bin b/data/layouts/BattleFrontier_BattleDomeLobby/map.bin index 655c6a39c..655c6a39c 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.bin +++ b/data/layouts/BattleFrontier_BattleDomeLobby/map.bin diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin +++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc new file mode 100644 index 000000000..4ac7a79df --- /dev/null +++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleDomePreBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleDomePreBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleDomePreBattleRoom_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder + .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleDome diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin Binary files differindex 49f40213a..49f40213a 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin +++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/border.bin +++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc new file mode 100644 index 000000000..35b8a1dec --- /dev/null +++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleFactoryBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleFactoryBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleFactoryBattleRoom_Layout:: + .4byte 0xd + .4byte 0xc + .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder + .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFactory diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin Binary files differindex feffbf038..feffbf038 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin +++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin +++ b/data/layouts/BattleFrontier_BattleFactoryLobby/border.bin diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc new file mode 100644 index 000000000..2071dd54a --- /dev/null +++ b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleFactoryLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin" + + .align 2 +BattleFrontier_BattleFactoryLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" + + .align 2 +BattleFrontier_BattleFactoryLobby_Layout:: + .4byte 0x13 + .4byte 0xc + .4byte BattleFrontier_BattleFactoryLobby_MapBorder + .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFactory diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin b/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin index 66037e302..66037e302 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.bin +++ b/data/layouts/BattleFrontier_BattleFactoryLobby/map.bin diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/border.bin +++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc new file mode 100644 index 000000000..f458fb9c2 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleFactoryPreBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleFactoryPreBattleRoom_Layout:: + .4byte 0x11 + .4byte 0xe + .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder + .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFactory diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin index 15e97cb30..15e97cb30 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin +++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin Binary files differindex 9afd13cdc..9afd13cdc 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin +++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc new file mode 100644 index 000000000..2a570bbd7 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePalaceBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattlePalaceBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattlePalaceBattleRoom_Layout:: + .4byte 0xf + .4byte 0xa + .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder + .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattlePalace diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin index 58d0a581f..58d0a581f 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin +++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin b/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin Binary files differindex 9afd13cdc..9afd13cdc 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/border.bin +++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc new file mode 100644 index 000000000..b76b87cb5 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePalaceCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin" + + .align 2 +BattleFrontier_BattlePalaceCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" + + .align 2 +BattleFrontier_BattlePalaceCorridor_Layout:: + .4byte 0x11 + .4byte 0xe + .4byte BattleFrontier_BattlePalaceCorridor_MapBorder + .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattlePalace diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin b/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin Binary files differindex f2bc6aca4..f2bc6aca4 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.bin +++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin b/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/border.bin +++ b/data/layouts/BattleFrontier_BattlePalaceLobby/border.bin diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc new file mode 100644 index 000000000..08c904db8 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePalaceLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin" + + .align 2 +BattleFrontier_BattlePalaceLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" + + .align 2 +BattleFrontier_BattlePalaceLobby_Layout:: + .4byte 0x19 + .4byte 0xc + .4byte BattleFrontier_BattlePalaceLobby_MapBorder + .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePalace diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin b/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin index cda8ff10e..cda8ff10e 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.bin +++ b/data/layouts/BattleFrontier_BattlePalaceLobby/map.bin diff --git a/data/maps/BattleFrontier_BattlePikeLobby/border.bin b/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeCorridor/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc new file mode 100644 index 000000000..7dd3dcbaa --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin" + + .align 2 +BattleFrontier_BattlePikeCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" + + .align 2 +BattleFrontier_BattlePikeCorridor_Layout:: + .4byte 0xe + .4byte 0x8 + .4byte BattleFrontier_BattlePikeCorridor_MapBorder + .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin b/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin index 5e02c145b..5e02c145b 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeCorridor/map.bin diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/layouts/BattleFrontier_BattlePikeLobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeLobby/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc new file mode 100644 index 000000000..a1bd10dd3 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin" + + .align 2 +BattleFrontier_BattlePikeLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" + + .align 2 +BattleFrontier_BattlePikeLobby_Layout:: + .4byte 0xb + .4byte 0xd + .4byte BattleFrontier_BattlePikeLobby_MapBorder + .4byte BattleFrontier_BattlePikeLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.bin b/data/layouts/BattleFrontier_BattlePikeLobby/map.bin index 4cbdfb405..4cbdfb405 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeLobby/map.bin diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc new file mode 100644 index 000000000..c860deb93 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeRandomRoom1_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom1_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom1_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder + .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin index 142150cbe..142150cbe 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc new file mode 100644 index 000000000..1ad2a90cc --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeRandomRoom2_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom2_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom2_Layout:: + .4byte 0x5 + .4byte 0x8 + .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder + .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin index 27a6e52aa..27a6e52aa 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc new file mode 100644 index 000000000..b60e07361 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeRandomRoom3_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom3_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" + + .align 2 +BattleFrontier_BattlePikeRandomRoom3_Layout:: + .4byte 0x9 + .4byte 0x14 + .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder + .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin index 8ce7f1c37..8ce7f1c37 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin +++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc new file mode 100644 index 000000000..d4f99085b --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePikeThreePathRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin" + + .align 2 +BattleFrontier_BattlePikeThreePathRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" + + .align 2 +BattleFrontier_BattlePikeThreePathRoom_Layout:: + .4byte 0xd + .4byte 0xb + .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder + .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin index 9618fe22a..9618fe22a 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin +++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin +++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc new file mode 100644 index 000000000..8a991e45d --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePointExchangeServiceCorner_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" + + .align 2 +BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" + + .align 2 +BattleFrontier_BattlePointExchangeServiceCorner_Layout:: + .4byte 0xf + .4byte 0xb + .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder + .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin index 62d5761e0..62d5761e0 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin +++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/border.bin +++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc new file mode 100644 index 000000000..2097173cc --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePyramidEmptySquare_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin" + + .align 2 +BattleFrontier_BattlePyramidEmptySquare_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" + + .align 2 +BattleFrontier_BattlePyramidEmptySquare_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder + .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin index 7c224d524..7c224d524 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin +++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin diff --git a/data/maps/BattleFrontier_BattlePyramidTop/border.bin b/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/border.bin +++ b/data/layouts/BattleFrontier_BattlePyramidLobby/border.bin diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc new file mode 100644 index 000000000..ecdceec7f --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePyramidLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin" + + .align 2 +BattleFrontier_BattlePyramidLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" + + .align 2 +BattleFrontier_BattlePyramidLobby_Layout:: + .4byte 0xf + .4byte 0x12 + .4byte BattleFrontier_BattlePyramidLobby_MapBorder + .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin b/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin index 32f23d3de..32f23d3de 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.bin +++ b/data/layouts/BattleFrontier_BattlePyramidLobby/map.bin diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin b/data/layouts/BattleFrontier_BattlePyramidTop/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin +++ b/data/layouts/BattleFrontier_BattlePyramidTop/border.bin diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc new file mode 100644 index 000000000..e96259589 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattlePyramidTop_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin" + + .align 2 +BattleFrontier_BattlePyramidTop_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" + + .align 2 +BattleFrontier_BattlePyramidTop_Layout:: + .4byte 0x22 + .4byte 0x17 + .4byte BattleFrontier_BattlePyramidTop_MapBorder + .4byte BattleFrontier_BattlePyramidTop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.bin b/data/layouts/BattleFrontier_BattlePyramidTop/map.bin index dba9cf1b0..dba9cf1b0 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.bin +++ b/data/layouts/BattleFrontier_BattlePyramidTop/map.bin diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin b/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/border.bin +++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc new file mode 100644 index 000000000..8738d81e1 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleTowerBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleTowerBattleRoom_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder + .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin index 42d99b5a6..42d99b5a6 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin +++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/border.bin +++ b/data/layouts/BattleFrontier_BattleTowerCorridor/border.bin diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc new file mode 100644 index 000000000..c54c38812 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerCorridor_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin" + + .align 2 +BattleFrontier_BattleTowerCorridor_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" + + .align 2 +BattleFrontier_BattleTowerCorridor_Layout:: + .4byte 0x11 + .4byte 0x5 + .4byte BattleFrontier_BattleTowerCorridor_MapBorder + .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin Binary files differindex 0b0803f91..0b0803f91 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.bin +++ b/data/layouts/BattleFrontier_BattleTowerCorridor/map.bin diff --git a/data/maps/BattleFrontier_BattleTowerElevator/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/border.bin +++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc new file mode 100644 index 000000000..9e822f0f9 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerCorridor2_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin" + + .align 2 +BattleFrontier_BattleTowerCorridor2_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" + + .align 2 +BattleFrontier_BattleTowerCorridor2_Layout:: + .4byte 0x11 + .4byte 0x5 + .4byte BattleFrontier_BattleTowerCorridor2_MapBorder + .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin Binary files differindex 87e93b640..87e93b640 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.bin +++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin diff --git a/data/maps/BattleFrontier_BattleTowerLobby/border.bin b/data/layouts/BattleFrontier_BattleTowerLobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/border.bin +++ b/data/layouts/BattleFrontier_BattleTowerLobby/border.bin diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc new file mode 100644 index 000000000..dc3733bc0 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerLobby_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin" + + .align 2 +BattleFrontier_BattleTowerLobby_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" + + .align 2 +BattleFrontier_BattleTowerLobby_Layout:: + .4byte 0x19 + .4byte 0xa + .4byte BattleFrontier_BattleTowerLobby_MapBorder + .4byte BattleFrontier_BattleTowerLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.bin b/data/layouts/BattleFrontier_BattleTowerLobby/map.bin Binary files differindex 77926803a..77926803a 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.bin +++ b/data/layouts/BattleFrontier_BattleTowerLobby/map.bin diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin +++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc new file mode 100644 index 000000000..dbd77c420 --- /dev/null +++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_BattleTowerMultiBattleRoom_MapBorder:: + .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" + + .align 2 +BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" + + .align 2 +BattleFrontier_BattleTowerMultiBattleRoom_Layout:: + .4byte 0x15 + .4byte 0xf + .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder + .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin Binary files differindex b0a58e016..b0a58e016 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin +++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin diff --git a/data/maps/BattleFrontier_Lounge1/border.bin b/data/layouts/BattleFrontier_Lounge1/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_Lounge1/border.bin +++ b/data/layouts/BattleFrontier_Lounge1/border.bin diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc new file mode 100644 index 000000000..cc22cc8d7 --- /dev/null +++ b/data/layouts/BattleFrontier_Lounge1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_Lounge1_MapBorder:: + .incbin "data/layouts/BattleFrontier_Lounge1/border.bin" + + .align 2 +BattleFrontier_Lounge1_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_Lounge1/map.bin" + + .align 2 +BattleFrontier_Lounge1_Layout:: + .4byte 0xd + .4byte 0x8 + .4byte BattleFrontier_Lounge1_MapBorder + .4byte BattleFrontier_Lounge1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_Lounge2/map.bin b/data/layouts/BattleFrontier_Lounge1/map.bin index 11ae8d6ee..11ae8d6ee 100644 --- a/data/maps/BattleFrontier_Lounge2/map.bin +++ b/data/layouts/BattleFrontier_Lounge1/map.bin diff --git a/data/maps/BattleFrontier_Lounge2/border.bin b/data/layouts/BattleFrontier_Lounge2/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_Lounge2/border.bin +++ b/data/layouts/BattleFrontier_Lounge2/border.bin diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc new file mode 100644 index 000000000..1f8df21ae --- /dev/null +++ b/data/layouts/BattleFrontier_Lounge2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_Lounge2_MapBorder:: + .incbin "data/layouts/BattleFrontier_Lounge2/border.bin" + + .align 2 +BattleFrontier_Lounge2_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_Lounge2/map.bin" + + .align 2 +BattleFrontier_Lounge2_Layout:: + .4byte 0x9 + .4byte 0xa + .4byte BattleFrontier_Lounge2_MapBorder + .4byte BattleFrontier_Lounge2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_Lounge1/map.bin b/data/layouts/BattleFrontier_Lounge2/map.bin index f5f1745b1..f5f1745b1 100644 --- a/data/maps/BattleFrontier_Lounge1/map.bin +++ b/data/layouts/BattleFrontier_Lounge2/map.bin diff --git a/data/maps/BattleFrontier_OutsideEast/border.bin b/data/layouts/BattleFrontier_OutsideEast/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/BattleFrontier_OutsideEast/border.bin +++ b/data/layouts/BattleFrontier_OutsideEast/border.bin diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc new file mode 100644 index 000000000..e79db8ee7 --- /dev/null +++ b/data/layouts/BattleFrontier_OutsideEast/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_OutsideEast_MapBorder:: + .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin" + + .align 2 +BattleFrontier_OutsideEast_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin" + + .align 2 +BattleFrontier_OutsideEast_Layout:: + .4byte 0x48 + .4byte 0x48 + .4byte BattleFrontier_OutsideEast_MapBorder + .4byte BattleFrontier_OutsideEast_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattleFrontierOutsideEast diff --git a/data/maps/BattleFrontier_OutsideEast/map.bin b/data/layouts/BattleFrontier_OutsideEast/map.bin Binary files differindex b073c4585..b073c4585 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.bin +++ b/data/layouts/BattleFrontier_OutsideEast/map.bin diff --git a/data/maps/BattleFrontier_OutsideWest/border.bin b/data/layouts/BattleFrontier_OutsideWest/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/BattleFrontier_OutsideWest/border.bin +++ b/data/layouts/BattleFrontier_OutsideWest/border.bin diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc new file mode 100644 index 000000000..0644d4b2b --- /dev/null +++ b/data/layouts/BattleFrontier_OutsideWest/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_OutsideWest_MapBorder:: + .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin" + + .align 2 +BattleFrontier_OutsideWest_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin" + + .align 2 +BattleFrontier_OutsideWest_Layout:: + .4byte 0x38 + .4byte 0x48 + .4byte BattleFrontier_OutsideWest_MapBorder + .4byte BattleFrontier_OutsideWest_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattleFrontierOutsideWest diff --git a/data/maps/BattleFrontier_OutsideWest/map.bin b/data/layouts/BattleFrontier_OutsideWest/map.bin Binary files differindex d43111bda..d43111bda 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.bin +++ b/data/layouts/BattleFrontier_OutsideWest/map.bin diff --git a/data/maps/BattleFrontier_RankingHall/border.bin b/data/layouts/BattleFrontier_RankingHall/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_RankingHall/border.bin +++ b/data/layouts/BattleFrontier_RankingHall/border.bin diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc new file mode 100644 index 000000000..03639f203 --- /dev/null +++ b/data/layouts/BattleFrontier_RankingHall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_RankingHall_MapBorder:: + .incbin "data/layouts/BattleFrontier_RankingHall/border.bin" + + .align 2 +BattleFrontier_RankingHall_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_RankingHall/map.bin" + + .align 2 +BattleFrontier_RankingHall_Layout:: + .4byte 0x35 + .4byte 0xf + .4byte BattleFrontier_RankingHall_MapBorder + .4byte BattleFrontier_RankingHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontierRankingHall diff --git a/data/maps/BattleFrontier_RankingHall/map.bin b/data/layouts/BattleFrontier_RankingHall/map.bin index df32e0665..df32e0665 100644 --- a/data/maps/BattleFrontier_RankingHall/map.bin +++ b/data/layouts/BattleFrontier_RankingHall/map.bin diff --git a/data/maps/BattleFrontier_ReceptionGate/border.bin b/data/layouts/BattleFrontier_ReceptionGate/border.bin Binary files differindex 9afd13cdc..9afd13cdc 100644 --- a/data/maps/BattleFrontier_ReceptionGate/border.bin +++ b/data/layouts/BattleFrontier_ReceptionGate/border.bin diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc new file mode 100644 index 000000000..11beca5e5 --- /dev/null +++ b/data/layouts/BattleFrontier_ReceptionGate/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_ReceptionGate_MapBorder:: + .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin" + + .align 2 +BattleFrontier_ReceptionGate_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin" + + .align 2 +BattleFrontier_ReceptionGate_Layout:: + .4byte 0x9 + .4byte 0xe + .4byte BattleFrontier_ReceptionGate_MapBorder + .4byte BattleFrontier_ReceptionGate_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_ReceptionGate/map.bin b/data/layouts/BattleFrontier_ReceptionGate/map.bin Binary files differindex 2b75ea851..2b75ea851 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.bin +++ b/data/layouts/BattleFrontier_ReceptionGate/map.bin diff --git a/data/maps/BattleFrontier_ScottsHouse/border.bin b/data/layouts/BattleFrontier_ScottsHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleFrontier_ScottsHouse/border.bin +++ b/data/layouts/BattleFrontier_ScottsHouse/border.bin diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc new file mode 100644 index 000000000..913d636d1 --- /dev/null +++ b/data/layouts/BattleFrontier_ScottsHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleFrontier_ScottsHouse_MapBorder:: + .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin" + + .align 2 +BattleFrontier_ScottsHouse_MapBlockdata:: + .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin" + + .align 2 +BattleFrontier_ScottsHouse_Layout:: + .4byte 0x6 + .4byte 0x8 + .4byte BattleFrontier_ScottsHouse_MapBorder + .4byte BattleFrontier_ScottsHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/BattleFrontier_ScottsHouse/map.bin b/data/layouts/BattleFrontier_ScottsHouse/map.bin index 8844e94dd..8844e94dd 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.bin +++ b/data/layouts/BattleFrontier_ScottsHouse/map.bin diff --git a/data/maps/BattlePyramidSquare01/border.bin b/data/layouts/BattlePyramidSquare01/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare01/border.bin +++ b/data/layouts/BattlePyramidSquare01/border.bin diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc new file mode 100644 index 000000000..103f35b31 --- /dev/null +++ b/data/layouts/BattlePyramidSquare01/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare01_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare01/border.bin" + + .align 2 +BattlePyramidSquare01_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare01/map.bin" + + .align 2 +BattlePyramidSquare01_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare01_MapBorder + .4byte BattlePyramidSquare01_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare01/map.bin b/data/layouts/BattlePyramidSquare01/map.bin index 586ccbdbd..586ccbdbd 100644 --- a/data/maps/BattlePyramidSquare01/map.bin +++ b/data/layouts/BattlePyramidSquare01/map.bin diff --git a/data/maps/BattlePyramidSquare02/border.bin b/data/layouts/BattlePyramidSquare02/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare02/border.bin +++ b/data/layouts/BattlePyramidSquare02/border.bin diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc new file mode 100644 index 000000000..c831af0a8 --- /dev/null +++ b/data/layouts/BattlePyramidSquare02/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare02_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare02/border.bin" + + .align 2 +BattlePyramidSquare02_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare02/map.bin" + + .align 2 +BattlePyramidSquare02_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare02_MapBorder + .4byte BattlePyramidSquare02_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare02/map.bin b/data/layouts/BattlePyramidSquare02/map.bin index 5a9b8d4ce..5a9b8d4ce 100644 --- a/data/maps/BattlePyramidSquare02/map.bin +++ b/data/layouts/BattlePyramidSquare02/map.bin diff --git a/data/maps/BattlePyramidSquare03/border.bin b/data/layouts/BattlePyramidSquare03/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare03/border.bin +++ b/data/layouts/BattlePyramidSquare03/border.bin diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc new file mode 100644 index 000000000..fb1da5213 --- /dev/null +++ b/data/layouts/BattlePyramidSquare03/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare03_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare03/border.bin" + + .align 2 +BattlePyramidSquare03_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare03/map.bin" + + .align 2 +BattlePyramidSquare03_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare03_MapBorder + .4byte BattlePyramidSquare03_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare03/map.bin b/data/layouts/BattlePyramidSquare03/map.bin index 903b8a49b..903b8a49b 100644 --- a/data/maps/BattlePyramidSquare03/map.bin +++ b/data/layouts/BattlePyramidSquare03/map.bin diff --git a/data/maps/BattlePyramidSquare04/border.bin b/data/layouts/BattlePyramidSquare04/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare04/border.bin +++ b/data/layouts/BattlePyramidSquare04/border.bin diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc new file mode 100644 index 000000000..b8b7ce24f --- /dev/null +++ b/data/layouts/BattlePyramidSquare04/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare04_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare04/border.bin" + + .align 2 +BattlePyramidSquare04_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare04/map.bin" + + .align 2 +BattlePyramidSquare04_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare04_MapBorder + .4byte BattlePyramidSquare04_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare04/map.bin b/data/layouts/BattlePyramidSquare04/map.bin index 32a264546..32a264546 100644 --- a/data/maps/BattlePyramidSquare04/map.bin +++ b/data/layouts/BattlePyramidSquare04/map.bin diff --git a/data/maps/BattlePyramidSquare05/border.bin b/data/layouts/BattlePyramidSquare05/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare05/border.bin +++ b/data/layouts/BattlePyramidSquare05/border.bin diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc new file mode 100644 index 000000000..f6f61cd5f --- /dev/null +++ b/data/layouts/BattlePyramidSquare05/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare05_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare05/border.bin" + + .align 2 +BattlePyramidSquare05_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare05/map.bin" + + .align 2 +BattlePyramidSquare05_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare05_MapBorder + .4byte BattlePyramidSquare05_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare05/map.bin b/data/layouts/BattlePyramidSquare05/map.bin index d6c5a6897..d6c5a6897 100644 --- a/data/maps/BattlePyramidSquare05/map.bin +++ b/data/layouts/BattlePyramidSquare05/map.bin diff --git a/data/maps/BattlePyramidSquare06/border.bin b/data/layouts/BattlePyramidSquare06/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare06/border.bin +++ b/data/layouts/BattlePyramidSquare06/border.bin diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc new file mode 100644 index 000000000..3774ce871 --- /dev/null +++ b/data/layouts/BattlePyramidSquare06/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare06_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare06/border.bin" + + .align 2 +BattlePyramidSquare06_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare06/map.bin" + + .align 2 +BattlePyramidSquare06_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare06_MapBorder + .4byte BattlePyramidSquare06_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare06/map.bin b/data/layouts/BattlePyramidSquare06/map.bin index c30533aab..c30533aab 100644 --- a/data/maps/BattlePyramidSquare06/map.bin +++ b/data/layouts/BattlePyramidSquare06/map.bin diff --git a/data/maps/BattlePyramidSquare07/border.bin b/data/layouts/BattlePyramidSquare07/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare07/border.bin +++ b/data/layouts/BattlePyramidSquare07/border.bin diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc new file mode 100644 index 000000000..cd5f16b0e --- /dev/null +++ b/data/layouts/BattlePyramidSquare07/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare07_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare07/border.bin" + + .align 2 +BattlePyramidSquare07_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare07/map.bin" + + .align 2 +BattlePyramidSquare07_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare07_MapBorder + .4byte BattlePyramidSquare07_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare07/map.bin b/data/layouts/BattlePyramidSquare07/map.bin index 25f9c1529..25f9c1529 100644 --- a/data/maps/BattlePyramidSquare07/map.bin +++ b/data/layouts/BattlePyramidSquare07/map.bin diff --git a/data/maps/BattlePyramidSquare08/border.bin b/data/layouts/BattlePyramidSquare08/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare08/border.bin +++ b/data/layouts/BattlePyramidSquare08/border.bin diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc new file mode 100644 index 000000000..bc3ac3005 --- /dev/null +++ b/data/layouts/BattlePyramidSquare08/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare08_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare08/border.bin" + + .align 2 +BattlePyramidSquare08_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare08/map.bin" + + .align 2 +BattlePyramidSquare08_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare08_MapBorder + .4byte BattlePyramidSquare08_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare08/map.bin b/data/layouts/BattlePyramidSquare08/map.bin index 86a830696..86a830696 100644 --- a/data/maps/BattlePyramidSquare08/map.bin +++ b/data/layouts/BattlePyramidSquare08/map.bin diff --git a/data/maps/BattlePyramidSquare09/border.bin b/data/layouts/BattlePyramidSquare09/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare09/border.bin +++ b/data/layouts/BattlePyramidSquare09/border.bin diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc new file mode 100644 index 000000000..1794f72b3 --- /dev/null +++ b/data/layouts/BattlePyramidSquare09/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare09_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare09/border.bin" + + .align 2 +BattlePyramidSquare09_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare09/map.bin" + + .align 2 +BattlePyramidSquare09_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare09_MapBorder + .4byte BattlePyramidSquare09_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare09/map.bin b/data/layouts/BattlePyramidSquare09/map.bin index e4f648704..e4f648704 100644 --- a/data/maps/BattlePyramidSquare09/map.bin +++ b/data/layouts/BattlePyramidSquare09/map.bin diff --git a/data/maps/BattlePyramidSquare10/border.bin b/data/layouts/BattlePyramidSquare10/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare10/border.bin +++ b/data/layouts/BattlePyramidSquare10/border.bin diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc new file mode 100644 index 000000000..49150f493 --- /dev/null +++ b/data/layouts/BattlePyramidSquare10/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare10_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare10/border.bin" + + .align 2 +BattlePyramidSquare10_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare10/map.bin" + + .align 2 +BattlePyramidSquare10_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare10_MapBorder + .4byte BattlePyramidSquare10_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare10/map.bin b/data/layouts/BattlePyramidSquare10/map.bin index 4aa7fd771..4aa7fd771 100644 --- a/data/maps/BattlePyramidSquare10/map.bin +++ b/data/layouts/BattlePyramidSquare10/map.bin diff --git a/data/maps/BattlePyramidSquare11/border.bin b/data/layouts/BattlePyramidSquare11/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare11/border.bin +++ b/data/layouts/BattlePyramidSquare11/border.bin diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc new file mode 100644 index 000000000..8385b6f3a --- /dev/null +++ b/data/layouts/BattlePyramidSquare11/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare11_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare11/border.bin" + + .align 2 +BattlePyramidSquare11_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare11/map.bin" + + .align 2 +BattlePyramidSquare11_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare11_MapBorder + .4byte BattlePyramidSquare11_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare11/map.bin b/data/layouts/BattlePyramidSquare11/map.bin index f393f51e5..f393f51e5 100644 --- a/data/maps/BattlePyramidSquare11/map.bin +++ b/data/layouts/BattlePyramidSquare11/map.bin diff --git a/data/maps/BattlePyramidSquare12/border.bin b/data/layouts/BattlePyramidSquare12/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare12/border.bin +++ b/data/layouts/BattlePyramidSquare12/border.bin diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc new file mode 100644 index 000000000..a63f1dc34 --- /dev/null +++ b/data/layouts/BattlePyramidSquare12/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare12_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare12/border.bin" + + .align 2 +BattlePyramidSquare12_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare12/map.bin" + + .align 2 +BattlePyramidSquare12_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare12_MapBorder + .4byte BattlePyramidSquare12_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare12/map.bin b/data/layouts/BattlePyramidSquare12/map.bin index 64dd96955..64dd96955 100644 --- a/data/maps/BattlePyramidSquare12/map.bin +++ b/data/layouts/BattlePyramidSquare12/map.bin diff --git a/data/maps/BattlePyramidSquare13/border.bin b/data/layouts/BattlePyramidSquare13/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare13/border.bin +++ b/data/layouts/BattlePyramidSquare13/border.bin diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc new file mode 100644 index 000000000..6f145fe96 --- /dev/null +++ b/data/layouts/BattlePyramidSquare13/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare13_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare13/border.bin" + + .align 2 +BattlePyramidSquare13_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare13/map.bin" + + .align 2 +BattlePyramidSquare13_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare13_MapBorder + .4byte BattlePyramidSquare13_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare13/map.bin b/data/layouts/BattlePyramidSquare13/map.bin index 5fc1485a7..5fc1485a7 100644 --- a/data/maps/BattlePyramidSquare13/map.bin +++ b/data/layouts/BattlePyramidSquare13/map.bin diff --git a/data/maps/BattlePyramidSquare14/border.bin b/data/layouts/BattlePyramidSquare14/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare14/border.bin +++ b/data/layouts/BattlePyramidSquare14/border.bin diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc new file mode 100644 index 000000000..ec69a1b54 --- /dev/null +++ b/data/layouts/BattlePyramidSquare14/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare14_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare14/border.bin" + + .align 2 +BattlePyramidSquare14_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare14/map.bin" + + .align 2 +BattlePyramidSquare14_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare14_MapBorder + .4byte BattlePyramidSquare14_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare14/map.bin b/data/layouts/BattlePyramidSquare14/map.bin index 21655a872..21655a872 100644 --- a/data/maps/BattlePyramidSquare14/map.bin +++ b/data/layouts/BattlePyramidSquare14/map.bin diff --git a/data/maps/BattlePyramidSquare15/border.bin b/data/layouts/BattlePyramidSquare15/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare15/border.bin +++ b/data/layouts/BattlePyramidSquare15/border.bin diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc new file mode 100644 index 000000000..29c5444f9 --- /dev/null +++ b/data/layouts/BattlePyramidSquare15/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare15_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare15/border.bin" + + .align 2 +BattlePyramidSquare15_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare15/map.bin" + + .align 2 +BattlePyramidSquare15_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare15_MapBorder + .4byte BattlePyramidSquare15_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare15/map.bin b/data/layouts/BattlePyramidSquare15/map.bin index ccbd87d9a..ccbd87d9a 100644 --- a/data/maps/BattlePyramidSquare15/map.bin +++ b/data/layouts/BattlePyramidSquare15/map.bin diff --git a/data/maps/BattlePyramidSquare16/border.bin b/data/layouts/BattlePyramidSquare16/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattlePyramidSquare16/border.bin +++ b/data/layouts/BattlePyramidSquare16/border.bin diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc new file mode 100644 index 000000000..cc2895943 --- /dev/null +++ b/data/layouts/BattlePyramidSquare16/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattlePyramidSquare16_MapBorder:: + .incbin "data/layouts/BattlePyramidSquare16/border.bin" + + .align 2 +BattlePyramidSquare16_MapBlockdata:: + .incbin "data/layouts/BattlePyramidSquare16/map.bin" + + .align 2 +BattlePyramidSquare16_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte BattlePyramidSquare16_MapBorder + .4byte BattlePyramidSquare16_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePyramid diff --git a/data/maps/BattlePyramidSquare16/map.bin b/data/layouts/BattlePyramidSquare16/map.bin index 601eb526e..601eb526e 100644 --- a/data/maps/BattlePyramidSquare16/map.bin +++ b/data/layouts/BattlePyramidSquare16/map.bin diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/layouts/BattleTentBattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/DewfordTown_Gym/border.bin +++ b/data/layouts/BattleTentBattleRoom/border.bin diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc new file mode 100644 index 000000000..97be7fdb4 --- /dev/null +++ b/data/layouts/BattleTentBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleTentBattleRoom_MapBorder:: + .incbin "data/layouts/BattleTentBattleRoom/border.bin" + + .align 2 +BattleTentBattleRoom_MapBlockdata:: + .incbin "data/layouts/BattleTentBattleRoom/map.bin" + + .align 2 +BattleTentBattleRoom_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte BattleTentBattleRoom_MapBorder + .4byte BattleTentBattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTent diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin b/data/layouts/BattleTentBattleRoom/map.bin Binary files differindex 92a738d5e..92a738d5e 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.bin +++ b/data/layouts/BattleTentBattleRoom/map.bin diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/layouts/BattleTentCorridor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/border.bin +++ b/data/layouts/BattleTentCorridor/border.bin diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc new file mode 100644 index 000000000..21f6c94fd --- /dev/null +++ b/data/layouts/BattleTentCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleTentCorridor_MapBorder:: + .incbin "data/layouts/BattleTentCorridor/border.bin" + + .align 2 +BattleTentCorridor_MapBlockdata:: + .incbin "data/layouts/BattleTentCorridor/map.bin" + + .align 2 +BattleTentCorridor_Layout:: + .4byte 0x5 + .4byte 0x8 + .4byte BattleTentCorridor_MapBorder + .4byte BattleTentCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTent diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.bin b/data/layouts/BattleTentCorridor/map.bin index 4cd270b21..4cd270b21 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.bin +++ b/data/layouts/BattleTentCorridor/map.bin diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/layouts/BattleTentLobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/border.bin +++ b/data/layouts/BattleTentLobby/border.bin diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc new file mode 100644 index 000000000..a740ae2f9 --- /dev/null +++ b/data/layouts/BattleTentLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BattleTentLobby_MapBorder:: + .incbin "data/layouts/BattleTentLobby/border.bin" + + .align 2 +BattleTentLobby_MapBlockdata:: + .incbin "data/layouts/BattleTentLobby/map.bin" + + .align 2 +BattleTentLobby_Layout:: + .4byte 0xd + .4byte 0xa + .4byte BattleTentLobby_MapBorder + .4byte BattleTentLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTent diff --git a/data/maps/FallarborTown_BattleTentLobby/map.bin b/data/layouts/BattleTentLobby/map.bin index 9ff37dc2c..9ff37dc2c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.bin +++ b/data/layouts/BattleTentLobby/map.bin diff --git a/data/maps/BirthIsland_Exterior/border.bin b/data/layouts/BirthIsland_Exterior/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/BirthIsland_Exterior/border.bin +++ b/data/layouts/BirthIsland_Exterior/border.bin diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc new file mode 100644 index 000000000..0fe3899ae --- /dev/null +++ b/data/layouts/BirthIsland_Exterior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +BirthIsland_Exterior_MapBorder:: + .incbin "data/layouts/BirthIsland_Exterior/border.bin" + + .align 2 +BirthIsland_Exterior_MapBlockdata:: + .incbin "data/layouts/BirthIsland_Exterior/map.bin" + + .align 2 +BirthIsland_Exterior_Layout:: + .4byte 0x1e + .4byte 0x1e + .4byte BirthIsland_Exterior_MapBorder + .4byte BirthIsland_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/maps/BirthIsland_Exterior/map.bin b/data/layouts/BirthIsland_Exterior/map.bin Binary files differindex 38dfe77a8..38dfe77a8 100644 --- a/data/maps/BirthIsland_Exterior/map.bin +++ b/data/layouts/BirthIsland_Exterior/map.bin diff --git a/data/maps/BirthIsland_Harbor/border.bin b/data/layouts/CableCarStation/border.bin index 19d906679..19d906679 100644 --- a/data/maps/BirthIsland_Harbor/border.bin +++ b/data/layouts/CableCarStation/border.bin diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc new file mode 100644 index 000000000..c2727063f --- /dev/null +++ b/data/layouts/CableCarStation/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CableCarStation_MapBorder:: + .incbin "data/layouts/CableCarStation/border.bin" + + .align 2 +CableCarStation_MapBlockdata:: + .incbin "data/layouts/CableCarStation/map.bin" + + .align 2 +CableCarStation_Layout:: + .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 Binary files differindex 93db9d5f0..93db9d5f0 100644 --- a/data/maps/Route112_CableCarStation/map.bin +++ b/data/layouts/CableCarStation/map.bin diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/layouts/CaveOfOrigin_1F/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_1F/border.bin +++ b/data/layouts/CaveOfOrigin_1F/border.bin diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc new file mode 100644 index 000000000..d82ecddd0 --- /dev/null +++ b/data/layouts/CaveOfOrigin_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_1F_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_1F/border.bin" + + .align 2 +CaveOfOrigin_1F_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_1F/map.bin" + + .align 2 +CaveOfOrigin_1F_Layout:: + .4byte 0x17 + .4byte 0x17 + .4byte CaveOfOrigin_1F_MapBorder + .4byte CaveOfOrigin_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/layouts/CaveOfOrigin_1F/map.bin index c3c5e7abf..c3c5e7abf 100644 --- a/data/maps/CaveOfOrigin_1F/map.bin +++ b/data/layouts/CaveOfOrigin_1F/map.bin diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/layouts/CaveOfOrigin_B1F/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_B1F/border.bin +++ b/data/layouts/CaveOfOrigin_B1F/border.bin diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc new file mode 100644 index 000000000..41158462c --- /dev/null +++ b/data/layouts/CaveOfOrigin_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_B1F_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" + + .align 2 +CaveOfOrigin_B1F_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" + + .align 2 +CaveOfOrigin_B1F_Layout:: + .4byte 0x13 + .4byte 0x13 + .4byte CaveOfOrigin_B1F_MapBorder + .4byte CaveOfOrigin_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/layouts/CaveOfOrigin_B1F/map.bin index 1fb2d71bb..1fb2d71bb 100644 --- a/data/maps/CaveOfOrigin_B1F/map.bin +++ b/data/layouts/CaveOfOrigin_B1F/map.bin diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/layouts/CaveOfOrigin_Entrance/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_Entrance/border.bin +++ b/data/layouts/CaveOfOrigin_Entrance/border.bin diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc new file mode 100644 index 000000000..3e6375d3e --- /dev/null +++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_Entrance_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" + + .align 2 +CaveOfOrigin_Entrance_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" + + .align 2 +CaveOfOrigin_Entrance_Layout:: + .4byte 0x13 + .4byte 0x1a + .4byte CaveOfOrigin_Entrance_MapBorder + .4byte CaveOfOrigin_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/layouts/CaveOfOrigin_Entrance/map.bin index 4bbffd109..4bbffd109 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.bin +++ b/data/layouts/CaveOfOrigin_Entrance/map.bin diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc new file mode 100644 index 000000000..dfaf8b8a6 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_UnusedRubySapphireMap1_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap1_Layout:: + .4byte 0x17 + .4byte 0x17 + .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder + .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin index 0ffbdaaa0..0ffbdaaa0 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin index 4117717f2..4117717f2 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc new file mode 100644 index 000000000..5caa1b9e5 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_UnusedRubySapphireMap2_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap2_Layout:: + .4byte 0x15 + .4byte 0x15 + .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder + .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin index 4c1fd5ab8..4c1fd5ab8 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc new file mode 100644 index 000000000..6290452c0 --- /dev/null +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +CaveOfOrigin_UnusedRubySapphireMap3_MapBorder:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata:: + .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" + + .align 2 +CaveOfOrigin_UnusedRubySapphireMap3_Layout:: + .4byte 0x13 + .4byte 0x15 + .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder + .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin index ea574b224..ea574b224 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin diff --git a/data/maps/DesertRuins/border.bin b/data/layouts/DesertRuins/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/DesertRuins/border.bin +++ b/data/layouts/DesertRuins/border.bin diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc new file mode 100644 index 000000000..6c4bff886 --- /dev/null +++ b/data/layouts/DesertRuins/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DesertRuins_MapBorder:: + .incbin "data/layouts/DesertRuins/border.bin" + + .align 2 +DesertRuins_MapBlockdata:: + .incbin "data/layouts/DesertRuins/map.bin" + + .align 2 +DesertRuins_Layout:: + .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 Binary files differindex 406cf7279..406cf7279 100644 --- a/data/maps/DesertRuins/map.bin +++ b/data/layouts/DesertRuins/map.bin diff --git a/data/maps/DesertUnderpass/border.bin b/data/layouts/DesertUnderpass/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/DesertUnderpass/border.bin +++ b/data/layouts/DesertUnderpass/border.bin diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc new file mode 100644 index 000000000..3871e181e --- /dev/null +++ b/data/layouts/DesertUnderpass/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DesertUnderpass_MapBorder:: + .incbin "data/layouts/DesertUnderpass/border.bin" + + .align 2 +DesertUnderpass_MapBlockdata:: + .incbin "data/layouts/DesertUnderpass/map.bin" + + .align 2 +DesertUnderpass_Layout:: + .4byte 0x8b + .4byte 0x17 + .4byte DesertUnderpass_MapBorder + .4byte DesertUnderpass_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/DesertUnderpass/map.bin b/data/layouts/DesertUnderpass/map.bin index 2f82e9357..2f82e9357 100644 --- a/data/maps/DesertUnderpass/map.bin +++ b/data/layouts/DesertUnderpass/map.bin diff --git a/data/maps/DewfordTown/border.bin b/data/layouts/DewfordTown/border.bin index 281762f5b..281762f5b 100644 --- a/data/maps/DewfordTown/border.bin +++ b/data/layouts/DewfordTown/border.bin diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc new file mode 100644 index 000000000..077262836 --- /dev/null +++ b/data/layouts/DewfordTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DewfordTown_MapBorder:: + .incbin "data/layouts/DewfordTown/border.bin" + + .align 2 +DewfordTown_MapBlockdata:: + .incbin "data/layouts/DewfordTown/map.bin" + + .align 2 +DewfordTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte DewfordTown_MapBorder + .4byte DewfordTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/maps/DewfordTown/map.bin b/data/layouts/DewfordTown/map.bin index e8a1154e8..e8a1154e8 100644 --- a/data/maps/DewfordTown/map.bin +++ b/data/layouts/DewfordTown/map.bin diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/layouts/DewfordTown_Gym/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/border.bin +++ b/data/layouts/DewfordTown_Gym/border.bin diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc new file mode 100644 index 000000000..89eb39936 --- /dev/null +++ b/data/layouts/DewfordTown_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DewfordTown_Gym_MapBorder:: + .incbin "data/layouts/DewfordTown_Gym/border.bin" + + .align 2 +DewfordTown_Gym_MapBlockdata:: + .incbin "data/layouts/DewfordTown_Gym/map.bin" + + .align 2 +DewfordTown_Gym_Layout:: + .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 Binary files differindex 43cd6e64a..43cd6e64a 100644 --- a/data/maps/DewfordTown_Gym/map.bin +++ b/data/layouts/DewfordTown_Gym/map.bin diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/layouts/DewfordTown_Hall/border.bin index 19d906679..19d906679 100644 --- a/data/maps/DewfordTown_Hall/border.bin +++ b/data/layouts/DewfordTown_Hall/border.bin diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc new file mode 100644 index 000000000..59e88cd47 --- /dev/null +++ b/data/layouts/DewfordTown_Hall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DewfordTown_Hall_MapBorder:: + .incbin "data/layouts/DewfordTown_Hall/border.bin" + + .align 2 +DewfordTown_Hall_MapBlockdata:: + .incbin "data/layouts/DewfordTown_Hall/map.bin" + + .align 2 +DewfordTown_Hall_Layout:: + .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 Binary files differindex 5fd13209d..5fd13209d 100644 --- a/data/maps/DewfordTown_Hall/map.bin +++ b/data/layouts/DewfordTown_Hall/map.bin diff --git a/data/maps/DewfordTown_House1/border.bin b/data/layouts/DoubleBattleColosseum/border.bin index 19d906679..19d906679 100644 --- a/data/maps/DewfordTown_House1/border.bin +++ b/data/layouts/DoubleBattleColosseum/border.bin diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc new file mode 100644 index 000000000..9641fb2bf --- /dev/null +++ b/data/layouts/DoubleBattleColosseum/layout.inc @@ -0,0 +1,16 @@ + .align 2 +DoubleBattleColosseum_MapBorder:: + .incbin "data/layouts/DoubleBattleColosseum/border.bin" + + .align 2 +DoubleBattleColosseum_MapBlockdata:: + .incbin "data/layouts/DoubleBattleColosseum/map.bin" + + .align 2 +DoubleBattleColosseum_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte DoubleBattleColosseum_MapBorder + .4byte DoubleBattleColosseum_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/layouts/DoubleBattleColosseum/map.bin index 77606e818..77606e818 100644 --- a/data/maps/DoubleBattleColosseum/map.bin +++ b/data/layouts/DoubleBattleColosseum/map.bin diff --git a/data/maps/EverGrandeCity/border.bin b/data/layouts/EverGrandeCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/EverGrandeCity/border.bin +++ b/data/layouts/EverGrandeCity/border.bin diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc new file mode 100644 index 000000000..e12d3c259 --- /dev/null +++ b/data/layouts/EverGrandeCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_MapBorder:: + .incbin "data/layouts/EverGrandeCity/border.bin" + + .align 2 +EverGrandeCity_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity/map.bin" + + .align 2 +EverGrandeCity_Layout:: + .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 Binary files differindex 33b271d5d..33b271d5d 100644 --- a/data/maps/EverGrandeCity/map.bin +++ b/data/layouts/EverGrandeCity/map.bin diff --git a/data/maps/EverGrandeCity_Hall1/border.bin b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_Hall1/border.bin +++ b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc new file mode 100644 index 000000000..c92ee599d --- /dev/null +++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_ChampionsRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" + + .align 2 +EverGrandeCity_ChampionsRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" + + .align 2 +EverGrandeCity_ChampionsRoom_Layout:: + .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 Binary files differindex a234307b5..a234307b5 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.bin +++ b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin diff --git a/data/maps/EverGrandeCity_Hall4/border.bin b/data/layouts/EverGrandeCity_DrakesRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_Hall4/border.bin +++ b/data/layouts/EverGrandeCity_DrakesRoom/border.bin diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc new file mode 100644 index 000000000..1cd96a760 --- /dev/null +++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_DrakesRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" + + .align 2 +EverGrandeCity_DrakesRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" + + .align 2 +EverGrandeCity_DrakesRoom_Layout:: + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_DrakesRoom_MapBorder + .4byte EverGrandeCity_DrakesRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/layouts/EverGrandeCity_DrakesRoom/map.bin index 3b5248d98..3b5248d98 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.bin +++ b/data/layouts/EverGrandeCity_DrakesRoom/map.bin diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/border.bin +++ b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc new file mode 100644 index 000000000..17031e546 --- /dev/null +++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_GlaciasRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" + + .align 2 +EverGrandeCity_GlaciasRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" + + .align 2 +EverGrandeCity_GlaciasRoom_Layout:: + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_GlaciasRoom_MapBorder + .4byte EverGrandeCity_GlaciasRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin index 2d7db7377..2d7db7377 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.bin +++ b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/layouts/EverGrandeCity_Hall4/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/border.bin +++ b/data/layouts/EverGrandeCity_Hall4/border.bin diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc new file mode 100644 index 000000000..169d5fda7 --- /dev/null +++ b/data/layouts/EverGrandeCity_Hall4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_Hall4_MapBorder:: + .incbin "data/layouts/EverGrandeCity_Hall4/border.bin" + + .align 2 +EverGrandeCity_Hall4_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_Hall4/map.bin" + + .align 2 +EverGrandeCity_Hall4_Layout:: + .4byte 0xb + .4byte 0x22 + .4byte EverGrandeCity_Hall4_MapBorder + .4byte EverGrandeCity_Hall4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_Hall4/map.bin b/data/layouts/EverGrandeCity_Hall4/map.bin index 580ae095a..580ae095a 100644 --- a/data/maps/EverGrandeCity_Hall4/map.bin +++ b/data/layouts/EverGrandeCity_Hall4/map.bin diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/border.bin +++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc new file mode 100644 index 000000000..f7442adde --- /dev/null +++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_HallOfFame_MapBorder:: + .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" + + .align 2 +EverGrandeCity_HallOfFame_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" + + .align 2 +EverGrandeCity_HallOfFame_Layout:: + .4byte 0xf + .4byte 0x11 + .4byte EverGrandeCity_HallOfFame_MapBorder + .4byte EverGrandeCity_HallOfFame_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin index 1df9e4804..1df9e4804 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.bin +++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/border.bin +++ b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc new file mode 100644 index 000000000..dc2847ed0 --- /dev/null +++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_PhoebesRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" + + .align 2 +EverGrandeCity_PhoebesRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" + + .align 2 +EverGrandeCity_PhoebesRoom_Layout:: + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_PhoebesRoom_MapBorder + .4byte EverGrandeCity_PhoebesRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin index 2e75b706c..2e75b706c 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.bin +++ b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin diff --git a/data/maps/DewfordTown_House2/border.bin b/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/DewfordTown_House2/border.bin +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc new file mode 100644 index 000000000..da1a3de82 --- /dev/null +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_PokemonLeague_1F_MapBorder:: + .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin" + + .align 2 +EverGrandeCity_PokemonLeague_1F_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" + + .align 2 +EverGrandeCity_PokemonLeague_1F_Layout:: + .4byte 0x13 + .4byte 0xc + .4byte EverGrandeCity_PokemonLeague_1F_MapBorder + .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin b/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin index 6bab68102..6bab68102 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.bin +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin diff --git a/data/maps/FallarborTown_BattleTentCorridor/border.bin b/data/layouts/EverGrandeCity_ShortHall/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/border.bin +++ b/data/layouts/EverGrandeCity_ShortHall/border.bin diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc new file mode 100644 index 000000000..b880ee439 --- /dev/null +++ b/data/layouts/EverGrandeCity_ShortHall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_ShortHall_MapBorder:: + .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin" + + .align 2 +EverGrandeCity_ShortHall_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin" + + .align 2 +EverGrandeCity_ShortHall_Layout:: + .4byte 0xb + .4byte 0xd + .4byte EverGrandeCity_ShortHall_MapBorder + .4byte EverGrandeCity_ShortHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_Hall1/map.bin b/data/layouts/EverGrandeCity_ShortHall/map.bin index 75812b238..75812b238 100644 --- a/data/maps/EverGrandeCity_Hall1/map.bin +++ b/data/layouts/EverGrandeCity_ShortHall/map.bin diff --git a/data/maps/FallarborTown_BattleTentLobby/border.bin b/data/layouts/EverGrandeCity_SidneysRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/FallarborTown_BattleTentLobby/border.bin +++ b/data/layouts/EverGrandeCity_SidneysRoom/border.bin diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc new file mode 100644 index 000000000..f43fdae6b --- /dev/null +++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +EverGrandeCity_SidneysRoom_MapBorder:: + .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" + + .align 2 +EverGrandeCity_SidneysRoom_MapBlockdata:: + .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" + + .align 2 +EverGrandeCity_SidneysRoom_Layout:: + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_SidneysRoom_MapBorder + .4byte EverGrandeCity_SidneysRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/layouts/EverGrandeCity_SidneysRoom/map.bin index ebca00c5c..ebca00c5c 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.bin +++ b/data/layouts/EverGrandeCity_SidneysRoom/map.bin diff --git a/data/maps/FallarborTown/border.bin b/data/layouts/FallarborTown/border.bin index 23e2a92e5..23e2a92e5 100644 --- a/data/maps/FallarborTown/border.bin +++ b/data/layouts/FallarborTown/border.bin diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc new file mode 100644 index 000000000..f8ba2bf1a --- /dev/null +++ b/data/layouts/FallarborTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FallarborTown_MapBorder:: + .incbin "data/layouts/FallarborTown/border.bin" + + .align 2 +FallarborTown_MapBlockdata:: + .incbin "data/layouts/FallarborTown/map.bin" + + .align 2 +FallarborTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte FallarborTown_MapBorder + .4byte FallarborTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/maps/FallarborTown/map.bin b/data/layouts/FallarborTown/map.bin index 950a54761..950a54761 100644 --- a/data/maps/FallarborTown/map.bin +++ b/data/layouts/FallarborTown/map.bin diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin index 19d906679..19d906679 100644 --- a/data/maps/DoubleBattleColosseum/border.bin +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/border.bin diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc new file mode 100644 index 000000000..70d1a079f --- /dev/null +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FallarborTown_LeftoverRSContestHall_MapBorder:: + .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin" + + .align 2 +FallarborTown_LeftoverRSContestHall_MapBlockdata:: + .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" + + .align 2 +FallarborTown_LeftoverRSContestHall_Layout:: + .4byte 0x15 + .4byte 0x12 + .4byte FallarborTown_LeftoverRSContestHall_MapBorder + .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin b/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin index d65e7c489..d65e7c489 100644 --- a/data/maps/FallarborTown_LeftoverRSContestHall/map.bin +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/map.bin diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin b/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin index 19d906679..19d906679 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/border.bin +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc new file mode 100644 index 000000000..c30723a04 --- /dev/null +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FallarborTown_LeftoverRSContestLobby_MapBorder:: + .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin" + + .align 2 +FallarborTown_LeftoverRSContestLobby_MapBlockdata:: + .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" + + .align 2 +FallarborTown_LeftoverRSContestLobby_Layout:: + .4byte 0xf + .4byte 0x7 + .4byte FallarborTown_LeftoverRSContestLobby_MapBorder + .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin b/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin index 87407546a..87407546a 100644 --- a/data/maps/FallarborTown_LeftoverRSContestLobby/map.bin +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin diff --git a/data/maps/FarawayIsland_Entrance/border.bin b/data/layouts/FarawayIsland_Entrance/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/FarawayIsland_Entrance/border.bin +++ b/data/layouts/FarawayIsland_Entrance/border.bin diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc new file mode 100644 index 000000000..4a1c6c36b --- /dev/null +++ b/data/layouts/FarawayIsland_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FarawayIsland_Entrance_MapBorder:: + .incbin "data/layouts/FarawayIsland_Entrance/border.bin" + + .align 2 +FarawayIsland_Entrance_MapBlockdata:: + .incbin "data/layouts/FarawayIsland_Entrance/map.bin" + + .align 2 +FarawayIsland_Entrance_Layout:: + .4byte 0x22 + .4byte 0x2e + .4byte FarawayIsland_Entrance_MapBorder + .4byte FarawayIsland_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/FarawayIsland_Entrance/map.bin b/data/layouts/FarawayIsland_Entrance/map.bin Binary files differindex 389f6b0cd..389f6b0cd 100644 --- a/data/maps/FarawayIsland_Entrance/map.bin +++ b/data/layouts/FarawayIsland_Entrance/map.bin diff --git a/data/maps/FarawayIsland_Interior/border.bin b/data/layouts/FarawayIsland_Interior/border.bin Binary files differindex addb5d6ce..addb5d6ce 100644 --- a/data/maps/FarawayIsland_Interior/border.bin +++ b/data/layouts/FarawayIsland_Interior/border.bin diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc new file mode 100644 index 000000000..bf8cbdbf4 --- /dev/null +++ b/data/layouts/FarawayIsland_Interior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FarawayIsland_Interior_MapBorder:: + .incbin "data/layouts/FarawayIsland_Interior/border.bin" + + .align 2 +FarawayIsland_Interior_MapBlockdata:: + .incbin "data/layouts/FarawayIsland_Interior/map.bin" + + .align 2 +FarawayIsland_Interior_Layout:: + .4byte 0x1d + .4byte 0x1a + .4byte FarawayIsland_Interior_MapBorder + .4byte FarawayIsland_Interior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/maps/FarawayIsland_Interior/map.bin b/data/layouts/FarawayIsland_Interior/map.bin Binary files differindex 847295734..847295734 100644 --- a/data/maps/FarawayIsland_Interior/map.bin +++ b/data/layouts/FarawayIsland_Interior/map.bin diff --git a/data/maps/FieryPath/border.bin b/data/layouts/FieryPath/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/FieryPath/border.bin +++ b/data/layouts/FieryPath/border.bin diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc new file mode 100644 index 000000000..7fff04df1 --- /dev/null +++ b/data/layouts/FieryPath/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FieryPath_MapBorder:: + .incbin "data/layouts/FieryPath/border.bin" + + .align 2 +FieryPath_MapBlockdata:: + .incbin "data/layouts/FieryPath/map.bin" + + .align 2 +FieryPath_Layout:: + .4byte 0x23 + .4byte 0x26 + .4byte FieryPath_MapBorder + .4byte FieryPath_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/FieryPath/map.bin b/data/layouts/FieryPath/map.bin index 5928fb173..5928fb173 100644 --- a/data/maps/FieryPath/map.bin +++ b/data/layouts/FieryPath/map.bin diff --git a/data/maps/FortreeCity/border.bin b/data/layouts/FortreeCity/border.bin Binary files differindex addb5d6ce..addb5d6ce 100644 --- a/data/maps/FortreeCity/border.bin +++ b/data/layouts/FortreeCity/border.bin diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc new file mode 100644 index 000000000..e273287de --- /dev/null +++ b/data/layouts/FortreeCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_MapBorder:: + .incbin "data/layouts/FortreeCity/border.bin" + + .align 2 +FortreeCity_MapBlockdata:: + .incbin "data/layouts/FortreeCity/map.bin" + + .align 2 +FortreeCity_Layout:: + .4byte 0x28 + .4byte 0x14 + .4byte FortreeCity_MapBorder + .4byte FortreeCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/maps/FortreeCity/map.bin b/data/layouts/FortreeCity/map.bin index a2aa40e98..a2aa40e98 100644 --- a/data/maps/FortreeCity/map.bin +++ b/data/layouts/FortreeCity/map.bin diff --git a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FallarborTown_LeftoverRSContestHall/border.bin +++ b/data/layouts/FortreeCity_DecorationShop/border.bin diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc new file mode 100644 index 000000000..e4727cf75 --- /dev/null +++ b/data/layouts/FortreeCity_DecorationShop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_DecorationShop_MapBorder:: + .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" + + .align 2 +FortreeCity_DecorationShop_MapBlockdata:: + .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" + + .align 2 +FortreeCity_DecorationShop_Layout:: + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_DecorationShop_MapBorder + .4byte FortreeCity_DecorationShop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin index 6ca8b4e61..6ca8b4e61 100644 --- a/data/maps/FortreeCity_DecorationShop/map.bin +++ b/data/layouts/FortreeCity_DecorationShop/map.bin diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/layouts/FortreeCity_Gym/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/FortreeCity_Gym/border.bin +++ b/data/layouts/FortreeCity_Gym/border.bin diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc new file mode 100644 index 000000000..81994276b --- /dev/null +++ b/data/layouts/FortreeCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_Gym_MapBorder:: + .incbin "data/layouts/FortreeCity_Gym/border.bin" + + .align 2 +FortreeCity_Gym_MapBlockdata:: + .incbin "data/layouts/FortreeCity_Gym/map.bin" + + .align 2 +FortreeCity_Gym_Layout:: + .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 Binary files differindex cff943707..cff943707 100644 --- a/data/maps/FortreeCity_Gym/map.bin +++ b/data/layouts/FortreeCity_Gym/map.bin diff --git a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin b/data/layouts/FortreeCity_House1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FallarborTown_LeftoverRSContestLobby/border.bin +++ b/data/layouts/FortreeCity_House1/border.bin diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc new file mode 100644 index 000000000..dd9962fde --- /dev/null +++ b/data/layouts/FortreeCity_House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_House1_MapBorder:: + .incbin "data/layouts/FortreeCity_House1/border.bin" + + .align 2 +FortreeCity_House1_MapBlockdata:: + .incbin "data/layouts/FortreeCity_House1/map.bin" + + .align 2 +FortreeCity_House1_Layout:: + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_House1_MapBorder + .4byte FortreeCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/FortreeCity_House1/map.bin b/data/layouts/FortreeCity_House1/map.bin index 5a3ac8cb6..5a3ac8cb6 100644 --- a/data/maps/FortreeCity_House1/map.bin +++ b/data/layouts/FortreeCity_House1/map.bin diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_House2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FortreeCity_DecorationShop/border.bin +++ b/data/layouts/FortreeCity_House2/border.bin diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc new file mode 100644 index 000000000..5ab659b9a --- /dev/null +++ b/data/layouts/FortreeCity_House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +FortreeCity_House2_MapBorder:: + .incbin "data/layouts/FortreeCity_House2/border.bin" + + .align 2 +FortreeCity_House2_MapBlockdata:: + .incbin "data/layouts/FortreeCity_House2/map.bin" + + .align 2 +FortreeCity_House2_Layout:: + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_House2_MapBorder + .4byte FortreeCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/FortreeCity_House2/map.bin b/data/layouts/FortreeCity_House2/map.bin index 3fbcd6043..3fbcd6043 100644 --- a/data/maps/FortreeCity_House2/map.bin +++ b/data/layouts/FortreeCity_House2/map.bin diff --git a/data/maps/GraniteCave_1F/border.bin b/data/layouts/GraniteCave_1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/GraniteCave_1F/border.bin +++ b/data/layouts/GraniteCave_1F/border.bin diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc new file mode 100644 index 000000000..641310f75 --- /dev/null +++ b/data/layouts/GraniteCave_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +GraniteCave_1F_MapBorder:: + .incbin "data/layouts/GraniteCave_1F/border.bin" + + .align 2 +GraniteCave_1F_MapBlockdata:: + .incbin "data/layouts/GraniteCave_1F/map.bin" + + .align 2 +GraniteCave_1F_Layout:: + .4byte 0x2a + .4byte 0xf + .4byte GraniteCave_1F_MapBorder + .4byte GraniteCave_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/GraniteCave_1F/map.bin b/data/layouts/GraniteCave_1F/map.bin index 58c7945ab..58c7945ab 100644 --- a/data/maps/GraniteCave_1F/map.bin +++ b/data/layouts/GraniteCave_1F/map.bin diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/layouts/GraniteCave_B1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/GraniteCave_B1F/border.bin +++ b/data/layouts/GraniteCave_B1F/border.bin diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc new file mode 100644 index 000000000..dcdafcd4e --- /dev/null +++ b/data/layouts/GraniteCave_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +GraniteCave_B1F_MapBorder:: + .incbin "data/layouts/GraniteCave_B1F/border.bin" + + .align 2 +GraniteCave_B1F_MapBlockdata:: + .incbin "data/layouts/GraniteCave_B1F/map.bin" + + .align 2 +GraniteCave_B1F_Layout:: + .4byte 0x20 + .4byte 0x1a + .4byte GraniteCave_B1F_MapBorder + .4byte GraniteCave_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/layouts/GraniteCave_B1F/map.bin index 27f98c6cf..27f98c6cf 100644 --- a/data/maps/GraniteCave_B1F/map.bin +++ b/data/layouts/GraniteCave_B1F/map.bin diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/layouts/GraniteCave_B2F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/GraniteCave_B2F/border.bin +++ b/data/layouts/GraniteCave_B2F/border.bin diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc new file mode 100644 index 000000000..90d63c5bb --- /dev/null +++ b/data/layouts/GraniteCave_B2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +GraniteCave_B2F_MapBorder:: + .incbin "data/layouts/GraniteCave_B2F/border.bin" + + .align 2 +GraniteCave_B2F_MapBlockdata:: + .incbin "data/layouts/GraniteCave_B2F/map.bin" + + .align 2 +GraniteCave_B2F_Layout:: + .4byte 0x20 + .4byte 0x1a + .4byte GraniteCave_B2F_MapBorder + .4byte GraniteCave_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/layouts/GraniteCave_B2F/map.bin index bbf8dc7af..bbf8dc7af 100644 --- a/data/maps/GraniteCave_B2F/map.bin +++ b/data/layouts/GraniteCave_B2F/map.bin diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/layouts/GraniteCave_StevensRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/GraniteCave_StevensRoom/border.bin +++ b/data/layouts/GraniteCave_StevensRoom/border.bin diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc new file mode 100644 index 000000000..ea6147343 --- /dev/null +++ b/data/layouts/GraniteCave_StevensRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +GraniteCave_StevensRoom_MapBorder:: + .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" + + .align 2 +GraniteCave_StevensRoom_MapBlockdata:: + .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" + + .align 2 +GraniteCave_StevensRoom_Layout:: + .4byte 0xf + .4byte 0xe + .4byte GraniteCave_StevensRoom_MapBorder + .4byte GraniteCave_StevensRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/layouts/GraniteCave_StevensRoom/map.bin index 3dc6987c2..3dc6987c2 100644 --- a/data/maps/GraniteCave_StevensRoom/map.bin +++ b/data/layouts/GraniteCave_StevensRoom/map.bin diff --git a/data/maps/FortreeCity_House1/border.bin b/data/layouts/Harbor/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FortreeCity_House1/border.bin +++ b/data/layouts/Harbor/border.bin diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc new file mode 100644 index 000000000..ab5f0e032 --- /dev/null +++ b/data/layouts/Harbor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Harbor_MapBorder:: + .incbin "data/layouts/Harbor/border.bin" + + .align 2 +Harbor_MapBlockdata:: + .incbin "data/layouts/Harbor/map.bin" + + .align 2 +Harbor_Layout:: + .4byte 0x18 + .4byte 0xf + .4byte Harbor_MapBorder + .4byte Harbor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/SlateportCity_Harbor/map.bin b/data/layouts/Harbor/map.bin index c77c1edfb..c77c1edfb 100644 --- a/data/maps/SlateportCity_Harbor/map.bin +++ b/data/layouts/Harbor/map.bin diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/layouts/House1/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LavaridgeTown_Gym_1F/border.bin +++ b/data/layouts/House1/border.bin diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc new file mode 100644 index 000000000..0d1c9a699 --- /dev/null +++ b/data/layouts/House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +House1_MapBorder:: + .incbin "data/layouts/House1/border.bin" + + .align 2 +House1_MapBlockdata:: + .incbin "data/layouts/House1/map.bin" + + .align 2 +House1_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte House1_MapBorder + .4byte House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/OldaleTown_House1/map.bin b/data/layouts/House1/map.bin index ea185484d..ea185484d 100644 --- a/data/maps/OldaleTown_House1/map.bin +++ b/data/layouts/House1/map.bin diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/layouts/House2/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/border.bin +++ b/data/layouts/House2/border.bin diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc new file mode 100644 index 000000000..357e6022f --- /dev/null +++ b/data/layouts/House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +House2_MapBorder:: + .incbin "data/layouts/House2/border.bin" + + .align 2 +House2_MapBlockdata:: + .incbin "data/layouts/House2/map.bin" + + .align 2 +House2_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte House2_MapBorder + .4byte House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/OldaleTown_House2/map.bin b/data/layouts/House2/map.bin index 0e9f07964..0e9f07964 100644 --- a/data/maps/OldaleTown_House2/map.bin +++ b/data/layouts/House2/map.bin diff --git a/data/maps/FortreeCity_House2/border.bin b/data/layouts/House3/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FortreeCity_House2/border.bin +++ b/data/layouts/House3/border.bin diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc new file mode 100644 index 000000000..2fe4bee46 --- /dev/null +++ b/data/layouts/House3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +House3_MapBorder:: + .incbin "data/layouts/House3/border.bin" + + .align 2 +House3_MapBlockdata:: + .incbin "data/layouts/House3/map.bin" + + .align 2 +House3_Layout:: + .4byte 0xa + .4byte 0x8 + .4byte House3_MapBorder + .4byte House3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/DewfordTown_House1/map.bin b/data/layouts/House3/map.bin index 1f732ba3f..1f732ba3f 100644 --- a/data/maps/DewfordTown_House1/map.bin +++ b/data/layouts/House3/map.bin diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/layouts/House4/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin +++ b/data/layouts/House4/border.bin diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc new file mode 100644 index 000000000..caeca73a8 --- /dev/null +++ b/data/layouts/House4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +House4_MapBorder:: + .incbin "data/layouts/House4/border.bin" + + .align 2 +House4_MapBlockdata:: + .incbin "data/layouts/House4/map.bin" + + .align 2 +House4_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte House4_MapBorder + .4byte House4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/DewfordTown_House2/map.bin b/data/layouts/House4/map.bin index 6274e4418..6274e4418 100644 --- a/data/maps/DewfordTown_House2/map.bin +++ b/data/layouts/House4/map.bin diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/layouts/HouseWithBed/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_ContestHall/border.bin +++ b/data/layouts/HouseWithBed/border.bin diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc new file mode 100644 index 000000000..bdb047feb --- /dev/null +++ b/data/layouts/HouseWithBed/layout.inc @@ -0,0 +1,16 @@ + .align 2 +HouseWithBed_MapBorder:: + .incbin "data/layouts/HouseWithBed/border.bin" + + .align 2 +HouseWithBed_MapBlockdata:: + .incbin "data/layouts/HouseWithBed/map.bin" + + .align 2 +HouseWithBed_Layout:: + .4byte 0xa + .4byte 0x8 + .4byte HouseWithBed_MapBorder + .4byte HouseWithBed_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/layouts/HouseWithBed/map.bin index b91b7153b..b91b7153b 100644 --- a/data/maps/PetalburgCity_House2/map.bin +++ b/data/layouts/HouseWithBed/map.bin diff --git a/data/maps/InsideOfTruck/border.bin b/data/layouts/InsideOfTruck/border.bin index 8459c2996..8459c2996 100644 --- a/data/maps/InsideOfTruck/border.bin +++ b/data/layouts/InsideOfTruck/border.bin diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc new file mode 100644 index 000000000..dc93f12a8 --- /dev/null +++ b/data/layouts/InsideOfTruck/layout.inc @@ -0,0 +1,16 @@ + .align 2 +InsideOfTruck_MapBorder:: + .incbin "data/layouts/InsideOfTruck/border.bin" + + .align 2 +InsideOfTruck_MapBlockdata:: + .incbin "data/layouts/InsideOfTruck/map.bin" + + .align 2 +InsideOfTruck_Layout:: + .4byte 0x5 + .4byte 0x5 + .4byte InsideOfTruck_MapBorder + .4byte InsideOfTruck_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideOfTruck diff --git a/data/maps/InsideOfTruck/map.bin b/data/layouts/InsideOfTruck/map.bin index 84b946be5..84b946be5 100644 --- a/data/maps/InsideOfTruck/map.bin +++ b/data/layouts/InsideOfTruck/map.bin diff --git a/data/maps/IslandCave/border.bin b/data/layouts/IslandCave/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/IslandCave/border.bin +++ b/data/layouts/IslandCave/border.bin diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc new file mode 100644 index 000000000..25d870e68 --- /dev/null +++ b/data/layouts/IslandCave/layout.inc @@ -0,0 +1,16 @@ + .align 2 +IslandCave_MapBorder:: + .incbin "data/layouts/IslandCave/border.bin" + + .align 2 +IslandCave_MapBlockdata:: + .incbin "data/layouts/IslandCave/map.bin" + + .align 2 +IslandCave_Layout:: + .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 Binary files differindex a7fa61b4d..a7fa61b4d 100644 --- a/data/maps/IslandCave/map.bin +++ b/data/layouts/IslandCave/map.bin diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/layouts/IslandHarbor/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_ContestLobby/border.bin +++ b/data/layouts/IslandHarbor/border.bin diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc new file mode 100644 index 000000000..7a1c43284 --- /dev/null +++ b/data/layouts/IslandHarbor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +IslandHarbor_MapBorder:: + .incbin "data/layouts/IslandHarbor/border.bin" + + .align 2 +IslandHarbor_MapBlockdata:: + .incbin "data/layouts/IslandHarbor/map.bin" + + .align 2 +IslandHarbor_Layout:: + .4byte 0x11 + .4byte 0xd + .4byte IslandHarbor_MapBorder + .4byte IslandHarbor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_IslandHarbor diff --git a/data/maps/BirthIsland_Harbor/map.bin b/data/layouts/IslandHarbor/map.bin index e14816107..e14816107 100644 --- a/data/maps/BirthIsland_Harbor/map.bin +++ b/data/layouts/IslandHarbor/map.bin diff --git a/data/maps/JaggedPass/border.bin b/data/layouts/JaggedPass/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/JaggedPass/border.bin +++ b/data/layouts/JaggedPass/border.bin diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc new file mode 100644 index 000000000..6aefbf605 --- /dev/null +++ b/data/layouts/JaggedPass/layout.inc @@ -0,0 +1,16 @@ + .align 2 +JaggedPass_MapBorder:: + .incbin "data/layouts/JaggedPass/border.bin" + + .align 2 +JaggedPass_MapBlockdata:: + .incbin "data/layouts/JaggedPass/map.bin" + + .align 2 +JaggedPass_Layout:: + .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 Binary files differindex 57195b4f5..57195b4f5 100644 --- a/data/maps/JaggedPass/map.bin +++ b/data/layouts/JaggedPass/map.bin diff --git a/data/maps/LavaridgeTown/border.bin b/data/layouts/LavaridgeTown/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/LavaridgeTown/border.bin +++ b/data/layouts/LavaridgeTown/border.bin diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc new file mode 100644 index 000000000..48d0bbe58 --- /dev/null +++ b/data/layouts/LavaridgeTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LavaridgeTown_MapBorder:: + .incbin "data/layouts/LavaridgeTown/border.bin" + + .align 2 +LavaridgeTown_MapBlockdata:: + .incbin "data/layouts/LavaridgeTown/map.bin" + + .align 2 +LavaridgeTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte LavaridgeTown_MapBorder + .4byte LavaridgeTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/LavaridgeTown/map.bin b/data/layouts/LavaridgeTown/map.bin index 604ad5f3f..604ad5f3f 100644 --- a/data/maps/LavaridgeTown/map.bin +++ b/data/layouts/LavaridgeTown/map.bin diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_Gym_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LavaridgeTown_HerbShop/border.bin +++ b/data/layouts/LavaridgeTown_Gym_1F/border.bin diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc new file mode 100644 index 000000000..e881e9d58 --- /dev/null +++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LavaridgeTown_Gym_1F_MapBorder:: + .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin" + + .align 2 +LavaridgeTown_Gym_1F_MapBlockdata:: + .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin" + + .align 2 +LavaridgeTown_Gym_1F_Layout:: + .4byte 0x11 + .4byte 0x13 + .4byte LavaridgeTown_Gym_1F_MapBorder + .4byte LavaridgeTown_Gym_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LavaridgeGym diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/layouts/LavaridgeTown_Gym_1F/map.bin index 31d16da5e..31d16da5e 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.bin +++ b/data/layouts/LavaridgeTown_Gym_1F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/layouts/LavaridgeTown_Gym_B1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin +++ b/data/layouts/LavaridgeTown_Gym_B1F/border.bin diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc new file mode 100644 index 000000000..1fa258cba --- /dev/null +++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LavaridgeTown_Gym_B1F_MapBorder:: + .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin" + + .align 2 +LavaridgeTown_Gym_B1F_MapBlockdata:: + .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin" + + .align 2 +LavaridgeTown_Gym_B1F_Layout:: + .4byte 0x11 + .4byte 0x13 + .4byte LavaridgeTown_Gym_B1F_MapBorder + .4byte LavaridgeTown_Gym_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LavaridgeGym diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/layouts/LavaridgeTown_Gym_B1F/map.bin index aeaf0177c..aeaf0177c 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.bin +++ b/data/layouts/LavaridgeTown_Gym_B1F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin +++ b/data/layouts/LavaridgeTown_HerbShop/border.bin diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc new file mode 100644 index 000000000..bf107dca9 --- /dev/null +++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LavaridgeTown_HerbShop_MapBorder:: + .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" + + .align 2 +LavaridgeTown_HerbShop_MapBlockdata:: + .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" + + .align 2 +LavaridgeTown_HerbShop_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte LavaridgeTown_HerbShop_MapBorder + .4byte LavaridgeTown_HerbShop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin index cc0294a80..cc0294a80 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.bin +++ b/data/layouts/LavaridgeTown_HerbShop/map.bin diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc new file mode 100644 index 000000000..e0ba92bbf --- /dev/null +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LavaridgeTown_PokemonCenter_1F_MapBorder:: + .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin" + + .align 2 +LavaridgeTown_PokemonCenter_1F_MapBlockdata:: + .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" + + .align 2 +LavaridgeTown_PokemonCenter_1F_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte LavaridgeTown_PokemonCenter_1F_MapBorder + .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin index d841f9f1a..d841f9f1a 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin diff --git a/data/maps/LilycoveCity/border.bin b/data/layouts/LilycoveCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/LilycoveCity/border.bin +++ b/data/layouts/LilycoveCity/border.bin diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc new file mode 100644 index 000000000..fedb7a91e --- /dev/null +++ b/data/layouts/LilycoveCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_MapBorder:: + .incbin "data/layouts/LilycoveCity/border.bin" + + .align 2 +LilycoveCity_MapBlockdata:: + .incbin "data/layouts/LilycoveCity/map.bin" + + .align 2 +LilycoveCity_Layout:: + .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 Binary files differindex 5d6b56ad9..5d6b56ad9 100644 --- a/data/maps/LilycoveCity/map.bin +++ b/data/layouts/LilycoveCity/map.bin diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/layouts/LilycoveCity_ContestHall/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin +++ b/data/layouts/LilycoveCity_ContestHall/border.bin diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc new file mode 100644 index 000000000..e0ce089f7 --- /dev/null +++ b/data/layouts/LilycoveCity_ContestHall/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_ContestHall_MapBorder:: + .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" + + .align 2 +LilycoveCity_ContestHall_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" + + .align 2 +LilycoveCity_ContestHall_Layout:: + .4byte 0x33 + .4byte 0x21 + .4byte LilycoveCity_ContestHall_MapBorder + .4byte LilycoveCity_ContestHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/layouts/LilycoveCity_ContestHall/map.bin index 06fdae4f7..06fdae4f7 100644 --- a/data/maps/LilycoveCity_ContestHall/map.bin +++ b/data/layouts/LilycoveCity_ContestHall/map.bin diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/layouts/LilycoveCity_ContestLobby/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_House2/border.bin +++ b/data/layouts/LilycoveCity_ContestLobby/border.bin diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc new file mode 100644 index 000000000..8ca1d160f --- /dev/null +++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_ContestLobby_MapBorder:: + .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" + + .align 2 +LilycoveCity_ContestLobby_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" + + .align 2 +LilycoveCity_ContestLobby_Layout:: + .4byte 0x1f + .4byte 0xc + .4byte LilycoveCity_ContestLobby_MapBorder + .4byte LilycoveCity_ContestLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/layouts/LilycoveCity_ContestLobby/map.bin index 122962e42..122962e42 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.bin +++ b/data/layouts/LilycoveCity_ContestLobby/map.bin diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc new file mode 100644 index 000000000..3c6c30cdc --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_CoveLilyMotel_1F_MapBorder:: + .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin" + + .align 2 +LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" + + .align 2 +LilycoveCity_CoveLilyMotel_1F_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder + .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin index 5242f8e57..5242f8e57 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc new file mode 100644 index 000000000..c65508e1a --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_CoveLilyMotel_2F_MapBorder:: + .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin" + + .align 2 +LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" + + .align 2 +LilycoveCity_CoveLilyMotel_2F_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder + .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin index 4484b5b55..4484b5b55 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc new file mode 100644 index 000000000..53d452438 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStoreElevator_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" + + .align 2 +LilycoveCity_DepartmentStoreElevator_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" + + .align 2 +LilycoveCity_DepartmentStoreElevator_Layout:: + .4byte 0x5 + .4byte 0x6 + .4byte LilycoveCity_DepartmentStoreElevator_MapBorder + .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleFrontier diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin index 7d9ae193b..7d9ae193b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin index c1b82435c..c1b82435c 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc new file mode 100644 index 000000000..61a5db9c2 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStoreRooftop_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" + + .align 2 +LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" + + .align 2 +LilycoveCity_DepartmentStoreRooftop_Layout:: + .4byte 0x12 + .4byte 0xc + .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder + .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin index e9125baf0..e9125baf0 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc new file mode 100644 index 000000000..441cfc474 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStore_1F_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin" + + .align 2 +LilycoveCity_DepartmentStore_1F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_1F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_1F_MapBorder + .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin index 2d3d15360..2d3d15360 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc new file mode 100644 index 000000000..54ede95cd --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStore_2F_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin" + + .align 2 +LilycoveCity_DepartmentStore_2F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_2F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_2F_MapBorder + .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin index 82ca90b08..82ca90b08 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc new file mode 100644 index 000000000..a16342425 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStore_3F_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin" + + .align 2 +LilycoveCity_DepartmentStore_3F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_3F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_3F_MapBorder + .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin index c10b776f5..c10b776f5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc new file mode 100644 index 000000000..26806016a --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStore_4F_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin" + + .align 2 +LilycoveCity_DepartmentStore_4F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_4F_Layout:: + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_4F_MapBorder + .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin index bc1a09e2c..bc1a09e2c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MauvilleCity_GameCorner/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc new file mode 100644 index 000000000..6b5a98fe4 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_DepartmentStore_5F_MapBorder:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin" + + .align 2 +LilycoveCity_DepartmentStore_5F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_5F_Layout:: + .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 Binary files differindex 80acc3900..80acc3900 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/layouts/LilycoveCity_House2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin +++ b/data/layouts/LilycoveCity_House2/border.bin diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc new file mode 100644 index 000000000..a7926872f --- /dev/null +++ b/data/layouts/LilycoveCity_House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_House2_MapBorder:: + .incbin "data/layouts/LilycoveCity_House2/border.bin" + + .align 2 +LilycoveCity_House2_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_House2/map.bin" + + .align 2 +LilycoveCity_House2_Layout:: + .4byte 0x8 + .4byte 0x8 + .4byte LilycoveCity_House2_MapBorder + .4byte LilycoveCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/layouts/LilycoveCity_House2/map.bin index e381f20eb..e381f20eb 100644 --- a/data/maps/LilycoveCity_House2/map.bin +++ b/data/layouts/LilycoveCity_House2/map.bin diff --git a/data/maps/LinkContestRoom1/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom1/border.bin +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc new file mode 100644 index 000000000..3a0215859 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_LilycoveMuseum_1F_MapBorder:: + .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin" + + .align 2 +LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" + + .align 2 +LilycoveCity_LilycoveMuseum_1F_Layout:: + .4byte 0x15 + .4byte 0xe + .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder + .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LilycoveMuseum diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin index 6e92a8b58..6e92a8b58 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin diff --git a/data/maps/LinkContestRoom2/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom2/border.bin +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc new file mode 100644 index 000000000..0cc19b039 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_LilycoveMuseum_2F_MapBorder:: + .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin" + + .align 2 +LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" + + .align 2 +LilycoveCity_LilycoveMuseum_2F_Layout:: + .4byte 0x16 + .4byte 0xd + .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder + .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LilycoveMuseum diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin index 76a918838..76a918838 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin diff --git a/data/maps/LinkContestRoom3/border.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom3/border.bin +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc new file mode 100644 index 000000000..3a3a624bd --- /dev/null +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LilycoveCity_PokemonTrainerFanClub_MapBorder:: + .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" + + .align 2 +LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: + .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" + + .align 2 +LilycoveCity_PokemonTrainerFanClub_Layout:: + .4byte 0xc + .4byte 0xe + .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder + .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin index cddfe5d9d..cddfe5d9d 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin diff --git a/data/maps/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom4/border.bin +++ b/data/layouts/LinkContestRoom1/border.bin diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc new file mode 100644 index 000000000..38af49829 --- /dev/null +++ b/data/layouts/LinkContestRoom1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom1_MapBorder:: + .incbin "data/layouts/LinkContestRoom1/border.bin" + + .align 2 +LinkContestRoom1_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom1/map.bin" + + .align 2 +LinkContestRoom1_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom1_MapBorder + .4byte LinkContestRoom1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom1/map.bin b/data/layouts/LinkContestRoom1/map.bin index a8853f6ae..a8853f6ae 100644 --- a/data/maps/LinkContestRoom1/map.bin +++ b/data/layouts/LinkContestRoom1/map.bin diff --git a/data/maps/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom5/border.bin +++ b/data/layouts/LinkContestRoom2/border.bin diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc new file mode 100644 index 000000000..d09439edd --- /dev/null +++ b/data/layouts/LinkContestRoom2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom2_MapBorder:: + .incbin "data/layouts/LinkContestRoom2/border.bin" + + .align 2 +LinkContestRoom2_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom2/map.bin" + + .align 2 +LinkContestRoom2_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom2_MapBorder + .4byte LinkContestRoom2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom2/map.bin b/data/layouts/LinkContestRoom2/map.bin index 7cb63b40d..7cb63b40d 100644 --- a/data/maps/LinkContestRoom2/map.bin +++ b/data/layouts/LinkContestRoom2/map.bin diff --git a/data/maps/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom3/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom6/border.bin +++ b/data/layouts/LinkContestRoom3/border.bin diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc new file mode 100644 index 000000000..c969be1ac --- /dev/null +++ b/data/layouts/LinkContestRoom3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom3_MapBorder:: + .incbin "data/layouts/LinkContestRoom3/border.bin" + + .align 2 +LinkContestRoom3_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom3/map.bin" + + .align 2 +LinkContestRoom3_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom3_MapBorder + .4byte LinkContestRoom3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom3/map.bin b/data/layouts/LinkContestRoom3/map.bin index 59e9e9182..59e9e9182 100644 --- a/data/maps/LinkContestRoom3/map.bin +++ b/data/layouts/LinkContestRoom3/map.bin diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/layouts/LinkContestRoom4/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin +++ b/data/layouts/LinkContestRoom4/border.bin diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc new file mode 100644 index 000000000..61b03a2ce --- /dev/null +++ b/data/layouts/LinkContestRoom4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom4_MapBorder:: + .incbin "data/layouts/LinkContestRoom4/border.bin" + + .align 2 +LinkContestRoom4_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom4/map.bin" + + .align 2 +LinkContestRoom4_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom4_MapBorder + .4byte LinkContestRoom4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom4/map.bin b/data/layouts/LinkContestRoom4/map.bin index 4e2166c19..4e2166c19 100644 --- a/data/maps/LinkContestRoom4/map.bin +++ b/data/layouts/LinkContestRoom4/map.bin diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/layouts/LinkContestRoom5/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_1F_1R/border.bin +++ b/data/layouts/LinkContestRoom5/border.bin diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc new file mode 100644 index 000000000..38f1e42cd --- /dev/null +++ b/data/layouts/LinkContestRoom5/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom5_MapBorder:: + .incbin "data/layouts/LinkContestRoom5/border.bin" + + .align 2 +LinkContestRoom5_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom5/map.bin" + + .align 2 +LinkContestRoom5_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom5_MapBorder + .4byte LinkContestRoom5_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom5/map.bin b/data/layouts/LinkContestRoom5/map.bin index ad068fe7c..ad068fe7c 100644 --- a/data/maps/LinkContestRoom5/map.bin +++ b/data/layouts/LinkContestRoom5/map.bin diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/layouts/LinkContestRoom6/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_1F_2R/border.bin +++ b/data/layouts/LinkContestRoom6/border.bin diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc new file mode 100644 index 000000000..39349840a --- /dev/null +++ b/data/layouts/LinkContestRoom6/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LinkContestRoom6_MapBorder:: + .incbin "data/layouts/LinkContestRoom6/border.bin" + + .align 2 +LinkContestRoom6_MapBlockdata:: + .incbin "data/layouts/LinkContestRoom6/map.bin" + + .align 2 +LinkContestRoom6_Layout:: + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom6_MapBorder + .4byte LinkContestRoom6_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom6/map.bin b/data/layouts/LinkContestRoom6/map.bin index 9fcec5a5e..9fcec5a5e 100644 --- a/data/maps/LinkContestRoom6/map.bin +++ b/data/layouts/LinkContestRoom6/map.bin diff --git a/data/maps/LittlerootTown/border.bin b/data/layouts/LittlerootTown/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/LittlerootTown/border.bin +++ b/data/layouts/LittlerootTown/border.bin diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc new file mode 100644 index 000000000..5f8254576 --- /dev/null +++ b/data/layouts/LittlerootTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LittlerootTown_MapBorder:: + .incbin "data/layouts/LittlerootTown/border.bin" + + .align 2 +LittlerootTown_MapBlockdata:: + .incbin "data/layouts/LittlerootTown/map.bin" + + .align 2 +LittlerootTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte LittlerootTown_MapBorder + .4byte LittlerootTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin index 9af76f90e..9af76f90e 100644 --- a/data/maps/LittlerootTown/map.bin +++ b/data/layouts/LittlerootTown/map.bin diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MauvilleCity_Gym/border.bin +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc new file mode 100644 index 000000000..0ccddcca8 --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LittlerootTown_BrendansHouse_1F_MapBorder:: + .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin" + + .align 2 +LittlerootTown_BrendansHouse_1F_MapBlockdata:: + .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" + + .align 2 +LittlerootTown_BrendansHouse_1F_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte LittlerootTown_BrendansHouse_1F_MapBorder + .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin index 3ae8e69a6..3ae8e69a6 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin index c1b82435c..c1b82435c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc new file mode 100644 index 000000000..f626ecfb0 --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LittlerootTown_BrendansHouse_2F_MapBorder:: + .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin" + + .align 2 +LittlerootTown_BrendansHouse_2F_MapBlockdata:: + .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" + + .align 2 +LittlerootTown_BrendansHouse_2F_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte LittlerootTown_BrendansHouse_2F_MapBorder + .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin index bfa5b907e..bfa5b907e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin index c1b82435c..c1b82435c 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/border.bin +++ b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc new file mode 100644 index 000000000..42d1365c3 --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LittlerootTown_MaysHouse_1F_MapBorder:: + .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin" + + .align 2 +LittlerootTown_MaysHouse_1F_MapBlockdata:: + .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" + + .align 2 +LittlerootTown_MaysHouse_1F_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte LittlerootTown_MaysHouse_1F_MapBorder + .4byte LittlerootTown_MaysHouse_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin index 21f62ebe3..21f62ebe3 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin +++ b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin diff --git a/data/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin index c1b82435c..c1b82435c 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/border.bin +++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc new file mode 100644 index 000000000..c0770b8f6 --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LittlerootTown_MaysHouse_2F_MapBorder:: + .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin" + + .align 2 +LittlerootTown_MaysHouse_2F_MapBlockdata:: + .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" + + .align 2 +LittlerootTown_MaysHouse_2F_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte LittlerootTown_MaysHouse_2F_MapBorder + .4byte LittlerootTown_MaysHouse_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin index 5904a9639..5904a9639 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin +++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_B1F_1R/border.bin +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc new file mode 100644 index 000000000..77d07033f --- /dev/null +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc @@ -0,0 +1,16 @@ + .align 2 +LittlerootTown_ProfessorBirchsLab_MapBorder:: + .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" + + .align 2 +LittlerootTown_ProfessorBirchsLab_MapBlockdata:: + .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" + + .align 2 +LittlerootTown_ProfessorBirchsLab_Layout:: + .4byte 0xd + .4byte 0xd + .4byte LittlerootTown_ProfessorBirchsLab_MapBorder + .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin index 0f84e80b2..0f84e80b2 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/layouts/MagmaHideout_1F/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MagmaHideout_1F/border.bin +++ b/data/layouts/MagmaHideout_1F/border.bin diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc new file mode 100644 index 000000000..2721bb6ff --- /dev/null +++ b/data/layouts/MagmaHideout_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_1F_MapBorder:: + .incbin "data/layouts/MagmaHideout_1F/border.bin" + + .align 2 +MagmaHideout_1F_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_1F/map.bin" + + .align 2 +MagmaHideout_1F_Layout:: + .4byte 0x25 + .4byte 0x26 + .4byte MagmaHideout_1F_MapBorder + .4byte MagmaHideout_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/layouts/MagmaHideout_1F/map.bin Binary files differindex fdf0d4252..fdf0d4252 100644 --- a/data/maps/MagmaHideout_1F/map.bin +++ b/data/layouts/MagmaHideout_1F/map.bin diff --git a/data/maps/MagmaHideout_2F_1R/border.bin b/data/layouts/MagmaHideout_2F_1R/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MagmaHideout_2F_1R/border.bin +++ b/data/layouts/MagmaHideout_2F_1R/border.bin diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc new file mode 100644 index 000000000..9d16b20b0 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_1R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_2F_1R_MapBorder:: + .incbin "data/layouts/MagmaHideout_2F_1R/border.bin" + + .align 2 +MagmaHideout_2F_1R_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_2F_1R/map.bin" + + .align 2 +MagmaHideout_2F_1R_Layout:: + .4byte 0x21 + .4byte 0x27 + .4byte MagmaHideout_2F_1R_MapBorder + .4byte MagmaHideout_2F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MagmaHideout_2F_1R/map.bin b/data/layouts/MagmaHideout_2F_1R/map.bin index d74c32347..d74c32347 100644 --- a/data/maps/MagmaHideout_2F_1R/map.bin +++ b/data/layouts/MagmaHideout_2F_1R/map.bin diff --git a/data/maps/MagmaHideout_2F_2R/border.bin b/data/layouts/MagmaHideout_2F_2R/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MagmaHideout_2F_2R/border.bin +++ b/data/layouts/MagmaHideout_2F_2R/border.bin diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc new file mode 100644 index 000000000..47a492f52 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_2R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_2F_2R_MapBorder:: + .incbin "data/layouts/MagmaHideout_2F_2R/border.bin" + + .align 2 +MagmaHideout_2F_2R_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_2F_2R/map.bin" + + .align 2 +MagmaHideout_2F_2R_Layout:: + .4byte 0x31 + .4byte 0x1c + .4byte MagmaHideout_2F_2R_MapBorder + .4byte MagmaHideout_2F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MagmaHideout_2F_2R/map.bin b/data/layouts/MagmaHideout_2F_2R/map.bin index 34cbf7eaa..34cbf7eaa 100644 --- a/data/maps/MagmaHideout_2F_2R/map.bin +++ b/data/layouts/MagmaHideout_2F_2R/map.bin diff --git a/data/maps/MagmaHideout_2F_3R/border.bin b/data/layouts/MagmaHideout_2F_3R/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MagmaHideout_2F_3R/border.bin +++ b/data/layouts/MagmaHideout_2F_3R/border.bin diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc new file mode 100644 index 000000000..cf1310587 --- /dev/null +++ b/data/layouts/MagmaHideout_2F_3R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_2F_3R_MapBorder:: + .incbin "data/layouts/MagmaHideout_2F_3R/border.bin" + + .align 2 +MagmaHideout_2F_3R_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_2F_3R/map.bin" + + .align 2 +MagmaHideout_2F_3R_Layout:: + .4byte 0x3c + .4byte 0x13 + .4byte MagmaHideout_2F_3R_MapBorder + .4byte MagmaHideout_2F_3R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MagmaHideout_2F_3R/map.bin b/data/layouts/MagmaHideout_2F_3R/map.bin index f25017291..f25017291 100644 --- a/data/maps/MagmaHideout_2F_3R/map.bin +++ b/data/layouts/MagmaHideout_2F_3R/map.bin diff --git a/data/maps/MagmaHideout_3F_1R/border.bin b/data/layouts/MagmaHideout_3F_1R/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MagmaHideout_3F_1R/border.bin +++ b/data/layouts/MagmaHideout_3F_1R/border.bin diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc new file mode 100644 index 000000000..6e7215914 --- /dev/null +++ b/data/layouts/MagmaHideout_3F_1R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_3F_1R_MapBorder:: + .incbin "data/layouts/MagmaHideout_3F_1R/border.bin" + + .align 2 +MagmaHideout_3F_1R_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_3F_1R/map.bin" + + .align 2 +MagmaHideout_3F_1R_Layout:: + .4byte 0x1c + .4byte 0x18 + .4byte MagmaHideout_3F_1R_MapBorder + .4byte MagmaHideout_3F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MagmaHideout_3F_1R/map.bin b/data/layouts/MagmaHideout_3F_1R/map.bin index da590f5dd..da590f5dd 100644 --- a/data/maps/MagmaHideout_3F_1R/map.bin +++ b/data/layouts/MagmaHideout_3F_1R/map.bin diff --git a/data/maps/MagmaHideout_3F_2R/border.bin b/data/layouts/MagmaHideout_3F_2R/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MagmaHideout_3F_2R/border.bin +++ b/data/layouts/MagmaHideout_3F_2R/border.bin diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc new file mode 100644 index 000000000..6f108d198 --- /dev/null +++ b/data/layouts/MagmaHideout_3F_2R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_3F_2R_MapBorder:: + .incbin "data/layouts/MagmaHideout_3F_2R/border.bin" + + .align 2 +MagmaHideout_3F_2R_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_3F_2R/map.bin" + + .align 2 +MagmaHideout_3F_2R_Layout:: + .4byte 0x18 + .4byte 0x11 + .4byte MagmaHideout_3F_2R_MapBorder + .4byte MagmaHideout_3F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MagmaHideout_3F_2R/map.bin b/data/layouts/MagmaHideout_3F_2R/map.bin index 49857819a..49857819a 100644 --- a/data/maps/MagmaHideout_3F_2R/map.bin +++ b/data/layouts/MagmaHideout_3F_2R/map.bin diff --git a/data/maps/MagmaHideout_3F_3R/border.bin b/data/layouts/MagmaHideout_3F_3R/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MagmaHideout_3F_3R/border.bin +++ b/data/layouts/MagmaHideout_3F_3R/border.bin diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc new file mode 100644 index 000000000..6508e73bf --- /dev/null +++ b/data/layouts/MagmaHideout_3F_3R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_3F_3R_MapBorder:: + .incbin "data/layouts/MagmaHideout_3F_3R/border.bin" + + .align 2 +MagmaHideout_3F_3R_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_3F_3R/map.bin" + + .align 2 +MagmaHideout_3F_3R_Layout:: + .4byte 0x21 + .4byte 0x18 + .4byte MagmaHideout_3F_3R_MapBorder + .4byte MagmaHideout_3F_3R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MagmaHideout_3F_3R/map.bin b/data/layouts/MagmaHideout_3F_3R/map.bin index 7c808ffb5..7c808ffb5 100644 --- a/data/maps/MagmaHideout_3F_3R/map.bin +++ b/data/layouts/MagmaHideout_3F_3R/map.bin diff --git a/data/maps/MagmaHideout_4F/border.bin b/data/layouts/MagmaHideout_4F/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MagmaHideout_4F/border.bin +++ b/data/layouts/MagmaHideout_4F/border.bin diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc new file mode 100644 index 000000000..32db60101 --- /dev/null +++ b/data/layouts/MagmaHideout_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MagmaHideout_4F_MapBorder:: + .incbin "data/layouts/MagmaHideout_4F/border.bin" + + .align 2 +MagmaHideout_4F_MapBlockdata:: + .incbin "data/layouts/MagmaHideout_4F/map.bin" + + .align 2 +MagmaHideout_4F_Layout:: + .4byte 0x3b + .4byte 0x1c + .4byte MagmaHideout_4F_MapBorder + .4byte MagmaHideout_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MagmaHideout_4F/map.bin b/data/layouts/MagmaHideout_4F/map.bin index 45a5547c6..45a5547c6 100644 --- a/data/maps/MagmaHideout_4F/map.bin +++ b/data/layouts/MagmaHideout_4F/map.bin diff --git a/data/maps/MarineCave_End/border.bin b/data/layouts/MarineCave_End/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/MarineCave_End/border.bin +++ b/data/layouts/MarineCave_End/border.bin diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc new file mode 100644 index 000000000..f69952dce --- /dev/null +++ b/data/layouts/MarineCave_End/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MarineCave_End_MapBorder:: + .incbin "data/layouts/MarineCave_End/border.bin" + + .align 2 +MarineCave_End_MapBlockdata:: + .incbin "data/layouts/MarineCave_End/map.bin" + + .align 2 +MarineCave_End_Layout:: + .4byte 0x1b + .4byte 0x1e + .4byte MarineCave_End_MapBorder + .4byte MarineCave_End_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/MarineCave_End/map.bin b/data/layouts/MarineCave_End/map.bin index 85138661d..85138661d 100644 --- a/data/maps/MarineCave_End/map.bin +++ b/data/layouts/MarineCave_End/map.bin diff --git a/data/maps/MarineCave_Entrance/border.bin b/data/layouts/MarineCave_Entrance/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/MarineCave_Entrance/border.bin +++ b/data/layouts/MarineCave_Entrance/border.bin diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc new file mode 100644 index 000000000..b6c9248c6 --- /dev/null +++ b/data/layouts/MarineCave_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MarineCave_Entrance_MapBorder:: + .incbin "data/layouts/MarineCave_Entrance/border.bin" + + .align 2 +MarineCave_Entrance_MapBlockdata:: + .incbin "data/layouts/MarineCave_Entrance/map.bin" + + .align 2 +MarineCave_Entrance_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte MarineCave_Entrance_MapBorder + .4byte MarineCave_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/MarineCave_Entrance/map.bin b/data/layouts/MarineCave_Entrance/map.bin index 62aa8537f..62aa8537f 100644 --- a/data/maps/MarineCave_Entrance/map.bin +++ b/data/layouts/MarineCave_Entrance/map.bin diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/layouts/Mart/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/border.bin +++ b/data/layouts/Mart/border.bin diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc new file mode 100644 index 000000000..33c232059 --- /dev/null +++ b/data/layouts/Mart/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Mart_MapBorder:: + .incbin "data/layouts/Mart/border.bin" + + .align 2 +Mart_MapBlockdata:: + .incbin "data/layouts/Mart/map.bin" + + .align 2 +Mart_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte Mart_MapBorder + .4byte Mart_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/layouts/Mart/map.bin index 08f393264..08f393264 100644 --- a/data/maps/OldaleTown_Mart/map.bin +++ b/data/layouts/Mart/map.bin diff --git a/data/maps/MauvilleCity/border.bin b/data/layouts/MauvilleCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/MauvilleCity/border.bin +++ b/data/layouts/MauvilleCity/border.bin diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc new file mode 100644 index 000000000..ba7785c3e --- /dev/null +++ b/data/layouts/MauvilleCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MauvilleCity_MapBorder:: + .incbin "data/layouts/MauvilleCity/border.bin" + + .align 2 +MauvilleCity_MapBlockdata:: + .incbin "data/layouts/MauvilleCity/map.bin" + + .align 2 +MauvilleCity_Layout:: + .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 Binary files differindex 80a38e902..80a38e902 100644 --- a/data/maps/MauvilleCity/map.bin +++ b/data/layouts/MauvilleCity/map.bin diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/layouts/MauvilleCity_BikeShop/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/MauvilleCity_BikeShop/border.bin +++ b/data/layouts/MauvilleCity_BikeShop/border.bin diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc new file mode 100644 index 000000000..4814becf8 --- /dev/null +++ b/data/layouts/MauvilleCity_BikeShop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MauvilleCity_BikeShop_MapBorder:: + .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" + + .align 2 +MauvilleCity_BikeShop_MapBlockdata:: + .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" + + .align 2 +MauvilleCity_BikeShop_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte MauvilleCity_BikeShop_MapBorder + .4byte MauvilleCity_BikeShop_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BikeShop diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/layouts/MauvilleCity_BikeShop/map.bin index 9891b9fd5..9891b9fd5 100644 --- a/data/maps/MauvilleCity_BikeShop/map.bin +++ b/data/layouts/MauvilleCity_BikeShop/map.bin diff --git a/data/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/layouts/MauvilleCity_GameCorner/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/border.bin +++ b/data/layouts/MauvilleCity_GameCorner/border.bin diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc new file mode 100644 index 000000000..9403c9df6 --- /dev/null +++ b/data/layouts/MauvilleCity_GameCorner/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MauvilleCity_GameCorner_MapBorder:: + .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" + + .align 2 +MauvilleCity_GameCorner_MapBlockdata:: + .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" + + .align 2 +MauvilleCity_GameCorner_Layout:: + .4byte 0x16 + .4byte 0xb + .4byte MauvilleCity_GameCorner_MapBorder + .4byte MauvilleCity_GameCorner_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MauvilleGameCorner diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/layouts/MauvilleCity_GameCorner/map.bin index ce3f9bf73..ce3f9bf73 100644 --- a/data/maps/MauvilleCity_GameCorner/map.bin +++ b/data/layouts/MauvilleCity_GameCorner/map.bin diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/layouts/MauvilleCity_Gym/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MossdeepCity_StevensHouse/border.bin +++ b/data/layouts/MauvilleCity_Gym/border.bin diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc new file mode 100644 index 000000000..1fdaf921e --- /dev/null +++ b/data/layouts/MauvilleCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MauvilleCity_Gym_MapBorder:: + .incbin "data/layouts/MauvilleCity_Gym/border.bin" + + .align 2 +MauvilleCity_Gym_MapBlockdata:: + .incbin "data/layouts/MauvilleCity_Gym/map.bin" + + .align 2 +MauvilleCity_Gym_Layout:: + .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 Binary files differindex 8860e5651..8860e5651 100644 --- a/data/maps/MauvilleCity_Gym/map.bin +++ b/data/layouts/MauvilleCity_Gym/map.bin diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/layouts/MeteorFalls_1F_1R/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_B1F_2R/border.bin +++ b/data/layouts/MeteorFalls_1F_1R/border.bin diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc new file mode 100644 index 000000000..3fea20553 --- /dev/null +++ b/data/layouts/MeteorFalls_1F_1R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MeteorFalls_1F_1R_MapBorder:: + .incbin "data/layouts/MeteorFalls_1F_1R/border.bin" + + .align 2 +MeteorFalls_1F_1R_MapBlockdata:: + .incbin "data/layouts/MeteorFalls_1F_1R/map.bin" + + .align 2 +MeteorFalls_1F_1R_Layout:: + .4byte 0x1e + .4byte 0x2a + .4byte MeteorFalls_1F_1R_MapBorder + .4byte MeteorFalls_1F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/layouts/MeteorFalls_1F_1R/map.bin index 4891475a3..4891475a3 100644 --- a/data/maps/MeteorFalls_1F_1R/map.bin +++ b/data/layouts/MeteorFalls_1F_1R/map.bin diff --git a/data/maps/MeteorFalls_StevensCave/border.bin b/data/layouts/MeteorFalls_1F_2R/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_StevensCave/border.bin +++ b/data/layouts/MeteorFalls_1F_2R/border.bin diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc new file mode 100644 index 000000000..ac91e848e --- /dev/null +++ b/data/layouts/MeteorFalls_1F_2R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MeteorFalls_1F_2R_MapBorder:: + .incbin "data/layouts/MeteorFalls_1F_2R/border.bin" + + .align 2 +MeteorFalls_1F_2R_MapBlockdata:: + .incbin "data/layouts/MeteorFalls_1F_2R/map.bin" + + .align 2 +MeteorFalls_1F_2R_Layout:: + .4byte 0x1e + .4byte 0x20 + .4byte MeteorFalls_1F_2R_MapBorder + .4byte MeteorFalls_1F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/layouts/MeteorFalls_1F_2R/map.bin index 67ce2b784..67ce2b784 100644 --- a/data/maps/MeteorFalls_1F_2R/map.bin +++ b/data/layouts/MeteorFalls_1F_2R/map.bin diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/layouts/MeteorFalls_B1F_1R/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin +++ b/data/layouts/MeteorFalls_B1F_1R/border.bin diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc new file mode 100644 index 000000000..c424edf3b --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MeteorFalls_B1F_1R_MapBorder:: + .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin" + + .align 2 +MeteorFalls_B1F_1R_MapBlockdata:: + .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin" + + .align 2 +MeteorFalls_B1F_1R_Layout:: + .4byte 0x1d + .4byte 0x26 + .4byte MeteorFalls_B1F_1R_MapBorder + .4byte MeteorFalls_B1F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/layouts/MeteorFalls_B1F_1R/map.bin index a37afdb17..a37afdb17 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.bin +++ b/data/layouts/MeteorFalls_B1F_1R/map.bin diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/layouts/MeteorFalls_B1F_2R/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin +++ b/data/layouts/MeteorFalls_B1F_2R/border.bin diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc new file mode 100644 index 000000000..b7ee944cc --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MeteorFalls_B1F_2R_MapBorder:: + .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin" + + .align 2 +MeteorFalls_B1F_2R_MapBlockdata:: + .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin" + + .align 2 +MeteorFalls_B1F_2R_Layout:: + .4byte 0xb + .4byte 0x12 + .4byte MeteorFalls_B1F_2R_MapBorder + .4byte MeteorFalls_B1F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/layouts/MeteorFalls_B1F_2R/map.bin index 5f4497752..5f4497752 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.bin +++ b/data/layouts/MeteorFalls_B1F_2R/map.bin diff --git a/data/maps/MtPyre_1F/border.bin b/data/layouts/MeteorFalls_StevensCave/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_1F/border.bin +++ b/data/layouts/MeteorFalls_StevensCave/border.bin diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc new file mode 100644 index 000000000..992e7d174 --- /dev/null +++ b/data/layouts/MeteorFalls_StevensCave/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MeteorFalls_StevensCave_MapBorder:: + .incbin "data/layouts/MeteorFalls_StevensCave/border.bin" + + .align 2 +MeteorFalls_StevensCave_MapBlockdata:: + .incbin "data/layouts/MeteorFalls_StevensCave/map.bin" + + .align 2 +MeteorFalls_StevensCave_Layout:: + .4byte 0x1e + .4byte 0x20 + .4byte MeteorFalls_StevensCave_MapBorder + .4byte MeteorFalls_StevensCave_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_StevensCave/map.bin b/data/layouts/MeteorFalls_StevensCave/map.bin index e509d66c2..e509d66c2 100644 --- a/data/maps/MeteorFalls_StevensCave/map.bin +++ b/data/layouts/MeteorFalls_StevensCave/map.bin diff --git a/data/maps/MirageTower_1F/border.bin b/data/layouts/MirageTower_1F/border.bin index 58596f99a..58596f99a 100644 --- a/data/maps/MirageTower_1F/border.bin +++ b/data/layouts/MirageTower_1F/border.bin diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc new file mode 100644 index 000000000..e4bb92d74 --- /dev/null +++ b/data/layouts/MirageTower_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MirageTower_1F_MapBorder:: + .incbin "data/layouts/MirageTower_1F/border.bin" + + .align 2 +MirageTower_1F_MapBlockdata:: + .incbin "data/layouts/MirageTower_1F/map.bin" + + .align 2 +MirageTower_1F_Layout:: + .4byte 0x15 + .4byte 0x11 + .4byte MirageTower_1F_MapBorder + .4byte MirageTower_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MirageTower diff --git a/data/maps/MirageTower_1F/map.bin b/data/layouts/MirageTower_1F/map.bin index b77d14890..b77d14890 100644 --- a/data/maps/MirageTower_1F/map.bin +++ b/data/layouts/MirageTower_1F/map.bin diff --git a/data/maps/MirageTower_2F/border.bin b/data/layouts/MirageTower_2F/border.bin index 58596f99a..58596f99a 100644 --- a/data/maps/MirageTower_2F/border.bin +++ b/data/layouts/MirageTower_2F/border.bin diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc new file mode 100644 index 000000000..601dd9de2 --- /dev/null +++ b/data/layouts/MirageTower_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MirageTower_2F_MapBorder:: + .incbin "data/layouts/MirageTower_2F/border.bin" + + .align 2 +MirageTower_2F_MapBlockdata:: + .incbin "data/layouts/MirageTower_2F/map.bin" + + .align 2 +MirageTower_2F_Layout:: + .4byte 0x15 + .4byte 0x11 + .4byte MirageTower_2F_MapBorder + .4byte MirageTower_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MirageTower diff --git a/data/maps/MirageTower_2F/map.bin b/data/layouts/MirageTower_2F/map.bin index 79c3056a9..79c3056a9 100644 --- a/data/maps/MirageTower_2F/map.bin +++ b/data/layouts/MirageTower_2F/map.bin diff --git a/data/maps/MirageTower_3F/border.bin b/data/layouts/MirageTower_3F/border.bin index 58596f99a..58596f99a 100644 --- a/data/maps/MirageTower_3F/border.bin +++ b/data/layouts/MirageTower_3F/border.bin diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc new file mode 100644 index 000000000..2bcd9806d --- /dev/null +++ b/data/layouts/MirageTower_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MirageTower_3F_MapBorder:: + .incbin "data/layouts/MirageTower_3F/border.bin" + + .align 2 +MirageTower_3F_MapBlockdata:: + .incbin "data/layouts/MirageTower_3F/map.bin" + + .align 2 +MirageTower_3F_Layout:: + .4byte 0x15 + .4byte 0x11 + .4byte MirageTower_3F_MapBorder + .4byte MirageTower_3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MirageTower diff --git a/data/maps/MirageTower_3F/map.bin b/data/layouts/MirageTower_3F/map.bin index 376ac2836..376ac2836 100644 --- a/data/maps/MirageTower_3F/map.bin +++ b/data/layouts/MirageTower_3F/map.bin diff --git a/data/maps/MirageTower_4F/border.bin b/data/layouts/MirageTower_4F/border.bin index 58596f99a..58596f99a 100644 --- a/data/maps/MirageTower_4F/border.bin +++ b/data/layouts/MirageTower_4F/border.bin diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc new file mode 100644 index 000000000..babf2a5c7 --- /dev/null +++ b/data/layouts/MirageTower_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MirageTower_4F_MapBorder:: + .incbin "data/layouts/MirageTower_4F/border.bin" + + .align 2 +MirageTower_4F_MapBlockdata:: + .incbin "data/layouts/MirageTower_4F/map.bin" + + .align 2 +MirageTower_4F_Layout:: + .4byte 0xd + .4byte 0xa + .4byte MirageTower_4F_MapBorder + .4byte MirageTower_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MirageTower diff --git a/data/maps/MirageTower_4F/map.bin b/data/layouts/MirageTower_4F/map.bin index 283534fb7..283534fb7 100644 --- a/data/maps/MirageTower_4F/map.bin +++ b/data/layouts/MirageTower_4F/map.bin diff --git a/data/maps/MossdeepCity/border.bin b/data/layouts/MossdeepCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/MossdeepCity/border.bin +++ b/data/layouts/MossdeepCity/border.bin diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc new file mode 100644 index 000000000..b5d392dc7 --- /dev/null +++ b/data/layouts/MossdeepCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_MapBorder:: + .incbin "data/layouts/MossdeepCity/border.bin" + + .align 2 +MossdeepCity_MapBlockdata:: + .incbin "data/layouts/MossdeepCity/map.bin" + + .align 2 +MossdeepCity_Layout:: + .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 Binary files differindex bf150f5bb..bf150f5bb 100644 --- a/data/maps/MossdeepCity/map.bin +++ b/data/layouts/MossdeepCity/map.bin diff --git a/data/maps/OldaleTown_House1/border.bin b/data/layouts/MossdeepCity_GameCorner_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/OldaleTown_House1/border.bin +++ b/data/layouts/MossdeepCity_GameCorner_1F/border.bin diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc new file mode 100644 index 000000000..e03619423 --- /dev/null +++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_GameCorner_1F_MapBorder:: + .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin" + + .align 2 +MossdeepCity_GameCorner_1F_MapBlockdata:: + .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin" + + .align 2 +MossdeepCity_GameCorner_1F_Layout:: + .4byte 0xc + .4byte 0xa + .4byte MossdeepCity_GameCorner_1F_MapBorder + .4byte MossdeepCity_GameCorner_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MossdeepGameCorner diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/layouts/MossdeepCity_GameCorner_1F/map.bin index 8be990dde..8be990dde 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.bin +++ b/data/layouts/MossdeepCity_GameCorner_1F/map.bin diff --git a/data/maps/OldaleTown_House2/border.bin b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/OldaleTown_House2/border.bin +++ b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc new file mode 100644 index 000000000..b51e18362 --- /dev/null +++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_GameCorner_B1F_MapBorder:: + .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin" + + .align 2 +MossdeepCity_GameCorner_B1F_MapBlockdata:: + .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" + + .align 2 +MossdeepCity_GameCorner_B1F_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte MossdeepCity_GameCorner_B1F_MapBorder + .4byte MossdeepCity_GameCorner_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin index 399d05705..399d05705 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.bin +++ b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/layouts/MossdeepCity_Gym/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/MossdeepCity_Gym/border.bin +++ b/data/layouts/MossdeepCity_Gym/border.bin diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc new file mode 100644 index 000000000..fbdfa6fdd --- /dev/null +++ b/data/layouts/MossdeepCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_Gym_MapBorder:: + .incbin "data/layouts/MossdeepCity_Gym/border.bin" + + .align 2 +MossdeepCity_Gym_MapBlockdata:: + .incbin "data/layouts/MossdeepCity_Gym/map.bin" + + .align 2 +MossdeepCity_Gym_Layout:: + .4byte 0x1a + .4byte 0x24 + .4byte MossdeepCity_Gym_MapBorder + .4byte MossdeepCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MossdeepGym diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/layouts/MossdeepCity_Gym/map.bin index da585f73f..da585f73f 100644 --- a/data/maps/MossdeepCity_Gym/map.bin +++ b/data/layouts/MossdeepCity_Gym/map.bin diff --git a/data/maps/MtPyre_2F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_2F/border.bin +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc new file mode 100644 index 000000000..c5fc2f570 --- /dev/null +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_SpaceCenter_1F_MapBorder:: + .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin" + + .align 2 +MossdeepCity_SpaceCenter_1F_MapBlockdata:: + .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" + + .align 2 +MossdeepCity_SpaceCenter_1F_Layout:: + .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 Binary files differindex 44f5081b9..44f5081b9 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin diff --git a/data/maps/MtPyre_3F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_3F/border.bin +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc new file mode 100644 index 000000000..4d406accc --- /dev/null +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_SpaceCenter_2F_MapBorder:: + .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin" + + .align 2 +MossdeepCity_SpaceCenter_2F_MapBlockdata:: + .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" + + .align 2 +MossdeepCity_SpaceCenter_2F_Layout:: + .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 Binary files differindex d2e52d780..d2e52d780 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/layouts/MossdeepCity_StevensHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/OldaleTown_Mart/border.bin +++ b/data/layouts/MossdeepCity_StevensHouse/border.bin diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc new file mode 100644 index 000000000..29aede186 --- /dev/null +++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MossdeepCity_StevensHouse_MapBorder:: + .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" + + .align 2 +MossdeepCity_StevensHouse_MapBlockdata:: + .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" + + .align 2 +MossdeepCity_StevensHouse_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte MossdeepCity_StevensHouse_MapBorder + .4byte MossdeepCity_StevensHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/layouts/MossdeepCity_StevensHouse/map.bin index ade25497a..ade25497a 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.bin +++ b/data/layouts/MossdeepCity_StevensHouse/map.bin diff --git a/data/maps/MtChimney/border.bin b/data/layouts/MtChimney/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MtChimney/border.bin +++ b/data/layouts/MtChimney/border.bin diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc new file mode 100644 index 000000000..f0afefe3b --- /dev/null +++ b/data/layouts/MtChimney/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtChimney_MapBorder:: + .incbin "data/layouts/MtChimney/border.bin" + + .align 2 +MtChimney_MapBlockdata:: + .incbin "data/layouts/MtChimney/map.bin" + + .align 2 +MtChimney_Layout:: + .4byte 0x28 + .4byte 0x2f + .4byte MtChimney_MapBorder + .4byte MtChimney_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MtChimney/map.bin b/data/layouts/MtChimney/map.bin index 1e7e2868d..1e7e2868d 100644 --- a/data/maps/MtChimney/map.bin +++ b/data/layouts/MtChimney/map.bin diff --git a/data/maps/MtPyre_4F/border.bin b/data/layouts/MtPyre_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_4F/border.bin +++ b/data/layouts/MtPyre_1F/border.bin diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc new file mode 100644 index 000000000..bd7fd82d5 --- /dev/null +++ b/data/layouts/MtPyre_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_1F_MapBorder:: + .incbin "data/layouts/MtPyre_1F/border.bin" + + .align 2 +MtPyre_1F_MapBlockdata:: + .incbin "data/layouts/MtPyre_1F/map.bin" + + .align 2 +MtPyre_1F_Layout:: + .4byte 0x16 + .4byte 0x13 + .4byte MtPyre_1F_MapBorder + .4byte MtPyre_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_1F/map.bin b/data/layouts/MtPyre_1F/map.bin index 60b992a73..60b992a73 100644 --- a/data/maps/MtPyre_1F/map.bin +++ b/data/layouts/MtPyre_1F/map.bin diff --git a/data/maps/MtPyre_5F/border.bin b/data/layouts/MtPyre_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_5F/border.bin +++ b/data/layouts/MtPyre_2F/border.bin diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc new file mode 100644 index 000000000..cbf534f69 --- /dev/null +++ b/data/layouts/MtPyre_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_2F_MapBorder:: + .incbin "data/layouts/MtPyre_2F/border.bin" + + .align 2 +MtPyre_2F_MapBlockdata:: + .incbin "data/layouts/MtPyre_2F/map.bin" + + .align 2 +MtPyre_2F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_2F_MapBorder + .4byte MtPyre_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_2F/map.bin b/data/layouts/MtPyre_2F/map.bin index 97b7e9e31..97b7e9e31 100644 --- a/data/maps/MtPyre_2F/map.bin +++ b/data/layouts/MtPyre_2F/map.bin diff --git a/data/maps/MtPyre_6F/border.bin b/data/layouts/MtPyre_3F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_6F/border.bin +++ b/data/layouts/MtPyre_3F/border.bin diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc new file mode 100644 index 000000000..ceaa1bea9 --- /dev/null +++ b/data/layouts/MtPyre_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_3F_MapBorder:: + .incbin "data/layouts/MtPyre_3F/border.bin" + + .align 2 +MtPyre_3F_MapBlockdata:: + .incbin "data/layouts/MtPyre_3F/map.bin" + + .align 2 +MtPyre_3F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_3F_MapBorder + .4byte MtPyre_3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_3F/map.bin b/data/layouts/MtPyre_3F/map.bin index 758eccc3a..758eccc3a 100644 --- a/data/maps/MtPyre_3F/map.bin +++ b/data/layouts/MtPyre_3F/map.bin diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/layouts/MtPyre_4F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/border.bin +++ b/data/layouts/MtPyre_4F/border.bin diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc new file mode 100644 index 000000000..5bd0eab59 --- /dev/null +++ b/data/layouts/MtPyre_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_4F_MapBorder:: + .incbin "data/layouts/MtPyre_4F/border.bin" + + .align 2 +MtPyre_4F_MapBlockdata:: + .incbin "data/layouts/MtPyre_4F/map.bin" + + .align 2 +MtPyre_4F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_4F_MapBorder + .4byte MtPyre_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_4F/map.bin b/data/layouts/MtPyre_4F/map.bin index 98dc679ff..98dc679ff 100644 --- a/data/maps/MtPyre_4F/map.bin +++ b/data/layouts/MtPyre_4F/map.bin diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/layouts/MtPyre_5F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin +++ b/data/layouts/MtPyre_5F/border.bin diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc new file mode 100644 index 000000000..fed3f9ae2 --- /dev/null +++ b/data/layouts/MtPyre_5F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_5F_MapBorder:: + .incbin "data/layouts/MtPyre_5F/border.bin" + + .align 2 +MtPyre_5F_MapBlockdata:: + .incbin "data/layouts/MtPyre_5F/map.bin" + + .align 2 +MtPyre_5F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_5F_MapBorder + .4byte MtPyre_5F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_5F/map.bin b/data/layouts/MtPyre_5F/map.bin index 12fbeeb7e..12fbeeb7e 100644 --- a/data/maps/MtPyre_5F/map.bin +++ b/data/layouts/MtPyre_5F/map.bin diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/layouts/MtPyre_6F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/PacifidlogTown_House1/border.bin +++ b/data/layouts/MtPyre_6F/border.bin diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc new file mode 100644 index 000000000..0fe9f6982 --- /dev/null +++ b/data/layouts/MtPyre_6F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_6F_MapBorder:: + .incbin "data/layouts/MtPyre_6F/border.bin" + + .align 2 +MtPyre_6F_MapBlockdata:: + .incbin "data/layouts/MtPyre_6F/map.bin" + + .align 2 +MtPyre_6F_Layout:: + .4byte 0xd + .4byte 0xd + .4byte MtPyre_6F_MapBorder + .4byte MtPyre_6F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_6F/map.bin b/data/layouts/MtPyre_6F/map.bin index 1f7438bfb..1f7438bfb 100644 --- a/data/maps/MtPyre_6F/map.bin +++ b/data/layouts/MtPyre_6F/map.bin diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/layouts/MtPyre_Exterior/border.bin Binary files differindex 1d7df4a00..1d7df4a00 100644 --- a/data/maps/MtPyre_Exterior/border.bin +++ b/data/layouts/MtPyre_Exterior/border.bin diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc new file mode 100644 index 000000000..2f81759d7 --- /dev/null +++ b/data/layouts/MtPyre_Exterior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_Exterior_MapBorder:: + .incbin "data/layouts/MtPyre_Exterior/border.bin" + + .align 2 +MtPyre_Exterior_MapBlockdata:: + .incbin "data/layouts/MtPyre_Exterior/map.bin" + + .align 2 +MtPyre_Exterior_Layout:: + .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 Binary files differindex 7ab1e0461..7ab1e0461 100644 --- a/data/maps/MtPyre_Exterior/map.bin +++ b/data/layouts/MtPyre_Exterior/map.bin diff --git a/data/maps/MtPyre_Summit/border.bin b/data/layouts/MtPyre_Summit/border.bin Binary files differindex 1d7df4a00..1d7df4a00 100644 --- a/data/maps/MtPyre_Summit/border.bin +++ b/data/layouts/MtPyre_Summit/border.bin diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc new file mode 100644 index 000000000..4f30ac9e1 --- /dev/null +++ b/data/layouts/MtPyre_Summit/layout.inc @@ -0,0 +1,16 @@ + .align 2 +MtPyre_Summit_MapBorder:: + .incbin "data/layouts/MtPyre_Summit/border.bin" + + .align 2 +MtPyre_Summit_MapBlockdata:: + .incbin "data/layouts/MtPyre_Summit/map.bin" + + .align 2 +MtPyre_Summit_Layout:: + .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 Binary files differindex 1de8bd5ea..1de8bd5ea 100644 --- a/data/maps/MtPyre_Summit/map.bin +++ b/data/layouts/MtPyre_Summit/map.bin diff --git a/data/maps/NavelRock_B1F/border.bin b/data/layouts/NavelRock_B1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/NavelRock_B1F/border.bin +++ b/data/layouts/NavelRock_B1F/border.bin diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc new file mode 100644 index 000000000..899aa8eed --- /dev/null +++ b/data/layouts/NavelRock_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_B1F_MapBorder:: + .incbin "data/layouts/NavelRock_B1F/border.bin" + + .align 2 +NavelRock_B1F_MapBlockdata:: + .incbin "data/layouts/NavelRock_B1F/map.bin" + + .align 2 +NavelRock_B1F_Layout:: + .4byte 0x17 + .4byte 0xb + .4byte NavelRock_B1F_MapBorder + .4byte NavelRock_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/maps/NavelRock_B1F/map.bin b/data/layouts/NavelRock_B1F/map.bin index 861fb6575..861fb6575 100644 --- a/data/maps/NavelRock_B1F/map.bin +++ b/data/layouts/NavelRock_B1F/map.bin diff --git a/data/maps/NavelRock_Bottom/border.bin b/data/layouts/NavelRock_Bottom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/NavelRock_Bottom/border.bin +++ b/data/layouts/NavelRock_Bottom/border.bin diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc new file mode 100644 index 000000000..043a977de --- /dev/null +++ b/data/layouts/NavelRock_Bottom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Bottom_MapBorder:: + .incbin "data/layouts/NavelRock_Bottom/border.bin" + + .align 2 +NavelRock_Bottom_MapBlockdata:: + .incbin "data/layouts/NavelRock_Bottom/map.bin" + + .align 2 +NavelRock_Bottom_Layout:: + .4byte 0x16 + .4byte 0x16 + .4byte NavelRock_Bottom_MapBorder + .4byte NavelRock_Bottom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/maps/NavelRock_Bottom/map.bin b/data/layouts/NavelRock_Bottom/map.bin index af2f8a245..af2f8a245 100644 --- a/data/maps/NavelRock_Bottom/map.bin +++ b/data/layouts/NavelRock_Bottom/map.bin diff --git a/data/maps/NavelRock_Entrance/border.bin b/data/layouts/NavelRock_Entrance/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/NavelRock_Entrance/border.bin +++ b/data/layouts/NavelRock_Entrance/border.bin diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc new file mode 100644 index 000000000..d9a12b71d --- /dev/null +++ b/data/layouts/NavelRock_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Entrance_MapBorder:: + .incbin "data/layouts/NavelRock_Entrance/border.bin" + + .align 2 +NavelRock_Entrance_MapBlockdata:: + .incbin "data/layouts/NavelRock_Entrance/map.bin" + + .align 2 +NavelRock_Entrance_Layout:: + .4byte 0x15 + .4byte 0x20 + .4byte NavelRock_Entrance_MapBorder + .4byte NavelRock_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/maps/NavelRock_Entrance/map.bin b/data/layouts/NavelRock_Entrance/map.bin index 6fd5b9fa0..6fd5b9fa0 100644 --- a/data/maps/NavelRock_Entrance/map.bin +++ b/data/layouts/NavelRock_Entrance/map.bin diff --git a/data/maps/NavelRock_Exterior/border.bin b/data/layouts/NavelRock_Exterior/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/NavelRock_Exterior/border.bin +++ b/data/layouts/NavelRock_Exterior/border.bin diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc new file mode 100644 index 000000000..b3fc825cf --- /dev/null +++ b/data/layouts/NavelRock_Exterior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Exterior_MapBorder:: + .incbin "data/layouts/NavelRock_Exterior/border.bin" + + .align 2 +NavelRock_Exterior_MapBlockdata:: + .incbin "data/layouts/NavelRock_Exterior/map.bin" + + .align 2 +NavelRock_Exterior_Layout:: + .4byte 0x15 + .4byte 0x18 + .4byte NavelRock_Exterior_MapBorder + .4byte NavelRock_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/maps/NavelRock_Exterior/map.bin b/data/layouts/NavelRock_Exterior/map.bin Binary files differindex 9b3342a1a..9b3342a1a 100644 --- a/data/maps/NavelRock_Exterior/map.bin +++ b/data/layouts/NavelRock_Exterior/map.bin diff --git a/data/maps/NavelRock_Fork/border.bin b/data/layouts/NavelRock_Fork/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/NavelRock_Fork/border.bin +++ b/data/layouts/NavelRock_Fork/border.bin diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc new file mode 100644 index 000000000..0f7956e5e --- /dev/null +++ b/data/layouts/NavelRock_Fork/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Fork_MapBorder:: + .incbin "data/layouts/NavelRock_Fork/border.bin" + + .align 2 +NavelRock_Fork_MapBlockdata:: + .incbin "data/layouts/NavelRock_Fork/map.bin" + + .align 2 +NavelRock_Fork_Layout:: + .4byte 0x1b + .4byte 0x56 + .4byte NavelRock_Fork_MapBorder + .4byte NavelRock_Fork_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/maps/NavelRock_Fork/map.bin b/data/layouts/NavelRock_Fork/map.bin index 0b314cc16..0b314cc16 100644 --- a/data/maps/NavelRock_Fork/map.bin +++ b/data/layouts/NavelRock_Fork/map.bin diff --git a/data/maps/NavelRock_Up1/border.bin b/data/layouts/NavelRock_LadderRoom1/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/NavelRock_Up1/border.bin +++ b/data/layouts/NavelRock_LadderRoom1/border.bin diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc new file mode 100644 index 000000000..34ff05e39 --- /dev/null +++ b/data/layouts/NavelRock_LadderRoom1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_LadderRoom1_MapBorder:: + .incbin "data/layouts/NavelRock_LadderRoom1/border.bin" + + .align 2 +NavelRock_LadderRoom1_MapBlockdata:: + .incbin "data/layouts/NavelRock_LadderRoom1/map.bin" + + .align 2 +NavelRock_LadderRoom1_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte NavelRock_LadderRoom1_MapBorder + .4byte NavelRock_LadderRoom1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/maps/NavelRock_Up1/map.bin b/data/layouts/NavelRock_LadderRoom1/map.bin index c2951c043..c2951c043 100644 --- a/data/maps/NavelRock_Up1/map.bin +++ b/data/layouts/NavelRock_LadderRoom1/map.bin diff --git a/data/maps/NavelRock_Up2/border.bin b/data/layouts/NavelRock_LadderRoom2/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/NavelRock_Up2/border.bin +++ b/data/layouts/NavelRock_LadderRoom2/border.bin diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc new file mode 100644 index 000000000..a50a32690 --- /dev/null +++ b/data/layouts/NavelRock_LadderRoom2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_LadderRoom2_MapBorder:: + .incbin "data/layouts/NavelRock_LadderRoom2/border.bin" + + .align 2 +NavelRock_LadderRoom2_MapBlockdata:: + .incbin "data/layouts/NavelRock_LadderRoom2/map.bin" + + .align 2 +NavelRock_LadderRoom2_Layout:: + .4byte 0x9 + .4byte 0x8 + .4byte NavelRock_LadderRoom2_MapBorder + .4byte NavelRock_LadderRoom2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/maps/NavelRock_Up2/map.bin b/data/layouts/NavelRock_LadderRoom2/map.bin index 47dd37b93..47dd37b93 100644 --- a/data/maps/NavelRock_Up2/map.bin +++ b/data/layouts/NavelRock_LadderRoom2/map.bin diff --git a/data/maps/NavelRock_Top/border.bin b/data/layouts/NavelRock_Top/border.bin index 8d839d092..8d839d092 100644 --- a/data/maps/NavelRock_Top/border.bin +++ b/data/layouts/NavelRock_Top/border.bin diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc new file mode 100644 index 000000000..6e99e9bf4 --- /dev/null +++ b/data/layouts/NavelRock_Top/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NavelRock_Top_MapBorder:: + .incbin "data/layouts/NavelRock_Top/border.bin" + + .align 2 +NavelRock_Top_MapBlockdata:: + .incbin "data/layouts/NavelRock_Top/map.bin" + + .align 2 +NavelRock_Top_Layout:: + .4byte 0x19 + .4byte 0x1c + .4byte NavelRock_Top_MapBorder + .4byte NavelRock_Top_MapBlockdata + .4byte gTileset_General + .4byte gTileset_NavelRock diff --git a/data/maps/NavelRock_Top/map.bin b/data/layouts/NavelRock_Top/map.bin index fce085ae6..fce085ae6 100644 --- a/data/maps/NavelRock_Top/map.bin +++ b/data/layouts/NavelRock_Top/map.bin diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/layouts/NewMauville_Entrance/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/maps/NewMauville_Entrance/border.bin +++ b/data/layouts/NewMauville_Entrance/border.bin diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc new file mode 100644 index 000000000..78e3edee4 --- /dev/null +++ b/data/layouts/NewMauville_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NewMauville_Entrance_MapBorder:: + .incbin "data/layouts/NewMauville_Entrance/border.bin" + + .align 2 +NewMauville_Entrance_MapBlockdata:: + .incbin "data/layouts/NewMauville_Entrance/map.bin" + + .align 2 +NewMauville_Entrance_Layout:: + .4byte 0x9 + .4byte 0x9 + .4byte NewMauville_Entrance_MapBorder + .4byte NewMauville_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/layouts/NewMauville_Entrance/map.bin index 1e3f471e8..1e3f471e8 100644 --- a/data/maps/NewMauville_Entrance/map.bin +++ b/data/layouts/NewMauville_Entrance/map.bin diff --git a/data/maps/NewMauville_Inside/border.bin b/data/layouts/NewMauville_Inside/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/NewMauville_Inside/border.bin +++ b/data/layouts/NewMauville_Inside/border.bin diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc new file mode 100644 index 000000000..d7dbe6a62 --- /dev/null +++ b/data/layouts/NewMauville_Inside/layout.inc @@ -0,0 +1,16 @@ + .align 2 +NewMauville_Inside_MapBorder:: + .incbin "data/layouts/NewMauville_Inside/border.bin" + + .align 2 +NewMauville_Inside_MapBlockdata:: + .incbin "data/layouts/NewMauville_Inside/map.bin" + + .align 2 +NewMauville_Inside_Layout:: + .4byte 0x29 + .4byte 0x29 + .4byte NewMauville_Inside_MapBorder + .4byte NewMauville_Inside_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BikeShop diff --git a/data/maps/NewMauville_Inside/map.bin b/data/layouts/NewMauville_Inside/map.bin index 78d1e39ce..78d1e39ce 100644 --- a/data/maps/NewMauville_Inside/map.bin +++ b/data/layouts/NewMauville_Inside/map.bin diff --git a/data/maps/OldaleTown/border.bin b/data/layouts/OldaleTown/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/OldaleTown/border.bin +++ b/data/layouts/OldaleTown/border.bin diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc new file mode 100644 index 000000000..7d266cfba --- /dev/null +++ b/data/layouts/OldaleTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +OldaleTown_MapBorder:: + .incbin "data/layouts/OldaleTown/border.bin" + + .align 2 +OldaleTown_MapBlockdata:: + .incbin "data/layouts/OldaleTown/map.bin" + + .align 2 +OldaleTown_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte OldaleTown_MapBorder + .4byte OldaleTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin index 28b17c441..28b17c441 100644 --- a/data/maps/OldaleTown/map.bin +++ b/data/layouts/OldaleTown/map.bin diff --git a/data/maps/PacifidlogTown/border.bin b/data/layouts/PacifidlogTown/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/PacifidlogTown/border.bin +++ b/data/layouts/PacifidlogTown/border.bin diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc new file mode 100644 index 000000000..a87de7036 --- /dev/null +++ b/data/layouts/PacifidlogTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PacifidlogTown_MapBorder:: + .incbin "data/layouts/PacifidlogTown/border.bin" + + .align 2 +PacifidlogTown_MapBlockdata:: + .incbin "data/layouts/PacifidlogTown/map.bin" + + .align 2 +PacifidlogTown_Layout:: + .4byte 0x14 + .4byte 0x28 + .4byte PacifidlogTown_MapBorder + .4byte PacifidlogTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/PacifidlogTown/map.bin b/data/layouts/PacifidlogTown/map.bin index 02c1454bb..02c1454bb 100644 --- a/data/maps/PacifidlogTown/map.bin +++ b/data/layouts/PacifidlogTown/map.bin diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/PacifidlogTown_House2/border.bin +++ b/data/layouts/PacifidlogTown_House1/border.bin diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc new file mode 100644 index 000000000..16f9402ca --- /dev/null +++ b/data/layouts/PacifidlogTown_House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PacifidlogTown_House1_MapBorder:: + .incbin "data/layouts/PacifidlogTown_House1/border.bin" + + .align 2 +PacifidlogTown_House1_MapBlockdata:: + .incbin "data/layouts/PacifidlogTown_House1/map.bin" + + .align 2 +PacifidlogTown_House1_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte PacifidlogTown_House1_MapBorder + .4byte PacifidlogTown_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/layouts/PacifidlogTown_House1/map.bin index 7865fdc7c..7865fdc7c 100644 --- a/data/maps/PacifidlogTown_House1/map.bin +++ b/data/layouts/PacifidlogTown_House1/map.bin diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/PetalburgCity_House2/border.bin +++ b/data/layouts/PacifidlogTown_House2/border.bin diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc new file mode 100644 index 000000000..deb111059 --- /dev/null +++ b/data/layouts/PacifidlogTown_House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PacifidlogTown_House2_MapBorder:: + .incbin "data/layouts/PacifidlogTown_House2/border.bin" + + .align 2 +PacifidlogTown_House2_MapBlockdata:: + .incbin "data/layouts/PacifidlogTown_House2/map.bin" + + .align 2 +PacifidlogTown_House2_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte PacifidlogTown_House2_MapBorder + .4byte PacifidlogTown_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/layouts/PacifidlogTown_House2/map.bin index 617346322..617346322 100644 --- a/data/maps/PacifidlogTown_House2/map.bin +++ b/data/layouts/PacifidlogTown_House2/map.bin diff --git a/data/maps/PetalburgCity/border.bin b/data/layouts/PetalburgCity/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/PetalburgCity/border.bin +++ b/data/layouts/PetalburgCity/border.bin diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc new file mode 100644 index 000000000..c458140a9 --- /dev/null +++ b/data/layouts/PetalburgCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PetalburgCity_MapBorder:: + .incbin "data/layouts/PetalburgCity/border.bin" + + .align 2 +PetalburgCity_MapBlockdata:: + .incbin "data/layouts/PetalburgCity/map.bin" + + .align 2 +PetalburgCity_Layout:: + .4byte 0x1e + .4byte 0x1e + .4byte PetalburgCity_MapBorder + .4byte PetalburgCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin index 35f0172ca..35f0172ca 100644 --- a/data/maps/PetalburgCity/map.bin +++ b/data/layouts/PetalburgCity/map.bin diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/layouts/PetalburgCity_Gym/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/PetalburgCity_Gym/border.bin +++ b/data/layouts/PetalburgCity_Gym/border.bin diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc new file mode 100644 index 000000000..974b95baf --- /dev/null +++ b/data/layouts/PetalburgCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PetalburgCity_Gym_MapBorder:: + .incbin "data/layouts/PetalburgCity_Gym/border.bin" + + .align 2 +PetalburgCity_Gym_MapBlockdata:: + .incbin "data/layouts/PetalburgCity_Gym/map.bin" + + .align 2 +PetalburgCity_Gym_Layout:: + .4byte 0x9 + .4byte 0x70 + .4byte PetalburgCity_Gym_MapBorder + .4byte PetalburgCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PetalburgGym diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/layouts/PetalburgCity_Gym/map.bin index 17d5ba980..17d5ba980 100644 --- a/data/maps/PetalburgCity_Gym/map.bin +++ b/data/layouts/PetalburgCity_Gym/map.bin diff --git a/data/maps/PetalburgWoods/border.bin b/data/layouts/PetalburgWoods/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/PetalburgWoods/border.bin +++ b/data/layouts/PetalburgWoods/border.bin diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc new file mode 100644 index 000000000..6ee24ef31 --- /dev/null +++ b/data/layouts/PetalburgWoods/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PetalburgWoods_MapBorder:: + .incbin "data/layouts/PetalburgWoods/border.bin" + + .align 2 +PetalburgWoods_MapBlockdata:: + .incbin "data/layouts/PetalburgWoods/map.bin" + + .align 2 +PetalburgWoods_Layout:: + .4byte 0x30 + .4byte 0x2c + .4byte PetalburgWoods_MapBorder + .4byte PetalburgWoods_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin index a032b4c43..a032b4c43 100644 --- a/data/maps/PetalburgWoods/map.bin +++ b/data/layouts/PetalburgWoods/map.bin diff --git a/data/maps/RecordCorner/border.bin b/data/layouts/PokemonCenter_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RecordCorner/border.bin +++ b/data/layouts/PokemonCenter_1F/border.bin diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc new file mode 100644 index 000000000..4d299d407 --- /dev/null +++ b/data/layouts/PokemonCenter_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PokemonCenter_1F_MapBorder:: + .incbin "data/layouts/PokemonCenter_1F/border.bin" + + .align 2 +PokemonCenter_1F_MapBlockdata:: + .incbin "data/layouts/PokemonCenter_1F/map.bin" + + .align 2 +PokemonCenter_1F_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte PokemonCenter_1F_MapBorder + .4byte PokemonCenter_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F/map.bin index 5201dde15..5201dde15 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.bin +++ b/data/layouts/PokemonCenter_1F/map.bin diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/layouts/PokemonCenter_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route104_MrBrineysHouse/border.bin +++ b/data/layouts/PokemonCenter_2F/border.bin diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc new file mode 100644 index 000000000..cc2aba89a --- /dev/null +++ b/data/layouts/PokemonCenter_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +PokemonCenter_2F_MapBorder:: + .incbin "data/layouts/PokemonCenter_2F/border.bin" + + .align 2 +PokemonCenter_2F_MapBlockdata:: + .incbin "data/layouts/PokemonCenter_2F/map.bin" + + .align 2 +PokemonCenter_2F_Layout:: + .4byte 0xe + .4byte 0xa + .4byte PokemonCenter_2F_MapBorder + .4byte PokemonCenter_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F/map.bin index c623d86fc..c623d86fc 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin +++ b/data/layouts/PokemonCenter_2F/map.bin diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/layouts/RecordCorner/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route110_TrickHouseCorridor/border.bin +++ b/data/layouts/RecordCorner/border.bin diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc new file mode 100644 index 000000000..ab18faa0d --- /dev/null +++ b/data/layouts/RecordCorner/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RecordCorner_MapBorder:: + .incbin "data/layouts/RecordCorner/border.bin" + + .align 2 +RecordCorner_MapBlockdata:: + .incbin "data/layouts/RecordCorner/map.bin" + + .align 2 +RecordCorner_Layout:: + .4byte 0x14 + .4byte 0xa + .4byte RecordCorner_MapBorder + .4byte RecordCorner_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/RecordCorner/map.bin b/data/layouts/RecordCorner/map.bin index 51dfb6e5a..51dfb6e5a 100644 --- a/data/maps/RecordCorner/map.bin +++ b/data/layouts/RecordCorner/map.bin diff --git a/data/maps/Route101/border.bin b/data/layouts/Route101/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route101/border.bin +++ b/data/layouts/Route101/border.bin diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc new file mode 100644 index 000000000..54193c343 --- /dev/null +++ b/data/layouts/Route101/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route101_MapBorder:: + .incbin "data/layouts/Route101/border.bin" + + .align 2 +Route101_MapBlockdata:: + .incbin "data/layouts/Route101/map.bin" + + .align 2 +Route101_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte Route101_MapBorder + .4byte Route101_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/Route101/map.bin b/data/layouts/Route101/map.bin index fab3a1d69..fab3a1d69 100644 --- a/data/maps/Route101/map.bin +++ b/data/layouts/Route101/map.bin diff --git a/data/maps/Route102/border.bin b/data/layouts/Route102/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route102/border.bin +++ b/data/layouts/Route102/border.bin diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc new file mode 100644 index 000000000..eaf962db2 --- /dev/null +++ b/data/layouts/Route102/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route102_MapBorder:: + .incbin "data/layouts/Route102/border.bin" + + .align 2 +Route102_MapBlockdata:: + .incbin "data/layouts/Route102/map.bin" + + .align 2 +Route102_Layout:: + .4byte 0x32 + .4byte 0x14 + .4byte Route102_MapBorder + .4byte Route102_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/Route102/map.bin b/data/layouts/Route102/map.bin index 7378bb44b..7378bb44b 100644 --- a/data/maps/Route102/map.bin +++ b/data/layouts/Route102/map.bin diff --git a/data/maps/Route103/border.bin b/data/layouts/Route103/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route103/border.bin +++ b/data/layouts/Route103/border.bin diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc new file mode 100644 index 000000000..eaf00808e --- /dev/null +++ b/data/layouts/Route103/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route103_MapBorder:: + .incbin "data/layouts/Route103/border.bin" + + .align 2 +Route103_MapBlockdata:: + .incbin "data/layouts/Route103/map.bin" + + .align 2 +Route103_Layout:: + .4byte 0x50 + .4byte 0x16 + .4byte Route103_MapBorder + .4byte Route103_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/Route103/map.bin b/data/layouts/Route103/map.bin index 44518dc92..44518dc92 100644 --- a/data/maps/Route103/map.bin +++ b/data/layouts/Route103/map.bin diff --git a/data/maps/Route104/border.bin b/data/layouts/Route104/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route104/border.bin +++ b/data/layouts/Route104/border.bin diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc new file mode 100644 index 000000000..58a000d70 --- /dev/null +++ b/data/layouts/Route104/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route104_MapBorder:: + .incbin "data/layouts/Route104/border.bin" + + .align 2 +Route104_MapBlockdata:: + .incbin "data/layouts/Route104/map.bin" + + .align 2 +Route104_Layout:: + .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 Binary files differindex 7731bc31c..7731bc31c 100644 --- a/data/maps/Route104/map.bin +++ b/data/layouts/Route104/map.bin diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/layouts/Route104_MrBrineysHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route110_TrickHouseEnd/border.bin +++ b/data/layouts/Route104_MrBrineysHouse/border.bin diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc new file mode 100644 index 000000000..039901d0a --- /dev/null +++ b/data/layouts/Route104_MrBrineysHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route104_MrBrineysHouse_MapBorder:: + .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" + + .align 2 +Route104_MrBrineysHouse_MapBlockdata:: + .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" + + .align 2 +Route104_MrBrineysHouse_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte Route104_MrBrineysHouse_MapBorder + .4byte Route104_MrBrineysHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/layouts/Route104_MrBrineysHouse/map.bin index 7660fd5d7..7660fd5d7 100644 --- a/data/maps/Route104_MrBrineysHouse/map.bin +++ b/data/layouts/Route104_MrBrineysHouse/map.bin diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/border.bin +++ b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc new file mode 100644 index 000000000..0510c9028 --- /dev/null +++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route104_PrettyPetalFlowerShop_MapBorder:: + .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" + + .align 2 +Route104_PrettyPetalFlowerShop_MapBlockdata:: + .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" + + .align 2 +Route104_PrettyPetalFlowerShop_Layout:: + .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 Binary files differindex d34ff5c1a..d34ff5c1a 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.bin +++ b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin diff --git a/data/maps/Route104_Prototype/border.bin b/data/layouts/Route104_Prototype/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route104_Prototype/border.bin +++ b/data/layouts/Route104_Prototype/border.bin diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc new file mode 100644 index 000000000..eb70f55c9 --- /dev/null +++ b/data/layouts/Route104_Prototype/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route104_Prototype_MapBorder:: + .incbin "data/layouts/Route104_Prototype/border.bin" + + .align 2 +Route104_Prototype_MapBlockdata:: + .incbin "data/layouts/Route104_Prototype/map.bin" + + .align 2 +Route104_Prototype_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte Route104_Prototype_MapBorder + .4byte Route104_Prototype_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/Route104_Prototype/map.bin b/data/layouts/Route104_Prototype/map.bin index 71bd63e62..71bd63e62 100644 --- a/data/maps/Route104_Prototype/map.bin +++ b/data/layouts/Route104_Prototype/map.bin diff --git a/data/maps/Route105/border.bin b/data/layouts/Route105/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route105/border.bin +++ b/data/layouts/Route105/border.bin diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc new file mode 100644 index 000000000..4156bc9a4 --- /dev/null +++ b/data/layouts/Route105/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route105_MapBorder:: + .incbin "data/layouts/Route105/border.bin" + + .align 2 +Route105_MapBlockdata:: + .incbin "data/layouts/Route105/map.bin" + + .align 2 +Route105_Layout:: + .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 Binary files differindex c4bd8286c..c4bd8286c 100644 --- a/data/maps/Route105/map.bin +++ b/data/layouts/Route105/map.bin diff --git a/data/maps/Route106/border.bin b/data/layouts/Route106/border.bin index 281762f5b..281762f5b 100644 --- a/data/maps/Route106/border.bin +++ b/data/layouts/Route106/border.bin diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc new file mode 100644 index 000000000..ff43ced2e --- /dev/null +++ b/data/layouts/Route106/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route106_MapBorder:: + .incbin "data/layouts/Route106/border.bin" + + .align 2 +Route106_MapBlockdata:: + .incbin "data/layouts/Route106/map.bin" + + .align 2 +Route106_Layout:: + .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 Binary files differindex b7e7d7238..b7e7d7238 100644 --- a/data/maps/Route106/map.bin +++ b/data/layouts/Route106/map.bin diff --git a/data/maps/Route107/border.bin b/data/layouts/Route107/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route107/border.bin +++ b/data/layouts/Route107/border.bin diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc new file mode 100644 index 000000000..9de501c61 --- /dev/null +++ b/data/layouts/Route107/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route107_MapBorder:: + .incbin "data/layouts/Route107/border.bin" + + .align 2 +Route107_MapBlockdata:: + .incbin "data/layouts/Route107/map.bin" + + .align 2 +Route107_Layout:: + .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 Binary files differindex 521997b0f..521997b0f 100644 --- a/data/maps/Route107/map.bin +++ b/data/layouts/Route107/map.bin diff --git a/data/maps/Route108/border.bin b/data/layouts/Route108/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route108/border.bin +++ b/data/layouts/Route108/border.bin diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc new file mode 100644 index 000000000..10fd278b3 --- /dev/null +++ b/data/layouts/Route108/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route108_MapBorder:: + .incbin "data/layouts/Route108/border.bin" + + .align 2 +Route108_MapBlockdata:: + .incbin "data/layouts/Route108/map.bin" + + .align 2 +Route108_Layout:: + .4byte 0x3c + .4byte 0x14 + .4byte Route108_MapBorder + .4byte Route108_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Slateport diff --git a/data/maps/Route108/map.bin b/data/layouts/Route108/map.bin index 138ddc020..138ddc020 100644 --- a/data/maps/Route108/map.bin +++ b/data/layouts/Route108/map.bin diff --git a/data/maps/Route109/border.bin b/data/layouts/Route109/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route109/border.bin +++ b/data/layouts/Route109/border.bin diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc new file mode 100644 index 000000000..f6d4864bf --- /dev/null +++ b/data/layouts/Route109/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route109_MapBorder:: + .incbin "data/layouts/Route109/border.bin" + + .align 2 +Route109_MapBlockdata:: + .incbin "data/layouts/Route109/map.bin" + + .align 2 +Route109_Layout:: + .4byte 0x28 + .4byte 0x3f + .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 Binary files differindex 62350867e..62350867e 100644 --- a/data/maps/Route109/map.bin +++ b/data/layouts/Route109/map.bin diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/layouts/Route109_SeashoreHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route109_SeashoreHouse/border.bin +++ b/data/layouts/Route109_SeashoreHouse/border.bin diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc new file mode 100644 index 000000000..316c1fc1b --- /dev/null +++ b/data/layouts/Route109_SeashoreHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route109_SeashoreHouse_MapBorder:: + .incbin "data/layouts/Route109_SeashoreHouse/border.bin" + + .align 2 +Route109_SeashoreHouse_MapBlockdata:: + .incbin "data/layouts/Route109_SeashoreHouse/map.bin" + + .align 2 +Route109_SeashoreHouse_Layout:: + .4byte 0xf + .4byte 0xa + .4byte Route109_SeashoreHouse_MapBorder + .4byte Route109_SeashoreHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_SeashoreHouse diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/layouts/Route109_SeashoreHouse/map.bin index cb7853a17..cb7853a17 100644 --- a/data/maps/Route109_SeashoreHouse/map.bin +++ b/data/layouts/Route109_SeashoreHouse/map.bin diff --git a/data/maps/Route110/border.bin b/data/layouts/Route110/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route110/border.bin +++ b/data/layouts/Route110/border.bin diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc new file mode 100644 index 000000000..1539ae91d --- /dev/null +++ b/data/layouts/Route110/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_MapBorder:: + .incbin "data/layouts/Route110/border.bin" + + .align 2 +Route110_MapBlockdata:: + .incbin "data/layouts/Route110/map.bin" + + .align 2 +Route110_Layout:: + .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 Binary files differindex ac83cb93d..ac83cb93d 100644 --- a/data/maps/Route110/map.bin +++ b/data/layouts/Route110/map.bin diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin +++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc new file mode 100644 index 000000000..4f804ef53 --- /dev/null +++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_SeasideCyclingRoadEntrance_MapBorder:: + .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin" + + .align 2 +Route110_SeasideCyclingRoadEntrance_MapBlockdata:: + .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" + + .align 2 +Route110_SeasideCyclingRoadEntrance_Layout:: + .4byte 0xf + .4byte 0x6 + .4byte Route110_SeasideCyclingRoadEntrance_MapBorder + .4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin b/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin index e9fc770d4..e9fc770d4 100644 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin +++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/layouts/Route110_TrickHouseCorridor/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route110_TrickHouseEntrance/border.bin +++ b/data/layouts/Route110_TrickHouseCorridor/border.bin diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc new file mode 100644 index 000000000..8f9c4d9ee --- /dev/null +++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHouseCorridor_MapBorder:: + .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" + + .align 2 +Route110_TrickHouseCorridor_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" + + .align 2 +Route110_TrickHouseCorridor_Layout:: + .4byte 0xf + .4byte 0x18 + .4byte Route110_TrickHouseCorridor_MapBorder + .4byte Route110_TrickHouseCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/layouts/Route110_TrickHouseCorridor/map.bin index 8981d28bd..8981d28bd 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.bin +++ b/data/layouts/Route110_TrickHouseCorridor/map.bin diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/layouts/Route110_TrickHouseEnd/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route112_CableCarStation/border.bin +++ b/data/layouts/Route110_TrickHouseEnd/border.bin diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc new file mode 100644 index 000000000..ee2b6b47f --- /dev/null +++ b/data/layouts/Route110_TrickHouseEnd/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHouseEnd_MapBorder:: + .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" + + .align 2 +Route110_TrickHouseEnd_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" + + .align 2 +Route110_TrickHouseEnd_Layout:: + .4byte 0xc + .4byte 0x8 + .4byte Route110_TrickHouseEnd_MapBorder + .4byte Route110_TrickHouseEnd_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/layouts/Route110_TrickHouseEnd/map.bin index 506fdb644..506fdb644 100644 --- a/data/maps/Route110_TrickHouseEnd/map.bin +++ b/data/layouts/Route110_TrickHouseEnd/map.bin diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/layouts/Route110_TrickHouseEntrance/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route114_FossilManiacsHouse/border.bin +++ b/data/layouts/Route110_TrickHouseEntrance/border.bin diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc new file mode 100644 index 000000000..ec9636627 --- /dev/null +++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHouseEntrance_MapBorder:: + .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" + + .align 2 +Route110_TrickHouseEntrance_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" + + .align 2 +Route110_TrickHouseEntrance_Layout:: + .4byte 0xc + .4byte 0x8 + .4byte Route110_TrickHouseEntrance_MapBorder + .4byte Route110_TrickHouseEntrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/layouts/Route110_TrickHouseEntrance/map.bin index 1306bb9b5..1306bb9b5 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.bin +++ b/data/layouts/Route110_TrickHouseEntrance/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/layouts/Route110_TrickHousePuzzle1/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle1/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle1/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc new file mode 100644 index 000000000..d8aadf110 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle1_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" + + .align 2 +Route110_TrickHousePuzzle1_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" + + .align 2 +Route110_TrickHousePuzzle1_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle1_MapBorder + .4byte Route110_TrickHousePuzzle1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/layouts/Route110_TrickHousePuzzle1/map.bin index 2bf5b392c..2bf5b392c 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle1/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/layouts/Route110_TrickHousePuzzle2/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle2/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle2/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc new file mode 100644 index 000000000..59bc2d06c --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle2_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" + + .align 2 +Route110_TrickHousePuzzle2_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" + + .align 2 +Route110_TrickHousePuzzle2_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle2_MapBorder + .4byte Route110_TrickHousePuzzle2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/layouts/Route110_TrickHousePuzzle2/map.bin index cb35a063e..cb35a063e 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle2/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/layouts/Route110_TrickHousePuzzle3/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle3/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle3/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc new file mode 100644 index 000000000..384a84032 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle3_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" + + .align 2 +Route110_TrickHousePuzzle3_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" + + .align 2 +Route110_TrickHousePuzzle3_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle3_MapBorder + .4byte Route110_TrickHousePuzzle3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/layouts/Route110_TrickHousePuzzle3/map.bin index ac4f344d9..ac4f344d9 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle3/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/layouts/Route110_TrickHousePuzzle4/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle4/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle4/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc new file mode 100644 index 000000000..3524e092d --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle4_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" + + .align 2 +Route110_TrickHousePuzzle4_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" + + .align 2 +Route110_TrickHousePuzzle4_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle4_MapBorder + .4byte Route110_TrickHousePuzzle4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/layouts/Route110_TrickHousePuzzle4/map.bin index 2dbcf251b..2dbcf251b 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle4/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/layouts/Route110_TrickHousePuzzle5/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle5/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle5/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc new file mode 100644 index 000000000..06f105c71 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle5_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" + + .align 2 +Route110_TrickHousePuzzle5_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" + + .align 2 +Route110_TrickHousePuzzle5_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle5_MapBorder + .4byte Route110_TrickHousePuzzle5_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/layouts/Route110_TrickHousePuzzle5/map.bin index 470e3eba3..470e3eba3 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle5/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/layouts/Route110_TrickHousePuzzle6/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle6/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle6/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc new file mode 100644 index 000000000..b11da0a1d --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle6_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" + + .align 2 +Route110_TrickHousePuzzle6_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" + + .align 2 +Route110_TrickHousePuzzle6_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle6_MapBorder + .4byte Route110_TrickHousePuzzle6_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/layouts/Route110_TrickHousePuzzle6/map.bin index 45dc20ba1..45dc20ba1 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle6/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/layouts/Route110_TrickHousePuzzle7/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle7/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle7/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc new file mode 100644 index 000000000..8d9e88b7e --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle7_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" + + .align 2 +Route110_TrickHousePuzzle7_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" + + .align 2 +Route110_TrickHousePuzzle7_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle7_MapBorder + .4byte Route110_TrickHousePuzzle7_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/layouts/Route110_TrickHousePuzzle7/map.bin index 68ac73547..68ac73547 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle7/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/layouts/Route110_TrickHousePuzzle8/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle8/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle8/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc new file mode 100644 index 000000000..139cefadc --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route110_TrickHousePuzzle8_MapBorder:: + .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" + + .align 2 +Route110_TrickHousePuzzle8_MapBlockdata:: + .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" + + .align 2 +Route110_TrickHousePuzzle8_Layout:: + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle8_MapBorder + .4byte Route110_TrickHousePuzzle8_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/layouts/Route110_TrickHousePuzzle8/map.bin index b59b0f606..b59b0f606 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle8/map.bin diff --git a/data/maps/Route111/border.bin b/data/layouts/Route111/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/maps/Route111/border.bin +++ b/data/layouts/Route111/border.bin diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc new file mode 100644 index 000000000..911ecfcb0 --- /dev/null +++ b/data/layouts/Route111/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route111_MapBorder:: + .incbin "data/layouts/Route111/border.bin" + + .align 2 +Route111_MapBlockdata:: + .incbin "data/layouts/Route111/map.bin" + + .align 2 +Route111_Layout:: + .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 Binary files differindex 4ce11a8a9..4ce11a8a9 100644 --- a/data/maps/Route111/map.bin +++ b/data/layouts/Route111/map.bin diff --git a/data/maps/Route112/border.bin b/data/layouts/Route112/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/Route112/border.bin +++ b/data/layouts/Route112/border.bin diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc new file mode 100644 index 000000000..22aae208c --- /dev/null +++ b/data/layouts/Route112/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route112_MapBorder:: + .incbin "data/layouts/Route112/border.bin" + + .align 2 +Route112_MapBlockdata:: + .incbin "data/layouts/Route112/map.bin" + + .align 2 +Route112_Layout:: + .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 Binary files differindex ef3fd5f10..ef3fd5f10 100644 --- a/data/maps/Route112/map.bin +++ b/data/layouts/Route112/map.bin diff --git a/data/maps/Route113/border.bin b/data/layouts/Route113/border.bin index 73e1e3c60..73e1e3c60 100644 --- a/data/maps/Route113/border.bin +++ b/data/layouts/Route113/border.bin diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc new file mode 100644 index 000000000..a6a438986 --- /dev/null +++ b/data/layouts/Route113/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route113_MapBorder:: + .incbin "data/layouts/Route113/border.bin" + + .align 2 +Route113_MapBlockdata:: + .incbin "data/layouts/Route113/map.bin" + + .align 2 +Route113_Layout:: + .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 Binary files differindex 609690de2..609690de2 100644 --- a/data/maps/Route113/map.bin +++ b/data/layouts/Route113/map.bin diff --git a/data/maps/Route114/border.bin b/data/layouts/Route114/border.bin index 23e2a92e5..23e2a92e5 100644 --- a/data/maps/Route114/border.bin +++ b/data/layouts/Route114/border.bin diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc new file mode 100644 index 000000000..1391ce296 --- /dev/null +++ b/data/layouts/Route114/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route114_MapBorder:: + .incbin "data/layouts/Route114/border.bin" + + .align 2 +Route114_MapBlockdata:: + .incbin "data/layouts/Route114/map.bin" + + .align 2 +Route114_Layout:: + .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 Binary files differindex 3bad45e04..3bad45e04 100644 --- a/data/maps/Route114/map.bin +++ b/data/layouts/Route114/map.bin diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/layouts/Route114_FossilManiacsHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route114_LanettesHouse/border.bin +++ b/data/layouts/Route114_FossilManiacsHouse/border.bin diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc new file mode 100644 index 000000000..314090849 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route114_FossilManiacsHouse_MapBorder:: + .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" + + .align 2 +Route114_FossilManiacsHouse_MapBlockdata:: + .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" + + .align 2 +Route114_FossilManiacsHouse_Layout:: + .4byte 0xa + .4byte 0x8 + .4byte Route114_FossilManiacsHouse_MapBorder + .4byte Route114_FossilManiacsHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/layouts/Route114_FossilManiacsHouse/map.bin index ea2d94fda..ea2d94fda 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.bin +++ b/data/layouts/Route114_FossilManiacsHouse/map.bin diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/layouts/Route114_FossilManiacsTunnel/border.bin index 580a207f4..580a207f4 100644 --- a/data/maps/Route114_FossilManiacsTunnel/border.bin +++ b/data/layouts/Route114_FossilManiacsTunnel/border.bin diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc new file mode 100644 index 000000000..90a891b57 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route114_FossilManiacsTunnel_MapBorder:: + .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" + + .align 2 +Route114_FossilManiacsTunnel_MapBlockdata:: + .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" + + .align 2 +Route114_FossilManiacsTunnel_Layout:: + .4byte 0xd + .4byte 0x1a + .4byte Route114_FossilManiacsTunnel_MapBorder + .4byte Route114_FossilManiacsTunnel_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/layouts/Route114_FossilManiacsTunnel/map.bin index 61838bff2..61838bff2 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.bin +++ b/data/layouts/Route114_FossilManiacsTunnel/map.bin diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/layouts/Route114_LanettesHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route116_TunnelersRestHouse/border.bin +++ b/data/layouts/Route114_LanettesHouse/border.bin diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc new file mode 100644 index 000000000..e1f2354c1 --- /dev/null +++ b/data/layouts/Route114_LanettesHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route114_LanettesHouse_MapBorder:: + .incbin "data/layouts/Route114_LanettesHouse/border.bin" + + .align 2 +Route114_LanettesHouse_MapBlockdata:: + .incbin "data/layouts/Route114_LanettesHouse/map.bin" + + .align 2 +Route114_LanettesHouse_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte Route114_LanettesHouse_MapBorder + .4byte Route114_LanettesHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/layouts/Route114_LanettesHouse/map.bin index de1858be4..de1858be4 100644 --- a/data/maps/Route114_LanettesHouse/map.bin +++ b/data/layouts/Route114_LanettesHouse/map.bin diff --git a/data/maps/Route115/border.bin b/data/layouts/Route115/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route115/border.bin +++ b/data/layouts/Route115/border.bin diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc new file mode 100644 index 000000000..1a5121474 --- /dev/null +++ b/data/layouts/Route115/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route115_MapBorder:: + .incbin "data/layouts/Route115/border.bin" + + .align 2 +Route115_MapBlockdata:: + .incbin "data/layouts/Route115/map.bin" + + .align 2 +Route115_Layout:: + .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 Binary files differindex 64a58e691..64a58e691 100644 --- a/data/maps/Route115/map.bin +++ b/data/layouts/Route115/map.bin diff --git a/data/maps/Route116/border.bin b/data/layouts/Route116/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route116/border.bin +++ b/data/layouts/Route116/border.bin diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc new file mode 100644 index 000000000..54471a0e0 --- /dev/null +++ b/data/layouts/Route116/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route116_MapBorder:: + .incbin "data/layouts/Route116/border.bin" + + .align 2 +Route116_MapBlockdata:: + .incbin "data/layouts/Route116/map.bin" + + .align 2 +Route116_Layout:: + .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 Binary files differindex a6e9d8843..a6e9d8843 100644 --- a/data/maps/Route116/map.bin +++ b/data/layouts/Route116/map.bin diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/layouts/Route116_TunnelersRestHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route119_WeatherInstitute_1F/border.bin +++ b/data/layouts/Route116_TunnelersRestHouse/border.bin diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc new file mode 100644 index 000000000..4faea6ce6 --- /dev/null +++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route116_TunnelersRestHouse_MapBorder:: + .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" + + .align 2 +Route116_TunnelersRestHouse_MapBlockdata:: + .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" + + .align 2 +Route116_TunnelersRestHouse_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte Route116_TunnelersRestHouse_MapBorder + .4byte Route116_TunnelersRestHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/layouts/Route116_TunnelersRestHouse/map.bin index 91e2c2019..91e2c2019 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.bin +++ b/data/layouts/Route116_TunnelersRestHouse/map.bin diff --git a/data/maps/Route117/border.bin b/data/layouts/Route117/border.bin Binary files differindex addb5d6ce..addb5d6ce 100644 --- a/data/maps/Route117/border.bin +++ b/data/layouts/Route117/border.bin diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc new file mode 100644 index 000000000..75b7f0d98 --- /dev/null +++ b/data/layouts/Route117/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route117_MapBorder:: + .incbin "data/layouts/Route117/border.bin" + + .align 2 +Route117_MapBlockdata:: + .incbin "data/layouts/Route117/map.bin" + + .align 2 +Route117_Layout:: + .4byte 0x3c + .4byte 0x14 + .4byte Route117_MapBorder + .4byte Route117_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/maps/Route117/map.bin b/data/layouts/Route117/map.bin index bdeda9cd4..bdeda9cd4 100644 --- a/data/maps/Route117/map.bin +++ b/data/layouts/Route117/map.bin diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/layouts/Route117_PokemonDayCare/border.bin index 7f603e844..7f603e844 100644 --- a/data/maps/Route117_PokemonDayCare/border.bin +++ b/data/layouts/Route117_PokemonDayCare/border.bin diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc new file mode 100644 index 000000000..0589c2d1b --- /dev/null +++ b/data/layouts/Route117_PokemonDayCare/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route117_PokemonDayCare_MapBorder:: + .incbin "data/layouts/Route117_PokemonDayCare/border.bin" + + .align 2 +Route117_PokemonDayCare_MapBlockdata:: + .incbin "data/layouts/Route117_PokemonDayCare/map.bin" + + .align 2 +Route117_PokemonDayCare_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte Route117_PokemonDayCare_MapBorder + .4byte Route117_PokemonDayCare_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonDayCare diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/layouts/Route117_PokemonDayCare/map.bin index bd4b64e13..bd4b64e13 100644 --- a/data/maps/Route117_PokemonDayCare/map.bin +++ b/data/layouts/Route117_PokemonDayCare/map.bin diff --git a/data/maps/Route118/border.bin b/data/layouts/Route118/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route118/border.bin +++ b/data/layouts/Route118/border.bin diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc new file mode 100644 index 000000000..a78bd28de --- /dev/null +++ b/data/layouts/Route118/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route118_MapBorder:: + .incbin "data/layouts/Route118/border.bin" + + .align 2 +Route118_MapBlockdata:: + .incbin "data/layouts/Route118/map.bin" + + .align 2 +Route118_Layout:: + .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 Binary files differindex dfd8a293d..dfd8a293d 100644 --- a/data/maps/Route118/map.bin +++ b/data/layouts/Route118/map.bin diff --git a/data/maps/Route119/border.bin b/data/layouts/Route119/border.bin Binary files differindex 864ac15fa..864ac15fa 100644 --- a/data/maps/Route119/border.bin +++ b/data/layouts/Route119/border.bin diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc new file mode 100644 index 000000000..0f288c2c5 --- /dev/null +++ b/data/layouts/Route119/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route119_MapBorder:: + .incbin "data/layouts/Route119/border.bin" + + .align 2 +Route119_MapBlockdata:: + .incbin "data/layouts/Route119/map.bin" + + .align 2 +Route119_Layout:: + .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 Binary files differindex 1126455a2..1126455a2 100644 --- a/data/maps/Route119/map.bin +++ b/data/layouts/Route119/map.bin diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/layouts/Route119_WeatherInstitute_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route119_WeatherInstitute_2F/border.bin +++ b/data/layouts/Route119_WeatherInstitute_1F/border.bin diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc new file mode 100644 index 000000000..35ae95d37 --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route119_WeatherInstitute_1F_MapBorder:: + .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin" + + .align 2 +Route119_WeatherInstitute_1F_MapBlockdata:: + .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin" + + .align 2 +Route119_WeatherInstitute_1F_Layout:: + .4byte 0x14 + .4byte 0xd + .4byte Route119_WeatherInstitute_1F_MapBorder + .4byte Route119_WeatherInstitute_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/layouts/Route119_WeatherInstitute_1F/map.bin index 07a4e7ebb..07a4e7ebb 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.bin +++ b/data/layouts/Route119_WeatherInstitute_1F/map.bin diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/layouts/Route119_WeatherInstitute_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_CuttersHouse/border.bin +++ b/data/layouts/Route119_WeatherInstitute_2F/border.bin diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc new file mode 100644 index 000000000..476ebf4fa --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route119_WeatherInstitute_2F_MapBorder:: + .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin" + + .align 2 +Route119_WeatherInstitute_2F_MapBlockdata:: + .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin" + + .align 2 +Route119_WeatherInstitute_2F_Layout:: + .4byte 0x14 + .4byte 0xb + .4byte Route119_WeatherInstitute_2F_MapBorder + .4byte Route119_WeatherInstitute_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/layouts/Route119_WeatherInstitute_2F/map.bin index 97953f463..97953f463 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.bin +++ b/data/layouts/Route119_WeatherInstitute_2F/map.bin diff --git a/data/maps/Route120/border.bin b/data/layouts/Route120/border.bin Binary files differindex 864ac15fa..864ac15fa 100644 --- a/data/maps/Route120/border.bin +++ b/data/layouts/Route120/border.bin diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc new file mode 100644 index 000000000..a58e60aee --- /dev/null +++ b/data/layouts/Route120/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route120_MapBorder:: + .incbin "data/layouts/Route120/border.bin" + + .align 2 +Route120_MapBlockdata:: + .incbin "data/layouts/Route120/map.bin" + + .align 2 +Route120_Layout:: + .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 Binary files differindex 599e6014d..599e6014d 100644 --- a/data/maps/Route120/map.bin +++ b/data/layouts/Route120/map.bin diff --git a/data/maps/Route121/border.bin b/data/layouts/Route121/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route121/border.bin +++ b/data/layouts/Route121/border.bin diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc new file mode 100644 index 000000000..0e39c4d35 --- /dev/null +++ b/data/layouts/Route121/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route121_MapBorder:: + .incbin "data/layouts/Route121/border.bin" + + .align 2 +Route121_MapBlockdata:: + .incbin "data/layouts/Route121/map.bin" + + .align 2 +Route121_Layout:: + .4byte 0x50 + .4byte 0x14 + .4byte Route121_MapBorder + .4byte Route121_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/Route121/map.bin b/data/layouts/Route121/map.bin index cfee98f2a..cfee98f2a 100644 --- a/data/maps/Route121/map.bin +++ b/data/layouts/Route121/map.bin diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/layouts/Route121_SafariZoneEntrance/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route121_SafariZoneEntrance/border.bin +++ b/data/layouts/Route121_SafariZoneEntrance/border.bin diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc new file mode 100644 index 000000000..f28d1b4dc --- /dev/null +++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route121_SafariZoneEntrance_MapBorder:: + .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" + + .align 2 +Route121_SafariZoneEntrance_MapBlockdata:: + .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" + + .align 2 +Route121_SafariZoneEntrance_Layout:: + .4byte 0x12 + .4byte 0xe + .4byte Route121_SafariZoneEntrance_MapBorder + .4byte Route121_SafariZoneEntrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/layouts/Route121_SafariZoneEntrance/map.bin index 35c1badac..35c1badac 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.bin +++ b/data/layouts/Route121_SafariZoneEntrance/map.bin diff --git a/data/maps/Route122/border.bin b/data/layouts/Route122/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route122/border.bin +++ b/data/layouts/Route122/border.bin diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc new file mode 100644 index 000000000..39f70e4e4 --- /dev/null +++ b/data/layouts/Route122/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route122_MapBorder:: + .incbin "data/layouts/Route122/border.bin" + + .align 2 +Route122_MapBlockdata:: + .incbin "data/layouts/Route122/map.bin" + + .align 2 +Route122_Layout:: + .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 Binary files differindex 1c76b0b0a..1c76b0b0a 100644 --- a/data/maps/Route122/map.bin +++ b/data/layouts/Route122/map.bin diff --git a/data/maps/Route123/border.bin b/data/layouts/Route123/border.bin Binary files differindex 864ac15fa..864ac15fa 100644 --- a/data/maps/Route123/border.bin +++ b/data/layouts/Route123/border.bin diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc new file mode 100644 index 000000000..db9093ba9 --- /dev/null +++ b/data/layouts/Route123/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route123_MapBorder:: + .incbin "data/layouts/Route123/border.bin" + + .align 2 +Route123_MapBlockdata:: + .incbin "data/layouts/Route123/map.bin" + + .align 2 +Route123_Layout:: + .4byte 0x8c + .4byte 0x14 + .4byte Route123_MapBorder + .4byte Route123_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/Route123/map.bin b/data/layouts/Route123/map.bin index e1ab62bd7..e1ab62bd7 100644 --- a/data/maps/Route123/map.bin +++ b/data/layouts/Route123/map.bin diff --git a/data/maps/Route124/border.bin b/data/layouts/Route124/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route124/border.bin +++ b/data/layouts/Route124/border.bin diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc new file mode 100644 index 000000000..e2c9abffc --- /dev/null +++ b/data/layouts/Route124/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route124_MapBorder:: + .incbin "data/layouts/Route124/border.bin" + + .align 2 +Route124_MapBlockdata:: + .incbin "data/layouts/Route124/map.bin" + + .align 2 +Route124_Layout:: + .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 Binary files differindex acd4a65fb..acd4a65fb 100644 --- a/data/maps/Route124/map.bin +++ b/data/layouts/Route124/map.bin diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc new file mode 100644 index 000000000..2179d7208 --- /dev/null +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route124_DivingTreasureHuntersHouse_MapBorder:: + .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" + + .align 2 +Route124_DivingTreasureHuntersHouse_MapBlockdata:: + .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" + + .align 2 +Route124_DivingTreasureHuntersHouse_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte Route124_DivingTreasureHuntersHouse_MapBorder + .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin index 8f1f6cbef..8f1f6cbef 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin diff --git a/data/maps/Route125/border.bin b/data/layouts/Route125/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route125/border.bin +++ b/data/layouts/Route125/border.bin diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc new file mode 100644 index 000000000..7c894c943 --- /dev/null +++ b/data/layouts/Route125/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route125_MapBorder:: + .incbin "data/layouts/Route125/border.bin" + + .align 2 +Route125_MapBlockdata:: + .incbin "data/layouts/Route125/map.bin" + + .align 2 +Route125_Layout:: + .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 Binary files differindex 078f2713d..078f2713d 100644 --- a/data/maps/Route125/map.bin +++ b/data/layouts/Route125/map.bin diff --git a/data/maps/Route126/border.bin b/data/layouts/Route126/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route126/border.bin +++ b/data/layouts/Route126/border.bin diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc new file mode 100644 index 000000000..b7f2e3e3c --- /dev/null +++ b/data/layouts/Route126/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route126_MapBorder:: + .incbin "data/layouts/Route126/border.bin" + + .align 2 +Route126_MapBlockdata:: + .incbin "data/layouts/Route126/map.bin" + + .align 2 +Route126_Layout:: + .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 Binary files differindex 2d684cf64..2d684cf64 100644 --- a/data/maps/Route126/map.bin +++ b/data/layouts/Route126/map.bin diff --git a/data/maps/Route127/border.bin b/data/layouts/Route127/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route127/border.bin +++ b/data/layouts/Route127/border.bin diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc new file mode 100644 index 000000000..637bd29b6 --- /dev/null +++ b/data/layouts/Route127/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route127_MapBorder:: + .incbin "data/layouts/Route127/border.bin" + + .align 2 +Route127_MapBlockdata:: + .incbin "data/layouts/Route127/map.bin" + + .align 2 +Route127_Layout:: + .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 Binary files differindex fa44f9960..fa44f9960 100644 --- a/data/maps/Route127/map.bin +++ b/data/layouts/Route127/map.bin diff --git a/data/maps/Route128/border.bin b/data/layouts/Route128/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route128/border.bin +++ b/data/layouts/Route128/border.bin diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc new file mode 100644 index 000000000..09265d811 --- /dev/null +++ b/data/layouts/Route128/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route128_MapBorder:: + .incbin "data/layouts/Route128/border.bin" + + .align 2 +Route128_MapBlockdata:: + .incbin "data/layouts/Route128/map.bin" + + .align 2 +Route128_Layout:: + .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 Binary files differindex fae8a373e..fae8a373e 100644 --- a/data/maps/Route128/map.bin +++ b/data/layouts/Route128/map.bin diff --git a/data/maps/Route129/border.bin b/data/layouts/Route129/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route129/border.bin +++ b/data/layouts/Route129/border.bin diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc new file mode 100644 index 000000000..926213af4 --- /dev/null +++ b/data/layouts/Route129/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route129_MapBorder:: + .incbin "data/layouts/Route129/border.bin" + + .align 2 +Route129_MapBlockdata:: + .incbin "data/layouts/Route129/map.bin" + + .align 2 +Route129_Layout:: + .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 Binary files differindex 8d09787fd..8d09787fd 100644 --- a/data/maps/Route129/map.bin +++ b/data/layouts/Route129/map.bin diff --git a/data/maps/Route130/border.bin b/data/layouts/Route130/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route130/border.bin +++ b/data/layouts/Route130/border.bin diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc new file mode 100644 index 000000000..30a1053bf --- /dev/null +++ b/data/layouts/Route130/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route130_MapBorder:: + .incbin "data/layouts/Route130/border.bin" + + .align 2 +Route130_MapBlockdata:: + .incbin "data/layouts/Route130/map.bin" + + .align 2 +Route130_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Route130_MapBorder + .4byte Route130_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/Route130/map.bin b/data/layouts/Route130/map.bin index b06fa74dc..b06fa74dc 100644 --- a/data/maps/Route130/map.bin +++ b/data/layouts/Route130/map.bin diff --git a/data/maps/Route131/border.bin b/data/layouts/Route131/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route131/border.bin +++ b/data/layouts/Route131/border.bin diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc new file mode 100644 index 000000000..0762566a8 --- /dev/null +++ b/data/layouts/Route131/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route131_MapBorder:: + .incbin "data/layouts/Route131/border.bin" + + .align 2 +Route131_MapBlockdata:: + .incbin "data/layouts/Route131/map.bin" + + .align 2 +Route131_Layout:: + .4byte 0x3c + .4byte 0x28 + .4byte Route131_MapBorder + .4byte Route131_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/Route131/map.bin b/data/layouts/Route131/map.bin index 096d6e116..096d6e116 100644 --- a/data/maps/Route131/map.bin +++ b/data/layouts/Route131/map.bin diff --git a/data/maps/Route132/border.bin b/data/layouts/Route132/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route132/border.bin +++ b/data/layouts/Route132/border.bin diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc new file mode 100644 index 000000000..3838b85bc --- /dev/null +++ b/data/layouts/Route132/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route132_MapBorder:: + .incbin "data/layouts/Route132/border.bin" + + .align 2 +Route132_MapBlockdata:: + .incbin "data/layouts/Route132/map.bin" + + .align 2 +Route132_Layout:: + .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 Binary files differindex 3250c0429..3250c0429 100644 --- a/data/maps/Route132/map.bin +++ b/data/layouts/Route132/map.bin diff --git a/data/maps/Route133/border.bin b/data/layouts/Route133/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route133/border.bin +++ b/data/layouts/Route133/border.bin diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc new file mode 100644 index 000000000..c380a9ca1 --- /dev/null +++ b/data/layouts/Route133/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route133_MapBorder:: + .incbin "data/layouts/Route133/border.bin" + + .align 2 +Route133_MapBlockdata:: + .incbin "data/layouts/Route133/map.bin" + + .align 2 +Route133_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Route133_MapBorder + .4byte Route133_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/Route133/map.bin b/data/layouts/Route133/map.bin index 1d4e74f73..1d4e74f73 100644 --- a/data/maps/Route133/map.bin +++ b/data/layouts/Route133/map.bin diff --git a/data/maps/Route134/border.bin b/data/layouts/Route134/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route134/border.bin +++ b/data/layouts/Route134/border.bin diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc new file mode 100644 index 000000000..46c4ea9dc --- /dev/null +++ b/data/layouts/Route134/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Route134_MapBorder:: + .incbin "data/layouts/Route134/border.bin" + + .align 2 +Route134_MapBlockdata:: + .incbin "data/layouts/Route134/map.bin" + + .align 2 +Route134_Layout:: + .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 Binary files differindex 7b78a2d3c..7b78a2d3c 100644 --- a/data/maps/Route134/map.bin +++ b/data/layouts/Route134/map.bin diff --git a/data/maps/RustboroCity/border.bin b/data/layouts/RustboroCity/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/RustboroCity/border.bin +++ b/data/layouts/RustboroCity/border.bin diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc new file mode 100644 index 000000000..e1451aff6 --- /dev/null +++ b/data/layouts/RustboroCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_MapBorder:: + .incbin "data/layouts/RustboroCity/border.bin" + + .align 2 +RustboroCity_MapBlockdata:: + .incbin "data/layouts/RustboroCity/map.bin" + + .align 2 +RustboroCity_Layout:: + .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 Binary files differindex 06736e47e..06736e47e 100644 --- a/data/maps/RustboroCity/map.bin +++ b/data/layouts/RustboroCity/map.bin diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/border.bin +++ b/data/layouts/RustboroCity_CuttersHouse/border.bin diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc new file mode 100644 index 000000000..a0df17833 --- /dev/null +++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_CuttersHouse_MapBorder:: + .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" + + .align 2 +RustboroCity_CuttersHouse_MapBlockdata:: + .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" + + .align 2 +RustboroCity_CuttersHouse_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte RustboroCity_CuttersHouse_MapBorder + .4byte RustboroCity_CuttersHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin index 5515d00cf..5515d00cf 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.bin +++ b/data/layouts/RustboroCity_CuttersHouse/map.bin diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/layouts/RustboroCity_DevonCorp_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/border.bin +++ b/data/layouts/RustboroCity_DevonCorp_1F/border.bin diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc new file mode 100644 index 000000000..6662b05c9 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_DevonCorp_1F_MapBorder:: + .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin" + + .align 2 +RustboroCity_DevonCorp_1F_MapBlockdata:: + .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin" + + .align 2 +RustboroCity_DevonCorp_1F_Layout:: + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_1F_MapBorder + .4byte RustboroCity_DevonCorp_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Facility diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/layouts/RustboroCity_DevonCorp_1F/map.bin index 09f86a742..09f86a742 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.bin +++ b/data/layouts/RustboroCity_DevonCorp_1F/map.bin diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/layouts/RustboroCity_DevonCorp_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/border.bin +++ b/data/layouts/RustboroCity_DevonCorp_2F/border.bin diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc new file mode 100644 index 000000000..f6331ab38 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_DevonCorp_2F_MapBorder:: + .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin" + + .align 2 +RustboroCity_DevonCorp_2F_MapBlockdata:: + .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin" + + .align 2 +RustboroCity_DevonCorp_2F_Layout:: + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_2F_MapBorder + .4byte RustboroCity_DevonCorp_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/layouts/RustboroCity_DevonCorp_2F/map.bin index 03985c572..03985c572 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.bin +++ b/data/layouts/RustboroCity_DevonCorp_2F/map.bin diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/layouts/RustboroCity_DevonCorp_3F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat1_1F/border.bin +++ b/data/layouts/RustboroCity_DevonCorp_3F/border.bin diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc new file mode 100644 index 000000000..2d265b6c8 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_DevonCorp_3F_MapBorder:: + .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin" + + .align 2 +RustboroCity_DevonCorp_3F_MapBlockdata:: + .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin" + + .align 2 +RustboroCity_DevonCorp_3F_Layout:: + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_3F_MapBorder + .4byte RustboroCity_DevonCorp_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Facility diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/layouts/RustboroCity_DevonCorp_3F/map.bin index 5a55ee4ab..5a55ee4ab 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.bin +++ b/data/layouts/RustboroCity_DevonCorp_3F/map.bin diff --git a/data/maps/RustboroCity_Flat1_2F/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat1_2F/border.bin +++ b/data/layouts/RustboroCity_Flat1_1F/border.bin diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc new file mode 100644 index 000000000..fc61a4201 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_Flat1_1F_MapBorder:: + .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin" + + .align 2 +RustboroCity_Flat1_1F_MapBlockdata:: + .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin" + + .align 2 +RustboroCity_Flat1_1F_Layout:: + .4byte 0xe + .4byte 0x8 + .4byte RustboroCity_Flat1_1F_MapBorder + .4byte RustboroCity_Flat1_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin index 017298e71..017298e71 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.bin +++ b/data/layouts/RustboroCity_Flat1_1F/map.bin diff --git a/data/maps/RustboroCity_Flat2_1F/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat2_1F/border.bin +++ b/data/layouts/RustboroCity_Flat1_2F/border.bin diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc new file mode 100644 index 000000000..b80a34322 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_Flat1_2F_MapBorder:: + .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin" + + .align 2 +RustboroCity_Flat1_2F_MapBlockdata:: + .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin" + + .align 2 +RustboroCity_Flat1_2F_Layout:: + .4byte 0xe + .4byte 0x8 + .4byte RustboroCity_Flat1_2F_MapBorder + .4byte RustboroCity_Flat1_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin index 936907d32..936907d32 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.bin +++ b/data/layouts/RustboroCity_Flat1_2F/map.bin diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat2_2F/border.bin +++ b/data/layouts/RustboroCity_Flat2_1F/border.bin diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc new file mode 100644 index 000000000..55c38f906 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_Flat2_1F_MapBorder:: + .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin" + + .align 2 +RustboroCity_Flat2_1F_MapBlockdata:: + .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin" + + .align 2 +RustboroCity_Flat2_1F_Layout:: + .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 Binary files differindex 0f6829f9c..0f6829f9c 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.bin +++ b/data/layouts/RustboroCity_Flat2_1F/map.bin diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat2_3F/border.bin +++ b/data/layouts/RustboroCity_Flat2_2F/border.bin diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc new file mode 100644 index 000000000..c099b5f9a --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_Flat2_2F_MapBorder:: + .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin" + + .align 2 +RustboroCity_Flat2_2F_MapBlockdata:: + .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin" + + .align 2 +RustboroCity_Flat2_2F_Layout:: + .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 Binary files differindex 9f3750fb4..9f3750fb4 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.bin +++ b/data/layouts/RustboroCity_Flat2_2F/map.bin diff --git a/data/maps/RustboroCity_House1/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_House1/border.bin +++ b/data/layouts/RustboroCity_Flat2_3F/border.bin diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc new file mode 100644 index 000000000..5e938f7d6 --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_Flat2_3F_MapBorder:: + .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin" + + .align 2 +RustboroCity_Flat2_3F_MapBlockdata:: + .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin" + + .align 2 +RustboroCity_Flat2_3F_Layout:: + .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 Binary files differindex 2112fe799..2112fe799 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.bin +++ b/data/layouts/RustboroCity_Flat2_3F/map.bin diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/layouts/RustboroCity_Gym/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/RustboroCity_Gym/border.bin +++ b/data/layouts/RustboroCity_Gym/border.bin diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc new file mode 100644 index 000000000..cd9b907fb --- /dev/null +++ b/data/layouts/RustboroCity_Gym/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_Gym_MapBorder:: + .incbin "data/layouts/RustboroCity_Gym/border.bin" + + .align 2 +RustboroCity_Gym_MapBlockdata:: + .incbin "data/layouts/RustboroCity_Gym/map.bin" + + .align 2 +RustboroCity_Gym_Layout:: + .4byte 0xb + .4byte 0x14 + .4byte RustboroCity_Gym_MapBorder + .4byte RustboroCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_RustboroGym diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/layouts/RustboroCity_Gym/map.bin index 4451674a7..4451674a7 100644 --- a/data/maps/RustboroCity_Gym/map.bin +++ b/data/layouts/RustboroCity_Gym/map.bin diff --git a/data/maps/RustboroCity_House2/border.bin b/data/layouts/RustboroCity_House/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_House2/border.bin +++ b/data/layouts/RustboroCity_House/border.bin diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc new file mode 100644 index 000000000..80f658fcd --- /dev/null +++ b/data/layouts/RustboroCity_House/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_House_MapBorder:: + .incbin "data/layouts/RustboroCity_House/border.bin" + + .align 2 +RustboroCity_House_MapBlockdata:: + .incbin "data/layouts/RustboroCity_House/map.bin" + + .align 2 +RustboroCity_House_Layouts:: + .4byte 0xc + .4byte 0x9 + .4byte RustboroCity_House_MapBorder + .4byte RustboroCity_House_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_House2/map.bin b/data/layouts/RustboroCity_House/map.bin index 5a53bbc77..5a53bbc77 100644 --- a/data/maps/RustboroCity_House2/map.bin +++ b/data/layouts/RustboroCity_House/map.bin diff --git a/data/maps/SSTidalCorridor/border.bin b/data/layouts/RustboroCity_House1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SSTidalCorridor/border.bin +++ b/data/layouts/RustboroCity_House1/border.bin diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc new file mode 100644 index 000000000..f88e3a80b --- /dev/null +++ b/data/layouts/RustboroCity_House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_House1_MapBorder:: + .incbin "data/layouts/RustboroCity_House1/border.bin" + + .align 2 +RustboroCity_House1_MapBlockdata:: + .incbin "data/layouts/RustboroCity_House1/map.bin" + + .align 2 +RustboroCity_House1_Layout:: + .4byte 0xd + .4byte 0x8 + .4byte RustboroCity_House1_MapBorder + .4byte RustboroCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_House1/map.bin b/data/layouts/RustboroCity_House1/map.bin index a14fc0405..a14fc0405 100644 --- a/data/maps/RustboroCity_House1/map.bin +++ b/data/layouts/RustboroCity_House1/map.bin diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/layouts/RustboroCity_PokemonSchool/border.bin index 8f857616b..8f857616b 100644 --- a/data/maps/RustboroCity_PokemonSchool/border.bin +++ b/data/layouts/RustboroCity_PokemonSchool/border.bin diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc new file mode 100644 index 000000000..470baa66e --- /dev/null +++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RustboroCity_PokemonSchool_MapBorder:: + .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" + + .align 2 +RustboroCity_PokemonSchool_MapBlockdata:: + .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" + + .align 2 +RustboroCity_PokemonSchool_Layout:: + .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 Binary files differindex 3f3b183d3..3f3b183d3 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.bin +++ b/data/layouts/RustboroCity_PokemonSchool/map.bin diff --git a/data/maps/RusturfTunnel/border.bin b/data/layouts/RusturfTunnel/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/RusturfTunnel/border.bin +++ b/data/layouts/RusturfTunnel/border.bin diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc new file mode 100644 index 000000000..feb5b0fc0 --- /dev/null +++ b/data/layouts/RusturfTunnel/layout.inc @@ -0,0 +1,16 @@ + .align 2 +RusturfTunnel_MapBorder:: + .incbin "data/layouts/RusturfTunnel/border.bin" + + .align 2 +RusturfTunnel_MapBlockdata:: + .incbin "data/layouts/RusturfTunnel/map.bin" + + .align 2 +RusturfTunnel_Layout:: + .4byte 0x24 + .4byte 0x18 + .4byte RusturfTunnel_MapBorder + .4byte RusturfTunnel_MapBlockdata + .4byte gTileset_General + .4byte gTileset_RusturfTunnel diff --git a/data/maps/RusturfTunnel/map.bin b/data/layouts/RusturfTunnel/map.bin index 87ce9bc73..87ce9bc73 100644 --- a/data/maps/RusturfTunnel/map.bin +++ b/data/layouts/RusturfTunnel/map.bin diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/layouts/SSTidalCorridor/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SSTidalLowerDeck/border.bin +++ b/data/layouts/SSTidalCorridor/border.bin diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc new file mode 100644 index 000000000..8180f0a4d --- /dev/null +++ b/data/layouts/SSTidalCorridor/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SSTidalCorridor_MapBorder:: + .incbin "data/layouts/SSTidalCorridor/border.bin" + + .align 2 +SSTidalCorridor_MapBlockdata:: + .incbin "data/layouts/SSTidalCorridor/map.bin" + + .align 2 +SSTidalCorridor_Layout:: + .4byte 0x12 + .4byte 0xd + .4byte SSTidalCorridor_MapBorder + .4byte SSTidalCorridor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/SSTidalCorridor/map.bin b/data/layouts/SSTidalCorridor/map.bin index f8cf1725d..f8cf1725d 100644 --- a/data/maps/SSTidalCorridor/map.bin +++ b/data/layouts/SSTidalCorridor/map.bin diff --git a/data/maps/SSTidalRooms/border.bin b/data/layouts/SSTidalLowerDeck/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SSTidalRooms/border.bin +++ b/data/layouts/SSTidalLowerDeck/border.bin diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc new file mode 100644 index 000000000..ece1a572e --- /dev/null +++ b/data/layouts/SSTidalLowerDeck/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SSTidalLowerDeck_MapBorder:: + .incbin "data/layouts/SSTidalLowerDeck/border.bin" + + .align 2 +SSTidalLowerDeck_MapBlockdata:: + .incbin "data/layouts/SSTidalLowerDeck/map.bin" + + .align 2 +SSTidalLowerDeck_Layout:: + .4byte 0x11 + .4byte 0xd + .4byte SSTidalLowerDeck_MapBorder + .4byte SSTidalLowerDeck_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/layouts/SSTidalLowerDeck/map.bin index 059ce30fe..059ce30fe 100644 --- a/data/maps/SSTidalLowerDeck/map.bin +++ b/data/layouts/SSTidalLowerDeck/map.bin diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/layouts/SSTidalRooms/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SingleBattleColosseum/border.bin +++ b/data/layouts/SSTidalRooms/border.bin diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc new file mode 100644 index 000000000..8cd255d8c --- /dev/null +++ b/data/layouts/SSTidalRooms/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SSTidalRooms_MapBorder:: + .incbin "data/layouts/SSTidalRooms/border.bin" + + .align 2 +SSTidalRooms_MapBlockdata:: + .incbin "data/layouts/SSTidalRooms/map.bin" + + .align 2 +SSTidalRooms_Layout:: + .4byte 0x24 + .4byte 0x12 + .4byte SSTidalRooms_MapBorder + .4byte SSTidalRooms_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideShip diff --git a/data/maps/SSTidalRooms/map.bin b/data/layouts/SSTidalRooms/map.bin index 6103ad0c2..6103ad0c2 100644 --- a/data/maps/SSTidalRooms/map.bin +++ b/data/layouts/SSTidalRooms/map.bin diff --git a/data/maps/SafariZone_North/border.bin b/data/layouts/SafariZone_North/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_North/border.bin +++ b/data/layouts/SafariZone_North/border.bin diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc new file mode 100644 index 000000000..f539c2ced --- /dev/null +++ b/data/layouts/SafariZone_North/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_North_MapBorder:: + .incbin "data/layouts/SafariZone_North/border.bin" + + .align 2 +SafariZone_North_MapBlockdata:: + .incbin "data/layouts/SafariZone_North/map.bin" + + .align 2 +SafariZone_North_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_North_MapBorder + .4byte SafariZone_North_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/SafariZone_North/map.bin b/data/layouts/SafariZone_North/map.bin Binary files differindex 4f5296815..4f5296815 100644 --- a/data/maps/SafariZone_North/map.bin +++ b/data/layouts/SafariZone_North/map.bin diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/layouts/SafariZone_Northeast/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_Northeast/border.bin +++ b/data/layouts/SafariZone_Northeast/border.bin diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc new file mode 100644 index 000000000..903a6c9e0 --- /dev/null +++ b/data/layouts/SafariZone_Northeast/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_Northeast_MapBorder:: + .incbin "data/layouts/SafariZone_Northeast/border.bin" + + .align 2 +SafariZone_Northeast_MapBlockdata:: + .incbin "data/layouts/SafariZone_Northeast/map.bin" + + .align 2 +SafariZone_Northeast_Layout:: + .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 Binary files differindex 9a8803a6a..9a8803a6a 100644 --- a/data/maps/SafariZone_Northeast/map.bin +++ b/data/layouts/SafariZone_Northeast/map.bin diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/layouts/SafariZone_Northwest/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_Northwest/border.bin +++ b/data/layouts/SafariZone_Northwest/border.bin diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc new file mode 100644 index 000000000..469e25617 --- /dev/null +++ b/data/layouts/SafariZone_Northwest/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_Northwest_MapBorder:: + .incbin "data/layouts/SafariZone_Northwest/border.bin" + + .align 2 +SafariZone_Northwest_MapBlockdata:: + .incbin "data/layouts/SafariZone_Northwest/map.bin" + + .align 2 +SafariZone_Northwest_Layout:: + .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 Binary files differindex 1825a1c92..1825a1c92 100644 --- a/data/maps/SafariZone_Northwest/map.bin +++ b/data/layouts/SafariZone_Northwest/map.bin diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/layouts/SafariZone_RestHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SafariZone_RestHouse/border.bin +++ b/data/layouts/SafariZone_RestHouse/border.bin diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc new file mode 100644 index 000000000..7cb238719 --- /dev/null +++ b/data/layouts/SafariZone_RestHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_RestHouse_MapBorder:: + .incbin "data/layouts/SafariZone_RestHouse/border.bin" + + .align 2 +SafariZone_RestHouse_MapBlockdata:: + .incbin "data/layouts/SafariZone_RestHouse/map.bin" + + .align 2 +SafariZone_RestHouse_Layout:: + .4byte 0xa + .4byte 0x9 + .4byte SafariZone_RestHouse_MapBorder + .4byte SafariZone_RestHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/layouts/SafariZone_RestHouse/map.bin index c57c99c7b..c57c99c7b 100644 --- a/data/maps/SafariZone_RestHouse/map.bin +++ b/data/layouts/SafariZone_RestHouse/map.bin diff --git a/data/maps/SafariZone_South/border.bin b/data/layouts/SafariZone_South/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_South/border.bin +++ b/data/layouts/SafariZone_South/border.bin diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc new file mode 100644 index 000000000..6431c6c01 --- /dev/null +++ b/data/layouts/SafariZone_South/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_South_MapBorder:: + .incbin "data/layouts/SafariZone_South/border.bin" + + .align 2 +SafariZone_South_MapBlockdata:: + .incbin "data/layouts/SafariZone_South/map.bin" + + .align 2 +SafariZone_South_Layout:: + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_South_MapBorder + .4byte SafariZone_South_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/SafariZone_South/map.bin b/data/layouts/SafariZone_South/map.bin Binary files differindex 50497b503..50497b503 100644 --- a/data/maps/SafariZone_South/map.bin +++ b/data/layouts/SafariZone_South/map.bin diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/layouts/SafariZone_Southeast/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_Southeast/border.bin +++ b/data/layouts/SafariZone_Southeast/border.bin diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc new file mode 100644 index 000000000..450efcd07 --- /dev/null +++ b/data/layouts/SafariZone_Southeast/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_Southeast_MapBorder:: + .incbin "data/layouts/SafariZone_Southeast/border.bin" + + .align 2 +SafariZone_Southeast_MapBlockdata:: + .incbin "data/layouts/SafariZone_Southeast/map.bin" + + .align 2 +SafariZone_Southeast_Layout:: + .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 Binary files differindex a778b8797..a778b8797 100644 --- a/data/maps/SafariZone_Southeast/map.bin +++ b/data/layouts/SafariZone_Southeast/map.bin diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/layouts/SafariZone_Southwest/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_Southwest/border.bin +++ b/data/layouts/SafariZone_Southwest/border.bin diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc new file mode 100644 index 000000000..559736b9f --- /dev/null +++ b/data/layouts/SafariZone_Southwest/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SafariZone_Southwest_MapBorder:: + .incbin "data/layouts/SafariZone_Southwest/border.bin" + + .align 2 +SafariZone_Southwest_MapBlockdata:: + .incbin "data/layouts/SafariZone_Southwest/map.bin" + + .align 2 +SafariZone_Southwest_Layout:: + .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 Binary files differindex 0074b6e55..0074b6e55 100644 --- a/data/maps/SafariZone_Southwest/map.bin +++ b/data/layouts/SafariZone_Southwest/map.bin diff --git a/data/maps/ScorchedSlab/border.bin b/data/layouts/ScorchedSlab/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ScorchedSlab/border.bin +++ b/data/layouts/ScorchedSlab/border.bin diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc new file mode 100644 index 000000000..e9f30c74c --- /dev/null +++ b/data/layouts/ScorchedSlab/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ScorchedSlab_MapBorder:: + .incbin "data/layouts/ScorchedSlab/border.bin" + + .align 2 +ScorchedSlab_MapBlockdata:: + .incbin "data/layouts/ScorchedSlab/map.bin" + + .align 2 +ScorchedSlab_Layout:: + .4byte 0xf + .4byte 0x14 + .4byte ScorchedSlab_MapBorder + .4byte ScorchedSlab_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ScorchedSlab/map.bin b/data/layouts/ScorchedSlab/map.bin index edbd982ee..edbd982ee 100644 --- a/data/maps/ScorchedSlab/map.bin +++ b/data/layouts/ScorchedSlab/map.bin diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/layouts/SeafloorCavern_Entrance/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Entrance/border.bin +++ b/data/layouts/SeafloorCavern_Entrance/border.bin diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc new file mode 100644 index 000000000..eaed336bc --- /dev/null +++ b/data/layouts/SeafloorCavern_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Entrance_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" + + .align 2 +SeafloorCavern_Entrance_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" + + .align 2 +SeafloorCavern_Entrance_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte SeafloorCavern_Entrance_MapBorder + .4byte SeafloorCavern_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/layouts/SeafloorCavern_Entrance/map.bin index f41e6e77d..f41e6e77d 100644 --- a/data/maps/SeafloorCavern_Entrance/map.bin +++ b/data/layouts/SeafloorCavern_Entrance/map.bin diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/layouts/SeafloorCavern_Room1/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room1/border.bin +++ b/data/layouts/SeafloorCavern_Room1/border.bin diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc new file mode 100644 index 000000000..6deb54493 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room1_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room1/border.bin" + + .align 2 +SeafloorCavern_Room1_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room1/map.bin" + + .align 2 +SeafloorCavern_Room1_Layout:: + .4byte 0x14 + .4byte 0x15 + .4byte SeafloorCavern_Room1_MapBorder + .4byte SeafloorCavern_Room1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/layouts/SeafloorCavern_Room1/map.bin index 57cd82f78..57cd82f78 100644 --- a/data/maps/SeafloorCavern_Room1/map.bin +++ b/data/layouts/SeafloorCavern_Room1/map.bin diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/layouts/SeafloorCavern_Room2/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room2/border.bin +++ b/data/layouts/SeafloorCavern_Room2/border.bin diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc new file mode 100644 index 000000000..c0dfdcedc --- /dev/null +++ b/data/layouts/SeafloorCavern_Room2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room2_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room2/border.bin" + + .align 2 +SeafloorCavern_Room2_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room2/map.bin" + + .align 2 +SeafloorCavern_Room2_Layout:: + .4byte 0x12 + .4byte 0xc + .4byte SeafloorCavern_Room2_MapBorder + .4byte SeafloorCavern_Room2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/layouts/SeafloorCavern_Room2/map.bin index 72a064870..72a064870 100644 --- a/data/maps/SeafloorCavern_Room2/map.bin +++ b/data/layouts/SeafloorCavern_Room2/map.bin diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/layouts/SeafloorCavern_Room3/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room3/border.bin +++ b/data/layouts/SeafloorCavern_Room3/border.bin diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc new file mode 100644 index 000000000..58ce10cdf --- /dev/null +++ b/data/layouts/SeafloorCavern_Room3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room3_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room3/border.bin" + + .align 2 +SeafloorCavern_Room3_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room3/map.bin" + + .align 2 +SeafloorCavern_Room3_Layout:: + .4byte 0x10 + .4byte 0x11 + .4byte SeafloorCavern_Room3_MapBorder + .4byte SeafloorCavern_Room3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/layouts/SeafloorCavern_Room3/map.bin index 01d18c73c..01d18c73c 100644 --- a/data/maps/SeafloorCavern_Room3/map.bin +++ b/data/layouts/SeafloorCavern_Room3/map.bin diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/layouts/SeafloorCavern_Room4/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room4/border.bin +++ b/data/layouts/SeafloorCavern_Room4/border.bin diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc new file mode 100644 index 000000000..f4ff113ff --- /dev/null +++ b/data/layouts/SeafloorCavern_Room4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room4_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room4/border.bin" + + .align 2 +SeafloorCavern_Room4_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room4/map.bin" + + .align 2 +SeafloorCavern_Room4_Layout:: + .4byte 0x12 + .4byte 0x13 + .4byte SeafloorCavern_Room4_MapBorder + .4byte SeafloorCavern_Room4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/layouts/SeafloorCavern_Room4/map.bin index 928749c95..928749c95 100644 --- a/data/maps/SeafloorCavern_Room4/map.bin +++ b/data/layouts/SeafloorCavern_Room4/map.bin diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/layouts/SeafloorCavern_Room5/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room5/border.bin +++ b/data/layouts/SeafloorCavern_Room5/border.bin diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc new file mode 100644 index 000000000..69218f64b --- /dev/null +++ b/data/layouts/SeafloorCavern_Room5/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room5_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room5/border.bin" + + .align 2 +SeafloorCavern_Room5_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room5/map.bin" + + .align 2 +SeafloorCavern_Room5_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte SeafloorCavern_Room5_MapBorder + .4byte SeafloorCavern_Room5_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/layouts/SeafloorCavern_Room5/map.bin index 386430fe4..386430fe4 100644 --- a/data/maps/SeafloorCavern_Room5/map.bin +++ b/data/layouts/SeafloorCavern_Room5/map.bin diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/layouts/SeafloorCavern_Room6/border.bin index a00c39057..a00c39057 100644 --- a/data/maps/SeafloorCavern_Room6/border.bin +++ b/data/layouts/SeafloorCavern_Room6/border.bin diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc new file mode 100644 index 000000000..d18506d6b --- /dev/null +++ b/data/layouts/SeafloorCavern_Room6/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room6_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room6/border.bin" + + .align 2 +SeafloorCavern_Room6_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room6/map.bin" + + .align 2 +SeafloorCavern_Room6_Layout:: + .4byte 0x18 + .4byte 0x17 + .4byte SeafloorCavern_Room6_MapBorder + .4byte SeafloorCavern_Room6_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/layouts/SeafloorCavern_Room6/map.bin index 452263326..452263326 100644 --- a/data/maps/SeafloorCavern_Room6/map.bin +++ b/data/layouts/SeafloorCavern_Room6/map.bin diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/layouts/SeafloorCavern_Room7/border.bin index a00c39057..a00c39057 100644 --- a/data/maps/SeafloorCavern_Room7/border.bin +++ b/data/layouts/SeafloorCavern_Room7/border.bin diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc new file mode 100644 index 000000000..6e953c06e --- /dev/null +++ b/data/layouts/SeafloorCavern_Room7/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room7_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room7/border.bin" + + .align 2 +SeafloorCavern_Room7_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room7/map.bin" + + .align 2 +SeafloorCavern_Room7_Layout:: + .4byte 0x17 + .4byte 0x19 + .4byte SeafloorCavern_Room7_MapBorder + .4byte SeafloorCavern_Room7_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/layouts/SeafloorCavern_Room7/map.bin index 7fa1d903d..7fa1d903d 100644 --- a/data/maps/SeafloorCavern_Room7/map.bin +++ b/data/layouts/SeafloorCavern_Room7/map.bin diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/layouts/SeafloorCavern_Room8/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room8/border.bin +++ b/data/layouts/SeafloorCavern_Room8/border.bin diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc new file mode 100644 index 000000000..1a0477b68 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room8/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room8_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room8/border.bin" + + .align 2 +SeafloorCavern_Room8_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room8/map.bin" + + .align 2 +SeafloorCavern_Room8_Layout:: + .4byte 0xb + .4byte 0xe + .4byte SeafloorCavern_Room8_MapBorder + .4byte SeafloorCavern_Room8_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/layouts/SeafloorCavern_Room8/map.bin index e70e95b47..e70e95b47 100644 --- a/data/maps/SeafloorCavern_Room8/map.bin +++ b/data/layouts/SeafloorCavern_Room8/map.bin diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/layouts/SeafloorCavern_Room9/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room9/border.bin +++ b/data/layouts/SeafloorCavern_Room9/border.bin diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc new file mode 100644 index 000000000..115db570b --- /dev/null +++ b/data/layouts/SeafloorCavern_Room9/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SeafloorCavern_Room9_MapBorder:: + .incbin "data/layouts/SeafloorCavern_Room9/border.bin" + + .align 2 +SeafloorCavern_Room9_MapBlockdata:: + .incbin "data/layouts/SeafloorCavern_Room9/map.bin" + + .align 2 +SeafloorCavern_Room9_Layout:: + .4byte 0x1b + .4byte 0x2e + .4byte SeafloorCavern_Room9_MapBorder + .4byte SeafloorCavern_Room9_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/layouts/SeafloorCavern_Room9/map.bin index 252112ac2..252112ac2 100644 --- a/data/maps/SeafloorCavern_Room9/map.bin +++ b/data/layouts/SeafloorCavern_Room9/map.bin diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/layouts/SealedChamber_InnerRoom/border.bin Binary files differindex 9afd13cdc..9afd13cdc 100644 --- a/data/maps/SealedChamber_InnerRoom/border.bin +++ b/data/layouts/SealedChamber_InnerRoom/border.bin diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc new file mode 100644 index 000000000..3de6298e2 --- /dev/null +++ b/data/layouts/SealedChamber_InnerRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SealedChamber_InnerRoom_MapBorder:: + .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" + + .align 2 +SealedChamber_InnerRoom_MapBlockdata:: + .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" + + .align 2 +SealedChamber_InnerRoom_Layout:: + .4byte 0x15 + .4byte 0x17 + .4byte SealedChamber_InnerRoom_MapBorder + .4byte SealedChamber_InnerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/layouts/SealedChamber_InnerRoom/map.bin index 823fa5fab..823fa5fab 100644 --- a/data/maps/SealedChamber_InnerRoom/map.bin +++ b/data/layouts/SealedChamber_InnerRoom/map.bin diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/layouts/SealedChamber_OuterRoom/border.bin Binary files differindex 9afd13cdc..9afd13cdc 100644 --- a/data/maps/SealedChamber_OuterRoom/border.bin +++ b/data/layouts/SealedChamber_OuterRoom/border.bin diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc new file mode 100644 index 000000000..b966d00ef --- /dev/null +++ b/data/layouts/SealedChamber_OuterRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SealedChamber_OuterRoom_MapBorder:: + .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" + + .align 2 +SealedChamber_OuterRoom_MapBlockdata:: + .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" + + .align 2 +SealedChamber_OuterRoom_Layout:: + .4byte 0x15 + .4byte 0x17 + .4byte SealedChamber_OuterRoom_MapBorder + .4byte SealedChamber_OuterRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/layouts/SealedChamber_OuterRoom/map.bin index bf1482f97..bf1482f97 100644 --- a/data/maps/SealedChamber_OuterRoom/map.bin +++ b/data/layouts/SealedChamber_OuterRoom/map.bin diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/layouts/SecretBase_BlueCave1/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BlueCave1/border.bin +++ b/data/layouts/SecretBase_BlueCave1/border.bin diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc new file mode 100644 index 000000000..7e3110f48 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BlueCave1_MapBorder:: + .incbin "data/layouts/SecretBase_BlueCave1/border.bin" + + .align 2 +SecretBase_BlueCave1_MapBlockdata:: + .incbin "data/layouts/SecretBase_BlueCave1/map.bin" + + .align 2 +SecretBase_BlueCave1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_BlueCave1_MapBorder + .4byte SecretBase_BlueCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/layouts/SecretBase_BlueCave1/map.bin index 371b2a8d5..371b2a8d5 100644 --- a/data/maps/SecretBase_BlueCave1/map.bin +++ b/data/layouts/SecretBase_BlueCave1/map.bin diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/layouts/SecretBase_BlueCave2/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BlueCave2/border.bin +++ b/data/layouts/SecretBase_BlueCave2/border.bin diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc new file mode 100644 index 000000000..7a3228832 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BlueCave2_MapBorder:: + .incbin "data/layouts/SecretBase_BlueCave2/border.bin" + + .align 2 +SecretBase_BlueCave2_MapBlockdata:: + .incbin "data/layouts/SecretBase_BlueCave2/map.bin" + + .align 2 +SecretBase_BlueCave2_Layout:: + .4byte 0xf + .4byte 0x7 + .4byte SecretBase_BlueCave2_MapBorder + .4byte SecretBase_BlueCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/layouts/SecretBase_BlueCave2/map.bin index 4993e5b65..4993e5b65 100644 --- a/data/maps/SecretBase_BlueCave2/map.bin +++ b/data/layouts/SecretBase_BlueCave2/map.bin diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/layouts/SecretBase_BlueCave3/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BlueCave3/border.bin +++ b/data/layouts/SecretBase_BlueCave3/border.bin diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc new file mode 100644 index 000000000..a1921a475 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BlueCave3_MapBorder:: + .incbin "data/layouts/SecretBase_BlueCave3/border.bin" + + .align 2 +SecretBase_BlueCave3_MapBlockdata:: + .incbin "data/layouts/SecretBase_BlueCave3/map.bin" + + .align 2 +SecretBase_BlueCave3_Layout:: + .4byte 0xa + .4byte 0x11 + .4byte SecretBase_BlueCave3_MapBorder + .4byte SecretBase_BlueCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/layouts/SecretBase_BlueCave3/map.bin index 968aade07..968aade07 100644 --- a/data/maps/SecretBase_BlueCave3/map.bin +++ b/data/layouts/SecretBase_BlueCave3/map.bin diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/layouts/SecretBase_BlueCave4/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BlueCave4/border.bin +++ b/data/layouts/SecretBase_BlueCave4/border.bin diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc new file mode 100644 index 000000000..81509d18c --- /dev/null +++ b/data/layouts/SecretBase_BlueCave4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BlueCave4_MapBorder:: + .incbin "data/layouts/SecretBase_BlueCave4/border.bin" + + .align 2 +SecretBase_BlueCave4_MapBlockdata:: + .incbin "data/layouts/SecretBase_BlueCave4/map.bin" + + .align 2 +SecretBase_BlueCave4_Layout:: + .4byte 0x9 + .4byte 0x11 + .4byte SecretBase_BlueCave4_MapBorder + .4byte SecretBase_BlueCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/layouts/SecretBase_BlueCave4/map.bin index 631ac0f81..631ac0f81 100644 --- a/data/maps/SecretBase_BlueCave4/map.bin +++ b/data/layouts/SecretBase_BlueCave4/map.bin diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/layouts/SecretBase_BrownCave1/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BrownCave1/border.bin +++ b/data/layouts/SecretBase_BrownCave1/border.bin diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc new file mode 100644 index 000000000..e1bec323a --- /dev/null +++ b/data/layouts/SecretBase_BrownCave1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BrownCave1_MapBorder:: + .incbin "data/layouts/SecretBase_BrownCave1/border.bin" + + .align 2 +SecretBase_BrownCave1_MapBlockdata:: + .incbin "data/layouts/SecretBase_BrownCave1/map.bin" + + .align 2 +SecretBase_BrownCave1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_BrownCave1_MapBorder + .4byte SecretBase_BrownCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/layouts/SecretBase_BrownCave1/map.bin index 56d3436ca..56d3436ca 100644 --- a/data/maps/SecretBase_BrownCave1/map.bin +++ b/data/layouts/SecretBase_BrownCave1/map.bin diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/layouts/SecretBase_BrownCave2/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BrownCave2/border.bin +++ b/data/layouts/SecretBase_BrownCave2/border.bin diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc new file mode 100644 index 000000000..52d595212 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BrownCave2_MapBorder:: + .incbin "data/layouts/SecretBase_BrownCave2/border.bin" + + .align 2 +SecretBase_BrownCave2_MapBlockdata:: + .incbin "data/layouts/SecretBase_BrownCave2/map.bin" + + .align 2 +SecretBase_BrownCave2_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte SecretBase_BrownCave2_MapBorder + .4byte SecretBase_BrownCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/layouts/SecretBase_BrownCave2/map.bin index 184896975..184896975 100644 --- a/data/maps/SecretBase_BrownCave2/map.bin +++ b/data/layouts/SecretBase_BrownCave2/map.bin diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/layouts/SecretBase_BrownCave3/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BrownCave3/border.bin +++ b/data/layouts/SecretBase_BrownCave3/border.bin diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc new file mode 100644 index 000000000..4fa22e613 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BrownCave3_MapBorder:: + .incbin "data/layouts/SecretBase_BrownCave3/border.bin" + + .align 2 +SecretBase_BrownCave3_MapBlockdata:: + .incbin "data/layouts/SecretBase_BrownCave3/map.bin" + + .align 2 +SecretBase_BrownCave3_Layout:: + .4byte 0xf + .4byte 0xb + .4byte SecretBase_BrownCave3_MapBorder + .4byte SecretBase_BrownCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/layouts/SecretBase_BrownCave3/map.bin index d9967522a..d9967522a 100644 --- a/data/maps/SecretBase_BrownCave3/map.bin +++ b/data/layouts/SecretBase_BrownCave3/map.bin diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/layouts/SecretBase_BrownCave4/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BrownCave4/border.bin +++ b/data/layouts/SecretBase_BrownCave4/border.bin diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc new file mode 100644 index 000000000..65566a482 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_BrownCave4_MapBorder:: + .incbin "data/layouts/SecretBase_BrownCave4/border.bin" + + .align 2 +SecretBase_BrownCave4_MapBlockdata:: + .incbin "data/layouts/SecretBase_BrownCave4/map.bin" + + .align 2 +SecretBase_BrownCave4_Layout:: + .4byte 0xe + .4byte 0xc + .4byte SecretBase_BrownCave4_MapBorder + .4byte SecretBase_BrownCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/layouts/SecretBase_BrownCave4/map.bin index 8b5a763c4..8b5a763c4 100644 --- a/data/maps/SecretBase_BrownCave4/map.bin +++ b/data/layouts/SecretBase_BrownCave4/map.bin diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/layouts/SecretBase_RedCave1/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_RedCave1/border.bin +++ b/data/layouts/SecretBase_RedCave1/border.bin diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc new file mode 100644 index 000000000..f9dcde880 --- /dev/null +++ b/data/layouts/SecretBase_RedCave1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_RedCave1_MapBorder:: + .incbin "data/layouts/SecretBase_RedCave1/border.bin" + + .align 2 +SecretBase_RedCave1_MapBlockdata:: + .incbin "data/layouts/SecretBase_RedCave1/map.bin" + + .align 2 +SecretBase_RedCave1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_RedCave1_MapBorder + .4byte SecretBase_RedCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/layouts/SecretBase_RedCave1/map.bin index ce666b57d..ce666b57d 100644 --- a/data/maps/SecretBase_RedCave1/map.bin +++ b/data/layouts/SecretBase_RedCave1/map.bin diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/layouts/SecretBase_RedCave2/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_RedCave2/border.bin +++ b/data/layouts/SecretBase_RedCave2/border.bin diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc new file mode 100644 index 000000000..667a744ad --- /dev/null +++ b/data/layouts/SecretBase_RedCave2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_RedCave2_MapBorder:: + .incbin "data/layouts/SecretBase_RedCave2/border.bin" + + .align 2 +SecretBase_RedCave2_MapBlockdata:: + .incbin "data/layouts/SecretBase_RedCave2/map.bin" + + .align 2 +SecretBase_RedCave2_Layout:: + .4byte 0x7 + .4byte 0x10 + .4byte SecretBase_RedCave2_MapBorder + .4byte SecretBase_RedCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/layouts/SecretBase_RedCave2/map.bin index 4fa03acfe..4fa03acfe 100644 --- a/data/maps/SecretBase_RedCave2/map.bin +++ b/data/layouts/SecretBase_RedCave2/map.bin diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/layouts/SecretBase_RedCave3/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_RedCave3/border.bin +++ b/data/layouts/SecretBase_RedCave3/border.bin diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc new file mode 100644 index 000000000..39a079d2b --- /dev/null +++ b/data/layouts/SecretBase_RedCave3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_RedCave3_MapBorder:: + .incbin "data/layouts/SecretBase_RedCave3/border.bin" + + .align 2 +SecretBase_RedCave3_MapBlockdata:: + .incbin "data/layouts/SecretBase_RedCave3/map.bin" + + .align 2 +SecretBase_RedCave3_Layout:: + .4byte 0xf + .4byte 0x8 + .4byte SecretBase_RedCave3_MapBorder + .4byte SecretBase_RedCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/layouts/SecretBase_RedCave3/map.bin index 0528e565d..0528e565d 100644 --- a/data/maps/SecretBase_RedCave3/map.bin +++ b/data/layouts/SecretBase_RedCave3/map.bin diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/layouts/SecretBase_RedCave4/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_RedCave4/border.bin +++ b/data/layouts/SecretBase_RedCave4/border.bin diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc new file mode 100644 index 000000000..890c1c3b5 --- /dev/null +++ b/data/layouts/SecretBase_RedCave4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_RedCave4_MapBorder:: + .incbin "data/layouts/SecretBase_RedCave4/border.bin" + + .align 2 +SecretBase_RedCave4_MapBlockdata:: + .incbin "data/layouts/SecretBase_RedCave4/map.bin" + + .align 2 +SecretBase_RedCave4_Layout:: + .4byte 0x9 + .4byte 0xf + .4byte SecretBase_RedCave4_MapBorder + .4byte SecretBase_RedCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/layouts/SecretBase_RedCave4/map.bin index 526763290..526763290 100644 --- a/data/maps/SecretBase_RedCave4/map.bin +++ b/data/layouts/SecretBase_RedCave4/map.bin diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/layouts/SecretBase_Shrub1/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Shrub1/border.bin +++ b/data/layouts/SecretBase_Shrub1/border.bin diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc new file mode 100644 index 000000000..835028c64 --- /dev/null +++ b/data/layouts/SecretBase_Shrub1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Shrub1_MapBorder:: + .incbin "data/layouts/SecretBase_Shrub1/border.bin" + + .align 2 +SecretBase_Shrub1_MapBlockdata:: + .incbin "data/layouts/SecretBase_Shrub1/map.bin" + + .align 2 +SecretBase_Shrub1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_Shrub1_MapBorder + .4byte SecretBase_Shrub1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/layouts/SecretBase_Shrub1/map.bin index 4b566cc1b..4b566cc1b 100644 --- a/data/maps/SecretBase_Shrub1/map.bin +++ b/data/layouts/SecretBase_Shrub1/map.bin diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/layouts/SecretBase_Shrub2/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Shrub2/border.bin +++ b/data/layouts/SecretBase_Shrub2/border.bin diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc new file mode 100644 index 000000000..cd1fe6119 --- /dev/null +++ b/data/layouts/SecretBase_Shrub2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Shrub2_MapBorder:: + .incbin "data/layouts/SecretBase_Shrub2/border.bin" + + .align 2 +SecretBase_Shrub2_MapBlockdata:: + .incbin "data/layouts/SecretBase_Shrub2/map.bin" + + .align 2 +SecretBase_Shrub2_Layout:: + .4byte 0xf + .4byte 0x7 + .4byte SecretBase_Shrub2_MapBorder + .4byte SecretBase_Shrub2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/layouts/SecretBase_Shrub2/map.bin index 8cb88cc44..8cb88cc44 100644 --- a/data/maps/SecretBase_Shrub2/map.bin +++ b/data/layouts/SecretBase_Shrub2/map.bin diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/layouts/SecretBase_Shrub3/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Shrub3/border.bin +++ b/data/layouts/SecretBase_Shrub3/border.bin diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc new file mode 100644 index 000000000..721df1201 --- /dev/null +++ b/data/layouts/SecretBase_Shrub3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Shrub3_MapBorder:: + .incbin "data/layouts/SecretBase_Shrub3/border.bin" + + .align 2 +SecretBase_Shrub3_MapBlockdata:: + .incbin "data/layouts/SecretBase_Shrub3/map.bin" + + .align 2 +SecretBase_Shrub3_Layout:: + .4byte 0xd + .4byte 0xb + .4byte SecretBase_Shrub3_MapBorder + .4byte SecretBase_Shrub3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/layouts/SecretBase_Shrub3/map.bin index d51aeea21..d51aeea21 100644 --- a/data/maps/SecretBase_Shrub3/map.bin +++ b/data/layouts/SecretBase_Shrub3/map.bin diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/layouts/SecretBase_Shrub4/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Shrub4/border.bin +++ b/data/layouts/SecretBase_Shrub4/border.bin diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc new file mode 100644 index 000000000..71a2495ad --- /dev/null +++ b/data/layouts/SecretBase_Shrub4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Shrub4_MapBorder:: + .incbin "data/layouts/SecretBase_Shrub4/border.bin" + + .align 2 +SecretBase_Shrub4_MapBlockdata:: + .incbin "data/layouts/SecretBase_Shrub4/map.bin" + + .align 2 +SecretBase_Shrub4_Layout:: + .4byte 0xe + .4byte 0xb + .4byte SecretBase_Shrub4_MapBorder + .4byte SecretBase_Shrub4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/layouts/SecretBase_Shrub4/map.bin index 8a4cf836d..8a4cf836d 100644 --- a/data/maps/SecretBase_Shrub4/map.bin +++ b/data/layouts/SecretBase_Shrub4/map.bin diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/layouts/SecretBase_Tree1/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Tree1/border.bin +++ b/data/layouts/SecretBase_Tree1/border.bin diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc new file mode 100644 index 000000000..45889b449 --- /dev/null +++ b/data/layouts/SecretBase_Tree1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Tree1_MapBorder:: + .incbin "data/layouts/SecretBase_Tree1/border.bin" + + .align 2 +SecretBase_Tree1_MapBlockdata:: + .incbin "data/layouts/SecretBase_Tree1/map.bin" + + .align 2 +SecretBase_Tree1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_Tree1_MapBorder + .4byte SecretBase_Tree1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/layouts/SecretBase_Tree1/map.bin index 907f1486a..907f1486a 100644 --- a/data/maps/SecretBase_Tree1/map.bin +++ b/data/layouts/SecretBase_Tree1/map.bin diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/layouts/SecretBase_Tree2/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Tree2/border.bin +++ b/data/layouts/SecretBase_Tree2/border.bin diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc new file mode 100644 index 000000000..ca1106b26 --- /dev/null +++ b/data/layouts/SecretBase_Tree2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Tree2_MapBorder:: + .incbin "data/layouts/SecretBase_Tree2/border.bin" + + .align 2 +SecretBase_Tree2_MapBlockdata:: + .incbin "data/layouts/SecretBase_Tree2/map.bin" + + .align 2 +SecretBase_Tree2_Layout:: + .4byte 0x7 + .4byte 0x10 + .4byte SecretBase_Tree2_MapBorder + .4byte SecretBase_Tree2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/layouts/SecretBase_Tree2/map.bin index c2e5698b0..c2e5698b0 100644 --- a/data/maps/SecretBase_Tree2/map.bin +++ b/data/layouts/SecretBase_Tree2/map.bin diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Tree3/border.bin +++ b/data/layouts/SecretBase_Tree3/border.bin diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc new file mode 100644 index 000000000..28a4ecbcc --- /dev/null +++ b/data/layouts/SecretBase_Tree3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Tree3_MapBorder:: + .incbin "data/layouts/SecretBase_Tree3/border.bin" + + .align 2 +SecretBase_Tree3_MapBlockdata:: + .incbin "data/layouts/SecretBase_Tree3/map.bin" + + .align 2 +SecretBase_Tree3_Layout:: + .4byte 0x11 + .4byte 0x8 + .4byte SecretBase_Tree3_MapBorder + .4byte SecretBase_Tree3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/layouts/SecretBase_Tree3/map.bin index b6ae04b00..b6ae04b00 100644 --- a/data/maps/SecretBase_Tree3/map.bin +++ b/data/layouts/SecretBase_Tree3/map.bin diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Tree4/border.bin +++ b/data/layouts/SecretBase_Tree4/border.bin diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc new file mode 100644 index 000000000..6f869a74e --- /dev/null +++ b/data/layouts/SecretBase_Tree4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_Tree4_MapBorder:: + .incbin "data/layouts/SecretBase_Tree4/border.bin" + + .align 2 +SecretBase_Tree4_MapBlockdata:: + .incbin "data/layouts/SecretBase_Tree4/map.bin" + + .align 2 +SecretBase_Tree4_Layout:: + .4byte 0xe + .4byte 0xe + .4byte SecretBase_Tree4_MapBorder + .4byte SecretBase_Tree4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/layouts/SecretBase_Tree4/map.bin index b3b381d9e..b3b381d9e 100644 --- a/data/maps/SecretBase_Tree4/map.bin +++ b/data/layouts/SecretBase_Tree4/map.bin diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/layouts/SecretBase_YellowCave1/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_YellowCave1/border.bin +++ b/data/layouts/SecretBase_YellowCave1/border.bin diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc new file mode 100644 index 000000000..d34c182c3 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_YellowCave1_MapBorder:: + .incbin "data/layouts/SecretBase_YellowCave1/border.bin" + + .align 2 +SecretBase_YellowCave1_MapBlockdata:: + .incbin "data/layouts/SecretBase_YellowCave1/map.bin" + + .align 2 +SecretBase_YellowCave1_Layout:: + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_YellowCave1_MapBorder + .4byte SecretBase_YellowCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/layouts/SecretBase_YellowCave1/map.bin index 1301e7317..1301e7317 100644 --- a/data/maps/SecretBase_YellowCave1/map.bin +++ b/data/layouts/SecretBase_YellowCave1/map.bin diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/layouts/SecretBase_YellowCave2/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_YellowCave2/border.bin +++ b/data/layouts/SecretBase_YellowCave2/border.bin diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc new file mode 100644 index 000000000..fc5813858 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_YellowCave2_MapBorder:: + .incbin "data/layouts/SecretBase_YellowCave2/border.bin" + + .align 2 +SecretBase_YellowCave2_MapBlockdata:: + .incbin "data/layouts/SecretBase_YellowCave2/map.bin" + + .align 2 +SecretBase_YellowCave2_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte SecretBase_YellowCave2_MapBorder + .4byte SecretBase_YellowCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/layouts/SecretBase_YellowCave2/map.bin index e18cb47c6..e18cb47c6 100644 --- a/data/maps/SecretBase_YellowCave2/map.bin +++ b/data/layouts/SecretBase_YellowCave2/map.bin diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/layouts/SecretBase_YellowCave3/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_YellowCave3/border.bin +++ b/data/layouts/SecretBase_YellowCave3/border.bin diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc new file mode 100644 index 000000000..005af813a --- /dev/null +++ b/data/layouts/SecretBase_YellowCave3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_YellowCave3_MapBorder:: + .incbin "data/layouts/SecretBase_YellowCave3/border.bin" + + .align 2 +SecretBase_YellowCave3_MapBlockdata:: + .incbin "data/layouts/SecretBase_YellowCave3/map.bin" + + .align 2 +SecretBase_YellowCave3_Layout:: + .4byte 0xc + .4byte 0xb + .4byte SecretBase_YellowCave3_MapBorder + .4byte SecretBase_YellowCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/layouts/SecretBase_YellowCave3/map.bin index b7d80a0ab..b7d80a0ab 100644 --- a/data/maps/SecretBase_YellowCave3/map.bin +++ b/data/layouts/SecretBase_YellowCave3/map.bin diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/layouts/SecretBase_YellowCave4/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_YellowCave4/border.bin +++ b/data/layouts/SecretBase_YellowCave4/border.bin diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc new file mode 100644 index 000000000..5dfaa435c --- /dev/null +++ b/data/layouts/SecretBase_YellowCave4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SecretBase_YellowCave4_MapBorder:: + .incbin "data/layouts/SecretBase_YellowCave4/border.bin" + + .align 2 +SecretBase_YellowCave4_MapBlockdata:: + .incbin "data/layouts/SecretBase_YellowCave4/map.bin" + + .align 2 +SecretBase_YellowCave4_Layout:: + .4byte 0xd + .4byte 0xe + .4byte SecretBase_YellowCave4_MapBorder + .4byte SecretBase_YellowCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/layouts/SecretBase_YellowCave4/map.bin index d3c3e0204..d3c3e0204 100644 --- a/data/maps/SecretBase_YellowCave4/map.bin +++ b/data/layouts/SecretBase_YellowCave4/map.bin diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc new file mode 100644 index 000000000..43df2d495 --- /dev/null +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_HighTideEntranceRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" + + .align 2 +ShoalCave_HighTideEntranceRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" + + .align 2 +ShoalCave_HighTideEntranceRoom_Layout:: + .4byte 0x23 + .4byte 0x23 + .4byte ShoalCave_HighTideEntranceRoom_MapBorder + .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin index 0e4b88c8f..0e4b88c8f 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/border.bin +++ b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc new file mode 100644 index 000000000..22fde10c6 --- /dev/null +++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_HighTideInnerRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" + + .align 2 +ShoalCave_HighTideInnerRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" + + .align 2 +ShoalCave_HighTideInnerRoom_Layout:: + .4byte 0x2e + .4byte 0x26 + .4byte ShoalCave_HighTideInnerRoom_MapBorder + .4byte ShoalCave_HighTideInnerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin index c540a4008..c540a4008 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.bin +++ b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc new file mode 100644 index 000000000..c471d40ed --- /dev/null +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_LowTideEntranceRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin" + + .align 2 +ShoalCave_LowTideEntranceRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" + + .align 2 +ShoalCave_LowTideEntranceRoom_Layout:: + .4byte 0x23 + .4byte 0x23 + .4byte ShoalCave_LowTideEntranceRoom_MapBorder + .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin index 1cf7c87f2..1cf7c87f2 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideIceRoom/border.bin b/data/layouts/ShoalCave_LowTideIceRoom/border.bin index 206bd63f8..206bd63f8 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideIceRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc new file mode 100644 index 000000000..3dea1135c --- /dev/null +++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_LowTideIceRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin" + + .align 2 +ShoalCave_LowTideIceRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin" + + .align 2 +ShoalCave_LowTideIceRoom_Layout:: + .4byte 0x14 + .4byte 0x1e + .4byte ShoalCave_LowTideIceRoom_MapBorder + .4byte ShoalCave_LowTideIceRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.bin b/data/layouts/ShoalCave_LowTideIceRoom/map.bin index 222f1f26c..222f1f26c 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideIceRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc new file mode 100644 index 000000000..090a783c4 --- /dev/null +++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_LowTideInnerRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin" + + .align 2 +ShoalCave_LowTideInnerRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" + + .align 2 +ShoalCave_LowTideInnerRoom_Layout:: + .4byte 0x2e + .4byte 0x26 + .4byte ShoalCave_LowTideInnerRoom_MapBorder + .4byte ShoalCave_LowTideInnerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.bin b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin index 87df28cf4..87df28cf4 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc new file mode 100644 index 000000000..364c026b2 --- /dev/null +++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_LowTideLowerRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin" + + .align 2 +ShoalCave_LowTideLowerRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" + + .align 2 +ShoalCave_LowTideLowerRoom_Layout:: + .4byte 0x1f + .4byte 0xe + .4byte ShoalCave_LowTideLowerRoom_MapBorder + .4byte ShoalCave_LowTideLowerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.bin b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin index 04bf2baf3..04bf2baf3 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc new file mode 100644 index 000000000..4195e34d8 --- /dev/null +++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +ShoalCave_LowTideStairsRoom_MapBorder:: + .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin" + + .align 2 +ShoalCave_LowTideStairsRoom_MapBlockdata:: + .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" + + .align 2 +ShoalCave_LowTideStairsRoom_Layout:: + .4byte 0x15 + .4byte 0xf + .4byte ShoalCave_LowTideStairsRoom_MapBorder + .4byte ShoalCave_LowTideStairsRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.bin b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin index f2b56644d..f2b56644d 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin diff --git a/data/maps/SkyPillar_1F/border.bin b/data/layouts/SingleBattleColosseum/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_1F/border.bin +++ b/data/layouts/SingleBattleColosseum/border.bin diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc new file mode 100644 index 000000000..59ec3c3c7 --- /dev/null +++ b/data/layouts/SingleBattleColosseum/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SingleBattleColosseum_MapBorder:: + .incbin "data/layouts/SingleBattleColosseum/border.bin" + + .align 2 +SingleBattleColosseum_MapBlockdata:: + .incbin "data/layouts/SingleBattleColosseum/map.bin" + + .align 2 +SingleBattleColosseum_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte SingleBattleColosseum_MapBorder + .4byte SingleBattleColosseum_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/layouts/SingleBattleColosseum/map.bin index 1f66ab707..1f66ab707 100644 --- a/data/maps/SingleBattleColosseum/map.bin +++ b/data/layouts/SingleBattleColosseum/map.bin diff --git a/data/maps/SkyPillar_2F/border.bin b/data/layouts/SkyPillar_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_2F/border.bin +++ b/data/layouts/SkyPillar_1F/border.bin diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc new file mode 100644 index 000000000..e0f3550ed --- /dev/null +++ b/data/layouts/SkyPillar_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SkyPillar_1F_MapBorder:: + .incbin "data/layouts/SkyPillar_1F/border.bin" + + .align 2 +SkyPillar_1F_MapBlockdata:: + .incbin "data/layouts/SkyPillar_1F/map.bin" + + .align 2 +SkyPillar_1F_Layout:: + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_1F_MapBorder + .4byte SkyPillar_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_1F/map.bin b/data/layouts/SkyPillar_1F/map.bin index 1eb299c49..1eb299c49 100644 --- a/data/maps/SkyPillar_1F/map.bin +++ b/data/layouts/SkyPillar_1F/map.bin diff --git a/data/maps/SkyPillar_3F/border.bin b/data/layouts/SkyPillar_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_3F/border.bin +++ b/data/layouts/SkyPillar_2F/border.bin diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc new file mode 100644 index 000000000..2ce0b5280 --- /dev/null +++ b/data/layouts/SkyPillar_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SkyPillar_2F_MapBorder:: + .incbin "data/layouts/SkyPillar_2F/border.bin" + + .align 2 +SkyPillar_2F_MapBlockdata:: + .incbin "data/layouts/SkyPillar_2F/map.bin" + + .align 2 +SkyPillar_2F_Layout:: + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_2F_MapBorder + .4byte SkyPillar_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_2F/map.bin b/data/layouts/SkyPillar_2F/map.bin index 8ec9bf213..8ec9bf213 100644 --- a/data/maps/SkyPillar_2F/map.bin +++ b/data/layouts/SkyPillar_2F/map.bin diff --git a/data/maps/SkyPillar_4F/border.bin b/data/layouts/SkyPillar_3F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_4F/border.bin +++ b/data/layouts/SkyPillar_3F/border.bin diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc new file mode 100644 index 000000000..0bf2ad939 --- /dev/null +++ b/data/layouts/SkyPillar_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SkyPillar_3F_MapBorder:: + .incbin "data/layouts/SkyPillar_3F/border.bin" + + .align 2 +SkyPillar_3F_MapBlockdata:: + .incbin "data/layouts/SkyPillar_3F/map.bin" + + .align 2 +SkyPillar_3F_Layout:: + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_3F_MapBorder + .4byte SkyPillar_3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_3F/map.bin b/data/layouts/SkyPillar_3F/map.bin index d6c76d48c..d6c76d48c 100644 --- a/data/maps/SkyPillar_3F/map.bin +++ b/data/layouts/SkyPillar_3F/map.bin diff --git a/data/maps/SkyPillar_5F/border.bin b/data/layouts/SkyPillar_4F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_5F/border.bin +++ b/data/layouts/SkyPillar_4F/border.bin diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc new file mode 100644 index 000000000..35b7b61d1 --- /dev/null +++ b/data/layouts/SkyPillar_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SkyPillar_4F_MapBorder:: + .incbin "data/layouts/SkyPillar_4F/border.bin" + + .align 2 +SkyPillar_4F_MapBlockdata:: + .incbin "data/layouts/SkyPillar_4F/map.bin" + + .align 2 +SkyPillar_4F_Layout:: + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_4F_MapBorder + .4byte SkyPillar_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_4F/map.bin b/data/layouts/SkyPillar_4F/map.bin index 02e82bb4f..02e82bb4f 100644 --- a/data/maps/SkyPillar_4F/map.bin +++ b/data/layouts/SkyPillar_4F/map.bin diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/layouts/SkyPillar_5F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SlateportCity_Harbor/border.bin +++ b/data/layouts/SkyPillar_5F/border.bin diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc new file mode 100644 index 000000000..dbef0083e --- /dev/null +++ b/data/layouts/SkyPillar_5F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SkyPillar_5F_MapBorder:: + .incbin "data/layouts/SkyPillar_5F/border.bin" + + .align 2 +SkyPillar_5F_MapBlockdata:: + .incbin "data/layouts/SkyPillar_5F/map.bin" + + .align 2 +SkyPillar_5F_Layout:: + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_5F_MapBorder + .4byte SkyPillar_5F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_5F/map.bin b/data/layouts/SkyPillar_5F/map.bin index b8cd541d5..b8cd541d5 100644 --- a/data/maps/SkyPillar_5F/map.bin +++ b/data/layouts/SkyPillar_5F/map.bin diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/layouts/SkyPillar_Entrance/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/SkyPillar_Entrance/border.bin +++ b/data/layouts/SkyPillar_Entrance/border.bin diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc new file mode 100644 index 000000000..ed0d1dedd --- /dev/null +++ b/data/layouts/SkyPillar_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SkyPillar_Entrance_MapBorder:: + .incbin "data/layouts/SkyPillar_Entrance/border.bin" + + .align 2 +SkyPillar_Entrance_MapBlockdata:: + .incbin "data/layouts/SkyPillar_Entrance/map.bin" + + .align 2 +SkyPillar_Entrance_Layout:: + .4byte 0x12 + .4byte 0x12 + .4byte SkyPillar_Entrance_MapBorder + .4byte SkyPillar_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SkyPillar_Entrance/map.bin b/data/layouts/SkyPillar_Entrance/map.bin index b215b86ef..b215b86ef 100644 --- a/data/maps/SkyPillar_Entrance/map.bin +++ b/data/layouts/SkyPillar_Entrance/map.bin diff --git a/data/maps/SkyPillar_Outside/border.bin b/data/layouts/SkyPillar_Outside/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/SkyPillar_Outside/border.bin +++ b/data/layouts/SkyPillar_Outside/border.bin diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc new file mode 100644 index 000000000..ae4184ea9 --- /dev/null +++ b/data/layouts/SkyPillar_Outside/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SkyPillar_Outside_MapBorder:: + .incbin "data/layouts/SkyPillar_Outside/border.bin" + + .align 2 +SkyPillar_Outside_MapBlockdata:: + .incbin "data/layouts/SkyPillar_Outside/map.bin" + + .align 2 +SkyPillar_Outside_Layout:: + .4byte 0x1c + .4byte 0x17 + .4byte SkyPillar_Outside_MapBorder + .4byte SkyPillar_Outside_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_Outside/map.bin b/data/layouts/SkyPillar_Outside/map.bin index 01b78d554..01b78d554 100644 --- a/data/maps/SkyPillar_Outside/map.bin +++ b/data/layouts/SkyPillar_Outside/map.bin diff --git a/data/maps/SkyPillar_Top/border.bin b/data/layouts/SkyPillar_Top/border.bin index e9d1c658c..e9d1c658c 100644 --- a/data/maps/SkyPillar_Top/border.bin +++ b/data/layouts/SkyPillar_Top/border.bin diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc new file mode 100644 index 000000000..f9e7f24a4 --- /dev/null +++ b/data/layouts/SkyPillar_Top/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SkyPillar_Top_MapBorder:: + .incbin "data/layouts/SkyPillar_Top/border.bin" + + .align 2 +SkyPillar_Top_MapBlockdata:: + .incbin "data/layouts/SkyPillar_Top/map.bin" + + .align 2 +SkyPillar_Top_Layout:: + .4byte 0x1b + .4byte 0x18 + .4byte SkyPillar_Top_MapBorder + .4byte SkyPillar_Top_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_Top/map.bin b/data/layouts/SkyPillar_Top/map.bin index d87f50f30..d87f50f30 100644 --- a/data/maps/SkyPillar_Top/map.bin +++ b/data/layouts/SkyPillar_Top/map.bin diff --git a/data/maps/SlateportCity/border.bin b/data/layouts/SlateportCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/SlateportCity/border.bin +++ b/data/layouts/SlateportCity/border.bin diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc new file mode 100644 index 000000000..5cc1b1276 --- /dev/null +++ b/data/layouts/SlateportCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SlateportCity_MapBorder:: + .incbin "data/layouts/SlateportCity/border.bin" + + .align 2 +SlateportCity_MapBlockdata:: + .incbin "data/layouts/SlateportCity/map.bin" + + .align 2 +SlateportCity_Layout:: + .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 Binary files differindex 163beb4e8..163beb4e8 100644 --- a/data/maps/SlateportCity/map.bin +++ b/data/layouts/SlateportCity/map.bin diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc new file mode 100644 index 000000000..957e23320 --- /dev/null +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SlateportCity_OceanicMuseum_1F_MapBorder:: + .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin" + + .align 2 +SlateportCity_OceanicMuseum_1F_MapBlockdata:: + .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" + + .align 2 +SlateportCity_OceanicMuseum_1F_Layout:: + .4byte 0x14 + .4byte 0x9 + .4byte SlateportCity_OceanicMuseum_1F_MapBorder + .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_OceanicMuseum diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin index f18b01e49..f18b01e49 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc new file mode 100644 index 000000000..0072fe2c5 --- /dev/null +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SlateportCity_OceanicMuseum_2F_MapBorder:: + .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin" + + .align 2 +SlateportCity_OceanicMuseum_2F_MapBlockdata:: + .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" + + .align 2 +SlateportCity_OceanicMuseum_2F_Layout:: + .4byte 0x14 + .4byte 0x9 + .4byte SlateportCity_OceanicMuseum_2F_MapBorder + .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_OceanicMuseum diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin index 1fa2cdc18..1fa2cdc18 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/layouts/SlateportCity_PokemonFanClub/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SlateportCity_PokemonFanClub/border.bin +++ b/data/layouts/SlateportCity_PokemonFanClub/border.bin diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc new file mode 100644 index 000000000..789c78b67 --- /dev/null +++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SlateportCity_PokemonFanClub_MapBorder:: + .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" + + .align 2 +SlateportCity_PokemonFanClub_MapBlockdata:: + .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" + + .align 2 +SlateportCity_PokemonFanClub_Layout:: + .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 Binary files differindex effff6653..effff6653 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.bin +++ b/data/layouts/SlateportCity_PokemonFanClub/map.bin diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/border.bin +++ b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc new file mode 100644 index 000000000..5ffddafa6 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SlateportCity_SternsShipyard_1F_MapBorder:: + .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin" + + .align 2 +SlateportCity_SternsShipyard_1F_MapBlockdata:: + .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" + + .align 2 +SlateportCity_SternsShipyard_1F_Layout:: + .4byte 0x15 + .4byte 0xf + .4byte SlateportCity_SternsShipyard_1F_MapBorder + .4byte SlateportCity_SternsShipyard_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin index 036f5ce26..036f5ce26 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.bin +++ b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin diff --git a/data/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/border.bin +++ b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc new file mode 100644 index 000000000..fe76a83e8 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SlateportCity_SternsShipyard_2F_MapBorder:: + .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin" + + .align 2 +SlateportCity_SternsShipyard_2F_MapBlockdata:: + .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" + + .align 2 +SlateportCity_SternsShipyard_2F_Layout:: + .4byte 0x11 + .4byte 0xf + .4byte SlateportCity_SternsShipyard_2F_MapBorder + .4byte SlateportCity_SternsShipyard_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin index d10ed2ac2..d10ed2ac2 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.bin +++ b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin diff --git a/data/maps/SootopolisCity/border.bin b/data/layouts/SootopolisCity/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/SootopolisCity/border.bin +++ b/data/layouts/SootopolisCity/border.bin diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc new file mode 100644 index 000000000..91a877c38 --- /dev/null +++ b/data/layouts/SootopolisCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_MapBorder:: + .incbin "data/layouts/SootopolisCity/border.bin" + + .align 2 +SootopolisCity_MapBlockdata:: + .incbin "data/layouts/SootopolisCity/map.bin" + + .align 2 +SootopolisCity_Layout:: + .4byte 0x3c + .4byte 0x3c + .4byte SootopolisCity_MapBorder + .4byte SootopolisCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Sootopolis diff --git a/data/maps/SootopolisCity/map.bin b/data/layouts/SootopolisCity/map.bin index ff03ebc3b..ff03ebc3b 100644 --- a/data/maps/SootopolisCity/map.bin +++ b/data/layouts/SootopolisCity/map.bin diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/layouts/SootopolisCity_Gym_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SootopolisCity_Gym_1F/border.bin +++ b/data/layouts/SootopolisCity_Gym_1F/border.bin diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc new file mode 100644 index 000000000..ce7a15e5e --- /dev/null +++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_Gym_1F_MapBorder:: + .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin" + + .align 2 +SootopolisCity_Gym_1F_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin" + + .align 2 +SootopolisCity_Gym_1F_Layout:: + .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 Binary files differindex dd52448c9..dd52448c9 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.bin +++ b/data/layouts/SootopolisCity_Gym_1F/map.bin diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/layouts/SootopolisCity_Gym_B1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SootopolisCity_Gym_B1F/border.bin +++ b/data/layouts/SootopolisCity_Gym_B1F/border.bin diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc new file mode 100644 index 000000000..a97138cd5 --- /dev/null +++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_Gym_B1F_MapBorder:: + .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin" + + .align 2 +SootopolisCity_Gym_B1F_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin" + + .align 2 +SootopolisCity_Gym_B1F_Layout:: + .4byte 0x11 + .4byte 0x1a + .4byte SootopolisCity_Gym_B1F_MapBorder + .4byte SootopolisCity_Gym_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_SootopolisGym diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/layouts/SootopolisCity_Gym_B1F/map.bin index 58410408f..58410408f 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.bin +++ b/data/layouts/SootopolisCity_Gym_B1F/map.bin diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SootopolisCity_House1/border.bin +++ b/data/layouts/SootopolisCity_House1/border.bin diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc new file mode 100644 index 000000000..5c37828ef --- /dev/null +++ b/data/layouts/SootopolisCity_House1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_House1_MapBorder:: + .incbin "data/layouts/SootopolisCity_House1/border.bin" + + .align 2 +SootopolisCity_House1_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_House1/map.bin" + + .align 2 +SootopolisCity_House1_Layout:: + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House1_MapBorder + .4byte SootopolisCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/layouts/SootopolisCity_House1/map.bin index 43f11b194..43f11b194 100644 --- a/data/maps/SootopolisCity_House1/map.bin +++ b/data/layouts/SootopolisCity_House1/map.bin diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SootopolisCity_House2/border.bin +++ b/data/layouts/SootopolisCity_House2/border.bin diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc new file mode 100644 index 000000000..ffa3c5ad1 --- /dev/null +++ b/data/layouts/SootopolisCity_House2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_House2_MapBorder:: + .incbin "data/layouts/SootopolisCity_House2/border.bin" + + .align 2 +SootopolisCity_House2_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_House2/map.bin" + + .align 2 +SootopolisCity_House2_Layout:: + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House2_MapBorder + .4byte SootopolisCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/layouts/SootopolisCity_House2/map.bin index 632e1e36a..632e1e36a 100644 --- a/data/maps/SootopolisCity_House2/map.bin +++ b/data/layouts/SootopolisCity_House2/map.bin diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SootopolisCity_House3/border.bin +++ b/data/layouts/SootopolisCity_House3/border.bin diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc new file mode 100644 index 000000000..3d1fa421c --- /dev/null +++ b/data/layouts/SootopolisCity_House3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_House3_MapBorder:: + .incbin "data/layouts/SootopolisCity_House3/border.bin" + + .align 2 +SootopolisCity_House3_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_House3/map.bin" + + .align 2 +SootopolisCity_House3_Layout:: + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House3_MapBorder + .4byte SootopolisCity_House3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/layouts/SootopolisCity_House3/map.bin index 8bbd6c517..8bbd6c517 100644 --- a/data/maps/SootopolisCity_House3/map.bin +++ b/data/layouts/SootopolisCity_House3/map.bin diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin b/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin +++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc new file mode 100644 index 000000000..1a0e7b418 --- /dev/null +++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_LotadAndSeedotHouse_MapBorder:: + .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin" + + .align 2 +SootopolisCity_LotadAndSeedotHouse_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" + + .align 2 +SootopolisCity_LotadAndSeedotHouse_Layout:: + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder + .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin b/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin index ffeea7269..ffeea7269 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin +++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc new file mode 100644 index 000000000..127128a2e --- /dev/null +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_MysteryEventsHouse_1F_MapBorder:: + .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin" + + .align 2 +SootopolisCity_MysteryEventsHouse_1F_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" + + .align 2 +SootopolisCity_MysteryEventsHouse_1F_Layout:: + .4byte 0xb + .4byte 0x8 + .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder + .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MysteryEventsHouse diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin index a9b17a746..a9b17a746 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc new file mode 100644 index 000000000..951b90582 --- /dev/null +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SootopolisCity_MysteryEventsHouse_B1F_MapBorder:: + .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin" + + .align 2 +SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata:: + .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" + + .align 2 +SootopolisCity_MysteryEventsHouse_B1F_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder + .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MysteryEventsHouse diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin index 558e1584e..558e1584e 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/layouts/SouthernIsland_Exterior/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/SouthernIsland_Exterior/border.bin +++ b/data/layouts/SouthernIsland_Exterior/border.bin diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc new file mode 100644 index 000000000..e5747d2e9 --- /dev/null +++ b/data/layouts/SouthernIsland_Exterior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SouthernIsland_Exterior_MapBorder:: + .incbin "data/layouts/SouthernIsland_Exterior/border.bin" + + .align 2 +SouthernIsland_Exterior_MapBlockdata:: + .incbin "data/layouts/SouthernIsland_Exterior/map.bin" + + .align 2 +SouthernIsland_Exterior_Layout:: + .4byte 0x21 + .4byte 0x1e + .4byte SouthernIsland_Exterior_MapBorder + .4byte SouthernIsland_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/layouts/SouthernIsland_Exterior/map.bin index 8c2c2df4a..8c2c2df4a 100644 --- a/data/maps/SouthernIsland_Exterior/map.bin +++ b/data/layouts/SouthernIsland_Exterior/map.bin diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/layouts/SouthernIsland_Interior/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SouthernIsland_Interior/border.bin +++ b/data/layouts/SouthernIsland_Interior/border.bin diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc new file mode 100644 index 000000000..3ac1a6a82 --- /dev/null +++ b/data/layouts/SouthernIsland_Interior/layout.inc @@ -0,0 +1,16 @@ + .align 2 +SouthernIsland_Interior_MapBorder:: + .incbin "data/layouts/SouthernIsland_Interior/border.bin" + + .align 2 +SouthernIsland_Interior_MapBlockdata:: + .incbin "data/layouts/SouthernIsland_Interior/map.bin" + + .align 2 +SouthernIsland_Interior_Layout:: + .4byte 0x1b + .4byte 0x18 + .4byte SouthernIsland_Interior_MapBorder + .4byte SouthernIsland_Interior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/layouts/SouthernIsland_Interior/map.bin index db1e4b153..db1e4b153 100644 --- a/data/maps/SouthernIsland_Interior/map.bin +++ b/data/layouts/SouthernIsland_Interior/map.bin diff --git a/data/maps/TerraCave_End/border.bin b/data/layouts/TerraCave_End/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/TerraCave_End/border.bin +++ b/data/layouts/TerraCave_End/border.bin diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc new file mode 100644 index 000000000..42ba6309b --- /dev/null +++ b/data/layouts/TerraCave_End/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TerraCave_End_MapBorder:: + .incbin "data/layouts/TerraCave_End/border.bin" + + .align 2 +TerraCave_End_MapBlockdata:: + .incbin "data/layouts/TerraCave_End/map.bin" + + .align 2 +TerraCave_End_Layout:: + .4byte 0x1b + .4byte 0x1e + .4byte TerraCave_End_MapBorder + .4byte TerraCave_End_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/TerraCave_End/map.bin b/data/layouts/TerraCave_End/map.bin index 93121190d..93121190d 100644 --- a/data/maps/TerraCave_End/map.bin +++ b/data/layouts/TerraCave_End/map.bin diff --git a/data/maps/TerraCave_Entrance/border.bin b/data/layouts/TerraCave_Entrance/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/TerraCave_Entrance/border.bin +++ b/data/layouts/TerraCave_Entrance/border.bin diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc new file mode 100644 index 000000000..8b0a09650 --- /dev/null +++ b/data/layouts/TerraCave_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TerraCave_Entrance_MapBorder:: + .incbin "data/layouts/TerraCave_Entrance/border.bin" + + .align 2 +TerraCave_Entrance_MapBlockdata:: + .incbin "data/layouts/TerraCave_Entrance/map.bin" + + .align 2 +TerraCave_Entrance_Layout:: + .4byte 0x14 + .4byte 0x14 + .4byte TerraCave_Entrance_MapBorder + .4byte TerraCave_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/TerraCave_Entrance/map.bin b/data/layouts/TerraCave_Entrance/map.bin index a8108c2ca..a8108c2ca 100644 --- a/data/maps/TerraCave_Entrance/map.bin +++ b/data/layouts/TerraCave_Entrance/map.bin diff --git a/data/maps/TradeCenter/border.bin b/data/layouts/TradeCenter/border.bin index 19d906679..19d906679 100644 --- a/data/maps/TradeCenter/border.bin +++ b/data/layouts/TradeCenter/border.bin diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc new file mode 100644 index 000000000..59d257c62 --- /dev/null +++ b/data/layouts/TradeCenter/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TradeCenter_MapBorder:: + .incbin "data/layouts/TradeCenter/border.bin" + + .align 2 +TradeCenter_MapBlockdata:: + .incbin "data/layouts/TradeCenter/map.bin" + + .align 2 +TradeCenter_Layout:: + .4byte 0xc + .4byte 0x9 + .4byte TradeCenter_MapBorder + .4byte TradeCenter_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/TradeCenter/map.bin b/data/layouts/TradeCenter/map.bin index 7e592dbe6..7e592dbe6 100644 --- a/data/maps/TradeCenter/map.bin +++ b/data/layouts/TradeCenter/map.bin diff --git a/data/maps/TrainerHill_1F/border.bin b/data/layouts/TrainerHill_1F/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/TrainerHill_1F/border.bin +++ b/data/layouts/TrainerHill_1F/border.bin diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc new file mode 100644 index 000000000..0cb5fee4a --- /dev/null +++ b/data/layouts/TrainerHill_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_1F_MapBorder:: + .incbin "data/layouts/TrainerHill_1F/border.bin" + + .align 2 +TrainerHill_1F_MapBlockdata:: + .incbin "data/layouts/TrainerHill_1F/map.bin" + + .align 2 +TrainerHill_1F_Layout:: + .4byte 0x10 + .4byte 0x15 + .4byte TrainerHill_1F_MapBorder + .4byte TrainerHill_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/maps/TrainerHill_1F/map.bin b/data/layouts/TrainerHill_1F/map.bin index d72e84a5c..d72e84a5c 100644 --- a/data/maps/TrainerHill_1F/map.bin +++ b/data/layouts/TrainerHill_1F/map.bin diff --git a/data/maps/TrainerHill_2F/border.bin b/data/layouts/TrainerHill_2F/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/TrainerHill_2F/border.bin +++ b/data/layouts/TrainerHill_2F/border.bin diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc new file mode 100644 index 000000000..25ac09eb9 --- /dev/null +++ b/data/layouts/TrainerHill_2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_2F_MapBorder:: + .incbin "data/layouts/TrainerHill_2F/border.bin" + + .align 2 +TrainerHill_2F_MapBlockdata:: + .incbin "data/layouts/TrainerHill_2F/map.bin" + + .align 2 +TrainerHill_2F_Layout:: + .4byte 0x10 + .4byte 0x15 + .4byte TrainerHill_2F_MapBorder + .4byte TrainerHill_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/maps/TrainerHill_2F/map.bin b/data/layouts/TrainerHill_2F/map.bin index 8b78fd0b4..8b78fd0b4 100644 --- a/data/maps/TrainerHill_2F/map.bin +++ b/data/layouts/TrainerHill_2F/map.bin diff --git a/data/maps/TrainerHill_3F/border.bin b/data/layouts/TrainerHill_3F/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/TrainerHill_3F/border.bin +++ b/data/layouts/TrainerHill_3F/border.bin diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc new file mode 100644 index 000000000..2b9f74cc7 --- /dev/null +++ b/data/layouts/TrainerHill_3F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_3F_MapBorder:: + .incbin "data/layouts/TrainerHill_3F/border.bin" + + .align 2 +TrainerHill_3F_MapBlockdata:: + .incbin "data/layouts/TrainerHill_3F/map.bin" + + .align 2 +TrainerHill_3F_Layout:: + .4byte 0x10 + .4byte 0x15 + .4byte TrainerHill_3F_MapBorder + .4byte TrainerHill_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/maps/TrainerHill_3F/map.bin b/data/layouts/TrainerHill_3F/map.bin index 5280752f4..5280752f4 100644 --- a/data/maps/TrainerHill_3F/map.bin +++ b/data/layouts/TrainerHill_3F/map.bin diff --git a/data/maps/TrainerHill_4F/border.bin b/data/layouts/TrainerHill_4F/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/TrainerHill_4F/border.bin +++ b/data/layouts/TrainerHill_4F/border.bin diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc new file mode 100644 index 000000000..8664a3c90 --- /dev/null +++ b/data/layouts/TrainerHill_4F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_4F_MapBorder:: + .incbin "data/layouts/TrainerHill_4F/border.bin" + + .align 2 +TrainerHill_4F_MapBlockdata:: + .incbin "data/layouts/TrainerHill_4F/map.bin" + + .align 2 +TrainerHill_4F_Layout:: + .4byte 0x10 + .4byte 0x15 + .4byte TrainerHill_4F_MapBorder + .4byte TrainerHill_4F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/maps/TrainerHill_4F/map.bin b/data/layouts/TrainerHill_4F/map.bin index 3a285b7f8..3a285b7f8 100644 --- a/data/maps/TrainerHill_4F/map.bin +++ b/data/layouts/TrainerHill_4F/map.bin diff --git a/data/maps/TrainerHill_Entrance/border.bin b/data/layouts/TrainerHill_Entrance/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/TrainerHill_Entrance/border.bin +++ b/data/layouts/TrainerHill_Entrance/border.bin diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc new file mode 100644 index 000000000..0fc549f46 --- /dev/null +++ b/data/layouts/TrainerHill_Entrance/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_Entrance_MapBorder:: + .incbin "data/layouts/TrainerHill_Entrance/border.bin" + + .align 2 +TrainerHill_Entrance_MapBlockdata:: + .incbin "data/layouts/TrainerHill_Entrance/map.bin" + + .align 2 +TrainerHill_Entrance_Layout:: + .4byte 0x13 + .4byte 0x11 + .4byte TrainerHill_Entrance_MapBorder + .4byte TrainerHill_Entrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/maps/TrainerHill_Entrance/map.bin b/data/layouts/TrainerHill_Entrance/map.bin index fc00c0a5f..fc00c0a5f 100644 --- a/data/maps/TrainerHill_Entrance/map.bin +++ b/data/layouts/TrainerHill_Entrance/map.bin diff --git a/data/maps/TrainerHill_Roof/border.bin b/data/layouts/TrainerHill_Roof/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/TrainerHill_Roof/border.bin +++ b/data/layouts/TrainerHill_Roof/border.bin diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc new file mode 100644 index 000000000..bfa1aeb35 --- /dev/null +++ b/data/layouts/TrainerHill_Roof/layout.inc @@ -0,0 +1,16 @@ + .align 2 +TrainerHill_Roof_MapBorder:: + .incbin "data/layouts/TrainerHill_Roof/border.bin" + + .align 2 +TrainerHill_Roof_MapBlockdata:: + .incbin "data/layouts/TrainerHill_Roof/map.bin" + + .align 2 +TrainerHill_Roof_Layout:: + .4byte 0x19 + .4byte 0x10 + .4byte TrainerHill_Roof_MapBorder + .4byte TrainerHill_Roof_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrainerHill diff --git a/data/maps/TrainerHill_Roof/map.bin b/data/layouts/TrainerHill_Roof/map.bin index 815ec1067..815ec1067 100644 --- a/data/maps/TrainerHill_Roof/map.bin +++ b/data/layouts/TrainerHill_Roof/map.bin diff --git a/data/maps/Underwater1/border.bin b/data/layouts/Underwater1/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater1/border.bin +++ b/data/layouts/Underwater1/border.bin diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc new file mode 100644 index 000000000..f2b61dfbc --- /dev/null +++ b/data/layouts/Underwater1/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater1_MapBorder:: + .incbin "data/layouts/Underwater1/border.bin" + + .align 2 +Underwater1_MapBlockdata:: + .incbin "data/layouts/Underwater1/map.bin" + + .align 2 +Underwater1_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Underwater1_MapBorder + .4byte Underwater1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater1/map.bin b/data/layouts/Underwater1/map.bin index 230e3dcd2..230e3dcd2 100644 --- a/data/maps/Underwater1/map.bin +++ b/data/layouts/Underwater1/map.bin diff --git a/data/maps/Underwater2/border.bin b/data/layouts/Underwater2/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater2/border.bin +++ b/data/layouts/Underwater2/border.bin diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc new file mode 100644 index 000000000..ab8892c86 --- /dev/null +++ b/data/layouts/Underwater2/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater2_MapBorder:: + .incbin "data/layouts/Underwater2/border.bin" + + .align 2 +Underwater2_MapBlockdata:: + .incbin "data/layouts/Underwater2/map.bin" + + .align 2 +Underwater2_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Underwater2_MapBorder + .4byte Underwater2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater2/map.bin b/data/layouts/Underwater2/map.bin index 0c6377c30..0c6377c30 100644 --- a/data/maps/Underwater2/map.bin +++ b/data/layouts/Underwater2/map.bin diff --git a/data/maps/Underwater3/border.bin b/data/layouts/Underwater3/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater3/border.bin +++ b/data/layouts/Underwater3/border.bin diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc new file mode 100644 index 000000000..b1238bc1f --- /dev/null +++ b/data/layouts/Underwater3/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater3_MapBorder:: + .incbin "data/layouts/Underwater3/border.bin" + + .align 2 +Underwater3_MapBlockdata:: + .incbin "data/layouts/Underwater3/map.bin" + + .align 2 +Underwater3_Layout:: + .4byte 0x50 + .4byte 0x50 + .4byte Underwater3_MapBorder + .4byte Underwater3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater3/map.bin b/data/layouts/Underwater3/map.bin index fc5c331a5..fc5c331a5 100644 --- a/data/maps/Underwater3/map.bin +++ b/data/layouts/Underwater3/map.bin diff --git a/data/maps/Underwater4/border.bin b/data/layouts/Underwater4/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater4/border.bin +++ b/data/layouts/Underwater4/border.bin diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc new file mode 100644 index 000000000..ed46c9f5b --- /dev/null +++ b/data/layouts/Underwater4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater4_MapBorder:: + .incbin "data/layouts/Underwater4/border.bin" + + .align 2 +Underwater4_MapBlockdata:: + .incbin "data/layouts/Underwater4/map.bin" + + .align 2 +Underwater4_Layout:: + .4byte 0x78 + .4byte 0x28 + .4byte Underwater4_MapBorder + .4byte Underwater4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater4/map.bin b/data/layouts/Underwater4/map.bin index 23f987681..23f987681 100644 --- a/data/maps/Underwater4/map.bin +++ b/data/layouts/Underwater4/map.bin diff --git a/data/maps/Underwater5/border.bin b/data/layouts/Underwater5/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater5/border.bin +++ b/data/layouts/Underwater5/border.bin diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc new file mode 100644 index 000000000..cef2c5d76 --- /dev/null +++ b/data/layouts/Underwater5/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater5_MapBorder:: + .incbin "data/layouts/Underwater5/border.bin" + + .align 2 +Underwater5_MapBlockdata:: + .incbin "data/layouts/Underwater5/map.bin" + + .align 2 +Underwater5_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Underwater5_MapBorder + .4byte Underwater5_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater5/map.bin b/data/layouts/Underwater5/map.bin index 902f0dbdc..902f0dbdc 100644 --- a/data/maps/Underwater5/map.bin +++ b/data/layouts/Underwater5/map.bin diff --git a/data/maps/Underwater6/border.bin b/data/layouts/Underwater6/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater6/border.bin +++ b/data/layouts/Underwater6/border.bin diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc new file mode 100644 index 000000000..c6f8b9742 --- /dev/null +++ b/data/layouts/Underwater6/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater6_MapBorder:: + .incbin "data/layouts/Underwater6/border.bin" + + .align 2 +Underwater6_MapBlockdata:: + .incbin "data/layouts/Underwater6/map.bin" + + .align 2 +Underwater6_Layout:: + .4byte 0x28 + .4byte 0x50 + .4byte Underwater6_MapBorder + .4byte Underwater6_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater6/map.bin b/data/layouts/Underwater6/map.bin index 92bd56031..92bd56031 100644 --- a/data/maps/Underwater6/map.bin +++ b/data/layouts/Underwater6/map.bin diff --git a/data/maps/Underwater7/border.bin b/data/layouts/Underwater7/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater7/border.bin +++ b/data/layouts/Underwater7/border.bin diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc new file mode 100644 index 000000000..e910152e4 --- /dev/null +++ b/data/layouts/Underwater7/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater7_MapBorder:: + .incbin "data/layouts/Underwater7/border.bin" + + .align 2 +Underwater7_MapBlockdata:: + .incbin "data/layouts/Underwater7/map.bin" + + .align 2 +Underwater7_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte Underwater7_MapBorder + .4byte Underwater7_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater7/map.bin b/data/layouts/Underwater7/map.bin index 660f585ae..660f585ae 100644 --- a/data/maps/Underwater7/map.bin +++ b/data/layouts/Underwater7/map.bin diff --git a/data/maps/Underwater_MarineCave/border.bin b/data/layouts/Underwater_MarineCave/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_MarineCave/border.bin +++ b/data/layouts/Underwater_MarineCave/border.bin diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc new file mode 100644 index 000000000..c51bbeb35 --- /dev/null +++ b/data/layouts/Underwater_MarineCave/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_MarineCave_MapBorder:: + .incbin "data/layouts/Underwater_MarineCave/border.bin" + + .align 2 +Underwater_MarineCave_MapBlockdata:: + .incbin "data/layouts/Underwater_MarineCave/map.bin" + + .align 2 +Underwater_MarineCave_Layout:: + .4byte 0x14 + .4byte 0xa + .4byte Underwater_MarineCave_MapBorder + .4byte Underwater_MarineCave_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_MarineCave/map.bin b/data/layouts/Underwater_MarineCave/map.bin index 1904f4757..1904f4757 100644 --- a/data/maps/Underwater_MarineCave/map.bin +++ b/data/layouts/Underwater_MarineCave/map.bin diff --git a/data/maps/Underwater_Route134/border.bin b/data/layouts/Underwater_Route134/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_Route134/border.bin +++ b/data/layouts/Underwater_Route134/border.bin diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc new file mode 100644 index 000000000..a4bcf2043 --- /dev/null +++ b/data/layouts/Underwater_Route134/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_Route134_MapBorder:: + .incbin "data/layouts/Underwater_Route134/border.bin" + + .align 2 +Underwater_Route134_MapBlockdata:: + .incbin "data/layouts/Underwater_Route134/map.bin" + + .align 2 +Underwater_Route134_Layout:: + .4byte 0x12 + .4byte 0xa + .4byte Underwater_Route134_MapBorder + .4byte Underwater_Route134_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_Route134/map.bin b/data/layouts/Underwater_Route134/map.bin index 77bdd37aa..77bdd37aa 100644 --- a/data/maps/Underwater_Route134/map.bin +++ b/data/layouts/Underwater_Route134/map.bin diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/layouts/Underwater_SeafloorCavern/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_SeafloorCavern/border.bin +++ b/data/layouts/Underwater_SeafloorCavern/border.bin diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc new file mode 100644 index 000000000..5d610efb1 --- /dev/null +++ b/data/layouts/Underwater_SeafloorCavern/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_SeafloorCavern_MapBorder:: + .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" + + .align 2 +Underwater_SeafloorCavern_MapBlockdata:: + .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" + + .align 2 +Underwater_SeafloorCavern_Layout:: + .4byte 0xe + .4byte 0x9 + .4byte Underwater_SeafloorCavern_MapBorder + .4byte Underwater_SeafloorCavern_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/layouts/Underwater_SeafloorCavern/map.bin index 4cacc495e..4cacc495e 100644 --- a/data/maps/Underwater_SeafloorCavern/map.bin +++ b/data/layouts/Underwater_SeafloorCavern/map.bin diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/layouts/Underwater_SealedChamber/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_SealedChamber/border.bin +++ b/data/layouts/Underwater_SealedChamber/border.bin diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc new file mode 100644 index 000000000..a6f924c18 --- /dev/null +++ b/data/layouts/Underwater_SealedChamber/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_SealedChamber_MapBorder:: + .incbin "data/layouts/Underwater_SealedChamber/border.bin" + + .align 2 +Underwater_SealedChamber_MapBlockdata:: + .incbin "data/layouts/Underwater_SealedChamber/map.bin" + + .align 2 +Underwater_SealedChamber_Layout:: + .4byte 0x16 + .4byte 0x30 + .4byte Underwater_SealedChamber_MapBorder + .4byte Underwater_SealedChamber_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/layouts/Underwater_SealedChamber/map.bin index 5ac0b4a73..5ac0b4a73 100644 --- a/data/maps/Underwater_SealedChamber/map.bin +++ b/data/layouts/Underwater_SealedChamber/map.bin diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/layouts/Underwater_SootopolisCity/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_SootopolisCity/border.bin +++ b/data/layouts/Underwater_SootopolisCity/border.bin diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc new file mode 100644 index 000000000..22d42167e --- /dev/null +++ b/data/layouts/Underwater_SootopolisCity/layout.inc @@ -0,0 +1,16 @@ + .align 2 +Underwater_SootopolisCity_MapBorder:: + .incbin "data/layouts/Underwater_SootopolisCity/border.bin" + + .align 2 +Underwater_SootopolisCity_MapBlockdata:: + .incbin "data/layouts/Underwater_SootopolisCity/map.bin" + + .align 2 +Underwater_SootopolisCity_Layout:: + .4byte 0x14 + .4byte 0xa + .4byte Underwater_SootopolisCity_MapBorder + .4byte Underwater_SootopolisCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/layouts/Underwater_SootopolisCity/map.bin index 71346ab72..71346ab72 100644 --- a/data/maps/Underwater_SootopolisCity/map.bin +++ b/data/layouts/Underwater_SootopolisCity/map.bin diff --git a/data/maps/UnionRoom/border.bin b/data/layouts/UnionRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/UnionRoom/border.bin +++ b/data/layouts/UnionRoom/border.bin diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc new file mode 100644 index 000000000..2c7e821a9 --- /dev/null +++ b/data/layouts/UnionRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnionRoom_MapBorder:: + .incbin "data/layouts/UnionRoom/border.bin" + + .align 2 +UnionRoom_MapBlockdata:: + .incbin "data/layouts/UnionRoom/map.bin" + + .align 2 +UnionRoom_Layout:: + .4byte 0xf + .4byte 0xc + .4byte UnionRoom_MapBorder + .4byte UnionRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_UnionRoom diff --git a/data/maps/UnionRoom/map.bin b/data/layouts/UnionRoom/map.bin index cb1b009c3..cb1b009c3 100644 --- a/data/maps/UnionRoom/map.bin +++ b/data/layouts/UnionRoom/map.bin diff --git a/data/maps/UnknownMap_08417FC4/border.bin b/data/layouts/UnknownMap_08417FC4/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/UnknownMap_08417FC4/border.bin +++ b/data/layouts/UnknownMap_08417FC4/border.bin diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc new file mode 100644 index 000000000..0f3b5504d --- /dev/null +++ b/data/layouts/UnknownMap_08417FC4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08417FC4_MapBorder:: + .incbin "data/layouts/UnknownMap_08417FC4/border.bin" + + .align 2 +UnknownMap_08417FC4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08417FC4/map.bin" + + .align 2 +UnknownMap_08417FC4_Layout:: + .4byte 0x50 + .4byte 0x28 + .4byte UnknownMap_08417FC4_MapBorder + .4byte UnknownMap_08417FC4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_08417FC4/map.bin b/data/layouts/UnknownMap_08417FC4/map.bin index 17a14a8d5..17a14a8d5 100644 --- a/data/maps/UnknownMap_08417FC4/map.bin +++ b/data/layouts/UnknownMap_08417FC4/map.bin diff --git a/data/maps/UnknownMap_08428450/border.bin b/data/layouts/UnknownMap_08428450/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_08428450/border.bin +++ b/data/layouts/UnknownMap_08428450/border.bin diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc new file mode 100644 index 000000000..603919b42 --- /dev/null +++ b/data/layouts/UnknownMap_08428450/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08428450_MapBorder:: + .incbin "data/layouts/UnknownMap_08428450/border.bin" + + .align 2 +UnknownMap_08428450_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08428450/map.bin" + + .align 2 +UnknownMap_08428450_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_08428450_MapBorder + .4byte UnknownMap_08428450_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_08428450/map.bin b/data/layouts/UnknownMap_08428450/map.bin Binary files differindex ca93fa0e2..ca93fa0e2 100644 --- a/data/maps/UnknownMap_08428450/map.bin +++ b/data/layouts/UnknownMap_08428450/map.bin diff --git a/data/maps/UnknownMap_084294C4/border.bin b/data/layouts/UnknownMap_084294C4/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_084294C4/border.bin +++ b/data/layouts/UnknownMap_084294C4/border.bin diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc new file mode 100644 index 000000000..3e565369a --- /dev/null +++ b/data/layouts/UnknownMap_084294C4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084294C4_MapBorder:: + .incbin "data/layouts/UnknownMap_084294C4/border.bin" + + .align 2 +UnknownMap_084294C4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084294C4/map.bin" + + .align 2 +UnknownMap_084294C4_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_084294C4_MapBorder + .4byte UnknownMap_084294C4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_084294C4/map.bin b/data/layouts/UnknownMap_084294C4/map.bin Binary files differindex 37f05b971..37f05b971 100644 --- a/data/maps/UnknownMap_084294C4/map.bin +++ b/data/layouts/UnknownMap_084294C4/map.bin diff --git a/data/maps/UnknownMap_084294E8/border.bin b/data/layouts/UnknownMap_084294E8/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_084294E8/border.bin +++ b/data/layouts/UnknownMap_084294E8/border.bin diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc new file mode 100644 index 000000000..fd157b999 --- /dev/null +++ b/data/layouts/UnknownMap_084294E8/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084294E8_MapBorder:: + .incbin "data/layouts/UnknownMap_084294E8/border.bin" + + .align 2 +UnknownMap_084294E8_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084294E8/map.bin" + + .align 2 +UnknownMap_084294E8_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_084294E8_MapBorder + .4byte UnknownMap_084294E8_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_084294E8/map.bin b/data/layouts/UnknownMap_084294E8/map.bin Binary files differindex ca93fa0e2..ca93fa0e2 100644 --- a/data/maps/UnknownMap_084294E8/map.bin +++ b/data/layouts/UnknownMap_084294E8/map.bin diff --git a/data/maps/UnknownMap_0843E6C0/border.bin b/data/layouts/UnknownMap_0843E6C0/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E6C0/border.bin +++ b/data/layouts/UnknownMap_0843E6C0/border.bin diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc new file mode 100644 index 000000000..9cc060b76 --- /dev/null +++ b/data/layouts/UnknownMap_0843E6C0/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E6C0_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E6C0/border.bin" + + .align 2 +UnknownMap_0843E6C0_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E6C0/map.bin" + + .align 2 +UnknownMap_0843E6C0_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E6C0_MapBorder + .4byte UnknownMap_0843E6C0_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E6C0/map.bin b/data/layouts/UnknownMap_0843E6C0/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E6C0/map.bin +++ b/data/layouts/UnknownMap_0843E6C0/map.bin diff --git a/data/maps/UnknownMap_0843E6E4/border.bin b/data/layouts/UnknownMap_0843E6E4/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E6E4/border.bin +++ b/data/layouts/UnknownMap_0843E6E4/border.bin diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc new file mode 100644 index 000000000..5651df7df --- /dev/null +++ b/data/layouts/UnknownMap_0843E6E4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E6E4_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E6E4/border.bin" + + .align 2 +UnknownMap_0843E6E4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E6E4/map.bin" + + .align 2 +UnknownMap_0843E6E4_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E6E4_MapBorder + .4byte UnknownMap_0843E6E4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E6E4/map.bin b/data/layouts/UnknownMap_0843E6E4/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E6E4/map.bin +++ b/data/layouts/UnknownMap_0843E6E4/map.bin diff --git a/data/maps/UnknownMap_0843E708/border.bin b/data/layouts/UnknownMap_0843E708/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E708/border.bin +++ b/data/layouts/UnknownMap_0843E708/border.bin diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc new file mode 100644 index 000000000..b79c2d34b --- /dev/null +++ b/data/layouts/UnknownMap_0843E708/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E708_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E708/border.bin" + + .align 2 +UnknownMap_0843E708_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E708/map.bin" + + .align 2 +UnknownMap_0843E708_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E708_MapBorder + .4byte UnknownMap_0843E708_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E708/map.bin b/data/layouts/UnknownMap_0843E708/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E708/map.bin +++ b/data/layouts/UnknownMap_0843E708/map.bin diff --git a/data/maps/UnknownMap_0843E72C/border.bin b/data/layouts/UnknownMap_0843E72C/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E72C/border.bin +++ b/data/layouts/UnknownMap_0843E72C/border.bin diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc new file mode 100644 index 000000000..36aee8b80 --- /dev/null +++ b/data/layouts/UnknownMap_0843E72C/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E72C_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E72C/border.bin" + + .align 2 +UnknownMap_0843E72C_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E72C/map.bin" + + .align 2 +UnknownMap_0843E72C_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E72C_MapBorder + .4byte UnknownMap_0843E72C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E72C/map.bin b/data/layouts/UnknownMap_0843E72C/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E72C/map.bin +++ b/data/layouts/UnknownMap_0843E72C/map.bin diff --git a/data/maps/UnknownMap_0843E750/border.bin b/data/layouts/UnknownMap_0843E750/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E750/border.bin +++ b/data/layouts/UnknownMap_0843E750/border.bin diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc new file mode 100644 index 000000000..c233955f1 --- /dev/null +++ b/data/layouts/UnknownMap_0843E750/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E750_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E750/border.bin" + + .align 2 +UnknownMap_0843E750_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E750/map.bin" + + .align 2 +UnknownMap_0843E750_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E750_MapBorder + .4byte UnknownMap_0843E750_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E750/map.bin b/data/layouts/UnknownMap_0843E750/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E750/map.bin +++ b/data/layouts/UnknownMap_0843E750/map.bin diff --git a/data/maps/UnknownMap_0843E774/border.bin b/data/layouts/UnknownMap_0843E774/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E774/border.bin +++ b/data/layouts/UnknownMap_0843E774/border.bin diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc new file mode 100644 index 000000000..bc2c238f3 --- /dev/null +++ b/data/layouts/UnknownMap_0843E774/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E774_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E774/border.bin" + + .align 2 +UnknownMap_0843E774_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E774/map.bin" + + .align 2 +UnknownMap_0843E774_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E774_MapBorder + .4byte UnknownMap_0843E774_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E774/map.bin b/data/layouts/UnknownMap_0843E774/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E774/map.bin +++ b/data/layouts/UnknownMap_0843E774/map.bin diff --git a/data/maps/UnknownMap_0843E798/border.bin b/data/layouts/UnknownMap_0843E798/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E798/border.bin +++ b/data/layouts/UnknownMap_0843E798/border.bin diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc new file mode 100644 index 000000000..352db474d --- /dev/null +++ b/data/layouts/UnknownMap_0843E798/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E798_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E798/border.bin" + + .align 2 +UnknownMap_0843E798_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E798/map.bin" + + .align 2 +UnknownMap_0843E798_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E798_MapBorder + .4byte UnknownMap_0843E798_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E798/map.bin b/data/layouts/UnknownMap_0843E798/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E798/map.bin +++ b/data/layouts/UnknownMap_0843E798/map.bin diff --git a/data/maps/UnknownMap_0843E7BC/border.bin b/data/layouts/UnknownMap_0843E7BC/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E7BC/border.bin +++ b/data/layouts/UnknownMap_0843E7BC/border.bin diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc new file mode 100644 index 000000000..c0edd37eb --- /dev/null +++ b/data/layouts/UnknownMap_0843E7BC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E7BC_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E7BC/border.bin" + + .align 2 +UnknownMap_0843E7BC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E7BC/map.bin" + + .align 2 +UnknownMap_0843E7BC_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E7BC_MapBorder + .4byte UnknownMap_0843E7BC_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E7BC/map.bin b/data/layouts/UnknownMap_0843E7BC/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E7BC/map.bin +++ b/data/layouts/UnknownMap_0843E7BC/map.bin diff --git a/data/maps/UnknownMap_0843E7E0/border.bin b/data/layouts/UnknownMap_0843E7E0/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E7E0/border.bin +++ b/data/layouts/UnknownMap_0843E7E0/border.bin diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc new file mode 100644 index 000000000..b421cf662 --- /dev/null +++ b/data/layouts/UnknownMap_0843E7E0/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E7E0_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E7E0/border.bin" + + .align 2 +UnknownMap_0843E7E0_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E7E0/map.bin" + + .align 2 +UnknownMap_0843E7E0_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E7E0_MapBorder + .4byte UnknownMap_0843E7E0_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E7E0/map.bin b/data/layouts/UnknownMap_0843E7E0/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E7E0/map.bin +++ b/data/layouts/UnknownMap_0843E7E0/map.bin diff --git a/data/maps/UnknownMap_0843E804/border.bin b/data/layouts/UnknownMap_0843E804/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E804/border.bin +++ b/data/layouts/UnknownMap_0843E804/border.bin diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc new file mode 100644 index 000000000..d8bc1cfb0 --- /dev/null +++ b/data/layouts/UnknownMap_0843E804/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E804_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E804/border.bin" + + .align 2 +UnknownMap_0843E804_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E804/map.bin" + + .align 2 +UnknownMap_0843E804_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E804_MapBorder + .4byte UnknownMap_0843E804_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E804/map.bin b/data/layouts/UnknownMap_0843E804/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E804/map.bin +++ b/data/layouts/UnknownMap_0843E804/map.bin diff --git a/data/maps/UnknownMap_0843E828/border.bin b/data/layouts/UnknownMap_0843E828/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E828/border.bin +++ b/data/layouts/UnknownMap_0843E828/border.bin diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc new file mode 100644 index 000000000..dddd408cc --- /dev/null +++ b/data/layouts/UnknownMap_0843E828/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E828_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E828/border.bin" + + .align 2 +UnknownMap_0843E828_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E828/map.bin" + + .align 2 +UnknownMap_0843E828_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E828_MapBorder + .4byte UnknownMap_0843E828_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E828/map.bin b/data/layouts/UnknownMap_0843E828/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E828/map.bin +++ b/data/layouts/UnknownMap_0843E828/map.bin diff --git a/data/maps/UnknownMap_0843E84C/border.bin b/data/layouts/UnknownMap_0843E84C/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E84C/border.bin +++ b/data/layouts/UnknownMap_0843E84C/border.bin diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc new file mode 100644 index 000000000..34c5282d5 --- /dev/null +++ b/data/layouts/UnknownMap_0843E84C/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E84C_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E84C/border.bin" + + .align 2 +UnknownMap_0843E84C_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E84C/map.bin" + + .align 2 +UnknownMap_0843E84C_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E84C_MapBorder + .4byte UnknownMap_0843E84C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E84C/map.bin b/data/layouts/UnknownMap_0843E84C/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E84C/map.bin +++ b/data/layouts/UnknownMap_0843E84C/map.bin diff --git a/data/maps/UnknownMap_0843E870/border.bin b/data/layouts/UnknownMap_0843E870/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E870/border.bin +++ b/data/layouts/UnknownMap_0843E870/border.bin diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc new file mode 100644 index 000000000..0ddc0f858 --- /dev/null +++ b/data/layouts/UnknownMap_0843E870/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0843E870_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E870/border.bin" + + .align 2 +UnknownMap_0843E870_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E870/map.bin" + + .align 2 +UnknownMap_0843E870_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E870_MapBorder + .4byte UnknownMap_0843E870_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E870/map.bin b/data/layouts/UnknownMap_0843E870/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E870/map.bin +++ b/data/layouts/UnknownMap_0843E870/map.bin diff --git a/data/maps/UnknownMap_0843E894/border.bin b/data/layouts/UnknownMap_0843E894/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_0843E894/border.bin +++ b/data/layouts/UnknownMap_0843E894/border.bin diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc new file mode 100755 index 000000000..0b3cc1697 --- /dev/null +++ b/data/layouts/UnknownMap_0843E894/layout.inc @@ -0,0 +1,15 @@ + .align 2 +UnknownMap_0843E894_MapBorder:: + .incbin "data/layouts/UnknownMap_0843E894/border.bin" + +UnknownMap_0843E894_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0843E894/map.bin" + + .align 2 +UnknownMap_0843E894_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_0843E894_MapBorder + .4byte UnknownMap_0843E894_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0843E894/map.bin b/data/layouts/UnknownMap_0843E894/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_0843E894/map.bin +++ b/data/layouts/UnknownMap_0843E894/map.bin diff --git a/data/maps/UnknownMap_08447028/border.bin b/data/layouts/UnknownMap_08447028/border.bin index 9e4b3fb7a..9e4b3fb7a 100644 --- a/data/maps/UnknownMap_08447028/border.bin +++ b/data/layouts/UnknownMap_08447028/border.bin diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc new file mode 100644 index 000000000..ea5e6288d --- /dev/null +++ b/data/layouts/UnknownMap_08447028/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08447028_MapBorder:: + .incbin "data/layouts/UnknownMap_08447028/border.bin" + + .align 2 +UnknownMap_08447028_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08447028/map.bin" + + .align 2 +UnknownMap_08447028_Layout:: + .4byte 0x3A + .4byte 0x1A + .4byte UnknownMap_08447028_MapBorder + .4byte UnknownMap_08447028_MapBlockdata + .4byte gTileset_General + .4byte 0 diff --git a/data/maps/UnknownMap_08447028/map.bin b/data/layouts/UnknownMap_08447028/map.bin index 028da0526..028da0526 100644 --- a/data/maps/UnknownMap_08447028/map.bin +++ b/data/layouts/UnknownMap_08447028/map.bin diff --git a/data/maps/UnknownMap_0845A394/border.bin b/data/layouts/UnknownMap_0845A394/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/UnknownMap_0845A394/border.bin +++ b/data/layouts/UnknownMap_0845A394/border.bin diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc new file mode 100644 index 000000000..d9951db4d --- /dev/null +++ b/data/layouts/UnknownMap_0845A394/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0845A394_MapBorder:: + .incbin "data/layouts/UnknownMap_0845A394/border.bin" + + .align 2 +UnknownMap_0845A394_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0845A394/map.bin" + + .align 2 +UnknownMap_0845A394_Layout:: + .4byte 0x13 + .4byte 0x13 + .4byte UnknownMap_0845A394_MapBorder + .4byte UnknownMap_0845A394_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0845A394/map.bin b/data/layouts/UnknownMap_0845A394/map.bin Binary files differindex fd294d9b6..fd294d9b6 100644 --- a/data/maps/UnknownMap_0845A394/map.bin +++ b/data/layouts/UnknownMap_0845A394/map.bin diff --git a/data/maps/UnknownMap_0845D470/border.bin b/data/layouts/UnknownMap_0845D470/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/UnknownMap_0845D470/border.bin +++ b/data/layouts/UnknownMap_0845D470/border.bin diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc new file mode 100644 index 000000000..36421f503 --- /dev/null +++ b/data/layouts/UnknownMap_0845D470/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0845D470_MapBorder:: + .incbin "data/layouts/UnknownMap_0845D470/border.bin" + + .align 2 +UnknownMap_0845D470_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0845D470/map.bin" + + .align 2 +UnknownMap_0845D470_Layout:: + .4byte 0x3C + .4byte 0x28 + .4byte UnknownMap_0845D470_MapBorder + .4byte UnknownMap_0845D470_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/UnknownMap_0845D470/map.bin b/data/layouts/UnknownMap_0845D470/map.bin index cd136de41..cd136de41 100644 --- a/data/maps/UnknownMap_0845D470/map.bin +++ b/data/layouts/UnknownMap_0845D470/map.bin diff --git a/data/maps/UnknownMap_0845ECB4/border.bin b/data/layouts/UnknownMap_0845ECB4/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/UnknownMap_0845ECB4/border.bin +++ b/data/layouts/UnknownMap_0845ECB4/border.bin diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc new file mode 100644 index 000000000..ca018989b --- /dev/null +++ b/data/layouts/UnknownMap_0845ECB4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0845ECB4_MapBorder:: + .incbin "data/layouts/UnknownMap_0845ECB4/border.bin" + + .align 2 +UnknownMap_0845ECB4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0845ECB4/map.bin" + + .align 2 +UnknownMap_0845ECB4_Layout:: + .4byte 0x1B + .4byte 0x2E + .4byte UnknownMap_0845ECB4_MapBorder + .4byte UnknownMap_0845ECB4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_0845ECB4/map.bin b/data/layouts/UnknownMap_0845ECB4/map.bin index ec344933f..ec344933f 100644 --- a/data/maps/UnknownMap_0845ECB4/map.bin +++ b/data/layouts/UnknownMap_0845ECB4/map.bin diff --git a/data/maps/UnknownMap_08469200/border.bin b/data/layouts/UnknownMap_08469200/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/UnknownMap_08469200/border.bin +++ b/data/layouts/UnknownMap_08469200/border.bin diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc new file mode 100644 index 000000000..babdb2c61 --- /dev/null +++ b/data/layouts/UnknownMap_08469200/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08469200_MapBorder:: + .incbin "data/layouts/UnknownMap_08469200/border.bin" + + .align 2 +UnknownMap_08469200_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08469200/map.bin" + + .align 2 +UnknownMap_08469200_Layout:: + .4byte 0x3C + .4byte 0x3C + .4byte UnknownMap_08469200_MapBorder + .4byte UnknownMap_08469200_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Sootopolis diff --git a/data/maps/UnknownMap_08469200/map.bin b/data/layouts/UnknownMap_08469200/map.bin index 67085fd37..67085fd37 100644 --- a/data/maps/UnknownMap_08469200/map.bin +++ b/data/layouts/UnknownMap_08469200/map.bin diff --git a/data/maps/UnknownMap_084693AC/border.bin b/data/layouts/UnknownMap_084693AC/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/UnknownMap_084693AC/border.bin +++ b/data/layouts/UnknownMap_084693AC/border.bin diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc new file mode 100644 index 000000000..f4b882fde --- /dev/null +++ b/data/layouts/UnknownMap_084693AC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084693AC_MapBorder:: + .incbin "data/layouts/UnknownMap_084693AC/border.bin" + + .align 2 +UnknownMap_084693AC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084693AC/map.bin" + + .align 2 +UnknownMap_084693AC_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_084693AC_MapBorder + .4byte UnknownMap_084693AC_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattlePike diff --git a/data/maps/UnknownMap_084693AC/map.bin b/data/layouts/UnknownMap_084693AC/map.bin Binary files differindex a179d8997..a179d8997 100644 --- a/data/maps/UnknownMap_084693AC/map.bin +++ b/data/layouts/UnknownMap_084693AC/map.bin diff --git a/data/maps/UnknownMap_08470BD8/border.bin b/data/layouts/UnknownMap_08470BD8/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/maps/UnknownMap_08470BD8/border.bin +++ b/data/layouts/UnknownMap_08470BD8/border.bin diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc new file mode 100644 index 000000000..f1a0e90ea --- /dev/null +++ b/data/layouts/UnknownMap_08470BD8/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08470BD8_MapBorder:: + .incbin "data/layouts/UnknownMap_08470BD8/border.bin" + + .align 2 +UnknownMap_08470BD8_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08470BD8/map.bin" + + .align 2 +UnknownMap_08470BD8_Layout:: + .4byte 0x28 + .4byte 0x8C + .4byte UnknownMap_08470BD8_MapBorder + .4byte UnknownMap_08470BD8_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/maps/UnknownMap_08470BD8/map.bin b/data/layouts/UnknownMap_08470BD8/map.bin Binary files differindex 0f7bbb958..0f7bbb958 100644 --- a/data/maps/UnknownMap_08470BD8/map.bin +++ b/data/layouts/UnknownMap_08470BD8/map.bin diff --git a/data/maps/UnknownMap_08480DAC/border.bin b/data/layouts/UnknownMap_08480DAC/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_08480DAC/border.bin +++ b/data/layouts/UnknownMap_08480DAC/border.bin diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc new file mode 100644 index 000000000..8239461fc --- /dev/null +++ b/data/layouts/UnknownMap_08480DAC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08480DAC_MapBorder:: + .incbin "data/layouts/UnknownMap_08480DAC/border.bin" + + .align 2 +UnknownMap_08480DAC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08480DAC/map.bin" + + .align 2 +UnknownMap_08480DAC_Layout:: + .4byte 0xD + .4byte 0xD + .4byte UnknownMap_08480DAC_MapBorder + .4byte UnknownMap_08480DAC_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/UnknownMap_08480DAC/map.bin b/data/layouts/UnknownMap_08480DAC/map.bin Binary files differindex d1277f280..d1277f280 100644 --- a/data/maps/UnknownMap_08480DAC/map.bin +++ b/data/layouts/UnknownMap_08480DAC/map.bin diff --git a/data/maps/UnknownMap_08480F54/border.bin b/data/layouts/UnknownMap_08480F54/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_08480F54/border.bin +++ b/data/layouts/UnknownMap_08480F54/border.bin diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc new file mode 100644 index 000000000..6916f61ae --- /dev/null +++ b/data/layouts/UnknownMap_08480F54/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08480F54_MapBorder:: + .incbin "data/layouts/UnknownMap_08480F54/border.bin" + + .align 2 +UnknownMap_08480F54_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08480F54/map.bin" + + .align 2 +UnknownMap_08480F54_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_08480F54_MapBorder + .4byte UnknownMap_08480F54_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/UnknownMap_08480F54/map.bin b/data/layouts/UnknownMap_08480F54/map.bin index f0d9c299c..f0d9c299c 100644 --- a/data/maps/UnknownMap_08480F54/map.bin +++ b/data/layouts/UnknownMap_08480F54/map.bin diff --git a/data/maps/UnknownMap_084810FC/border.bin b/data/layouts/UnknownMap_084810FC/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_084810FC/border.bin +++ b/data/layouts/UnknownMap_084810FC/border.bin diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc new file mode 100644 index 000000000..6e0116512 --- /dev/null +++ b/data/layouts/UnknownMap_084810FC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084810FC_MapBorder:: + .incbin "data/layouts/UnknownMap_084810FC/border.bin" + + .align 2 +UnknownMap_084810FC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084810FC/map.bin" + + .align 2 +UnknownMap_084810FC_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_084810FC_MapBorder + .4byte UnknownMap_084810FC_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/UnknownMap_084810FC/map.bin b/data/layouts/UnknownMap_084810FC/map.bin index 908158cf4..908158cf4 100644 --- a/data/maps/UnknownMap_084810FC/map.bin +++ b/data/layouts/UnknownMap_084810FC/map.bin diff --git a/data/maps/UnknownMap_084812A4/border.bin b/data/layouts/UnknownMap_084812A4/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_084812A4/border.bin +++ b/data/layouts/UnknownMap_084812A4/border.bin diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc new file mode 100644 index 000000000..3f7a2770d --- /dev/null +++ b/data/layouts/UnknownMap_084812A4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084812A4_MapBorder:: + .incbin "data/layouts/UnknownMap_084812A4/border.bin" + + .align 2 +UnknownMap_084812A4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084812A4/map.bin" + + .align 2 +UnknownMap_084812A4_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_084812A4_MapBorder + .4byte UnknownMap_084812A4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/UnknownMap_084812A4/map.bin b/data/layouts/UnknownMap_084812A4/map.bin index d033bc4d2..d033bc4d2 100644 --- a/data/maps/UnknownMap_084812A4/map.bin +++ b/data/layouts/UnknownMap_084812A4/map.bin diff --git a/data/maps/UnknownMap_0848144C/border.bin b/data/layouts/UnknownMap_0848144C/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_0848144C/border.bin +++ b/data/layouts/UnknownMap_0848144C/border.bin diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc new file mode 100644 index 000000000..fe7f90b16 --- /dev/null +++ b/data/layouts/UnknownMap_0848144C/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_0848144C_MapBorder:: + .incbin "data/layouts/UnknownMap_0848144C/border.bin" + + .align 2 +UnknownMap_0848144C_MapBlockdata:: + .incbin "data/layouts/UnknownMap_0848144C/map.bin" + + .align 2 +UnknownMap_0848144C_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_0848144C_MapBorder + .4byte UnknownMap_0848144C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/UnknownMap_0848144C/map.bin b/data/layouts/UnknownMap_0848144C/map.bin index eeccae9ae..eeccae9ae 100644 --- a/data/maps/UnknownMap_0848144C/map.bin +++ b/data/layouts/UnknownMap_0848144C/map.bin diff --git a/data/maps/UnknownMap_084815F4/border.bin b/data/layouts/UnknownMap_084815F4/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_084815F4/border.bin +++ b/data/layouts/UnknownMap_084815F4/border.bin diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc new file mode 100644 index 000000000..a501c6cc6 --- /dev/null +++ b/data/layouts/UnknownMap_084815F4/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_084815F4_MapBorder:: + .incbin "data/layouts/UnknownMap_084815F4/border.bin" + + .align 2 +UnknownMap_084815F4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_084815F4/map.bin" + + .align 2 +UnknownMap_084815F4_Layout:: + .4byte 0xE + .4byte 0xE + .4byte UnknownMap_084815F4_MapBorder + .4byte UnknownMap_084815F4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/UnknownMap_084815F4/map.bin b/data/layouts/UnknownMap_084815F4/map.bin index 8507a4932..8507a4932 100644 --- a/data/maps/UnknownMap_084815F4/map.bin +++ b/data/layouts/UnknownMap_084815F4/map.bin diff --git a/data/maps/UnknownMap_08481B24/border.bin b/data/layouts/UnknownMap_08481B24/border.bin index e9d1c658c..e9d1c658c 100644 --- a/data/maps/UnknownMap_08481B24/border.bin +++ b/data/layouts/UnknownMap_08481B24/border.bin diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc new file mode 100644 index 000000000..52a6a8acf --- /dev/null +++ b/data/layouts/UnknownMap_08481B24/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08481B24_MapBorder:: + .incbin "data/layouts/UnknownMap_08481B24/border.bin" + + .align 2 +UnknownMap_08481B24_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08481B24/map.bin" + + .align 2 +UnknownMap_08481B24_Layout:: + .4byte 0x1B + .4byte 0x18 + .4byte UnknownMap_08481B24_MapBorder + .4byte UnknownMap_08481B24_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/UnknownMap_08481B24/map.bin b/data/layouts/UnknownMap_08481B24/map.bin index 2a47bca91..2a47bca91 100644 --- a/data/maps/UnknownMap_08481B24/map.bin +++ b/data/layouts/UnknownMap_08481B24/map.bin diff --git a/data/maps/UnknownMap_08481DBC/border.bin b/data/layouts/UnknownMap_08481DBC/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/UnknownMap_08481DBC/border.bin +++ b/data/layouts/UnknownMap_08481DBC/border.bin diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc new file mode 100644 index 000000000..314a94b88 --- /dev/null +++ b/data/layouts/UnknownMap_08481DBC/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_08481DBC_MapBorder:: + .incbin "data/layouts/UnknownMap_08481DBC/border.bin" + + .align 2 +UnknownMap_08481DBC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08481DBC/map.bin" + + .align 2 +UnknownMap_08481DBC_Layout:: + .4byte 0xB + .4byte 0x8 + .4byte UnknownMap_08481DBC_MapBorder + .4byte UnknownMap_08481DBC_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MysteryEventsHouse diff --git a/data/maps/UnknownMap_08481DBC/map.bin b/data/layouts/UnknownMap_08481DBC/map.bin index 603f55c93..603f55c93 100644 --- a/data/maps/UnknownMap_08481DBC/map.bin +++ b/data/layouts/UnknownMap_08481DBC/map.bin diff --git a/data/maps/UnknownMap_25_29/border.bin b/data/layouts/UnknownMap_25_29/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_29/border.bin +++ b/data/layouts/UnknownMap_25_29/border.bin diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc new file mode 100644 index 000000000..30eb032e4 --- /dev/null +++ b/data/layouts/UnknownMap_25_29/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_25_29_MapBorder:: + .incbin "data/layouts/UnknownMap_25_29/border.bin" + + .align 2 +UnknownMap_25_29_MapBlockdata:: + .incbin "data/layouts/UnknownMap_25_29/map.bin" + + .align 2 +UnknownMap_25_29_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_29_MapBorder + .4byte UnknownMap_25_29_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/layouts/UnknownMap_25_29/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_29/map.bin +++ b/data/layouts/UnknownMap_25_29/map.bin diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/layouts/UnknownMap_25_30/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_30/border.bin +++ b/data/layouts/UnknownMap_25_30/border.bin diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc new file mode 100644 index 000000000..3423735c3 --- /dev/null +++ b/data/layouts/UnknownMap_25_30/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_25_30_MapBorder:: + .incbin "data/layouts/UnknownMap_25_30/border.bin" + + .align 2 +UnknownMap_25_30_MapBlockdata:: + .incbin "data/layouts/UnknownMap_25_30/map.bin" + + .align 2 +UnknownMap_25_30_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_30_MapBorder + .4byte UnknownMap_25_30_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/layouts/UnknownMap_25_30/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_30/map.bin +++ b/data/layouts/UnknownMap_25_30/map.bin diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/layouts/UnknownMap_25_31/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_31/border.bin +++ b/data/layouts/UnknownMap_25_31/border.bin diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc new file mode 100644 index 000000000..20fbdc9c8 --- /dev/null +++ b/data/layouts/UnknownMap_25_31/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_25_31_MapBorder:: + .incbin "data/layouts/UnknownMap_25_31/border.bin" + + .align 2 +UnknownMap_25_31_MapBlockdata:: + .incbin "data/layouts/UnknownMap_25_31/map.bin" + + .align 2 +UnknownMap_25_31_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_31_MapBorder + .4byte UnknownMap_25_31_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/layouts/UnknownMap_25_31/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_31/map.bin +++ b/data/layouts/UnknownMap_25_31/map.bin diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/layouts/UnknownMap_25_32/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_32/border.bin +++ b/data/layouts/UnknownMap_25_32/border.bin diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc new file mode 100644 index 000000000..2efcab4e0 --- /dev/null +++ b/data/layouts/UnknownMap_25_32/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_25_32_MapBorder:: + .incbin "data/layouts/UnknownMap_25_32/border.bin" + + .align 2 +UnknownMap_25_32_MapBlockdata:: + .incbin "data/layouts/UnknownMap_25_32/map.bin" + + .align 2 +UnknownMap_25_32_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_32_MapBorder + .4byte UnknownMap_25_32_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/layouts/UnknownMap_25_32/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_32/map.bin +++ b/data/layouts/UnknownMap_25_32/map.bin diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/layouts/UnknownMap_25_33/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_33/border.bin +++ b/data/layouts/UnknownMap_25_33/border.bin diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc new file mode 100644 index 000000000..4d27276dc --- /dev/null +++ b/data/layouts/UnknownMap_25_33/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_25_33_MapBorder:: + .incbin "data/layouts/UnknownMap_25_33/border.bin" + + .align 2 +UnknownMap_25_33_MapBlockdata:: + .incbin "data/layouts/UnknownMap_25_33/map.bin" + + .align 2 +UnknownMap_25_33_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_33_MapBorder + .4byte UnknownMap_25_33_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/layouts/UnknownMap_25_33/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_33/map.bin +++ b/data/layouts/UnknownMap_25_33/map.bin diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/layouts/UnknownMap_25_34/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_34/border.bin +++ b/data/layouts/UnknownMap_25_34/border.bin diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc new file mode 100644 index 000000000..3dea1f9af --- /dev/null +++ b/data/layouts/UnknownMap_25_34/layout.inc @@ -0,0 +1,16 @@ + .align 2 +UnknownMap_25_34_MapBorder:: + .incbin "data/layouts/UnknownMap_25_34/border.bin" + + .align 2 +UnknownMap_25_34_MapBlockdata:: + .incbin "data/layouts/UnknownMap_25_34/map.bin" + + .align 2 +UnknownMap_25_34_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_34_MapBorder + .4byte UnknownMap_25_34_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/layouts/UnknownMap_25_34/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_34/map.bin +++ b/data/layouts/UnknownMap_25_34/map.bin diff --git a/data/maps/VerdanturfTown/border.bin b/data/layouts/VerdanturfTown/border.bin Binary files differindex 864ac15fa..864ac15fa 100644 --- a/data/maps/VerdanturfTown/border.bin +++ b/data/layouts/VerdanturfTown/border.bin diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc new file mode 100644 index 000000000..2f329b930 --- /dev/null +++ b/data/layouts/VerdanturfTown/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VerdanturfTown_MapBorder:: + .incbin "data/layouts/VerdanturfTown/border.bin" + + .align 2 +VerdanturfTown_MapBlockdata:: + .incbin "data/layouts/VerdanturfTown/map.bin" + + .align 2 +VerdanturfTown_Layout:: + .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 Binary files differindex 8ed6ea56b..8ed6ea56b 100644 --- a/data/maps/VerdanturfTown/map.bin +++ b/data/layouts/VerdanturfTown/map.bin diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin b/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin Binary files differindex 9afd13cdc..9afd13cdc 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin +++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc new file mode 100644 index 000000000..89d82169c --- /dev/null +++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VerdanturfTown_BattleTentBattleRoom_MapBorder:: + .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin" + + .align 2 +VerdanturfTown_BattleTentBattleRoom_MapBlockdata:: + .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" + + .align 2 +VerdanturfTown_BattleTentBattleRoom_Layout:: + .4byte 0xd + .4byte 0x9 + .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder + .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BattleTent diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin b/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin Binary files differindex c405aabfc..c405aabfc 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin +++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/layouts/VerdanturfTown_WandasHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/VerdanturfTown_WandasHouse/border.bin +++ b/data/layouts/VerdanturfTown_WandasHouse/border.bin diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc new file mode 100644 index 000000000..8791f34bb --- /dev/null +++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VerdanturfTown_WandasHouse_MapBorder:: + .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" + + .align 2 +VerdanturfTown_WandasHouse_MapBlockdata:: + .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" + + .align 2 +VerdanturfTown_WandasHouse_Layout:: + .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 Binary files differindex 95d14d3c4..95d14d3c4 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.bin +++ b/data/layouts/VerdanturfTown_WandasHouse/map.bin diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/VictoryRoad_1F/border.bin +++ b/data/layouts/VictoryRoad_1F/border.bin diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc new file mode 100644 index 000000000..9ef50f743 --- /dev/null +++ b/data/layouts/VictoryRoad_1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VictoryRoad_1F_MapBorder:: + .incbin "data/layouts/VictoryRoad_1F/border.bin" + + .align 2 +VictoryRoad_1F_MapBlockdata:: + .incbin "data/layouts/VictoryRoad_1F/map.bin" + + .align 2 +VictoryRoad_1F_Layout:: + .4byte 0x2e + .4byte 0x2d + .4byte VictoryRoad_1F_MapBorder + .4byte VictoryRoad_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/layouts/VictoryRoad_1F/map.bin index a78316ef9..a78316ef9 100644 --- a/data/maps/VictoryRoad_1F/map.bin +++ b/data/layouts/VictoryRoad_1F/map.bin diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/layouts/VictoryRoad_B1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/VictoryRoad_B1F/border.bin +++ b/data/layouts/VictoryRoad_B1F/border.bin diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc new file mode 100644 index 000000000..fed9804fe --- /dev/null +++ b/data/layouts/VictoryRoad_B1F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VictoryRoad_B1F_MapBorder:: + .incbin "data/layouts/VictoryRoad_B1F/border.bin" + + .align 2 +VictoryRoad_B1F_MapBlockdata:: + .incbin "data/layouts/VictoryRoad_B1F/map.bin" + + .align 2 +VictoryRoad_B1F_Layout:: + .4byte 0x2e + .4byte 0x1f + .4byte VictoryRoad_B1F_MapBorder + .4byte VictoryRoad_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/layouts/VictoryRoad_B1F/map.bin index c1ea2f657..c1ea2f657 100644 --- a/data/maps/VictoryRoad_B1F/map.bin +++ b/data/layouts/VictoryRoad_B1F/map.bin diff --git a/data/maps/VictoryRoad_B2F/border.bin b/data/layouts/VictoryRoad_B2F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/VictoryRoad_B2F/border.bin +++ b/data/layouts/VictoryRoad_B2F/border.bin diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc new file mode 100644 index 000000000..77a9542f9 --- /dev/null +++ b/data/layouts/VictoryRoad_B2F/layout.inc @@ -0,0 +1,16 @@ + .align 2 +VictoryRoad_B2F_MapBorder:: + .incbin "data/layouts/VictoryRoad_B2F/border.bin" + + .align 2 +VictoryRoad_B2F_MapBlockdata:: + .incbin "data/layouts/VictoryRoad_B2F/map.bin" + + .align 2 +VictoryRoad_B2F_Layout:: + .4byte 0x2e + .4byte 0x1f + .4byte VictoryRoad_B2F_MapBorder + .4byte VictoryRoad_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/layouts/VictoryRoad_B2F/map.bin index 24c4f646a..24c4f646a 100644 --- a/data/maps/VictoryRoad_B2F/map.bin +++ b/data/layouts/VictoryRoad_B2F/map.bin diff --git a/data/layouts_table.inc b/data/layouts_table.inc new file mode 100644 index 000000000..cf3cac646 --- /dev/null +++ b/data/layouts_table.inc @@ -0,0 +1,444 @@ + .align 2 +gMapAttributes:: @ 8481DD4 + .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 UnknownMap_08417FC4_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 Mart_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 FallarborTown_LeftoverRSContestLobby_Layout + .4byte FallarborTown_LeftoverRSContestHall_Layout + .4byte LilycoveCity_House2_Layout + .4byte UnknownMap_08428450_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_084294C4_Layout + .4byte UnknownMap_084294E8_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_Layouts + .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 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_ShortHall_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_UnusedRubySapphireMap1_Layout + .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout + .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout + .4byte CaveOfOrigin_B1F_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_0843E6C0_Layout @ unused maps + .4byte UnknownMap_0843E6E4_Layout + .4byte UnknownMap_0843E708_Layout + .4byte UnknownMap_0843E72C_Layout + .4byte UnknownMap_0843E750_Layout + .4byte UnknownMap_0843E774_Layout + .4byte UnknownMap_0843E798_Layout + .4byte UnknownMap_0843E7BC_Layout + .4byte UnknownMap_0843E7E0_Layout + .4byte UnknownMap_0843E804_Layout + .4byte UnknownMap_0843E828_Layout + .4byte UnknownMap_0843E84C_Layout + .4byte UnknownMap_0843E870_Layout + .4byte UnknownMap_0843E894_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_North_Layout + .4byte SafariZone_Southwest_Layout + .4byte SafariZone_South_Layout + .4byte UnknownMap_08447028_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_SeasideCyclingRoadEntrance_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 BattleFrontier_BattleTowerLobby_Layout + .4byte BattleFrontier_OutsideWest_Layout + .4byte BattleElevator_Layout + .4byte BattleFrontier_BattleTowerCorridor_Layout + .4byte BattleFrontier_BattleTowerBattleRoom_Layout + .4byte RustboroCity_DevonCorp_3F_Layout + .4byte EverGrandeCity_PokemonLeague_1F_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_LotadAndSeedotHouse_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_0845A394_Layout + .4byte RustboroCity_Flat1_1F_Layout + .4byte RustboroCity_Flat1_2F_Layout + .4byte EverGrandeCity_Hall4_Layout + .4byte AquaHideout_UnusedRubyMap1_Layout + .4byte AquaHideout_UnusedRubyMap2_Layout + .4byte AquaHideout_UnusedRubyMap3_Layout + .4byte UnknownMap_0845D470_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_0845ECB4_Layout + .4byte MossdeepCity_StevensHouse_Layout + .4byte ShoalCave_LowTideIceRoom_Layout + .4byte SafariZone_RestHouse_Layout + .4byte SkyPillar_5F_Layout + .4byte SkyPillar_Top_Layout + .4byte BattleFrontier_BattleDomeLobby_Layout + .4byte BattleFrontier_BattleDomeCorridor_Layout + .4byte BattleFrontier_BattleDomePreBattleRoom_Layout + .4byte BattleFrontier_BattleDomeBattleRoom_Layout + .4byte MagmaHideout_1F_Layout + .4byte MagmaHideout_2F_1R_Layout + .4byte MagmaHideout_2F_2R_Layout + .4byte MagmaHideout_3F_1R_Layout + .4byte MagmaHideout_3F_2R_Layout + .4byte MagmaHideout_4F_Layout + .4byte BattleFrontier_BattlePalaceLobby_Layout + .4byte BattleFrontier_BattlePalaceCorridor_Layout + .4byte BattleFrontier_BattlePalaceBattleRoom_Layout + .4byte BattleFrontier_OutsideEast_Layout + .4byte BattleFrontier_BattleFactoryLobby_Layout + .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout + .4byte BattleFrontier_BattleFactoryBattleRoom_Layout + .4byte BattleFrontier_BattlePikeLobby_Layout + .4byte BattleFrontier_BattlePikeCorridor_Layout + .4byte BattleFrontier_BattlePikeThreePathRoom_Layout + .4byte BattleFrontier_BattlePikeRandomRoom1_Layout + .4byte BattleFrontier_BattlePikeRandomRoom2_Layout + .4byte BattleFrontier_BattleArenaLobby_Layout + .4byte BattleFrontier_BattleArenaCorridor_Layout + .4byte BattleFrontier_BattleArenaBattleRoom_Layout + .4byte UnknownMap_08469200_Layout + .4byte BattleFrontier_BattlePikeRandomRoom3_Layout + .4byte UnknownMap_084693AC_Layout + .4byte BattleFrontier_BattlePyramidLobby_Layout + .4byte BattleFrontier_BattlePyramidEmptySquare_Layout + .4byte BattlePyramidSquare01_Layout + .4byte BattlePyramidSquare02_Layout + .4byte BattlePyramidSquare03_Layout + .4byte BattlePyramidSquare04_Layout + .4byte BattlePyramidSquare05_Layout + .4byte BattlePyramidSquare06_Layout + .4byte BattlePyramidSquare07_Layout + .4byte BattlePyramidSquare08_Layout + .4byte BattlePyramidSquare09_Layout + .4byte BattlePyramidSquare10_Layout + .4byte BattlePyramidSquare11_Layout + .4byte BattlePyramidSquare12_Layout + .4byte BattlePyramidSquare13_Layout + .4byte BattlePyramidSquare14_Layout + .4byte BattlePyramidSquare15_Layout + .4byte BattlePyramidSquare16_Layout + .4byte BattleFrontier_BattlePyramidTop_Layout + .4byte MagmaHideout_3F_3R_Layout + .4byte MagmaHideout_2F_3R_Layout + .4byte MirageTower_1F_Layout + .4byte MirageTower_2F_Layout + .4byte MirageTower_3F_Layout + .4byte BattleTentLobby_Layout + .4byte BattleTentCorridor_Layout + .4byte BattleTentBattleRoom_Layout + .4byte VerdanturfTown_BattleTentBattleRoom_Layout + .4byte MirageTower_4F_Layout + .4byte DesertUnderpass_Layout + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout + .4byte BattleFrontier_BattleTowerCorridor2_Layout + .4byte UnknownMap_08470BD8_Layout + .4byte UnionRoom_Layout + .4byte SafariZone_Northeast_Layout + .4byte SafariZone_Southeast_Layout + .4byte BattleFrontier_RankingHall_Layout + .4byte BattleFrontier_Lounge1_Layout + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout + .4byte BattleFrontier_ReceptionGate_Layout + .4byte ArtisanCave_B1F_Layout + .4byte ArtisanCave_1F_Layout + .4byte FarawayIsland_Entrance_Layout + .4byte FarawayIsland_Interior_Layout + .4byte BirthIsland_Exterior_Layout + .4byte IslandHarbor_Layout + .4byte Underwater_MarineCave_Layout + .4byte MarineCave_Entrance_Layout + .4byte TerraCave_Entrance_Layout + .4byte TerraCave_End_Layout + .4byte Underwater6_Layout + .4byte Underwater7_Layout + .4byte Underwater5_Layout + .4byte MarineCave_End_Layout + .4byte TrainerHill_Entrance_Layout + .4byte TrainerHill_1F_Layout + .4byte TrainerHill_2F_Layout + .4byte TrainerHill_3F_Layout + .4byte TrainerHill_4F_Layout + .4byte TrainerHill_Roof_Layout + .4byte AlteringCave_Layout + .4byte NavelRock_Exterior_Layout + .4byte NavelRock_Entrance_Layout + .4byte NavelRock_Top_Layout + .4byte NavelRock_Bottom_Layout + .4byte NavelRock_LadderRoom1_Layout + .4byte NavelRock_LadderRoom2_Layout + .4byte NavelRock_B1F_Layout + .4byte NavelRock_Fork_Layout + .4byte BattleFrontier_Lounge2_Layout + .4byte BattleFrontier_ScottsHouse_Layout + .4byte MeteorFalls_StevensCave_Layout + .4byte UnknownMap_08480DAC_Layout + .4byte UnknownMap_08480F54_Layout + .4byte UnknownMap_084810FC_Layout + .4byte UnknownMap_084812A4_Layout + .4byte UnknownMap_0848144C_Layout + .4byte UnknownMap_084815F4_Layout + .4byte UnknownMap_08481B24_Layout + .4byte SootopolisCity_MysteryEventsHouse_1F_Layout + .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout + .4byte UnknownMap_08481DBC_Layout + diff --git a/data/maps.s b/data/maps.s index 92f5544a1..91c108c7a 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/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 5c6bae920..0348798fc 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -1,5 +1,5 @@ AbandonedShip_CaptainsOffice: @ 84845A4 - .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 7d1582721..2ce374617 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Corridors_1F: @ 84844C4 - .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 2205786fe..e8d5fc419 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Corridors_B1F: @ 84844FC - .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 f83905c8f..cac71c430 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck: @ 84844A8 - .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 fc93ec42d..c03eba0b8 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC - .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 cb8f99732..efa3a0bb9 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8 - .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 68b484f68..e2021ea85 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F: @ 848456C - .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 d712be55f..227bf3e8f 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms2_1F: @ 8484588 - .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 1b5cbb68a..55d228f47 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms2_B1F: @ 8484534 - .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 68dbcbbdb..62991d12e 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_1F: @ 84844E0 - .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 219410a9f..7838b8875 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F: @ 8484518 - .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 b314f5028..cc9db3443 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1: @ 8484550 - .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 3f15871b7..87650f5b2 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2: @ 84845C0 - .4byte AbandonedShip_Underwater2_MapAttributes + .4byte AbandonedShip_Underwater2_Layout .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index 98a23f76a..2361bf769 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -1,5 +1,5 @@ AlteringCave: @ 8484A58 - .4byte AlteringCave_MapAttributes + .4byte AlteringCave_Layout .4byte AlteringCave_MapEvents .4byte AlteringCave_MapScripts .4byte 0x0 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 2d384b07b..5e958c6bd 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -1,5 +1,5 @@ AncientTomb: @ 8484630 - .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 d2f8601bf..afbba5738 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -1,5 +1,5 @@ AquaHideout_1F: @ 8484144 - .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 e5a70a5c0..079c18ee9 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -1,5 +1,5 @@ AquaHideout_B1F: @ 8484160 - .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 0f3849799..8089a1634 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -1,5 +1,5 @@ AquaHideout_B2F: @ 848417C - .4byte AquaHideout_B2F_MapAttributes + .4byte AquaHideout_B2F_Layout .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index b32ecf901..a643b729e 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -1,5 +1,5 @@ AquaHideout_UnusedRubyMap1: @ 84846D8 - .4byte AquaHideout_UnusedRubyMap1_MapAttributes + .4byte AquaHideout_UnusedRubyMap1_Layout .4byte AquaHideout_UnusedRubyMap1_MapEvents .4byte AquaHideout_UnusedRubyMap1_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index dec1a5311..bb82dba18 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -1,5 +1,5 @@ AquaHideout_UnusedRubyMap2: @ 84846F4 - .4byte AquaHideout_UnusedRubyMap2_MapAttributes + .4byte AquaHideout_UnusedRubyMap2_Layout .4byte AquaHideout_UnusedRubyMap2_MapEvents .4byte AquaHideout_UnusedRubyMap2_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index a2383a4a6..1fa34aab4 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -1,5 +1,5 @@ AquaHideout_UnusedRubyMap3: @ 8484710 - .4byte AquaHideout_UnusedRubyMap3_MapAttributes + .4byte AquaHideout_UnusedRubyMap3_Layout .4byte AquaHideout_UnusedRubyMap3_MapEvents .4byte AquaHideout_UnusedRubyMap3_MapScripts .4byte 0x0 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index 1c363e7c9..a8d91737e 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -1,5 +1,5 @@ ArtisanCave_1F: @ 84849B0 - .4byte ArtisanCave_1F_MapAttributes + .4byte ArtisanCave_1F_Layout .4byte ArtisanCave_1F_MapEvents .4byte ArtisanCave_1F_MapScripts .4byte 0x0 diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index 844f627c1..a82cd93f6 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -1,5 +1,5 @@ ArtisanCave_B1F: @ 8484994 - .4byte ArtisanCave_B1F_MapAttributes + .4byte ArtisanCave_B1F_Layout .4byte ArtisanCave_B1F_MapEvents .4byte ArtisanCave_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 19e6f0413..7a8afda58 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484 - .4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes + .4byte BattleFrontier_BattleArenaBattleRoom_Layout .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index d70d50b1d..5312dd0fe 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaCorridor: @ 8485468 - .4byte BattleFrontier_BattleArenaCorridor_MapAttributes + .4byte BattleFrontier_BattleArenaCorridor_Layout .4byte BattleFrontier_BattleArenaCorridor_MapEvents .4byte BattleFrontier_BattleArenaCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 36522126d..3f5e0ff4e 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleArenaLobby: @ 848544C - .4byte BattleFrontier_BattleArenaLobby_MapAttributes + .4byte BattleFrontier_BattleArenaLobby_Layout .4byte BattleFrontier_BattleArenaLobby_MapEvents .4byte BattleFrontier_BattleArenaLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index ab6254403..3edfad730 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388 - .4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes + .4byte BattleFrontier_BattleDomeBattleRoom_Layout .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index f91cfe2d4..133115e33 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeCorridor: @ 8485350 - .4byte BattleFrontier_BattleDomeCorridor_MapAttributes + .4byte BattleFrontier_BattleDomeCorridor_Layout .4byte BattleFrontier_BattleDomeCorridor_MapEvents .4byte BattleFrontier_BattleDomeCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 0626aea77..26813d1f1 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomeLobby: @ 8485334 - .4byte BattleFrontier_BattleDomeLobby_MapAttributes + .4byte BattleFrontier_BattleDomeLobby_Layout .4byte BattleFrontier_BattleDomeLobby_MapEvents .4byte BattleFrontier_BattleDomeLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 7e06ab60a..e25a62ce8 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C - .4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes + .4byte BattleFrontier_BattleDomePreBattleRoom_Layout .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index 51aa2cb06..f3050926a 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 - .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes + .4byte BattleFrontier_BattleFactoryBattleRoom_Layout .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index f4304d579..7da242183 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0 - .4byte BattleFrontier_BattleFactoryLobby_MapAttributes + .4byte BattleFrontier_BattleFactoryLobby_Layout .4byte BattleFrontier_BattleFactoryLobby_MapEvents .4byte BattleFrontier_BattleFactoryLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index debeb0c12..eb6e06a0f 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes + .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 99c95d07d..b03d993fa 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC - .4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes + .4byte BattleFrontier_BattlePalaceBattleRoom_Layout .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index 4dec7d651..4b62687e7 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0 - .4byte BattleFrontier_BattlePalaceCorridor_MapAttributes + .4byte BattleFrontier_BattlePalaceCorridor_Layout .4byte BattleFrontier_BattlePalaceCorridor_MapEvents .4byte BattleFrontier_BattlePalaceCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 4bf9326b7..8104eadfc 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4 - .4byte BattleFrontier_BattlePalaceLobby_MapAttributes + .4byte BattleFrontier_BattlePalaceLobby_Layout .4byte BattleFrontier_BattlePalaceLobby_MapEvents .4byte BattleFrontier_BattlePalaceLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index f2bf0501b..a2b84a22c 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeCorridor: @ 8485510 - .4byte BattleFrontier_BattlePikeCorridor_MapAttributes + .4byte BattleFrontier_BattlePikeCorridor_Layout .4byte BattleFrontier_BattlePikeCorridor_MapEvents .4byte BattleFrontier_BattlePikeCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index 2b7709152..96d249ab9 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeLobby: @ 84854F4 - .4byte BattleFrontier_BattlePikeLobby_MapAttributes + .4byte BattleFrontier_BattlePikeLobby_Layout .4byte BattleFrontier_BattlePikeLobby_MapEvents .4byte BattleFrontier_BattlePikeLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index 89c74c18a..58a662bb3 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548 - .4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes + .4byte BattleFrontier_BattlePikeRandomRoom1_Layout .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 425df7bcb..5dde0fc15 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564 - .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes + .4byte BattleFrontier_BattlePikeRandomRoom2_Layout .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index e3518c68b..1d8848d23 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes + .4byte BattleFrontier_BattlePikeRandomRoom3_Layout .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index a9e768832..b1178e0a0 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C - .4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes + .4byte BattleFrontier_BattlePikeThreePathRoom_Layout .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 150d9cc03..069dc6f76 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index ead91f494..f2eccb9f4 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414 - .4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes + .4byte BattleFrontier_BattlePyramidEmptySquare_Layout .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index ab9d35d81..ed68e86c7 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8 - .4byte BattleFrontier_BattlePyramidLobby_MapAttributes + .4byte BattleFrontier_BattlePyramidLobby_Layout .4byte BattleFrontier_BattlePyramidLobby_MapEvents .4byte BattleFrontier_BattlePyramidLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index fe3964510..9e9508e7e 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattlePyramidTop: @ 8485430 - .4byte BattleFrontier_BattlePyramidTop_MapAttributes + .4byte BattleFrontier_BattlePyramidTop_Layout .4byte BattleFrontier_BattlePyramidTop_MapEvents .4byte BattleFrontier_BattlePyramidTop_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index bc54d421a..32b789720 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C - .4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes + .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index b9e17e9aa..a9eb2b2c5 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318 - .4byte BattleFrontier_BattleTowerBattleRoom2_MapAttributes + .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index f72c8fe29..361e6be03 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerCorridor: @ 8485200 - .4byte BattleFrontier_BattleTowerCorridor_MapAttributes + .4byte BattleFrontier_BattleTowerCorridor_Layout .4byte BattleFrontier_BattleTowerCorridor_MapEvents .4byte BattleFrontier_BattleTowerCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 6332bc83b..ccdcb013f 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC - .4byte BattleFrontier_BattleTowerCorridor2_MapAttributes + .4byte BattleFrontier_BattleTowerCorridor2_Layout .4byte BattleFrontier_BattleTowerCorridor2_MapEvents .4byte BattleFrontier_BattleTowerCorridor2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index 1dd6b495e..112c7f938 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerElevator: @ 84851E4 - .4byte BattleFrontier_BattleTowerElevator_MapAttributes + .4byte BattleElevator_Layout .4byte BattleFrontier_BattleTowerElevator_MapEvents .4byte BattleFrontier_BattleTowerElevator_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 94d43eb89..6e0e3b470 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerLobby: @ 84851C8 - .4byte BattleFrontier_BattleTowerLobby_MapAttributes + .4byte BattleFrontier_BattleTowerLobby_Layout .4byte BattleFrontier_BattleTowerLobby_MapEvents .4byte BattleFrontier_BattleTowerLobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 293fd6418..cc55ae591 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -1,5 +1,5 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 97eb721b6..44acc4b6a 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge1: @ 84855B8 - .4byte BattleFrontier_Lounge1_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge1_MapEvents .4byte BattleFrontier_Lounge1_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index b5a1367b5..69a6dba30 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge2: @ 84855F0 - .4byte BattleFrontier_Lounge2_MapAttributes + .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge2_MapEvents .4byte BattleFrontier_Lounge2_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index 21cd2cc38..3a18ce347 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge3: @ 848560C - .4byte BattleFrontier_Lounge3_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge3_MapEvents .4byte BattleFrontier_Lounge3_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index e550557ca..e052e6ce6 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge4: @ 8485628 - .4byte BattleFrontier_Lounge4_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge4_MapEvents .4byte BattleFrontier_Lounge4_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index dbe0afa67..a6fa1470f 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge5: @ 8485660 - .4byte BattleFrontier_Lounge5_MapAttributes + .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge5_MapEvents .4byte BattleFrontier_Lounge5_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index c41376cfd..ec6cfb105 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge6: @ 848567C - .4byte BattleFrontier_Lounge6_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge6_MapEvents .4byte BattleFrontier_Lounge6_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 0348fd64c..5124822a8 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge7: @ 8485698 - .4byte BattleFrontier_Lounge7_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge7_MapEvents .4byte BattleFrontier_Lounge7_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index 9ec0f336f..46fe25e2d 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge8: @ 84856D0 - .4byte BattleFrontier_Lounge8_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge8_MapEvents .4byte BattleFrontier_Lounge8_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index d88f40095..24e7b3005 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Lounge9: @ 84856EC - .4byte BattleFrontier_Lounge9_MapAttributes + .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge9_MapEvents .4byte BattleFrontier_Lounge9_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index b0cd11e40..1067fc70c 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -1,5 +1,5 @@ BattleFrontier_Mart: @ 8485740 - .4byte BattleFrontier_Mart_MapAttributes + .4byte Mart_Layout .4byte BattleFrontier_Mart_MapEvents .4byte BattleFrontier_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index f40bfc1f3..f9dc82cba 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideEast: @ 84852C4 - .4byte BattleFrontier_OutsideEast_MapAttributes + .4byte BattleFrontier_OutsideEast_Layout .4byte BattleFrontier_OutsideEast_MapEvents .4byte BattleFrontier_OutsideEast_MapScripts .4byte BattleFrontier_OutsideEast_MapConnections diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 24f1ce14b..319ecec6a 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -1,5 +1,5 @@ BattleFrontier_OutsideWest: @ 84851AC - .4byte BattleFrontier_OutsideWest_MapAttributes + .4byte BattleFrontier_OutsideWest_Layout .4byte BattleFrontier_OutsideWest_MapEvents .4byte BattleFrontier_OutsideWest_MapScripts .4byte BattleFrontier_OutsideWest_MapConnections diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index 561aba67e..22e3ff616 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ BattleFrontier_PokemonCenter_1F: @ 8485708 - .4byte BattleFrontier_PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte BattleFrontier_PokemonCenter_1F_MapEvents .4byte BattleFrontier_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 6aa965d08..361c58a04 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ BattleFrontier_PokemonCenter_2F: @ 8485724 - .4byte BattleFrontier_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte BattleFrontier_PokemonCenter_2F_MapEvents .4byte BattleFrontier_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index b068fbacc..340ba9597 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -1,5 +1,5 @@ BattleFrontier_RankingHall: @ 848559C - .4byte BattleFrontier_RankingHall_MapAttributes + .4byte BattleFrontier_RankingHall_Layout .4byte BattleFrontier_RankingHall_MapEvents .4byte BattleFrontier_RankingHall_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 32387ef0d..8f395bae4 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -1,5 +1,5 @@ BattleFrontier_ReceptionGate: @ 84856B4 - .4byte BattleFrontier_ReceptionGate_MapAttributes + .4byte BattleFrontier_ReceptionGate_Layout .4byte BattleFrontier_ReceptionGate_MapEvents .4byte BattleFrontier_ReceptionGate_MapScripts .4byte 0x0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index 1ac7c9524..f0e0be773 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -1,5 +1,5 @@ BattleFrontier_ScottsHouse: @ 8485644 - .4byte BattleFrontier_ScottsHouse_MapAttributes + .4byte BattleFrontier_ScottsHouse_Layout .4byte BattleFrontier_ScottsHouse_MapEvents .4byte BattleFrontier_ScottsHouse_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index 94605c92c..7ed6b181b 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare01: @ 8484F60 - .4byte BattlePyramidSquare01_MapAttributes + .4byte BattlePyramidSquare01_Layout .4byte BattlePyramidSquare01_MapEvents .4byte BattlePyramidSquare01_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index 44a5e7a99..9eb6ef754 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare02: @ 8484F7C - .4byte BattlePyramidSquare02_MapAttributes + .4byte BattlePyramidSquare02_Layout .4byte BattlePyramidSquare02_MapEvents .4byte BattlePyramidSquare02_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 300825ffa..3f07295ae 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare03: @ 8484F98 - .4byte BattlePyramidSquare03_MapAttributes + .4byte BattlePyramidSquare03_Layout .4byte BattlePyramidSquare03_MapEvents .4byte BattlePyramidSquare03_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 4031f62e3..978c4f466 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare04: @ 8484FB4 - .4byte BattlePyramidSquare04_MapAttributes + .4byte BattlePyramidSquare04_Layout .4byte BattlePyramidSquare04_MapEvents .4byte BattlePyramidSquare04_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index 72575d629..09a7e4703 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare05: @ 8484FD0 - .4byte BattlePyramidSquare05_MapAttributes + .4byte BattlePyramidSquare05_Layout .4byte BattlePyramidSquare05_MapEvents .4byte BattlePyramidSquare05_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 8d0fa49b1..e99531da8 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare06: @ 8484FEC - .4byte BattlePyramidSquare06_MapAttributes + .4byte BattlePyramidSquare06_Layout .4byte BattlePyramidSquare06_MapEvents .4byte BattlePyramidSquare06_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 12c74516a..13c23c24b 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare07: @ 8485008 - .4byte BattlePyramidSquare07_MapAttributes + .4byte BattlePyramidSquare07_Layout .4byte BattlePyramidSquare07_MapEvents .4byte BattlePyramidSquare07_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index cfe221f4b..a12b6016e 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare08: @ 8485024 - .4byte BattlePyramidSquare08_MapAttributes + .4byte BattlePyramidSquare08_Layout .4byte BattlePyramidSquare08_MapEvents .4byte BattlePyramidSquare08_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index 624b64800..486c74bc0 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare09: @ 8485040 - .4byte BattlePyramidSquare09_MapAttributes + .4byte BattlePyramidSquare09_Layout .4byte BattlePyramidSquare09_MapEvents .4byte BattlePyramidSquare09_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 16206bfe9..a73718125 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare10: @ 848505C - .4byte BattlePyramidSquare10_MapAttributes + .4byte BattlePyramidSquare10_Layout .4byte BattlePyramidSquare10_MapEvents .4byte BattlePyramidSquare10_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 34a53fdee..eac3cb1c7 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare11: @ 8485078 - .4byte BattlePyramidSquare11_MapAttributes + .4byte BattlePyramidSquare11_Layout .4byte BattlePyramidSquare11_MapEvents .4byte BattlePyramidSquare11_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index c514b4f4f..a1d5585c8 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare12: @ 8485094 - .4byte BattlePyramidSquare12_MapAttributes + .4byte BattlePyramidSquare12_Layout .4byte BattlePyramidSquare12_MapEvents .4byte BattlePyramidSquare12_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 23df0c29c..1c67b55e7 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare13: @ 84850B0 - .4byte BattlePyramidSquare13_MapAttributes + .4byte BattlePyramidSquare13_Layout .4byte BattlePyramidSquare13_MapEvents .4byte BattlePyramidSquare13_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 8570d95ef..9dcea14fa 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare14: @ 84850CC - .4byte BattlePyramidSquare14_MapAttributes + .4byte BattlePyramidSquare14_Layout .4byte BattlePyramidSquare14_MapEvents .4byte BattlePyramidSquare14_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 6120ec220..0429cbb0b 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare15: @ 84850E8 - .4byte BattlePyramidSquare15_MapAttributes + .4byte BattlePyramidSquare15_Layout .4byte BattlePyramidSquare15_MapEvents .4byte BattlePyramidSquare15_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 4df56bbc7..ea4627aa5 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare16: @ 8485104 - .4byte BattlePyramidSquare16_MapAttributes + .4byte BattlePyramidSquare16_Layout .4byte BattlePyramidSquare16_MapEvents .4byte BattlePyramidSquare16_MapScripts .4byte 0x0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index 5697555de..069bbc99c 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -1,5 +1,5 @@ BirthIsland_Exterior: @ 8485794 - .4byte BirthIsland_Exterior_MapAttributes + .4byte BirthIsland_Exterior_Layout .4byte BirthIsland_Exterior_MapEvents .4byte BirthIsland_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index 9a9a5954b..e9dc265f5 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -1,5 +1,5 @@ BirthIsland_Harbor: @ 84857B0 - .4byte BirthIsland_Harbor_MapAttributes + .4byte IslandHarbor_Layout .4byte BirthIsland_Harbor_MapEvents .4byte BirthIsland_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 97b1a7664..0fa252cc5 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F: @ 84842E8 - .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 d9d011a50..629806ad6 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F: @ 8484358 - .4byte CaveOfOrigin_B1F_MapAttributes + .4byte CaveOfOrigin_B1F_Layout .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index f2eab2e2b..b3e4dea97 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_Entrance: @ 84842CC - .4byte CaveOfOrigin_Entrance_MapAttributes + .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 081d1bba3..1edd4c6c2 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes + .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index ef1747de8..6b046b61a 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes + .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 623c9c2bc..819afc08f 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes + .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts .4byte 0x0 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index dcc150a4f..8f076bf77 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -1,5 +1,5 @@ DesertRuins: @ 8483F68 - .4byte DesertRuins_MapAttributes + .4byte DesertRuins_Layout .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index b01e7638a..2a420d703 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -1,5 +1,5 @@ DesertUnderpass: @ 8484978 - .4byte DesertUnderpass_MapAttributes + .4byte DesertUnderpass_Layout .4byte DesertUnderpass_MapEvents .4byte DesertUnderpass_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7437a42a2..7c6638aed 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -1,5 +1,5 @@ DewfordTown: @ 84825EC - .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 4d2dbcef9..fcb55ee29 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -1,5 +1,5 @@ DewfordTown_Gym: @ 8482C60 - .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 22466b2a8..31af0f14d 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -1,5 +1,5 @@ DewfordTown_Hall: @ 8482C7C - .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 399786aa9..c317b12bb 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -1,5 +1,5 @@ DewfordTown_House1: @ 8482C0C - .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 d9a2162e2..6d285c437 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -1,5 +1,5 @@ DewfordTown_House2: @ 8482C98 - .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 bdc1b5090..99d29f69c 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_1F: @ 8482C28 - .4byte DewfordTown_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 f5302fff1..4d6a71785 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_2F: @ 8482C44 - .4byte DewfordTown_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 6d102c5b1..d8275de59 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -1,5 +1,5 @@ DoubleBattleColosseum: @ 8484D84 - .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 f7fc65752..890d8b79f 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -1,5 +1,5 @@ EverGrandeCity: @ 8482598 - .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 445536d27..e239ed146 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C - .4byte EverGrandeCity_ChampionsRoom_MapAttributes + .4byte EverGrandeCity_ChampionsRoom_Layout .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 6d6438a79..0a4878176 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom: @ 8483C20 - .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 b301c2aa1..dbc20fd80 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom: @ 8483C04 - .4byte EverGrandeCity_GlaciasRoom_MapAttributes + .4byte EverGrandeCity_GlaciasRoom_Layout .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index 332a6cbb2..4dacefc77 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall1: @ 8483C58 - .4byte EverGrandeCity_Hall1_MapAttributes + .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall1_MapEvents .4byte EverGrandeCity_Hall1_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index b9029c027..0c160c76e 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall2: @ 8483C74 - .4byte EverGrandeCity_Hall2_MapAttributes + .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall2_MapEvents .4byte EverGrandeCity_Hall2_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index 282d06c66..da2ef5259 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall3: @ 8483C90 - .4byte EverGrandeCity_Hall3_MapAttributes + .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall3_MapEvents .4byte EverGrandeCity_Hall3_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 72fa22d75..da0b96380 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall4: @ 8483CAC - .4byte EverGrandeCity_Hall4_MapAttributes + .4byte EverGrandeCity_Hall4_Layout .4byte EverGrandeCity_Hall4_MapEvents .4byte EverGrandeCity_Hall4_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index eac2ba3fa..0c541bd58 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Hall5: @ 8483CC8 - .4byte EverGrandeCity_Hall5_MapAttributes + .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall5_MapEvents .4byte EverGrandeCity_Hall5_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index dd3726db9..786b7c598 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame: @ 8483D00 - .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 a5ebfb823..2e7bef16d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8 - .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 a3747320b..613b47446 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C - .4byte EverGrandeCity_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 1ad6c5727..63539b7a1 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_2F: @ 8483D38 - .4byte EverGrandeCity_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_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index 46fa79a73..d99e18907 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonLeague_1F: @ 8483CE4 - .4byte EverGrandeCity_PokemonLeague_1F_MapAttributes + .4byte EverGrandeCity_PokemonLeague_1F_Layout .4byte EverGrandeCity_PokemonLeague_1F_MapEvents .4byte EverGrandeCity_PokemonLeague_1F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 1d7775bfc..61d0b857a 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonLeague_2F: @ 8483D54 - .4byte EverGrandeCity_PokemonLeague_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonLeague_2F_MapEvents .4byte EverGrandeCity_PokemonLeague_2F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 594347dc3..3855eb87a 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom: @ 8483BCC - .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 a6ea87c04..c26b91f29 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,5 +1,5 @@ FallarborTown: @ 8482624 - .4byte FallarborTown_MapAttributes + .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 2a5695153..be81ffe6e 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentBattleRoom: @ 8482DCC - .4byte FallarborTown_BattleTentBattleRoom_MapAttributes + .4byte BattleTentBattleRoom_Layout .4byte FallarborTown_BattleTentBattleRoom_MapEvents .4byte FallarborTown_BattleTentBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 6ac376874..5f2023a71 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentCorridor: @ 8482DB0 - .4byte FallarborTown_BattleTentCorridor_MapAttributes + .4byte BattleTentCorridor_Layout .4byte FallarborTown_BattleTentCorridor_MapEvents .4byte FallarborTown_BattleTentCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 64d4180a5..ba86df464 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -1,5 +1,5 @@ FallarborTown_BattleTentLobby: @ 8482D94 - .4byte FallarborTown_BattleTentLobby_MapAttributes + .4byte BattleTentLobby_Layout .4byte FallarborTown_BattleTentLobby_MapEvents .4byte FallarborTown_BattleTentLobby_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index bbe9d895c..443a4dc27 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,5 +1,5 @@ FallarborTown_House1: @ 8482E20 - .4byte FallarborTown_House1_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 bf6d91d02..17cadef2b 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,5 +1,5 @@ FallarborTown_House2: @ 8482E3C - .4byte FallarborTown_House2_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 70ff79eb7..6e8aa3ef3 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -1,5 +1,5 @@ FallarborTown_Mart: @ 8482D78 - .4byte FallarborTown_Mart_MapAttributes + .4byte Mart_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 c3b9ec95d..515518d9a 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_1F: @ 8482DE8 - .4byte FallarborTown_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 655221b8a..2c67be178 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_2F: @ 8482E04 - .4byte FallarborTown_PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index 8e943d6c3..5d7879d64 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -1,5 +1,5 @@ FarawayIsland_Entrance: @ 848575C - .4byte FarawayIsland_Entrance_MapAttributes + .4byte FarawayIsland_Entrance_Layout .4byte FarawayIsland_Entrance_MapEvents .4byte FarawayIsland_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index 6d5e3f2d7..dd29fcc26 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -1,5 +1,5 @@ FarawayIsland_Interior: @ 8485778 - .4byte FarawayIsland_Interior_MapAttributes + .4byte FarawayIsland_Interior_Layout .4byte FarawayIsland_Interior_MapEvents .4byte FarawayIsland_Interior_MapScripts .4byte 0x0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 0cb60553b..c02896935 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,5 +1,5 @@ FieryPath: @ 8484048 - .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 6b78eeee1..b091e166f 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -1,5 +1,5 @@ FortreeCity: @ 8482528 - .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 000c589c6..4ebde8a93 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -1,5 +1,5 @@ FortreeCity_DecorationShop: @ 848361C - .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 08e50e944..eb241b368 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -1,5 +1,5 @@ FortreeCity_Gym: @ 848353C - .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 4aeeb4425..06dd18e1c 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -1,5 +1,5 @@ FortreeCity_House1: @ 8483520 - .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 30cad4def..62461784f 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -1,5 +1,5 @@ FortreeCity_House2: @ 84835AC - .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 2e2c7813d..54297f446 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -1,5 +1,5 @@ FortreeCity_House3: @ 84835C8 - .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 59c17803e..71002c7da 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -1,5 +1,5 @@ FortreeCity_House4: @ 84835E4 - .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 deaa634a8..6513cde1e 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -1,5 +1,5 @@ FortreeCity_House5: @ 8483600 - .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 03ee88852..18cb7b971 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -1,5 +1,5 @@ FortreeCity_Mart: @ 8483590 - .4byte FortreeCity_Mart_MapAttributes + .4byte Mart_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 d065198ad..ae2b8e0e8 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_1F: @ 8483558 - .4byte FortreeCity_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 5eb3483c3..adb7a7bde 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_2F: @ 8483574 - .4byte FortreeCity_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 ebd93d4eb..3d29c272a 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -1,5 +1,5 @@ GraniteCave_1F: @ 8483F84 - .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 de946f84c..6ab42f082 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -1,5 +1,5 @@ GraniteCave_B1F: @ 8483FA0 - .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 0442638f9..95935c283 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -1,5 +1,5 @@ GraniteCave_B2F: @ 8483FBC - .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 569d46b98..0644d8cb7 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom: @ 8483FD8 - .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 7e63d060f..c77ea5934 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -1,5 +1,5 @@ InsideOfTruck: @ 8484EF0 - .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 9b9e2b739..6ff291c29 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -1,5 +1,5 @@ IslandCave: @ 8484614 - .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 ad1a4640f..f6fc90e4e 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -1,5 +1,5 @@ JaggedPass: @ 848402C - .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 138cc6778..12cc74b5f 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -1,5 +1,5 @@ LavaridgeTown: @ 8482608 - .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 f473ddaee..30cde2e9c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_1F: @ 8482CD0 - .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 c188cd5ba..66d732921 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_B1F: @ 8482CEC - .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 5e3fd99a0..c9ef33f92 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_HerbShop: @ 8482CB4 - .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 f48bf4035..aa8a822f5 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_House: @ 8482D08 - .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 b3f901570..72d8699f1 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Mart: @ 8482D24 - .4byte LavaridgeTown_Mart_MapAttributes + .4byte Mart_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 30009b084..b3444dc0f 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_PokemonCenter_1F: @ 8482D40 - .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 26a5fd642..596b0e189 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_PokemonCenter_2F: @ 8482D5C - .4byte LavaridgeTown_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 37ec48371..1ec7fa26e 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -1,5 +1,5 @@ LilycoveCity: @ 8482544 - .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 f8f05f874..d0b17f863 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -1,5 +1,5 @@ LilycoveCity_ContestHall: @ 84836C4 - .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 674726f47..ddd0d6284 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -1,5 +1,5 @@ LilycoveCity_ContestLobby: @ 84836A8 - .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 149ff5359..ed380598b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F: @ 8483638 - .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 ade9f1a37..200e1b7bb 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_2F: @ 8483654 - .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 959699237..b5135b1ff 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator: @ 84838A0 - .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 3cf0cac45..3a96f4c3b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop: @ 8483884 - .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 140fe3568..2ad060976 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_1F: @ 84837F8 - .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 7d28c44b6..e4ebc314a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_2F: @ 8483814 - .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 2f94cc924..bb8cd73f7 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_3F: @ 8483830 - .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 8318c0edc..9bc54b809 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_4F: @ 848384C - .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 da0c4a399..cf1448ab8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_5F: @ 8483868 - .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_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 1d8faa5d4..abaf3ad3f 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor: @ 8483750 - .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 c298fe5f1..3d884a5d2 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House1: @ 8483788 - .4byte LilycoveCity_House1_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 b2276441c..3d184d345 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House2: @ 84837A4 - .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 2f3c3dc74..1a818490e 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House3: @ 84837C0 - .4byte LilycoveCity_House3_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 6a2acb155..9632ffa39 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House4: @ 84837DC - .4byte LilycoveCity_House4_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 8b534ed9a..3721b4432 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_LilycoveMuseum_1F: @ 8483670 - .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 0cbbfb2e5..c5adc0fb1 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_LilycoveMuseum_2F: @ 848368C - .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 5ef550b69..19e61cf16 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse: @ 848376C - .4byte LilycoveCity_MoveDeletersHouse_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 81f460c86..782efd3d0 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_1F: @ 84836E0 - .4byte LilycoveCity_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 d145bab55..7db9bcb62 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_2F: @ 84836FC - .4byte LilycoveCity_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 8d2f17dc6..0e23469c1 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonTrainerFanClub: @ 8483734 - .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 29e3bd57c..bf648b5da 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -1,5 +1,5 @@ LilycoveCity_UnusedMart: @ 8483718 - .4byte LilycoveCity_UnusedMart_MapAttributes + .4byte Mart_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 f5d7b9b78..dcd7be859 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,5 +1,5 @@ LinkContestRoom1: @ 8484DA0 - .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 b083a3a93..2afb7ae00 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,5 +1,5 @@ LinkContestRoom2: @ 8484E64 - .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 ec0e6ee7b..97f0cdcae 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,5 +1,5 @@ LinkContestRoom3: @ 8484E80 - .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 4a172b61f..9c0dfdc65 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,5 +1,5 @@ LinkContestRoom4: @ 8484E9C - .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 a26034ac6..42c2f3fdb 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,5 +1,5 @@ LinkContestRoom5: @ 8484EB8 - .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 436f89047..f1487f334 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,5 +1,5 @@ LinkContestRoom6: @ 8484ED4 - .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 240429a6d..04010b50c 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -1,5 +1,5 @@ LittlerootTown: @ 84825B4 - .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 781e37506..d5a87bae9 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_BrendansHouse_1F: @ 8482AF4 - .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 12047b040..0153a3f27 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_BrendansHouse_2F: @ 8482B10 - .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 624be65cb..1e72c91b5 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_MaysHouse_1F: @ 8482B2C - .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 a22e64716..20e9e3f5a 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_MaysHouse_2F: @ 8482B48 - .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 c58220612..8cd5eaf79 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -1,5 +1,5 @@ LittlerootTown_ProfessorBirchsLab: @ 8482B64 - .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 eab20d0d0..6158ed3cb 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_1F: @ 8484828 - .4byte MagmaHideout_1F_MapAttributes + .4byte MagmaHideout_1F_Layout .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index ff19befab..1a685fe55 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_2F_1R: @ 8484844 - .4byte MagmaHideout_2F_1R_MapAttributes + .4byte MagmaHideout_2F_1R_Layout .4byte MagmaHideout_2F_1R_MapEvents .4byte MagmaHideout_2F_1R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 8fe07f9ca..410522097 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_2F_2R: @ 8484860 - .4byte MagmaHideout_2F_2R_MapAttributes + .4byte MagmaHideout_2F_2R_Layout .4byte MagmaHideout_2F_2R_MapEvents .4byte MagmaHideout_2F_2R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 45ea7c94b..407408bf3 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_2F_3R: @ 84848EC - .4byte MagmaHideout_2F_3R_MapAttributes + .4byte MagmaHideout_2F_3R_Layout .4byte MagmaHideout_2F_3R_MapEvents .4byte MagmaHideout_2F_3R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 70ce39e74..228b197eb 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_1R: @ 848487C - .4byte MagmaHideout_3F_1R_MapAttributes + .4byte MagmaHideout_3F_1R_Layout .4byte MagmaHideout_3F_1R_MapEvents .4byte MagmaHideout_3F_1R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index 74266da9c..d070dd32a 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_2R: @ 8484898 - .4byte MagmaHideout_3F_2R_MapAttributes + .4byte MagmaHideout_3F_2R_Layout .4byte MagmaHideout_3F_2R_MapEvents .4byte MagmaHideout_3F_2R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index 5c1cdc9de..24ed48ff5 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -1,5 +1,5 @@ MagmaHideout_3F_3R: @ 84848D0 - .4byte MagmaHideout_3F_3R_MapAttributes + .4byte MagmaHideout_3F_3R_Layout .4byte MagmaHideout_3F_3R_MapEvents .4byte MagmaHideout_3F_3R_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index 441643653..45b5a40e6 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_4F: @ 84848B4 - .4byte MagmaHideout_4F_MapAttributes + .4byte MagmaHideout_4F_Layout .4byte MagmaHideout_4F_MapEvents .4byte MagmaHideout_4F_MapScripts .4byte 0x0 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 2eda73be9..8e3cf5a5f 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -1,5 +1,5 @@ MarineCave_End: @ 8484A04 - .4byte MarineCave_End_MapAttributes + .4byte MarineCave_End_Layout .4byte MarineCave_End_MapEvents .4byte MarineCave_End_MapScripts .4byte 0x0 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index a1e97eb95..17212c4f6 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -1,5 +1,5 @@ MarineCave_Entrance: @ 84849E8 - .4byte MarineCave_Entrance_MapAttributes + .4byte MarineCave_Entrance_Layout .4byte MarineCave_Entrance_MapEvents .4byte MarineCave_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index f8dada766..6e83a33bd 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -1,5 +1,5 @@ MauvilleCity: @ 84824F0 - .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 723d61151..8b7ecd54d 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -1,5 +1,5 @@ MauvilleCity_BikeShop: @ 8483280 - .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 9ef8ce976..11a71f8c6 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -1,5 +1,5 @@ MauvilleCity_GameCorner: @ 84832B8 - .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 343a2f01a..aa6430475 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym: @ 8483264 - .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 1cf42f8cf..db4371175 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House1: @ 848329C - .4byte MauvilleCity_House1_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 c1d2da264..4acd48c6d 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House2: @ 84832D4 - .4byte MauvilleCity_House2_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 c8f5dfb88..3130c2d35 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -1,5 +1,5 @@ MauvilleCity_Mart: @ 8483328 - .4byte MauvilleCity_Mart_MapAttributes + .4byte Mart_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 39a942e6f..5bb682b98 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_1F: @ 84832F0 - .4byte MauvilleCity_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 c09589b5a..d29063e86 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_2F: @ 848330C - .4byte MauvilleCity_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 6ec850978..1b1371370 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_1R: @ 8483EC0 - .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 946b15c66..a96c5648e 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_2R: @ 8483EDC - .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 a138eeb06..11402d3d5 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_1R: @ 8483EF8 - .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 2d3f50932..81c6276d2 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R: @ 8483F14 - .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/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index d5415ea46..22b3aaeb6 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -1,5 +1,5 @@ MeteorFalls_StevensCave: @ 8484A74 - .4byte MeteorFalls_StevensCave_MapAttributes + .4byte MeteorFalls_StevensCave_Layout .4byte MeteorFalls_StevensCave_MapEvents .4byte MeteorFalls_StevensCave_MapScripts .4byte 0x0 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 27611506e..cd0717add 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -1,5 +1,5 @@ MirageTower_1F: @ 8484908 - .4byte MirageTower_1F_MapAttributes + .4byte MirageTower_1F_Layout .4byte MirageTower_1F_MapEvents .4byte MirageTower_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index f512754e7..e449c3a37 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -1,5 +1,5 @@ MirageTower_2F: @ 8484924 - .4byte MirageTower_2F_MapAttributes + .4byte MirageTower_2F_Layout .4byte MirageTower_2F_MapEvents .4byte MirageTower_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index bdd93292e..def0a15c9 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -1,5 +1,5 @@ MirageTower_3F: @ 8484940 - .4byte MirageTower_3F_MapAttributes + .4byte MirageTower_3F_Layout .4byte MirageTower_3F_MapEvents .4byte MirageTower_3F_MapScripts .4byte 0x0 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index ff38fd9ca..7c1351ea6 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -1,5 +1,5 @@ MirageTower_4F: @ 848495C - .4byte MirageTower_4F_MapAttributes + .4byte MirageTower_4F_Layout .4byte MirageTower_4F_MapEvents .4byte MirageTower_4F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index c21d4f7f9..fc5af866a 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -1,5 +1,5 @@ MossdeepCity: @ 8482560 - .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 7e2adace8..9b886677e 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_1F: @ 84839F0 - .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 6b4a75713..623b5f970 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F: @ 8483A0C - .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 1bb806541..321271f78 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym: @ 84838BC - .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 5260cf931..64dedcba6 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House1: @ 84838D8 - .4byte MossdeepCity_House1_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 1d0463231..b3cf19738 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House2: @ 84838F4 - .4byte MossdeepCity_House2_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 d474eab75..d54538b4e 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House3: @ 8483964 - .4byte MossdeepCity_House3_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 30fe8c01a..33acf2e51 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House4: @ 848399C - .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 d745cc8f4..586c976e7 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -1,5 +1,5 @@ MossdeepCity_Mart: @ 8483948 - .4byte MossdeepCity_Mart_MapAttributes + .4byte Mart_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 0b9faca99..5ee83f3ce 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_1F: @ 8483910 - .4byte MossdeepCity_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 45e4f0881..a6659fafb 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_2F: @ 848392C - .4byte MossdeepCity_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 b503f8580..abfb64ee8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_SpaceCenter_1F: @ 84839B8 - .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 388482c64..3a7fce680 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4 - .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 179ebd36e..83a907bda 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -1,5 +1,5 @@ MossdeepCity_StevensHouse: @ 8483980 - .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 885541dde..bbdfaeb44 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -1,5 +1,5 @@ MtChimney: @ 8484010 - .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 e3f29070f..efd224564 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -1,5 +1,5 @@ MtChimney_CableCarStation: @ 8483DFC - .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 519211b49..17b7673c7 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,5 +1,5 @@ MtPyre_1F: @ 8484064 - .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 6eb960c01..d4a35c4c6 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -1,5 +1,5 @@ MtPyre_2F: @ 8484080 - .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 9dcd40578..8bf9f015a 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -1,5 +1,5 @@ MtPyre_3F: @ 848409C - .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 c94284c2f..9360976d4 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,5 +1,5 @@ MtPyre_4F: @ 84840B8 - .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 efabc0917..193120ca8 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -1,5 +1,5 @@ MtPyre_5F: @ 84840D4 - .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 f6931369b..3c390f962 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -1,5 +1,5 @@ MtPyre_6F: @ 84840F0 - .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 7d9df6a8e..013d84e84 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -1,5 +1,5 @@ MtPyre_Exterior: @ 848410C - .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 ffdb8fb8a..55f9d512b 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,5 +1,5 @@ MtPyre_Summit: @ 8484128 - .4byte MtPyre_Summit_MapAttributes + .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index 8570628b2..9a9b308de 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -1,5 +1,5 @@ NavelRock_B1F: @ 84858C8 - .4byte NavelRock_B1F_MapAttributes + .4byte NavelRock_B1F_Layout .4byte NavelRock_B1F_MapEvents .4byte NavelRock_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index e40c64d91..84d942a9e 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -1,5 +1,5 @@ NavelRock_Bottom: @ 8485AC0 - .4byte NavelRock_Bottom_MapAttributes + .4byte NavelRock_Bottom_Layout .4byte NavelRock_Bottom_MapEvents .4byte NavelRock_Bottom_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index af66bb9bc..4f8237761 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -1,5 +1,5 @@ NavelRock_Down01: @ 848598C - .4byte NavelRock_Down01_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down01_MapEvents .4byte NavelRock_Down01_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 8b70d543f..027de3f91 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -1,5 +1,5 @@ NavelRock_Down02: @ 84859A8 - .4byte NavelRock_Down02_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down02_MapEvents .4byte NavelRock_Down02_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index 78d1e1db3..41ae68722 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -1,5 +1,5 @@ NavelRock_Down03: @ 84859C4 - .4byte NavelRock_Down03_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down03_MapEvents .4byte NavelRock_Down03_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index ea459e2ff..a45886c16 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -1,5 +1,5 @@ NavelRock_Down04: @ 84859E0 - .4byte NavelRock_Down04_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down04_MapEvents .4byte NavelRock_Down04_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index ddb4d997f..2ab0c76ba 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -1,5 +1,5 @@ NavelRock_Down05: @ 84859FC - .4byte NavelRock_Down05_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down05_MapEvents .4byte NavelRock_Down05_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index 256d2d1c1..d8a17e85f 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -1,5 +1,5 @@ NavelRock_Down06: @ 8485A18 - .4byte NavelRock_Down06_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down06_MapEvents .4byte NavelRock_Down06_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index d49181bc4..0a77e6406 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -1,5 +1,5 @@ NavelRock_Down07: @ 8485A34 - .4byte NavelRock_Down07_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down07_MapEvents .4byte NavelRock_Down07_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index db1c426c2..a3cbed38a 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -1,5 +1,5 @@ NavelRock_Down08: @ 8485A50 - .4byte NavelRock_Down08_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down08_MapEvents .4byte NavelRock_Down08_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index 6f53a936f..6aed92500 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -1,5 +1,5 @@ NavelRock_Down09: @ 8485A6C - .4byte NavelRock_Down09_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down09_MapEvents .4byte NavelRock_Down09_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index f3945194a..bb96b7e3d 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -1,5 +1,5 @@ NavelRock_Down10: @ 8485A88 - .4byte NavelRock_Down10_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down10_MapEvents .4byte NavelRock_Down10_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index d02b578a1..48ed319eb 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -1,5 +1,5 @@ NavelRock_Down11: @ 8485AA4 - .4byte NavelRock_Down11_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down11_MapEvents .4byte NavelRock_Down11_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index 521af14c7..cc8d2446b 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -1,5 +1,5 @@ NavelRock_Entrance: @ 84858AC - .4byte NavelRock_Entrance_MapAttributes + .4byte NavelRock_Entrance_Layout .4byte NavelRock_Entrance_MapEvents .4byte NavelRock_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index 5d74b9eab..a01250cab 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -1,5 +1,5 @@ NavelRock_Exterior: @ 8485874 - .4byte NavelRock_Exterior_MapAttributes + .4byte NavelRock_Exterior_Layout .4byte NavelRock_Exterior_MapEvents .4byte NavelRock_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 94740f43b..a6dab9d20 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -1,5 +1,5 @@ NavelRock_Fork: @ 84858E4 - .4byte NavelRock_Fork_MapAttributes + .4byte NavelRock_Fork_Layout .4byte NavelRock_Fork_MapEvents .4byte NavelRock_Fork_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 644442986..c7243f452 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -1,5 +1,5 @@ NavelRock_Harbor: @ 8485890 - .4byte NavelRock_Harbor_MapAttributes + .4byte IslandHarbor_Layout .4byte NavelRock_Harbor_MapEvents .4byte NavelRock_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index f6e72236f..4d1535615 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -1,5 +1,5 @@ NavelRock_Top: @ 8485970 - .4byte NavelRock_Top_MapAttributes + .4byte NavelRock_Top_Layout .4byte NavelRock_Top_MapEvents .4byte NavelRock_Top_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index d9a51ab0f..c7484c59f 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -1,5 +1,5 @@ NavelRock_Up1: @ 8485900 - .4byte NavelRock_Up1_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up1_MapEvents .4byte NavelRock_Up1_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index 94d42c6c4..824ef267d 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -1,5 +1,5 @@ NavelRock_Up2: @ 848591C - .4byte NavelRock_Up2_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up2_MapEvents .4byte NavelRock_Up2_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index 2a57b2444..7782ca0f4 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -1,5 +1,5 @@ NavelRock_Up3: @ 8485938 - .4byte NavelRock_Up3_MapAttributes + .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up3_MapEvents .4byte NavelRock_Up3_MapScripts .4byte 0x0 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 17e8ae965..c022d9d0b 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -1,5 +1,5 @@ NavelRock_Up4: @ 8485954 - .4byte NavelRock_Up4_MapAttributes + .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up4_MapEvents .4byte NavelRock_Up4_MapScripts .4byte 0x0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 8bdf39e18..147f003d0 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -1,5 +1,5 @@ NewMauville_Entrance: @ 8484470 - .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 585719630..3eda8df5e 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -1,5 +1,5 @@ NewMauville_Inside: @ 848448C - .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 3eeb1e72d..3d8ae1db5 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -1,5 +1,5 @@ OldaleTown: @ 84825D0 - .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 245f1e146..6039540cc 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,5 +1,5 @@ OldaleTown_House1: @ 8482B80 - .4byte OldaleTown_House1_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 7bf092b6b..75753041f 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,5 +1,5 @@ OldaleTown_House2: @ 8482B9C - .4byte OldaleTown_House2_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 4f4ea646f..043acab8d 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -1,5 +1,5 @@ OldaleTown_Mart: @ 8482BF0 - .4byte OldaleTown_Mart_MapAttributes + .4byte Mart_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 cc564e6ae..d51331b61 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_1F: @ 8482BB8 - .4byte OldaleTown_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 798a5f72b..9b9df67fd 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_2F: @ 8482BD4 - .4byte OldaleTown_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 a630f5efa..3244c01b8 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -1,5 +1,5 @@ PacifidlogTown: @ 848265C - .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 a0e8763e3..b78d36a2a 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House1: @ 8482F8C - .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 8548cfc32..571dcd9ce 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House2: @ 8482FA8 - .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 7fa97cda2..fb60530a6 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House3: @ 8482FC4 - .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 b505892ad..7beed0a39 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House4: @ 8482FE0 - .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 055a1b566..671c7d28e 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House5: @ 8482FFC - .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 0c84c8b8a..d11ea93d2 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_1F: @ 8482F54 - .4byte PacifidlogTown_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 6804ac368..00724203f 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_2F: @ 8482F70 - .4byte PacifidlogTown_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 d87259512..248c6d2ae 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,5 +1,5 @@ PetalburgCity: @ 84824B8 - .4byte PetalburgCity_MapAttributes + .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents .4byte gStdScripts_End .4byte PetalburgCity_MapConnections diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 18a39e943..739f19b74 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -1,5 +1,5 @@ PetalburgCity_Gym: @ 8483034 - .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 2175ff856..6aeb5deef 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House1: @ 8483050 - .4byte PetalburgCity_House1_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 9213bc710..9595c1372 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House2: @ 848306C - .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 d2dc3edf3..7742f8bfe 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -1,5 +1,5 @@ PetalburgCity_Mart: @ 84830C0 - .4byte PetalburgCity_Mart_MapAttributes + .4byte Mart_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 581432e20..af57b7bab 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_1F: @ 8483088 - .4byte PetalburgCity_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 c16cfdee2..1528ab624 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_2F: @ 84830A4 - .4byte PetalburgCity_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 fc953bf81..4e207706d 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,5 +1,5 @@ PetalburgCity_WallysHouse: @ 8483018 - .4byte PetalburgCity_WallysHouse_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 1b1731f58..096f4a704 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -1,5 +1,5 @@ PetalburgWoods: @ 8483FF4 - .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 67ebd9405..7235504fa 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,5 +1,5 @@ RecordCorner: @ 8484D68 - .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 9550dc26b..ef027d1c6 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,5 +1,5 @@ Route101: @ 8482678 - .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 2c06344b0..22da93b7a 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,5 +1,5 @@ Route102: @ 8482694 - .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 6bc4c0070..1a8825bc1 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -1,5 +1,5 @@ Route103: @ 84826B0 - .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 7bcef3b0b..f431118c1 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,5 +1,5 @@ Route104: @ 84826CC - .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 f285f28ee..c6335b13f 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -1,5 +1,5 @@ Route104_MrBrineysHouse: @ 8483D70 - .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 ceac3651f..e23012fb4 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop: @ 8483D8C - .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 9728190a1..50f1b7b08 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,5 +1,5 @@ Route104_Prototype: @ 8485AF8 - .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 ac5604d72..61217a576 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -1,5 +1,5 @@ Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 - .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 de48be1a5..f7538b723 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,5 +1,5 @@ Route105: @ 84826E8 - .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 5ee6a3071..93f4bd835 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,5 +1,5 @@ Route106: @ 8482704 - .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 d6dffda04..a27885664 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -1,5 +1,5 @@ Route107: @ 8482720 - .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 e0a0c9f42..2c4cea90d 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -1,5 +1,5 @@ Route108: @ 848273C - .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 532443e1b..c9482cf31 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -1,5 +1,5 @@ Route109: @ 8482758 - .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 99c905eaa..cec1ace27 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse: @ 8485B30 - .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 5a74c1d6c..d6d394209 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -1,5 +1,5 @@ Route110: @ 8482774 - .4byte Route110_MapAttributes + .4byte Route110_Layout .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc index 433849c14..a2d6a37a5 100644 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadEntrance1: @ 8485C80 - .4byte Route110_SeasideCyclingRoadEntrance1_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadEntrance1_MapEvents .4byte Route110_SeasideCyclingRoadEntrance1_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc index 755b6a5ff..1720a77a2 100644 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadEntrance2: @ 8485C9C - .4byte Route110_SeasideCyclingRoadEntrance2_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadEntrance2_MapEvents .4byte Route110_SeasideCyclingRoadEntrance2_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index b8f569c6a..99a4a694a 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseCorridor: @ 8485B84 - .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 7f69874d1..0b38de121 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd: @ 8485B68 - .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 f3aa39cc5..842b2f32d 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance: @ 8485B4C - .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 ff78e3652..ef5388364 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle1: @ 8485BA0 - .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 25aa8b8dc..d54eb7752 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle2: @ 8485BBC - .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 9cd8c45be..3bcf40de1 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle3: @ 8485BD8 - .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 c928f08f3..85df95a1a 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle4: @ 8485BF4 - .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 d8b57d744..2402f4cc5 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5: @ 8485C10 - .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 5864cdd59..946ad91f4 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle6: @ 8485C2C - .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 e9217f7e2..5de9d6400 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle7: @ 8485C48 - .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 d9fce791e..750270dea 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle8: @ 8485C64 - .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 804a36387..89feae870 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -1,5 +1,5 @@ Route111: @ 8482790 - .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 8de668c4b..c2c055af6 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop: @ 8483DC4 - .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 86a766b6d..4cf6ca023 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,5 +1,5 @@ Route111_WinstrateFamilysHouse: @ 8483DA8 - .4byte Route111_WinstrateFamilysHouse_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 e0411ce05..397c0060a 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,5 +1,5 @@ Route112: @ 84827AC - .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 6caefade9..72667053d 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -1,5 +1,5 @@ Route112_CableCarStation: @ 8483DE0 - .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 a8c19f49d..87d56215e 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -1,5 +1,5 @@ Route113: @ 84827C8 - .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 49c0005b0..e9424580a 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -1,5 +1,5 @@ Route113_GlassWorkshop: @ 8485CB8 - .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 5b9db262a..cda0036b3 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -1,5 +1,5 @@ Route114: @ 84827E4 - .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 277c0c0df..efe6a1b76 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse: @ 8483E18 - .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 169b0b7a4..c20e1b2d3 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel: @ 8483E34 - .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 ba4cccfd5..9a5763394 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse: @ 8483E50 - .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 4d135e0b6..97156442e 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -1,5 +1,5 @@ Route115: @ 8482800 - .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 27009ad3f..919dffa6f 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -1,5 +1,5 @@ Route116: @ 848281C - .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 489c5a8b9..ac319327f 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse: @ 8483E6C - .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 d92b96e30..897d37afb 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,5 +1,5 @@ Route117: @ 8482838 - .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 1ace346b5..f690fa432 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare: @ 8483E88 - .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 5567df47f..3bf779b27 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -1,5 +1,5 @@ Route118: @ 8482854 - .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 17d13f572..cb61c3a38 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -1,5 +1,5 @@ Route119: @ 8482870 - .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 86f968efc..754b0c245 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,5 +1,5 @@ Route119_House: @ 8485D28 - .4byte Route119_House_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 1f555389a..fac499e3f 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_1F: @ 8485CF0 - .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 048ccbf77..69a351082 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_2F: @ 8485D0C - .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 ab7022f9c..9b8d641d9 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -1,5 +1,5 @@ Route120: @ 848288C - .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 5347f6d3d..4a05c76fe 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,5 +1,5 @@ Route121: @ 84828A8 - .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 3ce3d22e7..56a07a3fa 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -1,5 +1,5 @@ Route121_SafariZoneEntrance: @ 8483EA4 - .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 f4856b8ab..591501de1 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,5 +1,5 @@ Route122: @ 84828C4 - .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 ff3ab332f..7d7a4590f 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -1,5 +1,5 @@ Route123: @ 84828E0 - .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 f086368ad..f1466f9e7 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse: @ 8485CD4 - .4byte Route123_BerryMastersHouse_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 e4c690104..811fb3ec7 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,5 +1,5 @@ Route124: @ 84828FC - .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 d277004eb..a7501cddc 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44 - .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 09afc815f..4e67b3cb6 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,5 +1,5 @@ Route125: @ 8482918 - .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 f87efc723..13e741159 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,5 +1,5 @@ Route126: @ 8482934 - .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 070f9996f..fa3ee0200 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,5 +1,5 @@ Route127: @ 8482950 - .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 01d1a46ba..08acd71f2 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -1,5 +1,5 @@ Route128: @ 848296C - .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 4e5b177df..53abdbebe 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,5 +1,5 @@ Route129: @ 8482988 - .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 f4e1f3292..47b4b613c 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,5 +1,5 @@ Route130: @ 84829A4 - .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 44a8921ba..b13a344fc 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -1,5 +1,5 @@ Route131: @ 84829C0 - .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 df2aadbfa..b4fe2bc0d 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,5 +1,5 @@ Route132: @ 84829DC - .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 30a69f94d..e8bc66e6f 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,5 +1,5 @@ Route133: @ 84829F8 - .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 9730f5036..20f6dd90a 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,5 +1,5 @@ Route134: @ 8482A14 - .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 9698b81de..adce7ef75 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -1,5 +1,5 @@ RustboroCity: @ 848250C - .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 e7b936a19..5423772bf 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -1,5 +1,5 @@ RustboroCity_CuttersHouse: @ 8483478 - .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 68b72454f..9e270b9fc 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_1F: @ 8483344 - .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 5e4dc392b..f3954aed0 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_2F: @ 8483360 - .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 54ae910d3..c0bbdebd1 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_3F: @ 848337C - .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 ede158338..4f424b853 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat1_1F: @ 8483424 - .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 c1a83cdbb..49e5c1481 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat1_2F: @ 8483440 - .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 14d40b97a..4080980a0 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_1F: @ 84834B0 - .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 989069c30..d4ad99dbc 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_2F: @ 84834CC - .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 d531fcf98..90918421f 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_3F: @ 84834E8 - .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 4b49e1077..8aef6fe28 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -1,5 +1,5 @@ RustboroCity_Gym: @ 8483398 - .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 49445724b..c921d3a5e 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -1,5 +1,5 @@ RustboroCity_House1: @ 848345C - .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 ec04d74d9..6f4d6c02d 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,5 +1,5 @@ RustboroCity_House2: @ 8483494 - .4byte RustboroCity_House2_MapAttributes + .4byte RustboroCity_House_Layouts .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 9ffe65113..73b5d4a0b 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,5 +1,5 @@ RustboroCity_House3: @ 8483504 - .4byte RustboroCity_House3_MapAttributes + .4byte RustboroCity_House_Layouts .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 be134394a..cb82a6500 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -1,5 +1,5 @@ RustboroCity_Mart: @ 8483408 - .4byte RustboroCity_Mart_MapAttributes + .4byte Mart_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 fb88549f7..3db96f00d 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_1F: @ 84833D0 - .4byte RustboroCity_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 0acf68eaa..74f264702 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_2F: @ 84833EC - .4byte RustboroCity_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 a3d257cfb..3d68afc48 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonSchool: @ 84833B4 - .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 0ce8c9e12..d4f1fdad5 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -1,5 +1,5 @@ RusturfTunnel: @ 8483F30 - .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 606d682ba..046eedc85 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,5 +1,5 @@ SSTidalCorridor: @ 8484F0C - .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 c1f883c84..3e2f5bacb 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -1,5 +1,5 @@ SSTidalLowerDeck: @ 8484F28 - .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 09bfb8652..c5f0aaa00 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -1,5 +1,5 @@ SSTidalRooms: @ 8484F44 - .4byte SSTidalRooms_MapAttributes + .4byte SSTidalRooms_Layout .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index ce05b1eea..d7ad06ffa 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -1,5 +1,5 @@ SafariZone_North: @ 8485158 - .4byte SafariZone_North_MapAttributes + .4byte SafariZone_North_Layout .4byte SafariZone_North_MapEvents .4byte SafariZone_North_MapScripts .4byte SafariZone_North_MapConnections diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index e5efff7b6..58685eafe 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -1,5 +1,5 @@ SafariZone_Northeast: @ 848528C - .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 810826106..81718dc65 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -1,5 +1,5 @@ SafariZone_Northwest: @ 848513C - .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 591de9fc1..92488b12d 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -1,5 +1,5 @@ SafariZone_RestHouse: @ 8485270 - .4byte SafariZone_RestHouse_MapAttributes + .4byte SafariZone_RestHouse_Layout .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 58239408f..3ffd068c2 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -1,5 +1,5 @@ SafariZone_South: @ 8485190 - .4byte SafariZone_South_MapAttributes + .4byte SafariZone_South_Layout .4byte SafariZone_South_MapEvents .4byte SafariZone_South_MapScripts .4byte SafariZone_South_MapConnections diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 56e8aa094..438d3ea7f 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -1,5 +1,5 @@ SafariZone_Southeast: @ 84852A8 - .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 3eaf59e98..5cff316ae 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -1,5 +1,5 @@ SafariZone_Southwest: @ 8485174 - .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 e9b0a7b7e..543f83ebb 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -1,5 +1,5 @@ ScorchedSlab: @ 84846BC - .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 be05d04fa..3e26232dc 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance: @ 84841B4 - .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 094095d7e..29a75081f 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room1: @ 84841D0 - .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 ebbfc58bc..749b4b9ee 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room2: @ 84841EC - .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 56dd1c14b..4ef0565be 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room3: @ 8484208 - .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 1f710ac3a..0edd39d4a 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4: @ 8484224 - .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 8f9edd756..013f447dc 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room5: @ 8484240 - .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 e1aab7b08..9bbb14463 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room6: @ 848425C - .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 fd0b49c93..d4b0db267 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room7: @ 8484278 - .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 a5ecc196a..903e25a14 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room8: @ 8484294 - .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 4df3870e6..0d43deb23 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room9: @ 84842B0 - .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 87b73cfa1..4a26587bc 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom: @ 84846A0 - .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 fc55dd8d2..fd5fe39f3 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom: @ 8484684 - .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 8914ffdc5..4e987702c 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave1: @ 8484AC8 - .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 e36e3dc8e..ed22bbb04 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave2: @ 8484B70 - .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 a1cbd4c33..412d1f4af 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave3: @ 8484C18 - .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 4fb353150..542df3954 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave4: @ 8484CC0 - .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 57f27c823..aceddbfda 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave1: @ 8484AAC - .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 3c8bf24d7..de95374ba 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave2: @ 8484B54 - .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 78ebb6fd8..8535b1e89 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave3: @ 8484BFC - .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 4d92c301c..d73f38257 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave4: @ 8484CA4 - .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 8e730661d..1cb6c4f5e 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave1: @ 8484A90 - .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 b86e69ecf..744e8b24e 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave2: @ 8484B38 - .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 9d4f26d36..c153e74c6 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave3: @ 8484BE0 - .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 163780567..be475a7ad 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave4: @ 8484C88 - .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 8f5fd7198..6ab9f9d94 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub1: @ 8484B1C - .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 77b3ae833..760781e47 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub2: @ 8484BC4 - .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 7fb14ec94..cef2a4597 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub3: @ 8484C6C - .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 10a4d4ca4..12fa26c3c 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub4: @ 8484D14 - .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 157173fbb..c5b5a2aed 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree1: @ 8484B00 - .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 6708af92b..ddea5c0bc 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree2: @ 8484BA8 - .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 fd0c56856..630dbb6e3 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree3: @ 8484C50 - .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 c2f0b3350..bc6f84664 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree4: @ 8484CF8 - .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 77a446dbd..9a6ae5438 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave1: @ 8484AE4 - .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 ae9200fc1..da1949abe 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave2: @ 8484B8C - .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 d63751987..8bfeff0f5 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave3: @ 8484C34 - .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 1a5c43da5..baf6b7d89 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave4: @ 8484CDC - .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 5694fead4..2f3f34b43 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_HighTideEntranceRoom: @ 8484438 - .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 a6fd687b2..673bc6bec 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_HighTideInnerRoom: @ 8484454 - .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 b109f1f4b..c742d2b8c 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom: @ 84843C8 - .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 6a34db69e..6571068ce 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideIceRoom: @ 84847D4 - .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 cf40979a5..b6de02c7d 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom: @ 84843E4 - .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 abc2554de..719a92c3e 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom: @ 848441C - .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 aff87bf3d..74d0ec94f 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom: @ 8484400 - .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 d5be84526..54d003c27 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -1,5 +1,5 @@ SingleBattleColosseum: @ 8484D30 - .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 4ec895011..3a47df473 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -1,5 +1,5 @@ SkyPillar_1F: @ 8484764 - .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 acdc054e4..a1cc8fb8f 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -1,5 +1,5 @@ SkyPillar_2F: @ 8484780 - .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 21ac1c545..81ac3046d 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -1,5 +1,5 @@ SkyPillar_3F: @ 848479C - .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 977442c27..10a68ddc2 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -1,5 +1,5 @@ SkyPillar_4F: @ 84847B8 - .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 1df2963b5..bb38a2d5d 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -1,5 +1,5 @@ SkyPillar_5F: @ 84847F0 - .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 b6b697d46..8031521e9 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -1,5 +1,5 @@ SkyPillar_Entrance: @ 848472C - .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 49c5c14e1..38bb57bae 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -1,5 +1,5 @@ SkyPillar_Outside: @ 8484748 - .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 97fb4edf4..3836ab067 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -1,5 +1,5 @@ SkyPillar_Top: @ 848480C - .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 0ff430ff2..7ac123723 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -1,5 +1,5 @@ SlateportCity: @ 84824D4 - .4byte SlateportCity_MapAttributes + .4byte SlateportCity_Layout .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index 4245201fb..4c8c94753 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -1,5 +1,5 @@ SlateportCity_BattleTentBattleRoom: @ 848314C - .4byte SlateportCity_BattleTentBattleRoom_MapAttributes + .4byte BattleTentBattleRoom_Layout .4byte SlateportCity_BattleTentBattleRoom_MapEvents .4byte SlateportCity_BattleTentBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index f399ab26d..7ea7cca9e 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -1,5 +1,5 @@ SlateportCity_BattleTentCorridor: @ 8483130 - .4byte SlateportCity_BattleTentCorridor_MapAttributes + .4byte BattleTentCorridor_Layout .4byte SlateportCity_BattleTentCorridor_MapEvents .4byte SlateportCity_BattleTentCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 4a654fd25..1a809a567 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -1,5 +1,5 @@ SlateportCity_BattleTentLobby: @ 8483114 - .4byte SlateportCity_BattleTentLobby_MapAttributes + .4byte BattleTentLobby_Layout .4byte SlateportCity_BattleTentLobby_MapEvents .4byte SlateportCity_BattleTentLobby_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index ca013f6f2..7f214b54c 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -1,5 +1,5 @@ SlateportCity_Harbor: @ 84831D8 - .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 a5cf37a59..4f7bc3f98 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -1,5 +1,5 @@ SlateportCity_House1: @ 8483168 - .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 1c1ed9f6a..12389ed44 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -1,5 +1,5 @@ SlateportCity_House2: @ 84831F4 - .4byte SlateportCity_House2_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 8b0bd21a3..e13692bba 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -1,5 +1,5 @@ SlateportCity_Mart: @ 8483248 - .4byte SlateportCity_Mart_MapAttributes + .4byte Mart_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 b5be36774..4b0224075 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_OceanicMuseum_1F: @ 84831A0 - .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 6d9439419..7d4272d09 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_OceanicMuseum_2F: @ 84831BC - .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 c19ff9c4b..8d1e8cc17 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_1F: @ 8483210 - .4byte SlateportCity_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 345e8632a..7bf64b603 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_2F: @ 848322C - .4byte SlateportCity_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 70d0dc41c..87a6c0c5b 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonFanClub: @ 8483184 - .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 f30894e60..c04b411f1 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_SternsShipyard_1F: @ 84830DC - .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 c409b3df7..e3b36f4ed 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_SternsShipyard_2F: @ 84830F8 - .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 cb8f65244..74469da7c 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -1,5 +1,5 @@ SootopolisCity: @ 848257C - .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 b17a271d8..4200a7ed8 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Gym_1F: @ 8483A28 - .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 5473a347b..6265830e9 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Gym_B1F: @ 8483A44 - .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 8359334d0..2551aedc1 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House1: @ 8483AB4 - .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 3cd04937a..24e7a778a 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House2: @ 8483AD0 - .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 c3ee80da0..97ae23fb7 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House3: @ 8483AEC - .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 9d610b9a1..d39499132 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House4: @ 8483B08 - .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 29157d4df..d6de286cf 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House5: @ 8483B24 - .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 c05d23e64..36460f147 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House6: @ 8483B40 - .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 3f02bdcc5..383ab24b5 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House7: @ 8483B5C - .4byte SootopolisCity_House7_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 0ceade178..792b5ae31 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -1,5 +1,5 @@ SootopolisCity_LotadAndSeedotHouse: @ 8483B78 - .4byte SootopolisCity_LotadAndSeedotHouse_MapAttributes + .4byte SootopolisCity_LotadAndSeedotHouse_Layout .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 3b4aaa171..ac4ae5ea0 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Mart: @ 8483A98 - .4byte SootopolisCity_Mart_MapAttributes + .4byte Mart_Layout .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 72e09b813..2e5ea1f84 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes + .4byte SootopolisCity_MysteryEventsHouse_1F_Layout .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index d4497b3e9..c3ffec414 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes + .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 28fdf23bd..83485cbf1 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_1F: @ 8483A60 - .4byte SootopolisCity_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 97000d2b7..ba2bb5c0d 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_2F: @ 8483A7C - .4byte SootopolisCity_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 700a6cf00..d0d35fea1 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior: @ 8485238 - .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 a7b9f14a0..1a080af1e 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -1,5 +1,5 @@ SouthernIsland_Interior: @ 8485254 - .4byte SouthernIsland_Interior_MapAttributes + .4byte SouthernIsland_Interior_Layout .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 419388afa..900f5930f 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -1,5 +1,5 @@ TerraCave_End: @ 8484A3C - .4byte TerraCave_End_MapAttributes + .4byte TerraCave_End_Layout .4byte TerraCave_End_MapEvents .4byte TerraCave_End_MapScripts .4byte 0x0 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index f0e4df143..02c5edb91 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -1,5 +1,5 @@ TerraCave_Entrance: @ 8484A20 - .4byte TerraCave_Entrance_MapAttributes + .4byte TerraCave_Entrance_Layout .4byte TerraCave_Entrance_MapEvents .4byte TerraCave_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 757b3f0a4..55afa79f3 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,5 +1,5 @@ TradeCenter: @ 8484D4C - .4byte TradeCenter_MapAttributes + .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index 7c6a4ea0e..e5fd3b576 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -1,5 +1,5 @@ TrainerHill_1F: @ 84857E8 - .4byte TrainerHill_1F_MapAttributes + .4byte TrainerHill_1F_Layout .4byte TrainerHill_1F_MapEvents .4byte TrainerHill_1F_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index d9a6d6204..712c99cec 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -1,5 +1,5 @@ TrainerHill_2F: @ 8485804 - .4byte TrainerHill_2F_MapAttributes + .4byte TrainerHill_2F_Layout .4byte TrainerHill_2F_MapEvents .4byte TrainerHill_2F_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index c88a11d6d..92bbd40a1 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -1,5 +1,5 @@ TrainerHill_3F: @ 8485820 - .4byte TrainerHill_3F_MapAttributes + .4byte TrainerHill_3F_Layout .4byte TrainerHill_3F_MapEvents .4byte TrainerHill_3F_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index 6122362b6..5de769778 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -1,5 +1,5 @@ TrainerHill_4F: @ 848583C - .4byte TrainerHill_4F_MapAttributes + .4byte TrainerHill_4F_Layout .4byte TrainerHill_4F_MapEvents .4byte TrainerHill_4F_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 9d1227640..13912579d 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -1,5 +1,5 @@ TrainerHill_Elevator: @ 8485ADC - .4byte TrainerHill_Elevator_MapAttributes + .4byte BattleElevator_Layout .4byte TrainerHill_Elevator_MapEvents .4byte TrainerHill_Elevator_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index eae0676da..f37950d98 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -1,5 +1,5 @@ TrainerHill_Entrance: @ 84857CC - .4byte TrainerHill_Entrance_MapAttributes + .4byte TrainerHill_Entrance_Layout .4byte TrainerHill_Entrance_MapEvents .4byte TrainerHill_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index 3754fc21a..3527f447f 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -1,5 +1,5 @@ TrainerHill_Roof: @ 8485858 - .4byte TrainerHill_Roof_MapAttributes + .4byte TrainerHill_Roof_Layout .4byte TrainerHill_Roof_MapEvents .4byte TrainerHill_Roof_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 2c7de8477..d63ca8815 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -1,5 +1,5 @@ Underwater1: @ 8482A30 - .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 1f29f52f9..a2754c69e 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -1,5 +1,5 @@ Underwater2: @ 8482A4C - .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 108251489..8329304a8 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -1,5 +1,5 @@ Underwater3: @ 8482A68 - .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 38885bcb7..f4f3e8c4b 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -1,5 +1,5 @@ Underwater4: @ 8482A84 - .4byte Underwater4_MapAttributes + .4byte Underwater4_Layout .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index f46d3d677..043a6997e 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -1,5 +1,5 @@ Underwater5: @ 8482AA0 - .4byte Underwater5_MapAttributes + .4byte Underwater5_Layout .4byte Underwater5_MapEvents .4byte Underwater5_MapScripts .4byte Underwater5_MapConnections diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index cf6ab9141..1be09d6a1 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -1,5 +1,5 @@ Underwater6: @ 8482ABC - .4byte Underwater6_MapAttributes + .4byte Underwater6_Layout .4byte Underwater6_MapEvents .4byte Underwater6_MapScripts .4byte Underwater6_MapConnections diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 0a55ab00b..4ededa296 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -1,5 +1,5 @@ Underwater7: @ 8482AD8 - .4byte Underwater7_MapAttributes + .4byte Underwater7_Layout .4byte Underwater7_MapEvents .4byte Underwater7_MapScripts .4byte Underwater7_MapConnections diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 6dee9d77a..54bffb710 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -1,5 +1,5 @@ Underwater_MarineCave: @ 84849CC - .4byte Underwater_MarineCave_MapAttributes + .4byte Underwater_MarineCave_Layout .4byte Underwater_MarineCave_MapEvents .4byte Underwater_MarineCave_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index c00017cec..f08f506a1 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -1,5 +1,5 @@ Underwater_Route134: @ 848464C - .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 e10d30013..6415ac787 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -1,5 +1,5 @@ Underwater_SeafloorCavern: @ 8484198 - .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 54362aea4..a72666d12 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber: @ 8484668 - .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 af57b3c8d..ef9ee1612 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity: @ 8483F4C - .4byte Underwater_SootopolisCity_MapAttributes + .4byte Underwater_SootopolisCity_Layout .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index d0b38c071..b79ae81a2 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -1,5 +1,5 @@ UnionRoom: @ 8485120 - .4byte UnionRoom_MapAttributes + .4byte UnionRoom_Layout .4byte UnionRoom_MapEvents .4byte UnionRoom_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 4fa500e7e..4c8edd31c 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_29: @ 8484DBC - .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 38600bb68..46465019e 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_30: @ 8484DD8 - .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 f53d3055b..13e428cfd 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_31: @ 8484DF4 - .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 0e269a53c..8244c3802 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_32: @ 8484E10 - .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 6a8df64c6..b4da8dd48 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_33: @ 8484E2C - .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 d37b7ceaa..bb1ce881c 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_34: @ 8484E48 - .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 49be64155..047ba12ad 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -1,5 +1,5 @@ VerdanturfTown: @ 8482640 - .4byte VerdanturfTown_MapAttributes + .4byte VerdanturfTown_Layout .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index fba5c3764..1eef21301 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentBattleRoom: @ 8482E90 - .4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes + .4byte VerdanturfTown_BattleTentBattleRoom_Layout .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 5d8bccc99..9b8f62260 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentCorridor: @ 8482E74 - .4byte VerdanturfTown_BattleTentCorridor_MapAttributes + .4byte BattleTentCorridor_Layout .4byte VerdanturfTown_BattleTentCorridor_MapEvents .4byte VerdanturfTown_BattleTentCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 6b998c218..4d1e0ca9e 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_BattleTentLobby: @ 8482E58 - .4byte VerdanturfTown_BattleTentLobby_MapAttributes + .4byte BattleTentLobby_Layout .4byte VerdanturfTown_BattleTentLobby_MapEvents .4byte VerdanturfTown_BattleTentLobby_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 6666d264d..51f3dadbd 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_FriendshipRatersHouse: @ 8482F1C - .4byte VerdanturfTown_FriendshipRatersHouse_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 a1e99f984..e6571b7f0 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_House: @ 8482F38 - .4byte VerdanturfTown_House_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 3b5c3cce5..6f69b3aac 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_Mart: @ 8482EAC - .4byte VerdanturfTown_Mart_MapAttributes + .4byte Mart_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 d6fc48171..b6c5177ce 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_1F: @ 8482EC8 - .4byte VerdanturfTown_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 fa99aeaa4..ee657d77b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_2F: @ 8482EE4 - .4byte VerdanturfTown_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 a1e4e49aa..cb727234e 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_WandasHouse: @ 8482F00 - .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 8bd8286b5..35ff7bd3b 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_1F: @ 8484374 - .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 620dbdc71..b9edeeb17 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_B1F: @ 8484390 - .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 ebafcfd49..b6c80a656 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_B2F: @ 84843AC - .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 deleted file mode 100644 index c3c2a8d31..000000000 --- a/data/maps/_assets.inc +++ /dev/null @@ -1,7606 +0,0 @@ - .align 2 -PetalburgCity_MapBorder: @ 83DFE14 - .incbin "data/maps/PetalburgCity/border.bin" - - .align 2 -PetalburgCity_MapBlockdata: @ 83DFE1C - .incbin "data/maps/PetalburgCity/map.bin" - - .align 2 -PetalburgCity_MapAttributes: @ 83E0524 - .4byte 0x1e - .4byte 0x1e - .4byte PetalburgCity_MapBorder - .4byte PetalburgCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -SlateportCity_MapBorder: @ 83E053C - .incbin "data/maps/SlateportCity/border.bin" - - .align 2 -SlateportCity_MapBlockdata: @ 83E0544 - .incbin "data/maps/SlateportCity/map.bin" - - .align 2 -SlateportCity_MapAttributes: @ 83E1804 - .4byte 0x28 - .4byte 0x3c - .4byte SlateportCity_MapBorder - .4byte SlateportCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - - .align 2 -MauvilleCity_MapBorder: @ 83E181C - .incbin "data/maps/MauvilleCity/border.bin" - - .align 2 -MauvilleCity_MapBlockdata: @ 83E1824 - .incbin "data/maps/MauvilleCity/map.bin" - - .align 2 -MauvilleCity_MapAttributes: @ 83E1E64 - .4byte 0x28 - .4byte 0x14 - .4byte MauvilleCity_MapBorder - .4byte MauvilleCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -RustboroCity_MapBorder: @ 83E1E7C - .incbin "data/maps/RustboroCity/border.bin" - - .align 2 -RustboroCity_MapBlockdata: @ 83E1E84 - .incbin "data/maps/RustboroCity/map.bin" - - .align 2 -RustboroCity_MapAttributes: @ 83E3144 - .4byte 0x28 - .4byte 0x3c - .4byte RustboroCity_MapBorder - .4byte RustboroCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -FortreeCity_MapBorder: @ 83E315C - .incbin "data/maps/FortreeCity/border.bin" - - .align 2 -FortreeCity_MapBlockdata: @ 83E3164 - .incbin "data/maps/FortreeCity/map.bin" - - .align 2 -FortreeCity_MapAttributes: @ 83E37A4 - .4byte 0x28 - .4byte 0x14 - .4byte FortreeCity_MapBorder - .4byte FortreeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - - .align 2 -LilycoveCity_MapBorder: @ 83E37BC - .incbin "data/maps/LilycoveCity/border.bin" - - .align 2 -LilycoveCity_MapBlockdata: @ 83E37C4 - .incbin "data/maps/LilycoveCity/map.bin" - - .align 2 -LilycoveCity_MapAttributes: @ 83E50C4 - .4byte 0x50 - .4byte 0x28 - .4byte LilycoveCity_MapBorder - .4byte LilycoveCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -MossdeepCity_MapBorder: @ 83E50DC - .incbin "data/maps/MossdeepCity/border.bin" - - .align 2 -MossdeepCity_MapBlockdata: @ 83E50E4 - .incbin "data/maps/MossdeepCity/map.bin" - - .align 2 -MossdeepCity_MapAttributes: @ 83E69E4 - .4byte 0x50 - .4byte 0x28 - .4byte MossdeepCity_MapBorder - .4byte MossdeepCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -SootopolisCity_MapBorder: @ 83E69FC - .incbin "data/maps/SootopolisCity/border.bin" - - .align 2 -SootopolisCity_MapBlockdata: @ 83E6A04 - .incbin "data/maps/SootopolisCity/map.bin" - - .align 2 -SootopolisCity_MapAttributes: @ 83E8624 - .4byte 0x3c - .4byte 0x3c - .4byte SootopolisCity_MapBorder - .4byte SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Sootopolis - - .align 2 -EverGrandeCity_MapBorder: @ 83E863C - .incbin "data/maps/EverGrandeCity/border.bin" - - .align 2 -EverGrandeCity_MapBlockdata: @ 83E8644 - .incbin "data/maps/EverGrandeCity/map.bin" - - .align 2 -EverGrandeCity_MapAttributes: @ 83E9F44 - .4byte 0x28 - .4byte 0x50 - .4byte EverGrandeCity_MapBorder - .4byte EverGrandeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_EverGrande - - .align 2 -LittlerootTown_MapBorder: @ 83E9F5C - .incbin "data/maps/LittlerootTown/border.bin" - - .align 2 -LittlerootTown_MapBlockdata: @ 83E9F64 - .incbin "data/maps/LittlerootTown/map.bin" - - .align 2 -LittlerootTown_MapAttributes: @ 83EA284 - .4byte 0x14 - .4byte 0x14 - .4byte LittlerootTown_MapBorder - .4byte LittlerootTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -OldaleTown_MapBorder: @ 83EA29C - .incbin "data/maps/OldaleTown/border.bin" - - .align 2 -OldaleTown_MapBlockdata: @ 83EA2A4 - .incbin "data/maps/OldaleTown/map.bin" - - .align 2 -OldaleTown_MapAttributes: @ 83EA5C4 - .4byte 0x14 - .4byte 0x14 - .4byte OldaleTown_MapBorder - .4byte OldaleTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -DewfordTown_MapBorder: @ 83EA5DC - .incbin "data/maps/DewfordTown/border.bin" - - .align 2 -DewfordTown_MapBlockdata: @ 83EA5E4 - .incbin "data/maps/DewfordTown/map.bin" - - .align 2 -DewfordTown_MapAttributes: @ 83EA904 - .4byte 0x14 - .4byte 0x14 - .4byte DewfordTown_MapBorder - .4byte DewfordTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -LavaridgeTown_MapBorder: @ 83EA91C - .incbin "data/maps/LavaridgeTown/border.bin" - - .align 2 -LavaridgeTown_MapBlockdata: @ 83EA924 - .incbin "data/maps/LavaridgeTown/map.bin" - - .align 2 -LavaridgeTown_MapAttributes: @ 83EAC44 - .4byte 0x14 - .4byte 0x14 - .4byte LavaridgeTown_MapBorder - .4byte LavaridgeTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -FallarborTown_MapBorder: @ 83EAC5C - .incbin "data/maps/FallarborTown/border.bin" - - .align 2 -FallarborTown_MapBlockdata: @ 83EAC64 - .incbin "data/maps/FallarborTown/map.bin" - - .align 2 -FallarborTown_MapAttributes: @ 83EAF84 - .4byte 0x14 - .4byte 0x14 - .4byte FallarborTown_MapBorder - .4byte FallarborTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -VerdanturfTown_MapBorder: @ 83EAF9C - .incbin "data/maps/VerdanturfTown/border.bin" - - .align 2 -VerdanturfTown_MapBlockdata: @ 83EAFA4 - .incbin "data/maps/VerdanturfTown/map.bin" - - .align 2 -VerdanturfTown_MapAttributes: @ 83EB2C4 - .4byte 0x14 - .4byte 0x14 - .4byte VerdanturfTown_MapBorder - .4byte VerdanturfTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -PacifidlogTown_MapBorder: @ 83EB2DC - .incbin "data/maps/PacifidlogTown/border.bin" - - .align 2 -PacifidlogTown_MapBlockdata: @ 83EB2E4 - .incbin "data/maps/PacifidlogTown/map.bin" - - .align 2 -PacifidlogTown_MapAttributes: @ 83EB924 - .4byte 0x14 - .4byte 0x28 - .4byte PacifidlogTown_MapBorder - .4byte PacifidlogTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Route101_MapBorder: @ 83EB93C - .incbin "data/maps/Route101/border.bin" - - .align 2 -Route101_MapBlockdata: @ 83EB944 - .incbin "data/maps/Route101/map.bin" - - .align 2 -Route101_MapAttributes: @ 83EBC64 - .4byte 0x14 - .4byte 0x14 - .4byte Route101_MapBorder - .4byte Route101_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -Route102_MapBorder: @ 83EBC7C - .incbin "data/maps/Route102/border.bin" - - .align 2 -Route102_MapBlockdata: @ 83EBC84 - .incbin "data/maps/Route102/map.bin" - - .align 2 -Route102_MapAttributes: @ 83EC454 - .4byte 0x32 - .4byte 0x14 - .4byte Route102_MapBorder - .4byte Route102_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -Route103_MapBorder: @ 83EC46C - .incbin "data/maps/Route103/border.bin" - - .align 2 -Route103_MapBlockdata: @ 83EC474 - .incbin "data/maps/Route103/map.bin" - - .align 2 -Route103_MapAttributes: @ 83ED234 - .4byte 0x50 - .4byte 0x16 - .4byte Route103_MapBorder - .4byte Route103_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - - .align 2 -Route104_MapBorder: @ 83ED24C - .incbin "data/maps/Route104/border.bin" - - .align 2 -Route104_MapBlockdata: @ 83ED254 - .incbin "data/maps/Route104/map.bin" - - .align 2 -Route104_MapAttributes: @ 83EEB54 - .4byte 0x28 - .4byte 0x50 - .4byte Route104_MapBorder - .4byte Route104_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -Route105_MapBorder: @ 83EEB6C - .incbin "data/maps/Route105/border.bin" - - .align 2 -Route105_MapBlockdata: @ 83EEB74 - .incbin "data/maps/Route105/map.bin" - - .align 2 -Route105_MapAttributes: @ 83F0474 - .4byte 0x28 - .4byte 0x50 - .4byte Route105_MapBorder - .4byte Route105_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -Route106_MapBorder: @ 83F048C - .incbin "data/maps/Route106/border.bin" - - .align 2 -Route106_MapBlockdata: @ 83F0494 - .incbin "data/maps/Route106/map.bin" - - .align 2 -Route106_MapAttributes: @ 83F1114 - .4byte 0x50 - .4byte 0x14 - .4byte Route106_MapBorder - .4byte Route106_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -Route107_MapBorder: @ 83F112C - .incbin "data/maps/Route107/border.bin" - - .align 2 -Route107_MapBlockdata: @ 83F1134 - .incbin "data/maps/Route107/map.bin" - - .align 2 -Route107_MapAttributes: @ 83F1A94 - .4byte 0x3c - .4byte 0x14 - .4byte Route107_MapBorder - .4byte Route107_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -Route108_MapBorder: @ 83F1AAC - .incbin "data/maps/Route108/border.bin" - - .align 2 -Route108_MapBlockdata: @ 83F1AB4 - .incbin "data/maps/Route108/map.bin" - - .align 2 -Route108_MapAttributes: @ 83F2414 - .4byte 0x3c - .4byte 0x14 - .4byte Route108_MapBorder - .4byte Route108_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - - .align 2 -Route109_MapBorder: @ 83F242C - .incbin "data/maps/Route109/border.bin" - - .align 2 -Route109_MapBlockdata: @ 83F2434 - .incbin "data/maps/Route109/map.bin" - - .align 2 -Route109_MapAttributes: @ 83F37E4 - .4byte 0x28 - .4byte 0x3f - .4byte Route109_MapBorder - .4byte Route109_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - - .align 2 -Route110_MapBorder: @ 83F37FC - .incbin "data/maps/Route110/border.bin" - - .align 2 -Route110_MapBlockdata: @ 83F3804 - .incbin "data/maps/Route110/map.bin" - - .align 2 -Route110_MapAttributes: @ 83F5744 - .4byte 0x28 - .4byte 0x64 - .4byte Route110_MapBorder - .4byte Route110_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -Route111_MapBorder: @ 83F575C - .incbin "data/maps/Route111/border.bin" - - .align 2 -Route111_MapBlockdata: @ 83F5764 - .incbin "data/maps/Route111/map.bin" - - .align 2 -Route111_MapAttributes: @ 83F8324 - .4byte 0x28 - .4byte 0x8c - .4byte Route111_MapBorder - .4byte Route111_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -Route112_MapBorder: @ 83F833C - .incbin "data/maps/Route112/border.bin" - - .align 2 -Route112_MapBlockdata: @ 83F8344 - .incbin "data/maps/Route112/map.bin" - - .align 2 -Route112_MapAttributes: @ 83F9604 - .4byte 0x28 - .4byte 0x3c - .4byte Route112_MapBorder - .4byte Route112_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -Route113_MapBorder: @ 83F961C - .incbin "data/maps/Route113/border.bin" - - .align 2 -Route113_MapBlockdata: @ 83F9624 - .incbin "data/maps/Route113/map.bin" - - .align 2 -Route113_MapAttributes: @ 83FA5C4 - .4byte 0x64 - .4byte 0x14 - .4byte Route113_MapBorder - .4byte Route113_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -Route114_MapBorder: @ 83FA5DC - .incbin "data/maps/Route114/border.bin" - - .align 2 -Route114_MapBlockdata: @ 83FA5E4 - .incbin "data/maps/Route114/map.bin" - - .align 2 -Route114_MapAttributes: @ 83FBEE4 - .4byte 0x28 - .4byte 0x50 - .4byte Route114_MapBorder - .4byte Route114_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -Route115_MapBorder: @ 83FBEFC - .incbin "data/maps/Route115/border.bin" - - .align 2 -Route115_MapBlockdata: @ 83FBF04 - .incbin "data/maps/Route115/map.bin" - - .align 2 -Route115_MapAttributes: @ 83FD804 - .4byte 0x28 - .4byte 0x50 - .4byte Route115_MapBorder - .4byte Route115_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -Route116_MapBorder: @ 83FD81C - .incbin "data/maps/Route116/border.bin" - - .align 2 -Route116_MapBlockdata: @ 83FD824 - .incbin "data/maps/Route116/map.bin" - - .align 2 -Route116_MapAttributes: @ 83FE7C4 - .4byte 0x64 - .4byte 0x14 - .4byte Route116_MapBorder - .4byte Route116_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -Route117_MapBorder: @ 83FE7DC - .incbin "data/maps/Route117/border.bin" - - .align 2 -Route117_MapBlockdata: @ 83FE7E4 - .incbin "data/maps/Route117/map.bin" - - .align 2 -Route117_MapAttributes: @ 83FF144 - .4byte 0x3c - .4byte 0x14 - .4byte Route117_MapBorder - .4byte Route117_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -Route118_MapBorder: @ 83FF15C - .incbin "data/maps/Route118/border.bin" - - .align 2 -Route118_MapBlockdata: @ 83FF164 - .incbin "data/maps/Route118/map.bin" - - .align 2 -Route118_MapAttributes: @ 83FFDE4 - .4byte 0x50 - .4byte 0x14 - .4byte Route118_MapBorder - .4byte Route118_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -Route119_MapBorder: @ 83FFDFC - .incbin "data/maps/Route119/border.bin" - - .align 2 -Route119_MapBlockdata: @ 83FFE04 - .incbin "data/maps/Route119/map.bin" - - .align 2 -Route119_MapAttributes: @ 84029C4 - .4byte 0x28 - .4byte 0x8c - .4byte Route119_MapBorder - .4byte Route119_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - - .align 2 -Route120_MapBorder: @ 84029DC - .incbin "data/maps/Route120/border.bin" - - .align 2 -Route120_MapBlockdata: @ 84029E4 - .incbin "data/maps/Route120/map.bin" - - .align 2 -Route120_MapAttributes: @ 8404924 - .4byte 0x28 - .4byte 0x64 - .4byte Route120_MapBorder - .4byte Route120_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - - .align 2 -Route121_MapBorder: @ 840493C - .incbin "data/maps/Route121/border.bin" - - .align 2 -Route121_MapBlockdata: @ 8404944 - .incbin "data/maps/Route121/map.bin" - - .align 2 -Route121_MapAttributes: @ 84055C4 - .4byte 0x50 - .4byte 0x14 - .4byte Route121_MapBorder - .4byte Route121_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -Route122_MapBorder: @ 84055DC - .incbin "data/maps/Route122/border.bin" - - .align 2 -Route122_MapBlockdata: @ 84055E4 - .incbin "data/maps/Route122/map.bin" - - .align 2 -Route122_MapAttributes: @ 8406264 - .4byte 0x28 - .4byte 0x28 - .4byte Route122_MapBorder - .4byte Route122_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -Route123_MapBorder: @ 840627C - .incbin "data/maps/Route123/border.bin" - - .align 2 -Route123_MapBlockdata: @ 8406284 - .incbin "data/maps/Route123/map.bin" - - .align 2 -Route123_MapAttributes: @ 8407864 - .4byte 0x8c - .4byte 0x14 - .4byte Route123_MapBorder - .4byte Route123_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -Route124_MapBorder: @ 840787C - .incbin "data/maps/Route124/border.bin" - - .align 2 -Route124_MapBlockdata: @ 8407884 - .incbin "data/maps/Route124/map.bin" - - .align 2 -Route124_MapAttributes: @ 840AA84 - .4byte 0x50 - .4byte 0x50 - .4byte Route124_MapBorder - .4byte Route124_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route125_MapBorder: @ 840AA9C - .incbin "data/maps/Route125/border.bin" - - .align 2 -Route125_MapBlockdata: @ 840AAA4 - .incbin "data/maps/Route125/map.bin" - - .align 2 -Route125_MapAttributes: @ 840C3A4 - .4byte 0x50 - .4byte 0x28 - .4byte Route125_MapBorder - .4byte Route125_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route126_MapBorder: @ 840C3BC - .incbin "data/maps/Route126/border.bin" - - .align 2 -Route126_MapBlockdata: @ 840C3C4 - .incbin "data/maps/Route126/map.bin" - - .align 2 -Route126_MapAttributes: @ 840F5C4 - .4byte 0x50 - .4byte 0x50 - .4byte Route126_MapBorder - .4byte Route126_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route127_MapBorder: @ 840F5DC - .incbin "data/maps/Route127/border.bin" - - .align 2 -Route127_MapBlockdata: @ 840F5E4 - .incbin "data/maps/Route127/map.bin" - - .align 2 -Route127_MapAttributes: @ 84127E4 - .4byte 0x50 - .4byte 0x50 - .4byte Route127_MapBorder - .4byte Route127_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route128_MapBorder: @ 84127FC - .incbin "data/maps/Route128/border.bin" - - .align 2 -Route128_MapBlockdata: @ 8412804 - .incbin "data/maps/Route128/map.bin" - - .align 2 -Route128_MapAttributes: @ 8414D84 - .4byte 0x78 - .4byte 0x28 - .4byte Route128_MapBorder - .4byte Route128_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -Route129_MapBorder: @ 8414D9C - .incbin "data/maps/Route129/border.bin" - - .align 2 -Route129_MapBlockdata: @ 8414DA4 - .incbin "data/maps/Route129/map.bin" - - .align 2 -Route129_MapAttributes: @ 84166A4 - .4byte 0x50 - .4byte 0x28 - .4byte Route129_MapBorder - .4byte Route129_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - - .align 2 -UnknownMapBorder_08417FC4: @ 84166BC - .incbin "data/maps/UnknownMap_08417FC4/border.bin" - - .align 2 -UnknownMapBlockdata_08417FC4: @ 84166C4 - .incbin "data/maps/UnknownMap_08417FC4/map.bin" - - .align 2 -UnknownMapAttributes_08417FC4: @ 8417FC4 - .4byte 0x50 - .4byte 0x28 - .4byte UnknownMapBorder_08417FC4 - .4byte UnknownMapBlockdata_08417FC4 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -Route131_MapBorder: @ 8417FDC - .incbin "data/maps/Route131/border.bin" - - .align 2 -Route131_MapBlockdata: @ 8417FE4 - .incbin "data/maps/Route131/map.bin" - - .align 2 -Route131_MapAttributes: @ 84192A4 - .4byte 0x3c - .4byte 0x28 - .4byte Route131_MapBorder - .4byte Route131_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Route132_MapBorder: @ 84192BC - .incbin "data/maps/Route132/border.bin" - - .align 2 -Route132_MapBlockdata: @ 84192C4 - .incbin "data/maps/Route132/map.bin" - - .align 2 -Route132_MapAttributes: @ 841ABC4 - .4byte 0x50 - .4byte 0x28 - .4byte Route132_MapBorder - .4byte Route132_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Route133_MapBorder: @ 841ABDC - .incbin "data/maps/Route133/border.bin" - - .align 2 -Route133_MapBlockdata: @ 841ABE4 - .incbin "data/maps/Route133/map.bin" - - .align 2 -Route133_MapAttributes: @ 841C4E4 - .4byte 0x50 - .4byte 0x28 - .4byte Route133_MapBorder - .4byte Route133_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Route134_MapBorder: @ 841C4FC - .incbin "data/maps/Route134/border.bin" - - .align 2 -Route134_MapBlockdata: @ 841C504 - .incbin "data/maps/Route134/map.bin" - - .align 2 -Route134_MapAttributes: @ 841DE04 - .4byte 0x50 - .4byte 0x28 - .4byte Route134_MapBorder - .4byte Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -Underwater2_MapBorder: @ 841DE1C - .incbin "data/maps/Underwater2/border.bin" - - .align 2 -Underwater2_MapBlockdata: @ 841DE24 - .incbin "data/maps/Underwater2/map.bin" - - .align 2 -Underwater2_MapAttributes: @ 8421024 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater2_MapBorder - .4byte Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater3_MapBorder: @ 842103C - .incbin "data/maps/Underwater3/border.bin" - - .align 2 -Underwater3_MapBlockdata: @ 8421044 - .incbin "data/maps/Underwater3/map.bin" - - .align 2 -Underwater3_MapAttributes: @ 8424244 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater3_MapBorder - .4byte Underwater3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater4_MapBorder: @ 842425C - .incbin "data/maps/Underwater4/border.bin" - - .align 2 -Underwater4_MapBlockdata: @ 8424264 - .incbin "data/maps/Underwater4/map.bin" - - .align 2 -Underwater4_MapAttributes: @ 84267E4 - .4byte 0x78 - .4byte 0x28 - .4byte Underwater4_MapBorder - .4byte Underwater4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -LittlerootTown_BrendansHouse_1F_MapBorder: @ 84267FC - .incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_MapBlockdata: @ 8426804 - .incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_MapAttributes: @ 84268CC - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_BrendansHouse_1F_MapBorder - .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - - .align 2 -LittlerootTown_BrendansHouse_2F_MapBorder: @ 84268E4 - .incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_MapBlockdata: @ 84268EC - .incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_MapAttributes: @ 842697C - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_BrendansHouse_2F_MapBorder - .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - - .align 2 -LittlerootTown_MaysHouse_1F_MapBorder: @ 8426994 - .incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_MapBlockdata: @ 842699C - .incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_MapAttributes: @ 8426A64 - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_MaysHouse_1F_MapBorder - .4byte LittlerootTown_MaysHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - - .align 2 -LittlerootTown_MaysHouse_2F_MapBorder: @ 8426A7C - .incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_MapBlockdata: @ 8426A84 - .incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_MapAttributes: @ 8426B14 - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_MaysHouse_2F_MapBorder - .4byte LittlerootTown_MaysHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - - .align 2 -LittlerootTown_ProfessorBirchsLab_MapBorder: @ 8426B2C - .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_MapBlockdata: @ 8426B34 - .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_MapAttributes: @ 8426C88 - .4byte 0xd - .4byte 0xd - .4byte LittlerootTown_ProfessorBirchsLab_MapBorder - .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -OldaleTown_House1_MapBorder: @ 8426CA0 - .incbin "data/maps/OldaleTown_House1/border.bin" - - .align 2 -OldaleTown_House1_MapBlockdata: @ 8426CA8 - .incbin "data/maps/OldaleTown_House1/map.bin" - - .align 2 -FallarborTown_House1_MapAttributes: @ 8426D5C -LilycoveCity_House1_MapAttributes: @ 8426D5C -LilycoveCity_House4_MapAttributes: @ 8426D5C -MauvilleCity_House2_MapAttributes: @ 8426D5C -MossdeepCity_House2_MapAttributes: @ 8426D5C -OldaleTown_House1_MapAttributes: @ 8426D5C -PetalburgCity_House1_MapAttributes: @ 8426D5C -Route119_House_MapAttributes: @ 8426D5C -VerdanturfTown_House_MapAttributes: @ 8426D5C - .4byte 0xa - .4byte 0x9 - .4byte OldaleTown_House1_MapBorder - .4byte OldaleTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -OldaleTown_House2_MapBorder: @ 8426D74 - .incbin "data/maps/OldaleTown_House2/border.bin" - - .align 2 -OldaleTown_House2_MapBlockdata: @ 8426D7C - .incbin "data/maps/OldaleTown_House2/map.bin" - - .align 2 -FallarborTown_House2_MapAttributes: @ 8426E2C -LilycoveCity_House3_MapAttributes: @ 8426E2C -LilycoveCity_MoveDeletersHouse_MapAttributes: @ 8426E2C -MauvilleCity_House1_MapAttributes: @ 8426E2C -MossdeepCity_House1_MapAttributes: @ 8426E2C -MossdeepCity_House3_MapAttributes: @ 8426E2C -OldaleTown_House2_MapAttributes: @ 8426E2C -PetalburgCity_WallysHouse_MapAttributes: @ 8426E2C -Route111_WinstrateFamilysHouse_MapAttributes: @ 8426E2C -Route123_BerryMastersHouse_MapAttributes: @ 8426E2C -SlateportCity_House2_MapAttributes: @ 8426E2C -VerdanturfTown_FriendshipRatersHouse_MapAttributes: @ 8426E2C - .4byte 0xb - .4byte 0x8 - .4byte OldaleTown_House2_MapBorder - .4byte OldaleTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -OldaleTown_PokemonCenter_1F_MapBorder: @ 8426E44 - .incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin" - - .align 2 -OldaleTown_PokemonCenter_1F_MapBlockdata: @ 8426E4C - .incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin" - - .align 2 -BattleFrontier_PokemonCenter_1F_MapAttributes: @ 8426F48 -DewfordTown_PokemonCenter_1F_MapAttributes: @ 8426F48 -EverGrandeCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -FallarborTown_PokemonCenter_1F_MapAttributes: @ 8426F48 -FortreeCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -LilycoveCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -MauvilleCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -MossdeepCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -OldaleTown_PokemonCenter_1F_MapAttributes: @ 8426F48 -PacifidlogTown_PokemonCenter_1F_MapAttributes: @ 8426F48 -PetalburgCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -RustboroCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -SlateportCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -SootopolisCity_PokemonCenter_1F_MapAttributes: @ 8426F48 -VerdanturfTown_PokemonCenter_1F_MapAttributes: @ 8426F48 - .4byte 0xe - .4byte 0x9 - .4byte OldaleTown_PokemonCenter_1F_MapBorder - .4byte OldaleTown_PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - - .align 2 -OldaleTown_PokemonCenter_2F_MapBorder: @ 8426F60 - .incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin" - - .align 2 -OldaleTown_PokemonCenter_2F_MapBlockdata: @ 8426F68 - .incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin" - - .align 2 -BattleFrontier_PokemonCenter_2F_MapAttributes: @ 8427080 -DewfordTown_PokemonCenter_2F_MapAttributes: @ 8427080 -EverGrandeCity_PokemonCenter_2F_MapAttributes: @ 8427080 -EverGrandeCity_PokemonLeague_2F_MapAttributes: @ 8427080 -FallarborTown_PokemonCenter_2F_MapAttributes: @ 8427080 -FortreeCity_PokemonCenter_2F_MapAttributes: @ 8427080 -LavaridgeTown_PokemonCenter_2F_MapAttributes: @ 8427080 -LilycoveCity_PokemonCenter_2F_MapAttributes: @ 8427080 -MauvilleCity_PokemonCenter_2F_MapAttributes: @ 8427080 -MossdeepCity_PokemonCenter_2F_MapAttributes: @ 8427080 -OldaleTown_PokemonCenter_2F_MapAttributes: @ 8427080 -PacifidlogTown_PokemonCenter_2F_MapAttributes: @ 8427080 -PetalburgCity_PokemonCenter_2F_MapAttributes: @ 8427080 -RustboroCity_PokemonCenter_2F_MapAttributes: @ 8427080 -SlateportCity_PokemonCenter_2F_MapAttributes: @ 8427080 -SootopolisCity_PokemonCenter_2F_MapAttributes: @ 8427080 -VerdanturfTown_PokemonCenter_2F_MapAttributes: @ 8427080 - .4byte 0xe - .4byte 0xa - .4byte OldaleTown_PokemonCenter_2F_MapBorder - .4byte OldaleTown_PokemonCenter_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - - .align 2 -OldaleTown_Mart_MapBorder: @ 8427098 - .incbin "data/maps/OldaleTown_Mart/border.bin" - - .align 2 -OldaleTown_Mart_MapBlockdata: @ 84270A0 - .incbin "data/maps/OldaleTown_Mart/map.bin" - - .align 2 -BattleFrontier_Mart_MapAttributes: @ 8427150 -FallarborTown_Mart_MapAttributes: @ 8427150 -FortreeCity_Mart_MapAttributes: @ 8427150 -LavaridgeTown_Mart_MapAttributes: @ 8427150 -LilycoveCity_UnusedMart_MapAttributes: @ 8427150 -MauvilleCity_Mart_MapAttributes: @ 8427150 -MossdeepCity_Mart_MapAttributes: @ 8427150 -OldaleTown_Mart_MapAttributes: @ 8427150 -PetalburgCity_Mart_MapAttributes: @ 8427150 -RustboroCity_Mart_MapAttributes: @ 8427150 -SlateportCity_Mart_MapAttributes: @ 8427150 -SootopolisCity_Mart_MapAttributes: @ 8427150 -VerdanturfTown_Mart_MapAttributes: @ 8427150 - .4byte 0xb - .4byte 0x8 - .4byte OldaleTown_Mart_MapBorder - .4byte OldaleTown_Mart_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -DewfordTown_House1_MapBorder: @ 8427168 - .incbin "data/maps/DewfordTown_House1/border.bin" - - .align 2 -DewfordTown_House1_MapBlockdata: @ 8427170 - .incbin "data/maps/DewfordTown_House1/map.bin" - - .align 2 -DewfordTown_House1_MapAttributes: @ 8427210 -LavaridgeTown_House_MapAttributes: @ 8427210 -Route111_OldLadysRestStop_MapAttributes: @ 8427210 - .4byte 0xa - .4byte 0x8 - .4byte DewfordTown_House1_MapBorder - .4byte DewfordTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -DewfordTown_Gym_MapBorder: @ 8427228 - .incbin "data/maps/DewfordTown_Gym/border.bin" - - .align 2 -DewfordTown_Gym_MapBlockdata: @ 8427230 - .incbin "data/maps/DewfordTown_Gym/map.bin" - - .align 2 -DewfordTown_Gym_MapAttributes: @ 8427620 - .4byte 0x12 - .4byte 0x1c - .4byte DewfordTown_Gym_MapBorder - .4byte DewfordTown_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_DewfordGym - - .align 2 -DewfordTown_Hall_MapBorder: @ 8427638 - .incbin "data/maps/DewfordTown_Hall/border.bin" - - .align 2 -DewfordTown_Hall_MapBlockdata: @ 8427640 - .incbin "data/maps/DewfordTown_Hall/map.bin" - - .align 2 -DewfordTown_Hall_MapAttributes: @ 8427774 - .4byte 0x11 - .4byte 0x9 - .4byte DewfordTown_Hall_MapBorder - .4byte DewfordTown_Hall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -DewfordTown_House2_MapBorder: @ 842778C - .incbin "data/maps/DewfordTown_House2/border.bin" - - .align 2 -DewfordTown_House2_MapBlockdata: @ 8427794 - .incbin "data/maps/DewfordTown_House2/map.bin" - - .align 2 -DewfordTown_House2_MapAttributes: @ 8427848 -Route113_GlassWorkshop_MapAttributes: @ 8427848 - .4byte 0xa - .4byte 0x9 - .4byte DewfordTown_House2_MapBorder - .4byte DewfordTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -LavaridgeTown_HerbShop_MapBorder: @ 8427860 - .incbin "data/maps/LavaridgeTown_HerbShop/border.bin" - - .align 2 -LavaridgeTown_HerbShop_MapBlockdata: @ 8427868 - .incbin "data/maps/LavaridgeTown_HerbShop/map.bin" - - .align 2 -LavaridgeTown_HerbShop_MapAttributes: @ 8427918 - .4byte 0xb - .4byte 0x8 - .4byte LavaridgeTown_HerbShop_MapBorder - .4byte LavaridgeTown_HerbShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LavaridgeTown_Gym_1F_MapBorder: @ 8427930 - .incbin "data/maps/LavaridgeTown_Gym_1F/border.bin" - - .align 2 -LavaridgeTown_Gym_1F_MapBlockdata: @ 8427938 - .incbin "data/maps/LavaridgeTown_Gym_1F/map.bin" - - .align 2 -LavaridgeTown_Gym_1F_MapAttributes: @ 8427BC0 - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_1F_MapBorder - .4byte LavaridgeTown_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - - .align 2 -LavaridgeTown_Gym_B1F_MapBorder: @ 8427BD8 - .incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin" - - .align 2 -LavaridgeTown_Gym_B1F_MapBlockdata: @ 8427BE0 - .incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin" - - .align 2 -LavaridgeTown_Gym_B1F_MapAttributes: @ 8427E68 - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_B1F_MapBorder - .4byte LavaridgeTown_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - - .align 2 -LavaridgeTown_PokemonCenter_1F_MapBorder: @ 8427E80 - .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_MapBlockdata: @ 8427E88 - .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_MapAttributes: @ 8427F84 - .4byte 0xe - .4byte 0x9 - .4byte LavaridgeTown_PokemonCenter_1F_MapBorder - .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - - .align 2 -FallarborTown_LeftoverRSContestLobby_MapBorder: @ 8427F9C - .incbin "data/maps/FallarborTown_LeftoverRSContestLobby/border.bin" - - .align 2 -FallarborTown_LeftoverRSContestLobby_MapBlockdata: @ 8427FA4 - .incbin "data/maps/FallarborTown_LeftoverRSContestLobby/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestLobby_MapAttributes: @ 8428078 - .4byte 0xf - .4byte 0x7 - .4byte FallarborTown_LeftoverRSContestLobby_MapBorder - .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -FallarborTown_LeftoverRSContestHall_MapBorder: @ 8428090 - .incbin "data/maps/FallarborTown_LeftoverRSContestHall/border.bin" - - .align 2 -FallarborTown_LeftoverRSContestHall_MapBlockdata: @ 8428098 - .incbin "data/maps/FallarborTown_LeftoverRSContestHall/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestHall_MapAttributes: @ 842838C - .4byte 0x15 - .4byte 0x12 - .4byte FallarborTown_LeftoverRSContestHall_MapBorder - .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -LilycoveCity_House2_MapBorder: @ 84283A4 - .incbin "data/maps/LilycoveCity_House2/border.bin" - - .align 2 -LilycoveCity_House2_MapBlockdata: @ 84283AC - .incbin "data/maps/LilycoveCity_House2/map.bin" - - .align 2 -LilycoveCity_House2_MapAttributes: @ 842842C - .4byte 0x8 - .4byte 0x8 - .4byte LilycoveCity_House2_MapBorder - .4byte LilycoveCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -UnknownMapBorder_08428450: @ 8428444 - .incbin "data/maps/UnknownMap_08428450/border.bin" - - .align 2 -UnknownMapBlockdata_08428450: @ 842844C - .incbin "data/maps/UnknownMap_08428450/map.bin" - - .align 2 -UnknownMapAttributes_08428450: @ 8428450 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_08428450 - .4byte UnknownMapBlockdata_08428450 - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -VerdanturfTown_WandasHouse_MapBorder: @ 8428468 - .incbin "data/maps/VerdanturfTown_WandasHouse/border.bin" - - .align 2 -VerdanturfTown_WandasHouse_MapBlockdata: @ 8428470 - .incbin "data/maps/VerdanturfTown_WandasHouse/map.bin" - - .align 2 -VerdanturfTown_WandasHouse_MapAttributes: @ 8428580 - .4byte 0x11 - .4byte 0x8 - .4byte VerdanturfTown_WandasHouse_MapBorder - .4byte VerdanturfTown_WandasHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -PacifidlogTown_House1_MapBorder: @ 8428598 - .incbin "data/maps/PacifidlogTown_House1/border.bin" - - .align 2 -PacifidlogTown_House1_MapBlockdata: @ 84285A0 - .incbin "data/maps/PacifidlogTown_House1/map.bin" - - .align 2 -PacifidlogTown_House1_MapAttributes: @ 8428654 -PacifidlogTown_House3_MapAttributes: @ 8428654 -PacifidlogTown_House5_MapAttributes: @ 8428654 - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House1_MapBorder - .4byte PacifidlogTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -PacifidlogTown_House2_MapBorder: @ 842866C - .incbin "data/maps/PacifidlogTown_House2/border.bin" - - .align 2 -PacifidlogTown_House2_MapBlockdata: @ 8428674 - .incbin "data/maps/PacifidlogTown_House2/map.bin" - - .align 2 -PacifidlogTown_House2_MapAttributes: @ 8428728 -PacifidlogTown_House4_MapAttributes: @ 8428728 - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House2_MapBorder - .4byte PacifidlogTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -PetalburgCity_Gym_MapBorder: @ 8428740 - .incbin "data/maps/PetalburgCity_Gym/border.bin" - - .align 2 -PetalburgCity_Gym_MapBlockdata: @ 8428748 - .incbin "data/maps/PetalburgCity_Gym/map.bin" - - .align 2 -PetalburgCity_Gym_MapAttributes: @ 8428F28 - .4byte 0x9 - .4byte 0x70 - .4byte PetalburgCity_Gym_MapBorder - .4byte PetalburgCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PetalburgGym - - .align 2 -PetalburgCity_House2_MapBorder: @ 8428F40 - .incbin "data/maps/PetalburgCity_House2/border.bin" - - .align 2 -PetalburgCity_House2_MapBlockdata: @ 8428F48 - .incbin "data/maps/PetalburgCity_House2/map.bin" - - .align 2 -MossdeepCity_House4_MapAttributes: @ 8428FE8 -PetalburgCity_House2_MapAttributes: @ 8428FE8 -SlateportCity_House1_MapAttributes: @ 8428FE8 - .4byte 0xa - .4byte 0x8 - .4byte PetalburgCity_House2_MapBorder - .4byte PetalburgCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SlateportCity_SternsShipyard_1F_MapBorder: @ 8429000 - .incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_MapBlockdata: @ 8429008 - .incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_MapAttributes: @ 8429280 - .4byte 0x15 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_1F_MapBorder - .4byte SlateportCity_SternsShipyard_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -SlateportCity_SternsShipyard_2F_MapBorder: @ 8429298 - .incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_MapBlockdata: @ 84292A0 - .incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_MapAttributes: @ 84294A0 - .4byte 0x11 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_2F_MapBorder - .4byte SlateportCity_SternsShipyard_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -UnknownMapBorder_084294C4: @ 84294B8 - .incbin "data/maps/UnknownMap_084294C4/border.bin" - - .align 2 -UnknownMapBlockdata_084294C4: @ 84294C0 - .incbin "data/maps/UnknownMap_084294C4/map.bin" - - .align 2 -UnknownMapAttributes_084294C4: @ 84294C4 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_084294C4 - .4byte UnknownMapBlockdata_084294C4 - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMapBorder_084294E8: @ 84294DC - .incbin "data/maps/UnknownMap_084294E8/border.bin" - - .align 2 -UnknownMapBlockdata_084294E8: @ 84294E4 - .incbin "data/maps/UnknownMap_084294E8/map.bin" - - .align 2 -UnknownMapAttributes_084294E8: @ 84294E8 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_084294E8 - .4byte UnknownMapBlockdata_084294E8 - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -SlateportCity_PokemonFanClub_MapBorder: @ 8429500 - .incbin "data/maps/SlateportCity_PokemonFanClub/border.bin" - - .align 2 -SlateportCity_PokemonFanClub_MapBlockdata: @ 8429508 - .incbin "data/maps/SlateportCity_PokemonFanClub/map.bin" - - .align 2 -SlateportCity_PokemonFanClub_MapAttributes: @ 842963C - .4byte 0xe - .4byte 0xb - .4byte SlateportCity_PokemonFanClub_MapBorder - .4byte SlateportCity_PokemonFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonFanClub - - .align 2 -SlateportCity_OceanicMuseum_1F_MapBorder: @ 8429654 - .incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_MapBlockdata: @ 842965C - .incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_MapAttributes: @ 84297C4 - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_1F_MapBorder - .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - - .align 2 -SlateportCity_OceanicMuseum_2F_MapBorder: @ 84297DC - .incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_MapBlockdata: @ 84297E4 - .incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_MapAttributes: @ 842994C - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_2F_MapBorder - .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - - .align 2 -SlateportCity_Harbor_MapBorder: @ 8429964 - .incbin "data/maps/SlateportCity_Harbor/border.bin" - - .align 2 -SlateportCity_Harbor_MapBlockdata: @ 842996C - .incbin "data/maps/SlateportCity_Harbor/map.bin" - - .align 2 -LilycoveCity_Harbor_MapAttributes: @ 8429C3C -SlateportCity_Harbor_MapAttributes: @ 8429C3C - .4byte 0x18 - .4byte 0xf - .4byte SlateportCity_Harbor_MapBorder - .4byte SlateportCity_Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MauvilleCity_Gym_MapBorder: @ 8429C54 - .incbin "data/maps/MauvilleCity_Gym/border.bin" - - .align 2 -MauvilleCity_Gym_MapBlockdata: @ 8429C5C - .incbin "data/maps/MauvilleCity_Gym/map.bin" - - .align 2 -MauvilleCity_Gym_MapAttributes: @ 8429E00 - .4byte 0xa - .4byte 0x15 - .4byte MauvilleCity_Gym_MapBorder - .4byte MauvilleCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGym - - .align 2 -MauvilleCity_BikeShop_MapBorder: @ 8429E18 - .incbin "data/maps/MauvilleCity_BikeShop/border.bin" - - .align 2 -MauvilleCity_BikeShop_MapBlockdata: @ 8429E20 - .incbin "data/maps/MauvilleCity_BikeShop/map.bin" - - .align 2 -MauvilleCity_BikeShop_MapAttributes: @ 8429EF8 - .4byte 0xc - .4byte 0x9 - .4byte MauvilleCity_BikeShop_MapBorder - .4byte MauvilleCity_BikeShop_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - - .align 2 -MauvilleCity_GameCorner_MapBorder: @ 8429F10 - .incbin "data/maps/MauvilleCity_GameCorner/border.bin" - - .align 2 -MauvilleCity_GameCorner_MapBlockdata: @ 8429F18 - .incbin "data/maps/MauvilleCity_GameCorner/map.bin" - - .align 2 -MauvilleCity_GameCorner_MapAttributes: @ 842A0FC - .4byte 0x16 - .4byte 0xb - .4byte MauvilleCity_GameCorner_MapBorder - .4byte MauvilleCity_GameCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGameCorner - - .align 2 -RustboroCity_DevonCorp_1F_MapBorder: @ 842A114 - .incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin" - - .align 2 -RustboroCity_DevonCorp_1F_MapBlockdata: @ 842A11C - .incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin" - - .align 2 -RustboroCity_DevonCorp_1F_MapAttributes: @ 842A274 - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_1F_MapBorder - .4byte RustboroCity_DevonCorp_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Facility - - .align 2 -RustboroCity_DevonCorp_2F_MapBorder: @ 842A28C - .incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin" - - .align 2 -RustboroCity_DevonCorp_2F_MapBlockdata: @ 842A294 - .incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin" - - .align 2 -RustboroCity_DevonCorp_2F_MapAttributes: @ 842A3EC - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_2F_MapBorder - .4byte RustboroCity_DevonCorp_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -RustboroCity_Gym_MapBorder: @ 842A404 - .incbin "data/maps/RustboroCity_Gym/border.bin" - - .align 2 -RustboroCity_Gym_MapBlockdata: @ 842A40C - .incbin "data/maps/RustboroCity_Gym/map.bin" - - .align 2 -RustboroCity_Gym_MapAttributes: @ 842A5C4 - .4byte 0xb - .4byte 0x14 - .4byte RustboroCity_Gym_MapBorder - .4byte RustboroCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_RustboroGym - - .align 2 -RustboroCity_PokemonSchool_MapBorder: @ 842A5DC - .incbin "data/maps/RustboroCity_PokemonSchool/border.bin" - - .align 2 -RustboroCity_PokemonSchool_MapBlockdata: @ 842A5E4 - .incbin "data/maps/RustboroCity_PokemonSchool/map.bin" - - .align 2 -RustboroCity_PokemonSchool_MapAttributes: @ 842A6EC - .4byte 0xc - .4byte 0xb - .4byte RustboroCity_PokemonSchool_MapBorder - .4byte RustboroCity_PokemonSchool_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonSchool - - .align 2 -RustboroCity_House2_MapBorder: @ 842A704 - .incbin "data/maps/RustboroCity_House2/border.bin" - - .align 2 -RustboroCity_House2_MapBlockdata: @ 842A70C - .incbin "data/maps/RustboroCity_House2/map.bin" - - .align 2 -RustboroCity_House2_MapAttributes: @ 842A7E4 -RustboroCity_House3_MapAttributes: @ 842A7E4 - .4byte 0xc - .4byte 0x9 - .4byte RustboroCity_House2_MapBorder - .4byte RustboroCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_House1_MapBorder: @ 842A7FC - .incbin "data/maps/RustboroCity_House1/border.bin" - - .align 2 -RustboroCity_House1_MapBlockdata: @ 842A804 - .incbin "data/maps/RustboroCity_House1/map.bin" - - .align 2 -RustboroCity_House1_MapAttributes: @ 842A8D4 - .4byte 0xd - .4byte 0x8 - .4byte RustboroCity_House1_MapBorder - .4byte RustboroCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_CuttersHouse_MapBorder: @ 842A8EC - .incbin "data/maps/RustboroCity_CuttersHouse/border.bin" - - .align 2 -RustboroCity_CuttersHouse_MapBlockdata: @ 842A8F4 - .incbin "data/maps/RustboroCity_CuttersHouse/map.bin" - - .align 2 -RustboroCity_CuttersHouse_MapAttributes: @ 842A9BC - .4byte 0xb - .4byte 0x9 - .4byte RustboroCity_CuttersHouse_MapBorder - .4byte RustboroCity_CuttersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -FortreeCity_House1_MapBorder: @ 842A9D4 - .incbin "data/maps/FortreeCity_House1/border.bin" - - .align 2 -FortreeCity_House1_MapBlockdata: @ 842A9DC - .incbin "data/maps/FortreeCity_House1/map.bin" - - .align 2 -FortreeCity_House1_MapAttributes: @ 842AA3C -FortreeCity_House3_MapAttributes: @ 842AA3C -FortreeCity_House5_MapAttributes: @ 842AA3C - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House1_MapBorder - .4byte FortreeCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -FortreeCity_Gym_MapBorder: @ 842AA54 - .incbin "data/maps/FortreeCity_Gym/border.bin" - - .align 2 -FortreeCity_Gym_MapBlockdata: @ 842AA5C - .incbin "data/maps/FortreeCity_Gym/map.bin" - - .align 2 -FortreeCity_Gym_MapAttributes: @ 842AE44 - .4byte 0x14 - .4byte 0x19 - .4byte FortreeCity_Gym_MapBorder - .4byte FortreeCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_FortreeGym - - .align 2 -FortreeCity_House2_MapBorder: @ 842AE5C - .incbin "data/maps/FortreeCity_House2/border.bin" - - .align 2 -FortreeCity_House2_MapBlockdata: @ 842AE64 - .incbin "data/maps/FortreeCity_House2/map.bin" - - .align 2 -FortreeCity_House2_MapAttributes: @ 842AEC4 -FortreeCity_House4_MapAttributes: @ 842AEC4 - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House2_MapBorder - .4byte FortreeCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route104_MrBrineysHouse_MapBorder: @ 842AEDC - .incbin "data/maps/Route104_MrBrineysHouse/border.bin" - - .align 2 -Route104_MrBrineysHouse_MapBlockdata: @ 842AEE4 - .incbin "data/maps/Route104_MrBrineysHouse/map.bin" - - .align 2 -Route104_MrBrineysHouse_MapAttributes: @ 842AFBC - .4byte 0xc - .4byte 0x9 - .4byte Route104_MrBrineysHouse_MapBorder - .4byte Route104_MrBrineysHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -LilycoveCity_LilycoveMuseum_1F_MapBorder: @ 842AFD4 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_MapBlockdata: @ 842AFDC - .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_MapAttributes: @ 842B228 - .4byte 0x15 - .4byte 0xe - .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - - .align 2 -LilycoveCity_LilycoveMuseum_2F_MapBorder: @ 842B240 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_MapBlockdata: @ 842B248 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_MapAttributes: @ 842B484 - .4byte 0x16 - .4byte 0xd - .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - - .align 2 -LilycoveCity_ContestLobby_MapBorder: @ 842B49C - .incbin "data/maps/LilycoveCity_ContestLobby/border.bin" - - .align 2 -LilycoveCity_ContestLobby_MapBlockdata: @ 842B4A4 - .incbin "data/maps/LilycoveCity_ContestLobby/map.bin" - - .align 2 -LilycoveCity_ContestLobby_MapAttributes: @ 842B78C - .4byte 0x1f - .4byte 0xc - .4byte LilycoveCity_ContestLobby_MapBorder - .4byte LilycoveCity_ContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -LilycoveCity_ContestHall_MapBorder: @ 842B7A4 - .incbin "data/maps/LilycoveCity_ContestHall/border.bin" - - .align 2 -LilycoveCity_ContestHall_MapBlockdata: @ 842B7AC - .incbin "data/maps/LilycoveCity_ContestHall/map.bin" - - .align 2 -LilycoveCity_ContestHall_MapAttributes: @ 842C4D4 - .4byte 0x33 - .4byte 0x21 - .4byte LilycoveCity_ContestHall_MapBorder - .4byte LilycoveCity_ContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -LilycoveCity_PokemonTrainerFanClub_MapBorder: @ 842C4EC - .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_MapBlockdata: @ 842C4F4 - .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_MapAttributes: @ 842C644 - .4byte 0xc - .4byte 0xe - .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder - .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -MossdeepCity_Gym_MapBorder: @ 842C65C - .incbin "data/maps/MossdeepCity_Gym/border.bin" - - .align 2 -MossdeepCity_Gym_MapBlockdata: @ 842C664 - .incbin "data/maps/MossdeepCity_Gym/map.bin" - - .align 2 -MossdeepCity_Gym_MapAttributes: @ 842CDB4 - .4byte 0x1a - .4byte 0x24 - .4byte MossdeepCity_Gym_MapBorder - .4byte MossdeepCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGym - - .align 2 -SootopolisCity_Gym_1F_MapBorder: @ 842CDCC - .incbin "data/maps/SootopolisCity_Gym_1F/border.bin" - - .align 2 -SootopolisCity_Gym_1F_MapBlockdata: @ 842CDD4 - .incbin "data/maps/SootopolisCity_Gym_1F/map.bin" - - .align 2 -SootopolisCity_Gym_1F_MapAttributes: @ 842D148 - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_1F_MapBorder - .4byte SootopolisCity_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - - .align 2 -SootopolisCity_Gym_B1F_MapBorder: @ 842D160 - .incbin "data/maps/SootopolisCity_Gym_B1F/border.bin" - - .align 2 -SootopolisCity_Gym_B1F_MapBlockdata: @ 842D168 - .incbin "data/maps/SootopolisCity_Gym_B1F/map.bin" - - .align 2 -SootopolisCity_Gym_B1F_MapAttributes: @ 842D4DC - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_B1F_MapBorder - .4byte SootopolisCity_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - - .align 2 -EverGrandeCity_SidneysRoom_MapBorder: @ 842D4F4 - .incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin" - - .align 2 -EverGrandeCity_SidneysRoom_MapBlockdata: @ 842D4FC - .incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin" - - .align 2 -EverGrandeCity_SidneysRoom_MapAttributes: @ 842D668 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_SidneysRoom_MapBorder - .4byte EverGrandeCity_SidneysRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_PhoebesRoom_MapBorder: @ 842D680 - .incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_MapBlockdata: @ 842D688 - .incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_MapAttributes: @ 842D7F4 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_PhoebesRoom_MapBorder - .4byte EverGrandeCity_PhoebesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_GlaciasRoom_MapBorder: @ 842D80C - .incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_MapBlockdata: @ 842D814 - .incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_MapAttributes: @ 842D980 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_GlaciasRoom_MapBorder - .4byte EverGrandeCity_GlaciasRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_DrakesRoom_MapBorder: @ 842D998 - .incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin" - - .align 2 -EverGrandeCity_DrakesRoom_MapBlockdata: @ 842D9A0 - .incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin" - - .align 2 -EverGrandeCity_DrakesRoom_MapAttributes: @ 842DB0C - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_DrakesRoom_MapBorder - .4byte EverGrandeCity_DrakesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_ChampionsRoom_MapBorder: @ 842DB24 - .incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_MapBlockdata: @ 842DB2C - .incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_MapAttributes: @ 842DC80 - .4byte 0xd - .4byte 0xd - .4byte EverGrandeCity_ChampionsRoom_MapBorder - .4byte EverGrandeCity_ChampionsRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -EverGrandeCity_Hall1_MapBorder: @ 842DC98 - .incbin "data/maps/EverGrandeCity_Hall1/border.bin" - - .align 2 -EverGrandeCity_Hall1_MapBlockdata: @ 842DCA0 - .incbin "data/maps/EverGrandeCity_Hall1/map.bin" - - .align 2 -EverGrandeCity_Hall1_MapAttributes: @ 842DDC0 -EverGrandeCity_Hall2_MapAttributes: @ 842DDC0 -EverGrandeCity_Hall3_MapAttributes: @ 842DDC0 -EverGrandeCity_Hall5_MapAttributes: @ 842DDC0 - .4byte 0xb - .4byte 0xd - .4byte EverGrandeCity_Hall1_MapBorder - .4byte EverGrandeCity_Hall1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -Route104_PrettyPetalFlowerShop_MapBorder: @ 842DDD8 - .incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_MapBlockdata: @ 842DDE0 - .incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_MapAttributes: @ 842DEF0 -Route104_PrototypePrettyPetalFlowerShop_MapAttributes: @ 842DEF0 - .4byte 0xf - .4byte 0x9 - .4byte Route104_PrettyPetalFlowerShop_MapBorder - .4byte Route104_PrettyPetalFlowerShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PrettyPetalFlowerShop - - .align 2 -Route112_CableCarStation_MapBorder: @ 842DF08 - .incbin "data/maps/Route112_CableCarStation/border.bin" - - .align 2 -Route112_CableCarStation_MapBlockdata: @ 842DF10 - .incbin "data/maps/Route112_CableCarStation/map.bin" - - .align 2 -MtChimney_CableCarStation_MapAttributes: @ 842E048 -Route112_CableCarStation_MapAttributes: @ 842E048 - .4byte 0xd - .4byte 0xc - .4byte Route112_CableCarStation_MapBorder - .4byte Route112_CableCarStation_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -Route114_FossilManiacsHouse_MapBorder: @ 842E060 - .incbin "data/maps/Route114_FossilManiacsHouse/border.bin" - - .align 2 -Route114_FossilManiacsHouse_MapBlockdata: @ 842E068 - .incbin "data/maps/Route114_FossilManiacsHouse/map.bin" - - .align 2 -Route114_FossilManiacsHouse_MapAttributes: @ 842E108 - .4byte 0xa - .4byte 0x8 - .4byte Route114_FossilManiacsHouse_MapBorder - .4byte Route114_FossilManiacsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route114_FossilManiacsTunnel_MapBorder: @ 842E120 - .incbin "data/maps/Route114_FossilManiacsTunnel/border.bin" - - .align 2 -Route114_FossilManiacsTunnel_MapBlockdata: @ 842E128 - .incbin "data/maps/Route114_FossilManiacsTunnel/map.bin" - - .align 2 -Route114_FossilManiacsTunnel_MapAttributes: @ 842E3CC - .4byte 0xd - .4byte 0x1a - .4byte Route114_FossilManiacsTunnel_MapBorder - .4byte Route114_FossilManiacsTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - - .align 2 -Route114_LanettesHouse_MapBorder: @ 842E3E4 - .incbin "data/maps/Route114_LanettesHouse/border.bin" - - .align 2 -Route114_LanettesHouse_MapBlockdata: @ 842E3EC - .incbin "data/maps/Route114_LanettesHouse/map.bin" - - .align 2 -Route114_LanettesHouse_MapAttributes: @ 842E49C - .4byte 0xb - .4byte 0x8 - .4byte Route114_LanettesHouse_MapBorder - .4byte Route114_LanettesHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -Route116_TunnelersRestHouse_MapBorder: @ 842E4B4 - .incbin "data/maps/Route116_TunnelersRestHouse/border.bin" - - .align 2 -Route116_TunnelersRestHouse_MapBlockdata: @ 842E4BC - .incbin "data/maps/Route116_TunnelersRestHouse/map.bin" - - .align 2 -Route116_TunnelersRestHouse_MapAttributes: @ 842E570 - .4byte 0xa - .4byte 0x9 - .4byte Route116_TunnelersRestHouse_MapBorder - .4byte Route116_TunnelersRestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route117_PokemonDayCare_MapBorder: @ 842E588 - .incbin "data/maps/Route117_PokemonDayCare/border.bin" - - .align 2 -Route117_PokemonDayCare_MapBlockdata: @ 842E590 - .incbin "data/maps/Route117_PokemonDayCare/map.bin" - - .align 2 -Route117_PokemonDayCare_MapAttributes: @ 842E668 - .4byte 0xc - .4byte 0x9 - .4byte Route117_PokemonDayCare_MapBorder - .4byte Route117_PokemonDayCare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonDayCare - - .align 2 -Route121_SafariZoneEntrance_MapBorder: @ 842E680 - .incbin "data/maps/Route121_SafariZoneEntrance/border.bin" - - .align 2 -Route121_SafariZoneEntrance_MapBlockdata: @ 842E688 - .incbin "data/maps/Route121_SafariZoneEntrance/map.bin" - - .align 2 -Route121_SafariZoneEntrance_MapAttributes: @ 842E880 - .4byte 0x12 - .4byte 0xe - .4byte Route121_SafariZoneEntrance_MapBorder - .4byte Route121_SafariZoneEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -MeteorFalls_1F_1R_MapBorder: @ 842E898 - .incbin "data/maps/MeteorFalls_1F_1R/border.bin" - - .align 2 -MeteorFalls_1F_1R_MapBlockdata: @ 842E8A0 - .incbin "data/maps/MeteorFalls_1F_1R/map.bin" - - .align 2 -MeteorFalls_1F_1R_MapAttributes: @ 842F278 - .4byte 0x1e - .4byte 0x2a - .4byte MeteorFalls_1F_1R_MapBorder - .4byte MeteorFalls_1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -MeteorFalls_1F_2R_MapBorder: @ 842F290 - .incbin "data/maps/MeteorFalls_1F_2R/border.bin" - - .align 2 -MeteorFalls_1F_2R_MapBlockdata: @ 842F298 - .incbin "data/maps/MeteorFalls_1F_2R/map.bin" - - .align 2 -MeteorFalls_1F_2R_MapAttributes: @ 842FA18 - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_1F_2R_MapBorder - .4byte MeteorFalls_1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -MeteorFalls_B1F_1R_MapBorder: @ 842FA30 - .incbin "data/maps/MeteorFalls_B1F_1R/border.bin" - - .align 2 -MeteorFalls_B1F_1R_MapBlockdata: @ 842FA38 - .incbin "data/maps/MeteorFalls_B1F_1R/map.bin" - - .align 2 -MeteorFalls_B1F_1R_MapAttributes: @ 84302D4 - .4byte 0x1d - .4byte 0x26 - .4byte MeteorFalls_B1F_1R_MapBorder - .4byte MeteorFalls_B1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -MeteorFalls_B1F_2R_MapBorder: @ 84302EC - .incbin "data/maps/MeteorFalls_B1F_2R/border.bin" - - .align 2 -MeteorFalls_B1F_2R_MapBlockdata: @ 84302F4 - .incbin "data/maps/MeteorFalls_B1F_2R/map.bin" - - .align 2 -MeteorFalls_B1F_2R_MapAttributes: @ 8430480 - .4byte 0xb - .4byte 0x12 - .4byte MeteorFalls_B1F_2R_MapBorder - .4byte MeteorFalls_B1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -RusturfTunnel_MapBorder: @ 8430498 - .incbin "data/maps/RusturfTunnel/border.bin" - - .align 2 -RusturfTunnel_MapBlockdata: @ 84304A0 - .incbin "data/maps/RusturfTunnel/map.bin" - - .align 2 -RusturfTunnel_MapAttributes: @ 8430B60 - .4byte 0x24 - .4byte 0x18 - .4byte RusturfTunnel_MapBorder - .4byte RusturfTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_RusturfTunnel - - .align 2 -Underwater_SootopolisCity_MapBorder: @ 8430B78 - .incbin "data/maps/Underwater_SootopolisCity/border.bin" - - .align 2 -Underwater_SootopolisCity_MapBlockdata: @ 8430B80 - .incbin "data/maps/Underwater_SootopolisCity/map.bin" - - .align 2 -Underwater_SootopolisCity_MapAttributes: @ 8430D10 - .4byte 0x14 - .4byte 0xa - .4byte Underwater_SootopolisCity_MapBorder - .4byte Underwater_SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -DesertRuins_MapBorder: @ 8430D28 - .incbin "data/maps/DesertRuins/border.bin" - - .align 2 -DesertRuins_MapBlockdata: @ 8430D30 - .incbin "data/maps/DesertRuins/map.bin" - - .align 2 -DesertRuins_MapAttributes: @ 8431194 - .4byte 0x11 - .4byte 0x21 - .4byte DesertRuins_MapBorder - .4byte DesertRuins_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -GraniteCave_1F_MapBorder: @ 84311AC - .incbin "data/maps/GraniteCave_1F/border.bin" - - .align 2 -GraniteCave_1F_MapBlockdata: @ 84311B4 - .incbin "data/maps/GraniteCave_1F/map.bin" - - .align 2 -GraniteCave_1F_MapAttributes: @ 84316A0 - .4byte 0x2a - .4byte 0xf - .4byte GraniteCave_1F_MapBorder - .4byte GraniteCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -GraniteCave_B1F_MapBorder: @ 84316B8 - .incbin "data/maps/GraniteCave_B1F/border.bin" - - .align 2 -GraniteCave_B1F_MapBlockdata: @ 84316C0 - .incbin "data/maps/GraniteCave_B1F/map.bin" - - .align 2 -GraniteCave_B1F_MapAttributes: @ 8431D40 - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B1F_MapBorder - .4byte GraniteCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -GraniteCave_B2F_MapBorder: @ 8431D58 - .incbin "data/maps/GraniteCave_B2F/border.bin" - - .align 2 -GraniteCave_B2F_MapBlockdata: @ 8431D60 - .incbin "data/maps/GraniteCave_B2F/map.bin" - - .align 2 -GraniteCave_B2F_MapAttributes: @ 84323E0 - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B2F_MapBorder - .4byte GraniteCave_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -PetalburgWoods_MapBorder: @ 84323F8 - .incbin "data/maps/PetalburgWoods/border.bin" - - .align 2 -PetalburgWoods_MapBlockdata: @ 8432400 - .incbin "data/maps/PetalburgWoods/map.bin" - - .align 2 -PetalburgWoods_MapAttributes: @ 8433480 - .4byte 0x30 - .4byte 0x2c - .4byte PetalburgWoods_MapBorder - .4byte PetalburgWoods_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -MtChimney_MapBorder: @ 8433498 - .incbin "data/maps/MtChimney/border.bin" - - .align 2 -MtChimney_MapBlockdata: @ 84334A0 - .incbin "data/maps/MtChimney/map.bin" - - .align 2 -MtChimney_MapAttributes: @ 8434350 - .4byte 0x28 - .4byte 0x2f - .4byte MtChimney_MapBorder - .4byte MtChimney_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MtPyre_1F_MapBorder: @ 8434368 - .incbin "data/maps/MtPyre_1F/border.bin" - - .align 2 -MtPyre_1F_MapBlockdata: @ 8434370 - .incbin "data/maps/MtPyre_1F/map.bin" - - .align 2 -MtPyre_1F_MapAttributes: @ 84346B4 - .4byte 0x16 - .4byte 0x13 - .4byte MtPyre_1F_MapBorder - .4byte MtPyre_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_2F_MapBorder: @ 84346CC - .incbin "data/maps/MtPyre_2F/border.bin" - - .align 2 -MtPyre_2F_MapBlockdata: @ 84346D4 - .incbin "data/maps/MtPyre_2F/map.bin" - - .align 2 -MtPyre_2F_MapAttributes: @ 8434828 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_2F_MapBorder - .4byte MtPyre_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_3F_MapBorder: @ 8434840 - .incbin "data/maps/MtPyre_3F/border.bin" - - .align 2 -MtPyre_3F_MapBlockdata: @ 8434848 - .incbin "data/maps/MtPyre_3F/map.bin" - - .align 2 -MtPyre_3F_MapAttributes: @ 843499C - .4byte 0xd - .4byte 0xd - .4byte MtPyre_3F_MapBorder - .4byte MtPyre_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_4F_MapBorder: @ 84349B4 - .incbin "data/maps/MtPyre_4F/border.bin" - - .align 2 -MtPyre_4F_MapBlockdata: @ 84349BC - .incbin "data/maps/MtPyre_4F/map.bin" - - .align 2 -MtPyre_4F_MapAttributes: @ 8434B10 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_4F_MapBorder - .4byte MtPyre_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_5F_MapBorder: @ 8434B28 - .incbin "data/maps/MtPyre_5F/border.bin" - - .align 2 -MtPyre_5F_MapBlockdata: @ 8434B30 - .incbin "data/maps/MtPyre_5F/map.bin" - - .align 2 -MtPyre_5F_MapAttributes: @ 8434C84 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_5F_MapBorder - .4byte MtPyre_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_6F_MapBorder: @ 8434C9C - .incbin "data/maps/MtPyre_6F/border.bin" - - .align 2 -MtPyre_6F_MapBlockdata: @ 8434CA4 - .incbin "data/maps/MtPyre_6F/map.bin" - - .align 2 -MtPyre_6F_MapAttributes: @ 8434DF8 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_6F_MapBorder - .4byte MtPyre_6F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_1F_MapBorder: @ 8434E10 - .incbin "data/maps/AquaHideout_1F/border.bin" - - .align 2 -AquaHideout_1F_MapBlockdata: @ 8434E18 - .incbin "data/maps/AquaHideout_1F/map.bin" - - .align 2 -AquaHideout_1F_MapAttributes: @ 84354A8 - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_1F_MapBorder - .4byte AquaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_B1F_MapBorder: @ 84354C0 - .incbin "data/maps/AquaHideout_B1F/border.bin" - - .align 2 -AquaHideout_B1F_MapBlockdata: @ 84354C8 - .incbin "data/maps/AquaHideout_B1F/map.bin" - - .align 2 -AquaHideout_B1F_MapAttributes: @ 8435E58 - .4byte 0x33 - .4byte 0x18 - .4byte AquaHideout_B1F_MapBorder - .4byte AquaHideout_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_B2F_MapBorder: @ 8435E70 - .incbin "data/maps/AquaHideout_B2F/border.bin" - - .align 2 -AquaHideout_B2F_MapBlockdata: @ 8435E78 - .incbin "data/maps/AquaHideout_B2F/map.bin" - - .align 2 -AquaHideout_B2F_MapAttributes: @ 84364D8 - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_B2F_MapBorder - .4byte AquaHideout_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -Underwater_SeafloorCavern_MapBorder: @ 84364F0 - .incbin "data/maps/Underwater_SeafloorCavern/border.bin" - - .align 2 -Underwater_SeafloorCavern_MapBlockdata: @ 84364F8 - .incbin "data/maps/Underwater_SeafloorCavern/map.bin" - - .align 2 -Underwater_SeafloorCavern_MapAttributes: @ 84365F4 - .4byte 0xe - .4byte 0x9 - .4byte Underwater_SeafloorCavern_MapBorder - .4byte Underwater_SeafloorCavern_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -SeafloorCavern_Entrance_MapBorder: @ 843660C - .incbin "data/maps/SeafloorCavern_Entrance/border.bin" - - .align 2 -SeafloorCavern_Entrance_MapBlockdata: @ 8436614 - .incbin "data/maps/SeafloorCavern_Entrance/map.bin" - - .align 2 -SeafloorCavern_Entrance_MapAttributes: @ 8436934 - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Entrance_MapBorder - .4byte SeafloorCavern_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room1_MapBorder: @ 843694C - .incbin "data/maps/SeafloorCavern_Room1/border.bin" - - .align 2 -SeafloorCavern_Room1_MapBlockdata: @ 8436954 - .incbin "data/maps/SeafloorCavern_Room1/map.bin" - - .align 2 -SeafloorCavern_Room1_MapAttributes: @ 8436C9C - .4byte 0x14 - .4byte 0x15 - .4byte SeafloorCavern_Room1_MapBorder - .4byte SeafloorCavern_Room1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room2_MapBorder: @ 8436CB4 - .incbin "data/maps/SeafloorCavern_Room2/border.bin" - - .align 2 -SeafloorCavern_Room2_MapBlockdata: @ 8436CBC - .incbin "data/maps/SeafloorCavern_Room2/map.bin" - - .align 2 -SeafloorCavern_Room2_MapAttributes: @ 8436E6C - .4byte 0x12 - .4byte 0xc - .4byte SeafloorCavern_Room2_MapBorder - .4byte SeafloorCavern_Room2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room3_MapBorder: @ 8436E84 - .incbin "data/maps/SeafloorCavern_Room3/border.bin" - - .align 2 -SeafloorCavern_Room3_MapBlockdata: @ 8436E8C - .incbin "data/maps/SeafloorCavern_Room3/map.bin" - - .align 2 -SeafloorCavern_Room3_MapAttributes: @ 84370AC - .4byte 0x10 - .4byte 0x11 - .4byte SeafloorCavern_Room3_MapBorder - .4byte SeafloorCavern_Room3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room4_MapBorder: @ 84370C4 - .incbin "data/maps/SeafloorCavern_Room4/border.bin" - - .align 2 -SeafloorCavern_Room4_MapBlockdata: @ 84370CC - .incbin "data/maps/SeafloorCavern_Room4/map.bin" - - .align 2 -SeafloorCavern_Room4_MapAttributes: @ 8437378 - .4byte 0x12 - .4byte 0x13 - .4byte SeafloorCavern_Room4_MapBorder - .4byte SeafloorCavern_Room4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room5_MapBorder: @ 8437390 - .incbin "data/maps/SeafloorCavern_Room5/border.bin" - - .align 2 -SeafloorCavern_Room5_MapBlockdata: @ 8437398 - .incbin "data/maps/SeafloorCavern_Room5/map.bin" - - .align 2 -SeafloorCavern_Room5_MapAttributes: @ 84376B8 - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Room5_MapBorder - .4byte SeafloorCavern_Room5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room6_MapBorder: @ 84376D0 - .incbin "data/maps/SeafloorCavern_Room6/border.bin" - - .align 2 -SeafloorCavern_Room6_MapBlockdata: @ 84376D8 - .incbin "data/maps/SeafloorCavern_Room6/map.bin" - - .align 2 -SeafloorCavern_Room6_MapAttributes: @ 8437B28 - .4byte 0x18 - .4byte 0x17 - .4byte SeafloorCavern_Room6_MapBorder - .4byte SeafloorCavern_Room6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SeafloorCavern_Room7_MapBorder: @ 8437B40 - .incbin "data/maps/SeafloorCavern_Room7/border.bin" - - .align 2 -SeafloorCavern_Room7_MapBlockdata: @ 8437B48 - .incbin "data/maps/SeafloorCavern_Room7/map.bin" - - .align 2 -SeafloorCavern_Room7_MapAttributes: @ 8437FC8 - .4byte 0x17 - .4byte 0x19 - .4byte SeafloorCavern_Room7_MapBorder - .4byte SeafloorCavern_Room7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SeafloorCavern_Room8_MapBorder: @ 8437FE0 - .incbin "data/maps/SeafloorCavern_Room8/border.bin" - - .align 2 -SeafloorCavern_Room8_MapBlockdata: @ 8437FE8 - .incbin "data/maps/SeafloorCavern_Room8/map.bin" - - .align 2 -SeafloorCavern_Room8_MapAttributes: @ 843811C - .4byte 0xb - .4byte 0xe - .4byte SeafloorCavern_Room8_MapBorder - .4byte SeafloorCavern_Room8_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SeafloorCavern_Room9_MapBorder: @ 8438134 - .incbin "data/maps/SeafloorCavern_Room9/border.bin" - - .align 2 -SeafloorCavern_Room9_MapBlockdata: @ 843813C - .incbin "data/maps/SeafloorCavern_Room9/map.bin" - - .align 2 -SeafloorCavern_Room9_MapAttributes: @ 8438AF0 - .4byte 0x1b - .4byte 0x2e - .4byte SeafloorCavern_Room9_MapBorder - .4byte SeafloorCavern_Room9_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_Entrance_MapBorder: @ 8438B08 - .incbin "data/maps/CaveOfOrigin_Entrance/border.bin" - - .align 2 -CaveOfOrigin_Entrance_MapBlockdata: @ 8438B10 - .incbin "data/maps/CaveOfOrigin_Entrance/map.bin" - - .align 2 -CaveOfOrigin_Entrance_MapAttributes: @ 8438EEC - .4byte 0x13 - .4byte 0x1a - .4byte CaveOfOrigin_Entrance_MapBorder - .4byte CaveOfOrigin_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_1F_MapBorder: @ 8438F04 - .incbin "data/maps/CaveOfOrigin_1F/border.bin" - - .align 2 -CaveOfOrigin_1F_MapBlockdata: @ 8438F0C - .incbin "data/maps/CaveOfOrigin_1F/map.bin" - - .align 2 -CaveOfOrigin_1F_MapAttributes: @ 8439330 - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_1F_MapBorder - .4byte CaveOfOrigin_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_MapBorder: @ 8439348 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata: @ 8439350 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_MapAttributes: @ 8439774 - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_MapBorder: @ 843978C - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata: @ 8439794 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes: @ 8439B08 - .4byte 0x15 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_MapBorder: @ 8439B20 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata: @ 8439B28 - .incbin "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes: @ 8439E48 - .4byte 0x13 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -CaveOfOrigin_B1F_MapBorder: @ 8439E60 - .incbin "data/maps/CaveOfOrigin_B1F/border.bin" - - .align 2 -CaveOfOrigin_B1F_MapBlockdata: @ 8439E68 - .incbin "data/maps/CaveOfOrigin_B1F/map.bin" - - .align 2 -CaveOfOrigin_B1F_MapAttributes: @ 843A13C - .4byte 0x13 - .4byte 0x13 - .4byte CaveOfOrigin_B1F_MapBorder - .4byte CaveOfOrigin_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -VictoryRoad_1F_MapBorder: @ 843A154 - .incbin "data/maps/VictoryRoad_1F/border.bin" - - .align 2 -VictoryRoad_1F_MapBlockdata: @ 843A15C - .incbin "data/maps/VictoryRoad_1F/map.bin" - - .align 2 -VictoryRoad_1F_MapAttributes: @ 843B188 - .4byte 0x2e - .4byte 0x2d - .4byte VictoryRoad_1F_MapBorder - .4byte VictoryRoad_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_LowTideEntranceRoom_MapBorder: @ 843B1A0 - .incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_MapBlockdata: @ 843B1A8 - .incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_MapAttributes: @ 843BB3C - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_LowTideEntranceRoom_MapBorder - .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_LowTideInnerRoom_MapBorder: @ 843BB54 - .incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_MapBlockdata: @ 843BB5C - .incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_MapAttributes: @ 843C904 - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_LowTideInnerRoom_MapBorder - .4byte ShoalCave_LowTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_LowTideStairsRoom_MapBorder: @ 843C91C - .incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_MapBlockdata: @ 843C924 - .incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_MapAttributes: @ 843CB9C - .4byte 0x15 - .4byte 0xf - .4byte ShoalCave_LowTideStairsRoom_MapBorder - .4byte ShoalCave_LowTideStairsRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_LowTideLowerRoom_MapBorder: @ 843CBB4 - .incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_MapBlockdata: @ 843CBBC - .incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_MapAttributes: @ 843CF20 - .4byte 0x1f - .4byte 0xe - .4byte ShoalCave_LowTideLowerRoom_MapBorder - .4byte ShoalCave_LowTideLowerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_HighTideEntranceRoom_MapBorder: @ 843CF38 - .incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_MapBlockdata: @ 843CF40 - .incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_MapAttributes: @ 843D8D4 - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_HighTideEntranceRoom_MapBorder - .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ShoalCave_HighTideInnerRoom_MapBorder: @ 843D8EC - .incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_MapBlockdata: @ 843D8F4 - .incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_MapAttributes: @ 843E69C - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_HighTideInnerRoom_MapBorder - .4byte ShoalCave_HighTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E6C0: @ 843E6B4 - .incbin "data/maps/UnknownMap_0843E6C0/border.bin" - - .align 2 -UnknownMapBlockdata_0843E6C0: @ 843E6BC - .incbin "data/maps/UnknownMap_0843E6C0/map.bin" - - .align 2 -UnknownMapAttributes_0843E6C0: @ 843E6C0 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E6C0 - .4byte UnknownMapBlockdata_0843E6C0 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E6E4: @ 843E6D8 - .incbin "data/maps/UnknownMap_0843E6E4/border.bin" - - .align 2 -UnknownMapBlockdata_0843E6E4: @ 843E6E0 - .incbin "data/maps/UnknownMap_0843E6E4/map.bin" - - .align 2 -UnknownMapAttributes_0843E6E4: @ 843E6E4 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E6E4 - .4byte UnknownMapBlockdata_0843E6E4 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E708: @ 843E6FC - .incbin "data/maps/UnknownMap_0843E708/border.bin" - - .align 2 -UnknownMapBlockdata_0843E708: @ 843E704 - .incbin "data/maps/UnknownMap_0843E708/map.bin" - - .align 2 -UnknownMapAttributes_0843E708: @ 843E708 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E708 - .4byte UnknownMapBlockdata_0843E708 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E72C: @ 843E720 - .incbin "data/maps/UnknownMap_0843E72C/border.bin" - - .align 2 -UnknownMapBlockdata_0843E72C: @ 843E728 - .incbin "data/maps/UnknownMap_0843E72C/map.bin" - - .align 2 -UnknownMapAttributes_0843E72C: @ 843E72C - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E72C - .4byte UnknownMapBlockdata_0843E72C - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E750: @ 843E744 - .incbin "data/maps/UnknownMap_0843E750/border.bin" - - .align 2 -UnknownMapBlockdata_0843E750: @ 843E74C - .incbin "data/maps/UnknownMap_0843E750/map.bin" - - .align 2 -UnknownMapAttributes_0843E750: @ 843E750 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E750 - .4byte UnknownMapBlockdata_0843E750 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E774: @ 843E768 - .incbin "data/maps/UnknownMap_0843E774/border.bin" - - .align 2 -UnknownMapBlockdata_0843E774: @ 843E770 - .incbin "data/maps/UnknownMap_0843E774/map.bin" - - .align 2 -UnknownMapAttributes_0843E774: @ 843E774 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E774 - .4byte UnknownMapBlockdata_0843E774 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E798: @ 843E78C - .incbin "data/maps/UnknownMap_0843E798/border.bin" - - .align 2 -UnknownMapBlockdata_0843E798: @ 843E794 - .incbin "data/maps/UnknownMap_0843E798/map.bin" - - .align 2 -UnknownMapAttributes_0843E798: @ 843E798 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E798 - .4byte UnknownMapBlockdata_0843E798 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E7BC: @ 843E7B0 - .incbin "data/maps/UnknownMap_0843E7BC/border.bin" - - .align 2 -UnknownMapBlockdata_0843E7BC: @ 843E7B8 - .incbin "data/maps/UnknownMap_0843E7BC/map.bin" - - .align 2 -UnknownMapAttributes_0843E7BC: @ 843E7BC - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E7BC - .4byte UnknownMapBlockdata_0843E7BC - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E7E0: @ 843E7D4 - .incbin "data/maps/UnknownMap_0843E7E0/border.bin" - - .align 2 -UnknownMapBlockdata_0843E7E0: @ 843E7DC - .incbin "data/maps/UnknownMap_0843E7E0/map.bin" - - .align 2 -UnknownMapAttributes_0843E7E0: @ 843E7E0 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E7E0 - .4byte UnknownMapBlockdata_0843E7E0 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E804: @ 843E7F8 - .incbin "data/maps/UnknownMap_0843E804/border.bin" - - .align 2 -UnknownMapBlockdata_0843E804: @ 843E800 - .incbin "data/maps/UnknownMap_0843E804/map.bin" - - .align 2 -UnknownMapAttributes_0843E804: @ 843E804 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E804 - .4byte UnknownMapBlockdata_0843E804 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E828: @ 843E81C - .incbin "data/maps/UnknownMap_0843E828/border.bin" - - .align 2 -UnknownMapBlockdata_0843E828: @ 843E824 - .incbin "data/maps/UnknownMap_0843E828/map.bin" - - .align 2 -UnknownMapAttributes_0843E828: @ 843E828 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E828 - .4byte UnknownMapBlockdata_0843E828 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E84C: @ 843E840 - .incbin "data/maps/UnknownMap_0843E84C/border.bin" - - .align 2 -UnknownMapBlockdata_0843E84C: @ 843E848 - .incbin "data/maps/UnknownMap_0843E84C/map.bin" - - .align 2 -UnknownMapAttributes_0843E84C: @ 843E84C - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E84C - .4byte UnknownMapBlockdata_0843E84C - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0843E870: @ 843E864 - .incbin "data/maps/UnknownMap_0843E870/border.bin" - - .align 2 -UnknownMapBlockdata_0843E870: @ 843E86C - .incbin "data/maps/UnknownMap_0843E870/map.bin" - - .align 2 -UnknownMapAttributes_0843E870: @ 843E870 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E870 - .4byte UnknownMapBlockdata_0843E870 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_0843E894: @ 843E888 - .incbin "data/maps/UnknownMap_0843E894/border.bin" - -UnknownMapBlockdata_0843E894: @ 843E890 - .incbin "data/maps/UnknownMap_0843E894/map.bin" - - .align 2 -UnknownMapAttributes_0843E894: @ 843E894 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_0843E894 - .4byte UnknownMapBlockdata_0843E894 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -NewMauville_Entrance_MapBorder: @ 843E8AC - .incbin "data/maps/NewMauville_Entrance/border.bin" - - .align 2 -NewMauville_Entrance_MapBlockdata: @ 843E8B4 - .incbin "data/maps/NewMauville_Entrance/map.bin" - - .align 2 -NewMauville_Entrance_MapAttributes: @ 843E958 - .4byte 0x9 - .4byte 0x9 - .4byte NewMauville_Entrance_MapBorder - .4byte NewMauville_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -NewMauville_Inside_MapBorder: @ 843E970 - .incbin "data/maps/NewMauville_Inside/border.bin" - - .align 2 -NewMauville_Inside_MapBlockdata: @ 843E978 - .incbin "data/maps/NewMauville_Inside/map.bin" - - .align 2 -NewMauville_Inside_MapAttributes: @ 843F69C - .4byte 0x29 - .4byte 0x29 - .4byte NewMauville_Inside_MapBorder - .4byte NewMauville_Inside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - - .align 2 -AbandonedShip_Deck_MapBorder: @ 843F6B4 - .incbin "data/maps/AbandonedShip_Deck/border.bin" - - .align 2 -AbandonedShip_Deck_MapBlockdata: @ 843F6BC - .incbin "data/maps/AbandonedShip_Deck/map.bin" - - .align 2 -AbandonedShip_Deck_MapAttributes: @ 843FA84 - .4byte 0x17 - .4byte 0x15 - .4byte AbandonedShip_Deck_MapBorder - .4byte AbandonedShip_Deck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AbandonedShip_Corridors_1F_MapBorder: @ 843FA9C - .incbin "data/maps/AbandonedShip_Corridors_1F/border.bin" - - .align 2 -AbandonedShip_Corridors_1F_MapBlockdata: @ 843FAA4 - .incbin "data/maps/AbandonedShip_Corridors_1F/map.bin" - - .align 2 -AbandonedShip_Corridors_1F_MapAttributes: @ 843FC54 - .4byte 0x12 - .4byte 0xc - .4byte AbandonedShip_Corridors_1F_MapBorder - .4byte AbandonedShip_Corridors_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Rooms_1F_MapBorder: @ 843FC6C - .incbin "data/maps/AbandonedShip_Rooms_1F/border.bin" - - .align 2 -AbandonedShip_Rooms_1F_MapBlockdata: @ 843FC74 - .incbin "data/maps/AbandonedShip_Rooms_1F/map.bin" - - .align 2 -AbandonedShip_Rooms_1F_MapAttributes: @ 843FED8 - .4byte 0x12 - .4byte 0x11 - .4byte AbandonedShip_Rooms_1F_MapBorder - .4byte AbandonedShip_Rooms_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Corridors_B1F_MapBorder: @ 843FEF0 - .incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin" - - .align 2 -AbandonedShip_Corridors_B1F_MapBlockdata: @ 843FEF8 - .incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin" - - .align 2 -AbandonedShip_Corridors_B1F_MapAttributes: @ 843FFFC - .4byte 0xd - .4byte 0xa - .4byte AbandonedShip_Corridors_B1F_MapBorder - .4byte AbandonedShip_Corridors_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Rooms_B1F_MapBorder: @ 8440014 - .incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin" - - .align 2 -AbandonedShip_Rooms_B1F_MapBlockdata: @ 844001C - .incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms_B1F_MapAttributes: @ 84401CC - .4byte 0x1b - .4byte 0x8 - .4byte AbandonedShip_Rooms_B1F_MapBorder - .4byte AbandonedShip_Rooms_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Rooms2_B1F_MapBorder: @ 84401E4 - .incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_MapBlockdata: @ 84401EC - .incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_MapAttributes: @ 844030C - .4byte 0x12 - .4byte 0x8 - .4byte AbandonedShip_Rooms2_B1F_MapBorder - .4byte AbandonedShip_Rooms2_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Underwater1_MapBorder: @ 8440324 - .incbin "data/maps/AbandonedShip_Underwater1/border.bin" - - .align 2 -AbandonedShip_Underwater1_MapBlockdata: @ 844032C - .incbin "data/maps/AbandonedShip_Underwater1/map.bin" - - .align 2 -AbandonedShip_Underwater1_MapAttributes: @ 84403AC - .4byte 0x8 - .4byte 0x8 - .4byte AbandonedShip_Underwater1_MapBorder - .4byte AbandonedShip_Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Room_B1F_MapBorder: @ 84403C4 - .incbin "data/maps/AbandonedShip_Room_B1F/border.bin" - - .align 2 -AbandonedShip_Room_B1F_MapBlockdata: @ 84403CC - .incbin "data/maps/AbandonedShip_Room_B1F/map.bin" - - .align 2 -AbandonedShip_Room_B1F_MapAttributes: @ 844045C - .4byte 0x9 - .4byte 0x8 - .4byte AbandonedShip_Room_B1F_MapBorder - .4byte AbandonedShip_Room_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_Rooms2_1F_MapBorder: @ 8440474 - .incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin" - - .align 2 -AbandonedShip_Rooms2_1F_MapBlockdata: @ 844047C - .incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_1F_MapAttributes: @ 84405B0 - .4byte 0x9 - .4byte 0x11 - .4byte AbandonedShip_Rooms2_1F_MapBorder - .4byte AbandonedShip_Rooms2_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -AbandonedShip_CaptainsOffice_MapBorder: @ 84405C8 - .incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin" - - .align 2 -AbandonedShip_CaptainsOffice_MapBlockdata: @ 84405D0 - .incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin" - - .align 2 -AbandonedShip_CaptainsOffice_MapAttributes: @ 8440650 - .4byte 0x9 - .4byte 0x7 - .4byte AbandonedShip_CaptainsOffice_MapBorder - .4byte AbandonedShip_CaptainsOffice_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AbandonedShip_Underwater2_MapBorder: @ 8440668 - .incbin "data/maps/AbandonedShip_Underwater2/border.bin" - - .align 2 -AbandonedShip_Underwater2_MapBlockdata: @ 8440670 - .incbin "data/maps/AbandonedShip_Underwater2/map.bin" - - .align 2 -AbandonedShip_Underwater2_MapAttributes: @ 8440798 - .4byte 0x15 - .4byte 0x7 - .4byte AbandonedShip_Underwater2_MapBorder - .4byte AbandonedShip_Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -SecretBase_RedCave1_MapBorder: @ 84407B0 - .incbin "data/maps/SecretBase_RedCave1/border.bin" - - .align 2 -SecretBase_RedCave1_MapBlockdata: @ 84407B8 - .incbin "data/maps/SecretBase_RedCave1/map.bin" - - .align 2 -SecretBase_RedCave1_MapAttributes: @ 8440880 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_RedCave1_MapBorder - .4byte SecretBase_RedCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - - .align 2 -SecretBase_BrownCave1_MapBorder: @ 8440898 - .incbin "data/maps/SecretBase_BrownCave1/border.bin" - - .align 2 -SecretBase_BrownCave1_MapBlockdata: @ 84408A0 - .incbin "data/maps/SecretBase_BrownCave1/map.bin" - - .align 2 -SecretBase_BrownCave1_MapAttributes: @ 8440968 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BrownCave1_MapBorder - .4byte SecretBase_BrownCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - - .align 2 -SecretBase_BlueCave1_MapBorder: @ 8440980 - .incbin "data/maps/SecretBase_BlueCave1/border.bin" - - .align 2 -SecretBase_BlueCave1_MapBlockdata: @ 8440988 - .incbin "data/maps/SecretBase_BlueCave1/map.bin" - - .align 2 -SecretBase_BlueCave1_MapAttributes: @ 8440A50 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BlueCave1_MapBorder - .4byte SecretBase_BlueCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - - .align 2 -SecretBase_YellowCave1_MapBorder: @ 8440A68 - .incbin "data/maps/SecretBase_YellowCave1/border.bin" - - .align 2 -SecretBase_YellowCave1_MapBlockdata: @ 8440A70 - .incbin "data/maps/SecretBase_YellowCave1/map.bin" - - .align 2 -SecretBase_YellowCave1_MapAttributes: @ 8440B38 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_YellowCave1_MapBorder - .4byte SecretBase_YellowCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - - .align 2 -SecretBase_Tree1_MapBorder: @ 8440B50 - .incbin "data/maps/SecretBase_Tree1/border.bin" - - .align 2 -SecretBase_Tree1_MapBlockdata: @ 8440B58 - .incbin "data/maps/SecretBase_Tree1/map.bin" - - .align 2 -SecretBase_Tree1_MapAttributes: @ 8440C20 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Tree1_MapBorder - .4byte SecretBase_Tree1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - - .align 2 -SecretBase_Shrub1_MapBorder: @ 8440C38 - .incbin "data/maps/SecretBase_Shrub1/border.bin" - - .align 2 -SecretBase_Shrub1_MapBlockdata: @ 8440C40 - .incbin "data/maps/SecretBase_Shrub1/map.bin" - - .align 2 -SecretBase_Shrub1_MapAttributes: @ 8440D08 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Shrub1_MapBorder - .4byte SecretBase_Shrub1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - - .align 2 -SecretBase_RedCave2_MapBorder: @ 8440D20 - .incbin "data/maps/SecretBase_RedCave2/border.bin" - - .align 2 -SecretBase_RedCave2_MapBlockdata: @ 8440D28 - .incbin "data/maps/SecretBase_RedCave2/map.bin" - - .align 2 -SecretBase_RedCave2_MapAttributes: @ 8440E08 - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_RedCave2_MapBorder - .4byte SecretBase_RedCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - - .align 2 -SecretBase_BrownCave2_MapBorder: @ 8440E20 - .incbin "data/maps/SecretBase_BrownCave2/border.bin" - - .align 2 -SecretBase_BrownCave2_MapBlockdata: @ 8440E28 - .incbin "data/maps/SecretBase_BrownCave2/map.bin" - - .align 2 -SecretBase_BrownCave2_MapAttributes: @ 8440F24 - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_BrownCave2_MapBorder - .4byte SecretBase_BrownCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - - .align 2 -SecretBase_BlueCave2_MapBorder: @ 8440F3C - .incbin "data/maps/SecretBase_BlueCave2/border.bin" - - .align 2 -SecretBase_BlueCave2_MapBlockdata: @ 8440F44 - .incbin "data/maps/SecretBase_BlueCave2/map.bin" - - .align 2 -SecretBase_BlueCave2_MapAttributes: @ 8441018 - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_BlueCave2_MapBorder - .4byte SecretBase_BlueCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - - .align 2 -SecretBase_YellowCave2_MapBorder: @ 8441030 - .incbin "data/maps/SecretBase_YellowCave2/border.bin" - - .align 2 -SecretBase_YellowCave2_MapBlockdata: @ 8441038 - .incbin "data/maps/SecretBase_YellowCave2/map.bin" - - .align 2 -SecretBase_YellowCave2_MapAttributes: @ 8441134 - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_YellowCave2_MapBorder - .4byte SecretBase_YellowCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - - .align 2 -SecretBase_Tree2_MapBorder: @ 844114C - .incbin "data/maps/SecretBase_Tree2/border.bin" - - .align 2 -SecretBase_Tree2_MapBlockdata: @ 8441154 - .incbin "data/maps/SecretBase_Tree2/map.bin" - - .align 2 -SecretBase_Tree2_MapAttributes: @ 8441234 - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_Tree2_MapBorder - .4byte SecretBase_Tree2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - - .align 2 -SecretBase_Shrub2_MapBorder: @ 844124C - .incbin "data/maps/SecretBase_Shrub2/border.bin" - - .align 2 -SecretBase_Shrub2_MapBlockdata: @ 8441254 - .incbin "data/maps/SecretBase_Shrub2/map.bin" - - .align 2 -SecretBase_Shrub2_MapAttributes: @ 8441328 - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_Shrub2_MapBorder - .4byte SecretBase_Shrub2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - - .align 2 -SecretBase_RedCave3_MapBorder: @ 8441340 - .incbin "data/maps/SecretBase_RedCave3/border.bin" - - .align 2 -SecretBase_RedCave3_MapBlockdata: @ 8441348 - .incbin "data/maps/SecretBase_RedCave3/map.bin" - - .align 2 -SecretBase_RedCave3_MapAttributes: @ 8441438 - .4byte 0xf - .4byte 0x8 - .4byte SecretBase_RedCave3_MapBorder - .4byte SecretBase_RedCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - - .align 2 -SecretBase_BrownCave3_MapBorder: @ 8441450 - .incbin "data/maps/SecretBase_BrownCave3/border.bin" - - .align 2 -SecretBase_BrownCave3_MapBlockdata: @ 8441458 - .incbin "data/maps/SecretBase_BrownCave3/map.bin" - - .align 2 -SecretBase_BrownCave3_MapAttributes: @ 84415A4 - .4byte 0xf - .4byte 0xb - .4byte SecretBase_BrownCave3_MapBorder - .4byte SecretBase_BrownCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - - .align 2 -SecretBase_BlueCave3_MapBorder: @ 84415BC - .incbin "data/maps/SecretBase_BlueCave3/border.bin" - - .align 2 -SecretBase_BlueCave3_MapBlockdata: @ 84415C4 - .incbin "data/maps/SecretBase_BlueCave3/map.bin" - - .align 2 -SecretBase_BlueCave3_MapAttributes: @ 8441718 - .4byte 0xa - .4byte 0x11 - .4byte SecretBase_BlueCave3_MapBorder - .4byte SecretBase_BlueCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - - .align 2 -SecretBase_YellowCave3_MapBorder: @ 8441730 - .incbin "data/maps/SecretBase_YellowCave3/border.bin" - - .align 2 -SecretBase_YellowCave3_MapBlockdata: @ 8441738 - .incbin "data/maps/SecretBase_YellowCave3/map.bin" - - .align 2 -SecretBase_YellowCave3_MapAttributes: @ 8441840 - .4byte 0xc - .4byte 0xb - .4byte SecretBase_YellowCave3_MapBorder - .4byte SecretBase_YellowCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - - .align 2 -SecretBase_Tree3_MapBorder: @ 8441858 - .incbin "data/maps/SecretBase_Tree3/border.bin" - - .align 2 -SecretBase_Tree3_MapBlockdata: @ 8441860 - .incbin "data/maps/SecretBase_Tree3/map.bin" - - .align 2 -SecretBase_Tree3_MapAttributes: @ 8441970 - .4byte 0x11 - .4byte 0x8 - .4byte SecretBase_Tree3_MapBorder - .4byte SecretBase_Tree3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - - .align 2 -SecretBase_Shrub3_MapBorder: @ 8441988 - .incbin "data/maps/SecretBase_Shrub3/border.bin" - - .align 2 -SecretBase_Shrub3_MapBlockdata: @ 8441990 - .incbin "data/maps/SecretBase_Shrub3/map.bin" - - .align 2 -SecretBase_Shrub3_MapAttributes: @ 8441AB0 - .4byte 0xd - .4byte 0xb - .4byte SecretBase_Shrub3_MapBorder - .4byte SecretBase_Shrub3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - - .align 2 -SecretBase_RedCave4_MapBorder: @ 8441AC8 - .incbin "data/maps/SecretBase_RedCave4/border.bin" - - .align 2 -SecretBase_RedCave4_MapBlockdata: @ 8441AD0 - .incbin "data/maps/SecretBase_RedCave4/map.bin" - - .align 2 -SecretBase_RedCave4_MapAttributes: @ 8441BE0 - .4byte 0x9 - .4byte 0xf - .4byte SecretBase_RedCave4_MapBorder - .4byte SecretBase_RedCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - - .align 2 -SecretBase_BrownCave4_MapBorder: @ 8441BF8 - .incbin "data/maps/SecretBase_BrownCave4/border.bin" - - .align 2 -SecretBase_BrownCave4_MapBlockdata: @ 8441C00 - .incbin "data/maps/SecretBase_BrownCave4/map.bin" - - .align 2 -SecretBase_BrownCave4_MapAttributes: @ 8441D50 - .4byte 0xe - .4byte 0xc - .4byte SecretBase_BrownCave4_MapBorder - .4byte SecretBase_BrownCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - - .align 2 -SecretBase_BlueCave4_MapBorder: @ 8441D68 - .incbin "data/maps/SecretBase_BlueCave4/border.bin" - - .align 2 -SecretBase_BlueCave4_MapBlockdata: @ 8441D70 - .incbin "data/maps/SecretBase_BlueCave4/map.bin" - - .align 2 -SecretBase_BlueCave4_MapAttributes: @ 8441EA4 - .4byte 0x9 - .4byte 0x11 - .4byte SecretBase_BlueCave4_MapBorder - .4byte SecretBase_BlueCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - - .align 2 -SecretBase_YellowCave4_MapBorder: @ 8441EBC - .incbin "data/maps/SecretBase_YellowCave4/border.bin" - - .align 2 -SecretBase_YellowCave4_MapBlockdata: @ 8441EC4 - .incbin "data/maps/SecretBase_YellowCave4/map.bin" - - .align 2 -SecretBase_YellowCave4_MapAttributes: @ 8442030 - .4byte 0xd - .4byte 0xe - .4byte SecretBase_YellowCave4_MapBorder - .4byte SecretBase_YellowCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - - .align 2 -SecretBase_Tree4_MapBorder: @ 8442048 - .incbin "data/maps/SecretBase_Tree4/border.bin" - - .align 2 -SecretBase_Tree4_MapBlockdata: @ 8442050 - .incbin "data/maps/SecretBase_Tree4/map.bin" - - .align 2 -SecretBase_Tree4_MapAttributes: @ 84421D8 - .4byte 0xe - .4byte 0xe - .4byte SecretBase_Tree4_MapBorder - .4byte SecretBase_Tree4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - - .align 2 -SecretBase_Shrub4_MapBorder: @ 84421F0 - .incbin "data/maps/SecretBase_Shrub4/border.bin" - - .align 2 -SecretBase_Shrub4_MapBlockdata: @ 84421F8 - .incbin "data/maps/SecretBase_Shrub4/map.bin" - - .align 2 -SecretBase_Shrub4_MapAttributes: @ 844232C - .4byte 0xe - .4byte 0xb - .4byte SecretBase_Shrub4_MapBorder - .4byte SecretBase_Shrub4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - - .align 2 -SingleBattleColosseum_MapBorder: @ 8442344 - .incbin "data/maps/SingleBattleColosseum/border.bin" - - .align 2 -SingleBattleColosseum_MapBlockdata: @ 844234C - .incbin "data/maps/SingleBattleColosseum/map.bin" - - .align 2 -SingleBattleColosseum_MapAttributes: @ 8442448 - .4byte 0xe - .4byte 0x9 - .4byte SingleBattleColosseum_MapBorder - .4byte SingleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -TradeCenter_MapBorder: @ 8442460 - .incbin "data/maps/TradeCenter/border.bin" - - .align 2 -TradeCenter_MapBlockdata: @ 8442468 - .incbin "data/maps/TradeCenter/map.bin" - - .align 2 -TradeCenter_MapAttributes: @ 8442540 - .4byte 0xc - .4byte 0x9 - .4byte TradeCenter_MapBorder - .4byte TradeCenter_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -RecordCorner_MapBorder: @ 8442558 - .incbin "data/maps/RecordCorner/border.bin" - - .align 2 -RecordCorner_MapBlockdata: @ 8442560 - .incbin "data/maps/RecordCorner/map.bin" - - .align 2 -RecordCorner_MapAttributes: @ 84426F0 - .4byte 0x14 - .4byte 0xa - .4byte RecordCorner_MapBorder - .4byte RecordCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -DoubleBattleColosseum_MapBorder: @ 8442708 - .incbin "data/maps/DoubleBattleColosseum/border.bin" - - .align 2 -DoubleBattleColosseum_MapBlockdata: @ 8442710 - .incbin "data/maps/DoubleBattleColosseum/map.bin" - - .align 2 -DoubleBattleColosseum_MapAttributes: @ 844280C - .4byte 0xe - .4byte 0x9 - .4byte DoubleBattleColosseum_MapBorder - .4byte DoubleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -LinkContestRoom1_MapBorder: @ 8442824 - .incbin "data/maps/LinkContestRoom1/border.bin" - - .align 2 -LinkContestRoom1_MapBlockdata: @ 844282C - .incbin "data/maps/LinkContestRoom1/map.bin" - - .align 2 -LinkContestRoom1_MapAttributes: @ 8442978 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom1_MapBorder - .4byte LinkContestRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_29_MapBorder: @ 8442990 - .incbin "data/maps/UnknownMap_25_29/border.bin" - - .align 2 -UnknownMap_25_29_MapBlockdata: @ 8442998 - .incbin "data/maps/UnknownMap_25_29/map.bin" - - .align 2 -UnknownMap_25_29_MapAttributes: @ 844299C - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_29_MapBorder - .4byte UnknownMap_25_29_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_30_MapBorder: @ 84429B4 - .incbin "data/maps/UnknownMap_25_30/border.bin" - - .align 2 -UnknownMap_25_30_MapBlockdata: @ 84429BC - .incbin "data/maps/UnknownMap_25_30/map.bin" - - .align 2 -UnknownMap_25_30_MapAttributes: @ 84429C0 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_30_MapBorder - .4byte UnknownMap_25_30_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_31_MapBorder: @ 84429D8 - .incbin "data/maps/UnknownMap_25_31/border.bin" - - .align 2 -UnknownMap_25_31_MapBlockdata: @ 84429E0 - .incbin "data/maps/UnknownMap_25_31/map.bin" - - .align 2 -UnknownMap_25_31_MapAttributes: @ 84429E4 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_31_MapBorder - .4byte UnknownMap_25_31_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_32_MapBorder: @ 84429FC - .incbin "data/maps/UnknownMap_25_32/border.bin" - - .align 2 -UnknownMap_25_32_MapBlockdata: @ 8442A04 - .incbin "data/maps/UnknownMap_25_32/map.bin" - - .align 2 -UnknownMap_25_32_MapAttributes: @ 8442A08 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_32_MapBorder - .4byte UnknownMap_25_32_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_33_MapBorder: @ 8442A20 - .incbin "data/maps/UnknownMap_25_33/border.bin" - - .align 2 -UnknownMap_25_33_MapBlockdata: @ 8442A28 - .incbin "data/maps/UnknownMap_25_33/map.bin" - - .align 2 -UnknownMap_25_33_MapAttributes: @ 8442A2C - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_33_MapBorder - .4byte UnknownMap_25_33_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -UnknownMap_25_34_MapBorder: @ 8442A44 - .incbin "data/maps/UnknownMap_25_34/border.bin" - - .align 2 -UnknownMap_25_34_MapBlockdata: @ 8442A4C - .incbin "data/maps/UnknownMap_25_34/map.bin" - - .align 2 -UnknownMap_25_34_MapAttributes: @ 8442A50 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_34_MapBorder - .4byte UnknownMap_25_34_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - - .align 2 -LinkContestRoom2_MapBorder: @ 8442A68 - .incbin "data/maps/LinkContestRoom2/border.bin" - - .align 2 -LinkContestRoom2_MapBlockdata: @ 8442A70 - .incbin "data/maps/LinkContestRoom2/map.bin" - - .align 2 -LinkContestRoom2_MapAttributes: @ 8442BBC - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom2_MapBorder - .4byte LinkContestRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -LinkContestRoom3_MapBorder: @ 8442BD4 - .incbin "data/maps/LinkContestRoom3/border.bin" - - .align 2 -LinkContestRoom3_MapBlockdata: @ 8442BDC - .incbin "data/maps/LinkContestRoom3/map.bin" - - .align 2 -LinkContestRoom3_MapAttributes: @ 8442D28 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom3_MapBorder - .4byte LinkContestRoom3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -LinkContestRoom4_MapBorder: @ 8442D40 - .incbin "data/maps/LinkContestRoom4/border.bin" - - .align 2 -LinkContestRoom4_MapBlockdata: @ 8442D48 - .incbin "data/maps/LinkContestRoom4/map.bin" - - .align 2 -LinkContestRoom4_MapAttributes: @ 8442E94 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom4_MapBorder - .4byte LinkContestRoom4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -LinkContestRoom5_MapBorder: @ 8442EAC - .incbin "data/maps/LinkContestRoom5/border.bin" - - .align 2 -LinkContestRoom5_MapBlockdata: @ 8442EB4 - .incbin "data/maps/LinkContestRoom5/map.bin" - - .align 2 -LinkContestRoom5_MapAttributes: @ 8443000 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom5_MapBorder - .4byte LinkContestRoom5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -LinkContestRoom6_MapBorder: @ 8443018 - .incbin "data/maps/LinkContestRoom6/border.bin" - - .align 2 -LinkContestRoom6_MapBlockdata: @ 8443020 - .incbin "data/maps/LinkContestRoom6/map.bin" - - .align 2 -LinkContestRoom6_MapAttributes: @ 844316C - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom6_MapBorder - .4byte LinkContestRoom6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - - .align 2 -InsideOfTruck_MapBorder: @ 8443184 - .incbin "data/maps/InsideOfTruck/border.bin" - - .align 2 -InsideOfTruck_MapBlockdata: @ 844318C - .incbin "data/maps/InsideOfTruck/map.bin" - - .align 2 -InsideOfTruck_MapAttributes: @ 84431C0 - .4byte 0x5 - .4byte 0x5 - .4byte InsideOfTruck_MapBorder - .4byte InsideOfTruck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideOfTruck - - .align 2 -SafariZone_Northwest_MapBorder: @ 84431D8 - .incbin "data/maps/SafariZone_Northwest/border.bin" - - .align 2 -SafariZone_Northwest_MapBlockdata: @ 84431E0 - .incbin "data/maps/SafariZone_Northwest/map.bin" - - .align 2 -SafariZone_Northwest_MapAttributes: @ 8443E60 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northwest_MapBorder - .4byte SafariZone_Northwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -SafariZone_North_MapBorder: @ 8443E78 - .incbin "data/maps/SafariZone_North/border.bin" - - .align 2 -SafariZone_North_MapBlockdata: @ 8443E80 - .incbin "data/maps/SafariZone_North/map.bin" - - .align 2 -SafariZone_North_MapAttributes: @ 8444B00 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_North_MapBorder - .4byte SafariZone_North_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -SafariZone_Southwest_MapBorder: @ 8444B18 - .incbin "data/maps/SafariZone_Southwest/border.bin" - - .align 2 -SafariZone_Southwest_MapBlockdata: @ 8444B20 - .incbin "data/maps/SafariZone_Southwest/map.bin" - - .align 2 -SafariZone_Southwest_MapAttributes: @ 84457A0 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southwest_MapBorder - .4byte SafariZone_Southwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -SafariZone_South_MapBorder: @ 84457B8 - .incbin "data/maps/SafariZone_South/border.bin" - - .align 2 -SafariZone_South_MapBlockdata: @ 84457C0 - .incbin "data/maps/SafariZone_South/map.bin" - - .align 2 -SafariZone_South_MapAttributes: @ 8446440 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_South_MapBorder - .4byte SafariZone_South_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -UnknownMapBorder_08447028: @ 8446458 - .incbin "data/maps/UnknownMap_08447028/border.bin" - - .align 2 -UnknownMapBlockdata_08447028: @ 8446460 - .incbin "data/maps/UnknownMap_08447028/map.bin" - - .align 2 -UnknownMapAttributes_08447028: @ 8447028 - .4byte 0x3A - .4byte 0x1A - .4byte UnknownMapBorder_08447028 - .4byte UnknownMapBlockdata_08447028 - .4byte gTileset_General - .4byte 0 - - .align 2 -Route109_SeashoreHouse_MapBorder: @ 8447040 - .incbin "data/maps/Route109_SeashoreHouse/border.bin" - - .align 2 -Route109_SeashoreHouse_MapBlockdata: @ 8447048 - .incbin "data/maps/Route109_SeashoreHouse/map.bin" - - .align 2 -Route109_SeashoreHouse_MapAttributes: @ 8447174 - .4byte 0xf - .4byte 0xa - .4byte Route109_SeashoreHouse_MapBorder - .4byte Route109_SeashoreHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SeashoreHouse - - .align 2 -Route110_TrickHouseEntrance_MapBorder: @ 844718C - .incbin "data/maps/Route110_TrickHouseEntrance/border.bin" - - .align 2 -Route110_TrickHouseEntrance_MapBlockdata: @ 8447194 - .incbin "data/maps/Route110_TrickHouseEntrance/map.bin" - - .align 2 -Route110_TrickHouseEntrance_MapAttributes: @ 8447254 - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEntrance_MapBorder - .4byte Route110_TrickHouseEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route110_TrickHouseEnd_MapBorder: @ 844726C - .incbin "data/maps/Route110_TrickHouseEnd/border.bin" - - .align 2 -Route110_TrickHouseEnd_MapBlockdata: @ 8447274 - .incbin "data/maps/Route110_TrickHouseEnd/map.bin" - - .align 2 -Route110_TrickHouseEnd_MapAttributes: @ 8447334 - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEnd_MapBorder - .4byte Route110_TrickHouseEnd_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route110_TrickHouseCorridor_MapBorder: @ 844734C - .incbin "data/maps/Route110_TrickHouseCorridor/border.bin" - - .align 2 -Route110_TrickHouseCorridor_MapBlockdata: @ 8447354 - .incbin "data/maps/Route110_TrickHouseCorridor/map.bin" - - .align 2 -Route110_TrickHouseCorridor_MapAttributes: @ 8447624 - .4byte 0xf - .4byte 0x18 - .4byte Route110_TrickHouseCorridor_MapBorder - .4byte Route110_TrickHouseCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route110_TrickHousePuzzle1_MapBorder: @ 844763C - .incbin "data/maps/Route110_TrickHousePuzzle1/border.bin" - - .align 2 -Route110_TrickHousePuzzle1_MapBlockdata: @ 8447644 - .incbin "data/maps/Route110_TrickHousePuzzle1/map.bin" - - .align 2 -Route110_TrickHousePuzzle1_MapAttributes: @ 84478D8 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle1_MapBorder - .4byte Route110_TrickHousePuzzle1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle2_MapBorder: @ 84478F0 - .incbin "data/maps/Route110_TrickHousePuzzle2/border.bin" - - .align 2 -Route110_TrickHousePuzzle2_MapBlockdata: @ 84478F8 - .incbin "data/maps/Route110_TrickHousePuzzle2/map.bin" - - .align 2 -Route110_TrickHousePuzzle2_MapAttributes: @ 8447B8C - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle2_MapBorder - .4byte Route110_TrickHousePuzzle2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle3_MapBorder: @ 8447BA4 - .incbin "data/maps/Route110_TrickHousePuzzle3/border.bin" - - .align 2 -Route110_TrickHousePuzzle3_MapBlockdata: @ 8447BAC - .incbin "data/maps/Route110_TrickHousePuzzle3/map.bin" - - .align 2 -Route110_TrickHousePuzzle3_MapAttributes: @ 8447E40 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle3_MapBorder - .4byte Route110_TrickHousePuzzle3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle4_MapBorder: @ 8447E58 - .incbin "data/maps/Route110_TrickHousePuzzle4/border.bin" - - .align 2 -Route110_TrickHousePuzzle4_MapBlockdata: @ 8447E60 - .incbin "data/maps/Route110_TrickHousePuzzle4/map.bin" - - .align 2 -Route110_TrickHousePuzzle4_MapAttributes: @ 84480F4 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle4_MapBorder - .4byte Route110_TrickHousePuzzle4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle5_MapBorder: @ 844810C - .incbin "data/maps/Route110_TrickHousePuzzle5/border.bin" - - .align 2 -Route110_TrickHousePuzzle5_MapBlockdata: @ 8448114 - .incbin "data/maps/Route110_TrickHousePuzzle5/map.bin" - - .align 2 -Route110_TrickHousePuzzle5_MapAttributes: @ 84483A8 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle5_MapBorder - .4byte Route110_TrickHousePuzzle5_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle6_MapBorder: @ 84483C0 - .incbin "data/maps/Route110_TrickHousePuzzle6/border.bin" - - .align 2 -Route110_TrickHousePuzzle6_MapBlockdata: @ 84483C8 - .incbin "data/maps/Route110_TrickHousePuzzle6/map.bin" - - .align 2 -Route110_TrickHousePuzzle6_MapAttributes: @ 844865C - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle6_MapBorder - .4byte Route110_TrickHousePuzzle6_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle7_MapBorder: @ 8448674 - .incbin "data/maps/Route110_TrickHousePuzzle7/border.bin" - - .align 2 -Route110_TrickHousePuzzle7_MapBlockdata: @ 844867C - .incbin "data/maps/Route110_TrickHousePuzzle7/map.bin" - - .align 2 -Route110_TrickHousePuzzle7_MapAttributes: @ 8448910 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle7_MapBorder - .4byte Route110_TrickHousePuzzle7_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -Route110_TrickHousePuzzle8_MapBorder: @ 8448928 - .incbin "data/maps/Route110_TrickHousePuzzle8/border.bin" - - .align 2 -Route110_TrickHousePuzzle8_MapBlockdata: @ 8448930 - .incbin "data/maps/Route110_TrickHousePuzzle8/map.bin" - - .align 2 -Route110_TrickHousePuzzle8_MapAttributes: @ 8448BC4 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle8_MapBorder - .4byte Route110_TrickHousePuzzle8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - - .align 2 -FortreeCity_DecorationShop_MapBorder: @ 8448BDC - .incbin "data/maps/FortreeCity_DecorationShop/border.bin" - - .align 2 -FortreeCity_DecorationShop_MapBlockdata: @ 8448BE4 - .incbin "data/maps/FortreeCity_DecorationShop/map.bin" - - .align 2 -FortreeCity_DecorationShop_MapAttributes: @ 8448C44 - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_DecorationShop_MapBorder - .4byte FortreeCity_DecorationShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route110_SeasideCyclingRoadEntrance1_MapBorder: @ 8448C5C - .incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/border.bin" - - .align 2 -Route110_SeasideCyclingRoadEntrance1_MapBlockdata: @ 8448C64 - .incbin "data/maps/Route110_SeasideCyclingRoadEntrance1/map.bin" - - .align 2 -Route110_SeasideCyclingRoadEntrance1_MapAttributes: @ 8448D18 -Route110_SeasideCyclingRoadEntrance2_MapAttributes: @ 8448D18 - .4byte 0xf - .4byte 0x6 - .4byte Route110_SeasideCyclingRoadEntrance1_MapBorder - .4byte Route110_SeasideCyclingRoadEntrance1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_1F_MapBorder: @ 8448D30 - .incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_MapBlockdata: @ 8448D38 - .incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_MapAttributes: @ 8448E58 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_1F_MapBorder - .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_2F_MapBorder: @ 8448E70 - .incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_MapBlockdata: @ 8448E78 - .incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_MapAttributes: @ 8448F98 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_2F_MapBorder - .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_3F_MapBorder: @ 8448FB0 - .incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_MapBlockdata: @ 8448FB8 - .incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_MapAttributes: @ 84490D8 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_3F_MapBorder - .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_4F_MapBorder: @ 84490F0 - .incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_MapBlockdata: @ 84490F8 - .incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_MapAttributes: @ 8449218 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_4F_MapBorder - .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStore_5F_MapBorder: @ 8449230 - .incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_MapBlockdata: @ 8449238 - .incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_MapAttributes: @ 8449358 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_5F_MapBorder - .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -LilycoveCity_DepartmentStoreRooftop_MapBorder: @ 8449370 - .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_MapBlockdata: @ 8449378 - .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_MapAttributes: @ 8449528 - .4byte 0x12 - .4byte 0xc - .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder - .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - - .align 2 -Route130_MapBorder: @ 8449540 - .incbin "data/maps/Route130/border.bin" - - .align 2 -Route130_MapBlockdata: @ 8449548 - .incbin "data/maps/Route130/map.bin" - - .align 2 -Route130_MapAttributes: @ 844AE48 - .4byte 0x50 - .4byte 0x28 - .4byte Route130_MapBorder - .4byte Route130_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -BattleFrontier_BattleTowerLobby_MapBorder: @ 844AE60 - .incbin "data/maps/BattleFrontier_BattleTowerLobby/border.bin" - - .align 2 -BattleFrontier_BattleTowerLobby_MapBlockdata: @ 844AE68 - .incbin "data/maps/BattleFrontier_BattleTowerLobby/map.bin" - - .align 2 -BattleFrontier_BattleTowerLobby_MapAttributes: @ 844B05C - .4byte 0x19 - .4byte 0xa - .4byte BattleFrontier_BattleTowerLobby_MapBorder - .4byte BattleFrontier_BattleTowerLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_OutsideWest_MapBorder: @ 844B074 - .incbin "data/maps/BattleFrontier_OutsideWest/border.bin" - - .align 2 -BattleFrontier_OutsideWest_MapBlockdata: @ 844B07C - .incbin "data/maps/BattleFrontier_OutsideWest/map.bin" - - .align 2 -BattleFrontier_OutsideWest_MapAttributes: @ 844CFFC - .4byte 0x38 - .4byte 0x48 - .4byte BattleFrontier_OutsideWest_MapBorder - .4byte BattleFrontier_OutsideWest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontierOutsideWest - - .align 2 -BattleFrontier_BattleTowerElevator_MapBorder: @ 844D014 - .incbin "data/maps/BattleFrontier_BattleTowerElevator/border.bin" - - .align 2 -BattleFrontier_BattleTowerElevator_MapBlockdata: @ 844D01C - .incbin "data/maps/BattleFrontier_BattleTowerElevator/map.bin" - - .align 2 -BattleFrontier_BattleTowerElevator_MapAttributes: @ 844D064 -TrainerHill_Elevator_MapAttributes: @ 844D064 - .4byte 0x5 - .4byte 0x7 - .4byte BattleFrontier_BattleTowerElevator_MapBorder - .4byte BattleFrontier_BattleTowerElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_BattleTowerCorridor_MapBorder: @ 844D07C - .incbin "data/maps/BattleFrontier_BattleTowerCorridor/border.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor_MapBlockdata: @ 844D084 - .incbin "data/maps/BattleFrontier_BattleTowerCorridor/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor_MapAttributes: @ 844D130 - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor_MapBorder - .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_BattleTowerBattleRoom_MapBorder: @ 844D148 - .incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleTowerBattleRoom_MapBlockdata: @ 844D150 - .incbin "data/maps/BattleFrontier_BattleTowerBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerBattleRoom2_MapAttributes: @ 844D204 -BattleFrontier_BattleTowerBattleRoom_MapAttributes: @ 844D204 - .4byte 0xa - .4byte 0x9 - .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder - .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -RustboroCity_DevonCorp_3F_MapBorder: @ 844D21C - .incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin" - - .align 2 -RustboroCity_DevonCorp_3F_MapBlockdata: @ 844D224 - .incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin" - - .align 2 -RustboroCity_DevonCorp_3F_MapAttributes: @ 844D37C - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_3F_MapBorder - .4byte RustboroCity_DevonCorp_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Facility - - .align 2 -EverGrandeCity_PokemonLeague_1F_MapBorder: @ 844D394 - .incbin "data/maps/EverGrandeCity_PokemonLeague_1F/border.bin" - - .align 2 -EverGrandeCity_PokemonLeague_1F_MapBlockdata: @ 844D39C - .incbin "data/maps/EverGrandeCity_PokemonLeague_1F/map.bin" - - .align 2 -EverGrandeCity_PokemonLeague_1F_MapAttributes: @ 844D564 - .4byte 0x13 - .4byte 0xc - .4byte EverGrandeCity_PokemonLeague_1F_MapBorder - .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - - .align 2 -Route119_WeatherInstitute_1F_MapBorder: @ 844D57C - .incbin "data/maps/Route119_WeatherInstitute_1F/border.bin" - - .align 2 -Route119_WeatherInstitute_1F_MapBlockdata: @ 844D584 - .incbin "data/maps/Route119_WeatherInstitute_1F/map.bin" - - .align 2 -Route119_WeatherInstitute_1F_MapAttributes: @ 844D78C - .4byte 0x14 - .4byte 0xd - .4byte Route119_WeatherInstitute_1F_MapBorder - .4byte Route119_WeatherInstitute_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -Route119_WeatherInstitute_2F_MapBorder: @ 844D7A4 - .incbin "data/maps/Route119_WeatherInstitute_2F/border.bin" - - .align 2 -Route119_WeatherInstitute_2F_MapBlockdata: @ 844D7AC - .incbin "data/maps/Route119_WeatherInstitute_2F/map.bin" - - .align 2 -Route119_WeatherInstitute_2F_MapAttributes: @ 844D964 - .4byte 0x14 - .4byte 0xb - .4byte Route119_WeatherInstitute_2F_MapBorder - .4byte Route119_WeatherInstitute_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -LilycoveCity_DepartmentStoreElevator_MapBorder: @ 844D97C - .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_MapBlockdata: @ 844D984 - .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_MapAttributes: @ 844D9C0 - .4byte 0x5 - .4byte 0x6 - .4byte LilycoveCity_DepartmentStoreElevator_MapBorder - .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -Underwater1_MapBorder: @ 844D9D8 - .incbin "data/maps/Underwater1/border.bin" - - .align 2 -Underwater1_MapBlockdata: @ 844D9E0 - .incbin "data/maps/Underwater1/map.bin" - - .align 2 -Underwater1_MapAttributes: @ 8450BE0 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater1_MapBorder - .4byte Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -MossdeepCity_SpaceCenter_1F_MapBorder: @ 8450BF8 - .incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_MapBlockdata: @ 8450C00 - .incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_MapAttributes: @ 8450D40 - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_1F_MapBorder - .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MossdeepCity_SpaceCenter_2F_MapBorder: @ 8450D58 - .incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_MapBlockdata: @ 8450D60 - .incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_MapAttributes: @ 8450EA0 - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_2F_MapBorder - .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -SSTidalCorridor_MapBorder: @ 8450EB8 - .incbin "data/maps/SSTidalCorridor/border.bin" - - .align 2 -SSTidalCorridor_MapBlockdata: @ 8450EC0 - .incbin "data/maps/SSTidalCorridor/map.bin" - - .align 2 -SSTidalCorridor_MapAttributes: @ 8451094 - .4byte 0x12 - .4byte 0xd - .4byte SSTidalCorridor_MapBorder - .4byte SSTidalCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -SSTidalLowerDeck_MapBorder: @ 84510AC - .incbin "data/maps/SSTidalLowerDeck/border.bin" - - .align 2 -SSTidalLowerDeck_MapBlockdata: @ 84510B4 - .incbin "data/maps/SSTidalLowerDeck/map.bin" - - .align 2 -SSTidalLowerDeck_MapAttributes: @ 8451270 - .4byte 0x11 - .4byte 0xd - .4byte SSTidalLowerDeck_MapBorder - .4byte SSTidalLowerDeck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -SSTidalRooms_MapBorder: @ 8451288 - .incbin "data/maps/SSTidalRooms/border.bin" - - .align 2 -SSTidalRooms_MapBlockdata: @ 8451290 - .incbin "data/maps/SSTidalRooms/map.bin" - - .align 2 -SSTidalRooms_MapAttributes: @ 84517A0 - .4byte 0x24 - .4byte 0x12 - .4byte SSTidalRooms_MapBorder - .4byte SSTidalRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -IslandCave_MapBorder: @ 84517B8 - .incbin "data/maps/IslandCave/border.bin" - - .align 2 -IslandCave_MapBlockdata: @ 84517C0 - .incbin "data/maps/IslandCave/map.bin" - - .align 2 -IslandCave_MapAttributes: @ 8451C24 - .4byte 0x11 - .4byte 0x21 - .4byte IslandCave_MapBorder - .4byte IslandCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -AncientTomb_MapBorder: @ 8451C3C - .incbin "data/maps/AncientTomb/border.bin" - - .align 2 -AncientTomb_MapBlockdata: @ 8451C44 - .incbin "data/maps/AncientTomb/map.bin" - - .align 2 -AncientTomb_MapAttributes: @ 84520A8 - .4byte 0x11 - .4byte 0x21 - .4byte AncientTomb_MapBorder - .4byte AncientTomb_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -Underwater_Route134_MapBorder: @ 84520C0 - .incbin "data/maps/Underwater_Route134/border.bin" - - .align 2 -Underwater_Route134_MapBlockdata: @ 84520C8 - .incbin "data/maps/Underwater_Route134/map.bin" - - .align 2 -Underwater_Route134_MapAttributes: @ 8452230 - .4byte 0x12 - .4byte 0xa - .4byte Underwater_Route134_MapBorder - .4byte Underwater_Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater_SealedChamber_MapBorder: @ 8452248 - .incbin "data/maps/Underwater_SealedChamber/border.bin" - - .align 2 -Underwater_SealedChamber_MapBlockdata: @ 8452250 - .incbin "data/maps/Underwater_SealedChamber/map.bin" - - .align 2 -Underwater_SealedChamber_MapAttributes: @ 8452A90 - .4byte 0x16 - .4byte 0x30 - .4byte Underwater_SealedChamber_MapBorder - .4byte Underwater_SealedChamber_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -SealedChamber_OuterRoom_MapBorder: @ 8452AA8 - .incbin "data/maps/SealedChamber_OuterRoom/border.bin" - - .align 2 -SealedChamber_OuterRoom_MapBlockdata: @ 8452AB0 - .incbin "data/maps/SealedChamber_OuterRoom/map.bin" - - .align 2 -SealedChamber_OuterRoom_MapAttributes: @ 8452E78 - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_OuterRoom_MapBorder - .4byte SealedChamber_OuterRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -VictoryRoad_B1F_MapBorder: @ 8452E90 - .incbin "data/maps/VictoryRoad_B1F/border.bin" - - .align 2 -VictoryRoad_B1F_MapBlockdata: @ 8452E98 - .incbin "data/maps/VictoryRoad_B1F/map.bin" - - .align 2 -VictoryRoad_B1F_MapAttributes: @ 84539BC - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B1F_MapBorder - .4byte VictoryRoad_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -VictoryRoad_B2F_MapBorder: @ 84539D4 - .incbin "data/maps/VictoryRoad_B2F/border.bin" - - .align 2 -VictoryRoad_B2F_MapBlockdata: @ 84539DC - .incbin "data/maps/VictoryRoad_B2F/map.bin" - - .align 2 -VictoryRoad_B2F_MapAttributes: @ 8454500 - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B2F_MapBorder - .4byte VictoryRoad_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -Route104_Prototype_MapBorder: @ 8454518 - .incbin "data/maps/Route104_Prototype/border.bin" - - .align 2 -Route104_Prototype_MapBlockdata: @ 8454520 - .incbin "data/maps/Route104_Prototype/map.bin" - - .align 2 -Route104_Prototype_MapAttributes: @ 8454524 - .4byte 0x1 - .4byte 0x1 - .4byte Route104_Prototype_MapBorder - .4byte Route104_Prototype_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -GraniteCave_StevensRoom_MapBorder: @ 845453C - .incbin "data/maps/GraniteCave_StevensRoom/border.bin" - - .align 2 -GraniteCave_StevensRoom_MapBlockdata: @ 8454544 - .incbin "data/maps/GraniteCave_StevensRoom/map.bin" - - .align 2 -GraniteCave_StevensRoom_MapAttributes: @ 84546E8 - .4byte 0xf - .4byte 0xe - .4byte GraniteCave_StevensRoom_MapBorder - .4byte GraniteCave_StevensRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -AbandonedShip_HiddenFloorCorridors_MapBorder: @ 8454700 - .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_MapBlockdata: @ 8454708 - .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_MapAttributes: @ 8454828 - .4byte 0xd - .4byte 0xb - .4byte AbandonedShip_HiddenFloorCorridors_MapBorder - .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -SouthernIsland_Exterior_MapBorder: @ 8454840 - .incbin "data/maps/SouthernIsland_Exterior/border.bin" - - .align 2 -SouthernIsland_Exterior_MapBlockdata: @ 8454848 - .incbin "data/maps/SouthernIsland_Exterior/map.bin" - - .align 2 -SouthernIsland_Exterior_MapAttributes: @ 8455004 - .4byte 0x21 - .4byte 0x1e - .4byte SouthernIsland_Exterior_MapBorder - .4byte SouthernIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -SouthernIsland_Interior_MapBorder: @ 845501C - .incbin "data/maps/SouthernIsland_Interior/border.bin" - - .align 2 -SouthernIsland_Interior_MapBlockdata: @ 8455024 - .incbin "data/maps/SouthernIsland_Interior/map.bin" - - .align 2 -SouthernIsland_Interior_MapAttributes: @ 8455534 - .4byte 0x1b - .4byte 0x18 - .4byte SouthernIsland_Interior_MapBorder - .4byte SouthernIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -JaggedPass_MapBorder: @ 845554C - .incbin "data/maps/JaggedPass/border.bin" - - .align 2 -JaggedPass_MapBlockdata: @ 8455554 - .incbin "data/maps/JaggedPass/map.bin" - - .align 2 -JaggedPass_MapAttributes: @ 845601C - .4byte 0x1e - .4byte 0x2e - .4byte JaggedPass_MapBorder - .4byte JaggedPass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -FieryPath_MapBorder: @ 8456034 - .incbin "data/maps/FieryPath/border.bin" - - .align 2 -FieryPath_MapBlockdata: @ 845603C - .incbin "data/maps/FieryPath/map.bin" - - .align 2 -FieryPath_MapAttributes: @ 8456AA0 - .4byte 0x23 - .4byte 0x26 - .4byte FieryPath_MapBorder - .4byte FieryPath_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -RustboroCity_Flat2_1F_MapBorder: @ 8456AB8 - .incbin "data/maps/RustboroCity_Flat2_1F/border.bin" - - .align 2 -RustboroCity_Flat2_1F_MapBlockdata: @ 8456AC0 - .incbin "data/maps/RustboroCity_Flat2_1F/map.bin" - - .align 2 -RustboroCity_Flat2_1F_MapAttributes: @ 8456BBC - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_1F_MapBorder - .4byte RustboroCity_Flat2_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_Flat2_2F_MapBorder: @ 8456BD4 - .incbin "data/maps/RustboroCity_Flat2_2F/border.bin" - - .align 2 -RustboroCity_Flat2_2F_MapBlockdata: @ 8456BDC - .incbin "data/maps/RustboroCity_Flat2_2F/map.bin" - - .align 2 -RustboroCity_Flat2_2F_MapAttributes: @ 8456CD8 - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_2F_MapBorder - .4byte RustboroCity_Flat2_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_Flat2_3F_MapBorder: @ 8456CF0 - .incbin "data/maps/RustboroCity_Flat2_3F/border.bin" - - .align 2 -RustboroCity_Flat2_3F_MapBlockdata: @ 8456CF8 - .incbin "data/maps/RustboroCity_Flat2_3F/map.bin" - - .align 2 -RustboroCity_Flat2_3F_MapAttributes: @ 8456DF4 - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_3F_MapBorder - .4byte RustboroCity_Flat2_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SootopolisCity_LotadAndSeedotHouse_MapBorder: @ 8456E0C - .incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/border.bin" - - .align 2 -SootopolisCity_LotadAndSeedotHouse_MapBlockdata: @ 8456E14 - .incbin "data/maps/SootopolisCity_LotadAndSeedotHouse/map.bin" - - .align 2 -SootopolisCity_LotadAndSeedotHouse_MapAttributes: @ 8456E84 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder - .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -EverGrandeCity_HallOfFame_MapBorder: @ 8456E9C - .incbin "data/maps/EverGrandeCity_HallOfFame/border.bin" - - .align 2 -EverGrandeCity_HallOfFame_MapBlockdata: @ 8456EA4 - .incbin "data/maps/EverGrandeCity_HallOfFame/map.bin" - - .align 2 -EverGrandeCity_HallOfFame_MapAttributes: @ 84570A4 - .4byte 0xf - .4byte 0x11 - .4byte EverGrandeCity_HallOfFame_MapBorder - .4byte EverGrandeCity_HallOfFame_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - - .align 2 -LilycoveCity_CoveLilyMotel_1F_MapBorder: @ 84570BC - .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_MapBlockdata: @ 84570C4 - .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_MapAttributes: @ 845719C - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -LilycoveCity_CoveLilyMotel_2F_MapBorder: @ 84571B4 - .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_MapBlockdata: @ 84571BC - .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_MapAttributes: @ 8457294 - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -Route124_DivingTreasureHuntersHouse_MapBorder: @ 84572AC - .incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_MapBlockdata: @ 84572B4 - .incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_MapAttributes: @ 8457368 - .4byte 0xa - .4byte 0x9 - .4byte Route124_DivingTreasureHuntersHouse_MapBorder - .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -MtPyre_Exterior_MapBorder: @ 8457380 - .incbin "data/maps/MtPyre_Exterior/border.bin" - - .align 2 -MtPyre_Exterior_MapBlockdata: @ 8457388 - .incbin "data/maps/MtPyre_Exterior/map.bin" - - .align 2 -MtPyre_Exterior_MapAttributes: @ 84582AC - .4byte 0x26 - .4byte 0x33 - .4byte MtPyre_Exterior_MapBorder - .4byte MtPyre_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -MtPyre_Summit_MapBorder: @ 84582C4 - .incbin "data/maps/MtPyre_Summit/border.bin" - - .align 2 -MtPyre_Summit_MapBlockdata: @ 84582CC - .incbin "data/maps/MtPyre_Summit/map.bin" - - .align 2 -MtPyre_Summit_MapAttributes: @ 8459140 - .4byte 0x32 - .4byte 0x25 - .4byte MtPyre_Summit_MapBorder - .4byte MtPyre_Summit_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -SealedChamber_InnerRoom_MapBorder: @ 8459158 - .incbin "data/maps/SealedChamber_InnerRoom/border.bin" - - .align 2 -SealedChamber_InnerRoom_MapBlockdata: @ 8459160 - .incbin "data/maps/SealedChamber_InnerRoom/map.bin" - - .align 2 -SealedChamber_InnerRoom_MapAttributes: @ 8459528 - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_InnerRoom_MapBorder - .4byte SealedChamber_InnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -MossdeepCity_GameCorner_1F_MapBorder: @ 8459540 - .incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin" - - .align 2 -MossdeepCity_GameCorner_1F_MapBlockdata: @ 8459548 - .incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_1F_MapAttributes: @ 8459638 - .4byte 0xc - .4byte 0xa - .4byte MossdeepCity_GameCorner_1F_MapBorder - .4byte MossdeepCity_GameCorner_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGameCorner - - .align 2 -MossdeepCity_GameCorner_B1F_MapBorder: @ 8459650 - .incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_MapBlockdata: @ 8459658 - .incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_MapAttributes: @ 8459730 - .4byte 0xc - .4byte 0x9 - .4byte MossdeepCity_GameCorner_B1F_MapBorder - .4byte MossdeepCity_GameCorner_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SootopolisCity_House1_MapBorder: @ 8459748 - .incbin "data/maps/SootopolisCity_House1/border.bin" - - .align 2 -SootopolisCity_House1_MapBlockdata: @ 8459750 - .incbin "data/maps/SootopolisCity_House1/map.bin" - - .align 2 -SootopolisCity_House1_MapAttributes: @ 84597C0 -SootopolisCity_House4_MapAttributes: @ 84597C0 -SootopolisCity_House7_MapAttributes: @ 84597C0 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House1_MapBorder - .4byte SootopolisCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SootopolisCity_House2_MapBorder: @ 84597D8 - .incbin "data/maps/SootopolisCity_House2/border.bin" - - .align 2 -SootopolisCity_House2_MapBlockdata: @ 84597E0 - .incbin "data/maps/SootopolisCity_House2/map.bin" - - .align 2 -SootopolisCity_House2_MapAttributes: @ 8459850 -SootopolisCity_House5_MapAttributes: @ 8459850 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House2_MapBorder - .4byte SootopolisCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SootopolisCity_House3_MapBorder: @ 8459868 - .incbin "data/maps/SootopolisCity_House3/border.bin" - - .align 2 -SootopolisCity_House3_MapBlockdata: @ 8459870 - .incbin "data/maps/SootopolisCity_House3/map.bin" - - .align 2 -SootopolisCity_House3_MapAttributes: @ 84598E0 -SootopolisCity_House6_MapAttributes: @ 84598E0 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House3_MapBorder - .4byte SootopolisCity_House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -AbandonedShip_HiddenFloorRooms_MapBorder: @ 84598F8 - .incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_MapBlockdata: @ 8459900 - .incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_MapAttributes: @ 8459E28 - .4byte 0x2c - .4byte 0xf - .4byte AbandonedShip_HiddenFloorRooms_MapBorder - .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - - .align 2 -ScorchedSlab_MapBorder: @ 8459E40 - .incbin "data/maps/ScorchedSlab/border.bin" - - .align 2 -ScorchedSlab_MapBlockdata: @ 8459E48 - .incbin "data/maps/ScorchedSlab/map.bin" - - .align 2 -ScorchedSlab_MapAttributes: @ 845A0A0 - .4byte 0xf - .4byte 0x14 - .4byte ScorchedSlab_MapBorder - .4byte ScorchedSlab_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -UnknownMapBorder_0845A394: @ 845A0B8 - .incbin "data/maps/UnknownMap_0845A394/border.bin" - - .align 2 -UnknownMapBlockdata_0845A394: @ 845A0C0 - .incbin "data/maps/UnknownMap_0845A394/map.bin" - - .align 2 -UnknownMapAttributes_0845A394: @ 845A394 - .4byte 0x13 - .4byte 0x13 - .4byte UnknownMapBorder_0845A394 - .4byte UnknownMapBlockdata_0845A394 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -RustboroCity_Flat1_1F_MapBorder: @ 845A3AC - .incbin "data/maps/RustboroCity_Flat1_1F/border.bin" - - .align 2 -RustboroCity_Flat1_1F_MapBlockdata: @ 845A3B4 - .incbin "data/maps/RustboroCity_Flat1_1F/map.bin" - - .align 2 -RustboroCity_Flat1_1F_MapAttributes: @ 845A494 - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_1F_MapBorder - .4byte RustboroCity_Flat1_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -RustboroCity_Flat1_2F_MapBorder: @ 845A4AC - .incbin "data/maps/RustboroCity_Flat1_2F/border.bin" - - .align 2 -RustboroCity_Flat1_2F_MapBlockdata: @ 845A4B4 - .incbin "data/maps/RustboroCity_Flat1_2F/map.bin" - - .align 2 -RustboroCity_Flat1_2F_MapAttributes: @ 845A594 - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_2F_MapBorder - .4byte RustboroCity_Flat1_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -EverGrandeCity_Hall4_MapBorder: @ 845A5AC - .incbin "data/maps/EverGrandeCity_Hall4/border.bin" - - .align 2 -EverGrandeCity_Hall4_MapBlockdata: @ 845A5B4 - .incbin "data/maps/EverGrandeCity_Hall4/map.bin" - - .align 2 -EverGrandeCity_Hall4_MapAttributes: @ 845A8A0 - .4byte 0xb - .4byte 0x22 - .4byte EverGrandeCity_Hall4_MapBorder - .4byte EverGrandeCity_Hall4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - - .align 2 -AquaHideout_UnusedRubyMap1_MapBorder: @ 845A8B8 - .incbin "data/maps/AquaHideout_UnusedRubyMap1/border.bin" - - .align 2 -AquaHideout_UnusedRubyMap1_MapBlockdata: @ 845A8C0 - .incbin "data/maps/AquaHideout_UnusedRubyMap1/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap1_MapAttributes: @ 845AF50 - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_UnusedRubyMap1_MapBorder - .4byte AquaHideout_UnusedRubyMap1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_UnusedRubyMap2_MapBorder: @ 845AF68 - .incbin "data/maps/AquaHideout_UnusedRubyMap2/border.bin" - - .align 2 -AquaHideout_UnusedRubyMap2_MapBlockdata: @ 845AF70 - .incbin "data/maps/AquaHideout_UnusedRubyMap2/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap2_MapAttributes: @ 845BB10 - .4byte 0x3e - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap2_MapBorder - .4byte AquaHideout_UnusedRubyMap2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -AquaHideout_UnusedRubyMap3_MapBorder: @ 845BB28 - .incbin "data/maps/AquaHideout_UnusedRubyMap3/border.bin" - - .align 2 -AquaHideout_UnusedRubyMap3_MapBlockdata: @ 845BB30 - .incbin "data/maps/AquaHideout_UnusedRubyMap3/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap3_MapAttributes: @ 845C190 - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap3_MapBorder - .4byte AquaHideout_UnusedRubyMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - - .align 2 -UnknownMapBorder_0845D470: @ 845C1A8 - .incbin "data/maps/UnknownMap_0845D470/border.bin" - - .align 2 -UnknownMapBlockdata_0845D470: @ 845C1B0 - .incbin "data/maps/UnknownMap_0845D470/map.bin" - - .align 2 -UnknownMapAttributes_0845D470: @ 845D470 - .4byte 0x3C - .4byte 0x28 - .4byte UnknownMapBorder_0845D470 - .4byte UnknownMapBlockdata_0845D470 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_Entrance_MapBorder: @ 845D488 - .incbin "data/maps/SkyPillar_Entrance/border.bin" - - .align 2 -SkyPillar_Entrance_MapBlockdata: @ 845D490 - .incbin "data/maps/SkyPillar_Entrance/map.bin" - - .align 2 -SkyPillar_Entrance_MapAttributes: @ 845D718 - .4byte 0x12 - .4byte 0x12 - .4byte SkyPillar_Entrance_MapBorder - .4byte SkyPillar_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SkyPillar_Outside_MapBorder: @ 845D730 - .incbin "data/maps/SkyPillar_Outside/border.bin" - - .align 2 -SkyPillar_Outside_MapBlockdata: @ 845D738 - .incbin "data/maps/SkyPillar_Outside/map.bin" - - .align 2 -SkyPillar_Outside_MapAttributes: @ 845DC40 - .4byte 0x1c - .4byte 0x17 - .4byte SkyPillar_Outside_MapBorder - .4byte SkyPillar_Outside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_1F_MapBorder: @ 845DC58 - .incbin "data/maps/SkyPillar_1F/border.bin" - - .align 2 -SkyPillar_1F_MapBlockdata: @ 845DC60 - .incbin "data/maps/SkyPillar_1F/map.bin" - - .align 2 -SkyPillar_1F_MapAttributes: @ 845DDE8 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_1F_MapBorder - .4byte SkyPillar_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_2F_MapBorder: @ 845DE00 - .incbin "data/maps/SkyPillar_2F/border.bin" - - .align 2 -SkyPillar_2F_MapBlockdata: @ 845DE08 - .incbin "data/maps/SkyPillar_2F/map.bin" - - .align 2 -SkyPillar_2F_MapAttributes: @ 845DF90 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_2F_MapBorder - .4byte SkyPillar_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_3F_MapBorder: @ 845DFA8 - .incbin "data/maps/SkyPillar_3F/border.bin" - - .align 2 -SkyPillar_3F_MapBlockdata: @ 845DFB0 - .incbin "data/maps/SkyPillar_3F/map.bin" - - .align 2 -SkyPillar_3F_MapAttributes: @ 845E138 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_3F_MapBorder - .4byte SkyPillar_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_4F_MapBorder: @ 845E150 - .incbin "data/maps/SkyPillar_4F/border.bin" - - .align 2 -SkyPillar_4F_MapBlockdata: @ 845E158 - .incbin "data/maps/SkyPillar_4F/map.bin" - - .align 2 -SkyPillar_4F_MapAttributes: @ 845E2E0 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_4F_MapBorder - .4byte SkyPillar_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_0845ECB4: @ 845E2F8 - .incbin "data/maps/UnknownMap_0845ECB4/border.bin" - - .align 2 -UnknownMapBlockdata_0845ECB4: @ 845E300 - .incbin "data/maps/UnknownMap_0845ECB4/map.bin" - - .align 2 -UnknownMapAttributes_0845ECB4: @ 845ECB4 - .4byte 0x1B - .4byte 0x2E - .4byte UnknownMapBorder_0845ECB4 - .4byte UnknownMapBlockdata_0845ECB4 - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -MossdeepCity_StevensHouse_MapBorder: @ 845ECCC - .incbin "data/maps/MossdeepCity_StevensHouse/border.bin" - - .align 2 -MossdeepCity_StevensHouse_MapBlockdata: @ 845ECD4 - .incbin "data/maps/MossdeepCity_StevensHouse/map.bin" - - .align 2 -MossdeepCity_StevensHouse_MapAttributes: @ 845ED84 - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_StevensHouse_MapBorder - .4byte MossdeepCity_StevensHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -ShoalCave_LowTideIceRoom_MapBorder: @ 845ED9C - .incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin" - - .align 2 -ShoalCave_LowTideIceRoom_MapBlockdata: @ 845EDA4 - .incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin" - - .align 2 -ShoalCave_LowTideIceRoom_MapAttributes: @ 845F254 - .4byte 0x14 - .4byte 0x1e - .4byte ShoalCave_LowTideIceRoom_MapBorder - .4byte ShoalCave_LowTideIceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -SafariZone_RestHouse_MapBorder: @ 845F26C - .incbin "data/maps/SafariZone_RestHouse/border.bin" - - .align 2 -SafariZone_RestHouse_MapBlockdata: @ 845F274 - .incbin "data/maps/SafariZone_RestHouse/map.bin" - - .align 2 -SafariZone_RestHouse_MapAttributes: @ 845F328 - .4byte 0xa - .4byte 0x9 - .4byte SafariZone_RestHouse_MapBorder - .4byte SafariZone_RestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - - .align 2 -SkyPillar_5F_MapBorder: @ 845F340 - .incbin "data/maps/SkyPillar_5F/border.bin" - - .align 2 -SkyPillar_5F_MapBlockdata: @ 845F348 - .incbin "data/maps/SkyPillar_5F/map.bin" - - .align 2 -SkyPillar_5F_MapAttributes: @ 845F4D0 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_5F_MapBorder - .4byte SkyPillar_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SkyPillar_Top_MapBorder: @ 845F4E8 - .incbin "data/maps/SkyPillar_Top/border.bin" - - .align 2 -SkyPillar_Top_MapBlockdata: @ 845F4F0 - .incbin "data/maps/SkyPillar_Top/map.bin" - - .align 2 -SkyPillar_Top_MapAttributes: @ 845FA00 - .4byte 0x1b - .4byte 0x18 - .4byte SkyPillar_Top_MapBorder - .4byte SkyPillar_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -BattleFrontier_BattleDomeLobby_MapBorder: @ 845FA18 - .incbin "data/maps/BattleFrontier_BattleDomeLobby/border.bin" - - .align 2 -BattleFrontier_BattleDomeLobby_MapBlockdata: @ 845FA20 - .incbin "data/maps/BattleFrontier_BattleDomeLobby/map.bin" - - .align 2 -BattleFrontier_BattleDomeLobby_MapAttributes: @ 845FD30 - .4byte 0x17 - .4byte 0x11 - .4byte BattleFrontier_BattleDomeLobby_MapBorder - .4byte BattleFrontier_BattleDomeLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - - .align 2 -BattleFrontier_BattleDomeCorridor_MapBorder: @ 845FD48 - .incbin "data/maps/BattleFrontier_BattleDomeCorridor/border.bin" - - .align 2 -BattleFrontier_BattleDomeCorridor_MapBlockdata: @ 845FD50 - .incbin "data/maps/BattleFrontier_BattleDomeCorridor/map.bin" - - .align 2 -BattleFrontier_BattleDomeCorridor_MapAttributes: @ 845FFF0 - .4byte 0x30 - .4byte 0x7 - .4byte BattleFrontier_BattleDomeCorridor_MapBorder - .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_MapBorder: @ 8460008 - .incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_MapBlockdata: @ 8460010 - .incbin "data/maps/BattleFrontier_BattleDomePreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_MapAttributes: @ 84600A0 - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - - .align 2 -BattleFrontier_BattleDomeBattleRoom_MapBorder: @ 84600B8 - .incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleDomeBattleRoom_MapBlockdata: @ 84600C0 - .incbin "data/maps/BattleFrontier_BattleDomeBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomeBattleRoom_MapAttributes: @ 8460250 - .4byte 0x14 - .4byte 0xa - .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder - .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - - .align 2 -MagmaHideout_1F_MapBorder: @ 8460268 - .incbin "data/maps/MagmaHideout_1F/border.bin" - - .align 2 -MagmaHideout_1F_MapBlockdata: @ 8460270 - .incbin "data/maps/MagmaHideout_1F/map.bin" - - .align 2 -MagmaHideout_1F_MapAttributes: @ 8460D6C - .4byte 0x25 - .4byte 0x26 - .4byte MagmaHideout_1F_MapBorder - .4byte MagmaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_2F_1R_MapBorder: @ 8460D84 - .incbin "data/maps/MagmaHideout_2F_1R/border.bin" - - .align 2 -MagmaHideout_2F_1R_MapBlockdata: @ 8460D8C - .incbin "data/maps/MagmaHideout_2F_1R/map.bin" - - .align 2 -MagmaHideout_2F_1R_MapAttributes: @ 846179C - .4byte 0x21 - .4byte 0x27 - .4byte MagmaHideout_2F_1R_MapBorder - .4byte MagmaHideout_2F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_2F_2R_MapBorder: @ 84617B4 - .incbin "data/maps/MagmaHideout_2F_2R/border.bin" - - .align 2 -MagmaHideout_2F_2R_MapBlockdata: @ 84617BC - .incbin "data/maps/MagmaHideout_2F_2R/map.bin" - - .align 2 -MagmaHideout_2F_2R_MapAttributes: @ 8462274 - .4byte 0x31 - .4byte 0x1c - .4byte MagmaHideout_2F_2R_MapBorder - .4byte MagmaHideout_2F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_3F_1R_MapBorder: @ 846228C - .incbin "data/maps/MagmaHideout_3F_1R/border.bin" - - .align 2 -MagmaHideout_3F_1R_MapBlockdata: @ 8462294 - .incbin "data/maps/MagmaHideout_3F_1R/map.bin" - - .align 2 -MagmaHideout_3F_1R_MapAttributes: @ 84627D4 - .4byte 0x1c - .4byte 0x18 - .4byte MagmaHideout_3F_1R_MapBorder - .4byte MagmaHideout_3F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_3F_2R_MapBorder: @ 84627EC - .incbin "data/maps/MagmaHideout_3F_2R/border.bin" - - .align 2 -MagmaHideout_3F_2R_MapBlockdata: @ 84627F4 - .incbin "data/maps/MagmaHideout_3F_2R/map.bin" - - .align 2 -MagmaHideout_3F_2R_MapAttributes: @ 8462B24 - .4byte 0x18 - .4byte 0x11 - .4byte MagmaHideout_3F_2R_MapBorder - .4byte MagmaHideout_3F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_4F_MapBorder: @ 8462B3C - .incbin "data/maps/MagmaHideout_4F/border.bin" - - .align 2 -MagmaHideout_4F_MapBlockdata: @ 8462B44 - .incbin "data/maps/MagmaHideout_4F/map.bin" - - .align 2 -MagmaHideout_4F_MapAttributes: @ 846382C - .4byte 0x3b - .4byte 0x1c - .4byte MagmaHideout_4F_MapBorder - .4byte MagmaHideout_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -BattleFrontier_BattlePalaceLobby_MapBorder: @ 8463844 - .incbin "data/maps/BattleFrontier_BattlePalaceLobby/border.bin" - - .align 2 -BattleFrontier_BattlePalaceLobby_MapBlockdata: @ 846384C - .incbin "data/maps/BattleFrontier_BattlePalaceLobby/map.bin" - - .align 2 -BattleFrontier_BattlePalaceLobby_MapAttributes: @ 8463AA4 - .4byte 0x19 - .4byte 0xc - .4byte BattleFrontier_BattlePalaceLobby_MapBorder - .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePalace - - .align 2 -BattleFrontier_BattlePalaceCorridor_MapBorder: @ 8463ABC - .incbin "data/maps/BattleFrontier_BattlePalaceCorridor/border.bin" - - .align 2 -BattleFrontier_BattlePalaceCorridor_MapBlockdata: @ 8463AC4 - .incbin "data/maps/BattleFrontier_BattlePalaceCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePalaceCorridor_MapAttributes: @ 8463CA0 - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattlePalaceCorridor_MapBorder - .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattlePalace - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_MapBorder: @ 8463CB8 - .incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_MapBlockdata: @ 8463CC0 - .incbin "data/maps/BattleFrontier_BattlePalaceBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_MapAttributes: @ 8463DEC - .4byte 0xf - .4byte 0xa - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattlePalace - - .align 2 -BattleFrontier_OutsideEast_MapBorder: @ 8463E04 - .incbin "data/maps/BattleFrontier_OutsideEast/border.bin" - - .align 2 -BattleFrontier_OutsideEast_MapBlockdata: @ 8463E0C - .incbin "data/maps/BattleFrontier_OutsideEast/map.bin" - - .align 2 -BattleFrontier_OutsideEast_MapAttributes: @ 846668C - .4byte 0x48 - .4byte 0x48 - .4byte BattleFrontier_OutsideEast_MapBorder - .4byte BattleFrontier_OutsideEast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontierOutsideEast - - .align 2 -BattleFrontier_BattleFactoryLobby_MapBorder: @ 84666A4 - .incbin "data/maps/BattleFrontier_BattleFactoryLobby/border.bin" - - .align 2 -BattleFrontier_BattleFactoryLobby_MapBlockdata: @ 84666AC - .incbin "data/maps/BattleFrontier_BattleFactoryLobby/map.bin" - - .align 2 -BattleFrontier_BattleFactoryLobby_MapAttributes: @ 8466874 - .4byte 0x13 - .4byte 0xc - .4byte BattleFrontier_BattleFactoryLobby_MapBorder - .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_MapBorder: @ 846688C - .incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata: @ 8466894 - .incbin "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes: @ 8466A70 - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_MapBorder: @ 8466A88 - .incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_MapBlockdata: @ 8466A90 - .incbin "data/maps/BattleFrontier_BattleFactoryBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_MapAttributes: @ 8466BC8 - .4byte 0xd - .4byte 0xc - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - - .align 2 -BattleFrontier_BattlePikeLobby_MapBorder: @ 8466BE0 - .incbin "data/maps/BattleFrontier_BattlePikeLobby/border.bin" - - .align 2 -BattleFrontier_BattlePikeLobby_MapBlockdata: @ 8466BE8 - .incbin "data/maps/BattleFrontier_BattlePikeLobby/map.bin" - - .align 2 -BattleFrontier_BattlePikeLobby_MapAttributes: @ 8466D08 - .4byte 0xb - .4byte 0xd - .4byte BattleFrontier_BattlePikeLobby_MapBorder - .4byte BattleFrontier_BattlePikeLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePikeCorridor_MapBorder: @ 8466D20 - .incbin "data/maps/BattleFrontier_BattlePikeCorridor/border.bin" - - .align 2 -BattleFrontier_BattlePikeCorridor_MapBlockdata: @ 8466D28 - .incbin "data/maps/BattleFrontier_BattlePikeCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePikeCorridor_MapAttributes: @ 8466E08 - .4byte 0xe - .4byte 0x8 - .4byte BattleFrontier_BattlePikeCorridor_MapBorder - .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_MapBorder: @ 8466E20 - .incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/border.bin" - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_MapBlockdata: @ 8466E28 - .incbin "data/maps/BattleFrontier_BattlePikeThreePathRoom/map.bin" - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_MapAttributes: @ 8466F48 - .4byte 0xd - .4byte 0xb - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_MapBorder: @ 8466F60 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/border.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_MapBlockdata: @ 8466F68 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom1/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_MapAttributes: @ 8466FF8 - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_MapBorder: @ 8467010 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/border.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_MapBlockdata: @ 8467018 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom2/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_MapAttributes: @ 8467068 - .4byte 0x5 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattleArenaLobby_MapBorder: @ 8467080 - .incbin "data/maps/BattleFrontier_BattleArenaLobby/border.bin" - - .align 2 -BattleFrontier_BattleArenaLobby_MapBlockdata: @ 8467088 - .incbin "data/maps/BattleFrontier_BattleArenaLobby/map.bin" - - .align 2 -BattleFrontier_BattleArenaLobby_MapAttributes: @ 8467228 - .4byte 0x10 - .4byte 0xd - .4byte BattleFrontier_BattleArenaLobby_MapBorder - .4byte BattleFrontier_BattleArenaLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - - .align 2 -BattleFrontier_BattleArenaCorridor_MapBorder: @ 8467240 - .incbin "data/maps/BattleFrontier_BattleArenaCorridor/border.bin" - - .align 2 -BattleFrontier_BattleArenaCorridor_MapBlockdata: @ 8467248 - .incbin "data/maps/BattleFrontier_BattleArenaCorridor/map.bin" - - .align 2 -BattleFrontier_BattleArenaCorridor_MapAttributes: @ 8467440 - .4byte 0x12 - .4byte 0xe - .4byte BattleFrontier_BattleArenaCorridor_MapBorder - .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - - .align 2 -BattleFrontier_BattleArenaBattleRoom_MapBorder: @ 8467458 - .incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleArenaBattleRoom_MapBlockdata: @ 8467460 - .incbin "data/maps/BattleFrontier_BattleArenaBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleArenaBattleRoom_MapAttributes: @ 84675C0 - .4byte 0x10 - .4byte 0xb - .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder - .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - - .align 2 -UnknownMapBorder_08469200: @ 84675D8 - .incbin "data/maps/UnknownMap_08469200/border.bin" - - .align 2 -UnknownMapBlockdata_08469200: @ 84675E0 - .incbin "data/maps/UnknownMap_08469200/map.bin" - - .align 2 -UnknownMapAttributes_08469200: @ 8469200 - .4byte 0x3C - .4byte 0x3C - .4byte UnknownMapBorder_08469200 - .4byte UnknownMapBlockdata_08469200 - .4byte gTileset_General - .4byte gTileset_Sootopolis - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_MapBorder: @ 8469218 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/border.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_MapBlockdata: @ 8469220 - .incbin "data/maps/BattleFrontier_BattlePikeRandomRoom3/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_MapAttributes: @ 8469388 - .4byte 0x9 - .4byte 0x14 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -UnknownMapBorder_084693AC: @ 84693A0 - .incbin "data/maps/UnknownMap_084693AC/border.bin" - - .align 2 -UnknownMapBlockdata_084693AC: @ 84693A8 - .incbin "data/maps/UnknownMap_084693AC/map.bin" - - .align 2 -UnknownMapAttributes_084693AC: @ 84693AC - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_084693AC - .4byte UnknownMapBlockdata_084693AC - .4byte gTileset_Building - .4byte gTileset_BattlePike - - .align 2 -BattleFrontier_BattlePyramidLobby_MapBorder: @ 84693C4 - .incbin "data/maps/BattleFrontier_BattlePyramidLobby/border.bin" - - .align 2 -BattleFrontier_BattlePyramidLobby_MapBlockdata: @ 84693CC - .incbin "data/maps/BattleFrontier_BattlePyramidLobby/map.bin" - - .align 2 -BattleFrontier_BattlePyramidLobby_MapAttributes: @ 84695E8 - .4byte 0xf - .4byte 0x12 - .4byte BattleFrontier_BattlePyramidLobby_MapBorder - .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_MapBorder: @ 8469600 - .incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/border.bin" - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_MapBlockdata: @ 8469608 - .incbin "data/maps/BattleFrontier_BattlePyramidEmptySquare/map.bin" - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_MapAttributes: @ 8469688 - .4byte 0x8 - .4byte 0x8 - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare01_MapBorder: @ 84696A0 - .incbin "data/maps/BattlePyramidSquare01/border.bin" - - .align 2 -BattlePyramidSquare01_MapBlockdata: @ 84696A8 - .incbin "data/maps/BattlePyramidSquare01/map.bin" - - .align 2 -BattlePyramidSquare01_MapAttributes: @ 8469728 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare01_MapBorder - .4byte BattlePyramidSquare01_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare02_MapBorder: @ 8469740 - .incbin "data/maps/BattlePyramidSquare02/border.bin" - - .align 2 -BattlePyramidSquare02_MapBlockdata: @ 8469748 - .incbin "data/maps/BattlePyramidSquare02/map.bin" - - .align 2 -BattlePyramidSquare02_MapAttributes: @ 84697C8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare02_MapBorder - .4byte BattlePyramidSquare02_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare03_MapBorder: @ 84697E0 - .incbin "data/maps/BattlePyramidSquare03/border.bin" - - .align 2 -BattlePyramidSquare03_MapBlockdata: @ 84697E8 - .incbin "data/maps/BattlePyramidSquare03/map.bin" - - .align 2 -BattlePyramidSquare03_MapAttributes: @ 8469868 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare03_MapBorder - .4byte BattlePyramidSquare03_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare04_MapBorder: @ 8469880 - .incbin "data/maps/BattlePyramidSquare04/border.bin" - - .align 2 -BattlePyramidSquare04_MapBlockdata: @ 8469888 - .incbin "data/maps/BattlePyramidSquare04/map.bin" - - .align 2 -BattlePyramidSquare04_MapAttributes: @ 8469908 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare04_MapBorder - .4byte BattlePyramidSquare04_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare05_MapBorder: @ 8469920 - .incbin "data/maps/BattlePyramidSquare05/border.bin" - - .align 2 -BattlePyramidSquare05_MapBlockdata: @ 8469928 - .incbin "data/maps/BattlePyramidSquare05/map.bin" - - .align 2 -BattlePyramidSquare05_MapAttributes: @ 84699A8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare05_MapBorder - .4byte BattlePyramidSquare05_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare06_MapBorder: @ 84699C0 - .incbin "data/maps/BattlePyramidSquare06/border.bin" - - .align 2 -BattlePyramidSquare06_MapBlockdata: @ 84699C8 - .incbin "data/maps/BattlePyramidSquare06/map.bin" - - .align 2 -BattlePyramidSquare06_MapAttributes: @ 8469A48 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare06_MapBorder - .4byte BattlePyramidSquare06_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare07_MapBorder: @ 8469A60 - .incbin "data/maps/BattlePyramidSquare07/border.bin" - - .align 2 -BattlePyramidSquare07_MapBlockdata: @ 8469A68 - .incbin "data/maps/BattlePyramidSquare07/map.bin" - - .align 2 -BattlePyramidSquare07_MapAttributes: @ 8469AE8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare07_MapBorder - .4byte BattlePyramidSquare07_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare08_MapBorder: @ 8469B00 - .incbin "data/maps/BattlePyramidSquare08/border.bin" - - .align 2 -BattlePyramidSquare08_MapBlockdata: @ 8469B08 - .incbin "data/maps/BattlePyramidSquare08/map.bin" - - .align 2 -BattlePyramidSquare08_MapAttributes: @ 8469B88 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare08_MapBorder - .4byte BattlePyramidSquare08_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare09_MapBorder: @ 8469BA0 - .incbin "data/maps/BattlePyramidSquare09/border.bin" - - .align 2 -BattlePyramidSquare09_MapBlockdata: @ 8469BA8 - .incbin "data/maps/BattlePyramidSquare09/map.bin" - - .align 2 -BattlePyramidSquare09_MapAttributes: @ 8469C28 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare09_MapBorder - .4byte BattlePyramidSquare09_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare10_MapBorder: @ 8469C40 - .incbin "data/maps/BattlePyramidSquare10/border.bin" - - .align 2 -BattlePyramidSquare10_MapBlockdata: @ 8469C48 - .incbin "data/maps/BattlePyramidSquare10/map.bin" - - .align 2 -BattlePyramidSquare10_MapAttributes: @ 8469CC8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare10_MapBorder - .4byte BattlePyramidSquare10_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare11_MapBorder: @ 8469CE0 - .incbin "data/maps/BattlePyramidSquare11/border.bin" - - .align 2 -BattlePyramidSquare11_MapBlockdata: @ 8469CE8 - .incbin "data/maps/BattlePyramidSquare11/map.bin" - - .align 2 -BattlePyramidSquare11_MapAttributes: @ 8469D68 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare11_MapBorder - .4byte BattlePyramidSquare11_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare12_MapBorder: @ 8469D80 - .incbin "data/maps/BattlePyramidSquare12/border.bin" - - .align 2 -BattlePyramidSquare12_MapBlockdata: @ 8469D88 - .incbin "data/maps/BattlePyramidSquare12/map.bin" - - .align 2 -BattlePyramidSquare12_MapAttributes: @ 8469E08 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare12_MapBorder - .4byte BattlePyramidSquare12_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare13_MapBorder: @ 8469E20 - .incbin "data/maps/BattlePyramidSquare13/border.bin" - - .align 2 -BattlePyramidSquare13_MapBlockdata: @ 8469E28 - .incbin "data/maps/BattlePyramidSquare13/map.bin" - - .align 2 -BattlePyramidSquare13_MapAttributes: @ 8469EA8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare13_MapBorder - .4byte BattlePyramidSquare13_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare14_MapBorder: @ 8469EC0 - .incbin "data/maps/BattlePyramidSquare14/border.bin" - - .align 2 -BattlePyramidSquare14_MapBlockdata: @ 8469EC8 - .incbin "data/maps/BattlePyramidSquare14/map.bin" - - .align 2 -BattlePyramidSquare14_MapAttributes: @ 8469F48 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare14_MapBorder - .4byte BattlePyramidSquare14_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare15_MapBorder: @ 8469F60 - .incbin "data/maps/BattlePyramidSquare15/border.bin" - - .align 2 -BattlePyramidSquare15_MapBlockdata: @ 8469F68 - .incbin "data/maps/BattlePyramidSquare15/map.bin" - - .align 2 -BattlePyramidSquare15_MapAttributes: @ 8469FE8 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare15_MapBorder - .4byte BattlePyramidSquare15_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattlePyramidSquare16_MapBorder: @ 846A000 - .incbin "data/maps/BattlePyramidSquare16/border.bin" - - .align 2 -BattlePyramidSquare16_MapBlockdata: @ 846A008 - .incbin "data/maps/BattlePyramidSquare16/map.bin" - - .align 2 -BattlePyramidSquare16_MapAttributes: @ 846A088 - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare16_MapBorder - .4byte BattlePyramidSquare16_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -BattleFrontier_BattlePyramidTop_MapBorder: @ 846A0A0 - .incbin "data/maps/BattleFrontier_BattlePyramidTop/border.bin" - - .align 2 -BattleFrontier_BattlePyramidTop_MapBlockdata: @ 846A0A8 - .incbin "data/maps/BattleFrontier_BattlePyramidTop/map.bin" - - .align 2 -BattleFrontier_BattlePyramidTop_MapAttributes: @ 846A6C4 - .4byte 0x22 - .4byte 0x17 - .4byte BattleFrontier_BattlePyramidTop_MapBorder - .4byte BattleFrontier_BattlePyramidTop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - - .align 2 -MagmaHideout_3F_3R_MapBorder: @ 846A6DC - .incbin "data/maps/MagmaHideout_3F_3R/border.bin" - - .align 2 -MagmaHideout_3F_3R_MapBlockdata: @ 846A6E4 - .incbin "data/maps/MagmaHideout_3F_3R/map.bin" - - .align 2 -MagmaHideout_3F_3R_MapAttributes: @ 846AD14 - .4byte 0x21 - .4byte 0x18 - .4byte MagmaHideout_3F_3R_MapBorder - .4byte MagmaHideout_3F_3R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MagmaHideout_2F_3R_MapBorder: @ 846AD2C - .incbin "data/maps/MagmaHideout_2F_3R/border.bin" - - .align 2 -MagmaHideout_2F_3R_MapBlockdata: @ 846AD34 - .incbin "data/maps/MagmaHideout_2F_3R/map.bin" - - .align 2 -MagmaHideout_2F_3R_MapAttributes: @ 846B61C - .4byte 0x3c - .4byte 0x13 - .4byte MagmaHideout_2F_3R_MapBorder - .4byte MagmaHideout_2F_3R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - - .align 2 -MirageTower_1F_MapBorder: @ 846B634 - .incbin "data/maps/MirageTower_1F/border.bin" - - .align 2 -MirageTower_1F_MapBlockdata: @ 846B63C - .incbin "data/maps/MirageTower_1F/map.bin" - - .align 2 -MirageTower_1F_MapAttributes: @ 846B908 - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_1F_MapBorder - .4byte MirageTower_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - - .align 2 -MirageTower_2F_MapBorder: @ 846B920 - .incbin "data/maps/MirageTower_2F/border.bin" - - .align 2 -MirageTower_2F_MapBlockdata: @ 846B928 - .incbin "data/maps/MirageTower_2F/map.bin" - - .align 2 -MirageTower_2F_MapAttributes: @ 846BBF4 - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_2F_MapBorder - .4byte MirageTower_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - - .align 2 -MirageTower_3F_MapBorder: @ 846BC0C - .incbin "data/maps/MirageTower_3F/border.bin" - - .align 2 -MirageTower_3F_MapBlockdata: @ 846BC14 - .incbin "data/maps/MirageTower_3F/map.bin" - - .align 2 -MirageTower_3F_MapAttributes: @ 846BEE0 - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_3F_MapBorder - .4byte MirageTower_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - - .align 2 -FallarborTown_BattleTentLobby_MapBorder: @ 846BEF8 - .incbin "data/maps/FallarborTown_BattleTentLobby/border.bin" - - .align 2 -FallarborTown_BattleTentLobby_MapBlockdata: @ 846BF00 - .incbin "data/maps/FallarborTown_BattleTentLobby/map.bin" - - .align 2 -FallarborTown_BattleTentLobby_MapAttributes: @ 846C004 -SlateportCity_BattleTentLobby_MapAttributes: @ 846C004 -VerdanturfTown_BattleTentLobby_MapAttributes: @ 846C004 - .4byte 0xd - .4byte 0xa - .4byte FallarborTown_BattleTentLobby_MapBorder - .4byte FallarborTown_BattleTentLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - - .align 2 -FallarborTown_BattleTentCorridor_MapBorder: @ 846C01C - .incbin "data/maps/FallarborTown_BattleTentCorridor/border.bin" - - .align 2 -FallarborTown_BattleTentCorridor_MapBlockdata: @ 846C024 - .incbin "data/maps/FallarborTown_BattleTentCorridor/map.bin" - - .align 2 -FallarborTown_BattleTentCorridor_MapAttributes: @ 846C074 -SlateportCity_BattleTentCorridor_MapAttributes: @ 846C074 -VerdanturfTown_BattleTentCorridor_MapAttributes: @ 846C074 - .4byte 0x5 - .4byte 0x8 - .4byte FallarborTown_BattleTentCorridor_MapBorder - .4byte FallarborTown_BattleTentCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - - .align 2 -FallarborTown_BattleTentBattleRoom_MapBorder: @ 846C08C - .incbin "data/maps/FallarborTown_BattleTentBattleRoom/border.bin" - - .align 2 -FallarborTown_BattleTentBattleRoom_MapBlockdata: @ 846C094 - .incbin "data/maps/FallarborTown_BattleTentBattleRoom/map.bin" - - .align 2 -FallarborTown_BattleTentBattleRoom_MapAttributes: @ 846C148 -SlateportCity_BattleTentBattleRoom_MapAttributes: @ 846C148 - .4byte 0xa - .4byte 0x9 - .4byte FallarborTown_BattleTentBattleRoom_MapBorder - .4byte FallarborTown_BattleTentBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - - .align 2 -VerdanturfTown_BattleTentBattleRoom_MapBorder: @ 846C160 - .incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/border.bin" - - .align 2 -VerdanturfTown_BattleTentBattleRoom_MapBlockdata: @ 846C168 - .incbin "data/maps/VerdanturfTown_BattleTentBattleRoom/map.bin" - - .align 2 -VerdanturfTown_BattleTentBattleRoom_MapAttributes: @ 846C254 - .4byte 0xd - .4byte 0x9 - .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder - .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleTent - - .align 2 -MirageTower_4F_MapBorder: @ 846C26C - .incbin "data/maps/MirageTower_4F/border.bin" - - .align 2 -MirageTower_4F_MapBlockdata: @ 846C274 - .incbin "data/maps/MirageTower_4F/map.bin" - - .align 2 -MirageTower_4F_MapAttributes: @ 846C378 - .4byte 0xd - .4byte 0xa - .4byte MirageTower_4F_MapBorder - .4byte MirageTower_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - - .align 2 -DesertUnderpass_MapBorder: @ 846C390 - .incbin "data/maps/DesertUnderpass/border.bin" - - .align 2 -DesertUnderpass_MapBlockdata: @ 846C398 - .incbin "data/maps/DesertUnderpass/map.bin" - - .align 2 -DesertUnderpass_MapAttributes: @ 846DC94 - .4byte 0x8b - .4byte 0x17 - .4byte DesertUnderpass_MapBorder - .4byte DesertUnderpass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_MapBorder: @ 846DCAC - .incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata: @ 846DCB4 - .incbin "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes: @ 846DF2C - .4byte 0x15 - .4byte 0xf - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_BattleTowerCorridor2_MapBorder: @ 846DF44 - .incbin "data/maps/BattleFrontier_BattleTowerCorridor2/border.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor2_MapBlockdata: @ 846DF4C - .incbin "data/maps/BattleFrontier_BattleTowerCorridor2/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor2_MapAttributes: @ 846DFF8 - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor2_MapBorder - .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -UnknownMapBorder_08470BD8: @ 846E010 - .incbin "data/maps/UnknownMap_08470BD8/border.bin" - - .align 2 -UnknownMapBlockdata_08470BD8: @ 846E018 - .incbin "data/maps/UnknownMap_08470BD8/map.bin" - - .align 2 -UnknownMapAttributes_08470BD8: @ 8470BD8 - .4byte 0x28 - .4byte 0x8C - .4byte UnknownMapBorder_08470BD8 - .4byte UnknownMapBlockdata_08470BD8 - .4byte gTileset_General - .4byte gTileset_Mauville - - .align 2 -UnionRoom_MapBorder: @ 8470BF0 - .incbin "data/maps/UnionRoom/border.bin" - - .align 2 -UnionRoom_MapBlockdata: @ 8470BF8 - .incbin "data/maps/UnionRoom/map.bin" - - .align 2 -UnionRoom_MapAttributes: @ 8470D60 - .4byte 0xf - .4byte 0xc - .4byte UnionRoom_MapBorder - .4byte UnionRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_UnionRoom - - .align 2 -SafariZone_Northeast_MapBorder: @ 8470D78 - .incbin "data/maps/SafariZone_Northeast/border.bin" - - .align 2 -SafariZone_Northeast_MapBlockdata: @ 8470D80 - .incbin "data/maps/SafariZone_Northeast/map.bin" - - .align 2 -SafariZone_Northeast_MapAttributes: @ 8471A00 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northeast_MapBorder - .4byte SafariZone_Northeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -SafariZone_Southeast_MapBorder: @ 8471A18 - .incbin "data/maps/SafariZone_Southeast/border.bin" - - .align 2 -SafariZone_Southeast_MapBlockdata: @ 8471A20 - .incbin "data/maps/SafariZone_Southeast/map.bin" - - .align 2 -SafariZone_Southeast_MapAttributes: @ 84726A0 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southeast_MapBorder - .4byte SafariZone_Southeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - - .align 2 -BattleFrontier_RankingHall_MapBorder: @ 84726B8 - .incbin "data/maps/BattleFrontier_RankingHall/border.bin" - - .align 2 -BattleFrontier_RankingHall_MapBlockdata: @ 84726C0 - .incbin "data/maps/BattleFrontier_RankingHall/map.bin" - - .align 2 -BattleFrontier_RankingHall_MapAttributes: @ 8472CF8 - .4byte 0x35 - .4byte 0xf - .4byte BattleFrontier_RankingHall_MapBorder - .4byte BattleFrontier_RankingHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontierRankingHall - - .align 2 -BattleFrontier_Lounge2_MapBorder: @ 8472D10 - .incbin "data/maps/BattleFrontier_Lounge2/border.bin" - - .align 2 -BattleFrontier_Lounge2_MapBlockdata: @ 8472D18 - .incbin "data/maps/BattleFrontier_Lounge2/map.bin" - - .align 2 -BattleFrontier_Lounge2_MapAttributes: @ 8472DE8 -BattleFrontier_Lounge5_MapAttributes: @ 8472DE8 - .4byte 0xd - .4byte 0x8 - .4byte BattleFrontier_Lounge2_MapBorder - .4byte BattleFrontier_Lounge2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_MapBorder: @ 8472E00 - .incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata: @ 8472E08 - .incbin "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes: @ 8472F54 - .4byte 0xf - .4byte 0xb - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_ReceptionGate_MapBorder: @ 8472F6C - .incbin "data/maps/BattleFrontier_ReceptionGate/border.bin" - - .align 2 -BattleFrontier_ReceptionGate_MapBlockdata: @ 8472F74 - .incbin "data/maps/BattleFrontier_ReceptionGate/map.bin" - - .align 2 -BattleFrontier_ReceptionGate_MapAttributes: @ 8473070 - .4byte 0x9 - .4byte 0xe - .4byte BattleFrontier_ReceptionGate_MapBorder - .4byte BattleFrontier_ReceptionGate_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontier - - .align 2 -ArtisanCave_B1F_MapBorder: @ 8473088 - .incbin "data/maps/ArtisanCave_B1F/border.bin" - - .align 2 -ArtisanCave_B1F_MapBlockdata: @ 8473090 - .incbin "data/maps/ArtisanCave_B1F/map.bin" - - .align 2 -ArtisanCave_B1F_MapAttributes: @ 84743F8 - .4byte 0x2e - .4byte 0x36 - .4byte ArtisanCave_B1F_MapBorder - .4byte ArtisanCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -ArtisanCave_1F_MapBorder: @ 8474410 - .incbin "data/maps/ArtisanCave_1F/border.bin" - - .align 2 -ArtisanCave_1F_MapBlockdata: @ 8474418 - .incbin "data/maps/ArtisanCave_1F/map.bin" - - .align 2 -ArtisanCave_1F_MapAttributes: @ 84747B4 - .4byte 0x15 - .4byte 0x16 - .4byte ArtisanCave_1F_MapBorder - .4byte ArtisanCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -FarawayIsland_Entrance_MapBorder: @ 84747CC - .incbin "data/maps/FarawayIsland_Entrance/border.bin" - - .align 2 -FarawayIsland_Entrance_MapBlockdata: @ 84747D4 - .incbin "data/maps/FarawayIsland_Entrance/map.bin" - - .align 2 -FarawayIsland_Entrance_MapAttributes: @ 847540C - .4byte 0x22 - .4byte 0x2e - .4byte FarawayIsland_Entrance_MapBorder - .4byte FarawayIsland_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - - .align 2 -FarawayIsland_Interior_MapBorder: @ 8475424 - .incbin "data/maps/FarawayIsland_Interior/border.bin" - - .align 2 -FarawayIsland_Interior_MapBlockdata: @ 847542C - .incbin "data/maps/FarawayIsland_Interior/map.bin" - - .align 2 -FarawayIsland_Interior_MapAttributes: @ 8475A10 - .4byte 0x1d - .4byte 0x1a - .4byte FarawayIsland_Interior_MapBorder - .4byte FarawayIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - - .align 2 -BirthIsland_Exterior_MapBorder: @ 8475A28 - .incbin "data/maps/BirthIsland_Exterior/border.bin" - - .align 2 -BirthIsland_Exterior_MapBlockdata: @ 8475A30 - .incbin "data/maps/BirthIsland_Exterior/map.bin" - - .align 2 -BirthIsland_Exterior_MapAttributes: @ 8476138 - .4byte 0x1e - .4byte 0x1e - .4byte BirthIsland_Exterior_MapBorder - .4byte BirthIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -BirthIsland_Harbor_MapBorder: @ 8476150 - .incbin "data/maps/BirthIsland_Harbor/border.bin" - - .align 2 -BirthIsland_Harbor_MapBlockdata: @ 8476158 - .incbin "data/maps/BirthIsland_Harbor/map.bin" - - .align 2 -BirthIsland_Harbor_MapAttributes: @ 8476314 -NavelRock_Harbor_MapAttributes: @ 8476314 - .4byte 0x11 - .4byte 0xd - .4byte BirthIsland_Harbor_MapBorder - .4byte BirthIsland_Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_IslandHarbor - - .align 2 -Underwater_MarineCave_MapBorder: @ 847632C - .incbin "data/maps/Underwater_MarineCave/border.bin" - - .align 2 -Underwater_MarineCave_MapBlockdata: @ 8476334 - .incbin "data/maps/Underwater_MarineCave/map.bin" - - .align 2 -Underwater_MarineCave_MapAttributes: @ 84764C4 - .4byte 0x14 - .4byte 0xa - .4byte Underwater_MarineCave_MapBorder - .4byte Underwater_MarineCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -MarineCave_Entrance_MapBorder: @ 84764DC - .incbin "data/maps/MarineCave_Entrance/border.bin" - - .align 2 -MarineCave_Entrance_MapBlockdata: @ 84764E4 - .incbin "data/maps/MarineCave_Entrance/map.bin" - - .align 2 -MarineCave_Entrance_MapAttributes: @ 8476804 - .4byte 0x14 - .4byte 0x14 - .4byte MarineCave_Entrance_MapBorder - .4byte MarineCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -TerraCave_Entrance_MapBorder: @ 847681C - .incbin "data/maps/TerraCave_Entrance/border.bin" - - .align 2 -TerraCave_Entrance_MapBlockdata: @ 8476824 - .incbin "data/maps/TerraCave_Entrance/map.bin" - - .align 2 -TerraCave_Entrance_MapAttributes: @ 8476B44 - .4byte 0x14 - .4byte 0x14 - .4byte TerraCave_Entrance_MapBorder - .4byte TerraCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -TerraCave_End_MapBorder: @ 8476B5C - .incbin "data/maps/TerraCave_End/border.bin" - - .align 2 -TerraCave_End_MapBlockdata: @ 8476B64 - .incbin "data/maps/TerraCave_End/map.bin" - - .align 2 -TerraCave_End_MapAttributes: @ 84771B8 - .4byte 0x1b - .4byte 0x1e - .4byte TerraCave_End_MapBorder - .4byte TerraCave_End_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -Underwater6_MapBorder: @ 84771D0 - .incbin "data/maps/Underwater6/border.bin" - - .align 2 -Underwater6_MapBlockdata: @ 84771D8 - .incbin "data/maps/Underwater6/map.bin" - - .align 2 -Underwater6_MapAttributes: @ 8478AD8 - .4byte 0x28 - .4byte 0x50 - .4byte Underwater6_MapBorder - .4byte Underwater6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater7_MapBorder: @ 8478AF0 - .incbin "data/maps/Underwater7/border.bin" - - .align 2 -Underwater7_MapBlockdata: @ 8478AF8 - .incbin "data/maps/Underwater7/map.bin" - - .align 2 -Underwater7_MapAttributes: @ 847A3F8 - .4byte 0x50 - .4byte 0x28 - .4byte Underwater7_MapBorder - .4byte Underwater7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -Underwater5_MapBorder: @ 847A410 - .incbin "data/maps/Underwater5/border.bin" - - .align 2 -Underwater5_MapBlockdata: @ 847A418 - .incbin "data/maps/Underwater5/map.bin" - - .align 2 -Underwater5_MapAttributes: @ 847BD18 - .4byte 0x50 - .4byte 0x28 - .4byte Underwater5_MapBorder - .4byte Underwater5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - - .align 2 -MarineCave_End_MapBorder: @ 847BD30 - .incbin "data/maps/MarineCave_End/border.bin" - - .align 2 -MarineCave_End_MapBlockdata: @ 847BD38 - .incbin "data/maps/MarineCave_End/map.bin" - - .align 2 -MarineCave_End_MapAttributes: @ 847C38C - .4byte 0x1b - .4byte 0x1e - .4byte MarineCave_End_MapBorder - .4byte MarineCave_End_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -TrainerHill_Entrance_MapBorder: @ 847C3A4 - .incbin "data/maps/TrainerHill_Entrance/border.bin" - - .align 2 -TrainerHill_Entrance_MapBlockdata: @ 847C3AC - .incbin "data/maps/TrainerHill_Entrance/map.bin" - - .align 2 -TrainerHill_Entrance_MapAttributes: @ 847C634 - .4byte 0x13 - .4byte 0x11 - .4byte TrainerHill_Entrance_MapBorder - .4byte TrainerHill_Entrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_1F_MapBorder: @ 847C64C - .incbin "data/maps/TrainerHill_1F/border.bin" - - .align 2 -TrainerHill_1F_MapBlockdata: @ 847C654 - .incbin "data/maps/TrainerHill_1F/map.bin" - - .align 2 -TrainerHill_1F_MapAttributes: @ 847C8F4 - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_1F_MapBorder - .4byte TrainerHill_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_2F_MapBorder: @ 847C90C - .incbin "data/maps/TrainerHill_2F/border.bin" - - .align 2 -TrainerHill_2F_MapBlockdata: @ 847C914 - .incbin "data/maps/TrainerHill_2F/map.bin" - - .align 2 -TrainerHill_2F_MapAttributes: @ 847CBB4 - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_2F_MapBorder - .4byte TrainerHill_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_3F_MapBorder: @ 847CBCC - .incbin "data/maps/TrainerHill_3F/border.bin" - - .align 2 -TrainerHill_3F_MapBlockdata: @ 847CBD4 - .incbin "data/maps/TrainerHill_3F/map.bin" - - .align 2 -TrainerHill_3F_MapAttributes: @ 847CE74 - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_3F_MapBorder - .4byte TrainerHill_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_4F_MapBorder: @ 847CE8C - .incbin "data/maps/TrainerHill_4F/border.bin" - - .align 2 -TrainerHill_4F_MapBlockdata: @ 847CE94 - .incbin "data/maps/TrainerHill_4F/map.bin" - - .align 2 -TrainerHill_4F_MapAttributes: @ 847D134 - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_4F_MapBorder - .4byte TrainerHill_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -TrainerHill_Roof_MapBorder: @ 847D14C - .incbin "data/maps/TrainerHill_Roof/border.bin" - - .align 2 -TrainerHill_Roof_MapBlockdata: @ 847D154 - .incbin "data/maps/TrainerHill_Roof/map.bin" - - .align 2 -TrainerHill_Roof_MapAttributes: @ 847D474 - .4byte 0x19 - .4byte 0x10 - .4byte TrainerHill_Roof_MapBorder - .4byte TrainerHill_Roof_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - - .align 2 -AlteringCave_MapBorder: @ 847D48C - .incbin "data/maps/AlteringCave/border.bin" - - .align 2 -AlteringCave_MapBlockdata: @ 847D494 - .incbin "data/maps/AlteringCave/map.bin" - - .align 2 -AlteringCave_MapAttributes: @ 847DA94 - .4byte 0x20 - .4byte 0x18 - .4byte AlteringCave_MapBorder - .4byte AlteringCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - - .align 2 -NavelRock_Exterior_MapBorder: @ 847DAAC - .incbin "data/maps/NavelRock_Exterior/border.bin" - - .align 2 -NavelRock_Exterior_MapBlockdata: @ 847DAB4 - .incbin "data/maps/NavelRock_Exterior/map.bin" - - .align 2 -NavelRock_Exterior_MapAttributes: @ 847DEA4 - .4byte 0x15 - .4byte 0x18 - .4byte NavelRock_Exterior_MapBorder - .4byte NavelRock_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - - .align 2 -NavelRock_Entrance_MapBorder: @ 847DEBC - .incbin "data/maps/NavelRock_Entrance/border.bin" - - .align 2 -NavelRock_Entrance_MapBlockdata: @ 847DEC4 - .incbin "data/maps/NavelRock_Entrance/map.bin" - - .align 2 -NavelRock_Entrance_MapAttributes: @ 847E404 - .4byte 0x15 - .4byte 0x20 - .4byte NavelRock_Entrance_MapBorder - .4byte NavelRock_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Top_MapBorder: @ 847E41C - .incbin "data/maps/NavelRock_Top/border.bin" - - .align 2 -NavelRock_Top_MapBlockdata: @ 847E424 - .incbin "data/maps/NavelRock_Top/map.bin" - - .align 2 -NavelRock_Top_MapAttributes: @ 847E99C - .4byte 0x19 - .4byte 0x1c - .4byte NavelRock_Top_MapBorder - .4byte NavelRock_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Bottom_MapBorder: @ 847E9B4 - .incbin "data/maps/NavelRock_Bottom/border.bin" - - .align 2 -NavelRock_Bottom_MapBlockdata: @ 847E9BC - .incbin "data/maps/NavelRock_Bottom/map.bin" - - .align 2 -NavelRock_Bottom_MapAttributes: @ 847ED84 - .4byte 0x16 - .4byte 0x16 - .4byte NavelRock_Bottom_MapBorder - .4byte NavelRock_Bottom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Up1_MapBorder: @ 847ED9C - .incbin "data/maps/NavelRock_Up1/border.bin" - - .align 2 -NavelRock_Up1_MapBlockdata: @ 847EDA4 - .incbin "data/maps/NavelRock_Up1/map.bin" - - .align 2 -NavelRock_Down01_MapAttributes: @ 847EE34 -NavelRock_Down03_MapAttributes: @ 847EE34 -NavelRock_Down05_MapAttributes: @ 847EE34 -NavelRock_Down07_MapAttributes: @ 847EE34 -NavelRock_Down09_MapAttributes: @ 847EE34 -NavelRock_Down11_MapAttributes: @ 847EE34 -NavelRock_Up1_MapAttributes: @ 847EE34 -NavelRock_Up3_MapAttributes: @ 847EE34 - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_Up1_MapBorder - .4byte NavelRock_Up1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Up2_MapBorder: @ 847EE4C - .incbin "data/maps/NavelRock_Up2/border.bin" - - .align 2 -NavelRock_Up2_MapBlockdata: @ 847EE54 - .incbin "data/maps/NavelRock_Up2/map.bin" - - .align 2 -NavelRock_Down02_MapAttributes: @ 847EEE4 -NavelRock_Down04_MapAttributes: @ 847EEE4 -NavelRock_Down06_MapAttributes: @ 847EEE4 -NavelRock_Down08_MapAttributes: @ 847EEE4 -NavelRock_Down10_MapAttributes: @ 847EEE4 -NavelRock_Up2_MapAttributes: @ 847EEE4 -NavelRock_Up4_MapAttributes: @ 847EEE4 - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_Up2_MapBorder - .4byte NavelRock_Up2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_B1F_MapBorder: @ 847EEFC - .incbin "data/maps/NavelRock_B1F/border.bin" - - .align 2 -NavelRock_B1F_MapBlockdata: @ 847EF04 - .incbin "data/maps/NavelRock_B1F/map.bin" - - .align 2 -NavelRock_B1F_MapAttributes: @ 847F100 - .4byte 0x17 - .4byte 0xb - .4byte NavelRock_B1F_MapBorder - .4byte NavelRock_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -NavelRock_Fork_MapBorder: @ 847F118 - .incbin "data/maps/NavelRock_Fork/border.bin" - - .align 2 -NavelRock_Fork_MapBlockdata: @ 847F120 - .incbin "data/maps/NavelRock_Fork/map.bin" - - .align 2 -NavelRock_Fork_MapAttributes: @ 8480344 - .4byte 0x1b - .4byte 0x56 - .4byte NavelRock_Fork_MapBorder - .4byte NavelRock_Fork_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - - .align 2 -BattleFrontier_Lounge1_MapBorder: @ 848035C - .incbin "data/maps/BattleFrontier_Lounge1/border.bin" - - .align 2 -BattleFrontier_Lounge1_MapBlockdata: @ 8480364 - .incbin "data/maps/BattleFrontier_Lounge1/map.bin" - - .align 2 -BattleFrontier_Lounge1_MapAttributes: @ 8480418 -BattleFrontier_Lounge3_MapAttributes: @ 8480418 -BattleFrontier_Lounge4_MapAttributes: @ 8480418 -BattleFrontier_Lounge6_MapAttributes: @ 8480418 -BattleFrontier_Lounge7_MapAttributes: @ 8480418 -BattleFrontier_Lounge8_MapAttributes: @ 8480418 -BattleFrontier_Lounge9_MapAttributes: @ 8480418 - .4byte 0x9 - .4byte 0xa - .4byte BattleFrontier_Lounge1_MapBorder - .4byte BattleFrontier_Lounge1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -BattleFrontier_ScottsHouse_MapBorder: @ 8480430 - .incbin "data/maps/BattleFrontier_ScottsHouse/border.bin" - - .align 2 -BattleFrontier_ScottsHouse_MapBlockdata: @ 8480438 - .incbin "data/maps/BattleFrontier_ScottsHouse/map.bin" - - .align 2 -BattleFrontier_ScottsHouse_MapAttributes: @ 8480498 - .4byte 0x6 - .4byte 0x8 - .4byte BattleFrontier_ScottsHouse_MapBorder - .4byte BattleFrontier_ScottsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - - .align 2 -MeteorFalls_StevensCave_MapBorder: @ 84804B0 - .incbin "data/maps/MeteorFalls_StevensCave/border.bin" - - .align 2 -MeteorFalls_StevensCave_MapBlockdata: @ 84804B8 - .incbin "data/maps/MeteorFalls_StevensCave/map.bin" - - .align 2 -MeteorFalls_StevensCave_MapAttributes: @ 8480C38 - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_StevensCave_MapBorder - .4byte MeteorFalls_StevensCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - - .align 2 -UnknownMapBorder_08480DAC: @ 8480C50 - .incbin "data/maps/UnknownMap_08480DAC/border.bin" - - .align 2 -UnknownMapBlockdata_08480DAC: @ 8480C58 - .incbin "data/maps/UnknownMap_08480DAC/map.bin" - - .align 2 -UnknownMapAttributes_08480DAC: @ 8480DAC - .4byte 0xD - .4byte 0xD - .4byte UnknownMapBorder_08480DAC - .4byte UnknownMapBlockdata_08480DAC - .4byte gTileset_Building - .4byte gTileset_Lab - - .align 2 -UnknownMapBorder_08480F54: @ 8480DC4 - .incbin "data/maps/UnknownMap_08480F54/border.bin" - - .align 2 -UnknownMapBlockdata_08480F54: @ 8480DCC - .incbin "data/maps/UnknownMap_08480F54/map.bin" - - .align 2 -UnknownMapAttributes_08480F54: @ 8480F54 - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_08480F54 - .4byte UnknownMapBlockdata_08480F54 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_084810FC: @ 8480F6C - .incbin "data/maps/UnknownMap_084810FC/border.bin" - - .align 2 -UnknownMapBlockdata_084810FC: @ 8480F74 - .incbin "data/maps/UnknownMap_084810FC/map.bin" - - .align 2 -UnknownMapAttributes_084810FC: @ 84810FC - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_084810FC - .4byte UnknownMapBlockdata_084810FC - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_084812A4: @ 8480F6C - .incbin "data/maps/UnknownMap_084812A4/border.bin" - - .align 2 -UnknownMapBlockdata_084812A4: @ 8480F74 - .incbin "data/maps/UnknownMap_084812A4/map.bin" - - .align 2 -UnknownMapAttributes_084812A4: @ 84812A4 - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_084812A4 - .4byte UnknownMapBlockdata_084812A4 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_0848144C: @ 848144C - .incbin "data/maps/UnknownMap_0848144C/border.bin" - - .align 2 -UnknownMapBlockdata_0848144C: @ 848144C - .incbin "data/maps/UnknownMap_0848144C/map.bin" - - .align 2 -UnknownMapAttributes_0848144C: @ 848144C - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_0848144C - .4byte UnknownMapBlockdata_0848144C - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_084815F4: @ 848144C - .incbin "data/maps/UnknownMap_084815F4/border.bin" - - .align 2 -UnknownMapBlockdata_084815F4: @ 848144C - .incbin "data/maps/UnknownMap_084815F4/map.bin" - - .align 2 -UnknownMapAttributes_084815F4: @ 84815F4 - .4byte 0xE - .4byte 0xE - .4byte UnknownMapBorder_084815F4 - .4byte UnknownMapBlockdata_084815F4 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -UnknownMapBorder_08481B24: @ 848160C - .incbin "data/maps/UnknownMap_08481B24/border.bin" - - .align 2 -UnknownMapBlockdata_08481B24: @ 8481614 - .incbin "data/maps/UnknownMap_08481B24/map.bin" - - .align 2 -UnknownMapAttributes_08481B24: @ 8481B24 - .4byte 0x1B - .4byte 0x18 - .4byte UnknownMapBorder_08481B24 - .4byte UnknownMapBlockdata_08481B24 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_MapBorder: @ 8481B3C - .incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/border.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_MapBlockdata: @ 8481B44 - .incbin "data/maps/SootopolisCity_MysteryEventsHouse_1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_MapAttributes: @ 8481BF4 - .4byte 0xb - .4byte 0x8 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_MapBorder: @ 8481C0C - .incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/border.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata: @ 8481C14 - .incbin "data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_MapAttributes: @ 8481CEC - .4byte 0xc - .4byte 0x9 - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - - .align 2 -UnknownMapBorder_08481DBC: @ 8481D04 - .incbin "data/maps/UnknownMap_08481DBC/border.bin" - - .align 2 -UnknownMapBlockdata_08481DBC: @ 8481D0C - .incbin "data/maps/UnknownMap_08481DBC/map.bin" - - .align 2 -UnknownMapAttributes_08481DBC: @ 8481DBC - .4byte 0xB - .4byte 0x8 - .4byte UnknownMapBorder_08481DBC - .4byte UnknownMapBlockdata_08481DBC - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc deleted file mode 100644 index ef25ba2b5..000000000 --- a/data/maps/attributes_table.inc +++ /dev/null @@ -1,444 +0,0 @@ - .align 2 -gMapAttributes:: @ 8481DD4 - .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 UnknownMapAttributes_08417FC4 - .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 OldaleTown_House1_MapAttributes - .4byte OldaleTown_House2_MapAttributes - .4byte OldaleTown_PokemonCenter_1F_MapAttributes - .4byte OldaleTown_PokemonCenter_2F_MapAttributes - .4byte OldaleTown_Mart_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_LeftoverRSContestLobby_MapAttributes - .4byte FallarborTown_LeftoverRSContestHall_MapAttributes - .4byte LilycoveCity_House2_MapAttributes - .4byte UnknownMapAttributes_08428450 - .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_084294C4 - .4byte UnknownMapAttributes_084294E8 - .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 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_Hall1_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_UnusedRubySapphireMap1_MapAttributes - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapAttributes - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapAttributes - .4byte CaveOfOrigin_B1F_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_0843E6C0 @ unused maps - .4byte UnknownMapAttributes_0843E6E4 - .4byte UnknownMapAttributes_0843E708 - .4byte UnknownMapAttributes_0843E72C - .4byte UnknownMapAttributes_0843E750 - .4byte UnknownMapAttributes_0843E774 - .4byte UnknownMapAttributes_0843E798 - .4byte UnknownMapAttributes_0843E7BC - .4byte UnknownMapAttributes_0843E7E0 - .4byte UnknownMapAttributes_0843E804 - .4byte UnknownMapAttributes_0843E828 - .4byte UnknownMapAttributes_0843E84C - .4byte UnknownMapAttributes_0843E870 - .4byte UnknownMapAttributes_0843E894 - .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_North_MapAttributes - .4byte SafariZone_Southwest_MapAttributes - .4byte SafariZone_South_MapAttributes - .4byte UnknownMapAttributes_08447028 - .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_SeasideCyclingRoadEntrance1_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 BattleFrontier_BattleTowerLobby_MapAttributes - .4byte BattleFrontier_OutsideWest_MapAttributes - .4byte BattleFrontier_BattleTowerElevator_MapAttributes - .4byte BattleFrontier_BattleTowerCorridor_MapAttributes - .4byte BattleFrontier_BattleTowerBattleRoom_MapAttributes - .4byte RustboroCity_DevonCorp_3F_MapAttributes - .4byte EverGrandeCity_PokemonLeague_1F_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_LotadAndSeedotHouse_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_0845A394 - .4byte RustboroCity_Flat1_1F_MapAttributes - .4byte RustboroCity_Flat1_2F_MapAttributes - .4byte EverGrandeCity_Hall4_MapAttributes - .4byte AquaHideout_UnusedRubyMap1_MapAttributes - .4byte AquaHideout_UnusedRubyMap2_MapAttributes - .4byte AquaHideout_UnusedRubyMap3_MapAttributes - .4byte UnknownMapAttributes_0845D470 - .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_0845ECB4 - .4byte MossdeepCity_StevensHouse_MapAttributes - .4byte ShoalCave_LowTideIceRoom_MapAttributes - .4byte SafariZone_RestHouse_MapAttributes - .4byte SkyPillar_5F_MapAttributes - .4byte SkyPillar_Top_MapAttributes - .4byte BattleFrontier_BattleDomeLobby_MapAttributes - .4byte BattleFrontier_BattleDomeCorridor_MapAttributes - .4byte BattleFrontier_BattleDomePreBattleRoom_MapAttributes - .4byte BattleFrontier_BattleDomeBattleRoom_MapAttributes - .4byte MagmaHideout_1F_MapAttributes - .4byte MagmaHideout_2F_1R_MapAttributes - .4byte MagmaHideout_2F_2R_MapAttributes - .4byte MagmaHideout_3F_1R_MapAttributes - .4byte MagmaHideout_3F_2R_MapAttributes - .4byte MagmaHideout_4F_MapAttributes - .4byte BattleFrontier_BattlePalaceLobby_MapAttributes - .4byte BattleFrontier_BattlePalaceCorridor_MapAttributes - .4byte BattleFrontier_BattlePalaceBattleRoom_MapAttributes - .4byte BattleFrontier_OutsideEast_MapAttributes - .4byte BattleFrontier_BattleFactoryLobby_MapAttributes - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapAttributes - .4byte BattleFrontier_BattleFactoryBattleRoom_MapAttributes - .4byte BattleFrontier_BattlePikeLobby_MapAttributes - .4byte BattleFrontier_BattlePikeCorridor_MapAttributes - .4byte BattleFrontier_BattlePikeThreePathRoom_MapAttributes - .4byte BattleFrontier_BattlePikeRandomRoom1_MapAttributes - .4byte BattleFrontier_BattlePikeRandomRoom2_MapAttributes - .4byte BattleFrontier_BattleArenaLobby_MapAttributes - .4byte BattleFrontier_BattleArenaCorridor_MapAttributes - .4byte BattleFrontier_BattleArenaBattleRoom_MapAttributes - .4byte UnknownMapAttributes_08469200 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapAttributes - .4byte UnknownMapAttributes_084693AC - .4byte BattleFrontier_BattlePyramidLobby_MapAttributes - .4byte BattleFrontier_BattlePyramidEmptySquare_MapAttributes - .4byte BattlePyramidSquare01_MapAttributes - .4byte BattlePyramidSquare02_MapAttributes - .4byte BattlePyramidSquare03_MapAttributes - .4byte BattlePyramidSquare04_MapAttributes - .4byte BattlePyramidSquare05_MapAttributes - .4byte BattlePyramidSquare06_MapAttributes - .4byte BattlePyramidSquare07_MapAttributes - .4byte BattlePyramidSquare08_MapAttributes - .4byte BattlePyramidSquare09_MapAttributes - .4byte BattlePyramidSquare10_MapAttributes - .4byte BattlePyramidSquare11_MapAttributes - .4byte BattlePyramidSquare12_MapAttributes - .4byte BattlePyramidSquare13_MapAttributes - .4byte BattlePyramidSquare14_MapAttributes - .4byte BattlePyramidSquare15_MapAttributes - .4byte BattlePyramidSquare16_MapAttributes - .4byte BattleFrontier_BattlePyramidTop_MapAttributes - .4byte MagmaHideout_3F_3R_MapAttributes - .4byte MagmaHideout_2F_3R_MapAttributes - .4byte MirageTower_1F_MapAttributes - .4byte MirageTower_2F_MapAttributes - .4byte MirageTower_3F_MapAttributes - .4byte FallarborTown_BattleTentLobby_MapAttributes - .4byte FallarborTown_BattleTentCorridor_MapAttributes - .4byte FallarborTown_BattleTentBattleRoom_MapAttributes - .4byte VerdanturfTown_BattleTentBattleRoom_MapAttributes - .4byte MirageTower_4F_MapAttributes - .4byte DesertUnderpass_MapAttributes - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapAttributes - .4byte BattleFrontier_BattleTowerCorridor2_MapAttributes - .4byte UnknownMapAttributes_08470BD8 - .4byte UnionRoom_MapAttributes - .4byte SafariZone_Northeast_MapAttributes - .4byte SafariZone_Southeast_MapAttributes - .4byte BattleFrontier_RankingHall_MapAttributes - .4byte BattleFrontier_Lounge2_MapAttributes - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapAttributes - .4byte BattleFrontier_ReceptionGate_MapAttributes - .4byte ArtisanCave_B1F_MapAttributes - .4byte ArtisanCave_1F_MapAttributes - .4byte FarawayIsland_Entrance_MapAttributes - .4byte FarawayIsland_Interior_MapAttributes - .4byte BirthIsland_Exterior_MapAttributes - .4byte BirthIsland_Harbor_MapAttributes - .4byte Underwater_MarineCave_MapAttributes - .4byte MarineCave_Entrance_MapAttributes - .4byte TerraCave_Entrance_MapAttributes - .4byte TerraCave_End_MapAttributes - .4byte Underwater6_MapAttributes - .4byte Underwater7_MapAttributes - .4byte Underwater5_MapAttributes - .4byte MarineCave_End_MapAttributes - .4byte TrainerHill_Entrance_MapAttributes - .4byte TrainerHill_1F_MapAttributes - .4byte TrainerHill_2F_MapAttributes - .4byte TrainerHill_3F_MapAttributes - .4byte TrainerHill_4F_MapAttributes - .4byte TrainerHill_Roof_MapAttributes - .4byte AlteringCave_MapAttributes - .4byte NavelRock_Exterior_MapAttributes - .4byte NavelRock_Entrance_MapAttributes - .4byte NavelRock_Top_MapAttributes - .4byte NavelRock_Bottom_MapAttributes - .4byte NavelRock_Up1_MapAttributes - .4byte NavelRock_Up2_MapAttributes - .4byte NavelRock_B1F_MapAttributes - .4byte NavelRock_Fork_MapAttributes - .4byte BattleFrontier_Lounge1_MapAttributes - .4byte BattleFrontier_ScottsHouse_MapAttributes - .4byte MeteorFalls_StevensCave_MapAttributes - .4byte UnknownMapAttributes_08480DAC - .4byte UnknownMapAttributes_08480F54 - .4byte UnknownMapAttributes_084810FC - .4byte UnknownMapAttributes_084812A4 - .4byte UnknownMapAttributes_0848144C - .4byte UnknownMapAttributes_084815F4 - .4byte UnknownMapAttributes_08481B24 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapAttributes - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapAttributes - .4byte UnknownMapAttributes_08481DBC - diff --git a/data/maps/_groups.inc b/data/maps/groups.inc index f7fc7be89..f7fc7be89 100644 --- a/data/maps/_groups.inc +++ b/data/maps/groups.inc |