diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2019-09-17 00:10:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 00:10:23 -0400 |
commit | 945d3d3a27f6e5005e5481bb2ad36f1a2a220d3d (patch) | |
tree | 7dc8f5a21c6bb7640aad82de03a314b0e919f3b2 /src/battle_anim.c | |
parent | f4160ded9897f65e5ee7fa7050d195dfaa5bf5b2 (diff) | |
parent | 06af24bce58b9285166d27fc371ad3c3dbb63a29 (diff) |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/battle_anim.c')
-rw-r--r-- | src/battle_anim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 3cac9f33e..ab1e5ed6a 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1841,7 +1841,7 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo UpdateOamPriorityInAllHealthboxes(0); for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - if (GetBattlerSide(i) != 0) + if (GetBattlerSide(i) != B_SIDE_PLAYER) gAnimBattlerSpecies[i] = GetMonData(&gEnemyParty[gBattlerPartyIndexes[i]], MON_DATA_SPECIES); else gAnimBattlerSpecies[i] = GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_SPECIES); |