summaryrefslogtreecommitdiff
path: root/data/layouts
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
committerMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
commit5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch)
tree6ef755064008dfae8ce2942dc2762670cdabe815 /data/layouts
parent5007d279fea5326b41b877703c74fcaa56223364 (diff)
parent22931846d680de2bc585093678db3f5721aab891 (diff)
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/layouts')
-rw-r--r--data/layouts/BattleColosseum_2P/border.bin (renamed from data/layouts/DoubleBattleColosseum/border.bin)0
-rw-r--r--data/layouts/BattleColosseum_2P/map.bin (renamed from data/layouts/SingleBattleColosseum/map.bin)0
-rw-r--r--data/layouts/BattleColosseum_4P/border.bin (renamed from data/layouts/LinkContestRoom1/border.bin)0
-rw-r--r--data/layouts/BattleColosseum_4P/map.bin (renamed from data/layouts/DoubleBattleColosseum/map.bin)0
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin (renamed from data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin)bin8 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin (renamed from data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin)0
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin (renamed from data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin)bin8 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin (renamed from data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin)0
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin (renamed from data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin)bin8 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin (renamed from data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin)0
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidFloor/border.bin (renamed from data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin)bin8 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_BattlePyramidFloor/map.bin (renamed from data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin)0
-rw-r--r--data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin (renamed from data/layouts/BattleFrontier_BattlePyramidEmptySquare/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_BattleTowerCorridor2/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/BattleFrontier_ExchangeServiceCorner/border.bin (renamed from data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin)bin8 -> 8 bytes
-rw-r--r--data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin (renamed from data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin)0
-rw-r--r--data/layouts/ContestHall/border.bin (renamed from data/layouts/LinkContestRoom2/border.bin)0
-rw-r--r--data/layouts/ContestHall/map.bin (renamed from data/layouts/LinkContestRoom1/map.bin)0
-rw-r--r--data/layouts/ContestHallBeauty/border.bin (renamed from data/layouts/LinkContestRoom3/border.bin)0
-rw-r--r--data/layouts/ContestHallBeauty/map.bin (renamed from data/layouts/LinkContestRoom2/map.bin)0
-rw-r--r--data/layouts/ContestHallCool/border.bin (renamed from data/layouts/LinkContestRoom4/border.bin)0
-rw-r--r--data/layouts/ContestHallCool/map.bin (renamed from data/layouts/LinkContestRoom4/map.bin)0
-rw-r--r--data/layouts/ContestHallCute/border.bin (renamed from data/layouts/LinkContestRoom5/border.bin)0
-rw-r--r--data/layouts/ContestHallCute/map.bin (renamed from data/layouts/LinkContestRoom6/map.bin)0
-rw-r--r--data/layouts/ContestHallSmart/border.bin (renamed from data/layouts/LinkContestRoom6/border.bin)0
-rw-r--r--data/layouts/ContestHallSmart/map.bin (renamed from data/layouts/LinkContestRoom5/map.bin)0
-rw-r--r--data/layouts/ContestHallTough/border.bin (renamed from data/layouts/SingleBattleColosseum/border.bin)0
-rw-r--r--data/layouts/ContestHallTough/map.bin (renamed from data/layouts/LinkContestRoom3/map.bin)0
-rw-r--r--data/layouts/layouts.json120
31 files changed, 60 insertions, 60 deletions
diff --git a/data/layouts/DoubleBattleColosseum/border.bin b/data/layouts/BattleColosseum_2P/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/DoubleBattleColosseum/border.bin
+++ b/data/layouts/BattleColosseum_2P/border.bin
diff --git a/data/layouts/SingleBattleColosseum/map.bin b/data/layouts/BattleColosseum_2P/map.bin
index 1f66ab707..1f66ab707 100644
--- a/data/layouts/SingleBattleColosseum/map.bin
+++ b/data/layouts/BattleColosseum_2P/map.bin
diff --git a/data/layouts/LinkContestRoom1/border.bin b/data/layouts/BattleColosseum_4P/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom1/border.bin
+++ b/data/layouts/BattleColosseum_4P/border.bin
diff --git a/data/layouts/DoubleBattleColosseum/map.bin b/data/layouts/BattleColosseum_4P/map.bin
index 77606e818..77606e818 100644
--- a/data/layouts/DoubleBattleColosseum/map.bin
+++ b/data/layouts/BattleColosseum_4P/map.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin
index 27a6e52aa..27a6e52aa 100644
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin
index 142150cbe..142150cbe 100644
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin
index 8ce7f1c37..8ce7f1c37 100644
--- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin
+++ b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin
index 7c224d524..7c224d524 100644
--- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin
+++ b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin
diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/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_BattleTowerCorridor2/border.bin b/data/layouts/BattleFrontier_BattleTowerMultiPartnerRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattleTowerCorridor2/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/BattleFrontier_BattleTowerMultiBattleRoom/border.bin b/data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin
+++ b/data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin
Binary files differ
diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin
index 62d5761e0..62d5761e0 100644
--- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin
+++ b/data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin
diff --git a/data/layouts/LinkContestRoom2/border.bin b/data/layouts/ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom2/border.bin
+++ b/data/layouts/ContestHall/border.bin
diff --git a/data/layouts/LinkContestRoom1/map.bin b/data/layouts/ContestHall/map.bin
index a8853f6ae..a8853f6ae 100644
--- a/data/layouts/LinkContestRoom1/map.bin
+++ b/data/layouts/ContestHall/map.bin
diff --git a/data/layouts/LinkContestRoom3/border.bin b/data/layouts/ContestHallBeauty/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom3/border.bin
+++ b/data/layouts/ContestHallBeauty/border.bin
diff --git a/data/layouts/LinkContestRoom2/map.bin b/data/layouts/ContestHallBeauty/map.bin
index 7cb63b40d..7cb63b40d 100644
--- a/data/layouts/LinkContestRoom2/map.bin
+++ b/data/layouts/ContestHallBeauty/map.bin
diff --git a/data/layouts/LinkContestRoom4/border.bin b/data/layouts/ContestHallCool/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom4/border.bin
+++ b/data/layouts/ContestHallCool/border.bin
diff --git a/data/layouts/LinkContestRoom4/map.bin b/data/layouts/ContestHallCool/map.bin
index 4e2166c19..4e2166c19 100644
--- a/data/layouts/LinkContestRoom4/map.bin
+++ b/data/layouts/ContestHallCool/map.bin
diff --git a/data/layouts/LinkContestRoom5/border.bin b/data/layouts/ContestHallCute/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom5/border.bin
+++ b/data/layouts/ContestHallCute/border.bin
diff --git a/data/layouts/LinkContestRoom6/map.bin b/data/layouts/ContestHallCute/map.bin
index 9fcec5a5e..9fcec5a5e 100644
--- a/data/layouts/LinkContestRoom6/map.bin
+++ b/data/layouts/ContestHallCute/map.bin
diff --git a/data/layouts/LinkContestRoom6/border.bin b/data/layouts/ContestHallSmart/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/LinkContestRoom6/border.bin
+++ b/data/layouts/ContestHallSmart/border.bin
diff --git a/data/layouts/LinkContestRoom5/map.bin b/data/layouts/ContestHallSmart/map.bin
index ad068fe7c..ad068fe7c 100644
--- a/data/layouts/LinkContestRoom5/map.bin
+++ b/data/layouts/ContestHallSmart/map.bin
diff --git a/data/layouts/SingleBattleColosseum/border.bin b/data/layouts/ContestHallTough/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/SingleBattleColosseum/border.bin
+++ b/data/layouts/ContestHallTough/border.bin
diff --git a/data/layouts/LinkContestRoom3/map.bin b/data/layouts/ContestHallTough/map.bin
index 59e9e9182..59e9e9182 100644
--- a/data/layouts/LinkContestRoom3/map.bin
+++ b/data/layouts/ContestHallTough/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 353b9a284..681f46f75 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -2202,14 +2202,14 @@
"blockdata_filepath": "data/layouts/SecretBase_Shrub4/map.bin"
},
{
- "id": "LAYOUT_SINGLE_BATTLE_COLOSSEUM",
- "name": "SingleBattleColosseum_Layout",
+ "id": "LAYOUT_BATTLE_COLOSSEUM_2P",
+ "name": "BattleColosseum_2P_Layout",
"width": 14,
"height": 9,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub",
- "border_filepath": "data/layouts/SingleBattleColosseum/border.bin",
- "blockdata_filepath": "data/layouts/SingleBattleColosseum/map.bin"
+ "border_filepath": "data/layouts/BattleColosseum_2P/border.bin",
+ "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin"
},
{
"id": "LAYOUT_TRADE_CENTER",
@@ -2232,24 +2232,24 @@
"blockdata_filepath": "data/layouts/RecordCorner/map.bin"
},
{
- "id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
- "name": "DoubleBattleColosseum_Layout",
+ "id": "LAYOUT_BATTLE_COLOSSEUM_4P",
+ "name": "BattleColosseum_4P_Layout",
"width": 14,
"height": 9,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_CableClub",
- "border_filepath": "data/layouts/DoubleBattleColosseum/border.bin",
- "blockdata_filepath": "data/layouts/DoubleBattleColosseum/map.bin"
+ "border_filepath": "data/layouts/BattleColosseum_4P/border.bin",
+ "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin"
},
{
- "id": "LAYOUT_LINK_CONTEST_ROOM1",
- "name": "LinkContestRoom1_Layout",
+ "id": "LAYOUT_CONTEST_HALL",
+ "name": "ContestHall_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
- "border_filepath": "data/layouts/LinkContestRoom1/border.bin",
- "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin"
+ "border_filepath": "data/layouts/ContestHall/border.bin",
+ "blockdata_filepath": "data/layouts/ContestHall/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
@@ -2312,54 +2312,54 @@
"blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin"
},
{
- "id": "LAYOUT_LINK_CONTEST_ROOM2",
- "name": "LinkContestRoom2_Layout",
+ "id": "LAYOUT_CONTEST_HALL_BEAUTY",
+ "name": "ContestHallBeauty_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
- "border_filepath": "data/layouts/LinkContestRoom2/border.bin",
- "blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin"
+ "border_filepath": "data/layouts/ContestHallBeauty/border.bin",
+ "blockdata_filepath": "data/layouts/ContestHallBeauty/map.bin"
},
{
- "id": "LAYOUT_LINK_CONTEST_ROOM3",
- "name": "LinkContestRoom3_Layout",
+ "id": "LAYOUT_CONTEST_HALL_TOUGH",
+ "name": "ContestHallTough_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
- "border_filepath": "data/layouts/LinkContestRoom3/border.bin",
- "blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin"
+ "border_filepath": "data/layouts/ContestHallTough/border.bin",
+ "blockdata_filepath": "data/layouts/ContestHallTough/map.bin"
},
{
- "id": "LAYOUT_LINK_CONTEST_ROOM4",
- "name": "LinkContestRoom4_Layout",
+ "id": "LAYOUT_CONTEST_HALL_COOL",
+ "name": "ContestHallCool_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
- "border_filepath": "data/layouts/LinkContestRoom4/border.bin",
- "blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin"
+ "border_filepath": "data/layouts/ContestHallCool/border.bin",
+ "blockdata_filepath": "data/layouts/ContestHallCool/map.bin"
},
{
- "id": "LAYOUT_LINK_CONTEST_ROOM5",
- "name": "LinkContestRoom5_Layout",
+ "id": "LAYOUT_CONTEST_HALL_SMART",
+ "name": "ContestHallSmart_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
- "border_filepath": "data/layouts/LinkContestRoom5/border.bin",
- "blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin"
+ "border_filepath": "data/layouts/ContestHallSmart/border.bin",
+ "blockdata_filepath": "data/layouts/ContestHallSmart/map.bin"
},
{
- "id": "LAYOUT_LINK_CONTEST_ROOM6",
- "name": "LinkContestRoom6_Layout",
+ "id": "LAYOUT_CONTEST_HALL_CUTE",
+ "name": "ContestHallCute_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Contest",
- "border_filepath": "data/layouts/LinkContestRoom6/border.bin",
- "blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin"
+ "border_filepath": "data/layouts/ContestHallCute/border.bin",
+ "blockdata_filepath": "data/layouts/ContestHallCute/map.bin"
},
{
"id": "LAYOUT_INSIDE_OF_TRUCK",
@@ -3512,24 +3512,24 @@
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin"
},
{
- "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1",
- "name": "BattleFrontier_BattlePikeRandomRoom1_Layout",
+ "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL",
+ "name": "BattleFrontier_BattlePikeRoomNormal_Layout",
"width": 9,
"height": 8,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattlePike",
- "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin",
- "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin"
+ "border_filepath": "data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin",
+ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin"
},
{
- "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2",
- "name": "BattleFrontier_BattlePikeRandomRoom2_Layout",
+ "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL",
+ "name": "BattleFrontier_BattlePikeRoomFinal_Layout",
"width": 5,
"height": 8,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattlePike",
- "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin",
- "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin"
+ "border_filepath": "data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin",
+ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin"
},
{
"id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
@@ -3572,14 +3572,14 @@
"blockdata_filepath": "data/layouts/SootopolisCity_LegendsBattle/map.bin"
},
{
- "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3",
- "name": "BattleFrontier_BattlePikeRandomRoom3_Layout",
+ "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS",
+ "name": "BattleFrontier_BattlePikeRoomWildMons_Layout",
"width": 9,
"height": 20,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattlePike",
- "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin",
- "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin"
+ "border_filepath": "data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin",
+ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin"
},
{
"id": "LAYOUT_UNKNOWN_084693AC",
@@ -3602,14 +3602,14 @@
"blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin"
},
{
- "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
- "name": "BattleFrontier_BattlePyramidEmptySquare_Layout",
+ "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR",
+ "name": "BattleFrontier_BattlePyramidFloor_Layout",
"width": 8,
"height": 8,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattlePyramid",
- "border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin",
- "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin"
+ "border_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/border.bin",
+ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidFloor/map.bin"
},
{
"id": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
@@ -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",
@@ -3972,14 +3972,14 @@
"blockdata_filepath": "data/layouts/BattleFrontier_Lounge1/map.bin"
},
{
- "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER",
- "name": "BattleFrontier_BattlePointExchangeServiceCorner_Layout",
+ "id": "LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
+ "name": "BattleFrontier_ExchangeServiceCorner_Layout",
"width": 15,
"height": 11,
"primary_tileset": "gTileset_Building",
"secondary_tileset": "gTileset_BattleFrontier",
- "border_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin",
- "blockdata_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin"
+ "border_filepath": "data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin",
+ "blockdata_filepath": "data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin"
},
{
"id": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE",