diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-08 15:43:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:43:45 -0400 |
| commit | 8b80b417e2172a44098a22473717da20585bd15d (patch) | |
| tree | 2568b0dadaaf9dc2351da835bfaeacd11000b694 /src/berry_blender.c | |
| parent | 550875757b6bbe3cde41c928c6bbef863b5492bf (diff) | |
| parent | e50777042528a667b4196ed6879b39e573457494 (diff) | |
Merge pull request #1069 from GriffinRichards/doc-link
Document linking
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 4d3b7eb6f..a2a96c089 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -1246,7 +1246,7 @@ static void sub_8080018(void) if (++sBerryBlenderData->framesToWait > 20) { ClearDialogWindowAndFrameToTransparent(4, TRUE); - if (GetBlockReceivedStatus() == sub_800A9D8()) + if (GetBlockReceivedStatus() == GetLinkPlayerCountAsBitFlags()) { for (i = 0; i < GetLinkPlayerCount(); i++) { @@ -1500,7 +1500,7 @@ static void sub_80808D4(void) switch (sBerryBlenderData->mainState) { case 0: - sub_800B4C0(); + SetWirelessCommType0(); sub_8080588(); Blender_SetParticipantBerryData(0, gSpecialVar_ItemId); Blender_CopyBerryData(&sBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId); @@ -1664,7 +1664,7 @@ static void sub_80808D4(void) static void sub_8080DF8(void) { s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < CMD_LENGTH / 2; i++) { gSendCmd[0] = 0; gSendCmd[2] = 0; |