atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1798 from LOuroboros/retaliateTimer

Browse source 
Fixed Retaliate timer's value decrease
This commit is contained in:
ghoulslash 2021-10-22 10:51:37 -04:00 committed by GitHub
commit 09143c89e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/battle_util.c
View file

@ -2331,9 +2331,10 @@ u8 DoFieldEndTurnEffects(void)
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_RETALIATE:
gActiveBattler = gBattlerByTurnOrder[gBattleStruct->turnSideTracker];
if (gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].retaliateTimer > 0)
gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].retaliateTimer--;
if (gSideTimers[B_SIDE_PLAYER].retaliateTimer > 0)
gSideTimers[B_SIDE_PLAYER].retaliateTimer--;
if (gSideTimers[B_SIDE_OPPONENT].retaliateTimer > 0)
gSideTimers[B_SIDE_OPPONENT].retaliateTimer--;
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_FIELD_COUNT: