Merge branch 'master' into z_en_tk

include/fp.h

@@ -0,0 +1,34 @@
+#ifndef _FP_H_
+#define _FP_H_
+#include <ultra64.h>
+
+extern f32 qNaN0x3FFFFF;
+extern f32 qNaN0x10000;
+extern f32 sNaN0x3FFFFF;
+
+f32 floorf(f32 x);
+f64 floor(f64 x);
+s32 lfloorf(f32 x);
+s32 lfloor(f64 x);
+
+f32 ceilf(f32 x);
+f64 ceil(f64 x);
+s32 lceilf(f32 x);
+s32 lceil(f64 x);
+
+f32 truncf(f32 x);
+f64 trunc(f64 x);
+s32 ltruncf(f32 x);
+s32 ltrunc(f64 x);
+
+f32 nearbyintf(f32 x);
+f64 nearbyint(f64 x);
+s32 lnearbyintf(f32 x);
+s32 lnearbyint(f64 x);
+
+f32 roundf(f32 x);
+f64 round(f64 x);
+s32 lroundf(f32 x);
+s32 lround(f64 x);
+
+#endif

include/functions.h

@@ -393,6 +393,7 @@ s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, s
 s16 func_800347E8(s16 arg0);
 void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc1, void* unkFunc2, Actor* actor, s16 alpha);
 void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc1, void* unkFunc2, Actor* actor, s16 alpha);
+void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2);
 void Actor_Noop(Actor* actor, GlobalContext* globalCtx);
 void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist);
 void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist);
@@ -989,6 +990,7 @@ 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*);
 // ? func_8008E6A0(?);
 // ? func_8008E6AC(?);
 // ? func_8008E750(?);
@@ -2162,19 +2164,19 @@ void SystemHeap_Init(void *start, u32 size);
 // ? func_800FCC24(?);
 // ? func_800FCC6C(?);
 // ? func_800FCD40(?);
-// ? func_800FCE80(?);
-// ? func_800FCF34(?);
-// ? func_800FCF54(?);
-// ? func_800FCFA0(?);
-// ? func_800FD0C4(?);
-// ? func_800FD210(?);
-f32 func_800FD250(f32 f12, f32 f14);
-// ? func_800FD338(?);
-// ? func_800FD390(?);
-// ? func_800FD3C8(?);
-// ? func_800FD400(?);
-// ? func_800FD438(?);
-// ? func_800FD470(?);
+f32 Math_tanf(f32 x);
+f32 Math_nearbyintf(f32 x);
+f32 Math_atanf_taylor_q(f32 x);
+f32 Math_atanf_taylor(f32 x);
+f32 Math_atanf_cfrac(f32 x);
+f32 Math_atanf(f32 x);
+f32 Math_atan2f(f32 y, f32 x);
+f32 Math_asinf(f32 x);
+f32 Math_acosf(f32 x);
+f32 ceilf(f32 x);
+f32 truncf(f32 x);
+f32 roundf(f32 x);
+f32 nearbyintf(f32 x);
 void SystemArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action);
 void* SystemArena_Malloc(u32 size);
 void* SystemArena_MallocDebug(u32 size, const char* file, s32 line);

include/math.h

@@ -2,6 +2,7 @@
 #define _MATH_H_
 
 #define M_PI 3.14159265358979323846f
+#define M_SQRT2 1.41421356237309504880f
 #define FLT_MAX 340282346638528859811704183484516925440.0f
 
 float sinf(float);

include/variables.h

@@ -565,10 +565,6 @@ extern Scene gSceneTable[110];
 extern u8 gLetterTLUT[4][32]; // original name: "moji_tlut"
 extern u8 gFontFF[]; // original name: "font_ff"
 //extern ? D_8012ABF0;
-//extern ? D_8012AC00;
-//extern ? D_8012AC28;
-//extern ? D_8012AC40;
-//extern ? D_8012AC58;
 //extern ? D_8012AC90;
 //extern ? D_8012ACA0;
 //extern ? D_8012AD20;
