Wings -> Feathers

include/constants/items.h

@@ -105,13 +105,13 @@
 #define ITEM_MAX_REPEL 92
 #define ITEM_ABILITY_CAPSULE 93
 // Wings
-#define ITEM_HEALTH_WING 94
-#define ITEM_MUSCLE_WING 95
-#define ITEM_RESIST_WING 96
-#define ITEM_GENIUS_WING 97
-#define ITEM_CLEVER_WING 98
-#define ITEM_SWIFT_WING 99
-#define ITEM_PRETTY_WING 100
+#define ITEM_HEALTH_FEATHER 94
+#define ITEM_MUSCLE_FEATHER 95
+#define ITEM_RESIST_FEATHER 96
+#define ITEM_GENIUS_FEATHER 97
+#define ITEM_CLEVER_FEATHER 98
+#define ITEM_SWIFT_FEATHER 99
+#define ITEM_PRETTY_FEATHER 100
 // Evolution stones
 #define ITEM_SUN_STONE 101
 #define ITEM_MOON_STONE 102

include/graphics.h

@@ -4196,20 +4196,20 @@ extern const u32 gItemIcon_CoverFossil[];
 extern const u32 gItemIconPalette_CoverFossil[];
 extern const u32 gItemIcon_PlumeFossil[];
 extern const u32 gItemIconPalette_PlumeFossil[];
-extern const u32 gItemIcon_HealthWing[];
-extern const u32 gItemIconPalette_HealthWing[];
-extern const u32 gItemIcon_MuscleWing[];
-extern const u32 gItemIconPalette_MuscleWing[];
-extern const u32 gItemIcon_ResistWing[];
-extern const u32 gItemIconPalette_ResistWing[];
-extern const u32 gItemIcon_GeniusWing[];
-extern const u32 gItemIconPalette_GeniusWing[];
-extern const u32 gItemIcon_CleverWing[];
-extern const u32 gItemIconPalette_CleverWing[];
-extern const u32 gItemIcon_SwiftWing[];
-extern const u32 gItemIconPalette_SwiftWing[];
-extern const u32 gItemIcon_PrettyWing[];
-extern const u32 gItemIconPalette_PrettyWing[];
+extern const u32 gItemIcon_HealthFeather[];
+extern const u32 gItemIconPalette_HealthFeather[];
+extern const u32 gItemIcon_MuscleFeather[];
+extern const u32 gItemIconPalette_MuscleFeather[];
+extern const u32 gItemIcon_ResistFeather[];
+extern const u32 gItemIconPalette_ResistFeather[];
+extern const u32 gItemIcon_GeniusFeather[];
+extern const u32 gItemIconPalette_GeniusFeather[];
+extern const u32 gItemIcon_CleverFeather[];
+extern const u32 gItemIconPalette_CleverFeather[];
+extern const u32 gItemIcon_SwiftFeather[];
+extern const u32 gItemIconPalette_SwiftFeather[];
+extern const u32 gItemIcon_PrettyFeather[];
+extern const u32 gItemIconPalette_PrettyFeather[];
 extern const u32 gItemIcon_ShinyCharm[];
 extern const u32 gItemIconPalette_ShinyCharm[];
 extern const u32 gItemIcon_OvalCharm[];

src/data/graphics/items.h

