From 37aff56cc7998cc4733f0b8db06fe7137eebe55c Mon Sep 17 00:00:00 2001 From: MandL27 Date: Wed, 21 Oct 2020 16:57:54 -0400 Subject: [PATCH] turns out gen 7 did indeed use a denominator of 5 --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 54cf48317..dc0dc4391 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) // I'm not sure if gens 7+ should use /5, but it felt too high in testing + 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;