Skip to content

Commit

Permalink
Merge branch 'master' into daynight2
Browse files Browse the repository at this point in the history
  • Loading branch information
citrusbolt committed Apr 8, 2021
2 parents 84380a1 + cf036ee commit b321a3a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/daycare.c
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,7 @@ u8 CheckIncubator()
return 0xFF;

egg = (&gSaveBlock1Ptr->incubator)->egg;
RtcCalcLocalTime();
CalcTimeDifference(&timeElapsed, &(&gSaveBlock1Ptr->incubator)->timeEntered, &gLocalTime);
eggCycles = GetMonData(&egg, MON_DATA_FRIENDSHIP);
eggCyclesDepleted = (24 * 60 * timeElapsed.days + 60 * timeElapsed.hours + timeElapsed.minutes) / 36;
Expand Down

0 comments on commit b321a3a

Please sign in to comment.