diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 17:42:34 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 19:54:21 -0500 |
| commit | 91ee3221b3a4885d155ad2cca16b7678062ad18a (patch) | |
| tree | 6a8d0a92db8bc9867058f1e553b1bab8db2494da | |
| parent | 5e00c0bfcf54271b392dd1b83a901c7d623ce704 (diff) | |
Formatting
442 files changed, 572 insertions, 1013 deletions
diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc index 8a123be4c..d9e122ef2 100644 --- a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc +++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_CaptainsOffice_MapBorder:: .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin" - .align 2 AbandonedShip_CaptainsOffice_MapBlockdata:: .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_CaptainsOffice_Layout:: .4byte AbandonedShip_CaptainsOffice_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc index f3704b1cc..d5fd22578 100644 --- a/data/layouts/AbandonedShip_Corridors_1F/layout.inc +++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ AbandonedShip_Corridors_1F_Layout:: .4byte AbandonedShip_Corridors_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc index 131caed67..7299aa6f8 100644 --- a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ AbandonedShip_Corridors_B1F_Layout:: .4byte AbandonedShip_Corridors_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc index 81b598fb4..7f0baaaec 100644 --- a/data/layouts/AbandonedShip_Deck/layout.inc +++ b/data/layouts/AbandonedShip_Deck/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Deck_MapBorder:: .incbin "data/layouts/AbandonedShip_Deck/border.bin" - .align 2 AbandonedShip_Deck_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Deck/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Deck_Layout:: .4byte AbandonedShip_Deck_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc index 1f7d3117a..0ee7aa755 100644 --- a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_HiddenFloorCorridors_MapBorder:: .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin" - .align 2 AbandonedShip_HiddenFloorCorridors_MapBlockdata:: .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_HiddenFloorCorridors_Layout:: .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc index d7b36dd8b..bf2f758d7 100644 --- a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_HiddenFloorRooms_MapBorder:: .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin" - .align 2 AbandonedShip_HiddenFloorRooms_MapBlockdata:: .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_HiddenFloorRooms_Layout:: .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc index 62c4127f8..fdd5b395d 100644 --- a/data/layouts/AbandonedShip_Room_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ AbandonedShip_Room_B1F_Layout:: .4byte AbandonedShip_Room_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc index 26789691e..d15652cc0 100644 --- a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ AbandonedShip_Rooms2_1F_Layout:: .4byte AbandonedShip_Rooms2_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc index 35b92addd..d99e43f47 100644 --- a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ AbandonedShip_Rooms2_B1F_Layout:: .4byte AbandonedShip_Rooms2_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc index 0109a26f0..63e4a716a 100644 --- a/data/layouts/AbandonedShip_Rooms_1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ AbandonedShip_Rooms_1F_Layout:: .4byte AbandonedShip_Rooms_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc index 40ef7680a..ab688d668 100644 --- a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ AbandonedShip_Rooms_B1F_Layout:: .4byte AbandonedShip_Rooms_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc index 5619d0dba..8fa1b1485 100644 --- a/data/layouts/AbandonedShip_Underwater1/layout.inc +++ b/data/layouts/AbandonedShip_Underwater1/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Underwater1_MapBorder:: .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" - .align 2 AbandonedShip_Underwater1_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Underwater1_Layout:: .4byte AbandonedShip_Underwater1_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc index 1d123c8c7..feea82d16 100644 --- a/data/layouts/AbandonedShip_Underwater2/layout.inc +++ b/data/layouts/AbandonedShip_Underwater2/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Underwater2_MapBorder:: .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" - .align 2 AbandonedShip_Underwater2_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Underwater2_Layout:: .4byte AbandonedShip_Underwater2_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc index e69cc1dd0..9f03e7d87 100644 --- a/data/layouts/AlteringCave/layout.inc +++ b/data/layouts/AlteringCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 AlteringCave_MapBorder:: .incbin "data/layouts/AlteringCave/border.bin" - .align 2 AlteringCave_MapBlockdata:: .incbin "data/layouts/AlteringCave/map.bin" @@ -14,3 +12,4 @@ AlteringCave_Layout:: .4byte AlteringCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc index 7aabb07cc..ad173f936 100644 --- a/data/layouts/AncientTomb/layout.inc +++ b/data/layouts/AncientTomb/layout.inc @@ -1,8 +1,6 @@ - .align 2 AncientTomb_MapBorder:: .incbin "data/layouts/AncientTomb/border.bin" - .align 2 AncientTomb_MapBlockdata:: .incbin "data/layouts/AncientTomb/map.bin" @@ -14,3 +12,4 @@ AncientTomb_Layout:: .4byte AncientTomb_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc index 645be578f..5508a668b 100644 --- a/data/layouts/AquaHideout_1F/layout.inc +++ b/data/layouts/AquaHideout_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_1F_MapBorder:: .incbin "data/layouts/AquaHideout_1F/border.bin" - .align 2 AquaHideout_1F_MapBlockdata:: .incbin "data/layouts/AquaHideout_1F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_1F_Layout:: .4byte AquaHideout_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc index 10cfd2d9b..0889e548a 100644 --- a/data/layouts/AquaHideout_B1F/layout.inc +++ b/data/layouts/AquaHideout_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_B1F_MapBorder:: .incbin "data/layouts/AquaHideout_B1F/border.bin" - .align 2 AquaHideout_B1F_MapBlockdata:: .incbin "data/layouts/AquaHideout_B1F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_B1F_Layout:: .4byte AquaHideout_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc index 188e51fcc..9e335e5d9 100644 --- a/data/layouts/AquaHideout_B2F/layout.inc +++ b/data/layouts/AquaHideout_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_B2F_MapBorder:: .incbin "data/layouts/AquaHideout_B2F/border.bin" - .align 2 AquaHideout_B2F_MapBlockdata:: .incbin "data/layouts/AquaHideout_B2F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_B2F_Layout:: .4byte AquaHideout_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc index 643993a22..05862b275 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap1_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin" - .align 2 AquaHideout_UnusedRubyMap1_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap1_Layout:: .4byte AquaHideout_UnusedRubyMap1_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc index 6fdf6b31c..e9e08ab97 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap2_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin" - .align 2 AquaHideout_UnusedRubyMap2_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap2_Layout:: .4byte AquaHideout_UnusedRubyMap2_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc index 070fb2bac..44b35666f 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap3_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin" - .align 2 AquaHideout_UnusedRubyMap3_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap3_Layout:: .4byte AquaHideout_UnusedRubyMap3_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc index 7a5d63690..b32eef422 100644 --- a/data/layouts/ArtisanCave_1F/layout.inc +++ b/data/layouts/ArtisanCave_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 ArtisanCave_1F_MapBorder:: .incbin "data/layouts/ArtisanCave_1F/border.bin" - .align 2 ArtisanCave_1F_MapBlockdata:: .incbin "data/layouts/ArtisanCave_1F/map.bin" @@ -14,3 +12,4 @@ ArtisanCave_1F_Layout:: .4byte ArtisanCave_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc index 97e409473..2640303e3 100644 --- a/data/layouts/ArtisanCave_B1F/layout.inc +++ b/data/layouts/ArtisanCave_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 ArtisanCave_B1F_MapBorder:: .incbin "data/layouts/ArtisanCave_B1F/border.bin" - .align 2 ArtisanCave_B1F_MapBlockdata:: .incbin "data/layouts/ArtisanCave_B1F/map.bin" @@ -14,3 +12,4 @@ ArtisanCave_B1F_Layout:: .4byte ArtisanCave_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc index b101dbdda..374af9ffa 100644 --- a/data/layouts/BattleElevator/layout.inc +++ b/data/layouts/BattleElevator/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleElevator_MapBorder:: .incbin "data/layouts/BattleElevator/border.bin" - .align 2 BattleElevator_MapBlockdata:: .incbin "data/layouts/BattleElevator/map.bin" @@ -14,3 +12,4 @@ BattleElevator_Layout:: .4byte BattleElevator_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc index 6b0f61b5f..89f799d84 100644 --- a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin" - .align 2 BattleFrontier_BattleArenaBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaBattleRoom_Layout:: .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc index c984be1fb..8961ed778 100644 --- a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin" - .align 2 BattleFrontier_BattleArenaCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaCorridor_Layout:: .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc index bda4799ec..305fcc0d9 100644 --- a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin" - .align 2 BattleFrontier_BattleArenaLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaLobby_Layout:: .4byte BattleFrontier_BattleArenaLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc index 3ed732898..a4991ae0c 100644 --- a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin" - .align 2 BattleFrontier_BattleDomeBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeBattleRoom_Layout:: .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc index f4354caf0..7f3c93b82 100644 --- a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin" - .align 2 BattleFrontier_BattleDomeCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeCorridor_Layout:: .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc index d9127802a..2553e7098 100644 --- a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin" - .align 2 BattleFrontier_BattleDomeLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeLobby_Layout:: .4byte BattleFrontier_BattleDomeLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc index 4ac7a79df..8c0fe2ce5 100644 --- a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomePreBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin" - .align 2 BattleFrontier_BattleDomePreBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomePreBattleRoom_Layout:: .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc index 35b8a1dec..21ba6a015 100644 --- a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin" - .align 2 BattleFrontier_BattleFactoryBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryBattleRoom_Layout:: .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc index 2071dd54a..cc0a33611 100644 --- a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin" - .align 2 BattleFrontier_BattleFactoryLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryLobby_Layout:: .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc index f458fb9c2..fc4fc49bc 100644 --- a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" - .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryPreBattleRoom_Layout:: .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc index 2a570bbd7..3d9acc3c4 100644 --- a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin" - .align 2 BattleFrontier_BattlePalaceBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceBattleRoom_Layout:: .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc index b76b87cb5..2d16216c5 100644 --- a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin" - .align 2 BattleFrontier_BattlePalaceCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceCorridor_Layout:: .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata .4byte gTileset_General .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc index 08c904db8..f9a1dad7b 100644 --- a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin" - .align 2 BattleFrontier_BattlePalaceLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceLobby_Layout:: .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc index 7dd3dcbaa..1d6d21778 100644 --- a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin" - .align 2 BattleFrontier_BattlePikeCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeCorridor_Layout:: .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc index a1bd10dd3..3a5cd3538 100644 --- a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin" - .align 2 BattleFrontier_BattlePikeLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeLobby_Layout:: .4byte BattleFrontier_BattlePikeLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc index c860deb93..466ad0ff4 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom1_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom1_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom1_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc index 1ad2a90cc..1c7fb35d4 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom2_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom2_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc index b60e07361..ce17a0bf6 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom3_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom3_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom3_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc index d4f99085b..d7a082d13 100644 --- a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeThreePathRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin" - .align 2 BattleFrontier_BattlePikeThreePathRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeThreePathRoom_Layout:: .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc index 8a991e45d..a65e7928b 100644 --- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc +++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" - .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePointExchangeServiceCorner_Layout:: .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc index 2097173cc..a9e779ddb 100644 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidEmptySquare_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin" - .align 2 BattleFrontier_BattlePyramidEmptySquare_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidEmptySquare_Layout:: .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc index ecdceec7f..28575776a 100644 --- a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin" - .align 2 BattleFrontier_BattlePyramidLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidLobby_Layout:: .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc index e96259589..4657c37a3 100644 --- a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidTop_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin" - .align 2 BattleFrontier_BattlePyramidTop_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidTop_Layout:: .4byte BattleFrontier_BattlePyramidTop_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc index 8738d81e1..3d498239a 100644 --- a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin" - .align 2 BattleFrontier_BattleTowerBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerBattleRoom_Layout:: .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc index c54c38812..56335aa23 100644 --- a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin" - .align 2 BattleFrontier_BattleTowerCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerCorridor_Layout:: .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc index 9e822f0f9..7dba3777c 100644 --- a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerCorridor2_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin" - .align 2 BattleFrontier_BattleTowerCorridor2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerCorridor2_Layout:: .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc index dc3733bc0..790ff3bcd 100644 --- a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin" - .align 2 BattleFrontier_BattleTowerLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerLobby_Layout:: .4byte BattleFrontier_BattleTowerLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc index dbd77c420..df5615873 100644 --- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" - .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerMultiBattleRoom_Layout:: .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc index cc22cc8d7..c25b3b2a0 100644 --- a/data/layouts/BattleFrontier_Lounge1/layout.inc +++ b/data/layouts/BattleFrontier_Lounge1/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_Lounge1_MapBorder:: .incbin "data/layouts/BattleFrontier_Lounge1/border.bin" - .align 2 BattleFrontier_Lounge1_MapBlockdata:: .incbin "data/layouts/BattleFrontier_Lounge1/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_Lounge1_Layout:: .4byte BattleFrontier_Lounge1_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc index 1f8df21ae..b735b4994 100644 --- a/data/layouts/BattleFrontier_Lounge2/layout.inc +++ b/data/layouts/BattleFrontier_Lounge2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_Lounge2_MapBorder:: .incbin "data/layouts/BattleFrontier_Lounge2/border.bin" - .align 2 BattleFrontier_Lounge2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_Lounge2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_Lounge2_Layout:: .4byte BattleFrontier_Lounge2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc index e79db8ee7..ddaf20446 100644 --- a/data/layouts/BattleFrontier_OutsideEast/layout.inc +++ b/data/layouts/BattleFrontier_OutsideEast/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_OutsideEast_MapBorder:: .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin" - .align 2 BattleFrontier_OutsideEast_MapBlockdata:: .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_OutsideEast_Layout:: .4byte BattleFrontier_OutsideEast_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontierOutsideEast + diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc index 0644d4b2b..a506e554f 100644 --- a/data/layouts/BattleFrontier_OutsideWest/layout.inc +++ b/data/layouts/BattleFrontier_OutsideWest/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_OutsideWest_MapBorder:: .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin" - .align 2 BattleFrontier_OutsideWest_MapBlockdata:: .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_OutsideWest_Layout:: .4byte BattleFrontier_OutsideWest_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontierOutsideWest + diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc index 03639f203..d7615e693 100644 --- a/data/layouts/BattleFrontier_RankingHall/layout.inc +++ b/data/layouts/BattleFrontier_RankingHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_RankingHall_MapBorder:: .incbin "data/layouts/BattleFrontier_RankingHall/border.bin" - .align 2 BattleFrontier_RankingHall_MapBlockdata:: .incbin "data/layouts/BattleFrontier_RankingHall/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_RankingHall_Layout:: .4byte BattleFrontier_RankingHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontierRankingHall + diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc index 11beca5e5..3dd4aeaa5 100644 --- a/data/layouts/BattleFrontier_ReceptionGate/layout.inc +++ b/data/layouts/BattleFrontier_ReceptionGate/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_ReceptionGate_MapBorder:: .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin" - .align 2 BattleFrontier_ReceptionGate_MapBlockdata:: .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_ReceptionGate_Layout:: .4byte BattleFrontier_ReceptionGate_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc index 913d636d1..f08737109 100644 --- a/data/layouts/BattleFrontier_ScottsHouse/layout.inc +++ b/data/layouts/BattleFrontier_ScottsHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_ScottsHouse_MapBorder:: .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin" - .align 2 BattleFrontier_ScottsHouse_MapBlockdata:: .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_ScottsHouse_Layout:: .4byte BattleFrontier_ScottsHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc index 103f35b31..fe710cc40 100644 --- a/data/layouts/BattlePyramidSquare01/layout.inc +++ b/data/layouts/BattlePyramidSquare01/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare01_MapBorder:: .incbin "data/layouts/BattlePyramidSquare01/border.bin" - .align 2 BattlePyramidSquare01_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare01/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare01_Layout:: .4byte BattlePyramidSquare01_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc index c831af0a8..6aa5b7aa9 100644 --- a/data/layouts/BattlePyramidSquare02/layout.inc +++ b/data/layouts/BattlePyramidSquare02/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare02_MapBorder:: .incbin "data/layouts/BattlePyramidSquare02/border.bin" - .align 2 BattlePyramidSquare02_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare02/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare02_Layout:: .4byte BattlePyramidSquare02_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc index fb1da5213..4da41f9e9 100644 --- a/data/layouts/BattlePyramidSquare03/layout.inc +++ b/data/layouts/BattlePyramidSquare03/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare03_MapBorder:: .incbin "data/layouts/BattlePyramidSquare03/border.bin" - .align 2 BattlePyramidSquare03_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare03/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare03_Layout:: .4byte BattlePyramidSquare03_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc index b8b7ce24f..c298ee6f4 100644 --- a/data/layouts/BattlePyramidSquare04/layout.inc +++ b/data/layouts/BattlePyramidSquare04/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare04_MapBorder:: .incbin "data/layouts/BattlePyramidSquare04/border.bin" - .align 2 BattlePyramidSquare04_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare04/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare04_Layout:: .4byte BattlePyramidSquare04_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc index f6f61cd5f..87ce53274 100644 --- a/data/layouts/BattlePyramidSquare05/layout.inc +++ b/data/layouts/BattlePyramidSquare05/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare05_MapBorder:: .incbin "data/layouts/BattlePyramidSquare05/border.bin" - .align 2 BattlePyramidSquare05_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare05/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare05_Layout:: .4byte BattlePyramidSquare05_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc index 3774ce871..bcaeb89b0 100644 --- a/data/layouts/BattlePyramidSquare06/layout.inc +++ b/data/layouts/BattlePyramidSquare06/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare06_MapBorder:: .incbin "data/layouts/BattlePyramidSquare06/border.bin" - .align 2 BattlePyramidSquare06_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare06/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare06_Layout:: .4byte BattlePyramidSquare06_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc index cd5f16b0e..bb469b3c8 100644 --- a/data/layouts/BattlePyramidSquare07/layout.inc +++ b/data/layouts/BattlePyramidSquare07/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare07_MapBorder:: .incbin "data/layouts/BattlePyramidSquare07/border.bin" - .align 2 BattlePyramidSquare07_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare07/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare07_Layout:: .4byte BattlePyramidSquare07_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc index bc3ac3005..df88b710f 100644 --- a/data/layouts/BattlePyramidSquare08/layout.inc +++ b/data/layouts/BattlePyramidSquare08/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare08_MapBorder:: .incbin "data/layouts/BattlePyramidSquare08/border.bin" - .align 2 BattlePyramidSquare08_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare08/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare08_Layout:: .4byte BattlePyramidSquare08_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc index 1794f72b3..2869d9ac2 100644 --- a/data/layouts/BattlePyramidSquare09/layout.inc +++ b/data/layouts/BattlePyramidSquare09/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare09_MapBorder:: .incbin "data/layouts/BattlePyramidSquare09/border.bin" - .align 2 BattlePyramidSquare09_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare09/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare09_Layout:: .4byte BattlePyramidSquare09_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc index 49150f493..2ba8e8124 100644 --- a/data/layouts/BattlePyramidSquare10/layout.inc +++ b/data/layouts/BattlePyramidSquare10/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare10_MapBorder:: .incbin "data/layouts/BattlePyramidSquare10/border.bin" - .align 2 BattlePyramidSquare10_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare10/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare10_Layout:: .4byte BattlePyramidSquare10_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc index 8385b6f3a..190bddf10 100644 --- a/data/layouts/BattlePyramidSquare11/layout.inc +++ b/data/layouts/BattlePyramidSquare11/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare11_MapBorder:: .incbin "data/layouts/BattlePyramidSquare11/border.bin" - .align 2 BattlePyramidSquare11_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare11/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare11_Layout:: .4byte BattlePyramidSquare11_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc index a63f1dc34..199f66ace 100644 --- a/data/layouts/BattlePyramidSquare12/layout.inc +++ b/data/layouts/BattlePyramidSquare12/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare12_MapBorder:: .incbin "data/layouts/BattlePyramidSquare12/border.bin" - .align 2 BattlePyramidSquare12_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare12/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare12_Layout:: .4byte BattlePyramidSquare12_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc index 6f145fe96..351b04227 100644 --- a/data/layouts/BattlePyramidSquare13/layout.inc +++ b/data/layouts/BattlePyramidSquare13/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare13_MapBorder:: .incbin "data/layouts/BattlePyramidSquare13/border.bin" - .align 2 BattlePyramidSquare13_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare13/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare13_Layout:: .4byte BattlePyramidSquare13_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc index ec69a1b54..653ad161b 100644 --- a/data/layouts/BattlePyramidSquare14/layout.inc +++ b/data/layouts/BattlePyramidSquare14/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare14_MapBorder:: .incbin "data/layouts/BattlePyramidSquare14/border.bin" - .align 2 BattlePyramidSquare14_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare14/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare14_Layout:: .4byte BattlePyramidSquare14_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc index 29c5444f9..24090c671 100644 --- a/data/layouts/BattlePyramidSquare15/layout.inc +++ b/data/layouts/BattlePyramidSquare15/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare15_MapBorder:: .incbin "data/layouts/BattlePyramidSquare15/border.bin" - .align 2 BattlePyramidSquare15_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare15/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare15_Layout:: .4byte BattlePyramidSquare15_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc index cc2895943..67187b9bf 100644 --- a/data/layouts/BattlePyramidSquare16/layout.inc +++ b/data/layouts/BattlePyramidSquare16/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare16_MapBorder:: .incbin "data/layouts/BattlePyramidSquare16/border.bin" - .align 2 BattlePyramidSquare16_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare16/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare16_Layout:: .4byte BattlePyramidSquare16_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc index 97be7fdb4..4f9a8e626 100644 --- a/data/layouts/BattleTentBattleRoom/layout.inc +++ b/data/layouts/BattleTentBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentBattleRoom_MapBorder:: .incbin "data/layouts/BattleTentBattleRoom/border.bin" - .align 2 BattleTentBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleTentBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleTentBattleRoom_Layout:: .4byte BattleTentBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc index 21f6c94fd..9abcdefa4 100644 --- a/data/layouts/BattleTentCorridor/layout.inc +++ b/data/layouts/BattleTentCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentCorridor_MapBorder:: .incbin "data/layouts/BattleTentCorridor/border.bin" - .align 2 BattleTentCorridor_MapBlockdata:: .incbin "data/layouts/BattleTentCorridor/map.bin" @@ -14,3 +12,4 @@ BattleTentCorridor_Layout:: .4byte BattleTentCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc index a740ae2f9..a3216370f 100644 --- a/data/layouts/BattleTentLobby/layout.inc +++ b/data/layouts/BattleTentLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentLobby_MapBorder:: .incbin "data/layouts/BattleTentLobby/border.bin" - .align 2 BattleTentLobby_MapBlockdata:: .incbin "data/layouts/BattleTentLobby/map.bin" @@ -14,3 +12,4 @@ BattleTentLobby_Layout:: .4byte BattleTentLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc index 0fe3899ae..17dc4f0fb 100644 --- a/data/layouts/BirthIsland_Exterior/layout.inc +++ b/data/layouts/BirthIsland_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 BirthIsland_Exterior_MapBorder:: .incbin "data/layouts/BirthIsland_Exterior/border.bin" - .align 2 BirthIsland_Exterior_MapBlockdata:: .incbin "data/layouts/BirthIsland_Exterior/map.bin" @@ -14,3 +12,4 @@ BirthIsland_Exterior_Layout:: .4byte BirthIsland_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc index c2727063f..1113f89f2 100644 --- a/data/layouts/CableCarStation/layout.inc +++ b/data/layouts/CableCarStation/layout.inc @@ -1,8 +1,6 @@ - .align 2 CableCarStation_MapBorder:: .incbin "data/layouts/CableCarStation/border.bin" - .align 2 CableCarStation_MapBlockdata:: .incbin "data/layouts/CableCarStation/map.bin" @@ -14,3 +12,4 @@ CableCarStation_Layout:: .4byte CableCarStation_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc index d82ecddd0..616af1655 100644 --- a/data/layouts/CaveOfOrigin_1F/layout.inc +++ b/data/layouts/CaveOfOrigin_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_1F_MapBorder:: .incbin "data/layouts/CaveOfOrigin_1F/border.bin" - .align 2 CaveOfOrigin_1F_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_1F/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_1F_Layout:: .4byte CaveOfOrigin_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc index 41158462c..5850f15c9 100644 --- a/data/layouts/CaveOfOrigin_B1F/layout.inc +++ b/data/layouts/CaveOfOrigin_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_B1F_MapBorder:: .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" - .align 2 CaveOfOrigin_B1F_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_B1F_Layout:: .4byte CaveOfOrigin_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc index 3e6375d3e..11e230ce3 100644 --- a/data/layouts/CaveOfOrigin_Entrance/layout.inc +++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_Entrance_MapBorder:: .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" - .align 2 CaveOfOrigin_Entrance_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_Entrance_Layout:: .4byte CaveOfOrigin_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc index dfaf8b8a6..294bf786a 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap1_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc index 5caa1b9e5..c3a05f75f 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap2_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc index 6290452c0..cbc5c052a 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap3_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc index 6c4bff886..4d6e7571a 100644 --- a/data/layouts/DesertRuins/layout.inc +++ b/data/layouts/DesertRuins/layout.inc @@ -1,8 +1,6 @@ - .align 2 DesertRuins_MapBorder:: .incbin "data/layouts/DesertRuins/border.bin" - .align 2 DesertRuins_MapBlockdata:: .incbin "data/layouts/DesertRuins/map.bin" @@ -14,3 +12,4 @@ DesertRuins_Layout:: .4byte DesertRuins_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc index 3871e181e..9a17a128e 100644 --- a/data/layouts/DesertUnderpass/layout.inc +++ b/data/layouts/DesertUnderpass/layout.inc @@ -1,8 +1,6 @@ - .align 2 DesertUnderpass_MapBorder:: .incbin "data/layouts/DesertUnderpass/border.bin" - .align 2 DesertUnderpass_MapBlockdata:: .incbin "data/layouts/DesertUnderpass/map.bin" @@ -14,3 +12,4 @@ DesertUnderpass_Layout:: .4byte DesertUnderpass_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc index 077262836..28ccdc43c 100644 --- a/data/layouts/DewfordTown/layout.inc +++ b/data/layouts/DewfordTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_MapBorder:: .incbin "data/layouts/DewfordTown/border.bin" - .align 2 DewfordTown_MapBlockdata:: .incbin "data/layouts/DewfordTown/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Layout:: .4byte DewfordTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc index 89eb39936..bbada5bdc 100644 --- a/data/layouts/DewfordTown_Gym/layout.inc +++ b/data/layouts/DewfordTown_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_Gym_MapBorder:: .incbin "data/layouts/DewfordTown_Gym/border.bin" - .align 2 DewfordTown_Gym_MapBlockdata:: .incbin "data/layouts/DewfordTown_Gym/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Gym_Layout:: .4byte DewfordTown_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_DewfordGym + diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc index 59e88cd47..bd9cd03ae 100644 --- a/data/layouts/DewfordTown_Hall/layout.inc +++ b/data/layouts/DewfordTown_Hall/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_Hall_MapBorder:: .incbin "data/layouts/DewfordTown_Hall/border.bin" - .align 2 DewfordTown_Hall_MapBlockdata:: .incbin "data/layouts/DewfordTown_Hall/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Hall_Layout:: .4byte DewfordTown_Hall_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc index 9641fb2bf..61d112c1e 100644 --- a/data/layouts/DoubleBattleColosseum/layout.inc +++ b/data/layouts/DoubleBattleColosseum/layout.inc @@ -1,8 +1,6 @@ - .align 2 DoubleBattleColosseum_MapBorder:: .incbin "data/layouts/DoubleBattleColosseum/border.bin" - .align 2 DoubleBattleColosseum_MapBlockdata:: .incbin "data/layouts/DoubleBattleColosseum/map.bin" @@ -14,3 +12,4 @@ DoubleBattleColosseum_Layout:: .4byte DoubleBattleColosseum_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc index e12d3c259..16c02fbaa 100644 --- a/data/layouts/EverGrandeCity/layout.inc +++ b/data/layouts/EverGrandeCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_MapBorder:: .incbin "data/layouts/EverGrandeCity/border.bin" - .align 2 EverGrandeCity_MapBlockdata:: .incbin "data/layouts/EverGrandeCity/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_Layout:: .4byte EverGrandeCity_MapBlockdata .4byte gTileset_General .4byte gTileset_EverGrande + diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc index c92ee599d..dad4c7ef3 100644 --- a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc +++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_ChampionsRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" - .align 2 EverGrandeCity_ChampionsRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_ChampionsRoom_Layout:: .4byte EverGrandeCity_ChampionsRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc index 1cd96a760..9c140d49d 100644 --- a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc +++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_DrakesRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" - .align 2 EverGrandeCity_DrakesRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_DrakesRoom_Layout:: .4byte EverGrandeCity_DrakesRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc index 17031e546..bcd610d8c 100644 --- a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc +++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_GlaciasRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" - .align 2 EverGrandeCity_GlaciasRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_GlaciasRoom_Layout:: .4byte EverGrandeCity_GlaciasRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc index 169d5fda7..464fc8998 100644 --- a/data/layouts/EverGrandeCity_Hall4/layout.inc +++ b/data/layouts/EverGrandeCity_Hall4/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_Hall4_MapBorder:: .incbin "data/layouts/EverGrandeCity_Hall4/border.bin" - .align 2 EverGrandeCity_Hall4_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_Hall4/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_Hall4_Layout:: .4byte EverGrandeCity_Hall4_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc index f7442adde..deaa4429d 100644 --- a/data/layouts/EverGrandeCity_HallOfFame/layout.inc +++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_HallOfFame_MapBorder:: .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" - .align 2 EverGrandeCity_HallOfFame_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_HallOfFame_Layout:: .4byte EverGrandeCity_HallOfFame_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc index dc2847ed0..b02d5c312 100644 --- a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc +++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_PhoebesRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" - .align 2 EverGrandeCity_PhoebesRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_PhoebesRoom_Layout:: .4byte EverGrandeCity_PhoebesRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc index da1a3de82..d84e6449f 100644 --- a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ EverGrandeCity_PokemonLeague_1F_Layout:: .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc index b880ee439..2159c894d 100644 --- a/data/layouts/EverGrandeCity_ShortHall/layout.inc +++ b/data/layouts/EverGrandeCity_ShortHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_ShortHall_MapBorder:: .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin" - .align 2 EverGrandeCity_ShortHall_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_ShortHall_Layout:: .4byte EverGrandeCity_ShortHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc index f43fdae6b..86ffa16a1 100644 --- a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc +++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_SidneysRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" - .align 2 EverGrandeCity_SidneysRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_SidneysRoom_Layout:: .4byte EverGrandeCity_SidneysRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc index f8ba2bf1a..7f0894903 100644 --- a/data/layouts/FallarborTown/layout.inc +++ b/data/layouts/FallarborTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_MapBorder:: .incbin "data/layouts/FallarborTown/border.bin" - .align 2 FallarborTown_MapBlockdata:: .incbin "data/layouts/FallarborTown/map.bin" @@ -14,3 +12,4 @@ FallarborTown_Layout:: .4byte FallarborTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc index 70d1a079f..66acc546b 100644 --- a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_LeftoverRSContestHall_MapBorder:: .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin" - .align 2 FallarborTown_LeftoverRSContestHall_MapBlockdata:: .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" @@ -14,3 +12,4 @@ FallarborTown_LeftoverRSContestHall_Layout:: .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc index c30723a04..3ad232728 100644 --- a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_LeftoverRSContestLobby_MapBorder:: .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin" - .align 2 FallarborTown_LeftoverRSContestLobby_MapBlockdata:: .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" @@ -14,3 +12,4 @@ FallarborTown_LeftoverRSContestLobby_Layout:: .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc index 4a1c6c36b..c7d6bef91 100644 --- a/data/layouts/FarawayIsland_Entrance/layout.inc +++ b/data/layouts/FarawayIsland_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 FarawayIsland_Entrance_MapBorder:: .incbin "data/layouts/FarawayIsland_Entrance/border.bin" - .align 2 FarawayIsland_Entrance_MapBlockdata:: .incbin "data/layouts/FarawayIsland_Entrance/map.bin" @@ -14,3 +12,4 @@ FarawayIsland_Entrance_Layout:: .4byte FarawayIsland_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc index bf8cbdbf4..787dd53c9 100644 --- a/data/layouts/FarawayIsland_Interior/layout.inc +++ b/data/layouts/FarawayIsland_Interior/layout.inc @@ -1,8 +1,6 @@ - .align 2 FarawayIsland_Interior_MapBorder:: .incbin "data/layouts/FarawayIsland_Interior/border.bin" - .align 2 FarawayIsland_Interior_MapBlockdata:: .incbin "data/layouts/FarawayIsland_Interior/map.bin" @@ -14,3 +12,4 @@ FarawayIsland_Interior_Layout:: .4byte FarawayIsland_Interior_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc index 7fff04df1..c129ae715 100644 --- a/data/layouts/FieryPath/layout.inc +++ b/data/layouts/FieryPath/layout.inc @@ -1,8 +1,6 @@ - .align 2 FieryPath_MapBorder:: .incbin "data/layouts/FieryPath/border.bin" - .align 2 FieryPath_MapBlockdata:: .incbin "data/layouts/FieryPath/map.bin" @@ -14,3 +12,4 @@ FieryPath_Layout:: .4byte FieryPath_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc index e273287de..02564b36a 100644 --- a/data/layouts/FortreeCity/layout.inc +++ b/data/layouts/FortreeCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_MapBorder:: .incbin "data/layouts/FortreeCity/border.bin" - .align 2 FortreeCity_MapBlockdata:: .incbin "data/layouts/FortreeCity/map.bin" @@ -14,3 +12,4 @@ FortreeCity_Layout:: .4byte FortreeCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc index e4727cf75..6460a35b5 100644 --- a/data/layouts/FortreeCity_DecorationShop/layout.inc +++ b/data/layouts/FortreeCity_DecorationShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_DecorationShop_MapBorder:: .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" - .align 2 FortreeCity_DecorationShop_MapBlockdata:: .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" @@ -14,3 +12,4 @@ FortreeCity_DecorationShop_Layout:: .4byte FortreeCity_DecorationShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc index 81994276b..da7f1e73e 100644 --- a/data/layouts/FortreeCity_Gym/layout.inc +++ b/data/layouts/FortreeCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_Gym_MapBorder:: .incbin "data/layouts/FortreeCity_Gym/border.bin" - .align 2 FortreeCity_Gym_MapBlockdata:: .incbin "data/layouts/FortreeCity_Gym/map.bin" @@ -14,3 +12,4 @@ FortreeCity_Gym_Layout:: .4byte FortreeCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_FortreeGym + diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc index dd9962fde..214846c22 100644 --- a/data/layouts/FortreeCity_House1/layout.inc +++ b/data/layouts/FortreeCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_House1_MapBorder:: .incbin "data/layouts/FortreeCity_House1/border.bin" - .align 2 FortreeCity_House1_MapBlockdata:: .incbin "data/layouts/FortreeCity_House1/map.bin" @@ -14,3 +12,4 @@ FortreeCity_House1_Layout:: .4byte FortreeCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc index 5ab659b9a..3aa0898bf 100644 --- a/data/layouts/FortreeCity_House2/layout.inc +++ b/data/layouts/FortreeCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_House2_MapBorder:: .incbin "data/layouts/FortreeCity_House2/border.bin" - .align 2 FortreeCity_House2_MapBlockdata:: .incbin "data/layouts/FortreeCity_House2/map.bin" @@ -14,3 +12,4 @@ FortreeCity_House2_Layout:: .4byte FortreeCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc index 641310f75..009fd12f5 100644 --- a/data/layouts/GraniteCave_1F/layout.inc +++ b/data/layouts/GraniteCave_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_1F_MapBorder:: .incbin "data/layouts/GraniteCave_1F/border.bin" - .align 2 GraniteCave_1F_MapBlockdata:: .incbin "data/layouts/GraniteCave_1F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_1F_Layout:: .4byte GraniteCave_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc index dcdafcd4e..a57b238be 100644 --- a/data/layouts/GraniteCave_B1F/layout.inc +++ b/data/layouts/GraniteCave_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_B1F_MapBorder:: .incbin "data/layouts/GraniteCave_B1F/border.bin" - .align 2 GraniteCave_B1F_MapBlockdata:: .incbin "data/layouts/GraniteCave_B1F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_B1F_Layout:: .4byte GraniteCave_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc index 90d63c5bb..7ffd04b00 100644 --- a/data/layouts/GraniteCave_B2F/layout.inc +++ b/data/layouts/GraniteCave_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_B2F_MapBorder:: .incbin "data/layouts/GraniteCave_B2F/border.bin" - .align 2 GraniteCave_B2F_MapBlockdata:: .incbin "data/layouts/GraniteCave_B2F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_B2F_Layout:: .4byte GraniteCave_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc index ea6147343..5ee4fade4 100644 --- a/data/layouts/GraniteCave_StevensRoom/layout.inc +++ b/data/layouts/GraniteCave_StevensRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_StevensRoom_MapBorder:: .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" - .align 2 GraniteCave_StevensRoom_MapBlockdata:: .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" @@ -14,3 +12,4 @@ GraniteCave_StevensRoom_Layout:: .4byte GraniteCave_StevensRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc index ab5f0e032..e95b8ec9d 100644 --- a/data/layouts/Harbor/layout.inc +++ b/data/layouts/Harbor/layout.inc @@ -1,8 +1,6 @@ - .align 2 Harbor_MapBorder:: .incbin "data/layouts/Harbor/border.bin" - .align 2 Harbor_MapBlockdata:: .incbin "data/layouts/Harbor/map.bin" @@ -14,3 +12,4 @@ Harbor_Layout:: .4byte Harbor_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc index 0d1c9a699..b93f24df4 100644 --- a/data/layouts/House1/layout.inc +++ b/data/layouts/House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 House1_MapBorder:: .incbin "data/layouts/House1/border.bin" - .align 2 House1_MapBlockdata:: .incbin "data/layouts/House1/map.bin" @@ -14,3 +12,4 @@ House1_Layout:: .4byte House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc index 357e6022f..35566d8d1 100644 --- a/data/layouts/House2/layout.inc +++ b/data/layouts/House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 House2_MapBorder:: .incbin "data/layouts/House2/border.bin" - .align 2 House2_MapBlockdata:: .incbin "data/layouts/House2/map.bin" @@ -14,3 +12,4 @@ House2_Layout:: .4byte House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc index 2fe4bee46..6e2de11f4 100644 --- a/data/layouts/House3/layout.inc +++ b/data/layouts/House3/layout.inc @@ -1,8 +1,6 @@ - .align 2 House3_MapBorder:: .incbin "data/layouts/House3/border.bin" - .align 2 House3_MapBlockdata:: .incbin "data/layouts/House3/map.bin" @@ -14,3 +12,4 @@ House3_Layout:: .4byte House3_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc index caeca73a8..b06b3d427 100644 --- a/data/layouts/House4/layout.inc +++ b/data/layouts/House4/layout.inc @@ -1,8 +1,6 @@ - .align 2 House4_MapBorder:: .incbin "data/layouts/House4/border.bin" - .align 2 House4_MapBlockdata:: .incbin "data/layouts/House4/map.bin" @@ -14,3 +12,4 @@ House4_Layout:: .4byte House4_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc index bdb047feb..7fb8d2c9b 100644 --- a/data/layouts/HouseWithBed/layout.inc +++ b/data/layouts/HouseWithBed/layout.inc @@ -1,8 +1,6 @@ - .align 2 HouseWithBed_MapBorder:: .incbin "data/layouts/HouseWithBed/border.bin" - .align 2 HouseWithBed_MapBlockdata:: .incbin "data/layouts/HouseWithBed/map.bin" @@ -14,3 +12,4 @@ HouseWithBed_Layout:: .4byte HouseWithBed_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc index dc93f12a8..d1ddf8686 100644 --- a/data/layouts/InsideOfTruck/layout.inc +++ b/data/layouts/InsideOfTruck/layout.inc @@ -1,8 +1,6 @@ - .align 2 InsideOfTruck_MapBorder:: .incbin "data/layouts/InsideOfTruck/border.bin" - .align 2 InsideOfTruck_MapBlockdata:: .incbin "data/layouts/InsideOfTruck/map.bin" @@ -14,3 +12,4 @@ InsideOfTruck_Layout:: .4byte InsideOfTruck_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideOfTruck + diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc index 25d870e68..5a3035b72 100644 --- a/data/layouts/IslandCave/layout.inc +++ b/data/layouts/IslandCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 IslandCave_MapBorder:: .incbin "data/layouts/IslandCave/border.bin" - .align 2 IslandCave_MapBlockdata:: .incbin "data/layouts/IslandCave/map.bin" @@ -14,3 +12,4 @@ IslandCave_Layout:: .4byte IslandCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc index 7a1c43284..7fc86dca4 100644 --- a/data/layouts/IslandHarbor/layout.inc +++ b/data/layouts/IslandHarbor/layout.inc @@ -1,8 +1,6 @@ - .align 2 IslandHarbor_MapBorder:: .incbin "data/layouts/IslandHarbor/border.bin" - .align 2 IslandHarbor_MapBlockdata:: .incbin "data/layouts/IslandHarbor/map.bin" @@ -14,3 +12,4 @@ IslandHarbor_Layout:: .4byte IslandHarbor_MapBlockdata .4byte gTileset_General .4byte gTileset_IslandHarbor + diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc index 6aefbf605..5620551b8 100644 --- a/data/layouts/JaggedPass/layout.inc +++ b/data/layouts/JaggedPass/layout.inc @@ -1,8 +1,6 @@ - .align 2 JaggedPass_MapBorder:: .incbin "data/layouts/JaggedPass/border.bin" - .align 2 JaggedPass_MapBlockdata:: .incbin "data/layouts/JaggedPass/map.bin" @@ -14,3 +12,4 @@ JaggedPass_Layout:: .4byte JaggedPass_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc index 48d0bbe58..662955430 100644 --- a/data/layouts/LavaridgeTown/layout.inc +++ b/data/layouts/LavaridgeTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_MapBorder:: .incbin "data/layouts/LavaridgeTown/border.bin" - .align 2 LavaridgeTown_MapBlockdata:: .incbin "data/layouts/LavaridgeTown/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_Layout:: .4byte LavaridgeTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc index e881e9d58..36f4cb826 100644 --- a/data/layouts/LavaridgeTown_Gym_1F/layout.inc +++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LavaridgeTown_Gym_1F_Layout:: .4byte LavaridgeTown_Gym_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LavaridgeGym + diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc index 1fa258cba..9b80d7f90 100644 --- a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc +++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LavaridgeTown_Gym_B1F_Layout:: .4byte LavaridgeTown_Gym_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LavaridgeGym + diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc index bf107dca9..c59e12e49 100644 --- a/data/layouts/LavaridgeTown_HerbShop/layout.inc +++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_HerbShop_MapBorder:: .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" - .align 2 LavaridgeTown_HerbShop_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_HerbShop_Layout:: .4byte LavaridgeTown_HerbShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc index e0ba92bbf..e38d63815 100644 --- a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LavaridgeTown_PokemonCenter_1F_Layout:: .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc index fedb7a91e..ed4bd81e4 100644 --- a/data/layouts/LilycoveCity/layout.inc +++ b/data/layouts/LilycoveCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_MapBorder:: .incbin "data/layouts/LilycoveCity/border.bin" - .align 2 LilycoveCity_MapBlockdata:: .incbin "data/layouts/LilycoveCity/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_Layout:: .4byte LilycoveCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc index e0ce089f7..61e6e27ee 100644 --- a/data/layouts/LilycoveCity_ContestHall/layout.inc +++ b/data/layouts/LilycoveCity_ContestHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_ContestHall_MapBorder:: .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" - .align 2 LilycoveCity_ContestHall_MapBlockdata:: .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_ContestHall_Layout:: .4byte LilycoveCity_ContestHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc index 8ca1d160f..20cf4389f 100644 --- a/data/layouts/LilycoveCity_ContestLobby/layout.inc +++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_ContestLobby_MapBorder:: .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" - .align 2 LilycoveCity_ContestLobby_MapBlockdata:: .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_ContestLobby_Layout:: .4byte LilycoveCity_ContestLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc index 3c6c30cdc..b275834f7 100644 --- a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_CoveLilyMotel_1F_Layout:: .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc index c65508e1a..82a294c48 100644 --- a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_CoveLilyMotel_2F_Layout:: .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc index 53d452438..899e934bd 100644 --- a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStoreElevator_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" - .align 2 LilycoveCity_DepartmentStoreElevator_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStoreElevator_Layout:: .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc index 61a5db9c2..d40483308 100644 --- a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStoreRooftop_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" - .align 2 LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStoreRooftop_Layout:: .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc index 441cfc474..d3b5d9420 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_1F_Layout:: .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc index 54ede95cd..e5b01c8fd 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_2F_Layout:: .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc index a16342425..5d7aa93eb 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_3F_Layout:: .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc index 26806016a..b4585ca03 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_4F_Layout:: .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc index 6b5a98fe4..ade5e4bf5 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_5F_Layout:: .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc index a7926872f..de51e7fd6 100644 --- a/data/layouts/LilycoveCity_House2/layout.inc +++ b/data/layouts/LilycoveCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_House2_MapBorder:: .incbin "data/layouts/LilycoveCity_House2/border.bin" - .align 2 LilycoveCity_House2_MapBlockdata:: .incbin "data/layouts/LilycoveCity_House2/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_House2_Layout:: .4byte LilycoveCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc index 3a0215859..0dab4095c 100644 --- a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_LilycoveMuseum_1F_Layout:: .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LilycoveMuseum + diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc index 0cc19b039..aea446410 100644 --- a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LilycoveCity_LilycoveMuseum_2F_Layout:: .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LilycoveMuseum + diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc index 3a3a624bd..9b30c7c08 100644 --- a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_PokemonTrainerFanClub_MapBorder:: .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" - .align 2 LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_PokemonTrainerFanClub_Layout:: .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc index 38af49829..e71fe2df3 100644 --- a/data/layouts/LinkContestRoom1/layout.inc +++ b/data/layouts/LinkContestRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom1_MapBorder:: .incbin "data/layouts/LinkContestRoom1/border.bin" - .align 2 LinkContestRoom1_MapBlockdata:: .incbin "data/layouts/LinkContestRoom1/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom1_Layout:: .4byte LinkContestRoom1_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc index d09439edd..2dd66ab96 100644 --- a/data/layouts/LinkContestRoom2/layout.inc +++ b/data/layouts/LinkContestRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom2_MapBorder:: .incbin "data/layouts/LinkContestRoom2/border.bin" - .align 2 LinkContestRoom2_MapBlockdata:: .incbin "data/layouts/LinkContestRoom2/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom2_Layout:: .4byte LinkContestRoom2_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc index c969be1ac..c53cad723 100644 --- a/data/layouts/LinkContestRoom3/layout.inc +++ b/data/layouts/LinkContestRoom3/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom3_MapBorder:: .incbin "data/layouts/LinkContestRoom3/border.bin" - .align 2 LinkContestRoom3_MapBlockdata:: .incbin "data/layouts/LinkContestRoom3/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom3_Layout:: .4byte LinkContestRoom3_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc index 61b03a2ce..883918f37 100644 --- a/data/layouts/LinkContestRoom4/layout.inc +++ b/data/layouts/LinkContestRoom4/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom4_MapBorder:: .incbin "data/layouts/LinkContestRoom4/border.bin" - .align 2 LinkContestRoom4_MapBlockdata:: .incbin "data/layouts/LinkContestRoom4/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom4_Layout:: .4byte LinkContestRoom4_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc index 38f1e42cd..72a9d9f4e 100644 --- a/data/layouts/LinkContestRoom5/layout.inc +++ b/data/layouts/LinkContestRoom5/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom5_MapBorder:: .incbin "data/layouts/LinkContestRoom5/border.bin" - .align 2 LinkContestRoom5_MapBlockdata:: .incbin "data/layouts/LinkContestRoom5/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom5_Layout:: .4byte LinkContestRoom5_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc index 39349840a..33db4b56d 100644 --- a/data/layouts/LinkContestRoom6/layout.inc +++ b/data/layouts/LinkContestRoom6/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom6_MapBorder:: .incbin "data/layouts/LinkContestRoom6/border.bin" - .align 2 LinkContestRoom6_MapBlockdata:: .incbin "data/layouts/LinkContestRoom6/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom6_Layout:: .4byte LinkContestRoom6_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc index 5f8254576..8193ac695 100644 --- a/data/layouts/LittlerootTown/layout.inc +++ b/data/layouts/LittlerootTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_MapBorder:: .incbin "data/layouts/LittlerootTown/border.bin" - .align 2 LittlerootTown_MapBlockdata:: .incbin "data/layouts/LittlerootTown/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_Layout:: .4byte LittlerootTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc index 0ccddcca8..092c7d20b 100644 --- a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LittlerootTown_BrendansHouse_1F_Layout:: .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc index f626ecfb0..5235f4d98 100644 --- a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LittlerootTown_BrendansHouse_2F_Layout:: .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc index 42d1365c3..88b81a289 100644 --- a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc +++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LittlerootTown_MaysHouse_1F_Layout:: .4byte LittlerootTown_MaysHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc index c0770b8f6..0b6134dbd 100644 --- a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc +++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ LittlerootTown_MaysHouse_2F_Layout:: .4byte LittlerootTown_MaysHouse_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc index 77d07033f..d0be539a0 100644 --- a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_ProfessorBirchsLab_MapBorder:: .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" - .align 2 LittlerootTown_ProfessorBirchsLab_MapBlockdata:: .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_ProfessorBirchsLab_Layout:: .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc index 2721bb6ff..b50c7f015 100644 --- a/data/layouts/MagmaHideout_1F/layout.inc +++ b/data/layouts/MagmaHideout_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_1F_MapBorder:: .incbin "data/layouts/MagmaHideout_1F/border.bin" - .align 2 MagmaHideout_1F_MapBlockdata:: .incbin "data/layouts/MagmaHideout_1F/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_1F_Layout:: .4byte MagmaHideout_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc index 9d16b20b0..b9f0d27d7 100644 --- a/data/layouts/MagmaHideout_2F_1R/layout.inc +++ b/data/layouts/MagmaHideout_2F_1R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MagmaHideout_2F_1R_Layout:: .4byte MagmaHideout_2F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc index 47a492f52..01507909c 100644 --- a/data/layouts/MagmaHideout_2F_2R/layout.inc +++ b/data/layouts/MagmaHideout_2F_2R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MagmaHideout_2F_2R_Layout:: .4byte MagmaHideout_2F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc index cf1310587..d88fb50fd 100644 --- a/data/layouts/MagmaHideout_2F_3R/layout.inc +++ b/data/layouts/MagmaHideout_2F_3R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MagmaHideout_2F_3R_Layout:: .4byte MagmaHideout_2F_3R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc index 6e7215914..c2199b2f2 100644 --- a/data/layouts/MagmaHideout_3F_1R/layout.inc +++ b/data/layouts/MagmaHideout_3F_1R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MagmaHideout_3F_1R_Layout:: .4byte MagmaHideout_3F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc index 6f108d198..2c4662a49 100644 --- a/data/layouts/MagmaHideout_3F_2R/layout.inc +++ b/data/layouts/MagmaHideout_3F_2R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MagmaHideout_3F_2R_Layout:: .4byte MagmaHideout_3F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc index 6508e73bf..4042b9653 100644 --- a/data/layouts/MagmaHideout_3F_3R/layout.inc +++ b/data/layouts/MagmaHideout_3F_3R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MagmaHideout_3F_3R_Layout:: .4byte MagmaHideout_3F_3R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc index 32db60101..d7f8c547c 100644 --- a/data/layouts/MagmaHideout_4F/layout.inc +++ b/data/layouts/MagmaHideout_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_4F_MapBorder:: .incbin "data/layouts/MagmaHideout_4F/border.bin" - .align 2 MagmaHideout_4F_MapBlockdata:: .incbin "data/layouts/MagmaHideout_4F/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_4F_Layout:: .4byte MagmaHideout_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc index f69952dce..256338b89 100644 --- a/data/layouts/MarineCave_End/layout.inc +++ b/data/layouts/MarineCave_End/layout.inc @@ -1,8 +1,6 @@ - .align 2 MarineCave_End_MapBorder:: .incbin "data/layouts/MarineCave_End/border.bin" - .align 2 MarineCave_End_MapBlockdata:: .incbin "data/layouts/MarineCave_End/map.bin" @@ -14,3 +12,4 @@ MarineCave_End_Layout:: .4byte MarineCave_End_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc index b6c9248c6..219c182d7 100644 --- a/data/layouts/MarineCave_Entrance/layout.inc +++ b/data/layouts/MarineCave_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 MarineCave_Entrance_MapBorder:: .incbin "data/layouts/MarineCave_Entrance/border.bin" - .align 2 MarineCave_Entrance_MapBlockdata:: .incbin "data/layouts/MarineCave_Entrance/map.bin" @@ -14,3 +12,4 @@ MarineCave_Entrance_Layout:: .4byte MarineCave_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc index 33c232059..5233e09ab 100644 --- a/data/layouts/Mart/layout.inc +++ b/data/layouts/Mart/layout.inc @@ -1,8 +1,6 @@ - .align 2 Mart_MapBorder:: .incbin "data/layouts/Mart/border.bin" - .align 2 Mart_MapBlockdata:: .incbin "data/layouts/Mart/map.bin" @@ -14,3 +12,4 @@ Mart_Layout:: .4byte Mart_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc index ba7785c3e..7a8c17da2 100644 --- a/data/layouts/MauvilleCity/layout.inc +++ b/data/layouts/MauvilleCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_MapBorder:: .incbin "data/layouts/MauvilleCity/border.bin" - .align 2 MauvilleCity_MapBlockdata:: .incbin "data/layouts/MauvilleCity/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_Layout:: .4byte MauvilleCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc index 4814becf8..f0d358a35 100644 --- a/data/layouts/MauvilleCity_BikeShop/layout.inc +++ b/data/layouts/MauvilleCity_BikeShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_BikeShop_MapBorder:: .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" - .align 2 MauvilleCity_BikeShop_MapBlockdata:: .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_BikeShop_Layout:: .4byte MauvilleCity_BikeShop_MapBlockdata .4byte gTileset_General .4byte gTileset_BikeShop + diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc index 9403c9df6..307f7205e 100644 --- a/data/layouts/MauvilleCity_GameCorner/layout.inc +++ b/data/layouts/MauvilleCity_GameCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_GameCorner_MapBorder:: .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" - .align 2 MauvilleCity_GameCorner_MapBlockdata:: .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_GameCorner_Layout:: .4byte MauvilleCity_GameCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_MauvilleGameCorner + diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc index 1fdaf921e..290fca78e 100644 --- a/data/layouts/MauvilleCity_Gym/layout.inc +++ b/data/layouts/MauvilleCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_Gym_MapBorder:: .incbin "data/layouts/MauvilleCity_Gym/border.bin" - .align 2 MauvilleCity_Gym_MapBlockdata:: .incbin "data/layouts/MauvilleCity_Gym/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_Gym_Layout:: .4byte MauvilleCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_MauvilleGym + diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc index 3fea20553..ba7a0e487 100644 --- a/data/layouts/MeteorFalls_1F_1R/layout.inc +++ b/data/layouts/MeteorFalls_1F_1R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MeteorFalls_1F_1R_Layout:: .4byte MeteorFalls_1F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc index ac91e848e..2e3fcaf2e 100644 --- a/data/layouts/MeteorFalls_1F_2R/layout.inc +++ b/data/layouts/MeteorFalls_1F_2R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MeteorFalls_1F_2R_Layout:: .4byte MeteorFalls_1F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc index c424edf3b..a4f385d8f 100644 --- a/data/layouts/MeteorFalls_B1F_1R/layout.inc +++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MeteorFalls_B1F_1R_Layout:: .4byte MeteorFalls_B1F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc index b7ee944cc..982edc975 100644 --- a/data/layouts/MeteorFalls_B1F_2R/layout.inc +++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MeteorFalls_B1F_2R_Layout:: .4byte MeteorFalls_B1F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc index 992e7d174..1baf70a09 100644 --- a/data/layouts/MeteorFalls_StevensCave/layout.inc +++ b/data/layouts/MeteorFalls_StevensCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_StevensCave_MapBorder:: .incbin "data/layouts/MeteorFalls_StevensCave/border.bin" - .align 2 MeteorFalls_StevensCave_MapBlockdata:: .incbin "data/layouts/MeteorFalls_StevensCave/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_StevensCave_Layout:: .4byte MeteorFalls_StevensCave_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc index e4bb92d74..be36cc758 100644 --- a/data/layouts/MirageTower_1F/layout.inc +++ b/data/layouts/MirageTower_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_1F_MapBorder:: .incbin "data/layouts/MirageTower_1F/border.bin" - .align 2 MirageTower_1F_MapBlockdata:: .incbin "data/layouts/MirageTower_1F/map.bin" @@ -14,3 +12,4 @@ MirageTower_1F_Layout:: .4byte MirageTower_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc index 601dd9de2..ec4971bc4 100644 --- a/data/layouts/MirageTower_2F/layout.inc +++ b/data/layouts/MirageTower_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_2F_MapBorder:: .incbin "data/layouts/MirageTower_2F/border.bin" - .align 2 MirageTower_2F_MapBlockdata:: .incbin "data/layouts/MirageTower_2F/map.bin" @@ -14,3 +12,4 @@ MirageTower_2F_Layout:: .4byte MirageTower_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc index 2bcd9806d..c12de3a15 100644 --- a/data/layouts/MirageTower_3F/layout.inc +++ b/data/layouts/MirageTower_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_3F_MapBorder:: .incbin "data/layouts/MirageTower_3F/border.bin" - .align 2 MirageTower_3F_MapBlockdata:: .incbin "data/layouts/MirageTower_3F/map.bin" @@ -14,3 +12,4 @@ MirageTower_3F_Layout:: .4byte MirageTower_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc index babf2a5c7..518f7c943 100644 --- a/data/layouts/MirageTower_4F/layout.inc +++ b/data/layouts/MirageTower_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_4F_MapBorder:: .incbin "data/layouts/MirageTower_4F/border.bin" - .align 2 MirageTower_4F_MapBlockdata:: .incbin "data/layouts/MirageTower_4F/map.bin" @@ -14,3 +12,4 @@ MirageTower_4F_Layout:: .4byte MirageTower_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc index b5d392dc7..881cf9498 100644 --- a/data/layouts/MossdeepCity/layout.inc +++ b/data/layouts/MossdeepCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_MapBorder:: .incbin "data/layouts/MossdeepCity/border.bin" - .align 2 MossdeepCity_MapBlockdata:: .incbin "data/layouts/MossdeepCity/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_Layout:: .4byte MossdeepCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc index e03619423..2c2fb717d 100644 --- a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc +++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MossdeepCity_GameCorner_1F_Layout:: .4byte MossdeepCity_GameCorner_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MossdeepGameCorner + diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc index b51e18362..ec5dd2a57 100644 --- a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc +++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MossdeepCity_GameCorner_B1F_Layout:: .4byte MossdeepCity_GameCorner_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc index fbdfa6fdd..a65212a40 100644 --- a/data/layouts/MossdeepCity_Gym/layout.inc +++ b/data/layouts/MossdeepCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_Gym_MapBorder:: .incbin "data/layouts/MossdeepCity_Gym/border.bin" - .align 2 MossdeepCity_Gym_MapBlockdata:: .incbin "data/layouts/MossdeepCity_Gym/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_Gym_Layout:: .4byte MossdeepCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_MossdeepGym + diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc index c5fc2f570..759e68891 100644 --- a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MossdeepCity_SpaceCenter_1F_Layout:: .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc index 4d406accc..6e370a7fa 100644 --- a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ MossdeepCity_SpaceCenter_2F_Layout:: .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc index 29aede186..0db92aee9 100644 --- a/data/layouts/MossdeepCity_StevensHouse/layout.inc +++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_StevensHouse_MapBorder:: .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" - .align 2 MossdeepCity_StevensHouse_MapBlockdata:: .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_StevensHouse_Layout:: .4byte MossdeepCity_StevensHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc index f0afefe3b..29a3b1ad7 100644 --- a/data/layouts/MtChimney/layout.inc +++ b/data/layouts/MtChimney/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtChimney_MapBorder:: .incbin "data/layouts/MtChimney/border.bin" - .align 2 MtChimney_MapBlockdata:: .incbin "data/layouts/MtChimney/map.bin" @@ -14,3 +12,4 @@ MtChimney_Layout:: .4byte MtChimney_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc index bd7fd82d5..2402e815c 100644 --- a/data/layouts/MtPyre_1F/layout.inc +++ b/data/layouts/MtPyre_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_1F_MapBorder:: .incbin "data/layouts/MtPyre_1F/border.bin" - .align 2 MtPyre_1F_MapBlockdata:: .incbin "data/layouts/MtPyre_1F/map.bin" @@ -14,3 +12,4 @@ MtPyre_1F_Layout:: .4byte MtPyre_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc index cbf534f69..8d6ca1200 100644 --- a/data/layouts/MtPyre_2F/layout.inc +++ b/data/layouts/MtPyre_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_2F_MapBorder:: .incbin "data/layouts/MtPyre_2F/border.bin" - .align 2 MtPyre_2F_MapBlockdata:: .incbin "data/layouts/MtPyre_2F/map.bin" @@ -14,3 +12,4 @@ MtPyre_2F_Layout:: .4byte MtPyre_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc index ceaa1bea9..24ed0f7b1 100644 --- a/data/layouts/MtPyre_3F/layout.inc +++ b/data/layouts/MtPyre_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_3F_MapBorder:: .incbin "data/layouts/MtPyre_3F/border.bin" - .align 2 MtPyre_3F_MapBlockdata:: .incbin "data/layouts/MtPyre_3F/map.bin" @@ -14,3 +12,4 @@ MtPyre_3F_Layout:: .4byte MtPyre_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc index 5bd0eab59..65a8fcf59 100644 --- a/data/layouts/MtPyre_4F/layout.inc +++ b/data/layouts/MtPyre_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_4F_MapBorder:: .incbin "data/layouts/MtPyre_4F/border.bin" - .align 2 MtPyre_4F_MapBlockdata:: .incbin "data/layouts/MtPyre_4F/map.bin" @@ -14,3 +12,4 @@ MtPyre_4F_Layout:: .4byte MtPyre_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc index fed3f9ae2..222c6eb80 100644 --- a/data/layouts/MtPyre_5F/layout.inc +++ b/data/layouts/MtPyre_5F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_5F_MapBorder:: .incbin "data/layouts/MtPyre_5F/border.bin" - .align 2 MtPyre_5F_MapBlockdata:: .incbin "data/layouts/MtPyre_5F/map.bin" @@ -14,3 +12,4 @@ MtPyre_5F_Layout:: .4byte MtPyre_5F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc index 0fe9f6982..31b5288d5 100644 --- a/data/layouts/MtPyre_6F/layout.inc +++ b/data/layouts/MtPyre_6F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_6F_MapBorder:: .incbin "data/layouts/MtPyre_6F/border.bin" - .align 2 MtPyre_6F_MapBlockdata:: .incbin "data/layouts/MtPyre_6F/map.bin" @@ -14,3 +12,4 @@ MtPyre_6F_Layout:: .4byte MtPyre_6F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc index 2f81759d7..1b5997dba 100644 --- a/data/layouts/MtPyre_Exterior/layout.inc +++ b/data/layouts/MtPyre_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_Exterior_MapBorder:: .incbin "data/layouts/MtPyre_Exterior/border.bin" - .align 2 MtPyre_Exterior_MapBlockdata:: .incbin "data/layouts/MtPyre_Exterior/map.bin" @@ -14,3 +12,4 @@ MtPyre_Exterior_Layout:: .4byte MtPyre_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc index 4f30ac9e1..58e932eb7 100644 --- a/data/layouts/MtPyre_Summit/layout.inc +++ b/data/layouts/MtPyre_Summit/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_Summit_MapBorder:: .incbin "data/layouts/MtPyre_Summit/border.bin" - .align 2 MtPyre_Summit_MapBlockdata:: .incbin "data/layouts/MtPyre_Summit/map.bin" @@ -14,3 +12,4 @@ MtPyre_Summit_Layout:: .4byte MtPyre_Summit_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc index 899aa8eed..6f15bd276 100644 --- a/data/layouts/NavelRock_B1F/layout.inc +++ b/data/layouts/NavelRock_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_B1F_MapBorder:: .incbin "data/layouts/NavelRock_B1F/border.bin" - .align 2 NavelRock_B1F_MapBlockdata:: .incbin "data/layouts/NavelRock_B1F/map.bin" @@ -14,3 +12,4 @@ NavelRock_B1F_Layout:: .4byte NavelRock_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc index 043a977de..5c96a8cef 100644 --- a/data/layouts/NavelRock_Bottom/layout.inc +++ b/data/layouts/NavelRock_Bottom/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Bottom_MapBorder:: .incbin "data/layouts/NavelRock_Bottom/border.bin" - .align 2 NavelRock_Bottom_MapBlockdata:: .incbin "data/layouts/NavelRock_Bottom/map.bin" @@ -14,3 +12,4 @@ NavelRock_Bottom_Layout:: .4byte NavelRock_Bottom_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc index d9a12b71d..6dcedcb20 100644 --- a/data/layouts/NavelRock_Entrance/layout.inc +++ b/data/layouts/NavelRock_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Entrance_MapBorder:: .incbin "data/layouts/NavelRock_Entrance/border.bin" - .align 2 NavelRock_Entrance_MapBlockdata:: .incbin "data/layouts/NavelRock_Entrance/map.bin" @@ -14,3 +12,4 @@ NavelRock_Entrance_Layout:: .4byte NavelRock_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc index b3fc825cf..c2c4fa95e 100644 --- a/data/layouts/NavelRock_Exterior/layout.inc +++ b/data/layouts/NavelRock_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Exterior_MapBorder:: .incbin "data/layouts/NavelRock_Exterior/border.bin" - .align 2 NavelRock_Exterior_MapBlockdata:: .incbin "data/layouts/NavelRock_Exterior/map.bin" @@ -14,3 +12,4 @@ NavelRock_Exterior_Layout:: .4byte NavelRock_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc index 0f7956e5e..ab5d9c867 100644 --- a/data/layouts/NavelRock_Fork/layout.inc +++ b/data/layouts/NavelRock_Fork/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Fork_MapBorder:: .incbin "data/layouts/NavelRock_Fork/border.bin" - .align 2 NavelRock_Fork_MapBlockdata:: .incbin "data/layouts/NavelRock_Fork/map.bin" @@ -14,3 +12,4 @@ NavelRock_Fork_Layout:: .4byte NavelRock_Fork_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc index 34ff05e39..a7fc73d22 100644 --- a/data/layouts/NavelRock_LadderRoom1/layout.inc +++ b/data/layouts/NavelRock_LadderRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_LadderRoom1_MapBorder:: .incbin "data/layouts/NavelRock_LadderRoom1/border.bin" - .align 2 NavelRock_LadderRoom1_MapBlockdata:: .incbin "data/layouts/NavelRock_LadderRoom1/map.bin" @@ -14,3 +12,4 @@ NavelRock_LadderRoom1_Layout:: .4byte NavelRock_LadderRoom1_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc index a50a32690..8fbd6e51f 100644 --- a/data/layouts/NavelRock_LadderRoom2/layout.inc +++ b/data/layouts/NavelRock_LadderRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_LadderRoom2_MapBorder:: .incbin "data/layouts/NavelRock_LadderRoom2/border.bin" - .align 2 NavelRock_LadderRoom2_MapBlockdata:: .incbin "data/layouts/NavelRock_LadderRoom2/map.bin" @@ -14,3 +12,4 @@ NavelRock_LadderRoom2_Layout:: .4byte NavelRock_LadderRoom2_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc index 6e99e9bf4..50698cc76 100644 --- a/data/layouts/NavelRock_Top/layout.inc +++ b/data/layouts/NavelRock_Top/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Top_MapBorder:: .incbin "data/layouts/NavelRock_Top/border.bin" - .align 2 NavelRock_Top_MapBlockdata:: .incbin "data/layouts/NavelRock_Top/map.bin" @@ -14,3 +12,4 @@ NavelRock_Top_Layout:: .4byte NavelRock_Top_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc index 78e3edee4..bbd81cac7 100644 --- a/data/layouts/NewMauville_Entrance/layout.inc +++ b/data/layouts/NewMauville_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 NewMauville_Entrance_MapBorder:: .incbin "data/layouts/NewMauville_Entrance/border.bin" - .align 2 NewMauville_Entrance_MapBlockdata:: .incbin "data/layouts/NewMauville_Entrance/map.bin" @@ -14,3 +12,4 @@ NewMauville_Entrance_Layout:: .4byte NewMauville_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc index d7dbe6a62..096142c6d 100644 --- a/data/layouts/NewMauville_Inside/layout.inc +++ b/data/layouts/NewMauville_Inside/layout.inc @@ -1,8 +1,6 @@ - .align 2 NewMauville_Inside_MapBorder:: .incbin "data/layouts/NewMauville_Inside/border.bin" - .align 2 NewMauville_Inside_MapBlockdata:: .incbin "data/layouts/NewMauville_Inside/map.bin" @@ -14,3 +12,4 @@ NewMauville_Inside_Layout:: .4byte NewMauville_Inside_MapBlockdata .4byte gTileset_General .4byte gTileset_BikeShop + diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc index 7d266cfba..9709ca1ea 100644 --- a/data/layouts/OldaleTown/layout.inc +++ b/data/layouts/OldaleTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 OldaleTown_MapBorder:: .incbin "data/layouts/OldaleTown/border.bin" - .align 2 OldaleTown_MapBlockdata:: .incbin "data/layouts/OldaleTown/map.bin" @@ -14,3 +12,4 @@ OldaleTown_Layout:: .4byte OldaleTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc index a87de7036..4ba791f23 100644 --- a/data/layouts/PacifidlogTown/layout.inc +++ b/data/layouts/PacifidlogTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_MapBorder:: .incbin "data/layouts/PacifidlogTown/border.bin" - .align 2 PacifidlogTown_MapBlockdata:: .incbin "data/layouts/PacifidlogTown/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_Layout:: .4byte PacifidlogTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc index 16f9402ca..b5dcf58b2 100644 --- a/data/layouts/PacifidlogTown_House1/layout.inc +++ b/data/layouts/PacifidlogTown_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_House1_MapBorder:: .incbin "data/layouts/PacifidlogTown_House1/border.bin" - .align 2 PacifidlogTown_House1_MapBlockdata:: .incbin "data/layouts/PacifidlogTown_House1/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_House1_Layout:: .4byte PacifidlogTown_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc index deb111059..a10daa3cd 100644 --- a/data/layouts/PacifidlogTown_House2/layout.inc +++ b/data/layouts/PacifidlogTown_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_House2_MapBorder:: .incbin "data/layouts/PacifidlogTown_House2/border.bin" - .align 2 PacifidlogTown_House2_MapBlockdata:: .incbin "data/layouts/PacifidlogTown_House2/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_House2_Layout:: .4byte PacifidlogTown_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc index c458140a9..bae16b88f 100644 --- a/data/layouts/PetalburgCity/layout.inc +++ b/data/layouts/PetalburgCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgCity_MapBorder:: .incbin "data/layouts/PetalburgCity/border.bin" - .align 2 PetalburgCity_MapBlockdata:: .incbin "data/layouts/PetalburgCity/map.bin" @@ -14,3 +12,4 @@ PetalburgCity_Layout:: .4byte PetalburgCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc index 974b95baf..36fe1002f 100644 --- a/data/layouts/PetalburgCity_Gym/layout.inc +++ b/data/layouts/PetalburgCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgCity_Gym_MapBorder:: .incbin "data/layouts/PetalburgCity_Gym/border.bin" - .align 2 PetalburgCity_Gym_MapBlockdata:: .incbin "data/layouts/PetalburgCity_Gym/map.bin" @@ -14,3 +12,4 @@ PetalburgCity_Gym_Layout:: .4byte PetalburgCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_PetalburgGym + diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc index 6ee24ef31..840e17f7e 100644 --- a/data/layouts/PetalburgWoods/layout.inc +++ b/data/layouts/PetalburgWoods/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgWoods_MapBorder:: .incbin "data/layouts/PetalburgWoods/border.bin" - .align 2 PetalburgWoods_MapBlockdata:: .incbin "data/layouts/PetalburgWoods/map.bin" @@ -14,3 +12,4 @@ PetalburgWoods_Layout:: .4byte PetalburgWoods_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc index 4d299d407..bf1335f84 100644 --- a/data/layouts/PokemonCenter_1F/layout.inc +++ b/data/layouts/PokemonCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 PokemonCenter_1F_MapBorder:: .incbin "data/layouts/PokemonCenter_1F/border.bin" - .align 2 PokemonCenter_1F_MapBlockdata:: .incbin "data/layouts/PokemonCenter_1F/map.bin" @@ -14,3 +12,4 @@ PokemonCenter_1F_Layout:: .4byte PokemonCenter_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc index cc2aba89a..3cb812de7 100644 --- a/data/layouts/PokemonCenter_2F/layout.inc +++ b/data/layouts/PokemonCenter_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 PokemonCenter_2F_MapBorder:: .incbin "data/layouts/PokemonCenter_2F/border.bin" - .align 2 PokemonCenter_2F_MapBlockdata:: .incbin "data/layouts/PokemonCenter_2F/map.bin" @@ -14,3 +12,4 @@ PokemonCenter_2F_Layout:: .4byte PokemonCenter_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc index ab18faa0d..ed258b2a7 100644 --- a/data/layouts/RecordCorner/layout.inc +++ b/data/layouts/RecordCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 RecordCorner_MapBorder:: .incbin "data/layouts/RecordCorner/border.bin" - .align 2 RecordCorner_MapBlockdata:: .incbin "data/layouts/RecordCorner/map.bin" @@ -14,3 +12,4 @@ RecordCorner_Layout:: .4byte RecordCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc index 54193c343..e42ecf340 100644 --- a/data/layouts/Route101/layout.inc +++ b/data/layouts/Route101/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route101_MapBorder:: .incbin "data/layouts/Route101/border.bin" - .align 2 Route101_MapBlockdata:: .incbin "data/layouts/Route101/map.bin" @@ -14,3 +12,4 @@ Route101_Layout:: .4byte Route101_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc index eaf962db2..194d44fce 100644 --- a/data/layouts/Route102/layout.inc +++ b/data/layouts/Route102/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route102_MapBorder:: .incbin "data/layouts/Route102/border.bin" - .align 2 Route102_MapBlockdata:: .incbin "data/layouts/Route102/map.bin" @@ -14,3 +12,4 @@ Route102_Layout:: .4byte Route102_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc index eaf00808e..fe3bac066 100644 --- a/data/layouts/Route103/layout.inc +++ b/data/layouts/Route103/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route103_MapBorder:: .incbin "data/layouts/Route103/border.bin" - .align 2 Route103_MapBlockdata:: .incbin "data/layouts/Route103/map.bin" @@ -14,3 +12,4 @@ Route103_Layout:: .4byte Route103_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc index 58a000d70..9a9418e46 100644 --- a/data/layouts/Route104/layout.inc +++ b/data/layouts/Route104/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_MapBorder:: .incbin "data/layouts/Route104/border.bin" - .align 2 Route104_MapBlockdata:: .incbin "data/layouts/Route104/map.bin" @@ -14,3 +12,4 @@ Route104_Layout:: .4byte Route104_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc index 039901d0a..3474f3335 100644 --- a/data/layouts/Route104_MrBrineysHouse/layout.inc +++ b/data/layouts/Route104_MrBrineysHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_MrBrineysHouse_MapBorder:: .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" - .align 2 Route104_MrBrineysHouse_MapBlockdata:: .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" @@ -14,3 +12,4 @@ Route104_MrBrineysHouse_Layout:: .4byte Route104_MrBrineysHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc index 0510c9028..a46ffc18c 100644 --- a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc +++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_PrettyPetalFlowerShop_MapBorder:: .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" - .align 2 Route104_PrettyPetalFlowerShop_MapBlockdata:: .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" @@ -14,3 +12,4 @@ Route104_PrettyPetalFlowerShop_Layout:: .4byte Route104_PrettyPetalFlowerShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_PrettyPetalFlowerShop + diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc index eb70f55c9..b2b2c4f19 100644 --- a/data/layouts/Route104_Prototype/layout.inc +++ b/data/layouts/Route104_Prototype/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_Prototype_MapBorder:: .incbin "data/layouts/Route104_Prototype/border.bin" - .align 2 Route104_Prototype_MapBlockdata:: .incbin "data/layouts/Route104_Prototype/map.bin" @@ -14,3 +12,4 @@ Route104_Prototype_Layout:: .4byte Route104_Prototype_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc index 4156bc9a4..ce78ef9cc 100644 --- a/data/layouts/Route105/layout.inc +++ b/data/layouts/Route105/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route105_MapBorder:: .incbin "data/layouts/Route105/border.bin" - .align 2 Route105_MapBlockdata:: .incbin "data/layouts/Route105/map.bin" @@ -14,3 +12,4 @@ Route105_Layout:: .4byte Route105_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc index ff43ced2e..ea255b383 100644 --- a/data/layouts/Route106/layout.inc +++ b/data/layouts/Route106/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route106_MapBorder:: .incbin "data/layouts/Route106/border.bin" - .align 2 Route106_MapBlockdata:: .incbin "data/layouts/Route106/map.bin" @@ -14,3 +12,4 @@ Route106_Layout:: .4byte Route106_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc index 9de501c61..ea305b2a7 100644 --- a/data/layouts/Route107/layout.inc +++ b/data/layouts/Route107/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route107_MapBorder:: .incbin "data/layouts/Route107/border.bin" - .align 2 Route107_MapBlockdata:: .incbin "data/layouts/Route107/map.bin" @@ -14,3 +12,4 @@ Route107_Layout:: .4byte Route107_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc index 10fd278b3..1ec7171cf 100644 --- a/data/layouts/Route108/layout.inc +++ b/data/layouts/Route108/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route108_MapBorder:: .incbin "data/layouts/Route108/border.bin" - .align 2 Route108_MapBlockdata:: .incbin "data/layouts/Route108/map.bin" @@ -14,3 +12,4 @@ Route108_Layout:: .4byte Route108_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc index f6d4864bf..fa41585e9 100644 --- a/data/layouts/Route109/layout.inc +++ b/data/layouts/Route109/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route109_MapBorder:: .incbin "data/layouts/Route109/border.bin" - .align 2 Route109_MapBlockdata:: .incbin "data/layouts/Route109/map.bin" @@ -14,3 +12,4 @@ Route109_Layout:: .4byte Route109_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc index 316c1fc1b..9ec997b48 100644 --- a/data/layouts/Route109_SeashoreHouse/layout.inc +++ b/data/layouts/Route109_SeashoreHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route109_SeashoreHouse_MapBorder:: .incbin "data/layouts/Route109_SeashoreHouse/border.bin" - .align 2 Route109_SeashoreHouse_MapBlockdata:: .incbin "data/layouts/Route109_SeashoreHouse/map.bin" @@ -14,3 +12,4 @@ Route109_SeashoreHouse_Layout:: .4byte Route109_SeashoreHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_SeashoreHouse + diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc index 1539ae91d..24e5a9321 100644 --- a/data/layouts/Route110/layout.inc +++ b/data/layouts/Route110/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_MapBorder:: .incbin "data/layouts/Route110/border.bin" - .align 2 Route110_MapBlockdata:: .incbin "data/layouts/Route110/map.bin" @@ -14,3 +12,4 @@ Route110_Layout:: .4byte Route110_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc index 4f804ef53..abf78f62d 100644 --- a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc +++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_SeasideCyclingRoadEntrance_MapBorder:: .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin" - .align 2 Route110_SeasideCyclingRoadEntrance_MapBlockdata:: .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" @@ -14,3 +12,4 @@ Route110_SeasideCyclingRoadEntrance_Layout:: .4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc index 8f9c4d9ee..fe6ee4d26 100644 --- a/data/layouts/Route110_TrickHouseCorridor/layout.inc +++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseCorridor_MapBorder:: .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" - .align 2 Route110_TrickHouseCorridor_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseCorridor_Layout:: .4byte Route110_TrickHouseCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc index ee2b6b47f..dd9474aee 100644 --- a/data/layouts/Route110_TrickHouseEnd/layout.inc +++ b/data/layouts/Route110_TrickHouseEnd/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseEnd_MapBorder:: .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" - .align 2 Route110_TrickHouseEnd_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseEnd_Layout:: .4byte Route110_TrickHouseEnd_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc index ec9636627..97f3abe24 100644 --- a/data/layouts/Route110_TrickHouseEntrance/layout.inc +++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseEntrance_MapBorder:: .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" - .align 2 Route110_TrickHouseEntrance_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseEntrance_Layout:: .4byte Route110_TrickHouseEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc index d8aadf110..546876ab0 100644 --- a/data/layouts/Route110_TrickHousePuzzle1/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle1_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" - .align 2 Route110_TrickHousePuzzle1_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle1_Layout:: .4byte Route110_TrickHousePuzzle1_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc index 59bc2d06c..65caaa734 100644 --- a/data/layouts/Route110_TrickHousePuzzle2/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle2_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" - .align 2 Route110_TrickHousePuzzle2_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle2_Layout:: .4byte Route110_TrickHousePuzzle2_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc index 384a84032..a03cf9a71 100644 --- a/data/layouts/Route110_TrickHousePuzzle3/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle3_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" - .align 2 Route110_TrickHousePuzzle3_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle3_Layout:: .4byte Route110_TrickHousePuzzle3_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc index 3524e092d..581b41a43 100644 --- a/data/layouts/Route110_TrickHousePuzzle4/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle4_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" - .align 2 Route110_TrickHousePuzzle4_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle4_Layout:: .4byte Route110_TrickHousePuzzle4_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc index 06f105c71..5e06ac31e 100644 --- a/data/layouts/Route110_TrickHousePuzzle5/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle5_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" - .align 2 Route110_TrickHousePuzzle5_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle5_Layout:: .4byte Route110_TrickHousePuzzle5_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc index b11da0a1d..398c17951 100644 --- a/data/layouts/Route110_TrickHousePuzzle6/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle6_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" - .align 2 Route110_TrickHousePuzzle6_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle6_Layout:: .4byte Route110_TrickHousePuzzle6_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc index 8d9e88b7e..1612ec41b 100644 --- a/data/layouts/Route110_TrickHousePuzzle7/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle7_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" - .align 2 Route110_TrickHousePuzzle7_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle7_Layout:: .4byte Route110_TrickHousePuzzle7_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc index 139cefadc..3520b503f 100644 --- a/data/layouts/Route110_TrickHousePuzzle8/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle8_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" - .align 2 Route110_TrickHousePuzzle8_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle8_Layout:: .4byte Route110_TrickHousePuzzle8_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc index 911ecfcb0..2966c06c5 100644 --- a/data/layouts/Route111/layout.inc +++ b/data/layouts/Route111/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route111_MapBorder:: .incbin "data/layouts/Route111/border.bin" - .align 2 Route111_MapBlockdata:: .incbin "data/layouts/Route111/map.bin" @@ -14,3 +12,4 @@ Route111_Layout:: .4byte Route111_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc index 22aae208c..72a0c428c 100644 --- a/data/layouts/Route112/layout.inc +++ b/data/layouts/Route112/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route112_MapBorder:: .incbin "data/layouts/Route112/border.bin" - .align 2 Route112_MapBlockdata:: .incbin "data/layouts/Route112/map.bin" @@ -14,3 +12,4 @@ Route112_Layout:: .4byte Route112_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc index a6a438986..0c1d76b58 100644 --- a/data/layouts/Route113/layout.inc +++ b/data/layouts/Route113/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route113_MapBorder:: .incbin "data/layouts/Route113/border.bin" - .align 2 Route113_MapBlockdata:: .incbin "data/layouts/Route113/map.bin" @@ -14,3 +12,4 @@ Route113_Layout:: .4byte Route113_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc index 1391ce296..071f9e1b6 100644 --- a/data/layouts/Route114/layout.inc +++ b/data/layouts/Route114/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_MapBorder:: .incbin "data/layouts/Route114/border.bin" - .align 2 Route114_MapBlockdata:: .incbin "data/layouts/Route114/map.bin" @@ -14,3 +12,4 @@ Route114_Layout:: .4byte Route114_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc index 314090849..f915e572a 100644 --- a/data/layouts/Route114_FossilManiacsHouse/layout.inc +++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_FossilManiacsHouse_MapBorder:: .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" - .align 2 Route114_FossilManiacsHouse_MapBlockdata:: .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" @@ -14,3 +12,4 @@ Route114_FossilManiacsHouse_Layout:: .4byte Route114_FossilManiacsHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc index 90a891b57..c2392ff01 100644 --- a/data/layouts/Route114_FossilManiacsTunnel/layout.inc +++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_FossilManiacsTunnel_MapBorder:: .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" - .align 2 Route114_FossilManiacsTunnel_MapBlockdata:: .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" @@ -14,3 +12,4 @@ Route114_FossilManiacsTunnel_Layout:: .4byte Route114_FossilManiacsTunnel_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc index e1f2354c1..be9689ae3 100644 --- a/data/layouts/Route114_LanettesHouse/layout.inc +++ b/data/layouts/Route114_LanettesHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_LanettesHouse_MapBorder:: .incbin "data/layouts/Route114_LanettesHouse/border.bin" - .align 2 Route114_LanettesHouse_MapBlockdata:: .incbin "data/layouts/Route114_LanettesHouse/map.bin" @@ -14,3 +12,4 @@ Route114_LanettesHouse_Layout:: .4byte Route114_LanettesHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc index 1a5121474..9d6c3c969 100644 --- a/data/layouts/Route115/layout.inc +++ b/data/layouts/Route115/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route115_MapBorder:: .incbin "data/layouts/Route115/border.bin" - .align 2 Route115_MapBlockdata:: .incbin "data/layouts/Route115/map.bin" @@ -14,3 +12,4 @@ Route115_Layout:: .4byte Route115_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc index 54471a0e0..232cc41f8 100644 --- a/data/layouts/Route116/layout.inc +++ b/data/layouts/Route116/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route116_MapBorder:: .incbin "data/layouts/Route116/border.bin" - .align 2 Route116_MapBlockdata:: .incbin "data/layouts/Route116/map.bin" @@ -14,3 +12,4 @@ Route116_Layout:: .4byte Route116_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc index 4faea6ce6..1bd42eafc 100644 --- a/data/layouts/Route116_TunnelersRestHouse/layout.inc +++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route116_TunnelersRestHouse_MapBorder:: .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" - .align 2 Route116_TunnelersRestHouse_MapBlockdata:: .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" @@ -14,3 +12,4 @@ Route116_TunnelersRestHouse_Layout:: .4byte Route116_TunnelersRestHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc index 75b7f0d98..25e133f28 100644 --- a/data/layouts/Route117/layout.inc +++ b/data/layouts/Route117/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route117_MapBorder:: .incbin "data/layouts/Route117/border.bin" - .align 2 Route117_MapBlockdata:: .incbin "data/layouts/Route117/map.bin" @@ -14,3 +12,4 @@ Route117_Layout:: .4byte Route117_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc index 0589c2d1b..403881bfe 100644 --- a/data/layouts/Route117_PokemonDayCare/layout.inc +++ b/data/layouts/Route117_PokemonDayCare/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route117_PokemonDayCare_MapBorder:: .incbin "data/layouts/Route117_PokemonDayCare/border.bin" - .align 2 Route117_PokemonDayCare_MapBlockdata:: .incbin "data/layouts/Route117_PokemonDayCare/map.bin" @@ -14,3 +12,4 @@ Route117_PokemonDayCare_Layout:: .4byte Route117_PokemonDayCare_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonDayCare + diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc index a78bd28de..cb87f8414 100644 --- a/data/layouts/Route118/layout.inc +++ b/data/layouts/Route118/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route118_MapBorder:: .incbin "data/layouts/Route118/border.bin" - .align 2 Route118_MapBlockdata:: .incbin "data/layouts/Route118/map.bin" @@ -14,3 +12,4 @@ Route118_Layout:: .4byte Route118_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc index 0f288c2c5..66502fb15 100644 --- a/data/layouts/Route119/layout.inc +++ b/data/layouts/Route119/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route119_MapBorder:: .incbin "data/layouts/Route119/border.bin" - .align 2 Route119_MapBlockdata:: .incbin "data/layouts/Route119/map.bin" @@ -14,3 +12,4 @@ Route119_Layout:: .4byte Route119_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc index 35ae95d37..9637beea5 100644 --- a/data/layouts/Route119_WeatherInstitute_1F/layout.inc +++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ Route119_WeatherInstitute_1F_Layout:: .4byte Route119_WeatherInstitute_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc index 476ebf4fa..4f0948f7b 100644 --- a/data/layouts/Route119_WeatherInstitute_2F/layout.inc +++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ Route119_WeatherInstitute_2F_Layout:: .4byte Route119_WeatherInstitute_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc index a58e60aee..f9e9255a0 100644 --- a/data/layouts/Route120/layout.inc +++ b/data/layouts/Route120/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route120_MapBorder:: .incbin "data/layouts/Route120/border.bin" - .align 2 Route120_MapBlockdata:: .incbin "data/layouts/Route120/map.bin" @@ -14,3 +12,4 @@ Route120_Layout:: .4byte Route120_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc index 0e39c4d35..4d2c9744a 100644 --- a/data/layouts/Route121/layout.inc +++ b/data/layouts/Route121/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route121_MapBorder:: .incbin "data/layouts/Route121/border.bin" - .align 2 Route121_MapBlockdata:: .incbin "data/layouts/Route121/map.bin" @@ -14,3 +12,4 @@ Route121_Layout:: .4byte Route121_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc index f28d1b4dc..38ad9e97e 100644 --- a/data/layouts/Route121_SafariZoneEntrance/layout.inc +++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route121_SafariZoneEntrance_MapBorder:: .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" - .align 2 Route121_SafariZoneEntrance_MapBlockdata:: .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" @@ -14,3 +12,4 @@ Route121_SafariZoneEntrance_Layout:: .4byte Route121_SafariZoneEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc index 39f70e4e4..7f0baac20 100644 --- a/data/layouts/Route122/layout.inc +++ b/data/layouts/Route122/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route122_MapBorder:: .incbin "data/layouts/Route122/border.bin" - .align 2 Route122_MapBlockdata:: .incbin "data/layouts/Route122/map.bin" @@ -14,3 +12,4 @@ Route122_Layout:: .4byte Route122_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc index db9093ba9..0c76c2b7b 100644 --- a/data/layouts/Route123/layout.inc +++ b/data/layouts/Route123/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route123_MapBorder:: .incbin "data/layouts/Route123/border.bin" - .align 2 Route123_MapBlockdata:: .incbin "data/layouts/Route123/map.bin" @@ -14,3 +12,4 @@ Route123_Layout:: .4byte Route123_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc index e2c9abffc..d27ed902a 100644 --- a/data/layouts/Route124/layout.inc +++ b/data/layouts/Route124/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route124_MapBorder:: .incbin "data/layouts/Route124/border.bin" - .align 2 Route124_MapBlockdata:: .incbin "data/layouts/Route124/map.bin" @@ -14,3 +12,4 @@ Route124_Layout:: .4byte Route124_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc index 2179d7208..263571235 100644 --- a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route124_DivingTreasureHuntersHouse_MapBorder:: .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" - .align 2 Route124_DivingTreasureHuntersHouse_MapBlockdata:: .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" @@ -14,3 +12,4 @@ Route124_DivingTreasureHuntersHouse_Layout:: .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc index 7c894c943..f0d4e13b7 100644 --- a/data/layouts/Route125/layout.inc +++ b/data/layouts/Route125/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route125_MapBorder:: .incbin "data/layouts/Route125/border.bin" - .align 2 Route125_MapBlockdata:: .incbin "data/layouts/Route125/map.bin" @@ -14,3 +12,4 @@ Route125_Layout:: .4byte Route125_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc index b7f2e3e3c..859d025a5 100644 --- a/data/layouts/Route126/layout.inc +++ b/data/layouts/Route126/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route126_MapBorder:: .incbin "data/layouts/Route126/border.bin" - .align 2 Route126_MapBlockdata:: .incbin "data/layouts/Route126/map.bin" @@ -14,3 +12,4 @@ Route126_Layout:: .4byte Route126_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc index 637bd29b6..767330aff 100644 --- a/data/layouts/Route127/layout.inc +++ b/data/layouts/Route127/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route127_MapBorder:: .incbin "data/layouts/Route127/border.bin" - .align 2 Route127_MapBlockdata:: .incbin "data/layouts/Route127/map.bin" @@ -14,3 +12,4 @@ Route127_Layout:: .4byte Route127_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc index 09265d811..16624fa02 100644 --- a/data/layouts/Route128/layout.inc +++ b/data/layouts/Route128/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route128_MapBorder:: .incbin "data/layouts/Route128/border.bin" - .align 2 Route128_MapBlockdata:: .incbin "data/layouts/Route128/map.bin" @@ -14,3 +12,4 @@ Route128_Layout:: .4byte Route128_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc index 926213af4..9b7d6af1d 100644 --- a/data/layouts/Route129/layout.inc +++ b/data/layouts/Route129/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route129_MapBorder:: .incbin "data/layouts/Route129/border.bin" - .align 2 Route129_MapBlockdata:: .incbin "data/layouts/Route129/map.bin" @@ -14,3 +12,4 @@ Route129_Layout:: .4byte Route129_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc index 30a1053bf..41db11cb4 100644 --- a/data/layouts/Route130/layout.inc +++ b/data/layouts/Route130/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route130_MapBorder:: .incbin "data/layouts/Route130/border.bin" - .align 2 Route130_MapBlockdata:: .incbin "data/layouts/Route130/map.bin" @@ -14,3 +12,4 @@ Route130_Layout:: .4byte Route130_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc index 0762566a8..7fae261cc 100644 --- a/data/layouts/Route131/layout.inc +++ b/data/layouts/Route131/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route131_MapBorder:: .incbin "data/layouts/Route131/border.bin" - .align 2 Route131_MapBlockdata:: .incbin "data/layouts/Route131/map.bin" @@ -14,3 +12,4 @@ Route131_Layout:: .4byte Route131_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc index 3838b85bc..afaa7fb58 100644 --- a/data/layouts/Route132/layout.inc +++ b/data/layouts/Route132/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route132_MapBorder:: .incbin "data/layouts/Route132/border.bin" - .align 2 Route132_MapBlockdata:: .incbin "data/layouts/Route132/map.bin" @@ -14,3 +12,4 @@ Route132_Layout:: .4byte Route132_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc index c380a9ca1..5ff11108b 100644 --- a/data/layouts/Route133/layout.inc +++ b/data/layouts/Route133/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route133_MapBorder:: .incbin "data/layouts/Route133/border.bin" - .align 2 Route133_MapBlockdata:: .incbin "data/layouts/Route133/map.bin" @@ -14,3 +12,4 @@ Route133_Layout:: .4byte Route133_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc index 46c4ea9dc..9eeca6cc9 100644 --- a/data/layouts/Route134/layout.inc +++ b/data/layouts/Route134/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route134_MapBorder:: .incbin "data/layouts/Route134/border.bin" - .align 2 Route134_MapBlockdata:: .incbin "data/layouts/Route134/map.bin" @@ -14,3 +12,4 @@ Route134_Layout:: .4byte Route134_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc index e1451aff6..00c45dcc2 100644 --- a/data/layouts/RustboroCity/layout.inc +++ b/data/layouts/RustboroCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_MapBorder:: .incbin "data/layouts/RustboroCity/border.bin" - .align 2 RustboroCity_MapBlockdata:: .incbin "data/layouts/RustboroCity/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Layout:: .4byte RustboroCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc index a0df17833..0c86dede9 100644 --- a/data/layouts/RustboroCity_CuttersHouse/layout.inc +++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_CuttersHouse_MapBorder:: .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" - .align 2 RustboroCity_CuttersHouse_MapBlockdata:: .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" @@ -14,3 +12,4 @@ RustboroCity_CuttersHouse_Layout:: .4byte RustboroCity_CuttersHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc index 6662b05c9..dbf6b388e 100644 --- a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_1F_Layout:: .4byte RustboroCity_DevonCorp_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc index f6331ab38..34d581ae5 100644 --- a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_2F_Layout:: .4byte RustboroCity_DevonCorp_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc index 2d265b6c8..64c555be5 100644 --- a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_3F_Layout:: .4byte RustboroCity_DevonCorp_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc index fc61a4201..b904524a6 100644 --- a/data/layouts/RustboroCity_Flat1_1F/layout.inc +++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ RustboroCity_Flat1_1F_Layout:: .4byte RustboroCity_Flat1_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc index b80a34322..aa6e3ebdf 100644 --- a/data/layouts/RustboroCity_Flat1_2F/layout.inc +++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ RustboroCity_Flat1_2F_Layout:: .4byte RustboroCity_Flat1_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc index 55c38f906..8e44c97b7 100644 --- a/data/layouts/RustboroCity_Flat2_1F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ RustboroCity_Flat2_1F_Layout:: .4byte RustboroCity_Flat2_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc index c099b5f9a..ffcba8d17 100644 --- a/data/layouts/RustboroCity_Flat2_2F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ RustboroCity_Flat2_2F_Layout:: .4byte RustboroCity_Flat2_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc index 5e938f7d6..77775b4e0 100644 --- a/data/layouts/RustboroCity_Flat2_3F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ RustboroCity_Flat2_3F_Layout:: .4byte RustboroCity_Flat2_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc index cd9b907fb..8c064171b 100644 --- a/data/layouts/RustboroCity_Gym/layout.inc +++ b/data/layouts/RustboroCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Gym_MapBorder:: .incbin "data/layouts/RustboroCity_Gym/border.bin" - .align 2 RustboroCity_Gym_MapBlockdata:: .incbin "data/layouts/RustboroCity_Gym/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Gym_Layout:: .4byte RustboroCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_RustboroGym + diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc index 80f658fcd..b1b90daee 100644 --- a/data/layouts/RustboroCity_House/layout.inc +++ b/data/layouts/RustboroCity_House/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_House_MapBorder:: .incbin "data/layouts/RustboroCity_House/border.bin" - .align 2 RustboroCity_House_MapBlockdata:: .incbin "data/layouts/RustboroCity_House/map.bin" @@ -14,3 +12,4 @@ RustboroCity_House_Layouts:: .4byte RustboroCity_House_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc index f88e3a80b..27893f2fb 100644 --- a/data/layouts/RustboroCity_House1/layout.inc +++ b/data/layouts/RustboroCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_House1_MapBorder:: .incbin "data/layouts/RustboroCity_House1/border.bin" - .align 2 RustboroCity_House1_MapBlockdata:: .incbin "data/layouts/RustboroCity_House1/map.bin" @@ -14,3 +12,4 @@ RustboroCity_House1_Layout:: .4byte RustboroCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc index 470baa66e..2c4eb3977 100644 --- a/data/layouts/RustboroCity_PokemonSchool/layout.inc +++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_PokemonSchool_MapBorder:: .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" - .align 2 RustboroCity_PokemonSchool_MapBlockdata:: .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" @@ -14,3 +12,4 @@ RustboroCity_PokemonSchool_Layout:: .4byte RustboroCity_PokemonSchool_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonSchool + diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc index feb5b0fc0..7a063b922 100644 --- a/data/layouts/RusturfTunnel/layout.inc +++ b/data/layouts/RusturfTunnel/layout.inc @@ -1,8 +1,6 @@ - .align 2 RusturfTunnel_MapBorder:: .incbin "data/layouts/RusturfTunnel/border.bin" - .align 2 RusturfTunnel_MapBlockdata:: .incbin "data/layouts/RusturfTunnel/map.bin" @@ -14,3 +12,4 @@ RusturfTunnel_Layout:: .4byte RusturfTunnel_MapBlockdata .4byte gTileset_General .4byte gTileset_RusturfTunnel + diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc index 8180f0a4d..bcc034ecd 100644 --- a/data/layouts/SSTidalCorridor/layout.inc +++ b/data/layouts/SSTidalCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalCorridor_MapBorder:: .incbin "data/layouts/SSTidalCorridor/border.bin" - .align 2 SSTidalCorridor_MapBlockdata:: .incbin "data/layouts/SSTidalCorridor/map.bin" @@ -14,3 +12,4 @@ SSTidalCorridor_Layout:: .4byte SSTidalCorridor_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc index ece1a572e..807da09a1 100644 --- a/data/layouts/SSTidalLowerDeck/layout.inc +++ b/data/layouts/SSTidalLowerDeck/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalLowerDeck_MapBorder:: .incbin "data/layouts/SSTidalLowerDeck/border.bin" - .align 2 SSTidalLowerDeck_MapBlockdata:: .incbin "data/layouts/SSTidalLowerDeck/map.bin" @@ -14,3 +12,4 @@ SSTidalLowerDeck_Layout:: .4byte SSTidalLowerDeck_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc index 8cd255d8c..e44aac53c 100644 --- a/data/layouts/SSTidalRooms/layout.inc +++ b/data/layouts/SSTidalRooms/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalRooms_MapBorder:: .incbin "data/layouts/SSTidalRooms/border.bin" - .align 2 SSTidalRooms_MapBlockdata:: .incbin "data/layouts/SSTidalRooms/map.bin" @@ -14,3 +12,4 @@ SSTidalRooms_Layout:: .4byte SSTidalRooms_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc index f539c2ced..c6986540f 100644 --- a/data/layouts/SafariZone_North/layout.inc +++ b/data/layouts/SafariZone_North/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_North_MapBorder:: .incbin "data/layouts/SafariZone_North/border.bin" - .align 2 SafariZone_North_MapBlockdata:: .incbin "data/layouts/SafariZone_North/map.bin" @@ -14,3 +12,4 @@ SafariZone_North_Layout:: .4byte SafariZone_North_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc index 903a6c9e0..026e4a7c7 100644 --- a/data/layouts/SafariZone_Northeast/layout.inc +++ b/data/layouts/SafariZone_Northeast/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Northeast_MapBorder:: .incbin "data/layouts/SafariZone_Northeast/border.bin" - .align 2 SafariZone_Northeast_MapBlockdata:: .incbin "data/layouts/SafariZone_Northeast/map.bin" @@ -14,3 +12,4 @@ SafariZone_Northeast_Layout:: .4byte SafariZone_Northeast_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc index 469e25617..09d8bd482 100644 --- a/data/layouts/SafariZone_Northwest/layout.inc +++ b/data/layouts/SafariZone_Northwest/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Northwest_MapBorder:: .incbin "data/layouts/SafariZone_Northwest/border.bin" - .align 2 SafariZone_Northwest_MapBlockdata:: .incbin "data/layouts/SafariZone_Northwest/map.bin" @@ -14,3 +12,4 @@ SafariZone_Northwest_Layout:: .4byte SafariZone_Northwest_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc index 7cb238719..4176cb370 100644 --- a/data/layouts/SafariZone_RestHouse/layout.inc +++ b/data/layouts/SafariZone_RestHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_RestHouse_MapBorder:: .incbin "data/layouts/SafariZone_RestHouse/border.bin" - .align 2 SafariZone_RestHouse_MapBlockdata:: .incbin "data/layouts/SafariZone_RestHouse/map.bin" @@ -14,3 +12,4 @@ SafariZone_RestHouse_Layout:: .4byte SafariZone_RestHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc index 6431c6c01..ec83ba5b0 100644 --- a/data/layouts/SafariZone_South/layout.inc +++ b/data/layouts/SafariZone_South/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_South_MapBorder:: .incbin "data/layouts/SafariZone_South/border.bin" - .align 2 SafariZone_South_MapBlockdata:: .incbin "data/layouts/SafariZone_South/map.bin" @@ -14,3 +12,4 @@ SafariZone_South_Layout:: .4byte SafariZone_South_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc index 450efcd07..e55309b46 100644 --- a/data/layouts/SafariZone_Southeast/layout.inc +++ b/data/layouts/SafariZone_Southeast/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Southeast_MapBorder:: .incbin "data/layouts/SafariZone_Southeast/border.bin" - .align 2 SafariZone_Southeast_MapBlockdata:: .incbin "data/layouts/SafariZone_Southeast/map.bin" @@ -14,3 +12,4 @@ SafariZone_Southeast_Layout:: .4byte SafariZone_Southeast_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc index 559736b9f..1236d4d4b 100644 --- a/data/layouts/SafariZone_Southwest/layout.inc +++ b/data/layouts/SafariZone_Southwest/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Southwest_MapBorder:: .incbin "data/layouts/SafariZone_Southwest/border.bin" - .align 2 SafariZone_Southwest_MapBlockdata:: .incbin "data/layouts/SafariZone_Southwest/map.bin" @@ -14,3 +12,4 @@ SafariZone_Southwest_Layout:: .4byte SafariZone_Southwest_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc index e9f30c74c..897d873ab 100644 --- a/data/layouts/ScorchedSlab/layout.inc +++ b/data/layouts/ScorchedSlab/layout.inc @@ -1,8 +1,6 @@ - .align 2 ScorchedSlab_MapBorder:: .incbin "data/layouts/ScorchedSlab/border.bin" - .align 2 ScorchedSlab_MapBlockdata:: .incbin "data/layouts/ScorchedSlab/map.bin" @@ -14,3 +12,4 @@ ScorchedSlab_Layout:: .4byte ScorchedSlab_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc index eaed336bc..1d6ce495b 100644 --- a/data/layouts/SeafloorCavern_Entrance/layout.inc +++ b/data/layouts/SeafloorCavern_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Entrance_MapBorder:: .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" - .align 2 SeafloorCavern_Entrance_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Entrance_Layout:: .4byte SeafloorCavern_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc index 6deb54493..7f7cf0570 100644 --- a/data/layouts/SeafloorCavern_Room1/layout.inc +++ b/data/layouts/SeafloorCavern_Room1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room1_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room1/border.bin" - .align 2 SeafloorCavern_Room1_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room1/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room1_Layout:: .4byte SeafloorCavern_Room1_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc index c0dfdcedc..89f4e6a79 100644 --- a/data/layouts/SeafloorCavern_Room2/layout.inc +++ b/data/layouts/SeafloorCavern_Room2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room2_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room2/border.bin" - .align 2 SeafloorCavern_Room2_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room2/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room2_Layout:: .4byte SeafloorCavern_Room2_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc index 58ce10cdf..070842a9f 100644 --- a/data/layouts/SeafloorCavern_Room3/layout.inc +++ b/data/layouts/SeafloorCavern_Room3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room3_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room3/border.bin" - .align 2 SeafloorCavern_Room3_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room3/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room3_Layout:: .4byte SeafloorCavern_Room3_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc index f4ff113ff..6c984109d 100644 --- a/data/layouts/SeafloorCavern_Room4/layout.inc +++ b/data/layouts/SeafloorCavern_Room4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room4_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room4/border.bin" - .align 2 SeafloorCavern_Room4_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room4/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room4_Layout:: .4byte SeafloorCavern_Room4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc index 69218f64b..c48b00dba 100644 --- a/data/layouts/SeafloorCavern_Room5/layout.inc +++ b/data/layouts/SeafloorCavern_Room5/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room5_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room5/border.bin" - .align 2 SeafloorCavern_Room5_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room5/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room5_Layout:: .4byte SeafloorCavern_Room5_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc index d18506d6b..f729d0b1b 100644 --- a/data/layouts/SeafloorCavern_Room6/layout.inc +++ b/data/layouts/SeafloorCavern_Room6/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room6_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room6/border.bin" - .align 2 SeafloorCavern_Room6_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room6/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room6_Layout:: .4byte SeafloorCavern_Room6_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc index 6e953c06e..784b9bbb9 100644 --- a/data/layouts/SeafloorCavern_Room7/layout.inc +++ b/data/layouts/SeafloorCavern_Room7/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room7_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room7/border.bin" - .align 2 SeafloorCavern_Room7_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room7/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room7_Layout:: .4byte SeafloorCavern_Room7_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc index 1a0477b68..8f3d826c7 100644 --- a/data/layouts/SeafloorCavern_Room8/layout.inc +++ b/data/layouts/SeafloorCavern_Room8/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room8_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room8/border.bin" - .align 2 SeafloorCavern_Room8_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room8/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room8_Layout:: .4byte SeafloorCavern_Room8_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc index 115db570b..a5039da8f 100644 --- a/data/layouts/SeafloorCavern_Room9/layout.inc +++ b/data/layouts/SeafloorCavern_Room9/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room9_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room9/border.bin" - .align 2 SeafloorCavern_Room9_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room9/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room9_Layout:: .4byte SeafloorCavern_Room9_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc index 3de6298e2..7a064d5f0 100644 --- a/data/layouts/SealedChamber_InnerRoom/layout.inc +++ b/data/layouts/SealedChamber_InnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 SealedChamber_InnerRoom_MapBorder:: .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" - .align 2 SealedChamber_InnerRoom_MapBlockdata:: .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" @@ -14,3 +12,4 @@ SealedChamber_InnerRoom_Layout:: .4byte SealedChamber_InnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc index b966d00ef..bc6afaf29 100644 --- a/data/layouts/SealedChamber_OuterRoom/layout.inc +++ b/data/layouts/SealedChamber_OuterRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 SealedChamber_OuterRoom_MapBorder:: .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" - .align 2 SealedChamber_OuterRoom_MapBlockdata:: .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" @@ -14,3 +12,4 @@ SealedChamber_OuterRoom_Layout:: .4byte SealedChamber_OuterRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc index 7e3110f48..ec138440a 100644 --- a/data/layouts/SecretBase_BlueCave1/layout.inc +++ b/data/layouts/SecretBase_BlueCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave1_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave1/border.bin" - .align 2 SecretBase_BlueCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave1_Layout:: .4byte SecretBase_BlueCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc index 7a3228832..8c2b48661 100644 --- a/data/layouts/SecretBase_BlueCave2/layout.inc +++ b/data/layouts/SecretBase_BlueCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave2_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave2/border.bin" - .align 2 SecretBase_BlueCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave2_Layout:: .4byte SecretBase_BlueCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc index a1921a475..0ac8bee1b 100644 --- a/data/layouts/SecretBase_BlueCave3/layout.inc +++ b/data/layouts/SecretBase_BlueCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave3_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave3/border.bin" - .align 2 SecretBase_BlueCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave3_Layout:: .4byte SecretBase_BlueCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc index 81509d18c..d0e5ed45f 100644 --- a/data/layouts/SecretBase_BlueCave4/layout.inc +++ b/data/layouts/SecretBase_BlueCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave4_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave4/border.bin" - .align 2 SecretBase_BlueCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave4_Layout:: .4byte SecretBase_BlueCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc index e1bec323a..9044fd6d1 100644 --- a/data/layouts/SecretBase_BrownCave1/layout.inc +++ b/data/layouts/SecretBase_BrownCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave1_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave1/border.bin" - .align 2 SecretBase_BrownCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave1_Layout:: .4byte SecretBase_BrownCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc index 52d595212..7cfb9573b 100644 --- a/data/layouts/SecretBase_BrownCave2/layout.inc +++ b/data/layouts/SecretBase_BrownCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave2_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave2/border.bin" - .align 2 SecretBase_BrownCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave2_Layout:: .4byte SecretBase_BrownCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc index 4fa22e613..5ad1bf526 100644 --- a/data/layouts/SecretBase_BrownCave3/layout.inc +++ b/data/layouts/SecretBase_BrownCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave3_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave3/border.bin" - .align 2 SecretBase_BrownCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave3_Layout:: .4byte SecretBase_BrownCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc index 65566a482..6094a3832 100644 --- a/data/layouts/SecretBase_BrownCave4/layout.inc +++ b/data/layouts/SecretBase_BrownCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave4_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave4/border.bin" - .align 2 SecretBase_BrownCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave4_Layout:: .4byte SecretBase_BrownCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc index f9dcde880..a4664d509 100644 --- a/data/layouts/SecretBase_RedCave1/layout.inc +++ b/data/layouts/SecretBase_RedCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave1_MapBorder:: .incbin "data/layouts/SecretBase_RedCave1/border.bin" - .align 2 SecretBase_RedCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave1_Layout:: .4byte SecretBase_RedCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc index 667a744ad..7999395d8 100644 --- a/data/layouts/SecretBase_RedCave2/layout.inc +++ b/data/layouts/SecretBase_RedCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave2_MapBorder:: .incbin "data/layouts/SecretBase_RedCave2/border.bin" - .align 2 SecretBase_RedCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave2_Layout:: .4byte SecretBase_RedCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc index 39a079d2b..6a3cc123b 100644 --- a/data/layouts/SecretBase_RedCave3/layout.inc +++ b/data/layouts/SecretBase_RedCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave3_MapBorder:: .incbin "data/layouts/SecretBase_RedCave3/border.bin" - .align 2 SecretBase_RedCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave3_Layout:: .4byte SecretBase_RedCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc index 890c1c3b5..665f44709 100644 --- a/data/layouts/SecretBase_RedCave4/layout.inc +++ b/data/layouts/SecretBase_RedCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave4_MapBorder:: .incbin "data/layouts/SecretBase_RedCave4/border.bin" - .align 2 SecretBase_RedCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave4_Layout:: .4byte SecretBase_RedCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc index 835028c64..2bcc9f58a 100644 --- a/data/layouts/SecretBase_Shrub1/layout.inc +++ b/data/layouts/SecretBase_Shrub1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub1_MapBorder:: .incbin "data/layouts/SecretBase_Shrub1/border.bin" - .align 2 SecretBase_Shrub1_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub1/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub1_Layout:: .4byte SecretBase_Shrub1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc index cd1fe6119..e94376c3b 100644 --- a/data/layouts/SecretBase_Shrub2/layout.inc +++ b/data/layouts/SecretBase_Shrub2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub2_MapBorder:: .incbin "data/layouts/SecretBase_Shrub2/border.bin" - .align 2 SecretBase_Shrub2_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub2/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub2_Layout:: .4byte SecretBase_Shrub2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc index 721df1201..449f1a11f 100644 --- a/data/layouts/SecretBase_Shrub3/layout.inc +++ b/data/layouts/SecretBase_Shrub3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub3_MapBorder:: .incbin "data/layouts/SecretBase_Shrub3/border.bin" - .align 2 SecretBase_Shrub3_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub3/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub3_Layout:: .4byte SecretBase_Shrub3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc index 71a2495ad..139a82050 100644 --- a/data/layouts/SecretBase_Shrub4/layout.inc +++ b/data/layouts/SecretBase_Shrub4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub4_MapBorder:: .incbin "data/layouts/SecretBase_Shrub4/border.bin" - .align 2 SecretBase_Shrub4_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub4/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub4_Layout:: .4byte SecretBase_Shrub4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc index 45889b449..73e6e41a6 100644 --- a/data/layouts/SecretBase_Tree1/layout.inc +++ b/data/layouts/SecretBase_Tree1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree1_MapBorder:: .incbin "data/layouts/SecretBase_Tree1/border.bin" - .align 2 SecretBase_Tree1_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree1/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree1_Layout:: .4byte SecretBase_Tree1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc index ca1106b26..95b122220 100644 --- a/data/layouts/SecretBase_Tree2/layout.inc +++ b/data/layouts/SecretBase_Tree2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree2_MapBorder:: .incbin "data/layouts/SecretBase_Tree2/border.bin" - .align 2 SecretBase_Tree2_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree2/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree2_Layout:: .4byte SecretBase_Tree2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc index 28a4ecbcc..66716a404 100644 --- a/data/layouts/SecretBase_Tree3/layout.inc +++ b/data/layouts/SecretBase_Tree3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree3_MapBorder:: .incbin "data/layouts/SecretBase_Tree3/border.bin" - .align 2 SecretBase_Tree3_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree3/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree3_Layout:: .4byte SecretBase_Tree3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc index 6f869a74e..20d4c3e01 100644 --- a/data/layouts/SecretBase_Tree4/layout.inc +++ b/data/layouts/SecretBase_Tree4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree4_MapBorder:: .incbin "data/layouts/SecretBase_Tree4/border.bin" - .align 2 SecretBase_Tree4_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree4/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree4_Layout:: .4byte SecretBase_Tree4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc index d34c182c3..7fa3aa823 100644 --- a/data/layouts/SecretBase_YellowCave1/layout.inc +++ b/data/layouts/SecretBase_YellowCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave1_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave1/border.bin" - .align 2 SecretBase_YellowCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave1_Layout:: .4byte SecretBase_YellowCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc index fc5813858..0ae872e08 100644 --- a/data/layouts/SecretBase_YellowCave2/layout.inc +++ b/data/layouts/SecretBase_YellowCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave2_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave2/border.bin" - .align 2 SecretBase_YellowCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave2_Layout:: .4byte SecretBase_YellowCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc index 005af813a..f42d88920 100644 --- a/data/layouts/SecretBase_YellowCave3/layout.inc +++ b/data/layouts/SecretBase_YellowCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave3_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave3/border.bin" - .align 2 SecretBase_YellowCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave3_Layout:: .4byte SecretBase_YellowCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc index 5dfaa435c..b7a11df5a 100644 --- a/data/layouts/SecretBase_YellowCave4/layout.inc +++ b/data/layouts/SecretBase_YellowCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave4_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave4/border.bin" - .align 2 SecretBase_YellowCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave4_Layout:: .4byte SecretBase_YellowCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc index 43df2d495..a52425e15 100644 --- a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_HighTideEntranceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" - .align 2 ShoalCave_HighTideEntranceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_HighTideEntranceRoom_Layout:: .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc index 22fde10c6..2d323b9e0 100644 --- a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc +++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_HighTideInnerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" - .align 2 ShoalCave_HighTideInnerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_HighTideInnerRoom_Layout:: .4byte ShoalCave_HighTideInnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc index c471d40ed..0a1eee113 100644 --- a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideEntranceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin" - .align 2 ShoalCave_LowTideEntranceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideEntranceRoom_Layout:: .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc index 3dea1135c..6d7a51575 100644 --- a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideIceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin" - .align 2 ShoalCave_LowTideIceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideIceRoom_Layout:: .4byte ShoalCave_LowTideIceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc index 090a783c4..f66fc9723 100644 --- a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideInnerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin" - .align 2 ShoalCave_LowTideInnerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideInnerRoom_Layout:: .4byte ShoalCave_LowTideInnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc index 364c026b2..79cc82e8c 100644 --- a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideLowerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin" - .align 2 ShoalCave_LowTideLowerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideLowerRoom_Layout:: .4byte ShoalCave_LowTideLowerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc index 4195e34d8..62dbff40e 100644 --- a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideStairsRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin" - .align 2 ShoalCave_LowTideStairsRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideStairsRoom_Layout:: .4byte ShoalCave_LowTideStairsRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc index 59ec3c3c7..f42855de8 100644 --- a/data/layouts/SingleBattleColosseum/layout.inc +++ b/data/layouts/SingleBattleColosseum/layout.inc @@ -1,8 +1,6 @@ - .align 2 SingleBattleColosseum_MapBorder:: .incbin "data/layouts/SingleBattleColosseum/border.bin" - .align 2 SingleBattleColosseum_MapBlockdata:: .incbin "data/layouts/SingleBattleColosseum/map.bin" @@ -14,3 +12,4 @@ SingleBattleColosseum_Layout:: .4byte SingleBattleColosseum_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc index e0f3550ed..235f04935 100644 --- a/data/layouts/SkyPillar_1F/layout.inc +++ b/data/layouts/SkyPillar_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_1F_MapBorder:: .incbin "data/layouts/SkyPillar_1F/border.bin" - .align 2 SkyPillar_1F_MapBlockdata:: .incbin "data/layouts/SkyPillar_1F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_1F_Layout:: .4byte SkyPillar_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc index 2ce0b5280..368fcd518 100644 --- a/data/layouts/SkyPillar_2F/layout.inc +++ b/data/layouts/SkyPillar_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_2F_MapBorder:: .incbin "data/layouts/SkyPillar_2F/border.bin" - .align 2 SkyPillar_2F_MapBlockdata:: .incbin "data/layouts/SkyPillar_2F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_2F_Layout:: .4byte SkyPillar_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc index 0bf2ad939..32ac95143 100644 --- a/data/layouts/SkyPillar_3F/layout.inc +++ b/data/layouts/SkyPillar_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_3F_MapBorder:: .incbin "data/layouts/SkyPillar_3F/border.bin" - .align 2 SkyPillar_3F_MapBlockdata:: .incbin "data/layouts/SkyPillar_3F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_3F_Layout:: .4byte SkyPillar_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc index 35b7b61d1..055abf133 100644 --- a/data/layouts/SkyPillar_4F/layout.inc +++ b/data/layouts/SkyPillar_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_4F_MapBorder:: .incbin "data/layouts/SkyPillar_4F/border.bin" - .align 2 SkyPillar_4F_MapBlockdata:: .incbin "data/layouts/SkyPillar_4F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_4F_Layout:: .4byte SkyPillar_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc index dbef0083e..3f3bb5bc1 100644 --- a/data/layouts/SkyPillar_5F/layout.inc +++ b/data/layouts/SkyPillar_5F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_5F_MapBorder:: .incbin "data/layouts/SkyPillar_5F/border.bin" - .align 2 SkyPillar_5F_MapBlockdata:: .incbin "data/layouts/SkyPillar_5F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_5F_Layout:: .4byte SkyPillar_5F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc index ed0d1dedd..1313bd196 100644 --- a/data/layouts/SkyPillar_Entrance/layout.inc +++ b/data/layouts/SkyPillar_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Entrance_MapBorder:: .incbin "data/layouts/SkyPillar_Entrance/border.bin" - .align 2 SkyPillar_Entrance_MapBlockdata:: .incbin "data/layouts/SkyPillar_Entrance/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Entrance_Layout:: .4byte SkyPillar_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc index ae4184ea9..5eb9df563 100644 --- a/data/layouts/SkyPillar_Outside/layout.inc +++ b/data/layouts/SkyPillar_Outside/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Outside_MapBorder:: .incbin "data/layouts/SkyPillar_Outside/border.bin" - .align 2 SkyPillar_Outside_MapBlockdata:: .incbin "data/layouts/SkyPillar_Outside/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Outside_Layout:: .4byte SkyPillar_Outside_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc index f9e7f24a4..646c6f95f 100644 --- a/data/layouts/SkyPillar_Top/layout.inc +++ b/data/layouts/SkyPillar_Top/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Top_MapBorder:: .incbin "data/layouts/SkyPillar_Top/border.bin" - .align 2 SkyPillar_Top_MapBlockdata:: .incbin "data/layouts/SkyPillar_Top/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Top_Layout:: .4byte SkyPillar_Top_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc index 5cc1b1276..dfa184764 100644 --- a/data/layouts/SlateportCity/layout.inc +++ b/data/layouts/SlateportCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_MapBorder:: .incbin "data/layouts/SlateportCity/border.bin" - .align 2 SlateportCity_MapBlockdata:: .incbin "data/layouts/SlateportCity/map.bin" @@ -14,3 +12,4 @@ SlateportCity_Layout:: .4byte SlateportCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc index 957e23320..f921eb5fc 100644 --- a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ SlateportCity_OceanicMuseum_1F_Layout:: .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_OceanicMuseum + diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc index 0072fe2c5..7a6998987 100644 --- a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ SlateportCity_OceanicMuseum_2F_Layout:: .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_OceanicMuseum + diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc index 789c78b67..44f9a559f 100644 --- a/data/layouts/SlateportCity_PokemonFanClub/layout.inc +++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_PokemonFanClub_MapBorder:: .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" - .align 2 SlateportCity_PokemonFanClub_MapBlockdata:: .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" @@ -14,3 +12,4 @@ SlateportCity_PokemonFanClub_Layout:: .4byte SlateportCity_PokemonFanClub_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonFanClub + diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc index 5ffddafa6..00d5840c6 100644 --- a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc +++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ SlateportCity_SternsShipyard_1F_Layout:: .4byte SlateportCity_SternsShipyard_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc index fe76a83e8..01a969a3a 100644 --- a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc +++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ SlateportCity_SternsShipyard_2F_Layout:: .4byte SlateportCity_SternsShipyard_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc index 91a877c38..400a29cbd 100644 --- a/data/layouts/SootopolisCity/layout.inc +++ b/data/layouts/SootopolisCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_MapBorder:: .incbin "data/layouts/SootopolisCity/border.bin" - .align 2 SootopolisCity_MapBlockdata:: .incbin "data/layouts/SootopolisCity/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_Layout:: .4byte SootopolisCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Sootopolis + diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc index ce7a15e5e..4c6a6eeef 100644 --- a/data/layouts/SootopolisCity_Gym_1F/layout.inc +++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ SootopolisCity_Gym_1F_Layout:: .4byte SootopolisCity_Gym_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_SootopolisGym + diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc index a97138cd5..7eb90fb71 100644 --- a/data/layouts/SootopolisCity_Gym_B1F/layout.inc +++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ SootopolisCity_Gym_B1F_Layout:: .4byte SootopolisCity_Gym_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_SootopolisGym + diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc index 5c37828ef..1ad9cc41c 100644 --- a/data/layouts/SootopolisCity_House1/layout.inc +++ b/data/layouts/SootopolisCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House1_MapBorder:: .incbin "data/layouts/SootopolisCity_House1/border.bin" - .align 2 SootopolisCity_House1_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House1/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House1_Layout:: .4byte SootopolisCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc index ffa3c5ad1..9007d584b 100644 --- a/data/layouts/SootopolisCity_House2/layout.inc +++ b/data/layouts/SootopolisCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House2_MapBorder:: .incbin "data/layouts/SootopolisCity_House2/border.bin" - .align 2 SootopolisCity_House2_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House2/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House2_Layout:: .4byte SootopolisCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc index 3d1fa421c..540f4306c 100644 --- a/data/layouts/SootopolisCity_House3/layout.inc +++ b/data/layouts/SootopolisCity_House3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House3_MapBorder:: .incbin "data/layouts/SootopolisCity_House3/border.bin" - .align 2 SootopolisCity_House3_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House3/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House3_Layout:: .4byte SootopolisCity_House3_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc index 1a0e7b418..152563eb6 100644 --- a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc +++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_LotadAndSeedotHouse_MapBorder:: .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin" - .align 2 SootopolisCity_LotadAndSeedotHouse_MapBlockdata:: .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_LotadAndSeedotHouse_Layout:: .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc index 127128a2e..0b846950e 100644 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ SootopolisCity_MysteryEventsHouse_1F_Layout:: .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc index 951b90582..1bb92b933 100644 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ SootopolisCity_MysteryEventsHouse_B1F_Layout:: .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc index e5747d2e9..4a62cd3f5 100644 --- a/data/layouts/SouthernIsland_Exterior/layout.inc +++ b/data/layouts/SouthernIsland_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 SouthernIsland_Exterior_MapBorder:: .incbin "data/layouts/SouthernIsland_Exterior/border.bin" - .align 2 SouthernIsland_Exterior_MapBlockdata:: .incbin "data/layouts/SouthernIsland_Exterior/map.bin" @@ -14,3 +12,4 @@ SouthernIsland_Exterior_Layout:: .4byte SouthernIsland_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc index 3ac1a6a82..b4d9a35d2 100644 --- a/data/layouts/SouthernIsland_Interior/layout.inc +++ b/data/layouts/SouthernIsland_Interior/layout.inc @@ -1,8 +1,6 @@ - .align 2 SouthernIsland_Interior_MapBorder:: .incbin "data/layouts/SouthernIsland_Interior/border.bin" - .align 2 SouthernIsland_Interior_MapBlockdata:: .incbin "data/layouts/SouthernIsland_Interior/map.bin" @@ -14,3 +12,4 @@ SouthernIsland_Interior_Layout:: .4byte SouthernIsland_Interior_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc index 42ba6309b..0865a8e5b 100644 --- a/data/layouts/TerraCave_End/layout.inc +++ b/data/layouts/TerraCave_End/layout.inc @@ -1,8 +1,6 @@ - .align 2 TerraCave_End_MapBorder:: .incbin "data/layouts/TerraCave_End/border.bin" - .align 2 TerraCave_End_MapBlockdata:: .incbin "data/layouts/TerraCave_End/map.bin" @@ -14,3 +12,4 @@ TerraCave_End_Layout:: .4byte TerraCave_End_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc index 8b0a09650..19d50ef44 100644 --- a/data/layouts/TerraCave_Entrance/layout.inc +++ b/data/layouts/TerraCave_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 TerraCave_Entrance_MapBorder:: .incbin "data/layouts/TerraCave_Entrance/border.bin" - .align 2 TerraCave_Entrance_MapBlockdata:: .incbin "data/layouts/TerraCave_Entrance/map.bin" @@ -14,3 +12,4 @@ TerraCave_Entrance_Layout:: .4byte TerraCave_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc index 59d257c62..5e0297e7a 100644 --- a/data/layouts/TradeCenter/layout.inc +++ b/data/layouts/TradeCenter/layout.inc @@ -1,8 +1,6 @@ - .align 2 TradeCenter_MapBorder:: .incbin "data/layouts/TradeCenter/border.bin" - .align 2 TradeCenter_MapBlockdata:: .incbin "data/layouts/TradeCenter/map.bin" @@ -14,3 +12,4 @@ TradeCenter_Layout:: .4byte TradeCenter_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc index 0cb5fee4a..2009cd49e 100644 --- a/data/layouts/TrainerHill_1F/layout.inc +++ b/data/layouts/TrainerHill_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_1F_MapBorder:: .incbin "data/layouts/TrainerHill_1F/border.bin" - .align 2 TrainerHill_1F_MapBlockdata:: .incbin "data/layouts/TrainerHill_1F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_1F_Layout:: .4byte TrainerHill_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc index 25ac09eb9..f67b54bf1 100644 --- a/data/layouts/TrainerHill_2F/layout.inc +++ b/data/layouts/TrainerHill_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_2F_MapBorder:: .incbin "data/layouts/TrainerHill_2F/border.bin" - .align 2 TrainerHill_2F_MapBlockdata:: .incbin "data/layouts/TrainerHill_2F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_2F_Layout:: .4byte TrainerHill_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc index 2b9f74cc7..280517f41 100644 --- a/data/layouts/TrainerHill_3F/layout.inc +++ b/data/layouts/TrainerHill_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_3F_MapBorder:: .incbin "data/layouts/TrainerHill_3F/border.bin" - .align 2 TrainerHill_3F_MapBlockdata:: .incbin "data/layouts/TrainerHill_3F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_3F_Layout:: .4byte TrainerHill_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc index 8664a3c90..eed0b0120 100644 --- a/data/layouts/TrainerHill_4F/layout.inc +++ b/data/layouts/TrainerHill_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_4F_MapBorder:: .incbin "data/layouts/TrainerHill_4F/border.bin" - .align 2 TrainerHill_4F_MapBlockdata:: .incbin "data/layouts/TrainerHill_4F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_4F_Layout:: .4byte TrainerHill_4F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc index 0fc549f46..896f43e0d 100644 --- a/data/layouts/TrainerHill_Entrance/layout.inc +++ b/data/layouts/TrainerHill_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_Entrance_MapBorder:: .incbin "data/layouts/TrainerHill_Entrance/border.bin" - .align 2 TrainerHill_Entrance_MapBlockdata:: .incbin "data/layouts/TrainerHill_Entrance/map.bin" @@ -14,3 +12,4 @@ TrainerHill_Entrance_Layout:: .4byte TrainerHill_Entrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc index bfa1aeb35..9477dceda 100644 --- a/data/layouts/TrainerHill_Roof/layout.inc +++ b/data/layouts/TrainerHill_Roof/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_Roof_MapBorder:: .incbin "data/layouts/TrainerHill_Roof/border.bin" - .align 2 TrainerHill_Roof_MapBlockdata:: .incbin "data/layouts/TrainerHill_Roof/map.bin" @@ -14,3 +12,4 @@ TrainerHill_Roof_Layout:: .4byte TrainerHill_Roof_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc index f2b61dfbc..8e027bbd2 100644 --- a/data/layouts/Underwater1/layout.inc +++ b/data/layouts/Underwater1/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater1_MapBorder:: .incbin "data/layouts/Underwater1/border.bin" - .align 2 Underwater1_MapBlockdata:: .incbin "data/layouts/Underwater1/map.bin" @@ -14,3 +12,4 @@ Underwater1_Layout:: .4byte Underwater1_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc index ab8892c86..ac6350d47 100644 --- a/data/layouts/Underwater2/layout.inc +++ b/data/layouts/Underwater2/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater2_MapBorder:: .incbin "data/layouts/Underwater2/border.bin" - .align 2 Underwater2_MapBlockdata:: .incbin "data/layouts/Underwater2/map.bin" @@ -14,3 +12,4 @@ Underwater2_Layout:: .4byte Underwater2_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc index b1238bc1f..c365b6b8f 100644 --- a/data/layouts/Underwater3/layout.inc +++ b/data/layouts/Underwater3/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater3_MapBorder:: .incbin "data/layouts/Underwater3/border.bin" - .align 2 Underwater3_MapBlockdata:: .incbin "data/layouts/Underwater3/map.bin" @@ -14,3 +12,4 @@ Underwater3_Layout:: .4byte Underwater3_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc index ed46c9f5b..9e22e4e40 100644 --- a/data/layouts/Underwater4/layout.inc +++ b/data/layouts/Underwater4/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater4_MapBorder:: .incbin "data/layouts/Underwater4/border.bin" - .align 2 Underwater4_MapBlockdata:: .incbin "data/layouts/Underwater4/map.bin" @@ -14,3 +12,4 @@ Underwater4_Layout:: .4byte Underwater4_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc index cef2c5d76..6394eec54 100644 --- a/data/layouts/Underwater5/layout.inc +++ b/data/layouts/Underwater5/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater5_MapBorder:: .incbin "data/layouts/Underwater5/border.bin" - .align 2 Underwater5_MapBlockdata:: .incbin "data/layouts/Underwater5/map.bin" @@ -14,3 +12,4 @@ Underwater5_Layout:: .4byte Underwater5_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc index c6f8b9742..247af44bd 100644 --- a/data/layouts/Underwater6/layout.inc +++ b/data/layouts/Underwater6/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater6_MapBorder:: .incbin "data/layouts/Underwater6/border.bin" - .align 2 Underwater6_MapBlockdata:: .incbin "data/layouts/Underwater6/map.bin" @@ -14,3 +12,4 @@ Underwater6_Layout:: .4byte Underwater6_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc index e910152e4..5c2670b11 100644 --- a/data/layouts/Underwater7/layout.inc +++ b/data/layouts/Underwater7/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater7_MapBorder:: .incbin "data/layouts/Underwater7/border.bin" - .align 2 Underwater7_MapBlockdata:: .incbin "data/layouts/Underwater7/map.bin" @@ -14,3 +12,4 @@ Underwater7_Layout:: .4byte Underwater7_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc index c51bbeb35..52a3a7851 100644 --- a/data/layouts/Underwater_MarineCave/layout.inc +++ b/data/layouts/Underwater_MarineCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_MarineCave_MapBorder:: .incbin "data/layouts/Underwater_MarineCave/border.bin" - .align 2 Underwater_MarineCave_MapBlockdata:: .incbin "data/layouts/Underwater_MarineCave/map.bin" @@ -14,3 +12,4 @@ Underwater_MarineCave_Layout:: .4byte Underwater_MarineCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc index a4bcf2043..1534564a4 100644 --- a/data/layouts/Underwater_Route134/layout.inc +++ b/data/layouts/Underwater_Route134/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_Route134_MapBorder:: .incbin "data/layouts/Underwater_Route134/border.bin" - .align 2 Underwater_Route134_MapBlockdata:: .incbin "data/layouts/Underwater_Route134/map.bin" @@ -14,3 +12,4 @@ Underwater_Route134_Layout:: .4byte Underwater_Route134_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc index 5d610efb1..5bce06a6b 100644 --- a/data/layouts/Underwater_SeafloorCavern/layout.inc +++ b/data/layouts/Underwater_SeafloorCavern/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SeafloorCavern_MapBorder:: .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" - .align 2 Underwater_SeafloorCavern_MapBlockdata:: .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" @@ -14,3 +12,4 @@ Underwater_SeafloorCavern_Layout:: .4byte Underwater_SeafloorCavern_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc index a6f924c18..5baf5dde8 100644 --- a/data/layouts/Underwater_SealedChamber/layout.inc +++ b/data/layouts/Underwater_SealedChamber/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SealedChamber_MapBorder:: .incbin "data/layouts/Underwater_SealedChamber/border.bin" - .align 2 Underwater_SealedChamber_MapBlockdata:: .incbin "data/layouts/Underwater_SealedChamber/map.bin" @@ -14,3 +12,4 @@ Underwater_SealedChamber_Layout:: .4byte Underwater_SealedChamber_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc index 22d42167e..4a1b0aa02 100644 --- a/data/layouts/Underwater_SootopolisCity/layout.inc +++ b/data/layouts/Underwater_SootopolisCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SootopolisCity_MapBorder:: .incbin "data/layouts/Underwater_SootopolisCity/border.bin" - .align 2 Underwater_SootopolisCity_MapBlockdata:: .incbin "data/layouts/Underwater_SootopolisCity/map.bin" @@ -14,3 +12,4 @@ Underwater_SootopolisCity_Layout:: .4byte Underwater_SootopolisCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc index 2c7e821a9..0c2a065a5 100644 --- a/data/layouts/UnionRoom/layout.inc +++ b/data/layouts/UnionRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnionRoom_MapBorder:: .incbin "data/layouts/UnionRoom/border.bin" - .align 2 UnionRoom_MapBlockdata:: .incbin "data/layouts/UnionRoom/map.bin" @@ -14,3 +12,4 @@ UnionRoom_Layout:: .4byte UnionRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_UnionRoom + diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc index 0f3b5504d..41e954b4e 100644 --- a/data/layouts/UnknownMap_08417FC4/layout.inc +++ b/data/layouts/UnknownMap_08417FC4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08417FC4_MapBorder:: .incbin "data/layouts/UnknownMap_08417FC4/border.bin" - .align 2 UnknownMap_08417FC4_MapBlockdata:: .incbin "data/layouts/UnknownMap_08417FC4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08417FC4_Layout:: .4byte UnknownMap_08417FC4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc index 603919b42..f1695ec66 100644 --- a/data/layouts/UnknownMap_08428450/layout.inc +++ b/data/layouts/UnknownMap_08428450/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08428450_MapBorder:: .incbin "data/layouts/UnknownMap_08428450/border.bin" - .align 2 UnknownMap_08428450_MapBlockdata:: .incbin "data/layouts/UnknownMap_08428450/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08428450_Layout:: .4byte UnknownMap_08428450_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc index 3e565369a..f19bd682d 100644 --- a/data/layouts/UnknownMap_084294C4/layout.inc +++ b/data/layouts/UnknownMap_084294C4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084294C4_MapBorder:: .incbin "data/layouts/UnknownMap_084294C4/border.bin" - .align 2 UnknownMap_084294C4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084294C4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084294C4_Layout:: .4byte UnknownMap_084294C4_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc index fd157b999..e351524e1 100644 --- a/data/layouts/UnknownMap_084294E8/layout.inc +++ b/data/layouts/UnknownMap_084294E8/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084294E8_MapBorder:: .incbin "data/layouts/UnknownMap_084294E8/border.bin" - .align 2 UnknownMap_084294E8_MapBlockdata:: .incbin "data/layouts/UnknownMap_084294E8/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084294E8_Layout:: .4byte UnknownMap_084294E8_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc index 9cc060b76..fd01ddc10 100644 --- a/data/layouts/UnknownMap_0843E6C0/layout.inc +++ b/data/layouts/UnknownMap_0843E6C0/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E6C0_MapBorder:: .incbin "data/layouts/UnknownMap_0843E6C0/border.bin" - .align 2 UnknownMap_0843E6C0_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E6C0/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E6C0_Layout:: .4byte UnknownMap_0843E6C0_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc index 5651df7df..80ad93127 100644 --- a/data/layouts/UnknownMap_0843E6E4/layout.inc +++ b/data/layouts/UnknownMap_0843E6E4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E6E4_MapBorder:: .incbin "data/layouts/UnknownMap_0843E6E4/border.bin" - .align 2 UnknownMap_0843E6E4_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E6E4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E6E4_Layout:: .4byte UnknownMap_0843E6E4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc index b79c2d34b..16d4e400c 100644 --- a/data/layouts/UnknownMap_0843E708/layout.inc +++ b/data/layouts/UnknownMap_0843E708/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E708_MapBorder:: .incbin "data/layouts/UnknownMap_0843E708/border.bin" - .align 2 UnknownMap_0843E708_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E708/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E708_Layout:: .4byte UnknownMap_0843E708_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc index 36aee8b80..c6541b3ea 100644 --- a/data/layouts/UnknownMap_0843E72C/layout.inc +++ b/data/layouts/UnknownMap_0843E72C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E72C_MapBorder:: .incbin "data/layouts/UnknownMap_0843E72C/border.bin" - .align 2 UnknownMap_0843E72C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E72C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E72C_Layout:: .4byte UnknownMap_0843E72C_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc index c233955f1..e566a93b7 100644 --- a/data/layouts/UnknownMap_0843E750/layout.inc +++ b/data/layouts/UnknownMap_0843E750/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E750_MapBorder:: .incbin "data/layouts/UnknownMap_0843E750/border.bin" - .align 2 UnknownMap_0843E750_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E750/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E750_Layout:: .4byte UnknownMap_0843E750_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc index bc2c238f3..ce1a438eb 100644 --- a/data/layouts/UnknownMap_0843E774/layout.inc +++ b/data/layouts/UnknownMap_0843E774/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E774_MapBorder:: .incbin "data/layouts/UnknownMap_0843E774/border.bin" - .align 2 UnknownMap_0843E774_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E774/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E774_Layout:: .4byte UnknownMap_0843E774_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc index 352db474d..179e0d881 100644 --- a/data/layouts/UnknownMap_0843E798/layout.inc +++ b/data/layouts/UnknownMap_0843E798/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E798_MapBorder:: .incbin "data/layouts/UnknownMap_0843E798/border.bin" - .align 2 UnknownMap_0843E798_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E798/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E798_Layout:: .4byte UnknownMap_0843E798_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc index c0edd37eb..907ec6266 100644 --- a/data/layouts/UnknownMap_0843E7BC/layout.inc +++ b/data/layouts/UnknownMap_0843E7BC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E7BC_MapBorder:: .incbin "data/layouts/UnknownMap_0843E7BC/border.bin" - .align 2 UnknownMap_0843E7BC_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E7BC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E7BC_Layout:: .4byte UnknownMap_0843E7BC_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc index b421cf662..c56046ef1 100644 --- a/data/layouts/UnknownMap_0843E7E0/layout.inc +++ b/data/layouts/UnknownMap_0843E7E0/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E7E0_MapBorder:: .incbin "data/layouts/UnknownMap_0843E7E0/border.bin" - .align 2 UnknownMap_0843E7E0_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E7E0/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E7E0_Layout:: .4byte UnknownMap_0843E7E0_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc index d8bc1cfb0..49e32dbc7 100644 --- a/data/layouts/UnknownMap_0843E804/layout.inc +++ b/data/layouts/UnknownMap_0843E804/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E804_MapBorder:: .incbin "data/layouts/UnknownMap_0843E804/border.bin" - .align 2 UnknownMap_0843E804_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E804/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E804_Layout:: .4byte UnknownMap_0843E804_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc index dddd408cc..3cbe67299 100644 --- a/data/layouts/UnknownMap_0843E828/layout.inc +++ b/data/layouts/UnknownMap_0843E828/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E828_MapBorder:: .incbin "data/layouts/UnknownMap_0843E828/border.bin" - .align 2 UnknownMap_0843E828_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E828/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E828_Layout:: .4byte UnknownMap_0843E828_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc index 34c5282d5..7449536bf 100644 --- a/data/layouts/UnknownMap_0843E84C/layout.inc +++ b/data/layouts/UnknownMap_0843E84C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E84C_MapBorder:: .incbin "data/layouts/UnknownMap_0843E84C/border.bin" - .align 2 UnknownMap_0843E84C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E84C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E84C_Layout:: .4byte UnknownMap_0843E84C_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc index 0ddc0f858..23880a79c 100644 --- a/data/layouts/UnknownMap_0843E870/layout.inc +++ b/data/layouts/UnknownMap_0843E870/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E870_MapBorder:: .incbin "data/layouts/UnknownMap_0843E870/border.bin" - .align 2 UnknownMap_0843E870_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E870/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E870_Layout:: .4byte UnknownMap_0843E870_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc index 0b3cc1697..e42bfcdd9 100755 --- a/data/layouts/UnknownMap_0843E894/layout.inc +++ b/data/layouts/UnknownMap_0843E894/layout.inc @@ -1,4 +1,3 @@ - .align 2 UnknownMap_0843E894_MapBorder:: .incbin "data/layouts/UnknownMap_0843E894/border.bin" @@ -13,3 +12,4 @@ UnknownMap_0843E894_Layout:: .4byte UnknownMap_0843E894_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc index ea5e6288d..39d7bb18a 100644 --- a/data/layouts/UnknownMap_08447028/layout.inc +++ b/data/layouts/UnknownMap_08447028/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08447028_MapBorder:: .incbin "data/layouts/UnknownMap_08447028/border.bin" - .align 2 UnknownMap_08447028_MapBlockdata:: .incbin "data/layouts/UnknownMap_08447028/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08447028_Layout:: .4byte UnknownMap_08447028_MapBlockdata .4byte gTileset_General .4byte 0 + diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc index d9951db4d..a180340f8 100644 --- a/data/layouts/UnknownMap_0845A394/layout.inc +++ b/data/layouts/UnknownMap_0845A394/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845A394_MapBorder:: .incbin "data/layouts/UnknownMap_0845A394/border.bin" - .align 2 UnknownMap_0845A394_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845A394/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845A394_Layout:: .4byte UnknownMap_0845A394_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc index 36421f503..ce6a4c819 100644 --- a/data/layouts/UnknownMap_0845D470/layout.inc +++ b/data/layouts/UnknownMap_0845D470/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845D470_MapBorder:: .incbin "data/layouts/UnknownMap_0845D470/border.bin" - .align 2 UnknownMap_0845D470_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845D470/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845D470_Layout:: .4byte UnknownMap_0845D470_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc index ca018989b..535c4a6e9 100644 --- a/data/layouts/UnknownMap_0845ECB4/layout.inc +++ b/data/layouts/UnknownMap_0845ECB4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845ECB4_MapBorder:: .incbin "data/layouts/UnknownMap_0845ECB4/border.bin" - .align 2 UnknownMap_0845ECB4_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845ECB4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845ECB4_Layout:: .4byte UnknownMap_0845ECB4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc index babdb2c61..22191c61c 100644 --- a/data/layouts/UnknownMap_08469200/layout.inc +++ b/data/layouts/UnknownMap_08469200/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08469200_MapBorder:: .incbin "data/layouts/UnknownMap_08469200/border.bin" - .align 2 UnknownMap_08469200_MapBlockdata:: .incbin "data/layouts/UnknownMap_08469200/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08469200_Layout:: .4byte UnknownMap_08469200_MapBlockdata .4byte gTileset_General .4byte gTileset_Sootopolis + diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc index f4b882fde..0106c666a 100644 --- a/data/layouts/UnknownMap_084693AC/layout.inc +++ b/data/layouts/UnknownMap_084693AC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084693AC_MapBorder:: .incbin "data/layouts/UnknownMap_084693AC/border.bin" - .align 2 UnknownMap_084693AC_MapBlockdata:: .incbin "data/layouts/UnknownMap_084693AC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084693AC_Layout:: .4byte UnknownMap_084693AC_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc index f1a0e90ea..671127587 100644 --- a/data/layouts/UnknownMap_08470BD8/layout.inc +++ b/data/layouts/UnknownMap_08470BD8/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08470BD8_MapBorder:: .incbin "data/layouts/UnknownMap_08470BD8/border.bin" - .align 2 UnknownMap_08470BD8_MapBlockdata:: .incbin "data/layouts/UnknownMap_08470BD8/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08470BD8_Layout:: .4byte UnknownMap_08470BD8_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc index 8239461fc..b44036239 100644 --- a/data/layouts/UnknownMap_08480DAC/layout.inc +++ b/data/layouts/UnknownMap_08480DAC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08480DAC_MapBorder:: .incbin "data/layouts/UnknownMap_08480DAC/border.bin" - .align 2 UnknownMap_08480DAC_MapBlockdata:: .incbin "data/layouts/UnknownMap_08480DAC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08480DAC_Layout:: .4byte UnknownMap_08480DAC_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc index 6916f61ae..4593a8ba4 100644 --- a/data/layouts/UnknownMap_08480F54/layout.inc +++ b/data/layouts/UnknownMap_08480F54/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08480F54_MapBorder:: .incbin "data/layouts/UnknownMap_08480F54/border.bin" - .align 2 UnknownMap_08480F54_MapBlockdata:: .incbin "data/layouts/UnknownMap_08480F54/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08480F54_Layout:: .4byte UnknownMap_08480F54_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc index 6e0116512..6b73bfdce 100644 --- a/data/layouts/UnknownMap_084810FC/layout.inc +++ b/data/layouts/UnknownMap_084810FC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084810FC_MapBorder:: .incbin "data/layouts/UnknownMap_084810FC/border.bin" - .align 2 UnknownMap_084810FC_MapBlockdata:: .incbin "data/layouts/UnknownMap_084810FC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084810FC_Layout:: .4byte UnknownMap_084810FC_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc index 3f7a2770d..a394c8ef3 100644 --- a/data/layouts/UnknownMap_084812A4/layout.inc +++ b/data/layouts/UnknownMap_084812A4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084812A4_MapBorder:: .incbin "data/layouts/UnknownMap_084812A4/border.bin" - .align 2 UnknownMap_084812A4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084812A4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084812A4_Layout:: .4byte UnknownMap_084812A4_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc index fe7f90b16..cabe0b25b 100644 --- a/data/layouts/UnknownMap_0848144C/layout.inc +++ b/data/layouts/UnknownMap_0848144C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0848144C_MapBorder:: .incbin "data/layouts/UnknownMap_0848144C/border.bin" - .align 2 UnknownMap_0848144C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0848144C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0848144C_Layout:: .4byte UnknownMap_0848144C_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc index a501c6cc6..73ed49c79 100644 --- a/data/layouts/UnknownMap_084815F4/layout.inc +++ b/data/layouts/UnknownMap_084815F4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084815F4_MapBorder:: .incbin "data/layouts/UnknownMap_084815F4/border.bin" - .align 2 UnknownMap_084815F4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084815F4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084815F4_Layout:: .4byte UnknownMap_084815F4_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc index 52a6a8acf..250528be0 100644 --- a/data/layouts/UnknownMap_08481B24/layout.inc +++ b/data/layouts/UnknownMap_08481B24/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08481B24_MapBorder:: .incbin "data/layouts/UnknownMap_08481B24/border.bin" - .align 2 UnknownMap_08481B24_MapBlockdata:: .incbin "data/layouts/UnknownMap_08481B24/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08481B24_Layout:: .4byte UnknownMap_08481B24_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc index 314a94b88..465b92dc8 100644 --- a/data/layouts/UnknownMap_08481DBC/layout.inc +++ b/data/layouts/UnknownMap_08481DBC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08481DBC_MapBorder:: .incbin "data/layouts/UnknownMap_08481DBC/border.bin" - .align 2 UnknownMap_08481DBC_MapBlockdata:: .incbin "data/layouts/UnknownMap_08481DBC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08481DBC_Layout:: .4byte UnknownMap_08481DBC_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc index 30eb032e4..bb7002a20 100644 --- a/data/layouts/UnknownMap_25_29/layout.inc +++ b/data/layouts/UnknownMap_25_29/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ UnknownMap_25_29_Layout:: .4byte UnknownMap_25_29_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc index 3423735c3..5937a2195 100644 --- a/data/layouts/UnknownMap_25_30/layout.inc +++ b/data/layouts/UnknownMap_25_30/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ UnknownMap_25_30_Layout:: .4byte UnknownMap_25_30_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc index 20fbdc9c8..3dcbc7986 100644 --- a/data/layouts/UnknownMap_25_31/layout.inc +++ b/data/layouts/UnknownMap_25_31/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ UnknownMap_25_31_Layout:: .4byte UnknownMap_25_31_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc index 2efcab4e0..0ffe4c0b7 100644 --- a/data/layouts/UnknownMap_25_32/layout.inc +++ b/data/layouts/UnknownMap_25_32/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ UnknownMap_25_32_Layout:: .4byte UnknownMap_25_32_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc index 4d27276dc..3f8113a6f 100644 --- a/data/layouts/UnknownMap_25_33/layout.inc +++ b/data/layouts/UnknownMap_25_33/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ UnknownMap_25_33_Layout:: .4byte UnknownMap_25_33_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc index 3dea1f9af..6001d8fe7 100644 --- a/data/layouts/UnknownMap_25_34/layout.inc +++ b/data/layouts/UnknownMap_25_34/layout.inc @@ -1,8 +1,6 @@ - .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" @@ -14,3 +12,4 @@ UnknownMap_25_34_Layout:: .4byte UnknownMap_25_34_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc index 2f329b930..ce58c0798 100644 --- a/data/layouts/VerdanturfTown/layout.inc +++ b/data/layouts/VerdanturfTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_MapBorder:: .incbin "data/layouts/VerdanturfTown/border.bin" - .align 2 VerdanturfTown_MapBlockdata:: .incbin "data/layouts/VerdanturfTown/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_Layout:: .4byte VerdanturfTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc index 89d82169c..21fca6953 100644 --- a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc +++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_BattleTentBattleRoom_MapBorder:: .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin" - .align 2 VerdanturfTown_BattleTentBattleRoom_MapBlockdata:: .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_BattleTentBattleRoom_Layout:: .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleTent + diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc index 8791f34bb..ae5d1a7cf 100644 --- a/data/layouts/VerdanturfTown_WandasHouse/layout.inc +++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_WandasHouse_MapBorder:: .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" - .align 2 VerdanturfTown_WandasHouse_MapBlockdata:: .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_WandasHouse_Layout:: .4byte VerdanturfTown_WandasHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc index 9ef50f743..31e0fede3 100644 --- a/data/layouts/VictoryRoad_1F/layout.inc +++ b/data/layouts/VictoryRoad_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_1F_MapBorder:: .incbin "data/layouts/VictoryRoad_1F/border.bin" - .align 2 VictoryRoad_1F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_1F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_1F_Layout:: .4byte VictoryRoad_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc index fed9804fe..9ce7223e1 100644 --- a/data/layouts/VictoryRoad_B1F/layout.inc +++ b/data/layouts/VictoryRoad_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_B1F_MapBorder:: .incbin "data/layouts/VictoryRoad_B1F/border.bin" - .align 2 VictoryRoad_B1F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_B1F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_B1F_Layout:: .4byte VictoryRoad_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc index 77a9542f9..23c500cbe 100644 --- a/data/layouts/VictoryRoad_B2F/layout.inc +++ b/data/layouts/VictoryRoad_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_B2F_MapBorder:: .incbin "data/layouts/VictoryRoad_B2F/border.bin" - .align 2 VictoryRoad_B2F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_B2F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_B2F_Layout:: .4byte VictoryRoad_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts_table.inc b/data/layouts_table.inc index 3f94138fb..bd67fb6f9 100644 --- a/data/layouts_table.inc +++ b/data/layouts_table.inc @@ -1,5 +1,5 @@ - .align 2 -gMapLayouts:: @ 8481DD4 + .align 2 +gMapLayouts:: .4byte PetalburgCity_Layout .4byte SlateportCity_Layout .4byte MauvilleCity_Layout @@ -159,9 +159,9 @@ gMapLayouts:: @ 8481DD4 .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 CaveOfOrigin_UnusedRubySapphireMap2_Layout + .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout + .4byte CaveOfOrigin_B1F_Layout .4byte VictoryRoad_1F_Layout .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideInnerRoom_Layout @@ -169,20 +169,20 @@ gMapLayouts:: @ 8481DD4 .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 UnknownMap_0843E6C0_Layout + .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 @@ -241,8 +241,8 @@ gMapLayouts:: @ 8481DD4 .4byte SafariZone_North_Layout .4byte SafariZone_Southwest_Layout .4byte SafariZone_South_Layout - .4byte UnknownMap_08447028_Layout - .4byte Route109_SeashoreHouse_Layout + .4byte UnknownMap_08447028_Layout + .4byte Route109_SeashoreHouse_Layout .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseCorridor_Layout @@ -331,114 +331,113 @@ gMapLayouts:: @ 8481DD4 .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 - + .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 |