Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync

include/constants/item_config.h

@@ -14,6 +14,7 @@
 #define I_SHINY_CHARM_REROLLS   3       // Amount of re-rolls if the player has the Shiny Charm. Set to 0 to disable Shiny Charm's effects.
 #define I_KEY_FOSSILS           GEN_7   // In Gen4+, all Gen 3 fossils became regular items.
 #define I_KEY_ESCAPE_ROPE       GEN_7   // In Gen8, Escape Rope became a Key Item. Keep in mind, this will make it free to buy in marts.
+#define I_LEGACY_HEALING_ITEMS  GEN_7   // In Gen7+, certain healing items recover less HP than they used to.
 
 // Ball config
 #define I_LURE_BALL_MODIFIER    GEN_7   // In Gen7+, Lure Ball's catch multiplier is x5 instead of x3.

include/graphics.h

@@ -7768,20 +7768,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_FEATHER] = {gItemIcon_HealthWing, gItemIconPalette_HealthWing},
-    [ITEM_MUSCLE_FEATHER] = {gItemIcon_MuscleWing, gItemIconPalette_MuscleWing},
-    [ITEM_RESIST_FEATHER] = {gItemIcon_ResistWing, gItemIconPalette_ResistWing},
-    [ITEM_GENIUS_FEATHER] = {gItemIcon_GeniusWing, gItemIconPalette_GeniusWing},
-    [ITEM_CLEVER_FEATHER] = {gItemIcon_CleverWing, gItemIconPalette_CleverWing},
-    [ITEM_SWIFT_FEATHER] = {gItemIcon_SwiftWing, gItemIconPalette_SwiftWing},
-    [ITEM_PRETTY_FEATHER] = {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

@@ -2223,7 +2223,7 @@ const struct Item gItems[] =
         .name = _("Micle Berry"),
         .itemId = ITEM_MICLE_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // Placeholder
+        .holdEffect = HOLD_EFFECT_MICLE_BERRY,
         .holdEffectParam = 4,
         .description = sMicleBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -2483,8 +2483,8 @@ const struct Item gItems[] =
         .name = _("Custap Berry"),
         .itemId = ITEM_CUSTAP_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
-        .holdEffectParam = TYPE_FAIRY,
+        .holdEffect = HOLD_EFFECT_CUSTAP_BERRY,
+        .holdEffectParam = 4,
         .description = sCustapBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = ITEM_USE_BAG_MENU,
@@ -2496,8 +2496,7 @@ const struct Item gItems[] =
         .name = _("Jaboca Berry"),
         .itemId = ITEM_JABOCA_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
-        .holdEffectParam = TYPE_FAIRY,
+        .holdEffect = HOLD_EFFECT_JABOCA_BERRY,
         .description = sJabocaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = ITEM_USE_BAG_MENU,
@@ -2509,8 +2508,7 @@ const struct Item gItems[] =
         .name = _("Rowap Berry"),
         .itemId = ITEM_ROWAP_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
-        .holdEffectParam = TYPE_FAIRY,
+        .holdEffect = HOLD_EFFECT_ROWAP_BERRY,
         .description = sRowapBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = ITEM_USE_BAG_MENU,
@@ -2522,8 +2520,7 @@ const struct Item gItems[] =
         .name = _("Kee Berry"),
         .itemId = ITEM_KEE_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
-        .holdEffectParam = TYPE_FAIRY,
+        .holdEffect = HOLD_EFFECT_KEE_BERRY,
         .description = sKeeBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = ITEM_USE_BAG_MENU,
@@ -2535,8 +2532,7 @@ const struct Item gItems[] =
         .name = _("Maranga Berry"),
         .itemId = ITEM_MARANGA_BERRY,
         .price = 20,
-        .holdEffect = HOLD_EFFECT_NONE, // To Do
-        .holdEffectParam = TYPE_FAIRY,
+        .holdEffect = HOLD_EFFECT_MARANGA_BERRY,
         .description = sMarangaBerryDesc,
         .pocket = POCKET_BERRIES,
         .type = ITEM_USE_BAG_MENU,
@@ -2901,7 +2897,7 @@ const struct Item gItems[] =
         .name = _("Razor Claw"),
         .itemId = ITEM_RAZOR_CLAW,
         .price = 5000,
-        .holdEffect = HOLD_EFFECT_NONE, // Placeholder.
+        .holdEffect = HOLD_EFFECT_SCOPE_LENS,
         .description = sRazorClawDesc,
         .pocket = POCKET_ITEMS,
         .type = ITEM_USE_BAG_MENU,
@@ -6988,13 +6984,10 @@ const struct Item gItems[] =
         .name = _("HealthFeather"),
         .itemId = ITEM_HEALTH_FEATHER,
         .price = 300,
-        .holdEffect = 0,
-        .holdEffectParam = 4,
-        .description = sHealthWingDesc,
+        .description = sHealthFeatherDesc,
         .pocket = POCKET_ITEMS,
-        .type = ITEM_USE_BAG_MENU,
-        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .secondaryId = STAT_HP,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
     },
 
     [ITEM_MUSCLE_FEATHER] =
