summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2021-11-03 07:15:39 -0700
committerGitHub <noreply@github.com>2021-11-03 11:15:39 -0300
commit888627d36468c18446a9792156fb590175c7e0c1 (patch)
treefb4f4bcdcd9d476708ed386cc9df3639eec2b965 /src/code
parent52960d5c2fd0bc957bf743fc8f0d43d1e4e6b99d (diff)
Common data OK (#398)
* Matched common data * Change one hex to dec
Diffstat (limited to 'src/code')
-rw-r--r--src/code/title_setup.c2
-rw-r--r--src/code/z_common_data.c21
2 files changed, 21 insertions, 2 deletions
diff --git a/src/code/title_setup.c b/src/code/title_setup.c
index 7df67a3b2..69790b60c 100644
--- a/src/code/title_setup.c
+++ b/src/code/title_setup.c
@@ -47,7 +47,7 @@ void TitleSetup_GameStateResetContext(void) {
void TitleSetup_InitImpl(GameState* gameState) {
func_80185908();
- func_800E9360();
+ SaveContext_Init();
TitleSetup_GameStateResetContext();
gameState->running = 0;
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index d391ce153..88fa3e103 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -1,3 +1,22 @@
#include "global.h"
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_common_data/func_800E9360.s")
+SaveContext gSaveContext;
+
+void SaveContext_Init(void) {
+ bzero(&gSaveContext, sizeof(gSaveContext));
+ gSaveContext.playerForm = 0;
+ gSaveContext.seqIndex = 0xFF;
+ gSaveContext.nightSeqIndex = 0xFF;
+ gSaveContext.unk_3F46 = 0;
+ gSaveContext.nextCutsceneIndex = 0xFFEF;
+ gSaveContext.cutsceneTrigger = 0;
+ gSaveContext.unk_3F4D = 0;
+ gSaveContext.nextDayTime = 0xFFFF;
+ gSaveContext.environmentTime = 0;
+ gSaveContext.dogIsLost = true;
+ gSaveContext.nextTransition = 0xFF;
+ gSaveContext.unk_3F26 = 50;
+ gSaveContext.language = 1;
+ gSaveContext.audioSetting = 0;
+ gSaveContext.zTargetSetting = 0;
+}