collinfo.cpp progress

include/Matrixf.h

@@ -13,28 +13,7 @@ struct Quat;
  * Explicit constructors show up in recursion. Implicit does not.
  */
 struct Matrixf {
-	inline Matrixf() { }
-	// // TODO: Determine if this could've actually existed, or if I'm just making
-	// // it up.
-	inline Matrixf(const Mtx mtx)
-	{
-		mMatrix.mtxView[0][0] = mtx[0][0];
-		mMatrix.mtxView[0][1] = mtx[0][1];
-		mMatrix.mtxView[0][2] = mtx[0][2];
-		mMatrix.mtxView[0][3] = mtx[0][3];
-		mMatrix.mtxView[1][0] = mtx[1][0];
-		mMatrix.mtxView[1][1] = mtx[1][1];
-		mMatrix.mtxView[1][2] = mtx[1][2];
-		mMatrix.mtxView[1][3] = mtx[1][3];
-		mMatrix.mtxView[2][0] = mtx[2][0];
-		mMatrix.mtxView[2][1] = mtx[2][1];
-		mMatrix.mtxView[2][2] = mtx[2][2];
-		mMatrix.mtxView[2][3] = mtx[2][3];
-	}
-	/**
-	 * @reifiedAddress{80137300}
-	 * @reifiedFile{plugProjectKandoU/collinfo.cpp}
-	 */
+
 	f32& operator()(int p1, int p2) { return mMatrix.mtxView[p1][p2]; }
 
 	Vector3f operator*(Vector3f& vec)

include/Platform.h

@@ -26,4 +26,14 @@ struct Platform : CNode {
 	Sys::OBBTree* mTriDivider; // _18
 };
 
+// this is stripped, but needed to generate weak dtors in collinfo.cpp
+struct AgePlatform : public Platform {
+	AgePlatform();
+
+	virtual ~AgePlatform() { }
+
+	// _00     = VTBL
+	// _00-_18 = Platform
+};
+
 #endif

include/sysMath.h

@@ -4,6 +4,10 @@
 #include "JSystem/JMath.h"
 #include "Dolphin/math.h"
 
+template <typename T>
+struct Vector3;
+
+Vector3<f32> CRSplineTangent(f32 t, Vector3<f32>* controls);
 f32 pikmin2_sinf(f32 x);
 f32 pikmin2_cosf(f32 x);
 f32 pikmin2_atan2f(f32 x, f32 y);