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
@@ -581,7 +581,7 @@ static bool8 HandleStartMenuInput(void)
            && gMenuCallback != StartMenuSafariZoneRetireCallback
            && gMenuCallback != StartMenuBattlePyramidRetireCallback)
        {
-           FadeScreen(1, 0);
+           FadeScreen(FADE_TO_BLACK, 0);
        }

        return FALSE;