@@ -3145,7 +3141,6 @@ extern char D_80146238[];
 //extern ? D_8014AA38;
 //extern ? D_8014AA5C;
 //extern ? D_8014AA80;
-//extern ? D_8014AAC0;
 //extern ? D_8014B210;
 //extern ? D_8014B280;
 //extern ? D_8014B2E0;
@@ -3473,7 +3468,7 @@ extern GlobalContext* D_80157DA0;
 extern SaveContext gSaveContext; // 0x8015E660
 extern u32 D_8015FA88;
 extern u32 D_8015FA8C;
-extern GameInfo* gGameInfo;
+extern GameInfo* gGameInfo; // 0x8015FA90
 //extern ? D_8015FA98;
 //extern ? D_8015FA9B;
 //extern ? D_8015FC18;
@@ -3852,7 +3847,6 @@ extern u32 D_8016B5F5;
 //extern ? D_80174DBC;
 //extern ? D_80174DC0;
 //extern ? D_801755D0;
-//extern ? D_80175600;
 extern u32 __osMalloc_FreeBlockTest_Enable;
 //extern ? D_80175640;
 //extern ? D_80175660;

include/z64.h

@@ -163,7 +163,9 @@ typedef struct
     /* 0x1360 */ s32          scene_setup_index;
     /* 0x1364 */ s32          respawn_flag; // "restart_flag"
     /* 0x1368 */ RespawnData  respawn[3]; // "restart_data"
-    /* 0x13BC */ char         unk_13BC[0x000B];
+    /* 0x13BC */ char         unk_13BC[0x0008];
+    /* 0x13C4 */ s16          dogParams;
+    /* 0x13C6 */ char         unk_13C6[0x0001];
     /* 0x13C7 */ u8           unk_13C7;
     /* 0x13C8 */ u16          nayrus_love_timer;
     /* 0x13CA */ char         unk_13CA[0x0002];
@@ -207,7 +209,7 @@ typedef struct
     /* 0x1418 */ u8           fade_duration;
     /* 0x1419 */ u8           unk_1419; // transition related
     /* 0x141A */ u16          environment_time;
-    /* 0x141C */ u8           unk_141C;
+    /* 0x141C */ u8           dogIsLost;
     /* 0x141D */ u8           transition_type;
     /* 0x141E */ char         unk_141E[0x0002];
     /* 0x1420 */ s16          world_map_area;
@@ -1019,6 +1021,17 @@ typedef struct LoadedParticleEntry
     /* 0x005F */ u8 type;
 } LoadedParticleEntry; // size = 0x60
 
+// Some animation related structure
+typedef struct
+{
+    /* 0x00 */ u32      animation;
+    /* 0x04 */ f32      playbackSpeed;
+    /* 0x08 */ f32      unk_08;
+    /* 0x0C */ f32      frameCount;
+    /* 0x10 */ u8       unk_10;
+    /* 0x14 */ f32      transitionRate;
+} struct_80034EC0_Entry; // size = 0x18
+
 typedef struct
 {
     /* 0x00 */ u8 limbCount;
@@ -1026,7 +1039,7 @@ typedef struct
     /* 0x02 */ u8 dListCount;
     /* 0x03 */ char unk_03[0x01]; /* Probably Padding */
     /* 0x04 */ u32 limbIndex;
-    /* 0x08 */ u32 animCurrent;
+    /* 0x08 */ u32* animCurrent;
     /* 0x0C */ char unk_0C[0x04];
     /* 0x10 */ f32 animFrameCount;
     /* 0x14 */ f32 unk_14;

include/z64scene.h

@@ -396,6 +396,12 @@ typedef struct
 	s32 properties;
 } 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
+} Path; // size = 0x8
+
 typedef union
 {
     SCmdBase              base;