From 248980ae19b790f8f00cbfbb2b30bebc2c767a20 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 6 May 2024 18:24:36 -0400 Subject: [PATCH] =?UTF-8?q?Fixed=20Flab=C3=A9b=C3=A9=20family=20follower?= =?UTF-8?q?=20palettes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokemon/species_info/gen_6_families.h | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index ad73d4baba..151a9a4c6f 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -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