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

Minor aesthetic tweaks RE review

Browse Source
This commit is contained in:
PikalaxALT
2021-06-02 13:18:59 -04:00
parent c7e8b0857a
commit b3dfc556b1
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/link_rfu_2.c
+2 -4
View File
@@ -905,11 +905,9 @@ static bool32 RfuProcessEnqueuedRecvBlock(void)
rfu_REQ_disconnect(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag);
rfu_waitREQComplete();
status = RfuGetStatus();
if (
status != RFU_STATUS_FATAL_ERROR
if (status != RFU_STATUS_FATAL_ERROR
&& status != RFU_STATUS_JOIN_GROUP_NO
&& status != RFU_STATUS_LEAVE_GROUP
)
&& status != RFU_STATUS_LEAVE_GROUP)
RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, 0x9000);
rfu_clearAllSlot();
gReceivedRemoteLinkPlayers = FALSE;
src/union_room.c
+8 -8
View File
@@ -930,7 +930,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
else if (val == 2)
{
// Disconnect
RfuSetStatus(0, 0);
RfuSetStatus(RFU_STATUS_OK, 0);
data->state = 4;
}
break;
@@ -1154,7 +1154,7 @@ static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * data,
data->state = state1;
break;
case UNION_ROOM_SPAWN_OUT:
RfuSetStatus(0, 0);
RfuSetStatus(RFU_STATUS_OK, 0);
RedrawListMenu(data->listTaskId);
data->state = state2;
return TRUE;
@@ -1389,7 +1389,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
if (gReceivedRemoteLinkPlayers)
{
sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
RfuSetStatus(0, 0);
RfuSetStatus(RFU_STATUS_OK, 0);
switch (sPlayerCurrActivity)
{
case ACTIVITY_BATTLE:
@@ -1423,7 +1423,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
GetGroupLeaderSentAnOKMessage(gStringVar4, sPlayerCurrActivity);
if (PrintOnTextbox(&data->textState, gStringVar4))
{
RfuSetStatus(7, 0);
RfuSetStatus(RFU_STATUS_WAIT_ACK_JOIN_GROUP, 0);
StringCopy(gStringVar1, sUnionRoomActivityStringPtrs[sPlayerCurrActivity]);
StringExpandPlaceholders(gStringVar4, gUnknown_8457700);
}
@@ -1434,7 +1434,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
{
if (PrintOnTextbox(&data->textState, gStringVar4))
{
RfuSetStatus(12, 0);
RfuSetStatus(RFU_STATUS_ACK_JOIN_GROUP, 0);
data->delayBeforePrint = 0;
}
}
@@ -2182,7 +2182,7 @@ static void Task_MEvent_Leader(u8 taskId)
}
else if (val == 2)
{
RfuSetStatus(0, 0);
RfuSetStatus(RFU_STATUS_OK, 0);
data->state = 2;
}
break;
@@ -2381,7 +2381,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
break;
case 5:
AddTextPrinterToWindow1(gUnknown_84576AC);
RfuSetStatus(0, 0);
RfuSetStatus(RFU_STATUS_OK, 0);
break;
}
break;
@@ -2546,7 +2546,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
break;
case 5:
AddTextPrinterToWindow1(gUnknown_845777C);
RfuSetStatus(0, 0);
RfuSetStatus(RFU_STATUS_OK, 0);
break;
}
break;