diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc index 8a123be4ca..d9e122ef20 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 f3704b1cc7..d5fd225782 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 131caed67e..7299aa6f89 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 81b598fb4f..7f0baaaec2 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 1f7d3117af..0ee7aa7556 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 d7b36dd8be..bf2f758d7a 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 62c4127f8b..fdd5b395d4 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 26789691e8..d15652cc07 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 35b92addd8..d99e43f473 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 0109a26f07..63e4a716a3 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 40ef7680a1..ab688d668a 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 5619d0dba4..8fa1b14859 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 1d123c8c7b..feea82d163 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 e69cc1dd0b..9f03e7d871 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 7aabb07cc0..ad173f9360 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 645be578fd..5508a668b4 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 10cfd2d9b3..0889e548a8 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 188e51fcc3..9e335e5d92 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 643993a221..05862b275b 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 6fdf6b31ce..e9e08ab97f 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 070fb2bace..44b35666f0 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 7a5d636902..b32eef4221 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 97e409473b..2640303e34 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 b101dbdda8..374af9ffad 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 6b0f61b5fe..89f799d84f 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 c984be1fb7..8961ed7785 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 bda4799ece..305fcc0d97 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 3ed732898a..a4991ae0c0 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 f4354caf0c..7f3c93b827 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 d9127802ac..2553e70987 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 4ac7a79df1..8c0fe2ce5c 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 35b8a1dec5..21ba6a0156 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 2071dd54a9..cc0a336110 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 f458fb9c22..fc4fc49bcc 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 2a570bbd78..3d9acc3c49 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 b76b87cb57..2d16216c52 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 08c904db80..f9a1dad7b5 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 7dd3dcbaa1..1d6d21778c 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 a1bd10dd31..3a5cd35380 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 c860deb93c..466ad0ff4e 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 1ad2a90cc8..1c7fb35d45 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 b60e073615..ce17a0bf68 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 d4f99085b7..d7a082d13b 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 8a991e45d9..a65e7928b1 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 2097173cc6..a9e779ddbe 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 ecdceec7f9..28575776ac 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 e962595890..4657c37a36 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 8738d81e11..3d498239ae 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 c54c388120..56335aa234 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 9e822f0f95..7dba3777cd 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 dc3733bc08..790ff3bcd7 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 dbd77c420c..df5615873f 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 cc22cc8d72..c25b3b2a0f 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 1f8df21ae2..b735b4994e 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 e79db8ee71..ddaf204465 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 0644d4b2b8..a506e554fb 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 03639f2032..d7615e693d 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 11beca5e5a..3dd4aeaa53 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 913d636d1c..f087371096 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 103f35b315..fe710cc404 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 c831af0a8c..6aa5b7aa98 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 fb1da5213c..4da41f9e9b 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 b8b7ce24f6..c298ee6f4e 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 f6f61cd5fe..87ce532740 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 3774ce871f..bcaeb89b01 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 cd5f16b0e1..bb469b3c81 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 bc3ac30050..df88b710fd 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 1794f72b3b..2869d9ac25 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 49150f493f..2ba8e8124d 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 8385b6f3a0..190bddf10b 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 a63f1dc346..199f66aceb 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 6f145fe96b..351b04227c 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 ec69a1b54d..653ad161b5 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 29c5444f90..24090c671e 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 cc28959436..67187b9bf6 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 97be7fdb4f..4f9a8e6261 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 21f6c94fdf..9abcdefa43 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 a740ae2f93..a3216370f0 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 0fe3899ae7..17dc4f0fbd 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 c2727063f6..1113f89f2e 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 d82ecddd0f..616af16558 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 41158462c8..5850f15c90 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 3e6375d3e6..11e230ce36 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 dfaf8b8a6d..294bf786a2 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 5caa1b9e5a..c3a05f75f7 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 6290452c0b..cbc5c052a7 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 6c4bff8862..4d6e7571ab 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 3871e181ea..9a17a128e0 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 077262836c..28ccdc43c5 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 89eb399360..bbada5bdc0 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 59e88cd47b..bd9cd03aec 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 9641fb2bf8..61d112c1e9 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 e12d3c259a..16c02fbaac 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 c92ee599db..dad4c7ef35 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 1cd96a760e..9c140d49d3 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 17031e546e..bcd610d8c8 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 169d5fda7e..464fc8998f 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 f7442adde4..deaa4429d1 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 dc2847ed09..b02d5c312c 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 da1a3de82d..d84e6449f7 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 b880ee4394..2159c894d3 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 f43fdae6b7..86ffa16a15 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 f8ba2bf1a0..7f08949032 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 70d1a079fe..66acc546b4 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 c30723a044..3ad232728e 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 4a1c6c36b6..c7d6bef917 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 bf8cbdbf47..787dd53c9e 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 7fff04df13..c129ae7150 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 e273287ded..02564b36ad 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 e4727cf759..6460a35b54 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 81994276b8..da7f1e73e9 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 dd9962fdeb..214846c228 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 5ab659b9a5..3aa0898bfe 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 641310f758..009fd12f5c 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 dcdafcd4e2..a57b238be1 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 90d63c5bb4..7ffd04b001 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 ea61473432..5ee4fade44 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 ab5f0e0325..e95b8ec9d7 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 0d1c9a6991..b93f24df4f 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 357e6022ff..35566d8d12 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 2fe4bee46c..6e2de11f48 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 caeca73a89..b06b3d4273 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 bdb047feba..7fb8d2c9bd 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 dc93f12a8e..d1ddf86865 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 25d870e682..5a3035b721 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 7a1c432848..7fc86dca44 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 6aefbf6059..5620551b8a 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 48d0bbe58b..6629554306 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 e881e9d58d..36f4cb826a 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 1fa258cbaf..9b80d7f90f 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 bf107dca9a..c59e12e49c 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 e0ba92bbfc..e38d63815f 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 fedb7a91ed..ed4bd81e4a 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 e0ce089f76..61e6e27ee5 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 8ca1d160f1..20cf4389fb 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 3c6c30cdc7..b275834f7e 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 c65508e1a1..82a294c48f 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 53d452438b..899e934bdb 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 61a5db9c23..d404833086 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 441cfc4741..d3b5d94207 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 54ede95cd9..e5b01c8fd7 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 a163424253..5d7aa93ebe 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 26806016a2..b4585ca031 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 6b5a98fe4e..ade5e4bf51 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 a7926872fc..de51e7fd61 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 3a0215859e..0dab4095ce 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 0cc19b0394..aea4464109 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 3a3a624bd5..9b30c7c08e 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 38af498294..e71fe2df32 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 d09439edde..2dd66ab962 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 c969be1ace..c53cad7230 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 61b03a2ce5..883918f377 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 38f1e42cdf..72a9d9f4ed 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 39349840a1..33db4b56dc 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 5f8254576d..8193ac6956 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 0ccddcca8f..092c7d20b3 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 f626ecfb0a..5235f4d986 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 42d1365c33..88b81a289a 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 c0770b8f66..0b6134dbd9 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 77d07033f9..d0be539a0f 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 2721bb6ff9..b50c7f015f 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 9d16b20b09..b9f0d27d7e 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 47a492f525..01507909c1 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 cf13105878..d88fb50fd0 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 6e72159144..c2199b2f2e 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 6f108d1989..2c4662a49d 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 6508e73bf9..4042b9653b 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 32db601011..d7f8c547ca 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 f69952dced..256338b897 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 b6c9248c6a..219c182d79 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 33c2320598..5233e09ab0 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 ba7785c3ee..7a8c17da2e 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 4814becf80..f0d358a354 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 9403c9df66..307f7205e7 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 1fdaf921e5..290fca78e0 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 3fea20553d..ba7a0e487b 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 ac91e848ea..2e3fcaf2e1 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 c424edf3bc..a4f385d8f4 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 b7ee944ccd..982edc975e 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 992e7d1740..1baf70a097 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 e4bb92d747..be36cc758b 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 601dd9de29..ec4971bc41 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 2bcd9806dd..c12de3a150 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 babf2a5c74..518f7c9435 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 b5d392dc71..881cf9498d 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 e03619423c..2c2fb717da 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 b51e183626..ec5dd2a574 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 fbdfa6fddd..a65212a40c 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 c5fc2f5707..759e688912 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 4d406accc6..6e370a7fac 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 29aede186e..0db92aee9f 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 f0afefe3b7..29a3b1ad7e 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 bd7fd82d51..2402e815c4 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 cbf534f693..8d6ca12003 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 ceaa1bea9d..24ed0f7b12 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 5bd0eab595..65a8fcf598 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 fed3f9ae2f..222c6eb804 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 0fe9f6982a..31b5288d5b 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 2f81759d75..1b5997dbae 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 4f30ac9e1d..58e932eb7a 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 899aa8eed3..6f15bd2766 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 043a977de6..5c96a8cef2 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 d9a12b71d9..6dcedcb208 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 b3fc825cf6..c2c4fa95e5 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 0f7956e5eb..ab5d9c8673 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 34ff05e395..a7fc73d220 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 a50a32690f..8fbd6e51ff 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 6e99e9bf41..50698cc768 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 78e3edee40..bbd81cac7d 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 d7dbe6a620..096142c6de 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 7d266cfba9..9709ca1ea0 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 a87de70363..4ba791f231 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 16f9402ca4..b5dcf58b23 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 deb1110599..a10daa3cd6 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 c458140a9c..bae16b88f3 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 974b95baf0..36fe1002ff 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 6ee24ef31e..840e17f7e8 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 4d299d4070..bf1335f844 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 cc2aba89a0..3cb812de77 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 ab18faa0db..ed258b2a7f 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 54193c3435..e42ecf340e 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 eaf962db27..194d44fce7 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 eaf00808e5..fe3bac0668 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 58a000d706..9a9418e461 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 039901d0a5..3474f33351 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 0510c90288..a46ffc18c8 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 eb70f55c9a..b2b2c4f194 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 4156bc9a46..ce78ef9cc2 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 ff43ced2ed..ea255b383b 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 9de501c61b..ea305b2a76 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 10fd278b3e..1ec7171cf0 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 f6d4864bf7..fa41585e93 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 316c1fc1b6..9ec997b484 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 1539ae91d5..24e5a93210 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 4f804ef53d..abf78f62dd 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 8f9c4d9eea..fe6ee4d26b 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 ee2b6b47f0..dd9474aeef 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 ec96366279..97f3abe24c 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 d8aadf1101..546876ab00 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 59bc2d06c0..65caaa7341 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 384a840327..a03cf9a719 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 3524e092d8..581b41a43b 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 06f105c71d..5e06ac31e4 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 b11da0a1de..398c179516 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 8d9e88b7e5..1612ec41b5 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 139cefadcc..3520b503f7 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 911ecfcb08..2966c06c54 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 22aae208c8..72a0c428c4 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 a6a4389864..0c1d76b585 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 1391ce2969..071f9e1b66 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 3140908493..f915e572a9 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 90a891b57b..c2392ff01c 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 e1f2354c1f..be9689ae30 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 1a51214745..9d6c3c969b 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 54471a0e09..232cc41f8a 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 4faea6ce60..1bd42eafca 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 75b7f0d986..25e133f28e 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 0589c2d1b1..403881bfea 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 a78bd28dea..cb87f8414e 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 0f288c2c5a..66502fb15f 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 35ae95d378..9637beea5c 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 476ebf4fae..4f0948f7be 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 a58e60aee4..f9e9255a0f 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 0e39c4d35a..4d2c9744a4 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 f28d1b4dc9..38ad9e97ed 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 39f70e4e49..7f0baac20e 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 db9093ba9f..0c76c2b7b6 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 e2c9abffcb..d27ed902a5 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 2179d72080..2635712359 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 7c894c943d..f0d4e13b73 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 b7f2e3e3c4..859d025a5d 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 637bd29b69..767330aff8 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 09265d8115..16624fa023 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 926213af44..9b7d6af1de 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 30a1053bf4..41db11cb41 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 0762566a8d..7fae261cc8 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 3838b85bc4..afaa7fb58b 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 c380a9ca18..5ff11108b9 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 46c4ea9dc2..9eeca6cc9a 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 e1451aff60..00c45dcc25 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 a0df178335..0c86dede9a 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 6662b05c9c..dbf6b388e1 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 f6331ab386..34d581ae54 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 2d265b6c8b..64c555be55 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 fc61a42016..b904524a6f 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 b80a343223..aa6e3ebdf9 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 55c38f906b..8e44c97b70 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 c099b5f9ab..ffcba8d17e 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 5e938f7d69..77775b4e02 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 cd9b907fb5..8c064171bf 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 80f658fcdf..b1b90daee9 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 f88e3a80b5..27893f2fb0 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 470baa66e7..2c4eb3977c 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 feb5b0fc09..7a063b922c 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 8180f0a4d3..bcc034ecd9 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 ece1a572e4..807da09a18 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 8cd255d8ca..e44aac53c9 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 f539c2cede..c6986540fe 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 903a6c9e0c..026e4a7c76 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 469e256178..09d8bd4829 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 7cb2387190..4176cb370f 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 6431c6c014..ec83ba5b01 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 450efcd07b..e55309b46a 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 559736b9f7..1236d4d4bf 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 e9f30c74c5..897d873abe 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 eaed336bca..1d6ce495b6 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 6deb54493a..7f7cf0570d 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 c0dfdcedcf..89f4e6a792 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 58ce10cdf7..070842a9f5 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 f4ff113ff1..6c984109df 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 69218f64b2..c48b00dbaa 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 d18506d6bb..f729d0b1b2 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 6e953c06e7..784b9bbb95 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 1a0477b686..8f3d826c77 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 115db570bf..a5039da8f3 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 3de6298e26..7a064d5f0c 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 b966d00efd..bc6afaf291 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 7e3110f483..ec138440a4 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 7a32288323..8c2b48661e 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 a1921a475b..0ac8bee1be 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 81509d18cf..d0e5ed45fa 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 e1bec323ac..9044fd6d1e 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 52d5952125..7cfb9573ba 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 4fa22e613b..5ad1bf5269 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 65566a482f..6094a38322 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 f9dcde8805..a4664d5098 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 667a744ad7..7999395d85 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 39a079d2be..6a3cc123b6 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 890c1c3b5f..665f44709c 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 835028c64a..2bcc9f58a5 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 cd1fe61196..e94376c3b9 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 721df1201d..449f1a11f0 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 71a2495adb..139a820503 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 45889b4497..73e6e41a61 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 ca1106b26c..95b122220d 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 28a4ecbcc1..66716a4045 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 6f869a74e3..20d4c3e018 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 d34c182c3d..7fa3aa8237 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 fc58138580..0ae872e081 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 005af813a3..f42d889208 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 5dfaa435cc..b7a11df5a3 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 43df2d4956..a52425e15c 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 22fde10c60..2d323b9e07 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 c471d40ed5..0a1eee113e 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 3dea1135c4..6d7a515750 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 090a783c43..f66fc97239 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 364c026b2f..79cc82e8c8 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 4195e34d8b..62dbff40ee 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 59ec3c3c78..f42855de8a 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 e0f3550ed0..235f049352 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 2ce0b52807..368fcd518e 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 0bf2ad939e..32ac95143a 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 35b7b61d1d..055abf133c 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 dbef0083e6..3f3bb5bc10 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 ed0d1dedd6..1313bd196f 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 ae4184ea97..5eb9df563b 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 f9e7f24a44..646c6f95f8 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 5cc1b12760..dfa184764d 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 957e233203..f921eb5fcc 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 0072fe2c5a..7a69989875 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 789c78b673..44f9a559f0 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 5ffddafa6f..00d5840c67 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 fe76a83e83..01a969a3a2 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 91a877c38b..400a29cbd5 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 ce7a15e5e1..4c6a6eeef9 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 a97138cd59..7eb90fb71e 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 5c37828ef8..1ad9cc41c9 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 ffa3c5ad18..9007d584bc 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 3d1fa421cf..540f4306cd 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 1a0e7b4187..152563eb60 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 127128a2e5..0b846950ed 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 951b90582e..1bb92b9339 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 e5747d2e9f..4a62cd3f5d 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 3ac1a6a824..b4d9a35d29 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 42ba6309ba..0865a8e5bb 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 8b0a096504..19d50ef442 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 59d257c624..5e0297e7ad 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 0cb5fee4a9..2009cd49e5 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 25ac09eb9e..f67b54bf1d 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 2b9f74cc7d..280517f410 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 8664a3c90c..eed0b01209 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 0fc549f46d..896f43e0d4 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 bfa1aeb35e..9477dceda9 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 f2b61dfbc3..8e027bbd28 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 ab8892c860..ac6350d474 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 b1238bc1f8..c365b6b8f5 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 ed46c9f5b6..9e22e4e409 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 cef2c5d766..6394eec544 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 c6f8b9742d..247af44bdb 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 e910152e49..5c2670b111 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 c51bbeb35e..52a3a7851c 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 a4bcf2043a..1534564a46 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 5d610efb1e..5bce06a6b1 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 a6f924c188..5baf5dde85 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 22d42167e0..4a1b0aa026 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 2c7e821a9b..0c2a065a55 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 0f3b5504de..41e954b4ed 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 603919b424..f1695ec66b 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 3e565369ae..f19bd682d7 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 fd157b9991..e351524e16 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 9cc060b768..fd01ddc105 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 5651df7df7..80ad931275 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 b79c2d34b4..16d4e400ca 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 36aee8b80c..c6541b3ea9 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 c233955f1b..e566a93b71 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 bc2c238f33..ce1a438eb0 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 352db474d4..179e0d881d 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 c0edd37eb1..907ec6266d 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 b421cf6629..c56046ef18 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 d8bc1cfb09..49e32dbc76 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 dddd408cc4..3cbe672998 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 34c5282d5a..7449536bf7 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 0ddc0f858d..23880a79c7 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 0b3cc16977..e42bfcdd96 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 ea5e6288d2..39d7bb18ab 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 d9951db4db..a180340f8b 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 36421f5031..ce6a4c819a 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 ca018989b9..535c4a6e9a 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 babdb2c61b..22191c61cf 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 f4b882fdef..0106c666a5 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 f1a0e90eaa..671127587d 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 8239461fcd..b440362392 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 6916f61aed..4593a8ba47 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 6e0116512c..6b73bfdcee 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 3f7a2770d9..a394c8ef3f 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 fe7f90b16b..cabe0b25b2 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 a501c6cc66..73ed49c79a 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 52a6a8acf8..250528be04 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 314a94b885..465b92dc82 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 30eb032e48..bb7002a20e 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 3423735c3a..5937a21952 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 20fbdc9c8d..3dcbc7986a 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 2efcab4e06..0ffe4c0b7c 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 4d27276dcf..3f8113a6fb 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 3dea1f9af4..6001d8fe79 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 2f329b9303..ce58c0798e 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 89d82169cc..21fca69535 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 8791f34bb2..ae5d1a7cf6 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 9ef50f7430..31e0fede38 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 fed9804feb..9ce7223e1e 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 77a9542f96..23c500cbe4 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 3f94138fbb..bd67fb6f97 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