ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add type boosting held item power config (#3326)

Browse Source 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
This commit is contained in:
kittenchilly 2023-09-20 20:03:00 -05:00 committed by GitHub
parent 415d6e9054
commit d4217739e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/config/item.h
View File

@ -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_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_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_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 // 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. #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.

40
src/data/items.h
View File

@ -14,6 +14,12 @@
#define GEM_BOOST_PARAM 50 #define GEM_BOOST_PARAM 50
#endif #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[] = const struct Item gItems[] =
{ {
[ITEM_NONE] = [ITEM_NONE] =
@ -5169,7 +5175,7 @@ const struct Item gItems[] =
.name = _("Silk Scarf"), .name = _("Silk Scarf"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_NORMAL_POWER, .holdEffect = HOLD_EFFECT_NORMAL_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sSilkScarfDesc, .description = sSilkScarfDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5182,7 +5188,7 @@ const struct Item gItems[] =
.name = _("Charcoal"), .name = _("Charcoal"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_FIRE_POWER, .holdEffect = HOLD_EFFECT_FIRE_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sCharcoalDesc, .description = sCharcoalDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5195,7 +5201,7 @@ const struct Item gItems[] =
.name = _("Mystic Water"), .name = _("Mystic Water"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffect = HOLD_EFFECT_WATER_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sMysticWaterDesc, .description = sMysticWaterDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5208,7 +5214,7 @@ const struct Item gItems[] =
.name = _("Magnet"), .name = _("Magnet"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_ELECTRIC_POWER, .holdEffect = HOLD_EFFECT_ELECTRIC_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sMagnetDesc, .description = sMagnetDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5221,7 +5227,7 @@ const struct Item gItems[] =
.name = _("Miracle Seed"), .name = _("Miracle Seed"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_GRASS_POWER, .holdEffect = HOLD_EFFECT_GRASS_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sMiracleSeedDesc, .description = sMiracleSeedDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5234,7 +5240,7 @@ const struct Item gItems[] =
.name = _("Never-MeltIce"), .name = _("Never-MeltIce"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_ICE_POWER, .holdEffect = HOLD_EFFECT_ICE_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sNeverMeltIceDesc, .description = sNeverMeltIceDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5247,7 +5253,7 @@ const struct Item gItems[] =
.name = _("Black Belt"), .name = _("Black Belt"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_FIGHTING_POWER, .holdEffect = HOLD_EFFECT_FIGHTING_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sBlackBeltDesc, .description = sBlackBeltDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5260,7 +5266,7 @@ const struct Item gItems[] =
.name = _("Poison Barb"), .name = _("Poison Barb"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_POISON_POWER, .holdEffect = HOLD_EFFECT_POISON_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sPoisonBarbDesc, .description = sPoisonBarbDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5273,7 +5279,7 @@ const struct Item gItems[] =
.name = _("Soft Sand"), .name = _("Soft Sand"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_GROUND_POWER, .holdEffect = HOLD_EFFECT_GROUND_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sSoftSandDesc, .description = sSoftSandDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5286,7 +5292,7 @@ const struct Item gItems[] =
.name = _("Sharp Beak"), .name = _("Sharp Beak"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_FLYING_POWER, .holdEffect = HOLD_EFFECT_FLYING_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sSharpBeakDesc, .description = sSharpBeakDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5299,7 +5305,7 @@ const struct Item gItems[] =
.name = _("Twisted Spoon"), .name = _("Twisted Spoon"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_PSYCHIC_POWER, .holdEffect = HOLD_EFFECT_PSYCHIC_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sTwistedSpoonDesc, .description = sTwistedSpoonDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5312,7 +5318,7 @@ const struct Item gItems[] =
.name = _("Silver Powder"), .name = _("Silver Powder"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_BUG_POWER, .holdEffect = HOLD_EFFECT_BUG_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sSilverPowderDesc, .description = sSilverPowderDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5325,7 +5331,7 @@ const struct Item gItems[] =
.name = _("Hard Stone"), .name = _("Hard Stone"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_ROCK_POWER, .holdEffect = HOLD_EFFECT_ROCK_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sHardStoneDesc, .description = sHardStoneDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5338,7 +5344,7 @@ const struct Item gItems[] =
.name = _("Spell Tag"), .name = _("Spell Tag"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_GHOST_POWER, .holdEffect = HOLD_EFFECT_GHOST_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sSpellTagDesc, .description = sSpellTagDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5351,7 +5357,7 @@ const struct Item gItems[] =
.name = _("Dragon Fang"), .name = _("Dragon Fang"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_DRAGON_POWER, .holdEffect = HOLD_EFFECT_DRAGON_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sDragonFangDesc, .description = sDragonFangDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5364,7 +5370,7 @@ const struct Item gItems[] =
.name = _("Black Glasses"), .name = _("Black Glasses"),
.price = 1000, .price = 1000,
.holdEffect = HOLD_EFFECT_DARK_POWER, .holdEffect = HOLD_EFFECT_DARK_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sBlackGlassesDesc, .description = sBlackGlassesDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -5377,7 +5383,7 @@ const struct Item gItems[] =
.name = _("Metal Coat"), .name = _("Metal Coat"),
.price = 2000, .price = 2000,
.holdEffect = HOLD_EFFECT_STEEL_POWER, .holdEffect = HOLD_EFFECT_STEEL_POWER,
.holdEffectParam = 20, .holdEffectParam = TYPE_BOOST_PARAM,
.description = sMetalCoatDesc, .description = sMetalCoatDesc,
.pocket = POCKET_ITEMS, .pocket = POCKET_ITEMS,
.type = EVO_HELD_ITEM_TYPE, .type = EVO_HELD_ITEM_TYPE,