ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-19 09:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2122 from Sneed69/confuseberry_item

Browse Source 
Update Confuse Berry Hold Effect (Item Expansion)
This commit is contained in:
Eduardo Quezada D'Ottone 2022-05-08 09:02:36 -04:00 committed by GitHub
commit 7b53a4646c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/data/items.h
View File

@ -7037,13 +7037,21 @@ const struct Item gItems[] =
.flingPower = 10,
},
#if defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL >= GEN_8
#define CONFUSE_BERRY_HEAL_FRACTION 3
#elif defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL == GEN_7
#define CONFUSE_BERRY_HEAL_FRACTION 2
#else
#define CONFUSE_BERRY_HEAL_FRACTION 8
#endif
[ITEM_FIGY_BERRY] =
{
.name = _("Figy Berry"),
.itemId = ITEM_FIGY_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_CONFUSE_SPICY,
.holdEffectParam = 8,
.holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
.description = sFigyBerryDesc,
.pocket = POCKET_BERRIES,
.type = ITEM_USE_BAG_MENU,
@ -7057,7 +7065,7 @@ const struct Item gItems[] =
.itemId = ITEM_WIKI_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_CONFUSE_DRY,
.holdEffectParam = 8,
.holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
.description = sWikiBerryDesc,
.pocket = POCKET_BERRIES,
.type = ITEM_USE_BAG_MENU,
@ -7071,7 +7079,7 @@ const struct Item gItems[] =
.itemId = ITEM_MAGO_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_CONFUSE_SWEET,
.holdEffectParam = 8,
.holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
.description = sMagoBerryDesc,
.pocket = POCKET_BERRIES,
.type = ITEM_USE_BAG_MENU,
@ -7085,7 +7093,7 @@ const struct Item gItems[] =
.itemId = ITEM_AGUAV_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_CONFUSE_BITTER,
.holdEffectParam = 8,
.holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
.description = sAguavBerryDesc,
.pocket = POCKET_BERRIES,
.type = ITEM_USE_BAG_MENU,
@ -7099,7 +7107,7 @@ const struct Item gItems[] =
.itemId = ITEM_IAPAPA_BERRY,
.price = 20,
.holdEffect = HOLD_EFFECT_CONFUSE_SOUR,
.holdEffectParam = 8,
.holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
.description = sIapapaBerryDesc,
.pocket = POCKET_BERRIES,
.type = ITEM_USE_BAG_MENU,
@ -7107,6 +7115,8 @@ const struct Item gItems[] =
.flingPower = 10,
},
#undef CONFUSE_BERRY_HEAL_FRACTION
[ITEM_RAZZ_BERRY] =
{
.name = _("Razz Berry"),