Rename Furfrou Species tags to match Pokemon Showdown exports (#6041)

include/constants/species.h

@@ -1214,15 +1214,15 @@
 #define SPECIES_FLORGES_ORANGE                          1143
 #define SPECIES_FLORGES_BLUE                            1144
 #define SPECIES_FLORGES_WHITE                           1145
-#define SPECIES_FURFROU_HEART_TRIM                      1146
-#define SPECIES_FURFROU_STAR_TRIM                       1147
-#define SPECIES_FURFROU_DIAMOND_TRIM                    1148
-#define SPECIES_FURFROU_DEBUTANTE_TRIM                  1149
-#define SPECIES_FURFROU_MATRON_TRIM                     1150
-#define SPECIES_FURFROU_DANDY_TRIM                      1151
-#define SPECIES_FURFROU_LA_REINE_TRIM                   1152
-#define SPECIES_FURFROU_KABUKI_TRIM                     1153
-#define SPECIES_FURFROU_PHARAOH_TRIM                    1154
+#define SPECIES_FURFROU_HEART                           1146
+#define SPECIES_FURFROU_STAR                            1147
+#define SPECIES_FURFROU_DIAMOND                         1148
+#define SPECIES_FURFROU_DEBUTANTE                       1149
+#define SPECIES_FURFROU_MATRON                          1150
+#define SPECIES_FURFROU_DANDY                           1151
+#define SPECIES_FURFROU_LA_REINE                        1152
+#define SPECIES_FURFROU_KABUKI                          1153
+#define SPECIES_FURFROU_PHARAOH                         1154
 #define SPECIES_MEOWSTIC_F                              1155
 #define SPECIES_AEGISLASH_BLADE                         1156
 #define SPECIES_PUMPKABOO_SMALL                         1157

spritesheet_rules.mk

@@ -4212,31 +4212,31 @@ $(POKEMONGFXDIR)/florges/orange/overworld.4bpp: %.4bpp: %.png
 $(POKEMONGFXDIR)/florges/white/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/heart_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/heart/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/star_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/star/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/diamond_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/diamond/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/debutante_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/debutante/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/matron_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/matron/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/dandy_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/dandy/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/la_reine_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/la_reine/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/kabuki_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/kabuki/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(POKEMONGFXDIR)/furfrou/pharaoh_trim/overworld.4bpp: %.4bpp: %.png
+$(POKEMONGFXDIR)/furfrou/pharaoh/overworld.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 $(POKEMONGFXDIR)/hoopa/unbound/overworld.4bpp: %.4bpp: %.png

src/data/object_events/object_event_pic_tables_followers.h

@@ -4679,32 +4679,32 @@ static const struct SpriteFrameImage sPicTable_Pangoro[] = {
 static const struct SpriteFrameImage sPicTable_FurfrouNatural[] = {
     overworld_ascending_frames(gObjectEventPic_FurfrouNatural, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouHeartTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouHeartTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouHeart[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouHeart, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouStarTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouStarTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouStar[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouStar, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouDiamondTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouDiamondTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouDiamond[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouDiamond, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouDebutanteTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouDebutanteTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouDebutante[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouDebutante, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouMatronTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouMatronTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouMatron[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouMatron, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouDandyTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouDandyTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouDandy[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouDandy, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouLaReineTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouLaReineTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouLaReine[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouLaReine, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouKabukiTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouKabukiTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouKabuki[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouKabuki, 4, 4),
 };
-static const struct SpriteFrameImage sPicTable_FurfrouPharaohTrim[] = {
-    overworld_ascending_frames(gObjectEventPic_FurfrouPharaohTrim, 4, 4),
+static const struct SpriteFrameImage sPicTable_FurfrouPharaoh[] = {
+    overworld_ascending_frames(gObjectEventPic_FurfrouPharaoh, 4, 4),
 };
 #endif //P_FAMILY_FURFROU
 

src/data/pokemon/form_species_tables.h

@@ -1459,15 +1459,15 @@ static const u16 sFlorgesFormSpeciesIdTable[] = {
 #if P_FAMILY_FURFROU
 static const u16 sFurfrouFormSpeciesIdTable[] = {
     SPECIES_FURFROU_NATURAL,
-    SPECIES_FURFROU_HEART_TRIM,
-    SPECIES_FURFROU_STAR_TRIM,
-    SPECIES_FURFROU_DIAMOND_TRIM,
-    SPECIES_FURFROU_DEBUTANTE_TRIM,
-    SPECIES_FURFROU_MATRON_TRIM,
-    SPECIES_FURFROU_DANDY_TRIM,
-    SPECIES_FURFROU_LA_REINE_TRIM,
-    SPECIES_FURFROU_KABUKI_TRIM,
-    SPECIES_FURFROU_PHARAOH_TRIM,
+    SPECIES_FURFROU_HEART,
+    SPECIES_FURFROU_STAR,
+    SPECIES_FURFROU_DIAMOND,
+    SPECIES_FURFROU_DEBUTANTE,
+    SPECIES_FURFROU_MATRON,
+    SPECIES_FURFROU_DANDY,
+    SPECIES_FURFROU_LA_REINE,
+    SPECIES_FURFROU_KABUKI,
+    SPECIES_FURFROU_PHARAOH,
     FORM_SPECIES_END,
 };
 #endif //P_FAMILY_FURFROU

src/data/pokemon/pokedex_orders.h

@@ -1894,15 +1894,15 @@ const u16 gPokedexOrder_Weight[] =
     NATIONAL_DEX_SIMISEAR,
     NATIONAL_DEX_MARACTUS,
     NATIONAL_DEX_FURFROU,//_NATURAL,
-    //NATIONAL_DEX_FURFROU_HEART_TRIM,
-    //NATIONAL_DEX_FURFROU_STAR_TRIM,
-    //NATIONAL_DEX_FURFROU_DIAMOND_TRIM,
-    //NATIONAL_DEX_FURFROU_DEBUTANTE_TRIM,
-    //NATIONAL_DEX_FURFROU_MATRON_TRIM,
-    //NATIONAL_DEX_FURFROU_DANDY_TRIM,
-    //NATIONAL_DEX_FURFROU_LA_REINE_TRIM,
-    //NATIONAL_DEX_FURFROU_KABUKI_TRIM,
-    //NATIONAL_DEX_FURFROU_PHARAOH_TRIM,
+    //NATIONAL_DEX_FURFROU_HEART,
+    //NATIONAL_DEX_FURFROU_STAR,
+    //NATIONAL_DEX_FURFROU_DIAMOND,
+    //NATIONAL_DEX_FURFROU_DEBUTANTE,
+    //NATIONAL_DEX_FURFROU_MATRON,
+    //NATIONAL_DEX_FURFROU_DANDY,
+    //NATIONAL_DEX_FURFROU_LA_REINE,
+    //NATIONAL_DEX_FURFROU_KABUKI,
+    //NATIONAL_DEX_FURFROU_PHARAOH,
     NATIONAL_DEX_PERRSERKER,
     NATIONAL_DEX_INDEEDEE,//_MALE,
     //NATIONAL_DEX_INDEEDEE_FEMALE,
@@ -3711,15 +3711,15 @@ const u16 gPokedexOrder_Height[] =
     NATIONAL_DEX_TALONFLAME,
     NATIONAL_DEX_VIVILLON,
     NATIONAL_DEX_FURFROU,//_NATURAL,
-    //NATIONAL_DEX_FURFROU_HEART_TRIM,
-    //NATIONAL_DEX_FURFROU_STAR_TRIM,
-    //NATIONAL_DEX_FURFROU_DIAMOND_TRIM,
-    //NATIONAL_DEX_FURFROU_DEBUTANTE_TRIM,
-    //NATIONAL_DEX_FURFROU_MATRON_TRIM,
-    //NATIONAL_DEX_FURFROU_DANDY_TRIM,
-    //NATIONAL_DEX_FURFROU_LA_REINE_TRIM,
-    //NATIONAL_DEX_FURFROU_KABUKI_TRIM,
-    //NATIONAL_DEX_FURFROU_PHARAOH_TRIM,
+    //NATIONAL_DEX_FURFROU_HEART,
+    //NATIONAL_DEX_FURFROU_STAR,
+    //NATIONAL_DEX_FURFROU_DIAMOND,
+    //NATIONAL_DEX_FURFROU_DEBUTANTE,
+    //NATIONAL_DEX_FURFROU_MATRON,
+    //NATIONAL_DEX_FURFROU_DANDY,
+    //NATIONAL_DEX_FURFROU_LA_REINE,
+    //NATIONAL_DEX_FURFROU_KABUKI,
+    //NATIONAL_DEX_FURFROU_PHARAOH,
     //NATIONAL_DEX_ZYGARDE_10,
     //NATIONAL_DEX_ZYGARDE_10_POWER_CONSTRUCT,
     NATIONAL_DEX_SALAZZLE,

src/data/pokemon/species_info/gen_6_families.h

@@ -2192,16 +2192,16 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
         .formChangeTable = sFurfrouFormChangeTable,                                                     \
     }
 
-    [SPECIES_FURFROU_NATURAL] =        FURFROU_MISC_INFO(Natural,       FALSE, 48, 3, 56, 0, 0),
-    [SPECIES_FURFROU_HEART_TRIM] =     FURFROU_MISC_INFO(HeartTrim,     FALSE, 56, 2, 56, 1, 0),
-    [SPECIES_FURFROU_STAR_TRIM] =      FURFROU_MISC_INFO(StarTrim,      FALSE, 56, 2, 64, 1, 0),
-    [SPECIES_FURFROU_DIAMOND_TRIM] =   FURFROU_MISC_INFO(DiamondTrim,   FALSE, 48, 2, 56, 1, 0),
-    [SPECIES_FURFROU_DEBUTANTE_TRIM] = FURFROU_MISC_INFO(DebutanteTrim, TRUE,  48, 2, 56, 1, 2),
-    [SPECIES_FURFROU_MATRON_TRIM] =    FURFROU_MISC_INFO(MatronTrim,    FALSE, 48, 2, 56, 1, 2),
-    [SPECIES_FURFROU_DANDY_TRIM] =     FURFROU_MISC_INFO(DandyTrim,     FALSE, 48, 2, 56, 1, 1),
-    [SPECIES_FURFROU_LA_REINE_TRIM] =  FURFROU_MISC_INFO(LaReineTrim,   FALSE, 48, 2, 56, 1, 0),
-    [SPECIES_FURFROU_KABUKI_TRIM] =    FURFROU_MISC_INFO(KabukiTrim,    FALSE, 56, 2, 56, 1, 0),
-    [SPECIES_FURFROU_PHARAOH_TRIM] =   FURFROU_MISC_INFO(PharaohTrim,   FALSE, 48, 2, 56, 1, 0),
+    [SPECIES_FURFROU_NATURAL]   = FURFROU_MISC_INFO(Natural,   FALSE, 48, 3, 56, 0, 0),
+    [SPECIES_FURFROU_HEART]     = FURFROU_MISC_INFO(Heart,     FALSE, 56, 2, 56, 1, 0),
+    [SPECIES_FURFROU_STAR]      = FURFROU_MISC_INFO(Star,      FALSE, 56, 2, 64, 1, 0),
+    [SPECIES_FURFROU_DIAMOND]   = FURFROU_MISC_INFO(Diamond,   FALSE, 48, 2, 56, 1, 0),
+    [SPECIES_FURFROU_DEBUTANTE] = FURFROU_MISC_INFO(Debutante, TRUE,  48, 2, 56, 1, 2),
+    [SPECIES_FURFROU_MATRON]    = FURFROU_MISC_INFO(Matron,    FALSE, 48, 2, 56, 1, 2),
+    [SPECIES_FURFROU_DANDY]     = FURFROU_MISC_INFO(Dandy,     FALSE, 48, 2, 56, 1, 1),
+    [SPECIES_FURFROU_LA_REINE]  = FURFROU_MISC_INFO(LaReine,   FALSE, 48, 2, 56, 1, 0),
+    [SPECIES_FURFROU_KABUKI]    = FURFROU_MISC_INFO(Kabuki,    FALSE, 56, 2, 56, 1, 0),
+    [SPECIES_FURFROU_PHARAOH]   = FURFROU_MISC_INFO(Pharaoh,   FALSE, 48, 2, 56, 1, 0),
 #endif //P_FAMILY_FURFROU
 
 #if P_FAMILY_ESPURR