diff options
| author | KrimtonZ <krimtonz@gmail.com> | 2020-03-24 11:56:37 -0500 |
|---|---|---|
| committer | KrimtonZ <krimtonz@gmail.com> | 2020-03-24 11:56:37 -0500 |
| commit | 8bbac143cd9a101b2cdd2c80f3531d5cc104ca8a (patch) | |
| tree | 3b9aae76ff4e5200884f593d2db69254d9709c3f /include | |
| parent | ac4a51bf8fdc93221d4ba674351b683d0eedfd9b (diff) | |
| parent | 4eb7f023f348151fb73f4a0850a6f348280d7805 (diff) | |
Merge branch 'master' into skelanime
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 6 | ||||
| -rw-r--r-- | include/z64actor.h | 3 | ||||
| -rw-r--r-- | include/z64scene.h | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/include/functions.h b/include/functions.h index 1d0668aea..d0ca02700 100644 --- a/include/functions.h +++ b/include/functions.h @@ -800,7 +800,7 @@ void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos2, s32 radius // ? func_8006BE88(?); // ? func_8006BF1C(?); // ? func_8006C0FC(?); -u16 func_8006C360(GlobalContext*, u32); +u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet); // ? func_8006C3A0(?); // ? func_8006C3D0(?); void func_8006C438(GlobalContext* globalCtx, s16 arg1); @@ -1005,7 +1005,9 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2); void func_80088B34(s16 arg0); void Interface_Draw(GlobalContext* globalCtx); void Interface_Update(GlobalContext* globalCtx); -f32 func_8008E520(Actor* actor, Path* path, s16, s16*); +Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max); +f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw); +void Path_CopyLastPoint(Path* path, Vec3f* dest); // ? func_8008E6A0(?); // ? func_8008E6AC(?); // ? func_8008E750(?); diff --git a/include/z64actor.h b/include/z64actor.h index 4b986b4d6..9a18e6d5c 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -144,8 +144,7 @@ typedef struct Actor { /* 0x094 */ f32 yDistanceFromLink; /* 0x098 */ SubActorStruct98 sub_98; /* 0x0B4 */ ActorShape shape; - /* 0x0CC */ Vec3f unk_CC; // Used in Link, not Deku Babas - /* 0x0D8 */ Vec3f unk_D8; // Used in Link, not Deku Babas + /* 0x0CC */ Vec3f unk_CC[2]; /* 0x0E4 */ Vec3f unk_E4; // Stores result of some vector transformation involving actor xyz vector, and a matrix at Global Context + 11D60 /* 0x0F0 */ f32 unk_F0; // Related to above /* 0x0F4 */ f32 unk_F4; diff --git a/include/z64scene.h b/include/z64scene.h index d6b87447d..28db2047e 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -328,8 +328,8 @@ typedef struct { } WaterBoxHeader; typedef struct { - /* 0x00 */ u8 count; // Total number of points in the path for the actor to follow - /* 0x04 */ Vec3s* path; // Segment Address of the start of the path list + /* 0x00 */ u8 count; // number of points in the path + /* 0x04 */ Vec3s* points; // Segment Address to the array of points } Path; // size = 0x8 typedef union { |