minutes, not seconds

4 files changed, 21 insertions, 21 deletions

diff --git a/include/berry.h b/include/berry.h
index 0013b4dba..f0acbe0ad 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -22,7 +22,7 @@ bool8 IsPlayerFacingPlantedBerryTree(void);
 bool8 TryToWaterBerryTree(void);
 void ClearBerryTrees(void);
 bool32 BerryTreeGrow(struct BerryTree *tree);
-void BerryTreeTimeUpdate(int time);
+void BerryTreeTimeUpdate(s32 minutes);
 void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle);
 void RemoveBerryTree(u8 id);
 u8 GetBerryTypeByBerryTreeId(u8 id);
diff --git a/include/global.berry.h b/include/global.berry.h
index b7938868d..18e022b12 100644
--- a/include/global.berry.h
+++ b/include/global.berry.h
@@ -45,7 +45,7 @@ struct BerryTree
     u8 berry;
     u8 stage:7;
     u8 growthSparkle:1;
-    u16 secondsUntilNextStage;
+    u16 minutesUntilNextStage;
     u8 berryYield;
     u8 regrowthCount:4;
     u8 watered1:1;
diff --git a/src/berry.c b/src/berry.c
index 6c12af053..257248e5c 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1130,7 +1130,7 @@ bool32 BerryTreeGrow(struct BerryTree *tree)
     return TRUE;
 }
 
-void BerryTreeTimeUpdate(int time)
+void BerryTreeTimeUpdate(s32 minutes)
 {
     int i;
     struct BerryTree *tree;
@@ -1141,27 +1141,27 @@ void BerryTreeTimeUpdate(int time)
 
         if (tree->berry && tree->stage && !tree->growthSparkle)
         {
-            if (time >= GetStageDurationByBerryType(tree->berry) * 71)
+            if (minutes >= GetStageDurationByBerryType(tree->berry) * 71)
             {
                 *tree = gBlankBerryTree;
             }
             else
             {
-                int time2 = time;
+                s32 time = minutes;
 
-                while (time2 != 0)
+                while (time != 0)
                 {
-                    if (tree->secondsUntilNextStage > time2)
+                    if (tree->minutesUntilNextStage > time)
                     {
-                        tree->secondsUntilNextStage -= time2;
+                        tree->minutesUntilNextStage -= time;
                         break;
                     }
-                    time2 -= tree->secondsUntilNextStage;
-                    tree->secondsUntilNextStage = GetStageDurationByBerryType(tree->berry);
+                    time -= tree->minutesUntilNextStage;
+                    tree->minutesUntilNextStage = GetStageDurationByBerryType(tree->berry);
                     if (!BerryTreeGrow(tree))
                         break;
                     if (tree->stage == 5)
-                        tree->secondsUntilNextStage *= 4;
+                        tree->minutesUntilNextStage *= 4;
                 }
             }
         }
@@ -1174,12 +1174,12 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle)
 
     *tree = gBlankBerryTree;
     tree->berry = berry;
-    tree->secondsUntilNextStage = GetStageDurationByBerryType(berry);
+    tree->minutesUntilNextStage = GetStageDurationByBerryType(berry);
     tree->stage = stage;
     if (stage == 5)
     {
         tree->berryYield = CalcBerryYield(tree);
-        tree->secondsUntilNextStage *= 4;
+        tree->minutesUntilNextStage *= 4;
     }
     if (!sparkle)
     {
diff --git a/src/clock.c b/src/clock.c
index 48f937989..b263e99ae 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -18,7 +18,7 @@ extern void SetShoalItemFlag(u16);
 
 static void InitTimeBasedEvents(void);
 static void UpdatePerDay(struct Time *time);
-static void UpdatePerSecond(struct Time *time);
+static void UpdatePerMinute(struct Time *time);
 static void ReturnFromStartWallClock(void);
 
 static void InitTimeBasedEvents(void)
@@ -35,7 +35,7 @@ void DoTimeBasedEvents(void)
     {
         RtcCalcLocalTime();
         UpdatePerDay(&gLocalTime);
-        UpdatePerSecond(&gLocalTime);
+        UpdatePerMinute(&gLocalTime);
     }
 }
 
@@ -61,20 +61,20 @@ static void UpdatePerDay(struct Time *time)
     }
 }
 
-static void UpdatePerSecond(struct Time *time)
+static void UpdatePerMinute(struct Time *time)
 {
     struct Time newTime;
-    s32 totalSeconds;
+    s32 minutes;
 
     CalcTimeDifference(&newTime, &gSaveBlock2.lastBerryTreeUpdate, time);
-    totalSeconds = 1440 * newTime.days + 60 * newTime.hours + newTime.minutes;
+    minutes = 1440 * newTime.days + 60 * newTime.hours + newTime.minutes;
 
     // there's no way to get the correct assembly other than with this nested if check. so dumb.
-    if (totalSeconds != 0)
+    if (minutes != 0)
     {
-        if (totalSeconds >= 0)
+        if (minutes >= 0)
         {
-            BerryTreeTimeUpdate(totalSeconds);
+            BerryTreeTimeUpdate(minutes);
             gSaveBlock2.lastBerryTreeUpdate = *time;
         }
     }