Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add type boosting held item power config #3326

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Add type boosting held item power config #3326

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c243b
Add type boost held item power config
kittenchilly Sep 19, 2023
3ed57e3
Apply suggestions from code review
kittenchilly Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/config/item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%.
kittenchilly marked this conversation as resolved.
Show resolved Hide resolved

// 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.
Expand Down
40 changes: 23 additions & 17 deletions src/data/items.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
#define GEM_BOOST_PARAM 50
#endif

#if I_TYPE_BOOST_POWER >= GEN_4 //This is only for regular type boosting held items, not plates or pokemon-specific ones.
kittenchilly marked this conversation as resolved.
Show resolved Hide resolved
#define TYPE_BOOST_PARAM 20
#else
#define TYPE_BOOST_PARAM 10
#endif

const struct Item gItems[] =
{
[ITEM_NONE] =
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
Loading