diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index bcd4d126f9..97b366b843 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -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 diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index a642c78399..ad73d4baba 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -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