diff --git a/Progress.md b/Progress.md index b10c6a8625a..b34452255a4 100644 --- a/Progress.md +++ b/Progress.md @@ -97,7 +97,7 @@ d_a_e_bug | 29.207138% | 5172 | 17708 d_a_e_cr | 34.481521% | 3844 | 11148 d_a_e_cr_egg | 43.296089% | 1860 | 4296 d_a_e_db | 26.006517% | 9896 | 38052 -d_a_e_db_leaf | 57.582938% | 972 | 1688 +d_a_e_db_leaf | 100.000000% | 1688 | 1688 d_a_e_dd | 26.687870% | 7384 | 27668 d_a_e_df | 28.031364% | 4004 | 14284 d_a_e_dk | 29.244060% | 5416 | 18520 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 54.940711% | 1112 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.562950% | 3859848 | 11500324 +Total | 33.569176% | 3860564 | 11500324 diff --git a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 7a4dd2f9f9d..00000000000 --- a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_806A205C: -/* 806A205C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806A2060 7C 08 02 A6 */ mflr r0 -/* 806A2064 90 01 00 14 */ stw r0, 0x14(r1) -/* 806A2068 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806A206C 93 C1 00 08 */ stw r30, 8(r1) -/* 806A2070 7C 7F 1B 78 */ mr r31, r3 -/* 806A2074 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 806A2078 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 806A207C 40 82 00 1C */ bne lbl_806A2098 -/* 806A2080 28 1F 00 00 */ cmplwi r31, 0 -/* 806A2084 41 82 00 08 */ beq lbl_806A208C -/* 806A2088 4B 97 6A DD */ bl __ct__10fopAc_ac_cFv -lbl_806A208C: -/* 806A208C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) -/* 806A2090 60 00 00 08 */ ori r0, r0, 8 -/* 806A2094 90 1F 04 A0 */ stw r0, 0x4a0(r31) -lbl_806A2098: -/* 806A2098 38 7F 05 AC */ addi r3, r31, 0x5ac -/* 806A209C 3C 80 80 6A */ lis r4, d_a_e_db_leaf__stringBase0@ha /* 0x806A2118@ha */ -/* 806A20A0 38 84 21 18 */ addi r4, r4, d_a_e_db_leaf__stringBase0@l /* 0x806A2118@l */ -/* 806A20A4 4B 98 AE 19 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 806A20A8 7C 7E 1B 78 */ mr r30, r3 -/* 806A20AC 2C 1E 00 04 */ cmpwi r30, 4 -/* 806A20B0 40 82 00 40 */ bne lbl_806A20F0 -/* 806A20B4 7F E3 FB 78 */ mr r3, r31 -/* 806A20B8 3C 80 80 6A */ lis r4, useHeapInit__FP10fopAc_ac_c@ha /* 0x806A1F5C@ha */ -/* 806A20BC 38 84 1F 5C */ addi r4, r4, useHeapInit__FP10fopAc_ac_c@l /* 0x806A1F5C@l */ -/* 806A20C0 38 A0 0A 80 */ li r5, 0xa80 -/* 806A20C4 4B 97 83 ED */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl -/* 806A20C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 806A20CC 40 82 00 0C */ bne lbl_806A20D8 -/* 806A20D0 38 60 00 05 */ li r3, 5 -/* 806A20D4 48 00 00 20 */ b lbl_806A20F4 -lbl_806A20D8: -/* 806A20D8 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806A20DC 80 63 00 04 */ lwz r3, 4(r3) -/* 806A20E0 38 03 00 24 */ addi r0, r3, 0x24 -/* 806A20E4 90 1F 05 04 */ stw r0, 0x504(r31) -/* 806A20E8 7F E3 FB 78 */ mr r3, r31 -/* 806A20EC 4B FF FD B5 */ bl daE_DB_LEAF_Execute__FP15e_db_leaf_class -lbl_806A20F0: -/* 806A20F0 7F C3 F3 78 */ mr r3, r30 -lbl_806A20F4: -/* 806A20F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806A20F8 83 C1 00 08 */ lwz r30, 8(r1) -/* 806A20FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806A2100 7C 08 03 A6 */ mtlr r0 -/* 806A2104 38 21 00 10 */ addi r1, r1, 0x10 -/* 806A2108 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Delete__FP15e_db_leaf_class.s b/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Delete__FP15e_db_leaf_class.s deleted file mode 100644 index eb6b7c49ec9..00000000000 --- a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Delete__FP15e_db_leaf_class.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_806A1F2C: -/* 806A1F2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806A1F30 7C 08 02 A6 */ mflr r0 -/* 806A1F34 90 01 00 14 */ stw r0, 0x14(r1) -/* 806A1F38 3C 80 80 6A */ lis r4, d_a_e_db_leaf__stringBase0@ha /* 0x806A2118@ha */ -/* 806A1F3C 38 84 21 18 */ addi r4, r4, d_a_e_db_leaf__stringBase0@l /* 0x806A2118@l */ -/* 806A1F40 38 63 05 AC */ addi r3, r3, 0x5ac -/* 806A1F44 4B 98 B0 C5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 806A1F48 38 60 00 01 */ li r3, 1 -/* 806A1F4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806A1F50 7C 08 03 A6 */ mtlr r0 -/* 806A1F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 806A1F58 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Draw__FP15e_db_leaf_class.s b/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Draw__FP15e_db_leaf_class.s deleted file mode 100644 index eecfbcd1543..00000000000 --- a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Draw__FP15e_db_leaf_class.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_806A1E38: -/* 806A1E38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806A1E3C 7C 08 02 A6 */ mflr r0 -/* 806A1E40 90 01 00 14 */ stw r0, 0x14(r1) -/* 806A1E44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806A1E48 7C 7F 1B 78 */ mr r31, r3 -/* 806A1E4C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806A1E50 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806A1E54 38 80 00 00 */ li r4, 0 -/* 806A1E58 38 BF 04 D0 */ addi r5, r31, 0x4d0 -/* 806A1E5C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 806A1E60 4B B0 19 65 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 806A1E64 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806A1E68 80 83 00 04 */ lwz r4, 4(r3) -/* 806A1E6C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 806A1E70 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 806A1E74 80 84 00 04 */ lwz r4, 4(r4) -/* 806A1E78 38 BF 01 0C */ addi r5, r31, 0x10c -/* 806A1E7C 4B B0 2F 25 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 806A1E80 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806A1E84 4B 96 E7 FD */ bl entryDL__14mDoExt_McaMorfFv -/* 806A1E88 38 60 00 01 */ li r3, 1 -/* 806A1E8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806A1E90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806A1E94 7C 08 03 A6 */ mtlr r0 -/* 806A1E98 38 21 00 10 */ addi r1, r1, 0x10 -/* 806A1E9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Execute__FP15e_db_leaf_class.s b/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Execute__FP15e_db_leaf_class.s deleted file mode 100644 index 25848e96db8..00000000000 --- a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Execute__FP15e_db_leaf_class.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_806A1EA0: -/* 806A1EA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 806A1EA4 7C 08 02 A6 */ mflr r0 -/* 806A1EA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 806A1EAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 806A1EB0 7C 7F 1B 78 */ mr r31, r3 -/* 806A1EB4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806A1EB8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806A1EBC C0 3F 04 D0 */ lfs f1, 0x4d0(r31) -/* 806A1EC0 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 806A1EC4 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) -/* 806A1EC8 4B CA 4A 21 */ bl PSMTXTrans -/* 806A1ECC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806A1ED0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806A1ED4 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 806A1ED8 4B 96 A5 5D */ bl mDoMtx_YrotM__FPA4_fs -/* 806A1EDC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806A1EE0 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806A1EE4 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 806A1EE8 4B 96 A4 B5 */ bl mDoMtx_XrotM__FPA4_fs -/* 806A1EEC 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806A1EF0 80 83 00 04 */ lwz r4, 4(r3) -/* 806A1EF4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 806A1EF8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 806A1EFC 38 84 00 24 */ addi r4, r4, 0x24 -/* 806A1F00 4B CA 45 B1 */ bl PSMTXCopy -/* 806A1F04 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806A1F08 4B 96 E7 A5 */ bl modelCalc__14mDoExt_McaMorfFv -/* 806A1F0C 38 60 00 01 */ li r3, 1 -/* 806A1F10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 806A1F14 80 01 00 14 */ lwz r0, 0x14(r1) -/* 806A1F18 7C 08 03 A6 */ mtlr r0 -/* 806A1F1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 806A1F20 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/useHeapInit__FP10fopAc_ac_c.s b/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/useHeapInit__FP10fopAc_ac_c.s deleted file mode 100644 index a1c300052ac..00000000000 --- a/asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/useHeapInit__FP10fopAc_ac_c.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_806A1F5C: -/* 806A1F5C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 806A1F60 7C 08 02 A6 */ mflr r0 -/* 806A1F64 90 01 00 34 */ stw r0, 0x34(r1) -/* 806A1F68 39 61 00 30 */ addi r11, r1, 0x30 -/* 806A1F6C 4B CC 02 6D */ bl _savegpr_28 -/* 806A1F70 7C 7F 1B 78 */ mr r31, r3 -/* 806A1F74 38 60 00 54 */ li r3, 0x54 -/* 806A1F78 4B C2 CC D5 */ bl __nw__FUl -/* 806A1F7C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 806A1F80 41 82 00 9C */ beq lbl_806A201C -/* 806A1F84 3C 60 80 6A */ lis r3, d_a_e_db_leaf__stringBase0@ha /* 0x806A2118@ha */ -/* 806A1F88 38 63 21 18 */ addi r3, r3, d_a_e_db_leaf__stringBase0@l /* 0x806A2118@l */ -/* 806A1F8C 38 80 00 13 */ li r4, 0x13 -/* 806A1F90 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 806A1F94 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 806A1F98 3F 85 00 02 */ addis r28, r5, 2 -/* 806A1F9C 3B 9C C2 F8 */ addi r28, r28, -15624 -/* 806A1FA0 7F 85 E3 78 */ mr r5, r28 -/* 806A1FA4 38 C0 00 80 */ li r6, 0x80 -/* 806A1FA8 4B 99 A3 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 806A1FAC 7C 7D 1B 78 */ mr r29, r3 -/* 806A1FB0 3C 60 80 6A */ lis r3, d_a_e_db_leaf__stringBase0@ha /* 0x806A2118@ha */ -/* 806A1FB4 38 63 21 18 */ addi r3, r3, d_a_e_db_leaf__stringBase0@l /* 0x806A2118@l */ -/* 806A1FB8 38 80 00 18 */ li r4, 0x18 -/* 806A1FBC 7F 85 E3 78 */ mr r5, r28 -/* 806A1FC0 38 C0 00 80 */ li r6, 0x80 -/* 806A1FC4 4B 99 A3 29 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 806A1FC8 7C 64 1B 78 */ mr r4, r3 -/* 806A1FCC 38 00 00 01 */ li r0, 1 -/* 806A1FD0 90 01 00 08 */ stw r0, 8(r1) -/* 806A1FD4 38 00 00 00 */ li r0, 0 -/* 806A1FD8 90 01 00 0C */ stw r0, 0xc(r1) -/* 806A1FDC 3C 00 00 08 */ lis r0, 8 -/* 806A1FE0 90 01 00 10 */ stw r0, 0x10(r1) -/* 806A1FE4 3C 60 11 00 */ lis r3, 0x1100 /* 0x11000084@ha */ -/* 806A1FE8 38 03 00 84 */ addi r0, r3, 0x0084 /* 0x11000084@l */ -/* 806A1FEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 806A1FF0 7F C3 F3 78 */ mr r3, r30 -/* 806A1FF4 38 A0 00 00 */ li r5, 0 -/* 806A1FF8 38 C0 00 00 */ li r6, 0 -/* 806A1FFC 7F A7 EB 78 */ mr r7, r29 -/* 806A2000 39 00 00 02 */ li r8, 2 -/* 806A2004 3D 20 80 6A */ lis r9, lit_3699@ha /* 0x806A2114@ha */ -/* 806A2008 C0 29 21 14 */ lfs f1, lit_3699@l(r9) /* 0x806A2114@l */ -/* 806A200C 39 20 00 00 */ li r9, 0 -/* 806A2010 39 40 FF FF */ li r10, -1 -/* 806A2014 4B 96 DC 39 */ bl __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl -/* 806A2018 7C 7E 1B 78 */ mr r30, r3 -lbl_806A201C: -/* 806A201C 93 DF 05 B4 */ stw r30, 0x5b4(r31) -/* 806A2020 80 7F 05 B4 */ lwz r3, 0x5b4(r31) -/* 806A2024 28 03 00 00 */ cmplwi r3, 0 -/* 806A2028 41 82 00 10 */ beq lbl_806A2038 -/* 806A202C 80 03 00 04 */ lwz r0, 4(r3) -/* 806A2030 28 00 00 00 */ cmplwi r0, 0 -/* 806A2034 40 82 00 0C */ bne lbl_806A2040 -lbl_806A2038: -/* 806A2038 38 60 00 00 */ li r3, 0 -/* 806A203C 48 00 00 08 */ b lbl_806A2044 -lbl_806A2040: -/* 806A2040 38 60 00 01 */ li r3, 1 -lbl_806A2044: -/* 806A2044 39 61 00 30 */ addi r11, r1, 0x30 -/* 806A2048 4B CC 01 DD */ bl _restgpr_28 -/* 806A204C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 806A2050 7C 08 03 A6 */ mtlr r0 -/* 806A2054 38 21 00 30 */ addi r1, r1, 0x30 -/* 806A2058 4E 80 00 20 */ blr diff --git a/include/DynamicLink.h b/include/DynamicLink.h index f9da596ca89..53bd8f20b14 100644 --- a/include/DynamicLink.h +++ b/include/DynamicLink.h @@ -1,10 +1,12 @@ #ifndef DYNAMICLINK_H #define DYNAMICLINK_H -#include "JSystem/JKernel/JKRFileCache.h" -#include "dolphin/os/OSLink.h" #include "dolphin/types.h" -#include "m_Do/m_Do_dvd_thread.h" + +typedef struct OSModuleInfo OSModuleInfo; +class JKRArchive; +class JKRFileCache; +class mDoDvdThd_callback_c; struct DynamicModuleControlBase { /* 0x00 */ u16 mLinkCount; diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index 1cb44c0f04e..325172b6649 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -3,12 +3,14 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/JUtility/JUTNameTab.h" -#include "JSystem/JUtility/JUTTexture.h" -#include "dolphin/gx/GX.h" -#include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "global.h" +typedef struct _GXColor GXColor; +typedef struct _GXColorS10 GXColorS10; class J2DScreen; +class JUTPalette; +struct ResTIMG; enum J2DAnmKind { KIND_TRANSFORM = 0, diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h index cb4501ce587..19b86425589 100644 --- a/include/JSystem/J2DGraph/J2DAnmLoader.h +++ b/include/JSystem/J2DGraph/J2DAnmLoader.h @@ -2,7 +2,6 @@ #define J2DANMLOADER_H #include "JSystem/J2DGraph/J2DAnimation.h" -#include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "dolphin/types.h" struct J2DAnmLoaderDataBase { diff --git a/include/JSystem/J2DGraph/J2DManage.h b/include/JSystem/J2DGraph/J2DManage.h index 96a9e5ebc03..07d563571f7 100644 --- a/include/JSystem/J2DGraph/J2DManage.h +++ b/include/JSystem/J2DGraph/J2DManage.h @@ -1,9 +1,10 @@ #ifndef J2DMANAGE_H #define J2DMANAGE_H -#include "JSystem/JSupport/JSUInputStream.h" #include "dolphin/types.h" +class JSUInputStream; + struct J2DResReference { /* 0x00 */ u16 mCount; /* 0x02 */ u16 mOffsets[1]; diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h index d9ed9f94b83..5b4466de38b 100644 --- a/include/JSystem/J2DGraph/J2DMatBlock.h +++ b/include/JSystem/J2DGraph/J2DMatBlock.h @@ -2,11 +2,18 @@ #define J2DMATBLOCK_H #include "JSystem/J2DGraph/J2DTevs.h" -#include "JSystem/JUtility/JUTResFont.h" -#include "JSystem/JUtility/JUTTexture.h" #include "JSystem/JUtility/TColor.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" +class JUTFont; +class JUTPalette; +class JUTResFont; +class JUTTexture; +struct ResFONT; +struct ResTIMG; +struct ResTLUT; + struct J2DGXColorS10 : public GXColorS10 { /* 802F1B90 */ J2DGXColorS10(); }; diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/include/JSystem/J2DGraph/J2DMaterial.h index e30143379f4..b83a856cc99 100644 --- a/include/JSystem/J2DGraph/J2DMaterial.h +++ b/include/JSystem/J2DGraph/J2DMaterial.h @@ -3,7 +3,6 @@ #include "JSystem/J2DGraph/J2DAnimation.h" #include "JSystem/J2DGraph/J2DMatBlock.h" -#include "dolphin/gx/GX.h" #include "dolphin/types.h" class J2DMaterial { diff --git a/include/JSystem/J2DGraph/J2DMaterialFactory.h b/include/JSystem/J2DGraph/J2DMaterialFactory.h index e66d8f9bddb..719333b51c7 100644 --- a/include/JSystem/J2DGraph/J2DMaterialFactory.h +++ b/include/JSystem/J2DGraph/J2DMaterialFactory.h @@ -2,16 +2,26 @@ #define J2DMATERIALFACTORY_H #include "JSystem/J2DGraph/J2DManage.h" -#include "JSystem/J2DGraph/J2DMaterial.h" -#include "JSystem/JKernel/JKRArchive.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/types.h" struct J2DMaterialBlock {}; -struct J2DMaterialInitData; -struct J2DIndInitData; -struct J2DTevSwapModeTableInfo; +typedef struct _GXColor GXColor; +typedef struct _GXColorS10 GXColorS10; struct J2DAlphaCompInfo; +struct J2DBlendInfo; +struct J2DColorChanInfo; +struct J2DIndInitData; +class J2DMaterial; +struct J2DMaterialInitData; +struct J2DTevStageInfo; +struct J2DTevSwapModeTableInfo; +struct J2DTevSwapModeInfo; +struct J2DTevOrderInfo; +struct J2DTexCoordInfo; +struct J2DTexMtxInfo; +class JKRArchive; class J2DMaterialFactory { public: diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index 7d4832d8eb9..a2c4bf1d147 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -1,19 +1,26 @@ #ifndef J2DPANE_H #define J2DPANE_H -#include "JSystem/J2DGraph/J2DAnimation.h" -#include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/JGeometry.h" -#include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JSupport/JSUList.h" -#include "JSystem/JSupport/JSURandomInputStream.h" -#include "JSystem/JUtility/JUTFont.h" -#include "JSystem/JUtility/JUTResFont.h" -#include "JSystem/JUtility/JUTTexture.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" +class J2DAnmBase; +class J2DAnmColor; +class J2DAnmTransform; +class J2DAnmTevRegKey; +class J2DAnmTextureSRTKey; +class J2DAnmVisibilityFull; +class J2DAnmVtxColor; +class J2DGrafContext; class J2DScreen; +class J2DAnmTexPattern; +class JKRArchive; +class JSURandomInputStream; +struct ResFONT; +struct ResTIMG; enum J2DRotateAxis { /* 0x78 */ ROTATE_X = 'x', diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h index b28e74fd837..e19ea034bae 100644 --- a/include/JSystem/J2DGraph/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture.h @@ -2,10 +2,16 @@ #define J2DPICTURE_H #include "JSystem/J2DGraph/J2DPane.h" -#include "JSystem/J2DGraph/J2DScreen.h" -#include "JSystem/JUtility/JUTTexture.h" +#include "JSystem/JUtility/TColor.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/types.h" +class J2DMaterial; +class JUTPalette; +class JUTTexture; +struct ResTIMG; +struct ResTLUT; + enum J2DMirror { /* 0x0 */ MIRROR0, // temp, figure out later }; diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h index 3b830930154..8e3a3139cfb 100644 --- a/include/JSystem/J2DGraph/J2DPictureEx.h +++ b/include/JSystem/J2DGraph/J2DPictureEx.h @@ -1,10 +1,13 @@ #ifndef J2DPICTUREEX_H #define J2DPICTUREEX_H -#include "JSystem/J2DGraph/J2DMaterial.h" #include "JSystem/J2DGraph/J2DPicture.h" +#include "JSystem/J2DGraph/J2DTevs.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/types.h" +class J2DMaterial; + class J2DPictureEx : public J2DPicture { public: enum stage_enum {}; diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index fe2b1698238..e47e59b6463 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -6,6 +6,8 @@ #include "Runtime.PPCEABI.H/__va_arg.h" #include "dolphin/types.h" +class JUTFont; + class J2DPrint { public: struct TSize { diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h index a878d07f57c..456f8d3ad47 100644 --- a/include/JSystem/J2DGraph/J2DScreen.h +++ b/include/JSystem/J2DGraph/J2DScreen.h @@ -2,11 +2,13 @@ #define J2DSCREEN_H #include "JSystem/J2DGraph/J2DManage.h" -#include "JSystem/J2DGraph/J2DMaterial.h" #include "JSystem/J2DGraph/J2DPane.h" -#include "JSystem/JUtility/JUTNameTab.h" +#include "JSystem/JUtility/TColor.h" #include "dolphin/types.h" +class J2DMaterial; +class JUTNameTab; + struct J2DScrnHeader { /* 0x00 */ u32 mTag; /* 0x04 */ u32 mType; diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h index 087e9d5396c..63e0201b9cc 100644 --- a/include/JSystem/J2DGraph/J2DTevs.h +++ b/include/JSystem/J2DGraph/J2DTevs.h @@ -1,7 +1,7 @@ #ifndef J2DTEVS_H #define J2DTEVS_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index 67d1d663d31..b0d99ec5ae2 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -5,6 +5,9 @@ #include "JSystem/J2DGraph/J2DPane.h" #include "dolphin/types.h" +class J2DMaterial; +class JUTFont; + enum J2DTextBoxVBinding { /* 0x0 */ VBIND_CENTER, /* 0x1 */ VBIND_BOTTOM, diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/include/JSystem/J2DGraph/J2DTextBoxEx.h index 98f6c44c109..3a53a48ade8 100644 --- a/include/JSystem/J2DGraph/J2DTextBoxEx.h +++ b/include/JSystem/J2DGraph/J2DTextBoxEx.h @@ -1,11 +1,12 @@ #ifndef J2DTEXTBOXEX_H #define J2DTEXTBOXEX_H -#include "JSystem/J2DGraph/J2DMaterial.h" -#include "JSystem/J2DGraph/J2DPrint.h" #include "JSystem/J2DGraph/J2DTextBox.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/types.h" +class J2DMaterial; + class J2DTextBoxEx : public J2DTextBox { public: enum stage_enum { diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h index 088ab3315e9..fb114165f05 100644 --- a/include/JSystem/J2DGraph/J2DWindow.h +++ b/include/JSystem/J2DGraph/J2DWindow.h @@ -3,9 +3,11 @@ #include "JSystem/J2DGraph/J2DMaterial.h" #include "JSystem/J2DGraph/J2DPane.h" -#include "JSystem/JSupport/JSURandomInputStream.h" #include "dolphin/types.h" +class JSURandomInputStream; +class JUTTexture; + class J2DWindow : public J2DPane { public: struct TMaterial { diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/include/JSystem/J2DGraph/J2DWindowEx.h index e5f7e29f8ad..a19e3842aa3 100644 --- a/include/JSystem/J2DGraph/J2DWindowEx.h +++ b/include/JSystem/J2DGraph/J2DWindowEx.h @@ -3,6 +3,7 @@ #include "JSystem/J2DGraph/J2DMaterial.h" #include "JSystem/J2DGraph/J2DWindow.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/types.h" class J2DWindowEx : public J2DWindow { diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 5fe848fe8ac..198952a2339 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -3,8 +3,12 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" -#include "dolphin/gx/GX.h" +#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/types.h" +#include "global.h" + +typedef struct _GXColor GXColor; +typedef struct _GXColorS10 GXColorS10; struct J3DAnmKeyTableBase { /* 0x00 */ u16 mMaxFrame; diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h index 12f2da776c5..6156cf06cff 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJoint.h +++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h @@ -1,11 +1,12 @@ #ifndef J3DJOINT_H #define J3DJOINT_H -#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DTransform.h" #include "dolphin/types.h" class J3DAnmTransform; +class J3DJoint; +class J3DMaterial; class J3DMtxBuffer; class J3DMtxCalc { diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h index a58b55c9a90..dc74089af30 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h +++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h @@ -2,10 +2,11 @@ #define J3DJOINTTREE_H #include "JSystem/J3DGraphAnimator/J3DJoint.h" -#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" +class JUTNameTab; + struct J3DModelHierarchy { /* 0x0 */ u16 mType; /* 0x2 */ u16 mValue; diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h index db9a5184a60..b87b1f0d0aa 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h @@ -4,6 +4,9 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "dolphin/types.h" +typedef struct _GXColor GXColor; +typedef struct _GXColorS10 GXColorS10; + class J3DMatColorAnm { public: /* 8003B2B8 */ ~J3DMatColorAnm(); diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h index 79ed0e592d0..343006df807 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h @@ -1,7 +1,6 @@ #ifndef J3DMATERIALATTACH_H #define J3DMATERIALATTACH_H -#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/types.h" struct J3DMaterial; @@ -10,6 +9,7 @@ struct J3DAnmColor; struct J3DAnmTexPattern; struct J3DAnmTextureSRTKey; struct J3DAnmTevRegKey; +class JUTNameTab; class J3DMaterialTable { public: diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h index 766ae76a76f..125e7c9b3d3 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModelData.h +++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h @@ -8,6 +8,9 @@ #include "JSystem/J3DGraphBase/J3DVertex.h" #include "dolphin/types.h" +typedef struct _GXColor GXColor; +class JUTNameTab; + class J3DModelData { public: /* 80325D88 */ void clear(); diff --git a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h index 9abac85f9bd..4cc14fdd29a 100644 --- a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h +++ b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h @@ -3,9 +3,10 @@ #include "JSystem/J3DGraphBase/J3DShape.h" #include "JSystem/J3DGraphBase/J3DVertex.h" -#include "JSystem/JUtility/JUTNameTab.h" #include "dolphin/types.h" +class JUTNameTab; + class J3DShapeTable { public: J3DShapeTable() { diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index d68a99bc94f..4e1ca4a6e3e 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DStruct.h" #include "JSystem/J3DGraphBase/J3DTevs.h" #include "JSystem/J3DGraphBase/J3DTexture.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index 778236d80fe..cb98164d030 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -2,7 +2,7 @@ #define J3DSTRUCT_H #include "SSystem/SComponent/c_xyz.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" class J3DLightInfo { diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 95580afa910..b66c8b6c33f 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -2,6 +2,7 @@ #define J3DTEXTURE_H #include "JSystem/JUtility/JUTTexture.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/mtx/mtx.h" #include "dolphin/mtx/mtx44.h" #include "dolphin/types.h" diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h index a8e67d578f7..a601987c1de 100644 --- a/include/JSystem/J3DGraphBase/J3DVertex.h +++ b/include/JSystem/J3DGraphBase/J3DVertex.h @@ -1,10 +1,12 @@ #ifndef J3DVERTEX_H #define J3DVERTEX_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXAttr.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/mtx/vec.h" #include "dolphin/types.h" +typedef struct _GXColor GXColor; class J3DModel; struct J3DAnmVtxColor; diff --git a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h b/include/JSystem/J3DGraphLoader/J3DShapeFactory.h index 385a217e253..1100b5fe69d 100644 --- a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h +++ b/include/JSystem/J3DGraphLoader/J3DShapeFactory.h @@ -1,7 +1,8 @@ #ifndef J3DSHAPEFACTORY_H #define J3DSHAPEFACTORY_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXAttr.h" +#include "dolphin/mtx/vec.h" #include "dolphin/types.h" struct J3DShape; diff --git a/include/JSystem/JAudio2/JAIAudible.h b/include/JSystem/JAudio2/JAIAudible.h index 047b9132953..1f89a60d73a 100644 --- a/include/JSystem/JAudio2/JAIAudible.h +++ b/include/JSystem/JAudio2/JAIAudible.h @@ -2,7 +2,8 @@ #define JAIAUDIBLE_H #include "dolphin/types.h" -#include "JSystem/JAudio2/JASSoundParams.h" + +struct JASSoundParams; struct JAIAudible { virtual ~JAIAudible(); diff --git a/include/JSystem/JAudio2/JAIAudience.h b/include/JSystem/JAudio2/JAIAudience.h index 1621386ad8a..8b54ffe9f44 100644 --- a/include/JSystem/JAudio2/JAIAudience.h +++ b/include/JSystem/JAudio2/JAIAudience.h @@ -1,11 +1,10 @@ #ifndef JAIAUDIENCE_H #define JAIAUDIENCE_H -#include "JSystem/JAudio2/JAIAudible.h" -#include "JSystem/JAudio2/JAISound.h" #include "JSystem/JGeometry.h" #include "dolphin/types.h" +struct JAIAudible; class JAISoundID; struct JASSoundParams; diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h index 627445f912f..d4f6886b190 100644 --- a/include/JSystem/JAudio2/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr.h @@ -1,11 +1,15 @@ #ifndef JAISEMGR_H #define JAISEMGR_H -#include "JSystem/JAudio2/JAIAudience.h" #include "JSystem/JAudio2/JAISeqDataMgr.h" #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JAISoundParams.h" #include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JSupport/JSUList.h" +#include "global.h" + +struct JAIAudience; +struct JASSoundParams; struct JASNonCopyable { /* 0x0 */ int field_0x0; diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h index 95503312116..91766815309 100644 --- a/include/JSystem/JAudio2/JAISeqMgr.h +++ b/include/JSystem/JAudio2/JAISeqMgr.h @@ -1,12 +1,13 @@ #ifndef JAISEQMGR_H #define JAISEQMGR_H -#include "JSystem/JAudio2/JAIAudience.h" #include "JSystem/JAudio2/JAISeqDataMgr.h" #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JAISoundParams.h" #include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JSupport/JSUList.h" +struct JAIAudience; struct JAISeq; class JAISeqMgr : public JAISeqDataUser, public JASGlobalInstance { diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index b45793de42a..92a376f8364 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -1,8 +1,6 @@ #ifndef JAISOUND_H #define JAISOUND_H -#include "JSystem/JAudio2/JAIAudience.h" -#include "JSystem/JAudio2/JAISoundHandles.h" #include "JSystem/JAudio2/JAISoundParams.h" #include "JSystem/JGeometry.h" #include "dolphin/types.h" diff --git a/include/JSystem/JAudio2/JAISoundChild.h b/include/JSystem/JAudio2/JAISoundChild.h index 257e89eb400..b3ac7d6942e 100644 --- a/include/JSystem/JAudio2/JAISoundChild.h +++ b/include/JSystem/JAudio2/JAISoundChild.h @@ -2,9 +2,10 @@ #define JAISOUNDCHILD_H #include "JSystem/JAudio2/JAISoundParams.h" -#include "JSystem/JAudio2/JASTrack.h" #include "dolphin/types.h" +struct JASTrack; + struct JAISoundChild { /* 802A2AB0 */ void init(); /* 802A2B28 */ void mixOut(JASTrack*); diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/include/JSystem/JAudio2/JASAudioReseter.h index 66d466f3f51..45813a60167 100644 --- a/include/JSystem/JAudio2/JASAudioReseter.h +++ b/include/JSystem/JAudio2/JASAudioReseter.h @@ -1,9 +1,8 @@ #ifndef JASAUDIORESETER_H #define JASAUDIORESETER_H -#include "JSystem/JAudio2/JASDriverIF.h" #include "dolphin/types.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSInterrupt.h" struct JASCriticalSection { inline JASCriticalSection() {mInterruptState = OSDisableInterrupts();}; diff --git a/include/JSystem/JAudio2/JASDvdThread.h b/include/JSystem/JAudio2/JASDvdThread.h index 0e05c452d93..061f7bd496e 100644 --- a/include/JSystem/JAudio2/JASDvdThread.h +++ b/include/JSystem/JAudio2/JASDvdThread.h @@ -1,9 +1,10 @@ #ifndef JASDVDTHREAD_H #define JASDVDTHREAD_H -#include "JSystem/JAudio2/JASTaskThread.h" #include "dolphin/types.h" +class JASTaskThread; + class JASDvd { public: /* 8028FEFC */ static JASTaskThread* getThreadPointer(); diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/include/JSystem/JAudio2/JASResArcLoader.h index 8e32fb6b062..baab6775944 100644 --- a/include/JSystem/JAudio2/JASResArcLoader.h +++ b/include/JSystem/JAudio2/JASResArcLoader.h @@ -1,7 +1,10 @@ #ifndef JASRESARCLOADER_H #define JASRESARCLOADER_H -#include "JSystem/JKernel/JKRArchive.h" +#include "dolphin/types.h" + +typedef struct OSMessageQueue OSMessageQueue; +class JKRArchive; namespace JASResArcLoader { /* 80290BD0 */ size_t getResSize(JKRArchive const*, u16); diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index 4166ea15028..12465a470c4 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -2,7 +2,8 @@ #define JASTRACK_H #include "JSystem/JAudio2/JASGadget.h" -#include "JSystem/JAudio2/JASSoundParams.h" + +struct JASSoundParams; struct JASDsp { struct TChannel { diff --git a/include/JSystem/JAudio2/JASWaveArcLoader.h b/include/JSystem/JAudio2/JASWaveArcLoader.h index 95fb0280b0b..9e3610c6516 100644 --- a/include/JSystem/JAudio2/JASWaveArcLoader.h +++ b/include/JSystem/JAudio2/JASWaveArcLoader.h @@ -1,16 +1,13 @@ #ifndef JASWAVEARCLOADER_H #define JASWAVEARCLOADER_H +#include "JSystem/JSupport/JSUList.h" #include "dol2asm.h" -#include "dolphin/types.h" -#include "global.h" - #include "dolphin/os/OSMutex.h" +#include "dolphin/types.h" -#include "JSystem/JAudio2/JASDvdThread.h" -#include "JSystem/JAudio2/JASHeapCtrl.h" -#include "JSystem/JKernel/JKRDvdAramRipper.h" -#include "JSystem/JKernel/JKRSolidHeap.h" +class JKRHeap; +class JKRSolidHeap; struct JASDisposer { JASDisposer() {} diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index d189cd7cde4..57f987cc6fa 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -1,15 +1,18 @@ #ifndef JFWDISPLAY_H #define JFWDISPLAY_H -#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JSupport/JSUList.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTFader.h" -#include "JSystem/JUtility/JUTProcBar.h" #include "JSystem/JUtility/JUTXfb.h" #include "JSystem/JUtility/TColor.h" -#include "dolphin/gx/GX.h" +#include "dolphin/os/OSAlarm.h" #include "dolphin/types.h" +typedef struct _GXColor GXColor; +typedef struct _GXRenderModeObj GXRenderModeObj; +class JKRHeap; + typedef void (*JFWDisplayUnkFunc)(void); class JFWAlarm : public OSAlarm { diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h index 66c89e8c56d..e1b878f12ab 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/include/JSystem/JFramework/JFWSystem.h @@ -1,13 +1,17 @@ #ifndef JFWSYSTEM_H #define JFWSYSTEM_H -#include "JSystem/JKernel/JKRExpHeap.h" -#include "JSystem/JKernel/JKRThread.h" -#include "JSystem/JUtility/JUTConsole.h" -#include "JSystem/JUtility/JUTDbPrint.h" -#include "JSystem/JUtility/JUTResFont.h" #include "dolphin/types.h" +typedef struct _GXRenderModeObj GXRenderModeObj; +class JKRExpHeap; +class JKRThread; +class JUTConsole; +class JUTConsoleManager; +class JUTDbPrint; +class JUTResFont; +struct ResFONT; + struct JFWSystem { struct CSetUpParam { static s32 maxStdHeaps; diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index a7b3510800e..552681f88c6 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -1,6 +1,7 @@ #ifndef SEARCH_H #define SEARCH_H +#include "dolphin/types.h" #include "global.h" namespace JGadget { diff --git a/include/JSystem/JGadget/vector.h b/include/JSystem/JGadget/vector.h index 636ac909ccc..adb5ad1756d 100644 --- a/include/JSystem/JGadget/vector.h +++ b/include/JSystem/JGadget/vector.h @@ -1,7 +1,7 @@ #ifndef VECTOR_H #define VECTOR_H -#include "global.h" +#include "dolphin/types.h" extern u8 data_804511E0; extern u8 lit_569[]; diff --git a/include/JSystem/JKernel/JKRAram.h b/include/JSystem/JKernel/JKRAram.h index 80975eba935..5fd1b7820e8 100644 --- a/include/JSystem/JKernel/JKRAram.h +++ b/include/JSystem/JKernel/JKRAram.h @@ -1,13 +1,13 @@ #ifndef JKRARAM_H #define JKRARAM_H -#include "dolphin/types.h" - #include "JSystem/JKernel/JKRAramHeap.h" #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JKernel/JKRThread.h" +#include "dolphin/types.h" class JKRHeap; +class JKRAMCommand; class JKRAramBlock; class JKRAram : public JKRThread { private: diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive.h index 5a7f7bd44a1..33031afbe41 100644 --- a/include/JSystem/JKernel/JKRAramArchive.h +++ b/include/JSystem/JKernel/JKRAramArchive.h @@ -5,6 +5,9 @@ #include "JSystem/JKernel/JKRArchive.h" #include "dolphin/types.h" +class JKRAramBlock; +class JKRDvdFile; + class JKRAramArchive : public JKRArchive { public: JKRAramArchive(long, JKRArchive::EMountDirection); diff --git a/include/JSystem/JKernel/JKRAramBlock.h b/include/JSystem/JKernel/JKRAramBlock.h index 5f17050f2d1..0dcc348cdae 100644 --- a/include/JSystem/JKernel/JKRAramBlock.h +++ b/include/JSystem/JKernel/JKRAramBlock.h @@ -1,9 +1,6 @@ #ifndef JKRARAMBLOCK_H #define JKRARAMBLOCK_H -#include "dolphin/types.h" - -#include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JSupport/JSUList.h" #include "dolphin/types.h" diff --git a/include/JSystem/JKernel/JKRAramHeap.h b/include/JSystem/JKernel/JKRAramHeap.h index 0a1f912b633..48293cba8d1 100644 --- a/include/JSystem/JKernel/JKRAramHeap.h +++ b/include/JSystem/JKernel/JKRAramHeap.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRAramBlock.h" #include "JSystem/JKernel/JKRDisposer.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSMutex.h" #include "dolphin/types.h" class JKRAramHeap : public JKRDisposer { diff --git a/include/JSystem/JKernel/JKRAramPiece.h b/include/JSystem/JKernel/JKRAramPiece.h index 6e17f67e527..5f522d5d1ce 100644 --- a/include/JSystem/JKernel/JKRAramPiece.h +++ b/include/JSystem/JKernel/JKRAramPiece.h @@ -3,7 +3,8 @@ #include "JSystem/JSupport/JSUList.h" #include "dolphin/ar/arq.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSMutex.h" #include "dolphin/types.h" class JKRAramBlock; diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index 2583da20b85..e6e230d4150 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -2,12 +2,11 @@ #define JKRARCHIVE_H #include "JSystem/JKernel/JKRCompression.h" -#include "JSystem/JKernel/JKRDecomp.h" -#include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JKernel/JKRFileLoader.h" -#include "JSystem/JKernel/JKRHeap.h" #include "global.h" +class JKRHeap; + struct SArcHeader { /* 0x00 */ u32 signature; /* 0x04 */ u32 file_length; diff --git a/include/JSystem/JKernel/JKRCompArchive.h b/include/JSystem/JKernel/JKRCompArchive.h index f5fcb319999..74490ddfef1 100644 --- a/include/JSystem/JKernel/JKRCompArchive.h +++ b/include/JSystem/JKernel/JKRCompArchive.h @@ -4,6 +4,9 @@ #include "JSystem/JKernel/JKRArchive.h" #include "dolphin/types.h" +class JKRAramBlock; +class JKRDvdFile; + class JKRCompArchive : public JKRArchive { public: JKRCompArchive(long, JKRArchive::EMountDirection); diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper.h index ed01abe0239..a6b59f07a28 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper.h +++ b/include/JSystem/JKernel/JKRDvdAramRipper.h @@ -2,6 +2,7 @@ #define JKRDVDARAMRIPPER_H #include "JSystem/JKernel/JKRDvdRipper.h" +#include "JSystem/JSupport/JSUList.h" #include "dolphin/types.h" class JKRAramBlock; diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h index ecb722531aa..a1b12957828 100644 --- a/include/JSystem/JKernel/JKRDvdFile.h +++ b/include/JSystem/JKernel/JKRDvdFile.h @@ -3,9 +3,12 @@ #include "JSystem/JKernel/JKRFile.h" #include "dolphin/dvd/dvd.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSMutex.h" #include "dolphin/types.h" +struct OSThread; + class JKRADCommand; class JKRAramBlock; class JSUFileInputStream; diff --git a/include/JSystem/JKernel/JKRDvdRipper.h b/include/JSystem/JKernel/JKRDvdRipper.h index 21f068e3dd7..2afe449fb24 100644 --- a/include/JSystem/JKernel/JKRDvdRipper.h +++ b/include/JSystem/JKernel/JKRDvdRipper.h @@ -1,7 +1,7 @@ #ifndef JKRDVDRIPPER_H #define JKRDVDRIPPER_H -#include "JSystem/JKernel/JKRDecomp.h" +#include "JSystem/JKernel/JKRCompression.h" #include "dolphin/types.h" enum JKRExpandSwitch { diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index 4d8f196f90f..c12504d42fc 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -2,7 +2,7 @@ #define JKRHEAP_H #include "JSystem/JKernel/JKRDisposer.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSMutex.h" #include "dolphin/types.h" class JKRHeap; diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h index c4c294dcd54..12ed5241f6a 100644 --- a/include/JSystem/JKernel/JKRThread.h +++ b/include/JSystem/JKernel/JKRThread.h @@ -4,7 +4,9 @@ #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUList.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSThread.h" +#include "dolphin/os/OSTime.h" #include "dolphin/types.h" struct JKRThreadName_ { @@ -13,7 +15,6 @@ struct JKRThreadName_ { }; class JUTConsole; -class JKRHeap; class JKRThread : JKRDisposer { public: class TLoad { diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index f90f03264b8..82a267bf749 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -2,7 +2,6 @@ #define JMESSAGE_PROCESSOR_H #include "JSystem/JMessage/resource.h" -#include "JSystem/JUtility/JUTFont.h" #include "init.h" namespace JMessage { diff --git a/include/JSystem/JParticle/JPABaseShape.h b/include/JSystem/JParticle/JPABaseShape.h index af687cbe3c3..c8b6b485373 100644 --- a/include/JSystem/JParticle/JPABaseShape.h +++ b/include/JSystem/JParticle/JPABaseShape.h @@ -1,7 +1,8 @@ #ifndef JPABASESHAPE_H #define JPABASESHAPE_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" class JPAEmitterWorkData; diff --git a/include/JSystem/JParticle/JPAChildShape.h b/include/JSystem/JParticle/JPAChildShape.h index d45b97a4e76..eaa45d0131d 100644 --- a/include/JSystem/JParticle/JPAChildShape.h +++ b/include/JSystem/JParticle/JPAChildShape.h @@ -1,7 +1,7 @@ #ifndef JPACHILDSHAPE_H #define JPACHILDSHAPE_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" struct JPAChildShapeData { diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h index c8379df13e0..62c4a90a874 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/include/JSystem/JParticle/JPAParticle.h @@ -1,7 +1,8 @@ #ifndef JPAPARTICLE_H #define JPAPARTICLE_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" #include "JSystem/JGeometry.h" diff --git a/include/JSystem/JParticle/JPAResourceManager.h b/include/JSystem/JParticle/JPAResourceManager.h index c9ddb5c9c2f..bded1482d5a 100644 --- a/include/JSystem/JParticle/JPAResourceManager.h +++ b/include/JSystem/JParticle/JPAResourceManager.h @@ -2,7 +2,7 @@ #define JPARESOURCEMANAGER_H #include "JSystem/JParticle/JPATexture.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/types.h" class JKRHeap; diff --git a/include/JSystem/JParticle/JPATexture.h b/include/JSystem/JParticle/JPATexture.h index dcb2c2ebaaf..be671a9e0d2 100644 --- a/include/JSystem/JParticle/JPATexture.h +++ b/include/JSystem/JParticle/JPATexture.h @@ -2,6 +2,7 @@ #define JPATEXTURE_H #include "JSystem/JUtility/JUTTexture.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/types.h" struct JPATextureData { diff --git a/include/JSystem/JStage/JSGAmbientLight.h b/include/JSystem/JStage/JSGAmbientLight.h index 7d0d1835012..144d5af9c20 100644 --- a/include/JSystem/JStage/JSGAmbientLight.h +++ b/include/JSystem/JStage/JSGAmbientLight.h @@ -2,7 +2,7 @@ #define JSGAMBIENTLIGHT_H #include "JSystem/JStage/JSGObject.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" namespace JStage { struct TAmbientLight : public TObject { diff --git a/include/JSystem/JStage/JSGFog.h b/include/JSystem/JStage/JSGFog.h index beb8f761df1..d5551cac1e1 100644 --- a/include/JSystem/JStage/JSGFog.h +++ b/include/JSystem/JStage/JSGFog.h @@ -2,7 +2,8 @@ #define JSGFOG_H #include "JSystem/JStage/JSGObject.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" namespace JStage { struct TFog : public TObject { diff --git a/include/JSystem/JStage/JSGLight.h b/include/JSystem/JStage/JSGLight.h index 7317c8845f0..628e907de44 100644 --- a/include/JSystem/JStage/JSGLight.h +++ b/include/JSystem/JStage/JSGLight.h @@ -2,7 +2,9 @@ #define JSGLIGHT_H #include "JSystem/JStage/JSGObject.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" +#include "dolphin/mtx/vec.h" namespace JStage { enum TELight {}; diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index 9db6ffee4f2..a57f14f087a 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -4,6 +4,7 @@ #include "JSystem/JGadget/search.h" #include "JSystem/JGadget/vector.h" #include "dolphin/types.h" +#include "global.h" extern u8 lit_652[]; diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h index e5c742b97fd..a79ea8faea5 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -6,6 +6,7 @@ #include "JSystem/JStudio/JStudio/stb.h" #include "JSystem/JStudio/JStudio/ctb.h" #include "dolphin/gx/GX.h" +#include "dolphin/mtx/vec.h" namespace JStudio { struct TCreateObject { diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index b0da5a20450..12c6b0c8a53 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -5,7 +5,8 @@ #include "JSystem/JStudio/JStudio/stb.h" #include "JSystem/JStudio/JStudio/ctb.h" #include "JSystem/JStudio/JStudio/jstudio-control.h" -#include "dolphin/gx/GX.h" + +typedef struct _GXColor GXColor; namespace JStudio { namespace data { diff --git a/include/JSystem/JSupport/JSUFileStream.h b/include/JSystem/JSupport/JSUFileStream.h index 44c3f4ed7a3..4a20d8bf574 100644 --- a/include/JSystem/JSupport/JSUFileStream.h +++ b/include/JSystem/JSupport/JSUFileStream.h @@ -1,10 +1,11 @@ #ifndef JSUFILESTREAM_H #define JSUFILESTREAM_H -#include "JSystem/JKernel/JKRFile.h" #include "JSystem/JSupport/JSURandomInputStream.h" #include "dolphin/types.h" +class JKRFile; + class JSUFileInputStream : public JSURandomInputStream { public: virtual ~JSUFileInputStream() {} diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h index c244852aebd..f4802ad632b 100644 --- a/include/JSystem/JUtility/JUTCacheFont.h +++ b/include/JSystem/JUtility/JUTCacheFont.h @@ -1,9 +1,12 @@ #ifndef JUTCACHEFONT_H #define JUTCACHEFONT_H -#include "dolphin/types.h" #include "JSystem/JUtility/JUTResFont.h" -#include "JSystem/JKernel/JKRAram.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/types.h" +#include "global.h" + +class JKRAramBlock; class JUTCacheFont : public JUTResFont { public: diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/include/JSystem/JUtility/JUTDbPrint.h index 30b325183d7..abb86b051c1 100644 --- a/include/JSystem/JUtility/JUTDbPrint.h +++ b/include/JSystem/JUtility/JUTDbPrint.h @@ -1,10 +1,11 @@ #ifndef JUTDBPRINT_H #define JUTDBPRINT_H -#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTFont.h" #include "dolphin/types.h" +class JKRHeap; + // TODO: fix struct struct unk_print { /* 0x00 */ unk_print* mNext; diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index e03079cd505..6fac9abae89 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,14 +3,18 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JSupport/JSUList.h" -#include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTGamePad.h" #include "Runtime.PPCEABI.H/__va_arg.h" -#include "dolphin/gx/GX.h" -#include "dolphin/os/OS.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/os/OSError.h" +#include "dolphin/os/OSMessage.h" #include "dolphin/types.h" #include "global.h" +typedef struct _GXRenderModeObj GXRenderModeObj; +typedef struct OSContext OSContext; +class JUTDirectPrint; + class JUTExternalFB { public: /* 802E40CC */ JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32); diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index 4cb04da5380..dc6037c0f7f 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -3,7 +3,6 @@ #include "JSystem/JUtility/TColor.h" #include "MSL_C/string.h" -#include "dolphin/gx/GX.h" #include "dolphin/types.h" struct ResFONT { diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index 707b63e2f89..322fd52aa95 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JSupport/JSUList.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSTime.h" #include "dolphin/pad/Pad.h" #include "dolphin/types.h" diff --git a/include/JSystem/JUtility/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h index 329ca6ff2ef..9705458d016 100644 --- a/include/JSystem/JUtility/JUTPalette.h +++ b/include/JSystem/JUtility/JUTPalette.h @@ -1,7 +1,8 @@ #ifndef JUTPALETTE_H #define JUTPALETTE_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" enum JUTTransparency { UNK0, UNK1 }; diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h index d5ecd5f0d1b..c3edd4768e6 100644 --- a/include/JSystem/JUtility/JUTProcBar.h +++ b/include/JSystem/JUtility/JUTProcBar.h @@ -1,10 +1,12 @@ #ifndef JUTPROCBAR_H #define JUTPROCBAR_H -#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/TColor.h" +#include "dolphin/os/OSTime.h" #include "dolphin/types.h" +class JKRHeap; + class JUTProcBar { public: class CTime { diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 3a7a067b465..3187947f2e0 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -1,8 +1,11 @@ #ifndef JUTRESFONT_H #define JUTRESFONT_H -#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTFont.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" + +class JKRHeap; typedef bool (*IsLeadByte_func)(int); diff --git a/include/JSystem/JUtility/JUTResource.h b/include/JSystem/JUtility/JUTResource.h index 3447ca53afc..3f4846cabab 100644 --- a/include/JSystem/JUtility/JUTResource.h +++ b/include/JSystem/JUtility/JUTResource.h @@ -1,10 +1,11 @@ #ifndef JUTRESOURCE_H #define JUTRESOURCE_H -#include "JSystem/JKernel/JKRArchive.h" -#include "JSystem/JSupport/JSUInputStream.h" #include "dolphin/types.h" +class JKRArchive; +class JSUInputStream; + class JUTResReference { private: u8 unk_0x0[0x101]; diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index c9ab2dd7807..c9c179af1e3 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -1,9 +1,12 @@ #ifndef JUTTEXTURE_H #define JUTTEXTURE_H -#include "JSystem/JUtility/JUTPalette.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" +class JUTPalette; + /* * Acts as the header to image data. Usually texture data immediately follows it, * so any pointer arithmetic to go past the end of this structure is so that a diff --git a/include/JSystem/JUtility/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h index 319a8f2c7cc..d031439eba9 100644 --- a/include/JSystem/JUtility/JUTVideo.h +++ b/include/JSystem/JUtility/JUTVideo.h @@ -1,8 +1,9 @@ #ifndef JUTVIDEO_H #define JUTVIDEO_H -#include "dolphin/gx/GX.h" -#include "dolphin/os/OS.h" +#include "dolphin/gx/GXStruct.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSTime.h" #include "dolphin/types.h" #include "dolphin/vi/vi.h" diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h index 5d3933cc716..2edd92761f1 100644 --- a/include/JSystem/JUtility/JUTXfb.h +++ b/include/JSystem/JUtility/JUTXfb.h @@ -1,10 +1,12 @@ #ifndef JUTXFB_H #define JUTXFB_H -#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" #include "dolphin/types.h" +typedef struct _GXRenderModeObj GXRenderModeObj; +class JKRHeap; + class JUTXfb { public: enum EXfbNumber { // TODO: placeholder diff --git a/include/JSystem/JUtility/TColor.h b/include/JSystem/JUtility/TColor.h index 344a6cf10bc..7e7e00f23f7 100644 --- a/include/JSystem/JUtility/TColor.h +++ b/include/JSystem/JUtility/TColor.h @@ -1,7 +1,7 @@ #ifndef TCOLOR_H #define TCOLOR_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" namespace JUtility { diff --git a/include/SSystem/SComponent/c_bg_s_shdw_draw.h b/include/SSystem/SComponent/c_bg_s_shdw_draw.h index ceb4a5e6bd9..b6938b93688 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 3b29c2f0524..fe834acc38c 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 32c0cc8fb63..61b0f7622a2 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 aa1ae3274bc..6f31efc5931 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 39c653173c3..57c544a9bfc 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 ba1a556ef18..d268ceb5d69 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 20104043daa..1454175021e 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 12be442b34e..8e8d3936891 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 cc00a53c8ba..494521fa016 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 5bab254ea02..24338c6582b 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 0732d732668..0a352b2186a 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 c598fd96c8a..92c4444296b 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 09ae61efae5..c7fde53fb01 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 98296256dc8..4c536cd7c54 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 b10aa3c9424..3f00f5047de 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 9edd7386485..939a5e94174 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 a22151e06ab..ead7c9d03bd 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 ada8df11936..5218f9d9617 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; diff --git a/include/Z2AudioLib/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr.h index 9e3b540cc1b..1d97542bf13 100644 --- a/include/Z2AudioLib/Z2AudioMgr.h +++ b/include/Z2AudioLib/Z2AudioMgr.h @@ -3,8 +3,6 @@ #include "JSystem/JAudio2/JAISound.h" #include "JSystem/JAudio2/JASAudioReseter.h" -#include "JSystem/JKernel/JKRArchive.h" -#include "JSystem/JKernel/JKRSolidHeap.h" #include "Z2AudioLib/Z2Audience.h" #include "Z2AudioLib/Z2FxLineMgr.h" #include "Z2AudioLib/Z2SceneMgr.h" @@ -16,6 +14,10 @@ #include "Z2AudioLib/Z2SpeechMgr2.h" #include "Z2AudioLib/Z2StatusMgr.h" #include "dolphin/types.h" +#include "global.h" + +class JKRArchive; +class JKRSolidHeap; class Z2AudioMgr { public: diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 5d4e90279de..f6dac02f0f5 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_xyz.h" #include "Z2AudioLib/Z2SoundObject.h" +#include "Z2AudioLib/Z2SoundStarter.h" class Z2Creature { public: diff --git a/include/Z2AudioLib/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr.h index 34d04e70a5e..4cf8ffd9767 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr.h +++ b/include/Z2AudioLib/Z2EnvSeMgr.h @@ -5,6 +5,7 @@ #include "Z2AudioLib/Z2Calc.h" #include "Z2AudioLib/Z2SeMgr.h" #include "dolphin/mtx/mtxvec.h" +#include "global.h" struct Z2EnvSeBase { /* 802C589C */ Z2EnvSeBase(Vec*); diff --git a/include/Z2AudioLib/Z2FxLineMgr.h b/include/Z2AudioLib/Z2FxLineMgr.h index 9655f645172..ecf62b51e21 100644 --- a/include/Z2AudioLib/Z2FxLineMgr.h +++ b/include/Z2AudioLib/Z2FxLineMgr.h @@ -1,10 +1,11 @@ #ifndef Z2FXLINEMGR_H #define Z2FXLINEMGR_H -#include "JSystem/JKernel/JKRArchive.h" -#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JAudio2/JASGadget.h" +class JKRArchive; +class JKRHeap; + struct Z2FxLineEditNode {}; struct Z2FxLineConfig {}; diff --git a/include/Z2AudioLib/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr.h index 3f701467331..01f18c87b00 100644 --- a/include/Z2AudioLib/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr.h @@ -2,6 +2,7 @@ #define Z2SEMGR_H #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JAISoundHandles.h" #include "JSystem/JAudio2/JASGadget.h" #include "dolphin/mtx/vec.h" diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index 97bc1fba376..acf6c3d2cff 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -2,6 +2,7 @@ #define Z2SEQMGR_H #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JAISoundHandles.h" #include "JSystem/JAudio2/JASGadget.h" // move TTransition / Z2SoundFader ? diff --git a/include/Z2AudioLib/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles.h index 8e43695b6e9..94a6f84fffa 100644 --- a/include/Z2AudioLib/Z2SoundHandles.h +++ b/include/Z2AudioLib/Z2SoundHandles.h @@ -2,6 +2,7 @@ #define Z2SOUNDHANDLES_H #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JAISoundHandles.h" #include "JSystem/JSupport/JSUList.h" #include "dolphin/types.h" diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h index 1aadd884f05..852acaf94fd 100644 --- a/include/Z2AudioLib/Z2SoundMgr.h +++ b/include/Z2AudioLib/Z2SoundMgr.h @@ -6,6 +6,7 @@ #include "JSystem/JAudio2/JAISound.h" #include "JSystem/JAudio2/JAIStreamMgr.h" #include "JSystem/JAudio2/JASGadget.h" +#include "global.h" class Z2SoundMgr : public JASGlobalInstance { public: diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h index 8dcf45feee4..048fbd46d38 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr.h +++ b/include/Z2AudioLib/Z2SoundObjMgr.h @@ -3,7 +3,8 @@ #include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JSupport/JSUList.h" -#include "Z2AudioLib/Z2Creature.h" + +class Z2CreatureEnemy; class Z2SoundObjMgr : protected JSUList, public JASGlobalInstance { public: diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h index c6bc6a1d901..80f42ea4c2f 100644 --- a/include/Z2AudioLib/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject.h @@ -2,10 +2,11 @@ #define Z2SOUNDOBJECT_H #include "Z2AudioLib/Z2SoundHandles.h" -#include "Z2AudioLib/Z2SoundStarter.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" +struct Z2SoundStarter; + struct JAUSoundAnimationSound {}; class Z2SoundObjBase : protected Z2SoundHandles { diff --git a/include/Z2AudioLib/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2.h index 89480ee049f..a262c768bfe 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2.h +++ b/include/Z2AudioLib/Z2SpeechMgr2.h @@ -6,6 +6,7 @@ #include "JSystem/JMath/random.h" #include "Z2AudioLib/Z2SoundStarter.h" #include "dolphin/mtx/vec.h" +#include "global.h" struct Z2SpeechStarter : public Z2SoundStarter { /* 802CCFB8 */ Z2SpeechStarter(); diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h index d23b25485bc..4c8e248b262 100644 --- a/include/Z2AudioLib/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr.h @@ -1,8 +1,8 @@ #ifndef Z2STATUSMGR_H #define Z2STATUSMGR_H -#include "dolphin/mtx/vec.h" #include "JSystem/JAudio2/JASGadget.h" +#include "dolphin/mtx/vec.h" struct Z2StatusMgr : public JASGlobalInstance { Z2StatusMgr(); diff --git a/include/Z2AudioLib/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr.h index 8696774a5b0..4851637faed 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr.h +++ b/include/Z2AudioLib/Z2WolfHowlMgr.h @@ -2,7 +2,7 @@ #define Z2WOLFHOWLMGR_H #include "JSystem/JAudio2/JASGadget.h" -#include "Z2AudioLib/Z2SoundObject.h" +#include "JSystem/JAudio2/JAISoundHandles.h" #include "dolphin/types.h" /* diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index d05a1591c6c..f918ad216aa 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -3,35 +3,38 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/J3DGraphBase/J3DMatBlock.h" +#include "JSystem/JParticle/JPAParticle.h" #include "Z2AudioLib/Z2Creature.h" #include "Z2AudioLib/Z2WolfHowlMgr.h" #include "d/a/d_a_player.h" -#include "d/bg/d_bg_s.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s_lin_chk.h" +#include "d/bg/d_bg_w_base.h" #include "d/cc/d_cc_d.h" -#include "d/cc/d_cc_mass_s.h" #include "d/d_attention.h" -#include "d/d_drawlist.h" #include "d/d_eye_hl.h" #include "d/d_jnt_col.h" -#include "d/kankyo/d_kankyo.h" #include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_flow.h" #include "d/particle/d_particle.h" #include "d/particle/d_particle_copoly.h" +#include "d/save/d_save.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" -#include "f_op/f_op_scene.h" +#include "global.h" #include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h" #include "rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h" -class fopEn_enemy_c; -class daAlinkHIO_anm_c; -class J3DAnmTevRegKey; -class dDemo_actor_c; -class daScex_c; +class J2DAnmColorKey; +class J2DAnmTransformKey; class J2DScreen; class J2DPane; class J2DAnmBase; +class J3DAnmTevRegKey; +class dDemo_actor_c; +class daAlinkHIO_anm_c; +class daScex_c; +class fopEn_enemy_c; class daAlink_lockCursor_c : public dDlst_base_c { public: diff --git a/include/d/a/d_a_horse_static.h b/include/d/a/d_a_horse_static.h index d2b4f4223bd..a9918b7af22 100644 --- a/include/d/a/d_a_horse_static.h +++ b/include/d/a/d_a_horse_static.h @@ -2,7 +2,7 @@ #define D_A_D_A_HORSE_STATIC_H #include "dolphin/types.h" -#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h" +#include "f_op/f_op_actor.h" class daTagHstop_c : public fopAc_ac_c { public: diff --git a/include/d/a/d_a_item_static.h b/include/d/a/d_a_item_static.h index 16b521d8745..9a19d3e2e13 100644 --- a/include/d/a/d_a_item_static.h +++ b/include/d/a/d_a_item_static.h @@ -2,9 +2,10 @@ #define D_A_D_A_ITEM_STATIC_H #include "SSystem/SComponent/c_lib.h" +#include "Z2AudioLib/Z2SoundObject.h" #include "dolphin/types.h" #include "d/a/d_a_itembase.h" -#include "d/a/d_a_itembase_static.h" +#include "d/cc/d_cc_d.h" #include "d/particle/d_particle.h" class daItem_c; diff --git a/include/d/a/d_a_itembase_static.h b/include/d/a/d_a_itembase_static.h index 3c7f96b55d2..d44917a7897 100644 --- a/include/d/a/d_a_itembase_static.h +++ b/include/d/a/d_a_itembase_static.h @@ -1,9 +1,10 @@ #ifndef D_A_D_A_ITEMBASE_STATIC_H #define D_A_D_A_ITEMBASE_STATIC_H -#include "d/a/d_a_itembase.h" #include "dolphin/types.h" +class fopAc_ac_c; + void CheckFieldItemCreateHeap(fopAc_ac_c* actor); #endif /* D_A_D_A_ITEMBASE_STATIC_H */ diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h index a904b9e7b73..40620561ef4 100644 --- a/include/d/a/d_a_npc.h +++ b/include/d/a/d_a_npc.h @@ -1,9 +1,12 @@ #ifndef D_A_D_A_NPC_H #define D_A_D_A_NPC_H +#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "Z2AudioLib/Z2Creature.h" #include "d/com/d_com_inf_game.h" #include "d/d_path.h" -#include "d/msg/d_msg_object.h" +#include "d/msg/d_msg_flow.h" +#include "d/particle/d_particle_copoly.h" #include "dolphin/types.h" #include "global.h" diff --git a/include/d/a/d_a_obj_ss_base.h b/include/d/a/d_a_obj_ss_base.h index 29bf74248aa..2c256138740 100644 --- a/include/d/a/d_a_obj_ss_base.h +++ b/include/d/a/d_a_obj_ss_base.h @@ -1,7 +1,7 @@ #ifndef A_OBJ_D_A_OBJ_SS_BASE_H #define A_OBJ_D_A_OBJ_SS_BASE_H -#include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_actor.h" class daObj_SSBase_c : public fopAc_ac_c { public: diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 34b0ea5b883..ede65e97816 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -1,16 +1,12 @@ #ifndef D_A_D_A_PLAYER_H #define D_A_D_A_PLAYER_H -#include "JSystem/J3DGraphAnimator/J3DAnimation.h" -#include "JSystem/JUtility/JUTTexture.h" -#include "SSystem/SComponent/c_bg_s_poly_info.h" #include "d/d_drawlist.h" -#include "d/d_resorce.h" -#include "d/d_stage.h" -#include "d/save/d_save.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" +struct ResTIMG; + class daPy_sightPacket_c : public dDlst_base_c { public: daPy_sightPacket_c() {} diff --git a/include/d/bg/d_bg_plc.h b/include/d/bg/d_bg_plc.h index fde627bb51a..208448c179b 100644 --- a/include/d/bg/d_bg_plc.h +++ b/include/d/bg/d_bg_plc.h @@ -1,9 +1,10 @@ #ifndef D_BG_D_BG_PLC_H #define D_BG_D_BG_PLC_H -#include "d/bg/d_bg_pc.h" #include "dolphin/types.h" +struct sBgPc; + enum { /* 0x14 */ ZELDA_CODE_SIZE = 0x14 }; diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index b2a7e66f56f..befe2aed02b 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -4,9 +4,12 @@ #include "SSystem/SComponent/c_bg_s_gnd_chk.h" #include "SSystem/SComponent/c_bg_s_lin_chk.h" #include "SSystem/SComponent/c_bg_s_poly_info.h" -#include "d/bg/d_bg_w.h" +#include "d/bg/d_bg_w_base.h" #include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "global.h" + +class dBgW; +class fopAc_ac_c; class cBgS_ChkElm { public: diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index b2b42101013..8088837a38d 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -6,13 +6,12 @@ #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "SSystem/SComponent/c_m3d_g_lin.h" #include "SSystem/SComponent/c_m3d_g_pla.h" -#include "d/a/d_a_player.h" #include "d/bg/d_bg_s_gnd_chk.h" -#include "d/bg/d_bg_s_lin_chk.h" #include "d/bg/d_bg_s_roof_chk.h" #include "d/bg/d_bg_s_wtr_chk.h" #include "dolphin/types.h" -//#include "d/bg/d_bg_s.h" + +class fopAc_ac_c; class dBgS_AcchCir : public cBgS_PolyInfo { private: diff --git a/include/d/bg/d_bg_s_lin_chk.h b/include/d/bg/d_bg_s_lin_chk.h index e00cb38cafb..3b39c157793 100644 --- a/include/d/bg/d_bg_s_lin_chk.h +++ b/include/d/bg/d_bg_s_lin_chk.h @@ -4,7 +4,8 @@ #include "SSystem/SComponent/c_bg_s_lin_chk.h" #include "d/bg/d_bg_s_chk.h" #include "dolphin/types.h" -#include "f_op/f_op_actor.h" + +class fopAc_ac_c; class dBgS_LinChk : public cBgS_LinChk, public dBgS_Chk { public: diff --git a/include/d/bg/d_bg_s_movebg_actor.h b/include/d/bg/d_bg_s_movebg_actor.h index 5393f1dff11..0623dd94e2b 100644 --- a/include/d/bg/d_bg_s_movebg_actor.h +++ b/include/d/bg/d_bg_s_movebg_actor.h @@ -2,8 +2,8 @@ #define D_BG_D_BG_S_MOVEBG_ACTOR_H #include "SSystem/SComponent/c_bg_s_poly_info.h" -#include "d/bg/d_bg_w.h" #include "dolphin/types.h" +#include "f_op/f_op_actor.h" class dBgW; typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, diff --git a/include/d/bg/d_bg_s_sph_chk.h b/include/d/bg/d_bg_s_sph_chk.h index dfe60878d4c..d6ed2b47123 100644 --- a/include/d/bg/d_bg_s_sph_chk.h +++ b/include/d/bg/d_bg_s_sph_chk.h @@ -1,6 +1,7 @@ #ifndef D_BG_D_BG_S_SPH_CHK_H #define D_BG_D_BG_S_SPH_CHK_H +#include "SSystem/SComponent/c_bg_s_chk.h" #include "SSystem/SComponent/c_bg_s_poly_info.h" #include "SSystem/SComponent/c_m3d_g_pla.h" #include "SSystem/SComponent/c_m3d_g_sph.h" diff --git a/include/d/bg/d_bg_w.h b/include/d/bg/d_bg_w.h index e1b161626cc..c2c9f232102 100644 --- a/include/d/bg/d_bg_w.h +++ b/include/d/bg/d_bg_w.h @@ -1,17 +1,15 @@ #ifndef D_BG_D_BG_W_H #define D_BG_D_BG_W_H -#include "JSystem/J3DGraphBase/J3DVertex.h" -#include "SSystem/SComponent/c_bg_s_gnd_chk.h" -#include "SSystem/SComponent/c_bg_s_lin_chk.h" -#include "SSystem/SComponent/c_bg_s_poly_info.h" -#include "SSystem/SComponent/c_m3d_g_tri.h" -#include "d/bg/d_bg_s_acch.h" -#include "d/bg/d_bg_s_grp_pass_chk.h" -#include "d/bg/d_bg_s_poly_pass_chk.h" +#include "SSystem/SComponent/c_m3d_g_aab.h" +#include "SSystem/SComponent/c_m3d_g_pla.h" #include "d/bg/d_bg_w_base.h" +#include "dolphin/mtx/mtx.h" #include "dolphin/types.h" -#include "f_op/f_op_actor.h" + +class cBgS_GrpPassChk; +class cBgS_PolyPassChk; +class fopAc_ac_c; struct dBgS_CaptPoly {}; diff --git a/include/d/bg/d_bg_w_base.h b/include/d/bg/d_bg_w_base.h index d18386aeea5..264af2e2e20 100644 --- a/include/d/bg/d_bg_w_base.h +++ b/include/d/bg/d_bg_w_base.h @@ -1,17 +1,20 @@ #ifndef D_BG_D_BG_W_BASE_H #define D_BG_D_BG_W_BASE_H -#include "SSystem/SComponent/c_bg_s_gnd_chk.h" -#include "SSystem/SComponent/c_bg_s_lin_chk.h" #include "SSystem/SComponent/c_bg_s_poly_info.h" -#include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "SSystem/SComponent/c_bg_w.h" -#include "d/bg/d_bg_s_acch.h" -#include "d/bg/d_bg_s_sph_chk.h" +#include "SSystem/SComponent/c_m3d_g_pla.h" #include "dolphin/types.h" -#include "f_op/f_op_actor.h" +class cBgS_GndChk; +class cBgS_LinChk; +class cBgS_ShdwDraw; +class dBgS_Acch; struct dBgS_CaptPoly; +class dBgS_RoofChk; +class dBgS_SphChk; +class dBgS_SplGrpChk; +class fopAc_ac_c; class dBgW_Base : public cBgW_BgId { public: diff --git a/include/d/bg/d_bg_w_kcol.h b/include/d/bg/d_bg_w_kcol.h index b3dee70ba3f..12c5f303cc4 100644 --- a/include/d/bg/d_bg_w_kcol.h +++ b/include/d/bg/d_bg_w_kcol.h @@ -1,10 +1,14 @@ #ifndef D_BG_D_BG_W_KCOL_H #define D_BG_D_BG_W_KCOL_H +#include "SSystem/SComponent/c_m3d_g_aab.h" #include "d/bg/d_bg_plc.h" #include "d/bg/d_bg_w_base.h" #include "dolphin/types.h" +class cBgS_GrpPassChk; +class cBgS_PolyPassChk; +struct dBgPc; struct dBgS_CaptPoly; struct KC_PrismData { diff --git a/include/d/cc/d_cc_mass_s.h b/include/d/cc/d_cc_mass_s.h index 9a0a0ec2cb1..f420a789dd3 100644 --- a/include/d/cc/d_cc_mass_s.h +++ b/include/d/cc/d_cc_mass_s.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_cc_d.h" #include "dolphin/types.h" +#include "global.h" typedef void (*dCcMassS_ObjCallback)(fopAc_ac_c*, cXyz*, u32); diff --git a/include/d/cc/d_cc_s.h b/include/d/cc/d_cc_s.h index 7ad3000abe6..d43a28bd5a0 100644 --- a/include/d/cc/d_cc_s.h +++ b/include/d/cc/d_cc_s.h @@ -2,9 +2,12 @@ #define D_CC_D_CC_S_H #include "SSystem/SComponent/c_cc_s.h" -#include "d/cc/d_cc_d.h" #include "d/cc/d_cc_mass_s.h" #include "dolphin/types.h" +#include "global.h" + +class dCcD_GObjInf; +class dCcD_GStts; class dCcS : public cCcS { public: diff --git a/include/d/cc/d_cc_uty.h b/include/d/cc/d_cc_uty.h index 3e5cf8256a1..7cab514f079 100644 --- a/include/d/cc/d_cc_uty.h +++ b/include/d/cc/d_cc_uty.h @@ -3,7 +3,8 @@ #include "d/com/d_com_inf_game.h" #include "dolphin/types.h" -#include "f_op/f_op_actor.h" + +class fopAc_ac_c; enum dCcU_AtType { /* 0x01 */ HIT_TYPE_LINK_NORMAL_ATTACK = 1, diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 2d252ffc36a..e03010cf773 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1,14 +1,11 @@ #ifndef D_COM_D_COM_INF_GAME_H #define D_COM_D_COM_INF_GAME_H -#include "d/a/d_a_alink.h" #include "d/bg/d_bg_s.h" #include "d/cc/d_cc_s.h" #include "d/d_attention.h" #include "d/d_drawlist.h" -#include "d/d_procname.h" #include "d/d_resorce.h" -#include "d/d_simple_model.h" #include "d/d_stage.h" #include "d/d_vibration.h" #include "d/event/d_event.h" @@ -16,9 +13,13 @@ #include "d/particle/d_particle.h" #include "d/save/d_save.h" #include "f_op/f_op_camera_mng.h" -#include "f_op/f_op_scene_mng.h" +#include "global.h" +class JKRAramArchive; +class dSmplMdl_draw_c; class dTimer_c; +class daPy_py_c; +class scene_class; class __d_timer_info_c { public: diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 09f28ad8d7e..e011115c264 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -2,11 +2,12 @@ #define D_D_ATTENTION_H #include "SSystem/SComponent/c_angle.h" -#include "d/a/d_a_player.h" -#include "d/save/d_save.h" #include "dolphin/types.h" +#include "global.h" #include "m_Do/m_Do_ext.h" +class fopAc_ac_c; + class dAttHint_c { public: dAttHint_c() {} diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index 9b1760d693d..e24ae1b0c8b 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -3,6 +3,7 @@ #include "Z2AudioLib/Z2SoundObject.h" #include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s_lin_chk.h" #include "d/cc/d_cc_d.h" #include "d/kankyo/d_kankyo.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 08c4fe73963..e379c716c72 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -5,10 +5,11 @@ #include "SSystem/SComponent/c_xyz.h" #include "d/bg/d_bg_s_lin_chk.h" #include "d/bg/d_bg_s_gnd_chk.h" -#include "d/d_stage.h" -#include "dolphin/types.h" -#include "d/d_drawlist.h" #include "d/d_cam_param.h" +#include "d/d_drawlist.h" +#include "d/d_stage.h" +#include "dolphin/gx/GXStruct.h" +#include "dolphin/types.h" class fopAc_ac_c; diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 82d79c0b636..2099bdb0b91 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -2,7 +2,6 @@ #define D_D_DEMO_H #include "JSystem/JGadget/binary.h" -#include "JSystem/JMessage/control.h" #include "JSystem/JStage/JSGAmbientLight.h" #include "JSystem/JStage/JSGCamera.h" #include "JSystem/JStage/JSGFog.h" @@ -11,13 +10,20 @@ #include "JSystem/JStudio/JStudio_JAudio2/control.h" #include "JSystem/JStudio/JStudio_JParticle/object-particle.h" #include "JSystem/JStudio/JStudio_JStage/object.h" -#include "f_op/f_op_actor.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "SSystem/SComponent/c_xyz.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" +class J3DModel; class dDemo_actor_c; class dDemo_camera_c; class dDemo_ambient_c; class dDemo_light_c; class dDemo_fog_c; +class fopAc_ac_c; +struct jmessage_tControl; + class dDemo_object_c { public: /* 80038F54 */ dDemo_object_c(); diff --git a/include/d/d_door_param2.h b/include/d/d_door_param2.h index 0ae93871b83..398af653110 100644 --- a/include/d/d_door_param2.h +++ b/include/d/d_door_param2.h @@ -1,7 +1,9 @@ #ifndef D_D_DOOR_PARAM2_H #define D_D_DOOR_PARAM2_H -#include "f_op/f_op_actor_mng.h" +#include "dolphin/types.h" + +class fopAc_ac_c; class door_param2_c { public: diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 1a7f1f00dc2..5443d858f0c 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -2,18 +2,21 @@ #define D_D_DRAWLIST_H #include "JSystem/J2DGraph/J2DPicture.h" -#include "JSystem/J2DGraph/J2DScreen.h" -#include "JSystem/J3DGraphAnimator/J3DModel.h" -#include "JSystem/J3DGraphBase/J3DDrawBuffer.h" -#include "JSystem/J3DGraphBase/J3DPacket.h" #include "SSystem/SComponent/c_m3d_g_pla.h" #include "SSystem/SComponent/c_xyz.h" -#include "d/kankyo/d_kankyo.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" +#include "dolphin/mtx/mtx.h" #include "dolphin/mtx/mtx44.h" -#include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" #include "f_op/f_op_view.h" +#include "m_Do/m_Do_ext.h" +#include "global.h" + +class J3DDrawBuffer; +class J3DModel; +class J3DPacket; +class JUTFont; +class dKy_tevstr_c; class cM_rnd_c { public: diff --git a/include/d/d_eye_hl.h b/include/d/d_eye_hl.h index 2976dfc1138..dffddb10ac3 100644 --- a/include/d/d_eye_hl.h +++ b/include/d/d_eye_hl.h @@ -1,10 +1,10 @@ #ifndef D_D_EYE_HL_H #define D_D_EYE_HL_H -#include "JSystem/J3DGraphAnimator/J3DModelData.h" -#include "JSystem/J3DGraphBase/J3DDrawBuffer.h" -#include "JSystem/JUtility/JUTTexture.h" +#include "dolphin/types.h" +class J3DModelData; +struct ResTIMG; class dEyeHL_c; class dEyeHL_mng_c { diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h index c3935e8159e..80efa1f9951 100644 --- a/include/d/d_gameover.h +++ b/include/d/d_gameover.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_phase.h" #include "d/menu/d_menu_save.h" +#include "dolphin/gx/GXStruct.h" #include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_hostIO.h" diff --git a/include/d/d_item.h b/include/d/d_item.h index cab6dcbc384..cb9e78cdab6 100644 --- a/include/d/d_item.h +++ b/include/d/d_item.h @@ -1,7 +1,6 @@ #ifndef D_D_ITEM_H #define D_D_ITEM_H -#include "d/com/d_com_inf_game.h" #include "dolphin/types.h" void execItemGet(u8 item_id); diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index 9e2ccfbc219..ac4717885db 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -3,8 +3,11 @@ #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "SSystem/SComponent/c_m3d_g_lin.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" -#include "f_op/f_op_actor.h" + +class fopAc_ac_c; class dJntColData_c { public: diff --git a/include/d/d_kantera_icon_meter.h b/include/d/d_kantera_icon_meter.h index ad0a52cf4bd..5ddd37ec7a0 100644 --- a/include/d/d_kantera_icon_meter.h +++ b/include/d/d_kantera_icon_meter.h @@ -1,11 +1,11 @@ #ifndef D_D_KANTERA_ICON_METER_H #define D_D_KANTERA_ICON_METER_H -#include "d/com/d_com_inf_game.h" #include "d/d_drawlist.h" -#include "d/pane/d_pane_class.h" #include "dolphin/types.h" +class CPaneMgr; + class dDlst_KanteraIcon_c : public dDlst_base_c { public: /* 801AECB8 */ virtual void draw(); diff --git a/include/d/d_ky_thunder.h b/include/d/d_ky_thunder.h index ab099ac2a05..a66794cd09c 100644 --- a/include/d/d_ky_thunder.h +++ b/include/d/d_ky_thunder.h @@ -1,10 +1,11 @@ #ifndef D_D_KY_THUNDER_H #define D_D_KY_THUNDER_H -#include "JSystem/JKernel/JKRSolidHeap.h" #include "f_op/f_op_kankyo.h" #include "m_Do/m_Do_ext.h" +class JKRSolidHeap; + class dThunder_modelInfo_c { public: /* 0x00 */ J3DModel* mpModel; diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 3c8f01c5cf6..dddaaa9c5cb 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -1,9 +1,11 @@ #ifndef D_D_LIB_H #define D_D_LIB_H +#include "SSystem/SComponent/c_xyz.h" #include "dolphin/mtx/quat.h" -#include "dolphin/os/OS.h" -#include "f_op/f_op_actor.h" +#include "dolphin/os/OSTime.h" + +class fopAc_ac_c; struct JKRAramArchive; u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName); diff --git a/include/d/d_model.h b/include/d/d_model.h index 690dd1b5702..2a68d5bf39b 100644 --- a/include/d/d_model.h +++ b/include/d/d_model.h @@ -1,9 +1,12 @@ #ifndef D_D_MODEL_H #define D_D_MODEL_H -#include "d/com/d_com_inf_game.h" +#include "JSystem/J3DGraphBase/J3DPacket.h" #include "dolphin/types.h" +class J3DModelData; +class dKy_tevstr_c; + class dMdl_obj_c { public: MtxP getMtx() { return mMtx; } diff --git a/include/d/d_name.h b/include/d/d_name.h index b2a4101efd9..d2150301ec8 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -1,9 +1,18 @@ #ifndef D_D_NAME_H #define D_D_NAME_H -#include "d/com/d_com_inf_game.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" +class CPaneMgr; +class CPaneMgrAlpha; +class J2DAnmColorKey; +class J2DAnmTextureSRTKey; +class J2DTextBox; +class JUTFont; +struct STControl; +class dSelect_cursor_c; + class dNm_HIO_c { public: /* 8024E3E0 */ dNm_HIO_c(); diff --git a/include/d/d_path.h b/include/d/d_path.h index e7f58a88cd6..96a51bd243e 100644 --- a/include/d/d_path.h +++ b/include/d/d_path.h @@ -1,9 +1,11 @@ #ifndef D_D_PATH_H #define D_D_PATH_H -#include "d/d_stage.h" +#include "dolphin/types.h" -class dStage_dPnt_c; +class cBgS_PolyInfo; +struct cXyz; +struct dStage_dPnt_c; struct dPath { /* 0x0 */ u16 m_num; diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 1af4ce76bfb..a8bd1b0dbbe 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -1,13 +1,16 @@ #ifndef D_D_RESORCE_H #define D_D_RESORCE_H -#include "JSystem/JKernel/JKRArchive.h" -#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" +#include "global.h" #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" +class JKRArchive; +class JKRHeap; +class JKRSolidHeap; + class dRes_info_c { public: /* 8003A260 */ dRes_info_c(); diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h index 7c9d372d354..8d08fe368bc 100644 --- a/include/d/d_select_cursor.h +++ b/include/d/d_select_cursor.h @@ -6,6 +6,8 @@ #include "d/d_drawlist.h" #include "d/d_select_icon.h" +class J2DAnmTransformKey; + class dSelect_cursorHIO_c { public: /* 801941E4 */ dSelect_cursorHIO_c(); diff --git a/include/d/d_simple_model.h b/include/d/d_simple_model.h index 72ff3a98aaa..04477ea16cd 100644 --- a/include/d/d_simple_model.h +++ b/include/d/d_simple_model.h @@ -2,9 +2,10 @@ #define D_D_SIMPLE_MODEL_H #include "JSystem/J3DGraphAnimator/J3DModel.h" -#include "JSystem/JKernel/JKRSolidHeap.h" #include "dolphin/types.h" +class JKRSolidHeap; + class modelList_c { public: void init() { diff --git a/include/d/d_spline_path.h b/include/d/d_spline_path.h index b03f0c83ab7..49d8c5aaf29 100644 --- a/include/d/d_spline_path.h +++ b/include/d/d_spline_path.h @@ -1,8 +1,10 @@ #ifndef D_D_SPLINE_PATH_H #define D_D_SPLINE_PATH_H +#include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" -#include "d/d_path.h" + +struct dPath; struct dPathCurve { /* 80097C5C */ void Init(dPath*); diff --git a/include/d/d_stage.h b/include/d/d_stage.h index daf9f20a8de..77a8dd91c87 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1,13 +1,16 @@ #ifndef D_D_STAGE_H #define D_D_STAGE_H -#include "JSystem/JKernel/JKRExpHeap.h" #include "SSystem/SComponent/c_lib.h" #include "d/kankyo/d_kankyo.h" #include "d/kankyo/d_kankyo_data.h" #include "d/save/d_save.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" -#include "f_op/f_op_actor.h" +#include "f_pc/f_pc_priority.h" +#include "global.h" + +class JKRExpHeap; struct stage_vrboxcol_info_class { // VRB diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 397de45ce75..d1eff067491 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -2,13 +2,17 @@ #define D_D_TIMER_H #include "JSystem/J2DGraph/J2DPane.h" -#include "JSystem/JKernel/JKRExpHeap.h" #include "SSystem/SComponent/c_phase.h" #include "SSystem/SComponent/c_xyz.h" -#include "f_op/f_op_msg.h" +#include "d/d_drawlist.h" #include "d/msg/d_msg_object.h" #include "dolphin/os/OSTime.h" #include "dolphin/types.h" +#include "f_op/f_op_msg.h" + +class CPaneMgr; +class JKRArchive; +class JKRExpHeap; s32 dTimer_createStockTimer(); s32 dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f32 param_4, f32 param_5, diff --git a/include/d/d_tresure.h b/include/d/d_tresure.h index b8feddbd267..cd6232c2a96 100644 --- a/include/d/d_tresure.h +++ b/include/d/d_tresure.h @@ -1,7 +1,7 @@ #ifndef D_D_TRESURE_H #define D_D_TRESURE_H -#include "dolphin/mtx/mtxvec.h" +#include "dolphin/mtx/vec.h" #include "dolphin/types.h" class dTres_c { diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index 26543a574a2..2bc721a34db 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -1,7 +1,7 @@ #ifndef D_D_VIBRATION_H #define D_D_VIBRATION_H -#include "d/save/d_save.h" +#include "SSystem/SComponent/c_xyz.h" #include "d/d_vib_pattern.h" #include "dolphin/types.h" diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 56662ebb1ee..6fdd1171430 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -2,11 +2,11 @@ #define D_EVENT_D_EVENT_H #include "d/a/d_a_itembase.h" -#include "d/a/d_a_player.h" -#include "d/d_stage.h" -#include "d/event/d_event_manager.h" -#include "d/save/d_save.h" #include "dolphin/types.h" +#include "global.h" + +struct dStage_MapEvent_dt_c; +class fopAc_ac_c; #if DEBUG class dEvDb_bit_c { diff --git a/include/d/event/d_event_data.h b/include/d/event/d_event_data.h index 1b2d413e908..acf2561210d 100644 --- a/include/d/event/d_event_data.h +++ b/include/d/event/d_event_data.h @@ -1,9 +1,9 @@ #ifndef D_EVENT_D_EVENT_DATA_H #define D_EVENT_D_EVENT_DATA_H -#include "d/d_stage.h" -#include "f_op/f_op_msg.h" -#include "d/save/d_save.h" +#include "global.h" + +class msg_class; struct event_binary_data_header { /* 0x00 */ u32 eventTop; // offset to Event chunk diff --git a/include/d/event/d_event_lib.h b/include/d/event/d_event_lib.h index 5019a47c0a1..7dc9f688c01 100644 --- a/include/d/event/d_event_lib.h +++ b/include/d/event/d_event_lib.h @@ -2,7 +2,8 @@ #define D_EVENT_D_EVENT_LIB_H #include "dolphin/types.h" -#include "f_op/f_op_actor.h" + +class fopAc_ac_c; template struct action_class { diff --git a/include/d/event/d_event_manager.h b/include/d/event/d_event_manager.h index 1d8177b925c..3993688b761 100644 --- a/include/d/event/d_event_manager.h +++ b/include/d/event/d_event_manager.h @@ -1,9 +1,12 @@ #ifndef D_EVENT_D_EVENT_MANAGER_H #define D_EVENT_D_EVENT_MANAGER_H +#include "SSystem/SComponent/c_xyz.h" #include "d/event/d_event_data.h" #include "dolphin/types.h" +class fopAc_ac_c; + class dEvent_exception_c { public: dEvent_exception_c() { mEventInfoIdx = -1; } diff --git a/include/d/file/d_file_sel_info.h b/include/d/file/d_file_sel_info.h index ac5a790d695..060b90517f9 100644 --- a/include/d/file/d_file_sel_info.h +++ b/include/d/file/d_file_sel_info.h @@ -1,9 +1,12 @@ #ifndef D_FILE_D_FILE_SEL_INFO_H #define D_FILE_D_FILE_SEL_INFO_H -#include "d/com/d_com_inf_game.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" +class CPaneMgrAlpha; +class dSv_save_c; + class dFile_info_c { public: /* 80192434 */ dFile_info_c(JKRArchive*, u8); diff --git a/include/d/file/d_file_sel_warning.h b/include/d/file/d_file_sel_warning.h index 8353dcdc799..d347b7ee860 100644 --- a/include/d/file/d_file_sel_warning.h +++ b/include/d/file/d_file_sel_warning.h @@ -1,7 +1,9 @@ #ifndef D_FILE_D_FILE_SEL_WARNING_H #define D_FILE_D_FILE_SEL_WARNING_H -#include "d/com/d_com_inf_game.h" +#include "JSystem/JUtility/TColor.h" + +class JKRArchive; class dFile_warning_c { public: diff --git a/include/d/file/d_file_select.h b/include/d/file/d_file_select.h index f223124fcc2..b1113c2011f 100644 --- a/include/d/file/d_file_select.h +++ b/include/d/file/d_file_select.h @@ -2,13 +2,24 @@ #define D_FILE_D_FILE_SELECT_H #include "dolphin/types.h" -#include "d/com/d_com_inf_game.h" -#include "m_Do/m_Do_MemCard.h" -#include "d/file/d_file_sel_warning.h" -#include "d/d_name.h" -#include "d/msg/d_msg_string.h" -#include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include "JSystem/J3DGraphLoader/J3DAnmLoader.h" +#include "global.h" + +class CPaneMgr; +class CPaneMgrAlpha; +class J2DAnmBase; +class J2DAnmTransform; +class J2DPane; +class J2DPicture; +class J2DScreen; +class JKRArchive; +class JUTFont; +struct STControl; +struct cXyz; +class dFile_warning_c; +class dMsgString_c; +class dName_c; +class dSelect_cursor_c; +class dSv_save_c; class dDlst_FileSel_c { public: diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index f9ca7ce440b..6daa055ab87 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -1,17 +1,16 @@ #ifndef D_KANKYO_D_KANKYO_H #define D_KANKYO_D_KANKYO_H -#include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/J3DGraphBase/J3DStruct.h" -#include "JSystem/JParticle/JPAParticle.h" #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" -#include "Z2AudioLib/Z2EnvSeMgr.h" #include "d/kankyo/d_kankyo_wether.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" +#include "global.h" #include "m_Do/m_Do_ext.h" +class JPABaseEmitter; class cBgS_PolyInfo; void dKankyo_DayProc(); diff --git a/include/d/kankyo/d_kankyo_wether.h b/include/d/kankyo/d_kankyo_wether.h index f0f443fad28..2a99d418b5d 100644 --- a/include/d/kankyo/d_kankyo_wether.h +++ b/include/d/kankyo/d_kankyo_wether.h @@ -4,6 +4,7 @@ #include "JSystem/J3DGraphBase/J3DPacket.h" #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" void dKyw_wether_draw(); diff --git a/include/d/map/d_map_path.h b/include/d/map/d_map_path.h index 670b1724416..2d0fef74e11 100644 --- a/include/d/map/d_map_path.h +++ b/include/d/map/d_map_path.h @@ -3,6 +3,7 @@ #include "d/d_drawlist.h" #include "dolphin/types.h" +#include "global.h" class dDrawPath_c : public dDlst_base_c { public: diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 957afae8b6d..08af8253fbc 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -1,11 +1,13 @@ #ifndef D_MAP_D_MAP_PATH_DMAP_H #define D_MAP_D_MAP_PATH_DMAP_H -#include "d/d_stage.h" #include "d/d_tresure.h" #include "d/map/d_map_path.h" #include "dolphin/types.h" +class dStage_FileList2_dt_c; +struct stage_tgsc_data_class; + class dMpath_c { public: /* 8003F758 */ static bool isExistMapPathData(); diff --git a/include/d/menu/d_menu_calibration.h b/include/d/menu/d_menu_calibration.h index a937a01e510..4498fa31957 100644 --- a/include/d/menu/d_menu_calibration.h +++ b/include/d/menu/d_menu_calibration.h @@ -1,8 +1,12 @@ #ifndef D_MENU_D_MENU_CALIBRATION_H #define D_MENU_D_MENU_CALIBRATION_H -#include "d/com/d_com_inf_game.h" -#include "d/msg/d_msg_string.h" +#include "JSystem/J2DGraph/J2DTextBox.h" + +class CPaneMgr; +class JKRExpHeap; +class dMsgString_c; +class dSelect_cursor_c; class dMenu_Calibration_c { public: diff --git a/include/d/menu/d_menu_collect.h b/include/d/menu/d_menu_collect.h index 264ffd7a1df..26ca21fb311 100644 --- a/include/d/menu/d_menu_collect.h +++ b/include/d/menu/d_menu_collect.h @@ -1,11 +1,13 @@ #ifndef D_MENU_D_MENU_COLLECT_H #define D_MENU_D_MENU_COLLECT_H -#include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" +#include "d/d_drawlist.h" +#include "d/kankyo/d_kankyo.h" #include "dolphin/types.h" +class CPaneMgr; +struct CSTControl; +struct STControl; class dMsgString_c; class dMenu_save_c; class dMenu_Option_c; @@ -13,6 +15,7 @@ class dMenu_Letter_c; class dMenu_Fishing_c; class dMenu_Skill_c; class dMenu_Insect_c; +class dSelect_cursor_c; class dMenu_Collect2D_c; class dMenu_Collect2DTop_c : public dDlst_base_c { diff --git a/include/d/menu/d_menu_dmap.h b/include/d/menu/d_menu_dmap.h index 1bef68c63e8..1b65c12d92b 100644 --- a/include/d/menu/d_menu_dmap.h +++ b/include/d/menu/d_menu_dmap.h @@ -1,11 +1,18 @@ #ifndef D_MENU_D_MENU_DMAP_H #define D_MENU_D_MENU_DMAP_H -#include "JSystem/J2DGraph/J2DOrthoGraph.h" -#include "d/d_lib.h" #include "d/d_select_cursor.h" +#include "dolphin/mtx/vec.h" #include "dolphin/types.h" +class CPaneMgr; +struct CSTControl; +class J2DOrthoGraph; +class J2DPicture; +class J2DScreen; +class JKRArchive; +class JKRExpHeap; +struct STControl; class dMenu_DmapMapCtrl_c; class dMenu_DmapBg_c; class mDoDvdThd_mountArchive_c; diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h index a1f99185f6f..45e2d7057d6 100644 --- a/include/d/menu/d_menu_fishing.h +++ b/include/d/menu/d_menu_fishing.h @@ -1,14 +1,15 @@ #ifndef D_MENU_D_MENU_FISHING_H #define D_MENU_D_MENU_FISHING_H -#include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" -#include "m_Do/m_Do_dvd_thread.h" -#include "d/msg/d_msg_string.h" - +class CPaneMgr; +struct CSTControl; +class J2DTextBox; +struct STControl; +class dMsgString_c; +class mDoDvdThd_mountArchive_c; class dMenu_Fishing_c : public dDlst_base_c { public: diff --git a/include/d/menu/d_menu_fmap.h b/include/d/menu/d_menu_fmap.h index fdd4e1228f0..4b9dd93418b 100644 --- a/include/d/menu/d_menu_fmap.h +++ b/include/d/menu/d_menu_fmap.h @@ -1,12 +1,16 @@ #ifndef D_MENU_D_MENU_FMAP_H #define D_MENU_D_MENU_FMAP_H -#include "d/d_drawlist.h" -#include "d/d_lib.h" +#include "SSystem/SComponent/c_xyz.h" #include "d/msg/d_msg_flow.h" -#include "d/pane/d_pane_class.h" #include "dolphin/types.h" +struct CSTControl; +class J2DAnmTextureSRTKey; +class JKRArchive; +class JKRExpHeap; +class JKRHeap; +struct STControl; class dMenu_Fmap_stage_data_c; class dMenu_Fmap_world_data_c; class dMenu_Fmap_region_data_c; diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h index 40cc9ebf3fe..5ae137e84c1 100644 --- a/include/d/menu/d_menu_insect.h +++ b/include/d/menu/d_menu_insect.h @@ -1,13 +1,16 @@ #ifndef D_MENU_D_MENU_INSECT_H #define D_MENU_D_MENU_INSECT_H -#include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" +class CPaneMgr; +struct CSTControl; +class J2DTextBox; +struct STControl; class dMsgScrn3Select_c; class dMsgString_c; +class dSelect_cursor_c; class dMenu_Insect_c : public dDlst_base_c { public: diff --git a/include/d/menu/d_menu_letter.h b/include/d/menu/d_menu_letter.h index f4c553562b4..efe88ea01a7 100644 --- a/include/d/menu/d_menu_letter.h +++ b/include/d/menu/d_menu_letter.h @@ -1,14 +1,17 @@ #ifndef D_MENU_D_MENU_LETTER_H #define D_MENU_D_MENU_LETTER_H -#include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" +class CPaneMgr; +struct CSTControl; +class J2DTextBox; +struct STControl; class mDoDvdThd_mountArchive_c; class dMsgString_c; class dMsgScrnArrow_c; +class dSelect_cursor_c; class dMenu_Letter_c : public dDlst_base_c { public: diff --git a/include/d/menu/d_menu_option.h b/include/d/menu/d_menu_option.h index 7018bc75269..666de957c5f 100644 --- a/include/d/menu/d_menu_option.h +++ b/include/d/menu/d_menu_option.h @@ -1,16 +1,20 @@ #ifndef D_MENU_D_MENU_OPTION_H #define D_MENU_D_MENU_OPTION_H -#include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" +class CPaneMgr; +struct CSTControl; +class J2DTextBox; +class JUTFont; +struct STControl; class dFile_warning_c; class dMenu_Calibration_c; class mDoDvdThd_mountArchive_c; class dMsgString_c; class dMeterHaihai_c; +class dSelect_cursor_c; class dMenu_Option_c : public dDlst_base_c { public: diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h index fe7cd2e8a2d..3d1e87f07a8 100644 --- a/include/d/menu/d_menu_ring.h +++ b/include/d/menu/d_menu_ring.h @@ -1,14 +1,17 @@ #ifndef D_MENU_D_MENU_RING_H #define D_MENU_D_MENU_RING_H -#include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" -class dMsgString_c; +class CPaneMgr; +struct CSTControl; +class J2DTextBox; +struct STControl; class dKantera_icon_c; +class dMsgString_c; class dMenu_ItemExplain_c; +class dSelect_cursor_c; class dMenu_Ring_c : public dDlst_base_c { public: diff --git a/include/d/menu/d_menu_save.h b/include/d/menu/d_menu_save.h index 201cb0a27b7..e57da5ec3aa 100644 --- a/include/d/menu/d_menu_save.h +++ b/include/d/menu/d_menu_save.h @@ -1,17 +1,23 @@ #ifndef D_MENU_D_MENU_SAVE_H #define D_MENU_D_MENU_SAVE_H -#include "JSystem/J2DGraph/J2DScreen.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" -#include "m_Do/m_Do_dvd_thread.h" #include "d/save/d_save.h" +class CPaneMgr; +class CPaneMgrAlpha; +struct CSTControl; +class J2DAnmColorKey; +class J2DAnmTransformKey; +class JUTFont; +struct STControl; class dMsgString_c; class dFile_warning_c; class dFile_info_c; class dMsgScrnExplain_c; +class dSelect_cursor_c; +class mDoDvdThd_mountArchive_c; class dDlst_MenuSaveExplain_c : public dDlst_base_c { public: diff --git a/include/d/menu/d_menu_skill.h b/include/d/menu/d_menu_skill.h index 62a1f7a7d51..eb46672d0a9 100644 --- a/include/d/menu/d_menu_skill.h +++ b/include/d/menu/d_menu_skill.h @@ -1,13 +1,16 @@ #ifndef D_MENU_D_MENU_SKILL_H #define D_MENU_D_MENU_SKILL_H -#include "JSystem/J2DGraph/J2DPicture.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" +#include "d/d_drawlist.h" #include "dolphin/types.h" +class CPaneMgr; +struct CSTControl; +class J2DTextBox; +struct STControl; class mDoDvdThd_mountArchive_c; class dMsgString_c; +class dSelect_cursor_c; class dMenu_Skill_c : public dDlst_base_c { public: diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h index 07134186753..ac7cebce94c 100644 --- a/include/d/menu/d_menu_window.h +++ b/include/d/menu/d_menu_window.h @@ -2,17 +2,22 @@ #define D_MENU_D_MENU_WINDOW_H #include "d/d_drawlist.h" -#include "d/menu/d_menu_collect.h" -#include "d/meter/d_meter2_info.h" #include "f_op/f_op_msg.h" #include "dolphin/types.h" -#include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "m_Do/m_Do_mtx.h" -class dMenu_Ring_c; +struct CSTControl; +struct STControl; +class dMenu_Collect_c; class dMenu_Dmap_c; +class dMenu_Fishing_c; class dMenu_Fmap_c; +class dMenu_Insect_c; +class dMenu_Letter_c; +class dMenu_Option_c; +class dMenu_Ring_c; +class dMenu_Skill_c; +class dMenu_save_c; class dDlst_MENU_CAPTURE_c : public dDlst_base_c { public: diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index 087143a5944..e705ccdfee8 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -1,13 +1,17 @@ #ifndef D_METER_D_METER2_H #define D_METER_D_METER2_H -#include "JSystem/JKernel/JKRExpHeap.h" -#include "d/com/d_com_inf_game.h" -#include "d/meter/d_meter2_draw.h" -#include "d/meter/d_meter_map.h" +#include "d/d_drawlist.h" #include "f_op/f_op_msg.h" #include "dolphin/types.h" +class CPaneMgr; +class J2DAnmColor; +class J2DAnmTextureSRTKey; +class J2DAnmTransformKey; +class JKRExpHeap; +class JKRHeap; +class dMeter2Draw_c; class dMeterMap_c; class dMeterSub_c : public dDlst_base_c { diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h index 30676db42a3..c1bc990ed59 100644 --- a/include/d/meter/d_meter2_draw.h +++ b/include/d/meter/d_meter2_draw.h @@ -1,14 +1,17 @@ #ifndef D_METER_D_METER2_DRAW_H #define D_METER_D_METER2_DRAW_H -#include "JSystem/J2DGraph/J2DAnimation.h" -#include "JSystem/J2DGraph/J2DPicture.h" -#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/TColor.h" #include "d/d_drawlist.h" -#include "d/pane/d_pane_class.h" #include "dolphin/types.h" +class CPaneMgr; +class CPaneMgrAlpha; +class J2DAnmColorKey; +class J2DAnmTransformKey; +class JKRExpHeap; +class JKRHeap; + enum dMeter2Draw_actionFlag { /* 0x0 */ ACTION_FLG_DEFAULT, /* 0x2 */ ACTION_FLG_EMPHASIS = 2, diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index e840817d0f8..78ad8a4cc1e 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -1,14 +1,12 @@ #ifndef D_METER_D_METER2_INFO_H #define D_METER_D_METER2_INFO_H -#include "JSystem/JUtility/JUTTexture.h" -#include "d/d_resorce.h" -#include "d/menu/d_menu_window.h" -#include "d/meter/d_meter2.h" -#include "d/msg/d_msg_class.h" -#include "d/msg/d_msg_flow.h" -#include "d/pane/d_pane_class.h" -#include "f_op/f_op_actor.h" +#include "SSystem/SComponent/c_xyz.h" + +class CPaneMgr; +class J2DTextBox; +class JMSMesgEntry_c; +class JUTFont; struct dMenu_LetterData { u16 mSubject; diff --git a/include/d/meter/d_meter_HIO.h b/include/d/meter/d_meter_HIO.h index d58a06ecf43..01b77684e77 100644 --- a/include/d/meter/d_meter_HIO.h +++ b/include/d/meter/d_meter_HIO.h @@ -1,12 +1,13 @@ #ifndef D_METER_D_METER_HIO_H #define D_METER_D_METER_HIO_H -#include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JUtility/TColor.h" #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" -#include "m_Do/m_Do_ext.h" +#include "global.h" + +class JKRArchive; class dMeter_menuHIO_c { public: diff --git a/include/d/meter/d_meter_map.h b/include/d/meter/d_meter_map.h index 33b0e506b18..dfdfea6e714 100644 --- a/include/d/meter/d_meter_map.h +++ b/include/d/meter/d_meter_map.h @@ -1,11 +1,11 @@ #ifndef D_METER_D_METER_MAP_H #define D_METER_D_METER_MAP_H -#include "JSystem/J2DGraph/J2DPicture.h" -#include "JSystem/J2DGraph/J2DScreen.h" #include "d/map/d_map_path_dmap.h" #include "dolphin/types.h" +class J2DPicture; + // move renderingAmap_c + dMap_c later class renderingAmap_c : public renderingPlusDoorAndCursor_c { public: diff --git a/include/d/msg/d_msg_class.h b/include/d/msg/d_msg_class.h index 1b04e9eaf82..ebd33b79408 100644 --- a/include/d/msg/d_msg_class.h +++ b/include/d/msg/d_msg_class.h @@ -3,8 +3,11 @@ #include "JSystem/JMessage/control.h" #include "JSystem/JMessage/processor.h" -#include "d/msg/d_msg_out_font.h" -#include "f_op/f_op_msg.h" +#include "SSystem/SComponent/c_xyz.h" + +class COutFont_c; +class J2DTextBox; +class JUTFont; struct JMSMesgEntry_c { /* 0x00 */ u32 mStringOffset; diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h index 74dec026b45..cc14bff58e2 100644 --- a/include/d/msg/d_msg_flow.h +++ b/include/d/msg/d_msg_flow.h @@ -1,7 +1,10 @@ #ifndef D_MSG_D_MSG_FLOW_H #define D_MSG_D_MSG_FLOW_H -#include "f_op/f_op_msg.h" +#include "dolphin/types.h" + +class fopAc_ac_c; +class msg_class; // all mesg_flow_node structs members might be wrong struct mesg_flow_node { diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 75a0e42ebad..bef18638c38 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -1,15 +1,19 @@ #ifndef D_MSG_D_MSG_OBJECT_H #define D_MSG_D_MSG_OBJECT_H -#include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JMessage/control.h" -#include "JSystem/JMessage/processor.h" #include "JSystem/JMessage/resource.h" #include "d/com/d_com_inf_game.h" -#include "d/msg/d_msg_class.h" +#include "f_op/f_op_msg.h" class COutFont_c; +class J2DTextBox; +class JUTFont; class dMsgScrnBase_c; +class dMsgString_c; +struct jmessage_tReference; +struct jmessage_tRenderingProcessor; +struct jmessage_tSequenceProcessor; class dMsgObject_c : public msg_class { public: diff --git a/include/d/msg/d_msg_out_font.h b/include/d/msg/d_msg_out_font.h index e11307c7308..5f55372c142 100644 --- a/include/d/msg/d_msg_out_font.h +++ b/include/d/msg/d_msg_out_font.h @@ -2,8 +2,9 @@ #define D_MSG_D_MSG_OUT_FONT_H #include "dolphin/types.h" -#include "JSystem/J2DGraph/J2DTextBox.h" -#include "JSystem/J2DGraph/J2DPicture.h" + +class J2DPicture; +class J2DTextBox; class COutFontSet_c { public: diff --git a/include/d/msg/d_msg_string.h b/include/d/msg/d_msg_string.h index d9943b8384c..09ea58b3795 100644 --- a/include/d/msg/d_msg_string.h +++ b/include/d/msg/d_msg_string.h @@ -2,7 +2,9 @@ #define D_MSG_D_MSG_STRING_H #include "d/msg/d_msg_string_base.h" -#include "d/msg/d_msg_out_font.h" + +class COutFont_c; +class JUTFont; class dMsgString_c : public dMsgStringBase_c { public: diff --git a/include/d/msg/d_msg_string_base.h b/include/d/msg/d_msg_string_base.h index 0dcb053c291..838a7dbe668 100644 --- a/include/d/msg/d_msg_string_base.h +++ b/include/d/msg/d_msg_string_base.h @@ -1,8 +1,11 @@ #ifndef D_MSG_D_MSG_STRING_BASE_H #define D_MSG_D_MSG_STRING_BASE_H -#include "d/msg/d_msg_object.h" +#include "JSystem/JMessage/resource.h" +class COutFont_c; +class J2DTextBox; +class JUTFont; struct jmessage_string_tControl; struct jmessage_string_tReference; struct jmessage_string_tSequenceProcessor; diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h index 3265b1268e7..1a6f716e9ed 100644 --- a/include/d/pane/d_pane_class.h +++ b/include/d/pane/d_pane_class.h @@ -1,7 +1,7 @@ #ifndef D_PANE_D_PANE_CLASS_H #define D_PANE_D_PANE_CLASS_H -#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/JUtility/TColor.h" #include "d/pane/d_pane_class_alpha.h" #include "dolphin/types.h" diff --git a/include/d/pane/d_pane_class_alpha.h b/include/d/pane/d_pane_class_alpha.h index 79c67f6bf45..1ad577ef135 100644 --- a/include/d/pane/d_pane_class_alpha.h +++ b/include/d/pane/d_pane_class_alpha.h @@ -1,11 +1,13 @@ #ifndef D_PANE_D_PANE_CLASS_ALPHA_H #define D_PANE_D_PANE_CLASS_ALPHA_H -#include "JSystem/J2DGraph/J2DScreen.h" -#include "JSystem/J2DGraph/J2DWindow.h" -#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/J2DGraph/J2DPane.h" #include "dolphin/types.h" +class J2DPane; +class J2DScreen; +class JKRExpHeap; + class CPaneMgrAlpha { public: /* 8025546C */ virtual ~CPaneMgrAlpha(); diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 94fd475066f..0214eba6630 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -2,9 +2,18 @@ #define D_PARTICLE_D_PARTICLE_H #include "JSystem/JParticle/JPAParticle.h" -#include "d/particle/d_particle_name.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "SSystem/SComponent/c_xyz.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" -#include "f_op/f_op_actor.h" + +class J3DAnmTexPattern; +class J3DModel; +class J3DModelData; +class JKRExpHeap; +class JKRSolidHeap; +class dKy_tevstr_c; +class fopAc_ac_c; class dPa_levelEcallBack : public JPAEmitterCallBack { public: diff --git a/include/d/particle/d_particle_copoly.h b/include/d/particle/d_particle_copoly.h index 6364c0bee73..9919f70aa77 100644 --- a/include/d/particle/d_particle_copoly.h +++ b/include/d/particle/d_particle_copoly.h @@ -1,9 +1,11 @@ #ifndef D_PARTICLE_D_PARTICLE_COPOLY_H #define D_PARTICLE_D_PARTICLE_COPOLY_H -#include "d/bg/d_bg_s_acch.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" +class dBgS_Acch; struct dKy_tevstr_c; class dPaPo_c { diff --git a/include/d/s/d_s_logo.h b/include/d/s/d_s_logo.h index 8acfd8a38c0..9f6502979ce 100644 --- a/include/d/s/d_s_logo.h +++ b/include/d/s/d_s_logo.h @@ -1,9 +1,16 @@ #ifndef D_S_D_S_LOGO_H #define D_S_D_S_LOGO_H -#include "d/com/d_com_inf_game.h" +#include "SSystem/SComponent/c_phase.h" #include "dolphin/types.h" -#include "SSystem/SComponent/c_lib.h" +#include "f_op/f_op_scene.h" + +class JKRExpHeap; +class JKRHeap; +struct ResTIMG; +class dDlst_2D_c; +class mDoDvdThd_mountXArchive_c; +class mDoDvdThd_toMainRam_c; class dLog_HIO_c { public: diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h index 299e70f85fe..1c85842d724 100644 --- a/include/d/s/d_s_play.h +++ b/include/d/s/d_s_play.h @@ -1,10 +1,14 @@ #ifndef D_S_D_S_PLAY_H #define D_S_D_S_PLAY_H -#include "d/com/d_com_inf_game.h" +#include "SSystem/SComponent/c_phase.h" +#include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" #include "f_op/f_op_scene.h" +class mDoDvdThd_mountXArchive_c; +class mDoDvdThd_toMainRam_c; + class dScnPly_reg_HIO_c { public: /* 8025AD78 */ virtual ~dScnPly_reg_HIO_c(); diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 8acbe2582c8..fa3f80cdeab 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -3,8 +3,9 @@ #include "MSL_C/string.h" #include "SSystem/SComponent/c_xyz.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSTime.h" #include "dolphin/types.h" +#include "global.h" #define DEFAULT_SELECT_ITEM_INDEX 0 #define MAX_SELECT_ITEM 4 diff --git a/include/d/shop/d_shop_item_ctrl.h b/include/d/shop/d_shop_item_ctrl.h index 9a3e956c229..5a486dc093d 100644 --- a/include/d/shop/d_shop_item_ctrl.h +++ b/include/d/shop/d_shop_item_ctrl.h @@ -1,7 +1,7 @@ #ifndef D_SHOP_D_SHOP_ITEM_CTRL_H #define D_SHOP_D_SHOP_ITEM_CTRL_H -#include "d/a/d_a_shop_item_static.h" +#include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" class dShopItemCtrl_c { diff --git a/include/d/shop/d_shop_system.h b/include/d/shop/d_shop_system.h index e7d0c9db22c..048398c6ad6 100644 --- a/include/d/shop/d_shop_system.h +++ b/include/d/shop/d_shop_system.h @@ -5,6 +5,9 @@ #include "d/shop/d_shop_item_ctrl.h" #include "dolphin/types.h" +class dSelect_cursor_c; +struct STControl; + typedef int (*ShopCam_actionFunc)(void); class ShopCam_action_c { diff --git a/include/dolphin/card/CARDPriv.h b/include/dolphin/card/CARDPriv.h index 2e6df14132b..3d46ecbe651 100644 --- a/include/dolphin/card/CARDPriv.h +++ b/include/dolphin/card/CARDPriv.h @@ -1,6 +1,8 @@ #ifndef CARDPRIV_H #define CARDPRIV_H +#include "dolphin/os/OSAlarm.h" +#include "dolphin/os/OSThread.h" #include "dolphin/types.h" #ifdef __cplusplus @@ -22,6 +24,8 @@ extern "C" { #define CARD_MAX_MOUNT_STEP (CARD_NUM_SYSTEM_BLOCK + 2) +typedef struct DVDDiskID DVDDiskID; + typedef struct CARDDir { u8 gameName[4]; u8 company[2]; diff --git a/include/dolphin/dsp/dsp.h b/include/dolphin/dsp/dsp.h index e45c5c11af6..3b9db17a2b8 100644 --- a/include/dolphin/dsp/dsp.h +++ b/include/dolphin/dsp/dsp.h @@ -1,7 +1,7 @@ #ifndef DSP_H #define DSP_H -#include "dolphin/os/OS.h" +#include "dolphin/os/OSTime.h" volatile u16 __DSPRegs[32] : 0xCC005000; volatile u32 __AIRegs[8] : 0xCC006C00; diff --git a/include/dolphin/exi/EXIBios.h b/include/dolphin/exi/EXIBios.h index 71f91dcaffa..00099f62b17 100644 --- a/include/dolphin/exi/EXIBios.h +++ b/include/dolphin/exi/EXIBios.h @@ -1,12 +1,14 @@ #ifndef EXIBIOS_H #define EXIBIOS_H -#include "dolphin/os/OS.h" +#include "dolphin/types.h" #ifdef __cplusplus extern "C" { #endif +typedef struct OSContext OSContext; + vu32 __EXIRegs[16] : 0xCC006800; #define EXI_MEMORY_CARD_59 0x00000004 diff --git a/include/dolphin/gd/GDGeometry.h b/include/dolphin/gd/GDGeometry.h index 078eb39d709..715d27b7437 100644 --- a/include/dolphin/gd/GDGeometry.h +++ b/include/dolphin/gd/GDGeometry.h @@ -1,13 +1,15 @@ #ifndef GDGEOMETRY_H #define GDGEOMETRY_H -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/types.h" #ifdef __cplusplus extern "C" { #endif +typedef struct _GXVtxDescList GXVtxDescList; + void GDSetVtxDescv(GXVtxDescList*); void GDSetArray(GXAttr attr, const void* data, u8 stride); void GDSetArrayRaw(GXAttr attr, u32 data, u8 stride); diff --git a/include/dolphin/gx/GXBump.h b/include/dolphin/gx/GXBump.h index 29337920c79..ddb8d677493 100644 --- a/include/dolphin/gx/GXBump.h +++ b/include/dolphin/gx/GXBump.h @@ -2,7 +2,6 @@ #define GXBUMP_H #include "dolphin/gx/GXEnum.h" -#include "dolphin/mtx/mtx.h" #ifdef __cplusplus extern "C" { diff --git a/include/dolphin/gx/GXFifo.h b/include/dolphin/gx/GXFifo.h index 68f955e8265..7bdfceee0d2 100644 --- a/include/dolphin/gx/GXFifo.h +++ b/include/dolphin/gx/GXFifo.h @@ -3,7 +3,7 @@ #include "dolphin/gx/GXStruct.h" #include "dolphin/gx/GXEnum.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSThread.h" #ifdef __cplusplus extern "C" { diff --git a/include/dolphin/os/OSAlarm.h b/include/dolphin/os/OSAlarm.h index f628e20da8e..658e988e623 100644 --- a/include/dolphin/os/OSAlarm.h +++ b/include/dolphin/os/OSAlarm.h @@ -1,8 +1,8 @@ #ifndef OSALARM_H #define OSALARM_H -#include "dolphin/os/OSTime.h" #include "dolphin/os/OSError.h" +#include "dolphin/os/OSTime.h" #ifdef __cplusplus extern "C" { diff --git a/include/dolphin/os/OSError.h b/include/dolphin/os/OSError.h index c2dcd5b9b86..833ce346334 100644 --- a/include/dolphin/os/OSError.h +++ b/include/dolphin/os/OSError.h @@ -1,12 +1,14 @@ #ifndef OSERROR_H #define OSERROR_H -#include "dolphin/os/OSContext.h" +#include "dolphin/types.h" #ifdef __cplusplus extern "C" { #endif +typedef struct OSContext OSContext; + extern u32 __OSFpscrEnableBits; typedef u16 OSError; diff --git a/include/dolphin/os/OSInterrupt.h b/include/dolphin/os/OSInterrupt.h index 7654dfd4312..5726d44c6b0 100644 --- a/include/dolphin/os/OSInterrupt.h +++ b/include/dolphin/os/OSInterrupt.h @@ -1,12 +1,14 @@ #ifndef OSINTERRUPT_H #define OSINTERRUPT_H -#include "dolphin/os/OSContext.h" +#include "dolphin/types.h" #ifdef __cplusplus extern "C" { #endif +typedef struct OSContext OSContext; + typedef enum { OS_INTR_MEM_0, OS_INTR_MEM_1, diff --git a/include/dolphin/os/OSMemory.h b/include/dolphin/os/OSMemory.h index 92c5da07aed..bf059691771 100644 --- a/include/dolphin/os/OSMemory.h +++ b/include/dolphin/os/OSMemory.h @@ -1,7 +1,6 @@ #ifndef OSMEMORY_H #define OSMEMORY_H -#include "dolphin/types.h" #include "dolphin/os/OSInterrupt.h" #ifdef __cplusplus diff --git a/include/dolphin/pad/Pad.h b/include/dolphin/pad/Pad.h index 5fc625ff259..229e6457d14 100644 --- a/include/dolphin/pad/Pad.h +++ b/include/dolphin/pad/Pad.h @@ -1,12 +1,14 @@ #ifndef PAD_H #define PAD_H -#include "dolphin/os/OS.h" +#include "dolphin/types.h" #ifdef __cplusplus extern "C" { #endif +typedef struct OSContext OSContext; + typedef enum PADMask { PAD_CHAN3_BIT = (1 << 28), PAD_CHAN2_BIT = (1 << 29), diff --git a/include/dolphin/si/SIBios.h b/include/dolphin/si/SIBios.h index 34f04fc2f67..af736a1431d 100644 --- a/include/dolphin/si/SIBios.h +++ b/include/dolphin/si/SIBios.h @@ -1,7 +1,8 @@ #ifndef SIBIOS_H #define SIBIOS_H -#include "dolphin/os/OS.h" +#include "dolphin/os/OSInterrupt.h" +#include "dolphin/os/OSTime.h" #ifdef __cplusplus extern "C" { diff --git a/include/dolphin/vi/vi.h b/include/dolphin/vi/vi.h index cf1552d85c1..23abbcc4080 100644 --- a/include/dolphin/vi/vi.h +++ b/include/dolphin/vi/vi.h @@ -1,13 +1,14 @@ #ifndef VI_H #define VI_H -#include "dolphin/gx/GX.h" #include "dolphin/types.h" #ifdef __cplusplus extern "C" { #endif +typedef struct _GXRenderModeObj GXRenderModeObj; + #define VI_TVMODE(format, interlace) (((format) << 2) + (interlace)) #define VI_INTERLACE 0 diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index cc38fa72db8..dd29f9270c4 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -6,6 +6,7 @@ #include "d/kankyo/d_kankyo.h" #include "dolphin/mtx/mtx.h" #include "f_pc/f_pc_leaf.h" +#include "global.h" struct actor_method_class { /* 0x00 */ leafdraw_method_class base; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 239d8e737a2..a702fbf32c5 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -1,21 +1,17 @@ #ifndef F_OP_ACTOR_MNG_H_ #define F_OP_ACTOR_MNG_H_ -#include "JSystem/J3DGraphAnimator/J3DModelData.h" -#include "JSystem/JKernel/JKRHeap.h" -#include "SSystem/SComponent/c_m3d_g_pla.h" #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_iter.h" -#include "f_pc/f_pc_executor.h" -#include "f_pc/f_pc_fstcreate_req.h" #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_searcher.h" -#include "f_pc/f_pc_stdcreate_req.h" class J3DModelData; // placeholder +class JKRHeap; +class cM3dGPla; struct fopAcM_prmBase_class { /* 0x00 */ u32 field_0x00; diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h index 5f37c4635ff..9ae93e4b591 100644 --- a/include/f_op/f_op_camera.h +++ b/include/f_op/f_op_camera.h @@ -1,7 +1,9 @@ #ifndef F_F_OP_CAMERA_H_ #define F_F_OP_CAMERA_H_ -#include "f_op/f_op_camera_mng.h" +#include "f_op/f_op_view.h" + +class camera_class; struct camera_process_profile_definition { /* 0x00 */ view_process_profile_definition mBase; diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index c16bf9728ec..ba595396cd0 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -4,11 +4,11 @@ #include "SSystem/SComponent/c_phase.h" #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" -#include "dolphin/types.h" -#include "f_op/f_op_draw_tag.h" -#include "f_op/f_op_view.h" -#include "f_pc/f_pc_leaf.h" #include "d/d_camera.h" +#include "dolphin/types.h" +#include "f_op/f_op_view.h" + +typedef struct leafdraw_method_class leafdraw_method_class; class camera_process_class : public view_class { public: diff --git a/include/f_op/f_op_draw_iter.h b/include/f_op/f_op_draw_iter.h index a9e1048b60a..1455b65aeb8 100644 --- a/include/f_op/f_op_draw_iter.h +++ b/include/f_op/f_op_draw_iter.h @@ -1,7 +1,7 @@ #ifndef F_F_OP_DRAW_ITER_H_ #define F_F_OP_DRAW_ITER_H_ -#include "SSystem/SComponent/c_tag.h" +typedef struct create_tag_class create_tag_class; static create_tag_class* fopDwIt_GetTag(void); create_tag_class* fopDwIt_Begin(void); diff --git a/include/f_op/f_op_draw_tag.h b/include/f_op/f_op_draw_tag.h index 2a37bd7458d..281f9795ba0 100644 --- a/include/f_op/f_op_draw_tag.h +++ b/include/f_op/f_op_draw_tag.h @@ -1,7 +1,9 @@ #ifndef F_F_OP_DRAW_TAG #define F_F_OP_DRAW_TAG -#include "SSystem/SComponent/c_tag.h" +#include "SSystem/SComponent/c_tree.h" + +typedef struct create_tag_class create_tag_class; extern node_lists_tree_class g_fopDwTg_Queue; diff --git a/include/f_op/f_op_kankyo.h b/include/f_op/f_op_kankyo.h index d309c834109..0f2be635fb7 100644 --- a/include/f_op/f_op_kankyo.h +++ b/include/f_op/f_op_kankyo.h @@ -1,9 +1,9 @@ #ifndef F_OP_F_OP_KANKYO_H #define F_OP_F_OP_KANKYO_H +#include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" -#include "f_pc/f_pc_manager.h" -#include "f_op/f_op_kankyo_mng.h" +#include "f_pc/f_pc_leaf.h" class kankyo_class : public leafdraw_class { public: diff --git a/include/f_op/f_op_msg.h b/include/f_op/f_op_msg.h index 1e093473c6c..f792aaa7163 100644 --- a/include/f_op/f_op_msg.h +++ b/include/f_op/f_op_msg.h @@ -1,8 +1,10 @@ #ifndef F_OP_F_OP_MSG_H #define F_OP_F_OP_MSG_H +#include "SSystem/SComponent/c_xyz.h" #include "f_pc/f_pc_leaf.h" -#include "f_op/f_op_actor.h" + +class fopAc_ac_c; class msg_class : public leafdraw_class { public: diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index 6c74b566e12..8f981ceee0f 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -1,7 +1,13 @@ #ifndef F_F_OP_MSG_MNG_H_ #define F_F_OP_MSG_MNG_H_ -#include "f_op/f_op_msg.h" +#include "SSystem/SComponent/c_xyz.h" +#include "f_pc/f_pc_leaf.h" + +class JKRExpHeap; +class JKRHeap; +class fopAc_ac_c; +class msg_class; struct msg_process_profile_definition { /* 0x00 */ leaf_process_profile_definition mBase; diff --git a/include/f_op/f_op_overlap_mng.h b/include/f_op/f_op_overlap_mng.h index ba420a3b531..897f8320841 100644 --- a/include/f_op/f_op_overlap_mng.h +++ b/include/f_op/f_op_overlap_mng.h @@ -1,9 +1,10 @@ #ifndef F_F_OP_OVERLAP_MNG_H_ #define F_F_OP_OVERLAP_MNG_H_ -#include "SSystem/SComponent/c_request.h" #include "f_pc/f_pc_leaf.h" +struct request_base_class; + class overlap_task_class : public leafdraw_class { public: /* 0xC0 */ leafdraw_method_class* field_0xc0; diff --git a/include/f_op/f_op_overlap_req.h b/include/f_op/f_op_overlap_req.h index 0a88ab8cbed..db49882a72e 100644 --- a/include/f_op/f_op_overlap_req.h +++ b/include/f_op/f_op_overlap_req.h @@ -2,9 +2,10 @@ #define F_F_OP_OVERLAP_REQ_H_ #include "SSystem/SComponent/c_phase.h" -#include "SSystem/SComponent/c_request.h" #include "dolphin/types.h" -#include "f_pc/f_pc_layer.h" + +typedef struct layer_class layer_class; +struct request_base_class; class overlap_request_class { public: diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index ee1e7ae5c97..6c045f62fb0 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -1,12 +1,9 @@ #ifndef F_F_OP_SCENE_H_ #define F_F_OP_SCENE_H_ -#include "SSystem/SComponent/c_phase.h" #include "dolphin/types.h" #include "f_op/f_op_scene_tag.h" -#include "f_pc/f_pc_base.h" #include "f_pc/f_pc_node.h" -#include "m_Do/m_Do_dvd_thread.h" struct request_of_phase_process_class; class mDoDvdThd_command_c; diff --git a/include/f_op/f_op_scene_iter.h b/include/f_op/f_op_scene_iter.h index b135a73f2d8..76166b18c2f 100644 --- a/include/f_op/f_op_scene_iter.h +++ b/include/f_op/f_op_scene_iter.h @@ -1,9 +1,6 @@ #ifndef F_F_OP_SCENE_ITER_H_ #define F_F_OP_SCENE_ITER_H_ -#include "dolphin/types.h" -#include "f_pc/f_pc_base.h" - typedef void* (*fop_ScnItFunc)(void* pProc, void* pUserData); void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pUserData); diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h index 1e645f11df2..6be68ae1e76 100644 --- a/include/f_op/f_op_scene_mng.h +++ b/include/f_op/f_op_scene_mng.h @@ -2,7 +2,9 @@ #define F_F_OP_SCENE_MNG_H_ #include "f_pc/f_pc_manager.h" -#include "f_op/f_op_scene_pause.h" +#include "f_op/f_op_scene.h" + +typedef struct base_process_class base_process_class; scene_class* fopScnM_SearchByID(unsigned int id); int fopScnM_ChangeReq(scene_class*, s16, s16, u16); diff --git a/include/f_op/f_op_scene_pause.h b/include/f_op/f_op_scene_pause.h index d80452174e8..da01d4779e1 100644 --- a/include/f_op/f_op_scene_pause.h +++ b/include/f_op/f_op_scene_pause.h @@ -1,8 +1,7 @@ #ifndef F_F_OP_SCENE_PAUSE_H_ #define F_F_OP_SCENE_PAUSE_H_ -#include "dolphin/types.h" -#include "f_op/f_op_scene.h" +class scene_class; int fopScnPause_Enable(scene_class* pScene); int fopScnPause_Disable(scene_class* pScene); diff --git a/include/f_op/f_op_scene_req.h b/include/f_op/f_op_scene_req.h index 3968124dce9..9b58c0b2004 100644 --- a/include/f_op/f_op_scene_req.h +++ b/include/f_op/f_op_scene_req.h @@ -3,9 +3,10 @@ #include "SSystem/SComponent/c_phase.h" #include "dolphin/types.h" -#include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_node_req.h" +class scene_class; + extern "C" { void fopScnRq_Handler__Fv(void); void fopScnRq_ReRequest(void); diff --git a/include/f_op/f_op_scene_tag.h b/include/f_op/f_op_scene_tag.h index b12dd2db8ce..dccd6c1d139 100644 --- a/include/f_op/f_op_scene_tag.h +++ b/include/f_op/f_op_scene_tag.h @@ -1,8 +1,8 @@ #ifndef F_F_OP_SCENE_TAG_H_ #define F_F_OP_SCENE_TAG_H_ +#include "SSystem/SComponent/c_list.h" #include "dolphin/types.h" -#include "f_pc/f_pc_node.h" class scene_tag_class { u8 _0[0x14]; diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index e8719e83f00..b2a70e0e993 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 abae733a53d..cbe1ab3a746 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 45ee59045c3..92ca88ef877 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 faa6d102492..57de2d5d59f 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 ebae2011c4e..582abf5f399 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 e7cf53fcec1..c195ef6d1ed 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 79185d966fd..ebe81a41a90 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 cc3ba45602e..b62024269fc 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 d3999bf46f5..a987a5fadb4 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 7e5f88d7e81..ef08c5e6d6f 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 0f4084b8970..4f7e0046b7e 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 7ef1d11b44e..25f75a03485 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 cc67f9dadb7..3621f8bf779 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 b2df5fa658a..0f49a08590a 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 4a63c1e5e58..97a2fe57e39 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 986e7da9882..db6e8e467e7 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 1c3ad4eec46..633aaced547 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 fa92560fd64..c3c8a8c8975 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 c5ca3045fb6..a2c82824df8 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 d55e53d4ce7..895b25af95b 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 6294ed032bf..7c3dd68b2ad 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 6eda04ed469..a418200378b 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*); diff --git a/include/m_Do/m_Do_DVDError.h b/include/m_Do/m_Do_DVDError.h index 171f9417158..0f51463465b 100644 --- a/include/m_Do/m_Do_DVDError.h +++ b/include/m_Do/m_Do_DVDError.h @@ -1,7 +1,8 @@ #ifndef M_DO_M_DO_DVDERROR_H #define M_DO_M_DO_DVDERROR_H -#include "JSystem/JKernel/JKRThread.h" +typedef struct OSAlarm OSAlarm; +typedef struct OSContext OSContext; void mDoDvdErr_ThdCleanup(); static void mDoDvdErr_Watch(void*); diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h index 180e68c436b..c6a12f0b55a 100644 --- a/include/m_Do/m_Do_MemCard.h +++ b/include/m_Do/m_Do_MemCard.h @@ -1,10 +1,9 @@ #ifndef M_DO_M_DO_MEMCARD_H #define M_DO_M_DO_MEMCARD_H -#include "dolphin/os/OS.h" +#include "dolphin/os/OSMutex.h" #include "dolphin/types.h" #include "global.h" -#include "m_Do/m_Do_MemCardRWmng.h" class mDoMemCd_Ctrl_c { public: diff --git a/include/m_Do/m_Do_MemCardRWmng.h b/include/m_Do/m_Do_MemCardRWmng.h index 935ef9dd4ac..bfaf2a5cbf8 100644 --- a/include/m_Do/m_Do_MemCardRWmng.h +++ b/include/m_Do/m_Do_MemCardRWmng.h @@ -1,9 +1,10 @@ #ifndef M_DO_M_DO_MEMCARDRWMNG_H #define M_DO_M_DO_MEMCARDRWMNG_H -#include "dolphin/card/card.h" #include "dolphin/types.h" +typedef struct CARDFileInfo CARDFileInfo; + struct mDoMemCdRWm_HeaderData { /* 0x0000 */ u8 mBannerTexData[0xC00]; /* 0x0C00 */ u8 mBannerPalData[0x200]; diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 58c70de4b2d..5e8fd551899 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -1,13 +1,8 @@ #ifndef M_DO_M_DO_AUDIO_H #define M_DO_M_DO_AUDIO_H -#include "JSystem/JAudio2/JASGadget.h" -#include "JSystem/JAudio2/JASTrack.h" -#include "JSystem/JAudio2/JAUSoundTable.h" #include "Z2AudioLib/Z2AudioMgr.h" #include "Z2AudioLib/Z2EnvSeMgr.h" -#include "Z2AudioLib/Z2SoundInfo.h" -#include "Z2AudioLib/Z2WolfHowlMgr.h" class mDoAud_zelAudio_c { public: diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h index cd2c82b5fd9..c7b6fea361f 100644 --- a/include/m_Do/m_Do_controller_pad.h +++ b/include/m_Do/m_Do_controller_pad.h @@ -4,7 +4,6 @@ #include "JSystem/JUtility/JUTGamePad.h" #include "SSystem/SComponent/c_API_controller_pad.h" #include "dolphin/types.h" -#include "m_Do/m_Do_Reset.h" // Controller Ports 1 - 4 enum { PAD_1, PAD_2, PAD_3, PAD_4 }; diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h index de4e2f567bb..ba5e37e1ece 100644 --- a/include/m_Do/m_Do_dvd_thread.h +++ b/include/m_Do/m_Do_dvd_thread.h @@ -2,11 +2,15 @@ #define M_DO_M_DO_DVD_THREAD_H #include "JSystem/JKernel/JKRArchive.h" -#include "JSystem/JKernel/JKRHeap.h" -#include "JSystem/JKernel/JKRMemArchive.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSMutex.h" +#include "dolphin/os/OSThread.h" #include "dolphin/types.h" #include "f_pc/f_pc_node.h" +class JKRHeap; +class JKRMemArchive; + typedef void* (*mDoDvdThd_callback_func)(void*); class mDoDvdThd_command_c : public node_class { diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 580ad366646..ab3d2667457 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -3,13 +3,22 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" -#include "JSystem/JKernel/JKRAssertHeap.h" -#include "JSystem/JKernel/JKRExpHeap.h" -#include "JSystem/JKernel/JKRSolidHeap.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "SSystem/SComponent/c_xyz.h" +#include "Z2AudioLib/Z2SoundObject.h" +#include "dolphin/gx/GXStruct.h" #include "global.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_mtx.h" +class JKRArchive; +class JKRAssertHeap; +class JKRExpHeap; +class JKRHeap; +class JKRSolidHeap; +struct ResTIMG; +class Z2Creature; + class mDoExt_baseAnm { public: mDoExt_baseAnm() {} diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index 71d79aa0e0e..68ebab896b2 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -2,10 +2,12 @@ #define M_DO_M_DO_GRAPHIC_H #include "JSystem/JFramework/JFWDisplay.h" -#include "JSystem/JUtility/JUTFader.h" -#include "dolphin/gx/GX.h" +#include "dolphin/gx/GXStruct.h" +#include "dolphin/mtx/mtx.h" #include "dolphin/types.h" +class JUTFader; + int mDoGph_Create(); extern u8 mBlureFlag__13mDoGph_gInf_c; // Blure diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h index b64756a2198..42b303bee32 100644 --- a/include/m_Do/m_Do_lib.h +++ b/include/m_Do/m_Do_lib.h @@ -3,7 +3,11 @@ #include "JSystem/J3DU/J3DUClipper.h" #include "dolphin/types.h" -#include "JSystem/JUtility/JUTTexture.h" + +typedef struct _GXTexObj GXTexObj; +typedef struct _GXTlutObj GXTlutObj; +typedef struct Vec Vec; +struct ResTIMG; struct mDoLib_clipper { /* 8001528C */ void setup(f32, f32, f32, f32); diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h index 88cf77a4eb0..cbdcdb7d6fe 100644 --- a/include/m_Do/m_Do_machine.h +++ b/include/m_Do/m_Do_machine.h @@ -1,12 +1,11 @@ #ifndef M_DO_M_DO_MACHINE_H #define M_DO_M_DO_MACHINE_H -#include "JSystem/JUtility/JUTConsole.h" -#include "JSystem/JUtility/JUTGamePad.h" -#include "JSystem/JUtility/JUTVideo.h" +#include "dolphin/gx/GXStruct.h" #include "dolphin/types.h" -#include "m_Do/m_Do_Reset.h" -#include "m_Do/m_Do_main.h" + +typedef struct OSContext OSContext; +class JKRHeap; void myHeapCheckRecursive(JKRHeap*); BOOL mDoMch_IsProgressiveMode(); diff --git a/include/m_Do/m_Do_machine_exception.h b/include/m_Do/m_Do_machine_exception.h index 6d81404a7c1..1c98c7980ef 100644 --- a/include/m_Do/m_Do_machine_exception.h +++ b/include/m_Do/m_Do_machine_exception.h @@ -2,7 +2,6 @@ #define M_DO_M_DO_MACHINE_EXCEPTION_H #include "dolphin/types.h" -#include "dolphin/gx/GX.h" struct JUTConsole; diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index 83cd8645a0d..81b89b31bf0 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -2,9 +2,11 @@ #define M_DO_M_DO_MAIN_H #include "JSystem/JKernel/JKRExpHeap.h" -#include "dolphin/dvd/dvd.h" +#include "dolphin/os/OSTime.h" #include "dolphin/types.h" +class JKRExpHeap; + void version_check(); s32 LOAD_COPYDATE(void*); diff --git a/include/msg/scrn/d_msg_scrn_base.h b/include/msg/scrn/d_msg_scrn_base.h index c4a6d36dea8..9081f33fea9 100644 --- a/include/msg/scrn/d_msg_scrn_base.h +++ b/include/msg/scrn/d_msg_scrn_base.h @@ -1,9 +1,11 @@ #ifndef MSG_SCRN_D_MSG_SCRN_BASE_H #define MSG_SCRN_D_MSG_SCRN_BASE_H -#include "d/msg/d_msg_out_font.h" -#include "d/com/d_com_inf_game.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "d/d_drawlist.h" +class COutFont_c; +class CPaneMgr; struct CharInfo_c; class dMsgScrnBase_c : public dDlst_base_c { diff --git a/include/msg/scrn/d_msg_scrn_explain.h b/include/msg/scrn/d_msg_scrn_explain.h index ea0b2c2e0be..216e7004afb 100644 --- a/include/msg/scrn/d_msg_scrn_explain.h +++ b/include/msg/scrn/d_msg_scrn_explain.h @@ -2,10 +2,12 @@ #define MSG_SCRN_D_MSG_SCRN_EXPLAIN_H #include "msg/scrn/d_msg_scrn_base.h" -#include "JSystem/J2DGraph/J2DOrthoGraph.h" +class J2DOrthoGraph; +struct STControl; class dMsgScrnArrow_c; class dMsgScrn3Select_c; +class dMsgString_c; class dMsgScrnExplain_c { public: diff --git a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h index d00d3ce40ca..fde7bd69168 100644 --- a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h +++ b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h @@ -1,6 +1,7 @@ #ifndef D_A_B_OB_H #define D_A_B_OB_H +#include "Z2AudioLib/Z2Creature.h" #include "d/cc/d_cc_uty.h" #include "d/com/d_com_inf_game.h" diff --git a/include/rel/d/a/d_a_arrow/d_a_arrow.h b/include/rel/d/a/d_a_arrow/d_a_arrow.h index 31d7392100d..ab04bdf1cd0 100644 --- a/include/rel/d/a/d_a_arrow/d_a_arrow.h +++ b/include/rel/d/a/d_a_arrow/d_a_arrow.h @@ -1,12 +1,13 @@ #ifndef D_A_ARROW_H #define D_A_ARROW_H -#include "f_op/f_op_actor_mng.h" +#include "d/a/d_a_player.h" #include "d/d_procname.h" #include "d/cc/d_cc_d.h" #include "d/bg/d_bg_s_acch.h" #include "d/bg/d_bg_s_lin_chk.h" #include "d/particle/d_particle.h" +#include "f_op/f_op_actor_mng.h" class daArrow_c : public fopAc_ac_c { public: diff --git a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h index 93e99f73015..63cf4daeb9f 100644 --- a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h +++ b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h @@ -4,6 +4,7 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "Z2AudioLib/Z2SoundObject.h" #include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s_lin_chk.h" #include "d/cc/d_cc_d.h" #include "d/particle/d_particle_copoly.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/rel/d/a/d_a_cstaF/d_a_cstaF.h b/include/rel/d/a/d_a_cstaF/d_a_cstaF.h index 4ae90e62719..bbd183c09b8 100644 --- a/include/rel/d/a/d_a_cstaF/d_a_cstaF.h +++ b/include/rel/d/a/d_a_cstaF/d_a_cstaF.h @@ -1,8 +1,10 @@ #ifndef D_A_CSTAF_H #define D_A_CSTAF_H +#include "Z2AudioLib/Z2Creature.h" #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +#include "d/particle/d_particle_copoly.h" class daCstaF_c : public dBgS_MoveBgActor { public: diff --git a/include/rel/d/a/d_a_cstatue/d_a_cstatue.h b/include/rel/d/a/d_a_cstatue/d_a_cstatue.h index 8b0135832a6..3533acc1ce4 100644 --- a/include/rel/d/a/d_a_cstatue/d_a_cstatue.h +++ b/include/rel/d/a/d_a_cstatue/d_a_cstatue.h @@ -2,6 +2,7 @@ #define D_A_CSTATUE_H #include "SSystem/SComponent/c_phase.h" +#include "Z2AudioLib/Z2Creature.h" #include "d/bg/d_bg_s_acch.h" #include "d/cc/d_cc_d.h" #include "d/particle/d_particle_copoly.h" diff --git a/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h b/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h index 46e91138191..282cbc655b2 100644 --- a/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h +++ b/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h @@ -1,9 +1,11 @@ #ifndef D_A_GUARD_MNG_H #define D_A_GUARD_MNG_H +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h" -#include "d/com/d_com_inf_game.h" class daGuardMng_c : public fopAc_ac_c { public: diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h index 4252b18e89a..757eae29300 100644 --- a/include/rel/d/a/d_a_horse/d_a_horse.h +++ b/include/rel/d/a/d_a_horse/d_a_horse.h @@ -2,7 +2,10 @@ #define D_A_HORSE_H #include "Z2AudioLib/Z2Creature.h" +#include "d/a/d_a_player.h" #include "d/bg/d_bg_s.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/bg/d_bg_s_lin_chk.h" #include "d/cc/d_cc_d.h" #include "d/msg/d_msg_flow.h" #include "dolphin/types.h" diff --git a/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h b/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h index 48fe2419d4d..06636391306 100644 --- a/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h +++ b/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h @@ -3,6 +3,8 @@ #include "d/com/d_com_inf_game.h" +class dMeterButton_c; + class daSkip2D_c : public fopAc_ac_c { public: daSkip2D_c() { diff --git a/include/rel/d/a/d_a_spinner/d_a_spinner.h b/include/rel/d/a/d_a_spinner/d_a_spinner.h index f139147ad6e..31f85cc4041 100644 --- a/include/rel/d/a/d_a_spinner/d_a_spinner.h +++ b/include/rel/d/a/d_a_spinner/d_a_spinner.h @@ -2,6 +2,7 @@ #define D_A_SPINNER_H #include "d/com/d_com_inf_game.h" +#include "d/particle/d_particle_copoly.h" #include "dolphin/types.h" class daSpinner_c : public fopAc_ac_c { diff --git a/include/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.h b/include/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.h index 6aecd69f91e..a533ea51cfd 100644 --- a/include/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.h +++ b/include/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.h @@ -1,6 +1,16 @@ #ifndef D_A_E_DB_LEAF_H #define D_A_E_DB_LEAF_H +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" +#include "d/kankyo/d_kankyo.h" +#include "d/d_resorce.h" #include "dolphin/types.h" -#endif /* D_A_E_DB_LEAF_H */ +class e_db_leaf_class : public fopEn_enemy_c { +public: + /* 0x5AC */ request_of_phase_process_class mPhase; + /* 0x5B4 */ mDoExt_McaMorf* mpMorf; +}; // Size: 0x5B8 + +#endif /* D_A_E_DB_LEAF_H */ \ No newline at end of file diff --git a/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h b/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h index be52d7f2cdb..9271288722a 100644 --- a/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h +++ b/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h @@ -1,6 +1,7 @@ #ifndef D_A_E_YK_H #define D_A_E_YK_H +#include "Z2AudioLib/Z2Creature.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" diff --git a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h index 75ae6fd4165..16ae6f87915 100644 --- a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h +++ b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h @@ -1,6 +1,7 @@ #ifndef D_A_E_YM_H #define D_A_E_YM_H +#include "Z2AudioLib/Z2Creature.h" #include "d/cc/d_cc_uty.h" #include "d/com/d_com_inf_game.h" diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h index 9e225e4156a..47be9da007f 100644 --- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h +++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h @@ -5,6 +5,7 @@ #include "d/bg/d_bg_s_acch.h" #include "d/cc/d_cc_d.h" #include "dolphin/types.h" +#include "f_op/f_op_actor.h" class daObjCarry_c : public fopAc_ac_c { public: diff --git a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h index eafbdabf4c1..6bca7f11251 100644 --- a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h +++ b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h @@ -3,6 +3,7 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" class daObjBoard_c : public dBgS_MoveBgActor { public: diff --git a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h index 7f65865c113..ea7fd6691fe 100644 --- a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h +++ b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h @@ -3,6 +3,7 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" class daObjMGate_c : public dBgS_MoveBgActor { public: diff --git a/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h b/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h index fa880eb032c..1d55238d527 100644 --- a/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h +++ b/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h @@ -3,6 +3,7 @@ #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" enum { OBJ_STONE_TYPE_SMALL = 0, diff --git a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h index 45b4e09a2f6..d9d77a8fbff 100644 --- a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h +++ b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h @@ -2,6 +2,7 @@ #define D_A_OBJ_YOBIKUSA_H #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" class daObjYobikusa_c; typedef void (daObjYobikusa_c::*actionFunc)(); diff --git a/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h b/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h index e6992306e6d..ae36097347a 100644 --- a/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h +++ b/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h @@ -2,6 +2,7 @@ #define D_A_TAG_CSTASW_H #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" class daTagCstaSw_c : public fopAc_ac_c { diff --git a/include/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h b/include/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h index 9101c69d51f..cf10cb8a614 100644 --- a/include/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h +++ b/include/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h @@ -1,6 +1,7 @@ #ifndef D_A_TAG_ARENA_H #define D_A_TAG_ARENA_H +#include "JSystem/JKernel/JKRHeap.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h b/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h index 977192f2f6c..b315862a41a 100644 --- a/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h +++ b/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h @@ -1,6 +1,7 @@ #ifndef D_A_TAG_ASSISTANCE_H #define D_A_TAG_ASSISTANCE_H +#include "JSystem/JKernel/JKRHeap.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" diff --git a/include/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h b/include/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h index 07d779bb38b..ca7fd78312e 100644 --- a/include/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h +++ b/include/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h @@ -1,6 +1,7 @@ #ifndef D_A_TAG_GRA_H #define D_A_TAG_GRA_H +#include "JSystem/JKernel/JKRHeap.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" diff --git a/include/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h b/include/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h index 9cca8d66cd7..e77161af760 100644 --- a/include/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h +++ b/include/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h @@ -1,9 +1,8 @@ #ifndef D_A_TAG_HOWL_H #define D_A_TAG_HOWL_H -#include "d/com/d_com_inf_game.h" #include "d/d_procname.h" -#include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_actor.h" class daTag_Howl_c : public fopAc_ac_c { public: diff --git a/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h b/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h index eea9d27198d..feadc9bc727 100644 --- a/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h +++ b/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h @@ -3,6 +3,8 @@ #include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_flow.h" + class daTag_Lantern_c : public fopAc_ac_c { public: /* 8048ED28 */ int create(); diff --git a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h index 9f0dda433de..620595d744b 100644 --- a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h +++ b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h @@ -2,6 +2,7 @@ #define D_A_TAG_LV6CSTASW_H #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" class daLv6CstaSw_c : public fopAc_ac_c { diff --git a/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h b/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h index 675ce7214c6..4f878774709 100644 --- a/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h +++ b/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h @@ -1,9 +1,8 @@ #ifndef D_A_TAG_MMSG_H #define D_A_TAG_MMSG_H -#include "d/a/d_a_player.h" #include "dolphin/types.h" -#include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_actor.h" class daTagMmsg_c : public fopAc_ac_c { public: diff --git a/include/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.h b/include/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.h index 71ef44e72cf..4fc704f4297 100644 --- a/include/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.h +++ b/include/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.h @@ -1,6 +1,7 @@ #ifndef D_A_TAG_SCHEDULE_H #define D_A_TAG_SCHEDULE_H +#include "JSystem/JKernel/JKRHeap.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h b/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h index 90604ff928a..8b2973bf39b 100644 --- a/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h +++ b/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h @@ -2,6 +2,7 @@ #define D_A_TAG_SPRING_H #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" class daTagSpring_c : public fopAc_ac_c { public: diff --git a/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h b/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h index 5e03effb424..e4266706787 100644 --- a/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h +++ b/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h @@ -2,7 +2,10 @@ #define D_A_TAG_THEB_HINT_H // #include "rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" // needs to be pulled from d_a_npc_theB.h eventually struct daNpcTheB_c { diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp index 717ce664cf5..82ca1aadcdd 100644 --- a/libs/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp @@ -5,9 +5,12 @@ #include "JSystem/J2DGraph/J2DAnimation.h" #include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J3DGraphBase/J3DTexture.h" #include "JSystem/J3DGraphBase/J3DTransform.h" +#include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTResource.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" f32 J2DGetKeyFrameInterpolationf(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2); diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp index 7e95632fe36..10f2a10e684 100644 --- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp @@ -6,6 +6,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "MSL_C/math.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp index 60318ed15c8..6c26035dd55 100644 --- a/libs/JSystem/J2DGraph/J2DManage.cpp +++ b/libs/JSystem/J2DGraph/J2DManage.cpp @@ -4,6 +4,7 @@ // #include "JSystem/J2DGraph/J2DManage.h" +#include "JSystem/JSupport/JSUInputStream.h" #include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp index 1268d8e9abd..a8a158593ba 100644 --- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp @@ -4,7 +4,11 @@ // #include "JSystem/J2DGraph/J2DMatBlock.h" +#include "JSystem/JUtility/JUTPalette.h" +#include "JSystem/JUtility/JUTResFont.h" +#include "JSystem/JUtility/JUTTexture.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp index 3f53cb4c92c..a712ba9f124 100644 --- a/libs/JSystem/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp @@ -4,6 +4,8 @@ // #include "JSystem/J2DGraph/J2DMaterial.h" +#include "JSystem/J3DGraphAnimator/J3DAnimation.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp index ae5007d1cb0..ab65ee3cb44 100644 --- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -4,6 +4,8 @@ // #include "JSystem/J2DGraph/J2DMaterialFactory.h" +#include "JSystem/J2DGraph/J2DMaterial.h" +#include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp index 6c68036445e..16c56f64369 100644 --- a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp +++ b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp @@ -5,6 +5,8 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" +#include "dolphin/mtx/mtx44.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index caf72f13b48..460a2b13610 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -4,12 +4,17 @@ // #include "JSystem/J2DGraph/J2DPane.h" +#include "JSystem/J2DGraph/J2DAnimation.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DManage.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J3DGraphBase/J3DTransform.h" +#include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTResource.h" +#include "MSL_C/math.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" /* 802F5BF8-802F5CB8 2F0538 00C0+00 0/0 10/10 0/0 .text __ct__7J2DPaneFv */ diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp index 3e3a0ec79be..d0b1fd80e2c 100644 --- a/libs/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/J2DGraph/J2DPicture.cpp @@ -4,7 +4,10 @@ // #include "JSystem/J2DGraph/J2DPicture.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JUtility/JUTTexture.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp index 62123db41a8..0d7c82d8af8 100644 --- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp @@ -4,6 +4,9 @@ // #include "JSystem/J2DGraph/J2DPictureEx.h" +#include "JSystem/J2DGraph/J2DMaterial.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/JUTTexture.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp index dea6720967f..a2f63fa488c 100644 --- a/libs/JSystem/J2DGraph/J2DPrint.cpp +++ b/libs/JSystem/J2DGraph/J2DPrint.cpp @@ -4,10 +4,13 @@ // #include "JSystem/J2DGraph/J2DPrint.h" +#include "JSystem/JKernel/JKRHeap.h" #include "MSL_C/stdio.h" #include "MSL_C/stdlib.h" +#include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index 55e337eb99d..a9ef614b2e8 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -4,15 +4,19 @@ // #include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DMaterial.h" #include "JSystem/J2DGraph/J2DMaterialFactory.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPictureEx.h" #include "JSystem/J2DGraph/J2DTextBoxEx.h" #include "JSystem/J2DGraph/J2DWindowEx.h" #include "JSystem/JGeometry.h" +#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUMemoryStream.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index 10fdc197961..39d44594b52 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -4,8 +4,12 @@ // #include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/J2DGraph/J2DMaterial.h" #include "JSystem/J2DGraph/J2DPrint.h" +#include "JSystem/JSupport/JSURandomInputStream.h" +#include "JSystem/JUtility/JUTResFont.h" #include "MSL_C/string.h" +#include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp index 01a50b67767..25da723acc2 100644 --- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp @@ -4,6 +4,10 @@ // #include "JSystem/J2DGraph/J2DTextBoxEx.h" +#include "JSystem/J2DGraph/J2DMaterial.h" +#include "JSystem/J2DGraph/J2DPrint.h" +#include "JSystem/JSupport/JSURandomInputStream.h" +#include "JSystem/JUtility/JUTResFont.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp index d9a14fcc3b0..36b5091a82e 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -6,6 +6,7 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp index bf80c155d30..755abb18e51 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp @@ -8,8 +8,8 @@ #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" -#include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/JMath/JMath.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp index e757921fe42..31d54c4eaa4 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp @@ -6,6 +6,7 @@ #include "JSystem/J3DGraphAnimator/J3DJointTree.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" #include "JSystem/J3DGraphAnimator/J3DShapeTable.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp index 6dd85ccf63e..a29408c8cdc 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp @@ -1,6 +1,8 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp index ba46fd03728..8857e8e6157 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp @@ -5,6 +5,7 @@ #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DTevs.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp index f717c07639b..286bc5eb51c 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp @@ -5,9 +5,10 @@ #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DTransform.h" #include "dol2asm.h" -#include "dolphin/os/OSCache.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp b/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp index 9bf2bea95ea..30276017dc6 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp @@ -5,6 +5,7 @@ #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "dol2asm.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" diff --git a/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp index 2ad0f1fdd29..5e069c6b0a4 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp @@ -6,8 +6,8 @@ #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h" #include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" +#include "dolphin/mtx/mtx.h" #include "dolphin/types.h" -#include "mtx/mtx.h" // // Forward References: diff --git a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index f4e4df32c48..5d490d31287 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -5,6 +5,7 @@ #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp index 9a5324feae5..d98e1baf0bf 100644 --- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -5,6 +5,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index 87770b6c210..561cf053914 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -16,6 +16,7 @@ #include "dol2asm.h" #include "dolphin/gx/GX.h" #include "dolphin/os/OSCache.h" +#include "dolphin/os/OSInterrupt.h" #include "dolphin/types.h" #include "global.h" diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp index 64f0bb02ae2..a0f40763855 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -10,6 +10,7 @@ #include "dolphin/gx/GX.h" #include "dolphin/os/OSCache.h" #include "dolphin/types.h" +#include "global.h" // // External References: diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp index 2b326a72b07..8ce7f165652 100644 --- a/libs/JSystem/J3DGraphBase/J3DSys.cpp +++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp @@ -9,6 +9,7 @@ #include "dolphin/gx/GXPixel.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "global.h" #include "JSystem/J3DGraphBase/J3DTevs.h" diff --git a/libs/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/J3DGraphBase/J3DTexture.cpp index cf575daf32c..19e5d19aff5 100644 --- a/libs/JSystem/J3DGraphBase/J3DTexture.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTexture.cpp @@ -5,6 +5,7 @@ #include "JSystem/J3DGraphBase/J3DTexture.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" /* 8031204C-803121A4 30C98C 0158+00 0/0 1/1 0/0 .text loadGX__10J3DTextureCFUs11_GXTexMapID */ diff --git a/libs/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/J3DGraphBase/J3DVertex.cpp index 6d3e4e4ba57..65634b9acc6 100644 --- a/libs/JSystem/J3DGraphBase/J3DVertex.cpp +++ b/libs/JSystem/J3DGraphBase/J3DVertex.cpp @@ -11,6 +11,7 @@ #include "dol2asm.h" #include "dolphin/os/OSCache.h" #include "dolphin/types.h" +#include "global.h" #include "init.h" /* 80310EF8-80310F78 30B838 0080+00 0/0 1/1 0/0 .text __ct__13J3DVertexDataFv */ diff --git a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 4bac4d20813..c332c292d5a 100644 --- a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -5,6 +5,7 @@ #include "JSystem/J3DGraphLoader/J3DClusterLoader.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // @@ -58,7 +59,6 @@ extern "C" extern char const* const J3DClusterLoader__stringBase0; // SECTION_INIT void memcpy(); -extern "C" void OSReport(); extern "C" void* __nw__FUl(); extern "C" void* __nwa__FUl(); extern "C" void* __nwa__FUli(); @@ -69,7 +69,6 @@ extern "C" void func_8030A530(void* _this, void const*, void const*); extern "C" void func_8030A560(void* _this, void const*, void const*); extern "C" void __ct__13J3DDeformDataFv(); extern "C" void __ct__11J3DDeformerFP13J3DDeformData(); -extern "C" void DCStoreRange(); extern "C" void _savegpr_23(); extern "C" void _savegpr_26(); extern "C" void _restgpr_23(); diff --git a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index 15bd72207ec..5bb9d9f836b 100644 --- a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -8,6 +8,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSupport.h" #include "dolphin/os/OS.h" +#include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/JAudio2/JAISound.cpp index 30fe31e204e..2d6b1fc82d2 100644 --- a/libs/JSystem/JAudio2/JAISound.cpp +++ b/libs/JSystem/JAudio2/JAISound.cpp @@ -4,10 +4,14 @@ // #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JAIAudible.h" +#include "JSystem/JAudio2/JAIAudience.h" +#include "JSystem/JAudio2/JAISoundHandles.h" #include "JSystem/JAudio2/JASReport.h" #include "JSystem/JAudio2/JASTrack.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JAudio2/JAISoundChild.cpp b/libs/JSystem/JAudio2/JAISoundChild.cpp index 2766156808a..c45be5fbbf3 100644 --- a/libs/JSystem/JAudio2/JAISoundChild.cpp +++ b/libs/JSystem/JAudio2/JAISoundChild.cpp @@ -1,4 +1,5 @@ #include "JSystem/JAudio2/JAISoundChild.h" +#include "JSystem/JAudio2/JASTrack.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JAudio2/JASAudioReseter.cpp b/libs/JSystem/JAudio2/JASAudioReseter.cpp index fb081b4627d..30af7e31cc0 100644 --- a/libs/JSystem/JAudio2/JASAudioReseter.cpp +++ b/libs/JSystem/JAudio2/JASAudioReseter.cpp @@ -4,12 +4,12 @@ // #include "JSystem/JAudio2/JASAudioReseter.h" -#include "dol2asm.h" -#include "dolphin/os/OS.h" -#include "dolphin/types.h" #include "JSystem/JAudio2/JAISoundHandles.h" -#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JAudio2/JASAudioThread.h" +#include "JSystem/JAudio2/JASDriverIF.h" +#include "JSystem/JAudio2/JASGadget.h" +#include "dol2asm.h" +#include "dolphin/types.h" // // Types: diff --git a/libs/JSystem/JAudio2/JASDvdThread.cpp b/libs/JSystem/JAudio2/JASDvdThread.cpp index c73bd6c63ff..d3be1880b41 100644 --- a/libs/JSystem/JAudio2/JASDvdThread.cpp +++ b/libs/JSystem/JAudio2/JASDvdThread.cpp @@ -5,6 +5,7 @@ #include "JSystem/JAudio2/JASDvdThread.h" #include "dol2asm.h" +#include "dolphin/os/OSThread.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JAudio2/JASResArcLoader.cpp b/libs/JSystem/JAudio2/JASResArcLoader.cpp index 22ce0d1ca6e..5d30fcf444c 100644 --- a/libs/JSystem/JAudio2/JASResArcLoader.cpp +++ b/libs/JSystem/JAudio2/JASResArcLoader.cpp @@ -5,6 +5,8 @@ #include "JSystem/JAudio2/JASResArcLoader.h" #include "JSystem/JAudio2/JASDvdThread.h" +#include "JSystem/JAudio2/JASTaskThread.h" +#include "JSystem/JKernel/JKRArchive.h" /* 80290BD0-80290C04 28B510 0034+00 0/0 2/2 0/0 .text diff --git a/libs/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/JAudio2/JASTaskThread.cpp index 87fc196a3b2..471cd4f5827 100644 --- a/libs/JSystem/JAudio2/JASTaskThread.cpp +++ b/libs/JSystem/JAudio2/JASTaskThread.cpp @@ -5,6 +5,7 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "dol2asm.h" +#include "dolphin/os/OSInterrupt.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp index 5d6d4325d16..bf6104c7804 100644 --- a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -4,7 +4,12 @@ // #include "JSystem/JAudio2/JASWaveArcLoader.h" +#include "JSystem/JAudio2/JASDvdThread.h" +#include "JSystem/JAudio2/JASTaskThread.h" +#include "JSystem/JKernel/JKRDvdAramRipper.h" #include "MSL_C/string.h" +#include "dolphin/dvd/dvd.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index 12ff3f2eab2..1a08f016674 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -8,8 +8,11 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" +#include "JSystem/JUtility/JUTProcBar.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/mtx/mtx44.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp index d2197be068b..cd20c2e8da1 100644 --- a/libs/JSystem/JFramework/JFWSystem.cpp +++ b/libs/JSystem/JFramework/JFWSystem.cpp @@ -5,7 +5,9 @@ #include "JSystem/JFramework/JFWSystem.h" #include "JSystem/JKernel/JKRAram.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTGamePad.h" diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index 3d0f0e70f3f..46682e96266 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -8,11 +8,14 @@ #include "JSystem/JKernel/JKRAramHeap.h" #include "JSystem/JKernel/JKRAramPiece.h" #include "JSystem/JKernel/JKRAramStream.h" +#include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTException.h" #include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/ar/ar.h" +#include "dolphin/os/OSCache.h" +#include "dolphin/os/OSInterrupt.h" #include "global.h" // diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index 5b2cb23561c..d0a71b1d93d 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -7,12 +7,13 @@ #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" #include "JSystem/JKernel/JKRDvdRipper.h" -#include "JSystem/JKernel/JKRFile.h" +#include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTException.h" #include "MSL_C/math.h" #include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/JKernel/JKRAramHeap.cpp index 8adf0080c24..2d24b88454b 100644 --- a/libs/JSystem/JKernel/JKRAramHeap.cpp +++ b/libs/JSystem/JKernel/JKRAramHeap.cpp @@ -5,6 +5,7 @@ #include "JSystem/JKernel/JKRAramHeap.h" #include "JSystem/JKernel/JKRHeap.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp index 4be2fc66ae7..00fb68a072b 100644 --- a/libs/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/JKernel/JKRAramPiece.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTException.h" -#include "dolphin/os/OSCache.h" +#include "dolphin/os/OS.h" /* 802D3574-802D35F4 2CDEB4 0080+00 1/1 0/0 0/0 .text * prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v */ diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index 84487235137..54ddbc9fa47 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -9,6 +9,7 @@ #include "JSystem/JSupport/JSUFileStream.h" #include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTException.h" +#include "global.h" /* ############################################################################################## */ /* 80451408-8045140C 000908 0004+00 1/1 0/0 0/0 .sbss sAramStreamObject__13JKRAramStream diff --git a/libs/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp index 7743207cce3..f628372fd5d 100644 --- a/libs/JSystem/JKernel/JKRArchivePri.cpp +++ b/libs/JSystem/JKernel/JKRArchivePri.cpp @@ -7,6 +7,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "MSL_C/MSL_Common/Src/ctype.h" #include "MSL_C/string.h" +#include "global.h" /* ############################################################################################## */ /* 80451420-80451428 000920 0004+04 1/1 5/5 0/0 .sbss sCurrentDirID__10JKRArchive */ diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp index 9626f9eed34..bb6cca7d1ed 100644 --- a/libs/JSystem/JKernel/JKRCompArchive.cpp +++ b/libs/JSystem/JKernel/JKRCompArchive.cpp @@ -7,11 +7,13 @@ #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" #include "JSystem/JKernel/JKRDvdArchive.h" +#include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTException.h" #include "MSL_C/math.h" #include "MSL_C/string.h" #include "dol2asm.h" +#include "dolphin/os/OSCache.h" // // Forward References: diff --git a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp index aa0375b7aa4..0b3fa6ecf7d 100644 --- a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -8,9 +8,9 @@ #include "JSystem/JKernel/JKRAramStream.h" #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JSupport/JSUFileStream.h" -#include "JSystem/JSupport/JSUList.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" +#include "dolphin/os/OSInterrupt.h" #include "dolphin/vi/vi.h" #include "global.h" diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp index aedca6c4efd..9351e97929f 100644 --- a/libs/JSystem/JKernel/JKRDvdFile.cpp +++ b/libs/JSystem/JKernel/JKRDvdFile.cpp @@ -7,7 +7,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" #include "dol2asm.h" -#include "global.h" /* 8043436C-80434378 06108C 000C+00 4/4 0/0 0/0 .bss sDvdList__10JKRDvdFile */ JSUList JKRDvdFile::sDvdList; diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp index 59fa399fd1c..20a1be97ed1 100644 --- a/libs/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp @@ -9,6 +9,7 @@ #include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/os/OSCache.h" +#include "dolphin/os/OSInterrupt.h" #include "global.h" // diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index edc5fd935a0..2f438e54144 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -6,6 +6,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" +#include "dolphin/os/OS.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index c4c3edf3339..48df23e5cb4 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -4,11 +4,14 @@ // #include "JSystem/JKernel/JKRMemArchive.h" +#include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTException.h" #include "MSL_C/string.h" #include "dol2asm.h" +#include "dolphin/os/OSCache.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/JMath/JMATrigonometric.cpp index 88c107cb145..f504e659cf8 100644 --- a/libs/JSystem/JMath/JMATrigonometric.cpp +++ b/libs/JSystem/JMath/JMATrigonometric.cpp @@ -7,6 +7,7 @@ // #include "JSystem/JMath/JMATrigonometric.h" #include "MSL_C/math.h" #include "dol2asm.h" +#include "dolphin/types.h" #include "global.h" namespace std { diff --git a/libs/JSystem/JParticle/JPABaseShape.cpp b/libs/JSystem/JParticle/JPABaseShape.cpp index 7f385824f9b..6e72ee6e3ab 100644 --- a/libs/JSystem/JParticle/JPABaseShape.cpp +++ b/libs/JSystem/JParticle/JPABaseShape.cpp @@ -9,6 +9,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "dolphin/mtx/mtxvec.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/JParticle/JPAChildShape.cpp index 43044dd4add..1b3e183cf9a 100644 --- a/libs/JSystem/JParticle/JPAChildShape.cpp +++ b/libs/JSystem/JParticle/JPAChildShape.cpp @@ -6,6 +6,7 @@ #include "JSystem/JParticle/JPAChildShape.h" #include "JSystem/JParticle/JPAParticle.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/JParticle/JPAEmitterManager.cpp index bf11dba204e..0d1b1ff76fa 100644 --- a/libs/JSystem/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/JParticle/JPAEmitterManager.cpp @@ -8,6 +8,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JParticle/JPAExTexShape.cpp b/libs/JSystem/JParticle/JPAExTexShape.cpp index 5f5cfc414da..8371457d583 100644 --- a/libs/JSystem/JParticle/JPAExTexShape.cpp +++ b/libs/JSystem/JParticle/JPAExTexShape.cpp @@ -8,6 +8,7 @@ #include "JSystem/JParticle/JPAResource.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" /* 8027B040-8027B13C 275980 00FC+00 0/0 1/1 0/0 .text JPALoadExTex__FP18JPAEmitterWorkData */ diff --git a/libs/JSystem/JParticle/JPAExtraShape.cpp b/libs/JSystem/JParticle/JPAExtraShape.cpp index 9d08e8ccf7f..9f22d5d8687 100644 --- a/libs/JSystem/JParticle/JPAExtraShape.cpp +++ b/libs/JSystem/JParticle/JPAExtraShape.cpp @@ -9,6 +9,7 @@ #include "JSystem/JParticle/JPAResource.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp index d9430992d68..5e65f60201a 100644 --- a/libs/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/JParticle/JPAResource.cpp @@ -8,6 +8,7 @@ #include "JSystem/JParticle/JPAMath.h" #include "JSystem/JParticle/JPAParticle.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/mtx/mtx.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" diff --git a/libs/JSystem/JStudio/JStudio/functionvalue-inline.cpp b/libs/JSystem/JStudio/JStudio/functionvalue-inline.cpp index 6d1f9665eb6..d350b549dd6 100644 --- a/libs/JSystem/JStudio/JStudio/functionvalue-inline.cpp +++ b/libs/JSystem/JStudio/JStudio/functionvalue-inline.cpp @@ -1,5 +1,4 @@ #include "JSystem/JStudio/JStudio/functionvalue.h" -#include "global.h" namespace std { template diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp index d51fd487fa0..6efec2e5b1b 100644 --- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp @@ -9,6 +9,7 @@ #include "MSL_C/stdlib.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Types: diff --git a/libs/JSystem/JStudio/JStudio/fvb.cpp b/libs/JSystem/JStudio/JStudio/fvb.cpp index c7c256244ff..19d4fa8355f 100644 --- a/libs/JSystem/JStudio/JStudio/fvb.cpp +++ b/libs/JSystem/JStudio/JStudio/fvb.cpp @@ -7,6 +7,7 @@ #include "JSystem/JUtility/JUTException.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Types: diff --git a/libs/JSystem/JStudio/JStudio/stb.cpp b/libs/JSystem/JStudio/JStudio/stb.cpp index 38af2c2c3a3..05552f38bc9 100644 --- a/libs/JSystem/JStudio/JStudio/stb.cpp +++ b/libs/JSystem/JStudio/JStudio/stb.cpp @@ -2,6 +2,7 @@ #include "JSystem/JUtility/JUTException.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Types: diff --git a/libs/JSystem/JSupport/JSUFileStream.cpp b/libs/JSystem/JSupport/JSUFileStream.cpp index afd5e3316e7..42790bb45f5 100644 --- a/libs/JSystem/JSupport/JSUFileStream.cpp +++ b/libs/JSystem/JSupport/JSUFileStream.cpp @@ -4,6 +4,7 @@ // #include "JSystem/JSupport/JSUFileStream.h" +#include "JSystem/JKernel/JKRFile.h" /* 802DC638-802DC67C 2D6F78 0044+00 0/0 1/1 0/0 .text __ct__18JSUFileInputStreamFP7JKRFile */ JSUFileInputStream::JSUFileInputStream(JKRFile* pFile) { diff --git a/libs/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/JUtility/JUTCacheFont.cpp index 4cde5591b52..1130e67295a 100644 --- a/libs/JSystem/JUtility/JUTCacheFont.cpp +++ b/libs/JSystem/JUtility/JUTCacheFont.cpp @@ -4,8 +4,10 @@ // #include "JSystem/JUtility/JUTCacheFont.h" +#include "JSystem/JKernel/JKRAram.h" #include "JSystem/JUtility/JUTException.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" // // Forward References: diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index dea05eb4dc4..87ff86d2df3 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -10,6 +10,7 @@ #include "JSystem/JUtility/JUTVideo.h" #include "MSL_C/stdio.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" // // Forward References: diff --git a/libs/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/JUtility/JUTDbPrint.cpp index fc03e639a37..e2107cf463f 100644 --- a/libs/JSystem/JUtility/JUTDbPrint.cpp +++ b/libs/JSystem/JUtility/JUTDbPrint.cpp @@ -5,8 +5,10 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" #include "MSL_C/stdio.h" +#include "Runtime.PPCEABI.H/__va_arg.h" /* 802E0148-802E0190 2DAA88 0048+00 1/1 0/0 0/0 .text __ct__10JUTDbPrintFP7JUTFontP7JKRHeap */ JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index 92f615b636e..0ef9d23ec6c 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -12,6 +12,8 @@ #include "MSL_C/stdlib.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index fc301086673..82f4370c4ec 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -6,6 +6,7 @@ #include "JSystem/JUtility/JUTGamePad.h" #include "MSL_C/math.h" #include "dol2asm.h" +#include "dolphin/os/OSResetSW.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JUtility/JUTPalette.cpp b/libs/JSystem/JUtility/JUTPalette.cpp index 6b1cd63333a..a85b2149cca 100644 --- a/libs/JSystem/JUtility/JUTPalette.cpp +++ b/libs/JSystem/JUtility/JUTPalette.cpp @@ -1,4 +1,5 @@ #include "JSystem/JUtility/JUTPalette.h" +#include "dolphin/gx/GX.h" #include "dolphin/os/OS.h" void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* tlut) { diff --git a/libs/JSystem/JUtility/JUTProcBar.cpp b/libs/JSystem/JUtility/JUTProcBar.cpp index 578b1351bf2..5b9cd001228 100644 --- a/libs/JSystem/JUtility/JUTProcBar.cpp +++ b/libs/JSystem/JUtility/JUTProcBar.cpp @@ -8,6 +8,7 @@ #include "JSystem/JUtility/JUTVideo.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp index e5786a53396..b8377e442c5 100644 --- a/libs/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/JUtility/JUTResFont.cpp @@ -4,6 +4,7 @@ // #include "JSystem/JUtility/JUTResFont.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTConsole.h" #include "dol2asm.h" #include "dolphin/gx/GX.h" diff --git a/libs/JSystem/JUtility/JUTTexture.cpp b/libs/JSystem/JUtility/JUTTexture.cpp index eb7e6e97ba2..5193f4c6302 100644 --- a/libs/JSystem/JUtility/JUTTexture.cpp +++ b/libs/JSystem/JUtility/JUTTexture.cpp @@ -4,7 +4,9 @@ // #include "JSystem/JUtility/JUTTexture.h" +#include "JSystem/JUtility/JUTPalette.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // diff --git a/libs/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTVideo.cpp index c1ae47ae00f..b6bd3b266ed 100644 --- a/libs/JSystem/JUtility/JUTVideo.cpp +++ b/libs/JSystem/JUtility/JUTVideo.cpp @@ -6,6 +6,7 @@ #include "JSystem/JUtility/JUTVideo.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTXfb.h" +#include "dolphin/gx/GX.h" #include "dolphin/vi/vi.h" /* 80451538-8045153C 000A38 0004+00 4/4 18/18 1/1 .sbss sManager__8JUTVideo */ diff --git a/libs/JSystem/JUtility/JUTXfb.cpp b/libs/JSystem/JUtility/JUTXfb.cpp index 8c71e430da0..dc058b03fb3 100644 --- a/libs/JSystem/JUtility/JUTXfb.cpp +++ b/libs/JSystem/JUtility/JUTXfb.cpp @@ -4,6 +4,7 @@ // #include "JSystem/JUtility/JUTXfb.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "dolphin/gx/GX.h" diff --git a/libs/SSystem/SComponent/c_list.cpp b/libs/SSystem/SComponent/c_list.cpp index f616f117780..f4a6b3d7ee2 100644 --- a/libs/SSystem/SComponent/c_list.cpp +++ b/libs/SSystem/SComponent/c_list.cpp @@ -4,6 +4,7 @@ // #include "SSystem/SComponent/c_list.h" +#include "SSystem/SComponent/c_node.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/SSystem/SComponent/c_list_iter.cpp b/libs/SSystem/SComponent/c_list_iter.cpp index 4e81bbc0ae2..bdf3eb28eb0 100644 --- a/libs/SSystem/SComponent/c_list_iter.cpp +++ b/libs/SSystem/SComponent/c_list_iter.cpp @@ -4,6 +4,7 @@ // #include "SSystem/SComponent/c_list_iter.h" +#include "SSystem/SComponent/c_list.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/SSystem/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp index 64308c6b2a0..c9c83afa104 100644 --- a/libs/SSystem/SComponent/c_m3d.cpp +++ b/libs/SSystem/SComponent/c_m3d.cpp @@ -16,6 +16,7 @@ #include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/libs/SSystem/SComponent/c_malloc.cpp b/libs/SSystem/SComponent/c_malloc.cpp index 9710456ab08..677238e18be 100644 --- a/libs/SSystem/SComponent/c_malloc.cpp +++ b/libs/SSystem/SComponent/c_malloc.cpp @@ -4,6 +4,7 @@ // #include "SSystem/SComponent/c_malloc.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/SSystem/SComponent/c_node_iter.cpp b/libs/SSystem/SComponent/c_node_iter.cpp index 979c33679f7..bc2474a9577 100644 --- a/libs/SSystem/SComponent/c_node_iter.cpp +++ b/libs/SSystem/SComponent/c_node_iter.cpp @@ -4,6 +4,7 @@ // #include "SSystem/SComponent/c_node_iter.h" +#include "SSystem/SComponent/c_node.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/SSystem/SComponent/c_tag.cpp b/libs/SSystem/SComponent/c_tag.cpp index 0244594f3be..2812e56bf97 100644 --- a/libs/SSystem/SComponent/c_tag.cpp +++ b/libs/SSystem/SComponent/c_tag.cpp @@ -4,6 +4,7 @@ // #include "SSystem/SComponent/c_tag.h" +#include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_tree.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/SSystem/SComponent/c_tag_iter.cpp b/libs/SSystem/SComponent/c_tag_iter.cpp index bf4310f6f33..f5e6ac61c59 100644 --- a/libs/SSystem/SComponent/c_tag_iter.cpp +++ b/libs/SSystem/SComponent/c_tag_iter.cpp @@ -4,6 +4,7 @@ // #include "SSystem/SComponent/c_tag_iter.h" +#include "SSystem/SComponent/c_tag.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/SSystem/SComponent/c_tree.cpp b/libs/SSystem/SComponent/c_tree.cpp index 67911c6d3b1..a490ee415c7 100644 --- a/libs/SSystem/SComponent/c_tree.cpp +++ b/libs/SSystem/SComponent/c_tree.cpp @@ -4,6 +4,7 @@ // #include "SSystem/SComponent/c_tree.h" +#include "SSystem/SComponent/c_list.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/SSystem/SComponent/c_tree_iter.cpp b/libs/SSystem/SComponent/c_tree_iter.cpp index a91a420661f..d7201fb71d0 100644 --- a/libs/SSystem/SComponent/c_tree_iter.cpp +++ b/libs/SSystem/SComponent/c_tree_iter.cpp @@ -4,7 +4,9 @@ // #include "SSystem/SComponent/c_tree_iter.h" +#include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_list_iter.h" +#include "SSystem/SComponent/c_tree.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/SSystem/SComponent/c_xyz.cpp b/libs/SSystem/SComponent/c_xyz.cpp index 084ec83ab33..d45d0c05155 100644 --- a/libs/SSystem/SComponent/c_xyz.cpp +++ b/libs/SSystem/SComponent/c_xyz.cpp @@ -7,7 +7,6 @@ #include "MSL_C/float.h" #include "SSystem/SComponent/c_math.h" #include "dol2asm.h" -#include "global.h" // // Declarations: diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index dc1b05f5807..f8c94024959 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -4,6 +4,7 @@ // #include "Z2AudioLib/Z2Audience.h" +#include "JSystem/JAudio2/JAISound.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 9356e2a86f8..7fff13d9a0b 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -5,8 +5,10 @@ #include "Z2AudioLib/Z2AudioMgr.h" #include "JSystem/JAudio2/JASDriverIF.h" +#include "MSL_C/stdio.h" #include "MSL_C/stdlib.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // @@ -213,7 +215,6 @@ extern "C" void _restgpr_24(); extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void fprintf(); extern "C" extern void* __vt__12JAUSoundInfo[4 + 1 /* padding */]; extern "C" extern void* __vt__16JAIStreamAramMgr[5]; extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */]; diff --git a/libs/Z2AudioLib/Z2Calc.cpp b/libs/Z2AudioLib/Z2Calc.cpp index 1ba9e478e6c..d7bd7a7d6e6 100644 --- a/libs/Z2AudioLib/Z2Calc.cpp +++ b/libs/Z2AudioLib/Z2Calc.cpp @@ -7,7 +7,6 @@ #include "JSystem/JMath/random.h" #include "MSL_C/math.h" #include "dol2asm.h" -#include "global.h" // // Declarations: diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index 4c4e9add058..a17e909711f 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -4,9 +4,12 @@ // #include "Z2AudioLib/Z2LinkMgr.h" +#include "JSystem/J2DGraph/J2DScreen.h" #include "Z2AudioLib/Z2Creature.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" +#include "global.h" // // Types: diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 09ad2d587d3..bad0c63461a 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -10,6 +10,7 @@ #include "Z2AudioLib/Z2StatusMgr.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Types: diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index c354869ac1d..f936b5b3312 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -6,6 +6,7 @@ #include "Z2AudioLib/Z2SeMgr.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Types: diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index 32c9fd8f1ea..e2bb6c50fe8 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -4,6 +4,7 @@ // #include "Z2AudioLib/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2Creature.h" #include "Z2AudioLib/Z2SeqMgr.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index d876f9f2900..fa72125af7b 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -4,6 +4,7 @@ // #include "Z2AudioLib/Z2SoundObject.h" +#include "JSystem/JAudio2/JASGadget.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index d5e468f2566..3da4b98492c 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -6,6 +6,7 @@ #include "Z2AudioLib/Z2StatusMgr.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" +#include "global.h" // // Forward References: diff --git a/libs/dolphin/ar/arq.c b/libs/dolphin/ar/arq.c index 138c15676d0..bc583aafcdc 100644 --- a/libs/dolphin/ar/arq.c +++ b/libs/dolphin/ar/arq.c @@ -4,7 +4,9 @@ // #include "dolphin/ar/arq.h" +#include "dolphin/ar/ar.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // @@ -16,16 +18,6 @@ void __ARQCallbackHack(); void __ARQInterruptServiceRoutine(); void ARQInit(); -// -// External References: -// - -void OSRegisterVersion(); -BOOL OSDisableInterrupts(); -void OSRestoreInterrupts(); -void ARRegisterDMACallback(); -void ARStartDMA(); - // // Declarations: // diff --git a/libs/dolphin/card/CARDBios.c b/libs/dolphin/card/CARDBios.c index 4bdb226e983..8cde7616bfe 100644 --- a/libs/dolphin/card/CARDBios.c +++ b/libs/dolphin/card/CARDBios.c @@ -8,6 +8,7 @@ #include "dolphin/dsp/dsp.h" #include "dolphin/dvd/dvd.h" #include "dolphin/exi/EXIBios.h" +#include "dolphin/os/OS.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDBlock.c b/libs/dolphin/card/CARDBlock.c index 40ca946fdef..411017e82d6 100644 --- a/libs/dolphin/card/CARDBlock.c +++ b/libs/dolphin/card/CARDBlock.c @@ -8,7 +8,6 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDCheck.c b/libs/dolphin/card/CARDCheck.c index a35974e8d6e..c07de3c1e4c 100644 --- a/libs/dolphin/card/CARDCheck.c +++ b/libs/dolphin/card/CARDCheck.c @@ -8,7 +8,7 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" +#include "dolphin/os/OSRtc.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDDir.c b/libs/dolphin/card/CARDDir.c index 68d15bf9e6f..f430f2a7316 100644 --- a/libs/dolphin/card/CARDDir.c +++ b/libs/dolphin/card/CARDDir.c @@ -8,7 +8,6 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDFormat.c b/libs/dolphin/card/CARDFormat.c index 9532329bf72..6cdae58526e 100644 --- a/libs/dolphin/card/CARDFormat.c +++ b/libs/dolphin/card/CARDFormat.c @@ -8,7 +8,7 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" +#include "dolphin/os/OSRtc.h" #include "dolphin/vi/vi.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDMount.c b/libs/dolphin/card/CARDMount.c index cb33f9e4aa9..d0e1917f3c1 100644 --- a/libs/dolphin/card/CARDMount.c +++ b/libs/dolphin/card/CARDMount.c @@ -7,8 +7,8 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" #include "dolphin/exi/EXIBios.h" +#include "dolphin/os/OSRtc.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDNet.c b/libs/dolphin/card/CARDNet.c index 087361de622..83ab866d429 100644 --- a/libs/dolphin/card/CARDNet.c +++ b/libs/dolphin/card/CARDNet.c @@ -7,7 +7,6 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDRdwr.c b/libs/dolphin/card/CARDRdwr.c index 6a8ca19f68a..f1cd5a3c6f8 100644 --- a/libs/dolphin/card/CARDRdwr.c +++ b/libs/dolphin/card/CARDRdwr.c @@ -7,7 +7,6 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDRead.c b/libs/dolphin/card/CARDRead.c index 4b80389295a..e38979a8f12 100644 --- a/libs/dolphin/card/CARDRead.c +++ b/libs/dolphin/card/CARDRead.c @@ -7,7 +7,6 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDStat.c b/libs/dolphin/card/CARDStat.c index 965367466e6..e3955dab585 100644 --- a/libs/dolphin/card/CARDStat.c +++ b/libs/dolphin/card/CARDStat.c @@ -7,7 +7,6 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDUnlock.c b/libs/dolphin/card/CARDUnlock.c index 5a541a4f9b1..f2389431a08 100644 --- a/libs/dolphin/card/CARDUnlock.c +++ b/libs/dolphin/card/CARDUnlock.c @@ -7,8 +7,8 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/dvd/dvd.h" #include "dolphin/exi/EXIBios.h" +#include "dolphin/os/OS.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/card/CARDWrite.c b/libs/dolphin/card/CARDWrite.c index d3f3cd0cb99..ae8820e0337 100644 --- a/libs/dolphin/card/CARDWrite.c +++ b/libs/dolphin/card/CARDWrite.c @@ -7,7 +7,7 @@ #include "dol2asm.h" #include "dolphin/card/card.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSTime.h" #include "dolphin/card/CARDPriv.h" diff --git a/libs/dolphin/dsp/dsp.c b/libs/dolphin/dsp/dsp.c index 0feefca3ac8..be2d4327b52 100644 --- a/libs/dolphin/dsp/dsp.c +++ b/libs/dolphin/dsp/dsp.c @@ -1,6 +1,7 @@ #include "dolphin/dsp/dsp.h" #include "dolphin/dsp/dsp_debug.h" #include "dolphin/dsp/dsp_task.h" +#include "dolphin/os/OS.h" /* 80450A58-80450A60 -00001 0004+04 1/1 0/0 0/0 .sdata __DSPVersion */ static char* __DSPVersion = "<< Dolphin SDK - DSP\trelease build: Apr 5 2004 04:15:32 (0x2301) >>"; diff --git a/libs/dolphin/dvd/dvdlow.c b/libs/dolphin/dvd/dvdlow.c index f910fbaefb5..6e794167d04 100644 --- a/libs/dolphin/dvd/dvdlow.c +++ b/libs/dolphin/dvd/dvdlow.c @@ -8,9 +8,10 @@ #include "dol2asm.h" #include "dolphin/types.h" #include "dolphin/os/OSAlarm.h" -#include "dolphin/os/OSTime.h" #include "dolphin/os/OSContext.h" +#include "dolphin/os/OSInterrupt.h" #include "dolphin/os/OSReset.h" +#include "dolphin/os/OSTime.h" // // Forward References: @@ -42,15 +43,6 @@ BOOL __DVDLowTestAlarm(OSAlarm* alarm); // External References: // -void OSInitAlarm(); -void OSCreateAlarm(); -void OSSetAlarm(); -void OSCancelAlarm(); -BOOL OSDisableInterrupts(); -void OSRestoreInterrupts(BOOL enabled); -void __OSMaskInterrupts(); -OSTime __OSGetSystemTime(); - // // Declarations: // diff --git a/libs/dolphin/exi/EXIUart.c b/libs/dolphin/exi/EXIUart.c index 62234c7141a..9c2b0dc4011 100644 --- a/libs/dolphin/exi/EXIUart.c +++ b/libs/dolphin/exi/EXIUart.c @@ -6,6 +6,7 @@ #include "dolphin/exi/EXIUart.h" #include "dol2asm.h" #include "dolphin/exi/EXIBios.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/libs/dolphin/gd/GDBase.c b/libs/dolphin/gd/GDBase.c index 700d63635dc..b6e7a77f6ba 100644 --- a/libs/dolphin/gd/GDBase.c +++ b/libs/dolphin/gd/GDBase.c @@ -4,7 +4,7 @@ */ #include "dolphin/gd/GDBase.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSCache.h" /* 80360F98-80360FB0 35B8D8 0018+00 0/0 6/6 0/0 .text GDInitGDLObj */ void GDInitGDLObj(GDLObj* obj, u8* start, u32 len) { diff --git a/libs/dolphin/gx/GXFifo.c b/libs/dolphin/gx/GXFifo.c index 8755ba3f01d..878e58f3704 100644 --- a/libs/dolphin/gx/GXFifo.c +++ b/libs/dolphin/gx/GXFifo.c @@ -5,6 +5,7 @@ #include "dolphin/gx/GXFifo.h" #include "dolphin/gx/GX.h" +#include "dolphin/os/OSInterrupt.h" #include "dol2asm.h" // diff --git a/libs/dolphin/gx/GXInit.c b/libs/dolphin/gx/GXInit.c index 3a4574f0921..e635e83fc7e 100644 --- a/libs/dolphin/gx/GXInit.c +++ b/libs/dolphin/gx/GXInit.c @@ -6,6 +6,7 @@ #include "dolphin/gx/GXInit.h" #include "dolphin/gx/GX.h" #include "dol2asm.h" +#include "dolphin/os/OSTime.h" #include "dolphin/types.h" // diff --git a/libs/dolphin/os/OSAudioSystem.c b/libs/dolphin/os/OSAudioSystem.c index e431a1327a9..8094a40cbf4 100644 --- a/libs/dolphin/os/OSAudioSystem.c +++ b/libs/dolphin/os/OSAudioSystem.c @@ -6,7 +6,9 @@ #include "dolphin/os/OSAudioSystem.h" #include "dol2asm.h" #include "dolphin/dsp/dsp.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSArena.h" +#include "dolphin/os/OSCache.h" +#include "dolphin/os/OSTime.h" // // External References: diff --git a/libs/dolphin/os/OSMessage.c b/libs/dolphin/os/OSMessage.c index 620eebb01e1..b44e34b6964 100644 --- a/libs/dolphin/os/OSMessage.c +++ b/libs/dolphin/os/OSMessage.c @@ -5,7 +5,8 @@ #include "dolphin/os/OSMessage.h" #include "dol2asm.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSInterrupt.h" +#include "dolphin/os/OSThread.h" // // Declarations: diff --git a/libs/dolphin/os/OSRtc.c b/libs/dolphin/os/OSRtc.c index cda2d31b28e..53922644351 100644 --- a/libs/dolphin/os/OSRtc.c +++ b/libs/dolphin/os/OSRtc.c @@ -6,7 +6,8 @@ #include "dolphin/os/OSRtc.h" #include "dol2asm.h" #include "dolphin/exi/EXIBios.h" -#include "dolphin/os/OS.h" +#include "dolphin/os/OSCache.h" +#include "dolphin/os/OSInterrupt.h" static void WriteSramCallback(s32 chan, OSContext* context); static BOOL WriteSram(void* buffer, u32 offset, u32 size); diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c index 11235c960bb..c4cdb38783b 100644 --- a/libs/dolphin/pad/Pad.c +++ b/libs/dolphin/pad/Pad.c @@ -6,6 +6,7 @@ #include "dolphin/pad/Pad.h" #include "MSL_C/string.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/si/SIBios.h" #include "dolphin/si/SISamplingRate.h" diff --git a/libs/dolphin/si/SIBios.c b/libs/dolphin/si/SIBios.c index 5b2e0d1fb75..493620fca6c 100644 --- a/libs/dolphin/si/SIBios.c +++ b/libs/dolphin/si/SIBios.c @@ -5,6 +5,7 @@ #include "dolphin/si/SIBios.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/si/SISamplingRate.h" #include "dolphin/vi/vi.h" diff --git a/libs/dolphin/si/SISamplingRate.c b/libs/dolphin/si/SISamplingRate.c index c7c02cf188e..58aa2456208 100644 --- a/libs/dolphin/si/SISamplingRate.c +++ b/libs/dolphin/si/SISamplingRate.c @@ -5,6 +5,7 @@ #include "dolphin/si/SISamplingRate.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/si/SIBios.h" #include "dolphin/vi/vi.h" diff --git a/libs/dolphin/vi/vi.c b/libs/dolphin/vi/vi.c index f21ede57002..4db8ea96cbe 100644 --- a/libs/dolphin/vi/vi.c +++ b/libs/dolphin/vi/vi.c @@ -5,6 +5,7 @@ #include "dolphin/vi/vi.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index e3c26479d80..eed773c5e1d 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -4,12 +4,15 @@ // #include "rel/d/a/b/d_a_b_go/d_a_b_go.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2Creature.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Types: diff --git a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp index 4afdfce59f1..a0c423d4329 100644 --- a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp +++ b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp @@ -4,7 +4,9 @@ // #include "rel/d/a/b/d_a_b_ob/d_a_b_ob.h" +#include "d/a/d_a_player.h" #include "dol2asm.h" +#include "m_Do/m_Do_graphic.h" // // Types: diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index 969e9b357ef..becb04b3bd0 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -4,10 +4,13 @@ */ #include "rel/d/a/b/d_a_b_oh2/d_a_b_oh2.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JMath/JMath.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_graphic.h" /* 8061DCB8-8061DDB0 000078 00F8+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */ static int nodeCallBack(J3DJoint* i_joint, int param_1) { diff --git a/rel/d/a/d_a_alldie/d_a_alldie.cpp b/rel/d/a/d_a_alldie/d_a_alldie.cpp index aacaa5940b8..734c9ecb255 100644 --- a/rel/d/a/d_a_alldie/d_a_alldie.cpp +++ b/rel/d/a/d_a_alldie/d_a_alldie.cpp @@ -4,7 +4,10 @@ */ #include "rel/d/a/d_a_alldie/d_a_alldie.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 804D5818-804D5824 000078 000C+00 2/2 0/0 0/0 .text getEventNo__10daAlldie_cFv */ u8 daAlldie_c::getEventNo() { diff --git a/rel/d/a/d_a_andsw/d_a_andsw.cpp b/rel/d/a/d_a_andsw/d_a_andsw.cpp index d785b596f3d..354db308629 100644 --- a/rel/d/a/d_a_andsw/d_a_andsw.cpp +++ b/rel/d/a/d_a_andsw/d_a_andsw.cpp @@ -4,7 +4,9 @@ */ #include "rel/d/a/d_a_andsw/d_a_andsw.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80457978-804579B8 000078 0040+00 1/1 0/0 0/0 .text Create__9daAndsw_cFv */ int daAndsw_c::Create() { diff --git a/rel/d/a/d_a_arrow/d_a_arrow.cpp b/rel/d/a/d_a_arrow/d_a_arrow.cpp index 60dd2568889..8028ff7c0ad 100644 --- a/rel/d/a/d_a_arrow/d_a_arrow.cpp +++ b/rel/d/a/d_a_arrow/d_a_arrow.cpp @@ -6,6 +6,7 @@ #include "rel/d/a/d_a_arrow/d_a_arrow.h" #include "dol2asm.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp index 87498d584e9..8299f55d9f5 100644 --- a/rel/d/a/d_a_bg/d_a_bg.cpp +++ b/rel/d/a/d_a_bg/d_a_bg.cpp @@ -4,12 +4,16 @@ // #include "rel/d/a/d_a_bg/d_a_bg.h" +#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/JKernel/JKRHeap.h" #include "MSL_C/string.h" +#include "d/bg/d_bg_w.h" #include "d/bg/d_bg_w_kcol.h" #include "d/com/d_com_inf_game.h" #include "d/com/d_com_static.h" #include "d/d_demo.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" // diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp index ca21165f7c6..fd5b377f693 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -5,7 +5,9 @@ #include "rel/d/a/d_a_boomerang/d_a_boomerang.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" // diff --git a/rel/d/a/d_a_canoe/d_a_canoe.cpp b/rel/d/a/d_a_canoe/d_a_canoe.cpp index c59f9f98c8b..04dfd798aa3 100644 --- a/rel/d/a/d_a_canoe/d_a_canoe.cpp +++ b/rel/d/a/d_a_canoe/d_a_canoe.cpp @@ -6,6 +6,8 @@ #include "rel/d/a/d_a_canoe/d_a_canoe.h" #include "dol2asm.h" #include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2_info.h" +#include "f_op/f_op_actor_mng.h" // // Types: diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp index 3024c2e616b..80264fbb54c 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -4,9 +4,12 @@ */ #include "rel/d/a/d_a_crod/d_a_crod.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" #include "d/a/d_a_alink.h" +#include "d/d_procname.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" #include "rel/d/a/d_a_cstaF/d_a_cstaF.h" #include "rel/d/a/d_a_cstatue/d_a_cstatue.h" diff --git a/rel/d/a/d_a_cstaF/d_a_cstaF.cpp b/rel/d/a/d_a_cstaF/d_a_cstaF.cpp index c3cb6e52c21..8daa60477b9 100644 --- a/rel/d/a/d_a_cstaF/d_a_cstaF.cpp +++ b/rel/d/a/d_a_cstaF/d_a_cstaF.cpp @@ -5,6 +5,7 @@ #include "rel/d/a/d_a_cstaF/d_a_cstaF.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp index 5e194b95311..2fc0e5896c8 100644 --- a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp +++ b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp @@ -6,6 +6,7 @@ #include "rel/d/a/d_a_cstatue/d_a_cstatue.h" #include "dol2asm.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp index b3347b3dc39..613d929839f 100644 --- a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp +++ b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/d_a_dmidna/d_a_dmidna.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 8045D290-8045D298 000000 0007+01 3/3 0/0 0/0 .rodata l_arcName */ static const char l_arcName[] = "Dmidna"; diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp index 66c51d302e6..028bbf357d9 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -6,7 +6,10 @@ #include "rel/d/a/d_a_do/d_a_do.h" #include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" // // Forward References: diff --git a/rel/d/a/d_a_econt/d_a_econt.cpp b/rel/d/a/d_a_econt/d_a_econt.cpp index 32d5896b4c7..5812afdb9b1 100644 --- a/rel/d/a/d_a_econt/d_a_econt.cpp +++ b/rel/d/a/d_a_econt/d_a_econt.cpp @@ -4,8 +4,11 @@ */ #include "rel/d/a/d_a_econt/d_a_econt.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" #include "d/d_timer.h" +#include "d/meter/d_meter2_info.h" +#include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_executor.h" extern "C" extern u8 data_805197E0[4]; diff --git a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp index 634058de237..2a8eb2c9204 100644 --- a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp +++ b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/d_a_guard_mng/d_a_guard_mng.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_executor.h" /* 80837B18-80837B9C 000078 0084+00 1/1 0/0 0/0 .text s_sub__FPvPv */ diff --git a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp index 8dcede9f4e5..b391295804f 100644 --- a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp +++ b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/d_a_hitobj/d_a_hitobj.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" /* 8046B358-8046B360 000078 0008+00 1/0 0/0 0/0 .text daHitobj_Draw__FP12hitobj_class */ diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp index b4866f5e222..b6b1ab1613d 100644 --- a/rel/d/a/d_a_horse/d_a_horse.cpp +++ b/rel/d/a/d_a_horse/d_a_horse.cpp @@ -5,6 +5,7 @@ #include "rel/d/a/d_a_horse/d_a_horse.h" #include "d/a/d_a_player.h" +#include "d/d_stage.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp index a054d14a088..dc3ef2b636d 100644 --- a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp +++ b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp @@ -5,6 +5,8 @@ #include "rel/d/a/d_a_movie_player/d_a_movie_player.h" #include "dol2asm.h" +#include "dolphin/dvd/dvd.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp index fa39182ef79..12654ce3238 100644 --- a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp +++ b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp @@ -4,9 +4,11 @@ // #include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" // diff --git a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp index 37f4d914e69..1c0e7daf147 100644 --- a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp +++ b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp @@ -4,8 +4,10 @@ */ #include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h" +#include "JSystem/JKernel/JKRHeap.h" #include "MSL_C/stdio.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80485F00-80485F0C 000000 0009+03 1/1 0/0 0/0 .rodata l_specName */ static const char l_specName[] = "spec.dat"; diff --git a/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp b/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp index f68977a160b..899969385b8 100644 --- a/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp +++ b/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp @@ -4,6 +4,10 @@ */ #include "rel/d/a/d_a_skip_2D/d_a_skip_2D.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "d/meter/d_meter2.h" +#include "f_op/f_op_actor_mng.h" /* 80D4D478-80D4D498 000078 0020+00 1/1 0/0 0/0 .text daSkip2D_createHeap__FP10fopAc_ac_c */ diff --git a/rel/d/a/d_a_suspend/d_a_suspend.cpp b/rel/d/a/d_a_suspend/d_a_suspend.cpp index d2f3b9b9016..18e4844c0c2 100644 --- a/rel/d/a/d_a_suspend/d_a_suspend.cpp +++ b/rel/d/a/d_a_suspend/d_a_suspend.cpp @@ -4,6 +4,7 @@ // #include "rel/d/a/d_a_suspend/d_a_suspend.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" diff --git a/rel/d/a/d_a_swTime/d_a_swTime.cpp b/rel/d/a/d_a_swTime/d_a_swTime.cpp index a16705c8919..e2aa0eb466c 100644 --- a/rel/d/a/d_a_swTime/d_a_swTime.cpp +++ b/rel/d/a/d_a_swTime/d_a_swTime.cpp @@ -4,7 +4,9 @@ */ #include "rel/d/a/d_a_swTime/d_a_swTime.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80D4F638-80D4F660 000078 0028+00 1/1 0/0 0/0 .text Create__10daSwTime_cFv */ diff --git a/rel/d/a/d_a_swc00/d_a_swc00.cpp b/rel/d/a/d_a_swc00/d_a_swc00.cpp index 77919ff4e15..f1cf65b23ac 100644 --- a/rel/d/a/d_a_swc00/d_a_swc00.cpp +++ b/rel/d/a/d_a_swc00/d_a_swc00.cpp @@ -5,8 +5,10 @@ #include "rel/d/a/d_a_swc00/d_a_swc00.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" // // Types: diff --git a/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp b/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp index 1d1bcf84be9..f6132c3d956 100644 --- a/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp +++ b/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp @@ -4,7 +4,10 @@ */ #include "rel/d/a/d_a_tboxSw/d_a_tboxSw.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80D66858-80D66860 000078 0008+00 1/1 0/0 0/0 .text Create__10daTboxSw_cFv */ int daTboxSw_c::Create() { diff --git a/rel/d/a/d_a_title/d_a_title_nonmatching.cpp b/rel/d/a/d_a_title/d_a_title_nonmatching.cpp index 7c5c2560e4e..d587c93b3dc 100644 --- a/rel/d/a/d_a_title/d_a_title_nonmatching.cpp +++ b/rel/d/a/d_a_title/d_a_title_nonmatching.cpp @@ -4,10 +4,12 @@ // #include "rel/d/a/d_a_title/d_a_title.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JStudio/JStudio/stb.h" #include "dol2asm.h" #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_msg_mng.h" diff --git a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp index 0c45f1697e8..afd1bb4cbb2 100644 --- a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp +++ b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp @@ -4,6 +4,10 @@ */ #include "rel/d/a/d_a_vrbox/d_a_vrbox.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" static int daVrbox_color_set(vrbox_class* i_this); diff --git a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp index cd25b86d353..6eb6383e6a5 100644 --- a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp @@ -1,193 +1,96 @@ -// -// Generated By: dol2asm // Translation Unit: d_a_e_db_leaf -// #include "rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - static u8 now[48]; -}; - -struct mDoExt_McaMorfCallBack2_c {}; - -struct mDoExt_McaMorfCallBack1_c {}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_McaMorf { - /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); - /* 80010680 */ void entryDL(); - /* 800106AC */ void modelCalc(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct e_db_leaf_class {}; - -struct dKy_tevstr_c {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -// -// Forward References: -// - -extern "C" static void daE_DB_LEAF_Draw__FP15e_db_leaf_class(); -extern "C" static void daE_DB_LEAF_Execute__FP15e_db_leaf_class(); -extern "C" static bool daE_DB_LEAF_IsDelete__FP15e_db_leaf_class(); -extern "C" static void daE_DB_LEAF_Delete__FP15e_db_leaf_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" static void daE_DB_LEAF_Create__FP10fopAc_ac_c(); -extern "C" extern char const* const d_a_e_db_leaf__stringBase0; -extern "C" extern void* g_profile_E_DB_LEAF[12]; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void -__ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl(); -extern "C" void entryDL__14mDoExt_McaMorfFv(); -extern "C" void modelCalc__14mDoExt_McaMorfFv(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void* __nw__FUl(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; - -// -// Declarations: -// +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 806A1E38-806A1EA0 000078 0068+00 1/0 0/0 0/0 .text daE_DB_LEAF_Draw__FP15e_db_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_DB_LEAF_Draw(e_db_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Draw__FP15e_db_leaf_class.s" +static int daE_DB_LEAF_Draw(e_db_leaf_class* i_this) { + g_env_light.settingTevStruct(0,&i_this->current.pos,&i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(),&i_this->mTevStr); + i_this->mpMorf->entryDL(); + return 1; } -#pragma pop /* 806A1EA0-806A1F24 0000E0 0084+00 2/1 0/0 0/0 .text daE_DB_LEAF_Execute__FP15e_db_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_DB_LEAF_Execute(e_db_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Execute__FP15e_db_leaf_class.s" +static int daE_DB_LEAF_Execute(e_db_leaf_class* i_this) { + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + mDoMtx_stack_c::XrotM(i_this->shape_angle.x); + i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::now); + i_this->mpMorf->modelCalc(); + return 1; } -#pragma pop /* 806A1F24-806A1F2C 000164 0008+00 1/0 0/0 0/0 .text daE_DB_LEAF_IsDelete__FP15e_db_leaf_class */ -static bool daE_DB_LEAF_IsDelete(e_db_leaf_class* param_0) { - return true; +static int daE_DB_LEAF_IsDelete(e_db_leaf_class* i_this) { + return 1; } -/* ############################################################################################## */ -/* 806A2118-806A2118 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_806A2118 = "E_DB"; -#pragma pop - /* 806A1F2C-806A1F5C 00016C 0030+00 1/0 0/0 0/0 .text daE_DB_LEAF_Delete__FP15e_db_leaf_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_DB_LEAF_Delete(e_db_leaf_class* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Delete__FP15e_db_leaf_class.s" +static int daE_DB_LEAF_Delete(e_db_leaf_class* i_this) { + dComIfG_resDelete(&i_this->mPhase, "E_DB"); + return 1; } -#pragma pop -/* ############################################################################################## */ -/* 806A2114-806A2118 000000 0004+00 1/1 0/0 0/0 .rodata @3699 */ -SECTION_RODATA static f32 const lit_3699 = 1.0f; -COMPILER_STRIP_GATE(0x806A2114, &lit_3699); +/* 806A1F5C-806A205C 00019C 0100+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + e_db_leaf_class* leaf = static_cast(i_this); -/* 806A1F5C-806A205C 00019C 0100+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void useHeapInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/useHeapInit__FP10fopAc_ac_c.s" + leaf->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_DB", 0x18), NULL, NULL, + (J3DAnmTransform*)dComIfG_getObjectRes("E_DB", 0x13), 2, 1.0, 0, -1, 1, NULL, 0x80000, 0x11000084); + + if (leaf->mpMorf == NULL || leaf->mpMorf->getModel() == NULL) { + return 0; + } else { + return 1; + } +} + +/* 806A205C-806A210C 00029C 00B0+00 1/0 0/0 0/0 .text daE_DB_LEAF_Create__FP10fopAc_ac_c */ +static int daE_DB_LEAF_Create(fopAc_ac_c* i_this) { + e_db_leaf_class* leaf = (e_db_leaf_class*)i_this; + if (!fopAcM_CheckCondition(leaf, 8)) { + new (leaf) e_db_leaf_class(); + fopAcM_OnCondition(leaf, 8); + } + + int ret = dComIfG_resLoad(&leaf->mPhase, "E_DB"); + if (ret == cPhs_COMPLEATE_e) { + if(!fopAcM_entrySolidHeap(leaf,useHeapInit,0xA80)) { + return cPhs_ERROR_e; + } else { + fopAcM_SetMtx(leaf, leaf->mpMorf->getModel()->getBaseTRMtx()); + daE_DB_LEAF_Execute(leaf); + } + } + return ret; } -#pragma pop - -/* 806A205C-806A210C 00029C 00B0+00 1/0 0/0 0/0 .text daE_DB_LEAF_Create__FP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daE_DB_LEAF_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf/daE_DB_LEAF_Create__FP10fopAc_ac_c.s" -} -#pragma pop /* ############################################################################################## */ /* 806A2120-806A2140 -00001 0020+00 1/0 0/0 0/0 .data l_daE_DB_LEAF_Method */ -SECTION_DATA static void* l_daE_DB_LEAF_Method[8] = { - (void*)daE_DB_LEAF_Create__FP10fopAc_ac_c, - (void*)daE_DB_LEAF_Delete__FP15e_db_leaf_class, - (void*)daE_DB_LEAF_Execute__FP15e_db_leaf_class, - (void*)daE_DB_LEAF_IsDelete__FP15e_db_leaf_class, - (void*)daE_DB_LEAF_Draw__FP15e_db_leaf_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daE_DB_LEAF_Method = { + (process_method_func)daE_DB_LEAF_Create, + (process_method_func)daE_DB_LEAF_Delete, + (process_method_func)daE_DB_LEAF_Execute, + (process_method_func)daE_DB_LEAF_IsDelete, + (process_method_func)daE_DB_LEAF_Draw, }; /* 806A2140-806A2170 -00001 0030+00 0/0 0/0 1/0 .data g_profile_E_DB_LEAF */ -SECTION_DATA extern void* g_profile_E_DB_LEAF[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x01C60000, (void*)&g_fpcLf_Method, - (void*)0x000005B8, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x00890000, (void*)&l_daE_DB_LEAF_Method, - (void*)0x00040000, (void*)NULL, +extern actor_process_profile_definition g_profile_E_DB_LEAF = { + -3, + 7, + -3, + PROC_E_DB_LEAF, + &g_fpcLf_Method.mBase, + sizeof(e_db_leaf_class), + 0, + 0, + &g_fopAc_Method.base, + 0x0089, + &l_daE_DB_LEAF_Method, + 0x00040000, + 0, + 0, }; - -/* 806A2118-806A2118 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp index f827e1f34bb..8d85e9e3922 100644 --- a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp +++ b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp @@ -7,6 +7,7 @@ #include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "m_Do/m_Do_graphic.h" // // Types: diff --git a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp index 2d0d7c2b4f2..58bdb83e46a 100644 --- a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp +++ b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp @@ -4,12 +4,15 @@ */ #include "rel/d/a/e/d_a_e_yk/d_a_e_yk.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "c/c_damagereaction.h" +#include "d/a/d_a_player.h" +#include "d/d_procname.h" +#include "d/s/d_s_play.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "d/s/d_s_play.h" -#include "SSystem/SComponent/c_math.h" -#include "JSystem/JMath/JMath.h" -#include "c/c_damagereaction.h" // // Forward References: diff --git a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp index 3715acc39b9..2b46d7f8213 100644 --- a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp +++ b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp @@ -4,9 +4,13 @@ */ #include "rel/d/a/e/d_a_e_ym/d_a_e_ym.h" -#include "d/d_path.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" +#include "d/d_path.h" +#include "d/d_procname.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" // // Types: diff --git a/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp b/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp index 21752ac2ce7..9cea8f1fd1d 100644 --- a/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp +++ b/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp @@ -4,7 +4,9 @@ */ #include "rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_executor.h" /* 80815DF8-80815E00 000078 0008+00 1/0 0/0 0/0 .text daE_YM_TAG_Draw__FP12daE_YM_TAG_c diff --git a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp index 02bd1d84f62..b0d858eaff4 100644 --- a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp +++ b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/kytag/d_a_kytag02/d_a_kytag02.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* -80855AC0 000078 0008+00 1/0 0/0 0/0 .text daKytag02_Draw__FP13kytag02_class */ diff --git a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp index 85bdceffdb8..8be6e59d316 100644 --- a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp +++ b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index 0982aa9d0de..1d2bb916f5d 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -4,9 +4,11 @@ */ #include "rel/d/a/kytag/d_a_kytag06/d_a_kytag06.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 8085786C-80857918 0000EC 00AC+00 1/1 0/0 0/0 .text dice_wether_init__FUcff */ static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) { diff --git a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp index d497c919441..d5255864a26 100644 --- a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp +++ b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/kytag/d_a_kytag07/d_a_kytag07.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_stage.h" #include "d/d_procname.h" #include "f_op/f_op_overlap_mng.h" diff --git a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp index 91c971d1a43..fac1cf1694d 100644 --- a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp +++ b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp @@ -5,7 +5,10 @@ */ #include "rel/d/a/kytag/d_a_kytag14/d_a_kytag14.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80529998-805299A0 000078 0008+00 1/0 0/0 0/0 .text daKytag14_Draw__FP13kytag14_class */ diff --git a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp index e96a914ce75..7b25a03b2d8 100644 --- a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp +++ b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/kytag/d_a_kytag17/d_a_kytag17.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "dolphin/types.h" #include "d/kankyo/d_kankyo.h" diff --git a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp index 0efcf71769f..01f4176d455 100644 --- a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp +++ b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp @@ -4,12 +4,14 @@ // #include "rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" #include "dol2asm.h" #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" -#include "SSystem/SComponent/c_math.h" -#include "JSystem/JMath/JMath.h" // // Types: diff --git a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp index 7ad38d4cd3c..8ebaab5f4bb 100644 --- a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80BBAE84-80BBAE8C 000000 0006+02 3/3 0/0 0/0 .rodata l_arcName */ static const char l_arcName[] = "Bombf"; diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 020c0a4a56a..b03a7c46625 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -4,7 +4,10 @@ // #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" +#include "MSL_C/string.h" +#include "d/d_stage.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp index 96fdaa93ae8..234c0576bce 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp +++ b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp @@ -5,6 +5,7 @@ #include "rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_phase.h" #include "d/bg/d_bg_w.h" #include "d/com/d_com_inf_game.h" @@ -12,6 +13,7 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" +#include "global.h" extern const char* l_arcName; static int createSolidHeap(fopAc_ac_c* i_this); diff --git a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp index d1dec43051c..5a7c921060a 100644 --- a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp +++ b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/bg/d_bg_w.h" +#include "d/d_procname.h" /* 8057B958-8057B978 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__12daObjBoard_cFv */ void daObjBoard_c::initBaseMtx() { diff --git a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp index 5b4b56e2a2a..4249e1eaee8 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80BCC7F8-80BCC86C 000078 0074+00 2/2 0/0 0/0 .text setBaseMtx__11daCowdoor_cFv */ void daCowdoor_c::setBaseMtx() { diff --git a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp index edac11f174c..28b0f463720 100644 --- a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp +++ b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp @@ -4,7 +4,9 @@ */ #include "rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" struct daObj { template diff --git a/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp b/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp index ba99cbea104..93356f267af 100644 --- a/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp +++ b/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp @@ -4,7 +4,10 @@ */ #include "rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80BE3178-80BE3198 000078 0020+00 1/0 0/0 0/0 .text daObjE_CREATE_Create__FP10fopAc_ac_c */ static int daObjE_CREATE_Create(fopAc_ac_c* i_this) { diff --git a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp index 4189e562557..f347ade94f8 100644 --- a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp @@ -4,7 +4,11 @@ */ #include "rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/d_lib.h" +#include "d/d_procname.h" /* ############################################################################################## */ /* 80593E48-80593E60 000000 0018+00 2/2 0/0 0/0 .rodata l_key_offset */ diff --git a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp index a0f5706687e..5ef5c8246b3 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" /* 80CA8278-80CA82F4 000078 007C+00 1/1 0/0 0/0 .text create__16daObjOnsenFire_cFv */ diff --git a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp index 187e8460b47..b780aaf4ca3 100644 --- a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80CDCE78-80CDCE98 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__12daObjSmoke_cFv */ void daObjSmoke_c::initBaseMtx() { diff --git a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp index c75178652be..56cfd9f1dab 100644 --- a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp +++ b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp @@ -7,10 +7,14 @@ */ #include "rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JMath/JMath.h" +#include "SSystem/SComponent/c_math.h" +#include "d/d_lib.h" +#include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "SSystem/SComponent/c_math.h" -#include "JSystem/JMath/JMath.h" +#include "global.h" // // Forward References: diff --git a/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp b/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp index 6b1aeced6b2..246bc669f07 100644 --- a/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp +++ b/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp @@ -7,6 +7,8 @@ */ #include "rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_lib.h" diff --git a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp index d69b253ea4f..5c64d7bd6c7 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "f_op/f_op_draw_tag.h" /* 80D12B98-80D12BB8 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ static bool CheckCreateHeap(fopAc_ac_c* i_this) { diff --git a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp index 966d29ab064..374042f83f8 100644 --- a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp @@ -4,10 +4,15 @@ */ #include "rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "d/event/d_event_lib.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" // // Types: diff --git a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp index e505dcaa712..d292238a6e4 100644 --- a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp +++ b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp @@ -4,9 +4,13 @@ */ #include "rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" +#include "d/bg/d_bg_w.h" #include "d/d_procname.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" extern "C" static void damage_check__FP14obj_web0_class(); diff --git a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp index 6f35a3991f6..e63bb5ac994 100644 --- a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp +++ b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp @@ -4,9 +4,13 @@ */ #include "rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JMath/JMath.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_w.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 80D353AC-80D353C4 0000EC 0018+00 1/1 0/0 0/0 .text __ct__16daObj_Web1_HIO_cFv */ daObj_Web1_HIO_c::daObj_Web1_HIO_c() { diff --git a/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp b/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp index c36da6575ca..3fcb61a6bc6 100644 --- a/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp +++ b/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp @@ -4,6 +4,7 @@ // #include "rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" diff --git a/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp b/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp index 2f3ae6b3719..939d59d72db 100644 --- a/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 805A202C-805A2050 0000EC 0024+00 1/1 0/0 0/0 .text __ct__17daTagCstaSw_HIO_cFv */ daTagCstaSw_HIO_c::daTagCstaSw_HIO_c() { diff --git a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp index c2562aa3091..081ec1037b7 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp @@ -4,9 +4,13 @@ // #include "rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" +#include "d/msg/d_msg_flow.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Types: diff --git a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp index 58edf5a5763..d3d416759f2 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp +++ b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/d_procname.h" /* 805A2658-805A26A8 000078 0050+00 1/1 0/0 0/0 .text create__12daTagAJnot_cFv */ int daTagAJnot_c::create() { diff --git a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp index 36153d26e51..7af41f941c3 100644 --- a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp +++ b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/d_procname.h" /* ############################################################################################## */ /* 804D5724-804D5728 000000 0002+02 1/1 0/0 0/0 .rodata l_dist_tbl$3641 */ diff --git a/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp b/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp index f01bcc948ba..73940e97e0e 100644 --- a/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp +++ b/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" /* 80D587D8-80D58828 000078 0050+00 1/0 0/0 0/0 .text daTagEscape_Create__FP10fopAc_ac_c diff --git a/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp b/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp index e0814ecadb9..f866c65067d 100644 --- a/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp +++ b/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp @@ -4,7 +4,11 @@ */ #include "rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 805A3478-805A34F4 000078 007C+00 1/1 0/0 0/0 .text create__13daTagGstart_cFv */ int daTagGstart_c::create() { diff --git a/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp b/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp index e6cf2d68c67..a13fab8cb96 100644 --- a/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp +++ b/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp @@ -4,7 +4,9 @@ */ #include "rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" +#include "d/d_stage.h" /* 80D597F8-80D5985C 000078 0064+00 0/0 0/0 1/1 .text getAppearPoint__12daTagGuard_cFP3Vec */ int daTagGuard_c::getAppearPoint(Vec* i_appearPnt) { diff --git a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp index 1b04d77be16..5be2c46c96b 100644 --- a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp +++ b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 805A3758-805A3800 000078 00A8+00 1/1 0/0 0/0 .text create__12daTagHinit_cFv */ int daTagHinit_c::create() { diff --git a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp index b25b781038d..93fa38f9862 100644 --- a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp +++ b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp @@ -4,6 +4,11 @@ */ #include "rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" /* 8048D958-8048D9BC 000078 0064+00 1/1 0/0 0/0 .text create__12daTag_Howl_cFv */ int daTag_Howl_c::create() { diff --git a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp index 9323b839d26..99ad00557fe 100644 --- a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp @@ -4,7 +4,11 @@ */ #include "rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "d/meter/d_meter2_info.h" +#include "f_op/f_op_actor_mng.h" #include "rel/d/a/d_a_horse/d_a_horse.h" /* 805A43EC-805A45D8 0000EC 01EC+00 1/1 0/0 0/0 .text create__12daTagHstop_cFv */ diff --git a/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp b/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp index 05450407640..6532cf73e80 100644 --- a/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp +++ b/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" /* 80D59AF8-80D59B48 000078 0050+00 1/0 0/0 0/0 .text daTagInst_Create__FP10fopAc_ac_c */ diff --git a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp index 8d37edb8cf3..126f292b2a9 100644 --- a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 8048ECAC-8048ED28 0000EC 007C+00 1/0 0/0 0/0 .text __dt__15daTag_Lantern_cFv */ daTag_Lantern_c::~daTag_Lantern_c() {} diff --git a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp index 040fca2c096..12e8ea9cc9a 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" /* 80D5AD58-80D5ADEC 000078 0094+00 1/1 0/0 0/0 .text create__15daTag_Lv5Soup_cFv */ diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp index a61f7ea5837..ce3c2a53dc6 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80D5B2EC-80D5B310 0000EC 0024+00 1/1 0/0 0/0 .text __ct__17daLv6CstaSw_HIO_cFv */ daLv6CstaSw_HIO_c::daLv6CstaSw_HIO_c() { diff --git a/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp b/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp index 3c16edfc7b6..66e26fef4fe 100644 --- a/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp +++ b/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" /* 805A5498-805A54DC 000078 0044+00 1/1 0/0 0/0 .text Create__12daTagMagne_cFv */ diff --git a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp index 9ce091c2199..ec43415af34 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp @@ -4,10 +4,13 @@ // #include "rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" /* ############################################################################################## */ /* 80D5B918-80D5BA94 000078 017C+00 1/1 0/0 0/0 .text create__11daTagMmsg_cFv */ diff --git a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp index f751b15915a..8f49916715e 100644 --- a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp @@ -4,9 +4,12 @@ */ #include "rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/a/d_a_npc.h" +#include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp index 6d35e8308b6..b29479eadea 100644 --- a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80D5DACC-80D5DAF0 0000EC 0024+00 1/1 0/0 0/0 .text __ct__17daTagPoFire_HIO_cFv */ daTagPoFire_HIO_c::daTagPoFire_HIO_c() { diff --git a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp index 245f8339303..a2cfbb4d2d4 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp +++ b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" +#include "d/d_procname.h" /* 80D5EE98-80D5EED4 000078 003C+00 2/2 0/0 0/0 .text __ct__12daTagRetRm_cFv */ daTagRetRm_c::daTagRetRm_c() {} diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp index 62e3a94dbbc..d567d0e5d52 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80D5FAF8-80D5FB34 000078 003C+00 2/2 0/0 0/0 .text __ct__14daTagRmbitSw_cFv */ daTagRmbitSw_c::daTagRmbitSw_c() {} diff --git a/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp b/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp index 6f73f998ec6..370018be743 100644 --- a/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp +++ b/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" /* 80D601F8-80D60218 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__14daTagSetBall_cFv */ diff --git a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp index 80baba5424a..58335746f7a 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp @@ -5,7 +5,9 @@ */ #include "rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80D603F8-80D6048C 000078 0094+00 1/1 0/0 0/0 .text Create__14daTagRestart_cFv */ int daTagRestart_c::Create() { diff --git a/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp b/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp index f6e4fae686e..7db2edf52ea 100644 --- a/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp +++ b/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "d/d_procname.h" diff --git a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp index b4d6b66352e..2e77df01d47 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp +++ b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80D60B78-80D60D78 000078 0200+00 1/1 0/0 0/0 .text create__16daTag_ShopItem_cFv */ int daTag_ShopItem_c::create() { diff --git a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp index 97d3d195ed0..5eddcfd6d82 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80D612D8-80D61324 000078 004C+00 2/2 0/0 0/0 .text __ct__13daTagSmkEmt_cFv */ daTagSmkEmt_c::daTagSmkEmt_c() { diff --git a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp index a3108140f89..90fc9211ddb 100644 --- a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp +++ b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" /* 80D616F8-80D61718 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ static int CheckCreateHeap(fopAc_ac_c* param_0) { diff --git a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp index 9d32184a6aa..8229994dacc 100644 --- a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp +++ b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp @@ -4,6 +4,8 @@ */ #include "rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" #include "d/d_procname.h" /* 805A6A58-805A6A78 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__13daTagSpring_cFv */ diff --git a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp index 995b4ecf029..4a104e14109 100644 --- a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp +++ b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp @@ -4,7 +4,9 @@ */ #include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h" +#include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" +#include "d/d_procname.h" /* 80D638F8-80D63A78 000078 0180+00 1/1 0/0 0/0 .text create__13daTagStream_cFv */ int daTagStream_c::create() { diff --git a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp index ce806055664..cd209a646a8 100644 --- a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp +++ b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp @@ -4,6 +4,9 @@ */ #include "rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg_mng.h" /* 80490A58-80490AF8 000078 00A0+00 1/1 0/0 0/0 .text create__13daTag_Telop_cFv */ diff --git a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp index 81c989e7a68..d4e86a802f9 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp @@ -4,7 +4,10 @@ */ #include "rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" /* 80D63F38-80D63F74 000078 003C+00 2/2 0/0 0/0 .text __ct__13daTagWrHowl_cFv */ daTagWrHowl_c::daTagWrHowl_c() {} diff --git a/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp b/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp index 1779c94d4e9..22c727ae3b7 100644 --- a/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp +++ b/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp @@ -4,6 +4,7 @@ */ #include "rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/d_procname.h" /* 80D642D8-80D642E0 000078 0008+00 1/1 0/0 0/0 .text draw__14daTagWatchGe_cFv */ diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index b42a027f004..2772beb541f 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -4,12 +4,17 @@ */ #include "DynamicLink.h" +#include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRDvdRipper.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JUtility/JUTConsole.h" #include "MSL_C/stdio.h" #include "dol2asm.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "global.h" +#include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" /* 80451138-8045113C 000638 0004+00 3/3 0/0 0/0 .sbss mFirst__24DynamicModuleControlBase diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 0923c6837b3..8116bd5d955 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -6,7 +6,10 @@ #include "c/c_damagereaction.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index fcf5b640c31..a04d07d7822 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -5,12 +5,16 @@ #include "c/c_dylink.h" #include "DynamicLink.h" #include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "MSL_C/string.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "global.h" #include "m_Do/m_Do_ext.h" // diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index cd827157ed5..44eb6584385 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -5,7 +5,9 @@ #include "d/a/d_a_alink.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JMath/JMath.h" #include "JSystem/JStudio/JStudio/stb.h" #include "MSL_C/float.h" @@ -17,13 +19,20 @@ #include "d/d_item.h" #include "d/d_path.h" #include "d/d_procname.h" +#include "d/meter/d_meter2_draw.h" #include "d/msg/d_msg_object.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" +#include "m_Do/m_Do_controller_pad.h" #include "rel/d/a/d_a_crod/d_a_crod.h" #include "rel/d/a/d_a_horse/d_a_horse.h" #include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h" #include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h" #include "rel/d/a/d_a_spinner/d_a_spinner.h" +#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h" #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" diff --git a/src/d/a/d_a_horse_static.cpp b/src/d/a/d_a_horse_static.cpp index 9e64804270a..e1253611b87 100644 --- a/src/d/a/d_a_horse_static.cpp +++ b/src/d/a/d_a_horse_static.cpp @@ -6,6 +6,7 @@ #include "d/a/d_a_horse_static.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h" BOOL e_wb_class::checkWait() { return field_0x5b4 == 0x2A; diff --git a/src/d/a/d_a_itembase.cpp b/src/d/a/d_a_itembase.cpp index aa00fad4830..142d5b3dcaf 100644 --- a/src/d/a/d_a_itembase.cpp +++ b/src/d/a/d_a_itembase.cpp @@ -7,7 +7,9 @@ #include "d/com/d_com_inf_game.h" #include "d/d_item_data.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // External References: diff --git a/src/d/a/d_a_itembase_static.cpp b/src/d/a/d_a_itembase_static.cpp index b7d6cf8e192..1cb2402a1fc 100644 --- a/src/d/a/d_a_itembase_static.cpp +++ b/src/d/a/d_a_itembase_static.cpp @@ -4,6 +4,7 @@ // #include "d/a/d_a_itembase_static.h" +#include "d/a/d_a_itembase.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_item_data.h" #include "dol2asm.h" diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index c23f59c14f3..768d73c0137 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -4,13 +4,15 @@ // #include "d/a/d_a_npc.h" +#include "SSystem/SComponent/c_math.h" #include "d/a/d_a_player.h" #include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" #include "m_Do/m_Do_mtx.h" #include "rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h" -#include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_lib.h" // diff --git a/src/d/a/d_a_obj.cpp b/src/d/a/d_a_obj.cpp index 2d13730aa7d..a9e30df428f 100644 --- a/src/d/a/d_a_obj.cpp +++ b/src/d/a/d_a_obj.cpp @@ -7,6 +7,7 @@ #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Types: diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index 561124c5893..b832abab3fb 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -5,11 +5,14 @@ #include "d/a/d_a_obj_item.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_item_data.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" #include "m_Do/m_Do_mtx.h" // diff --git a/src/d/a/d_a_obj_ss_base.cpp b/src/d/a/d_a_obj_ss_base.cpp index 5696d66466c..007fd0677ef 100644 --- a/src/d/a/d_a_obj_ss_base.cpp +++ b/src/d/a/d_a_obj_ss_base.cpp @@ -6,6 +6,7 @@ #include "d/a/d_a_obj_ss_base.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Declarations: diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 89e1d8999d7..990e965952d 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -5,7 +5,9 @@ #include "d/a/d_a_player.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" +#include "JSystem/JKernel/JKRSolidHeap.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_alink.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtx.h" diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index d04cba9df7c..4f110311d40 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -4,10 +4,13 @@ // #include "d/bg/d_bg_s.h" +#include "d/bg/d_bg_s_sph_chk.h" +#include "d/bg/d_bg_w.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 83596cc9422..835a7d27421 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -7,10 +7,12 @@ #define __dt__12dBgS_AcchCirFv_DEFINED #include "d/bg/d_bg_s_acch.h" +#include "d/a/d_a_player.h" #include "d/bg/d_bg_s.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" +#include "global.h" // // Forward References: diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index a850fbc1ca3..ba9142591dc 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -4,8 +4,10 @@ // #include "d/bg/d_bg_s_movebg_actor.h" +#include "d/bg/d_bg_w.h" #include "d/com/d_com_inf_game.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" // diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index 9477aeb75f3..8ff99322b1c 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -9,6 +9,7 @@ #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" +#include "global.h" #include "rel/d/a/d_a_horse/d_a_horse.h" // diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index 63d4c0e23fd..7112deed772 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -4,6 +4,7 @@ // #include "d/bg/d_bg_w_kcol.h" +#include "d/bg/d_bg_pc.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/cc/d_cc_mass_s.cpp index 95c93417f1f..3f9d1fc3ad3 100644 --- a/src/d/cc/d_cc_mass_s.cpp +++ b/src/d/cc/d_cc_mass_s.cpp @@ -6,6 +6,8 @@ #include "d/cc/d_cc_mass_s.h" #include "SSystem/SComponent/c_math.h" #include "d/cc/d_cc_d.h" +#include "f_op/f_op_actor.h" +#include "global.h" /* 800852E0-800852F0 07FC20 0010+00 1/1 0/0 0/0 .text * Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v */ diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp index 3d5095e9ed9..d98e77f0c56 100644 --- a/src/d/cc/d_cc_s.cpp +++ b/src/d/cc/d_cc_s.cpp @@ -6,7 +6,9 @@ #include "d/cc/d_cc_s.h" #include "JSystem/JMath/JMath.h" #include "d/com/d_com_inf_game.h" +#include "d/d_jnt_col.h" #include "dol2asm.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/cc/d_cc_uty.cpp index d18ba1f8846..c546c63aae6 100644 --- a/src/d/cc/d_cc_uty.cpp +++ b/src/d/cc/d_cc_uty.cpp @@ -5,10 +5,13 @@ #include "d/cc/d_cc_uty.h" #include "SSystem/SComponent/c_math.h" +#include "Z2AudioLib/Z2Creature.h" +#include "d/a/d_a_player.h" #include "d/d_procname.h" #include "d/s/d_s_play.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index aaf065545a5..c02cefa0600 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -4,15 +4,26 @@ // #include "d/com/d_com_inf_game.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "MSL_C/stdio.h" +#include "d/a/d_a_alink.h" #include "d/d_item.h" #include "d/d_procname.h" +#include "d/d_simple_model.h" #include "d/d_timer.h" #include "d/kankyo/d_kankyo.h" +#include "d/map/d_map_path_dmap.h" #include "d/meter/d_meter2_info.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_scene_mng.h" +#include "global.h" +#include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" // // Forward References: diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index 934ee9cfce3..599b7cfdb2c 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -9,6 +9,7 @@ #include "d/d_demo.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" #include "rel/d/a/d_a_movie_player/d_a_movie_player.h" #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index d21038f7c31..02fe7150fff 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -4,11 +4,16 @@ // #include "d/d_attention.h" +#include "JSystem/J3DGraphBase/J3DMatBlock.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "dol2asm.h" #include "dolphin/mtx/mtxvec.h" +#include "dolphin/os/OSCache.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_controller_pad.h" // // Types: diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index 4eadd75cc8a..6bb62fb86af 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -5,6 +5,7 @@ #include "d/d_bomb.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" bool dBomb_c::checkStateCarry() { return (fopAcM_checkCarryNow(&mActor) || fopAcM_checkHookCarryNow(&mActor) || diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index 389d7e4db6e..68c2e9b74b3 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -5,6 +5,7 @@ #include "d/d_cam_param.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index d3f6192ab6d..e3d6b9ba5b5 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -5,9 +5,13 @@ #include "d/d_camera.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" #include "SSystem/SComponent/c_m3d_g_pla.h" +#include "d/a/d_a_alink.h" #include "d/com/d_com_inf_game.h" +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" // // Types: diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 3104de2c06f..48f10476aff 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -8,7 +8,11 @@ #include "d/com/d_com_inf_game.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" +#include "m_Do/m_Do_graphic.h" #include "rel/d/a/d_a_movie_player/d_a_movie_player.h" // diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp index ba9fcd64f31..19d0bb7de23 100644 --- a/src/d/d_door_param2.cpp +++ b/src/d/d_door_param2.cpp @@ -4,6 +4,7 @@ */ #include "d/d_door_param2.h" +#include "f_op/f_op_actor_mng.h" /* 8003A188-8003A194 034AC8 000C+00 0/0 0/0 17/17 .text getKind__13door_param2_cFP10fopAc_ac_c */ u8 door_param2_c::getKind(fopAc_ac_c* i_actor) { diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index a1f3925b324..095978b196e 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -4,10 +4,14 @@ // #include "d/d_drawlist.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DShape.h" #include "JSystem/J3DGraphBase/J3DSys.h" +#include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/mtx/mtx44.h" #include "dolphin/mtx/mtxvec.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index a007e80de6a..ff8d9ae3058 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -5,6 +5,8 @@ #include "d/d_error_msg.h" #include "dol2asm.h" +#include "dolphin/dvd/dvd.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 73abec2c13f..750e2d5b243 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -4,10 +4,13 @@ */ #include "d/d_eye_hl.h" +#include "JSystem/J3DGraphBase/J3DTexture.h" +#include "JSystem/JUtility/JUTTexture.h" +#include "Z2AudioLib/Z2Creature.h" #include "MSL_C/string.h" #include "d/com/d_com_inf_game.h" -#include "dolphin/os/OS.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "d/s/d_s_play.h" /* 8009C964-8009CA28 0972A4 00C4+00 0/0 2/2 0/0 .text entry__8dEyeHL_cFP12J3DModelDataPCc diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 60008a8a615..6c909dc9ad8 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -4,12 +4,18 @@ // #include "d/d_gameover.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JKernel/JKRHeap.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "d/menu/d_menu_save.h" +#include "d/meter/d_meter2_info.h" #include "d/meter/d_meter_HIO.h" #include "dol2asm.h" #include "f_op/f_op_msg_mng.h" +#include "m_Do/m_Do_graphic.h" +#include "m_Do/m_Do_Reset.h" // // Types: diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index ee3b2600421..a1fcebf76db 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -4,6 +4,7 @@ // #include "d/d_item.h" +#include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index c916527623f..fa24779fc84 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -4,9 +4,13 @@ // #include "d/d_kantera_icon_meter.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter_HIO.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "d/meter/d_meter_HIO.h" /* 801AE938-801AE974 1A9278 003C+00 0/0 3/3 0/0 .text __ct__15dKantera_icon_cFv */ dKantera_icon_c::dKantera_icon_c() { diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index c5691f1e977..1b52681062a 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -4,11 +4,15 @@ */ #include "d/d_ky_thunder.h" +#include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JMath/JMath.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" +#include "dolphin/os/OSCache.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "d/kankyo/d_kankyo_rain.h" +#include "f_op/f_op_kankyo_mng.h" #define EF_THUNDER01_BMD 0x1E #define EF_THUNDER02_BMD 0x1F diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 52dd72fd224..3e16a27b477 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -6,6 +6,7 @@ #include "d/d_kyeff.h" #include "Z2AudioLib/Z2EnvSeMgr.h" #include "d/com/d_com_inf_game.h" +#include "d/d_procname.h" #include "d/kankyo/d_kankyo.h" #include "d/kankyo/d_kankyo_wether.h" #include "dol2asm.h" diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index 87c577d002f..e3e0b5754fb 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -3,6 +3,7 @@ * */ +#include "SSystem/SComponent/c_phase.h" #include "d/d_kyeff2.h" #include "d/d_procname.h" #include "d/kankyo/d_kankyo_wether.h" diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index 23abd6e6696..a9d62c6da4e 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -4,6 +4,11 @@ // #include "d/d_model.h" +#include "JSystem/J3DGraphAnimator/J3DModelData.h" +#include "JSystem/J3DGraphBase/J3DDrawBuffer.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "d/com/d_com_inf_game.h" +#include "d/kankyo/d_kankyo.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index b68b20b138b..ced745080bf 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -5,10 +5,18 @@ #include "d/d_name.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J2DGraph/J2DTextBox.h" #include "MSL_C/stdio.h" +#include "MSL_C/string.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_msg_mng.h" +#include "global.h" +#include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_audio.h" // diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index cc186865e51..f07967a6cf1 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -11,14 +11,16 @@ #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" #include "JSystem/J3DGraphLoader/J3DClusterLoader.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "MSL_C/stdio.h" #include "MSL_C/string.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtx.h" -#include "dolphin/os/OSCache.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "global.h" // // Types: diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 5f9bee44e70..3e234f78da6 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -5,8 +5,12 @@ #include "d/d_scope.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JUtility/JUTTexture.h" #include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2_info.h" #include "dol2asm.h" +#include "global.h" // // Forward References: diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index e01da64eb46..603748c8f68 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -7,6 +7,7 @@ #include "dol2asm.h" #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "global.h" // // Types: diff --git a/src/d/d_select_icon.cpp b/src/d/d_select_icon.cpp index 7367ece488a..6e867819069 100644 --- a/src/d/d_select_icon.cpp +++ b/src/d/d_select_icon.cpp @@ -1,4 +1,5 @@ #include "d/d_select_icon.h" +#include "JSystem/J2DGraph/J2DAnimation.h" dSi_HIO_c::dSi_HIO_c() {} diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 77e074e3cba..5cec7f27fe8 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -5,14 +5,23 @@ #include "d/d_stage.h" #include "JSystem/JKernel/JKRAramArchive.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "MSL_C/stdio.h" #include "SSystem/SComponent/c_malloc.h" #include "d/com/d_com_inf_game.h" #include "d/com/d_com_static.h" +#include "d/d_lib.h" +#include "d/d_procname.h" +#include "d/d_tresure.h" #include "d/save/d_save_HIO.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_msg_mng.h" +#include "f_op/f_op_scene_mng.h" +#include "global.h" +#include "m_Do/m_Do_Reset.h" // // Forward References: diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index d5e53af63b4..7487e050e2f 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -5,9 +5,12 @@ #include "d/d_timer.h" #include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" #include "d/d_procname.h" +#include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "f_op/f_op_msg_mng.h" +#include "global.h" #include "m_Do/m_Do_lib.h" // diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index e27fa831419..5c373374076 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -5,6 +5,7 @@ #include "d/d_tresure.h" #include "d/com/d_com_inf_game.h" +#include "d/map/d_map_path_dmap.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index 84589375306..d6f44ddcd24 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -7,6 +7,7 @@ #include "dol2asm.h" #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "m_Do/m_Do_controller_pad.h" // // Forward References: diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index bb05219dee3..004225ab224 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -4,6 +4,7 @@ // #include "d/event/d_event.h" +#include "d/a/d_a_alink.h" #include "d/com/d_com_inf_game.h" #include "d/d_camera.h" #include "d/d_demo.h" @@ -14,6 +15,8 @@ #include "dolphin/types.h" #include "f_op/f_op_actor_iter.h" #include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" #include "rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h" #include "rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h" diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index e38c47e40bf..89eb2ec5947 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -11,7 +11,10 @@ #include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg_mng.h" +#include "m_Do/m_Do_graphic.h" +#include "global.h" // // Forward References: diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index 1307e6c2062..556a3f3615c 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -7,11 +7,14 @@ #include "SSystem/SComponent/c_math.h" #include "MSL_C/stdio.h" #include "Z2AudioLib/Z2AudioMgr.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/d_camera.h" #include "d/d_stage.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "global.h" #include "m_Do/m_Do_audio.h" // diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp index 4c149b9fcff..c1c243a5613 100644 --- a/src/d/file/d_file_sel_info.cpp +++ b/src/d/file/d_file_sel_info.cpp @@ -4,7 +4,12 @@ // #include "d/file/d_file_sel_info.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" #include "MSL_C/stdio.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2_info.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/file/d_file_sel_warning.cpp b/src/d/file/d_file_sel_warning.cpp index b1713ea6ba1..3f34b52283c 100644 --- a/src/d/file/d_file_sel_warning.cpp +++ b/src/d/file/d_file_sel_warning.cpp @@ -4,6 +4,9 @@ // #include "d/file/d_file_sel_warning.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index ad00d8473ae..de8ebe15e6f 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -7,8 +7,18 @@ #define __dt__15J2DAnmTransformFv_DEFINED #include "d/file/d_file_select.h" +#include "JSystem/J2DGraph/J2DAnimation.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/meter/d_meter2_info.h" +#include "d/msg/d_msg_string.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" +#include "dolphin/dvd/dvd.h" #include "dolphin/types.h" +#include "m_Do/m_Do_MemCard.h" +#include "m_Do/m_Do_controller_pad.h" // diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 7237f3678cb..d6e334fe017 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -5,13 +5,17 @@ #include "d/kankyo/d_kankyo.h" #include "MSL_C/string.h" +#include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" #include "d/kankyo/d_kankyo_data.h" +#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "global.h" #include "m_Do/m_Do_audio.h" // diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp index 8630e948e1c..3d3b2e607de 100644 --- a/src/d/kankyo/d_kankyo_rain.cpp +++ b/src/d/kankyo/d_kankyo_rain.cpp @@ -6,10 +6,12 @@ #include "d/kankyo/d_kankyo_rain.h" #include "MSL_C/math.h" #include "MSL_C/string.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/d_demo.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" // // Forward References: diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index 4a999295224..81dbab3a972 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -4,6 +4,8 @@ // #include "d/kankyo/d_kankyo_wether.h" +#include "JSystem/J3DGraphBase/J3DDrawBuffer.h" +#include "JSystem/JKernel/JKRHeap.h" #include "MSL_C/string.h" #include "Z2AudioLib/Z2EnvSeMgr.h" #include "d/com/d_com_inf_game.h" @@ -11,6 +13,7 @@ #include "d/kankyo/d_kankyo_rain.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" #include "m_Do/m_Do_audio.h" // diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index 1e8c06b367c..2bb54c3d94b 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -4,6 +4,8 @@ // #include "d/map/d_map_path.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/JUtility/JUTTexture.h" #include "d/com/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 9f13897000d..1e8d53c23dd 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -5,6 +5,7 @@ #include "d/map/d_map_path_dmap.h" #include "MSL_C/float.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" #include "d/map/d_map_path.h" #include "d/meter/d_meter_HIO.h" diff --git a/src/d/map/d_map_path_fmap.cpp b/src/d/map/d_map_path_fmap.cpp index 0341448f4db..de419779eef 100644 --- a/src/d/map/d_map_path_fmap.cpp +++ b/src/d/map/d_map_path_fmap.cpp @@ -6,6 +6,8 @@ #include "d/map/d_map_path_fmap.h" #include "MSL_C/float.h" #include "d/com/d_com_inf_game.h" +#include "d/map/d_map_path.h" +#include "d/d_tresure.h" #include "dol2asm.h" // diff --git a/src/d/menu/d_menu_calibration.cpp b/src/d/menu/d_menu_calibration.cpp index e3d6041ea1e..ed1ba5c5a7d 100644 --- a/src/d/menu/d_menu_calibration.cpp +++ b/src/d/menu/d_menu_calibration.cpp @@ -4,7 +4,13 @@ */ #include "d/menu/d_menu_calibration.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_select_cursor.h" +#include "d/meter/d_meter2_info.h" #include "d/meter/d_meter_HIO.h" +#include "d/msg/d_msg_string.h" +#include "d/pane/d_pane_class.h" +#include "m_Do/m_Do_controller_pad.h" /* 803BC238-803BC244 019358 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ static u8 cNullVec__6Z2Calc[12] = { diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index a37283bc799..ae5417b21e2 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -4,6 +4,7 @@ // #include "d/menu/d_menu_collect.h" +#include "d/d_lib.h" #include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index 450dbd1ff6a..b1e3903d8e5 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -4,7 +4,9 @@ // #include "d/menu/d_menu_dmap.h" +#include "JSystem/J2DGraph/J2DPicture.h" #include "MSL_C/string.h" +#include "d/d_lib.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index 398f0698a5f..c143d871837 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -4,6 +4,11 @@ */ #include "d/menu/d_menu_fishing.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/meter/d_meter2_info.h" +#include "d/msg/d_msg_string.h" #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_controller_pad.h" diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index 87bd3ccac63..aaec4f3efc5 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -4,10 +4,16 @@ // #include "d/menu/d_menu_fmap.h" +#include "JSystem/JKernel/JKRArchive.h" +#include "MSL_C/stdio.h" #include "MSL_C/string.h" +#include "d/d_lib.h" #include "dol2asm.h" +#include "dolphin/os/OSCache.h" #include "dolphin/types.h" +struct ResTIMG; + // // Types: // @@ -442,7 +448,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void sprintf(); extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index f54dbafc1f9..19eb040ea3f 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -4,6 +4,7 @@ // #include "d/menu/d_menu_insect.h" +#include "MSL_C/stdio.h" #include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -180,7 +181,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void snprintf(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 56c6f57215f..9e799999b57 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -4,6 +4,8 @@ // #include "d/menu/d_menu_letter.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "MSL_C/stdio.h" #include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -190,7 +192,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void sprintf(); extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" u8 letter_data__12dMenu_Letter[512]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/src/d/menu/d_menu_map_common.cpp b/src/d/menu/d_menu_map_common.cpp index b4a60f2b05e..33d3ecb34e3 100644 --- a/src/d/menu/d_menu_map_common.cpp +++ b/src/d/menu/d_menu_map_common.cpp @@ -12,6 +12,7 @@ #include "d/meter/d_meter_HIO.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" struct dMenuMapCommon_c { /* 801C2718 */ dMenuMapCommon_c(); diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp index 97bd179e309..7c3e25e2a89 100644 --- a/src/d/menu/d_menu_option.cpp +++ b/src/d/menu/d_menu_option.cpp @@ -6,6 +6,7 @@ #include "d/menu/d_menu_option.h" #include "MSL_C/string.h" #include "dol2asm.h" +#include "dolphin/os/OSRtc.h" #include "dolphin/types.h" // diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index d3a970f09dd..38919655419 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -5,15 +5,24 @@ #include "d/menu/d_menu_save.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "MSL_C/stdio.h" #include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/d_select_cursor.h" #include "d/file/d_file_sel_info.h" #include "d/file/d_file_sel_warning.h" +#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_string.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_MemCard.h" +#include "m_Do/m_Do_MemCardRWmng.h" +#include "m_Do/m_Do_Reset.h" +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" #include "msg/scrn/d_msg_scrn_explain.h" // diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 9ba5bb7c10a..5237e3bcdfb 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -7,6 +7,7 @@ #include "MSL_C/string.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Types: diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 47180550ece..5f4291ca6f9 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -4,8 +4,11 @@ // #include "d/menu/d_menu_window.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "Z2AudioLib/Z2AudioMgr.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" #include "d/menu/d_menu_collect.h" #include "d/menu/d_menu_dmap.h" #include "d/menu/d_menu_fishing.h" @@ -17,11 +20,16 @@ #include "d/menu/d_menu_save.h" #include "d/menu/d_menu_skill.h" #include "d/menu/d_menu_window_HIO.h" +#include "d/meter/d_meter2_info.h" #include "d/meter/d_meter_HIO.h" +#include "d/meter/d_meter_map.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" #include "f_op/f_op_msg_mng.h" +#include "global.h" +#include "m_Do/m_Do_controller_pad.h" // // Forward References: diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index d866e1a79bd..5f8e90a6d48 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -4,11 +4,16 @@ // #include "d/meter/d_meter2.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "d/d_demo.h" +#include "d/d_procname.h" #include "d/d_scope.h" #include "d/d_timer.h" #include "d/menu/d_menu_window_HIO.h" +#include "d/meter/d_meter2_draw.h" +#include "d/meter/d_meter2_info.h" #include "d/meter/d_meter_HIO.h" +#include "d/meter/d_meter_map.h" #include "dol2asm.h" #include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index b9df371915f..dcc4ea3c6b7 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -5,12 +5,18 @@ #include "d/meter/d_meter2_draw.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "d/a/d_a_alink.h" #include "d/com/d_com_inf_game.h" #include "d/d_kantera_icon_meter.h" +#include "d/meter/d_meter2_info.h" #include "d/meter/d_meter_HIO.h" #include "d/msg/d_msg_object.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index 40eb48e3d65..78be2b9a5b8 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -4,13 +4,19 @@ // #include "d/meter/d_meter2_info.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2.h" +#include "d/meter/d_meter_map.h" #include "d/msg/d_msg_object.h" #include "d/save/d_save.h" #include "dol2asm.h" +#include "dolphin/os/OSCache.h" #include "dolphin/types.h" #include "d/a/d_a_npc.h" #include "d/d_item_data.h" +#include "global.h" // // Forward References: diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index d41a15a6558..a7ac6f9af49 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -7,6 +7,7 @@ #include "d/save/d_save.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" // // Forward References: diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index b05d03cb5ac..d7cf9e1d954 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -4,13 +4,16 @@ // #include "d/meter/d_meter_map.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" #include "Z2AudioLib/Z2AudioMgr.h" #include "d/com/d_com_inf_game.h" #include "d/menu/d_menu_window.h" +#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_overlap_mng.h" +#include "m_Do/m_Do_controller_pad.h" // // Forward References: diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index cbd403363bf..8afa4dd99a8 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -6,9 +6,12 @@ #include "d/msg/d_msg_class.h" #include "MSL_C/stdio.h" #include "d/com/d_com_inf_game.h" +#include "d/d_lib.h" +#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "d/msg/d_msg_unit.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" // // Forward References: diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 1bc73232ac2..fcdb38b4ea1 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -5,13 +5,17 @@ #include "d/msg/d_msg_flow.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_alink.h" #include "d/com/d_com_inf_game.h" #include "d/com/d_com_static.h" #include "d/d_item.h" +#include "d/d_procname.h" +#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "d/shop/d_shop_system.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_audio.h" diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index 6d50d3ae35d..f6c4c6b2f4e 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -4,10 +4,13 @@ // #include "d/msg/d_msg_object.h" -#include "d/msg/d_msg_out_font.h" #include "JSystem/JGadget/binary.h" #include "MSL_C/stdio.h" +#include "d/meter/d_meter2_info.h" +#include "d/msg/d_msg_class.h" +#include "d/msg/d_msg_out_font.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // diff --git a/src/d/msg/d_msg_out_font.cpp b/src/d/msg/d_msg_out_font.cpp index 886a982e840..f32dc327fcb 100644 --- a/src/d/msg/d_msg_out_font.cpp +++ b/src/d/msg/d_msg_out_font.cpp @@ -4,9 +4,12 @@ // #include "d/msg/d_msg_out_font.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "global.h" #include "d/com/d_com_inf_game.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp index 8d741805828..db0e5f01fb0 100644 --- a/src/d/msg/d_msg_string.cpp +++ b/src/d/msg/d_msg_string.cpp @@ -4,6 +4,9 @@ // #include "d/msg/d_msg_string.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "d/meter/d_meter2_info.h" +#include "d/msg/d_msg_out_font.h" #include "dol2asm.h" #include "dolphin/types.h" #include "JSystem/JGeometry.h" diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp index d8f2f24ef83..2ee45fdd5d5 100644 --- a/src/d/msg/d_msg_string_base.cpp +++ b/src/d/msg/d_msg_string_base.cpp @@ -5,6 +5,8 @@ #include "d/msg/d_msg_string_base.h" #include "JSystem/JGadget/binary.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp index bea422bea49..b79380fb020 100644 --- a/src/d/msg/d_msg_unit.cpp +++ b/src/d/msg/d_msg_unit.cpp @@ -5,6 +5,7 @@ #include "d/msg/d_msg_unit.h" #include "MSL_C/stdio.h" +#include "MSL_C/string.h" #include "dol2asm.h" #include "d/kankyo/d_kankyo.h" #include "d/meter/d_meter2_info.h" diff --git a/src/d/pane/d_pane_class.cpp b/src/d/pane/d_pane_class.cpp index 17d05caae85..bd19960a10a 100644 --- a/src/d/pane/d_pane_class.cpp +++ b/src/d/pane/d_pane_class.cpp @@ -4,14 +4,19 @@ // #include "d/pane/d_pane_class.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/J2DGraph/J2DWindow.h" +#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JSupport/JSUMemoryStream.h" +#include "d/d_lib.h" #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" -#include "JSystem/J2DGraph/J2DOrthoGraph.h" -#include "JSystem/J2DGraph/J2DPicture.h" -#include "JSystem/JSupport/JSUMemoryStream.h" -#include "d/d_lib.h" /* 80253930-80253984 24E270 0054+00 0/0 11/11 0/0 .text __ct__8CPaneMgrFv */ CPaneMgr::CPaneMgr() { diff --git a/src/d/pane/d_pane_class_alpha.cpp b/src/d/pane/d_pane_class_alpha.cpp index a32ac807d14..354831b872b 100644 --- a/src/d/pane/d_pane_class_alpha.cpp +++ b/src/d/pane/d_pane_class_alpha.cpp @@ -4,6 +4,8 @@ // #include "d/pane/d_pane_class_alpha.h" +#include "JSystem/J2DGraph/J2DScreen.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index 377212c2fec..bc964d989a5 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -4,9 +4,11 @@ // #include "d/particle/d_particle.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "MSL_C/stdio.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/particle/d_particle_copoly.cpp b/src/d/particle/d_particle_copoly.cpp index d13dabfef1f..b1aaaf735b5 100644 --- a/src/d/particle/d_particle_copoly.cpp +++ b/src/d/particle/d_particle_copoly.cpp @@ -3,6 +3,7 @@ // Translation Unit: d/particle/d_particle_copoly // +#include "SSystem/SComponent/c_bg_s_poly_info.h" #include "d/particle/d_particle_copoly.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index fcc4225dea4..01873202547 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -5,11 +5,18 @@ #include "d/s/d_s_logo.h" #include "JSystem/JKernel/JKRAram.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "c/c_dylink.h" +#include "d/com/d_com_inf_game.h" #include "d/d_procname.h" +#include "d/d_tresure.h" +#include "d/map/d_map_path_dmap.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" // diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index f883b4d7afb..77bc75d70d7 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -4,13 +4,19 @@ // #include "d/s/d_s_name.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" -// #include "d/file/d_file_select.h" +#include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_overlap_mng.h" +#include "f_op/f_op_scene.h" +#include "f_pc/f_pc_manager.h" +#include "global.h" +#include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" #include "m_Do/m_Do_mtx.h" diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index dfcfc2a4337..fc16b0726dc 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -5,20 +5,25 @@ #include "d/s/d_s_play.h" #include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTGamePad.h" #include "SSystem/SComponent/c_counter.h" -#include "d/d_item.h" -#include "d/msg/d_msg_object.h" -#include "dol2asm.h" -#include "dolphin/types.h" -#include "f_op/f_op_draw_iter.h" -#include "f_op/f_op_overlap_mng.h" -#include "f_op/f_op_scene_mng.h" -#include "m_Do/m_Do_audio.h" +#include "d/a/d_a_player.h" #include "d/d_demo.h" +#include "d/d_item.h" #include "d/d_model.h" #include "d/d_procname.h" -#include "f_op/f_op_msg_mng.h" +#include "d/msg/d_msg_object.h" #include "d/save/d_save_HIO.h" +#include "dol2asm.h" +#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_draw_iter.h" +#include "f_op/f_op_msg_mng.h" +#include "f_op/f_op_overlap_mng.h" +#include "f_op/f_op_scene_mng.h" +#include "m_Do/m_Do_Reset.h" +#include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_graphic.h" // // Types: diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp index 5ea2c86a5a4..79fa110da89 100644 --- a/src/d/s/d_s_room.cpp +++ b/src/d/s/d_s_room.cpp @@ -4,13 +4,18 @@ // #include "d/s/d_s_room.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "MSL_C/stdio.h" #include "MSL_C/string.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "d/s/d_s_play.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_scene.h" +#include "f_op/f_op_scene_mng.h" +#include "m_Do/m_Do_Reset.h" static bool resetArchiveBank(int param_0); static bool setArchiveBank(int param_0); diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index d4dc037a859..5a3163bf6c3 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -5,11 +5,13 @@ #include "d/save/d_save.h" #include "d/save/d_save_init.h" +#include "JSystem/JUtility/JUTGamePad.h" #include "MSL_C/stdio.h" #include "Z2AudioLib/Z2AudioMgr.h" #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter2_info.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" // diff --git a/src/d/shop/d_shop_item_ctrl.cpp b/src/d/shop/d_shop_item_ctrl.cpp index b26a1f35b87..b7ec7650581 100644 --- a/src/d/shop/d_shop_item_ctrl.cpp +++ b/src/d/shop/d_shop_item_ctrl.cpp @@ -4,6 +4,8 @@ // #include "d/shop/d_shop_item_ctrl.h" +#include "SSystem/SComponent/c_lib.h" +#include "d/a/d_a_shop_item_static.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index a1ed67aae8b..34b2ac1c67a 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -5,14 +5,20 @@ #include "d/shop/d_shop_system.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_shop_item_static.h" #include "d/com/d_com_inf_game.h" #include "d/d_item.h" +#include "d/d_lib.h" #include "d/d_procname.h" +#include "d/d_select_cursor.h" +#include "d/meter/d_meter2_info.h" #include "d/meter/d_meter_HIO.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_audio.h" +#include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" // diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 27d1b92edd7..ac22d565bdd 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -4,12 +4,16 @@ */ #include "f_op/f_op_actor.h" +#include "d/a/d_a_alink.h" #include "d/com/d_com_inf_actor.h" #include "d/com/d_com_inf_game.h" #include "d/com/d_com_static.h" #include "d/d_demo.h" #include "d/s/d_s_play.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_actor_tag.h" +#include "f_op/f_op_draw_tag.h" +#include "f_pc/f_pc_manager.h" /* 80018B64-80018BD0 0134A4 006C+00 0/0 7/7 562/562 .text __ct__10fopAc_ac_cFv */ fopAc_ac_c::fopAc_ac_c() {} diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 81347de663d..112eea3affa 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -6,25 +6,27 @@ #include "f_op/f_op_actor_mng.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DU/J3DUClipper.h" -#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" +#include "JSystem/JMath/JMath.h" #include "MSL_C/math.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_malloc.h" -#include "dol2asm.h" -#include "global.h" -#include "d/com/d_com_inf_game.h" -#include "JSystem/JMath/JMath.h" #include "SSystem/SComponent/c_math.h" +#include "d/a/d_a_player.h" +#include "d/com/d_com_inf_game.h" +#include "d/d_path.h" #include "d/d_procname.h" #include "d/d_stage.h" +#include "dol2asm.h" +#include "dolphin/os/OS.h" #include "f_op/f_op_actor.h" +#include "f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_mtx.h" #include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h" -#include "d/d_path.h" // // Types: diff --git a/src/f_op/f_op_actor_tag.cpp b/src/f_op/f_op_actor_tag.cpp index cd6740cd854..09e7a314ede 100644 --- a/src/f_op/f_op_actor_tag.cpp +++ b/src/f_op/f_op_actor_tag.cpp @@ -4,6 +4,7 @@ */ #include "f_op/f_op_actor_tag.h" +#include "SSystem/SComponent/c_list.h" /* ############################################################################################## */ /* 803A35E0-803A35F0 000700 000C+04 1/1 2/2 0/0 .data g_fopAcTg_Queue */ diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index de0c7198b85..4a4d35f810b 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -6,6 +6,8 @@ #include "f_op/f_op_camera.h" #include "d/com/d_com_inf_game.h" #include "d/s/d_s_play.h" +#include "f_op/f_op_draw_tag.h" +#include "f_pc/f_pc_manager.h" /* 8001E140-8001E180 018A80 0040+00 1/0 0/0 0/0 .text fopCam_Draw__FP12camera_class */ static s32 fopCam_Draw(camera_class* i_this) { diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index 4fa5fd5fd02..665d738d992 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -4,6 +4,7 @@ */ #include "f_op/f_op_camera_mng.h" +#include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_stdcreate_req.h" /* ############################################################################################## */ diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp index c89473ab689..511f33ca66f 100644 --- a/src/f_op/f_op_draw_iter.cpp +++ b/src/f_op/f_op_draw_iter.cpp @@ -4,6 +4,8 @@ */ #include "f_op/f_op_draw_iter.h" +#include "SSystem/SComponent/c_list.h" +#include "SSystem/SComponent/c_tag.h" #include "f_op/f_op_draw_tag.h" /* ############################################################################################## */ diff --git a/src/f_op/f_op_draw_tag.cpp b/src/f_op/f_op_draw_tag.cpp index 5daa1511d23..771624df35e 100644 --- a/src/f_op/f_op_draw_tag.cpp +++ b/src/f_op/f_op_draw_tag.cpp @@ -4,6 +4,8 @@ */ #include "f_op/f_op_draw_tag.h" +#include "SSystem/SComponent/c_list.h" +#include "SSystem/SComponent/c_tag.h" #include "global.h" /* ############################################################################################## */ diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index ac3dbc0cdf9..38ba80921e4 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -7,6 +7,8 @@ #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" #include "d/s/d_s_play.h" +#include "f_op/f_op_draw_tag.h" +#include "f_op/f_op_kankyo_mng.h" #include "f_pc/f_pc_manager.h" /* 8001F284-8001F2C0 019BC4 003C+00 1/0 0/0 0/0 .text fopKy_Draw__FPv */ diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index b9b30830ff2..a7f9e18752b 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -5,7 +5,9 @@ #include "f_op/f_op_msg.h" #include "d/s/d_s_play.h" +#include "f_op/f_op_draw_tag.h" #include "f_op/f_op_msg_mng.h" +#include "f_pc/f_pc_manager.h" /* 8001F488-8001F4B0 019DC8 0028+00 1/0 0/0 0/0 .text fopMsg_Draw__FPv */ static int fopMsg_Draw(void* i_this) { diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 03bc3c74cfc..fc493bc5425 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -5,13 +5,18 @@ #include "f_op/f_op_msg_mng.h" #include "JSystem/J2DGraph/J2DPane.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JMath/JMath.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2.h" +#include "d/meter/d_meter2_info.h" #include "d/msg/d_msg_object.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_scene_mng.h" +#include "global.h" // // Forward References: diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index 5600eb1aa07..0eb284f10a4 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -3,6 +3,7 @@ * Overlap Process Framework */ +#include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap.h" #include "f_op/f_op_overlap_mng.h" #include "f_pc/f_pc_manager.h" diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp index 6f7de58896d..79a1a6e0fe2 100644 --- a/src/f_op/f_op_overlap_mng.cpp +++ b/src/f_op/f_op_overlap_mng.cpp @@ -3,6 +3,7 @@ * Overlap Process Manager */ +#include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_overlap_req.h" #include "f_op/f_op_scene_pause.h" diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp index 8d6622ab4d8..3952ae029ce 100644 --- a/src/f_op/f_op_overlap_req.cpp +++ b/src/f_op/f_op_overlap_req.cpp @@ -3,6 +3,7 @@ * Overlap Process Request */ +#include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap_req.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_manager.h" diff --git a/src/f_op/f_op_scene_pause.cpp b/src/f_op/f_op_scene_pause.cpp index 5ae68c389a4..0d2a7df7f44 100644 --- a/src/f_op/f_op_scene_pause.cpp +++ b/src/f_op/f_op_scene_pause.cpp @@ -4,6 +4,7 @@ */ #include "f_op/f_op_scene_pause.h" +#include "f_op/f_op_scene.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_manager.h" diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index 3831a62dd98..2c727692ae1 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -5,6 +5,8 @@ #include "f_op/f_op_scene_req.h" #include "f_op/f_op_overlap_mng.h" +#include "f_op/f_op_scene.h" +#include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_executor.h" /* 8001EE34-8001EE64 019774 0030+00 1/0 0/0 0/0 .text diff --git a/src/f_op/f_op_scene_tag.cpp b/src/f_op/f_op_scene_tag.cpp index 56021f060bc..6aa5e75be0b 100644 --- a/src/f_op/f_op_scene_tag.cpp +++ b/src/f_op/f_op_scene_tag.cpp @@ -3,6 +3,7 @@ * Scene Process Tag */ +#include "SSystem/SComponent/c_tag.h" #include "f_op/f_op_scene_tag.h" /* 8001F13C-8001F15C 019A7C 0020+00 0/0 1/1 0/0 .text fopScnTg_QueueTo__FP15scene_tag_class */ diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index 5b77008629e..57d4fcfca22 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -7,7 +7,10 @@ #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_phase.h" #include "SSystem/SStandard/s_basic.h" +#include "f_pc/f_pc_layer.h" +#include "f_pc/f_pc_method.h" #include "f_pc/f_pc_pause.h" +#include "f_pc/f_pc_profile.h" #include "global.h" /* 8002064C-8002065C 0010+00 s=0 e=14 z=0 None .text fpcBs_Is_JustOfType__Fii */ diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp index 388e2c9a1ee..9c55e32774d 100644 --- a/src/f_pc/f_pc_create_iter.cpp +++ b/src/f_pc/f_pc_create_iter.cpp @@ -3,8 +3,11 @@ * Framework - Process Create Iteration */ +#include "SSystem/SComponent/c_list_iter.h" +#include "SSystem/SComponent/c_tag_iter.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_create_req.h" +#include "f_pc/f_pc_layer.h" /* 800209C8-80020A04 003C+00 s=0 e=1 z=0 None .text fpcCtIt_Method__FPFPvPv_iPv */ s32 fpcCtIt_Method(fpcCtIt_MethodFunc i_judgeFunc, void* i_data) { diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index cc1b2b3c052..6d559553ce1 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -5,10 +5,12 @@ #include "f_pc/f_pc_create_req.h" #include "SSystem/SComponent/c_malloc.h" +#include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_create_tag.h" #include "f_pc/f_pc_deletor.h" #include "f_pc/f_pc_executor.h" +#include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_layer_iter.h" /* 80020ACC-80020AE8 001C+00 s=1 e=0 z=0 None .text fpcCtRq_isCreatingByID__FP10create_tagPUi diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp index 9655e55f6de..2a419c4afd2 100644 --- a/src/f_pc/f_pc_delete_tag.cpp +++ b/src/f_pc/f_pc_delete_tag.cpp @@ -3,10 +3,10 @@ * Framework - Process Delete Tag */ +#include "SSystem/SComponent/c_list.h" #include "f_pc/f_pc_delete_tag.h" #include "global.h" - /* ############################################################################################## */ /* 803A39A0-803A39B0 000C+04 s=2 e=1 z=0 None .data g_fpcDtTg_Queue */ node_list_class g_fpcDtTg_Queue = {NULL, NULL, 0}; diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp index bb31ce453b9..26f2ba09e9d 100644 --- a/src/f_pc/f_pc_draw.cpp +++ b/src/f_pc/f_pc_draw.cpp @@ -6,6 +6,7 @@ #include "f_pc/f_pc_draw.h" #include "SSystem/SComponent/c_API_graphic.h" #include "f_pc/f_pc_leaf.h" +#include "f_pc/f_pc_node.h" #include "f_pc/f_pc_pause.h" /* 80023954-800239F4 00A0+00 s=0 e=1 z=0 None .text fpcDw_Execute__FP18base_process_class */ diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp index 9ce751bbc6e..9fe86ede4ee 100644 --- a/src/f_pc/f_pc_fstcreate_req.cpp +++ b/src/f_pc/f_pc_fstcreate_req.cpp @@ -6,6 +6,8 @@ #include "f_pc/f_pc_fstcreate_req.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_pc/f_pc_base.h" +#include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_load.h" /* 80023A48-80023A98 0050+00 s=1 e=3 z=52 None .text fpcFCtRq_Do__FP19fast_create_request */ diff --git a/src/f_pc/f_pc_layer_iter.cpp b/src/f_pc/f_pc_layer_iter.cpp index 6e9aaa7974a..bb1f36ceedb 100644 --- a/src/f_pc/f_pc_layer_iter.cpp +++ b/src/f_pc/f_pc_layer_iter.cpp @@ -7,6 +7,7 @@ #include "SSystem/SComponent/c_node_iter.h" #include "SSystem/SComponent/c_tag_iter.h" #include "SSystem/SComponent/c_tree_iter.h" +#include "f_pc/f_pc_layer.h" /* 80021B88-80021BC0 0038+00 s=1 e=4 z=0 None .text fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv */ diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp index e1600cb485e..228feb92340 100644 --- a/src/f_pc/f_pc_layer_tag.cpp +++ b/src/f_pc/f_pc_layer_tag.cpp @@ -4,6 +4,7 @@ */ #include "f_pc/f_pc_layer_tag.h" +#include "f_pc/f_pc_layer.h" /* 80021CD4-80021DCC 00F8+00 s=1 e=1 z=0 None .text * fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs */ diff --git a/src/f_pc/f_pc_line.cpp b/src/f_pc/f_pc_line.cpp index da0d20a41e8..389e7e30d1e 100644 --- a/src/f_pc/f_pc_line.cpp +++ b/src/f_pc/f_pc_line.cpp @@ -5,8 +5,7 @@ #include "f_pc/f_pc_line.h" #include "f_pc/f_pc_node.h" - -#define ARRAY_SIZE(o) (sizeof((o)) / sizeof(*(o))) +#include "global.h" /* ############################################################################################## */ /* 803F4CF0-803F4DB0 00C0+00 s=2 e=0 z=0 None .bss l_fpcLn_Line */ diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index d8d6f120338..ce71bad5831 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -6,6 +6,7 @@ #include "f_pc/f_pc_manager.h" #include "SSystem/SComponent/c_API_graphic.h" #include "d/d_error_msg.h" +#include "d/d_lib.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_creator.h" @@ -25,6 +26,7 @@ #include "f_pc/f_pc_pause.h" #include "f_pc/f_pc_priority.h" #include "f_pc/f_pc_profile.h" +#include "m_Do/m_Do_controller_pad.h" /* 800220A0-800220C0 0020+00 s=1 e=1 z=0 None .text fpcM_Draw__FPv */ void fpcM_Draw(void* i_proc) { diff --git a/src/f_pc/f_pc_method_iter.cpp b/src/f_pc/f_pc_method_iter.cpp index 8b632626837..8e32e2e17e5 100644 --- a/src/f_pc/f_pc_method_iter.cpp +++ b/src/f_pc/f_pc_method_iter.cpp @@ -3,6 +3,7 @@ * Framework - Process Method Iteration */ +#include "SSystem/SComponent/c_list_iter.h" #include "f_pc/f_pc_method_iter.h" /* 80023764-80023788 0024+00 s=0 e=1 z=0 None .text fpcMtdIt_Method__FP15node_list_classPFPv_i diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 8d9d9445fdc..029b9537199 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -12,6 +12,7 @@ #include "f_pc/f_pc_deletor.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_layer.h" +#include "f_pc/f_pc_node.h" #include "f_pc/f_pc_stdcreate_req.h" /* 800227C4-80022804 0040+00 s=1 e=0 z=0 None .text fpcNdRq_RequestQTo__FP19node_create_request diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp index eea4efcab4e..348c0c55235 100644 --- a/src/f_pc/f_pc_pause.cpp +++ b/src/f_pc/f_pc_pause.cpp @@ -4,6 +4,7 @@ */ #include "f_pc/f_pc_pause.h" +#include "f_pc/f_pc_node.h" #include "f_pc/f_pc_layer_iter.h" /* 80023844-80023868 0024+00 s=0 e=3 z=0 None .text fpcPause_IsEnable__FPvUc */ diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp index 470f99fc5f8..09de22ba70d 100644 --- a/src/m_Do/m_Do_DVDError.cpp +++ b/src/m_Do/m_Do_DVDError.cpp @@ -4,7 +4,12 @@ */ #include "m_Do/m_Do_DVDError.h" +#include "JSystem/JKernel/JKRAssertHeap.h" +#include "JSystem/JKernel/JKRThread.h" #include "dol2asm.h" +#include "dolphin/dvd/dvd.h" +#include "dolphin/os/OSAlarm.h" +#include "dolphin/os/OSThread.h" #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_Reset.h" diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 5f39fed7688..3329ad4cc3c 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -4,12 +4,15 @@ */ #include "m_Do/m_Do_MemCard.h" +#include "JSystem/JKernel/JKRAssertHeap.h" #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JGadget/binary.h" #include "MSL_C/string.h" #include "dol2asm.h" +#include "dolphin/card/card.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_MemCardRWmng.h" #include "m_Do/m_Do_Reset.h" /* 8001672C-80016730 01106C 0004+00 1/1 0/0 0/0 .text __ct__15mDoMemCd_Ctrl_cFv */ diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 3dbd01c42b8..97f1d1ea24c 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -4,9 +4,11 @@ */ #include "m_Do/m_Do_MemCardRWmng.h" +#include "JSystem/JUtility/JUTTexture.h" #include "MSL_C/stdio.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" +#include "dolphin/card/card.h" #include "dolphin/types.h" #include "m_Do/m_Do_MemCard.h" diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index 8b6473250dd..cf9a96b1203 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -5,12 +5,15 @@ #include "m_Do/m_Do_Reset.h" #include "JSystem/JAudio2/JASDvdThread.h" +#include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JUtility/JUTGamePad.h" #include "JSystem/JUtility/JUTVideo.h" #include "JSystem/JUtility/JUTXfb.h" #include "SSystem/SComponent/c_API_controller_pad.h" #include "dol2asm.h" +#include "dolphin/dvd/dvd.h" #include "dolphin/gx/GX.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_DVDError.h" diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 59040fd36a1..a967711d401 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -4,8 +4,10 @@ */ #include "m_Do/m_Do_audio.h" +#include "JSystem/JKernel/JKRSolidHeap.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_dvd_thread.h" diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index 450d94eee86..88894d44e7b 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -4,11 +4,12 @@ */ #include "m_Do/m_Do_controller_pad.h" -#include "m_Do/m_Do_main.h" #include "SSystem/SComponent/c_lib.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_ap/f_ap_game.h" +#include "m_Do/m_Do_Reset.h" +#include "m_Do/m_Do_main.h" /* 803DD2D8-803DD2E8 009FF8 0010+00 2/2 6/6 0/0 .bss m_gamePad__8mDoCPd_c */ JUTGamePad* mDoCPd_c::m_gamePad[4]; diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index 447757da324..daacc008dd3 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -4,17 +4,21 @@ */ #include "m_Do/m_Do_dvd_thread.h" +#include "JSystem/JAudio2/JASDvdThread.h" +#include "JSystem/JAudio2/JASTaskThread.h" +#include "JSystem/JKernel/JKRAssertHeap.h" #include "JSystem/JKernel/JKRDvdRipper.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JKernel/JKRThread.h" #include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_node.h" #include "dol2asm.h" #include "dolphin/dvd/dvd.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" -#include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_Reset.h" -#include "JSystem/JAudio2/JASDvdThread.h" -#include "JSystem/JAudio2/JASTaskThread.h" +#include "m_Do/m_Do_ext.h" /* 800157FC-80015858 01013C 005C+00 1/1 0/1 0/0 .text main__9mDoDvdThdFPv */ s32 mDoDvdThd::main(void* param_0) { diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 840927474d5..471fb991d64 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -5,20 +5,25 @@ #include "m_Do/m_Do_ext.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DTevs.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRAssertHeap.h" #include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JMath/JMath.h" #include "MSL_C/stdio.h" #include "MSL_C/string.h" #include "SSystem/SComponent/c_xyz.h" #include "SSystem/SComponent/c_lib.h" +#include "Z2AudioLib/Z2Creature.h" #include "dol2asm.h" -#include "dolphin/mtx/mtx.h" -#include "dolphin/types.h" #include "dolphin/gx/GXDraw.h" +#include "dolphin/mtx/mtx.h" +#include "dolphin/os/OS.h" +#include "dolphin/types.h" #include "d/kankyo/d_kankyo.h" +#include "global.h" #include "m_Do/m_Do_mtx.h" // diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index ac725f6b12c..55d0a570ce6 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -5,11 +5,18 @@ #include "m_Do/m_Do_graphic.h" #include "JSystem/JFramework/JFWSystem.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JUtility/JUTDbPrint.h" +#include "JSystem/JUtility/JUTProcBar.h" +#include "JSystem/JUtility/JUTTexture.h" #include "SSystem/SComponent/c_lib.h" +#include "d/a/d_a_player.h" #include "d/com/d_com_inf_game.h" +#include "d/menu/d_menu_collect.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_ap/f_ap_game.h" +#include "global.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_machine.h" #include "m_Do/m_Do_mtx.h" diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 97e2c19dfe2..d67e433c7cd 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -8,16 +8,24 @@ #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JKernel/JKRAramStream.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTException.h" +#include "JSystem/JUtility/JUTVideo.h" #include "SSystem/SComponent/c_API_controller_pad.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_math.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" +#include "dolphin/vi/vi.h" #include "m_Do/m_Do_DVDError.h" #include "m_Do/m_Do_MemCard.h" +#include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_machine_exception.h" +#include "m_Do/m_Do_main.h" // // Forward References: diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index d7a5dc219a7..9c0a778ad0c 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -7,15 +7,24 @@ #include "DynamicLink.h" #include "JSystem/JAudio2/JASAudioThread.h" #include "JSystem/JAudio2/JASGadget.h" +#include "JSystem/JAudio2/JASTrack.h" +#include "JSystem/JAudio2/JAUSoundTable.h" #include "JSystem/JFramework/JFWSystem.h" #include "JSystem/JKernel/JKRAram.h" +#include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTReport.h" +#include "Z2AudioLib/Z2SoundInfo.h" +#include "Z2AudioLib/Z2WolfHowlMgr.h" #include "c/c_dylink.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" +#include "dolphin/dvd/dvd.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" #include "f_ap/f_ap_game.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_MemCard.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index 45633be7bff..bb56109a75c 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -4,6 +4,8 @@ */ #include "m_Do/m_Do_mtx.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "SSystem/SComponent/c_xyz.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index cc370023955..253b91589ef 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -7,10 +7,10 @@ #include "MSL_C/stdio.h" #include "Runtime.PPCEABI.H/__va_arg.h" #include "dol2asm.h" +#include "dolphin/base/PPCArch.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" -#include "dolphin/base/PPCArch.h" /* 80450B98-80450B9C -00001 0004+00 0/0 6/6 0/0 .sbss None */ u8 __OSReport_disable; diff --git a/src/msg/scrn/d_msg_scrn_base.cpp b/src/msg/scrn/d_msg_scrn_base.cpp index 25d3cce7dbc..0f439244685 100644 --- a/src/msg/scrn/d_msg_scrn_base.cpp +++ b/src/msg/scrn/d_msg_scrn_base.cpp @@ -4,9 +4,13 @@ // #include "msg/scrn/d_msg_scrn_base.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" #include "dol2asm.h" #include "dolphin/types.h" #include "d/msg/d_msg_object.h" +#include "d/msg/d_msg_out_font.h" +#include "d/pane/d_pane_class.h" /* 8023C0DC-8023C124 236A1C 0048+00 0/0 9/9 0/0 .text __ct__14dMsgScrnBase_cFv */ dMsgScrnBase_c::dMsgScrnBase_c() { diff --git a/src/msg/scrn/d_msg_scrn_boss.cpp b/src/msg/scrn/d_msg_scrn_boss.cpp index 88a1ac05569..ce74eed6258 100644 --- a/src/msg/scrn/d_msg_scrn_boss.cpp +++ b/src/msg/scrn/d_msg_scrn_boss.cpp @@ -4,7 +4,10 @@ // #include "msg/scrn/d_msg_scrn_boss.h" +#include "JSystem/J2DGraph/J2DGrafContext.h" +#include "JSystem/J2DGraph/J2DScreen.h" #include "d/msg/d_msg_object.h" +#include "d/pane/d_pane_class.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp index 5da4c77dbb7..0e3f1de9849 100644 --- a/src/msg/scrn/d_msg_scrn_explain.cpp +++ b/src/msg/scrn/d_msg_scrn_explain.cpp @@ -5,7 +5,10 @@ #include "msg/scrn/d_msg_scrn_explain.h" #include "MSL_C/stdio.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2_info.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" //