Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms

2018-01-21 15:22:05 -05:00
parent c408110319 a1aa645f23
commit 35cc20c9aa
293 changed files with 8429 additions and 2787 deletions
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -72,7 +72,7 @@ void CB2_ShowDiploma(void)
    DmaFill16(3, 0, VRAM, VRAM_SIZE);
    DmaFill32(3, 0, OAM, OAM_SIZE);
    DmaFill16(3, 0, PLTT, PLTT_SIZE);
-    remove_some_task();
+    ScanlineEffect_Stop();
    ResetTasks();
    ResetSpriteData();
    ResetPaletteFade();