From 5592fa434a3cff0a68503abd797e5c75c64d6a3e Mon Sep 17 00:00:00 2001 From: sneed Date: Sat, 7 May 2022 22:01:35 +0300 Subject: [PATCH] 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] =