dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync link_rfu_2 symbols from Emerald

Browse Source
This commit is contained in:
PikalaxALT
2021-06-01 15:55:14 -04:00
parent 5d9e161ae1
commit 6580ac8739
10 changed files with 717 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cable_club.c
+2 -2
View File
@@ -516,7 +516,7 @@ u8 CreateTask_ReestablishLinkInCableClubRoom(void)
gLinkType = LINKTYPE_MULTI_BATTLE;
break;
case USING_TRADE_CENTER:
gLinkType = LINKTYPE_0x1111;
gLinkType = LINKTYPE_TRADE;
break;
case USING_RECORD_CORNER:
gLinkType = LINKTYPE_0x3322;
@@ -859,7 +859,7 @@ static void Task_StartWirelessCableClubTrade(u8 taskId)
case 0:
ScriptContext2_Enable();
FadeScreen(FADE_TO_BLACK, 0);
Rfu_set_zero();
ClearLinkRfuCallback();
data[0]++;
break;
case 1:
src/link.c
+9 -9
View File
@@ -226,7 +226,7 @@ bool8 IsWirelessAdapterConnected(void)
return FALSE;
SetWirelessCommType1();
sub_80F86F4();
InitRFUAPI();
sub_80FB128(TRUE);
if (rfu_LMAN_REQBN_softReset_and_checkID() == RFU_ID)
{
@@ -378,7 +378,7 @@ void OpenLink(void)
}
else
{
sub_80F86F4();
InitRFUAPI();
}
gReceivedRemoteLinkPlayers = FALSE;
for (i = 0; i < MAX_LINK_PLAYERS; i++)
@@ -749,7 +749,7 @@ void ClearLinkCallback_2(void)
{
if (gWirelessCommType)
{
Rfu_set_zero();
ClearLinkRfuCallback();
}
else
{
@@ -1003,7 +1003,7 @@ bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType)
{
if (gWirelessCommType == 1)
{
return LinkRfu_PrepareCmd0xA100(blockRequestType);
return Rfu_SendBlockRequest(blockRequestType);
}
if (gLinkCallback == NULL)
{
@@ -1309,7 +1309,7 @@ void Link_StartSend5FFFwithParam(u16 a0)
{
if (gWirelessCommType == 1)
{
Rfu_BeginBuildAndSendCommand5F();
Rfu_SetCloseLinkCallback();
}
else
{
@@ -1326,7 +1326,7 @@ void SetCloseLinkCallback(void)
{
if (gWirelessCommType == 1)
{
Rfu_BeginBuildAndSendCommand5F();
Rfu_SetCloseLinkCallback();
}
else
{
@@ -1441,12 +1441,12 @@ static void CheckErrorStatus(void)
}
}
void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06)
void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 isConnectionError)
{
sLinkErrorBuffer.status = status;
sLinkErrorBuffer.lastSendQueueCount = lastSendQueueCount;
sLinkErrorBuffer.lastRecvQueueCount = lastRecvQueueCount;
sLinkErrorBuffer.unk_06 = unk_06;
sLinkErrorBuffer.unk_06 = isConnectionError;
}
void CB2_LinkError(void)
@@ -1619,7 +1619,7 @@ bool8 HasLinkErrorOccurred(void)
return gLinkErrorOccurred;
}
void PrepareLocalLinkPlayerBlock(void)
void LocalLinkPlayerToBlock(void)
{
struct LinkPlayerBlock * block;
src/link_rfu_2.c
+501 -446
View File
File diff suppressed because it is too large Load Diff
src/link_rfu_3.c
+58 -58
View File
@@ -163,7 +163,7 @@ static const struct SpriteTemplate sWirelessStatusIndicatorSpriteTemplate = {
SpriteCallbackDummy
};
void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *queue)
void RfuRecvQueue_Reset(struct RfuRecvQueue *ptr)
{
s32 i;
s32 j;
@@ -172,16 +172,16 @@ void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *queue)
{
for (j = 0; j < 70; j++)
{
queue->slots[i][j] = 0;
ptr->slots[i][j] = 0;
}
}
queue->send_slot = 0;
queue->recv_slot = 0;
queue->count = 0;
queue->full = 0;
ptr->send_slot = 0;
ptr->recv_slot = 0;
ptr->count = 0;
ptr->full = 0;
}
void RFU_queue_40_14_reset(struct RfuSendQueue *ptr)
void RfuSendQueue_Reset(struct RfuSendQueue *ptr)
{
s32 i;
s32 j;
@@ -217,20 +217,20 @@ static void RFU_queue_2_256_reset(struct UnkRfuStruct_Sub_Unused *ptr)
ptr->full = 0;
}
void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *queue, u8 *data)
void RfuRecvQueue_Enqueue(struct RfuRecvQueue *q1, u8 *q2)
{
s32 i;
u16 imeBak;
u8 count;
if (queue->count < 20)
if (q1->count < 20)
{
imeBak = REG_IME;
REG_IME = 0;
count = 0;
for (i = 0; i < 70; i += 14)
{
if (data[i] == 0 && data[i + 1] == 0)
if (q2[i] == 0 && q2[i + 1] == 0)
{
count++;
}
@@ -239,36 +239,36 @@ void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *queue, u8 *data)
{
for (i = 0; i < 70; i++)
{
queue->slots[queue->recv_slot][i] = data[i];
q1->slots[q1->recv_slot][i] = q2[i];
}
queue->recv_slot++;
queue->recv_slot %= 20;
queue->count++;
q1->recv_slot++;
q1->recv_slot %= 20;
q1->count++;
for (i = 0; i < 70; i++)
{
data[i] = 0;
q2[i] = 0;
}
}
REG_IME = imeBak;
}
else
{
queue->full = 1;
q1->full = 1;
}
}
void RFU_queue_40_14_recv(struct RfuSendQueue *queue, u8 *data)
void RfuSendQueue_Enqueue(struct RfuSendQueue *a0, u8 *a1)
{
s32 i;
u16 imeBak;
if (queue->count < 40)
if (a0->count < 40)
{
imeBak = REG_IME;
REG_IME = 0;
for (i = 0; i < 14; i++)
{
if (data[i] != 0)
if (a1[i] != 0)
{
break;
}
@@ -277,57 +277,57 @@ void RFU_queue_40_14_recv(struct RfuSendQueue *queue, u8 *data)
{
for (i = 0; i < 14; i++)
{
queue->slots[queue->recv_slot][i] = data[i];
a0->slots[a0->recv_slot][i] = a1[i];
}
queue->recv_slot++;
queue->recv_slot %= 40;
queue->count++;
a0->recv_slot++;
a0->recv_slot %= 40;
a0->count++;
for (i = 0; i < 14; i++)
{
data[i] = 0;
a1[i] = 0;
}
}
REG_IME = imeBak;
}
else
{
queue->full = 1;
a0->full = 1;
}
}
bool8 RFU_queue_20_70_send(struct UnkRfuStruct_2_Sub_124 *queue, u8 *dest)
bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue *a0, u8 *a1)
{
u16 imeBak;
s32 i;
imeBak = REG_IME;
REG_IME = 0;
if (queue->recv_slot == queue->send_slot || queue->full)
if (a0->recv_slot == a0->send_slot || a0->full)
{
for (i = 0; i < 70; i++)
{
dest[i] = 0;
a1[i] = 0;
}
REG_IME = imeBak;
return FALSE;
}
for (i = 0; i < 70; i++)
{
dest[i] = queue->slots[queue->send_slot][i];
a1[i] = a0->slots[a0->send_slot][i];
}
queue->send_slot++;
queue->send_slot %= 20;
queue->count--;
a0->send_slot++;
a0->send_slot %= 20;
a0->count--;
REG_IME = imeBak;
return TRUE;
}
bool8 RFU_queue_40_14_send(struct RfuSendQueue *queue, u8 *dest)
bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *q1, u8 *q2)
{
s32 i;
u16 imeBak;
if (queue->recv_slot == queue->send_slot || queue->full != 0)
if (q1->recv_slot == q1->send_slot || q1->full != 0)
{
return FALSE;
}
@@ -335,60 +335,60 @@ bool8 RFU_queue_40_14_send(struct RfuSendQueue *queue, u8 *dest)
REG_IME = 0;
for (i = 0; i < 14; i++)
{
dest[i] = queue->slots[queue->send_slot][i];
q2[i] = q1->slots[q1->send_slot][i];
}
queue->send_slot++;
queue->send_slot %= 40;
queue->count--;
q1->send_slot++;
q1->send_slot %= 40;
q1->count--;
REG_IME = imeBak;
return TRUE;
}
void RFU_queue_2_14_recv(struct UnkRfuStruct_2_Sub_c1c *queue, const u8 *data)
void RfuBackupQueue_Enqueue(struct RfuBackupQueue *q1, const u8 *q2)
{
s32 i;
if (data[1] == 0)
if (q2[1] == 0)
{
RFU_queue_2_14_send(queue, NULL);
RfuBackupQueue_Dequeue(q1, NULL);
}
else
{
for (i = 0; i < 14; i++)
{
queue->slots[queue->recv_slot][i] = data[i];
q1->slots[q1->recv_slot][i] = q2[i];
}
queue->recv_slot++;
queue->recv_slot %= 2;
if (queue->count < 2)
q1->recv_slot++;
q1->recv_slot %= 2;
if (q1->count < 2)
{
queue->count++;
q1->count++;
}
else
{
queue->send_slot = queue->recv_slot;
q1->send_slot = q1->recv_slot;
}
}
}
bool8 RFU_queue_2_14_send(struct UnkRfuStruct_2_Sub_c1c *queue, u8 *dest)
bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *q1, u8 *q2)
{
s32 i;
if (queue->count == 0)
if (q1->count == 0)
{
return FALSE;
}
if (dest != NULL)
if (q2 != NULL)
{
for (i = 0; i < 14; i++)
{
dest[i] = queue->slots[queue->send_slot][i];
q2[i] = q1->slots[q1->send_slot][i];
}
}
queue->send_slot++;
queue->send_slot %= 2;
queue->count--;
q1->send_slot++;
q1->send_slot %= 2;
q1->count--;
return TRUE;
}
@@ -572,7 +572,7 @@ bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx)
if (lman.parent_child == MODE_PARENT)
{
retVal = TRUE;
if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[idx].serialNo) && ((gRfuLinkStatus->getNameFlag >> idx) & 1))
if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[idx].serialNo) && ((gRfuLinkStatus->getNameFlag >> idx) & 1))
{
memcpy(gname, &gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH);
memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH);
@@ -586,7 +586,7 @@ bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx)
else
{
retVal = FALSE;
if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[idx].serialNo))
if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[idx].serialNo))
{
memcpy(gname, &gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH);
memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH);
@@ -722,7 +722,7 @@ void UpdateWirelessStatusIndicatorSprite(void)
{
signalStrength = GetParentSignalStrength();
}
if (sub_80FC1B0() == TRUE)
if (IsRfuRecoveringFromLinkLoss() == TRUE)
{
sprite->data[0] = 4;
}
@@ -766,7 +766,7 @@ void UpdateWirelessStatusIndicatorSprite(void)
gMain.oamBuffer[125].paletteNum = sprite->oam.paletteNum;
gMain.oamBuffer[125].tileNum = sprite->data[6] + sprite->anims[sprite->data[2]][sprite->data[4]].frame.imageValue;
CpuCopy16(gMain.oamBuffer + 125, (struct OamData *)OAM + 125, sizeof(struct OamData));
if (RfuGetErrorStatus() == 1)
if (RfuGetStatus() == 1)
{
DestroyWirelessStatusIndicatorSprite();
}
src/mystery_gift_menu.c
+2 -2
View File
@@ -1270,7 +1270,7 @@ void task00_mystery_gift(u8 taskId)
switch (mevent_client_do_exec(&data->curPromptWindowId))
{
case 6: // done
Rfu_BeginBuildAndSendCommand5F();
Rfu_SetCloseLinkCallback();
data->prevPromptWindowId = data->curPromptWindowId;
data->state = 13;
break;
@@ -1633,7 +1633,7 @@ void task00_mystery_gift(u8 taskId)
}
break;
case 33:
Rfu_BeginBuildAndSendCommand5F();
Rfu_SetCloseLinkCallback();
StringCopy(gStringVar1, gLinkPlayers[1].name);
data->state = 34;
break;
src/pokemon_jump_2.c
+1 -1
View File
@@ -1882,7 +1882,7 @@ static int sub_81497A8(void)
static bool32 sub_8149804(void)
{
return !Rfu.unk_124.count && !Rfu.sendQueue.count;
return !Rfu.recvQueue.count && !Rfu.sendQueue.count;
}
static int sub_8149834(u8 *arg0)
src/union_room.c
+27 -25
View File
@@ -861,7 +861,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
}
break;
case 11:
switch (UnionRoomHandleYesNo(&data->textState, TrainerIdAndNameStillInPartnersList(ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname)))
switch (UnionRoomHandleYesNo(&data->textState, CheckTrainerHasLeftByIdAndName(
ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId),
data->field_0->arr[data->playerCount].gname_uname.uname)))
{
case 0:
LoadWirelessStatusIndicatorSpriteGfx();
@@ -928,7 +930,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
else if (val == 2)
{
// Disconnect
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
data->state = 4;
}
break;
@@ -1027,7 +1029,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
gSpecialVar_Result = 8;
break;
case 26:
if (RfuIsErrorStatus1or2())
if (RfuHasErrored())
{
data->state = 29;
}
@@ -1152,7 +1154,7 @@ static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * data,
data->state = state1;
break;
case UNION_ROOM_SPAWN_OUT:
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
RedrawListMenu(data->listTaskId);
data->state = state2;
return TRUE;
@@ -1387,7 +1389,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
if (gReceivedRemoteLinkPlayers)
{
sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
switch (sPlayerCurrActivity)
{
case ACTIVITY_BATTLE:
@@ -1407,7 +1409,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
}
}
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 1:
data->state = 12;
@@ -1421,7 +1423,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
GetGroupLeaderSentAnOKMessage(gStringVar4, sPlayerCurrActivity);
if (PrintOnTextbox(&data->textState, gStringVar4))
{
RfuSetErrorStatus(7, 0);
RfuSetStatus(7, 0);
StringCopy(gStringVar1, sUnionRoomActivityStringPtrs[sPlayerCurrActivity]);
StringExpandPlaceholders(gStringVar4, gUnknown_8457700);
}
@@ -1432,7 +1434,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
{
if (PrintOnTextbox(&data->textState, gStringVar4))
{
RfuSetErrorStatus(12, 0);
RfuSetStatus(12, 0);
data->delayBeforePrint = 0;
}
}
@@ -1443,7 +1445,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
break;
}
if (!RfuGetErrorStatus() && JOY_NEW(B_BUTTON))
if (!RfuGetStatus() && JOY_NEW(B_BUTTON))
data->state = 7;
break;
case 7:
@@ -1451,10 +1453,10 @@ static void Task_TryJoinLinkGroup(u8 taskId)
data->state = 8;
break;
case 8:
switch (UnionRoomHandleYesNo(&data->textState, RfuGetErrorStatus()))
switch (UnionRoomHandleYesNo(&data->textState, RfuGetStatus()))
{
case 0:
LinkRfuNIsend8();
SendLeaveGroupNotice();
data->state = 9;
RedrawListMenu(data->listTaskId);
break;
@@ -1470,7 +1472,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
}
break;
case 9:
if (RfuGetErrorStatus())
if (RfuGetStatus())
data->state = 6;
break;
case 10:
@@ -1494,7 +1496,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
break;
case 13:
DestroyWirelessStatusIndicatorSprite();
if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetErrorStatus()]))
if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetStatus()]))
{
gSpecialVar_Result = 6;
data->state = 23;
@@ -1507,7 +1509,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
break;
case 15:
DestroyWirelessStatusIndicatorSprite();
if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetErrorStatus()]))
if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetStatus()]))
{
gSpecialVar_Result = 8;
data->state = 23;
@@ -2180,7 +2182,7 @@ static void Task_MEvent_Leader(u8 taskId)
}
else if (val == 2)
{
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
data->state = 2;
}
break;
@@ -2228,7 +2230,7 @@ static void Task_MEvent_Leader(u8 taskId)
}
break;
case 15:
if (RfuGetErrorStatus() == 1 || RfuGetErrorStatus() == 2)
if (RfuGetStatus() == 1 || RfuGetStatus() == 2)
{
data->state = 13;
}
@@ -2370,7 +2372,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
data->state = 10;
}
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 1:
case 2:
@@ -2379,7 +2381,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
break;
case 5:
AddTextPrinterToWindow1(gUnknown_84576AC);
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
break;
}
break;
@@ -2396,7 +2398,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
data->state++;
break;
case 9:
if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[RfuGetErrorStatus()]))
if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[RfuGetStatus()]))
{
DestroyWirelessStatusIndicatorSprite();
DestroyTask(taskId);
@@ -2535,7 +2537,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
data->state = 12;
}
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 1:
case 2:
@@ -2544,7 +2546,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
break;
case 5:
AddTextPrinterToWindow1(gUnknown_845777C);
RfuSetErrorStatus(0, 0);
RfuSetStatus(0, 0);
break;
}
break;
@@ -2837,7 +2839,7 @@ static void Task_RunUnionRoom(u8 taskId)
break;
case 25:
UR_RunTextPrinters_CheckPrinter0Active();
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 4:
HandleCancelTrade(TRUE);
@@ -3032,7 +3034,7 @@ static void Task_RunUnionRoom(u8 taskId)
}
break;
case 21:
switch (RfuGetErrorStatus())
switch (RfuGetStatus())
{
case 4:
HandleCancelTrade(TRUE);
@@ -3054,7 +3056,7 @@ static void Task_RunUnionRoom(u8 taskId)
taskData[3]++;
break;
case 22:
if (RfuIsErrorStatus1or2())
if (RfuHasErrored())
{
playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0);
UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE);
@@ -3073,7 +3075,7 @@ static void Task_RunUnionRoom(u8 taskId)
data->recvActivityRequest[0] = 0;
break;
case 12:
if (RfuIsErrorStatus1or2())
if (RfuHasErrored())
{
HandleCancelTrade(FALSE);
data->state = 2;
src/union_room_chat.c
+12 -12
View File
@@ -324,7 +324,7 @@ static void ChatEntryRoutine_Join(void)
sWork->routineState++;
// fall through
case 1:
if (IsLinkTaskFinished() && !GetRfuUnkCE8())
if (IsLinkTaskFinished() && !RfuHasFoundNewLeader())
{
if (SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
sWork->routineState++;
@@ -527,14 +527,14 @@ static void ChatEntryRoutine_AskQuitChatting(void)
sWork->routineState = 3;
break;
case 0:
sub_80FA4A8();
Rfu_UnionRoomChat_StopLinkManager();
PrepareSendBuffer_Disband(sWork->sendMessageBuffer);
sWork->routineState = 4;
break;
}
break;
case 4:
if (IsLinkTaskFinished() && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
if (IsLinkTaskFinished() && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
{
if (sWork->multiplayerId == 0)
sWork->routineState = 6;
@@ -577,15 +577,15 @@ static void ChatEntryRoutine_ExitChat(void)
}
break;
case 3:
if (IsLinkTaskFinished() && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
if (IsLinkTaskFinished() && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
sWork->routineState++;
break;
case 4:
if ((GetBlockReceivedStatus() & 1) && !GetRfuUnkCE8())
if ((GetBlockReceivedStatus() & 1) && !RfuHasFoundNewLeader())
sWork->routineState++;
break;
case 5:
if (IsLinkTaskFinished() && !GetRfuUnkCE8())
if (IsLinkTaskFinished() && !RfuHasFoundNewLeader())
{
SetCloseLinkCallback();
sWork->exitDelayTimer = 0;
@@ -620,7 +620,7 @@ static void ChatEntryRoutine_Drop(void)
}
break;
case 1:
if (!RunDisplaySubtask(0) && IsLinkTaskFinished() && !GetRfuUnkCE8())
if (!RunDisplaySubtask(0) && IsLinkTaskFinished() && !RfuHasFoundNewLeader())
{
SetCloseLinkCallback();
sWork->exitDelayTimer = 0;
@@ -666,7 +666,7 @@ static void ChatEntryRoutine_Disbanded(void)
}
break;
case 2:
if (RunDisplaySubtask(0) != TRUE && IsLinkTaskFinished() && !GetRfuUnkCE8())
if (RunDisplaySubtask(0) != TRUE && IsLinkTaskFinished() && !RfuHasFoundNewLeader())
{
SetCloseLinkCallback();
sWork->exitDelayTimer = 0;
@@ -704,7 +704,7 @@ static void ChatEntryRoutine_SendMessage(void)
sWork->routineState++;
// fall through
case 1:
if (IsLinkTaskFinished() == TRUE && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
if (IsLinkTaskFinished() == TRUE && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer)))
sWork->routineState++;
break;
case 2:
@@ -1355,7 +1355,7 @@ static void Task_ReceiveChatMessage(u8 taskId)
}
tBlockReceivedStatus = GetBlockReceivedStatus();
if (!tBlockReceivedStatus && GetRfuUnkCE8())
if (!tBlockReceivedStatus && RfuHasFoundNewLeader())
return;
tI = 0;
@@ -1409,7 +1409,7 @@ static void Task_ReceiveChatMessage(u8 taskId)
// You're the leader, and the person who left is not you
if (GetLinkPlayerCount() == 2)
{
sub_80FA4A8();
Rfu_UnionRoomChat_StopLinkManager();
sWork->exitType = CHATEXIT_LEADER_LAST;
DestroyTask(taskId);
return;
@@ -1433,7 +1433,7 @@ static void Task_ReceiveChatMessage(u8 taskId)
DestroyTask(taskId);
break;
case 2:
if (!GetRfuUnkCE8())
if (!RfuHasFoundNewLeader())
{
if (sWork->multiplayerId == 0)
sub_80FB030(sWork->linkPlayerCount);