diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
| commit | 663ecd00145da49fda7d2509d629d737ea633cd8 (patch) | |
| tree | a4cfc7323151501d5603f1cd34e68a73f328434e /src/evolution_scene.c | |
| parent | a78b0636f50c012c3618d55a9b83f834319de6e0 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor
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 4b59147ff..5dfc36cb2 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -269,7 +269,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, sub_80356D0(); LoadBattleTextboxAndBackground(); ResetSpriteData(); - remove_some_task(); + ScanlineEffect_Stop(); ResetTasks(); FreeAllSpritePalettes(); |