Merge pull request #1877 from kleeenexfeu/patch-1
Fix heat crash/heavy slam calculation
This commit is contained in:
commit
e886076998
1 changed files with 1 additions and 1 deletions
|
@ -7788,7 +7788,7 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
|
||||||
if (weight >= ARRAY_COUNT(sHeatCrashPowerTable))
|
if (weight >= ARRAY_COUNT(sHeatCrashPowerTable))
|
||||||
basePower = sHeatCrashPowerTable[ARRAY_COUNT(sHeatCrashPowerTable) - 1];
|
basePower = sHeatCrashPowerTable[ARRAY_COUNT(sHeatCrashPowerTable) - 1];
|
||||||
else
|
else
|
||||||
basePower = sHeatCrashPowerTable[i];
|
basePower = sHeatCrashPowerTable[weight];
|
||||||
break;
|
break;
|
||||||
case EFFECT_PUNISHMENT:
|
case EFFECT_PUNISHMENT:
|
||||||
basePower = 60 + (CountBattlerStatIncreases(battlerDef, FALSE) * 20);
|
basePower = 60 + (CountBattlerStatIncreases(battlerDef, FALSE) * 20);
|
||||||
|
|
Loading…
Reference in a new issue