mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-27 10:02:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_kaleido_mask.c Ok and Documented (Pause Menu Mask Page) (#1093)

Browse Source 
* import mask docs

* cleanup

* some PR

* fix merge from master

* fix merge

* move cursor result
This commit is contained in:
engineer124
2022-09-30 20:51:49 -04:00
committed by GitHub
parent 15b9f83bd8
commit b080fb3700
11 changed files with 930 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/flg_set.c
+4 -4
View File
@@ -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
};
src/code/z_sram_NES.c
+2 -2
View File
@@ -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) {