diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-11 14:55:51 -0500 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-11 14:55:51 -0500 |
commit | 8b41179e9349ac3dcc98f2436be2fa70f5040a33 (patch) | |
tree | be57f4b91ef966980e0ed8cee40cd920bb70c473 /src/field/start_menu.c | |
parent | 2e713e820ac25a6a68a150c4f07d4865609985f6 (diff) | |
parent | e7672a1aeb5e42d6f4e416ede9f6220122d11743 (diff) |
merge
Diffstat (limited to 'src/field/start_menu.c')
-rw-r--r-- | src/field/start_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 5b2276d1b..d6881cb01 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -28,7 +28,7 @@ #include "strings2.h" #include "task.h" #include "trainer_card.h" -#include "unknown_task.h" +#include "scanline_effect.h" //Menu actions enum { @@ -750,7 +750,7 @@ static bool32 sub_80719FC(u8 *step) REG_DISPCNT = 0; SetVBlankCallback(NULL); - remove_some_task(); + ScanlineEffect_Stop(); DmaClear16(3, PLTT, PLTT_SIZE); addr = (void *)VRAM; size = 0x18000; @@ -771,7 +771,7 @@ static bool32 sub_80719FC(u8 *step) ResetSpriteData(); ResetTasks(); ResetPaletteFade(); - dp12_8087EA4(); + ScanlineEffect_Clear(); break; case 2: Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4); |