@@ -1212,31 +1212,33 @@ const u32 gItemIconPalette_CoverFossil[] = INCBIN_U32("graphics/items/icon_palet
 const u32 gItemIcon_PlumeFossil[] = INCBIN_U32("graphics/items/icons/plume_fossil.4bpp.lz");
 const u32 gItemIconPalette_PlumeFossil[] = INCBIN_U32("graphics/items/icon_palettes/plume_fossil.gbapal.lz");
 
-const u32 gItemIcon_HealthWing[] = INCBIN_U32("graphics/items/icons/health_wing.4bpp.lz");
-const u32 gItemIconPalette_HealthWing[] = INCBIN_U32("graphics/items/icon_palettes/health_wing.gbapal.lz");
+const u32 gItemIcon_HealthFeather[] = INCBIN_U32("graphics/items/icons/health_feather.4bpp.lz");
+const u32 gItemIconPalette_HealthFeather[] = INCBIN_U32("graphics/items/icon_palettes/health_feather.gbapal.lz");
 
-const u32 gItemIcon_MuscleWing[] = INCBIN_U32("graphics/items/icons/muscle_wing.4bpp.lz");
-const u32 gItemIconPalette_MuscleWing[] = INCBIN_U32("graphics/items/icon_palettes/muscle_wing.gbapal.lz");
+const u32 gItemIcon_MuscleFeather[] = INCBIN_U32("graphics/items/icons/muscle_feather.4bpp.lz");
+const u32 gItemIconPalette_MuscleFeather[] = INCBIN_U32("graphics/items/icon_palettes/muscle_feather.gbapal.lz");
 
-const u32 gItemIcon_ResistWing[] = INCBIN_U32("graphics/items/icons/resist_wing.4bpp.lz");
-const u32 gItemIconPalette_ResistWing[] = INCBIN_U32("graphics/items/icon_palettes/resist_wing.gbapal.lz");
+const u32 gItemIcon_ResistFeather[] = INCBIN_U32("graphics/items/icons/resist_feather.4bpp.lz");
+const u32 gItemIconPalette_ResistFeather[] = INCBIN_U32("graphics/items/icon_palettes/resist_feather.gbapal.lz");
 
-const u32 gItemIcon_GeniusWing[] = INCBIN_U32("graphics/items/icons/genius_wing.4bpp.lz");
-const u32 gItemIconPalette_GeniusWing[] = INCBIN_U32("graphics/items/icon_palettes/genius_wing.gbapal.lz");
+const u32 gItemIcon_GeniusFeather[] = INCBIN_U32("graphics/items/icons/genius_feather.4bpp.lz");
+const u32 gItemIconPalette_GeniusFeather[] = INCBIN_U32("graphics/items/icon_palettes/genius_feather.gbapal.lz");
 
-const u32 gItemIcon_CleverWing[] = INCBIN_U32("graphics/items/icons/clever_wing.4bpp.lz");
-const u32 gItemIconPalette_CleverWing[] = INCBIN_U32("graphics/items/icon_palettes/clever_wing.gbapal.lz");
+const u32 gItemIcon_CleverFeather[] = INCBIN_U32("graphics/items/icons/clever_feather.4bpp.lz");
+const u32 gItemIconPalette_CleverFeather[] = INCBIN_U32("graphics/items/icon_palettes/clever_feather.gbapal.lz");
 
-const u32 gItemIcon_SwiftWing[] = INCBIN_U32("graphics/items/icons/swift_wing.4bpp.lz");
-const u32 gItemIconPalette_SwiftWing[] = INCBIN_U32("graphics/items/icon_palettes/swift_wing.gbapal.lz");
+const u32 gItemIcon_SwiftFeather[] = INCBIN_U32("graphics/items/icons/swift_feather.4bpp.lz");
+const u32 gItemIconPalette_SwiftFeather[] = INCBIN_U32("graphics/items/icon_palettes/swift_feather.gbapal.lz");
+
+const u32 gItemIcon_PrettyFeather[] = INCBIN_U32("graphics/items/icons/pretty_feather.4bpp.lz");
+const u32 gItemIconPalette_PrettyFeather[] = INCBIN_U32("graphics/items/icon_palettes/pretty_feather.gbapal.lz");
 
-const u32 gItemIcon_PrettyWing[] = INCBIN_U32("graphics/items/icons/pretty_wing.4bpp.lz");
-const u32 gItemIconPalette_PrettyWing[] = INCBIN_U32("graphics/items/icon_palettes/pretty_wing.gbapal.lz");
 const u32 gItemIcon_ShinyCharm[] = INCBIN_U32("graphics/items/icons/shiny_charm.4bpp.lz");
 const u32 gItemIconPalette_ShinyCharm[] = INCBIN_U32("graphics/items/icon_palettes/shiny_charm.gbapal.lz");
 
 const u32 gItemIcon_OvalCharm[] = INCBIN_U32("graphics/items/icons/oval_charm.4bpp.lz");
 const u32 gItemIconPalette_OvalCharm[] = INCBIN_U32("graphics/items/icon_palettes/oval_charm.gbapal.lz");
+
 // Gen 6 Items
 
 const u32 gItemIcon_AssaultVest[] = INCBIN_U32("graphics/items/icons/assault_vest.4bpp.lz");

src/data/item_icon_table.h

@@ -487,13 +487,13 @@ const u32 *const gItemIconTable[][2] =
     [ITEM_CELL_BATTERY] = {gItemIcon_CellBattery, gItemIconPalette_CellBattery},
     [ITEM_COVER_FOSSIL] = {gItemIcon_CoverFossil, gItemIconPalette_CoverFossil},
     [ITEM_PLUME_FOSSIL] = {gItemIcon_PlumeFossil, gItemIconPalette_PlumeFossil},
-    [ITEM_HEALTH_WING] = {gItemIcon_HealthWing, gItemIconPalette_HealthWing},
-    [ITEM_MUSCLE_WING] = {gItemIcon_MuscleWing, gItemIconPalette_MuscleWing},
-    [ITEM_RESIST_WING] = {gItemIcon_ResistWing, gItemIconPalette_ResistWing},
-    [ITEM_GENIUS_WING] = {gItemIcon_GeniusWing, gItemIconPalette_GeniusWing},
-    [ITEM_CLEVER_WING] = {gItemIcon_CleverWing, gItemIconPalette_CleverWing},
-    [ITEM_SWIFT_WING] = {gItemIcon_SwiftWing, gItemIconPalette_SwiftWing},
-    [ITEM_PRETTY_WING] = {gItemIcon_PrettyWing, gItemIconPalette_PrettyWing},
+    [ITEM_HEALTH_FEATHER] = {gItemIcon_HealthFeather, gItemIconPalette_HealthFeather},
+    [ITEM_MUSCLE_FEATHER] = {gItemIcon_MuscleFeather, gItemIconPalette_MuscleFeather},
+    [ITEM_RESIST_FEATHER] = {gItemIcon_ResistFeather, gItemIconPalette_ResistFeather},
+    [ITEM_GENIUS_FEATHER] = {gItemIcon_GeniusFeather, gItemIconPalette_GeniusFeather},
+    [ITEM_CLEVER_FEATHER] = {gItemIcon_CleverFeather, gItemIconPalette_CleverFeather},
+    [ITEM_SWIFT_FEATHER] = {gItemIcon_SwiftFeather, gItemIconPalette_SwiftFeather},
+    [ITEM_PRETTY_FEATHER] = {gItemIcon_PrettyFeather, gItemIconPalette_PrettyFeather},
     [ITEM_SHINY_CHARM] = {gItemIcon_ShinyCharm, gItemIconPalette_ShinyCharm},
     [ITEM_OVAL_CHARM] = {gItemIcon_OvalCharm, gItemIconPalette_OvalCharm},
 	// Gen 6 Items

src/data/items.h

@@ -6983,84 +6983,78 @@ const struct Item gItems[] =
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
     },
 
