Rename ZONE_TIME_TO_INT() -> TIME() (#14)

* Rename ZONE_TIME_TO_INT() -> TIME()

Author: JaceCear

include/constants/zones.h

@@ -89,9 +89,9 @@
 #define IS_EXTRA_STAGE(lvl)          ((lvl) == LEVEL_INDEX(ZONE_FINAL, ACT_THE_MOON))
 #define IS_FINAL_OR_EXTRA_STAGE(lvl) ((IS_FINAL_STAGE(lvl)) || (IS_EXTRA_STAGE(lvl)))
 
-#define ZONE_TIME_TO_INT(minutes, seconds) (int)(((minutes * 60.) + seconds) * GBA_FRAMES_PER_SECOND)
-#define TIMER_WARNING_BEGIN                (ZONE_TIME_TO_INT(0, 20))
-#define MAX_COURSE_TIME                    (ZONE_TIME_TO_INT(10, 0))
+#define TIME(minutes, seconds) (int)(((minutes * 60.) + seconds) * GBA_FRAMES_PER_SECOND)
+#define TIMER_WARNING_BEGIN    (TIME(0, 20))
+#define MAX_COURSE_TIME        (TIME(10, 0))
 
 #define SPECIAL_STAGE_REQUIRED_SP_RING_COUNT 7
 

include/game/parameters/characters.h

@@ -28,9 +28,9 @@
 #define PLAYER_MAX_FLOATING_SPEED (2.25)
 
 // NOTE: Equal in SA1 and SA2!
-#define PLAYER_INVULNERABLE_DURATION ZONE_TIME_TO_INT(0, 2)
-#define PLAYER_INVINCIBLE_DURATION   ZONE_TIME_TO_INT(0, 20)
-#define PLAYER_SPEED_UP_DURATION     ZONE_TIME_TO_INT(0, 20)
+#define PLAYER_INVULNERABLE_DURATION TIME(0, 2)
+#define PLAYER_INVINCIBLE_DURATION   TIME(0, 20)
+#define PLAYER_SPEED_UP_DURATION     TIME(0, 20)
 #define PLAYER_SPEED_UP_MUSIC_TEMPO  Q(2.0)
 
 #define PLAYER_AIR_SPEED_MAX 15.0
@@ -39,13 +39,13 @@
 #define TRICK__STOP_N_SLAM__DROP_SPEED Q(0.21875)
 
 /*** Cream ***/
-#define CREAM_FLYING_DURATION ZONE_TIME_TO_INT(0, 4)
+#define CREAM_FLYING_DURATION TIME(0, 4)
 
 /*** Tails ***/
 // NOTE: Unlike Cream, Tails does fly for 8 seconds, but his initial value gets set to 4.
 //       For some reason they lower his timer only every 2nd frame (in PlayerCB_8012C2C),
 //       instead of using a bigger value from the get-go, even though they gave him a
 //       4-byte timer.
-#define TAILS_FLYING_DURATION (ZONE_TIME_TO_INT(0, 8) / 2)
+#define TAILS_FLYING_DURATION (TIME(0, 8) / 2)
 
 #endif // GUARD_PARAMETERS_CHARACTERS_H

src/game/egg_rocket_transitions.c

@@ -357,7 +357,7 @@ NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_80294A8.inc", void Task_8
 
             if (gGameMode == GAME_MODE_SINGLE_PLAYER) {
                 gStageFlags |= FLAGS_EXECUTE_HBLANK_COPY;
-                gCourseTime = ZONE_TIME_TO_INT(5, 0);
+                gCourseTime = TIME(5, 0);
             }
         }
 
@@ -368,7 +368,7 @@ NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_80294A8.inc", void Task_8
 
             if (gGameMode == GAME_MODE_SINGLE_PLAYER) {
                 gStageFlags |= FLAGS_EXECUTE_HBLANK_COPY;
-                gCourseTime = ZONE_TIME_TO_INT(5, 0);
+                gCourseTime = TIME(5, 0);
             }
         }
 
