Sync Cable Club scripts

8 files changed, 21 insertions, 19 deletions

diff --git a/src/battle_records.c b/src/battle_records.c
index 38889ca67..07ff665d9 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -450,7 +450,7 @@ static void UpdateBattleOutcomeOnTrainerCards(s32 battlerId)
 
 void TryRecordLinkBattleOutcome(s32 battlerId)
 {
-    if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNKNOWN_MAP_00_04) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNKNOWN_MAP_00_04))
+    if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNION_ROOM) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNION_ROOM))
     {
         UpdateBattleOutcomeOnTrainerCards(battlerId);
         AddOpponentLinkBattleRecord(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].playerName, gTrainerCards[battlerId].trainerId, gBattleOutcome, gLinkPlayers[battlerId].language);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 17da53083..dee0c492b 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -901,7 +901,7 @@ static void CB2_EndTrainerBattle(void)
             gSpecialVar_Result = 1;
             if (gUnknown_20386CC & 1)
             {
-                sp000_heal_pokemon();
+                HealPlayerParty();
             }
             else
             {
diff --git a/src/event_object_lock.c b/src/event_object_lock.c
index 17ec57b20..ea4fa00b9 100644
--- a/src/event_object_lock.c
+++ b/src/event_object_lock.c
@@ -104,12 +104,12 @@ void sub_80696F0(void)
     UnfreezeObjectEvents();
 }
 
-void sub_8069740(void)
+void Script_FacePlayer(void)
 {
     ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing);
 }
 
-void sub_8069768(void)
+void Script_ClearHeldMovement(void)
 {
     ObjectEventClearAnimIfSpecialAnimActive(&gObjectEvents[gSelectedObjectEvent]);
 }
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index e2da82de2..dbc5f23b5 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -677,7 +677,7 @@ static void sub_807E678(u8 taskId)
     }
 }
 
-void sub_807E704(void)
+void ReturnFromLinkRoom(void)
 {
     CreateTask(sub_807E678, 10);
 }
diff --git a/src/field_specials.c b/src/field_specials.c
index 55f3bcce5..6f42ba764 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1985,7 +1985,7 @@ const u16 sPokeCenter1FMaps[] = {
     MAP_FIVE_ISLAND_POKEMON_CENTER_1F,
     MAP_SEVEN_ISLAND_POKEMON_CENTER_1F,
     MAP_SIX_ISLAND_POKEMON_CENTER_1F,
-    MAP_UNKNOWN_MAP_00_04,
+    MAP_UNION_ROOM,
     MAP_UNDEFINED
 };
 
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 6d4652f35..1e61b9b77 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -14,7 +14,7 @@ bool8 Special_HallOfFame(void)
     bool8 *r7;
     int i;
     bool8 gaveAtLeastOneRibbon;
-    sp000_heal_pokemon();
+    HealPlayerParty();
     if (FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE)
     {
         gHasHallOfFameRecords = TRUE;
diff --git a/src/save_location.c b/src/save_location.c
index 9b679c7ee..561fd2ff2 100644
--- a/src/save_location.c
+++ b/src/save_location.c
@@ -36,8 +36,10 @@ static const u16 sSaveLocationPokeCenterList[] =
     MAP_FIVE_ISLAND_POKEMON_CENTER_1F, MAP_FIVE_ISLAND_POKEMON_CENTER_2F,
     MAP_SEVEN_ISLAND_POKEMON_CENTER_1F, MAP_SEVEN_ISLAND_POKEMON_CENTER_2F, 
     MAP_SIX_ISLAND_POKEMON_CENTER_1F, MAP_SIX_ISLAND_POKEMON_CENTER_2F,
-    MAP_UNKNOWN_MAP_00_00, MAP_UNKNOWN_MAP_00_01,
-    MAP_UNKNOWN_MAP_00_03, MAP_UNKNOWN_MAP_00_04,
+    MAP_BATTLE_COLOSSEUM_2P, 
+    MAP_TRADE_CENTER,
+    MAP_BATTLE_COLOSSEUM_4P, 
+    MAP_UNION_ROOM,
     0xFFFF,
 };
 
diff --git a/src/script_menu.c b/src/script_menu.c
index 827f79fa6..2a81a7bce 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -598,22 +598,22 @@ const u8 *const gStdStringPtrs[] = {
 };
 
 static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = {
-    Text_1BC388,
-    Text_1BC3C7,
-    Text_1BCB42
+    CableClub_Text_TradeMonsUsingLinkCable,
+    CableClub_Text_BattleUsingLinkCable,
+    CableClub_Text_CancelSelectedItem
 };
 
 static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[] = {
-    Text_1BCA95,
-    Text_1BCACB,
-    Text_1BCAF2,
-    Text_1BCB42
+    CableClub_Text_YouMayTradeHere,
+    CableClub_Text_YouMayBattleHere,
+    CableClub_Text_CanMakeBerryPowder,
+    CableClub_Text_CancelSelectedItem
 };
 
 static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCancel[] = {
-    Text_1BCA95,
-    Text_1BCACB,
-    Text_1BCB42
+    CableClub_Text_YouMayTradeHere,
+    CableClub_Text_YouMayBattleHere,
+    CableClub_Text_CancelSelectedItem
 };
 
 static const union AnimCmd sMuseumFossilAnim0[] = {