summaryrefslogtreecommitdiff
path: root/src/util.c
diff options
context:
space:
mode:
authorSphericalIce <sphericalice@outlook.com>2021-02-14 22:08:19 +0000
committerSphericalIce <sphericalice@outlook.com>2021-02-14 22:08:19 +0000
commit27dc32de26e6697f8b493fd33667bb353d4d2453 (patch)
tree5a5a3a3864afe3444d5bba98a6c40ef266705975 /src/util.c
parentbe0699bd641c134aca365600e2e8b12da93da860 (diff)
Use RGB macros
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util.c b/src/util.c
index 8aa54857a..a4e3fa4cf 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2,6 +2,7 @@
#include "util.h"
#include "sprite.h"
#include "palette.h"
+#include "constants/rgb.h"
const u32 gBitTable[] =
{
@@ -271,8 +272,8 @@ void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor)
s8 g = data1->g;
s8 b = data1->b;
struct PlttData *data2 = (struct PlttData *)&blendColor;
- gPlttBufferFaded[index] = ((r + (((data2->r - r) * coeff) >> 4)) << 0)
- | ((g + (((data2->g - g) * coeff) >> 4)) << 5)
- | ((b + (((data2->b - b) * coeff) >> 4)) << 10);
+ gPlttBufferFaded[index] = RGB(r + (((data2->r - r) * coeff) >> 4),
+ g + (((data2->g - g) * coeff) >> 4),
+ b + (((data2->b - b) * coeff) >> 4));
}
}