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

Name color return values more accurately

Browse source
This commit is contained in:
SphericalIce 2021-01-19 17:59:36 +00:00
parent 8de76ed533
commit 2dfaba9472
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/rgb.h
View file

@ -10,7 +10,7 @@
#define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F)) #define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F))
#define RGB_ALPHA (1 << 15) #define RGB_ALPHA (1 << 15)
#define IS_ALPHA(color) (color & RGB_ALPHA) #define IS_ALPHA(color) ((color) & RGB_ALPHA)
#define RGB_BLACK RGB(0, 0, 0) #define RGB_BLACK RGB(0, 0, 0)
#define RGB_WHITE RGB(31, 31, 31) #define RGB_WHITE RGB(31, 31, 31)

32
src/field_effect.c
View file

@ -935,42 +935,42 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId)
void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
{ {
int curRed, curGreen, curBlue; int curRed, curGreen, curBlue;
u16 palette = gPlttBufferUnfaded[i]; u16 color = gPlttBufferUnfaded[i];
curRed = (palette & RGB_RED); curRed = (color & RGB_RED);
curGreen = (palette & RGB_GREEN) >> 5; curGreen = (color & RGB_GREEN) >> 5;
curBlue = (palette & RGB_BLUE) >> 10; curBlue = (color & RGB_BLUE) >> 10;
curRed += (((0x1F - curRed) * r) >> 4); curRed += (((0x1F - curRed) * r) >> 4);
curGreen += (((0x1F - curGreen) * g) >> 4); curGreen += (((0x1F - curGreen) * g) >> 4);
curBlue += (((0x1F - curBlue) * b) >> 4); curBlue += (((0x1F - curBlue) * b) >> 4);
palette = curRed; color = curRed;
palette |= (curGreen << 5); color |= (curGreen << 5);
palette |= (curBlue << 10); color |= (curBlue << 10);
gPlttBufferFaded[i] = palette; gPlttBufferFaded[i] = color;
} }
// r, g, b are between 0 and 16 // r, g, b are between 0 and 16
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
{ {
int curRed, curGreen, curBlue; int curRed, curGreen, curBlue;
u16 palette = gPlttBufferUnfaded[i]; u16 color = gPlttBufferUnfaded[i];
curRed = (palette & RGB_RED); curRed = (color & RGB_RED);
curGreen = (palette & RGB_GREEN) >> 5; curGreen = (color & RGB_GREEN) >> 5;
curBlue = (palette & RGB_BLUE) >> 10; curBlue = (color & RGB_BLUE) >> 10;
curRed -= ((curRed * r) >> 4); curRed -= ((curRed * r) >> 4);
curGreen -= ((curGreen * g) >> 4); curGreen -= ((curGreen * g) >> 4);
curBlue -= ((curBlue * b) >> 4); curBlue -= ((curBlue * b) >> 4);
palette = curRed; color = curRed;
palette |= curGreen << 5; color |= curGreen << 5;
palette |= curBlue << 10; color |= curBlue << 10;
gPlttBufferFaded[i] = palette; gPlttBufferFaded[i] = color;
} }
// Task data for Task_PokecenterHeal and Task_HallOfFameRecord // Task data for Task_PokecenterHeal and Task_HallOfFameRecord