diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
commit | 07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch) | |
tree | c77edf7fdacf36172bd3b6af790ad86111aef1fe /src/battle/anim/sonic.c | |
parent | 4d3098e89b5aebf080547a99e68640138dc74599 (diff) | |
parent | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff) |
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/battle/anim/sonic.c')
-rw-r--r-- | src/battle/anim/sonic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 1501f51f1..a882be73c 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -26,7 +26,7 @@ void AnimSonicBoomProjectile(struct Sprite* sprite) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - else if (GetBankSide(gAnimBankAttacker) != 0) + else if (GetBattlerSide(gAnimBankAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -34,8 +34,8 @@ void AnimSonicBoomProjectile(struct Sprite* sprite) } InitAnimSpritePos(sprite, 1); - targetXPos = GetBankPosition(gAnimBankTarget, 2) + gBattleAnimArgs[2]; - targetYPos = GetBankPosition(gAnimBankTarget, 3) + gBattleAnimArgs[3]; + targetXPos = GetBattlerSpriteCoord(gAnimBankTarget, 2) + gBattleAnimArgs[2]; + targetYPos = GetBattlerSpriteCoord(gAnimBankTarget, 3) + gBattleAnimArgs[3]; rotation = ArcTan2Neg(targetXPos - sprite->pos1.x, targetYPos - sprite->pos1.y); rotation += 0xF000; if (IsContest()) |