diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-14 18:11:04 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-25 12:54:08 -0600 |
| commit | 501d0d3c18e3c81af2d5c58e19a26fe5a8577f0b (patch) | |
| tree | a513a971c366bcbe03e7c6e30a7e64d65f5a0a8b /include | |
| parent | faf0ba8662ecd54b4160920097074aad3c2dc8cb (diff) | |
Document move anims C-H
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 10 | ||||
| -rw-r--r-- | include/constants/battle_anim.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index c3019a5cf..3eab8e62b 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -67,18 +67,18 @@ s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); void sub_80A4720(u16 a, u16 *b, u32 c, u8 d); void sub_80A477C(bool8); -// battle_intro.s +// battle_intro.c void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); void sub_8118FBC(int bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *arg5, u16 *arg6, u16 arg7); void HandleIntroSlide(u8 terrainId); int GetAnimBgAttribute(u8 bgId, u8 attributeId); -// battle_anim_mons.s +// battle_anim_mons.c void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite); void sub_80A8AEC(struct Sprite *sprite); void sub_80A8A6C(struct Sprite *sprite); void sub_80A8E30(struct Sprite *sprite); -void sub_80A8B64(struct Sprite *sprite); +void AnimSpinningSparkle(struct Sprite *sprite); void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y); void DestroySpriteAndMatrix(struct Sprite *sprite); void TranslateSpriteLinearFixedPoint(struct Sprite *sprite); @@ -101,7 +101,7 @@ void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 a2); s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 a2); u8 GetBattlerYCoordWithElevation(u8 battlerId); void WaitAnimForDuration(struct Sprite *sprite); -void AnimSnoreZ(struct Sprite *sprite); +void AnimTravelDiagonally(struct Sprite *sprite); void InitAnimLinearTranslation(struct Sprite *sprite); void sub_80A6F98(struct Sprite *sprite); u8 GetBattlerSpriteBGPriority(u8 battlerId); @@ -208,7 +208,7 @@ void sub_80A718C(struct Sprite *sprite); void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); // ground.c -void sub_81152DC(u8 taskId); +void AnimTask_HorizontalShake(u8 taskId); // battle_anim_special.c void sub_8172EF0(u8 battler, struct Pokemon *mon); diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 0fe231cdc..d87fa09a9 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -393,7 +393,7 @@ #define B_ANIM_STATUS_WRAPPED 0x9 // does not actually exist // Most tasks return a value to gBattleAnimArgs[7]. -#define ARG_RET_ID 0x7 +#define ARG_RET_ID 7 // Trapping Wrap-like moves end turn animation. #define TRAP_ANIM_BIND 0 |