Formatting

2018-06-20 17:42:34 -05:00
parent 5e00c0bfcf
commit 91ee3221b3
442 changed files with 572 additions and 1013 deletions
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- 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
+
--- a/Show More
+++ b/Show More