From 73d060b3b61a49b47990813cac5afbbef1e30c2b Mon Sep 17 00:00:00 2001 From: Ariel Antonitis Date: Tue, 20 Apr 2021 01:49:02 -0400 Subject: [PATCH] Added glowing colors for some follower pokemon (Ampharos). --- .../object_events/pics/pokemon/ampharos.png | Bin 703 -> 5069 bytes graphics/pokemon/ampharos/normal.pal | 6 +++--- graphics/pokemon/ampharos/shiny.pal | 6 +++--- src/event_object_movement.c | 12 ++++++++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/graphics/object_events/pics/pokemon/ampharos.png b/graphics/object_events/pics/pokemon/ampharos.png index 076d853d035d00096907463e52259562df05647b..2386f6d45263ab682cff969859bd8c75e2a23ea0 100644 GIT binary patch delta 5039 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 FV1g;Or11a% delta 640 zcmV-`0)PF@C%*-dBa;CU7z6(R|C1aM7=Ql&|KrMtUH||BN=ZaPRCt{2m9dH&F%X7T zTqA*>W(;8$0tZ$R?dx1+Lb@wl8Z0pDO0X)tI+q85BYuITIk>`vaPJan*DKA)k*^3T z0ymBMMyr2DqZyg8cYC-0!h|!dZHJ#fa5-pU+qM55)K{e~K#Ggmld zTx1S+P@$6N99&_;y39jPti%HRoqt!X$iYHaTw^Zfy2wMp&~na$Z-Fat=2yg;P7>uF zfRsFPQs7Fj@%RUxeNHSCot%tY?S_meg)<|C8?A2H>BumPA4!92h0gq%aTxAlD5Ap1 zNI@&D*x`v0o*KdDWmOt0Hv9TaI7rFi&ZEMaV=M86l=HPPl&9riU-%qg5r0z_-+IEq zWrw0ig)_%t6R=%^NdX3SQ;rYcIqeI_^F9$E!`Ivp<}R&=05%IS#TO=<3wJRm8wh>N zqr%92ETitW%UY%38#$)qG)O#Iou%wOm6T1N1V>JdVAXc1n{;g>#{+fF0-iikQ}$=l zQp#2}g!`mmOpEGqm~rfeLW1Jnk$)t=ZWZOe#q7^a9nL!#HCKc&rYV!ReM6b&j=!~wh!>83 aWxoOMtag) == 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