From 2f4f63afdb6a7b77a8161f0cd42ae64cc5f1515c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 15 Mar 2021 14:27:50 -0400
Subject: Document old man batttle controller

---
 src/union_room.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/union_room.c')

diff --git a/src/union_room.c b/src/union_room.c
index 772af688b..df4d5af64 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -2022,7 +2022,7 @@ static void Task_RunScriptAndFadeToActivity(u8 taskId)
     case 2:
         if (!gPaletteFade.active)
         {
-            PrepareSendLinkCmd2FFE_or_RfuCmd6600();
+            SetLinkStandbyCallback();
             data[0]++;
         }
         break;
@@ -2246,7 +2246,7 @@ static void Task_MEvent_Leader(u8 taskId)
         Free(data->field_8);
         Free(data->field_0);
         Free(data->field_4);
-        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
+        SetLinkStandbyCallback();
         data->state++;
         break;
     case 17:
@@ -2413,7 +2413,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
         break;
     case 11:
         data->state++;
-        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
+        SetLinkStandbyCallback();
         break;
     case 12:
         if (IsLinkTaskFinished())
@@ -2592,7 +2592,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
         break;
     case 13:
         data->state++;
-        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
+        SetLinkStandbyCallback();
         break;
     case 14:
         if (IsLinkTaskFinished())
@@ -2935,7 +2935,7 @@ static void Task_RunUnionRoom(u8 taskId)
         }
         break;
     case 32:
-        Link_TryStartSend5FFF();
+        SetCloseLinkCallback();
         data->state = 36;
         break;
     case 31:
@@ -2984,7 +2984,7 @@ static void Task_RunUnionRoom(u8 taskId)
         if (PrintOnTextbox(&data->textState, gStringVar4))
         {
             data->state = 41;
-            PrepareSendLinkCmd2FFE_or_RfuCmd6600();
+            SetLinkStandbyCallback();
             data->partnerYesNoResponse = 0;
             data->recvActivityRequest[0] = 0;
         }
@@ -3162,7 +3162,7 @@ static void Task_RunUnionRoom(u8 taskId)
         }
         break;
     case 10:
-        Link_TryStartSend5FFF();
+        SetCloseLinkCallback();
         data->state = 36;
         break;
     case 36:
@@ -3185,7 +3185,7 @@ static void Task_RunUnionRoom(u8 taskId)
         UnionRoom_ScheduleFieldMessageWithFollowupState(14, gStringVar4);
         break;
     case 14:
-        PrepareSendLinkCmd2FFE_or_RfuCmd6600();
+        SetLinkStandbyCallback();
         data->state = 15;
         break;
     case 15:
@@ -3447,7 +3447,7 @@ static bool32 UnionRoom_HandleContactFromOtherPlayer(struct UnkStruct_URoom * ur
         else if (var == 2)
         {
             uroom->state = 36;
-            Link_TryStartSend5FFF();
+            SetCloseLinkCallback();
             return FALSE;
         }
     }
-- 
cgit v1.2.3


From 14aa5bf52f5e6bfe93b41afcd0f9ccd6bb796d68 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 15 Mar 2021 20:17:47 -0400
Subject: Remove unused, unneeded fields from BattleHealthboxInfo

---
 src/union_room.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/union_room.c')

diff --git a/src/union_room.c b/src/union_room.c
index df4d5af64..b4d9c8e5e 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -3563,7 +3563,7 @@ static u8 HandlePlayerListUpdate(void)
     struct UnkStruct_URoom * structPtr = sUnionRoomMain.uRoom;
     s32 r7 = 0;
 
-    // If someone new joined, register them in field_8
+    // If someone new joined, register them in soundTimer
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
         if (AreGnameUnameDifferent(&structPtr->field_C->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy) == TRUE)
-- 
cgit v1.2.3


From 18f108088229e520660ee55fe74a323b3156b036 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 18 Mar 2021 14:33:43 -0400
Subject: Finish syncing pokemon.c with emerald

---
 src/union_room.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/union_room.c')

diff --git a/src/union_room.c b/src/union_room.c
index b4d9c8e5e..36619dd13 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -4689,7 +4689,7 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct UnkStruct_URoom * uro
 
     DynamicPlaceholderTextUtil_Reset();
 
-    StringCopy(uroom->trainerCardStrbufs[0], gTrainerClassNames[sub_80447F0()]);
+    StringCopy(uroom->trainerCardStrbufs[0], gTrainerClassNames[GetUnionRoomTrainerClass()]);
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, uroom->trainerCardStrbufs[0]);
 
     DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, trainerCard->rse.playerName);
-- 
cgit v1.2.3


From c5aa5d37229e5692355e4b3979b6cafbcad7caee Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 18 Mar 2021 15:00:06 -0400
Subject: Fix faulty search&replace

---
 src/union_room.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/union_room.c')

diff --git a/src/union_room.c b/src/union_room.c
index 36619dd13..24b8a4d3e 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -3563,7 +3563,7 @@ static u8 HandlePlayerListUpdate(void)
     struct UnkStruct_URoom * structPtr = sUnionRoomMain.uRoom;
     s32 r7 = 0;
 
-    // If someone new joined, register them in soundTimer
+    // If someone new joined, register them in field_8
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
         if (AreGnameUnameDifferent(&structPtr->field_C->arr[i].gname_uname, &sUnionGnameUnamePair_Dummy) == TRUE)
-- 
cgit v1.2.3