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

Update items.h

Browse Source
This commit is contained in:
sneed 2022-05-07 21:41:21 +03:00
parent 5dae95d8f8
commit 7008c01f25
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/data/items.h
View File

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