diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc index f495aae2c0..c652587a0e 100644 --- a/data/tilesets/headers.inc +++ b/data/tilesets/headers.inc @@ -57,7 +57,7 @@ gTileset_Slateport:: @ 83DF764 gTileset_Mauville:: @ 83DF77C .byte TRUE @ is compressed .byte TRUE @ is secondary tileset - .2byte 0x12 @ lightPalettes 7,10 + .2byte 0x32 @ lightPalettes 7,10,11 .4byte gTilesetTiles_Mauville .4byte gTilesetPalettes_Mauville .4byte gMetatiles_Mauville @@ -90,7 +90,7 @@ gTileset_Fallarbor:: @ 83DF7AC gTileset_Fortree:: @ 83DF7C4 .byte TRUE @ is compressed .byte TRUE @ is secondary tileset - .2byte 0 @ padding + .2byte 0x0404 @ lightPalettes 8, customLights 8 .4byte gTilesetTiles_Fortree .4byte gTilesetPalettes_Fortree .4byte gMetatiles_Fortree diff --git a/data/tilesets/secondary/fortree/metatiles.bin b/data/tilesets/secondary/fortree/metatiles.bin index ecc00d7e70..1b0958cbd1 100644 Binary files a/data/tilesets/secondary/fortree/metatiles.bin and b/data/tilesets/secondary/fortree/metatiles.bin differ diff --git a/data/tilesets/secondary/fortree/palettes/08.pal b/data/tilesets/secondary/fortree/palettes/08.pal index 40b922e287..11b51b1071 100644 --- a/data/tilesets/secondary/fortree/palettes/08.pal +++ b/data/tilesets/secondary/fortree/palettes/08.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -255 255 255 +0 96 8 255 255 255 246 238 189 230 213 172 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 172 180 197 123 123 123 -115 197 164 +176 184 200 diff --git a/data/tilesets/secondary/fortree/tiles.png b/data/tilesets/secondary/fortree/tiles.png index 9cd688c5ed..2da9fcbfab 100644 Binary files a/data/tilesets/secondary/fortree/tiles.png and b/data/tilesets/secondary/fortree/tiles.png differ diff --git a/data/tilesets/secondary/mauville/metatiles.bin b/data/tilesets/secondary/mauville/metatiles.bin index d138404658..a71ead8e57 100644 Binary files a/data/tilesets/secondary/mauville/metatiles.bin and b/data/tilesets/secondary/mauville/metatiles.bin differ diff --git a/data/tilesets/secondary/mauville/palettes/07.pal b/data/tilesets/secondary/mauville/palettes/07.pal index b74a8c0097..6f43490ad6 100644 --- a/data/tilesets/secondary/mauville/palettes/07.pal +++ b/data/tilesets/secondary/mauville/palettes/07.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -16 64 0 +8 0 128 255 255 180 238 238 90 213 213 65 @@ -9,11 +9,11 @@ JASC-PAL 131 131 139 98 98 123 65 74 106 -168 200 224 +40 48 88 213 213 213 164 164 172 230 197 246 213 139 222 197 115 164 148 98 106 -40 48 88 +168 200 224 diff --git a/data/tilesets/secondary/mauville/palettes/10.pal b/data/tilesets/secondary/mauville/palettes/10.pal index 5b3c5e6ef2..b87549f6d1 100644 --- a/data/tilesets/secondary/mauville/palettes/10.pal +++ b/data/tilesets/secondary/mauville/palettes/10.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -16 128 8 +8 192 0 255 255 255 148 222 205 123 180 172 diff --git a/data/tilesets/secondary/mauville/palettes/11.pal b/data/tilesets/secondary/mauville/palettes/11.pal index c73ec2fe82..48166182ae 100644 --- a/data/tilesets/secondary/mauville/palettes/11.pal +++ b/data/tilesets/secondary/mauville/palettes/11.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -172 180 139 +0 48 0 255 255 255 222 230 238 164 180 197 diff --git a/data/tilesets/secondary/mauville/tiles.png b/data/tilesets/secondary/mauville/tiles.png index 68e2f49dcd..20da7198e8 100644 Binary files a/data/tilesets/secondary/mauville/tiles.png and b/data/tilesets/secondary/mauville/tiles.png differ diff --git a/data/tilesets/secondary/petalburg/palettes/06.pal b/data/tilesets/secondary/petalburg/palettes/06.pal index 0c727de68c..0d0fbb48ca 100644 --- a/data/tilesets/secondary/petalburg/palettes/06.pal +++ b/data/tilesets/secondary/petalburg/palettes/06.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 128 8 +0 192 0 255 255 255 230 222 222 213 213 197 diff --git a/data/tilesets/secondary/petalburg/palettes/07.pal b/data/tilesets/secondary/petalburg/palettes/07.pal index 3f7cad9b2c..75b06af26e 100644 --- a/data/tilesets/secondary/petalburg/palettes/07.pal +++ b/data/tilesets/secondary/petalburg/palettes/07.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 128 8 +0 192 0 213 222 172 0 0 0 189 189 131 diff --git a/data/tilesets/secondary/rustboro/palettes/06.pal b/data/tilesets/secondary/rustboro/palettes/06.pal index e73db0e700..be88a09cf9 100644 --- a/data/tilesets/secondary/rustboro/palettes/06.pal +++ b/data/tilesets/secondary/rustboro/palettes/06.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -224 136 8 +240 192 0 255 255 255 216 224 232 184 200 224 diff --git a/data/tilesets/secondary/slateport/palettes/06.pal b/data/tilesets/secondary/slateport/palettes/06.pal index 5f71b74caa..2c624776cf 100644 --- a/data/tilesets/secondary/slateport/palettes/06.pal +++ b/data/tilesets/secondary/slateport/palettes/06.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 64 0 +0 32 0 255 255 255 230 230 238 205 205 222 diff --git a/data/tilesets/secondary/slateport/palettes/12.pal b/data/tilesets/secondary/slateport/palettes/12.pal index 07fa673902..f003c0d9ed 100644 --- a/data/tilesets/secondary/slateport/palettes/12.pal +++ b/data/tilesets/secondary/slateport/palettes/12.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -0 0 136 +0 128 64 222 205 148 184 168 80 0 0 0 diff --git a/src/palette.c b/src/palette.c index 1b38003df5..3d57136f88 100644 --- a/src/palette.c +++ b/src/palette.c @@ -993,7 +993,7 @@ void TimeBlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor) { if (i == 0) { 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; // Note that color 15 will never be light-blended + altBlendIndices = gPlttBufferUnfaded[index] << 1; // bit 0 species color 1, etc. data3 = (struct PlttData *)&gPlttBufferUnfaded[index+15]; if (!data3->unused_15) // use default blend color instead data3 = (struct PlttData *)&defaultBlendColor;