Copy z64Save.h docs from z_sram_nes WIP

9 files changed, 183 insertions, 183 deletions

diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index 34ad973f6..c86b59374 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -457,7 +457,7 @@ s32 func_8012EE34(s16 arg0) {
         }
     }
 
-    if (gSaveContext.roomInf[125][num] & gBitFlags[arg0 - (num << 5)]) {
+    if (gSaveContext.save.roomInf[125][num] & gBitFlags[arg0 - (num << 5)]) {
         return 1;
     }
 
@@ -503,23 +503,23 @@ void func_8012EF0C(s16 arg0) {
             }
 
             // Required to match
-            gSaveContext.roomInf[125][phi_v1] =
-                gSaveContext.roomInf[125][phi_v1] | gBitFlags[(s16)(*new_var)[phi_v0] - (phi_v1 << 5)];
+            gSaveContext.save.roomInf[125][phi_v1] =
+                gSaveContext.save.roomInf[125][phi_v1] | gBitFlags[(s16)(*new_var)[phi_v0] - (phi_v1 << 5)];
             phi_v0++;
         }
 
         if ((*new_var) == D_801C2380[0]) {
-            gSaveContext.unk_F60 |= 3;
+            gSaveContext.save.mapsVisible |= 3;
         } else if ((*new_var) == D_801C2380[1]) {
-            gSaveContext.unk_F60 |= 0x1C;
+            gSaveContext.save.mapsVisible |= 0x1C;
         } else if ((*new_var) == D_801C2380[2]) {
-            gSaveContext.unk_F60 |= 0xE0;
+            gSaveContext.save.mapsVisible |= 0xE0;
         } else if ((*new_var) == D_801C2380[3]) {
-            gSaveContext.unk_F60 |= 0x100;
+            gSaveContext.save.mapsVisible |= 0x100;
         } else if ((*new_var) == D_801C2380[4]) {
-            gSaveContext.unk_F60 |= 0x1E00;
+            gSaveContext.save.mapsVisible |= 0x1E00;
         } else if ((*new_var) == D_801C2380[5]) {
-            gSaveContext.unk_F60 |= 0x6000;
+            gSaveContext.save.mapsVisible |= 0x6000;
         }
     }
 
@@ -533,11 +533,11 @@ void func_8012F0EC(s16 arg0);
 // regalloc
 void func_8012F1BC(s16 sceneIndex) {
     if (sceneIndex == SCENE_KINSTA1) {
-        gSaveContext.roomInf[126][0] = ((((gSaveContext.roomInf[126][0] & 0xFFFF0000) >> 0x10) + 1) << 0x10) |
-                                       (gSaveContext.roomInf[126][0] & 0xFFFF);
+        gSaveContext.save.roomInf[126][0] = ((((gSaveContext.save.roomInf[126][0] & 0xFFFF0000) >> 0x10) + 1) << 0x10) |
+                                       (gSaveContext.save.roomInf[126][0] & 0xFFFF);
     } else {
-        gSaveContext.roomInf[126][0] =
-            ((gSaveContext.roomInf[126][0] + 1) & 0xFFFF) | (gSaveContext.roomInf[126][0] & 0xFFFF0000);
+        gSaveContext.save.roomInf[126][0] =
+            ((gSaveContext.save.roomInf[126][0] + 1) & 0xFFFF) | (gSaveContext.save.roomInf[126][0] & 0xFFFF0000);
     }
 }
 #else
@@ -547,9 +547,9 @@ void func_8012F1BC(s16 arg0);
 
 s16 func_8012F22C(s16 sceneIndex) {
     if (sceneIndex == SCENE_KINSTA1) {
-        return (gSaveContext.roomInf[126][0] & 0xFFFF0000) >> 0x10;
+        return (gSaveContext.save.roomInf[126][0] & 0xFFFF0000) >> 0x10;
     } else {
-        return gSaveContext.roomInf[126][0] & 0xFFFF;
+        return gSaveContext.save.roomInf[126][0] & 0xFFFF;
     }
 }
 
diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index 780884c85..53be7b68d 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -12,106 +12,106 @@
 #include "global.h"
 
 static FlagSetEntry sFlagEntries[] = {
-    { &gSaveContext.weekEventReg[0], "week_event_reg[0]" },
-    { &gSaveContext.weekEventReg[1], "week_event_reg[1]" },
-    { &gSaveContext.weekEventReg[2], "week_event_reg[2]" },
-    { &gSaveContext.weekEventReg[3], "week_event_reg[3]" },
-    { &gSaveContext.weekEventReg[4], "week_event_reg[4]" },
-    { &gSaveContext.weekEventReg[5], "week_event_reg[5]" },
-    { &gSaveContext.weekEventReg[6], "week_event_reg[6]" },
-    { &gSaveContext.weekEventReg[7], "week_event_reg[7]" },
-    { &gSaveContext.weekEventReg[8], "week_event_reg[8]" },
-    { &gSaveContext.weekEventReg[9], "week_event_reg[9]" },
-    { &gSaveContext.weekEventReg[10], "week_event_reg[10]" },
-    { &gSaveContext.weekEventReg[11], "week_event_reg[11]" },
-    { &gSaveContext.weekEventReg[12], "week_event_reg[12]" },
-    { &gSaveContext.weekEventReg[13], "week_event_reg[13]" },
-    { &gSaveContext.weekEventReg[14], "week_event_reg[14]" },
-    { &gSaveContext.weekEventReg[15], "week_event_reg[15]" },
-    { &gSaveContext.weekEventReg[16], "week_event_reg[16]" },
-    { &gSaveContext.weekEventReg[17], "week_event_reg[17]" },
-    { &gSaveContext.weekEventReg[18], "week_event_reg[18]" },
-    { &gSaveContext.weekEventReg[19], "week_event_reg[19]" },
-    { &gSaveContext.weekEventReg[20], "week_event_reg[20]" },
-    { &gSaveContext.weekEventReg[21], "week_event_reg[21]" },
-    { &gSaveContext.weekEventReg[22], "week_event_reg[22]" },
-    { &gSaveContext.weekEventReg[23], "week_event_reg[23]" },
-    { &gSaveContext.weekEventReg[24], "week_event_reg[24]" },
-    { &gSaveContext.weekEventReg[25], "week_event_reg[25]" },
-    { &gSaveContext.weekEventReg[26], "week_event_reg[26]" },
-    { &gSaveContext.weekEventReg[27], "week_event_reg[27]" },
-    { &gSaveContext.weekEventReg[28], "week_event_reg[28]" },
-    { &gSaveContext.weekEventReg[29], "week_event_reg[29]" },
-    { &gSaveContext.weekEventReg[30], "week_event_reg[30]" },
-    { &gSaveContext.weekEventReg[31], "week_event_reg[31]" },
-    { &gSaveContext.weekEventReg[32], "week_event_reg[32]" },
-    { &gSaveContext.weekEventReg[33], "week_event_reg[33]" },
-    { &gSaveContext.weekEventReg[34], "week_event_reg[34]" },
-    { &gSaveContext.weekEventReg[35], "week_event_reg[35]" },
-    { &gSaveContext.weekEventReg[36], "week_event_reg[36]" },
-    { &gSaveContext.weekEventReg[37], "week_event_reg[37]" },
-    { &gSaveContext.weekEventReg[38], "week_event_reg[38]" },
-    { &gSaveContext.weekEventReg[39], "week_event_reg[39]" },
-    { &gSaveContext.weekEventReg[40], "week_event_reg[40]" },
-    { &gSaveContext.weekEventReg[41], "week_event_reg[41]" },
-    { &gSaveContext.weekEventReg[42], "week_event_reg[42]" },
-    { &gSaveContext.weekEventReg[43], "week_event_reg[43]" },
-    { &gSaveContext.weekEventReg[44], "week_event_reg[44]" },
-    { &gSaveContext.weekEventReg[45], "week_event_reg[45]" },
-    { &gSaveContext.weekEventReg[46], "week_event_reg[46]" },
-    { &gSaveContext.weekEventReg[47], "week_event_reg[47]" },
-    { &gSaveContext.weekEventReg[48], "week_event_reg[48]" },
-    { &gSaveContext.weekEventReg[49], "week_event_reg[49]" },
-    { &gSaveContext.weekEventReg[50], "week_event_reg[50]" },
-    { &gSaveContext.weekEventReg[51], "week_event_reg[51]" },
-    { &gSaveContext.weekEventReg[52], "week_event_reg[52]" },
-    { &gSaveContext.weekEventReg[53], "week_event_reg[53]" },
-    { &gSaveContext.weekEventReg[54], "week_event_reg[54]" },
-    { &gSaveContext.weekEventReg[55], "week_event_reg[55]" },
-    { &gSaveContext.weekEventReg[56], "week_event_reg[56]" },
-    { &gSaveContext.weekEventReg[57], "week_event_reg[57]" },
-    { &gSaveContext.weekEventReg[58], "week_event_reg[58]" },
-    { &gSaveContext.weekEventReg[59], "week_event_reg[59]" },
-    { &gSaveContext.weekEventReg[60], "week_event_reg[60]" },
-    { &gSaveContext.weekEventReg[61], "week_event_reg[61]" },
-    { &gSaveContext.weekEventReg[62], "week_event_reg[62]" },
-    { &gSaveContext.weekEventReg[63], "week_event_reg[63]" },
-    { &gSaveContext.weekEventReg[64], "week_event_reg[64]" },
-    { &gSaveContext.weekEventReg[65], "week_event_reg[65]" },
-    { &gSaveContext.weekEventReg[66], "week_event_reg[66]" },
-    { &gSaveContext.weekEventReg[67], "week_event_reg[67]" },
-    { &gSaveContext.weekEventReg[68], "week_event_reg[68]" },
-    { &gSaveContext.weekEventReg[69], "week_event_reg[69]" },
-    { &gSaveContext.weekEventReg[70], "week_event_reg[70]" },
-    { &gSaveContext.weekEventReg[71], "week_event_reg[71]" },
-    { &gSaveContext.weekEventReg[72], "week_event_reg[72]" },
-    { &gSaveContext.weekEventReg[73], "week_event_reg[73]" },
-    { &gSaveContext.weekEventReg[74], "week_event_reg[74]" },
-    { &gSaveContext.weekEventReg[75], "week_event_reg[75]" },
-    { &gSaveContext.weekEventReg[76], "week_event_reg[76]" },
-    { &gSaveContext.weekEventReg[77], "week_event_reg[77]" },
-    { &gSaveContext.weekEventReg[78], "week_event_reg[78]" },
-    { &gSaveContext.weekEventReg[79], "week_event_reg[79]" },
-    { &gSaveContext.weekEventReg[80], "week_event_reg[80]" },
-    { &gSaveContext.weekEventReg[81], "week_event_reg[81]" },
-    { &gSaveContext.weekEventReg[82], "week_event_reg[82]" },
-    { &gSaveContext.weekEventReg[83], "week_event_reg[83]" },
-    { &gSaveContext.weekEventReg[84], "week_event_reg[84]" },
-    { &gSaveContext.weekEventReg[85], "week_event_reg[85]" },
-    { &gSaveContext.weekEventReg[86], "week_event_reg[86]" },
-    { &gSaveContext.weekEventReg[87], "week_event_reg[87]" },
-    { &gSaveContext.weekEventReg[88], "week_event_reg[88]" },
-    { &gSaveContext.weekEventReg[89], "week_event_reg[89]" },
-    { &gSaveContext.weekEventReg[90], "week_event_reg[90]" },
-    { &gSaveContext.weekEventReg[91], "week_event_reg[91]" },
-    { &gSaveContext.weekEventReg[92], "week_event_reg[92]" },
-    { &gSaveContext.weekEventReg[93], "week_event_reg[93]" },
-    { &gSaveContext.weekEventReg[94], "week_event_reg[94]" },
-    { &gSaveContext.weekEventReg[95], "week_event_reg[95]" },
-    { &gSaveContext.weekEventReg[96], "week_event_reg[96]" },
-    { &gSaveContext.weekEventReg[97], "week_event_reg[97]" },
-    { &gSaveContext.weekEventReg[98], "week_event_reg[98]" },
-    { &gSaveContext.weekEventReg[99], "week_event_reg[99]" },
+    { &gSaveContext.save.weekEventReg[0], "week_event_reg[0]" },
+    { &gSaveContext.save.weekEventReg[1], "week_event_reg[1]" },
+    { &gSaveContext.save.weekEventReg[2], "week_event_reg[2]" },
+    { &gSaveContext.save.weekEventReg[3], "week_event_reg[3]" },
+    { &gSaveContext.save.weekEventReg[4], "week_event_reg[4]" },
+    { &gSaveContext.save.weekEventReg[5], "week_event_reg[5]" },
+    { &gSaveContext.save.weekEventReg[6], "week_event_reg[6]" },
+    { &gSaveContext.save.weekEventReg[7], "week_event_reg[7]" },
+    { &gSaveContext.save.weekEventReg[8], "week_event_reg[8]" },
+    { &gSaveContext.save.weekEventReg[9], "week_event_reg[9]" },
+    { &gSaveContext.save.weekEventReg[10], "week_event_reg[10]" },
+    { &gSaveContext.save.weekEventReg[11], "week_event_reg[11]" },
+    { &gSaveContext.save.weekEventReg[12], "week_event_reg[12]" },
+    { &gSaveContext.save.weekEventReg[13], "week_event_reg[13]" },
+    { &gSaveContext.save.weekEventReg[14], "week_event_reg[14]" },
+    { &gSaveContext.save.weekEventReg[15], "week_event_reg[15]" },
+    { &gSaveContext.save.weekEventReg[16], "week_event_reg[16]" },
+    { &gSaveContext.save.weekEventReg[17], "week_event_reg[17]" },
+    { &gSaveContext.save.weekEventReg[18], "week_event_reg[18]" },
+    { &gSaveContext.save.weekEventReg[19], "week_event_reg[19]" },
+    { &gSaveContext.save.weekEventReg[20], "week_event_reg[20]" },
+    { &gSaveContext.save.weekEventReg[21], "week_event_reg[21]" },
+    { &gSaveContext.save.weekEventReg[22], "week_event_reg[22]" },
+    { &gSaveContext.save.weekEventReg[23], "week_event_reg[23]" },
+    { &gSaveContext.save.weekEventReg[24], "week_event_reg[24]" },
+    { &gSaveContext.save.weekEventReg[25], "week_event_reg[25]" },
+    { &gSaveContext.save.weekEventReg[26], "week_event_reg[26]" },
+    { &gSaveContext.save.weekEventReg[27], "week_event_reg[27]" },
+    { &gSaveContext.save.weekEventReg[28], "week_event_reg[28]" },
+    { &gSaveContext.save.weekEventReg[29], "week_event_reg[29]" },
+    { &gSaveContext.save.weekEventReg[30], "week_event_reg[30]" },
+    { &gSaveContext.save.weekEventReg[31], "week_event_reg[31]" },
+    { &gSaveContext.save.weekEventReg[32], "week_event_reg[32]" },
+    { &gSaveContext.save.weekEventReg[33], "week_event_reg[33]" },
+    { &gSaveContext.save.weekEventReg[34], "week_event_reg[34]" },
+    { &gSaveContext.save.weekEventReg[35], "week_event_reg[35]" },
+    { &gSaveContext.save.weekEventReg[36], "week_event_reg[36]" },
+    { &gSaveContext.save.weekEventReg[37], "week_event_reg[37]" },
+    { &gSaveContext.save.weekEventReg[38], "week_event_reg[38]" },
+    { &gSaveContext.save.weekEventReg[39], "week_event_reg[39]" },
+    { &gSaveContext.save.weekEventReg[40], "week_event_reg[40]" },
+    { &gSaveContext.save.weekEventReg[41], "week_event_reg[41]" },
+    { &gSaveContext.save.weekEventReg[42], "week_event_reg[42]" },
+    { &gSaveContext.save.weekEventReg[43], "week_event_reg[43]" },
+    { &gSaveContext.save.weekEventReg[44], "week_event_reg[44]" },
+    { &gSaveContext.save.weekEventReg[45], "week_event_reg[45]" },
+    { &gSaveContext.save.weekEventReg[46], "week_event_reg[46]" },
+    { &gSaveContext.save.weekEventReg[47], "week_event_reg[47]" },
+    { &gSaveContext.save.weekEventReg[48], "week_event_reg[48]" },
+    { &gSaveContext.save.weekEventReg[49], "week_event_reg[49]" },
+    { &gSaveContext.save.weekEventReg[50], "week_event_reg[50]" },
+    { &gSaveContext.save.weekEventReg[51], "week_event_reg[51]" },
+    { &gSaveContext.save.weekEventReg[52], "week_event_reg[52]" },
+    { &gSaveContext.save.weekEventReg[53], "week_event_reg[53]" },
+    { &gSaveContext.save.weekEventReg[54], "week_event_reg[54]" },
+    { &gSaveContext.save.weekEventReg[55], "week_event_reg[55]" },
+    { &gSaveContext.save.weekEventReg[56], "week_event_reg[56]" },
+    { &gSaveContext.save.weekEventReg[57], "week_event_reg[57]" },
+    { &gSaveContext.save.weekEventReg[58], "week_event_reg[58]" },
+    { &gSaveContext.save.weekEventReg[59], "week_event_reg[59]" },
+    { &gSaveContext.save.weekEventReg[60], "week_event_reg[60]" },
+    { &gSaveContext.save.weekEventReg[61], "week_event_reg[61]" },
+    { &gSaveContext.save.weekEventReg[62], "week_event_reg[62]" },
+    { &gSaveContext.save.weekEventReg[63], "week_event_reg[63]" },
+    { &gSaveContext.save.weekEventReg[64], "week_event_reg[64]" },
+    { &gSaveContext.save.weekEventReg[65], "week_event_reg[65]" },
+    { &gSaveContext.save.weekEventReg[66], "week_event_reg[66]" },
+    { &gSaveContext.save.weekEventReg[67], "week_event_reg[67]" },
+    { &gSaveContext.save.weekEventReg[68], "week_event_reg[68]" },
+    { &gSaveContext.save.weekEventReg[69], "week_event_reg[69]" },
+    { &gSaveContext.save.weekEventReg[70], "week_event_reg[70]" },
+    { &gSaveContext.save.weekEventReg[71], "week_event_reg[71]" },
+    { &gSaveContext.save.weekEventReg[72], "week_event_reg[72]" },
+    { &gSaveContext.save.weekEventReg[73], "week_event_reg[73]" },
+    { &gSaveContext.save.weekEventReg[74], "week_event_reg[74]" },
+    { &gSaveContext.save.weekEventReg[75], "week_event_reg[75]" },
+    { &gSaveContext.save.weekEventReg[76], "week_event_reg[76]" },
+    { &gSaveContext.save.weekEventReg[77], "week_event_reg[77]" },
+    { &gSaveContext.save.weekEventReg[78], "week_event_reg[78]" },
+    { &gSaveContext.save.weekEventReg[79], "week_event_reg[79]" },
+    { &gSaveContext.save.weekEventReg[80], "week_event_reg[80]" },
+    { &gSaveContext.save.weekEventReg[81], "week_event_reg[81]" },
+    { &gSaveContext.save.weekEventReg[82], "week_event_reg[82]" },
+    { &gSaveContext.save.weekEventReg[83], "week_event_reg[83]" },
+    { &gSaveContext.save.weekEventReg[84], "week_event_reg[84]" },
+    { &gSaveContext.save.weekEventReg[85], "week_event_reg[85]" },
+    { &gSaveContext.save.weekEventReg[86], "week_event_reg[86]" },
+    { &gSaveContext.save.weekEventReg[87], "week_event_reg[87]" },
+    { &gSaveContext.save.weekEventReg[88], "week_event_reg[88]" },
+    { &gSaveContext.save.weekEventReg[89], "week_event_reg[89]" },
+    { &gSaveContext.save.weekEventReg[90], "week_event_reg[90]" },
+    { &gSaveContext.save.weekEventReg[91], "week_event_reg[91]" },
+    { &gSaveContext.save.weekEventReg[92], "week_event_reg[92]" },
+    { &gSaveContext.save.weekEventReg[93], "week_event_reg[93]" },
+    { &gSaveContext.save.weekEventReg[94], "week_event_reg[94]" },
+    { &gSaveContext.save.weekEventReg[95], "week_event_reg[95]" },
+    { &gSaveContext.save.weekEventReg[96], "week_event_reg[96]" },
+    { &gSaveContext.save.weekEventReg[97], "week_event_reg[97]" },
+    { &gSaveContext.save.weekEventReg[98], "week_event_reg[98]" },
+    { &gSaveContext.save.weekEventReg[99], "week_event_reg[99]" },
 
     { &gSaveContext.eventInf[0], "event_inf[0]" },
     { &gSaveContext.eventInf[1], "event_inf[1]" },
@@ -245,8 +245,8 @@ void FlagSet_Update(GameState* gameState) {
     if (CHECK_BTN_ALL(input->cur.button, BTN_START)) {
         if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
             s16 i;
-            for (i = 0; i < ARRAY_COUNT(gSaveContext.weekEventReg); i++) {
-                gSaveContext.weekEventReg[i] = 0;
+            for (i = 0; i < ARRAY_COUNT(gSaveContext.save.weekEventReg); i++) {
+                gSaveContext.save.weekEventReg[i] = 0;
             }
             for (i = 0; i < ARRAY_COUNT(gSaveContext.eventInf); i++) {
                 gSaveContext.eventInf[i] = 0;
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index 26fd324a7..a2081af73 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -4,7 +4,7 @@ SaveContext gSaveContext;
 
 void SaveContext_Init(void) {
     bzero(&gSaveContext, sizeof(gSaveContext));
-    gSaveContext.playerForm = 0;
+    gSaveContext.save.playerForm = 0;
     gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
     gSaveContext.nightSeqIndex = 0xFF;
     gSaveContext.unk_3F46 = NA_BGM_GENERAL_SFX;
@@ -16,7 +16,7 @@ void SaveContext_Init(void) {
     gSaveContext.dogIsLost = true;
     gSaveContext.nextTransition = 0xFF;
     gSaveContext.unk_3F26 = 50;
-    gSaveContext.language = 1;
-    gSaveContext.audioSetting = 0;
-    gSaveContext.zTargetSetting = 0;
+    gSaveContext.options.language = 1;
+    gSaveContext.options.audioSetting = 0;
+    gSaveContext.options.zTargetSetting = 0;
 }
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index 7308b33f4..cd2fa96b6 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -7,17 +7,17 @@ u16 ElfMessage_GetFirstCycleHint(GlobalContext* globalCtx) {
     if (CURRENT_DAY <= 0) {
         return 0;
     }
-    if (gSaveContext.weekEventReg[88] & 0x20) {
+    if (gSaveContext.save.weekEventReg[88] & 0x20) {
         return 0;
     }
-    if (gSaveContext.weekEventReg[79] & 0x10) {
-        if (gSaveContext.weekEventReg[8] & 0x40) {
+    if (gSaveContext.save.weekEventReg[79] & 0x10) {
+        if (gSaveContext.save.weekEventReg[8] & 0x40) {
             return 0;
         }
         return 0x224;
     }
-    if (!(gSaveContext.weekEventReg[8] & 0x80)) {
-        if (gSaveContext.weekEventReg[9] & 1) {
+    if (!(gSaveContext.save.weekEventReg[8] & 0x80)) {
+        if (gSaveContext.save.weekEventReg[9] & 1) {
             return 0x21E;
         }
         if (globalCtx->sceneNum == SCENE_YOUSEI_IZUMI) {
@@ -25,7 +25,7 @@ u16 ElfMessage_GetFirstCycleHint(GlobalContext* globalCtx) {
         }
         return 0x21D;
     }
-    if (gSaveContext.magicAcquired != true) {
+    if (gSaveContext.save.playerData.magicAcquired != true) {
         return 0x21F;
     }
     if (INV_CONTENT(ITEM_DEED_LAND) == ITEM_DEED_LAND) {
@@ -35,27 +35,27 @@ u16 ElfMessage_GetFirstCycleHint(GlobalContext* globalCtx) {
         return 0;
     }
     if (INV_CONTENT(ITEM_MOON_TEAR) == ITEM_MOON_TEAR) {
-        if (gSaveContext.weekEventReg[86] & 4) {
+        if (gSaveContext.save.weekEventReg[86] & 4) {
             return 0x242;
         }
         return 0x243;
     }
-    if (gSaveContext.weekEventReg[74] & 0x20) {
+    if (gSaveContext.save.weekEventReg[74] & 0x20) {
         return 0x223;
     }
-    if (gSaveContext.weekEventReg[73] & 0x80) {
+    if (gSaveContext.save.weekEventReg[73] & 0x80) {
         return 0x222;
     }
-    if (gSaveContext.weekEventReg[73] & 0x20) {
+    if (gSaveContext.save.weekEventReg[73] & 0x20) {
         return 0x221;
     }
-    if (gSaveContext.weekEventReg[77] & 2) {
-        if (gSaveContext.weekEventReg[73] & 0x10) {
+    if (gSaveContext.save.weekEventReg[77] & 2) {
+        if (gSaveContext.save.weekEventReg[73] & 0x10) {
             return 0x240;
         }
         return 0x241;
     }
-    if ((gSaveContext.weekEventReg[86] & 2) || (gSaveContext.weekEventReg[73] & 0x40)) {
+    if ((gSaveContext.save.weekEventReg[86] & 2) || (gSaveContext.save.weekEventReg[73] & 0x40)) {
         return 0x23F;
     }
     return 0x220;
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index acd827f8e..11073ed60 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -814,13 +814,13 @@ s16 func_800A7650(s16 dropId) {
         (((dropId == ITEM00_ARROWS_10) || (dropId == ITEM00_ARROWS_30) || (dropId == ITEM00_ARROWS_40) ||
           (dropId == ITEM00_ARROWS_50)) &&
          (INV_CONTENT(ITEM_BOW) == ITEM_NONE)) ||
-        (((dropId == ITEM00_MAGIC_LARGE) || (dropId == ITEM00_MAGIC_SMALL)) && (gSaveContext.magicLevel == 0))) {
+        (((dropId == ITEM00_MAGIC_LARGE) || (dropId == ITEM00_MAGIC_SMALL)) && (gSaveContext.save.playerData.magicLevel == 0))) {
         return ITEM00_NO_DROP;
     }
 
     if (dropId == ITEM00_HEART) {
-        healthCapacity = gSaveContext.healthCapacity;
-        if (healthCapacity == gSaveContext.health) {
+        healthCapacity = gSaveContext.save.playerData.healthCapacity;
+        if (healthCapacity == gSaveContext.save.playerData.health) {
             return ITEM00_RUPEE_GREEN;
         }
     }
@@ -1066,9 +1066,9 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3
 
         if (dropId == ITEM00_MASK) {
             dropQuantity = 1;
-            if (gSaveContext.playerForm != PLAYER_FORM_GORON) {
-                if (gSaveContext.playerForm != PLAYER_FORM_ZORA) {
-                    if (gSaveContext.playerForm != PLAYER_FORM_HUMAN) {
+            if (gSaveContext.save.playerForm != PLAYER_FORM_GORON) {
+                if (gSaveContext.save.playerForm != PLAYER_FORM_ZORA) {
+                    if (gSaveContext.save.playerForm != PLAYER_FORM_HUMAN) {
                         dropId = ITEM00_RUPEE_GREEN;
                     } else {
                         dropId = ITEM00_ARROWS_10;
@@ -1097,26 +1097,26 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3
         }
 
         if (dropId == ITEM00_FLEXIBLE) {
-            if (gSaveContext.health < 0x11) {
+            if (gSaveContext.save.playerData.health < 0x11) {
                 Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, spawnPos->y + 40.0f,
                             spawnPos->z, 0, 0, 0, 2);
                 Audio_PlaySoundAtPosition(globalCtx, spawnPos, 40, NA_SE_EV_BUTTERFRY_TO_FAIRY);
                 return;
             }
 
-            if (gSaveContext.health < 0x31) {
+            if (gSaveContext.save.playerData.health < 0x31) {
                 params = 0x10;
                 dropId = ITEM00_HEART;
                 dropQuantity = 3;
-            } else if (gSaveContext.health < 0x51) {
+            } else if (gSaveContext.save.playerData.health < 0x51) {
                 params = 0x10;
                 dropId = ITEM00_HEART;
                 dropQuantity = 1;
-            } else if ((gSaveContext.magicLevel != 0) && (gSaveContext.magic == 0)) {
+            } else if ((gSaveContext.save.playerData.magicLevel != 0) && (gSaveContext.save.playerData.magic == 0)) {
                 params = 0xD0;
                 dropId = ITEM00_MAGIC_LARGE;
                 dropQuantity = 1;
-            } else if ((gSaveContext.magicLevel != 0) && ((gSaveContext.magicLevel >> 1) >= gSaveContext.magic)) {
+            } else if ((gSaveContext.save.playerData.magicLevel != 0) && ((gSaveContext.save.playerData.magicLevel >> 1) >= gSaveContext.save.playerData.magic)) {
                 params = 0xD0;
                 dropId = ITEM00_MAGIC_LARGE;
                 dropQuantity = 1;
@@ -1128,7 +1128,7 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3
                 params = 0xB0;
                 dropId = ITEM00_BOMBS_A;
                 dropQuantity = 1;
-            } else if (gSaveContext.rupees < 11) {
+            } else if (gSaveContext.save.playerData.rupees < 11) {
                 params = 0xA0;
                 dropId = ITEM00_RUPEE_RED;
                 dropQuantity = 1;
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c
index 979b28cba..5b885b653 100644
--- a/src/code/z_game_over.c
+++ b/src/code/z_game_over.c
@@ -44,7 +44,7 @@ void GameOver_Update(GlobalContext* globalCtx) {
             }
 
             gSaveContext.unk_3DC0 = 2000;
-            gSaveContext.naviTimer = 0;
+            gSaveContext.save.playerData.tatlTimer = 0;
             gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
             gSaveContext.nightSeqIndex = 0xFF;
             gSaveContext.eventInf[0] = 0;
@@ -72,11 +72,11 @@ void GameOver_Update(GlobalContext* globalCtx) {
                     gSaveContext.respawnFlag = -6;
                 }
                 gSaveContext.nextTransition = 2;
-                gSaveContext.health = 48;
+                gSaveContext.save.playerData.health = 48;
                 gameOverCtx->state++;
-                if (gSaveContext.inventory.items[SLOT(ITEM_MASK_DEKU)] == ITEM_MASK_DEKU) {
-                    gSaveContext.playerForm = PLAYER_FORM_HUMAN;
-                    gSaveContext.equippedMask = PLAYER_MASK_NONE;
+                if (gSaveContext.save.inventory.items[SLOT(ITEM_MASK_DEKU)] == ITEM_MASK_DEKU) {
+                    gSaveContext.save.playerForm = PLAYER_FORM_HUMAN;
+                    gSaveContext.save.equippedMask = PLAYER_MASK_NONE;
                 }
                 func_8013EE24();
             }
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c
index bbfad829f..898903cd0 100644
--- a/src/code/z_lifemeter.c
+++ b/src/code/z_lifemeter.c
@@ -38,7 +38,7 @@ void LifeMeter_Init(GlobalContext* globalCtx) {
 
     interfaceCtx->unkTimer = 320;
 
-    interfaceCtx->health = gSaveContext.health;
+    interfaceCtx->health = gSaveContext.save.playerData.health;
 
     interfaceCtx->lifeColorChange = 0;
     interfaceCtx->lifeColorChangeDirection = 0;
@@ -168,7 +168,7 @@ void LifeMeter_UpdateColors(GlobalContext* globalCtx) {
 }
 
 s32 LifeMeter_SaveInterfaceHealth(GlobalContext* globalCtx) {
-    gSaveContext.health = globalCtx->interfaceCtx.health;
+    gSaveContext.save.playerData.health = globalCtx->interfaceCtx.health;
 
     return 1;
 }
@@ -178,8 +178,8 @@ s32 LifeMeter_IncreaseInterfaceHealth(GlobalContext* globalCtx) {
 
     interfaceCtx->unkTimer = 320;
     interfaceCtx->health += 0x10;
-    if (globalCtx->interfaceCtx.health >= gSaveContext.health) {
-        globalCtx->interfaceCtx.health = gSaveContext.health;
+    if (globalCtx->interfaceCtx.health >= gSaveContext.save.playerData.health) {
+        globalCtx->interfaceCtx.health = gSaveContext.save.playerData.health;
         return 1;
     }
     return 0;
@@ -195,7 +195,7 @@ s32 LifeMeter_DecreaseInterfaceHealth(GlobalContext* globalCtx) {
         interfaceCtx->health -= 0x10;
         if (interfaceCtx->health <= 0) {
             interfaceCtx->health = 0;
-            globalCtx->damagePlayer(globalCtx, -(((void)0, gSaveContext.health) + 1));
+            globalCtx->damagePlayer(globalCtx, -(((void)0, gSaveContext.save.playerData.health) + 1));
             return 1;
         }
     }
@@ -216,18 +216,18 @@ void LifeMeter_Draw(GlobalContext* globalCtx) {
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
     InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
     Vtx* beatingHeartVtx = interfaceCtx->beatingHeartVtx;
-    s32 fractionHeartCount = gSaveContext.health % 0x10;
-    s16 healthCapacity = gSaveContext.healthCapacity / 0x10;
-    s16 fullHeartCount = gSaveContext.health / 0x10;
+    s32 fractionHeartCount = gSaveContext.save.playerData.health % 0x10;
+    s16 healthCapacity = gSaveContext.save.playerData.healthCapacity / 0x10;
+    s16 fullHeartCount = gSaveContext.save.playerData.health / 0x10;
     s32 pad2;
     f32 lifesize = interfaceCtx->lifeSizeChange * 0.1f;
     u32 curCombineModeSet = 0;
     TexturePtr temp = NULL;
-    s32 ddCount = gSaveContext.inventory.dungeonKeys[9] - 1;
+    s32 ddCount = gSaveContext.save.inventory.dungeonKeys[9] - 1;
 
     OPEN_DISPS(gfxCtx);
 
-    if ((gSaveContext.health % 0x10) == 0) {
+    if ((gSaveContext.save.playerData.health % 0x10) == 0) {
         fullHeartCount--;
     }
     offsetY = 0.0f;
@@ -417,19 +417,19 @@ void LifeMeter_UpdateSizeAndBeep(GlobalContext* globalCtx) {
 u32 LifeMeter_IsCritical(void) {
     s16 criticalThreshold;
 
-    if (gSaveContext.healthCapacity <= 80) { // healthCapacity <= 5 hearts?
+    if (gSaveContext.save.playerData.healthCapacity <= 80) { // healthCapacity <= 5 hearts?
         criticalThreshold = 16;
 
-    } else if (gSaveContext.healthCapacity <= 160) { // healthCapacity <= 10 hearts?
+    } else if (gSaveContext.save.playerData.healthCapacity <= 160) { // healthCapacity <= 10 hearts?
         criticalThreshold = 24;
 
-    } else if (gSaveContext.healthCapacity <= 240) { // healthCapacity <= 15 hearts?
+    } else if (gSaveContext.save.playerData.healthCapacity <= 240) { // healthCapacity <= 15 hearts?
         criticalThreshold = 32;
     } else {
         criticalThreshold = 44;
     }
 
-    if ((criticalThreshold >= gSaveContext.health) && (gSaveContext.health > 0)) {
+    if ((criticalThreshold >= gSaveContext.save.playerData.health) && (gSaveContext.save.playerData.health > 0)) {
         return true;
     }
     return false;
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index 6bebcf938..7d14ec98b 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -162,7 +162,7 @@ void Scene_HeaderCmdSpawnList(GlobalContext* globalCtx, SceneCmd* cmd) {
     nextObject = globalCtx2->objectCtx.status[globalCtx2->objectCtx.num].segment;
     globalCtx->objectCtx.num = loadedCount;
     globalCtx->objectCtx.spawnedObjectCount = loadedCount;
-    playerForm = gSaveContext.playerForm;
+    playerForm = gSaveContext.save.playerForm;
     playerObjectId = gLinkFormObjectIndexes[playerForm];
     gActorOverlayTable[0].initInfo->objectId = playerObjectId;
     Object_Spawn(&globalCtx->objectCtx, playerObjectId);
@@ -383,7 +383,7 @@ void Scene_HeaderCmdTimeSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
     u32 dayTime;
 
     if (cmd->timeSettings.hour != 0xFF && cmd->timeSettings.min != 0xFF) {
-        gSaveContext.environmentTime = gSaveContext.time =
+        gSaveContext.environmentTime = gSaveContext.save.time =
             (u16)(((cmd->timeSettings.hour + (cmd->timeSettings.min / 60.0f)) * 60.0f) / 0.021972656f);
     }
 
@@ -393,7 +393,7 @@ void Scene_HeaderCmdTimeSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
         globalCtx->envCtx.unk_2 = 0;
     }
 
-    if ((gSaveContext.inventory.items[SLOT_OCARINA] == ITEM_NONE) && (globalCtx->envCtx.unk_2 != 0)) {
+    if ((gSaveContext.save.inventory.items[SLOT_OCARINA] == ITEM_NONE) && (globalCtx->envCtx.unk_2 != 0)) {
         globalCtx->envCtx.unk_2 = 5;
     }
 
@@ -401,15 +401,15 @@ void Scene_HeaderCmdTimeSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
         REG(15) = globalCtx->envCtx.unk_2;
     }
 
-    dayTime = gSaveContext.time;
+    dayTime = gSaveContext.save.time;
     globalCtx->envCtx.unk_4 = -(Math_SinS(dayTime - 0x8000) * 120.0f) * 25.0f;
-    dayTime = gSaveContext.time;
+    dayTime = gSaveContext.save.time;
     globalCtx->envCtx.unk_8 = (Math_CosS(dayTime - 0x8000) * 120.0f) * 25.0f;
-    dayTime = gSaveContext.time;
+    dayTime = gSaveContext.save.time;
     globalCtx->envCtx.unk_C = (Math_CosS(dayTime - 0x8000) * 20.0f) * 25.0f;
 
-    if (globalCtx->envCtx.unk_2 == 0 && gSaveContext.cutscene < 0xFFF0) {
-        gSaveContext.environmentTime = gSaveContext.time;
+    if (globalCtx->envCtx.unk_2 == 0 && gSaveContext.save.cutscene < 0xFFF0) {
+        gSaveContext.environmentTime = gSaveContext.save.time;
 
         if (gSaveContext.environmentTime >= 0x2AAA && gSaveContext.environmentTime < 0x4555) {
             gSaveContext.environmentTime = 0x3555;
@@ -525,7 +525,7 @@ void Scene_HeaderCmdSetAreaVisitedFlag(GlobalContext* globalCtx, SceneCmd* cmd)
     }
 
     if (i < ARRAY_COUNT(gScenesPerRegion)) {
-        gSaveContext.mapsVisited = (gBitFlags[i] | gSaveContext.mapsVisited) | gSaveContext.mapsVisited;
+        gSaveContext.save.mapsVisited = (gBitFlags[i] | gSaveContext.save.mapsVisited) | gSaveContext.save.mapsVisited;
     }
 }
 
@@ -608,5 +608,5 @@ u16 Entrance_CreateIndex(s32 sceneIndex, s32 spawnIndex, s32 sceneSetup) {
  * Creates an entrance index from the current entrance index with the given spawn index.
  */
 u16 Entrance_CreateIndexFromSpawn(s32 spawnIndex) {
-    return Entrance_CreateIndex(gSaveContext.entranceIndex >> 9, spawnIndex, 0);
+    return Entrance_CreateIndex(gSaveContext.save.entranceIndex >> 9, spawnIndex, 0);
 }
diff --git a/src/code/z_snap.c b/src/code/z_snap.c
index 1c0ab3a27..afb0e5f97 100644
--- a/src/code/z_snap.c
+++ b/src/code/z_snap.c
@@ -12,8 +12,8 @@ s32 func_8013A240(GlobalContext* globalCtx) {
     s32 seen;
     s32 count = 0;
 
-    gSaveContext.roomInf[123][3] = 0;
-    gSaveContext.roomInf[123][4] = 0;
+    gSaveContext.save.roomInf[123][3] = 0;
+    gSaveContext.save.roomInf[123][4] = 0;
 
     if (globalCtx->sceneNum == SCENE_20SICHITAI) {
         func_8013A41C(1);
@@ -76,19 +76,19 @@ s32 func_8013A240(GlobalContext* globalCtx) {
 
 void func_8013A41C(s32 flag) {
     if (flag < 0x20) {
-        gSaveContext.roomInf[123][3] |= (1 << flag);
+        gSaveContext.save.roomInf[123][3] |= (1 << flag);
     } else {
         flag &= 0x1F;
-        gSaveContext.roomInf[123][4] |= (1 << flag);
+        gSaveContext.save.roomInf[123][4] |= (1 << flag);
     }
 }
 
 void func_8013A46C(s32 flag) {
     if (flag < 0x20) {
-        gSaveContext.roomInf[123][3] &= ~(1 << flag);
+        gSaveContext.save.roomInf[123][3] &= ~(1 << flag);
     } else {
         flag &= 0x1F;
-        gSaveContext.roomInf[123][4] &= ~(1 << flag);
+        gSaveContext.save.roomInf[123][4] &= ~(1 << flag);
     }
 }
 
@@ -96,10 +96,10 @@ u32 func_8013A4C4(s32 flag) {
     SaveContext* saveCtx = &gSaveContext;
 
     if (flag < 0x20) {
-        return saveCtx->roomInf[123][3] & (1 << flag);
+        return saveCtx->save.roomInf[123][3] & (1 << flag);
     } else {
         flag &= 0x1F;
-        return saveCtx->roomInf[123][4] & (1 << flag);
+        return saveCtx->save.roomInf[123][4] & (1 << flag);
     }
 }