diff --git a/include/config/item.h b/include/config/item.h index 8aaadbe84..0cd89b612 100644 --- a/include/config/item.h +++ b/include/config/item.h @@ -12,6 +12,7 @@ #define I_GRISEOUS_ORB_FORM_CHANGE GEN_LATEST // In Gen9+, the Griseous Orb no longer changes Giratina's form when held. #define I_GEM_BOOST_POWER GEN_LATEST // In Gen5+, the Gem boost power was reduced from 50% to 30%. #define I_USE_EVO_HELD_ITEMS_FROM_BAG FALSE // If TRUE, items such as Razor Claw or Electirizer will be usable from the bag to evolve a Pokémon just like in LA. +#define I_TYPE_BOOST_POWER GEN_LATEST // In Gen4+, all regular type boosting held items had their power increased from 10% to 20%. eg. Charcoal // TM config #define I_REUSABLE_TMS FALSE // In Gen5-8, TMs are reusable. Setting this to TRUE will make all vanilla TMs reusable, though they can also be cherry-picked by setting their importance to 1. diff --git a/src/data/items.h b/src/data/items.h index 842dae6bd..6990e7cde 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -14,6 +14,12 @@ #define GEM_BOOST_PARAM 50 #endif +#if I_TYPE_BOOST_POWER >= GEN_4 // For non Pokémon-specific type-boosting held items. + #define TYPE_BOOST_PARAM 20 +#else + #define TYPE_BOOST_PARAM 10 +#endif + const struct Item gItems[] = { [ITEM_NONE] = @@ -5169,7 +5175,7 @@ const struct Item gItems[] = .name = _("Silk Scarf"), .price = 1000, .holdEffect = HOLD_EFFECT_NORMAL_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sSilkScarfDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5182,7 +5188,7 @@ const struct Item gItems[] = .name = _("Charcoal"), .price = 1000, .holdEffect = HOLD_EFFECT_FIRE_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sCharcoalDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5195,7 +5201,7 @@ const struct Item gItems[] = .name = _("Mystic Water"), .price = 1000, .holdEffect = HOLD_EFFECT_WATER_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sMysticWaterDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5208,7 +5214,7 @@ const struct Item gItems[] = .name = _("Magnet"), .price = 1000, .holdEffect = HOLD_EFFECT_ELECTRIC_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sMagnetDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5221,7 +5227,7 @@ const struct Item gItems[] = .name = _("Miracle Seed"), .price = 1000, .holdEffect = HOLD_EFFECT_GRASS_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sMiracleSeedDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5234,7 +5240,7 @@ const struct Item gItems[] = .name = _("Never-MeltIce"), .price = 1000, .holdEffect = HOLD_EFFECT_ICE_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sNeverMeltIceDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5247,7 +5253,7 @@ const struct Item gItems[] = .name = _("Black Belt"), .price = 1000, .holdEffect = HOLD_EFFECT_FIGHTING_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sBlackBeltDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5260,7 +5266,7 @@ const struct Item gItems[] = .name = _("Poison Barb"), .price = 1000, .holdEffect = HOLD_EFFECT_POISON_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sPoisonBarbDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5273,7 +5279,7 @@ const struct Item gItems[] = .name = _("Soft Sand"), .price = 1000, .holdEffect = HOLD_EFFECT_GROUND_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sSoftSandDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5286,7 +5292,7 @@ const struct Item gItems[] = .name = _("Sharp Beak"), .price = 1000, .holdEffect = HOLD_EFFECT_FLYING_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sSharpBeakDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5299,7 +5305,7 @@ const struct Item gItems[] = .name = _("Twisted Spoon"), .price = 1000, .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sTwistedSpoonDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5312,7 +5318,7 @@ const struct Item gItems[] = .name = _("Silver Powder"), .price = 1000, .holdEffect = HOLD_EFFECT_BUG_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sSilverPowderDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5325,7 +5331,7 @@ const struct Item gItems[] = .name = _("Hard Stone"), .price = 1000, .holdEffect = HOLD_EFFECT_ROCK_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sHardStoneDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5338,7 +5344,7 @@ const struct Item gItems[] = .name = _("Spell Tag"), .price = 1000, .holdEffect = HOLD_EFFECT_GHOST_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sSpellTagDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5351,7 +5357,7 @@ const struct Item gItems[] = .name = _("Dragon Fang"), .price = 1000, .holdEffect = HOLD_EFFECT_DRAGON_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sDragonFangDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5364,7 +5370,7 @@ const struct Item gItems[] = .name = _("Black Glasses"), .price = 1000, .holdEffect = HOLD_EFFECT_DARK_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sBlackGlassesDesc, .pocket = POCKET_ITEMS, .type = ITEM_USE_BAG_MENU, @@ -5377,7 +5383,7 @@ const struct Item gItems[] = .name = _("Metal Coat"), .price = 2000, .holdEffect = HOLD_EFFECT_STEEL_POWER, - .holdEffectParam = 20, + .holdEffectParam = TYPE_BOOST_PARAM, .description = sMetalCoatDesc, .pocket = POCKET_ITEMS, .type = EVO_HELD_ITEM_TYPE,