Common data OK (#398)

* Matched common data

* Change one hex to dec
This commit is contained in:
Derek Hensley
2021-11-03 07:15:39 -07:00
committed by GitHub
parent 52960d5c2f
commit 888627d364
5 changed files with 23 additions and 5 deletions
+1 -1
View File
@@ -47,7 +47,7 @@ void TitleSetup_GameStateResetContext(void) {
void TitleSetup_InitImpl(GameState* gameState) {
func_80185908();
func_800E9360();
SaveContext_Init();
TitleSetup_GameStateResetContext();
gameState->running = 0;
+20 -1
View File
@@ -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;
}