atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Vivillon palettes

Browse source
This commit is contained in:
Eduardo Quezada 2024-05-06 18:16:12 -04:00
parent d5111ad76e
commit 48ce61715d
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/data/graphics/pokemon.h
View file

@ -14881,10 +14881,10 @@ const u32 gObjectEventPic_Substitute[] = INCBIN_COMP("graphics/pokemon/question_
const u8 gMonFootprint_Vivillon[] = INCBIN_U8("graphics/pokemon/vivillon/footprint.1bpp");
#endif //P_FOOTPRINTS
#if OW_FOLLOWERS_ENABLED
const u32 gObjectEventPic_VivillonIcySnow[] = INCBIN_COMP("graphics/pokemon/vivillon/meadow/follower.4bpp");
const u32 gObjectEventPic_VivillonIcySnow[] = INCBIN_COMP("graphics/pokemon/vivillon/follower.4bpp");
#if OW_FOLLOWERS_SHARE_PALETTE == FALSE
const u32 gFollowerPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/follow_normal.gbapal.lz");
const u32 gShinyFollowerPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/meadow/follow_shiny.gbapal.lz");
const u32 gFollowerPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/follow_normal.gbapal.lz");
const u32 gShinyFollowerPalette_VivillonIcySnow[] = INCBIN_U32("graphics/pokemon/vivillon/follow_shiny.gbapal.lz");
#endif //OW_FOLLOWERS_SHARE_PALETTE
#endif //OW_FOLLOWERS_ENABLED

8
src/data/pokemon/species_info/gen_6_families.h
View file

@ -1063,7 +1063,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.iconSprite = gMonIcon_Vivillon ##form, \
.iconPalIndex = iconPal, \
FOOTPRINT(Vivillon) \
FOLLOWER(Vivillon ##form, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT) \
FOLLOWER( \
Vivillon ##form, \
SIZE_32x32, \
SHADOW_SIZE_M, \
TRACKS_FOOT, \
gFollowerPalette_Vivillon ##form, \
gShinyFollowerPalette_Vivillon ##form) \
.levelUpLearnset = sVivillonLevelUpLearnset, \
.teachableLearnset = sVivillonTeachableLearnset, \
.formSpeciesIdTable = sVivillonFormSpeciesIdTable