Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed gamma shift for special sprite palette tags (lights, emotes).

Browse Source 
Supersedes c82510e22bffb98fd9c63dc246c332dd1da602cd
This commit is contained in:
Ariel A 2023-04-16 20:07:41 -04:00
parent ad9a77fe2c
commit 095994dc96
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/field_weather.c
View File

@ -493,7 +493,9 @@ static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex)
// Loop through the specified palette range and apply necessary color maps.
while (curPalIndex < numPalettes)
{
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_NONE)
// don't blend special palettes immune to blending
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_NONE ||
(curPalIndex >= 16 && GetSpritePaletteTagByPaletteNum(curPalIndex - 16) >> 15))
{
// No palette change.
palOffset += 16;
@ -502,10 +504,7 @@ static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex)
{
u8 r, g, b;
// don't blend special sprite palette tags
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_CONTRAST ||
(curPalIndex >= 16 && (curPalIndex - 16 == gWeatherPtr->contrastColorMapSpritePalIndex ||
GetSpritePaletteTagByPaletteNum(curPalIndex - 16) >> 15)))
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_CONTRAST || curPalIndex - 16 == gWeatherPtr->contrastColorMapSpritePalIndex)
colorMap = gWeatherPtr->contrastColorMaps[colorMapIndex];
else
colorMap = gWeatherPtr->darkenedContrastColorMaps[colorMapIndex];