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

Modified palette tint behavior.

Browse source
This commit is contained in:
Ariel Antonitis 2021-08-28 03:46:30 -04:00
parent f3cb35467a
commit b64eb7ea14
3 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/palette.h
View file

@ -27,9 +27,9 @@ enum
}; };
struct BlendSettings { struct BlendSettings {
u16 blendColor:15; u32 blendColor:24;
u16 isTint:1; u32 isTint:1;
u8 coeff:5; u32 coeff:5;
}; };
struct PaletteFadeControl struct PaletteFadeControl

4
src/overworld.c
View file

@ -1460,11 +1460,11 @@ void CB1_Overworld(void)
DoCB1_Overworld(gMain.newKeys, gMain.heldKeys); DoCB1_Overworld(gMain.newKeys, gMain.heldKeys);
} }
#define TINT_NIGHT Q_8_8(0.456) | Q_8_8(0.456) << 8 | Q_8_8(0.615) << 16
const struct BlendSettings gTimeOfDayBlend[] = const struct BlendSettings gTimeOfDayBlend[] =
{ {
[TIME_OF_DAY_NIGHT] = {.coeff = 10, .blendColor = 0x1400}, [TIME_OF_DAY_NIGHT] = {.coeff = 10, .blendColor = TINT_NIGHT, .isTint = TRUE},
[TIME_OF_DAY_TWILIGHT] = {.coeff = 4, .blendColor = 0x56dc, .isTint = TRUE}, [TIME_OF_DAY_TWILIGHT] = {.coeff = 4, .blendColor = 0x56dc, .isTint = TRUE},
[TIME_OF_DAY_DAY] = {.coeff = 0, .blendColor = 0}, [TIME_OF_DAY_DAY] = {.coeff = 0, .blendColor = 0},
}; };

36
src/palette.c
View file

@ -1101,12 +1101,24 @@ void TimeMixPalettes(u32 palettes, u16 *src, u16 *dst, struct BlendSettings *ble
tint1 = blend1->isTint; tint1 = blend1->isTint;
coeff1 = tint1 ? 8*2 : blend1->coeff*2; coeff1 = tint1 ? 8*2 : blend1->coeff*2;
r0 = (color0 << 27) >> 27; if (tint0) {
g0 = (color0 << 22) >> 27; r0 = (color0 << 24) >> 24;
b0 = (color0 << 17) >> 27; g0 = (color0 << 16) >> 24;
r1 = (color1 << 27) >> 27; b0 = (color0 << 8) >> 24;
g1 = (color1 << 22) >> 27; } else {
b1 = (color1 << 17) >> 27; r0 = (color0 << 27) >> 27;
g0 = (color0 << 22) >> 27;
b0 = (color0 << 17) >> 27;
}
if (tint1) {
r1 = (color1 << 24) >> 24;
g1 = (color1 << 16) >> 24;
b1 = (color1 << 8) >> 24;
} else {
r1 = (color1 << 27) >> 27;
g1 = (color1 << 22) >> 27;
b1 = (color1 << 17) >> 27;
}
defR = (defaultColor << 27) >> 27; defR = (defaultColor << 27) >> 27;
defG = (defaultColor << 22) >> 27; defG = (defaultColor << 22) >> 27;
defB = (defaultColor << 17) >> 27; defB = (defaultColor << 17) >> 27;
@ -1155,9 +1167,9 @@ void TimeMixPalettes(u32 palettes, u16 *src, u16 *dst, struct BlendSettings *ble
g2 = (g + (((g0 - g) * coeff0) >> 5)); g2 = (g + (((g0 - g) * coeff0) >> 5));
b2 = (b + (((b0 - b) * coeff0) >> 5)); b2 = (b + (((b0 - b) * coeff0) >> 5));
} else { // tint-based } else { // tint-based
r2 = (u16)(((r0 << 3) * r)) >> 8; r2 = (u16)((r0 * r)) >> 8;
g2 = (u16)(((g0 << 3) * g)) >> 8; g2 = (u16)((g0 * g)) >> 8;
b2 = (u16)(((b0 << 3) * b)) >> 8; b2 = (u16)((b0 * b)) >> 8;
if (r2 > 31) if (r2 > 31)
r2 = 31; r2 = 31;
if (g2 > 31) if (g2 > 31)
@ -1170,9 +1182,9 @@ void TimeMixPalettes(u32 palettes, u16 *src, u16 *dst, struct BlendSettings *ble
g3 = (g + (((g1 - g) * coeff1) >> 5)); g3 = (g + (((g1 - g) * coeff1) >> 5));
b3 = (b + (((b1 - b) * coeff1) >> 5)); b3 = (b + (((b1 - b) * coeff1) >> 5));
} else { // tint-based } else { // tint-based
r3 = (u16)(((r1 << 3) * r)) >> 8; r3 = (u16)((r1 * r)) >> 8;
g3 = (u16)(((g1 << 3) * g)) >> 8; g3 = (u16)((g1 * g)) >> 8;
b3 = (u16)(((b1 << 3) * b)) >> 8; b3 = (u16)((b1 * b)) >> 8;
if (r3 > 31) if (r3 > 31)
r3 = 31; r3 = 31;
if (g3 > 31) if (g3 > 31)