5 files changed, 19 insertions, 18 deletions
diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h
index 95c55325..cad007a9 100644
--- a/include/d/actor/d_a_npc_bm1.h
+++ b/include/d/actor/d_a_npc_bm1.h
@@ -129,7 +129,7 @@ public:
     bool chkAttention();
     void setAttention(bool);
     fopAc_ac_c* searchByID(fpc_ProcID);
-    bool partner_srch_sub(void* (*)(void*, void*));
+    bool partner_srch_sub(fpcLyIt_JudgeFunc);
     void partner_srch();
     u32 bm_movPass(bool);
     void bm_setFlyAnm();
diff --git a/include/d/actor/d_a_npc_ls1.h b/include/d/actor/d_a_npc_ls1.h
index 8186b325..a09ee960 100644
--- a/include/d/actor/d_a_npc_ls1.h
+++ b/include/d/actor/d_a_npc_ls1.h
@@ -139,7 +139,7 @@ public:
     bool chk_talk();
     bool chk_parts_notMov();
     fopAc_ac_c* searchByID(fpc_ProcID, int*);
-    bool partner_search_sub(void* (*)(void*, void*));
+    bool partner_search_sub(fpcLyIt_JudgeFunc);
     void partner_search();
     void setEyeCtrl();
     void clrEyeCtrl();
diff --git a/include/d/actor/d_a_npc_zl1.h b/include/d/actor/d_a_npc_zl1.h
index a19f51f2..8ee9a830 100644
--- a/include/d/actor/d_a_npc_zl1.h
+++ b/include/d/actor/d_a_npc_zl1.h
@@ -26,7 +26,6 @@ public:
 
 class daNpc_Zl1_c : public fopNpc_npc_c {
 public:
-
     typedef int (daNpc_Zl1_c::*ActionFunc)(void*);
 
     struct anm_prm_c {
@@ -37,7 +36,6 @@ public:
         int mLoopMode;
     };
 
-    daNpc_Zl1_c();
     void _nodeCB_Head(J3DNode*, J3DModel*);
     void _nodeCB_BackBone(J3DNode*, J3DModel*);
     BOOL set_startPos(int);
@@ -81,8 +79,8 @@ public:
     void checkOrder();
     bool chk_talk();
     bool chk_parts_notMov();
-    fopAc_ac_c* searchByID(fpc_ProcID, int*);
-    bool partner_search_sub(void* (*)(void*, void*));
+    fopAc_ac_c* searchByID(fpc_ProcID, BOOL*);
+    bool partner_search_sub(fpcLyIt_JudgeFunc);
     void partner_search();
     void setEyeCtrl();
     void clrEyeCtrl();
@@ -120,7 +118,9 @@ public:
     BOOL cut_move_JMP_OFF();
     void cut_init_OMAMORI_ONOFF(int);
     BOOL cut_move_OMAMORI_ONOFF();
+#if VERSION > VERSION_DEMO
     void cut_init_SURPRISED(int);
+#endif
     BOOL cut_move_SURPRISED();
     void privateCut(int);
     void endEvent();
@@ -163,6 +163,7 @@ public:
     BOOL bodyCreateHeap();
     BOOL itemCreateHeap();
     BOOL CreateHeap();
+
 public:
     /* 0x6C4 */ request_of_phase_process_class mPhs;
     /* 0x6CC */ s8 m_hed_jnt_num;
diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h
index 3258c3c5..a931d521 100644
--- a/include/f_pc/f_pc_executor.h
+++ b/include/f_pc/f_pc_executor.h
@@ -8,17 +8,13 @@
 
 typedef struct base_process_class base_process_class;
 
-base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData);
-base_process_class* fpcEx_SearchByID(fpc_ProcID id);
-BOOL fpcEx_IsExist(fpc_ProcID id);
-s32 fpcEx_ToLineQ(base_process_class* pProc);
-BOOL fpcEx_ExecuteQTo(base_process_class* pProc);
-BOOL fpcEx_Execute(base_process_class* pProc);
-BOOL fpcEx_ToExecuteQ(base_process_class* pProc);
-void fpcEx_Handler(fpcLnIt_QueueFunc pFunc);
-
-inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) {
-    return fpcEx_Search(pFunc, pUserData);
-}
+base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data);
+base_process_class* fpcEx_SearchByID(fpc_ProcID i_id);
+BOOL fpcEx_IsExist(fpc_ProcID i_id);
+s32 fpcEx_ToLineQ(base_process_class* i_proc);
+BOOL fpcEx_ExecuteQTo(base_process_class* i_proc);
+BOOL fpcEx_Execute(base_process_class* i_proc);
+BOOL fpcEx_ToExecuteQ(base_process_class* i_proc);
+void fpcEx_Handler(fpcLnIt_QueueFunc i_queueFunc);
 
 #endif
diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h
index 8c5e6106..a7cff2e2 100644
--- a/include/f_pc/f_pc_manager.h
+++ b/include/f_pc/f_pc_manager.h
@@ -76,6 +76,10 @@ inline void* fpcM_LyJudge(process_node_class* i_node, fpcLyIt_JudgeFunc i_func,
     return fpcLyIt_Judge(&i_node->mLayer, i_func, i_data);
 }
 
+inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc i_func, void* i_data) {
+    return fpcEx_Search(i_func, i_data);
+}
+
 inline s8 fpcM_CreateResult(void* pProc) {
     return ((base_process_class*)pProc)->mCreateResult;
 }