summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-06-28 04:30:45 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-06-28 04:30:45 +0800
commitbe2010e0db8ca527693d40a6f1410000033f7e7f (patch)
tree557a1ca9abaebc333ba8f66c0d240806c193a858 /src
parent6e570a107f6425068902e4ad077ab8c7b6e15ed3 (diff)
finished reset_save_heap
Diffstat (limited to 'src')
-rw-r--r--src/quest_log.c2
-rw-r--r--src/reset_save_heap.c30
2 files changed, 31 insertions, 1 deletions
diff --git a/src/quest_log.c b/src/quest_log.c
index 07d44388d..3fd9d53de 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -859,7 +859,7 @@ void sub_8110F14(u8 taskId)
}
else
{
- SetMainCallback2(sub_8056938);
+ SetMainCallback2(CB2_ContinueSavedGame);
DestroyTask(taskId);
}
}
diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c
new file mode 100644
index 000000000..4347eb756
--- /dev/null
+++ b/src/reset_save_heap.c
@@ -0,0 +1,30 @@
+#include "global.h"
+#include "main.h"
+#include "gpu_regs.h"
+#include "m4a.h"
+#include "load_save.h"
+#include "save.h"
+#include "new_game.h"
+#include "overworld.h"
+#include "malloc.h"
+
+void sub_8079B7C(void)
+{
+ u16 imeBackup;
+
+ imeBackup = REG_IME;
+ REG_IME = 0;
+ RegisterRamReset(0x00000001);
+ ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_FORCED_BLANK);
+ REG_IME = imeBackup;
+ gMain.inBattle = FALSE;
+ SetSaveBlocksPointers();
+ ResetMenuAndMonGlobals();
+ Save_ResetSaveCounters();
+ Save_LoadGameData(0);
+ if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
+ Sav2_ClearSetDefault();
+ SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
+ InitHeap(gHeap, HEAP_SIZE);
+ SetMainCallback2(CB2_ContinueSavedGame);
+}