summaryrefslogtreecommitdiff
path: root/include/f_pc
diff options
context:
space:
mode:
authorJcw87 <Jcw87@users.noreply.github.com>2023-05-12 12:10:14 -0700
committerGitHub <noreply@github.com>2023-05-12 12:10:14 -0700
commit221f40e6097dfe76c76602aa21aa07d5f760dce4 (patch)
treeb8f2549712927365bcffd13688729555a4276ff1 /include/f_pc
parent8c7cda85891b41cfdbce72ed4efb00292f34a16a (diff)
Remove #includes from headers (#334)
* add "global.h" to files that use it * add MSL_C includes to files that use them * remove dolphin includes from headers that don't need them * remove JSupport includes from headers that don't need them * remove JKernel includes from headers that don't need them * remove JUtility includes from headers that don't need them * remove J3D includes from headers that don't need them * remove J2D includes from headers that don't need them * remove JAudio2 includes from headers that don't need them * remove Z2AudioLib includes from headers that don't need them * remove JMessage includes from headers that don't need them * remove JParticle includes from headers that don't need them * remove SComponent includes from headers that don't need them * remove dol includes from headers that don't need them * sort includes
Diffstat (limited to 'include/f_pc')
-rw-r--r--include/f_pc/f_pc_base.h9
-rw-r--r--include/f_pc/f_pc_create_iter.h5
-rw-r--r--include/f_pc/f_pc_create_req.h5
-rw-r--r--include/f_pc/f_pc_create_tag.h1
-rw-r--r--include/f_pc/f_pc_creator.h6
-rw-r--r--include/f_pc/f_pc_delete_tag.h3
-rw-r--r--include/f_pc/f_pc_deletor.h4
-rw-r--r--include/f_pc/f_pc_draw.h4
-rw-r--r--include/f_pc/f_pc_executor.h4
-rw-r--r--include/f_pc/f_pc_fstcreate_req.h5
-rw-r--r--include/f_pc/f_pc_layer.h11
-rw-r--r--include/f_pc/f_pc_layer_iter.h4
-rw-r--r--include/f_pc/f_pc_layer_tag.h3
-rw-r--r--include/f_pc/f_pc_leaf.h1
-rw-r--r--include/f_pc/f_pc_line_iter.h2
-rw-r--r--include/f_pc/f_pc_manager.h6
-rw-r--r--include/f_pc/f_pc_method_iter.h3
-rw-r--r--include/f_pc/f_pc_node.h1
-rw-r--r--include/f_pc/f_pc_node_req.h15
-rw-r--r--include/f_pc/f_pc_pause.h2
-rw-r--r--include/f_pc/f_pc_profile.h6
-rw-r--r--include/f_pc/f_pc_stdcreate_req.h3
22 files changed, 53 insertions, 50 deletions
diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h
index e8719e83f0..b2a70e0e99 100644
--- a/include/f_pc/f_pc_base.h
+++ b/include/f_pc/f_pc_base.h
@@ -2,17 +2,16 @@
#ifndef F_PC_BASE_H_
#define F_PC_BASE_H_
-#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
-// #include "f/f_pc/f_pc_method.h"
#include "f_pc/f_pc_delete_tag.h"
#include "f_pc/f_pc_layer_tag.h"
#include "f_pc/f_pc_line_tag.h"
#include "f_pc/f_pc_priority.h"
-#include "f_pc/f_pc_profile.h"
-struct create_request;
-struct profile_method_class;
+typedef struct create_request create_request;
+typedef struct process_method_class process_method_class;
+typedef struct process_profile_definition process_profile_definition;
+typedef struct profile_method_class profile_method_class;
typedef struct base_process_class {
/* 0x00 */ u32 mBsType;
diff --git a/include/f_pc/f_pc_create_iter.h b/include/f_pc/f_pc_create_iter.h
index abae733a53..cbe1ab3a74 100644
--- a/include/f_pc/f_pc_create_iter.h
+++ b/include/f_pc/f_pc_create_iter.h
@@ -2,10 +2,9 @@
#ifndef F_PC_CREATE_ITER_H_
#define F_PC_CREATE_ITER_H_
-#include "SSystem/SComponent/c_list_iter.h"
-#include "SSystem/SComponent/c_tag_iter.h"
#include "dolphin/types.h"
-#include "f_pc/f_pc_create_tag.h"
+
+typedef struct create_tag create_tag;
typedef int (*fpcCtIt_MethodFunc)(void*, void*);
typedef void* (*fpcCtIt_JudgeFunc)(void*, void*);
diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h
index 45ee59045c..92ca88ef87 100644
--- a/include/f_pc/f_pc_create_req.h
+++ b/include/f_pc/f_pc_create_req.h
@@ -3,14 +3,13 @@
#define F_PC_CREATE_REQ_H_
#include "SSystem/SComponent/c_phase.h"
-#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
#include "f_pc/f_pc_create_tag.h"
-#include "f_pc/f_pc_layer.h"
#include "f_pc/f_pc_method.h"
#include "f_pc/f_pc_method_tag.h"
-struct base_process_class;
+typedef struct base_process_class base_process_class;
+typedef struct layer_class layer_class;
typedef struct create_request_method_class {
cPhs__Handler mpHandler;
diff --git a/include/f_pc/f_pc_create_tag.h b/include/f_pc/f_pc_create_tag.h
index faa6d10249..57de2d5d59 100644
--- a/include/f_pc/f_pc_create_tag.h
+++ b/include/f_pc/f_pc_create_tag.h
@@ -2,6 +2,7 @@
#ifndef F_PC_CREATE_TAG_H_
#define F_PC_CREATE_TAG_H_
+#include "SSystem/SComponent/c_list.h"
#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
diff --git a/include/f_pc/f_pc_creator.h b/include/f_pc/f_pc_creator.h
index ebae2011c4..582abf5f39 100644
--- a/include/f_pc/f_pc_creator.h
+++ b/include/f_pc/f_pc_creator.h
@@ -4,11 +4,11 @@
#include "dolphin/types.h"
-struct base_process_class;
+typedef struct base_process_class base_process_class;
BOOL fpcCt_IsCreatingByID(unsigned int id);
-s32 fpcCt_IsDoing(struct base_process_class* pProc);
-BOOL fpcCt_Abort(struct base_process_class* pProc);
+s32 fpcCt_IsDoing(base_process_class* pProc);
+BOOL fpcCt_Abort(base_process_class* pProc);
void fpcCt_Handler(void);
#endif
diff --git a/include/f_pc/f_pc_delete_tag.h b/include/f_pc/f_pc_delete_tag.h
index e7cf53fcec..c195ef6d1e 100644
--- a/include/f_pc/f_pc_delete_tag.h
+++ b/include/f_pc/f_pc_delete_tag.h
@@ -4,7 +4,8 @@
#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
-#include "f_pc/f_pc_layer.h"
+
+typedef struct layer_class layer_class;
typedef int (*delete_tag_func)(void*);
diff --git a/include/f_pc/f_pc_deletor.h b/include/f_pc/f_pc_deletor.h
index 79185d966f..ebe81a41a9 100644
--- a/include/f_pc/f_pc_deletor.h
+++ b/include/f_pc/f_pc_deletor.h
@@ -2,9 +2,9 @@
#ifndef F_PC_DELETOR_H_
#define F_PC_DELETOR_H_
-#include "f_pc/f_pc_base.h"
+#include "dolphin/types.h"
-struct base_process_class;
+typedef struct base_process_class base_process_class;
BOOL fpcDt_IsComplete(void);
s32 fpcDt_ToDeleteQ(base_process_class* pProc);
diff --git a/include/f_pc/f_pc_draw.h b/include/f_pc/f_pc_draw.h
index cc3ba45602..b62024269f 100644
--- a/include/f_pc/f_pc_draw.h
+++ b/include/f_pc/f_pc_draw.h
@@ -1,9 +1,9 @@
#ifndef F_PC_DRAW_H_
#define F_PC_DRAW_H_
-#include "SSystem/SComponent/c_node_iter.h"
#include "dolphin/types.h"
-#include "f_pc/f_pc_base.h"
+
+typedef struct base_process_class base_process_class;
typedef int (*fpcDw_HandlerFunc)(void*, void*);
typedef int (*fpcDw_HandlerFuncFunc)(fpcDw_HandlerFunc);
diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h
index d3999bf46f..a987a5fadb 100644
--- a/include/f_pc/f_pc_executor.h
+++ b/include/f_pc/f_pc_executor.h
@@ -2,11 +2,11 @@
#ifndef F_PC_EXECUTOR_H_
#define F_PC_EXECUTOR_H_
-#include "SSystem/SComponent/c_node_iter.h"
-#include "f_pc/f_pc_base.h"
#include "f_pc/f_pc_layer_iter.h"
#include "f_pc/f_pc_line_iter.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);
diff --git a/include/f_pc/f_pc_fstcreate_req.h b/include/f_pc/f_pc_fstcreate_req.h
index 7e5f88d7e8..ef08c5e6d6 100644
--- a/include/f_pc/f_pc_fstcreate_req.h
+++ b/include/f_pc/f_pc_fstcreate_req.h
@@ -2,9 +2,10 @@
#define F_PC_FSTCREATE_REQ_H_
#include "dolphin/types.h"
-#include "f_pc/f_pc_base.h"
#include "f_pc/f_pc_create_req.h"
-#include "f_pc/f_pc_layer.h"
+
+typedef struct base_process_class base_process_class;
+typedef struct layer_class layer_class;
typedef int (*fstCreateFunc)(void*, void*);
diff --git a/include/f_pc/f_pc_layer.h b/include/f_pc/f_pc_layer.h
index 0f4084b897..4f7e0046b7 100644
--- a/include/f_pc/f_pc_layer.h
+++ b/include/f_pc/f_pc_layer.h
@@ -2,12 +2,13 @@
#ifndef F_PC_LAYER_H_
#define F_PC_LAYER_H_
+#include "SSystem/SComponent/c_list.h"
#include "SSystem/SComponent/c_node.h"
-#include "SSystem/SComponent/c_tag.h"
#include "SSystem/SComponent/c_tree.h"
#include "dolphin/types.h"
-struct process_method_tag_class;
+typedef struct create_tag_class create_tag_class;
+typedef struct process_method_tag_class process_method_tag_class;
typedef struct process_node_class process_node_class;
typedef struct layer_class {
@@ -41,10 +42,10 @@ s32 fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag);
s32 fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag);
void fpcLy_Cancel(layer_class* pLayer);
-bool fpcLy_CancelMethod(struct process_method_tag_class* pLayer);
+bool fpcLy_CancelMethod(process_method_tag_class* pLayer);
-void fpcLy_CancelQTo(struct process_method_tag_class* pMthd);
-s32 fpcLy_ToCancelQ(layer_class* pLayer, struct process_method_tag_class* pMthd);
+void fpcLy_CancelQTo(process_method_tag_class* pMthd);
+s32 fpcLy_ToCancelQ(layer_class* pLayer, process_method_tag_class* pMthd);
void fpcLy_Create(layer_class* pLayer, void* pPcNode, node_list_class* pLists, int listNum);
diff --git a/include/f_pc/f_pc_layer_iter.h b/include/f_pc/f_pc_layer_iter.h
index 7ef1d11b44..25f75a0348 100644
--- a/include/f_pc/f_pc_layer_iter.h
+++ b/include/f_pc/f_pc_layer_iter.h
@@ -1,9 +1,9 @@
#ifndef F_PC_LAYER_ITER_H_
#define F_PC_LAYER_ITER_H_
-#include "SSystem/SComponent/c_node_iter.h"
#include "dolphin/types.h"
-#include "f_pc/f_pc_layer.h"
+
+typedef struct layer_class layer_class;
typedef struct layer_iter {
void* mpFunc;
diff --git a/include/f_pc/f_pc_layer_tag.h b/include/f_pc/f_pc_layer_tag.h
index cc67f9dadb..3621f8bf77 100644
--- a/include/f_pc/f_pc_layer_tag.h
+++ b/include/f_pc/f_pc_layer_tag.h
@@ -4,7 +4,8 @@
#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
-#include "f_pc/f_pc_layer.h"
+
+typedef struct layer_class layer_class;
typedef struct layer_management_tag_class {
create_tag_class mCreateTag;
diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h
index b2df5fa658..0f49a08590 100644
--- a/include/f_pc/f_pc_leaf.h
+++ b/include/f_pc/f_pc_leaf.h
@@ -6,6 +6,7 @@
#include "f_pc/f_pc_base.h"
#include "f_pc/f_pc_draw_priority.h"
#include "f_pc/f_pc_method.h"
+#include "f_pc/f_pc_profile.h"
typedef struct leafdraw_method_class {
/* 0x00 */ process_method_class mBase;
diff --git a/include/f_pc/f_pc_line_iter.h b/include/f_pc/f_pc_line_iter.h
index 4a63c1e5e5..97a2fe57e3 100644
--- a/include/f_pc/f_pc_line_iter.h
+++ b/include/f_pc/f_pc_line_iter.h
@@ -2,8 +2,6 @@
#ifndef F_PC_LINE_ITER_H_
#define F_PC_LINE_ITER_H_
-#include "SSystem/SComponent/c_node_iter.h"
-
typedef int (*fpcLnIt_QueueFunc)(void*, void*);
void fpcLnIt_Queue(fpcLnIt_QueueFunc pFunc);
diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h
index 986e7da988..db6e8e467e 100644
--- a/include/f_pc/f_pc_manager.h
+++ b/include/f_pc/f_pc_manager.h
@@ -1,16 +1,14 @@
#ifndef F_PC_MANAGER_H_
#define F_PC_MANAGER_H_
-#include "SSystem/SComponent/c_node_iter.h"
-#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
#include "f_pc/f_pc_base.h"
#include "f_pc/f_pc_create_iter.h"
-#include "f_pc/f_pc_node_req.h"
-#include "f_pc/f_pc_stdcreate_req.h"
#include "f_pc/f_pc_executor.h"
#include "f_pc/f_pc_leaf.h"
#include "f_pc/f_pc_layer_iter.h"
+#include "f_pc/f_pc_node.h"
+#include "f_pc/f_pc_stdcreate_req.h"
enum {
fpcM_ERROR_PROCESS_ID_e = -1,
diff --git a/include/f_pc/f_pc_method_iter.h b/include/f_pc/f_pc_method_iter.h
index 1c3ad4eec4..633aaced54 100644
--- a/include/f_pc/f_pc_method_iter.h
+++ b/include/f_pc/f_pc_method_iter.h
@@ -2,9 +2,10 @@
#ifndef F_PC_METHOD_ITER_H_
#define F_PC_METHOD_ITER_H_
-#include "SSystem/SComponent/c_list_iter.h"
#include "dolphin/types.h"
+typedef struct node_list_class node_list_class;
+
typedef int (*fpcMtdIt_MethodFunc)(void*);
void fpcMtdIt_Method(node_list_class* pList, fpcMtdIt_MethodFunc pMethod);
diff --git a/include/f_pc/f_pc_node.h b/include/f_pc/f_pc_node.h
index fa92560fd6..c3c8a8c897 100644
--- a/include/f_pc/f_pc_node.h
+++ b/include/f_pc/f_pc_node.h
@@ -5,6 +5,7 @@
#include "f_pc/f_pc_base.h"
#include "f_pc/f_pc_layer.h"
#include "f_pc/f_pc_method.h"
+#include "f_pc/f_pc_profile.h"
typedef struct nodedraw_method_class {
process_method_class mBase;
diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h
index c5ca3045fb..a2c82824df 100644
--- a/include/f_pc/f_pc_node_req.h
+++ b/include/f_pc/f_pc_node_req.h
@@ -2,10 +2,13 @@
#define F_PC_NODE_REQ_H_
#include "SSystem/SComponent/c_phase.h"
+#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
#include "f_pc/f_pc_method.h"
#include "f_pc/f_pc_method_tag.h"
-#include "f_pc/f_pc_node.h"
+
+typedef struct layer_class layer_class;
+typedef struct process_node_class process_node_class;
typedef struct node_create_request_method_class {
process_method_func mpExecuteFunc;
@@ -53,15 +56,15 @@ s32 fpcNdRq_Execute(node_create_request* pNodeCreateReq);
s32 fpcNdRq_Delete(node_create_request* pNodeCreateReq);
s32 fpcNdRq_Cancel(node_create_request* pNodeCreateReq);
s32 fpcNdRq_Handler(void);
-s32 fpcNdRq_IsPossibleTarget(struct process_node_class* pProcNode);
-s32 fpcNdRq_IsIng(struct process_node_class* pProcNode);
+s32 fpcNdRq_IsPossibleTarget(process_node_class* pProcNode);
+s32 fpcNdRq_IsIng(process_node_class* pProcNode);
node_create_request* fpcNdRq_Create(u32 pRequestSize);
-node_create_request* fpcNdRq_ChangeNode(u32 pRequestSize, struct process_node_class* pProcNode,
+node_create_request* fpcNdRq_ChangeNode(u32 pRequestSize, process_node_class* pProcNode,
s16 param_3, void* param_4);
-node_create_request* fpcNdRq_DeleteNode(u32 pRequestSize, struct process_node_class* pProcNode);
+node_create_request* fpcNdRq_DeleteNode(u32 pRequestSize, process_node_class* pProcNode);
node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* param_3);
node_create_request*
-fpcNdRq_Request(u32 param_1, int param_2, struct process_node_class* param_3, s16 param_4,
+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);
diff --git a/include/f_pc/f_pc_pause.h b/include/f_pc/f_pc_pause.h
index d55e53d4ce..895b25af95 100644
--- a/include/f_pc/f_pc_pause.h
+++ b/include/f_pc/f_pc_pause.h
@@ -2,8 +2,6 @@
#define F_PC_PAUSE_
#include "dolphin/types.h"
-#include "f_pc/f_pc_base.h"
-#include "f_pc/f_pc_node.h"
s32 fpcPause_IsEnable(void* pProc, u8 expected);
s32 fpcPause_Enable(void* pProc, u8 pauseMask);
diff --git a/include/f_pc/f_pc_profile.h b/include/f_pc/f_pc_profile.h
index 6294ed032b..7c3dd68b2a 100644
--- a/include/f_pc/f_pc_profile.h
+++ b/include/f_pc/f_pc_profile.h
@@ -3,10 +3,10 @@
#define F_PC_PROFILE_H_
#include "dolphin/types.h"
-#include "f_pc/f_pc_method.h"
-struct nodedraw_method_class;
-struct leafdraw_method_class;
+typedef struct nodedraw_method_class nodedraw_method_class;
+typedef struct leafdraw_method_class leafdraw_method_class;
+typedef struct process_method_class process_method_class;
typedef struct process_profile_definition {
/* 0x00 */ s32 mLayerID;
diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h
index 6eda04ed46..a418200378 100644
--- a/include/f_pc/f_pc_stdcreate_req.h
+++ b/include/f_pc/f_pc_stdcreate_req.h
@@ -3,7 +3,8 @@
#include "dolphin/types.h"
#include "f_pc/f_pc_create_req.h"
-#include "f_pc/f_pc_layer.h"
+
+typedef struct layer_class layer_class;
typedef int (*stdCreateFunc)(void*, void*);