diff options
| author | huderlem <huderlem@gmail.com> | 2019-11-08 17:24:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 17:24:05 -0600 |
| commit | 906a1ec4ab826400f8740fdaf0bd605350fcc4cd (patch) | |
| tree | 69bdc636b708b6d6ca773d065dfde04ddfa6538e /data/layouts | |
| parent | b38bc9a3a2d93e3482643b257685057e339dec9f (diff) | |
| parent | 35ed8de51b0784e44560237248fc516f96e835df (diff) | |
Merge pull request #883 from GriffinRichards/fix-colossname
Fix Battle Colosseum names
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/BattleColosseum2P/border.bin (renamed from data/layouts/DoubleBattleColosseum/border.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/BattleColosseum2P/map.bin (renamed from data/layouts/SingleBattleColosseum/map.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/BattleColosseum4P/border.bin (renamed from data/layouts/SingleBattleColosseum/border.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/BattleColosseum4P/map.bin (renamed from data/layouts/DoubleBattleColosseum/map.bin) | 0 | ||||
| -rw-r--r-- | data/layouts/layouts.json | 16 |
5 files changed, 8 insertions, 8 deletions
diff --git a/data/layouts/DoubleBattleColosseum/border.bin b/data/layouts/BattleColosseum2P/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/DoubleBattleColosseum/border.bin +++ b/data/layouts/BattleColosseum2P/border.bin diff --git a/data/layouts/SingleBattleColosseum/map.bin b/data/layouts/BattleColosseum2P/map.bin index 1f66ab707..1f66ab707 100644 --- a/data/layouts/SingleBattleColosseum/map.bin +++ b/data/layouts/BattleColosseum2P/map.bin diff --git a/data/layouts/SingleBattleColosseum/border.bin b/data/layouts/BattleColosseum4P/border.bin index 19d906679..19d906679 100644 --- a/data/layouts/SingleBattleColosseum/border.bin +++ b/data/layouts/BattleColosseum4P/border.bin diff --git a/data/layouts/DoubleBattleColosseum/map.bin b/data/layouts/BattleColosseum4P/map.bin index 77606e818..77606e818 100644 --- a/data/layouts/DoubleBattleColosseum/map.bin +++ b/data/layouts/BattleColosseum4P/map.bin 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", |
