Match 600+ P2 functions & VU0/splice foundations

include/alo.h

@@ -281,7 +281,7 @@ void UpdateAlo(ALO *palo, float dt);
 
 void InvalidateAloLighting(ALO *palo);
 
-void UpdateAloXfWorld__FP3ALO(ALO * palo);
+void UpdateAloXfWorld(ALO *palo);
 
 void UpdateAloXfWorldHierarchy(ALO *palo);
 

include/binoc.h

@@ -157,4 +157,6 @@ class CTextBox
     enum JV m_jv; // Vertical text justification;
 };
 
+extern "C" void open_close_binoc(BINOC *pbinoc, int state);
+
 #endif /* BINOC_H */

include/blip.h

@@ -20,11 +20,13 @@ struct RPL;
 typedef int GRFZON;
 
 /**
+ * @brief 128-bit VU scalar (the value lives in the x lane), 16-byte aligned.
+ * Passed by value in a single 128-bit GP register and stored with sq.
  * @todo Move elsewhere?
  */
 struct VU_FLOAT
 {
-    uint16_t data;
+    qword data;
 };
 
 /**

include/bsp.h

@@ -75,16 +75,16 @@ struct VBSP
  */
 struct LSG
 {
-    VECTOR apos[2];
-    VECTOR anormal[2];
+    VECTOR4 apos[2];
+    VECTOR4 anormal[2];
     float au[2];
     LSGK lsgk;
     undefined4 unk1;
     undefined8 unk2;
     EDGE *pedge;
     int iiposSwap;
     LSG *plsgNext;
-};
+} __attribute__((aligned(16)));
 
 /**
  * @brief Unknown.

include/cm.h

@@ -553,4 +553,11 @@ extern int g_rgbaFog; //Just to get the code matching -Kestin
 // extern float D_0026198c;
 // extern CM* g_pcm;
 
+void ResetCmLookAtSmooth(CM *pcm, void *pv);
+
+void SetupCmRotateToCam(CM *pcm);
+void SetCmLookAtSmooth(CM *pcm, int a1, VECTOR *pposEye, VECTOR *pposCenter, int a4, float u0, float u1, float u2, float u3, float u4, float u5);
+void ConvertCylindToWorldVelocity(void *a, void *b, void *c, float f0, float f1, float f2);
+void ConvertWorldToCylindVelocity(void *a, void *b, void *c, void *d, void *e, void *f);
+
 #endif // CM_H

include/cplcy.h

@@ -17,4 +17,6 @@ LOOKK LookkPopCplook(CPLOOK *pcplook);
 
 LOOKK LookkCurCplook(CPLOOK *pcplook);
 
+int FActiveCplcy(CPLCY *pcplcy);
+
 #endif // CPLCY_H

include/crusher.h

@@ -73,4 +73,10 @@ void InitCrbrain(CRBRAIN *pcrbrain);
 
 // TODO: Add unknown functions here.
 
+extern "C" void FUN_0014c5e8(void *p);
+
+extern "C" void FUN_0014c858(void *p);
+
+extern "C" void FUN_0014cba8(void *p);
+
 #endif // CRUSHER_H

include/font.h

@@ -124,6 +124,10 @@ extern CFont *g_pfont;
 
 void StartupFont();
 
+CFont *FUN_0015c1c0(int i);
+
+int FUN_0015c188(int i);
+
 void PostFontsLoad();
 
 #endif // FONT_H

include/frm.h

@@ -63,4 +63,6 @@ extern FRM *g_pfrmOpen;
 
 extern uchar g_abRenderLoopStack[0x20000]; // TODO: Move elsewhere?
 
+extern "C" void func_0015F618(int, int);
+
 #endif // FRM_H

include/game.h

@@ -251,7 +251,7 @@ void StartupGame();
 
 // LevelLoadData * search_level_by_load_data(LevelLoadData *search_level);
 
-// LevelLoadData * search_level_by_id(int search_id);
+extern "C" LevelLoadData *search_level_by_id(int search_id);
 
 /**
  * @brief Gets the friendly name of a level from its world ID.
@@ -401,7 +401,7 @@ bool FCharmAvailable();
  * @param pls Pointer to level state.
  * @param param_2 OID of the dialog.
  */
