ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-08 08:27:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2141 from Sneed69/Triple-Kick-Fix

Browse Source 
Triple kick power calc rework
This commit is contained in:
ghoulslash 2022-10-07 16:31:50 -04:00 committed by GitHub
commit 9164f03f96
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

@ -8232,7 +8232,7 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
basePower = gBattleStruct->presentBasePower; basePower = gBattleStruct->presentBasePower;
break; break;
case EFFECT_TRIPLE_KICK: case EFFECT_TRIPLE_KICK:
basePower += gBattleScripting.tripleKickPower; basePower *= (4 - gMultiHitCounter);
break; break;
case EFFECT_SPIT_UP: case EFFECT_SPIT_UP:
basePower = 100 * gDisableStructs[battlerAtk].stockpileCounter; basePower = 100 * gDisableStructs[battlerAtk].stockpileCounter;