From ef67f2d33b45348d76d722f250cdbcc8485be264 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 8 Jan 2020 05:43:06 -0500 Subject: Merge master into ObjEvent rename and prune accidental inclusions --- .../BattleFrontier_BattleTowerCorridor2/border.bin | Bin 8 -> 0 bytes .../layouts/BattleFrontier_BattleTowerCorridor2/map.bin | Bin 170 -> 0 bytes .../border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattleTowerMultiBattleRoom/map.bin | Bin 630 -> 0 bytes .../BattleFrontier_BattleTowerMultiCorridor/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleTowerMultiCorridor/map.bin | Bin 0 -> 170 bytes .../border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattleTowerMultiPartnerRoom/map.bin | Bin 0 -> 630 bytes data/layouts/layouts.json | 16 ++++++++-------- 9 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin delete mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin delete mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin delete mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin (limited to 'data/layouts') diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin b/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin deleted file mode 100644 index 87e93b640..000000000 Binary files a/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin deleted file mode 100644 index b0a58e016..000000000 Binary files a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin new file mode 100644 index 000000000..87e93b640 Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin differ diff --git a/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin new file mode 100644 index 000000000..b0a58e016 Binary files /dev/null and b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin differ diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 8523bb872..ff434efce 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3892,24 +3892,24 @@ "blockdata_filepath": "data/layouts/DesertUnderpass/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", - "name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM", + "name": "BattleFrontier_BattleTowerMultiPartnerRoom_Layout", "width": 21, "height": 15, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattleFrontier", - "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin" }, { - "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", - "name": "BattleFrontier_BattleTowerCorridor2_Layout", + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR", + "name": "BattleFrontier_BattleTowerMultiCorridor_Layout", "width": 17, "height": 5, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattleFrontier", - "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin", - "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" + "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin" }, { "id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER", -- cgit v1.2.3