diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-20 00:04:42 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-25 12:54:08 -0600 |
| commit | afa1ae220965ea6453a9e1a21fb211de280c41c8 (patch) | |
| tree | 450c8cf74b8cc25ed868b1dd34266598c236affc /src/battle_anim_mon_movement.c | |
| parent | e633b57593df806e1ae04d575f005d3fc4172d25 (diff) | |
Finish documenting move anim scripts
Diffstat (limited to 'src/battle_anim_mon_movement.c')
| -rw-r--r-- | src/battle_anim_mon_movement.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index e1849064d..59eaaf549 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -18,7 +18,7 @@ static void ReverseVerticalDipDirection(struct Sprite* sprite); static void SlideMonToOriginalPos(struct Sprite *sprite); static void SlideMonToOriginalPosStep(struct Sprite *sprite); static void SlideMonToOffset(struct Sprite *sprite); -static void sub_80D5B48(struct Sprite *sprite); +static void SlideMonToOffsetAndBack(struct Sprite *sprite); static void sub_80D5C20(struct Sprite *sprite); void AnimTask_WindUpLungePart1(u8 taskId); void AnimTask_WindUpLungePart2(u8 taskId); @@ -72,7 +72,7 @@ const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = .callback = SlideMonToOffset, }; -const struct SpriteTemplate gUnknown_0857FE88 = +const struct SpriteTemplate gSlideMonToOffsetAndBackSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -80,7 +80,7 @@ const struct SpriteTemplate gUnknown_0857FE88 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80D5B48, + .callback = SlideMonToOffsetAndBack, }; // Task to facilitate simple shaking of a pokemon's picture in battle. @@ -584,19 +584,17 @@ static void SlideMonToOffset(struct Sprite *sprite) sprite->callback = TranslateMonSpriteLinearFixedPoint; } -static void sub_80D5B48(struct Sprite *sprite) +static void SlideMonToOffsetAndBack(struct Sprite *sprite) { u8 spriteId; u8 battlerId; sprite->invisible = TRUE; + if (gBattleAnimArgs[0] == ANIM_ATTACKER) - { battlerId = gBattleAnimAttacker; - } else - { battlerId = gBattleAnimTarget; - } + spriteId = gBattlerSpriteIds[battlerId]; if (GetBattlerSide(battlerId)) { |