diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-10 13:35:10 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 13:35:10 -0600 |
| commit | d4afe49b06a7ef2422839fcd0340c06c6a8e541b (patch) | |
| tree | 2574b4b45b52dc72f88d5064ef6b9b5a74a6cec4 /src/field/start_menu.c | |
| parent | 0be27e16d2bea0fb4a9145849706779501ae3450 (diff) | |
| parent | bb2c758e8fa730b2bd19b92119a2bd7e37af57f8 (diff) | |
Merge pull request #519 from camthesaxman/label_unknown_task
label scanline effect routines
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); |