d_a_alink work / bump dtk version (#2205)

6 files changed, 18 insertions, 15 deletions

diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h
index f357aeef1f..743bf91252 100644
--- a/include/f_pc/f_pc_create_req.h
+++ b/include/f_pc/f_pc_create_req.h
@@ -6,6 +6,7 @@
 #include "f_pc/f_pc_create_tag.h"
 #include "f_pc/f_pc_method.h"
 #include "f_pc/f_pc_method_tag.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct base_process_class base_process_class;
 typedef struct layer_class layer_class;
@@ -28,8 +29,8 @@ typedef struct create_request {
     layer_class* mpLayer;
 } create_request;  // Size: 0x48
 
-bool fpcCtRq_isCreatingByID(create_tag* pTag, unsigned int* pId);
-BOOL fpcCtRq_IsCreatingByID(unsigned int id);
+bool fpcCtRq_isCreatingByID(create_tag* pTag, fpc_ProcID* pId);
+BOOL fpcCtRq_IsCreatingByID(fpc_ProcID id);
 void fpcCtRq_CreateQTo(create_request* pReq);
 void fpcCtRq_ToCreateQ(create_request* pReq);
 BOOL fpcCtRq_Delete(create_request* pReq);
diff --git a/include/f_pc/f_pc_creator.h b/include/f_pc/f_pc_creator.h
index 582abf5f39..b37a2ce88a 100644
--- a/include/f_pc/f_pc_creator.h
+++ b/include/f_pc/f_pc_creator.h
@@ -2,11 +2,11 @@
 #ifndef F_PC_CREATOR_H_
 #define F_PC_CREATOR_H_
 
-#include "dolphin/types.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct base_process_class base_process_class;
 
-BOOL fpcCt_IsCreatingByID(unsigned int id);
+BOOL fpcCt_IsCreatingByID(fpc_ProcID id);
 s32 fpcCt_IsDoing(base_process_class* pProc);
 BOOL fpcCt_Abort(base_process_class* pProc);
 void fpcCt_Handler(void);
diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h
index 6c15d16378..53a19b986f 100644
--- a/include/f_pc/f_pc_executor.h
+++ b/include/f_pc/f_pc_executor.h
@@ -4,12 +4,13 @@
 
 #include "f_pc/f_pc_layer_iter.h"
 #include "f_pc/f_pc_line_iter.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct base_process_class base_process_class;
 
 base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData);
-base_process_class* fpcEx_SearchByID(unsigned int id);
-BOOL fpcEx_IsExist(unsigned int id);
+base_process_class* fpcEx_SearchByID(fpc_ProcID id);
+BOOL fpcEx_IsExist(fpc_ProcID id);
 s32 fpcEx_ToLineQ(base_process_class* pProc);
 s32 fpcEx_ExecuteQTo(base_process_class* pProc);
 s32 fpcEx_Execute(base_process_class* pProc);
diff --git a/include/f_pc/f_pc_layer.h b/include/f_pc/f_pc_layer.h
index 4f7e0046b7..3930dfb49f 100644
--- a/include/f_pc/f_pc_layer.h
+++ b/include/f_pc/f_pc_layer.h
@@ -5,7 +5,7 @@
 #include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_node.h"
 #include "SSystem/SComponent/c_tree.h"
-#include "dolphin/types.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct create_tag_class create_tag_class;
 typedef struct process_method_tag_class process_method_tag_class;
@@ -26,8 +26,8 @@ typedef struct layer_class {
 void fpcLy_SetCurrentLayer(layer_class* pLayer);
 layer_class* fpcLy_CurrentLayer(void);
 layer_class* fpcLy_RootLayer(void);
-layer_class* fpcLy_Layer(unsigned int id);
-layer_class* fpcLy_Search(unsigned int id);
+layer_class* fpcLy_Layer(fpc_ProcID id);
+layer_class* fpcLy_Search(fpc_ProcID id);
 void fpcLy_Regist(layer_class* pLayer);
 
 void fpcLy_CreatedMesg(layer_class* pLayer);
diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h
index e808099465..57895a485f 100644
--- a/include/f_pc/f_pc_manager.h
+++ b/include/f_pc/f_pc_manager.h
@@ -63,7 +63,7 @@ inline void* fpcM_GetAppend(const void* proc) {
     return ((base_process_class*)proc)->mpUserData;
 }
 
-inline BOOL fpcM_IsExecuting(unsigned int id) {
+inline BOOL fpcM_IsExecuting(fpc_ProcID id) {
     return fpcEx_IsExist(id);
 }
 
@@ -83,7 +83,7 @@ void fpcM_Draw(void* pProc);
 s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc);
 s32 fpcM_Execute(void* pProc);
 s32 fpcM_Delete(void* pProc);
-BOOL fpcM_IsCreating(unsigned int pID);
+BOOL fpcM_IsCreating(fpc_ProcID pID);
 void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2);
 void fpcM_Init();
 base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3,
@@ -91,6 +91,6 @@ base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2,
 s32 fpcM_IsPause(void* pProc, u8 param_2);
 void fpcM_PauseEnable(void* pProc, u8 param_2);
 void fpcM_PauseDisable(void* pProc, u8 param_2);
-void* fpcM_JudgeInLayer(unsigned int pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
+void* fpcM_JudgeInLayer(fpc_ProcID pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
 
 #endif
diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h
index a99c22d028..bc8f13327f 100644
--- a/include/f_pc/f_pc_node_req.h
+++ b/include/f_pc/f_pc_node_req.h
@@ -4,6 +4,7 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "f_pc/f_pc_method.h"
 #include "f_pc/f_pc_method_tag.h"
+#include "f_pc/f_pc_base.h"
 
 typedef struct layer_class layer_class;
 typedef struct process_node_class process_node_class;
@@ -64,7 +65,7 @@ node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* par
 node_create_request*
 fpcNdRq_Request(u32 param_1, int param_2, process_node_class* param_3, s16 param_4,
                 void* param_5, node_create_request_method_class* pNodeCreateRequestMethodClass);
-s32 fpcNdRq_ReChangeNode(unsigned int pRequestId, s16 param_2, void* param_3);
-s32 fpcNdRq_ReRequest(unsigned int pRequestId, s16 param_2, void* param_3);
+s32 fpcNdRq_ReChangeNode(fpc_ProcID pRequestId, s16 param_2, void* param_3);
+s32 fpcNdRq_ReRequest(fpc_ProcID pRequestId, s16 param_2, void* param_3);
 
-#endif
\ No newline at end of file
+#endif