Use `CURRENT_TIME` Macro (#1514)

* use CURRENT_TIME macro

* add comment

* cleanup brackets

1 files changed, 42 insertions, 53 deletions

diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 894daa37f..de4ad150a 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -572,12 +572,11 @@ void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 arg2) {
 
     gSaveContext.sunsSongState = SUNSSONG_INACTIVE;
 
-    gSaveContext.skyboxTime = ((void)0, gSaveContext.save.time);
+    gSaveContext.skyboxTime = CURRENT_TIME;
 
     Environment_JumpForwardInTime();
 
-    if ((((void)0, gSaveContext.save.time) >= CLOCK_TIME(18, 0)) ||
-        (((void)0, gSaveContext.save.time) < CLOCK_TIME(6, 0))) {
+    if ((CURRENT_TIME >= CLOCK_TIME(18, 0)) || (CURRENT_TIME < CLOCK_TIME(6, 0))) {
         gSaveContext.save.isNight = true;
     } else {
         gSaveContext.save.isNight = false;
@@ -677,9 +676,9 @@ void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 arg2) {
     envCtx->adjLightSettings.fogNear = 0;
     envCtx->adjLightSettings.zFar = 0;
 
-    envCtx->sunPos.x = -(Math_SinS(((void)0, gSaveContext.save.time) - CLOCK_TIME(12, 0)) * 120.0f) * 25.0f;
-    envCtx->sunPos.y = (Math_CosS(((void)0, gSaveContext.save.time) - CLOCK_TIME(12, 0)) * 120.0f) * 25.0f;
-    envCtx->sunPos.z = (Math_CosS(((void)0, gSaveContext.save.time) - CLOCK_TIME(12, 0)) * 20.0f) * 25.0f;
+    envCtx->sunPos.x = -(Math_SinS(CURRENT_TIME - CLOCK_TIME(12, 0)) * 120.0f) * 25.0f;
+    envCtx->sunPos.y = (Math_CosS(CURRENT_TIME - CLOCK_TIME(12, 0)) * 120.0f) * 25.0f;
+    envCtx->sunPos.z = (Math_CosS(CURRENT_TIME - CLOCK_TIME(12, 0)) * 20.0f) * 25.0f;
 
     envCtx->windDirection.x = 80;
     envCtx->windDirection.y = 80;
@@ -775,8 +774,7 @@ void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 arg2) {
         play->envCtx.precipitation[PRECIP_SNOW_MAX] = 0;
 
         if (gWeatherMode == WEATHER_MODE_RAIN) {
-            if (((u32)CURRENT_DAY == 2) && (((void)0, gSaveContext.save.time) >= CLOCK_TIME(7, 0)) &&
-                (((void)0, gSaveContext.save.time) < CLOCK_TIME(17, 30))) {
+            if (((u32)CURRENT_DAY == 2) && (CURRENT_TIME >= CLOCK_TIME(7, 0)) && (CURRENT_TIME < CLOCK_TIME(17, 30))) {
                 if (Environment_GetStormState(play) != STORM_STATE_OFF) {
                     play->envCtx.precipitation[PRECIP_RAIN_MAX] = 60;
                 }
@@ -1209,10 +1207,9 @@ void Environment_UpdateTime(PlayState* play, EnvironmentContext* envCtx, PauseCo
                 ((play->transitionMode == TRANS_MODE_OFF) || (gSaveContext.gameMode != GAMEMODE_NORMAL))) {
                 if (play->transitionTrigger == TRANS_TRIGGER_OFF) {
                     if ((CutsceneManager_GetCurrentCsId() == CS_ID_NONE) && !Play_InCsMode(play)) {
-                        gSaveContext.save.time = ((void)0, gSaveContext.save.time) + (u16)R_TIME_SPEED;
+                        gSaveContext.save.time = CURRENT_TIME + (u16)R_TIME_SPEED;
                         if (R_TIME_SPEED != 0) {
-                            gSaveContext.save.time =
-                                ((void)0, gSaveContext.save.time) + (u16)((void)0, gSaveContext.save.timeSpeedOffset);
+                            gSaveContext.save.time = CURRENT_TIME + (u16)((void)0, gSaveContext.save.timeSpeedOffset);
                         }
                     }
                 }
@@ -1220,13 +1217,12 @@ void Environment_UpdateTime(PlayState* play, EnvironmentContext* envCtx, PauseCo
         }
     }
 
-    if ((((void)0, gSaveContext.skyboxTime) >= CLOCK_TIME(6, 0)) ||
-        (((void)0, gSaveContext.save.time) < CLOCK_TIME(6, 0)) ||
-        (((void)0, gSaveContext.save.time) >= (CLOCK_TIME(6, 0) + 0x10))) {
-        gSaveContext.skyboxTime = gSaveContext.save.time;
+    if ((((void)0, gSaveContext.skyboxTime) >= CLOCK_TIME(6, 0)) || (CURRENT_TIME < CLOCK_TIME(6, 0)) ||
+        (CURRENT_TIME >= (CLOCK_TIME(6, 0) + 0x10))) {
+        gSaveContext.skyboxTime = CURRENT_TIME;
     }
 
-    time = ((void)0, gSaveContext.save.time);
+    time = CURRENT_TIME;
 
     if ((time >= CLOCK_TIME(18, 0)) || (time < CLOCK_TIME(6, 0))) {
         gSaveContext.save.isNight = true;
@@ -1386,9 +1382,9 @@ void Environment_UpdateLights(PlayState* play, EnvironmentContext* envCtx, Light
                     }
 
                     if (Environment_IsSceneUpsideDown(play)) {
-                        var_v0 = ((void)0, gSaveContext.save.time) + CLOCK_TIME(12, 0);
+                        var_v0 = CURRENT_TIME + CLOCK_TIME(12, 0);
                     } else {
-                        var_v0 = ((void)0, gSaveContext.save.time);
+                        var_v0 = CURRENT_TIME;
                     }
                     temp_s0_2 = var_v0 - CLOCK_TIME(12, 0);
 
@@ -1615,9 +1611,9 @@ void Environment_UpdateSun(PlayState* play) {
         }
 
         if (Environment_IsSceneUpsideDown(play)) {
-            phi_v0 = ((void)0, gSaveContext.save.time) + CLOCK_TIME(12, 0);
+            phi_v0 = CURRENT_TIME + CLOCK_TIME(12, 0);
         } else {
-            phi_v0 = ((void)0, gSaveContext.save.time);
+            phi_v0 = CURRENT_TIME;
         }
 
         temp_a0 = phi_v0 - CLOCK_TIME(12, 0);
@@ -1747,7 +1743,7 @@ void Environment_UpdatePostmanEvents(PlayState* play) {
     }
 
     if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_90_01)) {
-        temp_a2_2 = ((void)0, gSaveContext.save.time) - D_801F4E78;
+        temp_a2_2 = CURRENT_TIME - D_801F4E78;
         if (CHECK_WEEKEVENTREG(WEEKEVENTREG_89_40) && ((u16)SCHEDULE_TIME_NOW >= (u16)SCHEDULE_TIME(5, 0))) {
             SET_WEEKEVENTREG(WEEKEVENTREG_90_01);
         } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_89_08) && (temp_a2_2 >= CLOCK_TIME(0, 23))) {
@@ -1755,7 +1751,7 @@ void Environment_UpdatePostmanEvents(PlayState* play) {
             D_801F4E78 = 0;
         } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_85_80) && (temp_a2_2 >= (CLOCK_TIME(1, 39) - 1))) {
             SET_WEEKEVENTREG(WEEKEVENTREG_89_08);
-            D_801F4E78 = gSaveContext.save.time;
+            D_801F4E78 = CURRENT_TIME;
         } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_86_01) && (temp_a2_2 >= (CLOCK_TIME(1, 9) - 1))) {
             SET_WEEKEVENTREG(WEEKEVENTREG_85_80);
         }
@@ -1788,7 +1784,7 @@ void Environment_DrawSun(PlayState* play) {
         if ((play->envCtx.sunPos.y > -800.0f) || Environment_IsSceneUpsideDown(play)) {
             Matrix_Translate(play->view.eye.x + play->envCtx.sunPos.x, play->view.eye.y + play->envCtx.sunPos.y,
                              play->view.eye.z + play->envCtx.sunPos.z, MTXMODE_NEW);
-            if (((void)0, gSaveContext.save.time) < CLOCK_TIME(12, 0)) {
+            if (CURRENT_TIME < CLOCK_TIME(12, 0)) {
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, (u8)((u8)(sSunColor * 52.0f) + 203),
                                 (u8)((u8)(sSunColor * 19.0f) + 181), (u8)sSunPrimAlpha);
                 gDPSetEnvColor(POLY_OPA_DISP++, (u8)(-(u8)(sSunColor * 5.0f) + 175),
@@ -1813,7 +1809,7 @@ void Environment_DrawSunLensFlare(PlayState* play, EnvironmentContext* envCtx, V
                                   Vec3f vec) {
     if ((play->envCtx.precipitation[PRECIP_RAIN_CUR] == 0) &&
         !(GET_ACTIVE_CAM(play)->stateFlags & CAM_STATE_UNDERWATER) && (play->skyboxId == SKYBOX_NORMAL_SKY)) {
-        f32 v0 = Math_CosS(((void)0, gSaveContext.save.time) - CLOCK_TIME(12, 0));
+        f32 v0 = Math_CosS(CURRENT_TIME - CLOCK_TIME(12, 0));
 
         Environment_DrawLensFlare(play, &play->envCtx, &play->view, play->state.gfxCtx, vec, 370.0f, v0 * 120.0f, 0x190,
                                   true);
@@ -2450,11 +2446,10 @@ void Environment_PlaySceneSequence(PlayState* play) {
                 if (play->sequenceCtx.seqId != ((void)0, gSaveContext.seqId)) {
                     Audio_PlaySceneSequence(play->sequenceCtx.seqId, dayMinusOne);
                 }
-            } else if ((((void)0, gSaveContext.save.time) >= CLOCK_TIME(6, 0)) &&
-                       (((void)0, gSaveContext.save.time) <= CLOCK_TIME(17, 10))) {
+            } else if ((CURRENT_TIME >= CLOCK_TIME(6, 0)) && (CURRENT_TIME <= CLOCK_TIME(17, 10))) {
                 if (gSceneSeqState != SCENESEQ_DEFAULT) {
                     Audio_PlayMorningSceneSequence(play->sequenceCtx.seqId, dayMinusOne);
-                } else if ((((void)0, gSaveContext.save.time) >= CLOCK_TIME(6, 1)) &&
+                } else if ((CURRENT_TIME >= CLOCK_TIME(6, 1)) &&
                            (play->sequenceCtx.seqId != ((void)0, gSaveContext.seqId))) {
                     Audio_PlaySceneSequence(play->sequenceCtx.seqId, dayMinusOne);
                 }
@@ -2463,11 +2458,9 @@ void Environment_PlaySceneSequence(PlayState* play) {
                 if (play->sequenceCtx.ambienceId != ((void)0, gSaveContext.ambienceId)) {
                     Audio_PlayAmbience(play->sequenceCtx.ambienceId);
                 }
-                if ((((void)0, gSaveContext.save.time) > CLOCK_TIME(17, 10)) &&
-                    (((void)0, gSaveContext.save.time) < CLOCK_TIME(19, 0))) {
+                if ((CURRENT_TIME > CLOCK_TIME(17, 10)) && (CURRENT_TIME < CLOCK_TIME(19, 0))) {
                     play->envCtx.timeSeqState = TIMESEQ_EARLY_NIGHT_CRITTERS;
-                } else if ((((void)0, gSaveContext.save.time) > CLOCK_TIME(19, 0)) ||
-                           (((void)0, gSaveContext.save.time) < CLOCK_TIME(5, 0))) {
+                } else if ((CURRENT_TIME > CLOCK_TIME(19, 0)) || (CURRENT_TIME < CLOCK_TIME(5, 0))) {
                     play->envCtx.timeSeqState = TIMESEQ_NIGHT_CRITTERS;
                 } else {
                     play->envCtx.timeSeqState = TIMESEQ_MORNING_CRITTERS;
@@ -2491,14 +2484,14 @@ void Environment_UpdateTimeBasedSequence(PlayState* play) {
                 break;
 
             case TIMESEQ_FADE_DAY_BGM:
-                if (((void)0, gSaveContext.save.time) > CLOCK_TIME(17, 10)) {
+                if (CURRENT_TIME > CLOCK_TIME(17, 10)) {
                     SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 240);
                     play->envCtx.timeSeqState++;
                 }
                 break;
 
             case TIMESEQ_NIGHT_BEGIN_SFX:
-                if (((void)0, gSaveContext.save.time) >= CLOCK_TIME(18, 0)) {
+                if (CURRENT_TIME >= CLOCK_TIME(18, 0)) {
                     play->envCtx.timeSeqState++;
                 }
                 break;
@@ -2512,7 +2505,7 @@ void Environment_UpdateTimeBasedSequence(PlayState* play) {
                 break;
 
             case TIMESEQ_NIGHT_DELAY:
-                if (((void)0, gSaveContext.save.time) >= CLOCK_TIME(19, 0)) {
+                if (CURRENT_TIME >= CLOCK_TIME(19, 0)) {
                     play->envCtx.timeSeqState++;
                 }
                 break;
@@ -2524,8 +2517,7 @@ void Environment_UpdateTimeBasedSequence(PlayState* play) {
                 break;
 
             case TIMESEQ_DAY_BEGIN_SFX:
-                if ((((void)0, gSaveContext.save.time) < CLOCK_TIME(19, 0)) &&
-                    (((void)0, gSaveContext.save.time) >= CLOCK_TIME(5, 0))) {
+                if ((CURRENT_TIME < CLOCK_TIME(19, 0)) && (CURRENT_TIME >= CLOCK_TIME(5, 0))) {
                     play->envCtx.timeSeqState++;
                 }
                 break;
@@ -2545,9 +2537,9 @@ void Environment_UpdateTimeBasedSequence(PlayState* play) {
     }
 
     if ((play->envCtx.timeSeqState != TIMESEQ_REQUEST) && (((void)0, gSaveContext.save.day) == 3) &&
-        (((void)0, gSaveContext.save.time) < CLOCK_TIME(6, 0)) && !func_800FE5D0(play) &&
-        (play->transitionTrigger == TRANS_TRIGGER_OFF) && (play->transitionMode == TRANS_MODE_OFF) &&
-        (play->csCtx.state == 0) && ((play->sceneId != SCENE_00KEIKOKU) || (((void)0, gSaveContext.sceneLayer) != 1)) &&
+        (CURRENT_TIME < CLOCK_TIME(6, 0)) && !func_800FE5D0(play) && (play->transitionTrigger == TRANS_TRIGGER_OFF) &&
+        (play->transitionMode == TRANS_MODE_OFF) && (play->csCtx.state == 0) &&
+        ((play->sceneId != SCENE_00KEIKOKU) || (((void)0, gSaveContext.sceneLayer) != 1)) &&
         (CutsceneManager_GetCurrentCsId() == CS_ID_NONE) &&
         (AudioSeq_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) != NA_BGM_FINAL_HOURS) &&
         (AudioSeq_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) != NA_BGM_SONG_OF_SOARING)) {
@@ -3061,8 +3053,7 @@ void Environment_PlayStormNatureAmbience(PlayState* play) {
         (AudioSeq_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) == NA_BGM_FINAL_HOURS)) {
         Audio_PlayAmbience(AMBIENCE_ID_07);
     } else if ((play->sequenceCtx.seqId != NA_BGM_NO_MUSIC) && (play->sequenceCtx.ambienceId != AMBIENCE_ID_13)) {
-        if ((((void)0, gSaveContext.save.time) >= CLOCK_TIME(6, 0)) &&
-            (((void)0, gSaveContext.save.time) < CLOCK_TIME(18, 0))) {
+        if ((CURRENT_TIME >= CLOCK_TIME(6, 0)) && (CURRENT_TIME < CLOCK_TIME(18, 0))) {
             Audio_PlayAmbience(play->sequenceCtx.ambienceId);
         }
     }
@@ -3076,8 +3067,7 @@ void Environment_StopStormNatureAmbience(PlayState* play) {
         (AudioSeq_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) == NA_BGM_FINAL_HOURS)) {
         SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_AMBIENCE, 20);
     } else if ((play->sequenceCtx.seqId != NA_BGM_NO_MUSIC) && (play->sequenceCtx.ambienceId != AMBIENCE_ID_13)) {
-        if ((((void)0, gSaveContext.save.time) >= CLOCK_TIME(6, 0)) &&
-            (((void)0, gSaveContext.save.time) < CLOCK_TIME(18, 0))) {
+        if ((CURRENT_TIME >= CLOCK_TIME(6, 0)) && (CURRENT_TIME < CLOCK_TIME(18, 0))) {
             SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_AMBIENCE, 20);
         }
     }
@@ -3100,13 +3090,12 @@ void Environment_SetupSkyboxStars(PlayState* play) {
     f32 phi_f0;
 
     if ((play->envCtx.skybox1Index == 0) && (play->skyboxId == SKYBOX_NORMAL_SKY)) {
-        if ((((void)0, gSaveContext.save.time) >= CLOCK_TIME(21, 0)) ||
-            (((void)0, gSaveContext.save.time) < CLOCK_TIME(2, 0))) {
+        if ((CURRENT_TIME >= CLOCK_TIME(21, 0)) || (CURRENT_TIME < CLOCK_TIME(2, 0))) {
             phi_f0 = 1.0f;
-        } else if (((void)0, gSaveContext.save.time) > CLOCK_TIME(19, 0)) {
-            phi_f0 = 1.0f - ((CLOCK_TIME(21, 0) - ((void)0, gSaveContext.save.time)) * (1.0f / (CLOCK_TIME(2, 0) + 1)));
-        } else if (((void)0, gSaveContext.save.time) < CLOCK_TIME(3, 0)) {
-            phi_f0 = (CLOCK_TIME(3, 0) - ((void)0, gSaveContext.save.time)) * (1.0f / (CLOCK_TIME(1, 0) + 1));
+        } else if (CURRENT_TIME > CLOCK_TIME(19, 0)) {
+            phi_f0 = 1.0f - ((CLOCK_TIME(21, 0) - CURRENT_TIME) * (1.0f / (CLOCK_TIME(2, 0) + 1)));
+        } else if (CURRENT_TIME < CLOCK_TIME(3, 0)) {
+            phi_f0 = (CLOCK_TIME(3, 0) - CURRENT_TIME) * (1.0f / (CLOCK_TIME(1, 0) + 1));
         } else {
             phi_f0 = 0.0f;
         }
@@ -3385,7 +3374,7 @@ u32 Environment_GetStormState(PlayState* play) {
 u8 Environment_IsFinalHours(PlayState* play) {
     u8 ret = false;
 
-    if ((gSaveContext.save.day == 3) && (gSaveContext.save.time < CLOCK_TIME(6, 0))) {
+    if ((gSaveContext.save.day == 3) && (CURRENT_TIME < CLOCK_TIME(6, 0))) {
         ret = true;
     }
 
@@ -3425,8 +3414,8 @@ u8 func_800FE6F8(PlayState* play, s16 timeAdvanceScaling, s16 nextTimeLimit) {
     u8 ret = false;
 
     if (R_TIME_SPEED != 0) {
-        nextTime = ((void)0, gSaveContext.save.time) +
-                   (R_TIME_SPEED + ((void)0, gSaveContext.save.timeSpeedOffset)) * timeAdvanceScaling * 20;
+        nextTime =
+            CURRENT_TIME + (R_TIME_SPEED + ((void)0, gSaveContext.save.timeSpeedOffset)) * timeAdvanceScaling * 20;
         if (nextTime > nextTimeLimit) {
             ret = true;
         }
@@ -3518,7 +3507,7 @@ void func_800FEAB0() {
 
 void Environment_JumpForwardInTime(void) {
     if (sTimeJump != 0) {
-        gSaveContext.save.time = ((void)0, gSaveContext.save.time) + sTimeJump;
+        gSaveContext.save.time = CURRENT_TIME + sTimeJump;
         sTimeJump = 0;
     }
 }