atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

finish berry hold effects

Browse source
This commit is contained in:
Evan 2021-03-03 09:25:25 -07:00
parent ac9828d016
commit 791fd5e709
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/constants/hold_effects.h
View file

@ -104,6 +104,12 @@
#define HOLD_EFFECT_RESIST_BERRY 98 #define HOLD_EFFECT_RESIST_BERRY 98
#define HOLD_EFFECT_POWER_ITEM 99 #define HOLD_EFFECT_POWER_ITEM 99
#define HOLD_EFFECT_RESTORE_PCT_HP 100 #define HOLD_EFFECT_RESTORE_PCT_HP 100
#define HOLD_EFFECT_MICLE_BERRY 101
#define HOLD_EFFECT_CUSTAP_BERRY 102
#define HOLD_EFFECT_JABOCA_BERRY 103
#define HOLD_EFFECT_ROWAP_BERRY 104
#define HOLD_EFFECT_KEE_BERRY 105
#define HOLD_EFFECT_MARANGA_BERRY 106
// Gen5 hold effects // Gen5 hold effects
#define HOLD_EFFECT_FLOAT_STONE 115 #define HOLD_EFFECT_FLOAT_STONE 115

14
src/data/items.h
View file

@ -2223,7 +2223,7 @@ const struct Item gItems[] =
.name = _("Micle Berry"), .name = _("Micle Berry"),
.itemId = ITEM_MICLE_BERRY, .itemId = ITEM_MICLE_BERRY,
.price = 20, .price = 20,
.holdEffect = HOLD_EFFECT_NONE, // Placeholder .holdEffect = HOLD_EFFECT_MICLE_BERRY,
.holdEffectParam = 4, .holdEffectParam = 4,
.description = sMicleBerryDesc, .description = sMicleBerryDesc,
.pocket = POCKET_BERRIES, .pocket = POCKET_BERRIES,
@ -2483,8 +2483,8 @@ const struct Item gItems[] =
.name = _("Custap Berry"), .name = _("Custap Berry"),
.itemId = ITEM_CUSTAP_BERRY, .itemId = ITEM_CUSTAP_BERRY,
.price = 20, .price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do .holdEffect = HOLD_EFFECT_CUSTAP_BERRY,
.holdEffectParam = TYPE_FAIRY, .holdEffectParam = 0,
.description = sCustapBerryDesc, .description = sCustapBerryDesc,
.pocket = POCKET_BERRIES, .pocket = POCKET_BERRIES,
.type = ITEM_USE_BAG_MENU, .type = ITEM_USE_BAG_MENU,
@ -2496,7 +2496,7 @@ const struct Item gItems[] =
.name = _("Jaboca Berry"), .name = _("Jaboca Berry"),
.itemId = ITEM_JABOCA_BERRY, .itemId = ITEM_JABOCA_BERRY,
.price = 20, .price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do .holdEffect = HOLD_EFFECT_JABOCA_BERRY,
.holdEffectParam = TYPE_FAIRY, .holdEffectParam = TYPE_FAIRY,
.description = sJabocaBerryDesc, .description = sJabocaBerryDesc,
.pocket = POCKET_BERRIES, .pocket = POCKET_BERRIES,
@ -2509,7 +2509,7 @@ const struct Item gItems[] =
.name = _("Rowap Berry"), .name = _("Rowap Berry"),
.itemId = ITEM_ROWAP_BERRY, .itemId = ITEM_ROWAP_BERRY,
.price = 20, .price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do .holdEffect = HOLD_EFFECT_ROWAP_BERRY,
.holdEffectParam = TYPE_FAIRY, .holdEffectParam = TYPE_FAIRY,
.description = sRowapBerryDesc, .description = sRowapBerryDesc,
.pocket = POCKET_BERRIES, .pocket = POCKET_BERRIES,
@ -2522,7 +2522,7 @@ const struct Item gItems[] =
.name = _("Kee Berry"), .name = _("Kee Berry"),
.itemId = ITEM_KEE_BERRY, .itemId = ITEM_KEE_BERRY,
.price = 20, .price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do .holdEffect = HOLD_EFFECT_HOLD_EFFECT_KEE_BERRY,
.holdEffectParam = TYPE_FAIRY, .holdEffectParam = TYPE_FAIRY,
.description = sKeeBerryDesc, .description = sKeeBerryDesc,
.pocket = POCKET_BERRIES, .pocket = POCKET_BERRIES,
@ -2535,7 +2535,7 @@ const struct Item gItems[] =
.name = _("Maranga Berry"), .name = _("Maranga Berry"),
.itemId = ITEM_MARANGA_BERRY, .itemId = ITEM_MARANGA_BERRY,
.price = 20, .price = 20,
.holdEffect = HOLD_EFFECT_NONE, // To Do .holdEffect = HOLD_EFFECT_HOLD_EFFECT_MARANGA_BERRY,
.holdEffectParam = TYPE_FAIRY, .holdEffectParam = TYPE_FAIRY,
.description = sMarangaBerryDesc, .description = sMarangaBerryDesc,
.pocket = POCKET_BERRIES, .pocket = POCKET_BERRIES,