Merge branch 'master' into fix-eventobj

2019-12-18 13:16:38 -05:00
parent db8a5c6c2b f8cef9a6a8
commit 949509aade
82 changed files with 3472 additions and 6562 deletions
@@ -1583,7 +1583,7 @@ void sub_8014790(u8 taskId)
    case 1:
        if (!ScriptContext1_IsScriptSetUp())
        {
-            FadeScreen(1, 0);
+            FadeScreen(FADE_TO_BLACK, 0);
            data[0] = 2;
        }
        break;