@@ -7002,13 +6995,10 @@ const struct Item gItems[] =
         .name = _("MuscleFeather"),
         .itemId = ITEM_MUSCLE_FEATHER,
         .price = 300,
-        .holdEffect = 0,
-        .holdEffectParam = 4,
-        .description = sMuscleWingDesc,
+        .description = sMuscleFeatherDesc,
         .pocket = POCKET_ITEMS,
-        .type = ITEM_USE_BAG_MENU,
-        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .secondaryId = STAT_ATK,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
     },
 
     [ITEM_RESIST_FEATHER] =
@@ -7016,13 +7006,10 @@ const struct Item gItems[] =
         .name = _("ResistFeather"),
         .itemId = ITEM_RESIST_FEATHER,
         .price = 300,
-        .holdEffect = 0,
-        .holdEffectParam = 4,
-        .description = sResistWingDesc,
+        .description = sResistFeatherDesc,
         .pocket = POCKET_ITEMS,
-        .type = ITEM_USE_BAG_MENU,
-        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .secondaryId = STAT_DEF,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
     },
 
     [ITEM_GENIUS_FEATHER] =
@@ -7030,13 +7017,10 @@ const struct Item gItems[] =
         .name = _("GeniusFeather"),
         .itemId = ITEM_GENIUS_FEATHER,
         .price = 300,
-        .holdEffect = 0,
-        .holdEffectParam = 4,
-        .description = sGeniusWingDesc,
+        .description = sGeniusFeatherDesc,
         .pocket = POCKET_ITEMS,
-        .type = ITEM_USE_BAG_MENU,
-        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .secondaryId = STAT_SPATK,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
     },
 
     [ITEM_CLEVER_FEATHER] =
@@ -7044,27 +7028,21 @@ const struct Item gItems[] =
         .name = _("CleverFeather"),
         .itemId = ITEM_CLEVER_FEATHER,
         .price = 300,
-        .holdEffect = 0,
-        .holdEffectParam = 4,
-        .description = sCleverWingDesc,
+        .description = sCleverFeatherDesc,
         .pocket = POCKET_ITEMS,
-        .type = ITEM_USE_BAG_MENU,
-        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .secondaryId = STAT_SPDEF,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
     },
 
     [ITEM_SWIFT_FEATHER] =
     {
-        .name = _("Swift Feather"),
+        .name = _("SwiftFeather"),
         .itemId = ITEM_SWIFT_FEATHER,
         .price = 300,
-        .holdEffect = 0,
-        .holdEffectParam = 4,
-        .description = sSwiftWingDesc,
+        .description = sSwiftFeatherDesc,
         .pocket = POCKET_ITEMS,
-        .type = ITEM_USE_BAG_MENU,
-        .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
-        .secondaryId = STAT_SPEED,
+        .type = ITEM_USE_PARTY_MENU,
+        .fieldUseFunc = ItemUseOutOfBattle_Medicine,
     },
 
     [ITEM_PRETTY_FEATHER] =
@@ -7072,7 +7050,7 @@ const struct Item gItems[] =
         .name = _("PrettyFeather"),
         .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

