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

Fixed instances of gSideTimers not using side constants (#2867)

Browse source
This commit is contained in:
ghoulslash 2023-03-27 21:48:50 -04:00 committed by GitHub
commit dd99cb6da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/battle_script_commands.c
View file

@ -3923,14 +3923,14 @@ static void Cmd_tryfaintmon(void)
if (gBattleResults.playerFaintCounter < 255) if (gBattleResults.playerFaintCounter < 255)
gBattleResults.playerFaintCounter++; gBattleResults.playerFaintCounter++;
AdjustFriendshipOnBattleFaint(gActiveBattler); AdjustFriendshipOnBattleFaint(gActiveBattler);
gSideTimers[0].retaliateTimer = 2; gSideTimers[B_SIDE_PLAYER].retaliateTimer = 2;
} }
else else
{ {
if (gBattleResults.opponentFaintCounter < 255) if (gBattleResults.opponentFaintCounter < 255)
gBattleResults.opponentFaintCounter++; gBattleResults.opponentFaintCounter++;
gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES, NULL); gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES, NULL);
gSideTimers[1].retaliateTimer = 2; gSideTimers[B_SIDE_OPPONENT].retaliateTimer = 2;
} }
if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattlerAttacker].hp != 0) if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattlerAttacker].hp != 0)
{ {