diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 15:47:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 15:47:45 -0400 |
| commit | 89bcf3cbd9ad9d3c3631159c5ba20d3660819066 (patch) | |
| tree | aa2b318b4763fe39fd4ffc19ac7356dabba7034f /src/dodrio_berry_picking.c | |
| parent | a88676094b37951bd83b81cf610ddf92d7be0736 (diff) | |
| parent | 9ff261ac2a249a669a42381509ef288287535b4f (diff) | |
Merge branch 'master' into add-localids
Diffstat (limited to 'src/dodrio_berry_picking.c')
| -rw-r--r-- | src/dodrio_berry_picking.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 262b7d111..3ca7a1cf7 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -450,7 +450,7 @@ static void (*const gUnknown_082F7AF4[])(void) = }; // code -void sub_802493C(u16 a0, void (*callback)(void)) +void StartDodrioBerryPicking(u16 a0, void (*callback)(void)) { gUnknown_03000DB0 = FALSE; @@ -832,9 +832,9 @@ static void sub_8025158(void) static bool32 sub_8025170(void) { - u8 r4 = GetBlockReceivedStatus(); - u8 r0 = sub_800A9D8(); - if (r4 == r0) + u8 recvStatus = GetBlockReceivedStatus(); + u8 playerFlags = GetLinkPlayerCountAsBitFlags(); + if (recvStatus == playerFlags) { ResetBlockReceivedFlags(); return TRUE; @@ -4483,12 +4483,12 @@ static void sub_802A380(void) case 2: if (!IsDma3ManagerBusyWithBgCopy()) { - CreateTask(sub_8153688, 0); + CreateTask(Task_LinkSave, 0); gUnknown_02022CF8->state++; } break; case 3: - if (!FuncIsActiveTask(sub_8153688)) + if (!FuncIsActiveTask(Task_LinkSave)) gUnknown_02022CF8->state++; break; default: |