From 791fd5e709246de047daeab7c494236ed2f92149 Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 3 Mar 2021 09:25:25 -0700 Subject: [PATCH 1/8] finish berry hold effects --- include/constants/hold_effects.h | 6 ++++++ src/data/items.h | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 54c1d004ad..ddbb51c655 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -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 diff --git a/src/data/items.h b/src/data/items.h index cd3a23f5bd..17d8ceb8f3 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -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 = 0, .description = sCustapBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, @@ -2496,7 +2496,7 @@ const struct Item gItems[] = .name = _("Jaboca Berry"), .itemId = ITEM_JABOCA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, // To Do + .holdEffect = HOLD_EFFECT_JABOCA_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sJabocaBerryDesc, .pocket = POCKET_BERRIES, @@ -2509,7 +2509,7 @@ const struct Item gItems[] = .name = _("Rowap Berry"), .itemId = ITEM_ROWAP_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, // To Do + .holdEffect = HOLD_EFFECT_ROWAP_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sRowapBerryDesc, .pocket = POCKET_BERRIES, @@ -2522,7 +2522,7 @@ const struct Item gItems[] = .name = _("Kee Berry"), .itemId = ITEM_KEE_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, // To Do + .holdEffect = HOLD_EFFECT_HOLD_EFFECT_KEE_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sKeeBerryDesc, .pocket = POCKET_BERRIES, @@ -2535,7 +2535,7 @@ const struct Item gItems[] = .name = _("Maranga Berry"), .itemId = ITEM_MARANGA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, // To Do + .holdEffect = HOLD_EFFECT_HOLD_EFFECT_MARANGA_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sMarangaBerryDesc, .pocket = POCKET_BERRIES, From f7c00d236615a402aad6336804ca4429786c92ae Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:34 -0600 Subject: [PATCH 2/8] Update src/data/items.h Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 6ed0163807..e3814169bf 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2522,7 +2522,7 @@ const struct Item gItems[] = .name = _("Kee Berry"), .itemId = ITEM_KEE_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_HOLD_EFFECT_KEE_BERRY, + .holdEffect = HOLD_EFFECT_KEE_BERRY, .holdEffectParam = TYPE_FAIRY, .description = sKeeBerryDesc, .pocket = POCKET_BERRIES, From aafc8e2109c3b2137812d94a3cda26828d6685bf Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:39 -0600 Subject: [PATCH 3/8] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index e3814169bf..9e44137033 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2484,7 +2484,7 @@ const struct Item gItems[] = .itemId = ITEM_CUSTAP_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CUSTAP_BERRY, - .holdEffectParam = 0, + .holdEffectParam = 4, .description = sCustapBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 6b868a028abd9e2eb14e82c53ff5fd6e9df234f9 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:47 -0600 Subject: [PATCH 4/8] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 9e44137033..383e275f03 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2523,7 +2523,6 @@ const struct Item gItems[] = .itemId = ITEM_KEE_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_KEE_BERRY, - .holdEffectParam = TYPE_FAIRY, .description = sKeeBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From a3b092c9a310b22d73075295867a1fcff411f044 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:51 -0600 Subject: [PATCH 5/8] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 383e275f03..70a40e4965 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2497,7 +2497,6 @@ const struct Item gItems[] = .itemId = ITEM_JABOCA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_JABOCA_BERRY, - .holdEffectParam = TYPE_FAIRY, .description = sJabocaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 39974b05f76d6d039e4d11cc0bacd7b3b45e6dcf Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:55 -0600 Subject: [PATCH 6/8] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 70a40e4965..3ae3ba814c 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2509,7 +2509,6 @@ const struct Item gItems[] = .itemId = ITEM_ROWAP_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_ROWAP_BERRY, - .holdEffectParam = TYPE_FAIRY, .description = sRowapBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 5aa1b5b1ee7e871bd5803421a9847072057c8204 Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:17:59 -0600 Subject: [PATCH 7/8] Update src/data/items.h Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- src/data/items.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 3ae3ba814c..fdcc5e29d9 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2533,7 +2533,6 @@ const struct Item gItems[] = .itemId = ITEM_MARANGA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_HOLD_EFFECT_MARANGA_BERRY, - .holdEffectParam = TYPE_FAIRY, .description = sMarangaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU, From 64815a5f8557d18f688938fc502422902a12640f Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Mon, 24 May 2021 10:18:05 -0600 Subject: [PATCH 8/8] Update src/data/items.h Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com> --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index fdcc5e29d9..b1c08fa537 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -2532,7 +2532,7 @@ const struct Item gItems[] = .name = _("Maranga Berry"), .itemId = ITEM_MARANGA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_HOLD_EFFECT_MARANGA_BERRY, + .holdEffect = HOLD_EFFECT_MARANGA_BERRY, .description = sMarangaBerryDesc, .pocket = POCKET_BERRIES, .type = ITEM_USE_BAG_MENU,