Merge pull request #883 from GriffinRichards/fix-colossname

Fix Battle Colosseum names

7 files changed, 21 insertions, 21 deletions

diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/BattleColosseum2P/map.json
index f63464424..18df18491 100644
--- a/data/maps/SingleBattleColosseum/map.json
+++ b/data/maps/BattleColosseum2P/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SINGLE_BATTLE_COLOSSEUM",
-  "name": "SingleBattleColosseum",
-  "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM",
+  "id": "MAP_BATTLE_COLOSSEUM_2P",
+  "name": "BattleColosseum2P",
+  "layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
   "music": "MUS_RAINBOW",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SingleBattleColosseum_EventScript_Attendant",
+      "script": "BattleColosseum2P_EventScript_Attendant",
       "flag": "0"
     }
   ],
@@ -52,7 +52,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_SingleBattleColosseum_PlayerSpot0"
+      "script": "EventScript_BattleColosseum2P_PlayerSpot0"
     },
     {
       "type": "trigger",
@@ -61,7 +61,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_SingleBattleColosseum_PlayerSpot1"
+      "script": "EventScript_BattleColosseum2P_PlayerSpot1"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc
new file mode 100644
index 000000000..efa01af6c
--- /dev/null
+++ b/data/maps/BattleColosseum2P/scripts.inc
@@ -0,0 +1,3 @@
+BattleColosseum2P_MapScripts:: @ 823B77D
+	.byte 0
+
diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/BattleColosseum4P/map.json
index 172bb3fdc..d17851aaf 100644
--- a/data/maps/DoubleBattleColosseum/map.json
+++ b/data/maps/BattleColosseum4P/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_DOUBLE_BATTLE_COLOSSEUM",
-  "name": "DoubleBattleColosseum",
-  "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM",
+  "id": "MAP_BATTLE_COLOSSEUM_4P",
+  "name": "BattleColosseum4P",
+  "layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
   "music": "MUS_RAINBOW",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
@@ -52,7 +52,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_DoubleBattleColosseum_PlayerSpot0"
+      "script": "EventScript_BattleColosseum4P_PlayerSpot0"
     },
     {
       "type": "trigger",
@@ -61,7 +61,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
+      "script": "EventScript_BattleColosseum4P_PlayerSpot2"
     },
     {
       "type": "trigger",
@@ -70,7 +70,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
+      "script": "EventScript_BattleColosseum4P_PlayerSpot1"
     },
     {
       "type": "trigger",
@@ -79,7 +79,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "EventScript_DoubleBattleColosseum_PlayerSpot3"
+      "script": "EventScript_BattleColosseum4P_PlayerSpot3"
     }
   ],
   "bg_events": []
diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc
new file mode 100644
index 000000000..b1733aecd
--- /dev/null
+++ b/data/maps/BattleColosseum4P/scripts.inc
@@ -0,0 +1,3 @@
+BattleColosseum4P_MapScripts:: @ 823B780
+	.byte 0
+
diff --git a/data/maps/DoubleBattleColosseum/scripts.inc b/data/maps/DoubleBattleColosseum/scripts.inc
deleted file mode 100644
index ac64377ae..000000000
--- a/data/maps/DoubleBattleColosseum/scripts.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-DoubleBattleColosseum_MapScripts:: @ 823B780
-	.byte 0
-
diff --git a/data/maps/SingleBattleColosseum/scripts.inc b/data/maps/SingleBattleColosseum/scripts.inc
deleted file mode 100644
index 06ed3ef16..000000000
--- a/data/maps/SingleBattleColosseum/scripts.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-SingleBattleColosseum_MapScripts:: @ 823B77D
-	.byte 0
-
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 7b78a80db..74746e0c4 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -456,10 +456,10 @@
     "SecretBase_YellowCave4",
     "SecretBase_Tree4",
     "SecretBase_Shrub4",
-    "SingleBattleColosseum",
+    "BattleColosseum2P",
     "TradeCenter",
     "RecordCorner",
-    "DoubleBattleColosseum",
+    "BattleColosseum4P",
     "LinkContestRoom1",
     "UnknownLinkContestRoom_25_29",
     "UnknownLinkContestRoom_25_30",