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

Slight palette update optimization.

Browse source
This commit is contained in:
Ariel Antonitis 2021-04-19 23:17:13 -04:00
parent a80de91463
commit 0d8467c2a9
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/overworld.c
View file

@ -1526,32 +1526,31 @@ static bool8 FadePalettesWithTime(void) { // Only used to fade back in
void UpdatePalettesWithTime(u32 palettes) { void UpdatePalettesWithTime(u32 palettes) {
if (MapHasNaturalLight(gMapHeader.mapType)) { if (MapHasNaturalLight(gMapHeader.mapType)) {
u8 i, j; u16 i;
u16 tempPaletteBuffer[16]; u16 tempPaletteBuffer[16];
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
if (GetSpritePaletteTagByPaletteNum(i) & 0x8000) // Don't blend special sprite palette tags if (GetSpritePaletteTagByPaletteNum(i) >> 15) // Don't blend special sprite palette tags
palettes &= ~(1 << (i + 16)); palettes &= ~(1 << (i + 16));
} }
palettes &= ~0xE000; // Don't blend tile palettes [13,15] palettes &= ~0xE000; // Don't blend tile palettes [13,15]
gTimeOfDay = min(TIME_OF_DAY_MAX, gTimeOfDay);
if (!palettes) if (!palettes)
return; return;
for (i = 0; palettes; i++) { for (i = 0; palettes; i+=16) {
if (palettes & 1) { if (palettes & 1) {
if (sTimeOfDayBlendVars[currentTimeBlend.time0].isTint) if (sTimeOfDayBlendVars[currentTimeBlend.time0].isTint)
TintPalette_RGB_Copy(i*16, sTimeOfDayBlendVars[currentTimeBlend.time0].blendColor); TintPalette_RGB_Copy(i, sTimeOfDayBlendVars[currentTimeBlend.time0].blendColor);
else else
TimeBlendPalette(i*16, sTimeOfDayBlendVars[currentTimeBlend.time0].coeff, sTimeOfDayBlendVars[currentTimeBlend.time0].blendColor); TimeBlendPalette(i, sTimeOfDayBlendVars[currentTimeBlend.time0].coeff, sTimeOfDayBlendVars[currentTimeBlend.time0].blendColor);
if (currentTimeBlend.weight == 256) { if (currentTimeBlend.weight == 256) {
palettes >>= 1; palettes >>= 1;
continue; continue;
} }
CpuFastCopy(&gPlttBufferFaded[i*16], tempPaletteBuffer, 32); CpuFastCopy(&gPlttBufferFaded[i], tempPaletteBuffer, 32);
if (sTimeOfDayBlendVars[currentTimeBlend.time1].isTint) if (sTimeOfDayBlendVars[currentTimeBlend.time1].isTint)
TintPalette_RGB_Copy(i*16, sTimeOfDayBlendVars[currentTimeBlend.time1].blendColor); TintPalette_RGB_Copy(i, sTimeOfDayBlendVars[currentTimeBlend.time1].blendColor);
else else
TimeBlendPalette(i*16, sTimeOfDayBlendVars[currentTimeBlend.time1].coeff, sTimeOfDayBlendVars[currentTimeBlend.time1].blendColor); TimeBlendPalette(i, sTimeOfDayBlendVars[currentTimeBlend.time1].coeff, sTimeOfDayBlendVars[currentTimeBlend.time1].blendColor);
AveragePalettes(tempPaletteBuffer, &gPlttBufferFaded[i*16], &gPlttBufferFaded[i*16], currentTimeBlend.weight); AveragePalettes(tempPaletteBuffer, &gPlttBufferFaded[i], &gPlttBufferFaded[i], currentTimeBlend.weight);
} }
palettes >>= 1; palettes >>= 1;
} }