Merge branch 'master' into quest_log

2018-10-15 09:19:30 -05:00
parent f12a82b068 a2e49c4d5c
commit f07f73e188
36 changed files with 2576 additions and 3691 deletions
@@ -971,8 +971,8 @@ void sub_8111914(void)
 void sub_8111984(void)
 {
    sub_806E6FC();
-    ResetSaveCounters();
-    sub_80DA4FC(0);
+    Save_ResetSaveCounters();
+    Save_LoadGameData(0);
    SetMainCallback2(sub_8057430);
    gUnknown_3005024 = sub_8111F60;
    FreeAllWindowBuffers();