diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-11 13:51:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 13:51:45 -0600 |
| commit | 2b56f43fce75871f2be993d43b483ceefd0bfc0f (patch) | |
| tree | 6fefa6a95a940c731ce7e551d1bc5c00a2626db0 /src/field/start_menu.c | |
| parent | a51b95150ba86a3982f613886471626f742aeacd (diff) | |
| parent | e7672a1aeb5e42d6f4e416ede9f6220122d11743 (diff) | |
Merge branch 'master' into assert
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); |