Merge branch 'master' of https://github.com/pret/pokeemerald into intro

2018-02-17 04:03:59 -06:00
parent 1605f62535 e2932a38de
commit ebd88b3606
125 changed files with 6338 additions and 14112 deletions
--- a/src/reset_save_heap.c
+++ b/src/reset_save_heap.c
@@ -26,5 +26,5 @@ void sub_81700F8(void)
        Sav2_ClearSetDefault();
    SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
    InitHeap(gHeap, HEAP_SIZE);
-    SetMainCallback2(sub_8086230);
+    SetMainCallback2(CB2_ContinueSavedGame);
 }