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

Sync berry crush from Emerald

Browse Source
This commit is contained in:
PikalaxALT
2021-05-05 13:03:39 -04:00
parent 9ed87063f1
commit ee6b3c1acf
46 changed files with 1776 additions and 1456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dodrio_berry_picking.c
+7 -7
View File
@@ -299,7 +299,7 @@ static void sub_8150A84(u8 taskId)
case 2:
if (!sub_8155E68())
{
LinkRfu_SetRfuFuncToSend6600();
Rfu_SetLinkStandbyCallback();
gUnknown_203F3E0->unk0C++;
}
break;
@@ -412,7 +412,7 @@ static void sub_8150CF4(void)
gUnknown_203F3E0->unk10++;
break;
case 1:
LinkRfu_SetRfuFuncToSend6600();
Rfu_SetLinkStandbyCallback();
gUnknown_203F3E0->unk10++;
break;
case 2:
@@ -424,7 +424,7 @@ static void sub_8150CF4(void)
case 3:
if (!IsMinigameCountdownRunning())
{
LinkRfu_SetRfuFuncToSend6600();
Rfu_SetLinkStandbyCallback();
gUnknown_203F3E0->unk10++;
}
break;
@@ -1023,12 +1023,12 @@ static void sub_815184C(void)
{
if (gUnknown_203F3E0->unk128 != 0)
{
sub_80FBA44();
ClearRecvCommands();
gUnknown_203F3E0->unk124 = 0;
}
else if (gUnknown_203F3E0->unk124 > 70)
{
sub_80FBA44();
ClearRecvCommands();
gUnknown_203F3E0->unk124 = 0;
}
}
@@ -1089,12 +1089,12 @@ static void sub_8151A5C(void)
{
if (gUnknown_203F3E0->unk128 != 0)
{
sub_80FBA44();
ClearRecvCommands();
gUnknown_203F3E0->unk124 = 0;
}
else if (gUnknown_203F3E0->unk124 > 70)
{
sub_80FBA44();
ClearRecvCommands();
gUnknown_203F3E0->unk124 = 0;
}
}