Merge master into ObjEvent rename

2019-12-15 02:00:00 -05:00
parent 6556b556dd 6967caefb2
commit 82f55f2381
49 changed files with 1845 additions and 1829 deletions
@@ -428,7 +428,7 @@ static void sub_80AF660(u8 taskId)
    if (WaitForWeatherFadeIn() == TRUE)
    {
        DestroyTask(taskId);
-        CreateTask(sub_809FA34, 80);
+        CreateTask(Task_ShowStartMenu, 80);
    }
 }