Fix Battle Colosseum names

21 files changed, 72 insertions, 72 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index b1e637bf0..79ca1ea8e 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -436,10 +436,10 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/AlteringCave/scripts.inc"
 	.include "data/maps/MeteorFalls_StevensCave/scripts.inc"
 	.include "data/scripts/shared_secret_base.inc"
-	.include "data/maps/SingleBattleColosseum/scripts.inc"
+	.include "data/maps/BattleColosseum2P/scripts.inc"
 	.include "data/maps/TradeCenter/scripts.inc"
 	.include "data/maps/RecordCorner/scripts.inc"
-	.include "data/maps/DoubleBattleColosseum/scripts.inc"
+	.include "data/maps/BattleColosseum4P/scripts.inc"
 	.include "data/maps/LinkContestRoom1/scripts.inc"
 	.include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc"
 	.include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc"
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",
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",
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index ebb2e6ef0..9d3bccaf9 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -388,9 +388,9 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
 	waitdooranim
 	release
 	compare VAR_0x8004, USING_MULTI_BATTLE
-	goto_if_eq CableClub_EventScript_WarpToDoubleColosseum
+	goto_if_eq CableClub_EventScript_WarpTo4PColosseum
 	special SetCableClubWarp
-	warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
+	warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
 	special sub_80AF948
 	waitstate
 	end
@@ -401,9 +401,9 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
 	waitmovement 0
 	return
 
-CableClub_EventScript_WarpToDoubleColosseum:: @ 8277036
+CableClub_EventScript_WarpTo4PColosseum:: @ 8277036
 	special SetCableClubWarp
-	warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8
+	warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
 	special sub_80AF948
 	waitstate
 	end
@@ -710,63 +710,63 @@ EventScript_CableBoxResults:: @ 8277365
 	releaseall
 	end
 
-EventScript_SingleBattleColosseum_PlayerSpot0:: @ 8277374
+EventScript_BattleColosseum2P_PlayerSpot0:: @ 8277374
 	setvar VAR_0x8005, 0
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_SingleBattleColosseum_PlayerSpot1:: @ 827737E
+EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E
 	setvar VAR_0x8005, 1
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_PlayerSpot0:: @ 8277388
+EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+	goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
 	setvar VAR_0x8005, 0
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_PlayerSpot1:: @ 82773A3
+EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+	goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
 	setvar VAR_0x8005, 1
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_PlayerSpot2:: @ 82773BE
+EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+	goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
 	setvar VAR_0x8005, 2
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_PlayerSpot3:: @ 82773D9
+EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_DoubleBattleColosseum_CancelSpotTrigger
+	goto_if_eq EventScript_BattleColosseum4P_CancelSpotTrigger
 	setvar VAR_0x8005, 3
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_DoubleBattleColosseum_CancelSpotTrigger:: @ 82773F4
+EventScript_BattleColosseum4P_CancelSpotTrigger:: @ 82773F4
 	end
 
 EventScript_TradeCenter_Chair0:: @ 82773F5
@@ -854,9 +854,9 @@ CableClub_EventScript_TooBusyToNotice:: @ 827749C
 	closemessage
 	end
 
-SingleBattleColosseum_EventScript_Attendant:: @ 82774A6
+BattleColosseum2P_EventScript_Attendant:: @ 82774A6
 	special Script_FacePlayer
-	msgbox SingleBattleColosseum_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
+	msgbox BattleColosseum2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
 	special Script_ClearHeldMovement
 	closemessage
 	end
diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc
index 85e0e4edb..7e98d9fc7 100644
--- a/data/text/cable_club.inc
+++ b/data/text/cable_club.inc
@@ -123,7 +123,7 @@ CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B
 	.string "TRAINER CARD!\p"
 	.string "It's a {STR_VAR_2} card!$"
 
-SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4
+BattleColosseum2P_Text_TakePlaceStartBattle: @ 82784B4
 	.string "Please take your place and start\n"
 	.string "your battle.$"
 
