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/starter_choose.c | |
| parent | 2e713e820ac25a6a68a150c4f07d4865609985f6 (diff) | |
| parent | e7672a1aeb5e42d6f4e416ede9f6220122d11743 (diff) | |
merge
Diffstat (limited to 'src/field/starter_choose.c')
| -rw-r--r-- | src/field/starter_choose.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index 91b706e78..418488774 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -14,7 +14,7 @@ #include "strings.h" #include "task.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern u16 gSpecialVar_Result; extern struct SpriteTemplate gUnknown_02024E8C; @@ -285,7 +285,7 @@ void CB2_ChooseStarter(void) LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM); LZ77UnCompVram(&gBirchBagTilemap, (void *)(VRAM + 0x3000)); LZ77UnCompVram(&gBirchGrassTilemap, (void *)(VRAM + 0x3800)); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); ResetPaletteFade(); |