ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-22 20:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1877 from kleeenexfeu/patch-1

Browse Source 
Fix heat crash/heavy slam calculation
This commit is contained in:
BuffelSaft 2021-11-10 14:18:57 +13:00 committed by GitHub
commit e886076998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_util.c
View File

@ -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);