From 791fd5e709246de047daeab7c494236ed2f92149 Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 3 Mar 2021 09:25:25 -0700 Subject: [PATCH 01/16] finish berry hold effects --- include/constants/hold_effects.h | 6 ++++++ src/data/items.h | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 54c1d004a..ddbb51c65 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -104,6 +104,12 @@ #define HOLD_EFFECT_RESIST_BERRY 98 #define HOLD_EFFECT_POWER_ITEM 99 #define HOLD_EFFECT_RESTORE_PCT_HP 100 +#define HOLD_EFFECT_MICLE_BERRY 101 +#define HOLD_EFFECT_CUSTAP_BERRY 102 +#define HOLD_EFFECT_JABOCA_BERRY 103 +#define HOLD_EFFECT_ROWAP_BERRY 104 +#define HOLD_EFFECT_KEE_BERRY 105 +#define HOLD_EFFECT_MARANGA_BERRY 106 // Gen5 hold effects #define HOLD_EFFECT_FLOAT_STONE 115 diff --git a/src/data/items.h b/src/data/items.h index cd3a23f5b..17d8ceb8f 100644 --- a/src/data/items.h +++ b/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 = 0, .description = sCustapBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, @@ -2496,7 +2496,7 @@ const struct Item gItems[] = .name = _("Jaboca Berry"), .itemId = ITEM_JABOCA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, // To Do + .holdEffect = HOLD_EFFECT_JABOCA_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sJabocaBerryDesc, .pocket = POCKET_BERRIES, @@ -2509,7 +2509,7 @@ const struct Item gItems[] = .name = _("Rowap Berry"), .itemId = ITEM_ROWAP_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, // To Do + .holdEffect = HOLD_EFFECT_ROWAP_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sRowapBerryDesc, .pocket = POCKET_BERRIES, @@ -2522,7 +2522,7 @@ const struct Item gItems[] = .name = _("Kee Berry"), .itemId = ITEM_KEE_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, // To Do + .holdEffect = HOLD_EFFECT_HOLD_EFFECT_KEE_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sKeeBerryDesc, .pocket = POCKET_BERRIES, @@ -2535,7 +2535,7 @@ const struct Item gItems[] = .name = _("Maranga Berry"), .itemId = ITEM_MARANGA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, // To Do + .holdEffect = HOLD_EFFECT_HOLD_EFFECT_MARANGA_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sMarangaBerryDesc, .pocket = POCKET_BERRIES, From f04f35f5c3a8a19761524d7df58521b81154d26e Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 2 Apr 2021 20:34:57 -0300 Subject: [PATCH 02/16] Added a config for the amount of HP recovered by healing items --- include/constants/item_config.h | 1 + src/data/pokemon/item_effects.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/include/constants/item_config.h b/include/constants/item_config.h index e78f748fa..0311491e6 100644 --- a/include/constants/item_config.h +++ b/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. diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index 4413fc6bd..68551b0c0 100644 --- a/src/data/pokemon/item_effects.h +++ b/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, +#else + [6] = 200, +#endif }; const u8 gItemEffect_SuperPotion[7] = { [4] = ITEM4_HEAL_HP, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 60, +#else + [6] = 50, +#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, +#else + [6] = 50, +#endif }; const u8 gItemEffect_SodaPop[7] = { [4] = ITEM4_HEAL_HP, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 50, +#else + [6] = 60, +#endif }; const u8 gItemEffect_Lemonade[7] = { [4] = ITEM4_HEAL_HP, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 70, +#else + [6] = 80, +#endif }; const u8 gItemEffect_MoomooMilk[7] = { @@ -81,7 +101,11 @@ const u8 gItemEffect_MoomooMilk[7] = { const u8 gItemEffect_EnergyPowder[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 60, +#else + [6] = 50, +#endif [7] = -5, [8] = -5, [9] = -10, @@ -90,7 +114,11 @@ const u8 gItemEffect_EnergyPowder[10] = { const u8 gItemEffect_EnergyRoot[10] = { [4] = ITEM4_HEAL_HP, [5] = ITEM5_FRIENDSHIP_ALL, +#if I_LEGACY_HEALING_ITEMS >= GEN_7 [6] = 120, +#else + [6] = 200, +#endif [7] = -10, [8] = -10, [9] = -15, From 5eed23b5d81e5e37f9f2628f60298885e42cfadc Mon Sep 17 00:00:00 2001 From: ExpoSeed <> Date: Mon, 5 Apr 2021 23:19:03 -0500 Subject: [PATCH 03/16] Razor claw effect --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 52530e752..c76b1d3e1 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2901,7 +2901,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, From 16573a36eb2e8abc59357def45e9acbd4d0db6c1 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 8 May 2021 18:32:37 -0300 Subject: [PATCH 04/16] Update item_descriptions.h --- src/data/text/item_descriptions.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 81ef5c8b8..6e434de21 100644 --- a/src/data/text/item_descriptions.h +++ b/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."); From 972ed0d5a715ce803ead9af2c638228fd602476b Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 17 May 2021 21:32:47 -0300 Subject: [PATCH 05/16] Adjusted the item data of the Wings/Feathers Now they work. Yay. --- src/data/items.h | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index c76b1d3e1..780a1c36b 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -6988,12 +6988,10 @@ const struct Item gItems[] = .name = _("HealthFeather"), .itemId = ITEM_HEALTH_WING, .price = 300, - .holdEffect = 0, - .holdEffectParam = 4, .description = sHealthWingDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, .secondaryId = STAT_HP, }, @@ -7002,12 +7000,10 @@ const struct Item gItems[] = .name = _("MuscleFeather"), .itemId = ITEM_MUSCLE_WING, .price = 300, - .holdEffect = 0, - .holdEffectParam = 4, .description = sMuscleWingDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, .secondaryId = STAT_ATK, }, @@ -7016,12 +7012,10 @@ const struct Item gItems[] = .name = _("ResistFeather"), .itemId = ITEM_RESIST_WING, .price = 300, - .holdEffect = 0, - .holdEffectParam = 4, .description = sResistWingDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, .secondaryId = STAT_DEF, }, @@ -7030,12 +7024,10 @@ const struct Item gItems[] = .name = _("GeniusFeather"), .itemId = ITEM_GENIUS_WING, .price = 300, - .holdEffect = 0, - .holdEffectParam = 4, .description = sGeniusWingDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, .secondaryId = STAT_SPATK, }, @@ -7044,12 +7036,10 @@ const struct Item gItems[] = .name = _("CleverFeather"), .itemId = ITEM_CLEVER_WING, .price = 300, - .holdEffect = 0, - .holdEffectParam = 4, .description = sCleverWingDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, .secondaryId = STAT_SPDEF, }, @@ -7058,12 +7048,10 @@ const struct Item gItems[] = .name = _("Swift Feather"), .itemId = ITEM_SWIFT_WING, .price = 300, - .holdEffect = 0, - .holdEffectParam = 4, .description = sSwiftWingDesc, .pocket = POCKET_ITEMS, - .type = ITEM_USE_BAG_MENU, - .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .type = ITEM_USE_PARTY_MENU, + .fieldUseFunc = ItemUseOutOfBattle_Medicine, .secondaryId = STAT_SPEED, }, From 0bc8ed59f5d22c53ce348cc9b257aa0ffa154b4c Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 17 May 2021 21:42:39 -0300 Subject: [PATCH 06/16] Wings -> Feathers --- .../{clever_wing.pal => clever_feather.pal} | 0 .../{genius_wing.pal => genius_feather.pal} | 0 .../{health_wing.pal => health_feather.pal} | 0 .../{muscle_wing.pal => muscle_feather.pal} | 0 .../{pretty_wing.pal => pretty_feather.pal} | 0 .../{resist_wing.pal => resist_feather.pal} | 0 .../{swift_wing.pal => swift_feather.pal} | 0 .../{clever_wing.png => clever_feather.png} | Bin .../{genius_wing.png => genius_feather.png} | Bin .../{health_wing.png => health_feather.png} | Bin .../{muscle_wing.png => muscle_feather.png} | Bin .../{pretty_wing.png => pretty_feather.png} | Bin .../{resist_wing.png => resist_feather.png} | Bin .../{swift_wing.png => swift_feather.png} | Bin include/constants/items.h | 14 +- include/graphics.h | 28 +-- src/data/graphics/items.h | 30 +-- src/data/item_icon_table.h | 14 +- src/data/items.h | 62 +++--- src/data/pokemon/item_effects.h | 194 +++++++++--------- src/data/text/item_descriptions.h | 14 +- 21 files changed, 176 insertions(+), 180 deletions(-) rename graphics/items/icon_palettes/{clever_wing.pal => clever_feather.pal} (100%) mode change 100755 => 100644 rename graphics/items/icon_palettes/{genius_wing.pal => genius_feather.pal} (100%) mode change 100755 => 100644 rename graphics/items/icon_palettes/{health_wing.pal => health_feather.pal} (100%) mode change 100755 => 100644 rename graphics/items/icon_palettes/{muscle_wing.pal => muscle_feather.pal} (100%) mode change 100755 => 100644 rename graphics/items/icon_palettes/{pretty_wing.pal => pretty_feather.pal} (100%) mode change 100755 => 100644 rename graphics/items/icon_palettes/{resist_wing.pal => resist_feather.pal} (100%) mode change 100755 => 100644 rename graphics/items/icon_palettes/{swift_wing.pal => swift_feather.pal} (100%) mode change 100755 => 100644 rename graphics/items/icons/{clever_wing.png => clever_feather.png} (100%) mode change 100755 => 100644 rename graphics/items/icons/{genius_wing.png => genius_feather.png} (100%) mode change 100755 => 100644 rename graphics/items/icons/{health_wing.png => health_feather.png} (100%) mode change 100755 => 100644 rename graphics/items/icons/{muscle_wing.png => muscle_feather.png} (100%) mode change 100755 => 100644 rename graphics/items/icons/{pretty_wing.png => pretty_feather.png} (100%) mode change 100755 => 100644 rename graphics/items/icons/{resist_wing.png => resist_feather.png} (100%) mode change 100755 => 100644 rename graphics/items/icons/{swift_wing.png => swift_feather.png} (100%) mode change 100755 => 100644 diff --git a/graphics/items/icon_palettes/clever_wing.pal b/graphics/items/icon_palettes/clever_feather.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icon_palettes/clever_wing.pal rename to graphics/items/icon_palettes/clever_feather.pal diff --git a/graphics/items/icon_palettes/genius_wing.pal b/graphics/items/icon_palettes/genius_feather.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icon_palettes/genius_wing.pal rename to graphics/items/icon_palettes/genius_feather.pal diff --git a/graphics/items/icon_palettes/health_wing.pal b/graphics/items/icon_palettes/health_feather.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icon_palettes/health_wing.pal rename to graphics/items/icon_palettes/health_feather.pal diff --git a/graphics/items/icon_palettes/muscle_wing.pal b/graphics/items/icon_palettes/muscle_feather.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icon_palettes/muscle_wing.pal rename to graphics/items/icon_palettes/muscle_feather.pal diff --git a/graphics/items/icon_palettes/pretty_wing.pal b/graphics/items/icon_palettes/pretty_feather.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icon_palettes/pretty_wing.pal rename to graphics/items/icon_palettes/pretty_feather.pal diff --git a/graphics/items/icon_palettes/resist_wing.pal b/graphics/items/icon_palettes/resist_feather.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icon_palettes/resist_wing.pal rename to graphics/items/icon_palettes/resist_feather.pal diff --git a/graphics/items/icon_palettes/swift_wing.pal b/graphics/items/icon_palettes/swift_feather.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icon_palettes/swift_wing.pal rename to graphics/items/icon_palettes/swift_feather.pal diff --git a/graphics/items/icons/clever_wing.png b/graphics/items/icons/clever_feather.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/clever_wing.png rename to graphics/items/icons/clever_feather.png diff --git a/graphics/items/icons/genius_wing.png b/graphics/items/icons/genius_feather.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/genius_wing.png rename to graphics/items/icons/genius_feather.png diff --git a/graphics/items/icons/health_wing.png b/graphics/items/icons/health_feather.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/health_wing.png rename to graphics/items/icons/health_feather.png diff --git a/graphics/items/icons/muscle_wing.png b/graphics/items/icons/muscle_feather.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/muscle_wing.png rename to graphics/items/icons/muscle_feather.png diff --git a/graphics/items/icons/pretty_wing.png b/graphics/items/icons/pretty_feather.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/pretty_wing.png rename to graphics/items/icons/pretty_feather.png diff --git a/graphics/items/icons/resist_wing.png b/graphics/items/icons/resist_feather.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/resist_wing.png rename to graphics/items/icons/resist_feather.png diff --git a/graphics/items/icons/swift_wing.png b/graphics/items/icons/swift_feather.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/swift_wing.png rename to graphics/items/icons/swift_feather.png diff --git a/include/constants/items.h b/include/constants/items.h index 94a7f0691..4b134bebf 100644 --- a/include/constants/items.h +++ b/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 diff --git a/include/graphics.h b/include/graphics.h index 832179301..db04cb5e9 100644 --- a/include/graphics.h +++ b/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[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 6ebfeb118..c3d44debd 100644 --- a/src/data/graphics/items.h +++ b/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"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 6c71c17c2..1002e741c 100644 --- a/src/data/item_icon_table.h +++ b/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 diff --git a/src/data/items.h b/src/data/items.h index 780a1c36b..8299291b8 100644 --- a/src/data/items.h +++ b/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 = _("Swift Feather"), - .itemId = ITEM_SWIFT_WING, + .name = _("SwiftFeather"), + .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, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index e8b791c77..cdeee308d 100644 --- a/src/data/pokemon/item_effects.h +++ b/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, }; @@ -488,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_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_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 }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 81ef5c8b8..61f8234cc 100644 --- a/src/data/text/item_descriptions.h +++ b/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."); From f7c00d236615a402aad6336804ca4429786c92ae Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:34 -0600 Subject: [PATCH 07/16] Update src/data/items.h Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 6ed016380..e3814169b 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2522,7 +2522,7 @@ const struct Item gItems[] = .name = _("Kee Berry"), .itemId = ITEM_KEE_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_HOLD_EFFECT_KEE_BERRY, + .holdEffect = HOLD_EFFECT_KEE_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sKeeBerryDesc, .pocket = POCKET_BERRIES, From aafc8e2109c3b2137812d94a3cda26828d6685bf Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:39 -0600 Subject: [PATCH 08/16] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index e3814169b..9e4413703 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2484,7 +2484,7 @@ const struct Item gItems[] = .itemId = ITEM_CUSTAP_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CUSTAP_BERRY, - .holdEffectParam = 0, + .holdEffectParam = 4, .description = sCustapBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 6b868a028abd9e2eb14e82c53ff5fd6e9df234f9 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:47 -0600 Subject: [PATCH 09/16] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 9e4413703..383e275f0 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2523,7 +2523,6 @@ const struct Item gItems[] = .itemId = ITEM_KEE_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_KEE_BERRY, - .holdEffectParam = TYPE_FAIRY, .description = sKeeBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From a3b092c9a310b22d73075295867a1fcff411f044 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:51 -0600 Subject: [PATCH 10/16] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 383e275f0..70a40e496 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2497,7 +2497,6 @@ const struct Item gItems[] = .itemId = ITEM_JABOCA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_JABOCA_BERRY, - .holdEffectParam = TYPE_FAIRY, .description = sJabocaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 39974b05f76d6d039e4d11cc0bacd7b3b45e6dcf Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:55 -0600 Subject: [PATCH 11/16] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 70a40e496..3ae3ba814 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2509,7 +2509,6 @@ const struct Item gItems[] = .itemId = ITEM_ROWAP_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_ROWAP_BERRY, - .holdEffectParam = TYPE_FAIRY, .description = sRowapBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 5aa1b5b1ee7e871bd5803421a9847072057c8204 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:59 -0600 Subject: [PATCH 12/16] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 3ae3ba814..fdcc5e29d 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2533,7 +2533,6 @@ const struct Item gItems[] = .itemId = ITEM_MARANGA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_HOLD_EFFECT_MARANGA_BERRY, - .holdEffectParam = TYPE_FAIRY, .description = sMarangaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 64815a5f8557d18f688938fc502422902a12640f Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:18:05 -0600 Subject: [PATCH 13/16] Update src/data/items.h Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index fdcc5e29d..b1c08fa53 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2532,7 +2532,7 @@ const struct Item gItems[] = .name = _("Maranga Berry"), .itemId = ITEM_MARANGA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_HOLD_EFFECT_MARANGA_BERRY, + .holdEffect = HOLD_EFFECT_MARANGA_BERRY, .description = sMarangaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 1b13db80fc42eb7840bbea130fa6f2226af6192f Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 2 Jun 2021 16:43:01 -0300 Subject: [PATCH 14/16] Syntax fix Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/pokemon/item_effects.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index cdeee308d..9fc10dbd0 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -250,7 +250,7 @@ const u8 gItemEffect_Zinc[11] = { [10] = ITEM10_IS_VITAMIN, }; -#define FEATHER_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 */ From 03647c77904c062fc990668aff9fc9cce8931e72 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 2 Jun 2021 17:27:42 -0300 Subject: [PATCH 15/16] Adjusted the list of item hold effects --- include/constants/hold_effects.h | 60 ++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 1d5db360e..3afad4f55 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -110,38 +110,46 @@ #define HOLD_EFFECT_ROWAP_BERRY 104 #define HOLD_EFFECT_KEE_BERRY 105 #define HOLD_EFFECT_MARANGA_BERRY 106 +#define HOLD_EFFECT_PLATE 107 // Gen5 hold effects -#define HOLD_EFFECT_FLOAT_STONE 115 -#define HOLD_EFFECT_EVIOLITE 116 -#define HOLD_EFFECT_ASSAULT_VEST 117 -#define HOLD_EFFECT_DRIVE 118 -#define HOLD_EFFECT_GEMS 119 -#define HOLD_EFFECT_ROCKY_HELMET 120 -#define HOLD_EFFECT_AIR_BALLOON 121 -#define HOLD_EFFECT_RED_CARD 122 -#define HOLD_EFFECT_RING_TARGET 123 -#define HOLD_EFFECT_BINDING_BAND 124 -#define HOLD_EFFECT_EJECT_BUTTON 125 -#define HOLD_EFFECT_ABSORB_BULB 126 -#define HOLD_EFFECT_CELL_BATTERY 127 +#define HOLD_EFFECT_FLOAT_STONE 117 +#define HOLD_EFFECT_EVIOLITE 118 +#define HOLD_EFFECT_ASSAULT_VEST 119 +#define HOLD_EFFECT_DRIVE 120 +#define HOLD_EFFECT_GEMS 121 +#define HOLD_EFFECT_ROCKY_HELMET 122 +#define HOLD_EFFECT_AIR_BALLOON 123 +#define HOLD_EFFECT_RED_CARD 124 +#define HOLD_EFFECT_RING_TARGET 125 +#define HOLD_EFFECT_BINDING_BAND 126 +#define HOLD_EFFECT_EJECT_BUTTON 127 +#define HOLD_EFFECT_ABSORB_BULB 128 +#define HOLD_EFFECT_CELL_BATTERY 129 // Gen6 hold effects -#define HOLD_EFFECT_FAIRY_POWER 129 -#define HOLD_EFFECT_MEGA_STONE 130 -#define HOLD_EFFECT_SAFETY_GOOGLES 131 -#define HOLD_EFFECT_LUMINOUS_MOSS 132 -#define HOLD_EFFECT_SNOWBALL 133 -#define HOLD_EFFECT_WEAKNESS_POLICY 134 +#define HOLD_EFFECT_FAIRY_POWER 139 +#define HOLD_EFFECT_MEGA_STONE 140 +#define HOLD_EFFECT_SAFETY_GOOGLES 141 +#define HOLD_EFFECT_LUMINOUS_MOSS 142 +#define HOLD_EFFECT_SNOWBALL 143 +#define HOLD_EFFECT_WEAKNESS_POLICY 144 // Gen7 hold effects -#define HOLD_EFFECT_PROTECTIVE_PADS 149 -#define HOLD_EFFECT_TERRAIN_EXTENDER 150 -#define HOLD_EFFECT_SEEDS 151 -#define HOLD_EFFECT_ADRENALINE_ORB 152 -#define HOLD_EFFECT_MEMORY 153 -#define HOLD_EFFECT_PLATE 154 -#define HOLD_EFFECT_Z_CRYSTAL 155 +#define HOLD_EFFECT_PROTECTIVE_PADS 154 +#define HOLD_EFFECT_TERRAIN_EXTENDER 155 +#define HOLD_EFFECT_SEEDS 156 +#define HOLD_EFFECT_ADRENALINE_ORB 157 +#define HOLD_EFFECT_MEMORY 158 +#define HOLD_EFFECT_Z_CRYSTAL 159 + +// Gen8 hold effects +#define HOLD_EFFECT_UTILITY_UMBRELLA 169 +#define HOLD_EFFECT_EJECT_PACK 170 +#define HOLD_EFFECT_ROOM_SERVICE 171 +#define HOLD_EFFECT_BLUNDER_POLICY 172 +#define HOLD_EFFECT_HEAVY_DUTY_BOOTS 173 +#define HOLD_EFFECT_THROAT_SPRAY 174 #define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS)) From a500b04a511ab665822a80cf34b0aaccf8b3b5c4 Mon Sep 17 00:00:00 2001 From: Jaizu Date: Thu, 3 Jun 2021 12:08:31 +0200 Subject: [PATCH 16/16] Feathr > Feather We do have enough space to put the whole word. --- src/data/items.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 1cd88ec77..48b3fc0c7 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -6981,7 +6981,7 @@ const struct Item gItems[] = [ITEM_HEALTH_FEATHER] = { - .name = _("HealthFeathr"), + .name = _("HealthFeather"), .itemId = ITEM_HEALTH_FEATHER, .price = 300, .description = sHealthFeatherDesc, @@ -6992,7 +6992,7 @@ const struct Item gItems[] = [ITEM_MUSCLE_FEATHER] = { - .name = _("MuscleFeathr"), + .name = _("MuscleFeather"), .itemId = ITEM_MUSCLE_FEATHER, .price = 300, .description = sMuscleFeatherDesc, @@ -7003,7 +7003,7 @@ const struct Item gItems[] = [ITEM_RESIST_FEATHER] = { - .name = _("ResistFeathr"), + .name = _("ResistFeather"), .itemId = ITEM_RESIST_FEATHER, .price = 300, .description = sResistFeatherDesc, @@ -7014,7 +7014,7 @@ const struct Item gItems[] = [ITEM_GENIUS_FEATHER] = { - .name = _("GeniusFeathr"), + .name = _("GeniusFeather"), .itemId = ITEM_GENIUS_FEATHER, .price = 300, .description = sGeniusFeatherDesc, @@ -7025,7 +7025,7 @@ const struct Item gItems[] = [ITEM_CLEVER_FEATHER] = { - .name = _("CleverFeathr"), + .name = _("CleverFeather"), .itemId = ITEM_CLEVER_FEATHER, .price = 300, .description = sCleverFeatherDesc, @@ -7047,7 +7047,7 @@ const struct Item gItems[] = [ITEM_PRETTY_FEATHER] = { - .name = _("PrettyFeathr"), + .name = _("PrettyFeather"), .itemId = ITEM_PRETTY_FEATHER, .price = 1000, .description = sPrettyFeatherDesc,