Merge branch 'main' of https://github.com/abnormalhare/marioparty4

include/REL/m401Dll.h

@@ -8,6 +8,10 @@ extern float lbl_2_bss_12C;
 extern float lbl_2_bss_128;
 extern float lbl_2_bss_124;
 extern s16 lbl_2_bss_120;
+extern Vec lbl_2_bss_6C;
+extern Vec lbl_2_bss_60;
+extern float lbl_2_bss_50;
+extern omObjData **lbl_2_bss_118;
 
 typedef struct m401_work_player {
 	s16 unk0;
@@ -59,6 +63,10 @@ typedef struct unkwork_10A88 {
 	float unk1C;
 } UnkWork10A88;
 
+void fn_2_169C(s16 arg0);
+
+void fn_2_A8A4(omObjData *object, float x, float y, float z);
+
 void fn_2_10240(Vec *arg0, Vec *arg1);
 void fn_2_1041C(void);
 void fn_2_10710(void);
@@ -66,7 +74,7 @@ void fn_2_10710(void);
 void fn_2_1079C(void);
 omObjData *fn_2_10A88(Vec *arg0, s16 arg1);
 
-void fn_2_141B0(void);
+omObjData *fn_2_141B0(void);
 omObjData *fn_2_14640(Process *objman);
 
 #endif

include/REL/m444dll.h

@@ -0,0 +1,73 @@
+#ifndef M444DLL_H
+#define M444DLL_H
+
+#include "game/data.h"
+#include "game/hsfman.h"
+#include "game/hsfmotion.h"
+
+#include "game/sprite.h"
+
+typedef struct datalist_model {
+	s32 datanum;
+	u32 attr;
+	s16 type;
+	s16 link;
+	s16 mot_link;
+	Vec pos;
+	Vec rot;
+	Vec scale;
+} DataListModel;
+
+typedef struct datalist_sprite {
+	u32 datanum;
+	s16 attr;
+	s16 prio;
+	float x;
+	float y;
+	GXColor color;
+} DataListSprite;
+
+void fn_1_8180(s16 view);
+void fn_1_8424(void);
+void fn_1_861C(s16 arg0);
+s16 fn_1_8DD0(s16 arg0);
+
+void fn_1_9418(s16 arg0);
+void fn_1_9CAC(s16 arg0, s16 arg1);
+
+void fn_1_A060(void);
+void fn_1_C214(void);
+
+
+void fn_1_D1E0(s16 model);
+void fn_1_D558(DataListModel *model_list);
+void fn_1_D818(DataListSprite *sprite_list);
+void fn_1_D950(void);
+void fn_1_D9C8(void);
+
+extern s16 lbl_1_bss_199C2[90];
+extern s16 lbl_1_bss_1990E[90];
+extern s16 lbl_1_bss_1990A[2];
+extern s16 lbl_1_bss_19908;
+
+extern Vec lbl_1_bss_34C[3];
+extern Vec lbl_1_bss_328[3];
+extern s16 lbl_1_bss_320[4];
+extern Vec lbl_1_bss_2F0;
+extern Vec lbl_1_bss_2E4;
+extern float lbl_1_bss_2E0;
+extern s16 lbl_1_bss_2DC;
+extern s16 lbl_1_bss_2DA;
+extern s16 lbl_1_bss_2D8;
+extern s16 lbl_1_bss_2D6;
+extern s16 lbl_1_bss_2D4;
+extern s16 lbl_1_bss_2D2;
+extern s16 lbl_1_bss_2D0;
+extern s16 lbl_1_bss_2C0[8];
+extern Vec lbl_1_bss_2A8[2];
+extern Vec lbl_1_bss_290[2];
+extern float lbl_1_bss_288[2];
+
+extern DataListModel lbl_1_data_470[];
+
+#endif

include/ext_math.h

@@ -11,11 +11,14 @@ typedef struct vec2f {
 
 #define ABS(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)))
+
 #define VECDistanceXZ(a, b) sqrtf((((a)->x-(b)->x)*((a)->x-(b)->x))+(((a)->z-(b)->z)*((a)->z-(b)->z)))
 #define VECDistanceZY(a, b) sqrtf((((a)->z-(b)->z)*((a)->z-(b)->z))+(((a)->y-(b)->y)*((a)->y-(b)->y)))
 #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 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)))
 
 #define sind(x) sin(M_PI*(x)/180.0)

include/game/hsfman.h

@@ -211,7 +211,6 @@ void Hu3DLLightStaticSet(s16, s16, s32);
 s32 Hu3DModelLightInfoSet(s16, s16);
 s16 Hu3DLightSet(ModelData*, Mtx*, Mtx*, f32);
 void lightSet(LightData* arg0, s16 arg1, Mtx *arg2, Mtx *arg3, f32 arg8);
-void Hu3DReflectMapSet(AnimData* arg0);
 void Hu3DReflectNoSet(s16 arg0);
 void Hu3DFogSet(f32, f32, u8, u8, u8);
 void Hu3DFogClear(void);