diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-05 13:07:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-05 13:07:22 -0400 |
| commit | 27d4411de0511a7dd342cebf7b05d01bfdec66b0 (patch) | |
| tree | 76754381b25a2e89dd4e430461097be87ccb86e5 | |
| parent | ee6b3c1acf4805d6df72b291b8c0f79635e6341a (diff) | |
Fix accidental label swap in link_rfu.h
| -rw-r--r-- | include/link_rfu.h | 4 | ||||
| -rw-r--r-- | src/link_rfu_2.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/link_rfu.h b/include/link_rfu.h index 80bad0a21..7d40776f3 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -14,8 +14,8 @@ #define RFUCMD_0x8900 0x8900 #define RFUCMD_SEND_BLOCK_REQ 0xa100 #define RFUCMD_SEND_HELD_KEYS 0xbe00 -#define RFUCMD_0xED00 0xee00 -#define RFUCMD_0xEE00 0xed00 +#define RFUCMD_0xED00 0xed00 +#define RFUCMD_0xEE00 0xee00 // RfuTgtData.gname is read as these structs. struct GFtgtGnameSub diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 46715488e..8c7447264 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -1031,7 +1031,7 @@ static void RfuHandleReceiveCommand(u8 unused) if (Rfu.cmd_6600_count == gRecvCmds[i][1]) Rfu.cmd_6600_recvd[i] = 1; break; - case RFUCMD_0xEE00: + case RFUCMD_0xED00: if (Rfu.parent_child == MODE_CHILD) { if (gReceivedRemoteLinkPlayers) @@ -1048,13 +1048,13 @@ static void RfuHandleReceiveCommand(u8 unused) } else { - RfuPrepareSendBuffer(RFUCMD_0xED00); + RfuPrepareSendBuffer(RFUCMD_0xEE00); gSendCmd[1] = gRecvCmds[i][1]; gSendCmd[2] = gRecvCmds[i][2]; gSendCmd[3] = gRecvCmds[i][3]; } break; - case RFUCMD_0xED00: + case RFUCMD_0xEE00: if (Rfu.parent_child == MODE_PARENT) { Rfu.bm_DisconnectSlot |= gRecvCmds[i][1]; @@ -1166,10 +1166,10 @@ static void RfuPrepareSendBuffer(u16 command) case RFUCMD_SEND_HELD_KEYS: gSendCmd[1] = gHeldKeyCodeToSend; break; - case RFUCMD_0xED00: - break; case RFUCMD_0xEE00: break; + case RFUCMD_0xED00: + break; } } @@ -2561,7 +2561,7 @@ static void sub_80FBDB8(u8 taskId) { if (gSendCmd[0] == 0 && !Rfu.unk_ce8) { - RfuPrepareSendBuffer(RFUCMD_0xEE00); + RfuPrepareSendBuffer(RFUCMD_0xED00); gSendCmd[1] = gTasks[taskId].data[0]; gSendCmd[2] = gTasks[taskId].data[1]; Rfu.playerCount -= gUnknown_843EC41[gTasks[taskId].data[0]]; |