`z_sram_NES` with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs (#531)

* Rename Sram_InitDebugSave

* Sram_InitDebugSave

* err

* Sram_IncrementDay

* non_matchings

* func_80146F5C and protos

* func_80146EE8

* func_80145698

* func_80143A54

* Split SaveContext

* problems with bss

* Fix bss

* more

* a small bunch

* Fix warnings

* almost everything

* two attempts

* at least compiles

* import data

* bss

* format

* stuff?

* Progress?

* More progress

* clean up data a little

* More progress

* disaster

* re split data

* A bit less of a disaster

* Fix renamed stuff

* data stuff

* fix conflicts

* format

* CycleSceneFlags

* some enums

* cleanup

* Fix merge issues

* format

* some changes

* format

* Lots of progress on z_sram_NES, but no matches yet

* SaveContent Documentation

* Oops

* Oops2

* Document more SaveContext

* Oops, don't need that anymore

* add small comment

* Another comment

* dekuPlaygroundPlayerName

* Fix merge issues

* format

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* remove magic number

* format

* fix merge issues

* bss

* format

* macro cleanup

* review

* merge issues

* review

* cleanup

* UNK_TYPE1

* Fix

* Remove comment

* small change

* conflicts

* review

* fix

* fixes

* format

* Update actorCtx renames part

* Match func_80143B0C thanks to Petrie and Anon

* minor cleaning pass

* format

* cleanup

* more minor cleanups

* Macros for accessing gSaveContext.save.stolenItems

* Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_

* format

* Update include/macros.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* @hensldm review

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Rename QUEST_SONG_NEW_WAVE

* Add scene name comments to D_801C5FC0

* rename horseData.yaw

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* // = CUR_UPG_VALUE(UPG_WALLET);

* run actorfixer and format

* fix bss

* Fix merge problems and run format

* Some improvements to func_801457CC by anon

* bss

* format

* run actorfixer

* actorfixer, bss and format

* Use original names for the RESPAWN_MODE enum because the current ones are bad

* QUEST_SONG_BOSSA_NOVA

* some minor fixes on the SaveContext struct according to the debug rom

* Merge Inventory.items and Inventory.masks

* a

* simplify saveBuf accesses

* A few func renames

* actorfixer

* bss

* fixes

* bss

* actorfixer

* actorfixer and format

* actorfixer

* whoops

* whops

* bss

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

1 files changed, 102 insertions, 102 deletions

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;