diff options
| author | SphericalIce <sphericalice@outlook.com> | 2021-01-19 17:59:36 +0000 |
|---|---|---|
| committer | SphericalIce <sphericalice@outlook.com> | 2021-01-19 17:59:36 +0000 |
| commit | 2dfaba9472c933f5a659a38fa2581ecf3d3f0ef7 (patch) | |
| tree | ea118ba89c546e36a16f0487e51886b0eb43544b /src/field_effect.c | |
| parent | 8de76ed5338b819784e426bd9d6c7d0164e23a61 (diff) | |
Name color return values more accurately
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index c74bb23be..b1837c514 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -935,42 +935,42 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId) void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) { int curRed, curGreen, curBlue; - u16 palette = gPlttBufferUnfaded[i]; + u16 color = gPlttBufferUnfaded[i]; - curRed = (palette & RGB_RED); - curGreen = (palette & RGB_GREEN) >> 5; - curBlue = (palette & RGB_BLUE) >> 10; + curRed = (color & RGB_RED); + curGreen = (color & RGB_GREEN) >> 5; + curBlue = (color & RGB_BLUE) >> 10; curRed += (((0x1F - curRed) * r) >> 4); curGreen += (((0x1F - curGreen) * g) >> 4); curBlue += (((0x1F - curBlue) * b) >> 4); - palette = curRed; - palette |= (curGreen << 5); - palette |= (curBlue << 10); + color = curRed; + color |= (curGreen << 5); + color |= (curBlue << 10); - gPlttBufferFaded[i] = palette; + gPlttBufferFaded[i] = color; } // r, g, b are between 0 and 16 void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) { int curRed, curGreen, curBlue; - u16 palette = gPlttBufferUnfaded[i]; + u16 color = gPlttBufferUnfaded[i]; - curRed = (palette & RGB_RED); - curGreen = (palette & RGB_GREEN) >> 5; - curBlue = (palette & RGB_BLUE) >> 10; + curRed = (color & RGB_RED); + curGreen = (color & RGB_GREEN) >> 5; + curBlue = (color & RGB_BLUE) >> 10; curRed -= ((curRed * r) >> 4); curGreen -= ((curGreen * g) >> 4); curBlue -= ((curBlue * b) >> 4); - palette = curRed; - palette |= curGreen << 5; - palette |= curBlue << 10; + color = curRed; + color |= curGreen << 5; + color |= curBlue << 10; - gPlttBufferFaded[i] = palette; + gPlttBufferFaded[i] = color; } // Task data for Task_PokecenterHeal and Task_HallOfFameRecord |