From 35ed8de51b0784e44560237248fc516f96e835df Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 12:37:11 -0500 Subject: Fix Battle Colosseum names --- data/layouts/BattleColosseum2P/border.bin | 1 + data/layouts/BattleColosseum2P/map.bin | 1 + data/layouts/BattleColosseum4P/border.bin | 1 + data/layouts/BattleColosseum4P/map.bin | 1 + data/layouts/DoubleBattleColosseum/border.bin | 1 - data/layouts/DoubleBattleColosseum/map.bin | 1 - data/layouts/SingleBattleColosseum/border.bin | 1 - data/layouts/SingleBattleColosseum/map.bin | 1 - data/layouts/layouts.json | 16 ++++++++-------- 9 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 data/layouts/BattleColosseum2P/border.bin create mode 100644 data/layouts/BattleColosseum2P/map.bin create mode 100644 data/layouts/BattleColosseum4P/border.bin create mode 100644 data/layouts/BattleColosseum4P/map.bin delete mode 100644 data/layouts/DoubleBattleColosseum/border.bin delete mode 100644 data/layouts/DoubleBattleColosseum/map.bin delete mode 100644 data/layouts/SingleBattleColosseum/border.bin delete mode 100644 data/layouts/SingleBattleColosseum/map.bin (limited to 'data/layouts') diff --git a/data/layouts/BattleColosseum2P/border.bin b/data/layouts/BattleColosseum2P/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/BattleColosseum2P/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/BattleColosseum2P/map.bin b/data/layouts/BattleColosseum2P/map.bin new file mode 100644 index 000000000..1f66ab707 --- /dev/null +++ b/data/layouts/BattleColosseum2P/map.bin @@ -0,0 +1 @@ +hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2T2U2U2b2c2U2U2V2U2�2���2U2`2U2U2d2e2U2U2a2U2�2���2U2T2U2U2f2g2U2U2V2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2 \ No newline at end of file diff --git a/data/layouts/BattleColosseum4P/border.bin b/data/layouts/BattleColosseum4P/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/BattleColosseum4P/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/BattleColosseum4P/map.bin b/data/layouts/BattleColosseum4P/map.bin new file mode 100644 index 000000000..77606e818 --- /dev/null +++ b/data/layouts/BattleColosseum4P/map.bin @@ -0,0 +1 @@ +hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2`2U2U2b2c2U2U2a2U2�2���2U2T2U2U2d2e2U2U2V2U2�2���2U2`2U2U2f2g2U2U2a2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2!2!2 \ No newline at end of file diff --git a/data/layouts/DoubleBattleColosseum/border.bin b/data/layouts/DoubleBattleColosseum/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/DoubleBattleColosseum/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/DoubleBattleColosseum/map.bin b/data/layouts/DoubleBattleColosseum/map.bin deleted file mode 100644 index 77606e818..000000000 --- a/data/layouts/DoubleBattleColosseum/map.bin +++ /dev/null @@ -1 +0,0 @@ -hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2`2U2U2b2c2U2U2a2U2�2���2U2T2U2U2d2e2U2U2V2U2�2���2U2`2U2U2f2g2U2U2a2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2!2!2 \ No newline at end of file diff --git a/data/layouts/SingleBattleColosseum/border.bin b/data/layouts/SingleBattleColosseum/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/SingleBattleColosseum/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/SingleBattleColosseum/map.bin b/data/layouts/SingleBattleColosseum/map.bin deleted file mode 100644 index 1f66ab707..000000000 --- a/data/layouts/SingleBattleColosseum/map.bin +++ /dev/null @@ -1 +0,0 @@ -hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2T2U2U2b2c2U2U2V2U2�2���2U2`2U2U2d2e2U2U2a2U2�2���2U2T2U2U2f2g2U2U2V2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 353b9a284..5a696d5e0 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": "BattleColosseum2P_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/BattleColosseum2P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin" }, { "id": "LAYOUT_TRADE_CENTER", @@ -2232,14 +2232,14 @@ "blockdata_filepath": "data/layouts/RecordCorner/map.bin" }, { - "id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", - "name": "DoubleBattleColosseum_Layout", + "id": "LAYOUT_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P_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/BattleColosseum4P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin" }, { "id": "LAYOUT_LINK_CONTEST_ROOM1", -- cgit v1.2.3 From ef8370566f14c22b9927db09b8ff69a98049c796 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 10 Nov 2019 21:54:00 -0500 Subject: Document Contest scripts --- data/layouts/ContestHall/border.bin | 1 + data/layouts/ContestHall/map.bin | 1 + data/layouts/ContestHallBeauty/border.bin | 1 + data/layouts/ContestHallBeauty/map.bin | 1 + data/layouts/ContestHallCool/border.bin | 1 + data/layouts/ContestHallCool/map.bin | 1 + data/layouts/ContestHallCute/border.bin | 1 + data/layouts/ContestHallCute/map.bin | 1 + data/layouts/ContestHallSmart/border.bin | 1 + data/layouts/ContestHallSmart/map.bin | 1 + data/layouts/ContestHallTough/border.bin | 1 + data/layouts/ContestHallTough/map.bin | 1 + data/layouts/LinkContestRoom1/border.bin | 1 - data/layouts/LinkContestRoom1/map.bin | 1 - data/layouts/LinkContestRoom2/border.bin | 1 - data/layouts/LinkContestRoom2/map.bin | 1 - data/layouts/LinkContestRoom3/border.bin | 1 - data/layouts/LinkContestRoom3/map.bin | 1 - data/layouts/LinkContestRoom4/border.bin | 1 - data/layouts/LinkContestRoom4/map.bin | 1 - data/layouts/LinkContestRoom5/border.bin | 1 - data/layouts/LinkContestRoom5/map.bin | 1 - data/layouts/LinkContestRoom6/border.bin | 1 - data/layouts/LinkContestRoom6/map.bin | 1 - data/layouts/layouts.json | 48 +++++++++++++++---------------- 25 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 data/layouts/ContestHall/border.bin create mode 100644 data/layouts/ContestHall/map.bin create mode 100644 data/layouts/ContestHallBeauty/border.bin create mode 100644 data/layouts/ContestHallBeauty/map.bin create mode 100644 data/layouts/ContestHallCool/border.bin create mode 100644 data/layouts/ContestHallCool/map.bin create mode 100644 data/layouts/ContestHallCute/border.bin create mode 100644 data/layouts/ContestHallCute/map.bin create mode 100644 data/layouts/ContestHallSmart/border.bin create mode 100644 data/layouts/ContestHallSmart/map.bin create mode 100644 data/layouts/ContestHallTough/border.bin create mode 100644 data/layouts/ContestHallTough/map.bin delete mode 100644 data/layouts/LinkContestRoom1/border.bin delete mode 100644 data/layouts/LinkContestRoom1/map.bin delete mode 100644 data/layouts/LinkContestRoom2/border.bin delete mode 100644 data/layouts/LinkContestRoom2/map.bin delete mode 100644 data/layouts/LinkContestRoom3/border.bin delete mode 100644 data/layouts/LinkContestRoom3/map.bin delete mode 100644 data/layouts/LinkContestRoom4/border.bin delete mode 100644 data/layouts/LinkContestRoom4/map.bin delete mode 100644 data/layouts/LinkContestRoom5/border.bin delete mode 100644 data/layouts/LinkContestRoom5/map.bin delete mode 100644 data/layouts/LinkContestRoom6/border.bin delete mode 100644 data/layouts/LinkContestRoom6/map.bin (limited to 'data/layouts') diff --git a/data/layouts/ContestHall/border.bin b/data/layouts/ContestHall/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/ContestHall/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ContestHall/map.bin b/data/layouts/ContestHall/map.bin new file mode 100644 index 000000000..a8853f6ae --- /dev/null +++ b/data/layouts/ContestHall/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u2222226s2t2u26 \ No newline at end of file diff --git a/data/layouts/ContestHallBeauty/border.bin b/data/layouts/ContestHallBeauty/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/ContestHallBeauty/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ContestHallBeauty/map.bin b/data/layouts/ContestHallBeauty/map.bin new file mode 100644 index 000000000..7cb63b40d --- /dev/null +++ b/data/layouts/ContestHallBeauty/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&22222솫�2222226솫�26 \ No newline at end of file diff --git a/data/layouts/ContestHallCool/border.bin b/data/layouts/ContestHallCool/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/ContestHallCool/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ContestHallCool/map.bin b/data/layouts/ContestHallCool/map.bin new file mode 100644 index 000000000..4e2166c19 --- /dev/null +++ b/data/layouts/ContestHallCool/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy򕂐�2yyz%2%2&22222򭪠�2222226򭪠�26 \ No newline at end of file diff --git a/data/layouts/ContestHallCute/border.bin b/data/layouts/ContestHallCute/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/ContestHallCute/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ContestHallCute/map.bin b/data/layouts/ContestHallCute/map.bin new file mode 100644 index 000000000..9fcec5a5e --- /dev/null +++ b/data/layouts/ContestHallCute/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy񣱰�2yyz%2%2&22222񼚀�2222226񼚀�26 \ No newline at end of file diff --git a/data/layouts/ContestHallSmart/border.bin b/data/layouts/ContestHallSmart/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/ContestHallSmart/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ContestHallSmart/map.bin b/data/layouts/ContestHallSmart/map.bin new file mode 100644 index 000000000..ad068fe7c --- /dev/null +++ b/data/layouts/ContestHallSmart/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy�2�2�2yyz%2%2&22222𙹀�2222226𙹀�26 \ No newline at end of file diff --git a/data/layouts/ContestHallTough/border.bin b/data/layouts/ContestHallTough/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/ContestHallTough/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/ContestHallTough/map.bin b/data/layouts/ContestHallTough/map.bin new file mode 100644 index 000000000..59e9e9182 --- /dev/null +++ b/data/layouts/ContestHallTough/map.bin @@ -0,0 +1 @@ +```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy𲡐�2yyz%2%2&22222񋉠�2222226񋉠�26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom1/border.bin b/data/layouts/LinkContestRoom1/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/LinkContestRoom1/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/LinkContestRoom1/map.bin b/data/layouts/LinkContestRoom1/map.bin deleted file mode 100644 index a8853f6ae..000000000 --- a/data/layouts/LinkContestRoom1/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyyk2l2m2yyz%2%2&22222s2t2u2222226s2t2u26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom2/border.bin b/data/layouts/LinkContestRoom2/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/LinkContestRoom2/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/LinkContestRoom2/map.bin b/data/layouts/LinkContestRoom2/map.bin deleted file mode 100644 index 7cb63b40d..000000000 --- a/data/layouts/LinkContestRoom2/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy{2|2}2yyz%2%2&22222솫�2222226솫�26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom3/border.bin b/data/layouts/LinkContestRoom3/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/LinkContestRoom3/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/LinkContestRoom3/map.bin b/data/layouts/LinkContestRoom3/map.bin deleted file mode 100644 index 59e9e9182..000000000 --- a/data/layouts/LinkContestRoom3/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy𲡐�2yyz%2%2&22222񋉠�2222226񋉠�26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom4/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/LinkContestRoom4/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/LinkContestRoom4/map.bin b/data/layouts/LinkContestRoom4/map.bin deleted file mode 100644 index 4e2166c19..000000000 --- a/data/layouts/LinkContestRoom4/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy򕂐�2yyz%2%2&22222򭪠�2222226򭪠�26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom5/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/LinkContestRoom5/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/LinkContestRoom5/map.bin b/data/layouts/LinkContestRoom5/map.bin deleted file mode 100644 index ad068fe7c..000000000 --- a/data/layouts/LinkContestRoom5/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy�2�2�2yyz%2%2&22222𙹀�2222226𙹀�26 \ No newline at end of file diff --git a/data/layouts/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom6/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/LinkContestRoom6/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/LinkContestRoom6/map.bin b/data/layouts/LinkContestRoom6/map.bin deleted file mode 100644 index 9fcec5a5e..000000000 --- a/data/layouts/LinkContestRoom6/map.bin +++ /dev/null @@ -1 +0,0 @@ -```````````````              $%2%2%2%2%2%2%2%2%2%2%2%2%2&$%2%2hiiiiiiij%2%2&$%2%2pq2q2q2q2q2o2q2r%2%2&$%2%2pq2q2q2�2q2w6q2r%2%2&$%2%2pq2q2q2�2q2q2q2r%2%2&$%2%2pq2q2q2q2q2q2q2r%2%2&$%2%2xyy񣱰�2yyz%2%2&22222񼚀�2222226񼚀�26 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 5a696d5e0..6e6f92117 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -2242,14 +2242,14 @@ "blockdata_filepath": "data/layouts/BattleColosseum4P/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", -- cgit v1.2.3 From 248b85c3cb41771b8bf20699c5740e894946fb14 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 12 Nov 2019 19:51:19 -0500 Subject: Document Frontier Exchange Corner scripts --- .../border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePointExchangeServiceCorner/map.bin | 2 -- .../layouts/BattleFrontier_ExchangeServiceCorner/border.bin | Bin 0 -> 8 bytes data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin | 2 ++ data/layouts/layouts.json | 8 ++++---- 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin delete mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin create mode 100644 data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin create mode 100644 data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin (limited to 'data/layouts') diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin deleted file mode 100644 index 62d5761e0..000000000 --- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin +++ /dev/null @@ -1,2 +0,0 @@ -���������������������  -�����������  �����������������������������������������������������������������������������������������������mno���������uvw���� \ No newline at end of file diff --git a/data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin b/data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_ExchangeServiceCorner/border.bin differ diff --git a/data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin b/data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin new file mode 100644 index 000000000..62d5761e0 --- /dev/null +++ b/data/layouts/BattleFrontier_ExchangeServiceCorner/map.bin @@ -0,0 +1,2 @@ +���������������������  +�����������  �����������������������������������������������������������������������������������������������mno���������uvw���� \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 6e6f92117..bfa2aa811 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -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", -- cgit v1.2.3 From 4dfa959fa297195a040a8cd0436d561296076f0e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 20 Nov 2019 21:46:29 -0500 Subject: Begin documenting Battle Pike and Frontier Util --- .../border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePikeRandomRoom1/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePikeRandomRoom2/map.bin | 1 - .../border.bin | Bin 8 -> 0 bytes .../BattleFrontier_BattlePikeRandomRoom3/map.bin | 1 - .../BattleFrontier_BattlePikeRoomFinal/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePikeRoomFinal/map.bin | 1 + .../BattleFrontier_BattlePikeRoomNormal/border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePikeRoomNormal/map.bin | 1 + .../border.bin | Bin 0 -> 8 bytes .../BattleFrontier_BattlePikeRoomWildMons/map.bin | 1 + data/layouts/layouts.json | 24 ++++++++++----------- 13 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin (limited to 'data/layouts') diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin deleted file mode 100644 index 142150cbe..000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin +++ /dev/null @@ -1 +0,0 @@ -���������������������񺣲�6���򢣼󸬰򕂔󸭘򢩂�2,�2�2�2,󴞄򭪂󴞬�2􃶜򧠒򭪂3􀶸�23򧠒򭪂-�2�2�2-򧠒 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin deleted file mode 100644 index 27a6e52aa..000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin +++ /dev/null @@ -1 +0,0 @@ -񒢘񘫌񆏾񮏪񛱞򃲸򉻬�652���52=@3A3B3=�2H3I3J3�242P3Q3R3�2<X3Y3Z3� \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin deleted file mode 100644 index 8ce7f1c37..000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin +++ /dev/null @@ -1 +0,0 @@ -���������������������񺣲�6���򢣼󷞀򕂔󷞨�󱙌��2�2�2�󴞄42�2 3�2�2�2 3󽭊>��򧠒�2���72 3 3󽭊�2 3 3�2>�������򧤂 3 3 3 3 3 3 3󽩆��������42 3 3 3 3 3 3�2 3>�������2�3�2 3 3 3 3 3�2 3>�2�������72�2 3 3 3 3 3�2 3>�������2�3 3󴞄󴞄󴞢 3>�3�2�2�23��󱙌�2�2�2󴞄 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeRoomFinal/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin new file mode 100644 index 000000000..27a6e52aa --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRoomFinal/map.bin @@ -0,0 +1 @@ +񒢘񘫌񆏾񮏪񛱞򃲸򉻬�652���52=@3A3B3=�2H3I3J3�242P3Q3R3�2<X3Y3Z3� \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeRoomNormal/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin new file mode 100644 index 000000000..142150cbe --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRoomNormal/map.bin @@ -0,0 +1 @@ +���������������������񺣲�6���򢣼󸬰򕂔󸭘򢩂�2,�2�2�2,󴞄򭪂󴞬�2􃶜򧠒򭪂3􀶸�23򧠒򭪂-�2�2�2-򧠒 \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin new file mode 100644 index 000000000..8ce7f1c37 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePikeRoomWildMons/map.bin @@ -0,0 +1 @@ +���������������������񺣲�6���򢣼󷞀򕂔󷞨�󱙌��2�2�2�󴞄42�2 3�2�2�2 3󽭊>��򧠒�2���72 3 3󽭊�2 3 3�2>�������򧤂 3 3 3 3 3 3 3󽩆��������42 3 3 3 3 3 3�2 3>�������2�3�2 3 3 3 3 3�2 3>�2�������72�2 3 3 3 3 3�2 3>�������2�3 3󴞄󴞄󴞢 3>�3�2�2�23��󱙌�2�2�2󴞄 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index bfa2aa811..ffa394fa1 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -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", -- cgit v1.2.3 From 75b0c9d7a9edabc742bc42f19d078fa2ae64870c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 11 Dec 2019 03:28:55 -0500 Subject: Document Battle Pyramid scripts --- .../BattleFrontier_BattlePyramidEmptySquare/border.bin | Bin 8 -> 0 bytes .../layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin | 1 - data/layouts/BattleFrontier_BattlePyramidFloor/border.bin | Bin 0 -> 8 bytes data/layouts/BattleFrontier_BattlePyramidFloor/map.bin | 1 + data/layouts/layouts.json | 8 ++++---- 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin delete mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin create mode 100644 data/layouts/BattleFrontier_BattlePyramidFloor/border.bin create mode 100644 data/layouts/BattleFrontier_BattlePyramidFloor/map.bin (limited to 'data/layouts') diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin deleted file mode 100644 index f496f458e..000000000 Binary files a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin and /dev/null differ diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin deleted file mode 100644 index 7c224d524..000000000 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin +++ /dev/null @@ -1 +0,0 @@ -��2�2�2�2�2�2��2�2�������2�2������2�2�2�������2�2������2��2������2��2�2�2�2�2�2�2�2�2�2�2�2�2�2� \ No newline at end of file diff --git a/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin new file mode 100644 index 000000000..f496f458e Binary files /dev/null and b/data/layouts/BattleFrontier_BattlePyramidFloor/border.bin differ diff --git a/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin new file mode 100644 index 000000000..7c224d524 --- /dev/null +++ b/data/layouts/BattleFrontier_BattlePyramidFloor/map.bin @@ -0,0 +1 @@ +��2�2�2�2�2�2��2�2�������2�2������2�2�2�������2�2������2��2������2��2�2�2�2�2�2�2�2�2�2�2�2�2�2� \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index ffa394fa1..201cd7bdf 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -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", -- cgit v1.2.3 From ddfa0c6298f4c4dcde9b40782bbdf41867bff761 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 14 Dec 2019 03:58:20 -0500 Subject: Document Battle Tower scripts --- .../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 ffa394fa1..c41bf92bd 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 From 22931846d680de2bc585093678db3f5721aab891 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 13 Jan 2020 21:13:33 -0500 Subject: Fix Colosseum name porymap issue --- data/layouts/BattleColosseum2P/border.bin | 1 - data/layouts/BattleColosseum2P/map.bin | 1 - data/layouts/BattleColosseum4P/border.bin | 1 - data/layouts/BattleColosseum4P/map.bin | 1 - data/layouts/BattleColosseum_2P/border.bin | 1 + data/layouts/BattleColosseum_2P/map.bin | 1 + data/layouts/BattleColosseum_4P/border.bin | 1 + data/layouts/BattleColosseum_4P/map.bin | 1 + data/layouts/layouts.json | 12 ++++++------ 9 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 data/layouts/BattleColosseum2P/border.bin delete mode 100644 data/layouts/BattleColosseum2P/map.bin delete mode 100644 data/layouts/BattleColosseum4P/border.bin delete mode 100644 data/layouts/BattleColosseum4P/map.bin create mode 100644 data/layouts/BattleColosseum_2P/border.bin create mode 100644 data/layouts/BattleColosseum_2P/map.bin create mode 100644 data/layouts/BattleColosseum_4P/border.bin create mode 100644 data/layouts/BattleColosseum_4P/map.bin (limited to 'data/layouts') diff --git a/data/layouts/BattleColosseum2P/border.bin b/data/layouts/BattleColosseum2P/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/BattleColosseum2P/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/BattleColosseum2P/map.bin b/data/layouts/BattleColosseum2P/map.bin deleted file mode 100644 index 1f66ab707..000000000 --- a/data/layouts/BattleColosseum2P/map.bin +++ /dev/null @@ -1 +0,0 @@ -hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2T2U2U2b2c2U2U2V2U2�2���2U2`2U2U2d2e2U2U2a2U2�2���2U2T2U2U2f2g2U2U2V2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2 \ No newline at end of file diff --git a/data/layouts/BattleColosseum4P/border.bin b/data/layouts/BattleColosseum4P/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/layouts/BattleColosseum4P/border.bin +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/layouts/BattleColosseum4P/map.bin b/data/layouts/BattleColosseum4P/map.bin deleted file mode 100644 index 77606e818..000000000 --- a/data/layouts/BattleColosseum4P/map.bin +++ /dev/null @@ -1 +0,0 @@ -hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2`2U2U2b2c2U2U2a2U2�2���2U2T2U2U2d2e2U2U2V2U2�2���2U2`2U2U2f2g2U2U2a2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2!2!2 \ No newline at end of file diff --git a/data/layouts/BattleColosseum_2P/border.bin b/data/layouts/BattleColosseum_2P/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/BattleColosseum_2P/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/BattleColosseum_2P/map.bin b/data/layouts/BattleColosseum_2P/map.bin new file mode 100644 index 000000000..1f66ab707 --- /dev/null +++ b/data/layouts/BattleColosseum_2P/map.bin @@ -0,0 +1 @@ +hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2T2U2U2b2c2U2U2V2U2�2���2U2`2U2U2d2e2U2U2a2U2�2���2U2T2U2U2f2g2U2U2V2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2 \ No newline at end of file diff --git a/data/layouts/BattleColosseum_4P/border.bin b/data/layouts/BattleColosseum_4P/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/layouts/BattleColosseum_4P/border.bin @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/layouts/BattleColosseum_4P/map.bin b/data/layouts/BattleColosseum_4P/map.bin new file mode 100644 index 000000000..77606e818 --- /dev/null +++ b/data/layouts/BattleColosseum_4P/map.bin @@ -0,0 +1 @@ +hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_�ଂL2M2솫�2�2M2N2㺻���2U2`2U2U2b2c2U2U2a2U2�2���2U2T2U2U2d2e2U2U2V2U2�2���2U2`2U2U2f2g2U2U2a2U2�2���2U2\2]2]2]2]2]2]2^2U2�2�!2!2!2!2 \ No newline at end of file diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index cb41ff9e9..681f46f75 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -2203,13 +2203,13 @@ }, { "id": "LAYOUT_BATTLE_COLOSSEUM_2P", - "name": "BattleColosseum2P_Layout", + "name": "BattleColosseum_2P_Layout", "width": 14, "height": 9, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_CableClub", - "border_filepath": "data/layouts/BattleColosseum2P/border.bin", - "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin" + "border_filepath": "data/layouts/BattleColosseum_2P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin" }, { "id": "LAYOUT_TRADE_CENTER", @@ -2233,13 +2233,13 @@ }, { "id": "LAYOUT_BATTLE_COLOSSEUM_4P", - "name": "BattleColosseum4P_Layout", + "name": "BattleColosseum_4P_Layout", "width": 14, "height": 9, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_CableClub", - "border_filepath": "data/layouts/BattleColosseum4P/border.bin", - "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin" + "border_filepath": "data/layouts/BattleColosseum_4P/border.bin", + "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin" }, { "id": "LAYOUT_CONTEST_HALL", -- cgit v1.2.3