Lots of work, many matching functions, most only requiring data to be complete

6 files changed, 23 insertions, 5 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index 5e116750..91808ae6 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -4,6 +4,7 @@
 #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
+#include "dolphin/mtx/mtx.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
 
@@ -113,15 +114,19 @@ public:
     Mtx33* getNrmMtxPtr() const { return mpNrmMtxBuf[1][mCurrentViewNo]; }
     Mtx33*** getBumpMtxPtrPtr() const { return mpBumpMtxArr[1]; }
     void setBaseScale(const Vec& scale) { mBaseScale = scale; }
-    void setUserArea(u32 area) { mUserArea = area; }
-    u32 getUserArea() const { return mUserArea; }
+    void setUserArea(void* area) { mUserArea = area; }
+    void* getUserArea() const { return mUserArea; }
     Vec* getBaseScale() { return &mBaseScale; }
 
+    void setAnmMtx(int jntNo, Mtx mtx) {
+        MTXCopy(mtx, mpNodeMtx[jntNo]);
+    }
+
     /* 0x004 */ J3DModelData* mModelData;
     /* 0x008 */ u32 mFlags;
     /* 0x00C */ u32 mDiffFlag;
     /* 0x010 */ J3DCalcCallBack mCalcCallBack;
-    /* 0x014 */ u32 mUserArea;
+    /* 0x014 */ void* mUserArea;
     /* 0x018 */ Vec mBaseScale;
     /* 0x024 */ Mtx mBaseTransformMtx;
     /* 0x054 */ Mtx mInternalView;
diff --git a/include/JSystem/J3DGraphAnimator/J3DNode.h b/include/JSystem/J3DGraphAnimator/J3DNode.h
index ec61c56f..977a610a 100644
--- a/include/JSystem/J3DGraphAnimator/J3DNode.h
+++ b/include/JSystem/J3DGraphAnimator/J3DNode.h
@@ -23,12 +23,14 @@ public:
     void setCallBack(J3DNodeCallBack callback) { mCallBack = callback; }
     J3DNodeCallBack getCallBack() { return mCallBack; }
     J3DNode* getChild() { return mChild; }
+    u16 getJntNo() { return mJntNo; }
 
     /* 0x04 */ void* mCallBackUserData;
     /* 0x08 */ J3DNodeCallBack mCallBack;
     /* 0x0C */ void* field_0x8;
     /* 0x10 */ J3DNode* mChild;
     /* 0x14 */ J3DNode* mYounger;
+    /* 0x18 */ u16 mJntNo;
 };  // Size: 0x18
 
 #endif /* J3DNODE_H */
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index f447c3b5..98d844f2 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -94,6 +94,9 @@ public:
     s16 getBodyAngleX() { return mBodyAngle.x; }
     s16 getBodyAngleY() { return mBodyAngle.y; }
 
+    void onPlayerNoDraw() { field_0x29c |= 0x8000000; }
+    void offPlayerNoDraw() { field_0x29c &= ~0x8000000; }
+
     virtual MtxP getLeftHandMatrix() = 0;
     virtual MtxP getRightHandMatrix() = 0;
     virtual void getGroundY() = 0;
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 866aa242..edddd541 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -1234,7 +1234,7 @@ inline f32* dComIfGp_evmng_getMyFloatP(int staffIdx, const char* name) {
     return reinterpret_cast<f32*>(dComIfGp_getEventManager().getMySubstanceP(staffIdx, name, 0)); //type 0 is float
 }
 
-inline Vec* dComIfGp_evmng_getMyVec3dP(int staffIdx, const char* name) {
+inline Vec* dComIfGp_evmng_getMyXyzP(int staffIdx, const char* name) {
     return reinterpret_cast<Vec*>(dComIfGp_getEventManager().getMySubstanceP(staffIdx, name, 1)); //type 1 is vec3f
 }
 
@@ -1278,6 +1278,10 @@ inline void dComIfGp_evmng_remove() {
     g_dComIfG_gameInfo.play.getEvtManager().remove();
 }
 
+inline void dComIfGp_evmng_setGoal(cXyz* i_goal) {
+    g_dComIfG_gameInfo.play.getEvtManager().setGoal(i_goal);
+}
+
 /**
  * === DRAWLIST ===
  */
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index 67d74641..f3a155d1 100644
--- a/include/d/d_particle.h
+++ b/include/d/d_particle.h
@@ -56,7 +56,7 @@ public:
 
 STATIC_ASSERT(sizeof(dPa_followEcallBack) == 0x14);
 
-class dPa_smokeEcallBack : dPa_followEcallBack {
+class dPa_smokeEcallBack : public dPa_followEcallBack {
 public:
     dPa_smokeEcallBack(u8);
     virtual ~dPa_smokeEcallBack();
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index f5333966..a0eee970 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -39,6 +39,10 @@ int mDoAud_load1stDynamicWave();
 
 extern JKRSolidHeap* g_mDoAud_audioHeap;
 
+inline void mDoAud_bgmStart(u32 param_0) {
+    mDoAud_zelAudio_c::getInterface()->bgmStart(param_0, 0, 0);
+}
+
 inline void mDoAud_bgmStop(u32 param_0) {
     mDoAud_zelAudio_c::getInterface()->bgmStop(param_0, 0);
 }