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
@@ -2423,7 +2423,7 @@ void sub_80156E0(u8 taskId)
        }
        break;
    case 23:
-        if (!FuncIsActiveTask(sub_809FA34))
+        if (!FuncIsActiveTask(Task_ShowStartMenu))
        {
            sub_8011090(0x40, 0, 0);
            data->state = 4;