summaryrefslogtreecommitdiff
path: root/data/layouts
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-12-25 11:39:20 -0600
committerGitHub <noreply@github.com>2019-12-25 11:39:20 -0600
commitee61726136c4d3c9a84eb89672890b66e31f4f45 (patch)
tree3cdbd28208021c88c14c5d014f7b59699b7783e7 /data/layouts
parent026e1108b26f4ce5cea362997135bd8efc7cb28a (diff)
parent23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (diff)
Merge pull request #936 from GriffinRichards/doc-tower
Document Battle Tower scripts
Diffstat (limited to 'data/layouts')
-rw-r--r--data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin (renamed from data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin)bin8 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin (renamed from data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin)bin170 -> 170 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin (renamed from data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin)bin8 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin (renamed from data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin)bin630 -> 630 bytes
-rw-r--r--data/layouts/layouts.json16
5 files changed, 8 insertions, 8 deletions
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin
+++ b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin
index 87e93b640..87e93b640 100644
--- a/data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin
+++ b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/map.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin
index b0a58e016..b0a58e016 100644
--- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin
+++ b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/map.bin
Binary files differ
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 201cd7bdf..cb41ff9e9 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",