Merge branch 'Rainchus:main' into main

include/REL/m408Dll.h

@@ -0,0 +1,56 @@
+#ifndef M408DLL_H
+#define M408DLL_H
+
+#include "game/object.h"
+
+typedef struct work_2FAC {
+	u16 unk0;
+	u16 unk2;
+	u32 unk4;
+	u32 unk8;
+	float unkC;
+	u32 unk10;
+	u32 unk14;
+	u32 unk18;
+	Vec unk1C;
+	Vec unk28;
+	Vec unk34;
+	Vec unk40;
+	Vec unk4C;
+	Vec unk58;
+	float unk64;
+	Vec unk68;
+	u32 unk74;
+	u32 unk78;
+	float unk7C[2];
+	float unk84[2];
+	s16 unk8C;
+	u16 unk8E;
+	float unk90;
+	Vec unk94;
+	Vec unkA0;
+	Vec unkAC;
+	Vec unkB8;
+} Work2FAC;
+
+void fn_1_67C4(u16 arg0, u16 arg1);
+u32 fn_1_6878(void);
+float fn_1_6888(void);
+Work2FAC *fn_1_68A8(s32 arg0);
+void fn_1_817C(Vec *arg0, Vec *arg1);
+void fn_1_84C4(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5);
+float fn_1_883C(float arg0, float arg1, float arg2);
+void fn_1_C3C0(Vec *arg0, Vec *arg1);
+u32 fn_1_C43C(void);
+s32 fn_1_CE68(void);
+void fn_1_CEEC(void);
+void fn_1_8958(Process *objman);
+void fn_1_C44C(Process *objman);
+s32 fn_1_11670(void);
+void fn_1_118D0(Process *objman);
+s32 fn_1_162CC(Vec *arg0, Vec *arg1);
+
+extern s32 lbl_1_bss_44;
+extern s32 lbl_1_bss_40;
+
+#endif

include/REL/m416Dll.h

@@ -0,0 +1,16 @@
+#ifndef M416DLL_H
+#define M416DLL_H
+
+#include "game/object.h"
+#include "game/hsfman.h"
+
+s32 fn_1_1240(void);
+void fn_1_1250(s32 arg0);
+void fn_1_613C(ModelData *model, ParticleData *particle, Mtx matrix);
+void fn_1_79D0(Process *objman);
+void fn_1_7A54(void);
+void fn_1_8EB4(s16 model);
+void fn_1_8F60(float arg0);
+void fn_1_8FF4(float arg0);
+
+#endif

include/dolphin/gx/GXVert.h

@@ -102,6 +102,12 @@ static inline void GXPosition3s16(const s16 x, const s16 y, const s16 z) {
   GXWGFifo.s16 = z;
 }
 
+static inline void GXPosition3u8(const u8 x, const u8 y, const u8 z) {
+  GXWGFifo.u8 = x;
+  GXWGFifo.u8 = y;
+  GXWGFifo.u8 = z;
+}
+
 static inline void GXPosition3f32(const f32 x, const f32 y, const f32 z) {
   GXWGFifo.f32 = x;
   GXWGFifo.f32 = y;

include/ext_math.h

@@ -10,6 +10,8 @@ typedef struct vec2f {
 } Vec2f;
 
 #define ABS(x) (((x) < 0) ? -(x) : (x))
+#define ABS_INV(x) (((x) >= 0) ? (x) : -(x))
+
 
 #define VECDistanceXYZ(a, b) sqrtf((((a)->x-(b)->x)*((a)->x-(b)->x))+(((a)->y-(b)->y)*((a)->y-(b)->y))+(((a)->z-(b)->z)*((a)->z-(b)->z)))
 
@@ -18,6 +20,8 @@ typedef struct vec2f {
 #define VECSumXZ(a, b) sqrtf((((a)->x+(b)->x)*((a)->x+(b)->x))+(((a)->z+(b)->z)*((a)->z+(b)->z)))
 
 #define VECMagXZ(a) sqrtf(((a)->x*(a)->x)+((a)->z*(a)->z))
+#define VECMagXY(a) sqrtf(((a)->x*(a)->x)+((a)->y*(a)->y))
+
 #define VECMag2Point(a) (((a)->x*(a)->x)+((a)->y*(a)->y)+((a)->z*(a)->z))
 #define VECMagPoint(x, y, z) sqrtf(((x)*(x))+((y)*(y))+((z)*(z)))
 

include/game/audio.h

@@ -13,7 +13,7 @@ typedef struct hu_snd_grp_data {
 } HuSndGrpData;
 
 void HuAudInit(void);
-s32 HuAudStreamPlay(void);
+s32 HuAudStreamPlay(char *name, s32 arg1);
 void HuAudStreamVolSet(s16 vol);
 void HuAudStreamPauseOn(void);
 void HuAudStreamPauseOff(void);

include/game/hsfanim.h

@@ -32,8 +32,8 @@ typedef struct {
 typedef struct particle_data {
     /* 0x00 */ s16 unk_00;
     /* 0x02 */ s16 unk_02;
-    /* 0x04 */ float unk_04;
-    /* 0x08 */ char unk_08[0x14];
+    /* 0x04 */ Vec unk_04;
+    /* 0x04 */ Vec unk_10;
     /* 0x1C */ void *unk_1C;
     /* 0x20 */ s16 unk_20;
     /* 0x22 */ s16 unk_22;

include/game/hsfdraw.h

@@ -28,6 +28,23 @@ typedef struct {
     /* 0x40 */ char unk40[4];
 } HsfdrawStruct01; // Size 0x44
 
+typedef struct hsf_draw_data {
+    s32 dlOfs;
+    s32 dlSize;
+    u16 polyCnt;
+    u32 flags;
+} HsfDrawData;
+
+typedef struct hsf_const_data {
+    u32 flags;
+    s16 hook;
+    HsfDrawData *drawData;
+    void *dlBuf;
+    Mtx matrix;
+    AnimData *hiliteMap;
+} HsfConstData;
+
+
 void Hu3DDrawPreInit(void);
 void Hu3DDraw(ModelData *arg0, Mtx arg1, Vec *arg2);
 s32 ObjCullCheck(HsfData *arg0, HsfObject *arg1, Mtx arg2);

include/game/hsfformat.h

@@ -159,16 +159,6 @@ typedef struct hsf_face {
     float nbt[3];
 } HsfFace;
 
-typedef struct hsf_const_data {
-    u32 flags;
-    s16 hook;
-    u8 unk6[2];
-    void *unk08;
-    void *unk0C;
-    Mtx unk10;
-    AnimData *hilite_map;
-} HsfConstData;
-
 typedef struct hsf_transform {
     Vec pos;
     Vec rot;
@@ -312,10 +302,11 @@ typedef struct hsf_light {
     float ref_brightness;
     float cutoff;
 } HsfLight;
+
 typedef struct hsf_object {
     char *name;
     u32 type;
-    HsfConstData *constData;
+    void *constData;
     u32 flags;
     union {
         HsfObjectData data;

include/game/hsfman.h

@@ -242,5 +242,6 @@ extern s32 shadowModelDrawF;
 extern s16 Hu3DCameraNo;
 extern s16 Hu3DCameraBit;
 extern s16 Hu3DPauseF;
+extern GXColor BGColor;
 
 #endif