diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-02 00:24:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-02 00:24:16 -0500 |
commit | 64460e01aede2bbcaa8d1dd18dd3fab590fa4a6e (patch) | |
tree | 58be3a15322f5c0972b71525f5cd22149bb67696 /src/battle_anim_effects_1.c | |
parent | 7e26aa3d21f55e1375bfde6ffbc70210170fdc37 (diff) | |
parent | 3fd5e143a986334985c2c786c324663dbba2db9b (diff) |
Merge pull request #1314 from GriffinRichards/doc-controllers
Document battle controllers, misc other battle
Diffstat (limited to 'src/battle_anim_effects_1.c')
-rw-r--r-- | src/battle_anim_effects_1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 04bab2f85..a2f52304a 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -3074,7 +3074,7 @@ static void AnimPresent(struct Sprite* sprite) sprite->callback = AnimItemSteal_Step1; } -static void sub_80FFB90(struct Sprite* sprite) +static void AnimKnockOffOpponentsItem(struct Sprite* sprite) { int zero; sprite->data[0] += ((sprite->data[3] * 128) / sprite->data[4]); @@ -3116,7 +3116,7 @@ static void AnimKnockOffItem(struct Sprite* sprite) sub_80FF9B8(sprite, 40); sprite->data[3] = 3; sprite->data[4] = 60; - sprite->callback = sub_80FFB90; + sprite->callback = AnimKnockOffOpponentsItem; } } @@ -3731,7 +3731,7 @@ static void AnimNeedleArmSpike_Step(struct Sprite* sprite) } } -static void sub_81009DC(struct Sprite* sprite) +static void AnimWhipHit_WaitEnd(struct Sprite* sprite) { if (sprite->animEnded) DestroyAnimSprite(sprite); @@ -3759,7 +3759,7 @@ static void AnimWhipHit(struct Sprite* sprite) if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) StartSpriteAnim(sprite, 1); - sprite->callback = sub_81009DC; + sprite->callback = AnimWhipHit_WaitEnd; SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); sprite->pos1.y += gBattleAnimArgs[1]; } |