diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-05-14 19:27:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 19:27:02 -0400 |
| commit | 7b18204a905c8431d8fb58c9964bdc37b1e548ac (patch) | |
| tree | 86884a6ed272d9a907b3d876db037a4af4e97f66 /src/battle_anim_mon_movement.c | |
| parent | 992fba2bc534e6ceaa69938baada1427e03d83e1 (diff) | |
| parent | ece62fa4ba8e385809deff330c7d7a0b348c10ae (diff) | |
Merge branch 'master' into doc-inconnect
Diffstat (limited to 'src/battle_anim_mon_movement.c')
| -rw-r--r-- | src/battle_anim_mon_movement.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index 8ed996993..5045f26ed 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -73,7 +73,7 @@ const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = .callback = SlideMonToOffset, }; -const struct SpriteTemplate gUnknown_83D4EB4 = +const struct SpriteTemplate gSlideMonToOffsetAndBackSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -620,7 +620,7 @@ static void AnimTask_WindUpLungePart2(u8 taskId) } } -void sub_80995FC(u8 taskId) +void AnimTask_SlideOffScreen(u8 taskId) { u8 spriteId; @@ -772,7 +772,7 @@ static void AnimTask_ScaleMonAndRestoreStep(u8 taskId) } } -void sub_8099980(u8 taskId) +void AnimTask_RotateMonSpriteToSide(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]); PrepareBattlerSpriteForRotScale(spriteId, 0); @@ -805,7 +805,7 @@ void sub_8099980(u8 taskId) gTasks[taskId].func = sub_8099B54; } -void sub_8099A78(u8 taskId) +void AnimTask_RotateMonToSideAndRestore(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[2]); PrepareBattlerSpriteForRotScale(spriteId, 0); @@ -866,7 +866,7 @@ static void sub_8099B54(u8 taskId) } } -void sub_8099BD4(u8 taskId) +void AnimTask_ShakeTargetBasedOnMovePowerOrDmg(u8 taskId) { if (gBattleAnimArgs[0] == 0) { |