diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/link_rfu_2.c | 6 | ||||
| -rw-r--r-- | src/union_room.c | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 8b37c5214..76db5d1b0 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -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; diff --git a/src/union_room.c b/src/union_room.c index 025ec0ee8..575fcd60e 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -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; |