@@ -399,7 +399,7 @@ void Task_80297E8(void)
     if (--shake->unkC == 0) {
         if (gGameMode == GAME_MODE_SINGLE_PLAYER) {
             gStageFlags |= STAGE_FLAG__TIMER_REVERSED;
-            gCourseTime = ZONE_TIME_TO_INT(5, 0);
+            gCourseTime = TIME(5, 0);
         }
 
         gPlayer.moveState &= ~MOVESTATE_IGNORE_INPUT;
@@ -415,7 +415,7 @@ void CreateEggRocketLaunchScreenShakeEffect()
     struct Task *t = TaskCreate(Task_80298C0, sizeof(EggRocketScreenShake), 0x4000, 0, NULL);
     EggRocketScreenShake *shake = TASK_DATA(t);
 
-    shake->unkC = ZONE_TIME_TO_INT(0, 1);
+    shake->unkC = TIME(0, 1);
 
     CreateScreenShake(0x800, 8, 16, 10, SCREENSHAKE_VERTICAL);
 
@@ -429,7 +429,7 @@ void Task_80298C0()
     EggRocketScreenShake *shake = TASK_DATA(gCurTask);
 
     if (--shake->unkC == 0) {
-        shake->unkC = ZONE_TIME_TO_INT(0, 5);
+        shake->unkC = TIME(0, 5);
         CreateScreenShake(0x800, 8, 16, 300, (SCREENSHAKE_VERTICAL | SCREENSHAKE_RANDOM_VALUE));
         gCurTask->main = Task_80297E8;
     }

src/game/enemies/boss_3_egg_ball.c

@@ -287,7 +287,7 @@ void CreateEntity_EggBall(MapEntity *me, u16 regionX, u16 regionY, u8 id)
         t = TaskCreate(Task_PipeInitialDelay, sizeof(EggBall_Pipe), 0x2200U, 0U, TaskDestructor_8030754);
         strc = TASK_DATA(t);
         strc->unk44 = i;
-        strc->delay = ZONE_TIME_TO_INT(0, 1.5);
+        strc->delay = TIME(0, 1.5);
         strc->unk3C = unk3C = gUnknown_084ACDD2[i][0][0];
         strc->unk3E = unk3E = gUnknown_084ACDD2[i][0][1];
         strc->base.regionX = boss->base.regionX;

src/game/enemies/bosses_egg_mobile.c

@@ -102,7 +102,7 @@ void Task_EggMobileAscent()
     UpdateSpriteAnimation(s2);
     DisplaySprite(s2);
 
-    if (eggMobile->stunDelay > ZONE_TIME_TO_INT(0, 0.75)) {
+    if (eggMobile->stunDelay > TIME(0, 0.75)) {
         eggMobile->offsetY -= Q(1);
 
         if (eggMobile->offsetY <= -Q(80)) {

src/game/enemies/bosses_misc.c

@@ -234,7 +234,7 @@ void Task_801623C()
 
         if ((Coll_Player_Entity_Intersection(s, capsule->worldX, capsule->worldY, p) & 0x80000)
             || (Coll_Player_Entity_Intersection(s2, capsule->worldX, capsule->worldY, p) & 0x80000)) {
-            p->timerInvulnerability = ZONE_TIME_TO_INT(0, 2);
+            p->timerInvulnerability = TIME(0, 2);
             if (I(p->qWorldX) < gCamera.x + (DISPLAY_WIDTH / 2)) {
                 p->qSpeedAirX = -Q(2);
                 sideX = (capsule->worldX + s->hitboxes[0].b.left) - p->spriteOffsetX;

src/game/enemies/fireball.c

@@ -9,7 +9,7 @@
 #include "constants/zones.h"
 
 #define NUM_SPARKS          2
-#define FIREBALL_SPAWN_RATE ZONE_TIME_TO_INT(0, 4)
+#define FIREBALL_SPAWN_RATE TIME(0, 4)
 
 typedef struct {
     /* 0x00 */ MapEntity *me;

src/game/enemies/mirror.c

@@ -178,7 +178,7 @@ void Task_MirrorShoot(void)
         }
     }
 
-    if (mirror->frames == ZONE_TIME_TO_INT(0, 1)) {
+    if (mirror->frames == TIME(0, 1)) {
         s->variant = 0;
         gCurTask->main = Task_Mirror;
     }

src/game/enemies/mole.c

@@ -82,7 +82,7 @@ void Task_Mole(void)
         return;
     }
 
-    if (++mole->frames >= ZONE_TIME_TO_INT(0, 1)) {
+    if (++mole->frames >= TIME(0, 1)) {
         mole->frames = 0;
         s->variant = 1;
 
@@ -118,7 +118,7 @@ void Task_Mole_8071640(void)
         return;
     }
 
-    if (++mole->frames >= ZONE_TIME_TO_INT(0, 1)) {
+    if (++mole->frames >= TIME(0, 1)) {
         mole->frames = 0;
         s->variant = 0;
         gCurTask->main = Task_Mole;

src/game/game_over.c

@@ -253,7 +253,7 @@ void Task_GameOverScreenInit(void)
 
     screen->frames = ++frames;
 
-    if (frames >= ZONE_TIME_TO_INT(0, 1)) {
+    if (frames >= TIME(0, 1)) {
         screen->s.frameFlags = 0;
         screen->s2.frameFlags = 0;
         gCurTask->main = Task_8056100;
@@ -297,7 +297,7 @@ void Task_8056100(void)
 
     screen->frames = ++frames;
 
-    if (frames >= ZONE_TIME_TO_INT(0, 1.5)) {
+    if (frames >= TIME(0, 1.5)) {
         gCurTask->main = Task_805618C;
     }
 
@@ -324,7 +324,7 @@ void Task_805618C(void)
 
     screen->frames = ++frames;
 
-    if (frames >= ZONE_TIME_TO_INT(0, 2)) {
+    if (frames >= TIME(0, 2)) {
         s->frameFlags = SPRITE_OAM_ORDER(2);
         s2->frameFlags = SPRITE_OAM_ORDER(2);
 
@@ -678,7 +678,7 @@ NONMATCH("asm/non_matching/game/game_over__Task_805676C.inc", void Task_805676C(
         }
     }
 
-    if (unk24 >= ZONE_TIME_TO_INT(0, 20)) {
+    if (unk24 >= TIME(0, 20)) {
         gCurTask->main = Task_DestroyGameOverD;
     }