fixes 2

Author: Pheenoh

include/d/actor/d_a_npc_gwolf.h

@@ -11,7 +11,7 @@
  * @details
  *
  */
-class daNpc_GWolf_c : public daNpcF_c {
+class daNpc_GWolf_c : public fopAc_ac_c {
 public:
     /* 809F30AC */ daNpc_GWolf_c();
     /* 809F34C0 */ void create();
@@ -67,13 +67,14 @@ class daNpc_GWolf_c : public daNpcF_c {
     static u8 mEvtCutList[60];
 
 private:
-    /* 0xB48 */ Z2Creature mCreature;
-    /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
-    /* 0xBDC */ daNpcF_Lookat_c mLookAt;
-    /* 0xC78 */ daNpcF_ActorMngr_c mActorMng[2];
-    /* 0xC88 */ u8 field_0xc88[4];
-    /* 0xC8C */ dCcD_Cyl mCyl;
-    /* 0xDC8 */ u8 field_0xdc8[0xE1C - 0xdc8];
+    // /* 0xB48 */ Z2Creature mCreature;
+    // /* 0xBD8 */ daNpcF_MatAnm_c* mpMatAnm;
+    // /* 0xBDC */ daNpcF_Lookat_c mLookAt;
+    // /* 0xC78 */ daNpcF_ActorMngr_c mActorMng[2];
+    // /* 0xC88 */ u8 field_0xc88[4];
+    // /* 0xC8C */ dCcD_Cyl mCyl;
+    // /* 0xDC8 */ u8 field_0xdc8[0xE1C - 0xdc8];
+    /* 0x568 */ u8 field_0xb48[0xE1C - 0x568];
     /* 0xE1C */ u8 field_0xe1c;
 };
 

include/d/actor/d_a_npc_kn.h

@@ -314,11 +314,11 @@ class daNpc_Kn_c : public fopEn_enemy_c {
     /* 80A3B7B4 */ virtual s32 getFootLJointNo();
     /* 80A3B7AC */ virtual s32 getFootRJointNo();
     /* 80A3BD1C */ virtual int getEyeballLMaterialNo();
-    /* 80A3BD24 */ virtual bool getEyeballRMaterialNo();
+    /* 80A3BD24 */ virtual s32 getEyeballRMaterialNo();
     /* 80A3BD14 */ virtual s32 getEyeballMaterialNo();
-    /* 80A3989C */ virtual void ctrlJoint(J3DJoint*, J3DModel*);
+    /* 80A3989C */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
     /* 80A3B720 */ virtual void afterJntAnm(int);
-    /* 80A3B7A4 */ virtual bool checkChangeEvt();
+    /* 80A3B7A4 */ virtual BOOL checkChangeEvt();
     /* 80A39BBC */ virtual int evtProc();
     /* 80A3B79C */ virtual BOOL evtEndProc();
     /* 80A39DBC */ virtual void setFootPos();

src/d/actor/d_a_npc4.cpp

@@ -97,7 +97,7 @@ void daNpcF_MatAnm_c::initialize() {
     mNowOffsetX = 0.0f;
     mNowOffsetY = 0.0f;
     mEyeMoveFlag = 0;
-    field_0x105 = 0;
+    mMorfFrm = 0;
 }
 
 /* 8015075C-80150870 14B09C 0114+00 1/0 0/0 0/0 .text calc__15daNpcF_MatAnm_cCFP11J3DMaterial */
@@ -109,8 +109,8 @@ void daNpcF_MatAnm_c::calc(J3DMaterial* i_material) const {
             J3DTexMtxInfo* curr_mtx_info =
                 &i_material->getTexGenBlock()->getTexMtx(i)->getTexMtxInfo();
 
-            if (field_0x105 != 0) {
-                f32 tmp8 = 1.0f / (field_0x105 + 1);
+            if (mMorfFrm != 0) {
+                f32 tmp8 = 1.0f / (mMorfFrm + 1);
                 f32 tmp9 = (1.0f - tmp8);
                 f32 tmp10 = field_0xF4 * (1.0f - tmp8);
 

src/d/actor/d_a_npc_kn.cpp

@@ -3612,7 +3612,7 @@ void daNpc_Kn_c::setCollisionTeach03() {
 void daNpc_Kn_c::setCollisionTeach04() {
     switch (mActionMode) {
     case 9:
-        if (dComIfGp_event_runCheck() && eventInfo.i_checkCommandDemoAccrpt()) {
+        if (dComIfGp_event_runCheck() && eventInfo.checkCommandDemoAccrpt()) {
             mCylCc.OffTgSetBit();
             mCylCc.OffCoSetBit();
         } else {