summaryrefslogtreecommitdiff
path: root/data/layouts
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-13 21:27:06 -0500
committerhuderlem <huderlem@gmail.com>2020-01-13 20:34:30 -0600
commit8c560386edeecf0b40b4c9f58ceaac50f4f22397 (patch)
treee36a0c99e35aad986a477316d70837025f89a1cb /data/layouts
parent172e1aafa8b2a3bd7d7f2f9d8d40cb71ba80b644 (diff)
Sync Colosseum map names
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)bin252 -> 252 bytes
-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)bin252 -> 252 bytes
-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 efef023e6..efef023e6 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 8616a5f1b..8616a5f1b 100644
--- a/data/layouts/BattleColosseum2P/map.bin
+++ b/data/layouts/BattleColosseum_2P/map.bin
Binary files differ
diff --git a/data/layouts/BattleColosseum4P/border.bin b/data/layouts/BattleColosseum_4P/border.bin
index efef023e6..efef023e6 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 c68e13ec3..c68e13ec3 100644
--- a/data/layouts/BattleColosseum4P/map.bin
+++ b/data/layouts/BattleColosseum_4P/map.bin
Binary files differ
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 6a9b024bd..04727aaa7 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -434,15 +434,15 @@
},
{
"id": "LAYOUT_BATTLE_COLOSSEUM_2P",
- "name": "BattleColosseum2P_Layout",
+ "name": "BattleColosseum_2P_Layout",
"width": 14,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44",
- "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",
@@ -470,15 +470,15 @@
},
{
"id": "LAYOUT_BATTLE_COLOSSEUM_4P",
- "name": "BattleColosseum4P_Layout",
+ "name": "BattleColosseum_4P_Layout",
"width": 14,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44",
- "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_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",