ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Heat Crash's power table name

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-10-04 20:17:43 -03:00
parent 142a83ca96
commit 4ab8c95207
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_util.c
View File

@ -7317,7 +7317,7 @@ static const u16 sWeightToDamageTable[] =
}; };
static const u8 sSpeedDiffPowerTable[] = {40, 60, 80, 120, 150}; static const u8 sSpeedDiffPowerTable[] = {40, 60, 80, 120, 150};
static const u8 sHeatCrushPowerTable[] = {40, 40, 60, 80, 100, 120}; static const u8 sHeatCrashPowerTable[] = {40, 40, 60, 80, 100, 120};
static const u8 sTrumpCardPowerTable[] = {200, 80, 60, 50, 40}; static const u8 sTrumpCardPowerTable[] = {200, 80, 60, 50, 40};
const struct TypePower gNaturalGiftTable[] = const struct TypePower gNaturalGiftTable[] =
@ -7512,10 +7512,10 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
break; break;
case EFFECT_HEAT_CRASH: case EFFECT_HEAT_CRASH:
weight = GetBattlerWeight(battlerAtk) / GetBattlerWeight(battlerDef); weight = GetBattlerWeight(battlerAtk) / GetBattlerWeight(battlerDef);
if (weight >= ARRAY_COUNT(sHeatCrushPowerTable)) if (weight >= ARRAY_COUNT(sHeatCrashPowerTable))
basePower = sHeatCrushPowerTable[ARRAY_COUNT(sHeatCrushPowerTable) - 1]; basePower = sHeatCrashPowerTable[ARRAY_COUNT(sHeatCrashPowerTable) - 1];
else else
basePower = sHeatCrushPowerTable[i]; basePower = sHeatCrashPowerTable[i];
break; break;
case EFFECT_PUNISHMENT: case EFFECT_PUNISHMENT:
basePower = 60 + (CountBattlerStatIncreases(battlerDef, FALSE) * 20); basePower = 60 + (CountBattlerStatIncreases(battlerDef, FALSE) * 20);