diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/link_rfu_2.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/link_rfu_2.c')
| -rw-r--r-- | src/link_rfu_2.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index f3e7ce274..77672f5d8 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -45,7 +45,7 @@ static void RfuFunc_SendNextBlock(void); static void RfuFunc_SendLastBlock(void); static void CallRfuFunc(void); static void sub_80FA738(void); -static int sub_80FA788(void); +static s32 sub_80FA788(void); static void sub_80FA834(u8 taskId); static void sub_80FA9D0(u16 a0); static void ValidateAndReceivePokemonSioInfo(void * a0); @@ -712,7 +712,7 @@ static bool32 sub_80F911C(void) if (!lman.acceptSlot_flag) { LinkRfu_Shutdown(); - gReceivedRemoteLinkPlayers = 0; + gReceivedRemoteLinkPlayers = FALSE; return FALSE; } } @@ -985,7 +985,7 @@ static void RfuHandleReceiveCommand(u8 unused) switch (gRecvCmds[i][0] & 0xff00) { case RFU_COMMAND_0x7800: - if (Rfu.parent_child == MODE_CHILD && gReceivedRemoteLinkPlayers != 0) + if (Rfu.parent_child == MODE_CHILD && gReceivedRemoteLinkPlayers) return; // fallthrough case RFU_COMMAND_0x7700: @@ -1017,7 +1017,7 @@ static void RfuHandleReceiveCommand(u8 unused) { Rfu.cmd_8800_recvbuf[i].receiving = 2; Rfu_SetBlockReceivedFlag(i); - if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && gReceivedRemoteLinkPlayers != 0 && Rfu.parent_child == MODE_CHILD) + if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && gReceivedRemoteLinkPlayers && Rfu.parent_child == MODE_CHILD) ValidateAndReceivePokemonSioInfo(gBlockRecvBuffer); } } @@ -1035,11 +1035,11 @@ static void RfuHandleReceiveCommand(u8 unused) case RFU_COMMAND_0xed00: if (Rfu.parent_child == MODE_CHILD) { - if (gReceivedRemoteLinkPlayers != 0) + if (gReceivedRemoteLinkPlayers) { if (gRecvCmds[i][1] & gRfuLinkStatus->connSlotFlag) { - gReceivedRemoteLinkPlayers = 0; + gReceivedRemoteLinkPlayers = FALSE; rfu_LMAN_requestChangeAgbClockMaster(); Rfu.unk_ce4 = gRecvCmds[i][2]; } @@ -1283,7 +1283,7 @@ static void RfuFunc_End5F00_PowerDownRfu(void) { rfu_clearAllSlot(); rfu_LMAN_powerDownRFU(); - gReceivedRemoteLinkPlayers = 0; + gReceivedRemoteLinkPlayers = FALSE; Rfu.isShuttingDown = TRUE; Rfu.RfuFunc = NULL; } @@ -1682,7 +1682,7 @@ static void sub_80FA834(u8 taskId) break; case 6: DestroyTask(taskId); - gReceivedRemoteLinkPlayers = 1; + gReceivedRemoteLinkPlayers = TRUE; Rfu.unk_ce8 = FALSE; rfu_LMAN_setLinkRecovery(1, 600); if (Rfu.unionRoomChatters) @@ -1836,7 +1836,7 @@ static void sub_80FACF0(u8 taskId) { ReceiveRfuLinkPlayers((const struct SioInfo *)gBlockRecvBuffer); ResetBlockReceivedFlag(0); - gReceivedRemoteLinkPlayers = 1; + gReceivedRemoteLinkPlayers = TRUE; DestroyTask(taskId); } break; |