-//int PfLookupDialog(LS *pls, OID oidDialog);
+int *PfLookupDialog(LS *pls, OID oidDialog);
 
 /**
  * @brief Clears 8 bytes of memory.

include/glbs.h

@@ -13,6 +13,7 @@
 
 // Forward.
 struct UV;
+struct UVF;
 
 /**
  * @brief (?) kind.
@@ -92,9 +93,9 @@ struct GLBS
 
     void SetNormal(VECTOR *ppos); // Might be SetPos?
 
-    void SetRgba(RGBA &rgba); // Might not be correct.
+    void SetRgba(RGBA *prgba);
 
-    void SetUv(UV *puv);
+    void SetUv(UVF *puv);
 
     void SetVtx(int fAdc);
 };

include/gomer.h

@@ -29,4 +29,6 @@ struct GOMER : public STEPGUARD
     /* 0xc40 */ int fAbandonExternal;
 };
 
+void PostGomerLoad(GOMER *pgomer);
+
 #endif // GOMER_H

include/gs.h

@@ -55,4 +55,10 @@ void ClearFrameBuffers();
 
 void UploadBitmaps(GRFZON grfzon, GSB *pgsb);
 
+struct GIFS;
+
+int FBuildUploadBitmapGifs(GRFZON grfzon, GSB *pgsb, GIFS *pgifs);
+
+void PropagateSurs();
+
 #endif // GS_H

include/hide.h

@@ -6,8 +6,19 @@
 
 #include "common.h"
 
+/**
+ * @todo Implement the HPNT and HSHAPE structs.
+ */
+struct HPNT;
+struct HSHAPE;
+struct VECTOR;
+
 // ...
 
 void StartupHide();
 
+void GetHshapeHidePos(HSHAPE *phshape, float s, VECTOR *ppos, float *pf);
+
+void GetHpntClosestHidePos(HPNT *phpnt, VECTOR *ppos, float *pf);
+
 #endif // HIDE_H

include/jp.h

@@ -0,0 +1,14 @@
+/**
+ * @file jp.h
+ */
+#ifndef JP_H
+#define JP_H
+
+#include "common.h"
+
+struct JT;
+struct LOCKG;
+
+extern "C" void func_001781E0(JT *pjt, LOCKG *plockg);
+
+#endif // JP_H

include/jt.h

@@ -78,7 +78,6 @@ enum JTBS
     JTBS_Zap_Electric = 34,
     JTBS_Zap_Fire = 35,
     JTBS_Zap_Water = 36,
-    // ...
     JTBS_Unk_54 = 54,
     JTBS_Unk_55 = 55
 
@@ -103,7 +102,6 @@ enum JTHS
  */
 enum JTCS
 {
-    // ...
 };
 
 /**
@@ -145,14 +143,14 @@ struct JT : public STEP
     STRUCT_PADDING(930);
     undefined2 padding0_extra;
 
-    ALO *paloMine_0x1518;   // 0x1518
+    ALO *paloMine_0x1518;
 
     STRUCT_PADDING(832);
     undefined2 padding1_extra;
 
-    JTS jts;                // 0x2220
+    JTS jts;
     int unk_0x2224;
-    JTBS jtbs;              // 0x2228
+    JTBS jtbs;
 
     STRUCT_PADDING(328);
     undefined1 padding2_extra;
@@ -179,6 +177,11 @@ void SetJtJts(JT *pjt, JTS jts, JTBS jtbs);
  */
 void ProfileJt(JT *pjt, int fProfile);
 
+struct XMG;
+struct ACTADJ;
+
+int FMatchJtXmg(JT *pjt, XMG *pxmg, ACTADJ *pactadj);
+
 extern JT *g_pjt;
 
 #endif // JT_H

include/mat.h

