From 73234e0c748c19bea198527e8c0abc2a88a0ae9d Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Fri, 12 Mar 2021 02:07:34 -0500 Subject: [PATCH] Changed Route 104 windows palette. --- .../tilesets/secondary/rustboro/metatiles.bin | Bin 5600 -> 5600 bytes .../secondary/rustboro/palettes/06.pal | 20 +++++++++--------- data/tilesets/secondary/rustboro/tiles.png | Bin 4003 -> 12786 bytes src/palette.c | 17 +++++++++------ 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/data/tilesets/secondary/rustboro/metatiles.bin b/data/tilesets/secondary/rustboro/metatiles.bin index 585e3a6c299ba5f8428ca95b4b8020298f1f21c6..63ecf0306eed55fba51975805e7469fdd82f728a 100644 GIT binary patch delta 108 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 Eg77eZ)&Kwi delta 3949 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 B@M{17 diff --git a/src/palette.c b/src/palette.c index 593c9bcd45..f433f442b2 100644 --- a/src/palette.c +++ b/src/palette.c @@ -983,24 +983,27 @@ void TimePalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor) { u16 i; s8 r, g, b; struct PlttData *data2 = (struct PlttData *)&blendColor; + struct PlttData *data3; + struct PlttData *blendData; + u16 altBlendIndices = 0; for (i = 0; i < numEntries; i++) { u16 index = i + palOffset; struct PlttData *data1 = (struct PlttData *)&gPlttBufferUnfaded[index]; if (i == 0) { - if (data1->unused_15) { // Use transparency color to blend - data2 = data1; + if (data1->unused_15) { // Color 0 is a bitmask for which colors to blend; color 15 is the alt blend color gPlttBufferFaded[index] = gPlttBufferUnfaded[index]; + altBlendIndices = gPlttBufferUnfaded[index] & 0x7FFF; + data3 = (struct PlttData *)&gPlttBufferUnfaded[index+15]; } - else if (data2->unused_15) // Set transparency/blending color - gPlttBufferUnfaded[index] = gPlttBufferFaded[index] = blendColor; continue; } r = data1->r; g = data1->g; b = data1->b; - gPlttBufferFaded[index] = RGB(r + (((data2->r - r) * coeff) >> 4), - g + (((data2->g - g) * coeff) >> 4), - b + (((data2->b - b) * coeff) >> 4)); + blendData = (altBlendIndices && altBlendIndices & (1 << i)) ? data3 : data2; + gPlttBufferFaded[index] = RGB(r + (((blendData->r - r) * coeff) >> 4), + g + (((blendData->g - g) * coeff) >> 4), + b + (((blendData->b - b) * coeff) >> 4)); } }