summaryrefslogtreecommitdiff
path: root/include/SSystem/SComponent
diff options
context:
space:
mode:
Diffstat (limited to 'include/SSystem/SComponent')
-rw-r--r--include/SSystem/SComponent/c_bg_s_shdw_draw.h2
-rw-r--r--include/SSystem/SComponent/c_cc_d.h6
-rw-r--r--include/SSystem/SComponent/c_cc_s.h1
-rw-r--r--include/SSystem/SComponent/c_list.h3
-rw-r--r--include/SSystem/SComponent/c_list_iter.h3
-rw-r--r--include/SSystem/SComponent/c_m3d_g_aab.h1
-rw-r--r--include/SSystem/SComponent/c_m3d_g_cps.h1
-rw-r--r--include/SSystem/SComponent/c_m3d_g_cyl.h1
-rw-r--r--include/SSystem/SComponent/c_m3d_g_sph.h4
-rw-r--r--include/SSystem/SComponent/c_m3d_g_tri.h3
-rw-r--r--include/SSystem/SComponent/c_malloc.h3
-rw-r--r--include/SSystem/SComponent/c_node_iter.h3
-rw-r--r--include/SSystem/SComponent/c_request.h1
-rw-r--r--include/SSystem/SComponent/c_tag.h5
-rw-r--r--include/SSystem/SComponent/c_tag_iter.h3
-rw-r--r--include/SSystem/SComponent/c_tree.h5
-rw-r--r--include/SSystem/SComponent/c_tree_iter.h3
-rw-r--r--include/SSystem/SComponent/c_xyz.h1
18 files changed, 31 insertions, 18 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_shdw_draw.h b/include/SSystem/SComponent/c_bg_s_shdw_draw.h
index ceb4a5e6bd..b6938b9368 100644
--- a/include/SSystem/SComponent/c_bg_s_shdw_draw.h
+++ b/include/SSystem/SComponent/c_bg_s_shdw_draw.h
@@ -3,11 +3,11 @@
#include "SSystem/SComponent/c_bg_s_chk.h"
#include "SSystem/SComponent/c_m3d_g_aab.h"
-#include "SSystem/SComponent/c_m3d_g_pla.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
struct cBgD_Vtx_t;
+class cM3dGPla;
typedef int (*cBgS_ShdwDraw_Callback)(class cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*);
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index 3b29c2f052..fe834acc38 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -1,16 +1,16 @@
#ifndef C_CC_D_H
#define C_CC_D_H
-#include "SSystem/SComponent/c_m3d.h"
#include "SSystem/SComponent/c_m3d_g_aab.h"
#include "SSystem/SComponent/c_m3d_g_cps.h"
#include "SSystem/SComponent/c_m3d_g_cyl.h"
#include "SSystem/SComponent/c_m3d_g_sph.h"
#include "SSystem/SComponent/c_m3d_g_tri.h"
-#include "dolphin/gx/GX.h"
-#include "f_op/f_op_actor.h"
#include "global.h"
+typedef struct _GXColor GXColor;
+class fopAc_ac_c;
+
enum CcG_Tg_HitMark {
CcG_Tg_UNK_MARK_6 = 6,
CcG_Tg_UNK_MARK_8 = 8,
diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h
index 32c0cc8fb6..61b0f7622a 100644
--- a/include/SSystem/SComponent/c_cc_s.h
+++ b/include/SSystem/SComponent/c_cc_s.h
@@ -3,6 +3,7 @@
#include "SSystem/SComponent/c_cc_d.h"
#include "dolphin/types.h"
+#include "global.h"
enum WeightType {
WeightType_0 = 0,
diff --git a/include/SSystem/SComponent/c_list.h b/include/SSystem/SComponent/c_list.h
index aa1ae3274b..6f31efc593 100644
--- a/include/SSystem/SComponent/c_list.h
+++ b/include/SSystem/SComponent/c_list.h
@@ -1,9 +1,10 @@
#ifndef C_LIST_H
#define C_LIST_H
-#include "SSystem/SComponent/c_node.h"
#include "dolphin/types.h"
+typedef struct node_class node_class;
+
typedef struct node_list_class {
node_class* mpHead;
node_class* mpTail;
diff --git a/include/SSystem/SComponent/c_list_iter.h b/include/SSystem/SComponent/c_list_iter.h
index 39c653173c..57c544a9bf 100644
--- a/include/SSystem/SComponent/c_list_iter.h
+++ b/include/SSystem/SComponent/c_list_iter.h
@@ -1,10 +1,11 @@
#ifndef C_LIST_ITER_H
#define C_LIST_ITER_H
-#include "SSystem/SComponent/c_list.h"
#include "SSystem/SComponent/c_node_iter.h"
#include "dolphin/types.h"
+typedef struct node_list_class node_list_class;
+
int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData);
void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData);
diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h
index ba1a556ef1..d268ceb5d6 100644
--- a/include/SSystem/SComponent/c_m3d_g_aab.h
+++ b/include/SSystem/SComponent/c_m3d_g_aab.h
@@ -3,6 +3,7 @@
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
+#include "global.h"
// Axis aligned bounding box
class cM3dGAab {
diff --git a/include/SSystem/SComponent/c_m3d_g_cps.h b/include/SSystem/SComponent/c_m3d_g_cps.h
index 20104043da..1454175021 100644
--- a/include/SSystem/SComponent/c_m3d_g_cps.h
+++ b/include/SSystem/SComponent/c_m3d_g_cps.h
@@ -5,6 +5,7 @@
#include "SSystem/SComponent/c_m3d_g_lin.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
+#include "global.h"
struct cM3dGCpsS {
/* 0x00 */ Vec mStart;
diff --git a/include/SSystem/SComponent/c_m3d_g_cyl.h b/include/SSystem/SComponent/c_m3d_g_cyl.h
index 12be442b34..8e8d393689 100644
--- a/include/SSystem/SComponent/c_m3d_g_cyl.h
+++ b/include/SSystem/SComponent/c_m3d_g_cyl.h
@@ -4,6 +4,7 @@
#include "SSystem/SComponent/c_m3d.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
+#include "global.h"
// Cylinder
struct cM3dGCylS {
diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h
index cc00a53c8b..494521fa01 100644
--- a/include/SSystem/SComponent/c_m3d_g_sph.h
+++ b/include/SSystem/SComponent/c_m3d_g_sph.h
@@ -2,9 +2,11 @@
#define C_M3D_G_SPH_H_
#include "SSystem/SComponent/c_m3d.h"
-#include "SSystem/SComponent/c_m3d_g_cyl.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
+#include "global.h"
+
+class cM3dGCyl;
struct cM3dGSphS {
/* 0x0 */ Vec mCenter;
diff --git a/include/SSystem/SComponent/c_m3d_g_tri.h b/include/SSystem/SComponent/c_m3d_g_tri.h
index 5bab254ea0..24338c6582 100644
--- a/include/SSystem/SComponent/c_m3d_g_tri.h
+++ b/include/SSystem/SComponent/c_m3d_g_tri.h
@@ -2,11 +2,12 @@
#define C_M3D_G_TRI_H_
#include "SSystem/SComponent/c_m3d.h"
-#include "SSystem/SComponent/c_m3d_g_cyl.h"
#include "SSystem/SComponent/c_m3d_g_pla.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
+class cM3dGCyl;
+
class cM3dGTri : public cM3dGPla {
// private:
public:
diff --git a/include/SSystem/SComponent/c_malloc.h b/include/SSystem/SComponent/c_malloc.h
index 0732d73266..0a352b2186 100644
--- a/include/SSystem/SComponent/c_malloc.h
+++ b/include/SSystem/SComponent/c_malloc.h
@@ -1,9 +1,10 @@
#ifndef C_MALLOC_H
#define C_MALLOC_H
-#include "JSystem/JKernel/JKRHeap.h"
#include "dolphin/types.h"
+class JKRHeap;
+
struct cMl {
static JKRHeap* Heap;
/* 80263220 */ static void init(JKRHeap*);
diff --git a/include/SSystem/SComponent/c_node_iter.h b/include/SSystem/SComponent/c_node_iter.h
index c598fd96c8..92c4444296 100644
--- a/include/SSystem/SComponent/c_node_iter.h
+++ b/include/SSystem/SComponent/c_node_iter.h
@@ -1,9 +1,10 @@
#ifndef C_NODE_ITER_H
#define C_NODE_ITER_H
-#include "SSystem/SComponent/c_node.h"
#include "dolphin/types.h"
+typedef struct node_class node_class;
+
typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData);
int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData);
diff --git a/include/SSystem/SComponent/c_request.h b/include/SSystem/SComponent/c_request.h
index 09ae61efae..c7fde53fb0 100644
--- a/include/SSystem/SComponent/c_request.h
+++ b/include/SSystem/SComponent/c_request.h
@@ -2,7 +2,6 @@
#define C_REQUEST_H
#include "dolphin/types.h"
-#include "f_pc/f_pc_base.h"
struct request_base_class {
u8 field_0x0;
diff --git a/include/SSystem/SComponent/c_tag.h b/include/SSystem/SComponent/c_tag.h
index 98296256dc..4c536cd7c5 100644
--- a/include/SSystem/SComponent/c_tag.h
+++ b/include/SSystem/SComponent/c_tag.h
@@ -1,11 +1,12 @@
#ifndef C_TAG_H
#define C_TAG_H
-#include "SSystem/SComponent/c_list.h"
#include "SSystem/SComponent/c_node.h"
-#include "SSystem/SComponent/c_tree.h"
#include "dolphin/types.h"
+typedef struct node_list_class node_list_class;
+typedef struct node_lists_tree_class node_lists_tree_class;
+
typedef struct create_tag_class {
node_class mpNode;
void* mpTagData;
diff --git a/include/SSystem/SComponent/c_tag_iter.h b/include/SSystem/SComponent/c_tag_iter.h
index b10aa3c942..3f00f5047d 100644
--- a/include/SSystem/SComponent/c_tag_iter.h
+++ b/include/SSystem/SComponent/c_tag_iter.h
@@ -2,9 +2,10 @@
#define C_TAG_ITER_H
#include "SSystem/SComponent/c_node_iter.h"
-#include "SSystem/SComponent/c_tag.h"
#include "dolphin/types.h"
+typedef struct create_tag_class create_tag_class;
+
typedef struct method_filter {
cNdIt_MethodFunc mpMethodFunc;
void* mpUserData;
diff --git a/include/SSystem/SComponent/c_tree.h b/include/SSystem/SComponent/c_tree.h
index 9edd738648..939a5e9417 100644
--- a/include/SSystem/SComponent/c_tree.h
+++ b/include/SSystem/SComponent/c_tree.h
@@ -1,10 +1,11 @@
#ifndef C_TREE_H
#define C_TREE_H
-#include "SSystem/SComponent/c_list.h"
-#include "SSystem/SComponent/c_node.h"
#include "dolphin/types.h"
+typedef struct node_class node_class;
+typedef struct node_list_class node_list_class;
+
typedef struct node_lists_tree_class {
node_list_class* mpLists;
int mNumLists;
diff --git a/include/SSystem/SComponent/c_tree_iter.h b/include/SSystem/SComponent/c_tree_iter.h
index a22151e06a..ead7c9d03b 100644
--- a/include/SSystem/SComponent/c_tree_iter.h
+++ b/include/SSystem/SComponent/c_tree_iter.h
@@ -2,9 +2,10 @@
#define C_TREE_ITER_H
#include "SSystem/SComponent/c_node_iter.h"
-#include "SSystem/SComponent/c_tree.h"
#include "dolphin/types.h"
+typedef struct node_lists_tree_class node_lists_tree_class;
+
int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData);
void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData);
diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h
index ada8df1193..5218f9d961 100644
--- a/include/SSystem/SComponent/c_xyz.h
+++ b/include/SSystem/SComponent/c_xyz.h
@@ -3,7 +3,6 @@
#include "MSL_C/math.h"
#include "dolphin/mtx/vec.h"
-#include "global.h"
struct cXyz : Vec {
static const cXyz Zero;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 07:59:08 +0000