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/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,6 @@ 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);
+
 #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/font.h

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

include/glbs.h

@@ -13,6 +13,7 @@
 
 // Forward.
 struct UV;
+struct UVF;
 
 /**
  * @brief (?) kind.
@@ -94,7 +95,7 @@ struct GLBS
 
     void SetRgba(RGBA &rgba); // Might not be correct.
 
-    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/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;

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/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/so.h

@@ -17,15 +17,20 @@
 #include <sm.h>
 #include <cm.h>
 
-// Forward.
 class CBinaryInputStream;
 struct XA;
 struct XP;
 struct RO;
 struct WKR;
 struct ZPR;
 struct WATER;
-struct CNSTR;
+/**
+ * @brief Constraint kind, an index into the s_acnstre table (see
+ * ConstrFromCnstr); each entry resolves to a CT and a normal vector.
+ */
+enum CNSTR
+{
+};
 struct CONSTR;
 struct SURFX;
 
@@ -37,7 +42,6 @@ typedef int GRFFSO;
  */
 enum EGK
 {
-    // ...
 };
 
 /**
@@ -162,7 +166,7 @@ void SetSoMass(SO *pso, float m);
 
 void AdjustSoMomint(SO *pso, float r);
 
-void DiscardSoXps(SO *pso);
+extern "C" void DiscardSoXps__FP2SO(SO *pso, int mode);
 
 void UpdateSoPosWorldPrev(SO *pso);
 
@@ -286,4 +290,6 @@ int FAbsorbSoWkr(SO *pso, WKR *pwkr);
 
 void CloneSoPhys(SO *pso, SO *psoPhys, int cposExtra);
 
+extern "C" void FUN_001bc4d8(uint8_t *param_1, uint8_t *param_2);
+
 #endif // SO_H

include/sound.h

@@ -256,6 +256,11 @@ void StartSound(SFXID sfxid, AMB **ppamb, ALO *palo, VECTOR *ppos, float sStart,
  */
 void StopSound(AMB *pamb, int msRampdown);
 
+// The symbol's GCC2 mangling says (int, unsigned char), but the ROM call
+// sites pass the second argument as a plain word with no narrowing, so the
+// in-game declaration must have taken ints; bind by literal symbol name.
+extern "C" void SetAMRegister__FiUc(int n, int bReg);
+
 /**
  * @brief TODO
  */

include/splice/bif.h

@@ -17,6 +17,12 @@ class CFrame;
  */
 enum BIFK
 {
+    // ...
+    BIFK_SetCar = 35,
+    BIFK_SetCdr = 36,
+    // ...
+    BIFK_HitTestObjects = 113,
+    BIFK_HitTestObjectsFirst = 114,
     // ...
     BIFK_AddO = 99,
     BIFK_EnsureO = 100,

include/splice/eval.h

@@ -6,6 +6,13 @@
 
 #include "common.h"
 
+// Forward.
+class CRef;
+class CPair;
+class CFrame;
+
+CRef RefEvalSymbol(CPair *ppair, CFrame *pframe);
+
 // ...
 
 #endif // SPLICE_EVAL_H

include/splice/frame.h

@@ -19,10 +19,10 @@ class CFrame
 public:
     void SetSingleParent(CFrame *pframeParent);
     void AddParent(CFrame *pframeParent);
-    CFrame *RefAddBinding(int symid, CRef * pref);
-    CFrame *RefSetBinding(int symid, CRef *pref);
-    int FFindBinding(int symid, int fRecursive, CRef *pref);
-    CRef *PrefFindBinding(int symid, int fRecursive);
+    CRef RefAddBinding(uint symid, CRef *pref);
+    CRef RefSetBinding(uint symid, CRef *pref);
+    int FFindBinding(uint symid, int fRecursive, CRef *pref);
+    CRef *PrefFindBinding(uint symid, int fRecursive);
     void CloneTo(CFrame *pframeClone);
 };
 

include/splice/ref.h

@@ -102,8 +102,8 @@ class CRef
     void SetSmp(SMP *psmp);
     void SetBasic(BASIC *pbasic);
     void SetMethod(CMethod *pmethod);
-    int RefCoerceS32() const;
-    float RefCoerceF32() const;
+    CRef RefCoerceS32();
+    CRef RefCoerceF32();
 };
 
 #endif // SPLICE_REF_H

include/splice/sidebag.h

