diff --git a/graphics/object_events/pics/pokemon/ampharos.png b/graphics/object_events/pics/pokemon/ampharos.png index 076d853d03..2386f6d452 100644 Binary files a/graphics/object_events/pics/pokemon/ampharos.png and b/graphics/object_events/pics/pokemon/ampharos.png differ diff --git a/graphics/pokemon/ampharos/normal.pal b/graphics/pokemon/ampharos/normal.pal index f7fdd3683d..f26721738f 100644 --- a/graphics/pokemon/ampharos/normal.pal +++ b/graphics/pokemon/ampharos/normal.pal @@ -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 diff --git a/graphics/pokemon/ampharos/shiny.pal b/graphics/pokemon/ampharos/shiny.pal index f29dc710fc..719c6b87f0 100644 --- a/graphics/pokemon/ampharos/shiny.pal +++ b/graphics/pokemon/ampharos/shiny.pal @@ -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 diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 62c64718f0..ce94116aa0 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -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