diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-26 15:02:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 15:02:38 -0400 |
| commit | 1016b239186097361ea20f2f91adf3932026f40c (patch) | |
| tree | 840a0f28046d3c66fcaf1c2bb8ab3228386a3a8a /src/battle_anim_effects_2.c | |
| parent | bb236b490d99fef02ed172e7ca86f6c70ef09527 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into rename-tablecmds
Diffstat (limited to 'src/battle_anim_effects_2.c')
| -rwxr-xr-x | src/battle_anim_effects_2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 65cc55604..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]; @@ -1609,10 +1609,10 @@ static void sub_8103C0C(u8 taskId) switch (gTasks[taskId].data[4]) { case 1: - sprite->oam.matrixNum |= 24; + sprite->oam.matrixNum |= (ST_OAM_HFLIP | ST_OAM_VFLIP); break; case 2: - sprite->oam.matrixNum = 8; + sprite->oam.matrixNum = ST_OAM_HFLIP; break; } @@ -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]; |