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

fix GetBattleAnimMoveTargets for non-player gBattleAnimAttacker (#2848)

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2023-03-27 18:11:22 -03:00 committed by GitHub
commit fa245c6edf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/battle_anim.c
View file

@ -440,22 +440,24 @@ static u8 GetBattleAnimMoveTargets(u8 battlerArgIndex, u8 *targets)
case MOVE_TARGET_BOTH: case MOVE_TARGET_BOTH:
targets[0] = gBattleAnimArgs[battlerArgIndex]; targets[0] = gBattleAnimArgs[battlerArgIndex];
numTargets = 1; numTargets = 1;
if (IsBattlerAlive(targets[0] ^ BIT_FLANK)) { if (IsBattlerAlive(BATTLE_PARTNER(targets[0])))
targets[1] = targets[0] ^ BIT_FLANK; {
numTargets++; targets[1] = BATTLE_PARTNER(targets[0]);
numTargets = 2;
} }
break; break;
case MOVE_TARGET_FOES_AND_ALLY: case MOVE_TARGET_FOES_AND_ALLY:
targets[0] = gBattleAnimArgs[battlerArgIndex]; targets[0] = gBattleAnimArgs[battlerArgIndex];
numTargets = 1; numTargets = 1;
if (IsBattlerAlive(BATTLE_PARTNER(targets[0])))
if (IsBattlerAlive(targets[0] ^ BIT_FLANK)) { {
targets[1] = targets[0] ^ BIT_FLANK; targets[1] = BATTLE_PARTNER(targets[0]);
numTargets++; numTargets++;
} }
if (IsBattlerAlive(gBattleAnimAttacker ^ BIT_FLANK)) { if (IsBattlerAlive(BATTLE_PARTNER(BATTLE_OPPOSITE(targets[0]))))
targets[2] = gBattleAnimAttacker ^ BIT_FLANK; {
targets[2] = BATTLE_PARTNER(BATTLE_OPPOSITE(targets[0]));
numTargets++; numTargets++;
} }
break; break;