@@ -30,9 +30,9 @@ class CSidebag
     SBB m_asbb[16];
 
 public:
-    CSidebag& RefAddBinding(int n, CRef *pref);
+    CRef RefAddBinding(int n, CRef *pref);
 
-    CSidebag& RefSetBinding(int n, CRef *pref);
+    CRef RefSetBinding(int n, CRef *pref);
 
     bool FFindBinding(int n, CRef *pref);
 

include/splice/splotheap.h

@@ -43,6 +43,12 @@ extern CSplotheap g_splotheapUnk1;
 extern CSplotheap g_splotheapProc;
 extern CSplotheap g_splotheapMethod;
 
+// Sidebag binding-node helpers: allocate a node {int n; CRef ref; pNext}
+// from g_splotheapUnk1, and recursively clone a node list.
+class CFrame;
+extern "C" void *FUN_0011C498();
+extern "C" void FUN_0011C418(void *psbbFrom, void *psbbTo, CFrame *pframe);
+
 static void *PvFromPsplot(SPLOT *psplot);
 static SPLOT *PsplotFromPv(void *pv);
 bool FIsPvGarbage(void *pv);

include/splice/vecmat.h

@@ -11,6 +11,8 @@
 
 VECTOR *PvectorNew();
 
+MATRIX4 *PmatrixNew();
+
 void IncrefVector(VECTOR *pvector);
 
 void DecrefVector(VECTOR *pvector);

include/stepguard.h

@@ -260,6 +260,8 @@ void SetSggSggs(SGG *psgg, SGGS sggs);
 
 void AssignSggSearchPoints(SGG *psgg);
 
+struct PUFFC;
+extern "C" void FUN_001c8920(PUFFC *ppuffc);
 /**
  * @brief Checks the struct has a 0 on an address, no idea what it means.
  * @todo Figure out what this actually does and give it a better name.

include/vec.h

@@ -9,6 +9,7 @@
 #include "common.h"
 
 struct SO;
+struct VU_VECTOR;
 
 /**
  * @brief Vector3 with X, Y, and Z
@@ -17,6 +18,8 @@ struct SO;
 struct VECTOR
 {
     float x, y, z;
+
+    VECTOR &operator=(VU_VECTOR vuvec);
 };
 
 struct VECTOR4
@@ -25,11 +28,15 @@ struct VECTOR4
 };
 
 /**
- * @todo Should be 16-byte aligned.
+ * @brief 128-bit VU quadword vector (x, y, z, w), 16-byte aligned. Passed by
+ * value in a single 128-bit GP register and loaded/stored with lq/sq.
  */
 struct VU_VECTOR
 {
-    ushort data;
+    qword data;
+
+    VU_VECTOR() {}
+    VU_VECTOR(const VECTOR &vec);
 };
 
 /**

include/water.h

@@ -25,7 +25,9 @@ struct WATER : public SO
 {
     /* 0x550 */ XA *pxaFirst;
     /* 0x554 */ MRG mrg;
-    STRUCT_PADDING(8); // 0x564 .. 0x584
+    STRUCT_PADDING(3); // 0x564 .. 0x570
+    /* 0x570 */ VU_VECTOR vecCurrent;
+    STRUCT_PADDING(1); // 0x580 .. 0x584
     /* 0x584 */ int unk_0x584;
     /* 0x588 */ int unk_0x588;
     STRUCT_PADDING(1); // 0x58c .. 0x590

src/P2/989snd.c

@@ -228,30 +228,6 @@ JUNK_ADDIU(10);
 JUNK_ADDIU(10);
 
 INCLUDE_ASM("asm/nonmatchings/P2/989snd", snd_GotReturns__Fv);
-#ifdef SKIP_ASM
-// Rodata
-int snd_GotReturns(void)
-{
-    FlushCache(0);
-    if (gCommBusy == NULL) {
-        return 1;
-    }
-
-    if (sceSifCheckStatRpc(&gSLClientData.rpcd)) {
-        return 0;
-    }
-
-    if (*gCommBusy == -1 && (gCommBusy[gAwaitingInts + 1] == -1)) {
-        gCommBusy = NULL;
-        return 1;
-    } else {
-        printf("989snd.c: Sif says RPC isn\'t busy, but we still don\'t have returns from the  IOP!\n");
-        return 0;
-    }
-
-    return 1;
-}
-#endif
 
 void snd_PrepareReturnBuffer(u_int* buffer, int num_ints)
 {