diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-12 10:15:31 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-12 10:15:31 -0500 |
| commit | cce4c9e92bfe7e10be3a0cf4940299e84701dba0 (patch) | |
| tree | 514282760474bf038fb734f87e4f84ac3fb0df12 /src/scene/intro.c | |
| parent | 3b8f6133865af6ede3628f3df8dd71648b43b3bc (diff) | |
| parent | 6a2e39eb97db47b542eea76c1e45df37184a0705 (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'src/scene/intro.c')
| -rw-r--r-- | src/scene/intro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scene/intro.c b/src/scene/intro.c index 4dc6cc91c..d7d772a40 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -19,7 +19,7 @@ #include "task.h" #include "title_screen.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "ewram.h" extern struct SpriteTemplate gUnknown_02024E8C; @@ -873,7 +873,7 @@ static u8 SetUpCopyrightScreen(void) DmaFill16(3, 0, (void *)(PLTT + 2), PLTT_SIZE - 2); ResetPaletteFade(); LoadCopyrightGraphics(0, 0x3800, 0); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); |