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/normal.c | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/normal.c')
| -rw-r--r-- | src/normal.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/normal.c b/src/normal.c index e20f74588..95c99d29e 100644 --- a/src/normal.c +++ b/src/normal.c @@ -880,9 +880,9 @@ void sub_8116388(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->callback = RunStoredCallbackWhenAffineAnimEnds; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); @@ -892,9 +892,9 @@ static void sub_81163D0(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[4]; sprite->callback = RunStoredCallbackWhenAffineAnimEnds; @@ -916,9 +916,9 @@ void sub_8116458(struct Sprite *sprite) StartSpriteAffineAnim(sprite, gBattleAnimArgs[1]); if (gBattleAnimArgs[0] == 0) - InitAnimSpritePos(sprite, 0); + InitSpritePosToAnimAttacker(sprite, 0); else - sub_80A6980(sprite, FALSE); + InitSpritePosToAnimTarget(sprite, FALSE); sprite->pos2.x += (Random2() % 48) - 24; sprite->pos2.y += (Random2() % 24) - 12; @@ -942,9 +942,9 @@ void sub_81164F0(struct Sprite *sprite) void sub_8116560(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[3]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); @@ -955,9 +955,9 @@ void sub_81165A8(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]); if (gBattleAnimArgs[2] == 0) - InitAnimSpritePos(sprite, 1); + InitSpritePosToAnimAttacker(sprite, 1); else - sub_80A6980(sprite, TRUE); + InitSpritePosToAnimTarget(sprite, TRUE); sprite->callback = sub_81165E4; } |