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

Fixed bug in TOD blending.

Browse source
This commit is contained in:
Ariel Antonitis 2021-04-22 03:54:42 -04:00
parent 4bb7abb520
commit 96d0f7ed7d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/overworld.c
View file

@ -1529,7 +1529,7 @@ void UpdatePalettesWithTime(u32 palettes) {
if (GetSpritePaletteTagByPaletteNum(i) >> 15) // 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 &= 0xFFFF1FFF; // Don't blend tile palettes [13,15]
if (!palettes) if (!palettes)
return; return;
TimeMixPalettes(palettes, TimeMixPalettes(palettes,

2
src/palette.c
View file

@ -526,7 +526,7 @@ static u8 UpdateTimeOfDayPaletteFade(void)
} }
} else { // tile palettes, don't blend [13, 15] } else { // tile palettes, don't blend [13, 15]
timePalettes = selectedPalettes &= ~0xE000; timePalettes = selectedPalettes & 0x1FFF;
} }
TimeMixPalettes(timePalettes, src, dst, &bld0, &bld1, gPaletteFade.weight); TimeMixPalettes(timePalettes, src, dst, &bld0, &bld1, gPaletteFade.weight);