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_2.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_2.c')
| -rw-r--r-- | src/dodrio_berry_picking_2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index aa9f65042..e5e263647 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -1431,12 +1431,12 @@ static void sub_8155A78(void) case 2: if (!IsDma3ManagerBusyWithBgCopy()) { - CreateTask(Task_SaveGame_UpdatedLinkRecords, 0); + CreateTask(Task_LinkSave, 0); gUnknown_203F440->state++; } break; case 3: - if (!FuncIsActiveTask(Task_SaveGame_UpdatedLinkRecords)) + if (!FuncIsActiveTask(Task_LinkSave)) gUnknown_203F440->state++; break; default: @@ -1577,7 +1577,7 @@ static void sub_8155EA0(void) ChangeBgX(3, 0, 0); ChangeBgY(3, 0, 0); InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); SetBgTilemapBuffer(3, gUnknown_203F440->tilemapBuffers[0]); SetBgTilemapBuffer(1, gUnknown_203F440->tilemapBuffers[1]); |