d_a_obj_carry work, SETUP_ACTOR macro, header cleanup (#1885)

* d_a_obj_carry work, SETUP_ACTOR macro

* rm headers, add script

* progress

* macro rename, consistent spacing

src/DynamicLink.cpp

@@ -4,7 +4,6 @@
  */
 
 #include "DynamicLink.h"
-#include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRFileCache.h"
@@ -12,8 +11,6 @@
 #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"
 

src/__start.c

@@ -1,6 +1,5 @@
 #include "MSL_C/stdlib.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "init.h"
 
 //

src/c/c_damagereaction.cpp

@@ -5,7 +5,6 @@
 
 #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"

src/c/c_dylink.cpp

@@ -4,14 +4,11 @@
  */
 #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"

src/d/a/d_a_alink.cpp

@@ -9,24 +9,14 @@
 #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"
 #include "SSystem/SComponent/c_math.h"
-#include "d/a/d_a_horse_static.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/d_bomb.h"
-#include "d/d_demo.h"
 #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"
@@ -12611,10 +12601,7 @@ inline bool checkMagicArmorWearFlg() {
 /* 800A5CC8-800A660C 0A0608 0944+00 1/1 0/0 0/0 .text            create__9daAlink_cFv */
 #ifdef NONMATCHING
 int daAlink_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daAlink_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daAlink_c);
 
     if (!struct_80450FD0) {
         bgWaitFlg = 0;

src/d/a/d_a_horse_static.cpp

@@ -4,8 +4,6 @@
 //
 
 #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() {

src/d/a/d_a_item_static.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/a/d_a_item_static.h"
-#include "dol2asm.h"
 #include "dolphin/types.h"
 
 //

src/d/a/d_a_itembase.cpp

@@ -6,8 +6,6 @@
 #include "d/a/d_a_itembase.h"
 #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"
 

src/d/a/d_a_itembase_static.cpp

@@ -8,7 +8,6 @@
 #include "SSystem/SComponent/c_lib.h"
 #include "d/d_item_data.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 u8 daItemBase_c::getItemNo() {
     return m_itemNo;

src/d/a/d_a_no_chg_room.cpp

@@ -5,7 +5,6 @@
 
 #include "d/a/d_a_no_chg_room.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/a/d_a_npc.cpp

@@ -4,14 +4,9 @@
 //
 
 #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 "d/msg/d_msg_object.h"
 #include "m_Do/m_Do_lib.h"

src/d/a/d_a_npc_cd.cpp

@@ -5,7 +5,6 @@
 
 #include "d/a/d_a_npc_cd.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/a/d_a_npc_cd2.cpp

@@ -5,7 +5,6 @@
 
 #include "d/a/d_a_npc_cd2.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/a/d_a_obj.cpp

@@ -6,7 +6,6 @@
 #include "d/a/d_a_obj.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 //

src/d/a/d_a_obj_item.cpp

@@ -4,14 +4,11 @@
 //
 
 #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"
 
@@ -742,10 +739,7 @@ SECTION_DATA extern void* __vt__8daItem_c[17 + 36 /* padding */] = {
 // matches, but issues with vtable
 #ifdef NONMATCHING
 int daItem_c::_daItem_create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daItem_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daItem_c);
 
     if (!field_0x95d) {
         field_0x92c = orig.angle.x;

src/d/a/d_a_obj_ss_base.cpp

@@ -4,8 +4,6 @@
 //
 
 #include "d/a/d_a_obj_ss_base.h"
-#include "dol2asm.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 //

src/d/a/d_a_player.cpp

@@ -8,11 +8,7 @@
 #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"
-#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_lib.h"
 #include "rel/d/a/d_a_boomerang/d_a_boomerang.h"

src/d/bg/d_bg_plc.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/bg/d_bg_plc.h"
-#include "dol2asm.h"
 #include "dolphin/types.h"
 
 //

src/d/bg/d_bg_s.cpp

@@ -8,8 +8,6 @@
 #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"
 
 //

src/d/bg/d_bg_s_acch.cpp

@@ -10,7 +10,6 @@
 #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"
 

src/d/bg/d_bg_s_gnd_chk.cpp

@@ -5,7 +5,6 @@
 
 #include "d/bg/d_bg_s_gnd_chk.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:

src/d/bg/d_bg_s_grp_pass_chk.cpp

@@ -5,7 +5,6 @@
 
 #include "d/bg/d_bg_s_grp_pass_chk.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:

src/d/bg/d_bg_s_lin_chk.cpp

@@ -5,7 +5,6 @@
 
 #include "d/bg/d_bg_s_lin_chk.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 //

src/d/bg/d_bg_s_movebg_actor.cpp

@@ -6,7 +6,6 @@
 #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"
 

src/d/bg/d_bg_s_poly_pass_chk.cpp

@@ -5,7 +5,6 @@
 
 #include "d/bg/d_bg_s_poly_pass_chk.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:

src/d/bg/d_bg_w.cpp

@@ -4,11 +4,9 @@
 //
 
 #include "d/bg/d_bg_w.h"
-#include "JSystem/JMath/JMATrigonometric.h"
 #include "SSystem/SComponent/c_math.h"
 #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"
 

src/d/bg/d_bg_w_kcol.cpp

@@ -6,7 +6,6 @@
 #include "d/bg/d_bg_w_kcol.h"
 #include "d/bg/d_bg_pc.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/cc/d_cc_d_nonmatching.cpp

@@ -4,9 +4,6 @@
 //
 
 #include "d/cc/d_cc_d.h"
-#include "dol2asm.h"
-#include "dolphin/types.h"
-#include "f_op/f_op_actor_iter.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_pc/f_pc_searcher.h"
 

src/d/cc/d_cc_mass_s.cpp

@@ -7,7 +7,6 @@
 #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    */

src/d/cc/d_cc_s.cpp

@@ -7,7 +7,6 @@
 #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"
 
 //

src/d/cc/d_cc_uty.cpp

@@ -4,13 +4,11 @@
 //
 
 #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"
 
 //

src/d/com/d_com_inf_game.cpp

@@ -11,15 +11,10 @@
 #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"

src/d/com/d_com_static.cpp

@@ -5,11 +5,8 @@
 
 #include "d/com/d_com_static.h"
 #include "MSL_C/stdio.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"
 #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"

src/d/d_att_dist.cpp

@@ -1,6 +1,5 @@
 #include "d/d_att_dist.h"
 #include "d/d_attention.h"
-#include "dol2asm.h"
 #include "dolphin/types.h"
 
 /* ############################################################################################## */

src/d/d_attention.cpp

@@ -9,9 +9,7 @@
 #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"
 

src/d/d_bomb.cpp

@@ -5,7 +5,6 @@
 
 #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) ||

src/d/d_bright_check.cpp

@@ -5,11 +5,7 @@
 
 #include "d/d_bright_check.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
-#include "d/d_drawlist.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/msg/d_msg_string.h"
-#include "d/meter/d_meter2_info.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"

src/d/d_camera.cpp

@@ -6,8 +6,6 @@
 #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"

src/d/d_demo.cpp

@@ -4,12 +4,9 @@
 //
 
 #include "d/d_demo.h"
-#include "MSL_C/float.h"
-#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"

src/d/d_drawlist.cpp

@@ -4,16 +4,10 @@
 //
 
 #include "d/d_drawlist.h"
-#include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
-#include "JSystem/J3DGraphBase/J3DShape.h"
-#include "JSystem/J3DGraphBase/J3DSys.h"
-#include "JSystem/JMath/JMath.h"
 #include "SSystem/SComponent/c_bg_s_shdw_draw.h"
-#include "SSystem/SComponent/c_math.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/s/d_s_play.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/mtx/mtx44.h"

src/d/d_envse.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_envse.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/d_error_msg.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_error_msg.h"
 #include "dol2asm.h"
-#include "dolphin/dvd/dvd.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 

src/d/d_ev_camera.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_ev_camera.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/d_eye_hl.cpp

@@ -5,9 +5,6 @@
 
 #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 "dol2asm.h"
 #include "dolphin/os/OS.h"

src/d/d_gameover.cpp

@@ -4,16 +4,13 @@
 //
 
 #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"
 

src/d/d_item.cpp

@@ -6,7 +6,6 @@
 #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"
 
 //

src/d/d_item_data.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_item_data.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:

src/d/d_jnt_col.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_jnt_col.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_mtx.h"
 

src/d/d_k_wmark.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_k_wmark.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/d_k_wpillar.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_k_wpillar.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/d_kantera_icon_meter.cpp

@@ -9,7 +9,6 @@
 #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"
 
 /* 801AE938-801AE974 1A9278 003C+00 0/0 3/3 0/0 .text            __ct__15dKantera_icon_cFv */

src/d/d_kyeff.cpp

@@ -4,10 +4,8 @@
  */
 
 #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"
 

src/d/d_lib.cpp

@@ -6,7 +6,6 @@
 #include "d/d_lib.h"
 #include "SSystem/SComponent/c_m3d.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
 #include "m_Do/m_Do_controller_pad.h"
 

src/d/d_model.cpp

@@ -4,11 +4,9 @@
 //
 
 #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"
 

src/d/d_name.cpp

@@ -4,16 +4,11 @@
 //
 
 #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"

src/d/d_npc_lib.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_npc_lib.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/d_resorce.cpp

@@ -4,17 +4,10 @@
 //
 
 #include "d/d_resorce.h"
-#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "JSystem/J3DGraphBase/J3DTevs.h"
-#include "JSystem/J3DGraphBase/J3DTexture.h"
-#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"

src/d/d_scope.cpp

@@ -4,7 +4,6 @@
 //
 
 #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"

src/d/d_select_cursor.cpp

@@ -5,11 +5,8 @@
 
 #include "d/d_select_cursor.h"
 #include "d/com/d_com_inf_game.h"
-#include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/J2DGraph/J2DAnimation.h"
-#include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "dolphin/os/OS.h"
 #include "global.h"
 

src/d/d_simple_model.cpp

@@ -4,9 +4,7 @@
 //
 
 #include "d/d_simple_model.h"
-#include "d/kankyo/d_kankyo.h"
 #include "d/com/d_com_inf_game.h"
-#include "dolphin/types.h"
 #include "m_Do/m_Do_mtx.h"
 
 //

src/d/d_spline_path.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_spline_path.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:

src/d/d_stage.cpp

@@ -11,15 +11,12 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
 #include "d/d_lib.h"
-#include "d/d_path.h"
 #include "d/d_procname.h"
-#include "d/d_tresure.h"
 #include "d/map/d_map_path_dmap.h"
 #include "d/map/d_map_path_fmap.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"

src/d/d_timer.cpp

@@ -4,13 +4,11 @@
 //
 
 #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"
 
 //

src/d/d_tresure.cpp

@@ -6,8 +6,6 @@
 #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"
 #include "d/d_path.h"
 #include "SSystem/SComponent/c_math.h"
 

src/d/d_vib_pattern.cpp

@@ -5,7 +5,6 @@
 
 #include "d/d_vib_pattern.h"
 #include "d/d_vibration.h"
-#include "dolphin/types.h"
 
 /* ############################################################################################## */
 /* 8037A620-8037A678 006C80 0058+00 0/0 1/1 0/0 .rodata          MS_patt__12dVibration_c */

src/d/d_vibration.cpp

@@ -4,8 +4,6 @@
 //
 
 #include "d/d_vibration.h"
-#include "dol2asm.h"
-#include "dolphin/types.h"
 #include "d/com/d_com_inf_game.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "SSystem/SComponent/c_math.h"

src/d/event/d_event.cpp

@@ -5,15 +5,10 @@
 
 #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"
 #include "d/d_procname.h"
-#include "d/d_stage.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#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"

src/d/event/d_event_data.cpp

@@ -4,13 +4,9 @@
 //
 
 #include "d/event/d_event_data.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/d_camera.h"
-#include "d/d_demo.h"
 #include "d/d_gameover.h"
 #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"

src/d/event/d_event_lib.cpp

@@ -5,9 +5,7 @@
 
 #include "d/event/d_event_lib.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/event/d_event_manager.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 //

src/d/event/d_event_manager.cpp

@@ -6,12 +6,8 @@
 #include "d/event/d_event_manager.h"
 #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 "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 #include "global.h"
 #include "m_Do/m_Do_audio.h"

src/d/file/d_file_sel_info.cpp

@@ -11,7 +11,6 @@
 #include "d/meter/d_meter2_info.h"
 #include "d/pane/d_pane_class.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:

src/d/file/d_file_sel_warning.cpp

@@ -8,7 +8,6 @@
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/file/d_file_select.cpp

@@ -7,13 +7,8 @@
 #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"

src/d/kankyo/d_kankyo.cpp

@@ -4,15 +4,8 @@
 //
 
 #include "d/kankyo/d_kankyo.h"
-#include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "MSL_C/string.h"
 #include "SSystem/SComponent/c_counter.h"
-#include "SSystem/SComponent/c_math.h"
-#include "d/a/d_a_player.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/kankyo/d_kankyo_data.h"
-#include "d/kankyo/d_kankyo_rain.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"

src/d/kankyo/d_kankyo_data.cpp

@@ -5,8 +5,6 @@
 
 #include "d/kankyo/d_kankyo_data.h"
 #include "d/d_stage.h"
-#include "dol2asm.h"
-#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 //

src/d/kankyo/d_kankyo_rain.cpp

@@ -4,13 +4,9 @@
 //
 
 #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"
 #include "m_Do/m_Do_lib.h"
 #include "SSystem/SComponent/c_math.h"

src/d/kankyo/d_kankyo_wether.cpp

@@ -6,13 +6,10 @@
 #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"
 #include "d/kankyo/d_kankyo.h"
 #include "d/kankyo/d_kankyo_rain.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "global.h"
 #include "m_Do/m_Do_audio.h"
 

src/d/map/d_map.cpp

@@ -5,7 +5,6 @@
 
 #include "d/map/d_map.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/map/d_map_path_dmap.cpp

@@ -4,7 +4,6 @@
  */
 
 #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"

src/d/map/d_map_path_fmap.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/map/d_map_path_fmap.h"
-#include "MSL_C/float.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 

src/d/menu/d_menu_calibration.cpp

@@ -9,7 +9,6 @@
 #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 */

src/d/menu/d_menu_collect.cpp

@@ -4,15 +4,9 @@
 //
 
 #include "d/menu/d_menu_collect.h"
-#include "JSystem/J2DGraph/J2DAnimation.h"
-#include "JSystem/J2DGraph/J2DAnmLoader.h"
-#include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "MSL_C/string.h"
-#include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_lib.h"
 #include "d/d_select_cursor.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/meter/d_meter2_info.h"

src/d/menu/d_menu_dmap.cpp

@@ -4,7 +4,6 @@
 //
 
 #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"

src/d/menu/d_menu_dmap_map.cpp

@@ -5,7 +5,6 @@
 
 #include "d/menu/d_menu_dmap_map.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/menu/d_menu_fishing.cpp

@@ -6,15 +6,12 @@
 #include "d/menu/d_menu_fishing.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
-#include "JSystem/JUtility/TColor.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_lib.h"
 #include "d/menu/d_menu_dmap.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/msg/d_msg_string.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
 

src/d/menu/d_menu_fmap.cpp

@@ -7,7 +7,6 @@
 #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"

src/d/menu/d_menu_fmap2D.cpp

@@ -5,7 +5,6 @@
 
 #include "d/menu/d_menu_fmap2D.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/menu/d_menu_fmap_map.cpp

@@ -5,7 +5,6 @@
 
 #include "d/menu/d_menu_fmap_map.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/menu/d_menu_insect.cpp

@@ -6,17 +6,12 @@
 #include "d/menu/d_menu_insect.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
-#include "JSystem/JUtility/TColor.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/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
-#include "d/msg/d_msg_class.h"
 #include "d/msg/d_msg_string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"

src/d/menu/d_menu_item_explain.cpp

@@ -5,7 +5,6 @@
 
 #include "d/menu/d_menu_item_explain.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/menu/d_menu_letter.cpp

@@ -8,7 +8,6 @@
 #include "MSL_C/stdio.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/menu/d_menu_map_common.cpp

@@ -4,9 +4,6 @@
 //
 
 #include "d/menu/d_menu_map_common.h"
-#include "JSystem/J2DGraph/J2DPane.h"
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "JSystem/JUtility/TColor.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_select_cursor.h"
 #include "d/meter/d_meter_HIO.h"

src/d/menu/d_menu_option.cpp

@@ -7,7 +7,6 @@
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSRtc.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/menu/d_menu_ring.cpp

@@ -6,7 +6,6 @@
 #include "d/menu/d_menu_ring.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Types:

src/d/menu/d_menu_save.cpp

@@ -4,7 +4,6 @@
 //
 
 #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"
@@ -16,8 +15,6 @@
 #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"

src/d/menu/d_menu_skill.cpp

@@ -5,18 +5,14 @@
 
 #include "d/menu/d_menu_skill.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JKernel/JKRMemArchive.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/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
-#include "d/msg/d_msg_class.h"
 #include "d/msg/d_msg_string.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "global.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"

src/d/menu/d_menu_window.cpp

@@ -5,9 +5,7 @@
 
 #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"
@@ -26,7 +24,6 @@
 #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"

src/d/meter/d_meter2.cpp

@@ -15,9 +15,7 @@
 #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"
-#include "m_Do/m_Do_audio.h"
 #include "rel/d/a/d_a_horse/d_a_horse.h"
 
 struct dMeterHakusha_c : public dMeterSub_c {

src/d/meter/d_meter2_draw.cpp

@@ -8,9 +8,7 @@
 #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"

src/d/meter/d_meter2_info.cpp

@@ -5,12 +5,8 @@
 
 #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"