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

Fixed Flabébé family follower palettes

Browse source
This commit is contained in:
Eduardo Quezada 2024-05-06 18:24:36 -04:00
parent 48ce61715d
commit 248980ae19
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1415,7 +1415,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.iconSprite = gMonIcon_Flabebe##Form##Flower, \
.iconPalIndex = iconPal, \
FOOTPRINT(Flabebe) \
FOLLOWER(Flabebe##Form##Flower, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT) \
FOLLOWER( \
Flabebe##Form##Flower, \
SIZE_32x32, \
SHADOW_SIZE_M, \
TRACKS_FOOT, \
gFollowerPalette_Flabebe##Form##Flower, \
gShinyFollowerPalette_Flabebe##Form##Flower) \
.levelUpLearnset = sFlabebeLevelUpLearnset, \
.teachableLearnset = sFlabebeTeachableLearnset, \
.formSpeciesIdTable = sFlabebeFormSpeciesIdTable, \
@ -1494,7 +1500,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.iconSprite = gMonIcon_Floette##form##Flower, \
.iconPalIndex = iconPal, \
FOOTPRINT(Floette) \
FOLLOWER(Floette##form##Flower, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT) \
FOLLOWER( \
Floette ##form##Flower, \
SIZE_32x32, \
SHADOW_SIZE_M, \
TRACKS_FOOT, \
gFollowerPalette_Floette ##form##Flower, \
gShinyFollowerPalette_Floette ##form##Flower) \
.formSpeciesIdTable = sFloetteFormSpeciesIdTable
#define FLOETTE_NORMAL_INFO(form, FORM, iconPal) \
@ -1634,7 +1646,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.iconSprite = gMonIcon_Florges##Form##Flower, \
.iconPalIndex = iconPal, \
FOOTPRINT(Florges) \
FOLLOWER(Florges##Form##Flower, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT) \
FOLLOWER( \
Florges ##Form##Flower, \
SIZE_32x32, \
SHADOW_SIZE_M, \
TRACKS_FOOT, \
gFollowerPalette_Florges ##Form##Flower, \
gShinyFollowerPalette_Florges ##Form##Flower) \
.levelUpLearnset = sFlorgesLevelUpLearnset, \
.teachableLearnset = sFlorgesTeachableLearnset, \
.formSpeciesIdTable = sFlorgesFormSpeciesIdTable