Merge pull request #1721 from AsparagusEduardo/fix_TrumpCard

Fixed Trump Card's damage check
This commit is contained in:
BuffelSaft 2021-10-06 15:55:21 +13:00 committed by GitHub
commit a48dec2e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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: