ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-30 14:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1643 from ghoulslash/echoed_voice

Browse Source 
better echoed voice power boost
This commit is contained in:
DizzyEggg 2021-09-09 19:59:45 +02:00 committed by GitHub
commit c5b810b508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/battle_util.c
View File

@ -7195,10 +7195,9 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
// gBattleStruct->sameMoveTurns incremented in ppreduce
if (gBattleStruct->sameMoveTurns[battlerAtk] != 0)
{
if (gBattleStruct->sameMoveTurns[battlerAtk] >= 5)
basePower *= 5;
else
basePower *= gBattleStruct->sameMoveTurns[battlerAtk];
basePower += (basePower * gBattleStruct->sameMoveTurns[battlerAtk]);
if (basePower > 200)
basePower = 200;
}
break;
case EFFECT_PAYBACK: