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, 102 insertions, 102 deletions

diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index a22b62a0e..bb25818a6 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -13,106 +13,106 @@
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
 
 static FlagSetEntry sFlagEntries[] = {
-    { &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.save.saveInfo.weekEventReg[0], "week_event_reg[0]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[1], "week_event_reg[1]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[2], "week_event_reg[2]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[3], "week_event_reg[3]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[4], "week_event_reg[4]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[5], "week_event_reg[5]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[6], "week_event_reg[6]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[7], "week_event_reg[7]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[8], "week_event_reg[8]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[9], "week_event_reg[9]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[10], "week_event_reg[10]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[11], "week_event_reg[11]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[12], "week_event_reg[12]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[13], "week_event_reg[13]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[14], "week_event_reg[14]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[15], "week_event_reg[15]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[16], "week_event_reg[16]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[17], "week_event_reg[17]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[18], "week_event_reg[18]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[19], "week_event_reg[19]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[20], "week_event_reg[20]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[21], "week_event_reg[21]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[22], "week_event_reg[22]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[23], "week_event_reg[23]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[24], "week_event_reg[24]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[25], "week_event_reg[25]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[26], "week_event_reg[26]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[27], "week_event_reg[27]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[28], "week_event_reg[28]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[29], "week_event_reg[29]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[30], "week_event_reg[30]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[31], "week_event_reg[31]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[32], "week_event_reg[32]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[33], "week_event_reg[33]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[34], "week_event_reg[34]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[35], "week_event_reg[35]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[36], "week_event_reg[36]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[37], "week_event_reg[37]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[38], "week_event_reg[38]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[39], "week_event_reg[39]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[40], "week_event_reg[40]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[41], "week_event_reg[41]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[42], "week_event_reg[42]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[43], "week_event_reg[43]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[44], "week_event_reg[44]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[45], "week_event_reg[45]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[46], "week_event_reg[46]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[47], "week_event_reg[47]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[48], "week_event_reg[48]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[49], "week_event_reg[49]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[50], "week_event_reg[50]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[51], "week_event_reg[51]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[52], "week_event_reg[52]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[53], "week_event_reg[53]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[54], "week_event_reg[54]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[55], "week_event_reg[55]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[56], "week_event_reg[56]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[57], "week_event_reg[57]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[58], "week_event_reg[58]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[59], "week_event_reg[59]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[60], "week_event_reg[60]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[61], "week_event_reg[61]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[62], "week_event_reg[62]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[63], "week_event_reg[63]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[64], "week_event_reg[64]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[65], "week_event_reg[65]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[66], "week_event_reg[66]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[67], "week_event_reg[67]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[68], "week_event_reg[68]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[69], "week_event_reg[69]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[70], "week_event_reg[70]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[71], "week_event_reg[71]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[72], "week_event_reg[72]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[73], "week_event_reg[73]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[74], "week_event_reg[74]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[75], "week_event_reg[75]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[76], "week_event_reg[76]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[77], "week_event_reg[77]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[78], "week_event_reg[78]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[79], "week_event_reg[79]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[80], "week_event_reg[80]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[81], "week_event_reg[81]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[82], "week_event_reg[82]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[83], "week_event_reg[83]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[84], "week_event_reg[84]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[85], "week_event_reg[85]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[86], "week_event_reg[86]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[87], "week_event_reg[87]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[88], "week_event_reg[88]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[89], "week_event_reg[89]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[90], "week_event_reg[90]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[91], "week_event_reg[91]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[92], "week_event_reg[92]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[93], "week_event_reg[93]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[94], "week_event_reg[94]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[95], "week_event_reg[95]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[96], "week_event_reg[96]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[97], "week_event_reg[97]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[98], "week_event_reg[98]" },
+    { &gSaveContext.save.saveInfo.weekEventReg[99], "week_event_reg[99]" },
 
     { &gSaveContext.eventInf[0], "event_inf[0]" },
     { &gSaveContext.eventInf[1], "event_inf[1]" },
@@ -246,8 +246,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.save.weekEventReg); i++) {
-                gSaveContext.save.weekEventReg[i] = 0;
+            for (i = 0; i < ARRAY_COUNT(gSaveContext.save.saveInfo.weekEventReg); i++) {
+                gSaveContext.save.saveInfo.weekEventReg[i] = 0;
             }
             for (i = 0; i < ARRAY_COUNT(gSaveContext.eventInf); i++) {
                 gSaveContext.eventInf[i] = 0;