diff options
1392 files changed, 5706 insertions, 5732 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/layouts/AbandonedShip_CaptainsOffice/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/border.bin +++ b/data/layouts/AbandonedShip_CaptainsOffice/border.bin diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc new file mode 100644 index 000000000..a274ac523 --- /dev/null +++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0 + .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin" + +AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8 + .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin" + + .align 2 +AbandonedShip_CaptainsOffice_Layout:: @ 82E7558 + .4byte 0x9 + .4byte 0x7 + .4byte AbandonedShip_CaptainsOffice_MapBorder + .4byte AbandonedShip_CaptainsOffice_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.bin b/data/layouts/AbandonedShip_CaptainsOffice/map.bin Binary files differindex c9097fa63..c9097fa63 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.bin +++ b/data/layouts/AbandonedShip_CaptainsOffice/map.bin diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/layouts/AbandonedShip_Corridors_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Corridors_1F/border.bin +++ b/data/layouts/AbandonedShip_Corridors_1F/border.bin diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc new file mode 100644 index 000000000..24d3eea96 --- /dev/null +++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4 + .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin" + +AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC + .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin" + + .align 2 +AbandonedShip_Corridors_1F_Layout:: @ 82E6B5C + .4byte 0x12 + .4byte 0xc + .4byte AbandonedShip_Corridors_1F_MapBorder + .4byte AbandonedShip_Corridors_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/layouts/AbandonedShip_Corridors_1F/map.bin index 5ef5ca949..5ef5ca949 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.bin +++ b/data/layouts/AbandonedShip_Corridors_1F/map.bin diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/layouts/AbandonedShip_Corridors_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/border.bin +++ b/data/layouts/AbandonedShip_Corridors_B1F/border.bin diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc new file mode 100644 index 000000000..5e8c95959 --- /dev/null +++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8 + .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin" + +AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00 + .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin" + + .align 2 +AbandonedShip_Corridors_B1F_Layout:: @ 82E6F04 + .4byte 0xd + .4byte 0xa + .4byte AbandonedShip_Corridors_B1F_MapBorder + .4byte AbandonedShip_Corridors_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/layouts/AbandonedShip_Corridors_B1F/map.bin index 24b1a7b61..24b1a7b61 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.bin +++ b/data/layouts/AbandonedShip_Corridors_B1F/map.bin diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/layouts/AbandonedShip_Deck/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/AbandonedShip_Deck/border.bin +++ b/data/layouts/AbandonedShip_Deck/border.bin diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc new file mode 100644 index 000000000..abd9a205a --- /dev/null +++ b/data/layouts/AbandonedShip_Deck/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Deck_MapBorder:: @ 82E65BC + .incbin "data/layouts/AbandonedShip_Deck/border.bin" + +AbandonedShip_Deck_MapBlockdata:: @ 82E65C4 + .incbin "data/layouts/AbandonedShip_Deck/map.bin" + + .align 2 +AbandonedShip_Deck_Layout:: @ 82E698C + .4byte 0x17 + .4byte 0x15 + .4byte AbandonedShip_Deck_MapBorder + .4byte AbandonedShip_Deck_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/layouts/AbandonedShip_Deck/map.bin index 67cdde3d7..67cdde3d7 100644 --- a/data/maps/AbandonedShip_Deck/map.bin +++ b/data/layouts/AbandonedShip_Deck/map.bin diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc new file mode 100644 index 000000000..afc4d6a17 --- /dev/null +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40 + .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin" + +AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48 + .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" + + .align 2 +AbandonedShip_HiddenFloorCorridors_Layout:: @ 82F9D68 + .4byte 0xd + .4byte 0xb + .4byte AbandonedShip_HiddenFloorCorridors_MapBorder + .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin index a4637ccbe..a4637ccbe 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc new file mode 100644 index 000000000..cea6993b2 --- /dev/null +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8 + .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin" + +AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00 + .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" + + .align 2 +AbandonedShip_HiddenFloorRooms_Layout:: @ 82FF328 + .4byte 0x2c + .4byte 0xf + .4byte AbandonedShip_HiddenFloorRooms_MapBorder + .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin index b63eeabe6..b63eeabe6 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/layouts/AbandonedShip_Room_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Room_B1F/border.bin +++ b/data/layouts/AbandonedShip_Room_B1F/border.bin diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc new file mode 100644 index 000000000..17341a15f --- /dev/null +++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC + .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin" + +AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4 + .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin" + + .align 2 +AbandonedShip_Room_B1F_Layout:: @ 82E7364 + .4byte 0x9 + .4byte 0x8 + .4byte AbandonedShip_Room_B1F_MapBorder + .4byte AbandonedShip_Room_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/layouts/AbandonedShip_Room_B1F/map.bin index cb8393eb2..cb8393eb2 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.bin +++ b/data/layouts/AbandonedShip_Room_B1F/map.bin diff --git a/data/maps/AbandonedShip_Rooms2_1F/border.bin b/data/layouts/AbandonedShip_Rooms2_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/border.bin +++ b/data/layouts/AbandonedShip_Rooms2_1F/border.bin diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc new file mode 100644 index 000000000..52c4a4f2e --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C + .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin" + +AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384 + .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin" + + .align 2 +AbandonedShip_Rooms2_1F_Layout:: @ 82E74B8 + .4byte 0x9 + .4byte 0x11 + .4byte AbandonedShip_Rooms2_1F_MapBorder + .4byte AbandonedShip_Rooms2_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/layouts/AbandonedShip_Rooms2_1F/map.bin index c897ce8a0..c897ce8a0 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.bin +++ b/data/layouts/AbandonedShip_Rooms2_1F/map.bin diff --git a/data/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/border.bin +++ b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc new file mode 100644 index 000000000..b3c205318 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC + .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin" + +AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4 + .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" + + .align 2 +AbandonedShip_Rooms2_B1F_Layout:: @ 82E7214 + .4byte 0x12 + .4byte 0x8 + .4byte AbandonedShip_Rooms2_B1F_MapBorder + .4byte AbandonedShip_Rooms2_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin index 7865bb69d..7865bb69d 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.bin +++ b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin diff --git a/data/maps/AbandonedShip_Rooms_1F/border.bin b/data/layouts/AbandonedShip_Rooms_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Rooms_1F/border.bin +++ b/data/layouts/AbandonedShip_Rooms_1F/border.bin diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc new file mode 100644 index 000000000..7563bfbba --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74 + .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin" + +AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C + .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin" + + .align 2 +AbandonedShip_Rooms_1F_Layout:: @ 82E6DE0 + .4byte 0x12 + .4byte 0x11 + .4byte AbandonedShip_Rooms_1F_MapBorder + .4byte AbandonedShip_Rooms_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/layouts/AbandonedShip_Rooms_1F/map.bin index 20529b3df..20529b3df 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.bin +++ b/data/layouts/AbandonedShip_Rooms_1F/map.bin diff --git a/data/maps/AbandonedShip_Rooms_B1F/border.bin b/data/layouts/AbandonedShip_Rooms_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/border.bin +++ b/data/layouts/AbandonedShip_Rooms_B1F/border.bin diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc new file mode 100644 index 000000000..89bd595c9 --- /dev/null +++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C + .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin" + +AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24 + .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin" + + .align 2 +AbandonedShip_Rooms_B1F_Layout:: @ 82E70D4 + .4byte 0x1b + .4byte 0x8 + .4byte AbandonedShip_Rooms_B1F_MapBorder + .4byte AbandonedShip_Rooms_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/layouts/AbandonedShip_Rooms_B1F/map.bin index b18509507..b18509507 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.bin +++ b/data/layouts/AbandonedShip_Rooms_B1F/map.bin diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/layouts/AbandonedShip_Underwater1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Underwater1/border.bin +++ b/data/layouts/AbandonedShip_Underwater1/border.bin diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc new file mode 100644 index 000000000..d738f437d --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater1/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Underwater1_MapBorder:: @ 82E722C + .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" + +AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234 + .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" + + .align 2 +AbandonedShip_Underwater1_Layout:: @ 82E72B4 + .4byte 0x8 + .4byte 0x8 + .4byte AbandonedShip_Underwater1_MapBorder + .4byte AbandonedShip_Underwater1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/layouts/AbandonedShip_Underwater1/map.bin index 2c73cfe86..2c73cfe86 100644 --- a/data/maps/AbandonedShip_Underwater1/map.bin +++ b/data/layouts/AbandonedShip_Underwater1/map.bin diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/layouts/AbandonedShip_Underwater2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AbandonedShip_Underwater2/border.bin +++ b/data/layouts/AbandonedShip_Underwater2/border.bin diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc new file mode 100644 index 000000000..86dad6567 --- /dev/null +++ b/data/layouts/AbandonedShip_Underwater2/layout.inc @@ -0,0 +1,14 @@ +AbandonedShip_Underwater2_MapBorder:: @ 82E7570 + .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" + +AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578 + .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" + + .align 2 +AbandonedShip_Underwater2_Layout:: @ 82E76A0 + .4byte 0x15 + .4byte 0x7 + .4byte AbandonedShip_Underwater2_MapBorder + .4byte AbandonedShip_Underwater2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/layouts/AbandonedShip_Underwater2/map.bin index 9dbd5c71a..9dbd5c71a 100644 --- a/data/maps/AbandonedShip_Underwater2/map.bin +++ b/data/layouts/AbandonedShip_Underwater2/map.bin diff --git a/data/maps/AncientTomb/border.bin b/data/layouts/AncientTomb/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/AncientTomb/border.bin +++ b/data/layouts/AncientTomb/border.bin diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc new file mode 100644 index 000000000..da28d0642 --- /dev/null +++ b/data/layouts/AncientTomb/layout.inc @@ -0,0 +1,14 @@ +AncientTomb_MapBorder:: @ 82F717C + .incbin "data/layouts/AncientTomb/border.bin" + +AncientTomb_MapBlockdata:: @ 82F7184 + .incbin "data/layouts/AncientTomb/map.bin" + + .align 2 +AncientTomb_Layout:: @ 82F75E8 + .4byte 0x11 + .4byte 0x21 + .4byte AncientTomb_MapBorder + .4byte AncientTomb_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/AncientTomb/map.bin b/data/layouts/AncientTomb/map.bin Binary files differindex bb87de307..bb87de307 100644 --- a/data/maps/AncientTomb/map.bin +++ b/data/layouts/AncientTomb/map.bin diff --git a/data/maps/AquaHideout_1F/border.bin b/data/layouts/AquaHideout_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_1F/border.bin +++ b/data/layouts/AquaHideout_1F/border.bin diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc new file mode 100644 index 000000000..74361e986 --- /dev/null +++ b/data/layouts/AquaHideout_1F/layout.inc @@ -0,0 +1,14 @@ +AquaHideout_1F_MapBorder:: @ 82DBBD4 + .incbin "data/layouts/AquaHideout_1F/border.bin" + +AquaHideout_1F_MapBlockdata:: @ 82DBBDC + .incbin "data/layouts/AquaHideout_1F/map.bin" + + .align 2 +AquaHideout_1F_Layout:: @ 82DC26C + .4byte 0x1c + .4byte 0x1e + .4byte AquaHideout_1F_MapBorder + .4byte AquaHideout_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_1F/map.bin b/data/layouts/AquaHideout_1F/map.bin index 2330fe015..2330fe015 100644 --- a/data/maps/AquaHideout_1F/map.bin +++ b/data/layouts/AquaHideout_1F/map.bin diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/layouts/AquaHideout_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_B1F/border.bin +++ b/data/layouts/AquaHideout_B1F/border.bin diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc new file mode 100644 index 000000000..451148de4 --- /dev/null +++ b/data/layouts/AquaHideout_B1F/layout.inc @@ -0,0 +1,14 @@ +AquaHideout_B1F_MapBorder:: @ 82DC284 + .incbin "data/layouts/AquaHideout_B1F/border.bin" + +AquaHideout_B1F_MapBlockdata:: @ 82DC28C + .incbin "data/layouts/AquaHideout_B1F/map.bin" + + .align 2 +AquaHideout_B1F_Layout:: @ 82DCC1C + .4byte 0x33 + .4byte 0x18 + .4byte AquaHideout_B1F_MapBorder + .4byte AquaHideout_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/layouts/AquaHideout_B1F/map.bin index 5d13df58d..5d13df58d 100644 --- a/data/maps/AquaHideout_B1F/map.bin +++ b/data/layouts/AquaHideout_B1F/map.bin diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/layouts/AquaHideout_B2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/AquaHideout_B2F/border.bin +++ b/data/layouts/AquaHideout_B2F/border.bin diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc new file mode 100644 index 000000000..860cc1790 --- /dev/null +++ b/data/layouts/AquaHideout_B2F/layout.inc @@ -0,0 +1,14 @@ +AquaHideout_B2F_MapBorder:: @ 82DCC34 + .incbin "data/layouts/AquaHideout_B2F/border.bin" + +AquaHideout_B2F_MapBlockdata:: @ 82DCC3C + .incbin "data/layouts/AquaHideout_B2F/map.bin" + + .align 2 +AquaHideout_B2F_Layout:: @ 82DD29C + .4byte 0x22 + .4byte 0x18 + .4byte AquaHideout_B2F_MapBorder + .4byte AquaHideout_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/layouts/AquaHideout_B2F/map.bin index 2e843a8e4..2e843a8e4 100644 --- a/data/maps/AquaHideout_B2F/map.bin +++ b/data/layouts/AquaHideout_B2F/map.bin diff --git a/data/maps/BattleTower_BattleRoom/border.bin b/data/layouts/BattleTower_BattleRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleTower_BattleRoom/border.bin +++ b/data/layouts/BattleTower_BattleRoom/border.bin diff --git a/data/layouts/BattleTower_BattleRoom/layout.inc b/data/layouts/BattleTower_BattleRoom/layout.inc new file mode 100644 index 000000000..7003c0bc3 --- /dev/null +++ b/data/layouts/BattleTower_BattleRoom/layout.inc @@ -0,0 +1,14 @@ +BattleTower_BattleRoom_MapBorder:: @ 82F2694 + .incbin "data/layouts/BattleTower_BattleRoom/border.bin" + +BattleTower_BattleRoom_MapBlockdata:: @ 82F269C + .incbin "data/layouts/BattleTower_BattleRoom/map.bin" + + .align 2 +BattleTower_BattleRoom_Layout:: @ 82F2750 + .4byte 0xa + .4byte 0x9 + .4byte BattleTower_BattleRoom_MapBorder + .4byte BattleTower_BattleRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTower diff --git a/data/maps/BattleTower_BattleRoom/map.bin b/data/layouts/BattleTower_BattleRoom/map.bin index 42d99b5a6..42d99b5a6 100644 --- a/data/maps/BattleTower_BattleRoom/map.bin +++ b/data/layouts/BattleTower_BattleRoom/map.bin diff --git a/data/maps/BattleTower_Corridor/border.bin b/data/layouts/BattleTower_Corridor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleTower_Corridor/border.bin +++ b/data/layouts/BattleTower_Corridor/border.bin diff --git a/data/layouts/BattleTower_Corridor/layout.inc b/data/layouts/BattleTower_Corridor/layout.inc new file mode 100644 index 000000000..9932107ef --- /dev/null +++ b/data/layouts/BattleTower_Corridor/layout.inc @@ -0,0 +1,14 @@ +BattleTower_Corridor_MapBorder:: @ 82F25C8 + .incbin "data/layouts/BattleTower_Corridor/border.bin" + +BattleTower_Corridor_MapBlockdata:: @ 82F25D0 + .incbin "data/layouts/BattleTower_Corridor/map.bin" + + .align 2 +BattleTower_Corridor_Layout:: @ 82F267C + .4byte 0x11 + .4byte 0x5 + .4byte BattleTower_Corridor_MapBorder + .4byte BattleTower_Corridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTower diff --git a/data/maps/BattleTower_Corridor/map.bin b/data/layouts/BattleTower_Corridor/map.bin Binary files differindex 0b0803f91..0b0803f91 100644 --- a/data/maps/BattleTower_Corridor/map.bin +++ b/data/layouts/BattleTower_Corridor/map.bin diff --git a/data/maps/BattleTower_Elevator/border.bin b/data/layouts/BattleTower_Elevator/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleTower_Elevator/border.bin +++ b/data/layouts/BattleTower_Elevator/border.bin diff --git a/data/layouts/BattleTower_Elevator/layout.inc b/data/layouts/BattleTower_Elevator/layout.inc new file mode 100644 index 000000000..6246ce767 --- /dev/null +++ b/data/layouts/BattleTower_Elevator/layout.inc @@ -0,0 +1,14 @@ +BattleTower_Elevator_MapBorder:: @ 82F2570 + .incbin "data/layouts/BattleTower_Elevator/border.bin" + +BattleTower_Elevator_MapBlockdata:: @ 82F2578 + .incbin "data/layouts/BattleTower_Elevator/map.bin" + + .align 2 +BattleTower_Elevator_Layout:: @ 82F25B0 + .4byte 0x4 + .4byte 0x7 + .4byte BattleTower_Elevator_MapBorder + .4byte BattleTower_Elevator_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTower diff --git a/data/maps/BattleTower_Elevator/map.bin b/data/layouts/BattleTower_Elevator/map.bin index 8777c1471..8777c1471 100644 --- a/data/maps/BattleTower_Elevator/map.bin +++ b/data/layouts/BattleTower_Elevator/map.bin diff --git a/data/maps/BattleTower_Lobby/border.bin b/data/layouts/BattleTower_Lobby/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/BattleTower_Lobby/border.bin +++ b/data/layouts/BattleTower_Lobby/border.bin diff --git a/data/layouts/BattleTower_Lobby/layout.inc b/data/layouts/BattleTower_Lobby/layout.inc new file mode 100644 index 000000000..b330b3c72 --- /dev/null +++ b/data/layouts/BattleTower_Lobby/layout.inc @@ -0,0 +1,14 @@ +BattleTower_Lobby_MapBorder:: @ 82F1D68 + .incbin "data/layouts/BattleTower_Lobby/border.bin" + +BattleTower_Lobby_MapBlockdata:: @ 82F1D70 + .incbin "data/layouts/BattleTower_Lobby/map.bin" + + .align 2 +BattleTower_Lobby_Layout:: @ 82F1E6C + .4byte 0xe + .4byte 0x9 + .4byte BattleTower_Lobby_MapBorder + .4byte BattleTower_Lobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTower diff --git a/data/maps/BattleTower_Lobby/map.bin b/data/layouts/BattleTower_Lobby/map.bin Binary files differindex 8ff3182a6..8ff3182a6 100644 --- a/data/maps/BattleTower_Lobby/map.bin +++ b/data/layouts/BattleTower_Lobby/map.bin diff --git a/data/maps/BattleTower_Outside/border.bin b/data/layouts/BattleTower_Outside/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/BattleTower_Outside/border.bin +++ b/data/layouts/BattleTower_Outside/border.bin diff --git a/data/layouts/BattleTower_Outside/layout.inc b/data/layouts/BattleTower_Outside/layout.inc new file mode 100644 index 000000000..f260dd98f --- /dev/null +++ b/data/layouts/BattleTower_Outside/layout.inc @@ -0,0 +1,14 @@ +BattleTower_Outside_MapBorder:: @ 82F1E84 + .incbin "data/layouts/BattleTower_Outside/border.bin" + +BattleTower_Outside_MapBlockdata:: @ 82F1E8C + .incbin "data/layouts/BattleTower_Outside/map.bin" + + .align 2 +BattleTower_Outside_Layout:: @ 82F2558 + .4byte 0x1d + .4byte 0x1e + .4byte BattleTower_Outside_MapBorder + .4byte BattleTower_Outside_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/maps/BattleTower_Outside/map.bin b/data/layouts/BattleTower_Outside/map.bin index 6e9f6adb6..6e9f6adb6 100644 --- a/data/maps/BattleTower_Outside/map.bin +++ b/data/layouts/BattleTower_Outside/map.bin diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/layouts/CableCarStation/border.bin index 19d906679..19d906679 100644 --- a/data/maps/DewfordTown_Hall/border.bin +++ b/data/layouts/CableCarStation/border.bin diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc new file mode 100644 index 000000000..c35f3739e --- /dev/null +++ b/data/layouts/CableCarStation/layout.inc @@ -0,0 +1,14 @@ +CableCarStation_MapBorder:: @ 82D4CCC + .incbin "data/layouts/CableCarStation/border.bin" + +CableCarStation_MapBlockdata:: @ 82D4CD4 + .incbin "data/layouts/CableCarStation/map.bin" + + .align 2 +CableCarStation_Layout:: @ 82D4E0C + .4byte 0xd + .4byte 0xc + .4byte CableCarStation_MapBorder + .4byte CableCarStation_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/Route112_CableCarStation/map.bin b/data/layouts/CableCarStation/map.bin Binary files differindex 93db9d5f0..93db9d5f0 100644 --- a/data/maps/Route112_CableCarStation/map.bin +++ b/data/layouts/CableCarStation/map.bin diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/layouts/CaveOfOrigin_1F/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_1F/border.bin +++ b/data/layouts/CaveOfOrigin_1F/border.bin diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc new file mode 100644 index 000000000..fd4e2ee77 --- /dev/null +++ b/data/layouts/CaveOfOrigin_1F/layout.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_1F_MapBorder:: @ 82DFE0C + .incbin "data/layouts/CaveOfOrigin_1F/border.bin" + +CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14 + .incbin "data/layouts/CaveOfOrigin_1F/map.bin" + + .align 2 +CaveOfOrigin_1F_Layout:: @ 82E0238 + .4byte 0x17 + .4byte 0x17 + .4byte CaveOfOrigin_1F_MapBorder + .4byte CaveOfOrigin_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/layouts/CaveOfOrigin_1F/map.bin index c3c5e7abf..c3c5e7abf 100644 --- a/data/maps/CaveOfOrigin_1F/map.bin +++ b/data/layouts/CaveOfOrigin_1F/map.bin diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/layouts/CaveOfOrigin_B1F/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_B1F/border.bin +++ b/data/layouts/CaveOfOrigin_B1F/border.bin diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc new file mode 100644 index 000000000..3d9dc9cec --- /dev/null +++ b/data/layouts/CaveOfOrigin_B1F/layout.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B1F_MapBorder:: @ 82E0250 + .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" + +CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258 + .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" + + .align 2 +CaveOfOrigin_B1F_Layout:: @ 82E067C + .4byte 0x17 + .4byte 0x17 + .4byte CaveOfOrigin_B1F_MapBorder + .4byte CaveOfOrigin_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/layouts/CaveOfOrigin_B1F/map.bin index 0ffbdaaa0..0ffbdaaa0 100644 --- a/data/maps/CaveOfOrigin_B1F/map.bin +++ b/data/layouts/CaveOfOrigin_B1F/map.bin diff --git a/data/maps/CaveOfOrigin_B2F/border.bin b/data/layouts/CaveOfOrigin_B2F/border.bin index 4117717f2..4117717f2 100644 --- a/data/maps/CaveOfOrigin_B2F/border.bin +++ b/data/layouts/CaveOfOrigin_B2F/border.bin diff --git a/data/layouts/CaveOfOrigin_B2F/layout.inc b/data/layouts/CaveOfOrigin_B2F/layout.inc new file mode 100644 index 000000000..403f393b8 --- /dev/null +++ b/data/layouts/CaveOfOrigin_B2F/layout.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B2F_MapBorder:: @ 82E0694 + .incbin "data/layouts/CaveOfOrigin_B2F/border.bin" + +CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C + .incbin "data/layouts/CaveOfOrigin_B2F/map.bin" + + .align 2 +CaveOfOrigin_B2F_Layout:: @ 82E0A10 + .4byte 0x15 + .4byte 0x15 + .4byte CaveOfOrigin_B2F_MapBorder + .4byte CaveOfOrigin_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_B2F/map.bin b/data/layouts/CaveOfOrigin_B2F/map.bin index 4c1fd5ab8..4c1fd5ab8 100644 --- a/data/maps/CaveOfOrigin_B2F/map.bin +++ b/data/layouts/CaveOfOrigin_B2F/map.bin diff --git a/data/maps/CaveOfOrigin_B3F/border.bin b/data/layouts/CaveOfOrigin_B3F/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_B3F/border.bin +++ b/data/layouts/CaveOfOrigin_B3F/border.bin diff --git a/data/layouts/CaveOfOrigin_B3F/layout.inc b/data/layouts/CaveOfOrigin_B3F/layout.inc new file mode 100644 index 000000000..797bc7569 --- /dev/null +++ b/data/layouts/CaveOfOrigin_B3F/layout.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B3F_MapBorder:: @ 82E0A28 + .incbin "data/layouts/CaveOfOrigin_B3F/border.bin" + +CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30 + .incbin "data/layouts/CaveOfOrigin_B3F/map.bin" + + .align 2 +CaveOfOrigin_B3F_Layout:: @ 82E0D50 + .4byte 0x13 + .4byte 0x15 + .4byte CaveOfOrigin_B3F_MapBorder + .4byte CaveOfOrigin_B3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_B3F/map.bin b/data/layouts/CaveOfOrigin_B3F/map.bin index ea574b224..ea574b224 100644 --- a/data/maps/CaveOfOrigin_B3F/map.bin +++ b/data/layouts/CaveOfOrigin_B3F/map.bin diff --git a/data/maps/CaveOfOrigin_B4F/border.bin b/data/layouts/CaveOfOrigin_B4F/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_B4F/border.bin +++ b/data/layouts/CaveOfOrigin_B4F/border.bin diff --git a/data/layouts/CaveOfOrigin_B4F/layout.inc b/data/layouts/CaveOfOrigin_B4F/layout.inc new file mode 100644 index 000000000..be6bc0bf6 --- /dev/null +++ b/data/layouts/CaveOfOrigin_B4F/layout.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B4F_MapBorder:: @ 82E0D68 + .incbin "data/layouts/CaveOfOrigin_B4F/border.bin" + +CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70 + .incbin "data/layouts/CaveOfOrigin_B4F/map.bin" + + .align 2 +CaveOfOrigin_B4F_Layout:: @ 82E1044 + .4byte 0x13 + .4byte 0x13 + .4byte CaveOfOrigin_B4F_MapBorder + .4byte CaveOfOrigin_B4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_B4F/map.bin b/data/layouts/CaveOfOrigin_B4F/map.bin index efec94a9e..efec94a9e 100644 --- a/data/maps/CaveOfOrigin_B4F/map.bin +++ b/data/layouts/CaveOfOrigin_B4F/map.bin diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/layouts/CaveOfOrigin_Entrance/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/CaveOfOrigin_Entrance/border.bin +++ b/data/layouts/CaveOfOrigin_Entrance/border.bin diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc new file mode 100644 index 000000000..242a7b45a --- /dev/null +++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10 + .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" + +CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18 + .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" + + .align 2 +CaveOfOrigin_Entrance_Layout:: @ 82DFDF4 + .4byte 0x13 + .4byte 0x1a + .4byte CaveOfOrigin_Entrance_MapBorder + .4byte CaveOfOrigin_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/layouts/CaveOfOrigin_Entrance/map.bin index 4bbffd109..4bbffd109 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.bin +++ b/data/layouts/CaveOfOrigin_Entrance/map.bin diff --git a/data/maps/DewfordTown_House1/border.bin b/data/layouts/ContestHall/border.bin index 19d906679..19d906679 100644 --- a/data/maps/DewfordTown_House1/border.bin +++ b/data/layouts/ContestHall/border.bin diff --git a/data/layouts/ContestHall/layout.inc b/data/layouts/ContestHall/layout.inc new file mode 100644 index 000000000..b108a3178 --- /dev/null +++ b/data/layouts/ContestHall/layout.inc @@ -0,0 +1,14 @@ +ContestHall_MapBorder:: @ 82CF1A4 + .incbin "data/layouts/ContestHall/border.bin" + +ContestHall_MapBlockdata:: @ 82CF1AC + .incbin "data/layouts/ContestHall/map.bin" + + .align 2 +ContestHall_Layout:: @ 82CF4A0 + .4byte 0x15 + .4byte 0x12 + .4byte ContestHall_MapBorder + .4byte ContestHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/FallarborTown_ContestHall/map.bin b/data/layouts/ContestHall/map.bin index d65e7c489..d65e7c489 100644 --- a/data/maps/FallarborTown_ContestHall/map.bin +++ b/data/layouts/ContestHall/map.bin diff --git a/data/maps/DewfordTown_House2/border.bin b/data/layouts/ContestLobby/border.bin index 19d906679..19d906679 100644 --- a/data/maps/DewfordTown_House2/border.bin +++ b/data/layouts/ContestLobby/border.bin diff --git a/data/layouts/ContestLobby/layout.inc b/data/layouts/ContestLobby/layout.inc new file mode 100644 index 000000000..975c86922 --- /dev/null +++ b/data/layouts/ContestLobby/layout.inc @@ -0,0 +1,14 @@ +ContestLobby_MapBorder:: @ 82CF0B0 + .incbin "data/layouts/ContestLobby/border.bin" + +ContestLobby_MapBlockdata:: @ 82CF0B8 + .incbin "data/layouts/ContestLobby/map.bin" + + .align 2 +ContestLobby_Layout:: @ 82CF18C + .4byte 0xf + .4byte 0x7 + .4byte ContestLobby_MapBorder + .4byte ContestLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/FallarborTown_ContestLobby/map.bin b/data/layouts/ContestLobby/map.bin index 87407546a..87407546a 100644 --- a/data/maps/FallarborTown_ContestLobby/map.bin +++ b/data/layouts/ContestLobby/map.bin diff --git a/data/maps/DesertRuins/border.bin b/data/layouts/DesertRuins/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/DesertRuins/border.bin +++ b/data/layouts/DesertRuins/border.bin diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc new file mode 100644 index 000000000..75de33542 --- /dev/null +++ b/data/layouts/DesertRuins/layout.inc @@ -0,0 +1,14 @@ +DesertRuins_MapBorder:: @ 82D7AEC + .incbin "data/layouts/DesertRuins/border.bin" + +DesertRuins_MapBlockdata:: @ 82D7AF4 + .incbin "data/layouts/DesertRuins/map.bin" + + .align 2 +DesertRuins_Layout:: @ 82D7F58 + .4byte 0x11 + .4byte 0x21 + .4byte DesertRuins_MapBorder + .4byte DesertRuins_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/DesertRuins/map.bin b/data/layouts/DesertRuins/map.bin Binary files differindex bb87de307..bb87de307 100644 --- a/data/maps/DesertRuins/map.bin +++ b/data/layouts/DesertRuins/map.bin diff --git a/data/maps/DewfordTown/border.bin b/data/layouts/DewfordTown/border.bin index 281762f5b..281762f5b 100644 --- a/data/maps/DewfordTown/border.bin +++ b/data/layouts/DewfordTown/border.bin diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc new file mode 100644 index 000000000..ddee6afbe --- /dev/null +++ b/data/layouts/DewfordTown/layout.inc @@ -0,0 +1,14 @@ +DewfordTown_MapBorder:: @ 8291A2C + .incbin "data/layouts/DewfordTown/border.bin" + +DewfordTown_MapBlockdata:: @ 8291A34 + .incbin "data/layouts/DewfordTown/map.bin" + + .align 2 +DewfordTown_Layout:: @ 8291D54 + .4byte 0x14 + .4byte 0x14 + .4byte DewfordTown_MapBorder + .4byte DewfordTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/maps/DewfordTown/map.bin b/data/layouts/DewfordTown/map.bin index e8a1154e8..e8a1154e8 100644 --- a/data/maps/DewfordTown/map.bin +++ b/data/layouts/DewfordTown/map.bin diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/layouts/DewfordTown_Gym/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/DewfordTown_Gym/border.bin +++ b/data/layouts/DewfordTown_Gym/border.bin diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc new file mode 100644 index 000000000..517522216 --- /dev/null +++ b/data/layouts/DewfordTown_Gym/layout.inc @@ -0,0 +1,14 @@ +DewfordTown_Gym_MapBorder:: @ 82CE42C + .incbin "data/layouts/DewfordTown_Gym/border.bin" + +DewfordTown_Gym_MapBlockdata:: @ 82CE434 + .incbin "data/layouts/DewfordTown_Gym/map.bin" + + .align 2 +DewfordTown_Gym_Layout:: @ 82CE824 + .4byte 0x12 + .4byte 0x1c + .4byte DewfordTown_Gym_MapBorder + .4byte DewfordTown_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_DewfordGym diff --git a/data/maps/DewfordTown_Gym/map.bin b/data/layouts/DewfordTown_Gym/map.bin index 19ea81674..19ea81674 100644 --- a/data/maps/DewfordTown_Gym/map.bin +++ b/data/layouts/DewfordTown_Gym/map.bin diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/layouts/DewfordTown_Hall/border.bin index 19d906679..19d906679 100644 --- a/data/maps/DoubleBattleColosseum/border.bin +++ b/data/layouts/DewfordTown_Hall/border.bin diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc new file mode 100644 index 000000000..c1f232111 --- /dev/null +++ b/data/layouts/DewfordTown_Hall/layout.inc @@ -0,0 +1,14 @@ +DewfordTown_Hall_MapBorder:: @ 82CE83C + .incbin "data/layouts/DewfordTown_Hall/border.bin" + +DewfordTown_Hall_MapBlockdata:: @ 82CE844 + .incbin "data/layouts/DewfordTown_Hall/map.bin" + + .align 2 +DewfordTown_Hall_Layout:: @ 82CE978 + .4byte 0x11 + .4byte 0x9 + .4byte DewfordTown_Hall_MapBorder + .4byte DewfordTown_Hall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/DewfordTown_Hall/map.bin b/data/layouts/DewfordTown_Hall/map.bin Binary files differindex 5fd13209d..5fd13209d 100644 --- a/data/maps/DewfordTown_Hall/map.bin +++ b/data/layouts/DewfordTown_Hall/map.bin diff --git a/data/maps/EverGrandeCity_PokemonLeague/border.bin b/data/layouts/DoubleBattleColosseum/border.bin index 19d906679..19d906679 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/border.bin +++ b/data/layouts/DoubleBattleColosseum/border.bin diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc new file mode 100644 index 000000000..04dc2e303 --- /dev/null +++ b/data/layouts/DoubleBattleColosseum/layout.inc @@ -0,0 +1,14 @@ +DoubleBattleColosseum_MapBorder:: @ 82E9610 + .incbin "data/layouts/DoubleBattleColosseum/border.bin" + +DoubleBattleColosseum_MapBlockdata:: @ 82E9618 + .incbin "data/layouts/DoubleBattleColosseum/map.bin" + + .align 2 +DoubleBattleColosseum_Layout:: @ 82E9714 + .4byte 0xe + .4byte 0x9 + .4byte DoubleBattleColosseum_MapBorder + .4byte DoubleBattleColosseum_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/layouts/DoubleBattleColosseum/map.bin index 77606e818..77606e818 100644 --- a/data/maps/DoubleBattleColosseum/map.bin +++ b/data/layouts/DoubleBattleColosseum/map.bin diff --git a/data/maps/EverGrandeCity/border.bin b/data/layouts/EverGrandeCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/EverGrandeCity/border.bin +++ b/data/layouts/EverGrandeCity/border.bin diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc new file mode 100644 index 000000000..f8465ad0f --- /dev/null +++ b/data/layouts/EverGrandeCity/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_MapBorder:: @ 828FA8C + .incbin "data/layouts/EverGrandeCity/border.bin" + +EverGrandeCity_MapBlockdata:: @ 828FA94 + .incbin "data/layouts/EverGrandeCity/map.bin" + + .align 2 +EverGrandeCity_Layout:: @ 8291394 + .4byte 0x28 + .4byte 0x50 + .4byte EverGrandeCity_MapBorder + .4byte EverGrandeCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_EverGrande diff --git a/data/maps/EverGrandeCity/map.bin b/data/layouts/EverGrandeCity/map.bin Binary files differindex 33b271d5d..33b271d5d 100644 --- a/data/maps/EverGrandeCity/map.bin +++ b/data/layouts/EverGrandeCity/map.bin diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/border.bin +++ b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc new file mode 100644 index 000000000..befca0f66 --- /dev/null +++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8 + .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" + +EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0 + .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" + + .align 2 +EverGrandeCity_ChampionsRoom_Layout:: @ 82D4A44 + .4byte 0xd + .4byte 0xd + .4byte EverGrandeCity_ChampionsRoom_MapBorder + .4byte EverGrandeCity_ChampionsRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.bin b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin Binary files differindex a234307b5..a234307b5 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.bin +++ b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin diff --git a/data/maps/EverGrandeCity_Corridor1/border.bin b/data/layouts/EverGrandeCity_Corridor4/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_Corridor1/border.bin +++ b/data/layouts/EverGrandeCity_Corridor4/border.bin diff --git a/data/layouts/EverGrandeCity_Corridor4/layout.inc b/data/layouts/EverGrandeCity_Corridor4/layout.inc new file mode 100644 index 000000000..e21b1481d --- /dev/null +++ b/data/layouts/EverGrandeCity_Corridor4/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC + .incbin "data/layouts/EverGrandeCity_Corridor4/border.bin" + +EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4 + .incbin "data/layouts/EverGrandeCity_Corridor4/map.bin" + + .align 2 +EverGrandeCity_Corridor4_Layout:: @ 82FFDA0 + .4byte 0xb + .4byte 0x22 + .4byte EverGrandeCity_Corridor4_MapBorder + .4byte EverGrandeCity_Corridor4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_Corridor4/map.bin b/data/layouts/EverGrandeCity_Corridor4/map.bin index 580ae095a..580ae095a 100644 --- a/data/maps/EverGrandeCity_Corridor4/map.bin +++ b/data/layouts/EverGrandeCity_Corridor4/map.bin diff --git a/data/maps/EverGrandeCity_Corridor4/border.bin b/data/layouts/EverGrandeCity_DrakesRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_Corridor4/border.bin +++ b/data/layouts/EverGrandeCity_DrakesRoom/border.bin diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc new file mode 100644 index 000000000..aa7d4c7ee --- /dev/null +++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C + .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" + +EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764 + .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" + + .align 2 +EverGrandeCity_DrakesRoom_Layout:: @ 82D48D0 + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_DrakesRoom_MapBorder + .4byte EverGrandeCity_DrakesRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/layouts/EverGrandeCity_DrakesRoom/map.bin index 3b5248d98..3b5248d98 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.bin +++ b/data/layouts/EverGrandeCity_DrakesRoom/map.bin diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/border.bin +++ b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc new file mode 100644 index 000000000..9dbcba92e --- /dev/null +++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0 + .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" + +EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8 + .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" + + .align 2 +EverGrandeCity_GlaciasRoom_Layout:: @ 82D4744 + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_GlaciasRoom_MapBorder + .4byte EverGrandeCity_GlaciasRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin index 2d7db7377..2d7db7377 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.bin +++ b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/border.bin +++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc new file mode 100644 index 000000000..fe6bfd983 --- /dev/null +++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC + .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" + +EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4 + .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" + + .align 2 +EverGrandeCity_HallOfFame_Layout:: @ 82FC5E4 + .4byte 0xf + .4byte 0x11 + .4byte EverGrandeCity_HallOfFame_MapBorder + .4byte EverGrandeCity_HallOfFame_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin index 1df9e4804..1df9e4804 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.bin +++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/border.bin +++ b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc new file mode 100644 index 000000000..0757ef56c --- /dev/null +++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444 + .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" + +EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C + .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" + + .align 2 +EverGrandeCity_PhoebesRoom_Layout:: @ 82D45B8 + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_PhoebesRoom_MapBorder + .4byte EverGrandeCity_PhoebesRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin index 2e75b706c..2e75b706c 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.bin +++ b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin diff --git a/data/maps/FallarborTown_ContestHall/border.bin b/data/layouts/EverGrandeCity_PokemonLeague/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FallarborTown_ContestHall/border.bin +++ b/data/layouts/EverGrandeCity_PokemonLeague/border.bin diff --git a/data/layouts/EverGrandeCity_PokemonLeague/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague/layout.inc new file mode 100644 index 000000000..268f4df65 --- /dev/null +++ b/data/layouts/EverGrandeCity_PokemonLeague/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0 + .incbin "data/layouts/EverGrandeCity_PokemonLeague/border.bin" + +EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8 + .incbin "data/layouts/EverGrandeCity_PokemonLeague/map.bin" + + .align 2 +EverGrandeCity_PokemonLeague_Layout:: @ 82F2AB0 + .4byte 0x13 + .4byte 0xc + .4byte EverGrandeCity_PokemonLeague_MapBorder + .4byte EverGrandeCity_PokemonLeague_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.bin b/data/layouts/EverGrandeCity_PokemonLeague/map.bin index d2acdf2dd..d2acdf2dd 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.bin +++ b/data/layouts/EverGrandeCity_PokemonLeague/map.bin diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/layouts/EverGrandeCity_ShortCorridor/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/border.bin +++ b/data/layouts/EverGrandeCity_ShortCorridor/border.bin diff --git a/data/layouts/EverGrandeCity_ShortCorridor/layout.inc b/data/layouts/EverGrandeCity_ShortCorridor/layout.inc new file mode 100644 index 000000000..cd04f317b --- /dev/null +++ b/data/layouts/EverGrandeCity_ShortCorridor/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_ShortCorridor_MapBorder:: @ 82D4A5C + .incbin "data/layouts/EverGrandeCity_ShortCorridor/border.bin" + +EverGrandeCity_ShortCorridor_MapBlockdata:: @ 82D4A64 + .incbin "data/layouts/EverGrandeCity_ShortCorridor/map.bin" + + .align 2 +EverGrandeCity_ShortCorridor_Layout:: @ 82D4B84 + .4byte 0xb + .4byte 0xd + .4byte EverGrandeCity_ShortCorridor_MapBorder + .4byte EverGrandeCity_ShortCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_Corridor1/map.bin b/data/layouts/EverGrandeCity_ShortCorridor/map.bin index 75812b238..75812b238 100644 --- a/data/maps/EverGrandeCity_Corridor1/map.bin +++ b/data/layouts/EverGrandeCity_ShortCorridor/map.bin diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/layouts/EverGrandeCity_SidneysRoom/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/border.bin +++ b/data/layouts/EverGrandeCity_SidneysRoom/border.bin diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc new file mode 100644 index 000000000..10905e89b --- /dev/null +++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc @@ -0,0 +1,14 @@ +EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8 + .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" + +EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0 + .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" + + .align 2 +EverGrandeCity_SidneysRoom_Layout:: @ 82D442C + .4byte 0xd + .4byte 0xe + .4byte EverGrandeCity_SidneysRoom_MapBorder + .4byte EverGrandeCity_SidneysRoom_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_EliteFour diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/layouts/EverGrandeCity_SidneysRoom/map.bin index ebca00c5c..ebca00c5c 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.bin +++ b/data/layouts/EverGrandeCity_SidneysRoom/map.bin diff --git a/data/maps/FallarborTown/border.bin b/data/layouts/FallarborTown/border.bin index 23e2a92e5..23e2a92e5 100644 --- a/data/maps/FallarborTown/border.bin +++ b/data/layouts/FallarborTown/border.bin diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc new file mode 100644 index 000000000..d8e51258c --- /dev/null +++ b/data/layouts/FallarborTown/layout.inc @@ -0,0 +1,14 @@ +FallarborTown_MapBorder:: @ 82920AC + .incbin "data/layouts/FallarborTown/border.bin" + +FallarborTown_MapBlockdata:: @ 82920B4 + .incbin "data/layouts/FallarborTown/map.bin" + + .align 2 +FallarborTown_Layout:: @ 82923D4 + .4byte 0x14 + .4byte 0x14 + .4byte FallarborTown_MapBorder + .4byte FallarborTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/maps/FallarborTown/map.bin b/data/layouts/FallarborTown/map.bin Binary files differindex 08f68b6ea..08f68b6ea 100644 --- a/data/maps/FallarborTown/map.bin +++ b/data/layouts/FallarborTown/map.bin diff --git a/data/maps/FieryPath/border.bin b/data/layouts/FieryPath/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/FieryPath/border.bin +++ b/data/layouts/FieryPath/border.bin diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc new file mode 100644 index 000000000..5e5e77404 --- /dev/null +++ b/data/layouts/FieryPath/layout.inc @@ -0,0 +1,14 @@ +FieryPath_MapBorder:: @ 82FB574 + .incbin "data/layouts/FieryPath/border.bin" + +FieryPath_MapBlockdata:: @ 82FB57C + .incbin "data/layouts/FieryPath/map.bin" + + .align 2 +FieryPath_Layout:: @ 82FBFE0 + .4byte 0x23 + .4byte 0x26 + .4byte FieryPath_MapBorder + .4byte FieryPath_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/FieryPath/map.bin b/data/layouts/FieryPath/map.bin index 5928fb173..5928fb173 100644 --- a/data/maps/FieryPath/map.bin +++ b/data/layouts/FieryPath/map.bin diff --git a/data/maps/FortreeCity/border.bin b/data/layouts/FortreeCity/border.bin Binary files differindex addb5d6ce..addb5d6ce 100644 --- a/data/maps/FortreeCity/border.bin +++ b/data/layouts/FortreeCity/border.bin diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc new file mode 100644 index 000000000..1e5bfcbd3 --- /dev/null +++ b/data/layouts/FortreeCity/layout.inc @@ -0,0 +1,14 @@ +FortreeCity_MapBorder:: @ 828A5AC + .incbin "data/layouts/FortreeCity/border.bin" + +FortreeCity_MapBlockdata:: @ 828A5B4 + .incbin "data/layouts/FortreeCity/map.bin" + + .align 2 +FortreeCity_Layout:: @ 828ABF4 + .4byte 0x28 + .4byte 0x14 + .4byte FortreeCity_MapBorder + .4byte FortreeCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/maps/FortreeCity/map.bin b/data/layouts/FortreeCity/map.bin index a2aa40e98..a2aa40e98 100644 --- a/data/maps/FortreeCity/map.bin +++ b/data/layouts/FortreeCity/map.bin diff --git a/data/maps/FallarborTown_ContestLobby/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FallarborTown_ContestLobby/border.bin +++ b/data/layouts/FortreeCity_DecorationShop/border.bin diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc new file mode 100644 index 000000000..b6cc3eba2 --- /dev/null +++ b/data/layouts/FortreeCity_DecorationShop/layout.inc @@ -0,0 +1,14 @@ +FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4 + .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" + +FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC + .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" + + .align 2 +FortreeCity_DecorationShop_Layout:: @ 82EFB4C + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_DecorationShop_MapBorder + .4byte FortreeCity_DecorationShop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin index 6ca8b4e61..6ca8b4e61 100644 --- a/data/maps/FortreeCity_DecorationShop/map.bin +++ b/data/layouts/FortreeCity_DecorationShop/map.bin diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/layouts/FortreeCity_Gym/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/FortreeCity_Gym/border.bin +++ b/data/layouts/FortreeCity_Gym/border.bin diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc new file mode 100644 index 000000000..75c619802 --- /dev/null +++ b/data/layouts/FortreeCity_Gym/layout.inc @@ -0,0 +1,14 @@ +FortreeCity_Gym_MapBorder:: @ 82D1B54 + .incbin "data/layouts/FortreeCity_Gym/border.bin" + +FortreeCity_Gym_MapBlockdata:: @ 82D1B5C + .incbin "data/layouts/FortreeCity_Gym/map.bin" + + .align 2 +FortreeCity_Gym_Layout:: @ 82D1F44 + .4byte 0x14 + .4byte 0x19 + .4byte FortreeCity_Gym_MapBorder + .4byte FortreeCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_FortreeGym diff --git a/data/maps/FortreeCity_Gym/map.bin b/data/layouts/FortreeCity_Gym/map.bin index a8ee94ae1..a8ee94ae1 100644 --- a/data/maps/FortreeCity_Gym/map.bin +++ b/data/layouts/FortreeCity_Gym/map.bin diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_House1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FortreeCity_DecorationShop/border.bin +++ b/data/layouts/FortreeCity_House1/border.bin diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc new file mode 100644 index 000000000..0c604c064 --- /dev/null +++ b/data/layouts/FortreeCity_House1/layout.inc @@ -0,0 +1,14 @@ +FortreeCity_House1_MapBorder:: @ 82D1AD4 + .incbin "data/layouts/FortreeCity_House1/border.bin" + +FortreeCity_House1_MapBlockdata:: @ 82D1ADC + .incbin "data/layouts/FortreeCity_House1/map.bin" + + .align 2 +FortreeCity_House1_Layout:: @ 82D1B3C + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_House1_MapBorder + .4byte FortreeCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/FortreeCity_House1/map.bin b/data/layouts/FortreeCity_House1/map.bin index 5a3ac8cb6..5a3ac8cb6 100644 --- a/data/maps/FortreeCity_House1/map.bin +++ b/data/layouts/FortreeCity_House1/map.bin diff --git a/data/maps/FortreeCity_House1/border.bin b/data/layouts/FortreeCity_House2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FortreeCity_House1/border.bin +++ b/data/layouts/FortreeCity_House2/border.bin diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc new file mode 100644 index 000000000..2ab8ee1c3 --- /dev/null +++ b/data/layouts/FortreeCity_House2/layout.inc @@ -0,0 +1,14 @@ +FortreeCity_House2_MapBorder:: @ 82D1F5C + .incbin "data/layouts/FortreeCity_House2/border.bin" + +FortreeCity_House2_MapBlockdata:: @ 82D1F64 + .incbin "data/layouts/FortreeCity_House2/map.bin" + + .align 2 +FortreeCity_House2_Layout:: @ 82D1FC4 + .4byte 0x8 + .4byte 0x6 + .4byte FortreeCity_House2_MapBorder + .4byte FortreeCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/FortreeCity_House2/map.bin b/data/layouts/FortreeCity_House2/map.bin index 3fbcd6043..3fbcd6043 100644 --- a/data/maps/FortreeCity_House2/map.bin +++ b/data/layouts/FortreeCity_House2/map.bin diff --git a/data/maps/GraniteCave_1F/border.bin b/data/layouts/GraniteCave_1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/GraniteCave_1F/border.bin +++ b/data/layouts/GraniteCave_1F/border.bin diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc new file mode 100644 index 000000000..a41a08112 --- /dev/null +++ b/data/layouts/GraniteCave_1F/layout.inc @@ -0,0 +1,14 @@ +GraniteCave_1F_MapBorder:: @ 82D7F70 + .incbin "data/layouts/GraniteCave_1F/border.bin" + +GraniteCave_1F_MapBlockdata:: @ 82D7F78 + .incbin "data/layouts/GraniteCave_1F/map.bin" + + .align 2 +GraniteCave_1F_Layout:: @ 82D8464 + .4byte 0x2a + .4byte 0xf + .4byte GraniteCave_1F_MapBorder + .4byte GraniteCave_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/GraniteCave_1F/map.bin b/data/layouts/GraniteCave_1F/map.bin index 58c7945ab..58c7945ab 100644 --- a/data/maps/GraniteCave_1F/map.bin +++ b/data/layouts/GraniteCave_1F/map.bin diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/layouts/GraniteCave_B1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/GraniteCave_B1F/border.bin +++ b/data/layouts/GraniteCave_B1F/border.bin diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc new file mode 100644 index 000000000..fed45feaa --- /dev/null +++ b/data/layouts/GraniteCave_B1F/layout.inc @@ -0,0 +1,14 @@ +GraniteCave_B1F_MapBorder:: @ 82D847C + .incbin "data/layouts/GraniteCave_B1F/border.bin" + +GraniteCave_B1F_MapBlockdata:: @ 82D8484 + .incbin "data/layouts/GraniteCave_B1F/map.bin" + + .align 2 +GraniteCave_B1F_Layout:: @ 82D8B04 + .4byte 0x20 + .4byte 0x1a + .4byte GraniteCave_B1F_MapBorder + .4byte GraniteCave_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/layouts/GraniteCave_B1F/map.bin index 27f98c6cf..27f98c6cf 100644 --- a/data/maps/GraniteCave_B1F/map.bin +++ b/data/layouts/GraniteCave_B1F/map.bin diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/layouts/GraniteCave_B2F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/GraniteCave_B2F/border.bin +++ b/data/layouts/GraniteCave_B2F/border.bin diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc new file mode 100644 index 000000000..3ec6961df --- /dev/null +++ b/data/layouts/GraniteCave_B2F/layout.inc @@ -0,0 +1,14 @@ +GraniteCave_B2F_MapBorder:: @ 82D8B1C + .incbin "data/layouts/GraniteCave_B2F/border.bin" + +GraniteCave_B2F_MapBlockdata:: @ 82D8B24 + .incbin "data/layouts/GraniteCave_B2F/map.bin" + + .align 2 +GraniteCave_B2F_Layout:: @ 82D91A4 + .4byte 0x20 + .4byte 0x1a + .4byte GraniteCave_B2F_MapBorder + .4byte GraniteCave_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/layouts/GraniteCave_B2F/map.bin index bbf8dc7af..bbf8dc7af 100644 --- a/data/maps/GraniteCave_B2F/map.bin +++ b/data/layouts/GraniteCave_B2F/map.bin diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/layouts/GraniteCave_StevensRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/GraniteCave_StevensRoom/border.bin +++ b/data/layouts/GraniteCave_StevensRoom/border.bin diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc new file mode 100644 index 000000000..fc036e27e --- /dev/null +++ b/data/layouts/GraniteCave_StevensRoom/layout.inc @@ -0,0 +1,14 @@ +GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C + .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" + +GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84 + .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" + + .align 2 +GraniteCave_StevensRoom_Layout:: @ 82F9C28 + .4byte 0xf + .4byte 0xe + .4byte GraniteCave_StevensRoom_MapBorder + .4byte GraniteCave_StevensRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/layouts/GraniteCave_StevensRoom/map.bin index 3dc6987c2..3dc6987c2 100644 --- a/data/maps/GraniteCave_StevensRoom/map.bin +++ b/data/layouts/GraniteCave_StevensRoom/map.bin diff --git a/data/maps/FortreeCity_House2/border.bin b/data/layouts/Harbor/border.bin index 19d906679..19d906679 100644 --- a/data/maps/FortreeCity_House2/border.bin +++ b/data/layouts/Harbor/border.bin diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc new file mode 100644 index 000000000..11d740254 --- /dev/null +++ b/data/layouts/Harbor/layout.inc @@ -0,0 +1,14 @@ +Harbor_MapBorder:: @ 82D0A78 + .incbin "data/layouts/Harbor/border.bin" + +Harbor_MapBlockdata:: @ 82D0A80 + .incbin "data/layouts/Harbor/map.bin" + + .align 2 +Harbor_Layout:: @ 82D0D50 + .4byte 0x18 + .4byte 0xf + .4byte Harbor_MapBorder + .4byte Harbor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/SlateportCity_Harbor/map.bin b/data/layouts/Harbor/map.bin index c77c1edfb..c77c1edfb 100644 --- a/data/maps/SlateportCity_Harbor/map.bin +++ b/data/layouts/Harbor/map.bin diff --git a/data/maps/House11/border.bin b/data/layouts/House1/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/House11/border.bin +++ b/data/layouts/House1/border.bin diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc new file mode 100644 index 000000000..c92a5232f --- /dev/null +++ b/data/layouts/House1/layout.inc @@ -0,0 +1,14 @@ +House1_MapBorder:: @ 82CDEC0 + .incbin "data/layouts/House1/border.bin" + +House1_MapBlockdata:: @ 82CDEC8 + .incbin "data/layouts/House1/map.bin" + + .align 2 +House1_Layout:: @ 82CDF7C + .4byte 0xa + .4byte 0x9 + .4byte House1_MapBorder + .4byte House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/House11/map.bin b/data/layouts/House1/map.bin index ea185484d..ea185484d 100644 --- a/data/maps/House11/map.bin +++ b/data/layouts/House1/map.bin diff --git a/data/maps/House12/border.bin b/data/layouts/House2/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/House12/border.bin +++ b/data/layouts/House2/border.bin diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc new file mode 100644 index 000000000..fae098aa3 --- /dev/null +++ b/data/layouts/House2/layout.inc @@ -0,0 +1,14 @@ +House2_MapBorder:: @ 82CDF94 + .incbin "data/layouts/House2/border.bin" + +House2_MapBlockdata:: @ 82CDF9C + .incbin "data/layouts/House2/map.bin" + + .align 2 +House2_Layout:: @ 82CE04C + .4byte 0xb + .4byte 0x8 + .4byte House2_MapBorder + .4byte House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/House12/map.bin b/data/layouts/House2/map.bin index 0e9f07964..0e9f07964 100644 --- a/data/maps/House12/map.bin +++ b/data/layouts/House2/map.bin diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/layouts/House3/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin +++ b/data/layouts/House3/border.bin diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc new file mode 100644 index 000000000..3664d8849 --- /dev/null +++ b/data/layouts/House3/layout.inc @@ -0,0 +1,14 @@ +House3_MapBorder:: @ 82CE36C + .incbin "data/layouts/House3/border.bin" + +House3_MapBlockdata:: @ 82CE374 + .incbin "data/layouts/House3/map.bin" + + .align 2 +House3_Layout:: @ 82CE414 + .4byte 0xa + .4byte 0x8 + .4byte House3_MapBorder + .4byte House3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/DewfordTown_House1/map.bin b/data/layouts/House3/map.bin index 1f732ba3f..1f732ba3f 100644 --- a/data/maps/DewfordTown_House1/map.bin +++ b/data/layouts/House3/map.bin diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/layouts/House4/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_ContestHall/border.bin +++ b/data/layouts/House4/border.bin diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc new file mode 100644 index 000000000..35f609029 --- /dev/null +++ b/data/layouts/House4/layout.inc @@ -0,0 +1,14 @@ +House4_MapBorder:: @ 82CE990 + .incbin "data/layouts/House4/border.bin" + +House4_MapBlockdata:: @ 82CE998 + .incbin "data/layouts/House4/map.bin" + + .align 2 +House4_Layout:: @ 82CEA4C + .4byte 0xa + .4byte 0x9 + .4byte House4_MapBorder + .4byte House4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/DewfordTown_House2/map.bin b/data/layouts/House4/map.bin index 6274e4418..6274e4418 100644 --- a/data/maps/DewfordTown_House2/map.bin +++ b/data/layouts/House4/map.bin diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/layouts/HouseWithBed/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_ContestLobby/border.bin +++ b/data/layouts/HouseWithBed/border.bin diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc new file mode 100644 index 000000000..6d732d4f7 --- /dev/null +++ b/data/layouts/HouseWithBed/layout.inc @@ -0,0 +1,14 @@ +HouseWithBed_MapBorder:: @ 82D0054 + .incbin "data/layouts/HouseWithBed/border.bin" + +HouseWithBed_MapBlockdata:: @ 82D005C + .incbin "data/layouts/HouseWithBed/map.bin" + + .align 2 +HouseWithBed_Layout:: @ 82D00FC + .4byte 0xa + .4byte 0x8 + .4byte HouseWithBed_MapBorder + .4byte HouseWithBed_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/layouts/HouseWithBed/map.bin index b91b7153b..b91b7153b 100644 --- a/data/maps/PetalburgCity_House2/map.bin +++ b/data/layouts/HouseWithBed/map.bin diff --git a/data/maps/InsideOfTruck/border.bin b/data/layouts/InsideOfTruck/border.bin index 8459c2996..8459c2996 100644 --- a/data/maps/InsideOfTruck/border.bin +++ b/data/layouts/InsideOfTruck/border.bin diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc new file mode 100644 index 000000000..f32874b46 --- /dev/null +++ b/data/layouts/InsideOfTruck/layout.inc @@ -0,0 +1,14 @@ +InsideOfTruck_MapBorder:: @ 82EA08C + .incbin "data/layouts/InsideOfTruck/border.bin" + +InsideOfTruck_MapBlockdata:: @ 82EA094 + .incbin "data/layouts/InsideOfTruck/map.bin" + + .align 2 +InsideOfTruck_Layout:: @ 82EA0C8 + .4byte 0x5 + .4byte 0x5 + .4byte InsideOfTruck_MapBorder + .4byte InsideOfTruck_MapBlockdata + .4byte gTileset_General + .4byte gTileset_InsideOfTruck diff --git a/data/maps/InsideOfTruck/map.bin b/data/layouts/InsideOfTruck/map.bin index 84b946be5..84b946be5 100644 --- a/data/maps/InsideOfTruck/map.bin +++ b/data/layouts/InsideOfTruck/map.bin diff --git a/data/maps/IslandCave/border.bin b/data/layouts/IslandCave/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/IslandCave/border.bin +++ b/data/layouts/IslandCave/border.bin diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc new file mode 100644 index 000000000..095996bc5 --- /dev/null +++ b/data/layouts/IslandCave/layout.inc @@ -0,0 +1,14 @@ +IslandCave_MapBorder:: @ 82F6CF8 + .incbin "data/layouts/IslandCave/border.bin" + +IslandCave_MapBlockdata:: @ 82F6D00 + .incbin "data/layouts/IslandCave/map.bin" + + .align 2 +IslandCave_Layout:: @ 82F7164 + .4byte 0x11 + .4byte 0x21 + .4byte IslandCave_MapBorder + .4byte IslandCave_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/IslandCave/map.bin b/data/layouts/IslandCave/map.bin Binary files differindex a7fa61b4d..a7fa61b4d 100644 --- a/data/maps/IslandCave/map.bin +++ b/data/layouts/IslandCave/map.bin diff --git a/data/maps/JaggedPass/border.bin b/data/layouts/JaggedPass/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/JaggedPass/border.bin +++ b/data/layouts/JaggedPass/border.bin diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc new file mode 100644 index 000000000..8679ed58d --- /dev/null +++ b/data/layouts/JaggedPass/layout.inc @@ -0,0 +1,14 @@ +JaggedPass_MapBorder:: @ 82FAA8C + .incbin "data/layouts/JaggedPass/border.bin" + +JaggedPass_MapBlockdata:: @ 82FAA94 + .incbin "data/layouts/JaggedPass/map.bin" + + .align 2 +JaggedPass_Layout:: @ 82FB55C + .4byte 0x1e + .4byte 0x2e + .4byte JaggedPass_MapBorder + .4byte JaggedPass_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/JaggedPass/map.bin b/data/layouts/JaggedPass/map.bin Binary files differindex a87a5332e..a87a5332e 100644 --- a/data/maps/JaggedPass/map.bin +++ b/data/layouts/JaggedPass/map.bin diff --git a/data/maps/LavaridgeTown/border.bin b/data/layouts/LavaridgeTown/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/LavaridgeTown/border.bin +++ b/data/layouts/LavaridgeTown/border.bin diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc new file mode 100644 index 000000000..c75599acc --- /dev/null +++ b/data/layouts/LavaridgeTown/layout.inc @@ -0,0 +1,14 @@ +LavaridgeTown_MapBorder:: @ 8291D6C + .incbin "data/layouts/LavaridgeTown/border.bin" + +LavaridgeTown_MapBlockdata:: @ 8291D74 + .incbin "data/layouts/LavaridgeTown/map.bin" + + .align 2 +LavaridgeTown_Layout:: @ 8292094 + .4byte 0x14 + .4byte 0x14 + .4byte LavaridgeTown_MapBorder + .4byte LavaridgeTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/LavaridgeTown/map.bin b/data/layouts/LavaridgeTown/map.bin index 604ad5f3f..604ad5f3f 100644 --- a/data/maps/LavaridgeTown/map.bin +++ b/data/layouts/LavaridgeTown/map.bin diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/layouts/LavaridgeTown_Gym_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LavaridgeTown_Gym_1F/border.bin +++ b/data/layouts/LavaridgeTown_Gym_1F/border.bin diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc new file mode 100644 index 000000000..4ccf34bae --- /dev/null +++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc @@ -0,0 +1,14 @@ +LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34 + .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin" + +LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C + .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin" + + .align 2 +LavaridgeTown_Gym_1F_Layout:: @ 82CED4C + .4byte 0xb + .4byte 0x18 + .4byte LavaridgeTown_Gym_1F_MapBorder + .4byte LavaridgeTown_Gym_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LavaridgeGym diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/layouts/LavaridgeTown_Gym_1F/map.bin index 7f2b02f90..7f2b02f90 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.bin +++ b/data/layouts/LavaridgeTown_Gym_1F/map.bin diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/layouts/LavaridgeTown_Gym_B1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/border.bin +++ b/data/layouts/LavaridgeTown_Gym_B1F/border.bin diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc new file mode 100644 index 000000000..4439d7e16 --- /dev/null +++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc @@ -0,0 +1,14 @@ +LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64 + .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin" + +LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C + .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin" + + .align 2 +LavaridgeTown_Gym_B1F_Layout:: @ 82CEF7C + .4byte 0xb + .4byte 0x18 + .4byte LavaridgeTown_Gym_B1F_MapBorder + .4byte LavaridgeTown_Gym_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LavaridgeGym diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/layouts/LavaridgeTown_Gym_B1F/map.bin index 035719ffe..035719ffe 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.bin +++ b/data/layouts/LavaridgeTown_Gym_B1F/map.bin diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LavaridgeTown_HerbShop/border.bin +++ b/data/layouts/LavaridgeTown_HerbShop/border.bin diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc new file mode 100644 index 000000000..e16d8d26e --- /dev/null +++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc @@ -0,0 +1,14 @@ +LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64 + .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" + +LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C + .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" + + .align 2 +LavaridgeTown_HerbShop_Layout:: @ 82CEB1C + .4byte 0xb + .4byte 0x8 + .4byte LavaridgeTown_HerbShop_MapBorder + .4byte LavaridgeTown_HerbShop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin index cc0294a80..cc0294a80 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.bin +++ b/data/layouts/LavaridgeTown_HerbShop/map.bin diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc new file mode 100644 index 000000000..878764cf4 --- /dev/null +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc @@ -0,0 +1,14 @@ +LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94 + .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin" + +LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C + .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" + + .align 2 +LavaridgeTown_PokemonCenter_1F_Layout:: @ 82CF098 + .4byte 0xe + .4byte 0x9 + .4byte LavaridgeTown_PokemonCenter_1F_MapBorder + .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin index d841f9f1a..d841f9f1a 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin diff --git a/data/maps/LilycoveCity/border.bin b/data/layouts/LilycoveCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/LilycoveCity/border.bin +++ b/data/layouts/LilycoveCity/border.bin diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc new file mode 100644 index 000000000..b9dd45070 --- /dev/null +++ b/data/layouts/LilycoveCity/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_MapBorder:: @ 828AC0C + .incbin "data/layouts/LilycoveCity/border.bin" + +LilycoveCity_MapBlockdata:: @ 828AC14 + .incbin "data/layouts/LilycoveCity/map.bin" + + .align 2 +LilycoveCity_Layout:: @ 828C514 + .4byte 0x50 + .4byte 0x28 + .4byte LilycoveCity_MapBorder + .4byte LilycoveCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/LilycoveCity/map.bin b/data/layouts/LilycoveCity/map.bin Binary files differindex d17bd748d..d17bd748d 100644 --- a/data/maps/LilycoveCity/map.bin +++ b/data/layouts/LilycoveCity/map.bin diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/layouts/LilycoveCity_ContestHall/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin +++ b/data/layouts/LilycoveCity_ContestHall/border.bin diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc new file mode 100644 index 000000000..49b886534 --- /dev/null +++ b/data/layouts/LilycoveCity_ContestHall/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_ContestHall_MapBorder:: @ 82D27E4 + .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" + +LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC + .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" + + .align 2 +LilycoveCity_ContestHall_Layout:: @ 82D3514 + .4byte 0x33 + .4byte 0x21 + .4byte LilycoveCity_ContestHall_MapBorder + .4byte LilycoveCity_ContestHall_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/layouts/LilycoveCity_ContestHall/map.bin index 06fdae4f7..06fdae4f7 100644 --- a/data/maps/LilycoveCity_ContestHall/map.bin +++ b/data/layouts/LilycoveCity_ContestHall/map.bin diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/layouts/LilycoveCity_ContestLobby/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_House2/border.bin +++ b/data/layouts/LilycoveCity_ContestLobby/border.bin diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc new file mode 100644 index 000000000..588aa758c --- /dev/null +++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_ContestLobby_MapBorder:: @ 82D259C + .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" + +LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4 + .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" + + .align 2 +LilycoveCity_ContestLobby_Layout:: @ 82D27CC + .4byte 0x17 + .4byte 0xc + .4byte LilycoveCity_ContestLobby_MapBorder + .4byte LilycoveCity_ContestLobby_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/layouts/LilycoveCity_ContestLobby/map.bin index 3d8c96b04..3d8c96b04 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.bin +++ b/data/layouts/LilycoveCity_ContestLobby/map.bin diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc new file mode 100644 index 000000000..6a995c0be --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC + .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin" + +LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604 + .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" + + .align 2 +LilycoveCity_CoveLilyMotel_1F_Layout:: @ 82FC6DC + .4byte 0xc + .4byte 0x9 + .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder + .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin index 5242f8e57..5242f8e57 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc new file mode 100644 index 000000000..ba54855aa --- /dev/null +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4 + .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin" + +LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC + .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" + + .align 2 +LilycoveCity_CoveLilyMotel_2F_Layout:: @ 82FC7D4 + .4byte 0xc + .4byte 0x9 + .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder + .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin index 4484b5b55..4484b5b55 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc new file mode 100644 index 000000000..8e6e35fdf --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8 + .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" + +LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0 + .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" + + .align 2 +LilycoveCity_DepartmentStoreElevator_Layout:: @ 82F2F00 + .4byte 0x4 + .4byte 0x6 + .4byte LilycoveCity_DepartmentStoreElevator_MapBorder + .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BattleTower diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin index 1b3bf23c0..1b3bf23c0 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin index c1b82435c..c1b82435c 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc new file mode 100644 index 000000000..d72a2a96b --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278 + .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" + +LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280 + .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" + + .align 2 +LilycoveCity_DepartmentStoreRooftop_Layout:: @ 82F0430 + .4byte 0x12 + .4byte 0xc + .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder + .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin index e9125baf0..e9125baf0 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc new file mode 100644 index 000000000..146db41fb --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38 + .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin" + +LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40 + .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_1F_Layout:: @ 82EFD60 + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_1F_MapBorder + .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin index 2d3d15360..2d3d15360 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc new file mode 100644 index 000000000..e1cd81700 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78 + .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin" + +LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80 + .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_2F_Layout:: @ 82EFEA0 + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_2F_MapBorder + .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin index 82ca90b08..82ca90b08 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc new file mode 100644 index 000000000..c8f82faee --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8 + .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin" + +LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0 + .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_3F_Layout:: @ 82EFFE0 + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_3F_MapBorder + .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin index c10b776f5..c10b776f5 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc new file mode 100644 index 000000000..fbd10dea0 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8 + .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin" + +LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000 + .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_4F_Layout:: @ 82F0120 + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_4F_MapBorder + .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin index bc1a09e2c..bc1a09e2c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc new file mode 100644 index 000000000..877794bb7 --- /dev/null +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138 + .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin" + +LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140 + .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" + + .align 2 +LilycoveCity_DepartmentStore_5F_Layout:: @ 82F0260 + .4byte 0x12 + .4byte 0x8 + .4byte LilycoveCity_DepartmentStore_5F_MapBorder + .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin Binary files differindex 80acc3900..80acc3900 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin diff --git a/data/maps/LilycoveCity_EmptyMap/border.bin b/data/layouts/LilycoveCity_EmptyMap/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/LilycoveCity_EmptyMap/border.bin +++ b/data/layouts/LilycoveCity_EmptyMap/border.bin diff --git a/data/layouts/LilycoveCity_EmptyMap/layout.inc b/data/layouts/LilycoveCity_EmptyMap/layout.inc new file mode 100644 index 000000000..9006217c0 --- /dev/null +++ b/data/layouts/LilycoveCity_EmptyMap/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_EmptyMap_MapBorder:: @ 82D369C + .incbin "data/layouts/LilycoveCity_EmptyMap/border.bin" + +LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4 + .incbin "data/layouts/LilycoveCity_EmptyMap/map.bin" + + .align 2 +LilycoveCity_EmptyMap_Layout:: @ 82D36A8 + .4byte 0x1 + .4byte 0x1 + .4byte LilycoveCity_EmptyMap_MapBorder + .4byte LilycoveCity_EmptyMap_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/LilycoveCity_EmptyMap/map.bin b/data/layouts/LilycoveCity_EmptyMap/map.bin index f70d7bba4..f70d7bba4 100644 --- a/data/maps/LilycoveCity_EmptyMap/map.bin +++ b/data/layouts/LilycoveCity_EmptyMap/map.bin diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/layouts/LilycoveCity_House2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin +++ b/data/layouts/LilycoveCity_House2/border.bin diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc new file mode 100644 index 000000000..a5f900854 --- /dev/null +++ b/data/layouts/LilycoveCity_House2/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_House2_MapBorder:: @ 82CF4B8 + .incbin "data/layouts/LilycoveCity_House2/border.bin" + +LilycoveCity_House2_MapBlockdata:: @ 82CF4C0 + .incbin "data/layouts/LilycoveCity_House2/map.bin" + + .align 2 +LilycoveCity_House2_Layout:: @ 82CF540 + .4byte 0x8 + .4byte 0x8 + .4byte LilycoveCity_House2_MapBorder + .4byte LilycoveCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/layouts/LilycoveCity_House2/map.bin index e381f20eb..e381f20eb 100644 --- a/data/maps/LilycoveCity_House2/map.bin +++ b/data/layouts/LilycoveCity_House2/map.bin diff --git a/data/maps/LinkContestRoom1/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom1/border.bin +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc new file mode 100644 index 000000000..57b9802da --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4 + .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin" + +LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC + .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" + + .align 2 +LilycoveCity_LilycoveMuseum_1F_Layout:: @ 82D2328 + .4byte 0x15 + .4byte 0xe + .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder + .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LilycoveMuseum diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin index 6e92a8b58..6e92a8b58 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin diff --git a/data/maps/LinkContestRoom2/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom2/border.bin +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc new file mode 100644 index 000000000..4e426f5f5 --- /dev/null +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340 + .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin" + +LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348 + .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" + + .align 2 +LilycoveCity_LilycoveMuseum_2F_Layout:: @ 82D2584 + .4byte 0x16 + .4byte 0xd + .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder + .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_LilycoveMuseum diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin index 76a918838..76a918838 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin diff --git a/data/maps/LinkContestRoom3/border.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom3/border.bin +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc new file mode 100644 index 000000000..4c93258ae --- /dev/null +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc @@ -0,0 +1,14 @@ +LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C + .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" + +LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534 + .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" + + .align 2 +LilycoveCity_PokemonTrainerFanClub_Layout:: @ 82D3684 + .4byte 0xc + .4byte 0xe + .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder + .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin index cddfe5d9d..cddfe5d9d 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin diff --git a/data/maps/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom4/border.bin +++ b/data/layouts/LinkContestRoom1/border.bin diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc new file mode 100644 index 000000000..1f71a862d --- /dev/null +++ b/data/layouts/LinkContestRoom1/layout.inc @@ -0,0 +1,14 @@ +LinkContestRoom1_MapBorder:: @ 82E972C + .incbin "data/layouts/LinkContestRoom1/border.bin" + +LinkContestRoom1_MapBlockdata:: @ 82E9734 + .incbin "data/layouts/LinkContestRoom1/map.bin" + + .align 2 +LinkContestRoom1_Layout:: @ 82E9880 + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom1_MapBorder + .4byte LinkContestRoom1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom1/map.bin b/data/layouts/LinkContestRoom1/map.bin index a8853f6ae..a8853f6ae 100644 --- a/data/maps/LinkContestRoom1/map.bin +++ b/data/layouts/LinkContestRoom1/map.bin diff --git a/data/maps/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom5/border.bin +++ b/data/layouts/LinkContestRoom2/border.bin diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc new file mode 100644 index 000000000..77a027169 --- /dev/null +++ b/data/layouts/LinkContestRoom2/layout.inc @@ -0,0 +1,14 @@ +LinkContestRoom2_MapBorder:: @ 82E9970 + .incbin "data/layouts/LinkContestRoom2/border.bin" + +LinkContestRoom2_MapBlockdata:: @ 82E9978 + .incbin "data/layouts/LinkContestRoom2/map.bin" + + .align 2 +LinkContestRoom2_Layout:: @ 82E9AC4 + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom2_MapBorder + .4byte LinkContestRoom2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom2/map.bin b/data/layouts/LinkContestRoom2/map.bin index 7cb63b40d..7cb63b40d 100644 --- a/data/maps/LinkContestRoom2/map.bin +++ b/data/layouts/LinkContestRoom2/map.bin diff --git a/data/maps/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom3/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LinkContestRoom6/border.bin +++ b/data/layouts/LinkContestRoom3/border.bin diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc new file mode 100644 index 000000000..250f1f851 --- /dev/null +++ b/data/layouts/LinkContestRoom3/layout.inc @@ -0,0 +1,14 @@ +LinkContestRoom3_MapBorder:: @ 82E9ADC + .incbin "data/layouts/LinkContestRoom3/border.bin" + +LinkContestRoom3_MapBlockdata:: @ 82E9AE4 + .incbin "data/layouts/LinkContestRoom3/map.bin" + + .align 2 +LinkContestRoom3_Layout:: @ 82E9C30 + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom3_MapBorder + .4byte LinkContestRoom3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom3/map.bin b/data/layouts/LinkContestRoom3/map.bin index 59e9e9182..59e9e9182 100644 --- a/data/maps/LinkContestRoom3/map.bin +++ b/data/layouts/LinkContestRoom3/map.bin diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/layouts/LinkContestRoom4/border.bin index 19d906679..19d906679 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin +++ b/data/layouts/LinkContestRoom4/border.bin diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc new file mode 100644 index 000000000..f29c386a8 --- /dev/null +++ b/data/layouts/LinkContestRoom4/layout.inc @@ -0,0 +1,14 @@ +LinkContestRoom4_MapBorder:: @ 82E9C48 + .incbin "data/layouts/LinkContestRoom4/border.bin" + +LinkContestRoom4_MapBlockdata:: @ 82E9C50 + .incbin "data/layouts/LinkContestRoom4/map.bin" + + .align 2 +LinkContestRoom4_Layout:: @ 82E9D9C + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom4_MapBorder + .4byte LinkContestRoom4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom4/map.bin b/data/layouts/LinkContestRoom4/map.bin index 4e2166c19..4e2166c19 100644 --- a/data/maps/LinkContestRoom4/map.bin +++ b/data/layouts/LinkContestRoom4/map.bin diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/layouts/LinkContestRoom5/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MagmaHideout_1F/border.bin +++ b/data/layouts/LinkContestRoom5/border.bin diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc new file mode 100644 index 000000000..033bc94e4 --- /dev/null +++ b/data/layouts/LinkContestRoom5/layout.inc @@ -0,0 +1,14 @@ +LinkContestRoom5_MapBorder:: @ 82E9DB4 + .incbin "data/layouts/LinkContestRoom5/border.bin" + +LinkContestRoom5_MapBlockdata:: @ 82E9DBC + .incbin "data/layouts/LinkContestRoom5/map.bin" + + .align 2 +LinkContestRoom5_Layout:: @ 82E9F08 + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom5_MapBorder + .4byte LinkContestRoom5_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom5/map.bin b/data/layouts/LinkContestRoom5/map.bin index ad068fe7c..ad068fe7c 100644 --- a/data/maps/LinkContestRoom5/map.bin +++ b/data/layouts/LinkContestRoom5/map.bin diff --git a/data/maps/MagmaHideout_B1F/border.bin b/data/layouts/LinkContestRoom6/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MagmaHideout_B1F/border.bin +++ b/data/layouts/LinkContestRoom6/border.bin diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc new file mode 100644 index 000000000..8101c42ba --- /dev/null +++ b/data/layouts/LinkContestRoom6/layout.inc @@ -0,0 +1,14 @@ +LinkContestRoom6_MapBorder:: @ 82E9F20 + .incbin "data/layouts/LinkContestRoom6/border.bin" + +LinkContestRoom6_MapBlockdata:: @ 82E9F28 + .incbin "data/layouts/LinkContestRoom6/map.bin" + + .align 2 +LinkContestRoom6_Layout:: @ 82EA074 + .4byte 0xf + .4byte 0xb + .4byte LinkContestRoom6_MapBorder + .4byte LinkContestRoom6_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Contest diff --git a/data/maps/LinkContestRoom6/map.bin b/data/layouts/LinkContestRoom6/map.bin index 9fcec5a5e..9fcec5a5e 100644 --- a/data/maps/LinkContestRoom6/map.bin +++ b/data/layouts/LinkContestRoom6/map.bin diff --git a/data/maps/LittlerootTown/border.bin b/data/layouts/LittlerootTown/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/LittlerootTown/border.bin +++ b/data/layouts/LittlerootTown/border.bin diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc new file mode 100644 index 000000000..2d29b6839 --- /dev/null +++ b/data/layouts/LittlerootTown/layout.inc @@ -0,0 +1,14 @@ +LittlerootTown_MapBorder:: @ 82913AC + .incbin "data/layouts/LittlerootTown/border.bin" + +LittlerootTown_MapBlockdata:: @ 82913B4 + .incbin "data/layouts/LittlerootTown/map.bin" + + .align 2 +LittlerootTown_Layout:: @ 82916D4 + .4byte 0x14 + .4byte 0x14 + .4byte LittlerootTown_MapBorder + .4byte LittlerootTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin index 9af76f90e..9af76f90e 100644 --- a/data/maps/LittlerootTown/map.bin +++ b/data/layouts/LittlerootTown/map.bin diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc new file mode 100644 index 000000000..e2470e498 --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc @@ -0,0 +1,14 @@ +LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C + .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin" + +LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24 + .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" + + .align 2 +LittlerootTown_BrendansHouse_1F_Layout:: @ 82CDAEC + .4byte 0xb + .4byte 0x9 + .4byte LittlerootTown_BrendansHouse_1F_MapBorder + .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin index 3ae8e69a6..3ae8e69a6 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin index c1b82435c..c1b82435c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc new file mode 100644 index 000000000..e848645e5 --- /dev/null +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc @@ -0,0 +1,14 @@ +LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04 + .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin" + +LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C + .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" + + .align 2 +LittlerootTown_BrendansHouse_2F_Layout:: @ 82CDB9C + .4byte 0x9 + .4byte 0x8 + .4byte LittlerootTown_BrendansHouse_2F_MapBorder + .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin index 9de4bae2a..9de4bae2a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin index c1b82435c..c1b82435c 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/border.bin +++ b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc new file mode 100644 index 000000000..b65b9596c --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc @@ -0,0 +1,14 @@ +LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4 + .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin" + +LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC + .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" + + .align 2 +LittlerootTown_MaysHouse_1F_Layout:: @ 82CDC84 + .4byte 0xb + .4byte 0x9 + .4byte LittlerootTown_MaysHouse_1F_MapBorder + .4byte LittlerootTown_MaysHouse_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin index 12b4f86c2..12b4f86c2 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin +++ b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin diff --git a/data/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin index c1b82435c..c1b82435c 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/border.bin +++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc new file mode 100644 index 000000000..e732253a9 --- /dev/null +++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc @@ -0,0 +1,14 @@ +LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C + .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin" + +LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4 + .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" + + .align 2 +LittlerootTown_MaysHouse_2F_Layout:: @ 82CDD34 + .4byte 0x9 + .4byte 0x8 + .4byte LittlerootTown_MaysHouse_2F_MapBorder + .4byte LittlerootTown_MaysHouse_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_BrendansMaysHouse diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin index b51210332..b51210332 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin +++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin diff --git a/data/maps/MagmaHideout_B2F/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MagmaHideout_B2F/border.bin +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc new file mode 100644 index 000000000..8dc767516 --- /dev/null +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc @@ -0,0 +1,14 @@ +LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C + .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" + +LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54 + .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" + + .align 2 +LittlerootTown_ProfessorBirchsLab_Layout:: @ 82CDEA8 + .4byte 0xd + .4byte 0xd + .4byte LittlerootTown_ProfessorBirchsLab_MapBorder + .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin index 0b62afcdf..0b62afcdf 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/layouts/MagmaHideout_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_1F_1R/border.bin +++ b/data/layouts/MagmaHideout_1F/border.bin diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc new file mode 100644 index 000000000..3aa438e2f --- /dev/null +++ b/data/layouts/MagmaHideout_1F/layout.inc @@ -0,0 +1,14 @@ +MagmaHideout_1F_MapBorder:: @ 82FFDB8 + .incbin "data/layouts/MagmaHideout_1F/border.bin" + +MagmaHideout_1F_MapBlockdata:: @ 82FFDC0 + .incbin "data/layouts/MagmaHideout_1F/map.bin" + + .align 2 +MagmaHideout_1F_Layout:: @ 8300450 + .4byte 0x1c + .4byte 0x1e + .4byte MagmaHideout_1F_MapBorder + .4byte MagmaHideout_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/layouts/MagmaHideout_1F/map.bin Binary files differindex 52c2d57eb..52c2d57eb 100644 --- a/data/maps/MagmaHideout_1F/map.bin +++ b/data/layouts/MagmaHideout_1F/map.bin diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/layouts/MagmaHideout_B1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_1F_2R/border.bin +++ b/data/layouts/MagmaHideout_B1F/border.bin diff --git a/data/layouts/MagmaHideout_B1F/layout.inc b/data/layouts/MagmaHideout_B1F/layout.inc new file mode 100644 index 000000000..9bc8f8860 --- /dev/null +++ b/data/layouts/MagmaHideout_B1F/layout.inc @@ -0,0 +1,14 @@ +MagmaHideout_B1F_MapBorder:: @ 8300468 + .incbin "data/layouts/MagmaHideout_B1F/border.bin" + +MagmaHideout_B1F_MapBlockdata:: @ 8300470 + .incbin "data/layouts/MagmaHideout_B1F/map.bin" + + .align 2 +MagmaHideout_B1F_Layout:: @ 8301010 + .4byte 0x3e + .4byte 0x18 + .4byte MagmaHideout_B1F_MapBorder + .4byte MagmaHideout_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MagmaHideout_B1F/map.bin b/data/layouts/MagmaHideout_B1F/map.bin index b423ca1a9..b423ca1a9 100644 --- a/data/maps/MagmaHideout_B1F/map.bin +++ b/data/layouts/MagmaHideout_B1F/map.bin diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/layouts/MagmaHideout_B2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_B1F_1R/border.bin +++ b/data/layouts/MagmaHideout_B2F/border.bin diff --git a/data/layouts/MagmaHideout_B2F/layout.inc b/data/layouts/MagmaHideout_B2F/layout.inc new file mode 100644 index 000000000..b245f7b91 --- /dev/null +++ b/data/layouts/MagmaHideout_B2F/layout.inc @@ -0,0 +1,14 @@ +MagmaHideout_B2F_MapBorder:: @ 8301028 + .incbin "data/layouts/MagmaHideout_B2F/border.bin" + +MagmaHideout_B2F_MapBlockdata:: @ 8301030 + .incbin "data/layouts/MagmaHideout_B2F/map.bin" + + .align 2 +MagmaHideout_B2F_Layout:: @ 8301690 + .4byte 0x22 + .4byte 0x18 + .4byte MagmaHideout_B2F_MapBorder + .4byte MagmaHideout_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MagmaHideout_B2F/map.bin b/data/layouts/MagmaHideout_B2F/map.bin index 68afb0063..68afb0063 100644 --- a/data/maps/MagmaHideout_B2F/map.bin +++ b/data/layouts/MagmaHideout_B2F/map.bin diff --git a/data/maps/MauvilleCity/border.bin b/data/layouts/MauvilleCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/MauvilleCity/border.bin +++ b/data/layouts/MauvilleCity/border.bin diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc new file mode 100644 index 000000000..a40712576 --- /dev/null +++ b/data/layouts/MauvilleCity/layout.inc @@ -0,0 +1,14 @@ +MauvilleCity_MapBorder:: @ 8288C6C + .incbin "data/layouts/MauvilleCity/border.bin" + +MauvilleCity_MapBlockdata:: @ 8288C74 + .incbin "data/layouts/MauvilleCity/map.bin" + + .align 2 +MauvilleCity_Layout:: @ 82892B4 + .4byte 0x28 + .4byte 0x14 + .4byte MauvilleCity_MapBorder + .4byte MauvilleCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/maps/MauvilleCity/map.bin b/data/layouts/MauvilleCity/map.bin Binary files differindex 80a38e902..80a38e902 100644 --- a/data/maps/MauvilleCity/map.bin +++ b/data/layouts/MauvilleCity/map.bin diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/layouts/MauvilleCity_BikeShop/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/MauvilleCity_BikeShop/border.bin +++ b/data/layouts/MauvilleCity_BikeShop/border.bin diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc new file mode 100644 index 000000000..b4f7c402f --- /dev/null +++ b/data/layouts/MauvilleCity_BikeShop/layout.inc @@ -0,0 +1,14 @@ +MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C + .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" + +MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34 + .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" + + .align 2 +MauvilleCity_BikeShop_Layout:: @ 82D100C + .4byte 0xc + .4byte 0x9 + .4byte MauvilleCity_BikeShop_MapBorder + .4byte MauvilleCity_BikeShop_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BikeShop diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/layouts/MauvilleCity_BikeShop/map.bin index 9891b9fd5..9891b9fd5 100644 --- a/data/maps/MauvilleCity_BikeShop/map.bin +++ b/data/layouts/MauvilleCity_BikeShop/map.bin diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/layouts/MauvilleCity_GameCorner/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MauvilleCity_GameCorner/border.bin +++ b/data/layouts/MauvilleCity_GameCorner/border.bin diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc new file mode 100644 index 000000000..7393c3274 --- /dev/null +++ b/data/layouts/MauvilleCity_GameCorner/layout.inc @@ -0,0 +1,14 @@ +MauvilleCity_GameCorner_MapBorder:: @ 82D1024 + .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" + +MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C + .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" + + .align 2 +MauvilleCity_GameCorner_Layout:: @ 82D1210 + .4byte 0x16 + .4byte 0xb + .4byte MauvilleCity_GameCorner_MapBorder + .4byte MauvilleCity_GameCorner_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MauvilleGameCorner diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/layouts/MauvilleCity_GameCorner/map.bin index ce3f9bf73..ce3f9bf73 100644 --- a/data/maps/MauvilleCity_GameCorner/map.bin +++ b/data/layouts/MauvilleCity_GameCorner/map.bin diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/layouts/MauvilleCity_Gym/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MauvilleCity_Gym/border.bin +++ b/data/layouts/MauvilleCity_Gym/border.bin diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc new file mode 100644 index 000000000..9e8004009 --- /dev/null +++ b/data/layouts/MauvilleCity_Gym/layout.inc @@ -0,0 +1,14 @@ +MauvilleCity_Gym_MapBorder:: @ 82D0D68 + .incbin "data/layouts/MauvilleCity_Gym/border.bin" + +MauvilleCity_Gym_MapBlockdata:: @ 82D0D70 + .incbin "data/layouts/MauvilleCity_Gym/map.bin" + + .align 2 +MauvilleCity_Gym_Layout:: @ 82D0F14 + .4byte 0xa + .4byte 0x15 + .4byte MauvilleCity_Gym_MapBorder + .4byte MauvilleCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MauvilleGym diff --git a/data/maps/MauvilleCity_Gym/map.bin b/data/layouts/MauvilleCity_Gym/map.bin index 73847264c..73847264c 100644 --- a/data/maps/MauvilleCity_Gym/map.bin +++ b/data/layouts/MauvilleCity_Gym/map.bin diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/layouts/MeteorFalls_1F_1R/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MeteorFalls_B1F_2R/border.bin +++ b/data/layouts/MeteorFalls_1F_1R/border.bin diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc new file mode 100644 index 000000000..131e63ec0 --- /dev/null +++ b/data/layouts/MeteorFalls_1F_1R/layout.inc @@ -0,0 +1,14 @@ +MeteorFalls_1F_1R_MapBorder:: @ 82D565C + .incbin "data/layouts/MeteorFalls_1F_1R/border.bin" + +MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664 + .incbin "data/layouts/MeteorFalls_1F_1R/map.bin" + + .align 2 +MeteorFalls_1F_1R_Layout:: @ 82D603C + .4byte 0x1e + .4byte 0x2a + .4byte MeteorFalls_1F_1R_MapBorder + .4byte MeteorFalls_1F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/layouts/MeteorFalls_1F_1R/map.bin index bcfb05fd2..bcfb05fd2 100644 --- a/data/maps/MeteorFalls_1F_1R/map.bin +++ b/data/layouts/MeteorFalls_1F_1R/map.bin diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/layouts/MeteorFalls_1F_2R/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin +++ b/data/layouts/MeteorFalls_1F_2R/border.bin diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc new file mode 100644 index 000000000..aacce1de4 --- /dev/null +++ b/data/layouts/MeteorFalls_1F_2R/layout.inc @@ -0,0 +1,14 @@ +MeteorFalls_1F_2R_MapBorder:: @ 82D6054 + .incbin "data/layouts/MeteorFalls_1F_2R/border.bin" + +MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C + .incbin "data/layouts/MeteorFalls_1F_2R/map.bin" + + .align 2 +MeteorFalls_1F_2R_Layout:: @ 82D67DC + .4byte 0x1e + .4byte 0x20 + .4byte MeteorFalls_1F_2R_MapBorder + .4byte MeteorFalls_1F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/layouts/MeteorFalls_1F_2R/map.bin index cea93a39b..cea93a39b 100644 --- a/data/maps/MeteorFalls_1F_2R/map.bin +++ b/data/layouts/MeteorFalls_1F_2R/map.bin diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/layouts/MeteorFalls_B1F_1R/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin +++ b/data/layouts/MeteorFalls_B1F_1R/border.bin diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc new file mode 100644 index 000000000..e5aef8279 --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc @@ -0,0 +1,14 @@ +MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4 + .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin" + +MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC + .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin" + + .align 2 +MeteorFalls_B1F_1R_Layout:: @ 82D7098 + .4byte 0x1d + .4byte 0x26 + .4byte MeteorFalls_B1F_1R_MapBorder + .4byte MeteorFalls_B1F_1R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/layouts/MeteorFalls_B1F_1R/map.bin index a37afdb17..a37afdb17 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.bin +++ b/data/layouts/MeteorFalls_B1F_1R/map.bin diff --git a/data/maps/MtPyre_1F/border.bin b/data/layouts/MeteorFalls_B1F_2R/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_1F/border.bin +++ b/data/layouts/MeteorFalls_B1F_2R/border.bin diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc new file mode 100644 index 000000000..8d6f7041a --- /dev/null +++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc @@ -0,0 +1,14 @@ +MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0 + .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin" + +MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8 + .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin" + + .align 2 +MeteorFalls_B1F_2R_Layout:: @ 82D7244 + .4byte 0xb + .4byte 0x12 + .4byte MeteorFalls_B1F_2R_MapBorder + .4byte MeteorFalls_B1F_2R_MapBlockdata + .4byte gTileset_General + .4byte gTileset_MeteorFalls diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/layouts/MeteorFalls_B1F_2R/map.bin index 5f4497752..5f4497752 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.bin +++ b/data/layouts/MeteorFalls_B1F_2R/map.bin diff --git a/data/maps/MossdeepCity/border.bin b/data/layouts/MossdeepCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/MossdeepCity/border.bin +++ b/data/layouts/MossdeepCity/border.bin diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc new file mode 100644 index 000000000..33ebb078e --- /dev/null +++ b/data/layouts/MossdeepCity/layout.inc @@ -0,0 +1,14 @@ +MossdeepCity_MapBorder:: @ 828C52C + .incbin "data/layouts/MossdeepCity/border.bin" + +MossdeepCity_MapBlockdata:: @ 828C534 + .incbin "data/layouts/MossdeepCity/map.bin" + + .align 2 +MossdeepCity_Layout:: @ 828DE34 + .4byte 0x50 + .4byte 0x28 + .4byte MossdeepCity_MapBorder + .4byte MossdeepCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/maps/MossdeepCity/map.bin b/data/layouts/MossdeepCity/map.bin Binary files differindex 29b167286..29b167286 100644 --- a/data/maps/MossdeepCity/map.bin +++ b/data/layouts/MossdeepCity/map.bin diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/layouts/MossdeepCity_GameCorner_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/border.bin +++ b/data/layouts/MossdeepCity_GameCorner_1F/border.bin diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc new file mode 100644 index 000000000..c569215c5 --- /dev/null +++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc @@ -0,0 +1,14 @@ +MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80 + .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin" + +MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88 + .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin" + + .align 2 +MossdeepCity_GameCorner_1F_Layout:: @ 82FEB38 + .4byte 0xb + .4byte 0x8 + .4byte MossdeepCity_GameCorner_1F_MapBorder + .4byte MossdeepCity_GameCorner_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/layouts/MossdeepCity_GameCorner_1F/map.bin index bad63f412..bad63f412 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.bin +++ b/data/layouts/MossdeepCity_GameCorner_1F/map.bin diff --git a/data/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/border.bin +++ b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc new file mode 100644 index 000000000..1ab9e6129 --- /dev/null +++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc @@ -0,0 +1,14 @@ +MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50 + .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin" + +MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58 + .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" + + .align 2 +MossdeepCity_GameCorner_B1F_Layout:: @ 82FEC30 + .4byte 0xc + .4byte 0x9 + .4byte MossdeepCity_GameCorner_B1F_MapBorder + .4byte MossdeepCity_GameCorner_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin index 399d05705..399d05705 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.bin +++ b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/layouts/MossdeepCity_Gym/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/MossdeepCity_Gym/border.bin +++ b/data/layouts/MossdeepCity_Gym/border.bin diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc new file mode 100644 index 000000000..0d999df58 --- /dev/null +++ b/data/layouts/MossdeepCity_Gym/layout.inc @@ -0,0 +1,14 @@ +MossdeepCity_Gym_MapBorder:: @ 82D36C0 + .incbin "data/layouts/MossdeepCity_Gym/border.bin" + +MossdeepCity_Gym_MapBlockdata:: @ 82D36C8 + .incbin "data/layouts/MossdeepCity_Gym/map.bin" + + .align 2 +MossdeepCity_Gym_Layout:: @ 82D3B78 + .4byte 0x14 + .4byte 0x1e + .4byte MossdeepCity_Gym_MapBorder + .4byte MossdeepCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_MossdeepGym diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/layouts/MossdeepCity_Gym/map.bin index cd6eb09f9..cd6eb09f9 100644 --- a/data/maps/MossdeepCity_Gym/map.bin +++ b/data/layouts/MossdeepCity_Gym/map.bin diff --git a/data/maps/MtPyre_2F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_2F/border.bin +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc new file mode 100644 index 000000000..97248346a --- /dev/null +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc @@ -0,0 +1,14 @@ +MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138 + .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin" + +MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140 + .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" + + .align 2 +MossdeepCity_SpaceCenter_1F_Layout:: @ 82F6280 + .4byte 0x10 + .4byte 0xa + .4byte MossdeepCity_SpaceCenter_1F_MapBorder + .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin Binary files differindex 44f5081b9..44f5081b9 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin diff --git a/data/maps/MtPyre_3F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_3F/border.bin +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc new file mode 100644 index 000000000..46c85be57 --- /dev/null +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc @@ -0,0 +1,14 @@ +MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298 + .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin" + +MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0 + .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" + + .align 2 +MossdeepCity_SpaceCenter_2F_Layout:: @ 82F63E0 + .4byte 0x10 + .4byte 0xa + .4byte MossdeepCity_SpaceCenter_2F_MapBorder + .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin Binary files differindex d2e52d780..d2e52d780 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/layouts/MossdeepCity_StevensHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/MossdeepCity_StevensHouse/border.bin +++ b/data/layouts/MossdeepCity_StevensHouse/border.bin diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc new file mode 100644 index 000000000..ec6c7cc3e --- /dev/null +++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc @@ -0,0 +1,14 @@ +MossdeepCity_StevensHouse_MapBorder:: @ 83041CC + .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" + +MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4 + .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" + + .align 2 +MossdeepCity_StevensHouse_Layout:: @ 8304284 + .4byte 0xb + .4byte 0x8 + .4byte MossdeepCity_StevensHouse_MapBorder + .4byte MossdeepCity_StevensHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/layouts/MossdeepCity_StevensHouse/map.bin index ade25497a..ade25497a 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.bin +++ b/data/layouts/MossdeepCity_StevensHouse/map.bin diff --git a/data/maps/MtChimney/border.bin b/data/layouts/MtChimney/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/MtChimney/border.bin +++ b/data/layouts/MtChimney/border.bin diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc new file mode 100644 index 000000000..ca97f1797 --- /dev/null +++ b/data/layouts/MtChimney/layout.inc @@ -0,0 +1,14 @@ +MtChimney_MapBorder:: @ 82DA25C + .incbin "data/layouts/MtChimney/border.bin" + +MtChimney_MapBlockdata:: @ 82DA264 + .incbin "data/layouts/MtChimney/map.bin" + + .align 2 +MtChimney_Layout:: @ 82DB114 + .4byte 0x28 + .4byte 0x2f + .4byte MtChimney_MapBorder + .4byte MtChimney_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/MtChimney/map.bin b/data/layouts/MtChimney/map.bin index 09eb5a906..09eb5a906 100644 --- a/data/maps/MtChimney/map.bin +++ b/data/layouts/MtChimney/map.bin diff --git a/data/maps/MtPyre_4F/border.bin b/data/layouts/MtPyre_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_4F/border.bin +++ b/data/layouts/MtPyre_1F/border.bin diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc new file mode 100644 index 000000000..c39f56fa2 --- /dev/null +++ b/data/layouts/MtPyre_1F/layout.inc @@ -0,0 +1,14 @@ +MtPyre_1F_MapBorder:: @ 82DB12C + .incbin "data/layouts/MtPyre_1F/border.bin" + +MtPyre_1F_MapBlockdata:: @ 82DB134 + .incbin "data/layouts/MtPyre_1F/map.bin" + + .align 2 +MtPyre_1F_Layout:: @ 82DB478 + .4byte 0x16 + .4byte 0x13 + .4byte MtPyre_1F_MapBorder + .4byte MtPyre_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_1F/map.bin b/data/layouts/MtPyre_1F/map.bin index 60b992a73..60b992a73 100644 --- a/data/maps/MtPyre_1F/map.bin +++ b/data/layouts/MtPyre_1F/map.bin diff --git a/data/maps/MtPyre_5F/border.bin b/data/layouts/MtPyre_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_5F/border.bin +++ b/data/layouts/MtPyre_2F/border.bin diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc new file mode 100644 index 000000000..8b68101c9 --- /dev/null +++ b/data/layouts/MtPyre_2F/layout.inc @@ -0,0 +1,14 @@ +MtPyre_2F_MapBorder:: @ 82DB490 + .incbin "data/layouts/MtPyre_2F/border.bin" + +MtPyre_2F_MapBlockdata:: @ 82DB498 + .incbin "data/layouts/MtPyre_2F/map.bin" + + .align 2 +MtPyre_2F_Layout:: @ 82DB5EC + .4byte 0xd + .4byte 0xd + .4byte MtPyre_2F_MapBorder + .4byte MtPyre_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_2F/map.bin b/data/layouts/MtPyre_2F/map.bin index 628d2262e..628d2262e 100644 --- a/data/maps/MtPyre_2F/map.bin +++ b/data/layouts/MtPyre_2F/map.bin diff --git a/data/maps/MtPyre_6F/border.bin b/data/layouts/MtPyre_3F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/MtPyre_6F/border.bin +++ b/data/layouts/MtPyre_3F/border.bin diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc new file mode 100644 index 000000000..459fae9e7 --- /dev/null +++ b/data/layouts/MtPyre_3F/layout.inc @@ -0,0 +1,14 @@ +MtPyre_3F_MapBorder:: @ 82DB604 + .incbin "data/layouts/MtPyre_3F/border.bin" + +MtPyre_3F_MapBlockdata:: @ 82DB60C + .incbin "data/layouts/MtPyre_3F/map.bin" + + .align 2 +MtPyre_3F_Layout:: @ 82DB760 + .4byte 0xd + .4byte 0xd + .4byte MtPyre_3F_MapBorder + .4byte MtPyre_3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_3F/map.bin b/data/layouts/MtPyre_3F/map.bin index fabbe8cb3..fabbe8cb3 100644 --- a/data/maps/MtPyre_3F/map.bin +++ b/data/layouts/MtPyre_3F/map.bin diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/layouts/MtPyre_4F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/border.bin +++ b/data/layouts/MtPyre_4F/border.bin diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc new file mode 100644 index 000000000..97363cb82 --- /dev/null +++ b/data/layouts/MtPyre_4F/layout.inc @@ -0,0 +1,14 @@ +MtPyre_4F_MapBorder:: @ 82DB778 + .incbin "data/layouts/MtPyre_4F/border.bin" + +MtPyre_4F_MapBlockdata:: @ 82DB780 + .incbin "data/layouts/MtPyre_4F/map.bin" + + .align 2 +MtPyre_4F_Layout:: @ 82DB8D4 + .4byte 0xd + .4byte 0xd + .4byte MtPyre_4F_MapBorder + .4byte MtPyre_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_4F/map.bin b/data/layouts/MtPyre_4F/map.bin index 98dc679ff..98dc679ff 100644 --- a/data/maps/MtPyre_4F/map.bin +++ b/data/layouts/MtPyre_4F/map.bin diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/layouts/MtPyre_5F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin +++ b/data/layouts/MtPyre_5F/border.bin diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc new file mode 100644 index 000000000..252899515 --- /dev/null +++ b/data/layouts/MtPyre_5F/layout.inc @@ -0,0 +1,14 @@ +MtPyre_5F_MapBorder:: @ 82DB8EC + .incbin "data/layouts/MtPyre_5F/border.bin" + +MtPyre_5F_MapBlockdata:: @ 82DB8F4 + .incbin "data/layouts/MtPyre_5F/map.bin" + + .align 2 +MtPyre_5F_Layout:: @ 82DBA48 + .4byte 0xd + .4byte 0xd + .4byte MtPyre_5F_MapBorder + .4byte MtPyre_5F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_5F/map.bin b/data/layouts/MtPyre_5F/map.bin index 12fbeeb7e..12fbeeb7e 100644 --- a/data/maps/MtPyre_5F/map.bin +++ b/data/layouts/MtPyre_5F/map.bin diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/layouts/MtPyre_6F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/PacifidlogTown_House1/border.bin +++ b/data/layouts/MtPyre_6F/border.bin diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc new file mode 100644 index 000000000..46c419157 --- /dev/null +++ b/data/layouts/MtPyre_6F/layout.inc @@ -0,0 +1,14 @@ +MtPyre_6F_MapBorder:: @ 82DBA60 + .incbin "data/layouts/MtPyre_6F/border.bin" + +MtPyre_6F_MapBlockdata:: @ 82DBA68 + .incbin "data/layouts/MtPyre_6F/map.bin" + + .align 2 +MtPyre_6F_Layout:: @ 82DBBBC + .4byte 0xd + .4byte 0xd + .4byte MtPyre_6F_MapBorder + .4byte MtPyre_6F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_6F/map.bin b/data/layouts/MtPyre_6F/map.bin index 54f599ec2..54f599ec2 100644 --- a/data/maps/MtPyre_6F/map.bin +++ b/data/layouts/MtPyre_6F/map.bin diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/layouts/MtPyre_Exterior/border.bin Binary files differindex 1d7df4a00..1d7df4a00 100644 --- a/data/maps/MtPyre_Exterior/border.bin +++ b/data/layouts/MtPyre_Exterior/border.bin diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc new file mode 100644 index 000000000..09cfeaecf --- /dev/null +++ b/data/layouts/MtPyre_Exterior/layout.inc @@ -0,0 +1,14 @@ +MtPyre_Exterior_MapBorder:: @ 82FC8C0 + .incbin "data/layouts/MtPyre_Exterior/border.bin" + +MtPyre_Exterior_MapBlockdata:: @ 82FC8C8 + .incbin "data/layouts/MtPyre_Exterior/map.bin" + + .align 2 +MtPyre_Exterior_Layout:: @ 82FD7EC + .4byte 0x26 + .4byte 0x33 + .4byte MtPyre_Exterior_MapBorder + .4byte MtPyre_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_Exterior/map.bin b/data/layouts/MtPyre_Exterior/map.bin Binary files differindex 7ab1e0461..7ab1e0461 100644 --- a/data/maps/MtPyre_Exterior/map.bin +++ b/data/layouts/MtPyre_Exterior/map.bin diff --git a/data/maps/MtPyre_Summit/border.bin b/data/layouts/MtPyre_Summit/border.bin Binary files differindex 1d7df4a00..1d7df4a00 100644 --- a/data/maps/MtPyre_Summit/border.bin +++ b/data/layouts/MtPyre_Summit/border.bin diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc new file mode 100644 index 000000000..b587bdee8 --- /dev/null +++ b/data/layouts/MtPyre_Summit/layout.inc @@ -0,0 +1,14 @@ +MtPyre_Summit_MapBorder:: @ 82FD804 + .incbin "data/layouts/MtPyre_Summit/border.bin" + +MtPyre_Summit_MapBlockdata:: @ 82FD80C + .incbin "data/layouts/MtPyre_Summit/map.bin" + + .align 2 +MtPyre_Summit_Layout:: @ 82FE680 + .4byte 0x32 + .4byte 0x25 + .4byte MtPyre_Summit_MapBorder + .4byte MtPyre_Summit_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/MtPyre_Summit/map.bin b/data/layouts/MtPyre_Summit/map.bin Binary files differindex 1de8bd5ea..1de8bd5ea 100644 --- a/data/maps/MtPyre_Summit/map.bin +++ b/data/layouts/MtPyre_Summit/map.bin diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/layouts/NewMauville_Entrance/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/maps/NewMauville_Entrance/border.bin +++ b/data/layouts/NewMauville_Entrance/border.bin diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc new file mode 100644 index 000000000..f86a45691 --- /dev/null +++ b/data/layouts/NewMauville_Entrance/layout.inc @@ -0,0 +1,14 @@ +NewMauville_Entrance_MapBorder:: @ 82E57B4 + .incbin "data/layouts/NewMauville_Entrance/border.bin" + +NewMauville_Entrance_MapBlockdata:: @ 82E57BC + .incbin "data/layouts/NewMauville_Entrance/map.bin" + + .align 2 +NewMauville_Entrance_Layout:: @ 82E5860 + .4byte 0x9 + .4byte 0x9 + .4byte NewMauville_Entrance_MapBorder + .4byte NewMauville_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/layouts/NewMauville_Entrance/map.bin index 1e3f471e8..1e3f471e8 100644 --- a/data/maps/NewMauville_Entrance/map.bin +++ b/data/layouts/NewMauville_Entrance/map.bin diff --git a/data/maps/NewMauville_Inside/border.bin b/data/layouts/NewMauville_Inside/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/NewMauville_Inside/border.bin +++ b/data/layouts/NewMauville_Inside/border.bin diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc new file mode 100644 index 000000000..25aa29e7d --- /dev/null +++ b/data/layouts/NewMauville_Inside/layout.inc @@ -0,0 +1,14 @@ +NewMauville_Inside_MapBorder:: @ 82E5878 + .incbin "data/layouts/NewMauville_Inside/border.bin" + +NewMauville_Inside_MapBlockdata:: @ 82E5880 + .incbin "data/layouts/NewMauville_Inside/map.bin" + + .align 2 +NewMauville_Inside_Layout:: @ 82E65A4 + .4byte 0x29 + .4byte 0x29 + .4byte NewMauville_Inside_MapBorder + .4byte NewMauville_Inside_MapBlockdata + .4byte gTileset_General + .4byte gTileset_BikeShop diff --git a/data/maps/NewMauville_Inside/map.bin b/data/layouts/NewMauville_Inside/map.bin index 78d1e39ce..78d1e39ce 100644 --- a/data/maps/NewMauville_Inside/map.bin +++ b/data/layouts/NewMauville_Inside/map.bin diff --git a/data/maps/OldaleTown/border.bin b/data/layouts/OldaleTown/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/OldaleTown/border.bin +++ b/data/layouts/OldaleTown/border.bin diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc new file mode 100644 index 000000000..621c4bd0d --- /dev/null +++ b/data/layouts/OldaleTown/layout.inc @@ -0,0 +1,14 @@ +OldaleTown_MapBorder:: @ 82916EC + .incbin "data/layouts/OldaleTown/border.bin" + +OldaleTown_MapBlockdata:: @ 82916F4 + .incbin "data/layouts/OldaleTown/map.bin" + + .align 2 +OldaleTown_Layout:: @ 8291A14 + .4byte 0x14 + .4byte 0x14 + .4byte OldaleTown_MapBorder + .4byte OldaleTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin index e6ff2362e..e6ff2362e 100644 --- a/data/maps/OldaleTown/map.bin +++ b/data/layouts/OldaleTown/map.bin diff --git a/data/maps/PacifidlogTown/border.bin b/data/layouts/PacifidlogTown/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/PacifidlogTown/border.bin +++ b/data/layouts/PacifidlogTown/border.bin diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc new file mode 100644 index 000000000..c2be2f4cf --- /dev/null +++ b/data/layouts/PacifidlogTown/layout.inc @@ -0,0 +1,14 @@ +PacifidlogTown_MapBorder:: @ 829272C + .incbin "data/layouts/PacifidlogTown/border.bin" + +PacifidlogTown_MapBlockdata:: @ 8292734 + .incbin "data/layouts/PacifidlogTown/map.bin" + + .align 2 +PacifidlogTown_Layout:: @ 8292D74 + .4byte 0x14 + .4byte 0x28 + .4byte PacifidlogTown_MapBorder + .4byte PacifidlogTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/PacifidlogTown/map.bin b/data/layouts/PacifidlogTown/map.bin index 02c1454bb..02c1454bb 100644 --- a/data/maps/PacifidlogTown/map.bin +++ b/data/layouts/PacifidlogTown/map.bin diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/PacifidlogTown_House2/border.bin +++ b/data/layouts/PacifidlogTown_House1/border.bin diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc new file mode 100644 index 000000000..b09e191ca --- /dev/null +++ b/data/layouts/PacifidlogTown_House1/layout.inc @@ -0,0 +1,14 @@ +PacifidlogTown_House1_MapBorder:: @ 82CF6AC + .incbin "data/layouts/PacifidlogTown_House1/border.bin" + +PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4 + .incbin "data/layouts/PacifidlogTown_House1/map.bin" + + .align 2 +PacifidlogTown_House1_Layout:: @ 82CF768 + .4byte 0xa + .4byte 0x9 + .4byte PacifidlogTown_House1_MapBorder + .4byte PacifidlogTown_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/layouts/PacifidlogTown_House1/map.bin index 7865fdc7c..7865fdc7c 100644 --- a/data/maps/PacifidlogTown_House1/map.bin +++ b/data/layouts/PacifidlogTown_House1/map.bin diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/PetalburgCity_House2/border.bin +++ b/data/layouts/PacifidlogTown_House2/border.bin diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc new file mode 100644 index 000000000..ecb3d28f0 --- /dev/null +++ b/data/layouts/PacifidlogTown_House2/layout.inc @@ -0,0 +1,14 @@ +PacifidlogTown_House2_MapBorder:: @ 82CF780 + .incbin "data/layouts/PacifidlogTown_House2/border.bin" + +PacifidlogTown_House2_MapBlockdata:: @ 82CF788 + .incbin "data/layouts/PacifidlogTown_House2/map.bin" + + .align 2 +PacifidlogTown_House2_Layout:: @ 82CF83C + .4byte 0xa + .4byte 0x9 + .4byte PacifidlogTown_House2_MapBorder + .4byte PacifidlogTown_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/layouts/PacifidlogTown_House2/map.bin index 617346322..617346322 100644 --- a/data/maps/PacifidlogTown_House2/map.bin +++ b/data/layouts/PacifidlogTown_House2/map.bin diff --git a/data/maps/PetalburgCity/border.bin b/data/layouts/PetalburgCity/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/PetalburgCity/border.bin +++ b/data/layouts/PetalburgCity/border.bin diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc new file mode 100644 index 000000000..76cb0186f --- /dev/null +++ b/data/layouts/PetalburgCity/layout.inc @@ -0,0 +1,14 @@ +PetalburgCity_MapBorder:: @ 8287264 + .incbin "data/layouts/PetalburgCity/border.bin" + +PetalburgCity_MapBlockdata:: @ 828726C + .incbin "data/layouts/PetalburgCity/map.bin" + + .align 2 +PetalburgCity_Layout:: @ 8287974 + .4byte 0x1e + .4byte 0x1e + .4byte PetalburgCity_MapBorder + .4byte PetalburgCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin index 35f0172ca..35f0172ca 100644 --- a/data/maps/PetalburgCity/map.bin +++ b/data/layouts/PetalburgCity/map.bin diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/layouts/PetalburgCity_Gym/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/PetalburgCity_Gym/border.bin +++ b/data/layouts/PetalburgCity_Gym/border.bin diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc new file mode 100644 index 000000000..9e5eb5509 --- /dev/null +++ b/data/layouts/PetalburgCity_Gym/layout.inc @@ -0,0 +1,14 @@ +PetalburgCity_Gym_MapBorder:: @ 82CF854 + .incbin "data/layouts/PetalburgCity_Gym/border.bin" + +PetalburgCity_Gym_MapBlockdata:: @ 82CF85C + .incbin "data/layouts/PetalburgCity_Gym/map.bin" + + .align 2 +PetalburgCity_Gym_Layout:: @ 82D003C + .4byte 0x9 + .4byte 0x70 + .4byte PetalburgCity_Gym_MapBorder + .4byte PetalburgCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PetalburgGym diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/layouts/PetalburgCity_Gym/map.bin index 665783c7b..665783c7b 100644 --- a/data/maps/PetalburgCity_Gym/map.bin +++ b/data/layouts/PetalburgCity_Gym/map.bin diff --git a/data/maps/PetalburgWoods/border.bin b/data/layouts/PetalburgWoods/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/PetalburgWoods/border.bin +++ b/data/layouts/PetalburgWoods/border.bin diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc new file mode 100644 index 000000000..47192ac1a --- /dev/null +++ b/data/layouts/PetalburgWoods/layout.inc @@ -0,0 +1,14 @@ +PetalburgWoods_MapBorder:: @ 82D91BC + .incbin "data/layouts/PetalburgWoods/border.bin" + +PetalburgWoods_MapBlockdata:: @ 82D91C4 + .incbin "data/layouts/PetalburgWoods/map.bin" + + .align 2 +PetalburgWoods_Layout:: @ 82DA244 + .4byte 0x30 + .4byte 0x2c + .4byte PetalburgWoods_MapBorder + .4byte PetalburgWoods_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin index a032b4c43..a032b4c43 100644 --- a/data/maps/PetalburgWoods/map.bin +++ b/data/layouts/PetalburgWoods/map.bin diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/layouts/PokeMart/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/OldaleTown_Mart/border.bin +++ b/data/layouts/PokeMart/border.bin diff --git a/data/layouts/PokeMart/layout.inc b/data/layouts/PokeMart/layout.inc new file mode 100644 index 000000000..830d398ac --- /dev/null +++ b/data/layouts/PokeMart/layout.inc @@ -0,0 +1,14 @@ +PokeMart_MapBorder:: @ 82CE29C + .incbin "data/layouts/PokeMart/border.bin" + +PokeMart_MapBlockdata:: @ 82CE2A4 + .incbin "data/layouts/PokeMart/map.bin" + + .align 2 +PokeMart_Layout:: @ 82CE354 + .4byte 0xb + .4byte 0x8 + .4byte PokeMart_MapBorder + .4byte PokeMart_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/layouts/PokeMart/map.bin index 73d90bf31..73d90bf31 100644 --- a/data/maps/OldaleTown_Mart/map.bin +++ b/data/layouts/PokeMart/map.bin diff --git a/data/maps/RecordCorner/border.bin b/data/layouts/PokemonCenter_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RecordCorner/border.bin +++ b/data/layouts/PokemonCenter_1F/border.bin diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc new file mode 100644 index 000000000..a4d067758 --- /dev/null +++ b/data/layouts/PokemonCenter_1F/layout.inc @@ -0,0 +1,14 @@ +PokemonCenter_1F_MapBorder:: @ 82CE064 + .incbin "data/layouts/PokemonCenter_1F/border.bin" + +PokemonCenter_1F_MapBlockdata:: @ 82CE06C + .incbin "data/layouts/PokemonCenter_1F/map.bin" + + .align 2 +PokemonCenter_1F_Layout:: @ 82CE168 + .4byte 0xe + .4byte 0x9 + .4byte PokemonCenter_1F_MapBorder + .4byte PokemonCenter_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F/map.bin index 5201dde15..5201dde15 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.bin +++ b/data/layouts/PokemonCenter_1F/map.bin diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/layouts/PokemonCenter_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route104_MrBrineysHouse/border.bin +++ b/data/layouts/PokemonCenter_2F/border.bin diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc new file mode 100644 index 000000000..033580519 --- /dev/null +++ b/data/layouts/PokemonCenter_2F/layout.inc @@ -0,0 +1,14 @@ +PokemonCenter_2F_MapBorder:: @ 82CE180 + .incbin "data/layouts/PokemonCenter_2F/border.bin" + +PokemonCenter_2F_MapBlockdata:: @ 82CE188 + .incbin "data/layouts/PokemonCenter_2F/map.bin" + + .align 2 +PokemonCenter_2F_Layout:: @ 82CE284 + .4byte 0xe + .4byte 0x9 + .4byte PokemonCenter_2F_MapBorder + .4byte PokemonCenter_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonCenter diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F/map.bin index 40cf9afd7..40cf9afd7 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin +++ b/data/layouts/PokemonCenter_2F/map.bin diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/layouts/RecordCorner/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route110_TrickHouseCorridor/border.bin +++ b/data/layouts/RecordCorner/border.bin diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc new file mode 100644 index 000000000..9252de7db --- /dev/null +++ b/data/layouts/RecordCorner/layout.inc @@ -0,0 +1,14 @@ +RecordCorner_MapBorder:: @ 82E9460 + .incbin "data/layouts/RecordCorner/border.bin" + +RecordCorner_MapBlockdata:: @ 82E9468 + .incbin "data/layouts/RecordCorner/map.bin" + + .align 2 +RecordCorner_Layout:: @ 82E95F8 + .4byte 0x14 + .4byte 0xa + .4byte RecordCorner_MapBorder + .4byte RecordCorner_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/RecordCorner/map.bin b/data/layouts/RecordCorner/map.bin index 51dfb6e5a..51dfb6e5a 100644 --- a/data/maps/RecordCorner/map.bin +++ b/data/layouts/RecordCorner/map.bin diff --git a/data/maps/Route101/border.bin b/data/layouts/Route101/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route101/border.bin +++ b/data/layouts/Route101/border.bin diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc new file mode 100644 index 000000000..276a580b0 --- /dev/null +++ b/data/layouts/Route101/layout.inc @@ -0,0 +1,14 @@ +Route101_MapBorder:: @ 8292D8C + .incbin "data/layouts/Route101/border.bin" + +Route101_MapBlockdata:: @ 8292D94 + .incbin "data/layouts/Route101/map.bin" + + .align 2 +Route101_Layout:: @ 82930B4 + .4byte 0x14 + .4byte 0x14 + .4byte Route101_MapBorder + .4byte Route101_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/Route101/map.bin b/data/layouts/Route101/map.bin index fab3a1d69..fab3a1d69 100644 --- a/data/maps/Route101/map.bin +++ b/data/layouts/Route101/map.bin diff --git a/data/maps/Route102/border.bin b/data/layouts/Route102/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route102/border.bin +++ b/data/layouts/Route102/border.bin diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc new file mode 100644 index 000000000..c2e36ea4e --- /dev/null +++ b/data/layouts/Route102/layout.inc @@ -0,0 +1,14 @@ +Route102_MapBorder:: @ 82930CC + .incbin "data/layouts/Route102/border.bin" + +Route102_MapBlockdata:: @ 82930D4 + .incbin "data/layouts/Route102/map.bin" + + .align 2 +Route102_Layout:: @ 82938A4 + .4byte 0x32 + .4byte 0x14 + .4byte Route102_MapBorder + .4byte Route102_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/Route102/map.bin b/data/layouts/Route102/map.bin index 7378bb44b..7378bb44b 100644 --- a/data/maps/Route102/map.bin +++ b/data/layouts/Route102/map.bin diff --git a/data/maps/Route103/border.bin b/data/layouts/Route103/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route103/border.bin +++ b/data/layouts/Route103/border.bin diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc new file mode 100644 index 000000000..15d321a66 --- /dev/null +++ b/data/layouts/Route103/layout.inc @@ -0,0 +1,14 @@ +Route103_MapBorder:: @ 82938BC + .incbin "data/layouts/Route103/border.bin" + +Route103_MapBlockdata:: @ 82938C4 + .incbin "data/layouts/Route103/map.bin" + + .align 2 +Route103_Layout:: @ 8294544 + .4byte 0x50 + .4byte 0x14 + .4byte Route103_MapBorder + .4byte Route103_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Petalburg diff --git a/data/maps/Route103/map.bin b/data/layouts/Route103/map.bin index 6c5205b4c..6c5205b4c 100644 --- a/data/maps/Route103/map.bin +++ b/data/layouts/Route103/map.bin diff --git a/data/maps/Route104/border.bin b/data/layouts/Route104/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route104/border.bin +++ b/data/layouts/Route104/border.bin diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc new file mode 100644 index 000000000..c6f807405 --- /dev/null +++ b/data/layouts/Route104/layout.inc @@ -0,0 +1,14 @@ +Route104_MapBorder:: @ 829455C + .incbin "data/layouts/Route104/border.bin" + +Route104_MapBlockdata:: @ 8294564 + .incbin "data/layouts/Route104/map.bin" + + .align 2 +Route104_Layout:: @ 8295E64 + .4byte 0x28 + .4byte 0x50 + .4byte Route104_MapBorder + .4byte Route104_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/Route104/map.bin b/data/layouts/Route104/map.bin Binary files differindex 7731bc31c..7731bc31c 100644 --- a/data/maps/Route104/map.bin +++ b/data/layouts/Route104/map.bin diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/layouts/Route104_MrBrineysHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route110_TrickHouseEnd/border.bin +++ b/data/layouts/Route104_MrBrineysHouse/border.bin diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc new file mode 100644 index 000000000..c265b931d --- /dev/null +++ b/data/layouts/Route104_MrBrineysHouse/layout.inc @@ -0,0 +1,14 @@ +Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC + .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" + +Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4 + .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" + + .align 2 +Route104_MrBrineysHouse_Layout:: @ 82D20BC + .4byte 0xc + .4byte 0x9 + .4byte Route104_MrBrineysHouse_MapBorder + .4byte Route104_MrBrineysHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/layouts/Route104_MrBrineysHouse/map.bin index 7660fd5d7..7660fd5d7 100644 --- a/data/maps/Route104_MrBrineysHouse/map.bin +++ b/data/layouts/Route104_MrBrineysHouse/map.bin diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/border.bin +++ b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc new file mode 100644 index 000000000..35012e71b --- /dev/null +++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc @@ -0,0 +1,14 @@ +Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C + .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" + +Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4 + .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" + + .align 2 +Route104_PrettyPetalFlowerShop_Layout:: @ 82D4CB4 + .4byte 0xf + .4byte 0x9 + .4byte Route104_PrettyPetalFlowerShop_MapBorder + .4byte Route104_PrettyPetalFlowerShop_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PrettyPetalFlowerShop diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.bin b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin Binary files differindex d34ff5c1a..d34ff5c1a 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.bin +++ b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin diff --git a/data/maps/Route104_Prototype/border.bin b/data/layouts/Route104_Prototype/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route104_Prototype/border.bin +++ b/data/layouts/Route104_Prototype/border.bin diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc new file mode 100644 index 000000000..9ddf033e1 --- /dev/null +++ b/data/layouts/Route104_Prototype/layout.inc @@ -0,0 +1,14 @@ +Route104_Prototype_MapBorder:: @ 82F9A58 + .incbin "data/layouts/Route104_Prototype/border.bin" + +Route104_Prototype_MapBlockdata:: @ 82F9A60 + .incbin "data/layouts/Route104_Prototype/map.bin" + + .align 2 +Route104_Prototype_Layout:: @ 82F9A64 + .4byte 0x1 + .4byte 0x1 + .4byte Route104_Prototype_MapBorder + .4byte Route104_Prototype_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/Route104_Prototype/map.bin b/data/layouts/Route104_Prototype/map.bin index 71bd63e62..71bd63e62 100644 --- a/data/maps/Route104_Prototype/map.bin +++ b/data/layouts/Route104_Prototype/map.bin diff --git a/data/maps/Route105/border.bin b/data/layouts/Route105/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route105/border.bin +++ b/data/layouts/Route105/border.bin diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc new file mode 100644 index 000000000..d918e73ff --- /dev/null +++ b/data/layouts/Route105/layout.inc @@ -0,0 +1,14 @@ +Route105_MapBorder:: @ 8295E7C + .incbin "data/layouts/Route105/border.bin" + +Route105_MapBlockdata:: @ 8295E84 + .incbin "data/layouts/Route105/map.bin" + + .align 2 +Route105_Layout:: @ 8297784 + .4byte 0x28 + .4byte 0x50 + .4byte Route105_MapBorder + .4byte Route105_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/maps/Route105/map.bin b/data/layouts/Route105/map.bin Binary files differindex 152aad670..152aad670 100644 --- a/data/maps/Route105/map.bin +++ b/data/layouts/Route105/map.bin diff --git a/data/maps/Route106/border.bin b/data/layouts/Route106/border.bin index 281762f5b..281762f5b 100644 --- a/data/maps/Route106/border.bin +++ b/data/layouts/Route106/border.bin diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc new file mode 100644 index 000000000..60ff843f3 --- /dev/null +++ b/data/layouts/Route106/layout.inc @@ -0,0 +1,14 @@ +Route106_MapBorder:: @ 829779C + .incbin "data/layouts/Route106/border.bin" + +Route106_MapBlockdata:: @ 82977A4 + .incbin "data/layouts/Route106/map.bin" + + .align 2 +Route106_Layout:: @ 8298424 + .4byte 0x50 + .4byte 0x14 + .4byte Route106_MapBorder + .4byte Route106_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/maps/Route106/map.bin b/data/layouts/Route106/map.bin Binary files differindex d65a278a4..d65a278a4 100644 --- a/data/maps/Route106/map.bin +++ b/data/layouts/Route106/map.bin diff --git a/data/maps/Route107/border.bin b/data/layouts/Route107/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route107/border.bin +++ b/data/layouts/Route107/border.bin diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc new file mode 100644 index 000000000..06b6f3020 --- /dev/null +++ b/data/layouts/Route107/layout.inc @@ -0,0 +1,14 @@ +Route107_MapBorder:: @ 829843C + .incbin "data/layouts/Route107/border.bin" + +Route107_MapBlockdata:: @ 8298444 + .incbin "data/layouts/Route107/map.bin" + + .align 2 +Route107_Layout:: @ 8298DA4 + .4byte 0x3c + .4byte 0x14 + .4byte Route107_MapBorder + .4byte Route107_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Dewford diff --git a/data/maps/Route107/map.bin b/data/layouts/Route107/map.bin Binary files differindex 521997b0f..521997b0f 100644 --- a/data/maps/Route107/map.bin +++ b/data/layouts/Route107/map.bin diff --git a/data/maps/Route108/border.bin b/data/layouts/Route108/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route108/border.bin +++ b/data/layouts/Route108/border.bin diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc new file mode 100644 index 000000000..1c4e97eec --- /dev/null +++ b/data/layouts/Route108/layout.inc @@ -0,0 +1,14 @@ +Route108_MapBorder:: @ 8298DBC + .incbin "data/layouts/Route108/border.bin" + +Route108_MapBlockdata:: @ 8298DC4 + .incbin "data/layouts/Route108/map.bin" + + .align 2 +Route108_Layout:: @ 8299724 + .4byte 0x3c + .4byte 0x14 + .4byte Route108_MapBorder + .4byte Route108_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Slateport diff --git a/data/maps/Route108/map.bin b/data/layouts/Route108/map.bin index 0a82f9924..0a82f9924 100644 --- a/data/maps/Route108/map.bin +++ b/data/layouts/Route108/map.bin diff --git a/data/maps/Route109/border.bin b/data/layouts/Route109/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route109/border.bin +++ b/data/layouts/Route109/border.bin diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc new file mode 100644 index 000000000..9ea7a20ce --- /dev/null +++ b/data/layouts/Route109/layout.inc @@ -0,0 +1,14 @@ +Route109_MapBorder:: @ 829973C + .incbin "data/layouts/Route109/border.bin" + +Route109_MapBlockdata:: @ 8299744 + .incbin "data/layouts/Route109/map.bin" + + .align 2 +Route109_Layout:: @ 829AA04 + .4byte 0x28 + .4byte 0x3c + .4byte Route109_MapBorder + .4byte Route109_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Slateport diff --git a/data/maps/Route109/map.bin b/data/layouts/Route109/map.bin Binary files differindex eb83de870..eb83de870 100644 --- a/data/maps/Route109/map.bin +++ b/data/layouts/Route109/map.bin diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/layouts/Route109_SeashoreHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route109_SeashoreHouse/border.bin +++ b/data/layouts/Route109_SeashoreHouse/border.bin diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc new file mode 100644 index 000000000..a4c1542ca --- /dev/null +++ b/data/layouts/Route109_SeashoreHouse/layout.inc @@ -0,0 +1,14 @@ +Route109_SeashoreHouse_MapBorder:: @ 82EDF48 + .incbin "data/layouts/Route109_SeashoreHouse/border.bin" + +Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50 + .incbin "data/layouts/Route109_SeashoreHouse/map.bin" + + .align 2 +Route109_SeashoreHouse_Layout:: @ 82EE07C + .4byte 0xf + .4byte 0xa + .4byte Route109_SeashoreHouse_MapBorder + .4byte Route109_SeashoreHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_SeashoreHouse diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/layouts/Route109_SeashoreHouse/map.bin index cb7853a17..cb7853a17 100644 --- a/data/maps/Route109_SeashoreHouse/map.bin +++ b/data/layouts/Route109_SeashoreHouse/map.bin diff --git a/data/maps/Route110/border.bin b/data/layouts/Route110/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route110/border.bin +++ b/data/layouts/Route110/border.bin diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc new file mode 100644 index 000000000..df2399715 --- /dev/null +++ b/data/layouts/Route110/layout.inc @@ -0,0 +1,14 @@ +Route110_MapBorder:: @ 829AA1C + .incbin "data/layouts/Route110/border.bin" + +Route110_MapBlockdata:: @ 829AA24 + .incbin "data/layouts/Route110/map.bin" + + .align 2 +Route110_Layout:: @ 829C964 + .4byte 0x28 + .4byte 0x64 + .4byte Route110_MapBorder + .4byte Route110_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/maps/Route110/map.bin b/data/layouts/Route110/map.bin Binary files differindex e10394048..e10394048 100644 --- a/data/maps/Route110/map.bin +++ b/data/layouts/Route110/map.bin diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin +++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc new file mode 100644 index 000000000..4841f1891 --- /dev/null +++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc @@ -0,0 +1,14 @@ +Route110_SeasideCyclingRoadEntrace_MapBorder:: @ 82EFB64 + .incbin "data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin" + +Route110_SeasideCyclingRoadEntrace_MapBlockdata:: @ 82EFB6C + .incbin "data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin" + + .align 2 +Route110_SeasideCyclingRoadEntrace_Layout:: @ 82EFC20 + .4byte 0xf + .4byte 0x6 + .4byte Route110_SeasideCyclingRoadEntrace_MapBorder + .4byte Route110_SeasideCyclingRoadEntrace_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin index e9fc770d4..e9fc770d4 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin +++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/layouts/Route110_TrickHouseCorridor/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route110_TrickHouseEntrance/border.bin +++ b/data/layouts/Route110_TrickHouseCorridor/border.bin diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc new file mode 100644 index 000000000..a85dd2b14 --- /dev/null +++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHouseCorridor_MapBorder:: @ 82EE254 + .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" + +Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C + .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" + + .align 2 +Route110_TrickHouseCorridor_Layout:: @ 82EE52C + .4byte 0xf + .4byte 0x18 + .4byte Route110_TrickHouseCorridor_MapBorder + .4byte Route110_TrickHouseCorridor_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/layouts/Route110_TrickHouseCorridor/map.bin index 8981d28bd..8981d28bd 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.bin +++ b/data/layouts/Route110_TrickHouseCorridor/map.bin diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/layouts/Route110_TrickHouseEnd/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route112_CableCarStation/border.bin +++ b/data/layouts/Route110_TrickHouseEnd/border.bin diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc new file mode 100644 index 000000000..d0c414069 --- /dev/null +++ b/data/layouts/Route110_TrickHouseEnd/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHouseEnd_MapBorder:: @ 82EE174 + .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" + +Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C + .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" + + .align 2 +Route110_TrickHouseEnd_Layout:: @ 82EE23C + .4byte 0xc + .4byte 0x8 + .4byte Route110_TrickHouseEnd_MapBorder + .4byte Route110_TrickHouseEnd_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/layouts/Route110_TrickHouseEnd/map.bin index 506fdb644..506fdb644 100644 --- a/data/maps/Route110_TrickHouseEnd/map.bin +++ b/data/layouts/Route110_TrickHouseEnd/map.bin diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/layouts/Route110_TrickHouseEntrance/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route114_FossilManiacsHouse/border.bin +++ b/data/layouts/Route110_TrickHouseEntrance/border.bin diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc new file mode 100644 index 000000000..6ccef43ff --- /dev/null +++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHouseEntrance_MapBorder:: @ 82EE094 + .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" + +Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C + .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" + + .align 2 +Route110_TrickHouseEntrance_Layout:: @ 82EE15C + .4byte 0xc + .4byte 0x8 + .4byte Route110_TrickHouseEntrance_MapBorder + .4byte Route110_TrickHouseEntrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/layouts/Route110_TrickHouseEntrance/map.bin index 1306bb9b5..1306bb9b5 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.bin +++ b/data/layouts/Route110_TrickHouseEntrance/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/layouts/Route110_TrickHousePuzzle1/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle1/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle1/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc new file mode 100644 index 000000000..8ad11d641 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544 + .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" + +Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C + .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" + + .align 2 +Route110_TrickHousePuzzle1_Layout:: @ 82EE7E0 + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle1_MapBorder + .4byte Route110_TrickHousePuzzle1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/layouts/Route110_TrickHousePuzzle1/map.bin index c809b7482..c809b7482 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle1/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/layouts/Route110_TrickHousePuzzle2/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle2/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle2/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc new file mode 100644 index 000000000..a7750390b --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8 + .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" + +Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800 + .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" + + .align 2 +Route110_TrickHousePuzzle2_Layout:: @ 82EEA94 + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle2_MapBorder + .4byte Route110_TrickHousePuzzle2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/layouts/Route110_TrickHousePuzzle2/map.bin index 819080ced..819080ced 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle2/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/layouts/Route110_TrickHousePuzzle3/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle3/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle3/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc new file mode 100644 index 000000000..8f49ea03a --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC + .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" + +Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4 + .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" + + .align 2 +Route110_TrickHousePuzzle3_Layout:: @ 82EED48 + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle3_MapBorder + .4byte Route110_TrickHousePuzzle3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/layouts/Route110_TrickHousePuzzle3/map.bin index 4dc43a00d..4dc43a00d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle3/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/layouts/Route110_TrickHousePuzzle4/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle4/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle4/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc new file mode 100644 index 000000000..20706bed7 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60 + .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" + +Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68 + .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" + + .align 2 +Route110_TrickHousePuzzle4_Layout:: @ 82EEFFC + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle4_MapBorder + .4byte Route110_TrickHousePuzzle4_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/layouts/Route110_TrickHousePuzzle4/map.bin index e0b8cf33f..e0b8cf33f 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle4/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/layouts/Route110_TrickHousePuzzle5/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle5/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle5/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc new file mode 100644 index 000000000..f01f23322 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014 + .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" + +Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C + .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" + + .align 2 +Route110_TrickHousePuzzle5_Layout:: @ 82EF2B0 + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle5_MapBorder + .4byte Route110_TrickHousePuzzle5_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/layouts/Route110_TrickHousePuzzle5/map.bin index a64ea34b6..a64ea34b6 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle5/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/layouts/Route110_TrickHousePuzzle6/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle6/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle6/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc new file mode 100644 index 000000000..a49bb680f --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8 + .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" + +Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0 + .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" + + .align 2 +Route110_TrickHousePuzzle6_Layout:: @ 82EF564 + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle6_MapBorder + .4byte Route110_TrickHousePuzzle6_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/layouts/Route110_TrickHousePuzzle6/map.bin index ec8447889..ec8447889 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle6/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/layouts/Route110_TrickHousePuzzle7/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle7/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle7/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc new file mode 100644 index 000000000..dcd1b9367 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C + .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" + +Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584 + .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" + + .align 2 +Route110_TrickHousePuzzle7_Layout:: @ 82EF818 + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle7_MapBorder + .4byte Route110_TrickHousePuzzle7_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/layouts/Route110_TrickHousePuzzle7/map.bin index 5859601f6..5859601f6 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle7/map.bin diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/layouts/Route110_TrickHousePuzzle8/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route110_TrickHousePuzzle8/border.bin +++ b/data/layouts/Route110_TrickHousePuzzle8/border.bin diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc new file mode 100644 index 000000000..1c8212684 --- /dev/null +++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc @@ -0,0 +1,14 @@ +Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830 + .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" + +Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838 + .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" + + .align 2 +Route110_TrickHousePuzzle8_Layout:: @ 82EFACC + .4byte 0xf + .4byte 0x16 + .4byte Route110_TrickHousePuzzle8_MapBorder + .4byte Route110_TrickHousePuzzle8_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_TrickHousePuzzle diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/layouts/Route110_TrickHousePuzzle8/map.bin index d8c131da6..d8c131da6 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.bin +++ b/data/layouts/Route110_TrickHousePuzzle8/map.bin diff --git a/data/maps/Route111/border.bin b/data/layouts/Route111/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/maps/Route111/border.bin +++ b/data/layouts/Route111/border.bin diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc new file mode 100644 index 000000000..ff3aa42c4 --- /dev/null +++ b/data/layouts/Route111/layout.inc @@ -0,0 +1,14 @@ +Route111_MapBorder:: @ 829C97C + .incbin "data/layouts/Route111/border.bin" + +Route111_MapBlockdata:: @ 829C984 + .incbin "data/layouts/Route111/map.bin" + + .align 2 +Route111_Layout:: @ 829F544 + .4byte 0x28 + .4byte 0x8c + .4byte Route111_MapBorder + .4byte Route111_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/maps/Route111/map.bin b/data/layouts/Route111/map.bin Binary files differindex 50fc935bd..50fc935bd 100644 --- a/data/maps/Route111/map.bin +++ b/data/layouts/Route111/map.bin diff --git a/data/maps/Route112/border.bin b/data/layouts/Route112/border.bin index 9ae2c2126..9ae2c2126 100644 --- a/data/maps/Route112/border.bin +++ b/data/layouts/Route112/border.bin diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc new file mode 100644 index 000000000..fc7caacb7 --- /dev/null +++ b/data/layouts/Route112/layout.inc @@ -0,0 +1,14 @@ +Route112_MapBorder:: @ 829F55C + .incbin "data/layouts/Route112/border.bin" + +Route112_MapBlockdata:: @ 829F564 + .incbin "data/layouts/Route112/map.bin" + + .align 2 +Route112_Layout:: @ 82A0824 + .4byte 0x28 + .4byte 0x3c + .4byte Route112_MapBorder + .4byte Route112_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lavaridge diff --git a/data/maps/Route112/map.bin b/data/layouts/Route112/map.bin Binary files differindex bc194cbc5..bc194cbc5 100644 --- a/data/maps/Route112/map.bin +++ b/data/layouts/Route112/map.bin diff --git a/data/maps/Route113/border.bin b/data/layouts/Route113/border.bin index 73e1e3c60..73e1e3c60 100644 --- a/data/maps/Route113/border.bin +++ b/data/layouts/Route113/border.bin diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc new file mode 100644 index 000000000..f56fc6b9b --- /dev/null +++ b/data/layouts/Route113/layout.inc @@ -0,0 +1,14 @@ +Route113_MapBorder:: @ 82A083C + .incbin "data/layouts/Route113/border.bin" + +Route113_MapBlockdata:: @ 82A0844 + .incbin "data/layouts/Route113/map.bin" + + .align 2 +Route113_Layout:: @ 82A17E4 + .4byte 0x64 + .4byte 0x14 + .4byte Route113_MapBorder + .4byte Route113_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/maps/Route113/map.bin b/data/layouts/Route113/map.bin index 1d6c6b283..1d6c6b283 100644 --- a/data/maps/Route113/map.bin +++ b/data/layouts/Route113/map.bin diff --git a/data/maps/Route114/border.bin b/data/layouts/Route114/border.bin index 23e2a92e5..23e2a92e5 100644 --- a/data/maps/Route114/border.bin +++ b/data/layouts/Route114/border.bin diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc new file mode 100644 index 000000000..440eaf330 --- /dev/null +++ b/data/layouts/Route114/layout.inc @@ -0,0 +1,14 @@ +Route114_MapBorder:: @ 82A17FC + .incbin "data/layouts/Route114/border.bin" + +Route114_MapBlockdata:: @ 82A1804 + .incbin "data/layouts/Route114/map.bin" + + .align 2 +Route114_Layout:: @ 82A3104 + .4byte 0x28 + .4byte 0x50 + .4byte Route114_MapBorder + .4byte Route114_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/maps/Route114/map.bin b/data/layouts/Route114/map.bin Binary files differindex 0d92450f4..0d92450f4 100644 --- a/data/maps/Route114/map.bin +++ b/data/layouts/Route114/map.bin diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/layouts/Route114_FossilManiacsHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route114_LanettesHouse/border.bin +++ b/data/layouts/Route114_FossilManiacsHouse/border.bin diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc new file mode 100644 index 000000000..10011c507 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc @@ -0,0 +1,14 @@ +Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24 + .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" + +Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C + .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" + + .align 2 +Route114_FossilManiacsHouse_Layout:: @ 82D4ECC + .4byte 0xa + .4byte 0x8 + .4byte Route114_FossilManiacsHouse_MapBorder + .4byte Route114_FossilManiacsHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/layouts/Route114_FossilManiacsHouse/map.bin index ea2d94fda..ea2d94fda 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.bin +++ b/data/layouts/Route114_FossilManiacsHouse/map.bin diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/layouts/Route114_FossilManiacsTunnel/border.bin index 580a207f4..580a207f4 100644 --- a/data/maps/Route114_FossilManiacsTunnel/border.bin +++ b/data/layouts/Route114_FossilManiacsTunnel/border.bin diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc new file mode 100644 index 000000000..0bd281050 --- /dev/null +++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc @@ -0,0 +1,14 @@ +Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4 + .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" + +Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC + .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" + + .align 2 +Route114_FossilManiacsTunnel_Layout:: @ 82D5190 + .4byte 0xd + .4byte 0x1a + .4byte Route114_FossilManiacsTunnel_MapBorder + .4byte Route114_FossilManiacsTunnel_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/layouts/Route114_FossilManiacsTunnel/map.bin index 586216000..586216000 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.bin +++ b/data/layouts/Route114_FossilManiacsTunnel/map.bin diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/layouts/Route114_LanettesHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route116_TunnelersRestHouse/border.bin +++ b/data/layouts/Route114_LanettesHouse/border.bin diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc new file mode 100644 index 000000000..2018011c3 --- /dev/null +++ b/data/layouts/Route114_LanettesHouse/layout.inc @@ -0,0 +1,14 @@ +Route114_LanettesHouse_MapBorder:: @ 82D51A8 + .incbin "data/layouts/Route114_LanettesHouse/border.bin" + +Route114_LanettesHouse_MapBlockdata:: @ 82D51B0 + .incbin "data/layouts/Route114_LanettesHouse/map.bin" + + .align 2 +Route114_LanettesHouse_Layout:: @ 82D5260 + .4byte 0xb + .4byte 0x8 + .4byte Route114_LanettesHouse_MapBorder + .4byte Route114_LanettesHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/layouts/Route114_LanettesHouse/map.bin index de1858be4..de1858be4 100644 --- a/data/maps/Route114_LanettesHouse/map.bin +++ b/data/layouts/Route114_LanettesHouse/map.bin diff --git a/data/maps/Route115/border.bin b/data/layouts/Route115/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route115/border.bin +++ b/data/layouts/Route115/border.bin diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc new file mode 100644 index 000000000..fb1b3d99b --- /dev/null +++ b/data/layouts/Route115/layout.inc @@ -0,0 +1,14 @@ +Route115_MapBorder:: @ 82A311C + .incbin "data/layouts/Route115/border.bin" + +Route115_MapBlockdata:: @ 82A3124 + .incbin "data/layouts/Route115/map.bin" + + .align 2 +Route115_Layout:: @ 82A4A24 + .4byte 0x28 + .4byte 0x50 + .4byte Route115_MapBorder + .4byte Route115_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fallarbor diff --git a/data/maps/Route115/map.bin b/data/layouts/Route115/map.bin Binary files differindex d6e8e9f1c..d6e8e9f1c 100644 --- a/data/maps/Route115/map.bin +++ b/data/layouts/Route115/map.bin diff --git a/data/maps/Route116/border.bin b/data/layouts/Route116/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route116/border.bin +++ b/data/layouts/Route116/border.bin diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc new file mode 100644 index 000000000..d7c24705b --- /dev/null +++ b/data/layouts/Route116/layout.inc @@ -0,0 +1,14 @@ +Route116_MapBorder:: @ 82A4A3C + .incbin "data/layouts/Route116/border.bin" + +Route116_MapBlockdata:: @ 82A4A44 + .incbin "data/layouts/Route116/map.bin" + + .align 2 +Route116_Layout:: @ 82A59E4 + .4byte 0x64 + .4byte 0x14 + .4byte Route116_MapBorder + .4byte Route116_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/Route116/map.bin b/data/layouts/Route116/map.bin Binary files differindex 055562dbb..055562dbb 100644 --- a/data/maps/Route116/map.bin +++ b/data/layouts/Route116/map.bin diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/layouts/Route116_TunnelersRestHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route119_WeatherInstitute_1F/border.bin +++ b/data/layouts/Route116_TunnelersRestHouse/border.bin diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc new file mode 100644 index 000000000..7a2a6997c --- /dev/null +++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc @@ -0,0 +1,14 @@ +Route116_TunnelersRestHouse_MapBorder:: @ 82D5278 + .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" + +Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280 + .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" + + .align 2 +Route116_TunnelersRestHouse_Layout:: @ 82D5334 + .4byte 0xa + .4byte 0x9 + .4byte Route116_TunnelersRestHouse_MapBorder + .4byte Route116_TunnelersRestHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/layouts/Route116_TunnelersRestHouse/map.bin index 91e2c2019..91e2c2019 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.bin +++ b/data/layouts/Route116_TunnelersRestHouse/map.bin diff --git a/data/maps/Route117/border.bin b/data/layouts/Route117/border.bin Binary files differindex addb5d6ce..addb5d6ce 100644 --- a/data/maps/Route117/border.bin +++ b/data/layouts/Route117/border.bin diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc new file mode 100644 index 000000000..552c03c84 --- /dev/null +++ b/data/layouts/Route117/layout.inc @@ -0,0 +1,14 @@ +Route117_MapBorder:: @ 82A59FC + .incbin "data/layouts/Route117/border.bin" + +Route117_MapBlockdata:: @ 82A5A04 + .incbin "data/layouts/Route117/map.bin" + + .align 2 +Route117_Layout:: @ 82A6364 + .4byte 0x3c + .4byte 0x14 + .4byte Route117_MapBorder + .4byte Route117_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/maps/Route117/map.bin b/data/layouts/Route117/map.bin index 9aaa06fef..9aaa06fef 100644 --- a/data/maps/Route117/map.bin +++ b/data/layouts/Route117/map.bin diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/layouts/Route117_PokemonDayCare/border.bin index 7f603e844..7f603e844 100644 --- a/data/maps/Route117_PokemonDayCare/border.bin +++ b/data/layouts/Route117_PokemonDayCare/border.bin diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc new file mode 100644 index 000000000..2fa028a7b --- /dev/null +++ b/data/layouts/Route117_PokemonDayCare/layout.inc @@ -0,0 +1,14 @@ +Route117_PokemonDayCare_MapBorder:: @ 82D534C + .incbin "data/layouts/Route117_PokemonDayCare/border.bin" + +Route117_PokemonDayCare_MapBlockdata:: @ 82D5354 + .incbin "data/layouts/Route117_PokemonDayCare/map.bin" + + .align 2 +Route117_PokemonDayCare_Layout:: @ 82D542C + .4byte 0xc + .4byte 0x9 + .4byte Route117_PokemonDayCare_MapBorder + .4byte Route117_PokemonDayCare_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonDayCare diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/layouts/Route117_PokemonDayCare/map.bin index bd4b64e13..bd4b64e13 100644 --- a/data/maps/Route117_PokemonDayCare/map.bin +++ b/data/layouts/Route117_PokemonDayCare/map.bin diff --git a/data/maps/Route118/border.bin b/data/layouts/Route118/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route118/border.bin +++ b/data/layouts/Route118/border.bin diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc new file mode 100644 index 000000000..f61ce1f82 --- /dev/null +++ b/data/layouts/Route118/layout.inc @@ -0,0 +1,14 @@ +Route118_MapBorder:: @ 82A637C + .incbin "data/layouts/Route118/border.bin" + +Route118_MapBlockdata:: @ 82A6384 + .incbin "data/layouts/Route118/map.bin" + + .align 2 +Route118_Layout:: @ 82A7004 + .4byte 0x50 + .4byte 0x14 + .4byte Route118_MapBorder + .4byte Route118_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/maps/Route118/map.bin b/data/layouts/Route118/map.bin Binary files differindex c8b0865d0..c8b0865d0 100644 --- a/data/maps/Route118/map.bin +++ b/data/layouts/Route118/map.bin diff --git a/data/maps/Route119/border.bin b/data/layouts/Route119/border.bin Binary files differindex 864ac15fa..864ac15fa 100644 --- a/data/maps/Route119/border.bin +++ b/data/layouts/Route119/border.bin diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc new file mode 100644 index 000000000..ed5f8777a --- /dev/null +++ b/data/layouts/Route119/layout.inc @@ -0,0 +1,14 @@ +Route119_MapBorder:: @ 82A701C + .incbin "data/layouts/Route119/border.bin" + +Route119_MapBlockdata:: @ 82A7024 + .incbin "data/layouts/Route119/map.bin" + + .align 2 +Route119_Layout:: @ 82A9BE4 + .4byte 0x28 + .4byte 0x8c + .4byte Route119_MapBorder + .4byte Route119_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/maps/Route119/map.bin b/data/layouts/Route119/map.bin Binary files differindex cd1c748d9..cd1c748d9 100644 --- a/data/maps/Route119/map.bin +++ b/data/layouts/Route119/map.bin diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/layouts/Route119_WeatherInstitute_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/Route119_WeatherInstitute_2F/border.bin +++ b/data/layouts/Route119_WeatherInstitute_1F/border.bin diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc new file mode 100644 index 000000000..bc0f92dfe --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc @@ -0,0 +1,14 @@ +Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8 + .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin" + +Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0 + .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin" + + .align 2 +Route119_WeatherInstitute_1F_Layout:: @ 82F2CD8 + .4byte 0x14 + .4byte 0xd + .4byte Route119_WeatherInstitute_1F_MapBorder + .4byte Route119_WeatherInstitute_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/layouts/Route119_WeatherInstitute_1F/map.bin index 07a4e7ebb..07a4e7ebb 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.bin +++ b/data/layouts/Route119_WeatherInstitute_1F/map.bin diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/layouts/Route119_WeatherInstitute_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_CuttersHouse/border.bin +++ b/data/layouts/Route119_WeatherInstitute_2F/border.bin diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc new file mode 100644 index 000000000..df864d9de --- /dev/null +++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc @@ -0,0 +1,14 @@ +Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0 + .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin" + +Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8 + .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin" + + .align 2 +Route119_WeatherInstitute_2F_Layout:: @ 82F2EB0 + .4byte 0x14 + .4byte 0xb + .4byte Route119_WeatherInstitute_2F_MapBorder + .4byte Route119_WeatherInstitute_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Lab diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/layouts/Route119_WeatherInstitute_2F/map.bin index 97953f463..97953f463 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.bin +++ b/data/layouts/Route119_WeatherInstitute_2F/map.bin diff --git a/data/maps/Route120/border.bin b/data/layouts/Route120/border.bin Binary files differindex 864ac15fa..864ac15fa 100644 --- a/data/maps/Route120/border.bin +++ b/data/layouts/Route120/border.bin diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc new file mode 100644 index 000000000..bc1d57778 --- /dev/null +++ b/data/layouts/Route120/layout.inc @@ -0,0 +1,14 @@ +Route120_MapBorder:: @ 82A9BFC + .incbin "data/layouts/Route120/border.bin" + +Route120_MapBlockdata:: @ 82A9C04 + .incbin "data/layouts/Route120/map.bin" + + .align 2 +Route120_Layout:: @ 82ABB44 + .4byte 0x28 + .4byte 0x64 + .4byte Route120_MapBorder + .4byte Route120_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Fortree diff --git a/data/maps/Route120/map.bin b/data/layouts/Route120/map.bin Binary files differindex bb98e751c..bb98e751c 100644 --- a/data/maps/Route120/map.bin +++ b/data/layouts/Route120/map.bin diff --git a/data/maps/Route121/border.bin b/data/layouts/Route121/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/Route121/border.bin +++ b/data/layouts/Route121/border.bin diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc new file mode 100644 index 000000000..a65e5c17d --- /dev/null +++ b/data/layouts/Route121/layout.inc @@ -0,0 +1,14 @@ +Route121_MapBorder:: @ 82ABB5C + .incbin "data/layouts/Route121/border.bin" + +Route121_MapBlockdata:: @ 82ABB64 + .incbin "data/layouts/Route121/map.bin" + + .align 2 +Route121_Layout:: @ 82AC7E4 + .4byte 0x50 + .4byte 0x14 + .4byte Route121_MapBorder + .4byte Route121_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/Route121/map.bin b/data/layouts/Route121/map.bin index 5c5397c0b..5c5397c0b 100644 --- a/data/maps/Route121/map.bin +++ b/data/layouts/Route121/map.bin diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/layouts/Route121_SafariZoneEntrance/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route121_SafariZoneEntrance/border.bin +++ b/data/layouts/Route121_SafariZoneEntrance/border.bin diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc new file mode 100644 index 000000000..db083c158 --- /dev/null +++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc @@ -0,0 +1,14 @@ +Route121_SafariZoneEntrance_MapBorder:: @ 82D5444 + .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" + +Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C + .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" + + .align 2 +Route121_SafariZoneEntrance_Layout:: @ 82D5644 + .4byte 0x12 + .4byte 0xe + .4byte Route121_SafariZoneEntrance_MapBorder + .4byte Route121_SafariZoneEntrance_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Shop diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/layouts/Route121_SafariZoneEntrance/map.bin index 35c1badac..35c1badac 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.bin +++ b/data/layouts/Route121_SafariZoneEntrance/map.bin diff --git a/data/maps/Route122/border.bin b/data/layouts/Route122/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route122/border.bin +++ b/data/layouts/Route122/border.bin diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc new file mode 100644 index 000000000..ce89713e3 --- /dev/null +++ b/data/layouts/Route122/layout.inc @@ -0,0 +1,14 @@ +Route122_MapBorder:: @ 82AC7FC + .incbin "data/layouts/Route122/border.bin" + +Route122_MapBlockdata:: @ 82AC804 + .incbin "data/layouts/Route122/map.bin" + + .align 2 +Route122_Layout:: @ 82AD484 + .4byte 0x28 + .4byte 0x28 + .4byte Route122_MapBorder + .4byte Route122_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/Route122/map.bin b/data/layouts/Route122/map.bin Binary files differindex 1c76b0b0a..1c76b0b0a 100644 --- a/data/maps/Route122/map.bin +++ b/data/layouts/Route122/map.bin diff --git a/data/maps/Route123/border.bin b/data/layouts/Route123/border.bin Binary files differindex 864ac15fa..864ac15fa 100644 --- a/data/maps/Route123/border.bin +++ b/data/layouts/Route123/border.bin diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc new file mode 100644 index 000000000..0acdf7008 --- /dev/null +++ b/data/layouts/Route123/layout.inc @@ -0,0 +1,14 @@ +Route123_MapBorder:: @ 82AD49C + .incbin "data/layouts/Route123/border.bin" + +Route123_MapBlockdata:: @ 82AD4A4 + .incbin "data/layouts/Route123/map.bin" + + .align 2 +Route123_Layout:: @ 82AEA84 + .4byte 0x8c + .4byte 0x14 + .4byte Route123_MapBorder + .4byte Route123_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/Route123/map.bin b/data/layouts/Route123/map.bin index 9b5573cc5..9b5573cc5 100644 --- a/data/maps/Route123/map.bin +++ b/data/layouts/Route123/map.bin diff --git a/data/maps/Route124/border.bin b/data/layouts/Route124/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route124/border.bin +++ b/data/layouts/Route124/border.bin diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc new file mode 100644 index 000000000..dddf9ad05 --- /dev/null +++ b/data/layouts/Route124/layout.inc @@ -0,0 +1,14 @@ +Route124_MapBorder:: @ 82AEA9C + .incbin "data/layouts/Route124/border.bin" + +Route124_MapBlockdata:: @ 82AEAA4 + .incbin "data/layouts/Route124/map.bin" + + .align 2 +Route124_Layout:: @ 82B1CA4 + .4byte 0x50 + .4byte 0x50 + .4byte Route124_MapBorder + .4byte Route124_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/maps/Route124/map.bin b/data/layouts/Route124/map.bin Binary files differindex 212135178..212135178 100644 --- a/data/maps/Route124/map.bin +++ b/data/layouts/Route124/map.bin diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc new file mode 100644 index 000000000..31f8a8ebf --- /dev/null +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc @@ -0,0 +1,14 @@ +Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC + .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" + +Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4 + .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" + + .align 2 +Route124_DivingTreasureHuntersHouse_Layout:: @ 82FC8A8 + .4byte 0xa + .4byte 0x9 + .4byte Route124_DivingTreasureHuntersHouse_MapBorder + .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin index 8f1f6cbef..8f1f6cbef 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin diff --git a/data/maps/Route125/border.bin b/data/layouts/Route125/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route125/border.bin +++ b/data/layouts/Route125/border.bin diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc new file mode 100644 index 000000000..43bb875c9 --- /dev/null +++ b/data/layouts/Route125/layout.inc @@ -0,0 +1,14 @@ +Route125_MapBorder:: @ 82B1CBC + .incbin "data/layouts/Route125/border.bin" + +Route125_MapBlockdata:: @ 82B1CC4 + .incbin "data/layouts/Route125/map.bin" + + .align 2 +Route125_Layout:: @ 82B35C4 + .4byte 0x50 + .4byte 0x28 + .4byte Route125_MapBorder + .4byte Route125_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/maps/Route125/map.bin b/data/layouts/Route125/map.bin Binary files differindex 12dab2a0b..12dab2a0b 100644 --- a/data/maps/Route125/map.bin +++ b/data/layouts/Route125/map.bin diff --git a/data/maps/Route126/border.bin b/data/layouts/Route126/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route126/border.bin +++ b/data/layouts/Route126/border.bin diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc new file mode 100644 index 000000000..ad03b109b --- /dev/null +++ b/data/layouts/Route126/layout.inc @@ -0,0 +1,14 @@ +Route126_MapBorder:: @ 82B35DC + .incbin "data/layouts/Route126/border.bin" + +Route126_MapBlockdata:: @ 82B35E4 + .incbin "data/layouts/Route126/map.bin" + + .align 2 +Route126_Layout:: @ 82B67E4 + .4byte 0x50 + .4byte 0x50 + .4byte Route126_MapBorder + .4byte Route126_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/maps/Route126/map.bin b/data/layouts/Route126/map.bin Binary files differindex 2d684cf64..2d684cf64 100644 --- a/data/maps/Route126/map.bin +++ b/data/layouts/Route126/map.bin diff --git a/data/maps/Route127/border.bin b/data/layouts/Route127/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route127/border.bin +++ b/data/layouts/Route127/border.bin diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc new file mode 100644 index 000000000..dcb0e27bc --- /dev/null +++ b/data/layouts/Route127/layout.inc @@ -0,0 +1,14 @@ +Route127_MapBorder:: @ 82B67FC + .incbin "data/layouts/Route127/border.bin" + +Route127_MapBlockdata:: @ 82B6804 + .incbin "data/layouts/Route127/map.bin" + + .align 2 +Route127_Layout:: @ 82B9A04 + .4byte 0x50 + .4byte 0x50 + .4byte Route127_MapBorder + .4byte Route127_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/maps/Route127/map.bin b/data/layouts/Route127/map.bin Binary files differindex 3d4690c18..3d4690c18 100644 --- a/data/maps/Route127/map.bin +++ b/data/layouts/Route127/map.bin diff --git a/data/maps/Route128/border.bin b/data/layouts/Route128/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route128/border.bin +++ b/data/layouts/Route128/border.bin diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc new file mode 100644 index 000000000..056baadf4 --- /dev/null +++ b/data/layouts/Route128/layout.inc @@ -0,0 +1,14 @@ +Route128_MapBorder:: @ 82B9A1C + .incbin "data/layouts/Route128/border.bin" + +Route128_MapBlockdata:: @ 82B9A24 + .incbin "data/layouts/Route128/map.bin" + + .align 2 +Route128_Layout:: @ 82BBFA4 + .4byte 0x78 + .4byte 0x28 + .4byte Route128_MapBorder + .4byte Route128_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/maps/Route128/map.bin b/data/layouts/Route128/map.bin Binary files differindex fae8a373e..fae8a373e 100644 --- a/data/maps/Route128/map.bin +++ b/data/layouts/Route128/map.bin diff --git a/data/maps/Route129/border.bin b/data/layouts/Route129/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route129/border.bin +++ b/data/layouts/Route129/border.bin diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc new file mode 100644 index 000000000..ba264dc1e --- /dev/null +++ b/data/layouts/Route129/layout.inc @@ -0,0 +1,14 @@ +Route129_MapBorder:: @ 82BBFBC + .incbin "data/layouts/Route129/border.bin" + +Route129_MapBlockdata:: @ 82BBFC4 + .incbin "data/layouts/Route129/map.bin" + + .align 2 +Route129_Layout:: @ 82BD8C4 + .4byte 0x50 + .4byte 0x28 + .4byte Route129_MapBorder + .4byte Route129_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mossdeep diff --git a/data/maps/Route129/map.bin b/data/layouts/Route129/map.bin Binary files differindex 8d09787fd..8d09787fd 100644 --- a/data/maps/Route129/map.bin +++ b/data/layouts/Route129/map.bin diff --git a/data/maps/Route130/border.bin b/data/layouts/Route130/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route130/border.bin +++ b/data/layouts/Route130/border.bin diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc new file mode 100644 index 000000000..234824abf --- /dev/null +++ b/data/layouts/Route130/layout.inc @@ -0,0 +1,14 @@ +Route130_MapBorder:: @ 82F0448 + .incbin "data/layouts/Route130/border.bin" + +Route130_MapBlockdata:: @ 82F0450 + .incbin "data/layouts/Route130/map.bin" + + .align 2 +Route130_Layout:: @ 82F1D50 + .4byte 0x50 + .4byte 0x28 + .4byte Route130_MapBorder + .4byte Route130_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/Route130/map.bin b/data/layouts/Route130/map.bin index b06fa74dc..b06fa74dc 100644 --- a/data/maps/Route130/map.bin +++ b/data/layouts/Route130/map.bin diff --git a/data/maps/Route131/border.bin b/data/layouts/Route131/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route131/border.bin +++ b/data/layouts/Route131/border.bin diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc new file mode 100644 index 000000000..86467c2d4 --- /dev/null +++ b/data/layouts/Route131/layout.inc @@ -0,0 +1,14 @@ +Route131_MapBorder:: @ 82BF1FC + .incbin "data/layouts/Route131/border.bin" + +Route131_MapBlockdata:: @ 82BF204 + .incbin "data/layouts/Route131/map.bin" + + .align 2 +Route131_Layout:: @ 82C04C4 + .4byte 0x3c + .4byte 0x28 + .4byte Route131_MapBorder + .4byte Route131_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/Route131/map.bin b/data/layouts/Route131/map.bin index ca8079e0f..ca8079e0f 100644 --- a/data/maps/Route131/map.bin +++ b/data/layouts/Route131/map.bin diff --git a/data/maps/Route132/border.bin b/data/layouts/Route132/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route132/border.bin +++ b/data/layouts/Route132/border.bin diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc new file mode 100644 index 000000000..f59bbc923 --- /dev/null +++ b/data/layouts/Route132/layout.inc @@ -0,0 +1,14 @@ +Route132_MapBorder:: @ 82C04DC + .incbin "data/layouts/Route132/border.bin" + +Route132_MapBlockdata:: @ 82C04E4 + .incbin "data/layouts/Route132/map.bin" + + .align 2 +Route132_Layout:: @ 82C1DE4 + .4byte 0x50 + .4byte 0x28 + .4byte Route132_MapBorder + .4byte Route132_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/Route132/map.bin b/data/layouts/Route132/map.bin Binary files differindex f122b2865..f122b2865 100644 --- a/data/maps/Route132/map.bin +++ b/data/layouts/Route132/map.bin diff --git a/data/maps/Route133/border.bin b/data/layouts/Route133/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route133/border.bin +++ b/data/layouts/Route133/border.bin diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc new file mode 100644 index 000000000..e9be93e17 --- /dev/null +++ b/data/layouts/Route133/layout.inc @@ -0,0 +1,14 @@ +Route133_MapBorder:: @ 82C1DFC + .incbin "data/layouts/Route133/border.bin" + +Route133_MapBlockdata:: @ 82C1E04 + .incbin "data/layouts/Route133/map.bin" + + .align 2 +Route133_Layout:: @ 82C3704 + .4byte 0x50 + .4byte 0x28 + .4byte Route133_MapBorder + .4byte Route133_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/Route133/map.bin b/data/layouts/Route133/map.bin index dfb44fe81..dfb44fe81 100644 --- a/data/maps/Route133/map.bin +++ b/data/layouts/Route133/map.bin diff --git a/data/maps/Route134/border.bin b/data/layouts/Route134/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/Route134/border.bin +++ b/data/layouts/Route134/border.bin diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc new file mode 100644 index 000000000..91e9cab8a --- /dev/null +++ b/data/layouts/Route134/layout.inc @@ -0,0 +1,14 @@ +Route134_MapBorder:: @ 82C371C + .incbin "data/layouts/Route134/border.bin" + +Route134_MapBlockdata:: @ 82C3724 + .incbin "data/layouts/Route134/map.bin" + + .align 2 +Route134_Layout:: @ 82C5024 + .4byte 0x50 + .4byte 0x28 + .4byte Route134_MapBorder + .4byte Route134_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/Route134/map.bin b/data/layouts/Route134/map.bin Binary files differindex fbb491539..fbb491539 100644 --- a/data/maps/Route134/map.bin +++ b/data/layouts/Route134/map.bin diff --git a/data/maps/RustboroCity/border.bin b/data/layouts/RustboroCity/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/RustboroCity/border.bin +++ b/data/layouts/RustboroCity/border.bin diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc new file mode 100644 index 000000000..7f37d8f74 --- /dev/null +++ b/data/layouts/RustboroCity/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_MapBorder:: @ 82892CC + .incbin "data/layouts/RustboroCity/border.bin" + +RustboroCity_MapBlockdata:: @ 82892D4 + .incbin "data/layouts/RustboroCity/map.bin" + + .align 2 +RustboroCity_Layout:: @ 828A594 + .4byte 0x28 + .4byte 0x3c + .4byte RustboroCity_MapBorder + .4byte RustboroCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/RustboroCity/map.bin b/data/layouts/RustboroCity/map.bin Binary files differindex d8921ec3f..d8921ec3f 100644 --- a/data/maps/RustboroCity/map.bin +++ b/data/layouts/RustboroCity/map.bin diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/border.bin +++ b/data/layouts/RustboroCity_CuttersHouse/border.bin diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc new file mode 100644 index 000000000..c13b660d9 --- /dev/null +++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC + .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" + +RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4 + .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" + + .align 2 +RustboroCity_CuttersHouse_Layout:: @ 82D1ABC + .4byte 0xb + .4byte 0x9 + .4byte RustboroCity_CuttersHouse_MapBorder + .4byte RustboroCity_CuttersHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin index 5515d00cf..5515d00cf 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.bin +++ b/data/layouts/RustboroCity_CuttersHouse/map.bin diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/layouts/RustboroCity_DevonCorp_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/border.bin +++ b/data/layouts/RustboroCity_DevonCorp_1F/border.bin diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc new file mode 100644 index 000000000..d5c85b2a6 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228 + .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin" + +RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230 + .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin" + + .align 2 +RustboroCity_DevonCorp_1F_Layout:: @ 82D1388 + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_1F_MapBorder + .4byte RustboroCity_DevonCorp_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/layouts/RustboroCity_DevonCorp_1F/map.bin index 78cc0c199..78cc0c199 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.bin +++ b/data/layouts/RustboroCity_DevonCorp_1F/map.bin diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/layouts/RustboroCity_DevonCorp_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/border.bin +++ b/data/layouts/RustboroCity_DevonCorp_2F/border.bin diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc new file mode 100644 index 000000000..aa13c9810 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0 + .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin" + +RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8 + .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin" + + .align 2 +RustboroCity_DevonCorp_2F_Layout:: @ 82D1500 + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_2F_MapBorder + .4byte RustboroCity_DevonCorp_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/layouts/RustboroCity_DevonCorp_2F/map.bin index 03985c572..03985c572 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.bin +++ b/data/layouts/RustboroCity_DevonCorp_2F/map.bin diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/layouts/RustboroCity_DevonCorp_3F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat1_1F/border.bin +++ b/data/layouts/RustboroCity_DevonCorp_3F/border.bin diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc new file mode 100644 index 000000000..b033a84f1 --- /dev/null +++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768 + .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin" + +RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770 + .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin" + + .align 2 +RustboroCity_DevonCorp_3F_Layout:: @ 82F28C8 + .4byte 0x13 + .4byte 0x9 + .4byte RustboroCity_DevonCorp_3F_MapBorder + .4byte RustboroCity_DevonCorp_3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/layouts/RustboroCity_DevonCorp_3F/map.bin index 8333a8bc3..8333a8bc3 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.bin +++ b/data/layouts/RustboroCity_DevonCorp_3F/map.bin diff --git a/data/maps/RustboroCity_Flat1_2F/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat1_2F/border.bin +++ b/data/layouts/RustboroCity_Flat1_1F/border.bin diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc new file mode 100644 index 000000000..449157295 --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC + .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin" + +RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4 + .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin" + + .align 2 +RustboroCity_Flat1_1F_Layout:: @ 82FF994 + .4byte 0xe + .4byte 0x8 + .4byte RustboroCity_Flat1_1F_MapBorder + .4byte RustboroCity_Flat1_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin index 017298e71..017298e71 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.bin +++ b/data/layouts/RustboroCity_Flat1_1F/map.bin diff --git a/data/maps/RustboroCity_Flat2_1F/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat2_1F/border.bin +++ b/data/layouts/RustboroCity_Flat1_2F/border.bin diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc new file mode 100644 index 000000000..804f8af4f --- /dev/null +++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC + .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin" + +RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4 + .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin" + + .align 2 +RustboroCity_Flat1_2F_Layout:: @ 82FFA94 + .4byte 0xe + .4byte 0x8 + .4byte RustboroCity_Flat1_2F_MapBorder + .4byte RustboroCity_Flat1_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin index 17a611343..17a611343 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.bin +++ b/data/layouts/RustboroCity_Flat1_2F/map.bin diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat2_2F/border.bin +++ b/data/layouts/RustboroCity_Flat2_1F/border.bin diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc new file mode 100644 index 000000000..8f25d160e --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8 + .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin" + +RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000 + .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin" + + .align 2 +RustboroCity_Flat2_1F_Layout:: @ 82FC0FC + .4byte 0xe + .4byte 0x9 + .4byte RustboroCity_Flat2_1F_MapBorder + .4byte RustboroCity_Flat2_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_Flat2_1F/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin Binary files differindex 0f6829f9c..0f6829f9c 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.bin +++ b/data/layouts/RustboroCity_Flat2_1F/map.bin diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_Flat2_3F/border.bin +++ b/data/layouts/RustboroCity_Flat2_2F/border.bin diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc new file mode 100644 index 000000000..3d08ed34e --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat2_2F_MapBorder:: @ 82FC114 + .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin" + +RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C + .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin" + + .align 2 +RustboroCity_Flat2_2F_Layout:: @ 82FC218 + .4byte 0xe + .4byte 0x9 + .4byte RustboroCity_Flat2_2F_MapBorder + .4byte RustboroCity_Flat2_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_Flat2_2F/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin Binary files differindex 9f3750fb4..9f3750fb4 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.bin +++ b/data/layouts/RustboroCity_Flat2_2F/map.bin diff --git a/data/maps/RustboroCity_House1/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_House1/border.bin +++ b/data/layouts/RustboroCity_Flat2_3F/border.bin diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc new file mode 100644 index 000000000..c4b09da1c --- /dev/null +++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_Flat2_3F_MapBorder:: @ 82FC230 + .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin" + +RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238 + .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin" + + .align 2 +RustboroCity_Flat2_3F_Layout:: @ 82FC334 + .4byte 0xe + .4byte 0x9 + .4byte RustboroCity_Flat2_3F_MapBorder + .4byte RustboroCity_Flat2_3F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_Flat2_3F/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin Binary files differindex 2112fe799..2112fe799 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.bin +++ b/data/layouts/RustboroCity_Flat2_3F/map.bin diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/layouts/RustboroCity_Gym/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/RustboroCity_Gym/border.bin +++ b/data/layouts/RustboroCity_Gym/border.bin diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc new file mode 100644 index 000000000..5c17a62ef --- /dev/null +++ b/data/layouts/RustboroCity_Gym/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_Gym_MapBorder:: @ 82D1518 + .incbin "data/layouts/RustboroCity_Gym/border.bin" + +RustboroCity_Gym_MapBlockdata:: @ 82D1520 + .incbin "data/layouts/RustboroCity_Gym/map.bin" + + .align 2 +RustboroCity_Gym_Layout:: @ 82D16C4 + .4byte 0xb + .4byte 0x13 + .4byte RustboroCity_Gym_MapBorder + .4byte RustboroCity_Gym_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_RustboroGym diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/layouts/RustboroCity_Gym/map.bin index bc69d8879..bc69d8879 100644 --- a/data/maps/RustboroCity_Gym/map.bin +++ b/data/layouts/RustboroCity_Gym/map.bin diff --git a/data/maps/RustboroCity_House2/border.bin b/data/layouts/RustboroCity_House/border.bin index 19d906679..19d906679 100644 --- a/data/maps/RustboroCity_House2/border.bin +++ b/data/layouts/RustboroCity_House/border.bin diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc new file mode 100644 index 000000000..9d523190e --- /dev/null +++ b/data/layouts/RustboroCity_House/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_House_MapBorder:: @ 82D1804 + .incbin "data/layouts/RustboroCity_House/border.bin" + +RustboroCity_House_MapBlockdata:: @ 82D180C + .incbin "data/layouts/RustboroCity_House/map.bin" + + .align 2 +RustboroCity_House_Layout:: @ 82D18E4 + .4byte 0xc + .4byte 0x9 + .4byte RustboroCity_House_MapBorder + .4byte RustboroCity_House_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_House2/map.bin b/data/layouts/RustboroCity_House/map.bin index 5a53bbc77..5a53bbc77 100644 --- a/data/maps/RustboroCity_House2/map.bin +++ b/data/layouts/RustboroCity_House/map.bin diff --git a/data/maps/SSTidalCorridor/border.bin b/data/layouts/RustboroCity_House1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SSTidalCorridor/border.bin +++ b/data/layouts/RustboroCity_House1/border.bin diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc new file mode 100644 index 000000000..8635c91af --- /dev/null +++ b/data/layouts/RustboroCity_House1/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_House1_MapBorder:: @ 82D18FC + .incbin "data/layouts/RustboroCity_House1/border.bin" + +RustboroCity_House1_MapBlockdata:: @ 82D1904 + .incbin "data/layouts/RustboroCity_House1/map.bin" + + .align 2 +RustboroCity_House1_Layout:: @ 82D19D4 + .4byte 0xd + .4byte 0x8 + .4byte RustboroCity_House1_MapBorder + .4byte RustboroCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/RustboroCity_House1/map.bin b/data/layouts/RustboroCity_House1/map.bin index a14fc0405..a14fc0405 100644 --- a/data/maps/RustboroCity_House1/map.bin +++ b/data/layouts/RustboroCity_House1/map.bin diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/layouts/RustboroCity_PokemonSchool/border.bin index 8f857616b..8f857616b 100644 --- a/data/maps/RustboroCity_PokemonSchool/border.bin +++ b/data/layouts/RustboroCity_PokemonSchool/border.bin diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc new file mode 100644 index 000000000..7c284c712 --- /dev/null +++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc @@ -0,0 +1,14 @@ +RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC + .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" + +RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4 + .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" + + .align 2 +RustboroCity_PokemonSchool_Layout:: @ 82D17EC + .4byte 0xc + .4byte 0xb + .4byte RustboroCity_PokemonSchool_MapBorder + .4byte RustboroCity_PokemonSchool_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonSchool diff --git a/data/maps/RustboroCity_PokemonSchool/map.bin b/data/layouts/RustboroCity_PokemonSchool/map.bin Binary files differindex 3f3b183d3..3f3b183d3 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.bin +++ b/data/layouts/RustboroCity_PokemonSchool/map.bin diff --git a/data/maps/RusturfTunnel/border.bin b/data/layouts/RusturfTunnel/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/RusturfTunnel/border.bin +++ b/data/layouts/RusturfTunnel/border.bin diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc new file mode 100644 index 000000000..94e2c858b --- /dev/null +++ b/data/layouts/RusturfTunnel/layout.inc @@ -0,0 +1,14 @@ +RusturfTunnel_MapBorder:: @ 82D725C + .incbin "data/layouts/RusturfTunnel/border.bin" + +RusturfTunnel_MapBlockdata:: @ 82D7264 + .incbin "data/layouts/RusturfTunnel/map.bin" + + .align 2 +RusturfTunnel_Layout:: @ 82D7924 + .4byte 0x24 + .4byte 0x18 + .4byte RusturfTunnel_MapBorder + .4byte RusturfTunnel_MapBlockdata + .4byte gTileset_General + .4byte gTileset_RusturfTunnel diff --git a/data/maps/RusturfTunnel/map.bin b/data/layouts/RusturfTunnel/map.bin index 87ce9bc73..87ce9bc73 100644 --- a/data/maps/RusturfTunnel/map.bin +++ b/data/layouts/RusturfTunnel/map.bin diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/layouts/SSTidalCorridor/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SSTidalLowerDeck/border.bin +++ b/data/layouts/SSTidalCorridor/border.bin diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc new file mode 100644 index 000000000..7e6ce5d5e --- /dev/null +++ b/data/layouts/SSTidalCorridor/layout.inc @@ -0,0 +1,14 @@ +SSTidalCorridor_MapBorder:: @ 82F63F8 + .incbin "data/layouts/SSTidalCorridor/border.bin" + +SSTidalCorridor_MapBlockdata:: @ 82F6400 + .incbin "data/layouts/SSTidalCorridor/map.bin" + + .align 2 +SSTidalCorridor_Layout:: @ 82F65D4 + .4byte 0x12 + .4byte 0xd + .4byte SSTidalCorridor_MapBorder + .4byte SSTidalCorridor_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/SSTidalCorridor/map.bin b/data/layouts/SSTidalCorridor/map.bin index f8cf1725d..f8cf1725d 100644 --- a/data/maps/SSTidalCorridor/map.bin +++ b/data/layouts/SSTidalCorridor/map.bin diff --git a/data/maps/SSTidalRooms/border.bin b/data/layouts/SSTidalLowerDeck/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SSTidalRooms/border.bin +++ b/data/layouts/SSTidalLowerDeck/border.bin diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc new file mode 100644 index 000000000..5054d8c1d --- /dev/null +++ b/data/layouts/SSTidalLowerDeck/layout.inc @@ -0,0 +1,14 @@ +SSTidalLowerDeck_MapBorder:: @ 82F65EC + .incbin "data/layouts/SSTidalLowerDeck/border.bin" + +SSTidalLowerDeck_MapBlockdata:: @ 82F65F4 + .incbin "data/layouts/SSTidalLowerDeck/map.bin" + + .align 2 +SSTidalLowerDeck_Layout:: @ 82F67B0 + .4byte 0x11 + .4byte 0xd + .4byte SSTidalLowerDeck_MapBorder + .4byte SSTidalLowerDeck_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/layouts/SSTidalLowerDeck/map.bin index 059ce30fe..059ce30fe 100644 --- a/data/maps/SSTidalLowerDeck/map.bin +++ b/data/layouts/SSTidalLowerDeck/map.bin diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/layouts/SSTidalRooms/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SingleBattleColosseum/border.bin +++ b/data/layouts/SSTidalRooms/border.bin diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc new file mode 100644 index 000000000..cbfe5ba5c --- /dev/null +++ b/data/layouts/SSTidalRooms/layout.inc @@ -0,0 +1,14 @@ +SSTidalRooms_MapBorder:: @ 82F67C8 + .incbin "data/layouts/SSTidalRooms/border.bin" + +SSTidalRooms_MapBlockdata:: @ 82F67D0 + .incbin "data/layouts/SSTidalRooms/map.bin" + + .align 2 +SSTidalRooms_Layout:: @ 82F6CE0 + .4byte 0x24 + .4byte 0x12 + .4byte SSTidalRooms_MapBorder + .4byte SSTidalRooms_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Ship diff --git a/data/maps/SSTidalRooms/map.bin b/data/layouts/SSTidalRooms/map.bin index 6103ad0c2..6103ad0c2 100644 --- a/data/maps/SSTidalRooms/map.bin +++ b/data/layouts/SSTidalRooms/map.bin diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/layouts/SafariZone_Northeast/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_Northeast/border.bin +++ b/data/layouts/SafariZone_Northeast/border.bin diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc new file mode 100644 index 000000000..9fa27626e --- /dev/null +++ b/data/layouts/SafariZone_Northeast/layout.inc @@ -0,0 +1,14 @@ +SafariZone_Northeast_MapBorder:: @ 82EAD80 + .incbin "data/layouts/SafariZone_Northeast/border.bin" + +SafariZone_Northeast_MapBlockdata:: @ 82EAD88 + .incbin "data/layouts/SafariZone_Northeast/map.bin" + + .align 2 +SafariZone_Northeast_Layout:: @ 82EBA08 + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_Northeast_MapBorder + .4byte SafariZone_Northeast_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/SafariZone_Northeast/map.bin b/data/layouts/SafariZone_Northeast/map.bin Binary files differindex d5e7fd825..d5e7fd825 100644 --- a/data/maps/SafariZone_Northeast/map.bin +++ b/data/layouts/SafariZone_Northeast/map.bin diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/layouts/SafariZone_Northwest/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_Northwest/border.bin +++ b/data/layouts/SafariZone_Northwest/border.bin diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc new file mode 100644 index 000000000..b3a82fd0f --- /dev/null +++ b/data/layouts/SafariZone_Northwest/layout.inc @@ -0,0 +1,14 @@ +SafariZone_Northwest_MapBorder:: @ 82EA0E0 + .incbin "data/layouts/SafariZone_Northwest/border.bin" + +SafariZone_Northwest_MapBlockdata:: @ 82EA0E8 + .incbin "data/layouts/SafariZone_Northwest/map.bin" + + .align 2 +SafariZone_Northwest_Layout:: @ 82EAD68 + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_Northwest_MapBorder + .4byte SafariZone_Northwest_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/SafariZone_Northwest/map.bin b/data/layouts/SafariZone_Northwest/map.bin Binary files differindex 1825a1c92..1825a1c92 100644 --- a/data/maps/SafariZone_Northwest/map.bin +++ b/data/layouts/SafariZone_Northwest/map.bin diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/layouts/SafariZone_RestHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SafariZone_RestHouse/border.bin +++ b/data/layouts/SafariZone_RestHouse/border.bin diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc new file mode 100644 index 000000000..127289873 --- /dev/null +++ b/data/layouts/SafariZone_RestHouse/layout.inc @@ -0,0 +1,14 @@ +SafariZone_RestHouse_MapBorder:: @ 830476C + .incbin "data/layouts/SafariZone_RestHouse/border.bin" + +SafariZone_RestHouse_MapBlockdata:: @ 8304774 + .incbin "data/layouts/SafariZone_RestHouse/map.bin" + + .align 2 +SafariZone_RestHouse_Layout:: @ 8304828 + .4byte 0xa + .4byte 0x9 + .4byte SafariZone_RestHouse_MapBorder + .4byte SafariZone_RestHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/layouts/SafariZone_RestHouse/map.bin index c57c99c7b..c57c99c7b 100644 --- a/data/maps/SafariZone_RestHouse/map.bin +++ b/data/layouts/SafariZone_RestHouse/map.bin diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/layouts/SafariZone_Southeast/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_Southeast/border.bin +++ b/data/layouts/SafariZone_Southeast/border.bin diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc new file mode 100644 index 000000000..8893cb6a1 --- /dev/null +++ b/data/layouts/SafariZone_Southeast/layout.inc @@ -0,0 +1,14 @@ +SafariZone_Southeast_MapBorder:: @ 82EC6C0 + .incbin "data/layouts/SafariZone_Southeast/border.bin" + +SafariZone_Southeast_MapBlockdata:: @ 82EC6C8 + .incbin "data/layouts/SafariZone_Southeast/map.bin" + + .align 2 +SafariZone_Southeast_Layout:: @ 82ED348 + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_Southeast_MapBorder + .4byte SafariZone_Southeast_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/SafariZone_Southeast/map.bin b/data/layouts/SafariZone_Southeast/map.bin Binary files differindex 540798144..540798144 100644 --- a/data/maps/SafariZone_Southeast/map.bin +++ b/data/layouts/SafariZone_Southeast/map.bin diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/layouts/SafariZone_Southwest/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SafariZone_Southwest/border.bin +++ b/data/layouts/SafariZone_Southwest/border.bin diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc new file mode 100644 index 000000000..58f199ac6 --- /dev/null +++ b/data/layouts/SafariZone_Southwest/layout.inc @@ -0,0 +1,14 @@ +SafariZone_Southwest_MapBorder:: @ 82EBA20 + .incbin "data/layouts/SafariZone_Southwest/border.bin" + +SafariZone_Southwest_MapBlockdata:: @ 82EBA28 + .incbin "data/layouts/SafariZone_Southwest/map.bin" + + .align 2 +SafariZone_Southwest_Layout:: @ 82EC6A8 + .4byte 0x28 + .4byte 0x28 + .4byte SafariZone_Southwest_MapBorder + .4byte SafariZone_Southwest_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Lilycove diff --git a/data/maps/SafariZone_Southwest/map.bin b/data/layouts/SafariZone_Southwest/map.bin Binary files differindex 0074b6e55..0074b6e55 100644 --- a/data/maps/SafariZone_Southwest/map.bin +++ b/data/layouts/SafariZone_Southwest/map.bin diff --git a/data/maps/ScorchedSlab/border.bin b/data/layouts/ScorchedSlab/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ScorchedSlab/border.bin +++ b/data/layouts/ScorchedSlab/border.bin diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc new file mode 100644 index 000000000..52d172a89 --- /dev/null +++ b/data/layouts/ScorchedSlab/layout.inc @@ -0,0 +1,14 @@ +ScorchedSlab_MapBorder:: @ 82FF340 + .incbin "data/layouts/ScorchedSlab/border.bin" + +ScorchedSlab_MapBlockdata:: @ 82FF348 + .incbin "data/layouts/ScorchedSlab/map.bin" + + .align 2 +ScorchedSlab_Layout:: @ 82FF5A0 + .4byte 0xf + .4byte 0x14 + .4byte ScorchedSlab_MapBorder + .4byte ScorchedSlab_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ScorchedSlab/map.bin b/data/layouts/ScorchedSlab/map.bin index edbd982ee..edbd982ee 100644 --- a/data/maps/ScorchedSlab/map.bin +++ b/data/layouts/ScorchedSlab/map.bin diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/layouts/SeafloorCavern_Entrance/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Entrance/border.bin +++ b/data/layouts/SeafloorCavern_Entrance/border.bin diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc new file mode 100644 index 000000000..bfdb7cdbd --- /dev/null +++ b/data/layouts/SeafloorCavern_Entrance/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0 + .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" + +SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8 + .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" + + .align 2 +SeafloorCavern_Entrance_Layout:: @ 82DD6F8 + .4byte 0x14 + .4byte 0x14 + .4byte SeafloorCavern_Entrance_MapBorder + .4byte SeafloorCavern_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/layouts/SeafloorCavern_Entrance/map.bin index 3861044dd..3861044dd 100644 --- a/data/maps/SeafloorCavern_Entrance/map.bin +++ b/data/layouts/SeafloorCavern_Entrance/map.bin diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/layouts/SeafloorCavern_Room1/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room1/border.bin +++ b/data/layouts/SeafloorCavern_Room1/border.bin diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc new file mode 100644 index 000000000..3ebfd886f --- /dev/null +++ b/data/layouts/SeafloorCavern_Room1/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room1_MapBorder:: @ 82DD710 + .incbin "data/layouts/SeafloorCavern_Room1/border.bin" + +SeafloorCavern_Room1_MapBlockdata:: @ 82DD718 + .incbin "data/layouts/SeafloorCavern_Room1/map.bin" + + .align 2 +SeafloorCavern_Room1_Layout:: @ 82DDA60 + .4byte 0x14 + .4byte 0x15 + .4byte SeafloorCavern_Room1_MapBorder + .4byte SeafloorCavern_Room1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/layouts/SeafloorCavern_Room1/map.bin index 57cd82f78..57cd82f78 100644 --- a/data/maps/SeafloorCavern_Room1/map.bin +++ b/data/layouts/SeafloorCavern_Room1/map.bin diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/layouts/SeafloorCavern_Room2/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room2/border.bin +++ b/data/layouts/SeafloorCavern_Room2/border.bin diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc new file mode 100644 index 000000000..86a7134ed --- /dev/null +++ b/data/layouts/SeafloorCavern_Room2/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room2_MapBorder:: @ 82DDA78 + .incbin "data/layouts/SeafloorCavern_Room2/border.bin" + +SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80 + .incbin "data/layouts/SeafloorCavern_Room2/map.bin" + + .align 2 +SeafloorCavern_Room2_Layout:: @ 82DDD74 + .4byte 0x12 + .4byte 0x15 + .4byte SeafloorCavern_Room2_MapBorder + .4byte SeafloorCavern_Room2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/layouts/SeafloorCavern_Room2/map.bin index 01b66f2f3..01b66f2f3 100644 --- a/data/maps/SeafloorCavern_Room2/map.bin +++ b/data/layouts/SeafloorCavern_Room2/map.bin diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/layouts/SeafloorCavern_Room3/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room3/border.bin +++ b/data/layouts/SeafloorCavern_Room3/border.bin diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc new file mode 100644 index 000000000..0e660f4f3 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room3/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room3_MapBorder:: @ 82DDD8C + .incbin "data/layouts/SeafloorCavern_Room3/border.bin" + +SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94 + .incbin "data/layouts/SeafloorCavern_Room3/map.bin" + + .align 2 +SeafloorCavern_Room3_Layout:: @ 82DDFB4 + .4byte 0x10 + .4byte 0x11 + .4byte SeafloorCavern_Room3_MapBorder + .4byte SeafloorCavern_Room3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/layouts/SeafloorCavern_Room3/map.bin index b5e92ca20..b5e92ca20 100644 --- a/data/maps/SeafloorCavern_Room3/map.bin +++ b/data/layouts/SeafloorCavern_Room3/map.bin diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/layouts/SeafloorCavern_Room4/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room4/border.bin +++ b/data/layouts/SeafloorCavern_Room4/border.bin diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc new file mode 100644 index 000000000..013e2d74e --- /dev/null +++ b/data/layouts/SeafloorCavern_Room4/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room4_MapBorder:: @ 82DDFCC + .incbin "data/layouts/SeafloorCavern_Room4/border.bin" + +SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4 + .incbin "data/layouts/SeafloorCavern_Room4/map.bin" + + .align 2 +SeafloorCavern_Room4_Layout:: @ 82DE280 + .4byte 0x12 + .4byte 0x13 + .4byte SeafloorCavern_Room4_MapBorder + .4byte SeafloorCavern_Room4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/layouts/SeafloorCavern_Room4/map.bin index 928749c95..928749c95 100644 --- a/data/maps/SeafloorCavern_Room4/map.bin +++ b/data/layouts/SeafloorCavern_Room4/map.bin diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/layouts/SeafloorCavern_Room5/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room5/border.bin +++ b/data/layouts/SeafloorCavern_Room5/border.bin diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc new file mode 100644 index 000000000..ede193527 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room5/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room5_MapBorder:: @ 82DE298 + .incbin "data/layouts/SeafloorCavern_Room5/border.bin" + +SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0 + .incbin "data/layouts/SeafloorCavern_Room5/map.bin" + + .align 2 +SeafloorCavern_Room5_Layout:: @ 82DE5C0 + .4byte 0x14 + .4byte 0x14 + .4byte SeafloorCavern_Room5_MapBorder + .4byte SeafloorCavern_Room5_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/layouts/SeafloorCavern_Room5/map.bin index 386430fe4..386430fe4 100644 --- a/data/maps/SeafloorCavern_Room5/map.bin +++ b/data/layouts/SeafloorCavern_Room5/map.bin diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/layouts/SeafloorCavern_Room6/border.bin index a00c39057..a00c39057 100644 --- a/data/maps/SeafloorCavern_Room6/border.bin +++ b/data/layouts/SeafloorCavern_Room6/border.bin diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc new file mode 100644 index 000000000..0b6b1026e --- /dev/null +++ b/data/layouts/SeafloorCavern_Room6/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room6_MapBorder:: @ 82DE5D8 + .incbin "data/layouts/SeafloorCavern_Room6/border.bin" + +SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0 + .incbin "data/layouts/SeafloorCavern_Room6/map.bin" + + .align 2 +SeafloorCavern_Room6_Layout:: @ 82DEA30 + .4byte 0x18 + .4byte 0x17 + .4byte SeafloorCavern_Room6_MapBorder + .4byte SeafloorCavern_Room6_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/layouts/SeafloorCavern_Room6/map.bin index 3776cc4c7..3776cc4c7 100644 --- a/data/maps/SeafloorCavern_Room6/map.bin +++ b/data/layouts/SeafloorCavern_Room6/map.bin diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/layouts/SeafloorCavern_Room7/border.bin index a00c39057..a00c39057 100644 --- a/data/maps/SeafloorCavern_Room7/border.bin +++ b/data/layouts/SeafloorCavern_Room7/border.bin diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc new file mode 100644 index 000000000..c4d799bfd --- /dev/null +++ b/data/layouts/SeafloorCavern_Room7/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room7_MapBorder:: @ 82DEA48 + .incbin "data/layouts/SeafloorCavern_Room7/border.bin" + +SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50 + .incbin "data/layouts/SeafloorCavern_Room7/map.bin" + + .align 2 +SeafloorCavern_Room7_Layout:: @ 82DEED0 + .4byte 0x17 + .4byte 0x19 + .4byte SeafloorCavern_Room7_MapBorder + .4byte SeafloorCavern_Room7_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/layouts/SeafloorCavern_Room7/map.bin index c1afaebcf..c1afaebcf 100644 --- a/data/maps/SeafloorCavern_Room7/map.bin +++ b/data/layouts/SeafloorCavern_Room7/map.bin diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/layouts/SeafloorCavern_Room8/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room8/border.bin +++ b/data/layouts/SeafloorCavern_Room8/border.bin diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc new file mode 100644 index 000000000..3c5ba6912 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room8/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room8_MapBorder:: @ 82DEEE8 + .incbin "data/layouts/SeafloorCavern_Room8/border.bin" + +SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0 + .incbin "data/layouts/SeafloorCavern_Room8/map.bin" + + .align 2 +SeafloorCavern_Room8_Layout:: @ 82DF024 + .4byte 0xb + .4byte 0xe + .4byte SeafloorCavern_Room8_MapBorder + .4byte SeafloorCavern_Room8_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/layouts/SeafloorCavern_Room8/map.bin index e70e95b47..e70e95b47 100644 --- a/data/maps/SeafloorCavern_Room8/map.bin +++ b/data/layouts/SeafloorCavern_Room8/map.bin diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/layouts/SeafloorCavern_Room9/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/SeafloorCavern_Room9/border.bin +++ b/data/layouts/SeafloorCavern_Room9/border.bin diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc new file mode 100644 index 000000000..c0cf63b78 --- /dev/null +++ b/data/layouts/SeafloorCavern_Room9/layout.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room9_MapBorder:: @ 82DF03C + .incbin "data/layouts/SeafloorCavern_Room9/border.bin" + +SeafloorCavern_Room9_MapBlockdata:: @ 82DF044 + .incbin "data/layouts/SeafloorCavern_Room9/map.bin" + + .align 2 +SeafloorCavern_Room9_Layout:: @ 82DF9F8 + .4byte 0x1b + .4byte 0x2e + .4byte SeafloorCavern_Room9_MapBorder + .4byte SeafloorCavern_Room9_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/layouts/SeafloorCavern_Room9/map.bin index 252112ac2..252112ac2 100644 --- a/data/maps/SeafloorCavern_Room9/map.bin +++ b/data/layouts/SeafloorCavern_Room9/map.bin diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/layouts/SealedChamber_InnerRoom/border.bin Binary files differindex 9afd13cdc..9afd13cdc 100644 --- a/data/maps/SealedChamber_InnerRoom/border.bin +++ b/data/layouts/SealedChamber_InnerRoom/border.bin diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc new file mode 100644 index 000000000..2bd90e419 --- /dev/null +++ b/data/layouts/SealedChamber_InnerRoom/layout.inc @@ -0,0 +1,14 @@ +SealedChamber_InnerRoom_MapBorder:: @ 82FE698 + .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" + +SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0 + .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" + + .align 2 +SealedChamber_InnerRoom_Layout:: @ 82FEA68 + .4byte 0x15 + .4byte 0x17 + .4byte SealedChamber_InnerRoom_MapBorder + .4byte SealedChamber_InnerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/layouts/SealedChamber_InnerRoom/map.bin index 823fa5fab..823fa5fab 100644 --- a/data/maps/SealedChamber_InnerRoom/map.bin +++ b/data/layouts/SealedChamber_InnerRoom/map.bin diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/layouts/SealedChamber_OuterRoom/border.bin Binary files differindex 9afd13cdc..9afd13cdc 100644 --- a/data/maps/SealedChamber_OuterRoom/border.bin +++ b/data/layouts/SealedChamber_OuterRoom/border.bin diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc new file mode 100644 index 000000000..f248eff53 --- /dev/null +++ b/data/layouts/SealedChamber_OuterRoom/layout.inc @@ -0,0 +1,14 @@ +SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8 + .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" + +SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0 + .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" + + .align 2 +SealedChamber_OuterRoom_Layout:: @ 82F83B8 + .4byte 0x15 + .4byte 0x17 + .4byte SealedChamber_OuterRoom_MapBorder + .4byte SealedChamber_OuterRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/layouts/SealedChamber_OuterRoom/map.bin index bf1482f97..bf1482f97 100644 --- a/data/maps/SealedChamber_OuterRoom/map.bin +++ b/data/layouts/SealedChamber_OuterRoom/map.bin diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/layouts/SecretBase_BlueCave1/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BlueCave1/border.bin +++ b/data/layouts/SecretBase_BlueCave1/border.bin diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc new file mode 100644 index 000000000..e07296cc3 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave1/layout.inc @@ -0,0 +1,14 @@ +SecretBase_BlueCave1_MapBorder:: @ 82E7888 + .incbin "data/layouts/SecretBase_BlueCave1/border.bin" + +SecretBase_BlueCave1_MapBlockdata:: @ 82E7890 + .incbin "data/layouts/SecretBase_BlueCave1/map.bin" + + .align 2 +SecretBase_BlueCave1_Layout:: @ 82E7958 + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_BlueCave1_MapBorder + .4byte SecretBase_BlueCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/layouts/SecretBase_BlueCave1/map.bin index 371b2a8d5..371b2a8d5 100644 --- a/data/maps/SecretBase_BlueCave1/map.bin +++ b/data/layouts/SecretBase_BlueCave1/map.bin diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/layouts/SecretBase_BlueCave2/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BlueCave2/border.bin +++ b/data/layouts/SecretBase_BlueCave2/border.bin diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc new file mode 100644 index 000000000..2bed0ca4f --- /dev/null +++ b/data/layouts/SecretBase_BlueCave2/layout.inc @@ -0,0 +1,14 @@ +SecretBase_BlueCave2_MapBorder:: @ 82E7E44 + .incbin "data/layouts/SecretBase_BlueCave2/border.bin" + +SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C + .incbin "data/layouts/SecretBase_BlueCave2/map.bin" + + .align 2 +SecretBase_BlueCave2_Layout:: @ 82E7F20 + .4byte 0xf + .4byte 0x7 + .4byte SecretBase_BlueCave2_MapBorder + .4byte SecretBase_BlueCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/layouts/SecretBase_BlueCave2/map.bin index 4993e5b65..4993e5b65 100644 --- a/data/maps/SecretBase_BlueCave2/map.bin +++ b/data/layouts/SecretBase_BlueCave2/map.bin diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/layouts/SecretBase_BlueCave3/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BlueCave3/border.bin +++ b/data/layouts/SecretBase_BlueCave3/border.bin diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc new file mode 100644 index 000000000..ef34dff34 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave3/layout.inc @@ -0,0 +1,14 @@ +SecretBase_BlueCave3_MapBorder:: @ 82E84C4 + .incbin "data/layouts/SecretBase_BlueCave3/border.bin" + +SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC + .incbin "data/layouts/SecretBase_BlueCave3/map.bin" + + .align 2 +SecretBase_BlueCave3_Layout:: @ 82E8620 + .4byte 0xa + .4byte 0x11 + .4byte SecretBase_BlueCave3_MapBorder + .4byte SecretBase_BlueCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/layouts/SecretBase_BlueCave3/map.bin index 968aade07..968aade07 100644 --- a/data/maps/SecretBase_BlueCave3/map.bin +++ b/data/layouts/SecretBase_BlueCave3/map.bin diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/layouts/SecretBase_BlueCave4/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BlueCave4/border.bin +++ b/data/layouts/SecretBase_BlueCave4/border.bin diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc new file mode 100644 index 000000000..b05de46b6 --- /dev/null +++ b/data/layouts/SecretBase_BlueCave4/layout.inc @@ -0,0 +1,14 @@ +SecretBase_BlueCave4_MapBorder:: @ 82E8C70 + .incbin "data/layouts/SecretBase_BlueCave4/border.bin" + +SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78 + .incbin "data/layouts/SecretBase_BlueCave4/map.bin" + + .align 2 +SecretBase_BlueCave4_Layout:: @ 82E8DAC + .4byte 0x9 + .4byte 0x11 + .4byte SecretBase_BlueCave4_MapBorder + .4byte SecretBase_BlueCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBlueCave diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/layouts/SecretBase_BlueCave4/map.bin index 631ac0f81..631ac0f81 100644 --- a/data/maps/SecretBase_BlueCave4/map.bin +++ b/data/layouts/SecretBase_BlueCave4/map.bin diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/layouts/SecretBase_BrownCave1/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BrownCave1/border.bin +++ b/data/layouts/SecretBase_BrownCave1/border.bin diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc new file mode 100644 index 000000000..8b33aa0a0 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave1/layout.inc @@ -0,0 +1,14 @@ +SecretBase_BrownCave1_MapBorder:: @ 82E77A0 + .incbin "data/layouts/SecretBase_BrownCave1/border.bin" + +SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8 + .incbin "data/layouts/SecretBase_BrownCave1/map.bin" + + .align 2 +SecretBase_BrownCave1_Layout:: @ 82E7870 + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_BrownCave1_MapBorder + .4byte SecretBase_BrownCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/layouts/SecretBase_BrownCave1/map.bin index 56d3436ca..56d3436ca 100644 --- a/data/maps/SecretBase_BrownCave1/map.bin +++ b/data/layouts/SecretBase_BrownCave1/map.bin diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/layouts/SecretBase_BrownCave2/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BrownCave2/border.bin +++ b/data/layouts/SecretBase_BrownCave2/border.bin diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc new file mode 100644 index 000000000..afce94e36 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave2/layout.inc @@ -0,0 +1,14 @@ +SecretBase_BrownCave2_MapBorder:: @ 82E7D28 + .incbin "data/layouts/SecretBase_BrownCave2/border.bin" + +SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30 + .incbin "data/layouts/SecretBase_BrownCave2/map.bin" + + .align 2 +SecretBase_BrownCave2_Layout:: @ 82E7E2C + .4byte 0xe + .4byte 0x9 + .4byte SecretBase_BrownCave2_MapBorder + .4byte SecretBase_BrownCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/layouts/SecretBase_BrownCave2/map.bin index 184896975..184896975 100644 --- a/data/maps/SecretBase_BrownCave2/map.bin +++ b/data/layouts/SecretBase_BrownCave2/map.bin diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/layouts/SecretBase_BrownCave3/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BrownCave3/border.bin +++ b/data/layouts/SecretBase_BrownCave3/border.bin diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc new file mode 100644 index 000000000..01ad3ff05 --- /dev/null +++ b/data/layouts/SecretBase_BrownCave3/layout.inc @@ -0,0 +1,14 @@ +SecretBase_BrownCave3_MapBorder:: @ 82E8358 + .incbin "data/layouts/SecretBase_BrownCave3/border.bin" + +SecretBase_BrownCave3_MapBlockdata:: @ 82E8360 + .incbin "data/layouts/SecretBase_BrownCave3/map.bin" + + .align 2 +SecretBase_BrownCave3_Layout:: @ 82E84AC + .4byte 0xf + .4byte 0xb + .4byte SecretBase_BrownCave3_MapBorder + .4byte SecretBase_BrownCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/layouts/SecretBase_BrownCave3/map.bin index d9967522a..d9967522a 100644 --- a/data/maps/SecretBase_BrownCave3/map.bin +++ b/data/layouts/SecretBase_BrownCave3/map.bin diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/layouts/SecretBase_BrownCave4/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_BrownCave4/border.bin +++ b/data/layouts/SecretBase_BrownCave4/border.bin diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc new file mode 100644 index 000000000..cb3b6288c --- /dev/null +++ b/data/layouts/SecretBase_BrownCave4/layout.inc @@ -0,0 +1,14 @@ +SecretBase_BrownCave4_MapBorder:: @ 82E8B00 + .incbin "data/layouts/SecretBase_BrownCave4/border.bin" + +SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08 + .incbin "data/layouts/SecretBase_BrownCave4/map.bin" + + .align 2 +SecretBase_BrownCave4_Layout:: @ 82E8C58 + .4byte 0xe + .4byte 0xc + .4byte SecretBase_BrownCave4_MapBorder + .4byte SecretBase_BrownCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseBrownCave diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/layouts/SecretBase_BrownCave4/map.bin index 8b5a763c4..8b5a763c4 100644 --- a/data/maps/SecretBase_BrownCave4/map.bin +++ b/data/layouts/SecretBase_BrownCave4/map.bin diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/layouts/SecretBase_RedCave1/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_RedCave1/border.bin +++ b/data/layouts/SecretBase_RedCave1/border.bin diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc new file mode 100644 index 000000000..0f93b246d --- /dev/null +++ b/data/layouts/SecretBase_RedCave1/layout.inc @@ -0,0 +1,14 @@ +SecretBase_RedCave1_MapBorder:: @ 82E76B8 + .incbin "data/layouts/SecretBase_RedCave1/border.bin" + +SecretBase_RedCave1_MapBlockdata:: @ 82E76C0 + .incbin "data/layouts/SecretBase_RedCave1/map.bin" + + .align 2 +SecretBase_RedCave1_Layout:: @ 82E7788 + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_RedCave1_MapBorder + .4byte SecretBase_RedCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/layouts/SecretBase_RedCave1/map.bin index ce666b57d..ce666b57d 100644 --- a/data/maps/SecretBase_RedCave1/map.bin +++ b/data/layouts/SecretBase_RedCave1/map.bin diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/layouts/SecretBase_RedCave2/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_RedCave2/border.bin +++ b/data/layouts/SecretBase_RedCave2/border.bin diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc new file mode 100644 index 000000000..f3a14a012 --- /dev/null +++ b/data/layouts/SecretBase_RedCave2/layout.inc @@ -0,0 +1,14 @@ +SecretBase_RedCave2_MapBorder:: @ 82E7C28 + .incbin "data/layouts/SecretBase_RedCave2/border.bin" + +SecretBase_RedCave2_MapBlockdata:: @ 82E7C30 + .incbin "data/layouts/SecretBase_RedCave2/map.bin" + + .align 2 +SecretBase_RedCave2_Layout:: @ 82E7D10 + .4byte 0x7 + .4byte 0x10 + .4byte SecretBase_RedCave2_MapBorder + .4byte SecretBase_RedCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/layouts/SecretBase_RedCave2/map.bin index 4fa03acfe..4fa03acfe 100644 --- a/data/maps/SecretBase_RedCave2/map.bin +++ b/data/layouts/SecretBase_RedCave2/map.bin diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/layouts/SecretBase_RedCave3/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_RedCave3/border.bin +++ b/data/layouts/SecretBase_RedCave3/border.bin diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc new file mode 100644 index 000000000..6cd683f8e --- /dev/null +++ b/data/layouts/SecretBase_RedCave3/layout.inc @@ -0,0 +1,14 @@ +SecretBase_RedCave3_MapBorder:: @ 82E8248 + .incbin "data/layouts/SecretBase_RedCave3/border.bin" + +SecretBase_RedCave3_MapBlockdata:: @ 82E8250 + .incbin "data/layouts/SecretBase_RedCave3/map.bin" + + .align 2 +SecretBase_RedCave3_Layout:: @ 82E8340 + .4byte 0xf + .4byte 0x8 + .4byte SecretBase_RedCave3_MapBorder + .4byte SecretBase_RedCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/layouts/SecretBase_RedCave3/map.bin index 0528e565d..0528e565d 100644 --- a/data/maps/SecretBase_RedCave3/map.bin +++ b/data/layouts/SecretBase_RedCave3/map.bin diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/layouts/SecretBase_RedCave4/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_RedCave4/border.bin +++ b/data/layouts/SecretBase_RedCave4/border.bin diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc new file mode 100644 index 000000000..1baa61276 --- /dev/null +++ b/data/layouts/SecretBase_RedCave4/layout.inc @@ -0,0 +1,14 @@ +SecretBase_RedCave4_MapBorder:: @ 82E89D0 + .incbin "data/layouts/SecretBase_RedCave4/border.bin" + +SecretBase_RedCave4_MapBlockdata:: @ 82E89D8 + .incbin "data/layouts/SecretBase_RedCave4/map.bin" + + .align 2 +SecretBase_RedCave4_Layout:: @ 82E8AE8 + .4byte 0x9 + .4byte 0xf + .4byte SecretBase_RedCave4_MapBorder + .4byte SecretBase_RedCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseRedCave diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/layouts/SecretBase_RedCave4/map.bin index 526763290..526763290 100644 --- a/data/maps/SecretBase_RedCave4/map.bin +++ b/data/layouts/SecretBase_RedCave4/map.bin diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/layouts/SecretBase_Shrub1/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Shrub1/border.bin +++ b/data/layouts/SecretBase_Shrub1/border.bin diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc new file mode 100644 index 000000000..68cbf0df3 --- /dev/null +++ b/data/layouts/SecretBase_Shrub1/layout.inc @@ -0,0 +1,14 @@ +SecretBase_Shrub1_MapBorder:: @ 82E7B40 + .incbin "data/layouts/SecretBase_Shrub1/border.bin" + +SecretBase_Shrub1_MapBlockdata:: @ 82E7B48 + .incbin "data/layouts/SecretBase_Shrub1/map.bin" + + .align 2 +SecretBase_Shrub1_Layout:: @ 82E7C10 + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_Shrub1_MapBorder + .4byte SecretBase_Shrub1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/layouts/SecretBase_Shrub1/map.bin index 4b566cc1b..4b566cc1b 100644 --- a/data/maps/SecretBase_Shrub1/map.bin +++ b/data/layouts/SecretBase_Shrub1/map.bin diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/layouts/SecretBase_Shrub2/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Shrub2/border.bin +++ b/data/layouts/SecretBase_Shrub2/border.bin diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc new file mode 100644 index 000000000..8e246a6ad --- /dev/null +++ b/data/layouts/SecretBase_Shrub2/layout.inc @@ -0,0 +1,14 @@ +SecretBase_Shrub2_MapBorder:: @ 82E8154 + .incbin "data/layouts/SecretBase_Shrub2/border.bin" + +SecretBase_Shrub2_MapBlockdata:: @ 82E815C + .incbin "data/layouts/SecretBase_Shrub2/map.bin" + + .align 2 +SecretBase_Shrub2_Layout:: @ 82E8230 + .4byte 0xf + .4byte 0x7 + .4byte SecretBase_Shrub2_MapBorder + .4byte SecretBase_Shrub2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/layouts/SecretBase_Shrub2/map.bin index 8cb88cc44..8cb88cc44 100644 --- a/data/maps/SecretBase_Shrub2/map.bin +++ b/data/layouts/SecretBase_Shrub2/map.bin diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/layouts/SecretBase_Shrub3/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Shrub3/border.bin +++ b/data/layouts/SecretBase_Shrub3/border.bin diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc new file mode 100644 index 000000000..ddae76b6e --- /dev/null +++ b/data/layouts/SecretBase_Shrub3/layout.inc @@ -0,0 +1,14 @@ +SecretBase_Shrub3_MapBorder:: @ 82E8890 + .incbin "data/layouts/SecretBase_Shrub3/border.bin" + +SecretBase_Shrub3_MapBlockdata:: @ 82E8898 + .incbin "data/layouts/SecretBase_Shrub3/map.bin" + + .align 2 +SecretBase_Shrub3_Layout:: @ 82E89B8 + .4byte 0xd + .4byte 0xb + .4byte SecretBase_Shrub3_MapBorder + .4byte SecretBase_Shrub3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/layouts/SecretBase_Shrub3/map.bin index d51aeea21..d51aeea21 100644 --- a/data/maps/SecretBase_Shrub3/map.bin +++ b/data/layouts/SecretBase_Shrub3/map.bin diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/layouts/SecretBase_Shrub4/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Shrub4/border.bin +++ b/data/layouts/SecretBase_Shrub4/border.bin diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc new file mode 100644 index 000000000..62ddf14f0 --- /dev/null +++ b/data/layouts/SecretBase_Shrub4/layout.inc @@ -0,0 +1,14 @@ +SecretBase_Shrub4_MapBorder:: @ 82E90F8 + .incbin "data/layouts/SecretBase_Shrub4/border.bin" + +SecretBase_Shrub4_MapBlockdata:: @ 82E9100 + .incbin "data/layouts/SecretBase_Shrub4/map.bin" + + .align 2 +SecretBase_Shrub4_Layout:: @ 82E9234 + .4byte 0xe + .4byte 0xb + .4byte SecretBase_Shrub4_MapBorder + .4byte SecretBase_Shrub4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseShrub diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/layouts/SecretBase_Shrub4/map.bin index 8a4cf836d..8a4cf836d 100644 --- a/data/maps/SecretBase_Shrub4/map.bin +++ b/data/layouts/SecretBase_Shrub4/map.bin diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/layouts/SecretBase_Tree1/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Tree1/border.bin +++ b/data/layouts/SecretBase_Tree1/border.bin diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc new file mode 100644 index 000000000..3b29d0302 --- /dev/null +++ b/data/layouts/SecretBase_Tree1/layout.inc @@ -0,0 +1,14 @@ +SecretBase_Tree1_MapBorder:: @ 82E7A58 + .incbin "data/layouts/SecretBase_Tree1/border.bin" + +SecretBase_Tree1_MapBlockdata:: @ 82E7A60 + .incbin "data/layouts/SecretBase_Tree1/map.bin" + + .align 2 +SecretBase_Tree1_Layout:: @ 82E7B28 + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_Tree1_MapBorder + .4byte SecretBase_Tree1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/layouts/SecretBase_Tree1/map.bin index 907f1486a..907f1486a 100644 --- a/data/maps/SecretBase_Tree1/map.bin +++ b/data/layouts/SecretBase_Tree1/map.bin diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/layouts/SecretBase_Tree2/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Tree2/border.bin +++ b/data/layouts/SecretBase_Tree2/border.bin diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc new file mode 100644 index 000000000..71722bcdb --- /dev/null +++ b/data/layouts/SecretBase_Tree2/layout.inc @@ -0,0 +1,14 @@ +SecretBase_Tree2_MapBorder:: @ 82E8054 + .incbin "data/layouts/SecretBase_Tree2/border.bin" + +SecretBase_Tree2_MapBlockdata:: @ 82E805C + .incbin "data/layouts/SecretBase_Tree2/map.bin" + + .align 2 +SecretBase_Tree2_Layout:: @ 82E813C + .4byte 0x7 + .4byte 0x10 + .4byte SecretBase_Tree2_MapBorder + .4byte SecretBase_Tree2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/layouts/SecretBase_Tree2/map.bin index c2e5698b0..c2e5698b0 100644 --- a/data/maps/SecretBase_Tree2/map.bin +++ b/data/layouts/SecretBase_Tree2/map.bin diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Tree3/border.bin +++ b/data/layouts/SecretBase_Tree3/border.bin diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc new file mode 100644 index 000000000..425369a5f --- /dev/null +++ b/data/layouts/SecretBase_Tree3/layout.inc @@ -0,0 +1,14 @@ +SecretBase_Tree3_MapBorder:: @ 82E8760 + .incbin "data/layouts/SecretBase_Tree3/border.bin" + +SecretBase_Tree3_MapBlockdata:: @ 82E8768 + .incbin "data/layouts/SecretBase_Tree3/map.bin" + + .align 2 +SecretBase_Tree3_Layout:: @ 82E8878 + .4byte 0x11 + .4byte 0x8 + .4byte SecretBase_Tree3_MapBorder + .4byte SecretBase_Tree3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/layouts/SecretBase_Tree3/map.bin index b6ae04b00..b6ae04b00 100644 --- a/data/maps/SecretBase_Tree3/map.bin +++ b/data/layouts/SecretBase_Tree3/map.bin diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin index 064786e8c..064786e8c 100644 --- a/data/maps/SecretBase_Tree4/border.bin +++ b/data/layouts/SecretBase_Tree4/border.bin diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc new file mode 100644 index 000000000..85b921292 --- /dev/null +++ b/data/layouts/SecretBase_Tree4/layout.inc @@ -0,0 +1,14 @@ +SecretBase_Tree4_MapBorder:: @ 82E8F50 + .incbin "data/layouts/SecretBase_Tree4/border.bin" + +SecretBase_Tree4_MapBlockdata:: @ 82E8F58 + .incbin "data/layouts/SecretBase_Tree4/map.bin" + + .align 2 +SecretBase_Tree4_Layout:: @ 82E90E0 + .4byte 0xe + .4byte 0xe + .4byte SecretBase_Tree4_MapBorder + .4byte SecretBase_Tree4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseTree diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/layouts/SecretBase_Tree4/map.bin index b3b381d9e..b3b381d9e 100644 --- a/data/maps/SecretBase_Tree4/map.bin +++ b/data/layouts/SecretBase_Tree4/map.bin diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/layouts/SecretBase_YellowCave1/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_YellowCave1/border.bin +++ b/data/layouts/SecretBase_YellowCave1/border.bin diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc new file mode 100644 index 000000000..6ae6cddf1 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave1/layout.inc @@ -0,0 +1,14 @@ +SecretBase_YellowCave1_MapBorder:: @ 82E7970 + .incbin "data/layouts/SecretBase_YellowCave1/border.bin" + +SecretBase_YellowCave1_MapBlockdata:: @ 82E7978 + .incbin "data/layouts/SecretBase_YellowCave1/map.bin" + + .align 2 +SecretBase_YellowCave1_Layout:: @ 82E7A40 + .4byte 0xb + .4byte 0x9 + .4byte SecretBase_YellowCave1_MapBorder + .4byte SecretBase_YellowCave1_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/layouts/SecretBase_YellowCave1/map.bin index 1301e7317..1301e7317 100644 --- a/data/maps/SecretBase_YellowCave1/map.bin +++ b/data/layouts/SecretBase_YellowCave1/map.bin diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/layouts/SecretBase_YellowCave2/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_YellowCave2/border.bin +++ b/data/layouts/SecretBase_YellowCave2/border.bin diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc new file mode 100644 index 000000000..dc206e31d --- /dev/null +++ b/data/layouts/SecretBase_YellowCave2/layout.inc @@ -0,0 +1,14 @@ +SecretBase_YellowCave2_MapBorder:: @ 82E7F38 + .incbin "data/layouts/SecretBase_YellowCave2/border.bin" + +SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40 + .incbin "data/layouts/SecretBase_YellowCave2/map.bin" + + .align 2 +SecretBase_YellowCave2_Layout:: @ 82E803C + .4byte 0xe + .4byte 0x9 + .4byte SecretBase_YellowCave2_MapBorder + .4byte SecretBase_YellowCave2_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/layouts/SecretBase_YellowCave2/map.bin index e18cb47c6..e18cb47c6 100644 --- a/data/maps/SecretBase_YellowCave2/map.bin +++ b/data/layouts/SecretBase_YellowCave2/map.bin diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/layouts/SecretBase_YellowCave3/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_YellowCave3/border.bin +++ b/data/layouts/SecretBase_YellowCave3/border.bin diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc new file mode 100644 index 000000000..af6b14601 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave3/layout.inc @@ -0,0 +1,14 @@ +SecretBase_YellowCave3_MapBorder:: @ 82E8638 + .incbin "data/layouts/SecretBase_YellowCave3/border.bin" + +SecretBase_YellowCave3_MapBlockdata:: @ 82E8640 + .incbin "data/layouts/SecretBase_YellowCave3/map.bin" + + .align 2 +SecretBase_YellowCave3_Layout:: @ 82E8748 + .4byte 0xc + .4byte 0xb + .4byte SecretBase_YellowCave3_MapBorder + .4byte SecretBase_YellowCave3_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/layouts/SecretBase_YellowCave3/map.bin index b7d80a0ab..b7d80a0ab 100644 --- a/data/maps/SecretBase_YellowCave3/map.bin +++ b/data/layouts/SecretBase_YellowCave3/map.bin diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/layouts/SecretBase_YellowCave4/border.bin index 5c0908a6a..5c0908a6a 100644 --- a/data/maps/SecretBase_YellowCave4/border.bin +++ b/data/layouts/SecretBase_YellowCave4/border.bin diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc new file mode 100644 index 000000000..94bf59ab5 --- /dev/null +++ b/data/layouts/SecretBase_YellowCave4/layout.inc @@ -0,0 +1,14 @@ +SecretBase_YellowCave4_MapBorder:: @ 82E8DC4 + .incbin "data/layouts/SecretBase_YellowCave4/border.bin" + +SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC + .incbin "data/layouts/SecretBase_YellowCave4/map.bin" + + .align 2 +SecretBase_YellowCave4_Layout:: @ 82E8F38 + .4byte 0xd + .4byte 0xe + .4byte SecretBase_YellowCave4_MapBorder + .4byte SecretBase_YellowCave4_MapBlockdata + .4byte gTileset_SecretBase + .4byte gTileset_SecretBaseYellowCave diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/layouts/SecretBase_YellowCave4/map.bin index d3c3e0204..d3c3e0204 100644 --- a/data/maps/SecretBase_YellowCave4/map.bin +++ b/data/layouts/SecretBase_YellowCave4/map.bin diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc new file mode 100644 index 000000000..5745b09c2 --- /dev/null +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc @@ -0,0 +1,14 @@ +ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40 + .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" + +ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48 + .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" + + .align 2 +ShoalCave_HighTideEntranceRoom_Layout:: @ 82E47DC + .4byte 0x23 + .4byte 0x23 + .4byte ShoalCave_HighTideEntranceRoom_MapBorder + .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin index 0e4b88c8f..0e4b88c8f 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/border.bin +++ b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc new file mode 100644 index 000000000..d95827791 --- /dev/null +++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc @@ -0,0 +1,14 @@ +ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4 + .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" + +ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC + .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" + + .align 2 +ShoalCave_HighTideInnerRoom_Layout:: @ 82E55A4 + .4byte 0x2e + .4byte 0x26 + .4byte ShoalCave_HighTideInnerRoom_MapBorder + .4byte ShoalCave_HighTideInnerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin index c540a4008..c540a4008 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.bin +++ b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc new file mode 100644 index 000000000..ceb41f7e8 --- /dev/null +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8 + .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin" + +ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0 + .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" + + .align 2 +ShoalCave_LowTideEntranceRoom_Layout:: @ 82E2A44 + .4byte 0x23 + .4byte 0x23 + .4byte ShoalCave_LowTideEntranceRoom_MapBorder + .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin index 1cf7c87f2..1cf7c87f2 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideIceRoom/border.bin b/data/layouts/ShoalCave_LowTideIceRoom/border.bin index 206bd63f8..206bd63f8 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideIceRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc new file mode 100644 index 000000000..b2ef09f0e --- /dev/null +++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C + .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin" + +ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4 + .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin" + + .align 2 +ShoalCave_LowTideIceRoom_Layout:: @ 8304754 + .4byte 0x14 + .4byte 0x1e + .4byte ShoalCave_LowTideIceRoom_MapBorder + .4byte ShoalCave_LowTideIceRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.bin b/data/layouts/ShoalCave_LowTideIceRoom/map.bin index 222f1f26c..222f1f26c 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideIceRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc new file mode 100644 index 000000000..10a1948ca --- /dev/null +++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C + .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin" + +ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64 + .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" + + .align 2 +ShoalCave_LowTideInnerRoom_Layout:: @ 82E380C + .4byte 0x2e + .4byte 0x26 + .4byte ShoalCave_LowTideInnerRoom_MapBorder + .4byte ShoalCave_LowTideInnerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.bin b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin index 87df28cf4..87df28cf4 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc new file mode 100644 index 000000000..c57b1b20e --- /dev/null +++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC + .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin" + +ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4 + .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" + + .align 2 +ShoalCave_LowTideLowerRoom_Layout:: @ 82E3E28 + .4byte 0x1f + .4byte 0xe + .4byte ShoalCave_LowTideLowerRoom_MapBorder + .4byte ShoalCave_LowTideLowerRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.bin b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin index 04bf2baf3..04bf2baf3 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin diff --git a/data/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/border.bin +++ b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc new file mode 100644 index 000000000..ded7e7cfb --- /dev/null +++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc @@ -0,0 +1,14 @@ +ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824 + .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin" + +ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C + .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" + + .align 2 +ShoalCave_LowTideStairsRoom_Layout:: @ 82E3AA4 + .4byte 0x15 + .4byte 0xf + .4byte ShoalCave_LowTideStairsRoom_MapBorder + .4byte ShoalCave_LowTideStairsRoom_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.bin b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin index f2b56644d..f2b56644d 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.bin +++ b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin diff --git a/data/maps/SkyPillar_1F/border.bin b/data/layouts/SingleBattleColosseum/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_1F/border.bin +++ b/data/layouts/SingleBattleColosseum/border.bin diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc new file mode 100644 index 000000000..636af1a0f --- /dev/null +++ b/data/layouts/SingleBattleColosseum/layout.inc @@ -0,0 +1,14 @@ +SingleBattleColosseum_MapBorder:: @ 82E924C + .incbin "data/layouts/SingleBattleColosseum/border.bin" + +SingleBattleColosseum_MapBlockdata:: @ 82E9254 + .incbin "data/layouts/SingleBattleColosseum/map.bin" + + .align 2 +SingleBattleColosseum_Layout:: @ 82E9350 + .4byte 0xe + .4byte 0x9 + .4byte SingleBattleColosseum_MapBorder + .4byte SingleBattleColosseum_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/layouts/SingleBattleColosseum/map.bin index 1f66ab707..1f66ab707 100644 --- a/data/maps/SingleBattleColosseum/map.bin +++ b/data/layouts/SingleBattleColosseum/map.bin diff --git a/data/maps/SkyPillar_2F/border.bin b/data/layouts/SkyPillar_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_2F/border.bin +++ b/data/layouts/SkyPillar_1F/border.bin diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc new file mode 100644 index 000000000..e53e06ff2 --- /dev/null +++ b/data/layouts/SkyPillar_1F/layout.inc @@ -0,0 +1,14 @@ +SkyPillar_1F_MapBorder:: @ 8303158 + .incbin "data/layouts/SkyPillar_1F/border.bin" + +SkyPillar_1F_MapBlockdata:: @ 8303160 + .incbin "data/layouts/SkyPillar_1F/map.bin" + + .align 2 +SkyPillar_1F_Layout:: @ 83032E8 + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_1F_MapBorder + .4byte SkyPillar_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_1F/map.bin b/data/layouts/SkyPillar_1F/map.bin index 1eb299c49..1eb299c49 100644 --- a/data/maps/SkyPillar_1F/map.bin +++ b/data/layouts/SkyPillar_1F/map.bin diff --git a/data/maps/SkyPillar_3F/border.bin b/data/layouts/SkyPillar_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_3F/border.bin +++ b/data/layouts/SkyPillar_2F/border.bin diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc new file mode 100644 index 000000000..67cf18b57 --- /dev/null +++ b/data/layouts/SkyPillar_2F/layout.inc @@ -0,0 +1,14 @@ +SkyPillar_2F_MapBorder:: @ 8303300 + .incbin "data/layouts/SkyPillar_2F/border.bin" + +SkyPillar_2F_MapBlockdata:: @ 8303308 + .incbin "data/layouts/SkyPillar_2F/map.bin" + + .align 2 +SkyPillar_2F_Layout:: @ 8303490 + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_2F_MapBorder + .4byte SkyPillar_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_2F/map.bin b/data/layouts/SkyPillar_2F/map.bin index 8ec9bf213..8ec9bf213 100644 --- a/data/maps/SkyPillar_2F/map.bin +++ b/data/layouts/SkyPillar_2F/map.bin diff --git a/data/maps/SkyPillar_4F/border.bin b/data/layouts/SkyPillar_3F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_4F/border.bin +++ b/data/layouts/SkyPillar_3F/border.bin diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc new file mode 100644 index 000000000..533a1ca2d --- /dev/null +++ b/data/layouts/SkyPillar_3F/layout.inc @@ -0,0 +1,14 @@ +SkyPillar_3F_MapBorder:: @ 83034A8 + .incbin "data/layouts/SkyPillar_3F/border.bin" + +SkyPillar_3F_MapBlockdata:: @ 83034B0 + .incbin "data/layouts/SkyPillar_3F/map.bin" + + .align 2 +SkyPillar_3F_Layout:: @ 8303638 + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_3F_MapBorder + .4byte SkyPillar_3F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_3F/map.bin b/data/layouts/SkyPillar_3F/map.bin index d6c76d48c..d6c76d48c 100644 --- a/data/maps/SkyPillar_3F/map.bin +++ b/data/layouts/SkyPillar_3F/map.bin diff --git a/data/maps/SkyPillar_5F/border.bin b/data/layouts/SkyPillar_4F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SkyPillar_5F/border.bin +++ b/data/layouts/SkyPillar_4F/border.bin diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc new file mode 100644 index 000000000..c4a651ea1 --- /dev/null +++ b/data/layouts/SkyPillar_4F/layout.inc @@ -0,0 +1,14 @@ +SkyPillar_4F_MapBorder:: @ 8303650 + .incbin "data/layouts/SkyPillar_4F/border.bin" + +SkyPillar_4F_MapBlockdata:: @ 8303658 + .incbin "data/layouts/SkyPillar_4F/map.bin" + + .align 2 +SkyPillar_4F_Layout:: @ 83037E0 + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_4F_MapBorder + .4byte SkyPillar_4F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_4F/map.bin b/data/layouts/SkyPillar_4F/map.bin index 02e82bb4f..02e82bb4f 100644 --- a/data/maps/SkyPillar_4F/map.bin +++ b/data/layouts/SkyPillar_4F/map.bin diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/layouts/SkyPillar_5F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SlateportCity_Harbor/border.bin +++ b/data/layouts/SkyPillar_5F/border.bin diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc new file mode 100644 index 000000000..ed9c9b0d0 --- /dev/null +++ b/data/layouts/SkyPillar_5F/layout.inc @@ -0,0 +1,14 @@ +SkyPillar_5F_MapBorder:: @ 8304840 + .incbin "data/layouts/SkyPillar_5F/border.bin" + +SkyPillar_5F_MapBlockdata:: @ 8304848 + .incbin "data/layouts/SkyPillar_5F/map.bin" + + .align 2 +SkyPillar_5F_Layout:: @ 83049D0 + .4byte 0xe + .4byte 0xe + .4byte SkyPillar_5F_MapBorder + .4byte SkyPillar_5F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_5F/map.bin b/data/layouts/SkyPillar_5F/map.bin index b8cd541d5..b8cd541d5 100644 --- a/data/maps/SkyPillar_5F/map.bin +++ b/data/layouts/SkyPillar_5F/map.bin diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/layouts/SkyPillar_Entrance/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/SkyPillar_Entrance/border.bin +++ b/data/layouts/SkyPillar_Entrance/border.bin diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc new file mode 100644 index 000000000..1523383e3 --- /dev/null +++ b/data/layouts/SkyPillar_Entrance/layout.inc @@ -0,0 +1,14 @@ +SkyPillar_Entrance_MapBorder:: @ 8302988 + .incbin "data/layouts/SkyPillar_Entrance/border.bin" + +SkyPillar_Entrance_MapBlockdata:: @ 8302990 + .incbin "data/layouts/SkyPillar_Entrance/map.bin" + + .align 2 +SkyPillar_Entrance_Layout:: @ 8302C18 + .4byte 0x12 + .4byte 0x12 + .4byte SkyPillar_Entrance_MapBorder + .4byte SkyPillar_Entrance_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/SkyPillar_Entrance/map.bin b/data/layouts/SkyPillar_Entrance/map.bin index b215b86ef..b215b86ef 100644 --- a/data/maps/SkyPillar_Entrance/map.bin +++ b/data/layouts/SkyPillar_Entrance/map.bin diff --git a/data/maps/SkyPillar_Outside/border.bin b/data/layouts/SkyPillar_Outside/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/SkyPillar_Outside/border.bin +++ b/data/layouts/SkyPillar_Outside/border.bin diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc new file mode 100644 index 000000000..f535e7bc6 --- /dev/null +++ b/data/layouts/SkyPillar_Outside/layout.inc @@ -0,0 +1,14 @@ +SkyPillar_Outside_MapBorder:: @ 8302C30 + .incbin "data/layouts/SkyPillar_Outside/border.bin" + +SkyPillar_Outside_MapBlockdata:: @ 8302C38 + .incbin "data/layouts/SkyPillar_Outside/map.bin" + + .align 2 +SkyPillar_Outside_Layout:: @ 8303140 + .4byte 0x1c + .4byte 0x17 + .4byte SkyPillar_Outside_MapBorder + .4byte SkyPillar_Outside_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_Outside/map.bin b/data/layouts/SkyPillar_Outside/map.bin index 4517589d0..4517589d0 100644 --- a/data/maps/SkyPillar_Outside/map.bin +++ b/data/layouts/SkyPillar_Outside/map.bin diff --git a/data/maps/SkyPillar_Top/border.bin b/data/layouts/SkyPillar_Top/border.bin Binary files differindex e0241fa60..e0241fa60 100644 --- a/data/maps/SkyPillar_Top/border.bin +++ b/data/layouts/SkyPillar_Top/border.bin diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc new file mode 100644 index 000000000..ee456e707 --- /dev/null +++ b/data/layouts/SkyPillar_Top/layout.inc @@ -0,0 +1,14 @@ +SkyPillar_Top_MapBorder:: @ 83049E8 + .incbin "data/layouts/SkyPillar_Top/border.bin" + +SkyPillar_Top_MapBlockdata:: @ 83049F0 + .incbin "data/layouts/SkyPillar_Top/map.bin" + + .align 2 +SkyPillar_Top_Layout:: @ 8304F00 + .4byte 0x1b + .4byte 0x18 + .4byte SkyPillar_Top_MapBorder + .4byte SkyPillar_Top_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/SkyPillar_Top/map.bin b/data/layouts/SkyPillar_Top/map.bin index fe6c2ad43..fe6c2ad43 100644 --- a/data/maps/SkyPillar_Top/map.bin +++ b/data/layouts/SkyPillar_Top/map.bin diff --git a/data/maps/SlateportCity/border.bin b/data/layouts/SlateportCity/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/SlateportCity/border.bin +++ b/data/layouts/SlateportCity/border.bin diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc new file mode 100644 index 000000000..2d52b7280 --- /dev/null +++ b/data/layouts/SlateportCity/layout.inc @@ -0,0 +1,14 @@ +SlateportCity_MapBorder:: @ 828798C + .incbin "data/layouts/SlateportCity/border.bin" + +SlateportCity_MapBlockdata:: @ 8287994 + .incbin "data/layouts/SlateportCity/map.bin" + + .align 2 +SlateportCity_Layout:: @ 8288C54 + .4byte 0x28 + .4byte 0x3c + .4byte SlateportCity_MapBorder + .4byte SlateportCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Slateport diff --git a/data/maps/SlateportCity/map.bin b/data/layouts/SlateportCity/map.bin Binary files differindex 97046ab59..97046ab59 100644 --- a/data/maps/SlateportCity/map.bin +++ b/data/layouts/SlateportCity/map.bin diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc new file mode 100644 index 000000000..ab05ae00f --- /dev/null +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc @@ -0,0 +1,14 @@ +SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768 + .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin" + +SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770 + .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" + + .align 2 +SlateportCity_OceanicMuseum_1F_Layout:: @ 82D08D8 + .4byte 0x14 + .4byte 0x9 + .4byte SlateportCity_OceanicMuseum_1F_MapBorder + .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_OceanicMuseum diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin index f18b01e49..f18b01e49 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc new file mode 100644 index 000000000..75f2d93ae --- /dev/null +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc @@ -0,0 +1,14 @@ +SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0 + .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin" + +SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8 + .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" + + .align 2 +SlateportCity_OceanicMuseum_2F_Layout:: @ 82D0A60 + .4byte 0x14 + .4byte 0x9 + .4byte SlateportCity_OceanicMuseum_2F_MapBorder + .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_OceanicMuseum diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin index 1fa2cdc18..1fa2cdc18 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/layouts/SlateportCity_PokemonFanClub/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SlateportCity_PokemonFanClub/border.bin +++ b/data/layouts/SlateportCity_PokemonFanClub/border.bin diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc new file mode 100644 index 000000000..3013872d5 --- /dev/null +++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc @@ -0,0 +1,14 @@ +SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614 + .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" + +SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C + .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" + + .align 2 +SlateportCity_PokemonFanClub_Layout:: @ 82D0750 + .4byte 0xe + .4byte 0xb + .4byte SlateportCity_PokemonFanClub_MapBorder + .4byte SlateportCity_PokemonFanClub_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_PokemonFanClub diff --git a/data/maps/SlateportCity_PokemonFanClub/map.bin b/data/layouts/SlateportCity_PokemonFanClub/map.bin Binary files differindex 71ae8c7c9..71ae8c7c9 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.bin +++ b/data/layouts/SlateportCity_PokemonFanClub/map.bin diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/border.bin +++ b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc new file mode 100644 index 000000000..59e301313 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc @@ -0,0 +1,14 @@ +SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114 + .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin" + +SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C + .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" + + .align 2 +SlateportCity_SternsShipyard_1F_Layout:: @ 82D0394 + .4byte 0x15 + .4byte 0xf + .4byte SlateportCity_SternsShipyard_1F_MapBorder + .4byte SlateportCity_SternsShipyard_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin index 036f5ce26..036f5ce26 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.bin +++ b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin diff --git a/data/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/border.bin +++ b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc new file mode 100644 index 000000000..4e3bcfb46 --- /dev/null +++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc @@ -0,0 +1,14 @@ +SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC + .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin" + +SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4 + .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" + + .align 2 +SlateportCity_SternsShipyard_2F_Layout:: @ 82D05B4 + .4byte 0x11 + .4byte 0xf + .4byte SlateportCity_SternsShipyard_2F_MapBorder + .4byte SlateportCity_SternsShipyard_2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Facility diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin index d10ed2ac2..d10ed2ac2 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.bin +++ b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin diff --git a/data/maps/SootopolisCity/border.bin b/data/layouts/SootopolisCity/border.bin index c07869a9f..c07869a9f 100644 --- a/data/maps/SootopolisCity/border.bin +++ b/data/layouts/SootopolisCity/border.bin diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc new file mode 100644 index 000000000..d5643288d --- /dev/null +++ b/data/layouts/SootopolisCity/layout.inc @@ -0,0 +1,14 @@ +SootopolisCity_MapBorder:: @ 828DE4C + .incbin "data/layouts/SootopolisCity/border.bin" + +SootopolisCity_MapBlockdata:: @ 828DE54 + .incbin "data/layouts/SootopolisCity/map.bin" + + .align 2 +SootopolisCity_Layout:: @ 828FA74 + .4byte 0x3c + .4byte 0x3c + .4byte SootopolisCity_MapBorder + .4byte SootopolisCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Sootopolis diff --git a/data/maps/SootopolisCity/map.bin b/data/layouts/SootopolisCity/map.bin index 4269e22a6..4269e22a6 100644 --- a/data/maps/SootopolisCity/map.bin +++ b/data/layouts/SootopolisCity/map.bin diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/layouts/SootopolisCity_Gym_1F/border.bin index 12819766e..12819766e 100644 --- a/data/maps/SootopolisCity_Gym_1F/border.bin +++ b/data/layouts/SootopolisCity_Gym_1F/border.bin diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc new file mode 100644 index 000000000..a38d2f5a2 --- /dev/null +++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc @@ -0,0 +1,14 @@ +SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90 + .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin" + +SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98 + .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin" + + .align 2 +SootopolisCity_Gym_1F_Layout:: @ 82D3F0C + .4byte 0x11 + .4byte 0x1a + .4byte SootopolisCity_Gym_1F_MapBorder + .4byte SootopolisCity_Gym_1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_SootopolisGym diff --git a/data/maps/SootopolisCity_Gym_1F/map.bin b/data/layouts/SootopolisCity_Gym_1F/map.bin index a4a20d477..a4a20d477 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.bin +++ b/data/layouts/SootopolisCity_Gym_1F/map.bin diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/layouts/SootopolisCity_Gym_B1F/border.bin index 12819766e..12819766e 100644 --- a/data/maps/SootopolisCity_Gym_B1F/border.bin +++ b/data/layouts/SootopolisCity_Gym_B1F/border.bin diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc new file mode 100644 index 000000000..cf568b83a --- /dev/null +++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc @@ -0,0 +1,14 @@ +SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24 + .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin" + +SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C + .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin" + + .align 2 +SootopolisCity_Gym_B1F_Layout:: @ 82D42A0 + .4byte 0x11 + .4byte 0x1a + .4byte SootopolisCity_Gym_B1F_MapBorder + .4byte SootopolisCity_Gym_B1F_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_SootopolisGym diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/layouts/SootopolisCity_Gym_B1F/map.bin index eb73a4d2f..eb73a4d2f 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.bin +++ b/data/layouts/SootopolisCity_Gym_B1F/map.bin diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SootopolisCity_House1/border.bin +++ b/data/layouts/SootopolisCity_House1/border.bin diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc new file mode 100644 index 000000000..b202d6bd1 --- /dev/null +++ b/data/layouts/SootopolisCity_House1/layout.inc @@ -0,0 +1,14 @@ +SootopolisCity_House1_MapBorder:: @ 82FEC48 + .incbin "data/layouts/SootopolisCity_House1/border.bin" + +SootopolisCity_House1_MapBlockdata:: @ 82FEC50 + .incbin "data/layouts/SootopolisCity_House1/map.bin" + + .align 2 +SootopolisCity_House1_Layout:: @ 82FECC0 + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House1_MapBorder + .4byte SootopolisCity_House1_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/layouts/SootopolisCity_House1/map.bin index 43f11b194..43f11b194 100644 --- a/data/maps/SootopolisCity_House1/map.bin +++ b/data/layouts/SootopolisCity_House1/map.bin diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SootopolisCity_House2/border.bin +++ b/data/layouts/SootopolisCity_House2/border.bin diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc new file mode 100644 index 000000000..e57feaf86 --- /dev/null +++ b/data/layouts/SootopolisCity_House2/layout.inc @@ -0,0 +1,14 @@ +SootopolisCity_House2_MapBorder:: @ 82FECD8 + .incbin "data/layouts/SootopolisCity_House2/border.bin" + +SootopolisCity_House2_MapBlockdata:: @ 82FECE0 + .incbin "data/layouts/SootopolisCity_House2/map.bin" + + .align 2 +SootopolisCity_House2_Layout:: @ 82FED50 + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House2_MapBorder + .4byte SootopolisCity_House2_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/layouts/SootopolisCity_House2/map.bin index 632e1e36a..632e1e36a 100644 --- a/data/maps/SootopolisCity_House2/map.bin +++ b/data/layouts/SootopolisCity_House2/map.bin diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin index 19d906679..19d906679 100644 --- a/data/maps/SootopolisCity_House3/border.bin +++ b/data/layouts/SootopolisCity_House3/border.bin diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc new file mode 100644 index 000000000..f86339f3b --- /dev/null +++ b/data/layouts/SootopolisCity_House3/layout.inc @@ -0,0 +1,14 @@ +SootopolisCity_House3_MapBorder:: @ 82FED68 + .incbin "data/layouts/SootopolisCity_House3/border.bin" + +SootopolisCity_House3_MapBlockdata:: @ 82FED70 + .incbin "data/layouts/SootopolisCity_House3/map.bin" + + .align 2 +SootopolisCity_House3_Layout:: @ 82FEDE0 + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House3_MapBorder + .4byte SootopolisCity_House3_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/layouts/SootopolisCity_House3/map.bin index 8bbd6c517..8bbd6c517 100644 --- a/data/maps/SootopolisCity_House3/map.bin +++ b/data/layouts/SootopolisCity_House3/map.bin diff --git a/data/maps/SootopolisCity_House8/border.bin b/data/layouts/SootopolisCity_House8/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/SootopolisCity_House8/border.bin +++ b/data/layouts/SootopolisCity_House8/border.bin diff --git a/data/layouts/SootopolisCity_House8/layout.inc b/data/layouts/SootopolisCity_House8/layout.inc new file mode 100644 index 000000000..05f0fca93 --- /dev/null +++ b/data/layouts/SootopolisCity_House8/layout.inc @@ -0,0 +1,14 @@ +SootopolisCity_House8_MapBorder:: @ 82FC34C + .incbin "data/layouts/SootopolisCity_House8/border.bin" + +SootopolisCity_House8_MapBlockdata:: @ 82FC354 + .incbin "data/layouts/SootopolisCity_House8/map.bin" + + .align 2 +SootopolisCity_House8_Layout:: @ 82FC3C4 + .4byte 0x8 + .4byte 0x7 + .4byte SootopolisCity_House8_MapBorder + .4byte SootopolisCity_House8_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/SootopolisCity_House8/map.bin b/data/layouts/SootopolisCity_House8/map.bin index ffeea7269..ffeea7269 100644 --- a/data/maps/SootopolisCity_House8/map.bin +++ b/data/layouts/SootopolisCity_House8/map.bin diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/layouts/SouthernIsland_Exterior/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/SouthernIsland_Exterior/border.bin +++ b/data/layouts/SouthernIsland_Exterior/border.bin diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc new file mode 100644 index 000000000..c043bfaf9 --- /dev/null +++ b/data/layouts/SouthernIsland_Exterior/layout.inc @@ -0,0 +1,14 @@ +SouthernIsland_Exterior_MapBorder:: @ 82F9D80 + .incbin "data/layouts/SouthernIsland_Exterior/border.bin" + +SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88 + .incbin "data/layouts/SouthernIsland_Exterior/map.bin" + + .align 2 +SouthernIsland_Exterior_Layout:: @ 82FA544 + .4byte 0x21 + .4byte 0x1e + .4byte SouthernIsland_Exterior_MapBorder + .4byte SouthernIsland_Exterior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/layouts/SouthernIsland_Exterior/map.bin index 8c2c2df4a..8c2c2df4a 100644 --- a/data/maps/SouthernIsland_Exterior/map.bin +++ b/data/layouts/SouthernIsland_Exterior/map.bin diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/layouts/SouthernIsland_Interior/border.bin index 03bcafef1..03bcafef1 100644 --- a/data/maps/SouthernIsland_Interior/border.bin +++ b/data/layouts/SouthernIsland_Interior/border.bin diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc new file mode 100644 index 000000000..8a231303c --- /dev/null +++ b/data/layouts/SouthernIsland_Interior/layout.inc @@ -0,0 +1,14 @@ +SouthernIsland_Interior_MapBorder:: @ 82FA55C + .incbin "data/layouts/SouthernIsland_Interior/border.bin" + +SouthernIsland_Interior_MapBlockdata:: @ 82FA564 + .incbin "data/layouts/SouthernIsland_Interior/map.bin" + + .align 2 +SouthernIsland_Interior_Layout:: @ 82FAA74 + .4byte 0x1b + .4byte 0x18 + .4byte SouthernIsland_Interior_MapBorder + .4byte SouthernIsland_Interior_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Rustboro diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/layouts/SouthernIsland_Interior/map.bin index db1e4b153..db1e4b153 100644 --- a/data/maps/SouthernIsland_Interior/map.bin +++ b/data/layouts/SouthernIsland_Interior/map.bin diff --git a/data/maps/TradeCenter/border.bin b/data/layouts/TradeCenter/border.bin index 19d906679..19d906679 100644 --- a/data/maps/TradeCenter/border.bin +++ b/data/layouts/TradeCenter/border.bin diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc new file mode 100644 index 000000000..906fb254a --- /dev/null +++ b/data/layouts/TradeCenter/layout.inc @@ -0,0 +1,14 @@ +TradeCenter_MapBorder:: @ 82E9368 + .incbin "data/layouts/TradeCenter/border.bin" + +TradeCenter_MapBlockdata:: @ 82E9370 + .incbin "data/layouts/TradeCenter/map.bin" + + .align 2 +TradeCenter_Layout:: @ 82E9448 + .4byte 0xc + .4byte 0x9 + .4byte TradeCenter_MapBorder + .4byte TradeCenter_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_CableClub diff --git a/data/maps/TradeCenter/map.bin b/data/layouts/TradeCenter/map.bin index 7e592dbe6..7e592dbe6 100644 --- a/data/maps/TradeCenter/map.bin +++ b/data/layouts/TradeCenter/map.bin diff --git a/data/maps/Underwater1/border.bin b/data/layouts/Underwater1/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater1/border.bin +++ b/data/layouts/Underwater1/border.bin diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc new file mode 100644 index 000000000..e020da990 --- /dev/null +++ b/data/layouts/Underwater1/layout.inc @@ -0,0 +1,14 @@ +Underwater1_MapBorder:: @ 82F2F18 + .incbin "data/layouts/Underwater1/border.bin" + +Underwater1_MapBlockdata:: @ 82F2F20 + .incbin "data/layouts/Underwater1/map.bin" + + .align 2 +Underwater1_Layout:: @ 82F6120 + .4byte 0x50 + .4byte 0x50 + .4byte Underwater1_MapBorder + .4byte Underwater1_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater1/map.bin b/data/layouts/Underwater1/map.bin index 230e3dcd2..230e3dcd2 100644 --- a/data/maps/Underwater1/map.bin +++ b/data/layouts/Underwater1/map.bin diff --git a/data/maps/Underwater2/border.bin b/data/layouts/Underwater2/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater2/border.bin +++ b/data/layouts/Underwater2/border.bin diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc new file mode 100644 index 000000000..6ba018c3b --- /dev/null +++ b/data/layouts/Underwater2/layout.inc @@ -0,0 +1,14 @@ +Underwater2_MapBorder:: @ 82C503C + .incbin "data/layouts/Underwater2/border.bin" + +Underwater2_MapBlockdata:: @ 82C5044 + .incbin "data/layouts/Underwater2/map.bin" + + .align 2 +Underwater2_Layout:: @ 82C8244 + .4byte 0x50 + .4byte 0x50 + .4byte Underwater2_MapBorder + .4byte Underwater2_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater2/map.bin b/data/layouts/Underwater2/map.bin index 0c6377c30..0c6377c30 100644 --- a/data/maps/Underwater2/map.bin +++ b/data/layouts/Underwater2/map.bin diff --git a/data/maps/Underwater3/border.bin b/data/layouts/Underwater3/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater3/border.bin +++ b/data/layouts/Underwater3/border.bin diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc new file mode 100644 index 000000000..be0ebc363 --- /dev/null +++ b/data/layouts/Underwater3/layout.inc @@ -0,0 +1,14 @@ +Underwater3_MapBorder:: @ 82C825C + .incbin "data/layouts/Underwater3/border.bin" + +Underwater3_MapBlockdata:: @ 82C8264 + .incbin "data/layouts/Underwater3/map.bin" + + .align 2 +Underwater3_Layout:: @ 82CB464 + .4byte 0x50 + .4byte 0x50 + .4byte Underwater3_MapBorder + .4byte Underwater3_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater3/map.bin b/data/layouts/Underwater3/map.bin index 1f7addb2d..1f7addb2d 100644 --- a/data/maps/Underwater3/map.bin +++ b/data/layouts/Underwater3/map.bin diff --git a/data/maps/Underwater4/border.bin b/data/layouts/Underwater4/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater4/border.bin +++ b/data/layouts/Underwater4/border.bin diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc new file mode 100644 index 000000000..cef9e4eb8 --- /dev/null +++ b/data/layouts/Underwater4/layout.inc @@ -0,0 +1,14 @@ +Underwater4_MapBorder:: @ 82CB47C + .incbin "data/layouts/Underwater4/border.bin" + +Underwater4_MapBlockdata:: @ 82CB484 + .incbin "data/layouts/Underwater4/map.bin" + + .align 2 +Underwater4_Layout:: @ 82CDA04 + .4byte 0x78 + .4byte 0x28 + .4byte Underwater4_MapBorder + .4byte Underwater4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater4/map.bin b/data/layouts/Underwater4/map.bin index 23f987681..23f987681 100644 --- a/data/maps/Underwater4/map.bin +++ b/data/layouts/Underwater4/map.bin diff --git a/data/maps/Underwater_Route134/border.bin b/data/layouts/Underwater_Route134/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_Route134/border.bin +++ b/data/layouts/Underwater_Route134/border.bin diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc new file mode 100644 index 000000000..523c9f5e3 --- /dev/null +++ b/data/layouts/Underwater_Route134/layout.inc @@ -0,0 +1,14 @@ +Underwater_Route134_MapBorder:: @ 82F7600 + .incbin "data/layouts/Underwater_Route134/border.bin" + +Underwater_Route134_MapBlockdata:: @ 82F7608 + .incbin "data/layouts/Underwater_Route134/map.bin" + + .align 2 +Underwater_Route134_Layout:: @ 82F7770 + .4byte 0x12 + .4byte 0xa + .4byte Underwater_Route134_MapBorder + .4byte Underwater_Route134_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_Route134/map.bin b/data/layouts/Underwater_Route134/map.bin index 77bdd37aa..77bdd37aa 100644 --- a/data/maps/Underwater_Route134/map.bin +++ b/data/layouts/Underwater_Route134/map.bin diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/layouts/Underwater_SeafloorCavern/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_SeafloorCavern/border.bin +++ b/data/layouts/Underwater_SeafloorCavern/border.bin diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc new file mode 100644 index 000000000..fa9352663 --- /dev/null +++ b/data/layouts/Underwater_SeafloorCavern/layout.inc @@ -0,0 +1,14 @@ +Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4 + .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" + +Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC + .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" + + .align 2 +Underwater_SeafloorCavern_Layout:: @ 82DD3B8 + .4byte 0xe + .4byte 0x9 + .4byte Underwater_SeafloorCavern_MapBorder + .4byte Underwater_SeafloorCavern_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/layouts/Underwater_SeafloorCavern/map.bin index 4cacc495e..4cacc495e 100644 --- a/data/maps/Underwater_SeafloorCavern/map.bin +++ b/data/layouts/Underwater_SeafloorCavern/map.bin diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/layouts/Underwater_SealedChamber/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_SealedChamber/border.bin +++ b/data/layouts/Underwater_SealedChamber/border.bin diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc new file mode 100644 index 000000000..9bf4ac1bf --- /dev/null +++ b/data/layouts/Underwater_SealedChamber/layout.inc @@ -0,0 +1,14 @@ +Underwater_SealedChamber_MapBorder:: @ 82F7788 + .incbin "data/layouts/Underwater_SealedChamber/border.bin" + +Underwater_SealedChamber_MapBlockdata:: @ 82F7790 + .incbin "data/layouts/Underwater_SealedChamber/map.bin" + + .align 2 +Underwater_SealedChamber_Layout:: @ 82F7FD0 + .4byte 0x16 + .4byte 0x30 + .4byte Underwater_SealedChamber_MapBorder + .4byte Underwater_SealedChamber_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/layouts/Underwater_SealedChamber/map.bin index 5ac0b4a73..5ac0b4a73 100644 --- a/data/maps/Underwater_SealedChamber/map.bin +++ b/data/layouts/Underwater_SealedChamber/map.bin diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/layouts/Underwater_SootopolisCity/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/Underwater_SootopolisCity/border.bin +++ b/data/layouts/Underwater_SootopolisCity/border.bin diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc new file mode 100644 index 000000000..f5049c9d2 --- /dev/null +++ b/data/layouts/Underwater_SootopolisCity/layout.inc @@ -0,0 +1,14 @@ +Underwater_SootopolisCity_MapBorder:: @ 82D793C + .incbin "data/layouts/Underwater_SootopolisCity/border.bin" + +Underwater_SootopolisCity_MapBlockdata:: @ 82D7944 + .incbin "data/layouts/Underwater_SootopolisCity/map.bin" + + .align 2 +Underwater_SootopolisCity_Layout:: @ 82D7AD4 + .4byte 0x14 + .4byte 0xa + .4byte Underwater_SootopolisCity_MapBorder + .4byte Underwater_SootopolisCity_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Underwater diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/layouts/Underwater_SootopolisCity/map.bin index 71346ab72..71346ab72 100644 --- a/data/maps/Underwater_SootopolisCity/map.bin +++ b/data/layouts/Underwater_SootopolisCity/map.bin diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/layouts/UnknownMap_082CF564/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_082CF564/border.bin +++ b/data/layouts/UnknownMap_082CF564/border.bin diff --git a/data/layouts/UnknownMap_082CF564/layout.inc b/data/layouts/UnknownMap_082CF564/layout.inc new file mode 100644 index 000000000..df2be91f2 --- /dev/null +++ b/data/layouts/UnknownMap_082CF564/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082CF564_MapBorder:: + .incbin "data/layouts/UnknownMap_082CF564/border.bin" + +UnknownMap_082CF564_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082CF564/map.bin" + + .align 2 +UnknownMap_082CF564_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082CF564_MapBorder + .4byte UnknownMap_082CF564_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_082CF564/map.bin b/data/layouts/UnknownMap_082CF564/map.bin Binary files differindex ca93fa0e2..ca93fa0e2 100644 --- a/data/maps/UnknownMap_082CF564/map.bin +++ b/data/layouts/UnknownMap_082CF564/map.bin diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/layouts/UnknownMap_082D05D8/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_082D05D8/border.bin +++ b/data/layouts/UnknownMap_082D05D8/border.bin diff --git a/data/layouts/UnknownMap_082D05D8/layout.inc b/data/layouts/UnknownMap_082D05D8/layout.inc new file mode 100644 index 000000000..f35922aea --- /dev/null +++ b/data/layouts/UnknownMap_082D05D8/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082D05D8_MapBorder:: + .incbin "data/layouts/UnknownMap_082D05D8/border.bin" + +UnknownMap_082D05D8_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082D05D8/map.bin" + + .align 2 +UnknownMap_082D05D8_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082D05D8_MapBorder + .4byte UnknownMap_082D05D8_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_082D05D8/map.bin b/data/layouts/UnknownMap_082D05D8/map.bin Binary files differindex 37f05b971..37f05b971 100644 --- a/data/maps/UnknownMap_082D05D8/map.bin +++ b/data/layouts/UnknownMap_082D05D8/map.bin diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/layouts/UnknownMap_082D05FC/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_082D05FC/border.bin +++ b/data/layouts/UnknownMap_082D05FC/border.bin diff --git a/data/layouts/UnknownMap_082D05FC/layout.inc b/data/layouts/UnknownMap_082D05FC/layout.inc new file mode 100644 index 000000000..646dab5cf --- /dev/null +++ b/data/layouts/UnknownMap_082D05FC/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082D05FC_MapBorder:: + .incbin "data/layouts/UnknownMap_082D05FC/border.bin" + +UnknownMap_082D05FC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082D05FC/map.bin" + + .align 2 +UnknownMap_082D05FC_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082D05FC_MapBorder + .4byte UnknownMap_082D05FC_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_082D05FC/map.bin b/data/layouts/UnknownMap_082D05FC/map.bin Binary files differindex ca93fa0e2..ca93fa0e2 100644 --- a/data/maps/UnknownMap_082D05FC/map.bin +++ b/data/layouts/UnknownMap_082D05FC/map.bin diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/layouts/UnknownMap_082E55C8/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E55C8/border.bin +++ b/data/layouts/UnknownMap_082E55C8/border.bin diff --git a/data/layouts/UnknownMap_082E55C8/layout.inc b/data/layouts/UnknownMap_082E55C8/layout.inc new file mode 100644 index 000000000..c6b6e0347 --- /dev/null +++ b/data/layouts/UnknownMap_082E55C8/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E55C8_MapBorder:: + .incbin "data/layouts/UnknownMap_082E55C8/border.bin" + +UnknownMap_082E55C8_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E55C8/map.bin" + + .align 2 +UnknownMap_082E55C8_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E55C8_MapBorder + .4byte UnknownMap_082E55C8_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E55C8/map.bin b/data/layouts/UnknownMap_082E55C8/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E55C8/map.bin +++ b/data/layouts/UnknownMap_082E55C8/map.bin diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/layouts/UnknownMap_082E55EC/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E55EC/border.bin +++ b/data/layouts/UnknownMap_082E55EC/border.bin diff --git a/data/layouts/UnknownMap_082E55EC/layout.inc b/data/layouts/UnknownMap_082E55EC/layout.inc new file mode 100644 index 000000000..8b1f2c21a --- /dev/null +++ b/data/layouts/UnknownMap_082E55EC/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E55EC_MapBorder:: + .incbin "data/layouts/UnknownMap_082E55EC/border.bin" + +UnknownMap_082E55EC_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E55EC/map.bin" + + .align 2 +UnknownMap_082E55EC_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E55EC_MapBorder + .4byte UnknownMap_082E55EC_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E55EC/map.bin b/data/layouts/UnknownMap_082E55EC/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E55EC/map.bin +++ b/data/layouts/UnknownMap_082E55EC/map.bin diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/layouts/UnknownMap_082E5610/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E5610/border.bin +++ b/data/layouts/UnknownMap_082E5610/border.bin diff --git a/data/layouts/UnknownMap_082E5610/layout.inc b/data/layouts/UnknownMap_082E5610/layout.inc new file mode 100644 index 000000000..87c11b97b --- /dev/null +++ b/data/layouts/UnknownMap_082E5610/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E5610_MapBorder:: + .incbin "data/layouts/UnknownMap_082E5610/border.bin" + +UnknownMap_082E5610_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E5610/map.bin" + + .align 2 +UnknownMap_082E5610_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E5610_MapBorder + .4byte UnknownMap_082E5610_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E5610/map.bin b/data/layouts/UnknownMap_082E5610/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E5610/map.bin +++ b/data/layouts/UnknownMap_082E5610/map.bin diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/layouts/UnknownMap_082E5634/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E5634/border.bin +++ b/data/layouts/UnknownMap_082E5634/border.bin diff --git a/data/layouts/UnknownMap_082E5634/layout.inc b/data/layouts/UnknownMap_082E5634/layout.inc new file mode 100644 index 000000000..a4d1675f4 --- /dev/null +++ b/data/layouts/UnknownMap_082E5634/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E5634_MapBorder:: + .incbin "data/layouts/UnknownMap_082E5634/border.bin" + +UnknownMap_082E5634_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E5634/map.bin" + + .align 2 +UnknownMap_082E5634_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E5634_MapBorder + .4byte UnknownMap_082E5634_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E5634/map.bin b/data/layouts/UnknownMap_082E5634/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E5634/map.bin +++ b/data/layouts/UnknownMap_082E5634/map.bin diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/layouts/UnknownMap_082E5658/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E5658/border.bin +++ b/data/layouts/UnknownMap_082E5658/border.bin diff --git a/data/layouts/UnknownMap_082E5658/layout.inc b/data/layouts/UnknownMap_082E5658/layout.inc new file mode 100644 index 000000000..b7608b96d --- /dev/null +++ b/data/layouts/UnknownMap_082E5658/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E5658_MapBorder:: + .incbin "data/layouts/UnknownMap_082E5658/border.bin" + +UnknownMap_082E5658_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E5658/map.bin" + + .align 2 +UnknownMap_082E5658_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E5658_MapBorder + .4byte UnknownMap_082E5658_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E5658/map.bin b/data/layouts/UnknownMap_082E5658/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E5658/map.bin +++ b/data/layouts/UnknownMap_082E5658/map.bin diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/layouts/UnknownMap_082E567C/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E567C/border.bin +++ b/data/layouts/UnknownMap_082E567C/border.bin diff --git a/data/layouts/UnknownMap_082E567C/layout.inc b/data/layouts/UnknownMap_082E567C/layout.inc new file mode 100644 index 000000000..6f427bee6 --- /dev/null +++ b/data/layouts/UnknownMap_082E567C/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E567C_MapBorder:: + .incbin "data/layouts/UnknownMap_082E567C/border.bin" + +UnknownMap_082E567C_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E567C/map.bin" + + .align 2 +UnknownMap_082E567C_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E567C_MapBorder + .4byte UnknownMap_082E567C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E567C/map.bin b/data/layouts/UnknownMap_082E567C/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E567C/map.bin +++ b/data/layouts/UnknownMap_082E567C/map.bin diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/layouts/UnknownMap_082E56A0/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E56A0/border.bin +++ b/data/layouts/UnknownMap_082E56A0/border.bin diff --git a/data/layouts/UnknownMap_082E56A0/layout.inc b/data/layouts/UnknownMap_082E56A0/layout.inc new file mode 100644 index 000000000..24964ef39 --- /dev/null +++ b/data/layouts/UnknownMap_082E56A0/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E56A0_MapBorder:: + .incbin "data/layouts/UnknownMap_082E56A0/border.bin" + +UnknownMap_082E56A0_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E56A0/map.bin" + + .align 2 +UnknownMap_082E56A0_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E56A0_MapBorder + .4byte UnknownMap_082E56A0_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E56A0/map.bin b/data/layouts/UnknownMap_082E56A0/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E56A0/map.bin +++ b/data/layouts/UnknownMap_082E56A0/map.bin diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/layouts/UnknownMap_082E56C4/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E56C4/border.bin +++ b/data/layouts/UnknownMap_082E56C4/border.bin diff --git a/data/layouts/UnknownMap_082E56C4/layout.inc b/data/layouts/UnknownMap_082E56C4/layout.inc new file mode 100644 index 000000000..e0d2eca7d --- /dev/null +++ b/data/layouts/UnknownMap_082E56C4/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E56C4_MapBorder:: + .incbin "data/layouts/UnknownMap_082E56C4/border.bin" + +UnknownMap_082E56C4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E56C4/map.bin" + + .align 2 +UnknownMap_082E56C4_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E56C4_MapBorder + .4byte UnknownMap_082E56C4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E56C4/map.bin b/data/layouts/UnknownMap_082E56C4/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E56C4/map.bin +++ b/data/layouts/UnknownMap_082E56C4/map.bin diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/layouts/UnknownMap_082E56E8/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E56E8/border.bin +++ b/data/layouts/UnknownMap_082E56E8/border.bin diff --git a/data/layouts/UnknownMap_082E56E8/layout.inc b/data/layouts/UnknownMap_082E56E8/layout.inc new file mode 100644 index 000000000..c163fd44e --- /dev/null +++ b/data/layouts/UnknownMap_082E56E8/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E56E8_MapBorder:: + .incbin "data/layouts/UnknownMap_082E56E8/border.bin" + +UnknownMap_082E56E8_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E56E8/map.bin" + + .align 2 +UnknownMap_082E56E8_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E56E8_MapBorder + .4byte UnknownMap_082E56E8_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E56E8/map.bin b/data/layouts/UnknownMap_082E56E8/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E56E8/map.bin +++ b/data/layouts/UnknownMap_082E56E8/map.bin diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/layouts/UnknownMap_082E570C/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E570C/border.bin +++ b/data/layouts/UnknownMap_082E570C/border.bin diff --git a/data/layouts/UnknownMap_082E570C/layout.inc b/data/layouts/UnknownMap_082E570C/layout.inc new file mode 100644 index 000000000..543decba8 --- /dev/null +++ b/data/layouts/UnknownMap_082E570C/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E570C_MapBorder:: + .incbin "data/layouts/UnknownMap_082E570C/border.bin" + +UnknownMap_082E570C_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E570C/map.bin" + + .align 2 +UnknownMap_082E570C_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E570C_MapBorder + .4byte UnknownMap_082E570C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E570C/map.bin b/data/layouts/UnknownMap_082E570C/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E570C/map.bin +++ b/data/layouts/UnknownMap_082E570C/map.bin diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/layouts/UnknownMap_082E5730/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E5730/border.bin +++ b/data/layouts/UnknownMap_082E5730/border.bin diff --git a/data/layouts/UnknownMap_082E5730/layout.inc b/data/layouts/UnknownMap_082E5730/layout.inc new file mode 100644 index 000000000..e1b39f931 --- /dev/null +++ b/data/layouts/UnknownMap_082E5730/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E5730_MapBorder:: + .incbin "data/layouts/UnknownMap_082E5730/border.bin" + +UnknownMap_082E5730_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E5730/map.bin" + + .align 2 +UnknownMap_082E5730_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E5730_MapBorder + .4byte UnknownMap_082E5730_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E5730/map.bin b/data/layouts/UnknownMap_082E5730/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E5730/map.bin +++ b/data/layouts/UnknownMap_082E5730/map.bin diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/layouts/UnknownMap_082E5754/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E5754/border.bin +++ b/data/layouts/UnknownMap_082E5754/border.bin diff --git a/data/layouts/UnknownMap_082E5754/layout.inc b/data/layouts/UnknownMap_082E5754/layout.inc new file mode 100644 index 000000000..f1b3970f9 --- /dev/null +++ b/data/layouts/UnknownMap_082E5754/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E5754_MapBorder:: + .incbin "data/layouts/UnknownMap_082E5754/border.bin" + +UnknownMap_082E5754_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E5754/map.bin" + + .align 2 +UnknownMap_082E5754_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E5754_MapBorder + .4byte UnknownMap_082E5754_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E5754/map.bin b/data/layouts/UnknownMap_082E5754/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E5754/map.bin +++ b/data/layouts/UnknownMap_082E5754/map.bin diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/layouts/UnknownMap_082E5778/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E5778/border.bin +++ b/data/layouts/UnknownMap_082E5778/border.bin diff --git a/data/layouts/UnknownMap_082E5778/layout.inc b/data/layouts/UnknownMap_082E5778/layout.inc new file mode 100644 index 000000000..457b16610 --- /dev/null +++ b/data/layouts/UnknownMap_082E5778/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E5778_MapBorder:: + .incbin "data/layouts/UnknownMap_082E5778/border.bin" + +UnknownMap_082E5778_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082E5778/map.bin" + + .align 2 +UnknownMap_082E5778_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E5778_MapBorder + .4byte UnknownMap_082E5778_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E5778/map.bin b/data/layouts/UnknownMap_082E5778/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E5778/map.bin +++ b/data/layouts/UnknownMap_082E5778/map.bin diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/layouts/UnknownMap_082E579C/border.bin index b15c94f96..b15c94f96 100644 --- a/data/maps/UnknownMap_082E579C/border.bin +++ b/data/layouts/UnknownMap_082E579C/border.bin diff --git a/data/layouts/UnknownMap_082E579C/layout.inc b/data/layouts/UnknownMap_082E579C/layout.inc new file mode 100644 index 000000000..9550a7acc --- /dev/null +++ b/data/layouts/UnknownMap_082E579C/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082E579C_MapBorder:: + .incbin "data/layouts/UnknownMap_082E579C/border.bin" + +UnknownMap_082E579C_MapBlockdata: + .incbin "data/layouts/UnknownMap_082E579C/map.bin" + + .align 2 +UnknownMap_082E579C_Layout:: + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_082E579C_MapBorder + .4byte UnknownMap_082E579C_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082E579C/map.bin b/data/layouts/UnknownMap_082E579C/map.bin Binary files differindex 22a47d94e..22a47d94e 100644 --- a/data/maps/UnknownMap_082E579C/map.bin +++ b/data/layouts/UnknownMap_082E579C/map.bin diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/layouts/UnknownMap_082EDF30/border.bin index 9e4b3fb7a..9e4b3fb7a 100644 --- a/data/maps/UnknownMap_082EDF30/border.bin +++ b/data/layouts/UnknownMap_082EDF30/border.bin diff --git a/data/layouts/UnknownMap_082EDF30/layout.inc b/data/layouts/UnknownMap_082EDF30/layout.inc new file mode 100644 index 000000000..483b21ac5 --- /dev/null +++ b/data/layouts/UnknownMap_082EDF30/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082EDF30_MapBorder:: + .incbin "data/layouts/UnknownMap_082EDF30/border.bin" + +UnknownMap_082EDF30_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082EDF30/map.bin" + + .align 2 +UnknownMap_082EDF30_Layout:: + .4byte 0x3A + .4byte 0x1A + .4byte UnknownMap_082EDF30_MapBorder + .4byte UnknownMap_082EDF30_MapBlockdata + .4byte gTileset_General + .4byte 0 diff --git a/data/maps/UnknownMap_082EDF30/map.bin b/data/layouts/UnknownMap_082EDF30/map.bin index 028da0526..028da0526 100644 --- a/data/maps/UnknownMap_082EDF30/map.bin +++ b/data/layouts/UnknownMap_082EDF30/map.bin diff --git a/data/maps/UnknownMap_082FF894/border.bin b/data/layouts/UnknownMap_082FF894/border.bin index f1629c020..f1629c020 100644 --- a/data/maps/UnknownMap_082FF894/border.bin +++ b/data/layouts/UnknownMap_082FF894/border.bin diff --git a/data/layouts/UnknownMap_082FF894/layout.inc b/data/layouts/UnknownMap_082FF894/layout.inc new file mode 100644 index 000000000..b353645bf --- /dev/null +++ b/data/layouts/UnknownMap_082FF894/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_082FF894_MapBorder:: + .incbin "data/layouts/UnknownMap_082FF894/border.bin" + +UnknownMap_082FF894_MapBlockdata:: + .incbin "data/layouts/UnknownMap_082FF894/map.bin" + + .align 2 +UnknownMap_082FF894_Layout:: + .4byte 0x13 + .4byte 0x13 + .4byte UnknownMap_082FF894_MapBorder + .4byte UnknownMap_082FF894_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_082FF894/map.bin b/data/layouts/UnknownMap_082FF894/map.bin Binary files differindex fd294d9b6..fd294d9b6 100644 --- a/data/maps/UnknownMap_082FF894/map.bin +++ b/data/layouts/UnknownMap_082FF894/map.bin diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/layouts/UnknownMap_08302970/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/UnknownMap_08302970/border.bin +++ b/data/layouts/UnknownMap_08302970/border.bin diff --git a/data/layouts/UnknownMap_08302970/layout.inc b/data/layouts/UnknownMap_08302970/layout.inc new file mode 100644 index 000000000..7e4299a89 --- /dev/null +++ b/data/layouts/UnknownMap_08302970/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_08302970_MapBorder:: + .incbin "data/layouts/UnknownMap_08302970/border.bin" + +UnknownMap_08302970_MapBlockdata:: + .incbin "data/layouts/UnknownMap_08302970/map.bin" + + .align 2 +UnknownMap_08302970_Layout:: + .4byte 0x3C + .4byte 0x28 + .4byte UnknownMap_08302970_MapBorder + .4byte UnknownMap_08302970_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Pacifidlog diff --git a/data/maps/UnknownMap_08302970/map.bin b/data/layouts/UnknownMap_08302970/map.bin index dd82c58d3..dd82c58d3 100644 --- a/data/maps/UnknownMap_08302970/map.bin +++ b/data/layouts/UnknownMap_08302970/map.bin diff --git a/data/maps/UnknownMap_083041B4/border.bin b/data/layouts/UnknownMap_083041B4/border.bin index f0eabd248..f0eabd248 100644 --- a/data/maps/UnknownMap_083041B4/border.bin +++ b/data/layouts/UnknownMap_083041B4/border.bin diff --git a/data/layouts/UnknownMap_083041B4/layout.inc b/data/layouts/UnknownMap_083041B4/layout.inc new file mode 100644 index 000000000..4fd4f176c --- /dev/null +++ b/data/layouts/UnknownMap_083041B4/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_083041B4_MapBorder:: + .incbin "data/layouts/UnknownMap_083041B4/border.bin" + +UnknownMap_083041B4_MapBlockdata:: + .incbin "data/layouts/UnknownMap_083041B4/map.bin" + + .align 2 +UnknownMap_083041B4_Layout:: + .4byte 0x1B + .4byte 0x2E + .4byte UnknownMap_083041B4_MapBorder + .4byte UnknownMap_083041B4_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnknownMap_083041B4/map.bin b/data/layouts/UnknownMap_083041B4/map.bin index ec344933f..ec344933f 100644 --- a/data/maps/UnknownMap_083041B4/map.bin +++ b/data/layouts/UnknownMap_083041B4/map.bin diff --git a/data/maps/UnknownMap_25_29/border.bin b/data/layouts/UnknownMap_25_29/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_29/border.bin +++ b/data/layouts/UnknownMap_25_29/border.bin diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc new file mode 100644 index 000000000..159e6d561 --- /dev/null +++ b/data/layouts/UnknownMap_25_29/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_25_29_MapBorder:: @ 82E9898 + .incbin "data/layouts/UnknownMap_25_29/border.bin" + +UnknownMap_25_29_MapBlockdata:: @ 82E98A0 + .incbin "data/layouts/UnknownMap_25_29/map.bin" + + .align 2 +UnknownMap_25_29_Layout:: @ 82E98A4 + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_29_MapBorder + .4byte UnknownMap_25_29_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/layouts/UnknownMap_25_29/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_29/map.bin +++ b/data/layouts/UnknownMap_25_29/map.bin diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/layouts/UnknownMap_25_30/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_30/border.bin +++ b/data/layouts/UnknownMap_25_30/border.bin diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc new file mode 100644 index 000000000..b721ecfa1 --- /dev/null +++ b/data/layouts/UnknownMap_25_30/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_25_30_MapBorder:: @ 82E98BC + .incbin "data/layouts/UnknownMap_25_30/border.bin" + +UnknownMap_25_30_MapBlockdata:: @ 82E98C4 + .incbin "data/layouts/UnknownMap_25_30/map.bin" + + .align 2 +UnknownMap_25_30_Layout:: @ 82E98C8 + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_30_MapBorder + .4byte UnknownMap_25_30_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/layouts/UnknownMap_25_30/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_30/map.bin +++ b/data/layouts/UnknownMap_25_30/map.bin diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/layouts/UnknownMap_25_31/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_31/border.bin +++ b/data/layouts/UnknownMap_25_31/border.bin diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc new file mode 100644 index 000000000..9ac9130f1 --- /dev/null +++ b/data/layouts/UnknownMap_25_31/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_25_31_MapBorder:: @ 82E98E0 + .incbin "data/layouts/UnknownMap_25_31/border.bin" + +UnknownMap_25_31_MapBlockdata:: @ 82E98E8 + .incbin "data/layouts/UnknownMap_25_31/map.bin" + + .align 2 +UnknownMap_25_31_Layout:: @ 82E98EC + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_31_MapBorder + .4byte UnknownMap_25_31_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/layouts/UnknownMap_25_31/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_31/map.bin +++ b/data/layouts/UnknownMap_25_31/map.bin diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/layouts/UnknownMap_25_32/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_32/border.bin +++ b/data/layouts/UnknownMap_25_32/border.bin diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc new file mode 100644 index 000000000..3b7b4b459 --- /dev/null +++ b/data/layouts/UnknownMap_25_32/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_25_32_MapBorder:: @ 82E9904 + .incbin "data/layouts/UnknownMap_25_32/border.bin" + +UnknownMap_25_32_MapBlockdata:: @ 82E990C + .incbin "data/layouts/UnknownMap_25_32/map.bin" + + .align 2 +UnknownMap_25_32_Layout:: @ 82E9910 + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_32_MapBorder + .4byte UnknownMap_25_32_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/layouts/UnknownMap_25_32/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_32/map.bin +++ b/data/layouts/UnknownMap_25_32/map.bin diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/layouts/UnknownMap_25_33/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_33/border.bin +++ b/data/layouts/UnknownMap_25_33/border.bin diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc new file mode 100644 index 000000000..6564dfe6b --- /dev/null +++ b/data/layouts/UnknownMap_25_33/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_25_33_MapBorder:: @ 82E9928 + .incbin "data/layouts/UnknownMap_25_33/border.bin" + +UnknownMap_25_33_MapBlockdata:: @ 82E9930 + .incbin "data/layouts/UnknownMap_25_33/map.bin" + + .align 2 +UnknownMap_25_33_Layout:: @ 82E9934 + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_33_MapBorder + .4byte UnknownMap_25_33_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/layouts/UnknownMap_25_33/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_33/map.bin +++ b/data/layouts/UnknownMap_25_33/map.bin diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/layouts/UnknownMap_25_34/border.bin index 19d906679..19d906679 100644 --- a/data/maps/UnknownMap_25_34/border.bin +++ b/data/layouts/UnknownMap_25_34/border.bin diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc new file mode 100644 index 000000000..178449d2f --- /dev/null +++ b/data/layouts/UnknownMap_25_34/layout.inc @@ -0,0 +1,14 @@ +UnknownMap_25_34_MapBorder:: @ 82E994C + .incbin "data/layouts/UnknownMap_25_34/border.bin" + +UnknownMap_25_34_MapBlockdata:: @ 82E9954 + .incbin "data/layouts/UnknownMap_25_34/map.bin" + + .align 2 +UnknownMap_25_34_Layout:: @ 82E9958 + .4byte 0x1 + .4byte 0x1 + .4byte UnknownMap_25_34_MapBorder + .4byte UnknownMap_25_34_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_Contest diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/layouts/UnknownMap_25_34/map.bin index 5fc1e81ec..5fc1e81ec 100644 --- a/data/maps/UnknownMap_25_34/map.bin +++ b/data/layouts/UnknownMap_25_34/map.bin diff --git a/data/maps/UnreferencedMap/border.bin b/data/layouts/UnreferencedMap/border.bin index c3fe51511..c3fe51511 100644 --- a/data/maps/UnreferencedMap/border.bin +++ b/data/layouts/UnreferencedMap/border.bin diff --git a/data/layouts/UnreferencedMap/layout.inc b/data/layouts/UnreferencedMap/layout.inc new file mode 100644 index 000000000..14edbb25d --- /dev/null +++ b/data/layouts/UnreferencedMap/layout.inc @@ -0,0 +1,14 @@ +UnreferencedMap_MapBorder:: @ 82BD8DC + .incbin "data/layouts/UnreferencedMap/border.bin" + +UnreferencedMap_MapBlockdata: @ 82BD8E4 + .incbin "data/layouts/UnreferencedMap/map.bin" + + .align 2 +UnreferencedMap_Layout:: @ 82BF1E4 + .4byte 0x50 + .4byte 0x28 + .4byte UnreferencedMap_MapBorder + .4byte UnreferencedMap_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/UnreferencedMap/map.bin b/data/layouts/UnreferencedMap/map.bin index 17a14a8d5..17a14a8d5 100644 --- a/data/maps/UnreferencedMap/map.bin +++ b/data/layouts/UnreferencedMap/map.bin diff --git a/data/maps/VerdanturfTown/border.bin b/data/layouts/VerdanturfTown/border.bin Binary files differindex 864ac15fa..864ac15fa 100644 --- a/data/maps/VerdanturfTown/border.bin +++ b/data/layouts/VerdanturfTown/border.bin diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc new file mode 100644 index 000000000..1e69e75c1 --- /dev/null +++ b/data/layouts/VerdanturfTown/layout.inc @@ -0,0 +1,14 @@ +VerdanturfTown_MapBorder:: @ 82923EC + .incbin "data/layouts/VerdanturfTown/border.bin" + +VerdanturfTown_MapBlockdata:: @ 82923F4 + .incbin "data/layouts/VerdanturfTown/map.bin" + + .align 2 +VerdanturfTown_Layout:: @ 8292714 + .4byte 0x14 + .4byte 0x14 + .4byte VerdanturfTown_MapBorder + .4byte VerdanturfTown_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville diff --git a/data/maps/VerdanturfTown/map.bin b/data/layouts/VerdanturfTown/map.bin Binary files differindex 0dbece956..0dbece956 100644 --- a/data/maps/VerdanturfTown/map.bin +++ b/data/layouts/VerdanturfTown/map.bin diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/layouts/VerdanturfTown_WandasHouse/border.bin Binary files differindex f496f458e..f496f458e 100644 --- a/data/maps/VerdanturfTown_WandasHouse/border.bin +++ b/data/layouts/VerdanturfTown_WandasHouse/border.bin diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc new file mode 100644 index 000000000..a6922408b --- /dev/null +++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc @@ -0,0 +1,14 @@ +VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C + .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" + +VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584 + .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" + + .align 2 +VerdanturfTown_WandasHouse_Layout:: @ 82CF694 + .4byte 0x11 + .4byte 0x8 + .4byte VerdanturfTown_WandasHouse_MapBorder + .4byte VerdanturfTown_WandasHouse_MapBlockdata + .4byte gTileset_Building + .4byte gTileset_GenericBuilding diff --git a/data/maps/VerdanturfTown_WandasHouse/map.bin b/data/layouts/VerdanturfTown_WandasHouse/map.bin Binary files differindex 95d14d3c4..95d14d3c4 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.bin +++ b/data/layouts/VerdanturfTown_WandasHouse/map.bin diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/VictoryRoad_1F/border.bin +++ b/data/layouts/VictoryRoad_1F/border.bin diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc new file mode 100644 index 000000000..5d0bd41d1 --- /dev/null +++ b/data/layouts/VictoryRoad_1F/layout.inc @@ -0,0 +1,14 @@ +VictoryRoad_1F_MapBorder:: @ 82E105C + .incbin "data/layouts/VictoryRoad_1F/border.bin" + +VictoryRoad_1F_MapBlockdata:: @ 82E1064 + .incbin "data/layouts/VictoryRoad_1F/map.bin" + + .align 2 +VictoryRoad_1F_Layout:: @ 82E2090 + .4byte 0x2e + .4byte 0x2d + .4byte VictoryRoad_1F_MapBorder + .4byte VictoryRoad_1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/layouts/VictoryRoad_1F/map.bin index a78316ef9..a78316ef9 100644 --- a/data/maps/VictoryRoad_1F/map.bin +++ b/data/layouts/VictoryRoad_1F/map.bin diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/layouts/VictoryRoad_B1F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/VictoryRoad_B1F/border.bin +++ b/data/layouts/VictoryRoad_B1F/border.bin diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc new file mode 100644 index 000000000..1613743cf --- /dev/null +++ b/data/layouts/VictoryRoad_B1F/layout.inc @@ -0,0 +1,14 @@ +VictoryRoad_B1F_MapBorder:: @ 82F83D0 + .incbin "data/layouts/VictoryRoad_B1F/border.bin" + +VictoryRoad_B1F_MapBlockdata:: @ 82F83D8 + .incbin "data/layouts/VictoryRoad_B1F/map.bin" + + .align 2 +VictoryRoad_B1F_Layout:: @ 82F8EFC + .4byte 0x2e + .4byte 0x1f + .4byte VictoryRoad_B1F_MapBorder + .4byte VictoryRoad_B1F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/layouts/VictoryRoad_B1F/map.bin index 706c96974..706c96974 100644 --- a/data/maps/VictoryRoad_B1F/map.bin +++ b/data/layouts/VictoryRoad_B1F/map.bin diff --git a/data/maps/VictoryRoad_B2F/border.bin b/data/layouts/VictoryRoad_B2F/border.bin index 423a0732e..423a0732e 100644 --- a/data/maps/VictoryRoad_B2F/border.bin +++ b/data/layouts/VictoryRoad_B2F/border.bin diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc new file mode 100644 index 000000000..ff4ddb865 --- /dev/null +++ b/data/layouts/VictoryRoad_B2F/layout.inc @@ -0,0 +1,14 @@ +VictoryRoad_B2F_MapBorder:: @ 82F8F14 + .incbin "data/layouts/VictoryRoad_B2F/border.bin" + +VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C + .incbin "data/layouts/VictoryRoad_B2F/map.bin" + + .align 2 +VictoryRoad_B2F_Layout:: @ 82F9A40 + .4byte 0x2e + .4byte 0x1f + .4byte VictoryRoad_B2F_MapBorder + .4byte VictoryRoad_B2F_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Cave diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/layouts/VictoryRoad_B2F/map.bin index 682c31764..682c31764 100644 --- a/data/maps/VictoryRoad_B2F/map.bin +++ b/data/layouts/VictoryRoad_B2F/map.bin diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index e5e3adc3a..74571dc08 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -1,5 +1,5 @@ AbandonedShip_CaptainsOffice:: @ 8307454 - .4byte AbandonedShip_CaptainsOffice_MapAttributes + .4byte AbandonedShip_CaptainsOffice_Layout .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index e2bd23252..4caf26a22 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Corridors_1F:: @ 8307374 - .4byte AbandonedShip_Corridors_1F_MapAttributes + .4byte AbandonedShip_Corridors_1F_Layout .4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 064e24e92..c979d2d79 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Corridors_B1F:: @ 83073AC - .4byte AbandonedShip_Corridors_B1F_MapAttributes + .4byte AbandonedShip_Corridors_B1F_Layout .4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 1db367db8..5002c48eb 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Deck:: @ 8307358 - .4byte AbandonedShip_Deck_MapAttributes + .4byte AbandonedShip_Deck_Layout .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index a841ee87c..8d862d16e 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C - .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes + .4byte AbandonedShip_HiddenFloorCorridors_Layout .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 647b22977..9699a3abd 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -1,5 +1,5 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 - .4byte AbandonedShip_HiddenFloorRooms_MapAttributes + .4byte AbandonedShip_HiddenFloorRooms_Layout .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 7b88baf94..adc37862b 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F:: @ 830741C - .4byte AbandonedShip_Room_B1F_MapAttributes + .4byte AbandonedShip_Room_B1F_Layout .4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 44bcd4733..15a2f66da 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms2_1F:: @ 8307438 - .4byte AbandonedShip_Rooms2_1F_MapAttributes + .4byte AbandonedShip_Rooms2_1F_Layout .4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 017b1382b..daaca3671 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 - .4byte AbandonedShip_Rooms2_B1F_MapAttributes + .4byte AbandonedShip_Rooms2_B1F_Layout .4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 7e8dbd5b8..2c017f053 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_1F:: @ 8307390 - .4byte AbandonedShip_Rooms_1F_MapAttributes + .4byte AbandonedShip_Rooms_1F_Layout .4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index 6ac6e3794..82f026ba7 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 - .4byte AbandonedShip_Rooms_B1F_MapAttributes + .4byte AbandonedShip_Rooms_B1F_Layout .4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index 6313cf6f1..adbf39015 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater1:: @ 8307400 - .4byte AbandonedShip_Underwater1_MapAttributes + .4byte AbandonedShip_Underwater1_Layout .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index c81b78357..66036ff55 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2:: @ 8307470 - .4byte AbandonedShip_Underwater2_MapAttributes + .4byte AbandonedShip_Underwater2_Layout .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 82ac0555d..04ec0679a 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -1,5 +1,5 @@ AncientTomb:: @ 83074E0 - .4byte AncientTomb_MapAttributes + .4byte AncientTomb_Layout .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 94650821d..819590c69 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -1,5 +1,5 @@ AquaHideout_1F:: @ 8306FF4 - .4byte AquaHideout_1F_MapAttributes + .4byte AquaHideout_1F_Layout .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index ef7f4cfdf..e67dba2e5 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -1,5 +1,5 @@ AquaHideout_B1F:: @ 8307010 - .4byte AquaHideout_B1F_MapAttributes + .4byte AquaHideout_B1F_Layout .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index 38b3f546f..dc10f234e 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -1,5 +1,5 @@ AquaHideout_B2F:: @ 830702C - .4byte AquaHideout_B2F_MapAttributes + .4byte AquaHideout_B2F_Layout .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 3104824ed..92dee0182 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -1,5 +1,5 @@ BattleTower_BattleRoom:: @ 8307C88 - .4byte BattleTower_BattleRoom_MapAttributes + .4byte BattleTower_BattleRoom_Layout .4byte BattleTower_BattleRoom_MapEvents .4byte BattleTower_BattleRoom_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index 016e178ac..311ae6862 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -1,5 +1,5 @@ BattleTower_Corridor:: @ 8307C6C - .4byte BattleTower_Corridor_MapAttributes + .4byte BattleTower_Corridor_Layout .4byte BattleTower_Corridor_MapEvents .4byte BattleTower_Corridor_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index 0a7285261..324b3ecc1 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -1,5 +1,5 @@ BattleTower_Elevator:: @ 8307C50 - .4byte BattleTower_Elevator_MapAttributes + .4byte BattleTower_Elevator_Layout .4byte BattleTower_Elevator_MapEvents .4byte BattleTower_Elevator_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index c8c0b0473..b8d527444 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -1,5 +1,5 @@ BattleTower_Lobby:: @ 8307C34 - .4byte BattleTower_Lobby_MapAttributes + .4byte BattleTower_Lobby_Layout .4byte BattleTower_Lobby_MapEvents .4byte BattleTower_Lobby_MapScripts .4byte 0x0 diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 01bbc2fd9..a80d3e318 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -1,5 +1,5 @@ BattleTower_Outside:: @ 8307C18 - .4byte BattleTower_Outside_MapAttributes + .4byte BattleTower_Outside_Layout .4byte BattleTower_Outside_MapEvents .4byte BattleTower_Outside_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index b49287535..18901b68b 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_1F:: @ 8307198 - .4byte CaveOfOrigin_1F_MapAttributes + .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 97e5e68c8..f1e768089 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B1F:: @ 83071B4 - .4byte CaveOfOrigin_B1F_MapAttributes + .4byte CaveOfOrigin_B1F_Layout .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index 79e76f693..b20d4a577 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B2F:: @ 83071D0 - .4byte CaveOfOrigin_B2F_MapAttributes + .4byte CaveOfOrigin_B2F_Layout .4byte CaveOfOrigin_B2F_MapEvents .4byte CaveOfOrigin_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index 746d187f3..a7e6b8a19 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B3F:: @ 83071EC - .4byte CaveOfOrigin_B3F_MapAttributes + .4byte CaveOfOrigin_B3F_Layout .4byte CaveOfOrigin_B3F_MapEvents .4byte CaveOfOrigin_B3F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc index 0cb1ad83b..97a58ddd6 100644 --- a/data/maps/CaveOfOrigin_B4F/header.inc +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B4F:: @ 8307208 - .4byte CaveOfOrigin_B4F_MapAttributes + .4byte CaveOfOrigin_B4F_Layout .4byte CaveOfOrigin_B4F_MapEvents .4byte CaveOfOrigin_B4F_MapScripts .4byte 0x0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 606997174..f36fac472 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -1,5 +1,5 @@ CaveOfOrigin_Entrance:: @ 830717C - .4byte CaveOfOrigin_Entrance_MapAttributes + .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 79e681666..cd6552519 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -1,5 +1,5 @@ DesertRuins:: @ 8306E18 - .4byte DesertRuins_MapAttributes + .4byte DesertRuins_Layout .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 7aed01d94..7bd135bad 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -1,5 +1,5 @@ DewfordTown:: @ 830557C - .4byte DewfordTown_MapAttributes + .4byte DewfordTown_Layout .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 79227e545..72c8a4c04 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -1,5 +1,5 @@ DewfordTown_Gym:: @ 8305B9C - .4byte DewfordTown_Gym_MapAttributes + .4byte DewfordTown_Gym_Layout .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 975a257d8..c7fa7c009 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -1,5 +1,5 @@ DewfordTown_Hall:: @ 8305BB8 - .4byte DewfordTown_Hall_MapAttributes + .4byte DewfordTown_Hall_Layout .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 95a8a8339..71e25e8b9 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -1,5 +1,5 @@ DewfordTown_House1:: @ 8305B48 - .4byte DewfordTown_House1_MapAttributes + .4byte House3_Layout .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 37aac2ead..6ffc05176 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -1,5 +1,5 @@ DewfordTown_House2:: @ 8305BD4 - .4byte DewfordTown_House2_MapAttributes + .4byte House4_Layout .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index 9cf0a8f46..b95db3ab0 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index a54a51c94..44fa18f08 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index baf1b8076..86ce13b14 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -1,5 +1,5 @@ DoubleBattleColosseum:: @ 83079CC - .4byte DoubleBattleColosseum_MapAttributes + .4byte DoubleBattleColosseum_Layout .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 0c1f6eab0..4d25d6198 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -1,5 +1,5 @@ EverGrandeCity:: @ 8305528 - .4byte EverGrandeCity_MapAttributes + .4byte EverGrandeCity_Layout .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 154d5ba29..d1f9e4fd1 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 - .4byte EverGrandeCity_ChampionsRoom_MapAttributes + .4byte EverGrandeCity_ChampionsRoom_Layout .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index 68d16484e..0843d41af 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor1:: @ 8306B24 - .4byte EverGrandeCity_Corridor1_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor1_MapEvents .4byte EverGrandeCity_Corridor1_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 0dab21f9a..be2df3915 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor2:: @ 8306B40 - .4byte EverGrandeCity_Corridor2_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor2_MapEvents .4byte EverGrandeCity_Corridor2_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index 3d20a6a41..d3b67d33d 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor3:: @ 8306B5C - .4byte EverGrandeCity_Corridor3_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor3_MapEvents .4byte EverGrandeCity_Corridor3_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 56a5297d7..002f42171 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor4:: @ 8306B78 - .4byte EverGrandeCity_Corridor4_MapAttributes + .4byte EverGrandeCity_Corridor4_Layout .4byte EverGrandeCity_Corridor4_MapEvents .4byte EverGrandeCity_Corridor4_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index 2ca1fef86..b53de1a2e 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_Corridor5:: @ 8306B94 - .4byte EverGrandeCity_Corridor5_MapAttributes + .4byte EverGrandeCity_ShortCorridor_Layout .4byte EverGrandeCity_Corridor5_MapEvents .4byte EverGrandeCity_Corridor5_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 04c1d9f32..873b3655b 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC - .4byte EverGrandeCity_DrakesRoom_MapAttributes + .4byte EverGrandeCity_DrakesRoom_Layout .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index e0a48f9a6..c64a5ae24 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 - .4byte EverGrandeCity_GlaciasRoom_MapAttributes + .4byte EverGrandeCity_GlaciasRoom_Layout .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index b7816ea86..33928c164 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame:: @ 8306BCC - .4byte EverGrandeCity_HallOfFame_MapAttributes + .4byte EverGrandeCity_HallOfFame_Layout .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index f9ef5a516..83a9eec14 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 - .4byte EverGrandeCity_PhoebesRoom_MapAttributes + .4byte EverGrandeCity_PhoebesRoom_Layout .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 2b72fc661..4450309d0 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index b60e3c3df..6cbd45842 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index cf24b61dc..a78353193 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 - .4byte EverGrandeCity_PokemonLeague_MapAttributes + .4byte EverGrandeCity_PokemonLeague_Layout .4byte EverGrandeCity_PokemonLeague_MapEvents .4byte EverGrandeCity_PokemonLeague_MapScripts .4byte 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 7c2ee11f8..03aea95dd 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 - .4byte EverGrandeCity_SidneysRoom_MapAttributes + .4byte EverGrandeCity_SidneysRoom_Layout .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index bd719a36b..48b0414f7 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,5 +1,5 @@ FallarborTown:: @ 83055B4 - .4byte FallarborTown_MapAttributes + .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index aa540e338..9563688ba 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -1,5 +1,5 @@ FallarborTown_ContestHall:: @ 8305CEC - .4byte FallarborTown_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte FallarborTown_ContestHall_MapEvents .4byte FallarborTown_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index 2f25d3675..dc5eafeaa 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -1,5 +1,5 @@ FallarborTown_ContestLobby:: @ 8305CD0 - .4byte FallarborTown_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte FallarborTown_ContestLobby_MapEvents .4byte FallarborTown_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index da9739789..5b6ee96fe 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,5 +1,5 @@ FallarborTown_House1:: @ 8305D40 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index ff1949cf9..d5e0e3faa 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,5 +1,5 @@ FallarborTown_House2:: @ 8305D5C - .4byte House12_MapAttributes + .4byte House2_Layout .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index b60fa85c8..c13e63f04 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -1,5 +1,5 @@ FallarborTown_Mart:: @ 8305CB4 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index 8ffb95e0c..36b6adbd5 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 45120890d..09f92a948 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index ccca2e656..d44eeb9ba 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,5 +1,5 @@ FieryPath:: @ 8306EF8 - .4byte FieryPath_MapAttributes + .4byte FieryPath_Layout .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 4c96de2b2..164805b62 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -1,5 +1,5 @@ FortreeCity:: @ 83054B8 - .4byte FortreeCity_MapAttributes + .4byte FortreeCity_Layout .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 5334ca92c..5bbe52710 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -1,5 +1,5 @@ FortreeCity_DecorationShop:: @ 8306504 - .4byte FortreeCity_DecorationShop_MapAttributes + .4byte FortreeCity_DecorationShop_Layout .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 378a73b52..7313a9a9d 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -1,5 +1,5 @@ FortreeCity_Gym:: @ 8306424 - .4byte FortreeCity_Gym_MapAttributes + .4byte FortreeCity_Gym_Layout .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index ad8198c43..299c3d5e6 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -1,5 +1,5 @@ FortreeCity_House1:: @ 8306408 - .4byte FortreeCity_House1_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 3c803636b..404d3560f 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -1,5 +1,5 @@ FortreeCity_House2:: @ 8306494 - .4byte FortreeCity_House2_MapAttributes + .4byte FortreeCity_House2_Layout .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 40bf85478..c1d287181 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -1,5 +1,5 @@ FortreeCity_House3:: @ 83064B0 - .4byte FortreeCity_House3_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index bed750ecb..f498ba201 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -1,5 +1,5 @@ FortreeCity_House4:: @ 83064CC - .4byte FortreeCity_House4_MapAttributes + .4byte FortreeCity_House2_Layout .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index a8bb67d65..2753198b0 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -1,5 +1,5 @@ FortreeCity_House5:: @ 83064E8 - .4byte FortreeCity_House5_MapAttributes + .4byte FortreeCity_House1_Layout .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 4b8793d36..9c260e3a0 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -1,5 +1,5 @@ FortreeCity_Mart:: @ 8306478 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index fcafbe2af..4f593492e 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 0421b7880..4b24dcf7d 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ FortreeCity_PokemonCenter_2F:: @ 830645C - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index cf22ded8a..081f54d26 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -1,5 +1,5 @@ GraniteCave_1F:: @ 8306E34 - .4byte GraniteCave_1F_MapAttributes + .4byte GraniteCave_1F_Layout .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 654803312..64c3eac04 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -1,5 +1,5 @@ GraniteCave_B1F:: @ 8306E50 - .4byte GraniteCave_B1F_MapAttributes + .4byte GraniteCave_B1F_Layout .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 4d243f3da..8c382b9bd 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -1,5 +1,5 @@ GraniteCave_B2F:: @ 8306E6C - .4byte GraniteCave_B2F_MapAttributes + .4byte GraniteCave_B2F_Layout .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index fb9b18436..fdd41a95a 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom:: @ 8306E88 - .4byte GraniteCave_StevensRoom_MapAttributes + .4byte GraniteCave_StevensRoom_Layout .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index ee88d280d..b406937ca 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -1,5 +1,5 @@ InsideOfTruck:: @ 8307B38 - .4byte InsideOfTruck_MapAttributes + .4byte InsideOfTruck_Layout .4byte InsideOfTruck_MapEvents .4byte InsideOfTruck_MapScripts .4byte 0x0 diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index f811fe3da..e77e85173 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -1,5 +1,5 @@ IslandCave:: @ 83074C4 - .4byte IslandCave_MapAttributes + .4byte IslandCave_Layout .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index 6770756e8..153162e4b 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -1,5 +1,5 @@ JaggedPass:: @ 8306EDC - .4byte JaggedPass_MapAttributes + .4byte JaggedPass_Layout .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index e34eec863..ad901d0ff 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -1,5 +1,5 @@ LavaridgeTown:: @ 8305598 - .4byte LavaridgeTown_MapAttributes + .4byte LavaridgeTown_Layout .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 929b07ae7..81fe4aae7 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_1F:: @ 8305C0C - .4byte LavaridgeTown_Gym_1F_MapAttributes + .4byte LavaridgeTown_Gym_1F_Layout .4byte LavaridgeTown_Gym_1F_MapEvents .4byte LavaridgeTown_Gym_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index d8a747789..7a1c7c348 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 - .4byte LavaridgeTown_Gym_B1F_MapAttributes + .4byte LavaridgeTown_Gym_B1F_Layout .4byte LavaridgeTown_Gym_B1F_MapEvents .4byte LavaridgeTown_Gym_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index f44118c5c..3c193937d 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_HerbShop:: @ 8305BF0 - .4byte LavaridgeTown_HerbShop_MapAttributes + .4byte LavaridgeTown_HerbShop_Layout .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index f43ea0bc4..e1e429dc3 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_House:: @ 8305C44 - .4byte LavaridgeTown_House_MapAttributes + .4byte House3_Layout .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 0882a6bf0..a4da19432 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_Mart:: @ 8305C60 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 78576d740..626ae4ab9 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C - .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes + .4byte LavaridgeTown_PokemonCenter_1F_Layout .4byte LavaridgeTown_PokemonCenter_1F_MapEvents .4byte LavaridgeTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 3d86fa588..3ff2df867 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 204e2098d..0bc87004b 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -1,5 +1,5 @@ LilycoveCity:: @ 83054D4 - .4byte LilycoveCity_MapAttributes + .4byte LilycoveCity_Layout .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 47329e0f7..7ab3bd2cd 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -1,5 +1,5 @@ LilycoveCity_ContestHall:: @ 83065AC - .4byte LilycoveCity_ContestHall_MapAttributes + .4byte LilycoveCity_ContestHall_Layout .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 5bf98a32b..b109dab11 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -1,5 +1,5 @@ LilycoveCity_ContestLobby:: @ 8306590 - .4byte LilycoveCity_ContestLobby_MapAttributes + .4byte LilycoveCity_ContestLobby_Layout .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 141fda863..94a1e4434 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 - .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes + .4byte LilycoveCity_CoveLilyMotel_1F_Layout .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 2d6f9de4b..b543a826d 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C - .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes + .4byte LilycoveCity_CoveLilyMotel_2F_Layout .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 3f1a8ada9..d8c3e1d6b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 - .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes + .4byte LilycoveCity_DepartmentStoreElevator_Layout .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 292c621d3..c50694c5e 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 - .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes + .4byte LilycoveCity_DepartmentStoreRooftop_Layout .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index ecfb77604..31798b5e6 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC - .4byte LilycoveCity_DepartmentStore_1F_MapAttributes + .4byte LilycoveCity_DepartmentStore_1F_Layout .4byte LilycoveCity_DepartmentStore_1F_MapEvents .4byte LilycoveCity_DepartmentStore_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index f10428935..75c8ef43c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 - .4byte LilycoveCity_DepartmentStore_2F_MapAttributes + .4byte LilycoveCity_DepartmentStore_2F_Layout .4byte LilycoveCity_DepartmentStore_2F_MapEvents .4byte LilycoveCity_DepartmentStore_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 16f453da0..29e214a1d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 - .4byte LilycoveCity_DepartmentStore_3F_MapAttributes + .4byte LilycoveCity_DepartmentStore_3F_Layout .4byte LilycoveCity_DepartmentStore_3F_MapEvents .4byte LilycoveCity_DepartmentStore_3F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 169f21d92..595f28d19 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 - .4byte LilycoveCity_DepartmentStore_4F_MapAttributes + .4byte LilycoveCity_DepartmentStore_4F_Layout .4byte LilycoveCity_DepartmentStore_4F_MapEvents .4byte LilycoveCity_DepartmentStore_4F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 19b45696c..ae3033a5d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C - .4byte LilycoveCity_DepartmentStore_5F_MapAttributes + .4byte LilycoveCity_DepartmentStore_5F_Layout .4byte LilycoveCity_DepartmentStore_5F_MapEvents .4byte LilycoveCity_DepartmentStore_5F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index a83e7139d..6c3149eaf 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -1,5 +1,5 @@ LilycoveCity_EmptyMap:: @ 8306654 - .4byte LilycoveCity_EmptyMap_MapAttributes + .4byte LilycoveCity_EmptyMap_Layout .4byte LilycoveCity_EmptyMap_MapEvents .4byte LilycoveCity_EmptyMap_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 022eb0356..d29ac7057 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -1,5 +1,5 @@ LilycoveCity_Harbor:: @ 8306638 - .4byte LilycoveCity_Harbor_MapAttributes + .4byte Harbor_Layout .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index f4246c98f..ec41783d0 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House1:: @ 830668C - .4byte House11_MapAttributes + .4byte House1_Layout .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 8aac9185c..491e60776 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House2:: @ 83066A8 - .4byte LilycoveCity_House2_MapAttributes + .4byte LilycoveCity_House2_Layout .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index f1c7f73b7..e984e5576 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House3:: @ 83066C4 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 47d5c21e7..0faae2952 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,5 +1,5 @@ LilycoveCity_House4:: @ 83066E0 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index d48ffc94f..7f2d6d8a8 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 - .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes + .4byte LilycoveCity_LilycoveMuseum_1F_Layout .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 460ed87f9..5b1207331 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 - .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes + .4byte LilycoveCity_LilycoveMuseum_2F_Layout .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index 5f6798646..b30bb8b6e 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index a1eb040ae..32d4df792 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 341ce8590..aacc4ca10 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 4e75b2193..292e02d96 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -1,5 +1,5 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C - .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes + .4byte LilycoveCity_PokemonTrainerFanClub_Layout .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index 43137d33b..c1027addb 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -1,5 +1,5 @@ LilycoveCity_UnusedMart:: @ 8306600 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 9e265d9c9..bc747d21e 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,5 +1,5 @@ LinkContestRoom1:: @ 83079E8 - .4byte LinkContestRoom1_MapAttributes + .4byte LinkContestRoom1_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index f492eab03..e8a4ec4fd 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,5 +1,5 @@ LinkContestRoom2:: @ 8307AAC - .4byte LinkContestRoom2_MapAttributes + .4byte LinkContestRoom2_Layout .4byte LinkContestRoom2_MapEvents .4byte LinkContestRoom2_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 90de4491d..930f19137 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,5 +1,5 @@ LinkContestRoom3:: @ 8307AC8 - .4byte LinkContestRoom3_MapAttributes + .4byte LinkContestRoom3_Layout .4byte LinkContestRoom3_MapEvents .4byte LinkContestRoom3_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 774e55abc..ddc1b2741 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,5 +1,5 @@ LinkContestRoom4:: @ 8307AE4 - .4byte LinkContestRoom4_MapAttributes + .4byte LinkContestRoom4_Layout .4byte LinkContestRoom4_MapEvents .4byte LinkContestRoom4_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 22b90f6c9..681662ee9 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,5 +1,5 @@ LinkContestRoom5:: @ 8307B00 - .4byte LinkContestRoom5_MapAttributes + .4byte LinkContestRoom5_Layout .4byte LinkContestRoom5_MapEvents .4byte LinkContestRoom5_MapScripts .4byte 0x0 diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index 773912080..55c417785 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,5 +1,5 @@ LinkContestRoom6:: @ 8307B1C - .4byte LinkContestRoom6_MapAttributes + .4byte LinkContestRoom6_Layout .4byte LinkContestRoom6_MapEvents .4byte LinkContestRoom6_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 5493f6005..73bbf71b5 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -1,5 +1,5 @@ LittlerootTown:: @ 8305544 - .4byte LittlerootTown_MapAttributes + .4byte LittlerootTown_Layout .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index 122fdc82a..6f2c31c86 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 - .4byte LittlerootTown_BrendansHouse_1F_MapAttributes + .4byte LittlerootTown_BrendansHouse_1F_Layout .4byte LittlerootTown_BrendansHouse_1F_MapEvents .4byte LittlerootTown_BrendansHouse_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 449a883cb..d23ea0b30 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C - .4byte LittlerootTown_BrendansHouse_2F_MapAttributes + .4byte LittlerootTown_BrendansHouse_2F_Layout .4byte LittlerootTown_BrendansHouse_2F_MapEvents .4byte LittlerootTown_BrendansHouse_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 6d6220086..961f411a2 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 - .4byte LittlerootTown_MaysHouse_1F_MapAttributes + .4byte LittlerootTown_MaysHouse_1F_Layout .4byte LittlerootTown_MaysHouse_1F_MapEvents .4byte LittlerootTown_MaysHouse_1F_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 44859dd4c..640230c00 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -1,5 +1,5 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 - .4byte LittlerootTown_MaysHouse_2F_MapAttributes + .4byte LittlerootTown_MaysHouse_2F_Layout .4byte LittlerootTown_MaysHouse_2F_MapEvents .4byte LittlerootTown_MaysHouse_2F_MapScripts .4byte 0x0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 31fb03c64..44f415d9b 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -1,5 +1,5 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 - .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes + .4byte LittlerootTown_ProfessorBirchsLab_Layout .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 3876e17ec..95e2ded37 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_1F:: @ 8307588 - .4byte MagmaHideout_1F_MapAttributes + .4byte MagmaHideout_1F_Layout .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index 16fe3f2ba..bafc9f112 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_B1F:: @ 83075A4 - .4byte MagmaHideout_B1F_MapAttributes + .4byte MagmaHideout_B1F_Layout .4byte MagmaHideout_B1F_MapEvents .4byte MagmaHideout_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index 3aee695b4..de9b39593 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -1,5 +1,5 @@ MagmaHideout_B2F:: @ 83075C0 - .4byte MagmaHideout_B2F_MapAttributes + .4byte MagmaHideout_B2F_Layout .4byte MagmaHideout_B2F_MapEvents .4byte MagmaHideout_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index e0e2c4f22..a5eb578c1 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -1,5 +1,5 @@ MauvilleCity:: @ 8305480 - .4byte MauvilleCity_MapAttributes + .4byte MauvilleCity_Layout .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index c99124794..4cf657936 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -1,5 +1,5 @@ MauvilleCity_BikeShop:: @ 8306168 - .4byte MauvilleCity_BikeShop_MapAttributes + .4byte MauvilleCity_BikeShop_Layout .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 653a41544..dfb7bcd0a 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -1,5 +1,5 @@ MauvilleCity_GameCorner:: @ 83061A0 - .4byte MauvilleCity_GameCorner_MapAttributes + .4byte MauvilleCity_GameCorner_Layout .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index efbd61fe0..7be94e661 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym:: @ 830614C - .4byte MauvilleCity_Gym_MapAttributes + .4byte MauvilleCity_Gym_Layout .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index e9acd83bd..b81f735fa 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House1:: @ 8306184 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 37a434405..84180ce98 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,5 +1,5 @@ MauvilleCity_House2:: @ 83061BC - .4byte House11_MapAttributes + .4byte House1_Layout .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 7712e16df..e8d2694d1 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -1,5 +1,5 @@ MauvilleCity_Mart:: @ 8306210 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index b6e0a1628..e3cf14b52 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 8787c975e..71c27de3b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index dcb3fbbde..50e5a59cf 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_1R:: @ 8306D70 - .4byte MeteorFalls_1F_1R_MapAttributes + .4byte MeteorFalls_1F_1R_Layout .4byte MeteorFalls_1F_1R_MapEvents .4byte MeteorFalls_1F_1R_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 0d9d797aa..9b07de17c 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_1F_2R:: @ 8306D8C - .4byte MeteorFalls_1F_2R_MapAttributes + .4byte MeteorFalls_1F_2R_Layout .4byte MeteorFalls_1F_2R_MapEvents .4byte MeteorFalls_1F_2R_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index f67ab9ea7..8b5b67256 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_1R:: @ 8306DA8 - .4byte MeteorFalls_B1F_1R_MapAttributes + .4byte MeteorFalls_B1F_1R_Layout .4byte MeteorFalls_B1F_1R_MapEvents .4byte MeteorFalls_B1F_1R_MapScripts .4byte 0x0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 779e6d23a..f3ed76145 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R:: @ 8306DC4 - .4byte MeteorFalls_B1F_2R_MapAttributes + .4byte MeteorFalls_B1F_2R_Layout .4byte MeteorFalls_B1F_2R_MapEvents .4byte MeteorFalls_B1F_2R_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 26b3e1db0..a108fc6d6 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -1,5 +1,5 @@ MossdeepCity:: @ 83054F0 - .4byte MossdeepCity_MapAttributes + .4byte MossdeepCity_Layout .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index d96d383ea..d7f6a2e16 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 - .4byte MossdeepCity_GameCorner_1F_MapAttributes + .4byte MossdeepCity_GameCorner_1F_Layout .4byte MossdeepCity_GameCorner_1F_MapEvents .4byte MossdeepCity_GameCorner_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 7692281f0..fc7a641eb 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 - .4byte MossdeepCity_GameCorner_B1F_MapAttributes + .4byte MossdeepCity_GameCorner_B1F_Layout .4byte MossdeepCity_GameCorner_B1F_MapEvents .4byte MossdeepCity_GameCorner_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index b72bdf62e..2546bc631 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -1,5 +1,5 @@ MossdeepCity_Gym:: @ 83067C0 - .4byte MossdeepCity_Gym_MapAttributes + .4byte MossdeepCity_Gym_Layout .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 5fd23c8ec..135ce0c71 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House1:: @ 83067DC - .4byte House12_MapAttributes + .4byte House2_Layout .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 99140eaa7..f518be4e0 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House2:: @ 83067F8 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 382f165a4..7e3abf6cd 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House3:: @ 8306868 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index 1c0e433bb..90daccd22 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -1,5 +1,5 @@ MossdeepCity_House4:: @ 83068A0 - .4byte MossdeepCity_House4_MapAttributes + .4byte HouseWithBed_Layout .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index c18fca0e3..eb808693c 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -1,5 +1,5 @@ MossdeepCity_Mart:: @ 830684C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index 036604eff..a2fff6ade 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index cb42c5c80..9307396ae 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 65ba897fb..6dd396fdd 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC - .4byte MossdeepCity_SpaceCenter_1F_MapAttributes + .4byte MossdeepCity_SpaceCenter_1F_Layout .4byte MossdeepCity_SpaceCenter_1F_MapEvents .4byte MossdeepCity_SpaceCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 2195ee8e2..53e692407 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -1,5 +1,5 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 - .4byte MossdeepCity_SpaceCenter_2F_MapAttributes + .4byte MossdeepCity_SpaceCenter_2F_Layout .4byte MossdeepCity_SpaceCenter_2F_MapEvents .4byte MossdeepCity_SpaceCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 761ea9b73..ecdc32bd1 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -1,5 +1,5 @@ MossdeepCity_StevensHouse:: @ 8306884 - .4byte MossdeepCity_StevensHouse_MapAttributes + .4byte MossdeepCity_StevensHouse_Layout .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index cdc29ce7f..43995f016 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -1,5 +1,5 @@ MtChimney:: @ 8306EC0 - .4byte MtChimney_MapAttributes + .4byte MtChimney_Layout .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index f5207578b..493cc512e 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -1,5 +1,5 @@ MtChimney_CableCarStation:: @ 8306CAC - .4byte MtChimney_CableCarStation_MapAttributes + .4byte CableCarStation_Layout .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index cfdff9591..0e2958753 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,5 +1,5 @@ MtPyre_1F:: @ 8306F14 - .4byte MtPyre_1F_MapAttributes + .4byte MtPyre_1F_Layout .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 914fdabd4..813fa5604 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -1,5 +1,5 @@ MtPyre_2F:: @ 8306F30 - .4byte MtPyre_2F_MapAttributes + .4byte MtPyre_2F_Layout .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index b4a59adbd..941fbbb20 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -1,5 +1,5 @@ MtPyre_3F:: @ 8306F4C - .4byte MtPyre_3F_MapAttributes + .4byte MtPyre_3F_Layout .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 8dcbd4e64..604d0fadc 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,5 +1,5 @@ MtPyre_4F:: @ 8306F68 - .4byte MtPyre_4F_MapAttributes + .4byte MtPyre_4F_Layout .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 0eb7f7bba..f1dc8d7c1 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -1,5 +1,5 @@ MtPyre_5F:: @ 8306F84 - .4byte MtPyre_5F_MapAttributes + .4byte MtPyre_5F_Layout .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 3cab722cd..8d824b4b6 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -1,5 +1,5 @@ MtPyre_6F:: @ 8306FA0 - .4byte MtPyre_6F_MapAttributes + .4byte MtPyre_6F_Layout .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 543e090f0..4a1c86be9 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -1,5 +1,5 @@ MtPyre_Exterior:: @ 8306FBC - .4byte MtPyre_Exterior_MapAttributes + .4byte MtPyre_Exterior_Layout .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index e07d849a6..74be5845e 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,5 +1,5 @@ MtPyre_Summit:: @ 8306FD8 - .4byte MtPyre_Summit_MapAttributes + .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 28ac26ccf..690e3d276 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -1,5 +1,5 @@ NewMauville_Entrance:: @ 8307320 - .4byte NewMauville_Entrance_MapAttributes + .4byte NewMauville_Entrance_Layout .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 9771d7ec7..dd252544f 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -1,5 +1,5 @@ NewMauville_Inside:: @ 830733C - .4byte NewMauville_Inside_MapAttributes + .4byte NewMauville_Inside_Layout .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 22965da3d..8403d61c6 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -1,5 +1,5 @@ OldaleTown:: @ 8305560 - .4byte OldaleTown_MapAttributes + .4byte OldaleTown_Layout .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 530a0e763..4f0142667 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,5 +1,5 @@ OldaleTown_House1:: @ 8305ABC - .4byte House11_MapAttributes + .4byte House1_Layout .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 2214fbfaf..84f544145 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,5 +1,5 @@ OldaleTown_House2:: @ 8305AD8 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index a0e8a8851..c1efeb849 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -1,5 +1,5 @@ OldaleTown_Mart:: @ 8305B2C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 82ced7328..e0695fbaf 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 79e6ca99d..cd42c15a7 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 057e83264..621ac206e 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -1,5 +1,5 @@ PacifidlogTown:: @ 83055EC - .4byte PacifidlogTown_MapAttributes + .4byte PacifidlogTown_Layout .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index 7842574f9..81b24d450 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House1:: @ 8305E90 - .4byte PacifidlogTown_House1_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 3fc2aba99..fe0626bf3 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House2:: @ 8305EAC - .4byte PacifidlogTown_House2_MapAttributes + .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 6bf1e6bd6..401c70d5b 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House3:: @ 8305EC8 - .4byte PacifidlogTown_House3_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index df930a533..5e69f1f7e 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House4:: @ 8305EE4 - .4byte PacifidlogTown_House4_MapAttributes + .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index d0fca156f..31bf4de65 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_House5:: @ 8305F00 - .4byte PacifidlogTown_House5_MapAttributes + .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index ef2ddbf4c..872d1ac17 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index b985545a8..734d4225d 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index c1706a55a..42136d835 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -1,5 +1,5 @@ PetalburgCity:: @ 8305448 - .4byte PetalburgCity_MapAttributes + .4byte PetalburgCity_Layout .4byte PetalburgCity_MapEvents .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index af00ed5f0..7799ed7df 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -1,5 +1,5 @@ PetalburgCity_Gym:: @ 8305F38 - .4byte PetalburgCity_Gym_MapAttributes + .4byte PetalburgCity_Gym_Layout .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 4fe3dfdbc..66d92403b 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House1:: @ 8305F54 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index fb76b1bfe..fdbf58c38 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -1,5 +1,5 @@ PetalburgCity_House2:: @ 8305F70 - .4byte PetalburgCity_House2_MapAttributes + .4byte HouseWithBed_Layout .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 56275cfaf..fc09d24a5 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -1,5 +1,5 @@ PetalburgCity_Mart:: @ 8305FC4 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 2596fb65d..3af2d5282 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index ac6c77b6a..008c26bf6 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 47fb229ba..22ebc57a3 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,5 +1,5 @@ PetalburgCity_WallysHouse:: @ 8305F1C - .4byte House12_MapAttributes + .4byte House2_Layout .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index b3a981af9..a1eb5618c 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -1,5 +1,5 @@ PetalburgWoods:: @ 8306EA4 - .4byte PetalburgWoods_MapAttributes + .4byte PetalburgWoods_Layout .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index a8322ebee..976ede8cf 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,5 +1,5 @@ RecordCorner:: @ 83079B0 - .4byte RecordCorner_MapAttributes + .4byte RecordCorner_Layout .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 1b4b6b1c4..c50d34519 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,5 +1,5 @@ Route101:: @ 8305608 - .4byte Route101_MapAttributes + .4byte Route101_Layout .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index a4318e2d2..c23ac6567 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,5 +1,5 @@ Route102:: @ 8305624 - .4byte Route102_MapAttributes + .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index b23f9d523..cf7033922 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -1,5 +1,5 @@ Route103:: @ 8305640 - .4byte Route103_MapAttributes + .4byte Route103_Layout .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 71e7059b5..084a2e602 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,5 +1,5 @@ Route104:: @ 830565C - .4byte Route104_MapAttributes + .4byte Route104_Layout .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index 3055a73d6..99d99bd8a 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -1,5 +1,5 @@ Route104_MrBrineysHouse:: @ 8306C20 - .4byte Route104_MrBrineysHouse_MapAttributes + .4byte Route104_MrBrineysHouse_Layout .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index 3dae6a068..f98d930ab 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -1,5 +1,5 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C - .4byte Route104_PrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 7f5115386..87b11e3ba 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,5 +1,5 @@ Route104_Prototype:: @ 8307CF8 - .4byte Route104_Prototype_MapAttributes + .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index 51b27eb0a..aecb3c549 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -1,5 +1,5 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 - .4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes + .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 344b8f634..a286003c9 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,5 +1,5 @@ Route105:: @ 8305678 - .4byte Route105_MapAttributes + .4byte Route105_Layout .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 494690340..baeb22a8a 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,5 +1,5 @@ Route106:: @ 8305694 - .4byte Route106_MapAttributes + .4byte Route106_Layout .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 382b617ba..dc8a49a79 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -1,5 +1,5 @@ Route107:: @ 83056B0 - .4byte Route107_MapAttributes + .4byte Route107_Layout .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 3214f7b89..d84d77d8e 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -1,5 +1,5 @@ Route108:: @ 83056CC - .4byte Route108_MapAttributes + .4byte Route108_Layout .4byte Route108_MapEvents .4byte Route108_MapScripts .4byte Route108_MapConnections diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index db91d1368..67a9b09c0 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -1,5 +1,5 @@ Route109:: @ 83056E8 - .4byte Route109_MapAttributes + .4byte Route109_Layout .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 064d428bd..7ac57b934 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -1,5 +1,5 @@ Route109_SeashoreHouse:: @ 8307D30 - .4byte Route109_SeashoreHouse_MapAttributes + .4byte Route109_SeashoreHouse_Layout .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 442a02ccb..b2ea0c8bd 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -1,5 +1,5 @@ Route110:: @ 8305704 - .4byte Route110_MapAttributes + .4byte Route110_Layout .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 749ab18e9..523832792 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrace_Layout .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index a4bd0cbd7..6c9a6413a 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapAttributes + .4byte Route110_SeasideCyclingRoadEntrace_Layout .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index f2b2c691d..bde1d5b52 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseCorridor:: @ 8307D84 - .4byte Route110_TrickHouseCorridor_MapAttributes + .4byte Route110_TrickHouseCorridor_Layout .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index d61808d7f..c0a61f038 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd:: @ 8307D68 - .4byte Route110_TrickHouseEnd_MapAttributes + .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 80d6c597f..8ecc26186 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance:: @ 8307D4C - .4byte Route110_TrickHouseEntrance_MapAttributes + .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index c4c87877c..7b5bb82f5 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 - .4byte Route110_TrickHousePuzzle1_MapAttributes + .4byte Route110_TrickHousePuzzle1_Layout .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index d278ca3aa..a21c2f395 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle2:: @ 8307DBC - .4byte Route110_TrickHousePuzzle2_MapAttributes + .4byte Route110_TrickHousePuzzle2_Layout .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 736a1dc19..974573410 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 - .4byte Route110_TrickHousePuzzle3_MapAttributes + .4byte Route110_TrickHousePuzzle3_Layout .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index f4117a578..d400e5eb4 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 - .4byte Route110_TrickHousePuzzle4_MapAttributes + .4byte Route110_TrickHousePuzzle4_Layout .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index 7216f556e..700aa68fe 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle5:: @ 8307E10 - .4byte Route110_TrickHousePuzzle5_MapAttributes + .4byte Route110_TrickHousePuzzle5_Layout .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 5ffc844bd..8bdef5c7b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle6:: @ 8307E2C - .4byte Route110_TrickHousePuzzle6_MapAttributes + .4byte Route110_TrickHousePuzzle6_Layout .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index cea170daa..2008208ce 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle7:: @ 8307E48 - .4byte Route110_TrickHousePuzzle7_MapAttributes + .4byte Route110_TrickHousePuzzle7_Layout .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 6a4dc7051..ced373d13 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -1,5 +1,5 @@ Route110_TrickHousePuzzle8:: @ 8307E64 - .4byte Route110_TrickHousePuzzle8_MapAttributes + .4byte Route110_TrickHousePuzzle8_Layout .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 5af1fb1c2..80fa09a0c 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -1,5 +1,5 @@ Route111:: @ 8305720 - .4byte Route111_MapAttributes + .4byte Route111_Layout .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 23f4959a3..60383cf3d 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop:: @ 8306C74 - .4byte Route111_OldLadysRestStop_MapAttributes + .4byte House3_Layout .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 32fbca9a0..985d6d62d 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,5 +1,5 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index f798451d6..9a59e413e 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,5 +1,5 @@ Route112:: @ 830573C - .4byte Route112_MapAttributes + .4byte Route112_Layout .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 3d025fb7b..990e7a5bf 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -1,5 +1,5 @@ Route112_CableCarStation:: @ 8306C90 - .4byte Route112_CableCarStation_MapAttributes + .4byte CableCarStation_Layout .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 5792f97c3..c5dff2d5d 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -1,5 +1,5 @@ Route113:: @ 8305758 - .4byte Route113_MapAttributes + .4byte Route113_Layout .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index a8bfdd35d..860db983c 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -1,5 +1,5 @@ Route113_GlassWorkshop:: @ 8307EB8 - .4byte Route113_GlassWorkshop_MapAttributes + .4byte House4_Layout .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index cfb5f4114..a845c579a 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -1,5 +1,5 @@ Route114:: @ 8305774 - .4byte Route114_MapAttributes + .4byte Route114_Layout .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index 2da95c284..8939a6ebd 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse:: @ 8306CC8 - .4byte Route114_FossilManiacsHouse_MapAttributes + .4byte Route114_FossilManiacsHouse_Layout .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index b410c822c..cdd7de9ff 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 - .4byte Route114_FossilManiacsTunnel_MapAttributes + .4byte Route114_FossilManiacsTunnel_Layout .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index a5b7eea50..d40a42513 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse:: @ 8306D00 - .4byte Route114_LanettesHouse_MapAttributes + .4byte Route114_LanettesHouse_Layout .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index b11134e28..ee72fe0b2 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -1,5 +1,5 @@ Route115:: @ 8305790 - .4byte Route115_MapAttributes + .4byte Route115_Layout .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index f4e145bf1..8fbf022a7 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -1,5 +1,5 @@ Route116:: @ 83057AC - .4byte Route116_MapAttributes + .4byte Route116_Layout .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index a52c6cada..b245aa534 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -1,5 +1,5 @@ Route116_TunnelersRestHouse:: @ 8306D1C - .4byte Route116_TunnelersRestHouse_MapAttributes + .4byte Route116_TunnelersRestHouse_Layout .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 9649f4728..437e59bd6 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,5 +1,5 @@ Route117:: @ 83057C8 - .4byte Route117_MapAttributes + .4byte Route117_Layout .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 567819b48..3df8c8b16 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare:: @ 8306D38 - .4byte Route117_PokemonDayCare_MapAttributes + .4byte Route117_PokemonDayCare_Layout .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 5b1190621..d75021d0a 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -1,5 +1,5 @@ Route118:: @ 83057E4 - .4byte Route118_MapAttributes + .4byte Route118_Layout .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index ef5887676..fd2445e92 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -1,5 +1,5 @@ Route119:: @ 8305800 - .4byte Route119_MapAttributes + .4byte Route119_Layout .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 2a14f5292..245d6c559 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,5 +1,5 @@ Route119_House:: @ 8307F28 - .4byte House11_MapAttributes + .4byte House1_Layout .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index b392fbc41..654ee2df0 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 - .4byte Route119_WeatherInstitute_1F_MapAttributes + .4byte Route119_WeatherInstitute_1F_Layout .4byte Route119_WeatherInstitute_1F_MapEvents .4byte Route119_WeatherInstitute_1F_MapScripts .4byte 0x0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index 9a5c3d9d8..803d3b75b 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -1,5 +1,5 @@ Route119_WeatherInstitute_2F:: @ 8307F0C - .4byte Route119_WeatherInstitute_2F_MapAttributes + .4byte Route119_WeatherInstitute_2F_Layout .4byte Route119_WeatherInstitute_2F_MapEvents .4byte Route119_WeatherInstitute_2F_MapScripts .4byte 0x0 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 3f8be7e95..912234e0c 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -1,5 +1,5 @@ Route120:: @ 830581C - .4byte Route120_MapAttributes + .4byte Route120_Layout .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index ba2c3d2da..90f1ed359 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,5 +1,5 @@ Route121:: @ 8305838 - .4byte Route121_MapAttributes + .4byte Route121_Layout .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 4a0bbe244..2c53111c8 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -1,5 +1,5 @@ Route121_SafariZoneEntrance:: @ 8306D54 - .4byte Route121_SafariZoneEntrance_MapAttributes + .4byte Route121_SafariZoneEntrance_Layout .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index 9889cc813..b6bd5943d 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,5 +1,5 @@ Route122:: @ 8305854 - .4byte Route122_MapAttributes + .4byte Route122_Layout .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index f33ab3e98..84bd53a9f 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -1,5 +1,5 @@ Route123:: @ 8305870 - .4byte Route123_MapAttributes + .4byte Route123_Layout .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 11501e733..d170971fa 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,5 +1,5 @@ Route123_BerryMastersHouse:: @ 8307ED4 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index 6e4466225..f1f361661 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,5 +1,5 @@ Route124:: @ 830588C - .4byte Route124_MapAttributes + .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 472ebc45a..d4a0d938e 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -1,5 +1,5 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 - .4byte Route124_DivingTreasureHuntersHouse_MapAttributes + .4byte Route124_DivingTreasureHuntersHouse_Layout .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index e7a43a64d..2e07545dc 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,5 +1,5 @@ Route125:: @ 83058A8 - .4byte Route125_MapAttributes + .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index a973af531..ec593c1cb 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,5 +1,5 @@ Route126:: @ 83058C4 - .4byte Route126_MapAttributes + .4byte Route126_Layout .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index a9f887a2b..484ef4e48 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,5 +1,5 @@ Route127:: @ 83058E0 - .4byte Route127_MapAttributes + .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 9ecc76fb7..7461f5796 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -1,5 +1,5 @@ Route128:: @ 83058FC - .4byte Route128_MapAttributes + .4byte Route128_Layout .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 580d69fc7..8cdd83703 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,5 +1,5 @@ Route129:: @ 8305918 - .4byte Route129_MapAttributes + .4byte Route129_Layout .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index a788bf9b5..ade5554f1 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,5 +1,5 @@ Route130:: @ 8305934 - .4byte Route130_MapAttributes + .4byte Route130_Layout .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index e7d9ea231..5dfa4e94c 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -1,5 +1,5 @@ Route131:: @ 8305950 - .4byte Route131_MapAttributes + .4byte Route131_Layout .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index d7ad0b2a4..5d797099e 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,5 +1,5 @@ Route132:: @ 830596C - .4byte Route132_MapAttributes + .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 4c0f718ec..1c0f9f16f 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,5 +1,5 @@ Route133:: @ 8305988 - .4byte Route133_MapAttributes + .4byte Route133_Layout .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 2ca22c40e..8280c31aa 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,5 +1,5 @@ Route134:: @ 83059A4 - .4byte Route134_MapAttributes + .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index d1352ea3e..3b36e6c68 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -1,5 +1,5 @@ RustboroCity:: @ 830549C - .4byte RustboroCity_MapAttributes + .4byte RustboroCity_Layout .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index c3b5a6d7c..b547804b4 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -1,5 +1,5 @@ RustboroCity_CuttersHouse:: @ 8306360 - .4byte RustboroCity_CuttersHouse_MapAttributes + .4byte RustboroCity_CuttersHouse_Layout .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index 5539006ff..d5c56227f 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_1F:: @ 830622C - .4byte RustboroCity_DevonCorp_1F_MapAttributes + .4byte RustboroCity_DevonCorp_1F_Layout .4byte RustboroCity_DevonCorp_1F_MapEvents .4byte RustboroCity_DevonCorp_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index 76bbea60b..930a8e915 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_2F:: @ 8306248 - .4byte RustboroCity_DevonCorp_2F_MapAttributes + .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index c3d4549de..335fbd66c 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -1,5 +1,5 @@ RustboroCity_DevonCorp_3F:: @ 8306264 - .4byte RustboroCity_DevonCorp_3F_MapAttributes + .4byte RustboroCity_DevonCorp_3F_Layout .4byte RustboroCity_DevonCorp_3F_MapEvents .4byte RustboroCity_DevonCorp_3F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 68a5697be..1577abe5c 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat1_1F:: @ 830630C - .4byte RustboroCity_Flat1_1F_MapAttributes + .4byte RustboroCity_Flat1_1F_Layout .4byte RustboroCity_Flat1_1F_MapEvents .4byte RustboroCity_Flat1_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index f0b29ae0d..18d9323a4 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat1_2F:: @ 8306328 - .4byte RustboroCity_Flat1_2F_MapAttributes + .4byte RustboroCity_Flat1_2F_Layout .4byte RustboroCity_Flat1_2F_MapEvents .4byte RustboroCity_Flat1_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 5f54f2624..dbfc104eb 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_1F:: @ 8306398 - .4byte RustboroCity_Flat2_1F_MapAttributes + .4byte RustboroCity_Flat2_1F_Layout .4byte RustboroCity_Flat2_1F_MapEvents .4byte RustboroCity_Flat2_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 086947abf..dbdca8d1a 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_2F:: @ 83063B4 - .4byte RustboroCity_Flat2_2F_MapAttributes + .4byte RustboroCity_Flat2_2F_Layout .4byte RustboroCity_Flat2_2F_MapEvents .4byte RustboroCity_Flat2_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 42866ebf2..9bac24e13 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -1,5 +1,5 @@ RustboroCity_Flat2_3F:: @ 83063D0 - .4byte RustboroCity_Flat2_3F_MapAttributes + .4byte RustboroCity_Flat2_3F_Layout .4byte RustboroCity_Flat2_3F_MapEvents .4byte RustboroCity_Flat2_3F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 5d18e933b..58b1d7674 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -1,5 +1,5 @@ RustboroCity_Gym:: @ 8306280 - .4byte RustboroCity_Gym_MapAttributes + .4byte RustboroCity_Gym_Layout .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 9ee09b4e3..ec04f80ac 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -1,5 +1,5 @@ RustboroCity_House1:: @ 8306344 - .4byte RustboroCity_House1_MapAttributes + .4byte RustboroCity_House1_Layout .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index 0122c6a92..cb9052e3c 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,5 +1,5 @@ RustboroCity_House2:: @ 830637C - .4byte RustboroCity_House2_MapAttributes + .4byte RustboroCity_House_Layout .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 8876f8499..c4fdd2d3c 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,5 +1,5 @@ RustboroCity_House3:: @ 83063EC - .4byte RustboroCity_House3_MapAttributes + .4byte RustboroCity_House_Layout .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 535c3e2fc..fe87573b4 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -1,5 +1,5 @@ RustboroCity_Mart:: @ 83062F0 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 57cb84729..5caf1e5fd 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 838a5e5a9..c25b9338f 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index dfb46b6f1..525731410 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -1,5 +1,5 @@ RustboroCity_PokemonSchool:: @ 830629C - .4byte RustboroCity_PokemonSchool_MapAttributes + .4byte RustboroCity_PokemonSchool_Layout .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 3e497a1e5..a25ada853 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -1,5 +1,5 @@ RusturfTunnel:: @ 8306DE0 - .4byte RusturfTunnel_MapAttributes + .4byte RusturfTunnel_Layout .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 6370e81ca..716b957f2 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,5 +1,5 @@ SSTidalCorridor:: @ 8307B54 - .4byte SSTidalCorridor_MapAttributes + .4byte SSTidalCorridor_Layout .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index 5b6bec321..f41665a91 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -1,5 +1,5 @@ SSTidalLowerDeck:: @ 8307B70 - .4byte SSTidalLowerDeck_MapAttributes + .4byte SSTidalLowerDeck_Layout .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 36bcab75e..c307f86c7 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -1,5 +1,5 @@ SSTidalRooms:: @ 8307B8C - .4byte SSTidalRooms_MapAttributes + .4byte SSTidalRooms_Layout .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 55bef875f..71a878230 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -1,5 +1,5 @@ SafariZone_Northeast:: @ 8307BC4 - .4byte SafariZone_Northeast_MapAttributes + .4byte SafariZone_Northeast_Layout .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index a3c85c6ed..5a85342cb 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -1,5 +1,5 @@ SafariZone_Northwest:: @ 8307BA8 - .4byte SafariZone_Northwest_MapAttributes + .4byte SafariZone_Northwest_Layout .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index 3db84b0b7..fd39571cd 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -1,5 +1,5 @@ SafariZone_RestHouse:: @ 8307CDC - .4byte SafariZone_RestHouse_MapAttributes + .4byte SafariZone_RestHouse_Layout .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 1307c9700..e076dd12b 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -1,5 +1,5 @@ SafariZone_Southeast:: @ 8307BFC - .4byte SafariZone_Southeast_MapAttributes + .4byte SafariZone_Southeast_Layout .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 548dc24b7..b1effab36 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -1,5 +1,5 @@ SafariZone_Southwest:: @ 8307BE0 - .4byte SafariZone_Southwest_MapAttributes + .4byte SafariZone_Southwest_Layout .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 16e45546e..ef420a191 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -1,5 +1,5 @@ ScorchedSlab:: @ 830756C - .4byte ScorchedSlab_MapAttributes + .4byte ScorchedSlab_Layout .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index d768c1099..ebb78622b 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Entrance:: @ 8307064 - .4byte SeafloorCavern_Entrance_MapAttributes + .4byte SeafloorCavern_Entrance_Layout .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index affbaf21c..81914c09a 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room1:: @ 8307080 - .4byte SeafloorCavern_Room1_MapAttributes + .4byte SeafloorCavern_Room1_Layout .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index 6e0e7455d..b1ce34ce8 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room2:: @ 830709C - .4byte SeafloorCavern_Room2_MapAttributes + .4byte SeafloorCavern_Room2_Layout .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index e2a432cd9..e152c8819 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room3:: @ 83070B8 - .4byte SeafloorCavern_Room3_MapAttributes + .4byte SeafloorCavern_Room3_Layout .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 0416091d4..de65dd9d8 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4:: @ 83070D4 - .4byte SeafloorCavern_Room4_MapAttributes + .4byte SeafloorCavern_Room4_Layout .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 3272c7021..316f0d3c9 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room5:: @ 83070F0 - .4byte SeafloorCavern_Room5_MapAttributes + .4byte SeafloorCavern_Room5_Layout .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 18fab912d..28bbdf424 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room6:: @ 830710C - .4byte SeafloorCavern_Room6_MapAttributes + .4byte SeafloorCavern_Room6_Layout .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index ff7579206..8c79c7ae9 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room7:: @ 8307128 - .4byte SeafloorCavern_Room7_MapAttributes + .4byte SeafloorCavern_Room7_Layout .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index f443c8530..8650c2849 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room8:: @ 8307144 - .4byte SeafloorCavern_Room8_MapAttributes + .4byte SeafloorCavern_Room8_Layout .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 10303ec46..f6625c0a0 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room9:: @ 8307160 - .4byte SeafloorCavern_Room9_MapAttributes + .4byte SeafloorCavern_Room9_Layout .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 6ae714a1f..b80aadc9e 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom:: @ 8307550 - .4byte SealedChamber_InnerRoom_MapAttributes + .4byte SealedChamber_InnerRoom_Layout .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index fe35a8210..7acb97fe9 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom:: @ 8307534 - .4byte SealedChamber_OuterRoom_MapAttributes + .4byte SealedChamber_OuterRoom_Layout .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 24641e4e6..8ed7552b6 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave1:: @ 8307710 - .4byte SecretBase_BlueCave1_MapAttributes + .4byte SecretBase_BlueCave1_Layout .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 599abd34a..ce44afd3b 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave2:: @ 83077B8 - .4byte SecretBase_BlueCave2_MapAttributes + .4byte SecretBase_BlueCave2_Layout .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 2adbdb4e5..361d5dff1 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave3:: @ 8307860 - .4byte SecretBase_BlueCave3_MapAttributes + .4byte SecretBase_BlueCave3_Layout .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 269a276ef..f76cbfce1 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_BlueCave4:: @ 8307908 - .4byte SecretBase_BlueCave4_MapAttributes + .4byte SecretBase_BlueCave4_Layout .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index b54737d93..0001efcea 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave1:: @ 83076F4 - .4byte SecretBase_BrownCave1_MapAttributes + .4byte SecretBase_BrownCave1_Layout .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index e84bfd2eb..ebe1e2ac6 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave2:: @ 830779C - .4byte SecretBase_BrownCave2_MapAttributes + .4byte SecretBase_BrownCave2_Layout .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 9e0dc78e0..161c19360 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave3:: @ 8307844 - .4byte SecretBase_BrownCave3_MapAttributes + .4byte SecretBase_BrownCave3_Layout .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index d21c844da..9a3fc9269 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_BrownCave4:: @ 83078EC - .4byte SecretBase_BrownCave4_MapAttributes + .4byte SecretBase_BrownCave4_Layout .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 60df36c7e..3a470fa40 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave1:: @ 83076D8 - .4byte SecretBase_RedCave1_MapAttributes + .4byte SecretBase_RedCave1_Layout .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index 5325c424e..fa4f38a53 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave2:: @ 8307780 - .4byte SecretBase_RedCave2_MapAttributes + .4byte SecretBase_RedCave2_Layout .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index a86997805..be46df6b6 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave3:: @ 8307828 - .4byte SecretBase_RedCave3_MapAttributes + .4byte SecretBase_RedCave3_Layout .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 40e830726..8e1d2e2c4 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_RedCave4:: @ 83078D0 - .4byte SecretBase_RedCave4_MapAttributes + .4byte SecretBase_RedCave4_Layout .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 3b634c729..ca0f3861c 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub1:: @ 8307764 - .4byte SecretBase_Shrub1_MapAttributes + .4byte SecretBase_Shrub1_Layout .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 1c27f8945..89f1b2ed0 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub2:: @ 830780C - .4byte SecretBase_Shrub2_MapAttributes + .4byte SecretBase_Shrub2_Layout .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index e6e85c9ed..5bc0e51d6 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub3:: @ 83078B4 - .4byte SecretBase_Shrub3_MapAttributes + .4byte SecretBase_Shrub3_Layout .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 1e610463f..e6cbf1428 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -1,5 +1,5 @@ SecretBase_Shrub4:: @ 830795C - .4byte SecretBase_Shrub4_MapAttributes + .4byte SecretBase_Shrub4_Layout .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 64722268c..f887c00e7 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree1:: @ 8307748 - .4byte SecretBase_Tree1_MapAttributes + .4byte SecretBase_Tree1_Layout .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index fefd54e68..c36f1ada0 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree2:: @ 83077F0 - .4byte SecretBase_Tree2_MapAttributes + .4byte SecretBase_Tree2_Layout .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index 09e55e66d..13890aefb 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree3:: @ 8307898 - .4byte SecretBase_Tree3_MapAttributes + .4byte SecretBase_Tree3_Layout .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index cfb58242e..f91c43add 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -1,5 +1,5 @@ SecretBase_Tree4:: @ 8307940 - .4byte SecretBase_Tree4_MapAttributes + .4byte SecretBase_Tree4_Layout .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 42a63256f..f275c84c4 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave1:: @ 830772C - .4byte SecretBase_YellowCave1_MapAttributes + .4byte SecretBase_YellowCave1_Layout .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index d57acde5c..4ea3e3fa5 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave2:: @ 83077D4 - .4byte SecretBase_YellowCave2_MapAttributes + .4byte SecretBase_YellowCave2_Layout .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index ecb6b7086..a3a6ce97f 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave3:: @ 830787C - .4byte SecretBase_YellowCave3_MapAttributes + .4byte SecretBase_YellowCave3_Layout .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index 97de9362b..721ecefb3 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -1,5 +1,5 @@ SecretBase_YellowCave4:: @ 8307924 - .4byte SecretBase_YellowCave4_MapAttributes + .4byte SecretBase_YellowCave4_Layout .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index e012b1a69..9eacbdc7e 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 - .4byte ShoalCave_HighTideEntranceRoom_MapAttributes + .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index c3f16869b..ab8156fcd 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 - .4byte ShoalCave_HighTideInnerRoom_MapAttributes + .4byte ShoalCave_HighTideInnerRoom_Layout .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index db63a0f9d..0a9b5ee49 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 - .4byte ShoalCave_LowTideEntranceRoom_MapAttributes + .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideEntranceRoom_MapEvents .4byte ShoalCave_LowTideEntranceRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index ba36a090d..59374d231 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideIceRoom:: @ 8307684 - .4byte ShoalCave_LowTideIceRoom_MapAttributes + .4byte ShoalCave_LowTideIceRoom_Layout .4byte ShoalCave_LowTideIceRoom_MapEvents .4byte ShoalCave_LowTideIceRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index c038dafcd..785230fc8 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 - .4byte ShoalCave_LowTideInnerRoom_MapAttributes + .4byte ShoalCave_LowTideInnerRoom_Layout .4byte ShoalCave_LowTideInnerRoom_MapEvents .4byte ShoalCave_LowTideInnerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 6fe4efb01..8d1375a5d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC - .4byte ShoalCave_LowTideLowerRoom_MapAttributes + .4byte ShoalCave_LowTideLowerRoom_Layout .4byte ShoalCave_LowTideLowerRoom_MapEvents .4byte ShoalCave_LowTideLowerRoom_MapScripts .4byte 0x0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index d3d904731..f47ce07e0 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 - .4byte ShoalCave_LowTideStairsRoom_MapAttributes + .4byte ShoalCave_LowTideStairsRoom_Layout .4byte ShoalCave_LowTideStairsRoom_MapEvents .4byte ShoalCave_LowTideStairsRoom_MapScripts .4byte 0x0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index f62205a55..eee3d307d 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -1,5 +1,5 @@ SingleBattleColosseum:: @ 8307978 - .4byte SingleBattleColosseum_MapAttributes + .4byte SingleBattleColosseum_Layout .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 4ccc410da..2afe52190 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -1,5 +1,5 @@ SkyPillar_1F:: @ 8307614 - .4byte SkyPillar_1F_MapAttributes + .4byte SkyPillar_1F_Layout .4byte SkyPillar_1F_MapEvents .4byte SkyPillar_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 1e3b0393d..307e73e95 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -1,5 +1,5 @@ SkyPillar_2F:: @ 8307630 - .4byte SkyPillar_2F_MapAttributes + .4byte SkyPillar_2F_Layout .4byte SkyPillar_2F_MapEvents .4byte SkyPillar_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index bd6d9cb86..f98f5edbc 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -1,5 +1,5 @@ SkyPillar_3F:: @ 830764C - .4byte SkyPillar_3F_MapAttributes + .4byte SkyPillar_3F_Layout .4byte SkyPillar_3F_MapEvents .4byte SkyPillar_3F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index 50869e629..c6482dba6 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -1,5 +1,5 @@ SkyPillar_4F:: @ 8307668 - .4byte SkyPillar_4F_MapAttributes + .4byte SkyPillar_4F_Layout .4byte SkyPillar_4F_MapEvents .4byte SkyPillar_4F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 16da8bcf4..ce4aacaef 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -1,5 +1,5 @@ SkyPillar_5F:: @ 83076A0 - .4byte SkyPillar_5F_MapAttributes + .4byte SkyPillar_5F_Layout .4byte SkyPillar_5F_MapEvents .4byte SkyPillar_5F_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 89d9becd9..c00189089 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -1,5 +1,5 @@ SkyPillar_Entrance:: @ 83075DC - .4byte SkyPillar_Entrance_MapAttributes + .4byte SkyPillar_Entrance_Layout .4byte SkyPillar_Entrance_MapEvents .4byte SkyPillar_Entrance_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 44e9a5991..71c9e9968 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -1,5 +1,5 @@ SkyPillar_Outside:: @ 83075F8 - .4byte SkyPillar_Outside_MapAttributes + .4byte SkyPillar_Outside_Layout .4byte SkyPillar_Outside_MapEvents .4byte SkyPillar_Outside_MapScripts .4byte 0x0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 0c241fe27..eb158417d 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -1,5 +1,5 @@ SkyPillar_Top:: @ 83076BC - .4byte SkyPillar_Top_MapAttributes + .4byte SkyPillar_Top_Layout .4byte SkyPillar_Top_MapEvents .4byte SkyPillar_Top_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 6575e0de5..75d71276c 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -1,5 +1,5 @@ SlateportCity:: @ 8305464 - .4byte SlateportCity_MapAttributes + .4byte SlateportCity_Layout .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index 64cc06565..5dd0f7be9 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -1,5 +1,5 @@ SlateportCity_ContestHall:: @ 8306034 - .4byte SlateportCity_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte SlateportCity_ContestHall_MapEvents .4byte SlateportCity_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index 440139e64..e758d8bd8 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -1,5 +1,5 @@ SlateportCity_ContestLobby:: @ 8306018 - .4byte SlateportCity_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte SlateportCity_ContestLobby_MapEvents .4byte SlateportCity_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index d7da07b49..479da8d1f 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -1,5 +1,5 @@ SlateportCity_Harbor:: @ 83060C0 - .4byte SlateportCity_Harbor_MapAttributes + .4byte Harbor_Layout .4byte SlateportCity_Harbor_MapEvents .4byte SlateportCity_Harbor_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 75a5cdb72..9d0a92cf0 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -1,5 +1,5 @@ SlateportCity_House1:: @ 8306050 - .4byte SlateportCity_House1_MapAttributes + .4byte HouseWithBed_Layout .4byte SlateportCity_House1_MapEvents .4byte SlateportCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index a5df54962..34b7c99a5 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -1,5 +1,5 @@ SlateportCity_House2:: @ 83060DC - .4byte House12_MapAttributes + .4byte House2_Layout .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 12f2172be..f591efb9c 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -1,5 +1,5 @@ SlateportCity_Mart:: @ 8306130 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte SlateportCity_Mart_MapEvents .4byte SlateportCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 7aaa2ff91..02821ae8d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 - .4byte SlateportCity_OceanicMuseum_1F_MapAttributes + .4byte SlateportCity_OceanicMuseum_1F_Layout .4byte SlateportCity_OceanicMuseum_1F_MapEvents .4byte SlateportCity_OceanicMuseum_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 3d9153f56..a8811c29e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 - .4byte SlateportCity_OceanicMuseum_2F_MapAttributes + .4byte SlateportCity_OceanicMuseum_2F_Layout .4byte SlateportCity_OceanicMuseum_2F_MapEvents .4byte SlateportCity_OceanicMuseum_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index d668f0efc..90e3b2c09 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 36c726d7f..a59bb27c6 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 1672d21b1..14ff57a26 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -1,5 +1,5 @@ SlateportCity_PokemonFanClub:: @ 830606C - .4byte SlateportCity_PokemonFanClub_MapAttributes + .4byte SlateportCity_PokemonFanClub_Layout .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index c3516151e..c5e7058f8 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -1,5 +1,5 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 - .4byte SlateportCity_SternsShipyard_1F_MapAttributes + .4byte SlateportCity_SternsShipyard_1F_Layout .4byte SlateportCity_SternsShipyard_1F_MapEvents .4byte SlateportCity_SternsShipyard_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 242e061aa..25958807e 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -1,5 +1,5 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC - .4byte SlateportCity_SternsShipyard_2F_MapAttributes + .4byte SlateportCity_SternsShipyard_2F_Layout .4byte SlateportCity_SternsShipyard_2F_MapEvents .4byte SlateportCity_SternsShipyard_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index d5cbae0be..32ea11228 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -1,5 +1,5 @@ SootopolisCity:: @ 830550C - .4byte SootopolisCity_MapAttributes + .4byte SootopolisCity_Layout .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 185bdc970..cc84c036b 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Gym_1F:: @ 830692C - .4byte SootopolisCity_Gym_1F_MapAttributes + .4byte SootopolisCity_Gym_1F_Layout .4byte SootopolisCity_Gym_1F_MapEvents .4byte SootopolisCity_Gym_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index 104ee8215..725a2b07e 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Gym_B1F:: @ 8306948 - .4byte SootopolisCity_Gym_B1F_MapAttributes + .4byte SootopolisCity_Gym_B1F_Layout .4byte SootopolisCity_Gym_B1F_MapEvents .4byte SootopolisCity_Gym_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 5ff1eb351..ed43835d4 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House1:: @ 83069B8 - .4byte SootopolisCity_House1_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 1ff5a7df1..eb7d36a34 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House2:: @ 83069D4 - .4byte SootopolisCity_House2_MapAttributes + .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index 3c6075fe7..7afa0cc43 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House3:: @ 83069F0 - .4byte SootopolisCity_House3_MapAttributes + .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index f155d1980..d9d34652f 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House4:: @ 8306A0C - .4byte SootopolisCity_House4_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index 7cfe101ac..ce3ed3456 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House5:: @ 8306A28 - .4byte SootopolisCity_House5_MapAttributes + .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 536872e88..ab1c28f9a 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House6:: @ 8306A44 - .4byte SootopolisCity_House6_MapAttributes + .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 598a84316..b025f33ec 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House7:: @ 8306A60 - .4byte SootopolisCity_House7_MapAttributes + .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index 4d6619797..da39efd62 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -1,5 +1,5 @@ SootopolisCity_House8:: @ 8306A7C - .4byte SootopolisCity_House8_MapAttributes + .4byte SootopolisCity_House8_Layout .4byte SootopolisCity_House8_MapEvents .4byte SootopolisCity_House8_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 47505e04d..fbf68127f 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -1,5 +1,5 @@ SootopolisCity_Mart:: @ 830699C - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index d0cef1039..5a6ce3973 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 4bdb48a7d..ed64f1f51 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 0579c81bc..6918c9c37 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -1,5 +1,5 @@ SouthernIsland_Exterior:: @ 8307CA4 - .4byte SouthernIsland_Exterior_MapAttributes + .4byte SouthernIsland_Exterior_Layout .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 42cf6db66..afa589d28 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -1,5 +1,5 @@ SouthernIsland_Interior:: @ 8307CC0 - .4byte SouthernIsland_Interior_MapAttributes + .4byte SouthernIsland_Interior_Layout .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 62bac5400..e29e2135d 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,5 +1,5 @@ TradeCenter:: @ 8307994 - .4byte TradeCenter_MapAttributes + .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index cfd06e4ce..52555165b 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -1,5 +1,5 @@ Underwater1:: @ 83059C0 - .4byte Underwater1_MapAttributes + .4byte Underwater1_Layout .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 38446fecc..0c19c9066 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -1,5 +1,5 @@ Underwater2:: @ 83059DC - .4byte Underwater2_MapAttributes + .4byte Underwater2_Layout .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 3cc773730..e952239e2 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -1,5 +1,5 @@ Underwater3:: @ 83059F8 - .4byte Underwater3_MapAttributes + .4byte Underwater3_Layout .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 8fb1e6faa..fb040d771 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -1,5 +1,5 @@ Underwater4:: @ 8305A14 - .4byte Underwater4_MapAttributes + .4byte Underwater4_Layout .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index fbc90290c..f27cb2fa7 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -1,5 +1,5 @@ Underwater_Route134:: @ 83074FC - .4byte Underwater_Route134_MapAttributes + .4byte Underwater_Route134_Layout .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 09f36c16f..13c740fed 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -1,5 +1,5 @@ Underwater_SeafloorCavern:: @ 8307048 - .4byte Underwater_SeafloorCavern_MapAttributes + .4byte Underwater_SeafloorCavern_Layout .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 86ff3384d..0eec2d22e 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber:: @ 8307518 - .4byte Underwater_SealedChamber_MapAttributes + .4byte Underwater_SealedChamber_Layout .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 8aa8bb316..3a672844f 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -1,5 +1,5 @@ Underwater_SootopolisCity:: @ 8306DFC - .4byte Underwater_SootopolisCity_MapAttributes + .4byte Underwater_SootopolisCity_Layout .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 93d3ab03f..dafb7d083 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_29:: @ 8307A04 - .4byte UnknownMap_25_29_MapAttributes + .4byte UnknownMap_25_29_Layout .4byte UnknownMap_25_29_MapEvents .4byte UnknownMap_25_29_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 96f2e3de2..005b7b40e 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_30:: @ 8307A20 - .4byte UnknownMap_25_30_MapAttributes + .4byte UnknownMap_25_30_Layout .4byte UnknownMap_25_30_MapEvents .4byte UnknownMap_25_30_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 135e1c4b1..5dae310ff 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_31:: @ 8307A3C - .4byte UnknownMap_25_31_MapAttributes + .4byte UnknownMap_25_31_Layout .4byte UnknownMap_25_31_MapEvents .4byte UnknownMap_25_31_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 4aaae9710..2dbc00c06 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_32:: @ 8307A58 - .4byte UnknownMap_25_32_MapAttributes + .4byte UnknownMap_25_32_Layout .4byte UnknownMap_25_32_MapEvents .4byte UnknownMap_25_32_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index e0bebe753..dc57d796b 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_33:: @ 8307A74 - .4byte UnknownMap_25_33_MapAttributes + .4byte UnknownMap_25_33_Layout .4byte UnknownMap_25_33_MapEvents .4byte UnknownMap_25_33_MapScripts .4byte 0x0 diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index b2c174c06..ccb77b687 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,5 +1,5 @@ UnknownMap_25_34:: @ 8307A90 - .4byte UnknownMap_25_34_MapAttributes + .4byte UnknownMap_25_34_Layout .4byte UnknownMap_25_34_MapEvents .4byte UnknownMap_25_34_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index ee41c767f..5d78f42e1 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -1,5 +1,5 @@ VerdanturfTown:: @ 83055D0 - .4byte VerdanturfTown_MapAttributes + .4byte VerdanturfTown_Layout .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index 1c0179afb..7f6b1d434 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_ContestHall:: @ 8305D94 - .4byte VerdanturfTown_ContestHall_MapAttributes + .4byte ContestHall_Layout .4byte VerdanturfTown_ContestHall_MapEvents .4byte VerdanturfTown_ContestHall_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index 31274e19f..c2f763927 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_ContestLobby:: @ 8305D78 - .4byte VerdanturfTown_ContestLobby_MapAttributes + .4byte ContestLobby_Layout .4byte VerdanturfTown_ContestLobby_MapEvents .4byte VerdanturfTown_ContestLobby_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 7b0ab4ad0..117166d92 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 - .4byte House12_MapAttributes + .4byte House2_Layout .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 0e29f4ea6..0bf8c3e2e 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_House:: @ 8305E3C - .4byte House11_MapAttributes + .4byte House1_Layout .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index db037960c..f2950cc8d 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_Mart:: @ 8305DB0 - .4byte PokeMart_MapAttributes + .4byte PokeMart_Layout .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 384c8719e..4e4e67840 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC - .4byte PokemonCenter_1F_MapAttributes + .4byte PokemonCenter_1F_Layout .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 518c11352..3122a827f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 - .4byte PokemonCenter_2F_MapAttributes + .4byte PokemonCenter_2F_Layout .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index bc31f5457..993693239 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -1,5 +1,5 @@ VerdanturfTown_WandasHouse:: @ 8305E04 - .4byte VerdanturfTown_WandasHouse_MapAttributes + .4byte VerdanturfTown_WandasHouse_Layout .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 21937891e..78b6e3939 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_1F:: @ 8307224 - .4byte VictoryRoad_1F_MapAttributes + .4byte VictoryRoad_1F_Layout .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index ebaa67358..ac2b2eeff 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_B1F:: @ 8307240 - .4byte VictoryRoad_B1F_MapAttributes + .4byte VictoryRoad_B1F_Layout .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 4690acbb7..f38f649a9 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -1,5 +1,5 @@ VictoryRoad_B2F:: @ 830725C - .4byte VictoryRoad_B2F_MapAttributes + .4byte VictoryRoad_B2F_Layout .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc index af4092f99..aec54aaab 100644 --- a/data/maps/_assets.inc +++ b/data/maps/_assets.inc @@ -1,5006 +1,332 @@ -PetalburgCity_MapBorder:: @ 8287264 - .incbin "data/maps/PetalburgCity/border.bin" - -PetalburgCity_MapBlockdata:: @ 828726C - .incbin "data/maps/PetalburgCity/map.bin" - - .align 2 -PetalburgCity_MapAttributes:: @ 8287974 - .4byte 0x1e - .4byte 0x1e - .4byte PetalburgCity_MapBorder - .4byte PetalburgCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -SlateportCity_MapBorder:: @ 828798C - .incbin "data/maps/SlateportCity/border.bin" - -SlateportCity_MapBlockdata:: @ 8287994 - .incbin "data/maps/SlateportCity/map.bin" - - .align 2 -SlateportCity_MapAttributes:: @ 8288C54 - .4byte 0x28 - .4byte 0x3c - .4byte SlateportCity_MapBorder - .4byte SlateportCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - -MauvilleCity_MapBorder:: @ 8288C6C - .incbin "data/maps/MauvilleCity/border.bin" - -MauvilleCity_MapBlockdata:: @ 8288C74 - .incbin "data/maps/MauvilleCity/map.bin" - - .align 2 -MauvilleCity_MapAttributes:: @ 82892B4 - .4byte 0x28 - .4byte 0x14 - .4byte MauvilleCity_MapBorder - .4byte MauvilleCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -RustboroCity_MapBorder:: @ 82892CC - .incbin "data/maps/RustboroCity/border.bin" - -RustboroCity_MapBlockdata:: @ 82892D4 - .incbin "data/maps/RustboroCity/map.bin" - - .align 2 -RustboroCity_MapAttributes:: @ 828A594 - .4byte 0x28 - .4byte 0x3c - .4byte RustboroCity_MapBorder - .4byte RustboroCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -FortreeCity_MapBorder:: @ 828A5AC - .incbin "data/maps/FortreeCity/border.bin" - -FortreeCity_MapBlockdata:: @ 828A5B4 - .incbin "data/maps/FortreeCity/map.bin" - - .align 2 -FortreeCity_MapAttributes:: @ 828ABF4 - .4byte 0x28 - .4byte 0x14 - .4byte FortreeCity_MapBorder - .4byte FortreeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - -LilycoveCity_MapBorder:: @ 828AC0C - .incbin "data/maps/LilycoveCity/border.bin" - -LilycoveCity_MapBlockdata:: @ 828AC14 - .incbin "data/maps/LilycoveCity/map.bin" - - .align 2 -LilycoveCity_MapAttributes:: @ 828C514 - .4byte 0x50 - .4byte 0x28 - .4byte LilycoveCity_MapBorder - .4byte LilycoveCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -MossdeepCity_MapBorder:: @ 828C52C - .incbin "data/maps/MossdeepCity/border.bin" - -MossdeepCity_MapBlockdata:: @ 828C534 - .incbin "data/maps/MossdeepCity/map.bin" - - .align 2 -MossdeepCity_MapAttributes:: @ 828DE34 - .4byte 0x50 - .4byte 0x28 - .4byte MossdeepCity_MapBorder - .4byte MossdeepCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -SootopolisCity_MapBorder:: @ 828DE4C - .incbin "data/maps/SootopolisCity/border.bin" - -SootopolisCity_MapBlockdata:: @ 828DE54 - .incbin "data/maps/SootopolisCity/map.bin" - - .align 2 -SootopolisCity_MapAttributes:: @ 828FA74 - .4byte 0x3c - .4byte 0x3c - .4byte SootopolisCity_MapBorder - .4byte SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Sootopolis - -EverGrandeCity_MapBorder:: @ 828FA8C - .incbin "data/maps/EverGrandeCity/border.bin" - -EverGrandeCity_MapBlockdata:: @ 828FA94 - .incbin "data/maps/EverGrandeCity/map.bin" - - .align 2 -EverGrandeCity_MapAttributes:: @ 8291394 - .4byte 0x28 - .4byte 0x50 - .4byte EverGrandeCity_MapBorder - .4byte EverGrandeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_EverGrande - -LittlerootTown_MapBorder:: @ 82913AC - .incbin "data/maps/LittlerootTown/border.bin" - -LittlerootTown_MapBlockdata:: @ 82913B4 - .incbin "data/maps/LittlerootTown/map.bin" - - .align 2 -LittlerootTown_MapAttributes:: @ 82916D4 - .4byte 0x14 - .4byte 0x14 - .4byte LittlerootTown_MapBorder - .4byte LittlerootTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -OldaleTown_MapBorder:: @ 82916EC - .incbin "data/maps/OldaleTown/border.bin" - -OldaleTown_MapBlockdata:: @ 82916F4 - .incbin "data/maps/OldaleTown/map.bin" - - .align 2 -OldaleTown_MapAttributes:: @ 8291A14 - .4byte 0x14 - .4byte 0x14 - .4byte OldaleTown_MapBorder - .4byte OldaleTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -DewfordTown_MapBorder:: @ 8291A2C - .incbin "data/maps/DewfordTown/border.bin" - -DewfordTown_MapBlockdata:: @ 8291A34 - .incbin "data/maps/DewfordTown/map.bin" - - .align 2 -DewfordTown_MapAttributes:: @ 8291D54 - .4byte 0x14 - .4byte 0x14 - .4byte DewfordTown_MapBorder - .4byte DewfordTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -LavaridgeTown_MapBorder:: @ 8291D6C - .incbin "data/maps/LavaridgeTown/border.bin" - -LavaridgeTown_MapBlockdata:: @ 8291D74 - .incbin "data/maps/LavaridgeTown/map.bin" - - .align 2 -LavaridgeTown_MapAttributes:: @ 8292094 - .4byte 0x14 - .4byte 0x14 - .4byte LavaridgeTown_MapBorder - .4byte LavaridgeTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -FallarborTown_MapBorder:: @ 82920AC - .incbin "data/maps/FallarborTown/border.bin" - -FallarborTown_MapBlockdata:: @ 82920B4 - .incbin "data/maps/FallarborTown/map.bin" - - .align 2 -FallarborTown_MapAttributes:: @ 82923D4 - .4byte 0x14 - .4byte 0x14 - .4byte FallarborTown_MapBorder - .4byte FallarborTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -VerdanturfTown_MapBorder:: @ 82923EC - .incbin "data/maps/VerdanturfTown/border.bin" - -VerdanturfTown_MapBlockdata:: @ 82923F4 - .incbin "data/maps/VerdanturfTown/map.bin" - - .align 2 -VerdanturfTown_MapAttributes:: @ 8292714 - .4byte 0x14 - .4byte 0x14 - .4byte VerdanturfTown_MapBorder - .4byte VerdanturfTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -PacifidlogTown_MapBorder:: @ 829272C - .incbin "data/maps/PacifidlogTown/border.bin" - -PacifidlogTown_MapBlockdata:: @ 8292734 - .incbin "data/maps/PacifidlogTown/map.bin" - - .align 2 -PacifidlogTown_MapAttributes:: @ 8292D74 - .4byte 0x14 - .4byte 0x28 - .4byte PacifidlogTown_MapBorder - .4byte PacifidlogTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Route101_MapBorder:: @ 8292D8C - .incbin "data/maps/Route101/border.bin" - -Route101_MapBlockdata:: @ 8292D94 - .incbin "data/maps/Route101/map.bin" - - .align 2 -Route101_MapAttributes:: @ 82930B4 - .4byte 0x14 - .4byte 0x14 - .4byte Route101_MapBorder - .4byte Route101_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -Route102_MapBorder:: @ 82930CC - .incbin "data/maps/Route102/border.bin" - -Route102_MapBlockdata:: @ 82930D4 - .incbin "data/maps/Route102/map.bin" - - .align 2 -Route102_MapAttributes:: @ 82938A4 - .4byte 0x32 - .4byte 0x14 - .4byte Route102_MapBorder - .4byte Route102_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -Route103_MapBorder:: @ 82938BC - .incbin "data/maps/Route103/border.bin" - -Route103_MapBlockdata:: @ 82938C4 - .incbin "data/maps/Route103/map.bin" - - .align 2 -Route103_MapAttributes:: @ 8294544 - .4byte 0x50 - .4byte 0x14 - .4byte Route103_MapBorder - .4byte Route103_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - -Route104_MapBorder:: @ 829455C - .incbin "data/maps/Route104/border.bin" - -Route104_MapBlockdata:: @ 8294564 - .incbin "data/maps/Route104/map.bin" - - .align 2 -Route104_MapAttributes:: @ 8295E64 - .4byte 0x28 - .4byte 0x50 - .4byte Route104_MapBorder - .4byte Route104_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -Route105_MapBorder:: @ 8295E7C - .incbin "data/maps/Route105/border.bin" - -Route105_MapBlockdata:: @ 8295E84 - .incbin "data/maps/Route105/map.bin" - - .align 2 -Route105_MapAttributes:: @ 8297784 - .4byte 0x28 - .4byte 0x50 - .4byte Route105_MapBorder - .4byte Route105_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -Route106_MapBorder:: @ 829779C - .incbin "data/maps/Route106/border.bin" - -Route106_MapBlockdata:: @ 82977A4 - .incbin "data/maps/Route106/map.bin" - - .align 2 -Route106_MapAttributes:: @ 8298424 - .4byte 0x50 - .4byte 0x14 - .4byte Route106_MapBorder - .4byte Route106_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -Route107_MapBorder:: @ 829843C - .incbin "data/maps/Route107/border.bin" - -Route107_MapBlockdata:: @ 8298444 - .incbin "data/maps/Route107/map.bin" - - .align 2 -Route107_MapAttributes:: @ 8298DA4 - .4byte 0x3c - .4byte 0x14 - .4byte Route107_MapBorder - .4byte Route107_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -Route108_MapBorder:: @ 8298DBC - .incbin "data/maps/Route108/border.bin" - -Route108_MapBlockdata:: @ 8298DC4 - .incbin "data/maps/Route108/map.bin" - - .align 2 -Route108_MapAttributes:: @ 8299724 - .4byte 0x3c - .4byte 0x14 - .4byte Route108_MapBorder - .4byte Route108_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - -Route109_MapBorder:: @ 829973C - .incbin "data/maps/Route109/border.bin" - -Route109_MapBlockdata:: @ 8299744 - .incbin "data/maps/Route109/map.bin" - - .align 2 -Route109_MapAttributes:: @ 829AA04 - .4byte 0x28 - .4byte 0x3c - .4byte Route109_MapBorder - .4byte Route109_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - -Route110_MapBorder:: @ 829AA1C - .incbin "data/maps/Route110/border.bin" - -Route110_MapBlockdata:: @ 829AA24 - .incbin "data/maps/Route110/map.bin" - - .align 2 -Route110_MapAttributes:: @ 829C964 - .4byte 0x28 - .4byte 0x64 - .4byte Route110_MapBorder - .4byte Route110_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -Route111_MapBorder:: @ 829C97C - .incbin "data/maps/Route111/border.bin" - -Route111_MapBlockdata:: @ 829C984 - .incbin "data/maps/Route111/map.bin" - - .align 2 -Route111_MapAttributes:: @ 829F544 - .4byte 0x28 - .4byte 0x8c - .4byte Route111_MapBorder - .4byte Route111_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -Route112_MapBorder:: @ 829F55C - .incbin "data/maps/Route112/border.bin" - -Route112_MapBlockdata:: @ 829F564 - .incbin "data/maps/Route112/map.bin" - - .align 2 -Route112_MapAttributes:: @ 82A0824 - .4byte 0x28 - .4byte 0x3c - .4byte Route112_MapBorder - .4byte Route112_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -Route113_MapBorder:: @ 82A083C - .incbin "data/maps/Route113/border.bin" - -Route113_MapBlockdata:: @ 82A0844 - .incbin "data/maps/Route113/map.bin" - - .align 2 -Route113_MapAttributes:: @ 82A17E4 - .4byte 0x64 - .4byte 0x14 - .4byte Route113_MapBorder - .4byte Route113_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -Route114_MapBorder:: @ 82A17FC - .incbin "data/maps/Route114/border.bin" - -Route114_MapBlockdata:: @ 82A1804 - .incbin "data/maps/Route114/map.bin" - - .align 2 -Route114_MapAttributes:: @ 82A3104 - .4byte 0x28 - .4byte 0x50 - .4byte Route114_MapBorder - .4byte Route114_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -Route115_MapBorder:: @ 82A311C - .incbin "data/maps/Route115/border.bin" - -Route115_MapBlockdata:: @ 82A3124 - .incbin "data/maps/Route115/map.bin" - - .align 2 -Route115_MapAttributes:: @ 82A4A24 - .4byte 0x28 - .4byte 0x50 - .4byte Route115_MapBorder - .4byte Route115_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -Route116_MapBorder:: @ 82A4A3C - .incbin "data/maps/Route116/border.bin" - -Route116_MapBlockdata:: @ 82A4A44 - .incbin "data/maps/Route116/map.bin" - - .align 2 -Route116_MapAttributes:: @ 82A59E4 - .4byte 0x64 - .4byte 0x14 - .4byte Route116_MapBorder - .4byte Route116_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -Route117_MapBorder:: @ 82A59FC - .incbin "data/maps/Route117/border.bin" - -Route117_MapBlockdata:: @ 82A5A04 - .incbin "data/maps/Route117/map.bin" - - .align 2 -Route117_MapAttributes:: @ 82A6364 - .4byte 0x3c - .4byte 0x14 - .4byte Route117_MapBorder - .4byte Route117_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -Route118_MapBorder:: @ 82A637C - .incbin "data/maps/Route118/border.bin" - -Route118_MapBlockdata:: @ 82A6384 - .incbin "data/maps/Route118/map.bin" - - .align 2 -Route118_MapAttributes:: @ 82A7004 - .4byte 0x50 - .4byte 0x14 - .4byte Route118_MapBorder - .4byte Route118_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - -Route119_MapBorder:: @ 82A701C - .incbin "data/maps/Route119/border.bin" - -Route119_MapBlockdata:: @ 82A7024 - .incbin "data/maps/Route119/map.bin" - - .align 2 -Route119_MapAttributes:: @ 82A9BE4 - .4byte 0x28 - .4byte 0x8c - .4byte Route119_MapBorder - .4byte Route119_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - -Route120_MapBorder:: @ 82A9BFC - .incbin "data/maps/Route120/border.bin" - -Route120_MapBlockdata:: @ 82A9C04 - .incbin "data/maps/Route120/map.bin" - - .align 2 -Route120_MapAttributes:: @ 82ABB44 - .4byte 0x28 - .4byte 0x64 - .4byte Route120_MapBorder - .4byte Route120_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - -Route121_MapBorder:: @ 82ABB5C - .incbin "data/maps/Route121/border.bin" - -Route121_MapBlockdata:: @ 82ABB64 - .incbin "data/maps/Route121/map.bin" - - .align 2 -Route121_MapAttributes:: @ 82AC7E4 - .4byte 0x50 - .4byte 0x14 - .4byte Route121_MapBorder - .4byte Route121_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -Route122_MapBorder:: @ 82AC7FC - .incbin "data/maps/Route122/border.bin" - -Route122_MapBlockdata:: @ 82AC804 - .incbin "data/maps/Route122/map.bin" - - .align 2 -Route122_MapAttributes:: @ 82AD484 - .4byte 0x28 - .4byte 0x28 - .4byte Route122_MapBorder - .4byte Route122_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -Route123_MapBorder:: @ 82AD49C - .incbin "data/maps/Route123/border.bin" - -Route123_MapBlockdata:: @ 82AD4A4 - .incbin "data/maps/Route123/map.bin" - - .align 2 -Route123_MapAttributes:: @ 82AEA84 - .4byte 0x8c - .4byte 0x14 - .4byte Route123_MapBorder - .4byte Route123_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -Route124_MapBorder:: @ 82AEA9C - .incbin "data/maps/Route124/border.bin" - -Route124_MapBlockdata:: @ 82AEAA4 - .incbin "data/maps/Route124/map.bin" - - .align 2 -Route124_MapAttributes:: @ 82B1CA4 - .4byte 0x50 - .4byte 0x50 - .4byte Route124_MapBorder - .4byte Route124_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route125_MapBorder:: @ 82B1CBC - .incbin "data/maps/Route125/border.bin" - -Route125_MapBlockdata:: @ 82B1CC4 - .incbin "data/maps/Route125/map.bin" - - .align 2 -Route125_MapAttributes:: @ 82B35C4 - .4byte 0x50 - .4byte 0x28 - .4byte Route125_MapBorder - .4byte Route125_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route126_MapBorder:: @ 82B35DC - .incbin "data/maps/Route126/border.bin" - -Route126_MapBlockdata:: @ 82B35E4 - .incbin "data/maps/Route126/map.bin" - - .align 2 -Route126_MapAttributes:: @ 82B67E4 - .4byte 0x50 - .4byte 0x50 - .4byte Route126_MapBorder - .4byte Route126_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route127_MapBorder:: @ 82B67FC - .incbin "data/maps/Route127/border.bin" - -Route127_MapBlockdata:: @ 82B6804 - .incbin "data/maps/Route127/map.bin" - - .align 2 -Route127_MapAttributes:: @ 82B9A04 - .4byte 0x50 - .4byte 0x50 - .4byte Route127_MapBorder - .4byte Route127_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route128_MapBorder:: @ 82B9A1C - .incbin "data/maps/Route128/border.bin" - -Route128_MapBlockdata:: @ 82B9A24 - .incbin "data/maps/Route128/map.bin" - - .align 2 -Route128_MapAttributes:: @ 82BBFA4 - .4byte 0x78 - .4byte 0x28 - .4byte Route128_MapBorder - .4byte Route128_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -Route129_MapBorder:: @ 82BBFBC - .incbin "data/maps/Route129/border.bin" - -Route129_MapBlockdata:: @ 82BBFC4 - .incbin "data/maps/Route129/map.bin" - - .align 2 -Route129_MapAttributes:: @ 82BD8C4 - .4byte 0x50 - .4byte 0x28 - .4byte Route129_MapBorder - .4byte Route129_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - -UnreferencedMap_MapBorder: @ 82BD8DC - .incbin "data/maps/UnreferencedMap/border.bin" - -UnreferencedMap_MapBlockdata: @ 82BD8E4 - .incbin "data/maps/UnreferencedMap/map.bin" - - .align 2 -UnreferencedMap_MapAttributes:: @ 82BF1E4 - .4byte 0x50 - .4byte 0x28 - .4byte UnreferencedMap_MapBorder - .4byte UnreferencedMap_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -Route131_MapBorder:: @ 82BF1FC - .incbin "data/maps/Route131/border.bin" - -Route131_MapBlockdata:: @ 82BF204 - .incbin "data/maps/Route131/map.bin" - - .align 2 -Route131_MapAttributes:: @ 82C04C4 - .4byte 0x3c - .4byte 0x28 - .4byte Route131_MapBorder - .4byte Route131_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Route132_MapBorder:: @ 82C04DC - .incbin "data/maps/Route132/border.bin" - -Route132_MapBlockdata:: @ 82C04E4 - .incbin "data/maps/Route132/map.bin" - - .align 2 -Route132_MapAttributes:: @ 82C1DE4 - .4byte 0x50 - .4byte 0x28 - .4byte Route132_MapBorder - .4byte Route132_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Route133_MapBorder:: @ 82C1DFC - .incbin "data/maps/Route133/border.bin" - -Route133_MapBlockdata:: @ 82C1E04 - .incbin "data/maps/Route133/map.bin" - - .align 2 -Route133_MapAttributes:: @ 82C3704 - .4byte 0x50 - .4byte 0x28 - .4byte Route133_MapBorder - .4byte Route133_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Route134_MapBorder:: @ 82C371C - .incbin "data/maps/Route134/border.bin" - -Route134_MapBlockdata:: @ 82C3724 - .incbin "data/maps/Route134/map.bin" - - .align 2 -Route134_MapAttributes:: @ 82C5024 - .4byte 0x50 - .4byte 0x28 - .4byte Route134_MapBorder - .4byte Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -Underwater2_MapBorder:: @ 82C503C - .incbin "data/maps/Underwater2/border.bin" - -Underwater2_MapBlockdata:: @ 82C5044 - .incbin "data/maps/Underwater2/map.bin" - - .align 2 -Underwater2_MapAttributes:: @ 82C8244 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater2_MapBorder - .4byte Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -Underwater3_MapBorder:: @ 82C825C - .incbin "data/maps/Underwater3/border.bin" - -Underwater3_MapBlockdata:: @ 82C8264 - .incbin "data/maps/Underwater3/map.bin" - - .align 2 -Underwater3_MapAttributes:: @ 82CB464 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater3_MapBorder - .4byte Underwater3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -Underwater4_MapBorder:: @ 82CB47C - .incbin "data/maps/Underwater4/border.bin" - -Underwater4_MapBlockdata:: @ 82CB484 - .incbin "data/maps/Underwater4/map.bin" - - .align 2 -Underwater4_MapAttributes:: @ 82CDA04 - .4byte 0x78 - .4byte 0x28 - .4byte Underwater4_MapBorder - .4byte Underwater4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C - .incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin" - -LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24 - .incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_MapAttributes:: @ 82CDAEC - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_BrendansHouse_1F_MapBorder - .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - -LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04 - .incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin" - -LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C - .incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_MapAttributes:: @ 82CDB9C - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_BrendansHouse_2F_MapBorder - .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - -LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4 - .incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin" - -LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC - .incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_MapAttributes:: @ 82CDC84 - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_MaysHouse_1F_MapBorder - .4byte LittlerootTown_MaysHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - -LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C - .incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin" - -LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4 - .incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_MapAttributes:: @ 82CDD34 - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_MaysHouse_2F_MapBorder - .4byte LittlerootTown_MaysHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - -LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C - .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin" - -LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54 - .incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8 - .4byte 0xd - .4byte 0xd - .4byte LittlerootTown_ProfessorBirchsLab_MapBorder - .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - -House11_MapBorder:: @ 82CDEC0 - .incbin "data/maps/House11/border.bin" - -House11_MapBlockdata:: @ 82CDEC8 - .incbin "data/maps/House11/map.bin" - - .align 2 -House11_MapAttributes:: @ 82CDF7C - .4byte 0xa - .4byte 0x9 - .4byte House11_MapBorder - .4byte House11_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -House12_MapBorder:: @ 82CDF94 - .incbin "data/maps/House12/border.bin" - -House12_MapBlockdata:: @ 82CDF9C - .incbin "data/maps/House12/map.bin" - - .align 2 -House12_MapAttributes:: @ 82CE04C - .4byte 0xb - .4byte 0x8 - .4byte House12_MapBorder - .4byte House12_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -PokemonCenter_1F_MapBorder:: @ 82CE064 - .incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin" - -PokemonCenter_1F_MapBlockdata:: @ 82CE06C - .incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin" - - .align 2 -PokemonCenter_1F_MapAttributes:: @ 82CE168 - .4byte 0xe - .4byte 0x9 - .4byte PokemonCenter_1F_MapBorder - .4byte PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - -PokemonCenter_2F_MapBorder:: @ 82CE180 - .incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin" - -PokemonCenter_2F_MapBlockdata:: @ 82CE188 - .incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin" - - .align 2 -PokemonCenter_2F_MapAttributes:: @ 82CE284 - .4byte 0xe - .4byte 0x9 - .4byte PokemonCenter_2F_MapBorder - .4byte PokemonCenter_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - -PokeMart_MapBorder:: @ 82CE29C - .incbin "data/maps/OldaleTown_Mart/border.bin" - -PokeMart_MapBlockdata:: @ 82CE2A4 - .incbin "data/maps/OldaleTown_Mart/map.bin" - - .align 2 -PokeMart_MapAttributes:: @ 82CE354 - .4byte 0xb - .4byte 0x8 - .4byte PokeMart_MapBorder - .4byte PokeMart_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -DewfordTown_House1_MapBorder:: @ 82CE36C - .incbin "data/maps/DewfordTown_House1/border.bin" - -DewfordTown_House1_MapBlockdata:: @ 82CE374 - .incbin "data/maps/DewfordTown_House1/map.bin" - - .align 2 -DewfordTown_House1_MapAttributes:: @ 82CE414 -LavaridgeTown_House_MapAttributes:: @ 82CE414 -Route111_OldLadysRestStop_MapAttributes:: @ 82CE414 - .4byte 0xa - .4byte 0x8 - .4byte DewfordTown_House1_MapBorder - .4byte DewfordTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -DewfordTown_Gym_MapBorder:: @ 82CE42C - .incbin "data/maps/DewfordTown_Gym/border.bin" - -DewfordTown_Gym_MapBlockdata:: @ 82CE434 - .incbin "data/maps/DewfordTown_Gym/map.bin" - - .align 2 -DewfordTown_Gym_MapAttributes:: @ 82CE824 - .4byte 0x12 - .4byte 0x1c - .4byte DewfordTown_Gym_MapBorder - .4byte DewfordTown_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_DewfordGym - -DewfordTown_Hall_MapBorder:: @ 82CE83C - .incbin "data/maps/DewfordTown_Hall/border.bin" - -DewfordTown_Hall_MapBlockdata:: @ 82CE844 - .incbin "data/maps/DewfordTown_Hall/map.bin" - - .align 2 -DewfordTown_Hall_MapAttributes:: @ 82CE978 - .4byte 0x11 - .4byte 0x9 - .4byte DewfordTown_Hall_MapBorder - .4byte DewfordTown_Hall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -DewfordTown_House2_MapBorder:: @ 82CE990 - .incbin "data/maps/DewfordTown_House2/border.bin" - -DewfordTown_House2_MapBlockdata:: @ 82CE998 - .incbin "data/maps/DewfordTown_House2/map.bin" - - .align 2 -DewfordTown_House2_MapAttributes:: @ 82CEA4C -Route113_GlassWorkshop_MapAttributes:: @ 82CEA4C - .4byte 0xa - .4byte 0x9 - .4byte DewfordTown_House2_MapBorder - .4byte DewfordTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64 - .incbin "data/maps/LavaridgeTown_HerbShop/border.bin" - -LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C - .incbin "data/maps/LavaridgeTown_HerbShop/map.bin" - - .align 2 -LavaridgeTown_HerbShop_MapAttributes:: @ 82CEB1C - .4byte 0xb - .4byte 0x8 - .4byte LavaridgeTown_HerbShop_MapBorder - .4byte LavaridgeTown_HerbShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34 - .incbin "data/maps/LavaridgeTown_Gym_1F/border.bin" - -LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C - .incbin "data/maps/LavaridgeTown_Gym_1F/map.bin" - - .align 2 -LavaridgeTown_Gym_1F_MapAttributes:: @ 82CED4C - .4byte 0xb - .4byte 0x18 - .4byte LavaridgeTown_Gym_1F_MapBorder - .4byte LavaridgeTown_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - -LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64 - .incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin" - -LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C - .incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin" - - .align 2 -LavaridgeTown_Gym_B1F_MapAttributes:: @ 82CEF7C - .4byte 0xb - .4byte 0x18 - .4byte LavaridgeTown_Gym_B1F_MapBorder - .4byte LavaridgeTown_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - -LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94 - .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin" - -LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C - .incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_MapAttributes:: @ 82CF098 - .4byte 0xe - .4byte 0x9 - .4byte LavaridgeTown_PokemonCenter_1F_MapBorder - .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - -FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0 - .incbin "data/maps/FallarborTown_ContestLobby/border.bin" - -FallarborTown_ContestLobby_MapBlockdata:: @ 82CF0B8 - .incbin "data/maps/FallarborTown_ContestLobby/map.bin" - - .align 2 -FallarborTown_ContestLobby_MapAttributes:: @ 82CF18C -SlateportCity_ContestLobby_MapAttributes:: @ 82CF18C -VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C - .4byte 0xf - .4byte 0x7 - .4byte FallarborTown_ContestLobby_MapBorder - .4byte FallarborTown_ContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -FallarborTown_ContestHall_MapBorder:: @ 82CF1A4 - .incbin "data/maps/FallarborTown_ContestHall/border.bin" - -FallarborTown_ContestHall_MapBlockdata:: @ 82CF1AC - .incbin "data/maps/FallarborTown_ContestHall/map.bin" - - .align 2 -FallarborTown_ContestHall_MapAttributes:: @ 82CF4A0 -SlateportCity_ContestHall_MapAttributes:: @ 82CF4A0 -VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0 - .4byte 0x15 - .4byte 0x12 - .4byte FallarborTown_ContestHall_MapBorder - .4byte FallarborTown_ContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -LilycoveCity_House2_MapBorder:: @ 82CF4B8 - .incbin "data/maps/LilycoveCity_House2/border.bin" - -LilycoveCity_House2_MapBlockdata:: @ 82CF4C0 - .incbin "data/maps/LilycoveCity_House2/map.bin" - - .align 2 -LilycoveCity_House2_MapAttributes:: @ 82CF540 - .4byte 0x8 - .4byte 0x8 - .4byte LilycoveCity_House2_MapBorder - .4byte LilycoveCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -UnknownMapBorder_082CF564: - .incbin "data/maps/UnknownMap_082CF564/border.bin" - -UnknownMapBlockdata_082CF564: - .incbin "data/maps/UnknownMap_082CF564/map.bin" - - .align 2 -UnknownMapAttributes_082CF564:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082CF564 - .4byte UnknownMapBlockdata_082CF564 - .4byte gTileset_Building - .4byte gTileset_Contest - -VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C - .incbin "data/maps/VerdanturfTown_WandasHouse/border.bin" - -VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584 - .incbin "data/maps/VerdanturfTown_WandasHouse/map.bin" - - .align 2 -VerdanturfTown_WandasHouse_MapAttributes:: @ 82CF694 - .4byte 0x11 - .4byte 0x8 - .4byte VerdanturfTown_WandasHouse_MapBorder - .4byte VerdanturfTown_WandasHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -PacifidlogTown_House1_MapBorder:: @ 82CF6AC - .incbin "data/maps/PacifidlogTown_House1/border.bin" - -PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4 - .incbin "data/maps/PacifidlogTown_House1/map.bin" - - .align 2 -PacifidlogTown_House1_MapAttributes:: @ 82CF768 -PacifidlogTown_House3_MapAttributes:: @ 82CF768 -PacifidlogTown_House5_MapAttributes:: @ 82CF768 - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House1_MapBorder - .4byte PacifidlogTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -PacifidlogTown_House2_MapBorder:: @ 82CF780 - .incbin "data/maps/PacifidlogTown_House2/border.bin" - -PacifidlogTown_House2_MapBlockdata:: @ 82CF788 - .incbin "data/maps/PacifidlogTown_House2/map.bin" - - .align 2 -PacifidlogTown_House2_MapAttributes:: @ 82CF83C -PacifidlogTown_House4_MapAttributes:: @ 82CF83C - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House2_MapBorder - .4byte PacifidlogTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -PetalburgCity_Gym_MapBorder:: @ 82CF854 - .incbin "data/maps/PetalburgCity_Gym/border.bin" - -PetalburgCity_Gym_MapBlockdata:: @ 82CF85C - .incbin "data/maps/PetalburgCity_Gym/map.bin" - - .align 2 -PetalburgCity_Gym_MapAttributes:: @ 82D003C - .4byte 0x9 - .4byte 0x70 - .4byte PetalburgCity_Gym_MapBorder - .4byte PetalburgCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PetalburgGym - -PetalburgCity_House2_MapBorder:: @ 82D0054 - .incbin "data/maps/PetalburgCity_House2/border.bin" - -PetalburgCity_House2_MapBlockdata:: @ 82D005C - .incbin "data/maps/PetalburgCity_House2/map.bin" - - .align 2 -MossdeepCity_House4_MapAttributes:: @ 82D00FC -PetalburgCity_House2_MapAttributes:: @ 82D00FC -SlateportCity_House1_MapAttributes:: @ 82D00FC - .4byte 0xa - .4byte 0x8 - .4byte PetalburgCity_House2_MapBorder - .4byte PetalburgCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114 - .incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin" - -SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C - .incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_MapAttributes:: @ 82D0394 - .4byte 0x15 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_1F_MapBorder - .4byte SlateportCity_SternsShipyard_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC - .incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin" - -SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4 - .incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4 - .4byte 0x11 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_2F_MapBorder - .4byte SlateportCity_SternsShipyard_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -UnknownMapBorder_082D05D8:: - .incbin "data/maps/UnknownMap_082D05D8/border.bin" - -UnknownMapBlockdata_082D05D8:: - .incbin "data/maps/UnknownMap_082D05D8/map.bin" - - .align 2 -UnknownMapAttributes_082D05D8:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082D05D8 - .4byte UnknownMapBlockdata_082D05D8 - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMapBorder_082D05FC:: - .incbin "data/maps/UnknownMap_082D05FC/border.bin" - -UnknownMapBlockdata_082D05FC:: - .incbin "data/maps/UnknownMap_082D05FC/map.bin" - - .align 2 -UnknownMapAttributes_082D05FC:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082D05FC - .4byte UnknownMapBlockdata_082D05FC - .4byte gTileset_Building - .4byte gTileset_Contest - -SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614 - .incbin "data/maps/SlateportCity_PokemonFanClub/border.bin" - -SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C - .incbin "data/maps/SlateportCity_PokemonFanClub/map.bin" - - .align 2 -SlateportCity_PokemonFanClub_MapAttributes:: @ 82D0750 - .4byte 0xe - .4byte 0xb - .4byte SlateportCity_PokemonFanClub_MapBorder - .4byte SlateportCity_PokemonFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonFanClub - -SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768 - .incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin" - -SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770 - .incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_MapAttributes:: @ 82D08D8 - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_1F_MapBorder - .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - -SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0 - .incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin" - -SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8 - .incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_MapAttributes:: @ 82D0A60 - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_2F_MapBorder - .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - -SlateportCity_Harbor_MapBorder:: @ 82D0A78 - .incbin "data/maps/SlateportCity_Harbor/border.bin" - -SlateportCity_Harbor_MapBlockdata:: @ 82D0A80 - .incbin "data/maps/SlateportCity_Harbor/map.bin" - - .align 2 -LilycoveCity_Harbor_MapAttributes:: @ 82D0D50 -SlateportCity_Harbor_MapAttributes:: @ 82D0D50 - .4byte 0x18 - .4byte 0xf - .4byte SlateportCity_Harbor_MapBorder - .4byte SlateportCity_Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MauvilleCity_Gym_MapBorder:: @ 82D0D68 - .incbin "data/maps/MauvilleCity_Gym/border.bin" - -MauvilleCity_Gym_MapBlockdata:: @ 82D0D70 - .incbin "data/maps/MauvilleCity_Gym/map.bin" - - .align 2 -MauvilleCity_Gym_MapAttributes:: @ 82D0F14 - .4byte 0xa - .4byte 0x15 - .4byte MauvilleCity_Gym_MapBorder - .4byte MauvilleCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGym - -MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C - .incbin "data/maps/MauvilleCity_BikeShop/border.bin" - -MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34 - .incbin "data/maps/MauvilleCity_BikeShop/map.bin" - - .align 2 -MauvilleCity_BikeShop_MapAttributes:: @ 82D100C - .4byte 0xc - .4byte 0x9 - .4byte MauvilleCity_BikeShop_MapBorder - .4byte MauvilleCity_BikeShop_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - -MauvilleCity_GameCorner_MapBorder:: @ 82D1024 - .incbin "data/maps/MauvilleCity_GameCorner/border.bin" - -MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C - .incbin "data/maps/MauvilleCity_GameCorner/map.bin" - - .align 2 -MauvilleCity_GameCorner_MapAttributes:: @ 82D1210 - .4byte 0x16 - .4byte 0xb - .4byte MauvilleCity_GameCorner_MapBorder - .4byte MauvilleCity_GameCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGameCorner - -RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228 - .incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin" - -RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230 - .incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin" - - .align 2 -RustboroCity_DevonCorp_1F_MapAttributes:: @ 82D1388 - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_1F_MapBorder - .4byte RustboroCity_DevonCorp_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0 - .incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin" - -RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8 - .incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin" - - .align 2 -RustboroCity_DevonCorp_2F_MapAttributes:: @ 82D1500 - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_2F_MapBorder - .4byte RustboroCity_DevonCorp_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -RustboroCity_Gym_MapBorder:: @ 82D1518 - .incbin "data/maps/RustboroCity_Gym/border.bin" - -RustboroCity_Gym_MapBlockdata:: @ 82D1520 - .incbin "data/maps/RustboroCity_Gym/map.bin" - - .align 2 -RustboroCity_Gym_MapAttributes:: @ 82D16C4 - .4byte 0xb - .4byte 0x13 - .4byte RustboroCity_Gym_MapBorder - .4byte RustboroCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_RustboroGym - -RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC - .incbin "data/maps/RustboroCity_PokemonSchool/border.bin" - -RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4 - .incbin "data/maps/RustboroCity_PokemonSchool/map.bin" - - .align 2 -RustboroCity_PokemonSchool_MapAttributes:: @ 82D17EC - .4byte 0xc - .4byte 0xb - .4byte RustboroCity_PokemonSchool_MapBorder - .4byte RustboroCity_PokemonSchool_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonSchool - -RustboroCity_House2_MapBorder:: @ 82D1804 - .incbin "data/maps/RustboroCity_House2/border.bin" - -RustboroCity_House2_MapBlockdata:: @ 82D180C - .incbin "data/maps/RustboroCity_House2/map.bin" - - .align 2 -RustboroCity_House2_MapAttributes:: @ 82D18E4 -RustboroCity_House3_MapAttributes:: @ 82D18E4 - .4byte 0xc - .4byte 0x9 - .4byte RustboroCity_House2_MapBorder - .4byte RustboroCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_House1_MapBorder:: @ 82D18FC - .incbin "data/maps/RustboroCity_House1/border.bin" - -RustboroCity_House1_MapBlockdata:: @ 82D1904 - .incbin "data/maps/RustboroCity_House1/map.bin" - - .align 2 -RustboroCity_House1_MapAttributes:: @ 82D19D4 - .4byte 0xd - .4byte 0x8 - .4byte RustboroCity_House1_MapBorder - .4byte RustboroCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC - .incbin "data/maps/RustboroCity_CuttersHouse/border.bin" - -RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4 - .incbin "data/maps/RustboroCity_CuttersHouse/map.bin" - - .align 2 -RustboroCity_CuttersHouse_MapAttributes:: @ 82D1ABC - .4byte 0xb - .4byte 0x9 - .4byte RustboroCity_CuttersHouse_MapBorder - .4byte RustboroCity_CuttersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -FortreeCity_House1_MapBorder:: @ 82D1AD4 - .incbin "data/maps/FortreeCity_House1/border.bin" - -FortreeCity_House1_MapBlockdata:: @ 82D1ADC - .incbin "data/maps/FortreeCity_House1/map.bin" - - .align 2 -FortreeCity_House1_MapAttributes:: @ 82D1B3C -FortreeCity_House3_MapAttributes:: @ 82D1B3C -FortreeCity_House5_MapAttributes:: @ 82D1B3C - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House1_MapBorder - .4byte FortreeCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -FortreeCity_Gym_MapBorder:: @ 82D1B54 - .incbin "data/maps/FortreeCity_Gym/border.bin" - -FortreeCity_Gym_MapBlockdata:: @ 82D1B5C - .incbin "data/maps/FortreeCity_Gym/map.bin" - - .align 2 -FortreeCity_Gym_MapAttributes:: @ 82D1F44 - .4byte 0x14 - .4byte 0x19 - .4byte FortreeCity_Gym_MapBorder - .4byte FortreeCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_FortreeGym - -FortreeCity_House2_MapBorder:: @ 82D1F5C - .incbin "data/maps/FortreeCity_House2/border.bin" - -FortreeCity_House2_MapBlockdata:: @ 82D1F64 - .incbin "data/maps/FortreeCity_House2/map.bin" - - .align 2 -FortreeCity_House2_MapAttributes:: @ 82D1FC4 -FortreeCity_House4_MapAttributes:: @ 82D1FC4 - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House2_MapBorder - .4byte FortreeCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC - .incbin "data/maps/Route104_MrBrineysHouse/border.bin" - -Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4 - .incbin "data/maps/Route104_MrBrineysHouse/map.bin" - - .align 2 -Route104_MrBrineysHouse_MapAttributes:: @ 82D20BC - .4byte 0xc - .4byte 0x9 - .4byte Route104_MrBrineysHouse_MapBorder - .4byte Route104_MrBrineysHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin" - -LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC - .incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_MapAttributes:: @ 82D2328 - .4byte 0x15 - .4byte 0xe - .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - -LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin" - -LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348 - .incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_MapAttributes:: @ 82D2584 - .4byte 0x16 - .4byte 0xd - .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - -LilycoveCity_ContestLobby_MapBorder:: @ 82D259C - .incbin "data/maps/LilycoveCity_ContestLobby/border.bin" - -LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4 - .incbin "data/maps/LilycoveCity_ContestLobby/map.bin" - - .align 2 -LilycoveCity_ContestLobby_MapAttributes:: @ 82D27CC - .4byte 0x17 - .4byte 0xc - .4byte LilycoveCity_ContestLobby_MapBorder - .4byte LilycoveCity_ContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -LilycoveCity_ContestHall_MapBorder:: @ 82D27E4 - .incbin "data/maps/LilycoveCity_ContestHall/border.bin" - -LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC - .incbin "data/maps/LilycoveCity_ContestHall/map.bin" - - .align 2 -LilycoveCity_ContestHall_MapAttributes:: @ 82D3514 - .4byte 0x33 - .4byte 0x21 - .4byte LilycoveCity_ContestHall_MapBorder - .4byte LilycoveCity_ContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C - .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin" - -LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534 - .incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_MapAttributes:: @ 82D3684 - .4byte 0xc - .4byte 0xe - .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder - .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -LilycoveCity_EmptyMap_MapBorder:: @ 82D369C - .incbin "data/maps/LilycoveCity_EmptyMap/border.bin" - -LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4 - .incbin "data/maps/LilycoveCity_EmptyMap/map.bin" - - .align 2 -LilycoveCity_EmptyMap_MapAttributes:: @ 82D36A8 - .4byte 0x1 - .4byte 0x1 - .4byte LilycoveCity_EmptyMap_MapBorder - .4byte LilycoveCity_EmptyMap_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MossdeepCity_Gym_MapBorder:: @ 82D36C0 - .incbin "data/maps/MossdeepCity_Gym/border.bin" - -MossdeepCity_Gym_MapBlockdata:: @ 82D36C8 - .incbin "data/maps/MossdeepCity_Gym/map.bin" - - .align 2 -MossdeepCity_Gym_MapAttributes:: @ 82D3B78 - .4byte 0x14 - .4byte 0x1e - .4byte MossdeepCity_Gym_MapBorder - .4byte MossdeepCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGym - -SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90 - .incbin "data/maps/SootopolisCity_Gym_1F/border.bin" - -SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98 - .incbin "data/maps/SootopolisCity_Gym_1F/map.bin" - - .align 2 -SootopolisCity_Gym_1F_MapAttributes:: @ 82D3F0C - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_1F_MapBorder - .4byte SootopolisCity_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - -SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24 - .incbin "data/maps/SootopolisCity_Gym_B1F/border.bin" - -SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C - .incbin "data/maps/SootopolisCity_Gym_B1F/map.bin" - - .align 2 -SootopolisCity_Gym_B1F_MapAttributes:: @ 82D42A0 - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_B1F_MapBorder - .4byte SootopolisCity_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - -EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8 - .incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin" - -EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0 - .incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin" - - .align 2 -EverGrandeCity_SidneysRoom_MapAttributes:: @ 82D442C - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_SidneysRoom_MapBorder - .4byte EverGrandeCity_SidneysRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444 - .incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin" - -EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C - .incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_MapAttributes:: @ 82D45B8 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_PhoebesRoom_MapBorder - .4byte EverGrandeCity_PhoebesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0 - .incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin" - -EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8 - .incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_MapAttributes:: @ 82D4744 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_GlaciasRoom_MapBorder - .4byte EverGrandeCity_GlaciasRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C - .incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin" - -EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764 - .incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin" - - .align 2 -EverGrandeCity_DrakesRoom_MapAttributes:: @ 82D48D0 - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_DrakesRoom_MapBorder - .4byte EverGrandeCity_DrakesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8 - .incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin" - -EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0 - .incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_MapAttributes:: @ 82D4A44 - .4byte 0xd - .4byte 0xd - .4byte EverGrandeCity_ChampionsRoom_MapBorder - .4byte EverGrandeCity_ChampionsRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C - .incbin "data/maps/EverGrandeCity_Corridor1/border.bin" - -EverGrandeCity_Corridor1_MapBlockdata:: @ 82D4A64 - .incbin "data/maps/EverGrandeCity_Corridor1/map.bin" - - .align 2 -EverGrandeCity_Corridor1_MapAttributes:: @ 82D4B84 -EverGrandeCity_Corridor2_MapAttributes:: @ 82D4B84 -EverGrandeCity_Corridor3_MapAttributes:: @ 82D4B84 -EverGrandeCity_Corridor5_MapAttributes:: @ 82D4B84 - .4byte 0xb - .4byte 0xd - .4byte EverGrandeCity_Corridor1_MapBorder - .4byte EverGrandeCity_Corridor1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C - .incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin" - -Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4 - .incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4 -Route104_PrototypePrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4 - .4byte 0xf - .4byte 0x9 - .4byte Route104_PrettyPetalFlowerShop_MapBorder - .4byte Route104_PrettyPetalFlowerShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PrettyPetalFlowerShop - -Route112_CableCarStation_MapBorder:: @ 82D4CCC - .incbin "data/maps/Route112_CableCarStation/border.bin" - -Route112_CableCarStation_MapBlockdata:: @ 82D4CD4 - .incbin "data/maps/Route112_CableCarStation/map.bin" - - .align 2 -MtChimney_CableCarStation_MapAttributes:: @ 82D4E0C -Route112_CableCarStation_MapAttributes:: @ 82D4E0C - .4byte 0xd - .4byte 0xc - .4byte Route112_CableCarStation_MapBorder - .4byte Route112_CableCarStation_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24 - .incbin "data/maps/Route114_FossilManiacsHouse/border.bin" - -Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C - .incbin "data/maps/Route114_FossilManiacsHouse/map.bin" - - .align 2 -Route114_FossilManiacsHouse_MapAttributes:: @ 82D4ECC - .4byte 0xa - .4byte 0x8 - .4byte Route114_FossilManiacsHouse_MapBorder - .4byte Route114_FossilManiacsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4 - .incbin "data/maps/Route114_FossilManiacsTunnel/border.bin" - -Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC - .incbin "data/maps/Route114_FossilManiacsTunnel/map.bin" - - .align 2 -Route114_FossilManiacsTunnel_MapAttributes:: @ 82D5190 - .4byte 0xd - .4byte 0x1a - .4byte Route114_FossilManiacsTunnel_MapBorder - .4byte Route114_FossilManiacsTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - -Route114_LanettesHouse_MapBorder:: @ 82D51A8 - .incbin "data/maps/Route114_LanettesHouse/border.bin" - -Route114_LanettesHouse_MapBlockdata:: @ 82D51B0 - .incbin "data/maps/Route114_LanettesHouse/map.bin" - - .align 2 -Route114_LanettesHouse_MapAttributes:: @ 82D5260 - .4byte 0xb - .4byte 0x8 - .4byte Route114_LanettesHouse_MapBorder - .4byte Route114_LanettesHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - -Route116_TunnelersRestHouse_MapBorder:: @ 82D5278 - .incbin "data/maps/Route116_TunnelersRestHouse/border.bin" - -Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280 - .incbin "data/maps/Route116_TunnelersRestHouse/map.bin" - - .align 2 -Route116_TunnelersRestHouse_MapAttributes:: @ 82D5334 - .4byte 0xa - .4byte 0x9 - .4byte Route116_TunnelersRestHouse_MapBorder - .4byte Route116_TunnelersRestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route117_PokemonDayCare_MapBorder:: @ 82D534C - .incbin "data/maps/Route117_PokemonDayCare/border.bin" - -Route117_PokemonDayCare_MapBlockdata:: @ 82D5354 - .incbin "data/maps/Route117_PokemonDayCare/map.bin" - - .align 2 -Route117_PokemonDayCare_MapAttributes:: @ 82D542C - .4byte 0xc - .4byte 0x9 - .4byte Route117_PokemonDayCare_MapBorder - .4byte Route117_PokemonDayCare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonDayCare - -Route121_SafariZoneEntrance_MapBorder:: @ 82D5444 - .incbin "data/maps/Route121_SafariZoneEntrance/border.bin" - -Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C - .incbin "data/maps/Route121_SafariZoneEntrance/map.bin" - - .align 2 -Route121_SafariZoneEntrance_MapAttributes:: @ 82D5644 - .4byte 0x12 - .4byte 0xe - .4byte Route121_SafariZoneEntrance_MapBorder - .4byte Route121_SafariZoneEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -MeteorFalls_1F_1R_MapBorder:: @ 82D565C - .incbin "data/maps/MeteorFalls_1F_1R/border.bin" - -MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664 - .incbin "data/maps/MeteorFalls_1F_1R/map.bin" - - .align 2 -MeteorFalls_1F_1R_MapAttributes:: @ 82D603C - .4byte 0x1e - .4byte 0x2a - .4byte MeteorFalls_1F_1R_MapBorder - .4byte MeteorFalls_1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - -MeteorFalls_1F_2R_MapBorder:: @ 82D6054 - .incbin "data/maps/MeteorFalls_1F_2R/border.bin" - -MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C - .incbin "data/maps/MeteorFalls_1F_2R/map.bin" - - .align 2 -MeteorFalls_1F_2R_MapAttributes:: @ 82D67DC - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_1F_2R_MapBorder - .4byte MeteorFalls_1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - -MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4 - .incbin "data/maps/MeteorFalls_B1F_1R/border.bin" - -MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC - .incbin "data/maps/MeteorFalls_B1F_1R/map.bin" - - .align 2 -MeteorFalls_B1F_1R_MapAttributes:: @ 82D7098 - .4byte 0x1d - .4byte 0x26 - .4byte MeteorFalls_B1F_1R_MapBorder - .4byte MeteorFalls_B1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - -MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0 - .incbin "data/maps/MeteorFalls_B1F_2R/border.bin" - -MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8 - .incbin "data/maps/MeteorFalls_B1F_2R/map.bin" - - .align 2 -MeteorFalls_B1F_2R_MapAttributes:: @ 82D7244 - .4byte 0xb - .4byte 0x12 - .4byte MeteorFalls_B1F_2R_MapBorder - .4byte MeteorFalls_B1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - -RusturfTunnel_MapBorder:: @ 82D725C - .incbin "data/maps/RusturfTunnel/border.bin" - -RusturfTunnel_MapBlockdata:: @ 82D7264 - .incbin "data/maps/RusturfTunnel/map.bin" - - .align 2 -RusturfTunnel_MapAttributes:: @ 82D7924 - .4byte 0x24 - .4byte 0x18 - .4byte RusturfTunnel_MapBorder - .4byte RusturfTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_RusturfTunnel - -Underwater_SootopolisCity_MapBorder:: @ 82D793C - .incbin "data/maps/Underwater_SootopolisCity/border.bin" - -Underwater_SootopolisCity_MapBlockdata:: @ 82D7944 - .incbin "data/maps/Underwater_SootopolisCity/map.bin" - - .align 2 -Underwater_SootopolisCity_MapAttributes:: @ 82D7AD4 - .4byte 0x14 - .4byte 0xa - .4byte Underwater_SootopolisCity_MapBorder - .4byte Underwater_SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -DesertRuins_MapBorder:: @ 82D7AEC - .incbin "data/maps/DesertRuins/border.bin" - -DesertRuins_MapBlockdata:: @ 82D7AF4 - .incbin "data/maps/DesertRuins/map.bin" - - .align 2 -DesertRuins_MapAttributes:: @ 82D7F58 - .4byte 0x11 - .4byte 0x21 - .4byte DesertRuins_MapBorder - .4byte DesertRuins_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -GraniteCave_1F_MapBorder:: @ 82D7F70 - .incbin "data/maps/GraniteCave_1F/border.bin" - -GraniteCave_1F_MapBlockdata:: @ 82D7F78 - .incbin "data/maps/GraniteCave_1F/map.bin" - - .align 2 -GraniteCave_1F_MapAttributes:: @ 82D8464 - .4byte 0x2a - .4byte 0xf - .4byte GraniteCave_1F_MapBorder - .4byte GraniteCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -GraniteCave_B1F_MapBorder:: @ 82D847C - .incbin "data/maps/GraniteCave_B1F/border.bin" - -GraniteCave_B1F_MapBlockdata:: @ 82D8484 - .incbin "data/maps/GraniteCave_B1F/map.bin" - - .align 2 -GraniteCave_B1F_MapAttributes:: @ 82D8B04 - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B1F_MapBorder - .4byte GraniteCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -GraniteCave_B2F_MapBorder:: @ 82D8B1C - .incbin "data/maps/GraniteCave_B2F/border.bin" - -GraniteCave_B2F_MapBlockdata:: @ 82D8B24 - .incbin "data/maps/GraniteCave_B2F/map.bin" - - .align 2 -GraniteCave_B2F_MapAttributes:: @ 82D91A4 - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B2F_MapBorder - .4byte GraniteCave_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -PetalburgWoods_MapBorder:: @ 82D91BC - .incbin "data/maps/PetalburgWoods/border.bin" - -PetalburgWoods_MapBlockdata:: @ 82D91C4 - .incbin "data/maps/PetalburgWoods/map.bin" - - .align 2 -PetalburgWoods_MapAttributes:: @ 82DA244 - .4byte 0x30 - .4byte 0x2c - .4byte PetalburgWoods_MapBorder - .4byte PetalburgWoods_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -MtChimney_MapBorder:: @ 82DA25C - .incbin "data/maps/MtChimney/border.bin" - -MtChimney_MapBlockdata:: @ 82DA264 - .incbin "data/maps/MtChimney/map.bin" - - .align 2 -MtChimney_MapAttributes:: @ 82DB114 - .4byte 0x28 - .4byte 0x2f - .4byte MtChimney_MapBorder - .4byte MtChimney_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -MtPyre_1F_MapBorder:: @ 82DB12C - .incbin "data/maps/MtPyre_1F/border.bin" - -MtPyre_1F_MapBlockdata:: @ 82DB134 - .incbin "data/maps/MtPyre_1F/map.bin" - - .align 2 -MtPyre_1F_MapAttributes:: @ 82DB478 - .4byte 0x16 - .4byte 0x13 - .4byte MtPyre_1F_MapBorder - .4byte MtPyre_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_2F_MapBorder:: @ 82DB490 - .incbin "data/maps/MtPyre_2F/border.bin" - -MtPyre_2F_MapBlockdata:: @ 82DB498 - .incbin "data/maps/MtPyre_2F/map.bin" - - .align 2 -MtPyre_2F_MapAttributes:: @ 82DB5EC - .4byte 0xd - .4byte 0xd - .4byte MtPyre_2F_MapBorder - .4byte MtPyre_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_3F_MapBorder:: @ 82DB604 - .incbin "data/maps/MtPyre_3F/border.bin" - -MtPyre_3F_MapBlockdata:: @ 82DB60C - .incbin "data/maps/MtPyre_3F/map.bin" - - .align 2 -MtPyre_3F_MapAttributes:: @ 82DB760 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_3F_MapBorder - .4byte MtPyre_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_4F_MapBorder:: @ 82DB778 - .incbin "data/maps/MtPyre_4F/border.bin" - -MtPyre_4F_MapBlockdata:: @ 82DB780 - .incbin "data/maps/MtPyre_4F/map.bin" - - .align 2 -MtPyre_4F_MapAttributes:: @ 82DB8D4 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_4F_MapBorder - .4byte MtPyre_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_5F_MapBorder:: @ 82DB8EC - .incbin "data/maps/MtPyre_5F/border.bin" - -MtPyre_5F_MapBlockdata:: @ 82DB8F4 - .incbin "data/maps/MtPyre_5F/map.bin" - - .align 2 -MtPyre_5F_MapAttributes:: @ 82DBA48 - .4byte 0xd - .4byte 0xd - .4byte MtPyre_5F_MapBorder - .4byte MtPyre_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_6F_MapBorder:: @ 82DBA60 - .incbin "data/maps/MtPyre_6F/border.bin" - -MtPyre_6F_MapBlockdata:: @ 82DBA68 - .incbin "data/maps/MtPyre_6F/map.bin" - - .align 2 -MtPyre_6F_MapAttributes:: @ 82DBBBC - .4byte 0xd - .4byte 0xd - .4byte MtPyre_6F_MapBorder - .4byte MtPyre_6F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AquaHideout_1F_MapBorder:: @ 82DBBD4 - .incbin "data/maps/AquaHideout_1F/border.bin" - -AquaHideout_1F_MapBlockdata:: @ 82DBBDC - .incbin "data/maps/AquaHideout_1F/map.bin" - - .align 2 -AquaHideout_1F_MapAttributes:: @ 82DC26C - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_1F_MapBorder - .4byte AquaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AquaHideout_B1F_MapBorder:: @ 82DC284 - .incbin "data/maps/AquaHideout_B1F/border.bin" - -AquaHideout_B1F_MapBlockdata:: @ 82DC28C - .incbin "data/maps/AquaHideout_B1F/map.bin" - - .align 2 -AquaHideout_B1F_MapAttributes:: @ 82DCC1C - .4byte 0x33 - .4byte 0x18 - .4byte AquaHideout_B1F_MapBorder - .4byte AquaHideout_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AquaHideout_B2F_MapBorder:: @ 82DCC34 - .incbin "data/maps/AquaHideout_B2F/border.bin" - -AquaHideout_B2F_MapBlockdata:: @ 82DCC3C - .incbin "data/maps/AquaHideout_B2F/map.bin" - - .align 2 -AquaHideout_B2F_MapAttributes:: @ 82DD29C - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_B2F_MapBorder - .4byte AquaHideout_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4 - .incbin "data/maps/Underwater_SeafloorCavern/border.bin" - -Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC - .incbin "data/maps/Underwater_SeafloorCavern/map.bin" - - .align 2 -Underwater_SeafloorCavern_MapAttributes:: @ 82DD3B8 - .4byte 0xe - .4byte 0x9 - .4byte Underwater_SeafloorCavern_MapBorder - .4byte Underwater_SeafloorCavern_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0 - .incbin "data/maps/SeafloorCavern_Entrance/border.bin" - -SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8 - .incbin "data/maps/SeafloorCavern_Entrance/map.bin" - - .align 2 -SeafloorCavern_Entrance_MapAttributes:: @ 82DD6F8 - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Entrance_MapBorder - .4byte SeafloorCavern_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room1_MapBorder:: @ 82DD710 - .incbin "data/maps/SeafloorCavern_Room1/border.bin" - -SeafloorCavern_Room1_MapBlockdata:: @ 82DD718 - .incbin "data/maps/SeafloorCavern_Room1/map.bin" - - .align 2 -SeafloorCavern_Room1_MapAttributes:: @ 82DDA60 - .4byte 0x14 - .4byte 0x15 - .4byte SeafloorCavern_Room1_MapBorder - .4byte SeafloorCavern_Room1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room2_MapBorder:: @ 82DDA78 - .incbin "data/maps/SeafloorCavern_Room2/border.bin" - -SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80 - .incbin "data/maps/SeafloorCavern_Room2/map.bin" - - .align 2 -SeafloorCavern_Room2_MapAttributes:: @ 82DDD74 - .4byte 0x12 - .4byte 0x15 - .4byte SeafloorCavern_Room2_MapBorder - .4byte SeafloorCavern_Room2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room3_MapBorder:: @ 82DDD8C - .incbin "data/maps/SeafloorCavern_Room3/border.bin" - -SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94 - .incbin "data/maps/SeafloorCavern_Room3/map.bin" - - .align 2 -SeafloorCavern_Room3_MapAttributes:: @ 82DDFB4 - .4byte 0x10 - .4byte 0x11 - .4byte SeafloorCavern_Room3_MapBorder - .4byte SeafloorCavern_Room3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room4_MapBorder:: @ 82DDFCC - .incbin "data/maps/SeafloorCavern_Room4/border.bin" - -SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4 - .incbin "data/maps/SeafloorCavern_Room4/map.bin" - - .align 2 -SeafloorCavern_Room4_MapAttributes:: @ 82DE280 - .4byte 0x12 - .4byte 0x13 - .4byte SeafloorCavern_Room4_MapBorder - .4byte SeafloorCavern_Room4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room5_MapBorder:: @ 82DE298 - .incbin "data/maps/SeafloorCavern_Room5/border.bin" - -SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0 - .incbin "data/maps/SeafloorCavern_Room5/map.bin" - - .align 2 -SeafloorCavern_Room5_MapAttributes:: @ 82DE5C0 - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Room5_MapBorder - .4byte SeafloorCavern_Room5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room6_MapBorder:: @ 82DE5D8 - .incbin "data/maps/SeafloorCavern_Room6/border.bin" - -SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0 - .incbin "data/maps/SeafloorCavern_Room6/map.bin" - - .align 2 -SeafloorCavern_Room6_MapAttributes:: @ 82DEA30 - .4byte 0x18 - .4byte 0x17 - .4byte SeafloorCavern_Room6_MapBorder - .4byte SeafloorCavern_Room6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SeafloorCavern_Room7_MapBorder:: @ 82DEA48 - .incbin "data/maps/SeafloorCavern_Room7/border.bin" - -SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50 - .incbin "data/maps/SeafloorCavern_Room7/map.bin" - - .align 2 -SeafloorCavern_Room7_MapAttributes:: @ 82DEED0 - .4byte 0x17 - .4byte 0x19 - .4byte SeafloorCavern_Room7_MapBorder - .4byte SeafloorCavern_Room7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SeafloorCavern_Room8_MapBorder:: @ 82DEEE8 - .incbin "data/maps/SeafloorCavern_Room8/border.bin" - -SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0 - .incbin "data/maps/SeafloorCavern_Room8/map.bin" - - .align 2 -SeafloorCavern_Room8_MapAttributes:: @ 82DF024 - .4byte 0xb - .4byte 0xe - .4byte SeafloorCavern_Room8_MapBorder - .4byte SeafloorCavern_Room8_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SeafloorCavern_Room9_MapBorder:: @ 82DF03C - .incbin "data/maps/SeafloorCavern_Room9/border.bin" - -SeafloorCavern_Room9_MapBlockdata:: @ 82DF044 - .incbin "data/maps/SeafloorCavern_Room9/map.bin" - - .align 2 -SeafloorCavern_Room9_MapAttributes:: @ 82DF9F8 - .4byte 0x1b - .4byte 0x2e - .4byte SeafloorCavern_Room9_MapBorder - .4byte SeafloorCavern_Room9_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10 - .incbin "data/maps/CaveOfOrigin_Entrance/border.bin" - -CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18 - .incbin "data/maps/CaveOfOrigin_Entrance/map.bin" - - .align 2 -CaveOfOrigin_Entrance_MapAttributes:: @ 82DFDF4 - .4byte 0x13 - .4byte 0x1a - .4byte CaveOfOrigin_Entrance_MapBorder - .4byte CaveOfOrigin_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_1F_MapBorder:: @ 82DFE0C - .incbin "data/maps/CaveOfOrigin_1F/border.bin" - -CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14 - .incbin "data/maps/CaveOfOrigin_1F/map.bin" - - .align 2 -CaveOfOrigin_1F_MapAttributes:: @ 82E0238 - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_1F_MapBorder - .4byte CaveOfOrigin_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_B1F_MapBorder:: @ 82E0250 - .incbin "data/maps/CaveOfOrigin_B1F/border.bin" - -CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258 - .incbin "data/maps/CaveOfOrigin_B1F/map.bin" - - .align 2 -CaveOfOrigin_B1F_MapAttributes:: @ 82E067C - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_B1F_MapBorder - .4byte CaveOfOrigin_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_B2F_MapBorder:: @ 82E0694 - .incbin "data/maps/CaveOfOrigin_B2F/border.bin" - -CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C - .incbin "data/maps/CaveOfOrigin_B2F/map.bin" - - .align 2 -CaveOfOrigin_B2F_MapAttributes:: @ 82E0A10 - .4byte 0x15 - .4byte 0x15 - .4byte CaveOfOrigin_B2F_MapBorder - .4byte CaveOfOrigin_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_B3F_MapBorder:: @ 82E0A28 - .incbin "data/maps/CaveOfOrigin_B3F/border.bin" - -CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30 - .incbin "data/maps/CaveOfOrigin_B3F/map.bin" - - .align 2 -CaveOfOrigin_B3F_MapAttributes:: @ 82E0D50 - .4byte 0x13 - .4byte 0x15 - .4byte CaveOfOrigin_B3F_MapBorder - .4byte CaveOfOrigin_B3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -CaveOfOrigin_B4F_MapBorder:: @ 82E0D68 - .incbin "data/maps/CaveOfOrigin_B4F/border.bin" - -CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70 - .incbin "data/maps/CaveOfOrigin_B4F/map.bin" - - .align 2 -CaveOfOrigin_B4F_MapAttributes:: @ 82E1044 - .4byte 0x13 - .4byte 0x13 - .4byte CaveOfOrigin_B4F_MapBorder - .4byte CaveOfOrigin_B4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -VictoryRoad_1F_MapBorder:: @ 82E105C - .incbin "data/maps/VictoryRoad_1F/border.bin" - -VictoryRoad_1F_MapBlockdata:: @ 82E1064 - .incbin "data/maps/VictoryRoad_1F/map.bin" - - .align 2 -VictoryRoad_1F_MapAttributes:: @ 82E2090 - .4byte 0x2e - .4byte 0x2d - .4byte VictoryRoad_1F_MapBorder - .4byte VictoryRoad_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8 - .incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin" - -ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0 - .incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_MapAttributes:: @ 82E2A44 - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_LowTideEntranceRoom_MapBorder - .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C - .incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin" - -ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64 - .incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_MapAttributes:: @ 82E380C - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_LowTideInnerRoom_MapBorder - .4byte ShoalCave_LowTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824 - .incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin" - -ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C - .incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_MapAttributes:: @ 82E3AA4 - .4byte 0x15 - .4byte 0xf - .4byte ShoalCave_LowTideStairsRoom_MapBorder - .4byte ShoalCave_LowTideStairsRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC - .incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin" - -ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4 - .incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_MapAttributes:: @ 82E3E28 - .4byte 0x1f - .4byte 0xe - .4byte ShoalCave_LowTideLowerRoom_MapBorder - .4byte ShoalCave_LowTideLowerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40 - .incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin" - -ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48 - .incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_MapAttributes:: @ 82E47DC - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_HighTideEntranceRoom_MapBorder - .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4 - .incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin" - -ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC - .incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4 - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_HighTideInnerRoom_MapBorder - .4byte ShoalCave_HighTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E55C8: - .incbin "data/maps/UnknownMap_082E55C8/border.bin" - -UnknownMapBlockdata_082E55C8: - .incbin "data/maps/UnknownMap_082E55C8/map.bin" - - .align 2 -UnknownMapAttributes_082E55C8: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E55C8 - .4byte UnknownMapBlockdata_082E55C8 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E55EC: - .incbin "data/maps/UnknownMap_082E55EC/border.bin" - -UnknownMapBlockdata_082E55EC: - .incbin "data/maps/UnknownMap_082E55EC/map.bin" - - .align 2 -UnknownMapAttributes_082E55EC: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E55EC - .4byte UnknownMapBlockdata_082E55EC - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5610: - .incbin "data/maps/UnknownMap_082E5610/border.bin" - -UnknownMapBlockdata_082E5610: - .incbin "data/maps/UnknownMap_082E5610/map.bin" - - .align 2 -UnknownMapAttributes_082E5610: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5610 - .4byte UnknownMapBlockdata_082E5610 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5634: - .incbin "data/maps/UnknownMap_082E5634/border.bin" - -UnknownMapBlockdata_082E5634: - .incbin "data/maps/UnknownMap_082E5634/map.bin" - - .align 2 -UnknownMapAttributes_082E5634: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5634 - .4byte UnknownMapBlockdata_082E5634 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5658: - .incbin "data/maps/UnknownMap_082E5658/border.bin" - -UnknownMapBlockdata_082E5658: - .incbin "data/maps/UnknownMap_082E5658/map.bin" - - .align 2 -UnknownMapAttributes_082E5658: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5658 - .4byte UnknownMapBlockdata_082E5658 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E567C: - .incbin "data/maps/UnknownMap_082E567C/border.bin" - -UnknownMapBlockdata_082E567C: - .incbin "data/maps/UnknownMap_082E567C/map.bin" - - .align 2 -UnknownMapAttributes_082E567C: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E567C - .4byte UnknownMapBlockdata_082E567C - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E56A0: - .incbin "data/maps/UnknownMap_082E56A0/border.bin" - -UnknownMapBlockdata_082E56A0: - .incbin "data/maps/UnknownMap_082E56A0/map.bin" - - .align 2 -UnknownMapAttributes_082E56A0: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E56A0 - .4byte UnknownMapBlockdata_082E56A0 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E56C4: - .incbin "data/maps/UnknownMap_082E56C4/border.bin" - -UnknownMapBlockdata_082E56C4: - .incbin "data/maps/UnknownMap_082E56C4/map.bin" - - .align 2 -UnknownMapAttributes_082E56C4: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E56C4 - .4byte UnknownMapBlockdata_082E56C4 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E56E8: - .incbin "data/maps/UnknownMap_082E56E8/border.bin" - -UnknownMapBlockdata_082E56E8: - .incbin "data/maps/UnknownMap_082E56E8/map.bin" - - .align 2 -UnknownMapAttributes_082E56E8: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E56E8 - .4byte UnknownMapBlockdata_082E56E8 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E570C: - .incbin "data/maps/UnknownMap_082E570C/border.bin" - -UnknownMapBlockdata_082E570C: - .incbin "data/maps/UnknownMap_082E570C/map.bin" - - .align 2 -UnknownMapAttributes_082E570C: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E570C - .4byte UnknownMapBlockdata_082E570C - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5730: - .incbin "data/maps/UnknownMap_082E5730/border.bin" - -UnknownMapBlockdata_082E5730: - .incbin "data/maps/UnknownMap_082E5730/map.bin" - - .align 2 -UnknownMapAttributes_082E5730: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5730 - .4byte UnknownMapBlockdata_082E5730 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5754: - .incbin "data/maps/UnknownMap_082E5754/border.bin" - -UnknownMapBlockdata_082E5754: - .incbin "data/maps/UnknownMap_082E5754/map.bin" - - .align 2 -UnknownMapAttributes_082E5754: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5754 - .4byte UnknownMapBlockdata_082E5754 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E5778: - .incbin "data/maps/UnknownMap_082E5778/border.bin" - -UnknownMapBlockdata_082E5778: - .incbin "data/maps/UnknownMap_082E5778/map.bin" - - .align 2 -UnknownMapAttributes_082E5778: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E5778 - .4byte UnknownMapBlockdata_082E5778 - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082E579C: - .incbin "data/maps/UnknownMap_082E579C/border.bin" - -UnknownMapBlockdata_082E579C: - .incbin "data/maps/UnknownMap_082E579C/map.bin" - - .align 2 -UnknownMapAttributes_082E579C: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMapBorder_082E579C - .4byte UnknownMapBlockdata_082E579C - .4byte gTileset_General - .4byte gTileset_Cave - -NewMauville_Entrance_MapBorder:: @ 82E57B4 - .incbin "data/maps/NewMauville_Entrance/border.bin" - -NewMauville_Entrance_MapBlockdata:: @ 82E57BC - .incbin "data/maps/NewMauville_Entrance/map.bin" - - .align 2 -NewMauville_Entrance_MapAttributes:: @ 82E5860 - .4byte 0x9 - .4byte 0x9 - .4byte NewMauville_Entrance_MapBorder - .4byte NewMauville_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -NewMauville_Inside_MapBorder:: @ 82E5878 - .incbin "data/maps/NewMauville_Inside/border.bin" - -NewMauville_Inside_MapBlockdata:: @ 82E5880 - .incbin "data/maps/NewMauville_Inside/map.bin" - - .align 2 -NewMauville_Inside_MapAttributes:: @ 82E65A4 - .4byte 0x29 - .4byte 0x29 - .4byte NewMauville_Inside_MapBorder - .4byte NewMauville_Inside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - -AbandonedShip_Deck_MapBorder:: @ 82E65BC - .incbin "data/maps/AbandonedShip_Deck/border.bin" - -AbandonedShip_Deck_MapBlockdata:: @ 82E65C4 - .incbin "data/maps/AbandonedShip_Deck/map.bin" - - .align 2 -AbandonedShip_Deck_MapAttributes:: @ 82E698C - .4byte 0x17 - .4byte 0x15 - .4byte AbandonedShip_Deck_MapBorder - .4byte AbandonedShip_Deck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4 - .incbin "data/maps/AbandonedShip_Corridors_1F/border.bin" - -AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC - .incbin "data/maps/AbandonedShip_Corridors_1F/map.bin" - - .align 2 -AbandonedShip_Corridors_1F_MapAttributes:: @ 82E6B5C - .4byte 0x12 - .4byte 0xc - .4byte AbandonedShip_Corridors_1F_MapBorder - .4byte AbandonedShip_Corridors_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74 - .incbin "data/maps/AbandonedShip_Rooms_1F/border.bin" - -AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C - .incbin "data/maps/AbandonedShip_Rooms_1F/map.bin" - - .align 2 -AbandonedShip_Rooms_1F_MapAttributes:: @ 82E6DE0 - .4byte 0x12 - .4byte 0x11 - .4byte AbandonedShip_Rooms_1F_MapBorder - .4byte AbandonedShip_Rooms_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8 - .incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin" - -AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00 - .incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin" - - .align 2 -AbandonedShip_Corridors_B1F_MapAttributes:: @ 82E6F04 - .4byte 0xd - .4byte 0xa - .4byte AbandonedShip_Corridors_B1F_MapBorder - .4byte AbandonedShip_Corridors_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C - .incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin" - -AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24 - .incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms_B1F_MapAttributes:: @ 82E70D4 - .4byte 0x1b - .4byte 0x8 - .4byte AbandonedShip_Rooms_B1F_MapBorder - .4byte AbandonedShip_Rooms_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC - .incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin" - -AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4 - .incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_MapAttributes:: @ 82E7214 - .4byte 0x12 - .4byte 0x8 - .4byte AbandonedShip_Rooms2_B1F_MapBorder - .4byte AbandonedShip_Rooms2_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Underwater1_MapBorder:: @ 82E722C - .incbin "data/maps/AbandonedShip_Underwater1/border.bin" - -AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234 - .incbin "data/maps/AbandonedShip_Underwater1/map.bin" - - .align 2 -AbandonedShip_Underwater1_MapAttributes:: @ 82E72B4 - .4byte 0x8 - .4byte 0x8 - .4byte AbandonedShip_Underwater1_MapBorder - .4byte AbandonedShip_Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC - .incbin "data/maps/AbandonedShip_Room_B1F/border.bin" - -AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4 - .incbin "data/maps/AbandonedShip_Room_B1F/map.bin" - - .align 2 -AbandonedShip_Room_B1F_MapAttributes:: @ 82E7364 - .4byte 0x9 - .4byte 0x8 - .4byte AbandonedShip_Room_B1F_MapBorder - .4byte AbandonedShip_Room_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C - .incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin" - -AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384 - .incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_1F_MapAttributes:: @ 82E74B8 - .4byte 0x9 - .4byte 0x11 - .4byte AbandonedShip_Rooms2_1F_MapBorder - .4byte AbandonedShip_Rooms2_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0 - .incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin" - -AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8 - .incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin" - - .align 2 -AbandonedShip_CaptainsOffice_MapAttributes:: @ 82E7558 - .4byte 0x9 - .4byte 0x7 - .4byte AbandonedShip_CaptainsOffice_MapBorder - .4byte AbandonedShip_CaptainsOffice_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -AbandonedShip_Underwater2_MapBorder:: @ 82E7570 - .incbin "data/maps/AbandonedShip_Underwater2/border.bin" - -AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578 - .incbin "data/maps/AbandonedShip_Underwater2/map.bin" - - .align 2 -AbandonedShip_Underwater2_MapAttributes:: @ 82E76A0 - .4byte 0x15 - .4byte 0x7 - .4byte AbandonedShip_Underwater2_MapBorder - .4byte AbandonedShip_Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -SecretBase_RedCave1_MapBorder:: @ 82E76B8 - .incbin "data/maps/SecretBase_RedCave1/border.bin" - -SecretBase_RedCave1_MapBlockdata:: @ 82E76C0 - .incbin "data/maps/SecretBase_RedCave1/map.bin" - - .align 2 -SecretBase_RedCave1_MapAttributes:: @ 82E7788 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_RedCave1_MapBorder - .4byte SecretBase_RedCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - -SecretBase_BrownCave1_MapBorder:: @ 82E77A0 - .incbin "data/maps/SecretBase_BrownCave1/border.bin" - -SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8 - .incbin "data/maps/SecretBase_BrownCave1/map.bin" - - .align 2 -SecretBase_BrownCave1_MapAttributes:: @ 82E7870 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BrownCave1_MapBorder - .4byte SecretBase_BrownCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - -SecretBase_BlueCave1_MapBorder:: @ 82E7888 - .incbin "data/maps/SecretBase_BlueCave1/border.bin" - -SecretBase_BlueCave1_MapBlockdata:: @ 82E7890 - .incbin "data/maps/SecretBase_BlueCave1/map.bin" - - .align 2 -SecretBase_BlueCave1_MapAttributes:: @ 82E7958 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BlueCave1_MapBorder - .4byte SecretBase_BlueCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - -SecretBase_YellowCave1_MapBorder:: @ 82E7970 - .incbin "data/maps/SecretBase_YellowCave1/border.bin" - -SecretBase_YellowCave1_MapBlockdata:: @ 82E7978 - .incbin "data/maps/SecretBase_YellowCave1/map.bin" - - .align 2 -SecretBase_YellowCave1_MapAttributes:: @ 82E7A40 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_YellowCave1_MapBorder - .4byte SecretBase_YellowCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - -SecretBase_Tree1_MapBorder:: @ 82E7A58 - .incbin "data/maps/SecretBase_Tree1/border.bin" - -SecretBase_Tree1_MapBlockdata:: @ 82E7A60 - .incbin "data/maps/SecretBase_Tree1/map.bin" - - .align 2 -SecretBase_Tree1_MapAttributes:: @ 82E7B28 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Tree1_MapBorder - .4byte SecretBase_Tree1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - -SecretBase_Shrub1_MapBorder:: @ 82E7B40 - .incbin "data/maps/SecretBase_Shrub1/border.bin" - -SecretBase_Shrub1_MapBlockdata:: @ 82E7B48 - .incbin "data/maps/SecretBase_Shrub1/map.bin" - - .align 2 -SecretBase_Shrub1_MapAttributes:: @ 82E7C10 - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Shrub1_MapBorder - .4byte SecretBase_Shrub1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - -SecretBase_RedCave2_MapBorder:: @ 82E7C28 - .incbin "data/maps/SecretBase_RedCave2/border.bin" - -SecretBase_RedCave2_MapBlockdata:: @ 82E7C30 - .incbin "data/maps/SecretBase_RedCave2/map.bin" - - .align 2 -SecretBase_RedCave2_MapAttributes:: @ 82E7D10 - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_RedCave2_MapBorder - .4byte SecretBase_RedCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - -SecretBase_BrownCave2_MapBorder:: @ 82E7D28 - .incbin "data/maps/SecretBase_BrownCave2/border.bin" - -SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30 - .incbin "data/maps/SecretBase_BrownCave2/map.bin" - - .align 2 -SecretBase_BrownCave2_MapAttributes:: @ 82E7E2C - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_BrownCave2_MapBorder - .4byte SecretBase_BrownCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - -SecretBase_BlueCave2_MapBorder:: @ 82E7E44 - .incbin "data/maps/SecretBase_BlueCave2/border.bin" - -SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C - .incbin "data/maps/SecretBase_BlueCave2/map.bin" - - .align 2 -SecretBase_BlueCave2_MapAttributes:: @ 82E7F20 - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_BlueCave2_MapBorder - .4byte SecretBase_BlueCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - -SecretBase_YellowCave2_MapBorder:: @ 82E7F38 - .incbin "data/maps/SecretBase_YellowCave2/border.bin" - -SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40 - .incbin "data/maps/SecretBase_YellowCave2/map.bin" - - .align 2 -SecretBase_YellowCave2_MapAttributes:: @ 82E803C - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_YellowCave2_MapBorder - .4byte SecretBase_YellowCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - -SecretBase_Tree2_MapBorder:: @ 82E8054 - .incbin "data/maps/SecretBase_Tree2/border.bin" - -SecretBase_Tree2_MapBlockdata:: @ 82E805C - .incbin "data/maps/SecretBase_Tree2/map.bin" - - .align 2 -SecretBase_Tree2_MapAttributes:: @ 82E813C - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_Tree2_MapBorder - .4byte SecretBase_Tree2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - -SecretBase_Shrub2_MapBorder:: @ 82E8154 - .incbin "data/maps/SecretBase_Shrub2/border.bin" - -SecretBase_Shrub2_MapBlockdata:: @ 82E815C - .incbin "data/maps/SecretBase_Shrub2/map.bin" - - .align 2 -SecretBase_Shrub2_MapAttributes:: @ 82E8230 - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_Shrub2_MapBorder - .4byte SecretBase_Shrub2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - -SecretBase_RedCave3_MapBorder:: @ 82E8248 - .incbin "data/maps/SecretBase_RedCave3/border.bin" - -SecretBase_RedCave3_MapBlockdata:: @ 82E8250 - .incbin "data/maps/SecretBase_RedCave3/map.bin" - - .align 2 -SecretBase_RedCave3_MapAttributes:: @ 82E8340 - .4byte 0xf - .4byte 0x8 - .4byte SecretBase_RedCave3_MapBorder - .4byte SecretBase_RedCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - -SecretBase_BrownCave3_MapBorder:: @ 82E8358 - .incbin "data/maps/SecretBase_BrownCave3/border.bin" - -SecretBase_BrownCave3_MapBlockdata:: @ 82E8360 - .incbin "data/maps/SecretBase_BrownCave3/map.bin" - - .align 2 -SecretBase_BrownCave3_MapAttributes:: @ 82E84AC - .4byte 0xf - .4byte 0xb - .4byte SecretBase_BrownCave3_MapBorder - .4byte SecretBase_BrownCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - -SecretBase_BlueCave3_MapBorder:: @ 82E84C4 - .incbin "data/maps/SecretBase_BlueCave3/border.bin" - -SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC - .incbin "data/maps/SecretBase_BlueCave3/map.bin" - - .align 2 -SecretBase_BlueCave3_MapAttributes:: @ 82E8620 - .4byte 0xa - .4byte 0x11 - .4byte SecretBase_BlueCave3_MapBorder - .4byte SecretBase_BlueCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - -SecretBase_YellowCave3_MapBorder:: @ 82E8638 - .incbin "data/maps/SecretBase_YellowCave3/border.bin" - -SecretBase_YellowCave3_MapBlockdata:: @ 82E8640 - .incbin "data/maps/SecretBase_YellowCave3/map.bin" - - .align 2 -SecretBase_YellowCave3_MapAttributes:: @ 82E8748 - .4byte 0xc - .4byte 0xb - .4byte SecretBase_YellowCave3_MapBorder - .4byte SecretBase_YellowCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - -SecretBase_Tree3_MapBorder:: @ 82E8760 - .incbin "data/maps/SecretBase_Tree3/border.bin" - -SecretBase_Tree3_MapBlockdata:: @ 82E8768 - .incbin "data/maps/SecretBase_Tree3/map.bin" - - .align 2 -SecretBase_Tree3_MapAttributes:: @ 82E8878 - .4byte 0x11 - .4byte 0x8 - .4byte SecretBase_Tree3_MapBorder - .4byte SecretBase_Tree3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - -SecretBase_Shrub3_MapBorder:: @ 82E8890 - .incbin "data/maps/SecretBase_Shrub3/border.bin" - -SecretBase_Shrub3_MapBlockdata:: @ 82E8898 - .incbin "data/maps/SecretBase_Shrub3/map.bin" - - .align 2 -SecretBase_Shrub3_MapAttributes:: @ 82E89B8 - .4byte 0xd - .4byte 0xb - .4byte SecretBase_Shrub3_MapBorder - .4byte SecretBase_Shrub3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - -SecretBase_RedCave4_MapBorder:: @ 82E89D0 - .incbin "data/maps/SecretBase_RedCave4/border.bin" - -SecretBase_RedCave4_MapBlockdata:: @ 82E89D8 - .incbin "data/maps/SecretBase_RedCave4/map.bin" - - .align 2 -SecretBase_RedCave4_MapAttributes:: @ 82E8AE8 - .4byte 0x9 - .4byte 0xf - .4byte SecretBase_RedCave4_MapBorder - .4byte SecretBase_RedCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - -SecretBase_BrownCave4_MapBorder:: @ 82E8B00 - .incbin "data/maps/SecretBase_BrownCave4/border.bin" - -SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08 - .incbin "data/maps/SecretBase_BrownCave4/map.bin" - - .align 2 -SecretBase_BrownCave4_MapAttributes:: @ 82E8C58 - .4byte 0xe - .4byte 0xc - .4byte SecretBase_BrownCave4_MapBorder - .4byte SecretBase_BrownCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - -SecretBase_BlueCave4_MapBorder:: @ 82E8C70 - .incbin "data/maps/SecretBase_BlueCave4/border.bin" - -SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78 - .incbin "data/maps/SecretBase_BlueCave4/map.bin" - - .align 2 -SecretBase_BlueCave4_MapAttributes:: @ 82E8DAC - .4byte 0x9 - .4byte 0x11 - .4byte SecretBase_BlueCave4_MapBorder - .4byte SecretBase_BlueCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - -SecretBase_YellowCave4_MapBorder:: @ 82E8DC4 - .incbin "data/maps/SecretBase_YellowCave4/border.bin" - -SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC - .incbin "data/maps/SecretBase_YellowCave4/map.bin" - - .align 2 -SecretBase_YellowCave4_MapAttributes:: @ 82E8F38 - .4byte 0xd - .4byte 0xe - .4byte SecretBase_YellowCave4_MapBorder - .4byte SecretBase_YellowCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - -SecretBase_Tree4_MapBorder:: @ 82E8F50 - .incbin "data/maps/SecretBase_Tree4/border.bin" - -SecretBase_Tree4_MapBlockdata:: @ 82E8F58 - .incbin "data/maps/SecretBase_Tree4/map.bin" - - .align 2 -SecretBase_Tree4_MapAttributes:: @ 82E90E0 - .4byte 0xe - .4byte 0xe - .4byte SecretBase_Tree4_MapBorder - .4byte SecretBase_Tree4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - -SecretBase_Shrub4_MapBorder:: @ 82E90F8 - .incbin "data/maps/SecretBase_Shrub4/border.bin" - -SecretBase_Shrub4_MapBlockdata:: @ 82E9100 - .incbin "data/maps/SecretBase_Shrub4/map.bin" - - .align 2 -SecretBase_Shrub4_MapAttributes:: @ 82E9234 - .4byte 0xe - .4byte 0xb - .4byte SecretBase_Shrub4_MapBorder - .4byte SecretBase_Shrub4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - -SingleBattleColosseum_MapBorder:: @ 82E924C - .incbin "data/maps/SingleBattleColosseum/border.bin" - -SingleBattleColosseum_MapBlockdata:: @ 82E9254 - .incbin "data/maps/SingleBattleColosseum/map.bin" - - .align 2 -SingleBattleColosseum_MapAttributes:: @ 82E9350 - .4byte 0xe - .4byte 0x9 - .4byte SingleBattleColosseum_MapBorder - .4byte SingleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -TradeCenter_MapBorder:: @ 82E9368 - .incbin "data/maps/TradeCenter/border.bin" - -TradeCenter_MapBlockdata:: @ 82E9370 - .incbin "data/maps/TradeCenter/map.bin" - - .align 2 -TradeCenter_MapAttributes:: @ 82E9448 - .4byte 0xc - .4byte 0x9 - .4byte TradeCenter_MapBorder - .4byte TradeCenter_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -RecordCorner_MapBorder:: @ 82E9460 - .incbin "data/maps/RecordCorner/border.bin" - -RecordCorner_MapBlockdata:: @ 82E9468 - .incbin "data/maps/RecordCorner/map.bin" - - .align 2 -RecordCorner_MapAttributes:: @ 82E95F8 - .4byte 0x14 - .4byte 0xa - .4byte RecordCorner_MapBorder - .4byte RecordCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -DoubleBattleColosseum_MapBorder:: @ 82E9610 - .incbin "data/maps/DoubleBattleColosseum/border.bin" - -DoubleBattleColosseum_MapBlockdata:: @ 82E9618 - .incbin "data/maps/DoubleBattleColosseum/map.bin" - - .align 2 -DoubleBattleColosseum_MapAttributes:: @ 82E9714 - .4byte 0xe - .4byte 0x9 - .4byte DoubleBattleColosseum_MapBorder - .4byte DoubleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -LinkContestRoom1_MapBorder:: @ 82E972C - .incbin "data/maps/LinkContestRoom1/border.bin" - -LinkContestRoom1_MapBlockdata:: @ 82E9734 - .incbin "data/maps/LinkContestRoom1/map.bin" - - .align 2 -LinkContestRoom1_MapAttributes:: @ 82E9880 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom1_MapBorder - .4byte LinkContestRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -UnknownMap_25_29_MapBorder:: @ 82E9898 - .incbin "data/maps/UnknownMap_25_29/border.bin" - -UnknownMap_25_29_MapBlockdata:: @ 82E98A0 - .incbin "data/maps/UnknownMap_25_29/map.bin" - - .align 2 -UnknownMap_25_29_MapAttributes:: @ 82E98A4 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_29_MapBorder - .4byte UnknownMap_25_29_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_30_MapBorder:: @ 82E98BC - .incbin "data/maps/UnknownMap_25_30/border.bin" - -UnknownMap_25_30_MapBlockdata:: @ 82E98C4 - .incbin "data/maps/UnknownMap_25_30/map.bin" - - .align 2 -UnknownMap_25_30_MapAttributes:: @ 82E98C8 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_30_MapBorder - .4byte UnknownMap_25_30_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_31_MapBorder:: @ 82E98E0 - .incbin "data/maps/UnknownMap_25_31/border.bin" - -UnknownMap_25_31_MapBlockdata:: @ 82E98E8 - .incbin "data/maps/UnknownMap_25_31/map.bin" - - .align 2 -UnknownMap_25_31_MapAttributes:: @ 82E98EC - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_31_MapBorder - .4byte UnknownMap_25_31_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_32_MapBorder:: @ 82E9904 - .incbin "data/maps/UnknownMap_25_32/border.bin" - -UnknownMap_25_32_MapBlockdata:: @ 82E990C - .incbin "data/maps/UnknownMap_25_32/map.bin" - - .align 2 -UnknownMap_25_32_MapAttributes:: @ 82E9910 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_32_MapBorder - .4byte UnknownMap_25_32_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_33_MapBorder:: @ 82E9928 - .incbin "data/maps/UnknownMap_25_33/border.bin" - -UnknownMap_25_33_MapBlockdata:: @ 82E9930 - .incbin "data/maps/UnknownMap_25_33/map.bin" - - .align 2 -UnknownMap_25_33_MapAttributes:: @ 82E9934 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_33_MapBorder - .4byte UnknownMap_25_33_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -UnknownMap_25_34_MapBorder:: @ 82E994C - .incbin "data/maps/UnknownMap_25_34/border.bin" - -UnknownMap_25_34_MapBlockdata:: @ 82E9954 - .incbin "data/maps/UnknownMap_25_34/map.bin" - - .align 2 -UnknownMap_25_34_MapAttributes:: @ 82E9958 - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_34_MapBorder - .4byte UnknownMap_25_34_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - -LinkContestRoom2_MapBorder:: @ 82E9970 - .incbin "data/maps/LinkContestRoom2/border.bin" - -LinkContestRoom2_MapBlockdata:: @ 82E9978 - .incbin "data/maps/LinkContestRoom2/map.bin" - - .align 2 -LinkContestRoom2_MapAttributes:: @ 82E9AC4 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom2_MapBorder - .4byte LinkContestRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -LinkContestRoom3_MapBorder:: @ 82E9ADC - .incbin "data/maps/LinkContestRoom3/border.bin" - -LinkContestRoom3_MapBlockdata:: @ 82E9AE4 - .incbin "data/maps/LinkContestRoom3/map.bin" - - .align 2 -LinkContestRoom3_MapAttributes:: @ 82E9C30 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom3_MapBorder - .4byte LinkContestRoom3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -LinkContestRoom4_MapBorder:: @ 82E9C48 - .incbin "data/maps/LinkContestRoom4/border.bin" - -LinkContestRoom4_MapBlockdata:: @ 82E9C50 - .incbin "data/maps/LinkContestRoom4/map.bin" - - .align 2 -LinkContestRoom4_MapAttributes:: @ 82E9D9C - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom4_MapBorder - .4byte LinkContestRoom4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -LinkContestRoom5_MapBorder:: @ 82E9DB4 - .incbin "data/maps/LinkContestRoom5/border.bin" - -LinkContestRoom5_MapBlockdata:: @ 82E9DBC - .incbin "data/maps/LinkContestRoom5/map.bin" - - .align 2 -LinkContestRoom5_MapAttributes:: @ 82E9F08 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom5_MapBorder - .4byte LinkContestRoom5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -LinkContestRoom6_MapBorder:: @ 82E9F20 - .incbin "data/maps/LinkContestRoom6/border.bin" - -LinkContestRoom6_MapBlockdata:: @ 82E9F28 - .incbin "data/maps/LinkContestRoom6/map.bin" - - .align 2 -LinkContestRoom6_MapAttributes:: @ 82EA074 - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom6_MapBorder - .4byte LinkContestRoom6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - -InsideOfTruck_MapBorder:: @ 82EA08C - .incbin "data/maps/InsideOfTruck/border.bin" - -InsideOfTruck_MapBlockdata:: @ 82EA094 - .incbin "data/maps/InsideOfTruck/map.bin" - - .align 2 -InsideOfTruck_MapAttributes:: @ 82EA0C8 - .4byte 0x5 - .4byte 0x5 - .4byte InsideOfTruck_MapBorder - .4byte InsideOfTruck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideOfTruck - -SafariZone_Northwest_MapBorder:: @ 82EA0E0 - .incbin "data/maps/SafariZone_Northwest/border.bin" - -SafariZone_Northwest_MapBlockdata:: @ 82EA0E8 - .incbin "data/maps/SafariZone_Northwest/map.bin" - - .align 2 -SafariZone_Northwest_MapAttributes:: @ 82EAD68 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northwest_MapBorder - .4byte SafariZone_Northwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -SafariZone_Northeast_MapBorder:: @ 82EAD80 - .incbin "data/maps/SafariZone_Northeast/border.bin" - -SafariZone_Northeast_MapBlockdata:: @ 82EAD88 - .incbin "data/maps/SafariZone_Northeast/map.bin" - - .align 2 -SafariZone_Northeast_MapAttributes:: @ 82EBA08 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northeast_MapBorder - .4byte SafariZone_Northeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -SafariZone_Southwest_MapBorder:: @ 82EBA20 - .incbin "data/maps/SafariZone_Southwest/border.bin" - -SafariZone_Southwest_MapBlockdata:: @ 82EBA28 - .incbin "data/maps/SafariZone_Southwest/map.bin" - - .align 2 -SafariZone_Southwest_MapAttributes:: @ 82EC6A8 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southwest_MapBorder - .4byte SafariZone_Southwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -SafariZone_Southeast_MapBorder:: @ 82EC6C0 - .incbin "data/maps/SafariZone_Southeast/border.bin" - -SafariZone_Southeast_MapBlockdata:: @ 82EC6C8 - .incbin "data/maps/SafariZone_Southeast/map.bin" - - .align 2 -SafariZone_Southeast_MapAttributes:: @ 82ED348 - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southeast_MapBorder - .4byte SafariZone_Southeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - -UnknownMapBorder_082EDF30: - .incbin "data/maps/UnknownMap_082EDF30/border.bin" - -UnknownMapBlockdata_082EDF30: - .incbin "data/maps/UnknownMap_082EDF30/map.bin" - - .align 2 -UnknownMapAttributes_082EDF30: - .4byte 0x3A - .4byte 0x1A - .4byte UnknownMapBorder_082EDF30 - .4byte UnknownMapBlockdata_082EDF30 - .4byte gTileset_General - .4byte 0 - -Route109_SeashoreHouse_MapBorder:: @ 82EDF48 - .incbin "data/maps/Route109_SeashoreHouse/border.bin" - -Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50 - .incbin "data/maps/Route109_SeashoreHouse/map.bin" - - .align 2 -Route109_SeashoreHouse_MapAttributes:: @ 82EE07C - .4byte 0xf - .4byte 0xa - .4byte Route109_SeashoreHouse_MapBorder - .4byte Route109_SeashoreHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SeashoreHouse - -Route110_TrickHouseEntrance_MapBorder:: @ 82EE094 - .incbin "data/maps/Route110_TrickHouseEntrance/border.bin" - -Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C - .incbin "data/maps/Route110_TrickHouseEntrance/map.bin" - - .align 2 -Route110_TrickHouseEntrance_MapAttributes:: @ 82EE15C - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEntrance_MapBorder - .4byte Route110_TrickHouseEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route110_TrickHouseEnd_MapBorder:: @ 82EE174 - .incbin "data/maps/Route110_TrickHouseEnd/border.bin" - -Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C - .incbin "data/maps/Route110_TrickHouseEnd/map.bin" - - .align 2 -Route110_TrickHouseEnd_MapAttributes:: @ 82EE23C - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEnd_MapBorder - .4byte Route110_TrickHouseEnd_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route110_TrickHouseCorridor_MapBorder:: @ 82EE254 - .incbin "data/maps/Route110_TrickHouseCorridor/border.bin" - -Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C - .incbin "data/maps/Route110_TrickHouseCorridor/map.bin" - - .align 2 -Route110_TrickHouseCorridor_MapAttributes:: @ 82EE52C - .4byte 0xf - .4byte 0x18 - .4byte Route110_TrickHouseCorridor_MapBorder - .4byte Route110_TrickHouseCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544 - .incbin "data/maps/Route110_TrickHousePuzzle1/border.bin" - -Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C - .incbin "data/maps/Route110_TrickHousePuzzle1/map.bin" - - .align 2 -Route110_TrickHousePuzzle1_MapAttributes:: @ 82EE7E0 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle1_MapBorder - .4byte Route110_TrickHousePuzzle1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8 - .incbin "data/maps/Route110_TrickHousePuzzle2/border.bin" - -Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800 - .incbin "data/maps/Route110_TrickHousePuzzle2/map.bin" - - .align 2 -Route110_TrickHousePuzzle2_MapAttributes:: @ 82EEA94 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle2_MapBorder - .4byte Route110_TrickHousePuzzle2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC - .incbin "data/maps/Route110_TrickHousePuzzle3/border.bin" - -Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4 - .incbin "data/maps/Route110_TrickHousePuzzle3/map.bin" - - .align 2 -Route110_TrickHousePuzzle3_MapAttributes:: @ 82EED48 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle3_MapBorder - .4byte Route110_TrickHousePuzzle3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60 - .incbin "data/maps/Route110_TrickHousePuzzle4/border.bin" - -Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68 - .incbin "data/maps/Route110_TrickHousePuzzle4/map.bin" - - .align 2 -Route110_TrickHousePuzzle4_MapAttributes:: @ 82EEFFC - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle4_MapBorder - .4byte Route110_TrickHousePuzzle4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014 - .incbin "data/maps/Route110_TrickHousePuzzle5/border.bin" - -Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C - .incbin "data/maps/Route110_TrickHousePuzzle5/map.bin" - - .align 2 -Route110_TrickHousePuzzle5_MapAttributes:: @ 82EF2B0 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle5_MapBorder - .4byte Route110_TrickHousePuzzle5_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8 - .incbin "data/maps/Route110_TrickHousePuzzle6/border.bin" - -Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0 - .incbin "data/maps/Route110_TrickHousePuzzle6/map.bin" - - .align 2 -Route110_TrickHousePuzzle6_MapAttributes:: @ 82EF564 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle6_MapBorder - .4byte Route110_TrickHousePuzzle6_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C - .incbin "data/maps/Route110_TrickHousePuzzle7/border.bin" - -Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584 - .incbin "data/maps/Route110_TrickHousePuzzle7/map.bin" - - .align 2 -Route110_TrickHousePuzzle7_MapAttributes:: @ 82EF818 - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle7_MapBorder - .4byte Route110_TrickHousePuzzle7_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830 - .incbin "data/maps/Route110_TrickHousePuzzle8/border.bin" - -Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838 - .incbin "data/maps/Route110_TrickHousePuzzle8/map.bin" - - .align 2 -Route110_TrickHousePuzzle8_MapAttributes:: @ 82EFACC - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle8_MapBorder - .4byte Route110_TrickHousePuzzle8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - -FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4 - .incbin "data/maps/FortreeCity_DecorationShop/border.bin" - -FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC - .incbin "data/maps/FortreeCity_DecorationShop/map.bin" - - .align 2 -FortreeCity_DecorationShop_MapAttributes:: @ 82EFB4C - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_DecorationShop_MapBorder - .4byte FortreeCity_DecorationShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64 - .incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin" - -Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata:: @ 82EFB6C - .incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin" - - .align 2 -Route110_SeasideCyclingRoadNorthEntrance_MapAttributes:: @ 82EFC20 -Route110_SeasideCyclingRoadSouthEntrance_MapAttributes:: @ 82EFC20 - .4byte 0xf - .4byte 0x6 - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapBorder - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38 - .incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin" - -LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40 - .incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_MapAttributes:: @ 82EFD60 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_1F_MapBorder - .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78 - .incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin" - -LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80 - .incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_MapAttributes:: @ 82EFEA0 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_2F_MapBorder - .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8 - .incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin" - -LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0 - .incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_MapAttributes:: @ 82EFFE0 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_3F_MapBorder - .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8 - .incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin" - -LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000 - .incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_MapAttributes:: @ 82F0120 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_4F_MapBorder - .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138 - .incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin" - -LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140 - .incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_MapAttributes:: @ 82F0260 - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_5F_MapBorder - .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278 - .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin" - -LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280 - .incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_MapAttributes:: @ 82F0430 - .4byte 0x12 - .4byte 0xc - .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder - .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - -Route130_MapBorder:: @ 82F0448 - .incbin "data/maps/Route130/border.bin" - -Route130_MapBlockdata:: @ 82F0450 - .incbin "data/maps/Route130/map.bin" - - .align 2 -Route130_MapAttributes:: @ 82F1D50 - .4byte 0x50 - .4byte 0x28 - .4byte Route130_MapBorder - .4byte Route130_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -BattleTower_Lobby_MapBorder:: @ 82F1D68 - .incbin "data/maps/BattleTower_Lobby/border.bin" - -BattleTower_Lobby_MapBlockdata:: @ 82F1D70 - .incbin "data/maps/BattleTower_Lobby/map.bin" - - .align 2 -BattleTower_Lobby_MapAttributes:: @ 82F1E6C - .4byte 0xe - .4byte 0x9 - .4byte BattleTower_Lobby_MapBorder - .4byte BattleTower_Lobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -BattleTower_Outside_MapBorder:: @ 82F1E84 - .incbin "data/maps/BattleTower_Outside/border.bin" - -BattleTower_Outside_MapBlockdata:: @ 82F1E8C - .incbin "data/maps/BattleTower_Outside/map.bin" - - .align 2 -BattleTower_Outside_MapAttributes:: @ 82F2558 - .4byte 0x1d - .4byte 0x1e - .4byte BattleTower_Outside_MapBorder - .4byte BattleTower_Outside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - -BattleTower_Elevator_MapBorder:: @ 82F2570 - .incbin "data/maps/BattleTower_Elevator/border.bin" - -BattleTower_Elevator_MapBlockdata:: @ 82F2578 - .incbin "data/maps/BattleTower_Elevator/map.bin" - - .align 2 -BattleTower_Elevator_MapAttributes:: @ 82F25B0 - .4byte 0x4 - .4byte 0x7 - .4byte BattleTower_Elevator_MapBorder - .4byte BattleTower_Elevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -BattleTower_Corridor_MapBorder:: @ 82F25C8 - .incbin "data/maps/BattleTower_Corridor/border.bin" - -BattleTower_Corridor_MapBlockdata:: @ 82F25D0 - .incbin "data/maps/BattleTower_Corridor/map.bin" - - .align 2 -BattleTower_Corridor_MapAttributes:: @ 82F267C - .4byte 0x11 - .4byte 0x5 - .4byte BattleTower_Corridor_MapBorder - .4byte BattleTower_Corridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -BattleTower_BattleRoom_MapBorder:: @ 82F2694 - .incbin "data/maps/BattleTower_BattleRoom/border.bin" - -BattleTower_BattleRoom_MapBlockdata:: @ 82F269C - .incbin "data/maps/BattleTower_BattleRoom/map.bin" - - .align 2 -BattleTower_BattleRoom_MapAttributes:: @ 82F2750 - .4byte 0xa - .4byte 0x9 - .4byte BattleTower_BattleRoom_MapBorder - .4byte BattleTower_BattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768 - .incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin" - -RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770 - .incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin" - - .align 2 -RustboroCity_DevonCorp_3F_MapAttributes:: @ 82F28C8 - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_3F_MapBorder - .4byte RustboroCity_DevonCorp_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0 - .incbin "data/maps/EverGrandeCity_PokemonLeague/border.bin" - -EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8 - .incbin "data/maps/EverGrandeCity_PokemonLeague/map.bin" - - .align 2 -EverGrandeCity_PokemonLeague_MapAttributes:: @ 82F2AB0 - .4byte 0x13 - .4byte 0xc - .4byte EverGrandeCity_PokemonLeague_MapBorder - .4byte EverGrandeCity_PokemonLeague_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - -Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8 - .incbin "data/maps/Route119_WeatherInstitute_1F/border.bin" - -Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0 - .incbin "data/maps/Route119_WeatherInstitute_1F/map.bin" - - .align 2 -Route119_WeatherInstitute_1F_MapAttributes:: @ 82F2CD8 - .4byte 0x14 - .4byte 0xd - .4byte Route119_WeatherInstitute_1F_MapBorder - .4byte Route119_WeatherInstitute_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - -Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0 - .incbin "data/maps/Route119_WeatherInstitute_2F/border.bin" - -Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8 - .incbin "data/maps/Route119_WeatherInstitute_2F/map.bin" - - .align 2 -Route119_WeatherInstitute_2F_MapAttributes:: @ 82F2EB0 - .4byte 0x14 - .4byte 0xb - .4byte Route119_WeatherInstitute_2F_MapBorder - .4byte Route119_WeatherInstitute_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - -LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8 - .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin" - -LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0 - .incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_MapAttributes:: @ 82F2F00 - .4byte 0x4 - .4byte 0x6 - .4byte LilycoveCity_DepartmentStoreElevator_MapBorder - .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTower - -Underwater1_MapBorder:: @ 82F2F18 - .incbin "data/maps/Underwater1/border.bin" - -Underwater1_MapBlockdata:: @ 82F2F20 - .incbin "data/maps/Underwater1/map.bin" - - .align 2 -Underwater1_MapAttributes:: @ 82F6120 - .4byte 0x50 - .4byte 0x50 - .4byte Underwater1_MapBorder - .4byte Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138 - .incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin" - -MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140 - .incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_MapAttributes:: @ 82F6280 - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_1F_MapBorder - .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298 - .incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin" - -MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0 - .incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_MapAttributes:: @ 82F63E0 - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_2F_MapBorder - .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -SSTidalCorridor_MapBorder:: @ 82F63F8 - .incbin "data/maps/SSTidalCorridor/border.bin" - -SSTidalCorridor_MapBlockdata:: @ 82F6400 - .incbin "data/maps/SSTidalCorridor/map.bin" - - .align 2 -SSTidalCorridor_MapAttributes:: @ 82F65D4 - .4byte 0x12 - .4byte 0xd - .4byte SSTidalCorridor_MapBorder - .4byte SSTidalCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -SSTidalLowerDeck_MapBorder:: @ 82F65EC - .incbin "data/maps/SSTidalLowerDeck/border.bin" - -SSTidalLowerDeck_MapBlockdata:: @ 82F65F4 - .incbin "data/maps/SSTidalLowerDeck/map.bin" - - .align 2 -SSTidalLowerDeck_MapAttributes:: @ 82F67B0 - .4byte 0x11 - .4byte 0xd - .4byte SSTidalLowerDeck_MapBorder - .4byte SSTidalLowerDeck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -SSTidalRooms_MapBorder:: @ 82F67C8 - .incbin "data/maps/SSTidalRooms/border.bin" - -SSTidalRooms_MapBlockdata:: @ 82F67D0 - .incbin "data/maps/SSTidalRooms/map.bin" - - .align 2 -SSTidalRooms_MapAttributes:: @ 82F6CE0 - .4byte 0x24 - .4byte 0x12 - .4byte SSTidalRooms_MapBorder - .4byte SSTidalRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -IslandCave_MapBorder:: @ 82F6CF8 - .incbin "data/maps/IslandCave/border.bin" - -IslandCave_MapBlockdata:: @ 82F6D00 - .incbin "data/maps/IslandCave/map.bin" - - .align 2 -IslandCave_MapAttributes:: @ 82F7164 - .4byte 0x11 - .4byte 0x21 - .4byte IslandCave_MapBorder - .4byte IslandCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -AncientTomb_MapBorder:: @ 82F717C - .incbin "data/maps/AncientTomb/border.bin" - -AncientTomb_MapBlockdata:: @ 82F7184 - .incbin "data/maps/AncientTomb/map.bin" - - .align 2 -AncientTomb_MapAttributes:: @ 82F75E8 - .4byte 0x11 - .4byte 0x21 - .4byte AncientTomb_MapBorder - .4byte AncientTomb_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -Underwater_Route134_MapBorder:: @ 82F7600 - .incbin "data/maps/Underwater_Route134/border.bin" - -Underwater_Route134_MapBlockdata:: @ 82F7608 - .incbin "data/maps/Underwater_Route134/map.bin" - - .align 2 -Underwater_Route134_MapAttributes:: @ 82F7770 - .4byte 0x12 - .4byte 0xa - .4byte Underwater_Route134_MapBorder - .4byte Underwater_Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -Underwater_SealedChamber_MapBorder:: @ 82F7788 - .incbin "data/maps/Underwater_SealedChamber/border.bin" - -Underwater_SealedChamber_MapBlockdata:: @ 82F7790 - .incbin "data/maps/Underwater_SealedChamber/map.bin" - - .align 2 -Underwater_SealedChamber_MapAttributes:: @ 82F7FD0 - .4byte 0x16 - .4byte 0x30 - .4byte Underwater_SealedChamber_MapBorder - .4byte Underwater_SealedChamber_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - -SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8 - .incbin "data/maps/SealedChamber_OuterRoom/border.bin" - -SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0 - .incbin "data/maps/SealedChamber_OuterRoom/map.bin" - - .align 2 -SealedChamber_OuterRoom_MapAttributes:: @ 82F83B8 - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_OuterRoom_MapBorder - .4byte SealedChamber_OuterRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -VictoryRoad_B1F_MapBorder:: @ 82F83D0 - .incbin "data/maps/VictoryRoad_B1F/border.bin" - -VictoryRoad_B1F_MapBlockdata:: @ 82F83D8 - .incbin "data/maps/VictoryRoad_B1F/map.bin" - - .align 2 -VictoryRoad_B1F_MapAttributes:: @ 82F8EFC - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B1F_MapBorder - .4byte VictoryRoad_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -VictoryRoad_B2F_MapBorder:: @ 82F8F14 - .incbin "data/maps/VictoryRoad_B2F/border.bin" - -VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C - .incbin "data/maps/VictoryRoad_B2F/map.bin" - - .align 2 -VictoryRoad_B2F_MapAttributes:: @ 82F9A40 - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B2F_MapBorder - .4byte VictoryRoad_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -Route104_Prototype_MapBorder:: @ 82F9A58 - .incbin "data/maps/Route104_Prototype/border.bin" - -Route104_Prototype_MapBlockdata:: @ 82F9A60 - .incbin "data/maps/Route104_Prototype/map.bin" - - .align 2 -Route104_Prototype_MapAttributes:: @ 82F9A64 - .4byte 0x1 - .4byte 0x1 - .4byte Route104_Prototype_MapBorder - .4byte Route104_Prototype_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C - .incbin "data/maps/GraniteCave_StevensRoom/border.bin" - -GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84 - .incbin "data/maps/GraniteCave_StevensRoom/map.bin" - - .align 2 -GraniteCave_StevensRoom_MapAttributes:: @ 82F9C28 - .4byte 0xf - .4byte 0xe - .4byte GraniteCave_StevensRoom_MapBorder - .4byte GraniteCave_StevensRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40 - .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin" - -AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48 - .incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_MapAttributes:: @ 82F9D68 - .4byte 0xd - .4byte 0xb - .4byte AbandonedShip_HiddenFloorCorridors_MapBorder - .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -SouthernIsland_Exterior_MapBorder:: @ 82F9D80 - .incbin "data/maps/SouthernIsland_Exterior/border.bin" - -SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88 - .incbin "data/maps/SouthernIsland_Exterior/map.bin" - - .align 2 -SouthernIsland_Exterior_MapAttributes:: @ 82FA544 - .4byte 0x21 - .4byte 0x1e - .4byte SouthernIsland_Exterior_MapBorder - .4byte SouthernIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -SouthernIsland_Interior_MapBorder:: @ 82FA55C - .incbin "data/maps/SouthernIsland_Interior/border.bin" - -SouthernIsland_Interior_MapBlockdata:: @ 82FA564 - .incbin "data/maps/SouthernIsland_Interior/map.bin" - - .align 2 -SouthernIsland_Interior_MapAttributes:: @ 82FAA74 - .4byte 0x1b - .4byte 0x18 - .4byte SouthernIsland_Interior_MapBorder - .4byte SouthernIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - -JaggedPass_MapBorder:: @ 82FAA8C - .incbin "data/maps/JaggedPass/border.bin" - -JaggedPass_MapBlockdata:: @ 82FAA94 - .incbin "data/maps/JaggedPass/map.bin" - - .align 2 -JaggedPass_MapAttributes:: @ 82FB55C - .4byte 0x1e - .4byte 0x2e - .4byte JaggedPass_MapBorder - .4byte JaggedPass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -FieryPath_MapBorder:: @ 82FB574 - .incbin "data/maps/FieryPath/border.bin" - -FieryPath_MapBlockdata:: @ 82FB57C - .incbin "data/maps/FieryPath/map.bin" - - .align 2 -FieryPath_MapAttributes:: @ 82FBFE0 - .4byte 0x23 - .4byte 0x26 - .4byte FieryPath_MapBorder - .4byte FieryPath_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - -RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8 - .incbin "data/maps/RustboroCity_Flat2_1F/border.bin" - -RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000 - .incbin "data/maps/RustboroCity_Flat2_1F/map.bin" - - .align 2 -RustboroCity_Flat2_1F_MapAttributes:: @ 82FC0FC - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_1F_MapBorder - .4byte RustboroCity_Flat2_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_Flat2_2F_MapBorder:: @ 82FC114 - .incbin "data/maps/RustboroCity_Flat2_2F/border.bin" - -RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C - .incbin "data/maps/RustboroCity_Flat2_2F/map.bin" - - .align 2 -RustboroCity_Flat2_2F_MapAttributes:: @ 82FC218 - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_2F_MapBorder - .4byte RustboroCity_Flat2_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_Flat2_3F_MapBorder:: @ 82FC230 - .incbin "data/maps/RustboroCity_Flat2_3F/border.bin" - -RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238 - .incbin "data/maps/RustboroCity_Flat2_3F/map.bin" - - .align 2 -RustboroCity_Flat2_3F_MapAttributes:: @ 82FC334 - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_3F_MapBorder - .4byte RustboroCity_Flat2_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SootopolisCity_House8_MapBorder:: @ 82FC34C - .incbin "data/maps/SootopolisCity_House8/border.bin" - -SootopolisCity_House8_MapBlockdata:: @ 82FC354 - .incbin "data/maps/SootopolisCity_House8/map.bin" - - .align 2 -SootopolisCity_House8_MapAttributes:: @ 82FC3C4 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House8_MapBorder - .4byte SootopolisCity_House8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC - .incbin "data/maps/EverGrandeCity_HallOfFame/border.bin" - -EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4 - .incbin "data/maps/EverGrandeCity_HallOfFame/map.bin" - - .align 2 -EverGrandeCity_HallOfFame_MapAttributes:: @ 82FC5E4 - .4byte 0xf - .4byte 0x11 - .4byte EverGrandeCity_HallOfFame_MapBorder - .4byte EverGrandeCity_HallOfFame_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - -LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC - .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin" - -LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604 - .incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_MapAttributes:: @ 82FC6DC - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4 - .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin" - -LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC - .incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_MapAttributes:: @ 82FC7D4 - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC - .incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin" - -Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4 - .incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_MapAttributes:: @ 82FC8A8 - .4byte 0xa - .4byte 0x9 - .4byte Route124_DivingTreasureHuntersHouse_MapBorder - .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -MtPyre_Exterior_MapBorder:: @ 82FC8C0 - .incbin "data/maps/MtPyre_Exterior/border.bin" - -MtPyre_Exterior_MapBlockdata:: @ 82FC8C8 - .incbin "data/maps/MtPyre_Exterior/map.bin" - - .align 2 -MtPyre_Exterior_MapAttributes:: @ 82FD7EC - .4byte 0x26 - .4byte 0x33 - .4byte MtPyre_Exterior_MapBorder - .4byte MtPyre_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MtPyre_Summit_MapBorder:: @ 82FD804 - .incbin "data/maps/MtPyre_Summit/border.bin" - -MtPyre_Summit_MapBlockdata:: @ 82FD80C - .incbin "data/maps/MtPyre_Summit/map.bin" - - .align 2 -MtPyre_Summit_MapAttributes:: @ 82FE680 - .4byte 0x32 - .4byte 0x25 - .4byte MtPyre_Summit_MapBorder - .4byte MtPyre_Summit_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -SealedChamber_InnerRoom_MapBorder:: @ 82FE698 - .incbin "data/maps/SealedChamber_InnerRoom/border.bin" - -SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0 - .incbin "data/maps/SealedChamber_InnerRoom/map.bin" - - .align 2 -SealedChamber_InnerRoom_MapAttributes:: @ 82FEA68 - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_InnerRoom_MapBorder - .4byte SealedChamber_InnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80 - .incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin" - -MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88 - .incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_1F_MapAttributes:: @ 82FEB38 - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_GameCorner_1F_MapBorder - .4byte MossdeepCity_GameCorner_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50 - .incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin" - -MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58 - .incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_MapAttributes:: @ 82FEC30 - .4byte 0xc - .4byte 0x9 - .4byte MossdeepCity_GameCorner_B1F_MapBorder - .4byte MossdeepCity_GameCorner_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SootopolisCity_House1_MapBorder:: @ 82FEC48 - .incbin "data/maps/SootopolisCity_House1/border.bin" - -SootopolisCity_House1_MapBlockdata:: @ 82FEC50 - .incbin "data/maps/SootopolisCity_House1/map.bin" - - .align 2 -SootopolisCity_House1_MapAttributes:: @ 82FECC0 -SootopolisCity_House4_MapAttributes:: @ 82FECC0 -SootopolisCity_House7_MapAttributes:: @ 82FECC0 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House1_MapBorder - .4byte SootopolisCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SootopolisCity_House2_MapBorder:: @ 82FECD8 - .incbin "data/maps/SootopolisCity_House2/border.bin" - -SootopolisCity_House2_MapBlockdata:: @ 82FECE0 - .incbin "data/maps/SootopolisCity_House2/map.bin" - - .align 2 -SootopolisCity_House2_MapAttributes:: @ 82FED50 -SootopolisCity_House5_MapAttributes:: @ 82FED50 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House2_MapBorder - .4byte SootopolisCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SootopolisCity_House3_MapBorder:: @ 82FED68 - .incbin "data/maps/SootopolisCity_House3/border.bin" - -SootopolisCity_House3_MapBlockdata:: @ 82FED70 - .incbin "data/maps/SootopolisCity_House3/map.bin" - - .align 2 -SootopolisCity_House3_MapAttributes:: @ 82FEDE0 -SootopolisCity_House6_MapAttributes:: @ 82FEDE0 - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House3_MapBorder - .4byte SootopolisCity_House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8 - .incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin" - -AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00 - .incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_MapAttributes:: @ 82FF328 - .4byte 0x2c - .4byte 0xf - .4byte AbandonedShip_HiddenFloorRooms_MapBorder - .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Ship - -ScorchedSlab_MapBorder:: @ 82FF340 - .incbin "data/maps/ScorchedSlab/border.bin" - -ScorchedSlab_MapBlockdata:: @ 82FF348 - .incbin "data/maps/ScorchedSlab/map.bin" - - .align 2 -ScorchedSlab_MapAttributes:: @ 82FF5A0 - .4byte 0xf - .4byte 0x14 - .4byte ScorchedSlab_MapBorder - .4byte ScorchedSlab_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -UnknownMapBorder_082FF894: - .incbin "data/maps/UnknownMap_082FF894/border.bin" - -UnknownMapBlockdata_082FF894: - .incbin "data/maps/UnknownMap_082FF894/map.bin" - - .align 2 -UnknownMapAttributes_082FF894: - .4byte 0x13 - .4byte 0x13 - .4byte UnknownMapBorder_082FF894 - .4byte UnknownMapBlockdata_082FF894 - .4byte gTileset_General - .4byte gTileset_Cave - -RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC - .incbin "data/maps/RustboroCity_Flat1_1F/border.bin" - -RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4 - .incbin "data/maps/RustboroCity_Flat1_1F/map.bin" - - .align 2 -RustboroCity_Flat1_1F_MapAttributes:: @ 82FF994 - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_1F_MapBorder - .4byte RustboroCity_Flat1_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC - .incbin "data/maps/RustboroCity_Flat1_2F/border.bin" - -RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4 - .incbin "data/maps/RustboroCity_Flat1_2F/map.bin" - - .align 2 -RustboroCity_Flat1_2F_MapAttributes:: @ 82FFA94 - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_2F_MapBorder - .4byte RustboroCity_Flat1_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC - .incbin "data/maps/EverGrandeCity_Corridor4/border.bin" - -EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4 - .incbin "data/maps/EverGrandeCity_Corridor4/map.bin" - - .align 2 -EverGrandeCity_Corridor4_MapAttributes:: @ 82FFDA0 - .4byte 0xb - .4byte 0x22 - .4byte EverGrandeCity_Corridor4_MapBorder - .4byte EverGrandeCity_Corridor4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - -MagmaHideout_1F_MapBorder:: @ 82FFDB8 - .incbin "data/maps/MagmaHideout_1F/border.bin" - -MagmaHideout_1F_MapBlockdata:: @ 82FFDC0 - .incbin "data/maps/MagmaHideout_1F/map.bin" - - .align 2 -MagmaHideout_1F_MapAttributes:: @ 8300450 - .4byte 0x1c - .4byte 0x1e - .4byte MagmaHideout_1F_MapBorder - .4byte MagmaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MagmaHideout_B1F_MapBorder:: @ 8300468 - .incbin "data/maps/MagmaHideout_B1F/border.bin" - -MagmaHideout_B1F_MapBlockdata:: @ 8300470 - .incbin "data/maps/MagmaHideout_B1F/map.bin" - - .align 2 -MagmaHideout_B1F_MapAttributes:: @ 8301010 - .4byte 0x3e - .4byte 0x18 - .4byte MagmaHideout_B1F_MapBorder - .4byte MagmaHideout_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -MagmaHideout_B2F_MapBorder:: @ 8301028 - .incbin "data/maps/MagmaHideout_B2F/border.bin" - -MagmaHideout_B2F_MapBlockdata:: @ 8301030 - .incbin "data/maps/MagmaHideout_B2F/map.bin" - - .align 2 -MagmaHideout_B2F_MapAttributes:: @ 8301690 - .4byte 0x22 - .4byte 0x18 - .4byte MagmaHideout_B2F_MapBorder - .4byte MagmaHideout_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - -UnknownMapBorder_08302970: - .incbin "data/maps/UnknownMap_08302970/border.bin" - -UnknownMapBlockdata_08302970: - .incbin "data/maps/UnknownMap_08302970/map.bin" - - .align 2 -UnknownMapAttributes_08302970: - .4byte 0x3C - .4byte 0x28 - .4byte UnknownMapBorder_08302970 - .4byte UnknownMapBlockdata_08302970 - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_Entrance_MapBorder:: @ 8302988 - .incbin "data/maps/SkyPillar_Entrance/border.bin" - -SkyPillar_Entrance_MapBlockdata:: @ 8302990 - .incbin "data/maps/SkyPillar_Entrance/map.bin" - - .align 2 -SkyPillar_Entrance_MapAttributes:: @ 8302C18 - .4byte 0x12 - .4byte 0x12 - .4byte SkyPillar_Entrance_MapBorder - .4byte SkyPillar_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SkyPillar_Outside_MapBorder:: @ 8302C30 - .incbin "data/maps/SkyPillar_Outside/border.bin" - -SkyPillar_Outside_MapBlockdata:: @ 8302C38 - .incbin "data/maps/SkyPillar_Outside/map.bin" - - .align 2 -SkyPillar_Outside_MapAttributes:: @ 8303140 - .4byte 0x1c - .4byte 0x17 - .4byte SkyPillar_Outside_MapBorder - .4byte SkyPillar_Outside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_1F_MapBorder:: @ 8303158 - .incbin "data/maps/SkyPillar_1F/border.bin" - -SkyPillar_1F_MapBlockdata:: @ 8303160 - .incbin "data/maps/SkyPillar_1F/map.bin" - - .align 2 -SkyPillar_1F_MapAttributes:: @ 83032E8 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_1F_MapBorder - .4byte SkyPillar_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_2F_MapBorder:: @ 8303300 - .incbin "data/maps/SkyPillar_2F/border.bin" - -SkyPillar_2F_MapBlockdata:: @ 8303308 - .incbin "data/maps/SkyPillar_2F/map.bin" - - .align 2 -SkyPillar_2F_MapAttributes:: @ 8303490 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_2F_MapBorder - .4byte SkyPillar_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_3F_MapBorder:: @ 83034A8 - .incbin "data/maps/SkyPillar_3F/border.bin" - -SkyPillar_3F_MapBlockdata:: @ 83034B0 - .incbin "data/maps/SkyPillar_3F/map.bin" - - .align 2 -SkyPillar_3F_MapAttributes:: @ 8303638 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_3F_MapBorder - .4byte SkyPillar_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_4F_MapBorder:: @ 8303650 - .incbin "data/maps/SkyPillar_4F/border.bin" - -SkyPillar_4F_MapBlockdata:: @ 8303658 - .incbin "data/maps/SkyPillar_4F/map.bin" - - .align 2 -SkyPillar_4F_MapAttributes:: @ 83037E0 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_4F_MapBorder - .4byte SkyPillar_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -UnknownMapBorder_083041B4: - .incbin "data/maps/UnknownMap_083041B4/border.bin" - -UnknownMapBlockdata_083041B4: - .incbin "data/maps/UnknownMap_083041B4/map.bin" - - .align 2 -UnknownMapAttributes_083041B4: - .4byte 0x1B - .4byte 0x2E - .4byte UnknownMapBorder_083041B4 - .4byte UnknownMapBlockdata_083041B4 - .4byte gTileset_General - .4byte gTileset_Cave - -MossdeepCity_StevensHouse_MapBorder:: @ 83041CC - .incbin "data/maps/MossdeepCity_StevensHouse/border.bin" - -MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4 - .incbin "data/maps/MossdeepCity_StevensHouse/map.bin" - - .align 2 -MossdeepCity_StevensHouse_MapAttributes:: @ 8304284 - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_StevensHouse_MapBorder - .4byte MossdeepCity_StevensHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C - .incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin" - -ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4 - .incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin" - - .align 2 -ShoalCave_LowTideIceRoom_MapAttributes:: @ 8304754 - .4byte 0x14 - .4byte 0x1e - .4byte ShoalCave_LowTideIceRoom_MapBorder - .4byte ShoalCave_LowTideIceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - -SafariZone_RestHouse_MapBorder:: @ 830476C - .incbin "data/maps/SafariZone_RestHouse/border.bin" - -SafariZone_RestHouse_MapBlockdata:: @ 8304774 - .incbin "data/maps/SafariZone_RestHouse/map.bin" - - .align 2 -SafariZone_RestHouse_MapAttributes:: @ 8304828 - .4byte 0xa - .4byte 0x9 - .4byte SafariZone_RestHouse_MapBorder - .4byte SafariZone_RestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - -SkyPillar_5F_MapBorder:: @ 8304840 - .incbin "data/maps/SkyPillar_5F/border.bin" - -SkyPillar_5F_MapBlockdata:: @ 8304848 - .incbin "data/maps/SkyPillar_5F/map.bin" - - .align 2 -SkyPillar_5F_MapAttributes:: @ 83049D0 - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_5F_MapBorder - .4byte SkyPillar_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - -SkyPillar_Top_MapBorder:: @ 83049E8 - .incbin "data/maps/SkyPillar_Top/border.bin" - -SkyPillar_Top_MapBlockdata:: @ 83049F0 - .incbin "data/maps/SkyPillar_Top/map.bin" - - .align 2 -SkyPillar_Top_MapAttributes:: @ 8304F00 - .4byte 0x1b - .4byte 0x18 - .4byte SkyPillar_Top_MapBorder - .4byte SkyPillar_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog + .include "data/layouts/PetalburgCity/layout.inc" + .include "data/layouts/SlateportCity/layout.inc" + .include "data/layouts/MauvilleCity/layout.inc" + .include "data/layouts/RustboroCity/layout.inc" + .include "data/layouts/FortreeCity/layout.inc" + .include "data/layouts/LilycoveCity/layout.inc" + .include "data/layouts/MossdeepCity/layout.inc" + .include "data/layouts/SootopolisCity/layout.inc" + .include "data/layouts/EverGrandeCity/layout.inc" + .include "data/layouts/LittlerootTown/layout.inc" + .include "data/layouts/OldaleTown/layout.inc" + .include "data/layouts/DewfordTown/layout.inc" + .include "data/layouts/LavaridgeTown/layout.inc" + .include "data/layouts/FallarborTown/layout.inc" + .include "data/layouts/VerdanturfTown/layout.inc" + .include "data/layouts/PacifidlogTown/layout.inc" + .include "data/layouts/Route101/layout.inc" + .include "data/layouts/Route102/layout.inc" + .include "data/layouts/Route103/layout.inc" + .include "data/layouts/Route104/layout.inc" + .include "data/layouts/Route105/layout.inc" + .include "data/layouts/Route106/layout.inc" + .include "data/layouts/Route107/layout.inc" + .include "data/layouts/Route108/layout.inc" + .include "data/layouts/Route109/layout.inc" + .include "data/layouts/Route110/layout.inc" + .include "data/layouts/Route111/layout.inc" + .include "data/layouts/Route112/layout.inc" + .include "data/layouts/Route113/layout.inc" + .include "data/layouts/Route114/layout.inc" + .include "data/layouts/Route115/layout.inc" + .include "data/layouts/Route116/layout.inc" + .include "data/layouts/Route117/layout.inc" + .include "data/layouts/Route118/layout.inc" + .include "data/layouts/Route119/layout.inc" + .include "data/layouts/Route120/layout.inc" + .include "data/layouts/Route121/layout.inc" + .include "data/layouts/Route122/layout.inc" + .include "data/layouts/Route123/layout.inc" + .include "data/layouts/Route124/layout.inc" + .include "data/layouts/Route125/layout.inc" + .include "data/layouts/Route126/layout.inc" + .include "data/layouts/Route127/layout.inc" + .include "data/layouts/Route128/layout.inc" + .include "data/layouts/Route129/layout.inc" + .include "data/layouts/UnreferencedMap/layout.inc" + .include "data/layouts/Route131/layout.inc" + .include "data/layouts/Route132/layout.inc" + .include "data/layouts/Route133/layout.inc" + .include "data/layouts/Route134/layout.inc" + .include "data/layouts/Underwater2/layout.inc" + .include "data/layouts/Underwater3/layout.inc" + .include "data/layouts/Underwater4/layout.inc" + .include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc" + .include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc" + .include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc" + .include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc" + .include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc" + .include "data/layouts/House1/layout.inc" + .include "data/layouts/House2/layout.inc" + .include "data/layouts/PokemonCenter_1F/layout.inc" + .include "data/layouts/PokemonCenter_2F/layout.inc" + .include "data/layouts/PokeMart/layout.inc" + .include "data/layouts/House3/layout.inc" + .include "data/layouts/DewfordTown_Gym/layout.inc" + .include "data/layouts/DewfordTown_Hall/layout.inc" + .include "data/layouts/House4/layout.inc" + .include "data/layouts/LavaridgeTown_HerbShop/layout.inc" + .include "data/layouts/LavaridgeTown_Gym_1F/layout.inc" + .include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc" + .include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc" + .include "data/layouts/ContestLobby/layout.inc" + .include "data/layouts/ContestHall/layout.inc" + .include "data/layouts/LilycoveCity_House2/layout.inc" + .include "data/layouts/UnknownMap_082CF564/layout.inc" + .include "data/layouts/VerdanturfTown_WandasHouse/layout.inc" + .include "data/layouts/PacifidlogTown_House1/layout.inc" + .include "data/layouts/PacifidlogTown_House2/layout.inc" + .include "data/layouts/PetalburgCity_Gym/layout.inc" + .include "data/layouts/HouseWithBed/layout.inc" + .include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc" + .include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc" + .include "data/layouts/UnknownMap_082D05D8/layout.inc" + .include "data/layouts/UnknownMap_082D05FC/layout.inc" + .include "data/layouts/SlateportCity_PokemonFanClub/layout.inc" + .include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc" + .include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc" + .include "data/layouts/Harbor/layout.inc" + .include "data/layouts/MauvilleCity_Gym/layout.inc" + .include "data/layouts/MauvilleCity_BikeShop/layout.inc" + .include "data/layouts/MauvilleCity_GameCorner/layout.inc" + .include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc" + .include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc" + .include "data/layouts/RustboroCity_Gym/layout.inc" + .include "data/layouts/RustboroCity_PokemonSchool/layout.inc" + .include "data/layouts/RustboroCity_House/layout.inc" + .include "data/layouts/RustboroCity_House1/layout.inc" + .include "data/layouts/RustboroCity_CuttersHouse/layout.inc" + .include "data/layouts/FortreeCity_House1/layout.inc" + .include "data/layouts/FortreeCity_Gym/layout.inc" + .include "data/layouts/FortreeCity_House2/layout.inc" + .include "data/layouts/Route104_MrBrineysHouse/layout.inc" + .include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc" + .include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc" + .include "data/layouts/LilycoveCity_ContestLobby/layout.inc" + .include "data/layouts/LilycoveCity_ContestHall/layout.inc" + .include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc" + .include "data/layouts/LilycoveCity_EmptyMap/layout.inc" + .include "data/layouts/MossdeepCity_Gym/layout.inc" + .include "data/layouts/SootopolisCity_Gym_1F/layout.inc" + .include "data/layouts/SootopolisCity_Gym_B1F/layout.inc" + .include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc" + .include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc" + .include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc" + .include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc" + .include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc" + .include "data/layouts/EverGrandeCity_ShortCorridor/layout.inc" + .include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc" + .include "data/layouts/CableCarStation/layout.inc" + .include "data/layouts/Route114_FossilManiacsHouse/layout.inc" + .include "data/layouts/Route114_FossilManiacsTunnel/layout.inc" + .include "data/layouts/Route114_LanettesHouse/layout.inc" + .include "data/layouts/Route116_TunnelersRestHouse/layout.inc" + .include "data/layouts/Route117_PokemonDayCare/layout.inc" + .include "data/layouts/Route121_SafariZoneEntrance/layout.inc" + .include "data/layouts/MeteorFalls_1F_1R/layout.inc" + .include "data/layouts/MeteorFalls_1F_2R/layout.inc" + .include "data/layouts/MeteorFalls_B1F_1R/layout.inc" + .include "data/layouts/MeteorFalls_B1F_2R/layout.inc" + .include "data/layouts/RusturfTunnel/layout.inc" + .include "data/layouts/Underwater_SootopolisCity/layout.inc" + .include "data/layouts/DesertRuins/layout.inc" + .include "data/layouts/GraniteCave_1F/layout.inc" + .include "data/layouts/GraniteCave_B1F/layout.inc" + .include "data/layouts/GraniteCave_B2F/layout.inc" + .include "data/layouts/PetalburgWoods/layout.inc" + .include "data/layouts/MtChimney/layout.inc" + .include "data/layouts/MtPyre_1F/layout.inc" + .include "data/layouts/MtPyre_2F/layout.inc" + .include "data/layouts/MtPyre_3F/layout.inc" + .include "data/layouts/MtPyre_4F/layout.inc" + .include "data/layouts/MtPyre_5F/layout.inc" + .include "data/layouts/MtPyre_6F/layout.inc" + .include "data/layouts/AquaHideout_1F/layout.inc" + .include "data/layouts/AquaHideout_B1F/layout.inc" + .include "data/layouts/AquaHideout_B2F/layout.inc" + .include "data/layouts/Underwater_SeafloorCavern/layout.inc" + .include "data/layouts/SeafloorCavern_Entrance/layout.inc" + .include "data/layouts/SeafloorCavern_Room1/layout.inc" + .include "data/layouts/SeafloorCavern_Room2/layout.inc" + .include "data/layouts/SeafloorCavern_Room3/layout.inc" + .include "data/layouts/SeafloorCavern_Room4/layout.inc" + .include "data/layouts/SeafloorCavern_Room5/layout.inc" + .include "data/layouts/SeafloorCavern_Room6/layout.inc" + .include "data/layouts/SeafloorCavern_Room7/layout.inc" + .include "data/layouts/SeafloorCavern_Room8/layout.inc" + .include "data/layouts/SeafloorCavern_Room9/layout.inc" + .include "data/layouts/CaveOfOrigin_Entrance/layout.inc" + .include "data/layouts/CaveOfOrigin_1F/layout.inc" + .include "data/layouts/CaveOfOrigin_B1F/layout.inc" + .include "data/layouts/CaveOfOrigin_B2F/layout.inc" + .include "data/layouts/CaveOfOrigin_B3F/layout.inc" + .include "data/layouts/CaveOfOrigin_B4F/layout.inc" + .include "data/layouts/VictoryRoad_1F/layout.inc" + .include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc" + .include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc" + .include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc" + .include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc" + .include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc" + .include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc" + .include "data/layouts/UnknownMap_082E55C8/layout.inc" + .include "data/layouts/UnknownMap_082E55EC/layout.inc" + .include "data/layouts/UnknownMap_082E5610/layout.inc" + .include "data/layouts/UnknownMap_082E5634/layout.inc" + .include "data/layouts/UnknownMap_082E5658/layout.inc" + .include "data/layouts/UnknownMap_082E567C/layout.inc" + .include "data/layouts/UnknownMap_082E56A0/layout.inc" + .include "data/layouts/UnknownMap_082E56C4/layout.inc" + .include "data/layouts/UnknownMap_082E56E8/layout.inc" + .include "data/layouts/UnknownMap_082E570C/layout.inc" + .include "data/layouts/UnknownMap_082E5730/layout.inc" + .include "data/layouts/UnknownMap_082E5754/layout.inc" + .include "data/layouts/UnknownMap_082E5778/layout.inc" + .include "data/layouts/UnknownMap_082E579C/layout.inc" + .include "data/layouts/NewMauville_Entrance/layout.inc" + .include "data/layouts/NewMauville_Inside/layout.inc" + .include "data/layouts/AbandonedShip_Deck/layout.inc" + .include "data/layouts/AbandonedShip_Corridors_1F/layout.inc" + .include "data/layouts/AbandonedShip_Rooms_1F/layout.inc" + .include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc" + .include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc" + .include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc" + .include "data/layouts/AbandonedShip_Underwater1/layout.inc" + .include "data/layouts/AbandonedShip_Room_B1F/layout.inc" + .include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc" + .include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc" + .include "data/layouts/AbandonedShip_Underwater2/layout.inc" + .include "data/layouts/SecretBase_RedCave1/layout.inc" + .include "data/layouts/SecretBase_BrownCave1/layout.inc" + .include "data/layouts/SecretBase_BlueCave1/layout.inc" + .include "data/layouts/SecretBase_YellowCave1/layout.inc" + .include "data/layouts/SecretBase_Tree1/layout.inc" + .include "data/layouts/SecretBase_Shrub1/layout.inc" + .include "data/layouts/SecretBase_RedCave2/layout.inc" + .include "data/layouts/SecretBase_BrownCave2/layout.inc" + .include "data/layouts/SecretBase_BlueCave2/layout.inc" + .include "data/layouts/SecretBase_YellowCave2/layout.inc" + .include "data/layouts/SecretBase_Tree2/layout.inc" + .include "data/layouts/SecretBase_Shrub2/layout.inc" + .include "data/layouts/SecretBase_RedCave3/layout.inc" + .include "data/layouts/SecretBase_BrownCave3/layout.inc" + .include "data/layouts/SecretBase_BlueCave3/layout.inc" + .include "data/layouts/SecretBase_YellowCave3/layout.inc" + .include "data/layouts/SecretBase_Tree3/layout.inc" + .include "data/layouts/SecretBase_Shrub3/layout.inc" + .include "data/layouts/SecretBase_RedCave4/layout.inc" + .include "data/layouts/SecretBase_BrownCave4/layout.inc" + .include "data/layouts/SecretBase_BlueCave4/layout.inc" + .include "data/layouts/SecretBase_YellowCave4/layout.inc" + .include "data/layouts/SecretBase_Tree4/layout.inc" + .include "data/layouts/SecretBase_Shrub4/layout.inc" + .include "data/layouts/SingleBattleColosseum/layout.inc" + .include "data/layouts/TradeCenter/layout.inc" + .include "data/layouts/RecordCorner/layout.inc" + .include "data/layouts/DoubleBattleColosseum/layout.inc" + .include "data/layouts/LinkContestRoom1/layout.inc" + .include "data/layouts/UnknownMap_25_29/layout.inc" + .include "data/layouts/UnknownMap_25_30/layout.inc" + .include "data/layouts/UnknownMap_25_31/layout.inc" + .include "data/layouts/UnknownMap_25_32/layout.inc" + .include "data/layouts/UnknownMap_25_33/layout.inc" + .include "data/layouts/UnknownMap_25_34/layout.inc" + .include "data/layouts/LinkContestRoom2/layout.inc" + .include "data/layouts/LinkContestRoom3/layout.inc" + .include "data/layouts/LinkContestRoom4/layout.inc" + .include "data/layouts/LinkContestRoom5/layout.inc" + .include "data/layouts/LinkContestRoom6/layout.inc" + .include "data/layouts/InsideOfTruck/layout.inc" + .include "data/layouts/SafariZone_Northwest/layout.inc" + .include "data/layouts/SafariZone_Northeast/layout.inc" + .include "data/layouts/SafariZone_Southwest/layout.inc" + .include "data/layouts/SafariZone_Southeast/layout.inc" + .include "data/layouts/UnknownMap_082EDF30/layout.inc" + .include "data/layouts/Route109_SeashoreHouse/layout.inc" + .include "data/layouts/Route110_TrickHouseEntrance/layout.inc" + .include "data/layouts/Route110_TrickHouseEnd/layout.inc" + .include "data/layouts/Route110_TrickHouseCorridor/layout.inc" + .include "data/layouts/Route110_TrickHousePuzzle1/layout.inc" + .include "data/layouts/Route110_TrickHousePuzzle2/layout.inc" + .include "data/layouts/Route110_TrickHousePuzzle3/layout.inc" + .include "data/layouts/Route110_TrickHousePuzzle4/layout.inc" + .include "data/layouts/Route110_TrickHousePuzzle5/layout.inc" + .include "data/layouts/Route110_TrickHousePuzzle6/layout.inc" + .include "data/layouts/Route110_TrickHousePuzzle7/layout.inc" + .include "data/layouts/Route110_TrickHousePuzzle8/layout.inc" + .include "data/layouts/FortreeCity_DecorationShop/layout.inc" + .include "data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc" + .include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc" + .include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc" + .include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc" + .include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc" + .include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc" + .include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc" + .include "data/layouts/Route130/layout.inc" + .include "data/layouts/BattleTower_Lobby/layout.inc" + .include "data/layouts/BattleTower_Outside/layout.inc" + .include "data/layouts/BattleTower_Elevator/layout.inc" + .include "data/layouts/BattleTower_Corridor/layout.inc" + .include "data/layouts/BattleTower_BattleRoom/layout.inc" + .include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc" + .include "data/layouts/EverGrandeCity_PokemonLeague/layout.inc" + .include "data/layouts/Route119_WeatherInstitute_1F/layout.inc" + .include "data/layouts/Route119_WeatherInstitute_2F/layout.inc" + .include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc" + .include "data/layouts/Underwater1/layout.inc" + .include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc" + .include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc" + .include "data/layouts/SSTidalCorridor/layout.inc" + .include "data/layouts/SSTidalLowerDeck/layout.inc" + .include "data/layouts/SSTidalRooms/layout.inc" + .include "data/layouts/IslandCave/layout.inc" + .include "data/layouts/AncientTomb/layout.inc" + .include "data/layouts/Underwater_Route134/layout.inc" + .include "data/layouts/Underwater_SealedChamber/layout.inc" + .include "data/layouts/SealedChamber_OuterRoom/layout.inc" + .include "data/layouts/VictoryRoad_B1F/layout.inc" + .include "data/layouts/VictoryRoad_B2F/layout.inc" + .include "data/layouts/Route104_Prototype/layout.inc" + .include "data/layouts/GraniteCave_StevensRoom/layout.inc" + .include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc" + .include "data/layouts/SouthernIsland_Exterior/layout.inc" + .include "data/layouts/SouthernIsland_Interior/layout.inc" + .include "data/layouts/JaggedPass/layout.inc" + .include "data/layouts/FieryPath/layout.inc" + .include "data/layouts/RustboroCity_Flat2_1F/layout.inc" + .include "data/layouts/RustboroCity_Flat2_2F/layout.inc" + .include "data/layouts/RustboroCity_Flat2_3F/layout.inc" + .include "data/layouts/SootopolisCity_House8/layout.inc" + .include "data/layouts/EverGrandeCity_HallOfFame/layout.inc" + .include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc" + .include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc" + .include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc" + .include "data/layouts/MtPyre_Exterior/layout.inc" + .include "data/layouts/MtPyre_Summit/layout.inc" + .include "data/layouts/SealedChamber_InnerRoom/layout.inc" + .include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc" + .include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc" + .include "data/layouts/SootopolisCity_House1/layout.inc" + .include "data/layouts/SootopolisCity_House2/layout.inc" + .include "data/layouts/SootopolisCity_House3/layout.inc" + .include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc" + .include "data/layouts/ScorchedSlab/layout.inc" + .include "data/layouts/UnknownMap_082FF894/layout.inc" + .include "data/layouts/RustboroCity_Flat1_1F/layout.inc" + .include "data/layouts/RustboroCity_Flat1_2F/layout.inc" + .include "data/layouts/EverGrandeCity_Corridor4/layout.inc" + .include "data/layouts/MagmaHideout_1F/layout.inc" + .include "data/layouts/MagmaHideout_B1F/layout.inc" + .include "data/layouts/MagmaHideout_B2F/layout.inc" + .include "data/layouts/UnknownMap_08302970/layout.inc" + .include "data/layouts/SkyPillar_Entrance/layout.inc" + .include "data/layouts/SkyPillar_Outside/layout.inc" + .include "data/layouts/SkyPillar_1F/layout.inc" + .include "data/layouts/SkyPillar_2F/layout.inc" + .include "data/layouts/SkyPillar_3F/layout.inc" + .include "data/layouts/SkyPillar_4F/layout.inc" + .include "data/layouts/UnknownMap_083041B4/layout.inc" + .include "data/layouts/MossdeepCity_StevensHouse/layout.inc" + .include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc" + .include "data/layouts/SafariZone_RestHouse/layout.inc" + .include "data/layouts/SkyPillar_5F/layout.inc" + .include "data/layouts/SkyPillar_Top/layout.inc" diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc index 241efb9a6..b1a15d7ef 100644 --- a/data/maps/attributes_table.inc +++ b/data/maps/attributes_table.inc @@ -1,334 +1,334 @@ .align 2 gMapAttributes:: @ 8304F18 - .4byte PetalburgCity_MapAttributes - .4byte SlateportCity_MapAttributes - .4byte MauvilleCity_MapAttributes - .4byte RustboroCity_MapAttributes - .4byte FortreeCity_MapAttributes - .4byte LilycoveCity_MapAttributes - .4byte MossdeepCity_MapAttributes - .4byte SootopolisCity_MapAttributes - .4byte EverGrandeCity_MapAttributes - .4byte LittlerootTown_MapAttributes - .4byte OldaleTown_MapAttributes - .4byte DewfordTown_MapAttributes - .4byte LavaridgeTown_MapAttributes - .4byte FallarborTown_MapAttributes - .4byte VerdanturfTown_MapAttributes - .4byte PacifidlogTown_MapAttributes - .4byte Route101_MapAttributes - .4byte Route102_MapAttributes - .4byte Route103_MapAttributes - .4byte Route104_MapAttributes - .4byte Route105_MapAttributes - .4byte Route106_MapAttributes - .4byte Route107_MapAttributes - .4byte Route108_MapAttributes - .4byte Route109_MapAttributes - .4byte Route110_MapAttributes - .4byte Route111_MapAttributes - .4byte Route112_MapAttributes - .4byte Route113_MapAttributes - .4byte Route114_MapAttributes - .4byte Route115_MapAttributes - .4byte Route116_MapAttributes - .4byte Route117_MapAttributes - .4byte Route118_MapAttributes - .4byte Route119_MapAttributes - .4byte Route120_MapAttributes - .4byte Route121_MapAttributes - .4byte Route122_MapAttributes - .4byte Route123_MapAttributes - .4byte Route124_MapAttributes - .4byte Route125_MapAttributes - .4byte Route126_MapAttributes - .4byte Route127_MapAttributes - .4byte Route128_MapAttributes - .4byte Route129_MapAttributes - .4byte UnreferencedMap_MapAttributes - .4byte Route131_MapAttributes - .4byte Route132_MapAttributes - .4byte Route133_MapAttributes - .4byte Route134_MapAttributes - .4byte Underwater2_MapAttributes - .4byte Underwater3_MapAttributes - .4byte Underwater4_MapAttributes - .4byte LittlerootTown_BrendansHouse_1F_MapAttributes - .4byte LittlerootTown_BrendansHouse_2F_MapAttributes - .4byte LittlerootTown_MaysHouse_1F_MapAttributes - .4byte LittlerootTown_MaysHouse_2F_MapAttributes - .4byte LittlerootTown_ProfessorBirchsLab_MapAttributes - .4byte House11_MapAttributes - .4byte House12_MapAttributes - .4byte PokemonCenter_1F_MapAttributes - .4byte PokemonCenter_2F_MapAttributes - .4byte PokeMart_MapAttributes - .4byte DewfordTown_House1_MapAttributes - .4byte DewfordTown_Gym_MapAttributes - .4byte DewfordTown_Hall_MapAttributes - .4byte DewfordTown_House2_MapAttributes - .4byte LavaridgeTown_HerbShop_MapAttributes - .4byte LavaridgeTown_Gym_1F_MapAttributes - .4byte LavaridgeTown_Gym_B1F_MapAttributes - .4byte LavaridgeTown_PokemonCenter_1F_MapAttributes - .4byte FallarborTown_ContestLobby_MapAttributes - .4byte FallarborTown_ContestHall_MapAttributes - .4byte LilycoveCity_House2_MapAttributes - .4byte UnknownMapAttributes_082CF564 - .4byte VerdanturfTown_WandasHouse_MapAttributes - .4byte PacifidlogTown_House1_MapAttributes - .4byte PacifidlogTown_House2_MapAttributes - .4byte PetalburgCity_Gym_MapAttributes - .4byte MossdeepCity_House4_MapAttributes - .4byte SlateportCity_SternsShipyard_1F_MapAttributes - .4byte SlateportCity_SternsShipyard_2F_MapAttributes - .4byte UnknownMapAttributes_082D05D8 - .4byte UnknownMapAttributes_082D05FC - .4byte SlateportCity_PokemonFanClub_MapAttributes - .4byte SlateportCity_OceanicMuseum_1F_MapAttributes - .4byte SlateportCity_OceanicMuseum_2F_MapAttributes - .4byte LilycoveCity_Harbor_MapAttributes - .4byte MauvilleCity_Gym_MapAttributes - .4byte MauvilleCity_BikeShop_MapAttributes - .4byte MauvilleCity_GameCorner_MapAttributes - .4byte RustboroCity_DevonCorp_1F_MapAttributes - .4byte RustboroCity_DevonCorp_2F_MapAttributes - .4byte RustboroCity_Gym_MapAttributes - .4byte RustboroCity_PokemonSchool_MapAttributes - .4byte RustboroCity_House2_MapAttributes - .4byte RustboroCity_House1_MapAttributes - .4byte RustboroCity_CuttersHouse_MapAttributes - .4byte FortreeCity_House1_MapAttributes - .4byte FortreeCity_Gym_MapAttributes - .4byte FortreeCity_House2_MapAttributes - .4byte Route104_MrBrineysHouse_MapAttributes - .4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes - .4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes - .4byte LilycoveCity_ContestLobby_MapAttributes - .4byte LilycoveCity_ContestHall_MapAttributes - .4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes - .4byte LilycoveCity_EmptyMap_MapAttributes - .4byte MossdeepCity_Gym_MapAttributes - .4byte SootopolisCity_Gym_1F_MapAttributes - .4byte SootopolisCity_Gym_B1F_MapAttributes - .4byte EverGrandeCity_SidneysRoom_MapAttributes - .4byte EverGrandeCity_PhoebesRoom_MapAttributes - .4byte EverGrandeCity_GlaciasRoom_MapAttributes - .4byte EverGrandeCity_DrakesRoom_MapAttributes - .4byte EverGrandeCity_ChampionsRoom_MapAttributes - .4byte EverGrandeCity_Corridor1_MapAttributes - .4byte Route104_PrettyPetalFlowerShop_MapAttributes - .4byte Route112_CableCarStation_MapAttributes - .4byte Route114_FossilManiacsHouse_MapAttributes - .4byte Route114_FossilManiacsTunnel_MapAttributes - .4byte Route114_LanettesHouse_MapAttributes - .4byte Route116_TunnelersRestHouse_MapAttributes - .4byte Route117_PokemonDayCare_MapAttributes - .4byte Route121_SafariZoneEntrance_MapAttributes - .4byte MeteorFalls_1F_1R_MapAttributes - .4byte MeteorFalls_1F_2R_MapAttributes - .4byte MeteorFalls_B1F_1R_MapAttributes - .4byte MeteorFalls_B1F_2R_MapAttributes - .4byte RusturfTunnel_MapAttributes - .4byte Underwater_SootopolisCity_MapAttributes - .4byte DesertRuins_MapAttributes - .4byte GraniteCave_1F_MapAttributes - .4byte GraniteCave_B1F_MapAttributes - .4byte GraniteCave_B2F_MapAttributes - .4byte PetalburgWoods_MapAttributes - .4byte MtChimney_MapAttributes - .4byte MtPyre_1F_MapAttributes - .4byte MtPyre_2F_MapAttributes - .4byte MtPyre_3F_MapAttributes - .4byte MtPyre_4F_MapAttributes - .4byte MtPyre_5F_MapAttributes - .4byte MtPyre_6F_MapAttributes - .4byte AquaHideout_1F_MapAttributes - .4byte AquaHideout_B1F_MapAttributes - .4byte AquaHideout_B2F_MapAttributes - .4byte Underwater_SeafloorCavern_MapAttributes - .4byte SeafloorCavern_Entrance_MapAttributes - .4byte SeafloorCavern_Room1_MapAttributes - .4byte SeafloorCavern_Room2_MapAttributes - .4byte SeafloorCavern_Room3_MapAttributes - .4byte SeafloorCavern_Room4_MapAttributes - .4byte SeafloorCavern_Room5_MapAttributes - .4byte SeafloorCavern_Room6_MapAttributes - .4byte SeafloorCavern_Room7_MapAttributes - .4byte SeafloorCavern_Room8_MapAttributes - .4byte SeafloorCavern_Room9_MapAttributes - .4byte CaveOfOrigin_Entrance_MapAttributes - .4byte CaveOfOrigin_1F_MapAttributes - .4byte CaveOfOrigin_B1F_MapAttributes - .4byte CaveOfOrigin_B2F_MapAttributes - .4byte CaveOfOrigin_B3F_MapAttributes - .4byte CaveOfOrigin_B4F_MapAttributes - .4byte VictoryRoad_1F_MapAttributes - .4byte ShoalCave_LowTideEntranceRoom_MapAttributes - .4byte ShoalCave_LowTideInnerRoom_MapAttributes - .4byte ShoalCave_LowTideStairsRoom_MapAttributes - .4byte ShoalCave_LowTideLowerRoom_MapAttributes - .4byte ShoalCave_HighTideEntranceRoom_MapAttributes - .4byte ShoalCave_HighTideInnerRoom_MapAttributes - .4byte UnknownMapAttributes_082E55C8 @ unused maps - .4byte UnknownMapAttributes_082E55EC - .4byte UnknownMapAttributes_082E5610 - .4byte UnknownMapAttributes_082E5634 - .4byte UnknownMapAttributes_082E5658 - .4byte UnknownMapAttributes_082E567C - .4byte UnknownMapAttributes_082E56A0 - .4byte UnknownMapAttributes_082E56C4 - .4byte UnknownMapAttributes_082E56E8 - .4byte UnknownMapAttributes_082E570C - .4byte UnknownMapAttributes_082E5730 - .4byte UnknownMapAttributes_082E5754 - .4byte UnknownMapAttributes_082E5778 - .4byte UnknownMapAttributes_082E579C - .4byte NewMauville_Entrance_MapAttributes - .4byte NewMauville_Inside_MapAttributes - .4byte AbandonedShip_Deck_MapAttributes - .4byte AbandonedShip_Corridors_1F_MapAttributes - .4byte AbandonedShip_Rooms_1F_MapAttributes - .4byte AbandonedShip_Corridors_B1F_MapAttributes - .4byte AbandonedShip_Rooms_B1F_MapAttributes - .4byte AbandonedShip_Rooms2_B1F_MapAttributes - .4byte AbandonedShip_Underwater1_MapAttributes - .4byte AbandonedShip_Room_B1F_MapAttributes - .4byte AbandonedShip_Rooms2_1F_MapAttributes - .4byte AbandonedShip_CaptainsOffice_MapAttributes - .4byte AbandonedShip_Underwater2_MapAttributes - .4byte SecretBase_RedCave1_MapAttributes - .4byte SecretBase_BrownCave1_MapAttributes - .4byte SecretBase_BlueCave1_MapAttributes - .4byte SecretBase_YellowCave1_MapAttributes - .4byte SecretBase_Tree1_MapAttributes - .4byte SecretBase_Shrub1_MapAttributes - .4byte SecretBase_RedCave2_MapAttributes - .4byte SecretBase_BrownCave2_MapAttributes - .4byte SecretBase_BlueCave2_MapAttributes - .4byte SecretBase_YellowCave2_MapAttributes - .4byte SecretBase_Tree2_MapAttributes - .4byte SecretBase_Shrub2_MapAttributes - .4byte SecretBase_RedCave3_MapAttributes - .4byte SecretBase_BrownCave3_MapAttributes - .4byte SecretBase_BlueCave3_MapAttributes - .4byte SecretBase_YellowCave3_MapAttributes - .4byte SecretBase_Tree3_MapAttributes - .4byte SecretBase_Shrub3_MapAttributes - .4byte SecretBase_RedCave4_MapAttributes - .4byte SecretBase_BrownCave4_MapAttributes - .4byte SecretBase_BlueCave4_MapAttributes - .4byte SecretBase_YellowCave4_MapAttributes - .4byte SecretBase_Tree4_MapAttributes - .4byte SecretBase_Shrub4_MapAttributes - .4byte SingleBattleColosseum_MapAttributes - .4byte TradeCenter_MapAttributes - .4byte RecordCorner_MapAttributes - .4byte DoubleBattleColosseum_MapAttributes - .4byte LinkContestRoom1_MapAttributes - .4byte UnknownMap_25_29_MapAttributes - .4byte UnknownMap_25_30_MapAttributes - .4byte UnknownMap_25_31_MapAttributes - .4byte UnknownMap_25_32_MapAttributes - .4byte UnknownMap_25_33_MapAttributes - .4byte UnknownMap_25_34_MapAttributes - .4byte LinkContestRoom2_MapAttributes - .4byte LinkContestRoom3_MapAttributes - .4byte LinkContestRoom4_MapAttributes - .4byte LinkContestRoom5_MapAttributes - .4byte LinkContestRoom6_MapAttributes - .4byte InsideOfTruck_MapAttributes - .4byte SafariZone_Northwest_MapAttributes - .4byte SafariZone_Northeast_MapAttributes - .4byte SafariZone_Southwest_MapAttributes - .4byte SafariZone_Southeast_MapAttributes - .4byte UnknownMapAttributes_082EDF30 - .4byte Route109_SeashoreHouse_MapAttributes - .4byte Route110_TrickHouseEntrance_MapAttributes - .4byte Route110_TrickHouseEnd_MapAttributes - .4byte Route110_TrickHouseCorridor_MapAttributes - .4byte Route110_TrickHousePuzzle1_MapAttributes - .4byte Route110_TrickHousePuzzle2_MapAttributes - .4byte Route110_TrickHousePuzzle3_MapAttributes - .4byte Route110_TrickHousePuzzle4_MapAttributes - .4byte Route110_TrickHousePuzzle5_MapAttributes - .4byte Route110_TrickHousePuzzle6_MapAttributes - .4byte Route110_TrickHousePuzzle7_MapAttributes - .4byte Route110_TrickHousePuzzle8_MapAttributes - .4byte FortreeCity_DecorationShop_MapAttributes - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes - .4byte LilycoveCity_DepartmentStore_1F_MapAttributes - .4byte LilycoveCity_DepartmentStore_2F_MapAttributes - .4byte LilycoveCity_DepartmentStore_3F_MapAttributes - .4byte LilycoveCity_DepartmentStore_4F_MapAttributes - .4byte LilycoveCity_DepartmentStore_5F_MapAttributes - .4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes - .4byte Route130_MapAttributes - .4byte BattleTower_Lobby_MapAttributes - .4byte BattleTower_Outside_MapAttributes - .4byte BattleTower_Elevator_MapAttributes - .4byte BattleTower_Corridor_MapAttributes - .4byte BattleTower_BattleRoom_MapAttributes - .4byte RustboroCity_DevonCorp_3F_MapAttributes - .4byte EverGrandeCity_PokemonLeague_MapAttributes - .4byte Route119_WeatherInstitute_1F_MapAttributes - .4byte Route119_WeatherInstitute_2F_MapAttributes - .4byte LilycoveCity_DepartmentStoreElevator_MapAttributes - .4byte Underwater1_MapAttributes - .4byte MossdeepCity_SpaceCenter_1F_MapAttributes - .4byte MossdeepCity_SpaceCenter_2F_MapAttributes - .4byte SSTidalCorridor_MapAttributes - .4byte SSTidalLowerDeck_MapAttributes - .4byte SSTidalRooms_MapAttributes - .4byte IslandCave_MapAttributes - .4byte AncientTomb_MapAttributes - .4byte Underwater_Route134_MapAttributes - .4byte Underwater_SealedChamber_MapAttributes - .4byte SealedChamber_OuterRoom_MapAttributes - .4byte VictoryRoad_B1F_MapAttributes - .4byte VictoryRoad_B2F_MapAttributes - .4byte Route104_Prototype_MapAttributes - .4byte GraniteCave_StevensRoom_MapAttributes - .4byte AbandonedShip_HiddenFloorCorridors_MapAttributes - .4byte SouthernIsland_Exterior_MapAttributes - .4byte SouthernIsland_Interior_MapAttributes - .4byte JaggedPass_MapAttributes - .4byte FieryPath_MapAttributes - .4byte RustboroCity_Flat2_1F_MapAttributes - .4byte RustboroCity_Flat2_2F_MapAttributes - .4byte RustboroCity_Flat2_3F_MapAttributes - .4byte SootopolisCity_House8_MapAttributes - .4byte EverGrandeCity_HallOfFame_MapAttributes - .4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes - .4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes - .4byte Route124_DivingTreasureHuntersHouse_MapAttributes - .4byte MtPyre_Exterior_MapAttributes - .4byte MtPyre_Summit_MapAttributes - .4byte SealedChamber_InnerRoom_MapAttributes - .4byte MossdeepCity_GameCorner_1F_MapAttributes - .4byte MossdeepCity_GameCorner_B1F_MapAttributes - .4byte SootopolisCity_House1_MapAttributes - .4byte SootopolisCity_House2_MapAttributes - .4byte SootopolisCity_House3_MapAttributes - .4byte AbandonedShip_HiddenFloorRooms_MapAttributes - .4byte ScorchedSlab_MapAttributes - .4byte UnknownMapAttributes_082FF894 - .4byte RustboroCity_Flat1_1F_MapAttributes - .4byte RustboroCity_Flat1_2F_MapAttributes - .4byte EverGrandeCity_Corridor4_MapAttributes - .4byte MagmaHideout_1F_MapAttributes - .4byte MagmaHideout_B1F_MapAttributes - .4byte MagmaHideout_B2F_MapAttributes - .4byte UnknownMapAttributes_08302970 - .4byte SkyPillar_Entrance_MapAttributes - .4byte SkyPillar_Outside_MapAttributes - .4byte SkyPillar_1F_MapAttributes - .4byte SkyPillar_2F_MapAttributes - .4byte SkyPillar_3F_MapAttributes - .4byte SkyPillar_4F_MapAttributes - .4byte UnknownMapAttributes_083041B4 - .4byte MossdeepCity_StevensHouse_MapAttributes - .4byte ShoalCave_LowTideIceRoom_MapAttributes - .4byte SafariZone_RestHouse_MapAttributes - .4byte SkyPillar_5F_MapAttributes - .4byte SkyPillar_Top_MapAttributes + .4byte PetalburgCity_Layout + .4byte SlateportCity_Layout + .4byte MauvilleCity_Layout + .4byte RustboroCity_Layout + .4byte FortreeCity_Layout + .4byte LilycoveCity_Layout + .4byte MossdeepCity_Layout + .4byte SootopolisCity_Layout + .4byte EverGrandeCity_Layout + .4byte LittlerootTown_Layout + .4byte OldaleTown_Layout + .4byte DewfordTown_Layout + .4byte LavaridgeTown_Layout + .4byte FallarborTown_Layout + .4byte VerdanturfTown_Layout + .4byte PacifidlogTown_Layout + .4byte Route101_Layout + .4byte Route102_Layout + .4byte Route103_Layout + .4byte Route104_Layout + .4byte Route105_Layout + .4byte Route106_Layout + .4byte Route107_Layout + .4byte Route108_Layout + .4byte Route109_Layout + .4byte Route110_Layout + .4byte Route111_Layout + .4byte Route112_Layout + .4byte Route113_Layout + .4byte Route114_Layout + .4byte Route115_Layout + .4byte Route116_Layout + .4byte Route117_Layout + .4byte Route118_Layout + .4byte Route119_Layout + .4byte Route120_Layout + .4byte Route121_Layout + .4byte Route122_Layout + .4byte Route123_Layout + .4byte Route124_Layout + .4byte Route125_Layout + .4byte Route126_Layout + .4byte Route127_Layout + .4byte Route128_Layout + .4byte Route129_Layout + .4byte UnreferencedMap_Layout + .4byte Route131_Layout + .4byte Route132_Layout + .4byte Route133_Layout + .4byte Route134_Layout + .4byte Underwater2_Layout + .4byte Underwater3_Layout + .4byte Underwater4_Layout + .4byte LittlerootTown_BrendansHouse_1F_Layout + .4byte LittlerootTown_BrendansHouse_2F_Layout + .4byte LittlerootTown_MaysHouse_1F_Layout + .4byte LittlerootTown_MaysHouse_2F_Layout + .4byte LittlerootTown_ProfessorBirchsLab_Layout + .4byte House1_Layout + .4byte House2_Layout + .4byte PokemonCenter_1F_Layout + .4byte PokemonCenter_2F_Layout + .4byte PokeMart_Layout + .4byte House3_Layout + .4byte DewfordTown_Gym_Layout + .4byte DewfordTown_Hall_Layout + .4byte House4_Layout + .4byte LavaridgeTown_HerbShop_Layout + .4byte LavaridgeTown_Gym_1F_Layout + .4byte LavaridgeTown_Gym_B1F_Layout + .4byte LavaridgeTown_PokemonCenter_1F_Layout + .4byte ContestLobby_Layout + .4byte ContestHall_Layout + .4byte LilycoveCity_House2_Layout + .4byte UnknownMap_082CF564_Layout + .4byte VerdanturfTown_WandasHouse_Layout + .4byte PacifidlogTown_House1_Layout + .4byte PacifidlogTown_House2_Layout + .4byte PetalburgCity_Gym_Layout + .4byte HouseWithBed_Layout + .4byte SlateportCity_SternsShipyard_1F_Layout + .4byte SlateportCity_SternsShipyard_2F_Layout + .4byte UnknownMap_082D05D8_Layout + .4byte UnknownMap_082D05FC_Layout + .4byte SlateportCity_PokemonFanClub_Layout + .4byte SlateportCity_OceanicMuseum_1F_Layout + .4byte SlateportCity_OceanicMuseum_2F_Layout + .4byte Harbor_Layout + .4byte MauvilleCity_Gym_Layout + .4byte MauvilleCity_BikeShop_Layout + .4byte MauvilleCity_GameCorner_Layout + .4byte RustboroCity_DevonCorp_1F_Layout + .4byte RustboroCity_DevonCorp_2F_Layout + .4byte RustboroCity_Gym_Layout + .4byte RustboroCity_PokemonSchool_Layout + .4byte RustboroCity_House_Layout + .4byte RustboroCity_House1_Layout + .4byte RustboroCity_CuttersHouse_Layout + .4byte FortreeCity_House1_Layout + .4byte FortreeCity_Gym_Layout + .4byte FortreeCity_House2_Layout + .4byte Route104_MrBrineysHouse_Layout + .4byte LilycoveCity_LilycoveMuseum_1F_Layout + .4byte LilycoveCity_LilycoveMuseum_2F_Layout + .4byte LilycoveCity_ContestLobby_Layout + .4byte LilycoveCity_ContestHall_Layout + .4byte LilycoveCity_PokemonTrainerFanClub_Layout + .4byte LilycoveCity_EmptyMap_Layout + .4byte MossdeepCity_Gym_Layout + .4byte SootopolisCity_Gym_1F_Layout + .4byte SootopolisCity_Gym_B1F_Layout + .4byte EverGrandeCity_SidneysRoom_Layout + .4byte EverGrandeCity_PhoebesRoom_Layout + .4byte EverGrandeCity_GlaciasRoom_Layout + .4byte EverGrandeCity_DrakesRoom_Layout + .4byte EverGrandeCity_ChampionsRoom_Layout + .4byte EverGrandeCity_ShortCorridor_Layout + .4byte Route104_PrettyPetalFlowerShop_Layout + .4byte CableCarStation_Layout + .4byte Route114_FossilManiacsHouse_Layout + .4byte Route114_FossilManiacsTunnel_Layout + .4byte Route114_LanettesHouse_Layout + .4byte Route116_TunnelersRestHouse_Layout + .4byte Route117_PokemonDayCare_Layout + .4byte Route121_SafariZoneEntrance_Layout + .4byte MeteorFalls_1F_1R_Layout + .4byte MeteorFalls_1F_2R_Layout + .4byte MeteorFalls_B1F_1R_Layout + .4byte MeteorFalls_B1F_2R_Layout + .4byte RusturfTunnel_Layout + .4byte Underwater_SootopolisCity_Layout + .4byte DesertRuins_Layout + .4byte GraniteCave_1F_Layout + .4byte GraniteCave_B1F_Layout + .4byte GraniteCave_B2F_Layout + .4byte PetalburgWoods_Layout + .4byte MtChimney_Layout + .4byte MtPyre_1F_Layout + .4byte MtPyre_2F_Layout + .4byte MtPyre_3F_Layout + .4byte MtPyre_4F_Layout + .4byte MtPyre_5F_Layout + .4byte MtPyre_6F_Layout + .4byte AquaHideout_1F_Layout + .4byte AquaHideout_B1F_Layout + .4byte AquaHideout_B2F_Layout + .4byte Underwater_SeafloorCavern_Layout + .4byte SeafloorCavern_Entrance_Layout + .4byte SeafloorCavern_Room1_Layout + .4byte SeafloorCavern_Room2_Layout + .4byte SeafloorCavern_Room3_Layout + .4byte SeafloorCavern_Room4_Layout + .4byte SeafloorCavern_Room5_Layout + .4byte SeafloorCavern_Room6_Layout + .4byte SeafloorCavern_Room7_Layout + .4byte SeafloorCavern_Room8_Layout + .4byte SeafloorCavern_Room9_Layout + .4byte CaveOfOrigin_Entrance_Layout + .4byte CaveOfOrigin_1F_Layout + .4byte CaveOfOrigin_B1F_Layout + .4byte CaveOfOrigin_B2F_Layout + .4byte CaveOfOrigin_B3F_Layout + .4byte CaveOfOrigin_B4F_Layout + .4byte VictoryRoad_1F_Layout + .4byte ShoalCave_LowTideEntranceRoom_Layout + .4byte ShoalCave_LowTideInnerRoom_Layout + .4byte ShoalCave_LowTideStairsRoom_Layout + .4byte ShoalCave_LowTideLowerRoom_Layout + .4byte ShoalCave_HighTideEntranceRoom_Layout + .4byte ShoalCave_HighTideInnerRoom_Layout + .4byte UnknownMap_082E55C8_Layout @ unused maps + .4byte UnknownMap_082E55EC_Layout + .4byte UnknownMap_082E5610_Layout + .4byte UnknownMap_082E5634_Layout + .4byte UnknownMap_082E5658_Layout + .4byte UnknownMap_082E567C_Layout + .4byte UnknownMap_082E56A0_Layout + .4byte UnknownMap_082E56C4_Layout + .4byte UnknownMap_082E56E8_Layout + .4byte UnknownMap_082E570C_Layout + .4byte UnknownMap_082E5730_Layout + .4byte UnknownMap_082E5754_Layout + .4byte UnknownMap_082E5778_Layout + .4byte UnknownMap_082E579C_Layout + .4byte NewMauville_Entrance_Layout + .4byte NewMauville_Inside_Layout + .4byte AbandonedShip_Deck_Layout + .4byte AbandonedShip_Corridors_1F_Layout + .4byte AbandonedShip_Rooms_1F_Layout + .4byte AbandonedShip_Corridors_B1F_Layout + .4byte AbandonedShip_Rooms_B1F_Layout + .4byte AbandonedShip_Rooms2_B1F_Layout + .4byte AbandonedShip_Underwater1_Layout + .4byte AbandonedShip_Room_B1F_Layout + .4byte AbandonedShip_Rooms2_1F_Layout + .4byte AbandonedShip_CaptainsOffice_Layout + .4byte AbandonedShip_Underwater2_Layout + .4byte SecretBase_RedCave1_Layout + .4byte SecretBase_BrownCave1_Layout + .4byte SecretBase_BlueCave1_Layout + .4byte SecretBase_YellowCave1_Layout + .4byte SecretBase_Tree1_Layout + .4byte SecretBase_Shrub1_Layout + .4byte SecretBase_RedCave2_Layout + .4byte SecretBase_BrownCave2_Layout + .4byte SecretBase_BlueCave2_Layout + .4byte SecretBase_YellowCave2_Layout + .4byte SecretBase_Tree2_Layout + .4byte SecretBase_Shrub2_Layout + .4byte SecretBase_RedCave3_Layout + .4byte SecretBase_BrownCave3_Layout + .4byte SecretBase_BlueCave3_Layout + .4byte SecretBase_YellowCave3_Layout + .4byte SecretBase_Tree3_Layout + .4byte SecretBase_Shrub3_Layout + .4byte SecretBase_RedCave4_Layout + .4byte SecretBase_BrownCave4_Layout + .4byte SecretBase_BlueCave4_Layout + .4byte SecretBase_YellowCave4_Layout + .4byte SecretBase_Tree4_Layout + .4byte SecretBase_Shrub4_Layout + .4byte SingleBattleColosseum_Layout + .4byte TradeCenter_Layout + .4byte RecordCorner_Layout + .4byte DoubleBattleColosseum_Layout + .4byte LinkContestRoom1_Layout + .4byte UnknownMap_25_29_Layout + .4byte UnknownMap_25_30_Layout + .4byte UnknownMap_25_31_Layout + .4byte UnknownMap_25_32_Layout + .4byte UnknownMap_25_33_Layout + .4byte UnknownMap_25_34_Layout + .4byte LinkContestRoom2_Layout + .4byte LinkContestRoom3_Layout + .4byte LinkContestRoom4_Layout + .4byte LinkContestRoom5_Layout + .4byte LinkContestRoom6_Layout + .4byte InsideOfTruck_Layout + .4byte SafariZone_Northwest_Layout + .4byte SafariZone_Northeast_Layout + .4byte SafariZone_Southwest_Layout + .4byte SafariZone_Southeast_Layout + .4byte UnknownMap_082EDF30_Layout + .4byte Route109_SeashoreHouse_Layout + .4byte Route110_TrickHouseEntrance_Layout + .4byte Route110_TrickHouseEnd_Layout + .4byte Route110_TrickHouseCorridor_Layout + .4byte Route110_TrickHousePuzzle1_Layout + .4byte Route110_TrickHousePuzzle2_Layout + .4byte Route110_TrickHousePuzzle3_Layout + .4byte Route110_TrickHousePuzzle4_Layout + .4byte Route110_TrickHousePuzzle5_Layout + .4byte Route110_TrickHousePuzzle6_Layout + .4byte Route110_TrickHousePuzzle7_Layout + .4byte Route110_TrickHousePuzzle8_Layout + .4byte FortreeCity_DecorationShop_Layout + .4byte Route110_SeasideCyclingRoadEntrace_Layout + .4byte LilycoveCity_DepartmentStore_1F_Layout + .4byte LilycoveCity_DepartmentStore_2F_Layout + .4byte LilycoveCity_DepartmentStore_3F_Layout + .4byte LilycoveCity_DepartmentStore_4F_Layout + .4byte LilycoveCity_DepartmentStore_5F_Layout + .4byte LilycoveCity_DepartmentStoreRooftop_Layout + .4byte Route130_Layout + .4byte BattleTower_Lobby_Layout + .4byte BattleTower_Outside_Layout + .4byte BattleTower_Elevator_Layout + .4byte BattleTower_Corridor_Layout + .4byte BattleTower_BattleRoom_Layout + .4byte RustboroCity_DevonCorp_3F_Layout + .4byte EverGrandeCity_PokemonLeague_Layout + .4byte Route119_WeatherInstitute_1F_Layout + .4byte Route119_WeatherInstitute_2F_Layout + .4byte LilycoveCity_DepartmentStoreElevator_Layout + .4byte Underwater1_Layout + .4byte MossdeepCity_SpaceCenter_1F_Layout + .4byte MossdeepCity_SpaceCenter_2F_Layout + .4byte SSTidalCorridor_Layout + .4byte SSTidalLowerDeck_Layout + .4byte SSTidalRooms_Layout + .4byte IslandCave_Layout + .4byte AncientTomb_Layout + .4byte Underwater_Route134_Layout + .4byte Underwater_SealedChamber_Layout + .4byte SealedChamber_OuterRoom_Layout + .4byte VictoryRoad_B1F_Layout + .4byte VictoryRoad_B2F_Layout + .4byte Route104_Prototype_Layout + .4byte GraniteCave_StevensRoom_Layout + .4byte AbandonedShip_HiddenFloorCorridors_Layout + .4byte SouthernIsland_Exterior_Layout + .4byte SouthernIsland_Interior_Layout + .4byte JaggedPass_Layout + .4byte FieryPath_Layout + .4byte RustboroCity_Flat2_1F_Layout + .4byte RustboroCity_Flat2_2F_Layout + .4byte RustboroCity_Flat2_3F_Layout + .4byte SootopolisCity_House8_Layout + .4byte EverGrandeCity_HallOfFame_Layout + .4byte LilycoveCity_CoveLilyMotel_1F_Layout + .4byte LilycoveCity_CoveLilyMotel_2F_Layout + .4byte Route124_DivingTreasureHuntersHouse_Layout + .4byte MtPyre_Exterior_Layout + .4byte MtPyre_Summit_Layout + .4byte SealedChamber_InnerRoom_Layout + .4byte MossdeepCity_GameCorner_1F_Layout + .4byte MossdeepCity_GameCorner_B1F_Layout + .4byte SootopolisCity_House1_Layout + .4byte SootopolisCity_House2_Layout + .4byte SootopolisCity_House3_Layout + .4byte AbandonedShip_HiddenFloorRooms_Layout + .4byte ScorchedSlab_Layout + .4byte UnknownMap_082FF894_Layout + .4byte RustboroCity_Flat1_1F_Layout + .4byte RustboroCity_Flat1_2F_Layout + .4byte EverGrandeCity_Corridor4_Layout + .4byte MagmaHideout_1F_Layout + .4byte MagmaHideout_B1F_Layout + .4byte MagmaHideout_B2F_Layout + .4byte UnknownMap_08302970_Layout + .4byte SkyPillar_Entrance_Layout + .4byte SkyPillar_Outside_Layout + .4byte SkyPillar_1F_Layout + .4byte SkyPillar_2F_Layout + .4byte SkyPillar_3F_Layout + .4byte SkyPillar_4F_Layout + .4byte UnknownMap_083041B4_Layout + .4byte MossdeepCity_StevensHouse_Layout + .4byte ShoalCave_LowTideIceRoom_Layout + .4byte SafariZone_RestHouse_Layout + .4byte SkyPillar_5F_Layout + .4byte SkyPillar_Top_Layout |