diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-13 13:40:57 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-13 13:40:57 -0400 |
| commit | e2eb17dcbd8f9021b7e9fc805c8c03fac6b3b255 (patch) | |
| tree | 5705aaca2ef0713f55ca22a4a814161e26aa4582 /src/battle_anim_effects_3.c | |
| parent | 1ce33843b645e3139bd414c2d048c628967f4e07 (diff) | |
| parent | f75c048434d5dc7538e628206c29a0730404db81 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'src/battle_anim_effects_3.c')
| -rw-r--r-- | src/battle_anim_effects_3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index e9bfb2618..c60f51c31 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -3571,7 +3571,7 @@ static void sub_80E1AD8(u8 taskId) } } -void sub_80E1C48(u8 taskId) +void AnimTask_SlideMonForFocusBand(u8 taskId) { gTasks[taskId].data[15] = gBattlerSpriteIds[gBattleAnimAttacker]; gTasks[taskId].data[14] = gBattleAnimArgs[0]; @@ -3751,7 +3751,7 @@ static void AnimTask_FacadeColorBlendStep(u8 taskId) } } -void sub_80E2084(u8 taskId) +void AnimTask_StatusClearedEffect(u8 taskId) { sub_80BBA20(taskId, 0, 0x1A0, gBattleAnimAttacker, gBattleAnimArgs[0], 10, 2, 30, gCureBubblesGfx, gCureBubblesTilemap, gCureBubblesPal); } |