diff --git a/include/constants/layouts.h b/include/constants/layouts.h
index d4819c46a..fd64196e0 100755
--- a/include/constants/layouts.h
+++ b/include/constants/layouts.h
@@ -221,10 +221,10 @@
 #define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218
 #define LAYOUT_SECRET_BASE_TREE4 219
 #define LAYOUT_SECRET_BASE_SHRUB4 220
-#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221
+#define LAYOUT_BATTLE_COLOSSEUM_2P 221
 #define LAYOUT_TRADE_CENTER 222
 #define LAYOUT_RECORD_CORNER 223
-#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224
+#define LAYOUT_BATTLE_COLOSSEUM_4P 224
 #define LAYOUT_LINK_CONTEST_ROOM1 225
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226
 #define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 802c381b5..63717c92c 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -422,10 +422,10 @@
 #define MAP_SECRET_BASE_YELLOW_CAVE4        (21 | (25 << 8))
 #define MAP_SECRET_BASE_TREE4               (22 | (25 << 8))
 #define MAP_SECRET_BASE_SHRUB4              (23 | (25 << 8))
-#define MAP_SINGLE_BATTLE_COLOSSEUM         (24 | (25 << 8))
+#define MAP_BATTLE_COLOSSEUM_2P             (24 | (25 << 8))
 #define MAP_TRADE_CENTER                    (25 | (25 << 8))
 #define MAP_RECORD_CORNER                   (26 | (25 << 8))
-#define MAP_DOUBLE_BATTLE_COLOSSEUM         (27 | (25 << 8))
+#define MAP_BATTLE_COLOSSEUM_4P             (27 | (25 << 8))
 #define MAP_LINK_CONTEST_ROOM1              (28 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8))
 #define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8))
diff --git a/src/field_specials.c b/src/field_specials.c
index 65bc3a095..08daadc4f 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3998,10 +3998,10 @@ bool8 InPokemonCenter(void)
         MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F,
         MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F,
         MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
-        MAP_SINGLE_BATTLE_COLOSSEUM,
+        MAP_BATTLE_COLOSSEUM_2P,
         MAP_TRADE_CENTER,
         MAP_RECORD_CORNER,
-        MAP_DOUBLE_BATTLE_COLOSSEUM,
+        MAP_BATTLE_COLOSSEUM_4P,
         0xFFFF
     };
 
diff --git a/src/overworld.c b/src/overworld.c
index 55afe2fcf..42a39d03e 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -88,16 +88,16 @@ extern const u8 EventScript_DoLinkRoomExit[];
 extern const u8 CableClub_EventScript_TooBusyToNotice[];
 extern const u8 CableClub_EventScript_ReadTrainerCard[];
 extern const u8 CableClub_EventScript_ReadTrainerCardColored[];
-extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot0[];
-extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot1[];
-extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot2[];
-extern const u8 EventScript_DoubleBattleColosseum_PlayerSpot3[];
+extern const u8 EventScript_BattleColosseum4P_PlayerSpot0[];
+extern const u8 EventScript_BattleColosseum4P_PlayerSpot1[];
+extern const u8 EventScript_BattleColosseum4P_PlayerSpot2[];
+extern const u8 EventScript_BattleColosseum4P_PlayerSpot3[];
 extern const u8 EventScript_RecordCenter_Spot0[];
 extern const u8 EventScript_RecordCenter_Spot1[];
 extern const u8 EventScript_RecordCenter_Spot2[];
 extern const u8 EventScript_RecordCenter_Spot3[];
-extern const u8 EventScript_SingleBattleColosseum_PlayerSpot0[];
-extern const u8 EventScript_SingleBattleColosseum_PlayerSpot1[];
+extern const u8 EventScript_BattleColosseum2P_PlayerSpot0[];
+extern const u8 EventScript_BattleColosseum2P_PlayerSpot1[];
 extern const u8 EventScript_TradeCenter_Chair1[];
 extern const u8 EventScript_TradeCenter_Chair0[];
 extern const u8 EventScript_ConfirmLeaveTradeRoom[];
