diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-07-05 20:53:40 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-05 19:12:20 -0700 |
commit | 99c98097753008b1f824a676b36f34ac2857effe (patch) | |
tree | cff85e4c569e337f087d62314122209929195d92 /src/battle/battle_controller_wally.c | |
parent | c63e00f47a5d3388a149fdbd8b6cbd8c138e8494 (diff) |
Decompile battle_anim_813F0f4.s
Diffstat (limited to 'src/battle/battle_controller_wally.c')
-rw-r--r-- | src/battle/battle_controller_wally.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c index ed4eadee6..312ef9d12 100644 --- a/src/battle/battle_controller_wally.c +++ b/src/battle/battle_controller_wally.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" +#include "battle_anim_813F0F4.h" #include "battle_interface.h" #include "battle_message.h" #include "data2.h" @@ -63,7 +64,6 @@ extern void Emitcmd35(u8, u16); extern void nullsub_14(void); extern void PrepareBagForWallyTutorial(void); -extern void sub_8141828(); extern void sub_8045A5C(); extern void sub_804777C(); extern void sub_8043DFC(); @@ -85,7 +85,7 @@ extern void sub_80304A8(void); extern void sub_8047858(); extern void StartBattleIntroAnim(); extern void oamt_add_pos2_onto_pos1(); -extern void StartTranslateAnimSpriteByDeltas(struct Sprite *); +extern void StartAnimLinearTranslation(struct Sprite *); extern void sub_8030E38(struct Sprite *); extern void StoreSpriteCallbackInData(); extern u8 sub_8046400(); @@ -1482,7 +1482,7 @@ void WallyHandleTrainerBallThrow(void) gSprites[gBankSpriteIds[gActiveBattler]].data[0] = 50; gSprites[gBankSpriteIds[gActiveBattler]].data[2] = -40; gSprites[gBankSpriteIds[gActiveBattler]].data[4] = gSprites[gBankSpriteIds[gActiveBattler]].pos1.y; - gSprites[gBankSpriteIds[gActiveBattler]].callback = StartTranslateAnimSpriteByDeltas; + gSprites[gBankSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation; gSprites[gBankSpriteIds[gActiveBattler]].data[5] = gActiveBattler; StoreSpriteCallbackInData(&gSprites[gBankSpriteIds[gActiveBattler]], sub_8030E38); StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBattler]], 1); |