diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 23:20:13 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-21 23:20:13 -0500 |
commit | d4e8c20f840996049f269ffcd22d7e3feb489696 (patch) | |
tree | 48b8deab17118064ae33bf8924569c834416cb96 /src/evolution_scene.c | |
parent | d35cf06854be09a6bcf5ceb63cdb54cefd6d48a2 (diff) | |
parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) |
Merge branch 'master' into link
Diffstat (limited to 'src/evolution_scene.c')
-rw-r--r-- | src/evolution_scene.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 536eb6979..2ce788f8e 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -266,7 +266,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, sub_80356D0(); LoadBattleTextboxAndBackground(); ResetSpriteData(); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); FreeAllSpritePalettes(); |