@@ -2781,13 +2781,13 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player)
 // these event scripts runs.
 static u16 GetDirectionForEventScript(const u8 *script)
 {
-    if (script == EventScript_DoubleBattleColosseum_PlayerSpot0)
+    if (script == EventScript_BattleColosseum4P_PlayerSpot0)
         return FACING_FORCED_RIGHT;
-    else if (script == EventScript_DoubleBattleColosseum_PlayerSpot1)
+    else if (script == EventScript_BattleColosseum4P_PlayerSpot1)
         return FACING_FORCED_LEFT;
-    else if (script == EventScript_DoubleBattleColosseum_PlayerSpot2)
+    else if (script == EventScript_BattleColosseum4P_PlayerSpot2)
         return FACING_FORCED_RIGHT;
-    else if (script == EventScript_DoubleBattleColosseum_PlayerSpot3)
+    else if (script == EventScript_BattleColosseum4P_PlayerSpot3)
         return FACING_FORCED_LEFT;
     else if (script == EventScript_RecordCenter_Spot0)
         return FACING_FORCED_RIGHT;
@@ -2797,9 +2797,9 @@ static u16 GetDirectionForEventScript(const u8 *script)
         return FACING_FORCED_RIGHT;
     else if (script == EventScript_RecordCenter_Spot3)
         return FACING_FORCED_LEFT;
-    else if (script == EventScript_SingleBattleColosseum_PlayerSpot0)
+    else if (script == EventScript_BattleColosseum2P_PlayerSpot0)
         return FACING_FORCED_RIGHT;
-    else if (script == EventScript_SingleBattleColosseum_PlayerSpot1)
+    else if (script == EventScript_BattleColosseum2P_PlayerSpot1)
         return FACING_FORCED_LEFT;
     else if (script == EventScript_TradeCenter_Chair0)
         return FACING_FORCED_RIGHT;
diff --git a/src/save_location.c b/src/save_location.c
index 2443b3161..b3cb9b4fd 100644
--- a/src/save_location.c
+++ b/src/save_location.c
@@ -52,10 +52,10 @@ static const u16 sSaveLocationPokeCenterList[] =
     MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F,
     MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
     MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F,
-    MAP_SINGLE_BATTLE_COLOSSEUM,
+    MAP_BATTLE_COLOSSEUM_2P,
     MAP_TRADE_CENTER,
     MAP_RECORD_CORNER,
-    MAP_DOUBLE_BATTLE_COLOSSEUM,
+    MAP_BATTLE_COLOSSEUM_4P,
     0xFFFF,
 };
 
diff --git a/src/union_room.c b/src/union_room.c
index 5952b03eb..948468c00 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1470,7 +1470,7 @@ void sub_801440C(u8 taskId)
         HealPlayerParty();
         SavePlayerParty();
         LoadPlayerBag();
-        sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_SINGLE_BATTLE);
+        sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_SINGLE_BATTLE);
         SetMainCallback2(sub_8014384);
         break;
     case 2:
@@ -1479,7 +1479,7 @@ void sub_801440C(u8 taskId)
         SavePlayerParty();
         LoadPlayerBag();
         sub_80143E4(gBlockSendBuffer, TRUE);
-        sub_8014304(MAP_GROUP(SINGLE_BATTLE_COLOSSEUM), MAP_NUM(SINGLE_BATTLE_COLOSSEUM), 6, 8, USING_DOUBLE_BATTLE);
+        sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_2P), MAP_NUM(BATTLE_COLOSSEUM_2P), 6, 8, USING_DOUBLE_BATTLE);
         SetMainCallback2(sub_8014384);
         break;
     case 3:
@@ -1488,7 +1488,7 @@ void sub_801440C(u8 taskId)
         SavePlayerParty();
         LoadPlayerBag();
         sub_80143E4(gBlockSendBuffer, TRUE);
-        sub_8014304(MAP_GROUP(DOUBLE_BATTLE_COLOSSEUM), MAP_NUM(DOUBLE_BATTLE_COLOSSEUM), 5, 8, USING_MULTI_BATTLE);
+        sub_8014304(MAP_GROUP(BATTLE_COLOSSEUM_4P), MAP_NUM(BATTLE_COLOSSEUM_4P), 5, 8, USING_MULTI_BATTLE);
         SetMainCallback2(sub_8014384);
         break;
     case 4: