diff options
Diffstat (limited to 'src')
139 files changed, 444 insertions, 34 deletions
diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index b42a027f00..2772beb541 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 0923c6837b..8116bd5d95 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 fcf5b640c3..a04d07d782 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 cd827157ed..44eb658438 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 9e64804270..e1253611b8 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 aa00fad483..142d5b3dca 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 b7d6cf8e19..1cb2402a1f 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 eee828d49e..ca0f1b5c9d 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 2d13730aa7..a9e30df428 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 561124c589..b832abab3f 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 5696d66466..007fd0677e 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 89e1d8999d..990e965952 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 d04cba9df7..4f110311d4 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 83596cc942..835a7d2742 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 a850fbc1ca..ba9142591d 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 9477aeb75f..8ff99322b1 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 63d4c0e23f..7112deed77 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 95c93417f1..3f9d1fc3ad 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 3d5095e9ed..d98e77f0c5 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 d18ba1f884..c546c63aae 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 aaf065545a..c02cefa060 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 afa3571b5b..73a7af91ec 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 d21038f7c3..02fe7150ff 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 4eadd75cc8..6bb62fb86a 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 389d7e4db6..68c2e9b74b 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 d3f6192ab6..e3d6b9ba5b 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 3104de2c06..48f10476af 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 ba9fcd64f3..19d0bb7de2 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 a1f3925b32..095978b196 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 a007e80de6..ff8d9ae305 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 73abec2c13..750e2d5b24 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 60008a8a61..6c909dc9ad 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 ee3b260042..a1fcebf76d 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 c916527623..fa24779fc8 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 c5691f1e97..1b52681062 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 52dd72fd22..3e16a27b47 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 87c577d002..e3e0b5754f 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 23abd6e669..a9d62c6da4 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 b68b20b138..ced745080b 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 cc186865e5..f07967a6cf 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 5f9bee44e7..3e234f78da 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 e01da64eb4..603748c8f6 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 7367ece488..6e86781906 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 77e074e3cb..5cec7f27fe 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 d5e53af63b..7487e050e2 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 e27fa83141..5c37337407 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 8458937530..d6f44ddcd2 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 bb05219dee..004225ab22 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 e38c47e40b..89eb2ec594 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 1307e6c206..556a3f3615 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 4c149b9fcf..c1c243a561 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 b1713ea6ba..3f34b52283 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 ad00d8473a..de8ebe15e6 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 7237f3678c..d6e334fe01 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 8630e948e1..3d3b2e607d 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 4a99929522..81dbab3a97 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 1e8c06b367..2bb54c3d94 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 9f13897000..1e8d53c23d 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 0341448f4d..de419779ee 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 e3d6041ea1..ed1ba5c5a7 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 a37283bc79..ae5417b21e 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 450dbd1ff6..b1e3903d8e 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 398f0698a5..c143d87183 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 87bd3ccac6..aaec4f3efc 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 f54dbafc1f..19eb040ea3 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 56c6f57215..9e799999b5 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 b4a60f2b05..33d3ecb34e 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 97bd179e30..7c3e25e2a8 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 d3a970f09d..3891965541 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 9ba5bb7c10..5237e3bcdf 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 47180550ec..5f4291ca6f 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 d866e1a79b..5f8e90a6d4 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 b9df371915..dcc4ea3c6b 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 40eb48e3d6..78be2b9a5b 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 d41a15a655..a7ac6f9af4 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 b05d03cb5a..d7cf9e1d95 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 cbd403363b..8afa4dd99a 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 a0d16cf3b6..b22e4a8c92 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 6d50d3ae35..f6c4c6b2f4 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 1a5ca727f2..6143d7c01d 100644 --- a/src/d/msg/d_msg_out_font.cpp +++ b/src/d/msg/d_msg_out_font.cpp @@ -4,10 +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 "d/com/d_com_inf_game.h" +#include "global.h" // // Forward References: diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp index 8d74180582..db0e5f01fb 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 d8f2f24ef8..2ee45fdd5d 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 bea422bea4..b79380fb02 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 17d05caae8..bd19960a10 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 "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/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" /* 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 a32ac807d1..354831b872 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 377212c2fe..bc964d989a 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 d13dabfef1..b1aaaf735b 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 fcc4225dea..0187320254 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 f883b4d7af..77bc75d70d 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 dfcfc2a433..fc16b0726d 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/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 "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 "d/d_demo.h" -#include "d/d_model.h" -#include "d/d_procname.h" -#include "f_op/f_op_msg_mng.h" -#include "d/save/d_save_HIO.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 5ea2c86a5a..79fa110da8 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 d4dc037a85..5a3163bf6c 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 b26a1f35b8..b7ec765058 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 a1ed67aae8..34b2ac1c67 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 27d1b92edd..ac22d565bd 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 81347de663..112eea3aff 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 cd6740cd85..09e7a314ed 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 de0c7198b8..4a4d35f810 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 4fa5fd5fd0..665d738d99 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 c89473ab68..511f33ca66 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 5daa1511d2..771624df35 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 ac3dbc0cdf..38ba80921e 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 b9b30830ff..a7f9e18752 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 09e1786306..efceab4ca1 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 5600eb1aa0..0eb284f10a 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 6f7de58896..79a1a6e0fe 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 8d6622ab4d..3952ae029c 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 5ae68c389a..0d2a7df7f4 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 3831a62dd9..2c727692ae 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 56021f060b..6aa5e75be0 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 5b77008629..57d4fcfca2 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 388e2c9a1e..9c55e32774 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 cc1b2b3c05..6d559553ce 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 9655e55f6d..2a419c4afd 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 bb31ce453b..26f2ba09e9 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 9ce751bbc6..9fe86ede4e 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 6e9aaa7974..bb1f36ceed 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 e1600cb485..228feb9234 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 da0d20a41e..389e7e30d1 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 d8d6f12033..ce71bad583 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 8b63262683..8e32e2e17e 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 8d9d9445fd..029b953719 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 eea4efcab4..348c0c5523 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 470f99fc5f..09de22ba70 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 5f39fed768..3329ad4cc3 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 3dbd01c42b..97f1d1ea24 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 8b6473250d..cf9a96b120 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 59040fd36a..a967711d40 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 450d94eee8..88894d44e7 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 447757da32..daacc008dd 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 840927474d..471fb991d6 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/gx/GXDraw.h" #include "dolphin/mtx/mtx.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" -#include "dolphin/gx/GXDraw.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 ac725f6b12..55d0a570ce 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 97e2c19dfe..d67e433c7c 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 d7a5dc219a..9c0a778ad0 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 45633be7bf..bb56109a75 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 cc37002395..253b91589e 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 25d3cce7db..0f43924468 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 88a1ac0556..ce74eed625 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 5da4c77dbb..0e3f1de984 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" // |