atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimized UpdateTimeOfDay.

Browse source
This commit is contained in:
Ariel A 2022-04-16 17:33:36 -04:00
parent 6e621d80a1
commit ea6c1a9e40
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/overworld.c
View file

@ -1474,44 +1474,45 @@ const struct BlendSettings gTimeOfDayBlend[] =
}; };
u8 UpdateTimeOfDay(void) { u8 UpdateTimeOfDay(void) {
s8 hours, minutes; s32 hours, minutes;
RtcCalcLocalTime(); RtcCalcLocalTime();
hours = gLocalTime.hours; hours = gLocalTime.hours;
minutes = gLocalTime.minutes; minutes = gLocalTime.minutes;
if (hours >= 22 || hours < 4) { // night if (hours < 4) { // night
currentTimeBlend.weight = 256; currentTimeBlend.weight = 256;
currentTimeBlend.altWeight = 0; currentTimeBlend.altWeight = 0;
return gTimeOfDay = currentTimeBlend.time0 = currentTimeBlend.time1 = TIME_OF_DAY_NIGHT; return gTimeOfDay = currentTimeBlend.time0 = currentTimeBlend.time1 = TIME_OF_DAY_NIGHT;
} else if (hours >= 4 && hours < 7) { // night->twilight } else if (hours < 7) { // night->twilight
currentTimeBlend.time0 = TIME_OF_DAY_NIGHT; currentTimeBlend.time0 = TIME_OF_DAY_NIGHT;
currentTimeBlend.time1 = TIME_OF_DAY_TWILIGHT; currentTimeBlend.time1 = TIME_OF_DAY_TWILIGHT;
currentTimeBlend.weight = 256 - 256 * ((hours - 4) * 60 + minutes) / ((7-4)*60); currentTimeBlend.weight = 256 - 256 * ((hours - 4) * 60 + minutes) / ((7-4)*60);
currentTimeBlend.altWeight = (256 - currentTimeBlend.weight) / 2; currentTimeBlend.altWeight = (256 - currentTimeBlend.weight) / 2;
return gTimeOfDay = TIME_OF_DAY_DAY; return gTimeOfDay = TIME_OF_DAY_DAY;
} else if (hours >= 7 && hours < 10) { // twilight->day } else if (hours < 10) { // twilight->day
currentTimeBlend.time0 = TIME_OF_DAY_TWILIGHT; currentTimeBlend.time0 = TIME_OF_DAY_TWILIGHT;
currentTimeBlend.time1 = TIME_OF_DAY_DAY; currentTimeBlend.time1 = TIME_OF_DAY_DAY;
currentTimeBlend.weight = 256 - 256 * ((hours - 7) * 60 + minutes) / ((10-7)*60); currentTimeBlend.weight = 256 - 256 * ((hours - 7) * 60 + minutes) / ((10-7)*60);
currentTimeBlend.altWeight = (256 - currentTimeBlend.weight) / 2 + 128; currentTimeBlend.altWeight = (256 - currentTimeBlend.weight) / 2 + 128;
return gTimeOfDay = TIME_OF_DAY_DAY; return gTimeOfDay = TIME_OF_DAY_DAY;
} else if (hours >= 10 && hours < 18) { // day } else if (hours < 18) { // day
currentTimeBlend.weight = currentTimeBlend.altWeight = 256; currentTimeBlend.weight = currentTimeBlend.altWeight = 256;
return gTimeOfDay = currentTimeBlend.time0 = currentTimeBlend.time1 = TIME_OF_DAY_DAY; return gTimeOfDay = currentTimeBlend.time0 = currentTimeBlend.time1 = TIME_OF_DAY_DAY;
} else if (hours >= 18 && hours < 20) { // day->twilight } else if (hours < 20) { // day->twilight
currentTimeBlend.time0 = TIME_OF_DAY_DAY; currentTimeBlend.time0 = TIME_OF_DAY_DAY;
currentTimeBlend.time1 = TIME_OF_DAY_TWILIGHT; currentTimeBlend.time1 = TIME_OF_DAY_TWILIGHT;
currentTimeBlend.weight = 256 - 256 * ((hours - 18) * 60 + minutes) / ((20-18)*60); currentTimeBlend.weight = 256 - 256 * ((hours - 18) * 60 + minutes) / ((20-18)*60);
currentTimeBlend.altWeight = currentTimeBlend.weight / 2 + 128; currentTimeBlend.altWeight = currentTimeBlend.weight / 2 + 128;
return gTimeOfDay = TIME_OF_DAY_TWILIGHT; return gTimeOfDay = TIME_OF_DAY_TWILIGHT;
} else if (hours >= 20 && hours < 22) { // twilight->night } else if (hours < 22) { // twilight->night
currentTimeBlend.time0 = TIME_OF_DAY_TWILIGHT; currentTimeBlend.time0 = TIME_OF_DAY_TWILIGHT;
currentTimeBlend.time1 = TIME_OF_DAY_NIGHT; currentTimeBlend.time1 = TIME_OF_DAY_NIGHT;
currentTimeBlend.weight = 256 - 256 * ((hours - 20) * 60 + minutes) / ((22-20)*60); currentTimeBlend.weight = 256 - 256 * ((hours - 20) * 60 + minutes) / ((22-20)*60);
currentTimeBlend.altWeight = currentTimeBlend.weight / 2; currentTimeBlend.altWeight = currentTimeBlend.weight / 2;
return gTimeOfDay = TIME_OF_DAY_NIGHT; return gTimeOfDay = TIME_OF_DAY_NIGHT;
} else { // This should never occur } else { // 22-24, night
currentTimeBlend.weight = 256; currentTimeBlend.weight = 256;
return gTimeOfDay = currentTimeBlend.time0 = currentTimeBlend.time1 = TIME_OF_DAY_DAY; currentTimeBlend.altWeight = 0;
return gTimeOfDay = currentTimeBlend.time0 = currentTimeBlend.time1 = TIME_OF_DAY_NIGHT;
} }
} }