diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-05-27 06:46:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 06:46:29 -0400 |
| commit | c396aaa804543c6950bdef918f3773394da09bdf (patch) | |
| tree | a925bd32e0745ddf3ecef23d1ef3e710f3250273 /src/dodrio_berry_picking.c | |
| parent | 3dce3407d5f9bca69d61b1cf1b314fb1e921d572 (diff) | |
| parent | 1a9ba7bb0aeb27a7d0bca43190edd054e517f27b (diff) | |
Merge pull request #431 from PikalaxALT/sync_bery_crush
Sync berry crush from Emerald
Diffstat (limited to 'src/dodrio_berry_picking.c')
| -rw-r--r-- | src/dodrio_berry_picking.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 35562bde7..53af1f48c 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -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; } } |