d_a_npc_tt inlines fix

4 files changed, 16 insertions, 12 deletions

diff --git a/include/d/actor/d_a_npc_fa1.h b/include/d/actor/d_a_npc_fa1.h
index c1fa89a5..dfb004a4 100644
--- a/include/d/actor/d_a_npc_fa1.h
+++ b/include/d/actor/d_a_npc_fa1.h
@@ -25,6 +25,11 @@ public:
 
 class daNpc_Fa1_c : public fopNpc_npc_c {
 public:
+    typedef void(daNpc_Fa1_c::*MoveFunc_t)();
+    typedef void(daNpc_Fa1_c::*MoveSubFunc_t)();
+    typedef void(daNpc_Fa1_c::*BottleMoveSubFunc_t)();
+    typedef void(daNpc_Fa1_c::*BottleBabaSubFunc_t)();
+
     enum Type_e {
         Type_NORMAL_e = 0,
         Type_TIMER_e = 1,
@@ -149,11 +154,6 @@ public:
     void setMtx();
 
 public:
-    typedef void(daNpc_Fa1_c::*MoveFunc_t)();
-    typedef void(daNpc_Fa1_c::*MoveSubFunc_t)();
-    typedef void(daNpc_Fa1_c::*BottleMoveSubFunc_t)();
-    typedef void(daNpc_Fa1_c::*BottleBabaSubFunc_t)();
-
     /* 0x6C4 */ u8 m6C4[0x6CC - 0x6C4];
     /* 0x6CC */ mDoExt_McaMorf* mpMorf;
     /* 0x6D0 */ daNpc_Fa1_McaMorfCallBack1_c mMcaMorfCallback1;
diff --git a/include/d/actor/d_a_npc_tt.h b/include/d/actor/d_a_npc_tt.h
index 07b3c790..83b6daca 100644
--- a/include/d/actor/d_a_npc_tt.h
+++ b/include/d/actor/d_a_npc_tt.h
@@ -11,7 +11,7 @@ struct tt_ke_s {
     void ke_pos_set(cXyz*);
 };
 
-struct lineKe {
+struct daNpc_Tt_ke_c {
     tt_ke_s field_0x6C8[8];
     mDoExt_3DlineMat0_c mLineMat;
 };
@@ -42,9 +42,10 @@ public:
     void clrEvFlag(u16 evFlag) { mEvFlags &= ~evFlag; }
     void clrFlag(u16 flag) { mFlags &= ~flag; }
 
-    s8 getBackboneJntNum() { return m_jnt.getBackboneJntNum(); }
+    s8 getBackboneJntNum() { return m_backbone_jnt_num; }
+    s8 getHeadJntNum() { return m_head_jnt_num; }
+    s16 getBackbone_x() { return m_jnt.getBackbone_x(); }
     s16 getBackbone_y() { return m_jnt.getBackbone_y(); }
-    s8 getHeadJntNum() { return m_jnt.getHeadJntNum(); }
     s16 getHead_x() { return m_jnt.getHead_x(); }
     s16 getHead_y() { return m_jnt.getHead_y(); }
 
@@ -117,6 +118,7 @@ public:
     void danceInit(int);
     BOOL danceProc();
     BOOL danceNext();
+
 public:
     /* 0x290 */ dNpc_HeadAnm_c mHeadAnm;
     /* 0x2B4 */ s16 mEventIdx;
@@ -152,7 +154,7 @@ public:
     /* 0x6C4 */ u8 mDanceStep;
     /* 0x6C5 */ u8 mDanceStepTimer;
     /* 0x6C6 */ u8 field_0x6C6[0x6C8 - 0x6C6];
-    /* 0x6C8 */ lineKe mLineKe;
+    /* 0x6C8 */ daNpc_Tt_ke_c mLineKe;
     /* 0xE64 */ s8 mTexPatternIdx;
     /* 0xE65 */ s8 mCurrAnmIdx;
     /* 0xE66 */ s8 mAnmLoopCount;
diff --git a/include/d/d_menu_save.h b/include/d/d_menu_save.h
index b4108851..27abeb14 100644
--- a/include/d/d_menu_save.h
+++ b/include/d/d_menu_save.h
@@ -206,6 +206,8 @@ public:
     dMs_HIO_c();
     virtual ~dMs_HIO_c() {}
 
+    void genMessage(JORMContext* ctx) {}
+
     /* 0x04 */ s8 id;
     /* 0x05 */ u8 field_0x5;
     /* 0x06 */ u8 field_0x6;
diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp
index b5ef59e4..d839d1ad 100644
--- a/src/d/actor/d_a_npc_tt.cpp
+++ b/src/d/actor/d_a_npc_tt.cpp
@@ -42,7 +42,7 @@ static BOOL nodeCallBack_Tt(J3DNode* node, int calcTiming) {
 
         if(i_this != NULL) {
             MTXCopy(model->getAnmMtx(jntNo), *calc_mtx);
-            if (jntNo == i_this->m_head_jnt_num) {
+            if (jntNo == i_this->getHeadJntNum()) {
                 temp.setall(0.0f);
                 cMtx_YrotM(*calc_mtx, -i_this->getHead_y());
                 cMtx_ZrotM(*calc_mtx, -i_this->getHead_x() - i_this->mHeadAnm.field_0x00);
@@ -54,9 +54,9 @@ static BOOL nodeCallBack_Tt(J3DNode* node, int calcTiming) {
                 i_this->setEyePos(temp2);
                 i_this->incAttnSetCount();
 
-            } else if (jntNo == i_this->m_backbone_jnt_num) {
+            } else if (jntNo == i_this->getBackboneJntNum()) {
                 mDoMtx_XrotM(*calc_mtx, i_this->getBackbone_y());
-                mDoMtx_ZrotM(*calc_mtx, i_this->m_jnt.getBackbone_x());
+                mDoMtx_ZrotM(*calc_mtx, i_this->getBackbone_x());
             }
             cMtx_copy(*calc_mtx, J3DSys::mCurrentMtx);
             model->setAnmMtx(jntNo, *calc_mtx);