-    [ITEM_HEALTH_WING] =
+    [ITEM_HEALTH_FEATHER] =
     {
-        .name = _("HealthFeather"),
-        .itemId = ITEM_HEALTH_WING,
+        .name = _("HealthFeathr"),
+        .itemId = ITEM_HEALTH_FEATHER,
         .price = 300,
-        .description = sHealthWingDesc,
+        .description = sHealthFeatherDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_PARTY_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .secondaryId = STAT_HP,
     },
 
-    [ITEM_MUSCLE_WING] =
+    [ITEM_MUSCLE_FEATHER] =
     {
-        .name = _("MuscleFeather"),
-        .itemId = ITEM_MUSCLE_WING,
+        .name = _("MuscleFeathr"),
+        .itemId = ITEM_MUSCLE_FEATHER,
         .price = 300,
-        .description = sMuscleWingDesc,
+        .description = sMuscleFeatherDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_PARTY_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .secondaryId = STAT_ATK,
     },
 
-    [ITEM_RESIST_WING] =
+    [ITEM_RESIST_FEATHER] =
     {
-        .name = _("ResistFeather"),
-        .itemId = ITEM_RESIST_WING,
+        .name = _("ResistFeathr"),
+        .itemId = ITEM_RESIST_FEATHER,
         .price = 300,
-        .description = sResistWingDesc,
+        .description = sResistFeatherDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_PARTY_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .secondaryId = STAT_DEF,
     },
 
-    [ITEM_GENIUS_WING] =
+    [ITEM_GENIUS_FEATHER] =
     {
-        .name = _("GeniusFeather"),
-        .itemId = ITEM_GENIUS_WING,
+        .name = _("GeniusFeathr"),
+        .itemId = ITEM_GENIUS_FEATHER,
         .price = 300,
-        .description = sGeniusWingDesc,
+        .description = sGeniusFeatherDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_PARTY_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .secondaryId = STAT_SPATK,
     },
 
-    [ITEM_CLEVER_WING] =
+    [ITEM_CLEVER_FEATHER] =
     {
-        .name = _("CleverFeather"),
-        .itemId = ITEM_CLEVER_WING,
+        .name = _("CleverFeathr"),
+        .itemId = ITEM_CLEVER_FEATHER,
         .price = 300,
-        .description = sCleverWingDesc,
+        .description = sCleverFeatherDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_PARTY_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .secondaryId = STAT_SPDEF,
     },
 
-    [ITEM_SWIFT_WING] =
+    [ITEM_SWIFT_FEATHER] =
     {
         .name = _("SwiftFeather"),
-        .itemId = ITEM_SWIFT_WING,
+        .itemId = ITEM_SWIFT_FEATHER,
         .price = 300,
-        .description = sSwiftWingDesc,
+        .description = sSwiftFeatherDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_PARTY_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_Medicine,
-        .secondaryId = STAT_SPEED,
     },
 
