Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-10-23 01:22:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1415 from ghoulslash/item_expansion

Browse Source 
Add Berry Hold Effects
This commit is contained in:
ultima-soul
2021-05-24 11:07:35 -07:00
committed by GitHub
parent ff296efb5c 64815a5f85
commit 1f859e340d
2 changed files with 13 additions and 11 deletions
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_POWER_ITEM 99
#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
#define HOLD_EFFECT_FLOAT_STONE 115

18
src/data/items.h
View File

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