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/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"