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

Fix Payback not boosting on switching

Browse Source
This commit is contained in:
DizzyEggg 2020-04-12 12:14:22 +02:00
parent 060b795d8e
commit 458809c5f7
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

@ -5365,7 +5365,7 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
} }
break; break;
case EFFECT_PAYBACK: case EFFECT_PAYBACK:
if (GetBattlerTurnOrderNum(battlerAtk) > GetBattlerTurnOrderNum(battlerDef)) if (GetBattlerTurnOrderNum(battlerAtk) > GetBattlerTurnOrderNum(battlerDef) && gDisableStructs[battlerDef].isFirstTurn != 2)
basePower *= 2; basePower *= 2;
break; break;
case EFFECT_ROUND: case EFFECT_ROUND: