mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-27 22:03:53 +01:00
Merge pull request #1866 from LOuroboros/orbs
Gave a holdEffectParam to the Adamant, Lustrous and Griseous Orbs
This commit is contained in:
commit
75d9f1ccb5
@ -5327,6 +5327,9 @@ const struct Item gItems[] =
|
|||||||
.name = _("Adamant Orb"),
|
.name = _("Adamant Orb"),
|
||||||
.itemId = ITEM_ADAMANT_ORB,
|
.itemId = ITEM_ADAMANT_ORB,
|
||||||
.price = 0,
|
.price = 0,
|
||||||
|
#if defined(BATTLE_ENGINE)
|
||||||
|
.holdEffectParam = 20,
|
||||||
|
#endif
|
||||||
.holdEffect = HOLD_EFFECT_ADAMANT_ORB,
|
.holdEffect = HOLD_EFFECT_ADAMANT_ORB,
|
||||||
.description = sAdamantOrbDesc,
|
.description = sAdamantOrbDesc,
|
||||||
.pocket = POCKET_ITEMS,
|
.pocket = POCKET_ITEMS,
|
||||||
@ -5339,6 +5342,9 @@ const struct Item gItems[] =
|
|||||||
.name = _("Lustrous Orb"),
|
.name = _("Lustrous Orb"),
|
||||||
.itemId = ITEM_LUSTROUS_ORB,
|
.itemId = ITEM_LUSTROUS_ORB,
|
||||||
.price = 0,
|
.price = 0,
|
||||||
|
#if defined(BATTLE_ENGINE)
|
||||||
|
.holdEffectParam = 20,
|
||||||
|
#endif
|
||||||
.holdEffect = HOLD_EFFECT_LUSTROUS_ORB,
|
.holdEffect = HOLD_EFFECT_LUSTROUS_ORB,
|
||||||
.description = sLustrousOrbDesc,
|
.description = sLustrousOrbDesc,
|
||||||
.pocket = POCKET_ITEMS,
|
.pocket = POCKET_ITEMS,
|
||||||
@ -5351,6 +5357,9 @@ const struct Item gItems[] =
|
|||||||
.name = _("Griseous Orb"),
|
.name = _("Griseous Orb"),
|
||||||
.itemId = ITEM_GRISEOUS_ORB,
|
.itemId = ITEM_GRISEOUS_ORB,
|
||||||
.price = 0,
|
.price = 0,
|
||||||
|
#if defined(BATTLE_ENGINE)
|
||||||
|
.holdEffectParam = 20,
|
||||||
|
#endif
|
||||||
.holdEffect = HOLD_EFFECT_GRISEOUS_ORB,
|
.holdEffect = HOLD_EFFECT_GRISEOUS_ORB,
|
||||||
.description = sGriseousOrbDesc,
|
.description = sGriseousOrbDesc,
|
||||||
.pocket = POCKET_ITEMS,
|
.pocket = POCKET_ITEMS,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user