Add `SaveInfo` substruct to `SaveContext` (#1191)

* SaveInfo

* fix accesses in sram_NES.c

* some more fixing

* more fixes

* format

* fix unk

* namefixer

* format

* bss

* review

* weekeventregconvert

* namefixer

* bss

1 files changed, 8 insertions, 8 deletions

diff --git a/src/code/z_snap.c b/src/code/z_snap.c
index e9663b02f..9361cc1e0 100644
--- a/src/code/z_snap.c
+++ b/src/code/z_snap.c
@@ -18,8 +18,8 @@ s32 Snap_RecordPictographedActors(PlayState* play) {
     s32 seen;
     s32 validCount = 0;
 
-    gSaveContext.save.pictoFlags0 = 0;
-    gSaveContext.save.pictoFlags1 = 0;
+    gSaveContext.save.saveInfo.pictoFlags0 = 0;
+    gSaveContext.save.saveInfo.pictoFlags1 = 0;
 
     if (play->sceneId == SCENE_20SICHITAI) {
         Snap_SetFlag(PICTO_VALID_IN_SWAMP);
@@ -91,20 +91,20 @@ s32 Snap_RecordPictographedActors(PlayState* play) {
 // Only used in this file
 void Snap_SetFlag(s32 flag) {
     if (flag < 0x20) {
-        gSaveContext.save.pictoFlags0 |= (1 << flag);
+        gSaveContext.save.saveInfo.pictoFlags0 |= (1 << flag);
     } else {
         flag &= 0x1F;
-        gSaveContext.save.pictoFlags1 |= (1 << flag);
+        gSaveContext.save.saveInfo.pictoFlags1 |= (1 << flag);
     }
 }
 
 // Unused
 void Snap_UnsetFlag(s32 flag) {
     if (flag < 0x20) {
-        gSaveContext.save.pictoFlags0 &= ~(1 << flag);
+        gSaveContext.save.saveInfo.pictoFlags0 &= ~(1 << flag);
     } else {
         flag &= 0x1F;
-        gSaveContext.save.pictoFlags1 &= ~(1 << flag);
+        gSaveContext.save.saveInfo.pictoFlags1 &= ~(1 << flag);
     }
 }
 
@@ -112,10 +112,10 @@ u32 Snap_CheckFlag(s32 flag) {
     SaveContext* saveCtx = &gSaveContext;
 
     if (flag < 0x20) {
-        return saveCtx->save.pictoFlags0 & (1 << flag);
+        return saveCtx->save.saveInfo.pictoFlags0 & (1 << flag);
     } else {
         flag &= 0x1F;
-        return saveCtx->save.pictoFlags1 & (1 << flag);
+        return saveCtx->save.saveInfo.pictoFlags1 & (1 << flag);
     }
 }