-    [ITEM_PRETTY_WING] =
+    [ITEM_PRETTY_FEATHER] =
     {
-        .name = _("PrettyFeather"),
-        .itemId = ITEM_PRETTY_WING,
+        .name = _("PrettyFeathr"),
+        .itemId = ITEM_PRETTY_FEATHER,
         .price = 1000,
-        .description = sPrettyWingDesc,
+        .description = sPrettyFeatherDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_BAG_MENU,
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,

src/data/pokemon/item_effects.h

@@ -250,52 +250,52 @@ const u8 gItemEffect_Zinc[11] = {
     [10] = ITEM10_IS_VITAMIN,
 };
 
-#define WING_FRIENDSHIP_CHANGE(i)                \
+#define FEATHER_FRIENDSHIP_CHANGE(i)                \
     [(i) + 0] = 3, /* Friendship change, low */  \
     [(i) + 1] = 2, /* Friendship change, mid */  \
     [(i) + 2] = 1  /* Friendship change, high */
 
-const u8 gItemEffect_HpWing[11] = {
+const u8 gItemEffect_HpFeather[11] = {
     [4] = ITEM4_EV_HP,
     [5] = ITEM5_FRIENDSHIP_ALL,
     [6] = ITEM6_ADD_ONE_EV,
-    WING_FRIENDSHIP_CHANGE(7),
+    FEATHER_FRIENDSHIP_CHANGE(7),
     [10] = 0,
 };
 
-const u8 gItemEffect_AtkWing[11] = {
+const u8 gItemEffect_AtkFeather[11] = {
     [4] = ITEM4_EV_ATK,
     [5] = ITEM5_FRIENDSHIP_ALL,
     [6] = ITEM6_ADD_ONE_EV,
-    WING_FRIENDSHIP_CHANGE(7),
+    FEATHER_FRIENDSHIP_CHANGE(7),
     [10] = 0,
 };
 
-const u8 gItemEffect_DefWing[11] = {
+const u8 gItemEffect_DefFeather[11] = {
     [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
     [6] = ITEM6_ADD_ONE_EV,
-    WING_FRIENDSHIP_CHANGE(7),
+    FEATHER_FRIENDSHIP_CHANGE(7),
     [10] = 0,
 };
 
-const u8 gItemEffect_SpeedWing[11] = {
+const u8 gItemEffect_SpeedFeather[11] = {
     [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
     [6] = ITEM6_ADD_ONE_EV,
-    WING_FRIENDSHIP_CHANGE(7),
+    FEATHER_FRIENDSHIP_CHANGE(7),
     [10] = 0,
 };
 
-const u8 gItemEffect_SpatkWing[11] = {
+const u8 gItemEffect_SpatkFeather[11] = {
     [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
     [6] = ITEM6_ADD_ONE_EV,
-    WING_FRIENDSHIP_CHANGE(7),
+    FEATHER_FRIENDSHIP_CHANGE(7),
     [10] = 0,
 };
 
-const u8 gItemEffect_SpdefWing[11] = {
+const u8 gItemEffect_SpdefFeather[11] = {
     [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
     [6] = ITEM6_ADD_ONE_EV,
-    WING_FRIENDSHIP_CHANGE(7),
+    FEATHER_FRIENDSHIP_CHANGE(7),
     [10] = 0,
 };
 
@@ -530,12 +530,12 @@ const u8 *const gItemEffectTable[] =
     [ITEM_RARE_CANDY - ITEM_POTION]     = gItemEffect_RareCandy,
     [ITEM_PP_UP - ITEM_POTION]          = gItemEffect_PPUp,
     [ITEM_ZINC - ITEM_POTION]           = gItemEffect_Zinc,
-    [ITEM_HEALTH_WING - ITEM_POTION]   = gItemEffect_HpWing,
-    [ITEM_MUSCLE_WING - ITEM_POTION]   = gItemEffect_AtkWing,
-    [ITEM_RESIST_WING - ITEM_POTION]   = gItemEffect_DefWing,
-    [ITEM_GENIUS_WING - ITEM_POTION]   = gItemEffect_SpatkWing,
-    [ITEM_CLEVER_WING - ITEM_POTION]   = gItemEffect_SpdefWing,
-    [ITEM_SWIFT_WING - ITEM_POTION]    = gItemEffect_SpeedWing,
+    [ITEM_HEALTH_FEATHER - ITEM_POTION] = gItemEffect_HpFeather,
+    [ITEM_MUSCLE_FEATHER - ITEM_POTION] = gItemEffect_AtkFeather,
+    [ITEM_RESIST_FEATHER - ITEM_POTION] = gItemEffect_DefFeather,
+    [ITEM_GENIUS_FEATHER - ITEM_POTION] = gItemEffect_SpatkFeather,
+    [ITEM_CLEVER_FEATHER - ITEM_POTION] = gItemEffect_SpdefFeather,
+    [ITEM_SWIFT_FEATHER - ITEM_POTION]  = gItemEffect_SpeedFeather,
     [ITEM_PP_MAX - ITEM_POTION]         = gItemEffect_PPMax,
     [ITEM_GUARD_SPEC - ITEM_POTION]     = gItemEffect_GuardSpec,
     [ITEM_DIRE_HIT - ITEM_POTION]       = gItemEffect_DireHit,

src/data/text/item_descriptions.h

@@ -2784,37 +2784,37 @@ static const u8 sHoneyDesc[] = _(
     "attracts wild\n"
     "Pokémon when used.");
 
-static const u8 sHealthWingDesc[] = _(
+static const u8 sHealthFeatherDesc[] = _(
     "An item that raises\n"
     "the base HP of\n"
     "a Pokémon.");
 
-static const u8 sMuscleWingDesc[] = _(
+static const u8 sMuscleFeatherDesc[] = _(
     "An item that raises\n"
     "the base Attack of\n"
     "a Pokémon.");
 
-static const u8 sResistWingDesc[] = _(
+static const u8 sResistFeatherDesc[] = _(
     "An item that raises\n"
     "the base Defense\n"
     "of a Pokémon.");
 
-static const u8 sGeniusWingDesc[] = _(
+static const u8 sGeniusFeatherDesc[] = _(
     "An item that raises\n"
     "the base Sp. Atk.\n"
     "of a Pokémon.");
 
-static const u8 sCleverWingDesc[] = _(
+static const u8 sCleverFeatherDesc[] = _(
     "An item that raises\n"
     "the base Sp. Def.\n"
     "of a Pokémon.");
 
-static const u8 sSwiftWingDesc[] = _(
+static const u8 sSwiftFeatherDesc[] = _(
     "An item that raises\n"
     "the base Speed of\n"
     "a Pokémon.");
 
-static const u8 sPrettyWingDesc[] = _(
+static const u8 sPrettyFeatherDesc[] = _(
     "A beautiful yet\n"
     "plain feather that\n"
     "does nothing.");