@@ -36,12 +36,20 @@ const u8 gItemEffect_MaxPotion[7] = {
 
 const u8 gItemEffect_HyperPotion[7] = {
     [4] = ITEM4_HEAL_HP,
+#if I_LEGACY_HEALING_ITEMS >= GEN_7
     [6] = 120, // Amount of HP to recover
+#else
+    [6] = 200, // Amount of HP to recover
+#endif
 };
 
 const u8 gItemEffect_SuperPotion[7] = {
     [4] = ITEM4_HEAL_HP,
+#if I_LEGACY_HEALING_ITEMS >= GEN_7
     [6] = 60, // Amount of HP to recover
+#else
+    [6] = 50, // Amount of HP to recover
+#endif
 };
 
 const u8 gItemEffect_FullHeal[6] = {
@@ -60,17 +68,29 @@ const u8 gItemEffect_MaxRevive[7] = {
 
 const u8 gItemEffect_FreshWater[7] = {
     [4] = ITEM4_HEAL_HP,
+#if I_LEGACY_HEALING_ITEMS >= GEN_7
     [6] = 30, // Amount of HP to recover
+#else
+    [6] = 50, // Amount of HP to recover
+#endif
 };
 
 const u8 gItemEffect_SodaPop[7] = {
     [4] = ITEM4_HEAL_HP,
+#if I_LEGACY_HEALING_ITEMS >= GEN_7
     [6] = 50, // Amount of HP to recover
+#else
+    [6] = 60, // Amount of HP to recover
+#endif
 };
 
 const u8 gItemEffect_Lemonade[7] = {
     [4] = ITEM4_HEAL_HP,
+#if I_LEGACY_HEALING_ITEMS >= GEN_7
     [6] = 70, // Amount of HP to recover
+#else
+    [6] = 80, // Amount of HP to recover
+#endif
 };
 
 const u8 gItemEffect_MoomooMilk[7] = {
@@ -81,16 +101,24 @@ const u8 gItemEffect_MoomooMilk[7] = {
 const u8 gItemEffect_EnergyPowder[10] = {
     [4] = ITEM4_HEAL_HP,
     [5] = ITEM5_FRIENDSHIP_ALL,
-    [6] = 60,  // Amount of HP to recover
-    [7] = -5,  // Friendship change, low
-    [8] = -5,  // Friendship change, mid
+#if I_LEGACY_HEALING_ITEMS >= GEN_7
+    [6] = 60, // Amount of HP to recover
+#else
+    [6] = 50, // Amount of HP to recover
+#endif
+    [7] = -5, // Friendship change, low
+    [8] = -5, // Friendship change, mid
     [9] = -10, // Friendship change, high
 };
 
 const u8 gItemEffect_EnergyRoot[10] = {
     [4] = ITEM4_HEAL_HP,
     [5] = ITEM5_FRIENDSHIP_ALL,
+#if I_LEGACY_HEALING_ITEMS >= GEN_7
     [6] = 120, // Amount of HP to recover
+#else
+    [6] = 200, // Amount of HP to recover
+#endif
     [7] = -10, // Friendship change, low
     [8] = -10, // Friendship change, mid
     [9] = -15, // Friendship change, high
@@ -222,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,
 };
 
@@ -460,88 +488,88 @@ const u8 gItemEffect_TamatoBerry[10] = {
 
 const u8 *const gItemEffectTable[] =
 {
-    [ITEM_POTION - ITEM_POTION]        = gItemEffect_Potion,
-    [ITEM_ANTIDOTE - ITEM_POTION]      = gItemEffect_Antidote,
-    [ITEM_BURN_HEAL - ITEM_POTION]     = gItemEffect_BurnHeal,
-    [ITEM_ICE_HEAL - ITEM_POTION]      = gItemEffect_IceHeal,
-    [ITEM_AWAKENING - ITEM_POTION]     = gItemEffect_Awakening,
-    [ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal,
-    [ITEM_FULL_RESTORE - ITEM_POTION]  = gItemEffect_FullRestore,
-    [ITEM_MAX_POTION - ITEM_POTION]    = gItemEffect_MaxPotion,
-    [ITEM_HYPER_POTION - ITEM_POTION]  = gItemEffect_HyperPotion,
-    [ITEM_SUPER_POTION - ITEM_POTION]  = gItemEffect_SuperPotion,
-    [ITEM_FULL_HEAL - ITEM_POTION]     = gItemEffect_FullHeal,
-    [ITEM_REVIVE - ITEM_POTION]        = gItemEffect_Revive,
-    [ITEM_MAX_REVIVE - ITEM_POTION]    = gItemEffect_MaxRevive,
-    [ITEM_FRESH_WATER - ITEM_POTION]   = gItemEffect_FreshWater,
-    [ITEM_SODA_POP - ITEM_POTION]      = gItemEffect_SodaPop,
-    [ITEM_LEMONADE - ITEM_POTION]      = gItemEffect_Lemonade,
-    [ITEM_MOOMOO_MILK - ITEM_POTION]   = gItemEffect_MoomooMilk,
-    [ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder,
-    [ITEM_ENERGY_ROOT - ITEM_POTION]   = gItemEffect_EnergyRoot,
-    [ITEM_HEAL_POWDER - ITEM_POTION]   = gItemEffect_HealPowder,
-    [ITEM_REVIVAL_HERB - ITEM_POTION]  = gItemEffect_RevivalHerb,
-    [ITEM_ETHER - ITEM_POTION]         = gItemEffect_Ether,
-    [ITEM_MAX_ETHER - ITEM_POTION]     = gItemEffect_MaxEther,
-    [ITEM_ELIXIR - ITEM_POTION]        = gItemEffect_Elixir,
-    [ITEM_MAX_ELIXIR - ITEM_POTION]    = gItemEffect_MaxElixir,
-    [ITEM_LAVA_COOKIE - ITEM_POTION]   = gItemEffect_LavaCookie,
-    [ITEM_BLUE_FLUTE - ITEM_POTION]    = gItemEffect_BlueFlute,
-    [ITEM_YELLOW_FLUTE - ITEM_POTION]  = gItemEffect_YellowFlute,
-    [ITEM_RED_FLUTE - ITEM_POTION]     = gItemEffect_RedFlute,
-    [ITEM_BERRY_JUICE - ITEM_POTION]   = gItemEffect_BerryJuice,
-    [ITEM_SWEET_HEART - ITEM_POTION]   = gItemEffect_SweetHeart,
-    [ITEM_BIG_MALASADA - ITEM_POTION]  = gItemEffect_BigMalasada,
-    [ITEM_OLD_GATEAU - ITEM_POTION]    = gItemEffect_OldGateau,
-    [ITEM_SACRED_ASH - ITEM_POTION]    = gItemEffect_SacredAsh,
-    [ITEM_HP_UP - ITEM_POTION]         = gItemEffect_HPUp,
-    [ITEM_PROTEIN - ITEM_POTION]       = gItemEffect_Protein,
-    [ITEM_IRON - ITEM_POTION]          = gItemEffect_Iron,
-    [ITEM_CARBOS - ITEM_POTION]        = gItemEffect_Carbos,
-    [ITEM_CALCIUM - ITEM_POTION]       = gItemEffect_Calcium,
-    [ITEM_RARE_CANDY - ITEM_POTION]    = gItemEffect_RareCandy,
-    [ITEM_PP_UP - ITEM_POTION]         = gItemEffect_PPUp,
-    [ITEM_ZINC - ITEM_POTION]          = gItemEffect_Zinc,
-    [ITEM_HEALTH_FEATHER - ITEM_POTION]   = gItemEffect_HpWing,
-    [ITEM_MUSCLE_FEATHER - ITEM_POTION]   = gItemEffect_AtkWing,
-    [ITEM_RESIST_FEATHER - ITEM_POTION]   = gItemEffect_DefWing,
-    [ITEM_GENIUS_FEATHER - ITEM_POTION]   = gItemEffect_SpatkWing,
-    [ITEM_CLEVER_FEATHER - ITEM_POTION]   = gItemEffect_SpdefWing,
-    [ITEM_SWIFT_FEATHER - ITEM_POTION]    = gItemEffect_SpeedWing,
-    [ITEM_PP_MAX - ITEM_POTION]        = gItemEffect_PPMax,
-    [ITEM_GUARD_SPEC - ITEM_POTION]    = gItemEffect_GuardSpec,
-    [ITEM_DIRE_HIT - ITEM_POTION]      = gItemEffect_DireHit,
-    [ITEM_X_ATTACK - ITEM_POTION]      = gItemEffect_XAttack,
-    [ITEM_X_DEFENSE - ITEM_POTION]     = gItemEffect_XDefense,
-    [ITEM_X_SPEED - ITEM_POTION]       = gItemEffect_XSpeed,
-    [ITEM_X_ACCURACY - ITEM_POTION]    = gItemEffect_XAccuracy,
-    [ITEM_X_SP_ATK - ITEM_POTION]      = gItemEffect_XSpecialAttack,
-    [ITEM_X_SP_DEF - ITEM_POTION]      = gItemEffect_XSpecialDefense,
-    [ITEM_SUN_STONE - ITEM_POTION]     = gItemEffect_EvoStone,
-    [ITEM_MOON_STONE - ITEM_POTION]    = gItemEffect_EvoStone,
-    [ITEM_FIRE_STONE - ITEM_POTION]    = gItemEffect_EvoStone,
-    [ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_EvoStone,
-    [ITEM_WATER_STONE - ITEM_POTION]   = gItemEffect_EvoStone,
-    [ITEM_LEAF_STONE - ITEM_POTION]    = gItemEffect_EvoStone,
-    [ITEM_DAWN_STONE - ITEM_POTION]    = gItemEffect_EvoStone,
-    [ITEM_DUSK_STONE - ITEM_POTION]    = gItemEffect_EvoStone,
-    [ITEM_SHINY_STONE - ITEM_POTION]   = gItemEffect_EvoStone,
-    [ITEM_ICE_STONE - ITEM_POTION]     = gItemEffect_EvoStone,
-    [ITEM_CHERI_BERRY - ITEM_POTION]   = gItemEffect_CheriBerry,
-    [ITEM_CHESTO_BERRY - ITEM_POTION]  = gItemEffect_ChestoBerry,
-    [ITEM_PECHA_BERRY - ITEM_POTION]   = gItemEffect_PechaBerry,
-    [ITEM_RAWST_BERRY - ITEM_POTION]   = gItemEffect_RawstBerry,
-    [ITEM_ASPEAR_BERRY - ITEM_POTION]  = gItemEffect_AspearBerry,
-    [ITEM_LEPPA_BERRY - ITEM_POTION]   = gItemEffect_LeppaBerry,
-    [ITEM_ORAN_BERRY - ITEM_POTION]    = gItemEffect_OranBerry,
-    [ITEM_PERSIM_BERRY - ITEM_POTION]  = gItemEffect_PersimBerry,
-    [ITEM_LUM_BERRY - ITEM_POTION]     = gItemEffect_LumBerry,
-    [ITEM_SITRUS_BERRY - ITEM_POTION]  = gItemEffect_SitrusBerry,
-    [ITEM_POMEG_BERRY - ITEM_POTION]   = gItemEffect_PomegBerry,
-    [ITEM_KELPSY_BERRY - ITEM_POTION]  = gItemEffect_KelpsyBerry,
-    [ITEM_QUALOT_BERRY - ITEM_POTION]  = gItemEffect_QualotBerry,
-    [ITEM_HONDEW_BERRY - ITEM_POTION]  = gItemEffect_HondewBerry,
-    [ITEM_GREPA_BERRY - ITEM_POTION]   = gItemEffect_GrepaBerry,
-    [ITEM_TAMATO_BERRY - ITEM_POTION]  = gItemEffect_TamatoBerry,
-    [LAST_BERRY_INDEX - ITEM_POTION]   = NULL
+    [ITEM_POTION - ITEM_POTION]         = gItemEffect_Potion,
+    [ITEM_ANTIDOTE - ITEM_POTION]       = gItemEffect_Antidote,
+    [ITEM_BURN_HEAL - ITEM_POTION]      = gItemEffect_BurnHeal,
+    [ITEM_ICE_HEAL - ITEM_POTION]       = gItemEffect_IceHeal,
+    [ITEM_AWAKENING - ITEM_POTION]      = gItemEffect_Awakening,
+    [ITEM_PARALYZE_HEAL - ITEM_POTION]  = gItemEffect_ParalyzeHeal,
+    [ITEM_FULL_RESTORE - ITEM_POTION]   = gItemEffect_FullRestore,
+    [ITEM_MAX_POTION - ITEM_POTION]     = gItemEffect_MaxPotion,
+    [ITEM_HYPER_POTION - ITEM_POTION]   = gItemEffect_HyperPotion,
+    [ITEM_SUPER_POTION - ITEM_POTION]   = gItemEffect_SuperPotion,
+    [ITEM_FULL_HEAL - ITEM_POTION]      = gItemEffect_FullHeal,
+    [ITEM_REVIVE - ITEM_POTION]         = gItemEffect_Revive,
+    [ITEM_MAX_REVIVE - ITEM_POTION]     = gItemEffect_MaxRevive,
+    [ITEM_FRESH_WATER - ITEM_POTION]    = gItemEffect_FreshWater,
+    [ITEM_SODA_POP - ITEM_POTION]       = gItemEffect_SodaPop,
+    [ITEM_LEMONADE - ITEM_POTION]       = gItemEffect_Lemonade,
+    [ITEM_MOOMOO_MILK - ITEM_POTION]    = gItemEffect_MoomooMilk,
+    [ITEM_ENERGY_POWDER - ITEM_POTION]  = gItemEffect_EnergyPowder,
+    [ITEM_ENERGY_ROOT - ITEM_POTION]    = gItemEffect_EnergyRoot,
+    [ITEM_HEAL_POWDER - ITEM_POTION]    = gItemEffect_HealPowder,
+    [ITEM_REVIVAL_HERB - ITEM_POTION]   = gItemEffect_RevivalHerb,
+    [ITEM_ETHER - ITEM_POTION]          = gItemEffect_Ether,
+    [ITEM_MAX_ETHER - ITEM_POTION]      = gItemEffect_MaxEther,
+    [ITEM_ELIXIR - ITEM_POTION]         = gItemEffect_Elixir,
+    [ITEM_MAX_ELIXIR - ITEM_POTION]     = gItemEffect_MaxElixir,
+    [ITEM_LAVA_COOKIE - ITEM_POTION]    = gItemEffect_LavaCookie,
+    [ITEM_BLUE_FLUTE - ITEM_POTION]     = gItemEffect_BlueFlute,
+    [ITEM_YELLOW_FLUTE - ITEM_POTION]   = gItemEffect_YellowFlute,
+    [ITEM_RED_FLUTE - ITEM_POTION]      = gItemEffect_RedFlute,
+    [ITEM_BERRY_JUICE - ITEM_POTION]    = gItemEffect_BerryJuice,
+    [ITEM_SWEET_HEART - ITEM_POTION]    = gItemEffect_SweetHeart,
+    [ITEM_BIG_MALASADA - ITEM_POTION]   = gItemEffect_BigMalasada,
+    [ITEM_OLD_GATEAU - ITEM_POTION]     = gItemEffect_OldGateau,
+    [ITEM_SACRED_ASH - ITEM_POTION]     = gItemEffect_SacredAsh,
+    [ITEM_HP_UP - ITEM_POTION]          = gItemEffect_HPUp,
+    [ITEM_PROTEIN - ITEM_POTION]        = gItemEffect_Protein,
+    [ITEM_IRON - ITEM_POTION]           = gItemEffect_Iron,
+    [ITEM_CARBOS - ITEM_POTION]         = gItemEffect_Carbos,
+    [ITEM_CALCIUM - ITEM_POTION]        = gItemEffect_Calcium,
+    [ITEM_RARE_CANDY - ITEM_POTION]     = gItemEffect_RareCandy,
+    [ITEM_PP_UP - ITEM_POTION]          = gItemEffect_PPUp,
+    [ITEM_ZINC - ITEM_POTION]           = gItemEffect_Zinc,
+    [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,
+    [ITEM_X_ATTACK - ITEM_POTION]       = gItemEffect_XAttack,
+    [ITEM_X_DEFENSE - ITEM_POTION]      = gItemEffect_XDefense,
+    [ITEM_X_SPEED - ITEM_POTION]        = gItemEffect_XSpeed,
+    [ITEM_X_ACCURACY - ITEM_POTION]     = gItemEffect_XAccuracy,
+    [ITEM_X_SP_ATK - ITEM_POTION]       = gItemEffect_XSpecialAttack,
+    [ITEM_X_SP_DEF - ITEM_POTION]       = gItemEffect_XSpecialDefense,
+    [ITEM_SUN_STONE - ITEM_POTION]      = gItemEffect_EvoStone,
+    [ITEM_MOON_STONE - ITEM_POTION]     = gItemEffect_EvoStone,
+    [ITEM_FIRE_STONE - ITEM_POTION]     = gItemEffect_EvoStone,
+    [ITEM_THUNDER_STONE - ITEM_POTION]  = gItemEffect_EvoStone,
+    [ITEM_WATER_STONE - ITEM_POTION]    = gItemEffect_EvoStone,
+    [ITEM_LEAF_STONE - ITEM_POTION]     = gItemEffect_EvoStone,
+    [ITEM_DAWN_STONE - ITEM_POTION]     = gItemEffect_EvoStone,
+    [ITEM_DUSK_STONE - ITEM_POTION]     = gItemEffect_EvoStone,
+    [ITEM_SHINY_STONE - ITEM_POTION]    = gItemEffect_EvoStone,
+    [ITEM_ICE_STONE - ITEM_POTION]      = gItemEffect_EvoStone,
+    [ITEM_CHERI_BERRY - ITEM_POTION]    = gItemEffect_CheriBerry,
+    [ITEM_CHESTO_BERRY - ITEM_POTION]   = gItemEffect_ChestoBerry,
+    [ITEM_PECHA_BERRY - ITEM_POTION]    = gItemEffect_PechaBerry,
+    [ITEM_RAWST_BERRY - ITEM_POTION]    = gItemEffect_RawstBerry,
+    [ITEM_ASPEAR_BERRY - ITEM_POTION]   = gItemEffect_AspearBerry,
+    [ITEM_LEPPA_BERRY - ITEM_POTION]    = gItemEffect_LeppaBerry,
+    [ITEM_ORAN_BERRY - ITEM_POTION]     = gItemEffect_OranBerry,
+    [ITEM_PERSIM_BERRY - ITEM_POTION]   = gItemEffect_PersimBerry,
+    [ITEM_LUM_BERRY - ITEM_POTION]      = gItemEffect_LumBerry,
+    [ITEM_SITRUS_BERRY - ITEM_POTION]   = gItemEffect_SitrusBerry,
+    [ITEM_POMEG_BERRY - ITEM_POTION]    = gItemEffect_PomegBerry,
+    [ITEM_KELPSY_BERRY - ITEM_POTION]   = gItemEffect_KelpsyBerry,
+    [ITEM_QUALOT_BERRY - ITEM_POTION]   = gItemEffect_QualotBerry,
+    [ITEM_HONDEW_BERRY - ITEM_POTION]   = gItemEffect_HondewBerry,
+    [ITEM_GREPA_BERRY - ITEM_POTION]    = gItemEffect_GrepaBerry,
+    [ITEM_TAMATO_BERRY - ITEM_POTION]   = gItemEffect_TamatoBerry,
+    [LAST_BERRY_INDEX - ITEM_POTION]    = NULL
 };

src/data/text/item_descriptions.h

@@ -751,27 +751,27 @@ static const u8 sIapapaBerryDesc[] = _(
     "may confuse.");
 
 static const u8 sRazzBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Razz.");
 
 static const u8 sBlukBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Bluk.");
 
 static const u8 sNanabBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Nanab.");
 
 static const u8 sWepearBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Wepear.");
 
 static const u8 sPinapBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Pinap.");
 
@@ -806,47 +806,47 @@ static const u8 sTamatoBerryDesc[] = _(
     "base Speed.");
 
 static const u8 sCornnBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Cornn.");
 
 static const u8 sMagostBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Magost.");
 
 static const u8 sRabutaBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Rabuta.");
 
 static const u8 sNomelBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Nomel.");
 
 static const u8 sSpelonBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Spelon.");
 
 static const u8 sPamtreBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Pamtre.");
 
 static const u8 sWatmelBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Watmel.");
 
 static const u8 sDurinBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Durin.");
 
 static const u8 sBelueBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow Belue.");
 
@@ -891,7 +891,7 @@ static const u8 sMicleBerryDesc[] = _(
     "move in a pinch.");
 
 static const u8 sEnigmaBerryDesc[] = _(
-    "Pokéblock ingredient.\n"
+    "{POKEBLOCK} ingredient.\n"
     "Plant in loamy soil\n"
     "to grow a mystery.");
 
@@ -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.");