diff options
| author | engineer124 <engineer124engineer124@gmail.com> | 2022-02-05 14:35:56 +1100 |
|---|---|---|
| committer | engineer124 <engineer124engineer124@gmail.com> | 2022-02-05 14:35:56 +1100 |
| commit | 27fff3f16821eef052d66deb2f672365839e4ce6 (patch) | |
| tree | 175cef1de748b4c983ebb049dc80850bbea6c737 /src/code/z_parameter.c | |
| parent | 8421222792ff4d461a4cfabb9525e3fd515732cd (diff) | |
| parent | 2104c163628b1e6fbea36cd5c648fca515960a39 (diff) | |
Merge branch 'master' into parameter
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index dd6db1a54..c959c4b9a 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -603,11 +603,11 @@ void Interface_NewDay(GlobalContext* globalCtx, s32 day) { // i is used to store sceneId for (i = 0; i < 120; i++) { - gSaveContext.save.roomInf[i][0] = gSaveContext.cycleSceneFlags[i].chest; - gSaveContext.save.roomInf[i][1] = gSaveContext.cycleSceneFlags[i].swch0; - gSaveContext.save.roomInf[i][2] = gSaveContext.cycleSceneFlags[i].swch1; - gSaveContext.save.roomInf[i][3] = gSaveContext.cycleSceneFlags[i].clearedRoom; - gSaveContext.save.roomInf[i][4] = gSaveContext.cycleSceneFlags[i].collectible; + gSaveContext.cycleSceneFlags[i].chest = gSaveContext.cycleSceneFlags[i].chest; + gSaveContext.cycleSceneFlags[i].swch0 = gSaveContext.cycleSceneFlags[i].swch0; + gSaveContext.cycleSceneFlags[i].swch1 = gSaveContext.cycleSceneFlags[i].swch1; + gSaveContext.cycleSceneFlags[i].clearedRoom = gSaveContext.cycleSceneFlags[i].clearedRoom; + gSaveContext.cycleSceneFlags[i].collectible = gSaveContext.cycleSceneFlags[i].collectible; } } @@ -2493,8 +2493,8 @@ void Interface_DrawClock(GlobalContext* globalCtx) { OPEN_DISPS(globalCtx->state.gfxCtx); if (REG(15) != 0) { - if ((msgCtx->unk11F22 == 0) || ((globalCtx->actorCtx.unk5 & 2) && !func_801690CC(globalCtx)) || - (msgCtx->unk11F22 == 0) || ((msgCtx->unk11F04 >= 0x100) && (msgCtx->unk11F04 <= 0x200)) || + if ((msgCtx->msgMode == 0) || ((globalCtx->actorCtx.unk5 & 2) && !func_801690CC(globalCtx)) || + (msgCtx->msgMode == 0) || ((msgCtx->unk11F04 >= 0x100) && (msgCtx->unk11F04 <= 0x200)) || (gSaveContext.gameMode == 3)) { if (FrameAdvance_IsEnabled(globalCtx) == 0) { if (func_800FE4A8() == 0) { @@ -3919,7 +3919,7 @@ void Interface_Update(GlobalContext* globalCtx) { interfaceCtx->unk_218 = -15700.0f; interfaceCtx->unk_210 = 2; - if ((msgCtx->unk11F22 != 0) && (msgCtx->unk12006 == 0x26)) { + if ((msgCtx->msgMode != 0) && (msgCtx->unk12006 == 0x26)) { gGameInfo->data[0x55F] = -14; } else { gGameInfo->data[0x55F] = 0; |