mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-03-08 08:27:52 +01:00
Merge pull request #2141 from Sneed69/Triple-Kick-Fix
Triple kick power calc rework
This commit is contained in:
commit
9164f03f96
@ -8232,7 +8232,7 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
|
||||
basePower = gBattleStruct->presentBasePower;
|
||||
break;
|
||||
case EFFECT_TRIPLE_KICK:
|
||||
basePower += gBattleScripting.tripleKickPower;
|
||||
basePower *= (4 - gMultiHitCounter);
|
||||
break;
|
||||
case EFFECT_SPIT_UP:
|
||||
basePower = 100 * gDisableStructs[battlerAtk].stockpileCounter;
|
||||
|
Loading…
x
Reference in New Issue
Block a user