Merge master into ObjEvent rename

2019-11-25 20:00:04 -05:00
parent 4c52cf9ed1 6efa51f8ad
commit f559fa3fe2
144 changed files with 8322 additions and 8521 deletions
@@ -1715,7 +1715,7 @@ void CB2_ContinueSavedGame(void)
    StopMapMusic();
    ResetSafariZoneFlag_();
    if (gSaveFileStatus == 0xFF)
-        sub_81A3908();
+        ResetWinStreaks();

    LoadSaveblockMapHeader();
    ClearDiveAndHoleWarps();