summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-10-23 17:39:15 -0700
committerGitHub <noreply@github.com>2017-10-23 17:39:15 -0700
commitfe8629615bb6e847ab632797ff1291c02e70a35c (patch)
tree20b7bbb74a99a7b96d0f33d3ef79641bffd21374 /src/engine
parent7529e63a5aafad47543b1651474ec6b143cb958a (diff)
parentc5241d9e80582b746d050ac4424393ccc1636d4b (diff)
Merge pull request #449 from ProjectRevoTPP/clean_berry
document berry.c.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/clock.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/engine/clock.c b/src/engine/clock.c
index 9635514d2..cb8af64a8 100644
--- a/src/engine/clock.c
+++ b/src/engine/clock.c
@@ -61,19 +61,18 @@ static void UpdatePerDay(struct Time *time)
static void UpdatePerMinute(struct Time *time)
{
struct Time newTime;
- s32 minutes;
+ s32 minutesPassed;
CalcTimeDifference(&newTime, &gSaveBlock2.lastBerryTreeUpdate, time);
- minutes = 1440 * newTime.days + 60 * newTime.hours + newTime.minutes;
+ minutesPassed = 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 (minutes != 0)
+ if (minutesPassed == 0) // do not do the update for the first minute.
+ return;
+
+ if (minutesPassed > -1) // do not perform an update on invalid minutesPassed.
{
- if (minutes >= 0)
- {
- BerryTreeTimeUpdate(minutes);
- gSaveBlock2.lastBerryTreeUpdate = *time;
- }
+ BerryTreeTimeUpdate(minutesPassed);
+ gSaveBlock2.lastBerryTreeUpdate = *time;
}
}