summaryrefslogtreecommitdiff
path: root/data/layouts
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-13 21:13:33 -0500
committerhuderlem <huderlem@gmail.com>2020-01-13 20:20:48 -0600
commit22931846d680de2bc585093678db3f5721aab891 (patch)
treed813ff208ef430ea637dec8bcb858065f58ee482 /data/layouts
parent736f3bbbe0d1685474364a68038554f024bff62e (diff)
Fix Colosseum name porymap issue
Diffstat (limited to 'data/layouts')
-rw-r--r--data/layouts/BattleColosseum_2P/border.bin (renamed from data/layouts/BattleColosseum2P/border.bin)0
-rw-r--r--data/layouts/BattleColosseum_2P/map.bin (renamed from data/layouts/BattleColosseum2P/map.bin)0
-rw-r--r--data/layouts/BattleColosseum_4P/border.bin (renamed from data/layouts/BattleColosseum4P/border.bin)0
-rw-r--r--data/layouts/BattleColosseum_4P/map.bin (renamed from data/layouts/BattleColosseum4P/map.bin)0
-rw-r--r--data/layouts/layouts.json12
5 files changed, 6 insertions, 6 deletions
diff --git a/data/layouts/BattleColosseum2P/border.bin b/data/layouts/BattleColosseum_2P/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/BattleColosseum2P/border.bin
+++ b/data/layouts/BattleColosseum_2P/border.bin
diff --git a/data/layouts/BattleColosseum2P/map.bin b/data/layouts/BattleColosseum_2P/map.bin
index 1f66ab707..1f66ab707 100644
--- a/data/layouts/BattleColosseum2P/map.bin
+++ b/data/layouts/BattleColosseum_2P/map.bin
diff --git a/data/layouts/BattleColosseum4P/border.bin b/data/layouts/BattleColosseum_4P/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/BattleColosseum4P/border.bin
+++ b/data/layouts/BattleColosseum_4P/border.bin
diff --git a/data/layouts/BattleColosseum4P/map.bin b/data/layouts/BattleColosseum_4P/map.bin
index 77606e818..77606e818 100644
--- a/data/layouts/BattleColosseum4P/map.bin
+++ b/data/layouts/BattleColosseum_4P/map.bin
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",