diff options
author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /src/pokeball.c | |
parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'src/pokeball.c')
-rw-r--r-- | src/pokeball.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokeball.c b/src/pokeball.c index 09e7ac639..ad839e6af 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -402,7 +402,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId) gSprites[ballSpriteId].data[2] = GetBattlerSpriteCoord(gBattlerTarget, BATTLER_COORD_X); gSprites[ballSpriteId].data[4] = GetBattlerSpriteCoord(gBattlerTarget, BATTLER_COORD_Y) - 16; gSprites[ballSpriteId].data[5] = -40; - sub_80A68D4(&gSprites[ballSpriteId]); + InitAnimArcTranslation(&gSprites[ballSpriteId]); gSprites[ballSpriteId].oam.affineParam = taskId; gTasks[taskId].tOpponentBattler = gBattlerTarget; gTasks[taskId].func = TaskDummy; @@ -898,7 +898,7 @@ static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite) sprite->data[4] = GetBattlerSpriteCoord(sprite->sBattler, 3) + 24; sprite->data[5] = -30; sprite->oam.affineParam = sprite->sBattler; - sub_80A68D4(sprite); + InitAnimArcTranslation(sprite); sprite->callback = SpriteCB_PlayerMonSendOut_2; } |