dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Make broader use of RGB macros

Browse Source
This commit is contained in:
SphericalIce
2021-01-19 17:15:12 +00:00
parent 6c91534304
commit 8de76ed533
5 changed files with 171 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/palette.c
+22 -22
View File
@@ -624,7 +624,7 @@ static u8 UpdateFastPaletteFade(void)
if (b < b0)
b = b0;
gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
gPlttBufferFaded[i] = RGB(r, g, b);
}
break;
case FAST_FADE_OUT_TO_WHITE:
@@ -642,7 +642,7 @@ static u8 UpdateFastPaletteFade(void)
if (b > 31)
b = 31;
gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
gPlttBufferFaded[i] = RGB(r, g, b);
}
break;
case FAST_FADE_IN_FROM_BLACK:
@@ -668,7 +668,7 @@ static u8 UpdateFastPaletteFade(void)
if (b > b0)
b = b0;
gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
gPlttBufferFaded[i] = RGB(r, g, b);
}
break;
case FAST_FADE_OUT_TO_BLACK:
@@ -686,7 +686,7 @@ static u8 UpdateFastPaletteFade(void)
if (b < 0)
b = 0;
gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
gPlttBufferFaded[i] = RGB(r, g, b);
}
}
@@ -856,13 +856,13 @@ void TintPalette_GrayScale(u16 *palette, u16 count)
for (i = 0; i < count; i++)
{
r = (*palette >> 0) & 0x1F;
g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
r = GET_R(*palette);
g = GET_G(*palette);
b = GET_B(*palette);
gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
*palette++ = (gray << 10) | (gray << 5) | (gray << 0);
*palette++ = RGB2(gray, gray, gray);
}
}
@@ -873,18 +873,18 @@ void TintPalette_GrayScale2(u16 *palette, u16 count)
for (i = 0; i < count; i++)
{
r = (*palette >> 0) & 0x1F;
g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
r = GET_R(*palette);
g = GET_G(*palette);
b = GET_B(*palette);
gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
if (gray > 0x1F)
gray = 0x1F;
if (gray > 31)
gray = 31;
gray = sRoundedDownGrayscaleMap[gray];
*palette++ = (gray << 10) | (gray << 5) | (gray << 0);
*palette++ = RGB2(gray, gray, gray);
}
}
@@ -895,9 +895,9 @@ void TintPalette_SepiaTone(u16 *palette, u16 count)
for (i = 0; i < count; i++)
{
r = (*palette >> 0) & 0x1F;
g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
r = GET_R(*palette);
g = GET_G(*palette);
b = GET_B(*palette);
gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
@@ -908,7 +908,7 @@ void TintPalette_SepiaTone(u16 *palette, u16 count)
if (r > 31)
r = 31;
*palette++ = (b << 10) | (g << 5) | (r << 0);
*palette++ = RGB2(r, g, b);
}
}
@@ -919,9 +919,9 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 b
for (i = 0; i < count; i++)
{
r = (*palette >> 0) & 0x1F;
g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
r = GET_R(*palette);
g = GET_G(*palette);
b = GET_B(*palette);
gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8;
@@ -936,7 +936,7 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 b
if (b > 31)
b = 31;
*palette++ = (b << 10) | (g << 5) | (r << 0);
*palette++ = RGB2(r, g, b);
}
}