Merge branch 'master' into link

This commit is contained in:
PikalaxALT
2018-01-21 23:20:13 -05:00
1241 changed files with 5063 additions and 3232 deletions

View File

@@ -266,7 +266,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
sub_80356D0();
LoadBattleTextboxAndBackground();
ResetSpriteData();
remove_some_task();
ScanlineEffect_Stop();
ResetTasks();
FreeAllSpritePalettes();