Merge branch 'master' into link

2018-01-21 23:20:13 -05:00
parent d35cf06854 f57340b729
commit d4e8c20f84
1241 changed files with 5063 additions and 3232 deletions
--- a/src/link.c
+++ b/src/link.c
@@ -1637,7 +1637,7 @@ void CB2_LinkError(void)
    ResetPaletteFadeControl();
    FillPalette(0, 0, 2);
    ResetTasks();
-    remove_some_task();
+    ScanlineEffect_Stop();
    if (gWirelessCommType)
    {
        if (!sLinkErrorBuffer.unk_06)