diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-07 20:50:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-07 20:50:41 -0400 |
| commit | 6c5d1c4a3de2f1a2d1855a542a6a5d53e4daf936 (patch) | |
| tree | e9a140e919d72891ea825b64fc72a9cfa175ce88 /src/battle/battle_controller_opponent.c | |
| parent | c4cc1522c86ec240c53c75455b650b1c69b2d5a4 (diff) | |
| parent | 9238533346fd97c67e48fee33a204d1e8e2dd0a7 (diff) | |
Merge pull request #9 from pret/master
sync with source repo
Diffstat (limited to 'src/battle/battle_controller_opponent.c')
| -rw-r--r-- | src/battle/battle_controller_opponent.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c index d8760e21f..ee313c098 100644 --- a/src/battle/battle_controller_opponent.c +++ b/src/battle/battle_controller_opponent.c @@ -83,7 +83,7 @@ extern void sub_80313A0(struct Sprite *); extern void sub_8032B4C(void); extern void sub_8031A6C(u16, u8); extern void sub_8032B84(void); -extern void StartTranslateAnimSpriteByDeltas(struct Sprite *); +extern void StartAnimLinearTranslation(struct Sprite *); extern void sub_8032BBC(void); extern void oamt_add_pos2_onto_pos1(); extern void StoreSpriteCallbackInData(); @@ -1284,7 +1284,7 @@ void OpponentHandleTrainerSlideBack(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], SpriteCallbackDummy); gBattleBankFunc[gActiveBattler] = sub_8032BBC; } @@ -2223,7 +2223,7 @@ void OpponentHandleTrainerBallThrow(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 35; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = 280; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8035C10); taskId = CreateTask(sub_8035C44, 5); gTasks[taskId].data[0] = gActiveBattler; |