From b080fb370032738769467242c7a1a7945f972836 Mon Sep 17 00:00:00 2001
From: engineer124 <47598039+engineer124@users.noreply.github.com>
Date: Fri, 30 Sep 2022 20:51:49 -0400
Subject: z_kaleido_mask.c Ok and Documented (Pause Menu Mask Page) (#1093)

* import mask docs

* cleanup

* some PR

* fix merge from master

* fix merge

* move cursor result
---
 src/code/flg_set.c    | 8 ++++----
 src/code/z_sram_NES.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/code')

diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index 0bc978160..a22b62a0e 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -1,6 +1,6 @@
 /**
  * File: flg_set.c
- * Description: Event Editor, used to view and edit weekEventReg, eventInf and maskMaskBit flags.
+ * Description: Event Editor, used to view and edit weekEventReg, eventInf and masksGivenOnMoon flags.
  * Controls:
  *  + Left and Right: select different flags/bits in array element
  *  + Up and Down: select array element (byte) 1 up/down
@@ -123,9 +123,9 @@ static FlagSetEntry sFlagEntries[] = {
     { &gSaveContext.eventInf[6], "event_inf[6]" },
     { &gSaveContext.eventInf[7], "event_inf[7]" },
 
-    { &gSaveContext.maskMaskBit[0], "mask_mask_bit[0]" },
-    { &gSaveContext.maskMaskBit[1], "mask_mask_bit[1]" },
-    { &gSaveContext.maskMaskBit[2], "mask_mask_bit[2]" },
+    { &gSaveContext.masksGivenOnMoon[0], "mask_mask_bit[0]" },
+    { &gSaveContext.masksGivenOnMoon[1], "mask_mask_bit[1]" },
+    { &gSaveContext.masksGivenOnMoon[2], "mask_mask_bit[2]" },
 
     { NULL, NULL }, // used in the code to detect array end
 };
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c
index 73b0a0af0..6f9006146 100644
--- a/src/code/z_sram_NES.c
+++ b/src/code/z_sram_NES.c
@@ -292,8 +292,8 @@ void Sram_SaveEndOfCycle(PlayState* play) {
         gSaveContext.cycleSceneFlags[i].collectible = 0;
     }
 
-    for (i = 0; i < ARRAY_COUNT(gSaveContext.maskMaskBit); i++) {
-        gSaveContext.maskMaskBit[i] = 0;
+    for (i = 0; i < ARRAY_COUNT(gSaveContext.masksGivenOnMoon); i++) {
+        gSaveContext.masksGivenOnMoon[i] = 0;
     }
 
     if (gSaveContext.save.weekEventReg[84] & 0x20) {
-- 
cgit v1.2.3