mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-29 23:04:10 +01:00
Merge pull request #1721 from AsparagusEduardo/fix_TrumpCard
Fixed Trump Card's damage check
This commit is contained in:
commit
a48dec2e31
@ -7489,7 +7489,7 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
|
||||
if (gBattleMons[battlerAtk].pp[i] >= ARRAY_COUNT(sTrumpCardPowerTable))
|
||||
basePower = sTrumpCardPowerTable[ARRAY_COUNT(sTrumpCardPowerTable) - 1];
|
||||
else
|
||||
basePower = sTrumpCardPowerTable[i];
|
||||
basePower = sTrumpCardPowerTable[gBattleMons[battlerAtk].pp[i]];
|
||||
}
|
||||
break;
|
||||
case EFFECT_ACROBATICS:
|
||||
|
Loading…
x
Reference in New Issue
Block a user