diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-05 09:06:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 09:06:31 -0400 |
| commit | 1e1a4076f0e1378b4e3424513fa43533d773272c (patch) | |
| tree | 53163abdfd81490e1e2aeef89d85a83336b5c4ff /src/battle_anim_effects_2.c | |
| parent | 5c7eac713423fc72e90965ce828fe3c969089ff1 (diff) | |
| parent | eb0b73c14e662e2d682837a78c78c868697fc5e8 (diff) | |
Merge pull request #798 from GriffinRichards/constants-baction
Use misc battle constants
Diffstat (limited to 'src/battle_anim_effects_2.c')
| -rwxr-xr-x | src/battle_anim_effects_2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 3b7d26aab..1add76bf3 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1479,7 +1479,7 @@ void AnimSonicBoomProjectile(struct Sprite *sprite) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - else if (GetBattlerSide(gBattleAnimAttacker) != 0) + else if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -1646,7 +1646,7 @@ void sub_8103CF0(u8 taskId) } else { - if ((gBattlerPositions[gBattleAnimTarget] & 1) == 0) + if ((gBattlerPositions[gBattleAnimTarget] & BIT_SIDE) == B_SIDE_PLAYER) { gTasks[taskId].data[4] = 1; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; |