From 7008c01f2564c4153bfa47ddb652aa69a588536a Mon Sep 17 00:00:00 2001 From: sneed Date: Sat, 7 May 2022 21:41:21 +0300 Subject: [PATCH 1/4] Update items.h --- src/data/items.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 61c1fd770c..034b5be57a 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7037,13 +7037,22 @@ const struct Item gItems[] = .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] = { .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 +7066,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 +7080,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 +7094,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 +7108,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 +7116,8 @@ const struct Item gItems[] = .flingPower = 10, }, +#undef CONFUSE_BERRY_HEAL_FRACTION + [ITEM_RAZZ_BERRY] = { .name = _("Razz Berry"), From 5592fa434a3cff0a68503abd797e5c75c64d6a3e Mon Sep 17 00:00:00 2001 From: sneed Date: Sat, 7 May 2022 22:01:35 +0300 Subject: [PATCH 2/4] catch < gen7 with engine --- src/data/items.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 034b5be57a..5f34ff3ed0 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7037,13 +7037,12 @@ const struct Item gItems[] = .flingPower = 10, }, -#ifndef BATTLE_ENGINE - #define CONFUSE_BERRY_HEAL_FRACTION 8 +#if defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL >= GEN_8 + #define CONFUSE_BERRY_HEAL_FRACTION 3 +#else if defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL == GEN_7 + #define CONFUSE_BERRY_HEAL_FRACTION 2 #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 + #define CONFUSE_BERRY_HEAL_FRACTION 8 #endif [ITEM_FIGY_BERRY] = From d8256663e3852732d4b2a174bb3e869e29a4d80f Mon Sep 17 00:00:00 2001 From: sneed Date: Sat, 7 May 2022 22:12:10 +0300 Subject: [PATCH 3/4] fix syntax --- 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 5f34ff3ed0..246af3dd70 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7039,7 +7039,7 @@ const struct Item gItems[] = #if defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL >= GEN_8 #define CONFUSE_BERRY_HEAL_FRACTION 3 -#else if defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL == GEN_7 +#elseif defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL == GEN_7 #define CONFUSE_BERRY_HEAL_FRACTION 2 #else #define CONFUSE_BERRY_HEAL_FRACTION 8 From eebfed20add79295e6c30511f5c018902656b019 Mon Sep 17 00:00:00 2001 From: sneed Date: Sun, 8 May 2022 09:58:06 +0300 Subject: [PATCH 4/4] #elif --- 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 246af3dd70..11c4bb91d3 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7039,7 +7039,7 @@ const struct Item gItems[] = #if defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL >= GEN_8 #define CONFUSE_BERRY_HEAL_FRACTION 3 -#elseif defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL == GEN_7 +#elif defined(BATTLE_ENGINE) && B_CONFUSE_BERRIES_HEAL == GEN_7 #define CONFUSE_BERRY_HEAL_FRACTION 2 #else #define CONFUSE_BERRY_HEAL_FRACTION 8