Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Fortree/weather institute lights.

Browse Source
This commit is contained in:
Ariel Antonitis 2021-03-16 01:00:14 -04:00
parent 4a04282c0b
commit b7d9b77e46
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/tilesets/headers.inc
View File

@ -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

BIN
data/tilesets/secondary/fortree/metatiles.bin
View File

Binary file not shown.

4
data/tilesets/secondary/fortree/palettes/08.pal
View File

@ -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

BIN
data/tilesets/secondary/fortree/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
data/tilesets/secondary/mauville/metatiles.bin
View File

Binary file not shown.

6
data/tilesets/secondary/mauville/palettes/07.pal
View File

@ -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

2
data/tilesets/secondary/mauville/palettes/10.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
16 128 8
8 192 0
255 255 255
148 222 205
123 180 172

2
data/tilesets/secondary/mauville/palettes/11.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
172 180 139
0 48 0
255 255 255
222 230 238
164 180 197

BIN
data/tilesets/secondary/mauville/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

2
data/tilesets/secondary/petalburg/palettes/06.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
0 128 8
0 192 0
255 255 255
230 222 222
213 213 197

2
data/tilesets/secondary/petalburg/palettes/07.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
0 128 8
0 192 0
213 222 172
0 0 0
189 189 131

2
data/tilesets/secondary/rustboro/palettes/06.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
224 136 8
240 192 0
255 255 255
216 224 232
184 200 224

2
data/tilesets/secondary/slateport/palettes/06.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
0 64 0
0 32 0
255 255 255
230 230 238
205 205 222

2
data/tilesets/secondary/slateport/palettes/12.pal
View File

@ -1,7 +1,7 @@
JASC-PAL
0100
16
0 0 136
0 128 64
222 205 148
184 168 80
0 0 0

2
src/palette.c
View File

@ -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;