diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index dc2bf02ae..2faabea94 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -129,8 +129,8 @@ public:
     Mtx33** getBumpMtxPtrPtr(u32 idx) const { return mpBumpMtxArr[1][idx]; }
     Mtx33* getBumpMtxPtr(u32 idx) const { return mpBumpMtxArr[1][idx][mCurrentViewNo]; }
     void setBaseScale(const Vec& scale) { mBaseScale = scale; }
-    void setUserArea(void* area) { mUserArea = area; }
-    void* getUserArea() const { return mUserArea; }
+    void setUserArea(u32 area) { mUserArea = area; }
+    u32 getUserArea() const { return mUserArea; }
     Vec* getBaseScale() { return &mBaseScale; }
     void setVisibilityManager(J3DVisibilityManager* manager) { mpVisibilityManager = manager; }
 
@@ -138,7 +138,7 @@ public:
     /* 0x008 */ u32 mFlags;
     /* 0x00C */ u32 mDiffFlag;
     /* 0x010 */ J3DCalcCallBack mCalcCallBack;
-    /* 0x014 */ void* mUserArea;
+    /* 0x014 */ u32 mUserArea;
     /* 0x018 */ Vec mBaseScale;
     /* 0x024 */ Mtx mBaseTransformMtx;
     /* 0x054 */ Mtx mInternalView;
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index cf38b693c..29be5cd72 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -112,7 +112,7 @@ public:
     virtual void checkCutCharge() const;
     virtual void getBokoFlamePos(cXyz*);
     virtual void checkTactWait() const;
-    virtual void setTactZev(unsigned int, int, const char*);
+    virtual void setTactZev(unsigned int, int, char*);
     virtual void onDekuSpReturnFlg(u8);
     virtual void checkComboCutTurn() const;
     virtual f32 getBaseAnimeFrameRate() = 0;
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index 11338b282..9c048e212 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -135,12 +135,6 @@ public:
     bool checkCommandDemoAccrpt() { return mCommand == 2; }
     bool checkCommandCatch() { return mCommand == 6; }
 
-    //void suspendProc(void* actor) {
-    //    if (field_0x10 != NULL) {
-    //        field_0x14(actor);
-    //    }
-    //}
-
     /* 0x04 */ u16 mCommand;
     /* 0x06 */ u16 mCondition;
     /* 0x08 */ s16 mEventId;
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index f7925b632..32e46066a 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -65,7 +65,7 @@ static const char* daObjMknjD_jointName[] = {
     "Hahen20"
 };
 
-const char* daObjMknjD_EventName[] = {
+char* daObjMknjD_EventName[] = {
     "MKNJD_D_DEMO",
     "MKNJD_K_DEMO",
 
@@ -162,8 +162,8 @@ namespace daObjMknjD {
             PRM_TYPE_S = 0x10,
         };
 
-        inline int prm_get_swSave() { return daObj::PrmAbstract<Prm_e>(this, PRM_SWITCH_W, PRM_SWITCH_S); }
-        inline u8 prm_get_Type() { return daObj::PrmAbstract<Prm_e>(this, PRM_TYPE_W, PRM_TYPE_S); }
+        int prm_get_swSave() { return daObj::PrmAbstract<Prm_e>(this, PRM_SWITCH_W, PRM_SWITCH_S); }
+        u8 prm_get_Type() { return daObj::PrmAbstract<Prm_e>(this, PRM_TYPE_W, PRM_TYPE_S); }
 
         static Mtx M_tmp_mtx;
     };
@@ -293,7 +293,7 @@ int daObjMknjD::Act_c::CreateHeap() {
             }
         }
 
-        mMainMdl->setUserArea(this);
+        mMainMdl->setUserArea(reinterpret_cast<u32>(this));
 
         int curTblIdx = 0;
         nameTable = mBreakMdl->getModelData()->getJointName();
@@ -311,7 +311,7 @@ int daObjMknjD::Act_c::CreateHeap() {
             }
         }
 
-        mBreakMdl->setUserArea(this);
+        mBreakMdl->setUserArea(reinterpret_cast<u32>(this));
         mMainMdlAlpha = 0xFF;
 
         return 1;
@@ -460,7 +460,7 @@ void daObjMknjD::Act_c::setGoal(int i_staffIdx) {
     cXyz pos = *dComIfGp_evmng_getMyXyzP(i_staffIdx, "Posion");
 
     mDoMtx_stack_c::transS(getPosition());
-    mDoMtx_YrotM(mDoMtx_stack_c::get(), current.angle.GetY());
+    mDoMtx_YrotM(mDoMtx_stack_c::get(), current.angle.y);
 
     mDoMtx_stack_c::transM(pos);
     
@@ -659,8 +659,7 @@ void daObjMknjD::Act_c::privateCut() {
 
 /* 00001348-00001400       .text manage_friend_draw__10daObjMknjDFi */
 void daObjMknjD::manage_friend_draw(int i_param1) {
-    u16 medliProc = PROC_NPC_MD;
-    fopAc_ac_c* judgeResult = static_cast<fopAc_ac_c*>(fopAcIt_Judge(fpcSch_JudgeForPName, &medliProc));
+    fopAc_ac_c* judgeResult = fopAcM_SearchByName(PROC_NPC_MD);
 
     if (judgeResult != NULL) {
         if (i_param1 == 1) {
@@ -672,8 +671,7 @@ void daObjMknjD::manage_friend_draw(int i_param1) {
         }
     }
 
-    u16 makarProc = PROC_NPC_CB1;
-    judgeResult = static_cast<fopAc_ac_c*>(fopAcIt_Judge(fpcSch_JudgeForPName, &makarProc));
+    judgeResult = fopAcM_SearchByName(PROC_NPC_CB1);
     
     if (judgeResult != NULL) {
         if (i_param1 == 1) {
@@ -759,10 +757,10 @@ bool daObjMknjD::Act_c::daObjMknjD_break() {
             JGeometry::TVec3<f32> vec;
 
             vec.set(3.0f, 3.0f, 3.0f);
-            mEmitters[3]->setGlobalDynamicsScale(vec);
+            mEmitters[3]->setGlobalParticleScale(vec);
 
             vec.set(6.0f, 6.0f, 6.0f);
-            mEmitters[3]->setGlobalParticleScale(vec);
+            mEmitters[3]->setGlobalDynamicsScale(vec);
         }
     }
     // After 255 frames, the cutscene ends.