diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2023-08-15 22:23:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-15 22:23:53 +0200 |
| commit | 4dea0bfb26951a8a07ee4cbb9642d8bcd52ba71a (patch) | |
| tree | 58b4bc2b3a80f7aa4b3a6bf66270cb637276f38d /include | |
| parent | 9e9d62cf710d6be36094d9d44e73996ea368b84b (diff) | |
Placeholder names for skelanime moveflags (#1489)
* Add defines for all used animflags
* Use named constants (and add two) for players `func_80832F54` flags
* note which flags are player-only
* Attempt at documenting but too FeelsUnkMan again
* forgot something
* ANIM_FLAG_PLAYER_0 -> ANIM_FLAG_0 and amend comment from "player-only" to "no effect outside player"
* 1<<n flags
Diffstat (limited to 'include')
| -rwxr-xr-x | include/z64animation.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/z64animation.h b/include/z64animation.h index c7108a668..ca87a69d1 100755 --- a/include/z64animation.h +++ b/include/z64animation.h @@ -88,8 +88,12 @@ typedef enum { /* 1 */ ANIMTAPER_ACCEL } AnimationTapers; +#define ANIM_FLAG_0 (1 << 0) // (no effect outside of player) Related to scaling an animation from/to child/adult #define ANIM_FLAG_UPDATE_Y (1 << 1) +#define ANIM_FLAG_PLAYER_2 (1 << 2) // (player-only) Related to scaling an animation from/to child/adult +#define ANIM_FLAG_PLAYER_SETMOVE (1 << 3) // (player-only) Call AnimationContext_SetMoveActor #define ANIM_FLAG_NO_MOVE (1 << 4) +#define ANIM_FLAG_PLAYER_7 (1 << 7) // (player-only) typedef struct SkelAnime { /* 0x00 */ u8 limbCount; // Number of limbs in the skeleton @@ -287,7 +291,7 @@ typedef struct { typedef struct { /* 0x000 */ struct Actor* actor; /* 0x004 */ struct SkelAnime* skelAnime; - /* 0x008 */ f32 unk_08; + /* 0x008 */ f32 diffScaleY; } AnimEntryMoveActor; // size = 0xC typedef union { @@ -317,7 +321,7 @@ void AnimationContext_SetCopyAll(struct PlayState* play, s32 vecCount, Vec3s* ds void AnimationContext_SetCopyTrue(struct PlayState* play, s32 vecCount, Vec3s* dst, Vec3s* src, u8* copyFlag); void AnimationContext_SetCopyFalse(struct PlayState* play, s32 vecCount, Vec3s* dst, Vec3s* src, u8* copyFlag); void AnimationContext_SetInterp(struct PlayState* play, s32 vecCount, Vec3s* base, Vec3s* mod, f32 weight); -void AnimationContext_SetMoveActor(struct PlayState* play, struct Actor* actor, SkelAnime* skelAnime, f32 arg3); +void AnimationContext_SetMoveActor(struct PlayState* play, struct Actor* actor, SkelAnime* skelAnime, f32 moveDiffScaleY); void AnimationContext_SetNextQueue(struct PlayState* play); void AnimationContext_DisableQueue(struct PlayState* play); |
