From 9c574f3adb58367d8ef1f04bdf38a31eb745d608 Mon Sep 17 00:00:00 2001 From: MandL27 Date: Fri, 23 Oct 2020 19:49:27 -0400 Subject: [PATCH] Fixed some comparison operators --- src/battle_script_commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index cf1211bcd5..1176c4896f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3650,7 +3650,7 @@ static void Cmd_getexp(void) if (holdEffect == HOLD_EFFECT_EXP_SHARE) viaExpShare++; } - #if (B_SCALED_EXP == GEN_5) && (B_SCALED_EXP != GEN_6) + #if (B_SCALED_EXP >= GEN_5) && (B_SCALED_EXP != GEN_6) calculatedExp = gBaseStats[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 5; #else calculatedExp = gBaseStats[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7; @@ -3736,7 +3736,7 @@ static void Cmd_getexp(void) gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && B_TRAINER_EXP_MULTIPLIER <= GEN_7) gBattleMoveDamage = (gBattleMoveDamage * 150) / 100; - #if (B_SCALED_EXP == GEN_5) && (B_SCALED_EXP != GEN_6) + #if (B_SCALED_EXP >= GEN_5) && (B_SCALED_EXP != GEN_6) gBattleMoveDamage *= sExperienceScalingFactors[(gBattleMons[gBattlerFainted].level * 2) + 10]; gBattleMoveDamage /= sExperienceScalingFactors[gBattleMons[gBattlerFainted].level + GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) + 10];