Merge pull request #1069 from GriffinRichards/doc-link

Document linking
This commit is contained in:
PikalaxALT
2020-07-08 15:43:45 -04:00
committed by GitHub
101 changed files with 7537 additions and 6613 deletions
+3 -3
View File
@@ -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;