diff --git a/include/SMS/Graph/GraphTracer.hxx b/include/SMS/Graph/GraphTracer.hxx
index 6e1fa5b..e0be335 100644
--- a/include/SMS/Graph/GraphTracer.hxx
+++ b/include/SMS/Graph/GraphTracer.hxx
@@ -12,7 +12,7 @@ public:
     TGraphWeb *getGraph() const;
     void moveTo(int);
     void setTo(int);
-    void traceSpline(f32);
+    bool traceSpline(f32);
 
     TGraphWeb *mGraph;  // 0x0000
     s32 mCurrentNode;   // 0x0004
diff --git a/include/SMS/Graph/SplineRail.hxx b/include/SMS/Graph/SplineRail.hxx
index 4720f1b..0590870 100644
--- a/include/SMS/Graph/SplineRail.hxx
+++ b/include/SMS/Graph/SplineRail.hxx
@@ -11,7 +11,7 @@ class TSplineRail {
 public:
     TSplineRail(TGraphWeb *);
 
-    void getPosAndRot(f32, TVec3f posOut, TVec3f rotOut);
+    void getPosAndRot(f32, TVec3f *posOut, TVec3f *rotOut);
 };
 
 class TSplinePath {
diff --git a/include/SMS/MSound/MSound.hxx b/include/SMS/MSound/MSound.hxx
index a7ed568..6305199 100644
--- a/include/SMS/MSound/MSound.hxx
+++ b/include/SMS/MSound/MSound.hxx
@@ -6,17 +6,17 @@
 #include <JSystem/JKernel/JKRHeap.hxx>
 
 enum MS_SCENE_WAVE {
-    MS_WAVE_DEFAULT = 256,
-    MS_WAVE_DOLPIC = 513,
-    MS_WAVE_BIANCO = 514,
-    MS_WAVE_MANMA = 515,
-    MS_WAVE_PINNAPACO_S = 516,
-    MS_WAVE_PINNAPACO = 516,
-    MS_WAVE_MARE_SEA = 517,
+    MS_WAVE_DEFAULT      = 256,
+    MS_WAVE_DOLPIC       = 513,
+    MS_WAVE_BIANCO       = 514,
+    MS_WAVE_MANMA        = 515,
+    MS_WAVE_PINNAPACO_S  = 516,
+    MS_WAVE_PINNAPACO    = 516,
+    MS_WAVE_MARE_SEA     = 517,
     MS_WAVE_MONTEVILLAGE = 518,
-    MS_WAVE_SHILENA = 519,
-    MS_WAVE_RICO = 520,
-    MS_WAVE_CLEAR = 521,
+    MS_WAVE_SHILENA      = 519,
+    MS_WAVE_RICO         = 520,
+    MS_WAVE_CLEAR        = 521,
 };
 enum MS_SOUND_EFFECT {
     MSD_SE_PO_WATER_HI          = 0x00000000,
@@ -1659,7 +1659,7 @@ public:
 
     bool cameraLooksAtMario();
     u32 checkMarioVoicePlaying(u8);
-    void checkWaveOnAram(MS_SCENE_WAVE);
+    bool checkWaveOnAram(MS_SCENE_WAVE);
     void demoModeIn(u16, bool);
     void demoModeOut(bool);
     void enterStage(MS_SCENE_WAVE, u8, u8);
diff --git a/include/SMS/Player/MarioCap.hxx b/include/SMS/Player/MarioCap.hxx
index f9e74b4..25c148e 100644
--- a/include/SMS/Player/MarioCap.hxx
+++ b/include/SMS/Player/MarioCap.hxx
@@ -15,6 +15,14 @@ public:
     void createMirrorModel();
     void mtxEffectHide();
     void mtxEffectShow();
+
+    u32 _00;
+    u32 _04;
+    u16 _08;
+    J3DModel *mCap1;
+    J3DModel *mCap3;
+    J3DModel *mDiverHelm;
+    J3DModel *maGlass1;
 };
 
 extern const char *cDirtyFileName;