diff --git a/include/functions.h b/include/functions.h index d4b4502b67..4264a77753 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 10a28a41ba..da41830df2 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 {