ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Retaliate timer's value decrease

Browse Source 
I made an oopsie, basically.
Thanks to Xavion#9504 for the fix.
This commit is contained in:
LOuroboros 2021-10-21 08:50:04 -03:00
parent 2bd8ded9d2
commit 34fe0c54be
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++; gBattleStruct->turnCountersTracker++;
break; break;
case ENDTURN_RETALIATE: case ENDTURN_RETALIATE:
gActiveBattler = gBattlerByTurnOrder[gBattleStruct->turnSideTracker]; if (gSideTimers[0].retaliateTimer > 0)
if (gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].retaliateTimer > 0) gSideTimers[0].retaliateTimer--;
gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].retaliateTimer--; if (gSideTimers[1].retaliateTimer > 0)
gSideTimers[1].retaliateTimer--;
gBattleStruct->turnCountersTracker++; gBattleStruct->turnCountersTracker++;
break; break;
case ENDTURN_FIELD_COUNT: case ENDTURN_FIELD_COUNT: