diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/bug.c | |
parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/bug.c')
-rw-r--r-- | src/bug.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -252,7 +252,7 @@ void sub_81104E4(struct Sprite *sprite) if (IsContest()) gBattleAnimArgs[2] /= 2; - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; @@ -274,7 +274,7 @@ void sub_81104E4(struct Sprite *sprite) static void sub_811057C(struct Sprite *sprite) { - if (TranslateAnimLinear(sprite)) + if (AnimTranslateLinear(sprite)) { DestroyAnimSprite(sprite); return; @@ -389,7 +389,7 @@ void AnimTranslateStinger(struct Sprite *sprite) } } - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2]; lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3]; @@ -414,7 +414,7 @@ void AnimTranslateStinger(struct Sprite *sprite) // arg 5: wave amplitude void AnimMissileArc(struct Sprite *sprite) { - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); if (GetBattlerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; |