mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-26 23:47:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into skelanime

Browse Source
This commit is contained in:
KrimtonZ
2020-03-24 11:56:37 -05:00
parent ac4a51bf8f 4eb7f023f3
commit 8bbac143cd
505 changed files with 1437 additions and 2808 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+4 -2
View File
@@ -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(?);
include/z64actor.h
+1 -2
View File
@@ -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;
include/z64scene.h
+2 -2
View File
@@ -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 {