mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 18:30:35 +00:00
Code Issues Projects Releases Wiki Activity

minor struct updates

Browse source
This commit is contained in:
KrimtonZ 2020-03-26 14:03:04 -05:00
parent e03c7377b9
commit 23987fa467
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/functions.h
View file

@ -1169,8 +1169,8 @@ void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime);
void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime);
void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2); void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2);
void SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnime, void SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnime,
LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, f32 arg4, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, f32 frame,
f32 frameCount, u8 arg6, f32 arg7); f32 frameCount, u8 arg6, f32 transitionRate);
void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg);
void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg,
f32 playbackSpeed); f32 playbackSpeed);

5
include/z64animation.h
View file

@ -74,7 +74,6 @@ typedef struct {
/* 0x001 */ u8 vecCount; /* 0x001 */ u8 vecCount;
/* 0x004 */ Vec3s* dst; /* 0x004 */ Vec3s* dst;
/* 0x008 */ Vec3s* src; /* 0x008 */ Vec3s* src;
/* 0x00C */ char unk_0C[0x30];
} AnimationEntryType1; } AnimationEntryType1;
typedef struct { typedef struct {
@ -83,7 +82,6 @@ typedef struct {
/* 0x004 */ Vec3s* unk_04; /* 0x004 */ Vec3s* unk_04;
/* 0x008 */ Vec3s* unk_08; /* 0x008 */ Vec3s* unk_08;
/* 0x00C */ f32 unk_0C; /* 0x00C */ f32 unk_0C;
/* 0x010 */ char unk_10[0x2C];
} AnimationEntryType2; } AnimationEntryType2;
typedef struct { typedef struct {
@ -92,7 +90,6 @@ typedef struct {
/* 0x004 */ Vec3s* dst; /* 0x004 */ Vec3s* dst;
/* 0x008 */ Vec3s* src; /* 0x008 */ Vec3s* src;
/* 0x00C */ u8* index; /* 0x00C */ u8* index;
/* 0x010 */ char unk_10[0x2C];
} AnimationEntryType3; } AnimationEntryType3;
typedef struct { typedef struct {
@ -102,14 +99,12 @@ typedef struct {
/* 0x004 */ Vec3s* dst; /* 0x004 */ Vec3s* dst;
/* 0x008 */ Vec3s* src; /* 0x008 */ Vec3s* src;
/* 0x00C */ u8* index; /* 0x00C */ u8* index;
/* 0x010 */ char unk_10[0x2C];
} AnimationEntryType4; } AnimationEntryType4;
typedef struct { typedef struct {
/* 0x000 */ struct Actor* actor; /* 0x000 */ struct Actor* actor;
/* 0x004 */ SkelAnime* skelAnime; /* 0x004 */ SkelAnime* skelAnime;
/* 0x008 */ f32 unk_08; /* 0x008 */ f32 unk_08;
/* 0x00C */ char unk_0C[0x30];
} AnimationEntryType5; } AnimationEntryType5;
typedef struct { typedef struct {