diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-30 15:33:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 15:33:17 -0400 |
| commit | 5773bb864344c2f365dc14ddb64a1d1fbb114b32 (patch) | |
| tree | 740f7e4a6598d56af374957fff35f8755a2c902a /src/berry_crush.c | |
| parent | cdc19a0b07b7fbd97f8dfc5935b18d0acf9b22d5 (diff) | |
| parent | c8307317344f0ca6d176882cf8b55d3bf82dc680 (diff) | |
Merge pull request #1152 from GriffinRichards/doc-blender
Document berry blender
Diffstat (limited to 'src/berry_crush.c')
| -rwxr-xr-x | src/berry_crush.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/berry_crush.c b/src/berry_crush.c index 6269f0ad9..d753e603c 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -900,7 +900,7 @@ static void sub_8020D8C(void) void sub_8020E1C(void) { DestroyTask(gUnknown_02022C90->unkA); - ChooseBerrySetCallback(sub_8020D8C); + ChooseBerryForMachine(sub_8020D8C); } static void sub_8020E3C(void) @@ -2357,7 +2357,7 @@ void sub_802339C(struct BerryCrushGame *r4) for (r7 = 0; r7 < r4->unk9; ++r7) { r2 = gRecvCmds[r7]; - if ((r2[0] & 0xFF00) == 0x2F00 + if ((r2[0] & 0xFF00) == RFUCMD_SEND_PACKET && r2[1] == 2) { if ((u8)r2[2] & 4) @@ -2559,7 +2559,7 @@ void sub_80236B8(struct BerryCrushGame *r5) r5->unk5C.unk02_1 = r5->unk25_4; r5->unk5C.unk0A = r5->unk25_5; memcpy(r5->unk40.unk2, &r5->unk5C, sizeof(r5->unk40.unk2)); - sub_800FE50(r5->unk40.unk2); + Rfu_SendPacket(r5->unk40.unk2); } void sub_802385C(struct BerryCrushGame *r5) @@ -2580,7 +2580,7 @@ void sub_802385C(struct BerryCrushGame *r5) for (r4 = 0; r4 < r5->unk9; ++r4) r5->unk68.as_four_players.others[r4].unk4.as_2d_bytes[1][5] = 0; #endif - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00 + if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET || gRecvCmds[0][1] != 2) { r5->unk25_2 = 0; |