diff options
| author | garak <garakmon@gmail.com> | 2018-09-29 14:30:45 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-09-29 14:30:45 -0400 |
| commit | ca685eb9e661523c79467a72a077775738f8bd45 (patch) | |
| tree | 4548a9981a38732085fe41b9b392f7fa79c38c0f /src/battle/anim/splash.c | |
| parent | 6876a50bc4ffb2a86658cc1a43f60df869ca3296 (diff) | |
| parent | da01d48fee341701cbec9b39bdc649c78162ed2d (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-anim-labels
Diffstat (limited to 'src/battle/anim/splash.c')
| -rw-r--r-- | src/battle/anim/splash.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/battle/anim/splash.c b/src/battle/anim/splash.c index c01748953..7e3d08554 100644 --- a/src/battle/anim/splash.c +++ b/src/battle/anim/splash.c @@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; -static void sub_80D07AC(u8 taskId); +static void AnimTask_SplashStep(u8 taskId); // splash (splash effect of hopping up and down) // Used in Splash, Mud Sport, and Sketch. @@ -21,7 +21,10 @@ const union AffineAnimCmd gSpriteAffineAnim_83D76F4[] = AFFINEANIMCMD_END, }; -void sub_80D074C(u8 taskId) +// Task to facilitate expanding and hopping effect seen in Splash. +// arg 0: anim battler +// arg 1: num hops +void AnimTask_Splash(u8 taskId) { struct Task* task = &gTasks[taskId]; if (gBattleAnimArgs[1] == 0) @@ -37,11 +40,11 @@ void sub_80D074C(u8 taskId) task->data[3] = 0; task->data[4] = 0; sub_80798F4(task, spriteId, &gSpriteAffineAnim_83D76F4); - task->func = sub_80D07AC; + task->func = AnimTask_SplashStep; } } -void sub_80D07AC(u8 taskId) +void AnimTask_SplashStep(u8 taskId) { struct Task* task = &gTasks[taskId]; switch (task->data[1]) |