@@ -14,6 +14,8 @@
 struct MATRIX4
 {
 	float mat[4][4];
+
+	void PostCopyMatrix3();
 };
 
 /**
@@ -25,7 +27,6 @@ struct MATRIX3
 	float mat[3][3];
 };
 
-void PostCopyMatrix3(MATRIX4 *pmat);
 
 MATRIX3 *MatMulMatTransMat(MATRIX3 *matLeft, MATRIX3 *matRight);
 

include/mpeg.h

@@ -28,4 +28,12 @@ void StartupMpeg();
 
 extern CMpeg g_mpeg;
 
+extern "C" void FUN_0018f0e8(CMpeg *pmpeg, void *pv);
+
+extern "C" int FAccept__10CMpegAudioiPUc(void *pmpega, int cb, uchar *pb);
+
+extern "C" void CbDemuxed__5CMpegi(CMpeg *pmpeg, int nParam);
+
+extern "C" void Execute__5CMpeg(CMpeg *pmpeg, OID *poid);
+
 #endif // MPEG_H

include/path.h

@@ -6,6 +6,11 @@
 
 #include "common.h"
 
-// ...
+struct CG;
+struct VECTOR;
+
+int CposFindPath(CG *pcg, VECTOR *pvec0, VECTOR *pvec1, int n, VECTOR *pvec2);
+
+void FindClosestPointInCg(CG *pcg, VECTOR *pvec0, VECTOR *pvec1);
 
 #endif // PATH_H

include/pipe.h

@@ -6,6 +6,7 @@
 
 #include "common.h"
 #include <lo.h>
+#include <vec.h>
 
 /**
  * @class PIPE
@@ -16,7 +17,12 @@ struct PIPE : public LO
 {
     /* 0x34 */ undefined4 unk;
     /* 0x38 */ DLE dlePipe;
-    /* 0x40 */ STRUCT_PADDING(9);
+    /* 0x40 */ VU_VECTOR normal; // TODO: Verify name.
+    /* 0x50 */ int unk_0x50;
+    /* 0x54 */ int unk_0x54;
+    /* 0x58 */ int unk_0x58;
+    /* 0x5C */ float unk_0x5c;
+    /* 0x60 */ STRUCT_PADDING(1);
     /* 0x64 */ OID oid; // TODO: Verify name.
     /* 0x68 */ LO *plo; // TODO: Verify type and name.
 };

include/puffer.h

@@ -96,4 +96,6 @@ int FCanPuffcAttack(PUFFC *ppuffc);
 
 void PostPuffbLoad(PUFFB *ppuffb);
 
+extern "C" void FUN_001973d8(void *p);
+
 #endif // PUFFER_H

include/rumble.h

@@ -88,6 +88,8 @@ void TriggerRumbleRumk(RUMBLE *prumble, RUMK rumk, float dt);
 
 void SetRumbleRums(RUMBLE *prumble, RUMS rums);
 
+void TriggerRumbleRumpat(RUMBLE *prumble, RUMPAT *prumpat, float dt);
+
 void StopRumbleActuators(RUMBLE *prumble);
 
 #endif // RUMBLE_H

include/rwm.h

@@ -94,4 +94,6 @@ void GetRwacPan(RWAC *prwac, float *pradPan);
 
 void GetRwacTilt(RWAC *prwac, float *pradTilt);
 
+extern "C" void FUN_001a93c8(RWM *prwm);
+
 #endif // RWM_H

include/sce/libs.h

@@ -0,0 +1,13 @@
+/**
+ * @file sce/libs.h
+ *
+ * @brief Declarations for SDK library functions (asm/sce/libs.s).
+ */
+#ifndef SCE_LIBS_H
+#define SCE_LIBS_H
+
+extern "C" int func_00202120();
+extern "C" void func_00202058(int);
+extern "C" void *memmove(void *dst, const void *src, int cb);
+
+#endif // SCE_LIBS_H

include/screen.h

@@ -387,4 +387,8 @@ void UpdateAttract(ATTRACT *pattract);
 
 void DrawLineScreen(uint x1, uint y1, uint z1, uint x2, uint y2, uint z2, RGBA *rgba, int fDepthTest);
 
+extern "C" char FUN_001aea08(void);
+
+extern "C" void FUN_001aea70(int, int);
+
 #endif // SCREEN_H

include/sensor.h

@@ -65,13 +65,10 @@ struct SENSOR : public SO
     STRUCT_PADDING(2);
     /* 0x564 */ uint ctriggerObjects; // Current count of trigger object IDs.
     /* 0x568 */ OID atriggerObjects[4]; // Array of trigger object IDs.
-    STRUCT_PADDING(4);
     /* 0x578 */ uint cnoTriggerObjects; // Current count of no-trigger object IDs.
     /* 0x57C */ OID anoTriggerObjects[4]; // Array of no-trigger object IDs.
-    STRUCT_PADDING(4);
     /* 0x58c */ uint ctriggerClasses; // Current count of trigger class IDs.
     /* 0x590 */ CID atriggerClasses[4]; // Array of trigger class IDs.
-    STRUCT_PADDING(4);
     /* 0x5a0 */ uint cnoTriggerClasses; // Current count of no-trigger class IDs.
     /* 0x5a4 */ CID anoTriggerClasses[4]; // Array of no-trigger class IDs.
 };