diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-08-15 18:26:09 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-10-05 23:37:54 -0400 |
| commit | 4efa6c882a68d69e32f59580faa438a6b1fd0b68 (patch) | |
| tree | 025979d9287c2e6de8786b01e16176231c28c3b5 /src/berry_crush.c | |
| parent | dfdcfc1568ad8d3c4efbe36f06c1b883b677abd2 (diff) | |
Continue misc link documentation, rename reset_save_heap
Diffstat (limited to 'src/berry_crush.c')
| -rwxr-xr-x | src/berry_crush.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/berry_crush.c b/src/berry_crush.c index abaad232e..fd0d86c7e 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -984,12 +984,12 @@ static u32 QuitBerryCrush(MainCallback exitCallback) return 0; } -#define ERROR_EXIT(exitCallback) \ - { \ - SetMainCallback2(exitCallback); \ - Rfu.unk_10 = 0; \ - Rfu.unk_12 = 0; \ - Rfu.errorState = 1; \ +#define ERROR_EXIT(exitCallback) \ + { \ + SetMainCallback2(exitCallback); \ + Rfu.unk_10 = 0; \ + Rfu.unk_12 = 0; \ + Rfu.errorState = RFU_ERROR_STATE_1; \ } void StartBerryCrush(MainCallback exitCallback) @@ -2565,7 +2565,7 @@ static void HandlePartnerInput(struct BerryCrushGame *game) linkState = (struct BerryCrushGame_LinkState *)gRecvCmds[i]; // Skip player if we have not received a packet from them - if ((linkState->rfuCmd & 0xFF00) != RFUCMD_SEND_PACKET) + if ((linkState->rfuCmd & RFUCMD_MASK) != RFUCMD_SEND_PACKET) continue; if (linkState->sendFlag != SEND_GAME_STATE) continue; @@ -2805,7 +2805,7 @@ static void RecvLinkData(struct BerryCrushGame *game) for (i = 0; i < game->playerCount; i++) game->players[i].inputState = INPUT_STATE_NONE; - if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET) + if ((gRecvCmds[0][0] & RFUCMD_MASK) != RFUCMD_SEND_PACKET) { game->playedSound = FALSE; return; |