diff options
| author | KrimtonZ <krimtonz@gmail.com> | 2020-03-26 14:03:04 -0500 |
|---|---|---|
| committer | KrimtonZ <krimtonz@gmail.com> | 2020-03-26 14:03:04 -0500 |
| commit | 23987fa46774a5c033467c8bc0cd9b2d1024d188 (patch) | |
| tree | 119f34323207a6f59149463019d4da73c348d6bd /include | |
| parent | e03c7377b9d480597ac013710d9fc14833e1ae71 (diff) | |
minor struct updates
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rwxr-xr-x | include/z64animation.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/functions.h b/include/functions.h index d4b4502b6..4264a7775 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1169,8 +1169,8 @@ void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2); void SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnime, - LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, f32 arg4, - f32 frameCount, u8 arg6, f32 arg7); + LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, f32 frame, + f32 frameCount, u8 arg6, f32 transitionRate); void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed); diff --git a/include/z64animation.h b/include/z64animation.h index 10a28a41b..da41830df 100755 --- a/include/z64animation.h +++ b/include/z64animation.h @@ -74,7 +74,6 @@ typedef struct { /* 0x001 */ u8 vecCount; /* 0x004 */ Vec3s* dst; /* 0x008 */ Vec3s* src; - /* 0x00C */ char unk_0C[0x30]; } AnimationEntryType1; typedef struct { @@ -83,7 +82,6 @@ typedef struct { /* 0x004 */ Vec3s* unk_04; /* 0x008 */ Vec3s* unk_08; /* 0x00C */ f32 unk_0C; - /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType2; typedef struct { @@ -92,7 +90,6 @@ typedef struct { /* 0x004 */ Vec3s* dst; /* 0x008 */ Vec3s* src; /* 0x00C */ u8* index; - /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType3; typedef struct { @@ -102,14 +99,12 @@ typedef struct { /* 0x004 */ Vec3s* dst; /* 0x008 */ Vec3s* src; /* 0x00C */ u8* index; - /* 0x010 */ char unk_10[0x2C]; } AnimationEntryType4; typedef struct { /* 0x000 */ struct Actor* actor; /* 0x004 */ SkelAnime* skelAnime; /* 0x008 */ f32 unk_08; - /* 0x00C */ char unk_0C[0x30]; } AnimationEntryType5; typedef struct { |