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

Added glowing colors for some follower pokemon (Ampharos).

Browse Source
This commit is contained in:
Ariel Antonitis 2021-04-20 01:49:02 -04:00
parent ae4f596885
commit 73d060b3b6
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/object_events/pics/pokemon/ampharos.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 703 B

After

Width:  |  Height:  |  Size: 5.0 KiB

6
graphics/pokemon/ampharos/normal.pal
View File

@ -1,13 +1,13 @@
JASC-PAL
0100
16
205 205 172
0 8 248
255 255 255
255 238 74
255 197 16
213 148 0
148 74 0
255 0 255
230 230 230
230 230 230
172 172 172
98 106 106
@ -16,4 +16,4 @@ JASC-PAL
197 65 0
139 32 0
90 0 0
255 0 255
197 65 0

6
graphics/pokemon/ampharos/shiny.pal
View File

@ -1,13 +1,13 @@
JASC-PAL
0100
16
205 205 172
0 8 248
255 255 255
246 180 213
213 148 180
189 115 156
139 82 106
255 0 255
230 230 230
230 230 230
172 172 172
98 106 106
@ -16,4 +16,4 @@ JASC-PAL
65 106 205
32 65 156
49 74 139
255 0 255
65 106 205

12
src/event_object_movement.c
View File

@ -1672,6 +1672,18 @@ static void FollowerSetGraphics(struct ObjectEvent *objectEvent, u16 species, u8
if (IndexOfSpritePaletteTag(spritePalette->tag) == 0xFF) { // Load compressed palette
LoadCompressedSpritePalette(spritePalette);
sprite->oam.paletteNum = IndexOfSpritePaletteTag(spritePalette->tag); // Tag is always present
if (species == SPECIES_AMPHAROS) { // palette should be light-blended TODO: Add more glowing pokemon
// CHARIZARD_LINE ?
// CHINCHOU & LANTERN
// FLAAFY, MAREEP
// UMBREON
// VOLBEAT ?
// REGIS ?
u16 * palette = &gPlttBufferUnfaded[(sprite->oam.paletteNum+16)*16];
palette[0] |= 0x8000;
if (palette[0] & 0x4000) // If color 15 is blended, use it as the alternate color
palette[15] |= 0x8000;
}
UpdateSpritePaletteWithTime(sprite->oam.paletteNum);
} else
sprite->oam.paletteNum = IndexOfSpritePaletteTag(spritePalette->tag); // Tag is always present