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

Fix accidental label swap in link_rfu.h

Browse Source
This commit is contained in:
PikalaxALT
2021-05-05 13:07:22 -04:00
parent ee6b3c1acf
commit 27d4411de0
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/link_rfu.h
+2 -2
View File
@@ -14,8 +14,8 @@
#define RFUCMD_0x8900 0x8900 #define RFUCMD_0x8900 0x8900
#define RFUCMD_SEND_BLOCK_REQ 0xa100 #define RFUCMD_SEND_BLOCK_REQ 0xa100
#define RFUCMD_SEND_HELD_KEYS 0xbe00 #define RFUCMD_SEND_HELD_KEYS 0xbe00
#define RFUCMD_0xED00 0xee00 #define RFUCMD_0xED00 0xed00
#define RFUCMD_0xEE00 0xed00 #define RFUCMD_0xEE00 0xee00
// RfuTgtData.gname is read as these structs. // RfuTgtData.gname is read as these structs.
struct GFtgtGnameSub struct GFtgtGnameSub
src/link_rfu_2.c
+6 -6
View File
@@ -1031,7 +1031,7 @@ static void RfuHandleReceiveCommand(u8 unused)
if (Rfu.cmd_6600_count == gRecvCmds[i][1]) if (Rfu.cmd_6600_count == gRecvCmds[i][1])
Rfu.cmd_6600_recvd[i] = 1; Rfu.cmd_6600_recvd[i] = 1;
break; break;
case RFUCMD_0xEE00: case RFUCMD_0xED00:
if (Rfu.parent_child == MODE_CHILD) if (Rfu.parent_child == MODE_CHILD)
{ {
if (gReceivedRemoteLinkPlayers) if (gReceivedRemoteLinkPlayers)
@@ -1048,13 +1048,13 @@ static void RfuHandleReceiveCommand(u8 unused)
} }
else else
{ {
RfuPrepareSendBuffer(RFUCMD_0xED00); RfuPrepareSendBuffer(RFUCMD_0xEE00);
gSendCmd[1] = gRecvCmds[i][1]; gSendCmd[1] = gRecvCmds[i][1];
gSendCmd[2] = gRecvCmds[i][2]; gSendCmd[2] = gRecvCmds[i][2];
gSendCmd[3] = gRecvCmds[i][3]; gSendCmd[3] = gRecvCmds[i][3];
} }
break; break;
case RFUCMD_0xED00: case RFUCMD_0xEE00:
if (Rfu.parent_child == MODE_PARENT) if (Rfu.parent_child == MODE_PARENT)
{ {
Rfu.bm_DisconnectSlot |= gRecvCmds[i][1]; Rfu.bm_DisconnectSlot |= gRecvCmds[i][1];
@@ -1166,10 +1166,10 @@ static void RfuPrepareSendBuffer(u16 command)
case RFUCMD_SEND_HELD_KEYS: case RFUCMD_SEND_HELD_KEYS:
gSendCmd[1] = gHeldKeyCodeToSend; gSendCmd[1] = gHeldKeyCodeToSend;
break; break;
case RFUCMD_0xED00:
break;
case RFUCMD_0xEE00: case RFUCMD_0xEE00:
break; break;
case RFUCMD_0xED00:
break;
} }
} }
@@ -2561,7 +2561,7 @@ static void sub_80FBDB8(u8 taskId)
{ {
if (gSendCmd[0] == 0 && !Rfu.unk_ce8) if (gSendCmd[0] == 0 && !Rfu.unk_ce8)
{ {
RfuPrepareSendBuffer(RFUCMD_0xEE00); RfuPrepareSendBuffer(RFUCMD_0xED00);
gSendCmd[1] = gTasks[taskId].data[0]; gSendCmd[1] = gTasks[taskId].data[0];
gSendCmd[2] = gTasks[taskId].data[1]; gSendCmd[2] = gTasks[taskId].data[1];
Rfu.playerCount -= gUnknown_843EC41[gTasks[taskId].data[0]]; Rfu.playerCount -= gUnknown_843EC41[gTasks[taskId].data[0]];