TheOnlyZac · lindskogen · Jun 5, 2026 · Jun 5, 2026 · Jun 6, 2026 · Jun 6, 2026
diff --git a/config/symbol_addrs.txt b/config/symbol_addrs.txt
diff --git a/include/alo.h b/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);
 

diff --git a/include/binoc.h b/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 */
diff --git a/include/blip.h b/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;
 };
 
 /**

diff --git a/include/bsp.h b/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.

diff --git a/include/cm.h b/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);
+
+extern "C" void SetupCmRotateToCam(CM *pcm);
+extern "C" void SetCmLookAtSmooth(CM *pcm, int a1, VECTOR *pposEye, VECTOR *pposCenter, int a4, float u0, float u1, float u2, float u3, float u4, float u5);
+extern "C" void ConvertCylindToWorldVelocity(void *a, void *b, void *c, float f0, float f1, float f2);
+extern "C" void ConvertWorldToCylindVelocity(void *a, void *b, void *c, void *d, void *e, void *f);
+
 #endif // CM_H
diff --git a/include/cplcy.h b/include/cplcy.h
@@ -17,4 +17,6 @@ LOOKK LookkPopCplook(CPLOOK *pcplook);
 
 LOOKK LookkCurCplook(CPLOOK *pcplook);
 
+int FActiveCplcy(CPLCY *pcplcy);
+
 #endif // CPLCY_H
diff --git a/include/crusher.h b/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
diff --git a/include/font.h b/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
diff --git a/include/frm.h b/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
diff --git a/include/game.h b/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.

diff --git a/include/glbs.h b/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);
 };

diff --git a/include/gomer.h b/include/gomer.h
@@ -29,4 +29,6 @@ struct GOMER : public STEPGUARD
     /* 0xc40 */ int fAbandonExternal;
 };
 
+void PostGomerLoad(GOMER *pgomer);
+
 #endif // GOMER_H
diff --git a/include/jp.h b/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
diff --git a/include/jt.h b/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;

diff --git a/include/mat.h b/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);
 

diff --git a/include/mpeg.h b/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
diff --git a/include/pipe.h b/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.
 };

diff --git a/include/puffer.h b/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
diff --git a/include/rwm.h b/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
diff --git a/include/sce/libs.h b/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
diff --git a/include/screen.h b/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
diff --git a/include/so.h b/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
diff --git a/include/sound.h b/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
  */
@@ -314,4 +319,6 @@ int GetAMRegister(int reg);
  */
 void UpdateAMRegister(int reg, int value);
 
+extern "C" void PreloadVag1(void *pv);
+
 #endif // SOUND_H
diff --git a/include/splice/bif.h b/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,

diff --git a/include/splice/eval.h b/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
diff --git a/include/splice/frame.h b/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);
 };
 

diff --git a/include/splice/ref.h b/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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,6 @@ LOOKK LookkPopCplook(CPLOOK *pcplook);

		LOOKK LookkCurCplook(CPLOOK *pcplook);

		int FActiveCplcy(CPLCY *pcplcy);

		#endif // CPLCY_H
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,4 +63,6 @@ extern FRM *g_pfrmOpen;

		extern uchar g_abRenderLoopStack[0x20000]; // TODO: Move elsewhere?

		extern "C" void func_0015F618(int, int);
TheOnlyZac Jul 3, 2026 Copy link Copy Markdown Owner Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. No extern C

		#endif // FRM_H
Original file line number	Diff line number	Diff line change
Expand Up		@@ -96,4 +96,6 @@ int FCanPuffcAttack(PUFFC *ppuffc);

		void PostPuffbLoad(PUFFB *ppuffb);

		extern "C" void FUN_001973d8(void *p);
TheOnlyZac Jul 3, 2026 Copy link Copy Markdown Owner Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. No extern C

		#endif // PUFFER_H
Original file line number	Diff line number	Diff line change
Expand Up		@@ -94,4 +94,6 @@ void GetRwacPan(RWAC prwac, float pradPan);

		void GetRwacTilt(RWAC prwac, float pradTilt);

		extern "C" void FUN_001a93c8(RWM *prwm);
TheOnlyZac Jul 3, 2026 Copy link Copy Markdown Owner Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. No extern C

		#endif // RWM_H