summaryrefslogtreecommitdiff
path: root/src/battle/battle_controller_linkopponent.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-07-05 20:53:40 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-07-05 19:12:20 -0700
commit99c98097753008b1f824a676b36f34ac2857effe (patch)
treecff85e4c569e337f087d62314122209929195d92 /src/battle/battle_controller_linkopponent.c
parentc63e00f47a5d3388a149fdbd8b6cbd8c138e8494 (diff)
Decompile battle_anim_813F0f4.s
Diffstat (limited to 'src/battle/battle_controller_linkopponent.c')
-rw-r--r--src/battle/battle_controller_linkopponent.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index a759822cd..8ca3d160a 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.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 "data2.h"
#include "link.h"
@@ -71,7 +72,7 @@ extern void sub_80313A0(struct Sprite *);
extern void sub_803757C(void);
extern void oamt_add_pos2_onto_pos1();
extern void StoreSpriteCallbackInData();
-extern void StartTranslateAnimSpriteByDeltas(struct Sprite *);
+extern void StartAnimLinearTranslation(struct Sprite *);
extern void sub_80375B4(void);
extern void sub_8010384(struct Sprite *);
extern void sub_8037B78(void);
@@ -103,7 +104,6 @@ extern u8 move_anim_start_t3();
extern void sub_8037FD8(void);
extern void sub_8037F34(void);
extern void LinkOpponentBufferExecCompleted(void);
-extern void sub_8141828();
extern void sub_804777C();
// this file's functions
@@ -1280,7 +1280,7 @@ void LinkOpponentHandleTrainerSlideBack(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_80375B4;
}
@@ -1631,7 +1631,7 @@ void LinkOpponentHandleTrainerBallThrow(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_803A3A8);
taskId = CreateTask(sub_803A2C4, 5);
gTasks[taskId].data[0] = gActiveBattler;