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

rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp

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

rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp

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

rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp

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

rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp

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

rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp

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

rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp

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

rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp

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

rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp

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

rel/d/a/b/d_a_b_go/d_a_b_go.cpp

@@ -4,12 +4,8 @@
 //
 
 #include "rel/d/a/b/d_a_b_go/d_a_b_go.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "SSystem/SComponent/c_lib.h"
-#include "SSystem/SComponent/c_math.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
@@ -694,10 +690,7 @@ COMPILER_STRIP_GATE(0x80604088, &lit_3929);
 // matches with literals
 #ifdef NONMATCHING
 static int daB_GO_Create(fopAc_ac_c* i_actor) {
-    if (!fopAcM_CheckCondition(i_actor, 8)) {
-        new (i_actor) b_go_class();
-        fopAcM_OnCondition(i_actor, 8);
-    }
+    fopAcM_SetupActor(i_actor, b_go_class);
     b_go_class* b_go = (b_go_class*)i_actor;
 
     int phase_state = dComIfG_resLoad(&b_go->mPhase, "B_go");

rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp

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

rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp

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

rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp

@@ -4,10 +4,6 @@
  */
 
 #include "rel/d/a/b/d_a_b_oh/d_a_b_oh.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "SSystem/SComponent/c_math.h"
-#include "c/c_damagereaction.h"
-#include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "dol2asm.h"
@@ -1460,10 +1456,7 @@ COMPILER_STRIP_GATE(0x8061DA70, &lit_4519);
 // matches with literals
 #ifdef NONMATCHING
 static int daB_OH_Create(fopAc_ac_c* i_this) {
-    if (!fopAcM_CheckCondition(i_this, 8)) {
-        new (i_this) b_oh_class();
-        fopAcM_OnCondition(i_this, 8);
-    }
+    fopAcM_SetupActor(i_this, b_oh_class);
     b_oh_class* this_ = (b_oh_class*)i_this;
 
     int phase = dComIfG_resLoad(&this_->mPhase, "B_oh");

rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp

@@ -10,7 +10,6 @@
 #include "c/c_damagereaction.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "m_Do/m_Do_graphic.h"
 
 /* 8061DCB8-8061DDB0 000078 00F8+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
@@ -276,10 +275,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
 /* 8061E868-8061E9EC 000C28 0184+00 1/0 0/0 0/0 .text            daB_OH2_Create__FP10fopAc_ac_c */
 static int daB_OH2_Create(fopAc_ac_c* i_this) {
-    if (!fopAcM_CheckCondition(i_this, 8)) {
-        new (i_this) b_oh2_class();
-        fopAcM_OnCondition(i_this, 8);
-    }
+    fopAcM_SetupActor(i_this, b_oh2_class);
     b_oh2_class* _this = static_cast<b_oh2_class*>(i_this);
 
     int phase = dComIfG_resLoad(&_this->mPhase, "B_oh");

rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp

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

rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp

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

rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp

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

rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp

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

rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp

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

rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp

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

rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp

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

rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp

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

rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp

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

rel/d/a/d_a_alldie/d_a_alldie.cpp

@@ -163,10 +163,7 @@ static int daAlldie_Delete(daAlldie_c* i_this) {
 
 /* 804D5BF0-804D5D1C 000450 012C+00 1/0 0/0 0/0 .text            daAlldie_Create__FP10fopAc_ac_c */
 int daAlldie_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daAlldie_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daAlldie_c);
 
     s8 roomNo = fopAcM_GetRoomNo(this);
 

rel/d/a/d_a_andsw/d_a_andsw.cpp

@@ -6,7 +6,6 @@
 #include "rel/d/a/d_a_andsw/d_a_andsw.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_actor_mng.h"
 
 /* 80457978-804579B8 000078 0040+00 1/1 0/0 0/0 .text            Create__9daAndsw_cFv */
 int daAndsw_c::Create() {
@@ -21,10 +20,7 @@ int daAndsw_c::Create() {
 
 /* 804579B8-80457A20 0000B8 0068+00 1/1 0/0 0/0 .text            create__9daAndsw_cFv */
 int daAndsw_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daAndsw_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daAndsw_c);
     if (!Create()) {
         return cPhs_ERROR_e;
     }

rel/d/a/d_a_andsw2/d_a_andsw2.cpp

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

rel/d/a/d_a_arrow/d_a_arrow.cpp

@@ -6,7 +6,6 @@
 #include "rel/d/a/d_a_arrow/d_a_arrow.h"
 #include "dol2asm.h"
 #include "d/com/d_com_inf_game.h"
-#include "f_op/f_op_actor_mng.h"
 
 //
 // Forward References:

rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp

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

rel/d/a/d_a_bd/d_a_bd.cpp

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

rel/d/a/d_a_bg/d_a_bg.cpp

@@ -4,14 +4,10 @@
 //
 
 #include "rel/d/a/d_a_bg/d_a_bg.h"
-#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "MSL_C/string.h"
 #include "d/bg/d_bg_w.h"
 #include "d/bg/d_bg_w_kcol.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
-#include "d/d_demo.h"
 #include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
@@ -1008,10 +1004,7 @@ int daBg_c::create() {
     field_0x5f1 = 0;
 
     if (mHeap == NULL) {
-        if (!fopAcM_CheckCondition(this, 8)) {
-            new (this) daBg_c();
-            fopAcM_OnCondition(this, 8);
-        }
+        fopAcM_SetupActor(this, daBg_c);
 
         orig.roomNo = roomNo;
         current.roomNo = roomNo;

rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp

@@ -7,8 +7,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "MSL_C/stdio.h"
-#include "SSystem/SComponent/c_math.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "dol2asm.h"
 #include "dolphin/os/OS.h"
@@ -1448,10 +1446,7 @@ int daBgObj_c::Delete() {
 
 /* 8045C330-8045C444 002D50 0114+00 1/0 0/0 0/0 .text            daBgObj_create1st__FP9daBgObj_c */
 static int daBgObj_create1st(daBgObj_c* i_this) {
-    if (!fopAcM_CheckCondition(i_this, 8)) {
-        new (i_this) daBgObj_c();
-        fopAcM_OnCondition(i_this, 8);
-    }
+    fopAcM_SetupActor(i_this, daBgObj_c);
 
     return i_this->create1st();
 }

rel/d/a/d_a_boomerang/d_a_boomerang.cpp

@@ -4,12 +4,7 @@
 //
 
 #include "rel/d/a/d_a_boomerang/d_a_boomerang.h"
-#include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
-#include "JSystem/JKernel/JKRArchive.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "JSystem/JParticle/JPAParticle.h"
-#include "SSystem/SComponent/c_math.h"
 #include "d/a/d_a_alink.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"

rel/d/a/d_a_bullet/d_a_bullet.cpp

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

rel/d/a/d_a_canoe/d_a_canoe.cpp

@@ -7,7 +7,6 @@
 #include "dol2asm.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
-#include "f_op/f_op_actor_mng.h"
 
 //
 // Types:

rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp

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

rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp

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

rel/d/a/d_a_cow/d_a_cow.cpp

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

rel/d/a/d_a_crod/d_a_crod.cpp

@@ -8,7 +8,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/a/d_a_alink.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_actor_mng.h"
 #include "rel/d/a/d_a_cstaF/d_a_cstaF.h"
 #include "rel/d/a/d_a_cstatue/d_a_cstatue.h"
 
@@ -80,10 +79,7 @@ static dCcD_SrcCps l_atCpsSrc = {
 
 /* 804A2F18-804A31F8 000158 02E0+00 1/1 0/0 0/0 .text            create__8daCrod_cFv */
 int daCrod_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daCrod_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daCrod_c);
 
     if (fopAcM_GetParam(this) == 6) {
         fopAcM_setStageLayer(this);

rel/d/a/d_a_cstaF/d_a_cstaF.cpp

@@ -5,7 +5,6 @@
 
 #include "rel/d/a/d_a_cstaF/d_a_cstaF.h"
 #include "dol2asm.h"
-#include "f_op/f_op_actor_mng.h"
 
 //
 // Forward References:

rel/d/a/d_a_cstatue/d_a_cstatue.cpp

@@ -6,7 +6,6 @@
 #include "rel/d/a/d_a_cstatue/d_a_cstatue.h"
 #include "dol2asm.h"
 #include "d/com/d_com_inf_game.h"
-#include "f_op/f_op_actor_mng.h"
 
 //
 // Forward References:

rel/d/a/d_a_demo00/d_a_demo00.cpp

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

rel/d/a/d_a_demo_item/d_a_demo_item.cpp

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

rel/d/a/d_a_disappear/d_a_disappear.cpp

@@ -105,10 +105,7 @@ static void set_disappear(disappear_class* i_this, f32 i_scale) {
 /* 804A9364-804A9458 0004C4 00F4+00 1/0 0/0 0/0 .text            daDisappear_Create__FP10fopAc_ac_c
  */
 static int daDisappear_Create(fopAc_ac_c* i_this) {
-    if (!fopAcM_CheckCondition(i_this, 8)) {
-        new (i_this) disappear_class();
-        fopAcM_OnCondition(i_this, 8);
-    }
+    fopAcM_SetupActor(i_this, disappear_class);
     disappear_class* this_ = (disappear_class*)i_this;
 
     this_->field_0x567 = fopAcM_GetParam(this_);

rel/d/a/d_a_dmidna/d_a_dmidna.cpp

@@ -31,10 +31,7 @@ static int daDmidna_createHeap(fopAc_ac_c* i_this) {
 
 /* 8045CFE4-8045D094 000184 00B0+00 1/1 0/0 0/0 .text            create__10daDmidna_cFv */
 int daDmidna_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daDmidna_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daDmidna_c);
 
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {

rel/d/a/d_a_do/d_a_do.cpp

@@ -9,7 +9,6 @@
 #include "d/d_procname.h"
 #include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
-#include "global.h"
 
 //
 // Forward References:

rel/d/a/d_a_dshutter/d_a_dshutter.cpp

@@ -638,10 +638,7 @@ static s8 data_80468174[4];
 
 /* 80467C7C-80467DF8 00085C 017C+00 1/0 0/0 0/0 .text            daDsh_Create__FP10fopAc_ac_c */
 int daDsh_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daDsh_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daDsh_c);
 
     mType = getType();
 

rel/d/a/d_a_econt/d_a_econt.cpp

@@ -8,7 +8,6 @@
 #include "d/d_procname.h"
 #include "d/d_timer.h"
 #include "d/meter/d_meter2_info.h"
-#include "f_op/f_op_actor_mng.h"
 #include "f_pc/f_pc_executor.h"
 
 extern "C" extern u8 data_805197E0[4];
@@ -73,10 +72,7 @@ static int daEcont_Delete(econt_class* i_this) {
 /* 805196E4-80519774 000244 0090+00 1/0 0/0 0/0 .text            daEcont_Create__FP10fopAc_ac_c */
 static int daEcont_Create(fopAc_ac_c* i_this) {
     econt_class* encounter = (econt_class*)i_this;
-    if (!fopAcM_CheckCondition(encounter, 8)) {
-        new (encounter) econt_class();
-        fopAcM_OnCondition(encounter, 8);
-    }
+    fopAcM_SetupActor(i_this, econt_class);
     dTimer_createTimer(8,0x989298,2,0,210.0f,410.0f,32.0f,419.0f);
     encounter->field_0x5b8[0] = 0x14;
     return cPhs_COMPLEATE_e;

rel/d/a/d_a_econt/unknown_translation_unit_bss.cpp

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

rel/d/a/d_a_ep/d_a_ep.cpp

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

rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp

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

rel/d/a/d_a_fr/d_a_fr.cpp

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

rel/d/a/d_a_grass/d_a_grass.cpp

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

rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp

@@ -5,7 +5,6 @@
 
 #include "rel/d/a/d_a_guard_mng/d_a_guard_mng.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_actor_mng.h"
 #include "f_pc/f_pc_executor.h"
 
 /* 80837B18-80837B9C 000078 0084+00 1/1 0/0 0/0 .text            s_sub__FPvPv */

rel/d/a/d_a_hitobj/d_a_hitobj.cpp

@@ -6,7 +6,6 @@
 #include "rel/d/a/d_a_hitobj/d_a_hitobj.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_kankyo_mng.h"
 
 /* 8046B358-8046B360 000078 0008+00 1/0 0/0 0/0 .text            daHitobj_Draw__FP12hitobj_class */
@@ -61,10 +60,7 @@ static dCcD_SrcSph cc_sph_src = {
 /* 8046B400-8046B53C 000120 013C+00 1/0 0/0 0/0 .text            daHitobj_Create__FP10fopAc_ac_c */
 static int daHitobj_Create(fopAc_ac_c* i_this) {
     hitobj_class* hitobj = (hitobj_class*)i_this;
-    if (!fopAcM_CheckCondition(hitobj, 8)) {
-        new (hitobj) hitobj_class();
-        fopAcM_OnCondition(hitobj, 8);
-    }
+    fopAcM_SetupActor(i_this, hitobj_class);
 
     int ret = dComIfG_resLoad(&hitobj->mPhase,"Hitobj");
 

rel/d/a/d_a_horse/d_a_horse.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "rel/d/a/d_a_horse/d_a_horse.h"
-#include "d/a/d_a_player.h"
 #include "d/d_stage.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"

rel/d/a/d_a_hozelda/d_a_hozelda.cpp

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

rel/d/a/d_a_hozelda/unknown_translation_unit_bss.cpp

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

rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp

@@ -47,10 +47,7 @@ static char* l_arcName = "M_IzmGate";
 /* 80849184-80849260 000164 00DC+00 1/0 0/0 0/0 .text            daIzumiGate_Create__FP10fopAc_ac_c
  */
 int daIzumiGate_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daIzumiGate_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daIzumiGate_c);
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
         int objectName = dComIfG_getObjctResName2Index(l_arcName, "M_IzumiGate_b.dzb");

rel/d/a/d_a_kago/d_a_kago.cpp

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

rel/d/a/d_a_mant/d_a_mant.cpp

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

rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp

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

rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp

@@ -4,10 +4,7 @@
 //
 
 #include "rel/d/a/d_a_mg_fshop/d_a_mg_fshop.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "d/bg/d_bg_w.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "dol2asm.h"
 #include "f_pc/f_pc_executor.h"
 #include "m_Do/m_Do_controller_pad.h"

rel/d/a/d_a_midna/d_a_midna.cpp

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

rel/d/a/d_a_midna/unknown_translation_unit_bss.cpp

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

rel/d/a/d_a_mirror/d_a_mirror.cpp

@@ -5,10 +5,6 @@
 
 #include "rel/d/a/d_a_mirror/d_a_mirror.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
-#include "dolphin/gf/GFGeometry.h"
-#include "dolphin/gf/GFLight.h"
-#include "MSL_C/float.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/a/d_a_player.h"
@@ -559,12 +555,9 @@ void daMirror_c::setModelMtx() {
 }
 
 /* 80872018-8087206C 0014D8 0054+00 1/0 0/0 0/0 .text            daMirror_create__FP10daMirror_c */
-static int daMirror_create(daMirror_c* param_0) {
-    if (fopAcM_CheckCondition(param_0, 8) == 0) {
-        new (param_0) daMirror_c();
-        fopAcM_OnCondition(param_0, 8);
-    }
-    return param_0->daMirror_c::create();
+static int daMirror_create(daMirror_c* i_this) {
+    fopAcM_SetupActor(i_this, daMirror_c);
+    return i_this->daMirror_c::create();
 }
 
 /* ############################################################################################## */

rel/d/a/d_a_movie_player/d_a_movie_player.cpp

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

rel/d/a/d_a_myna/d_a_myna.cpp

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

rel/d/a/d_a_nbomb/d_a_nbomb.cpp

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

rel/d/a/d_a_ni/d_a_ni.cpp

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

rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp

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

rel/d/a/d_a_path_line/d_a_path_line.cpp

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

rel/d/a/d_a_peru/d_a_peru.cpp

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

rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp

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

rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp

@@ -4,9 +4,7 @@
 //
 
 #include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_mtx.h"
@@ -78,12 +76,9 @@ COMPILER_STRIP_GATE(0x80485C9C, &lit_3759);
 /* 80485974-80485A30 0001B4 00BC+00 1/0 0/0 0/0 .text            daScex_Create__FP10fopAc_ac_c */
 // matches with literals
 #ifdef NONMATCHING
-static int daScex_Create(fopAc_ac_c* ac) {
-    if (!fopAcM_CheckCondition(ac, 8)) {
-        new (ac) daScex_c();
-        fopAcM_OnCondition(ac, 8);
-    }
-    daScex_c* scex = static_cast<daScex_c*>(ac);
+static int daScex_Create(fopAc_ac_c* i_this) {
+    fopAcM_SetupActor(i_this, daScex_c);
+    daScex_c* scex = static_cast<daScex_c*>(i_this);
 
     mDoMtx_stack_c::transS(scex->current.pos.x, scex->current.pos.y, scex->current.pos.z);
     mDoMtx_stack_c::YrotM(scex->shape_angle.y);

rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp

@@ -59,10 +59,7 @@ int daScExit_c::Create() {
 
 /* 8059E230-8059E2C0 000150 0090+00 1/1 0/0 0/0 .text            create__10daScExit_cFv */
 int daScExit_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daScExit_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daScExit_c);
 
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {

rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp

@@ -27,10 +27,7 @@ int daSetBgObj_c::CreateInit() {
 
 /* 80485DFC-80485E88 0000FC 008C+00 1/1 0/0 0/0 .text            create__12daSetBgObj_cFv */
 int daSetBgObj_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daSetBgObj_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daSetBgObj_c);
 
     sprintf(mArcName, "%s", getArcName(this));
 

rel/d/a/d_a_shop_item/d_a_shop_item.cpp

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

rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp

@@ -28,10 +28,7 @@ int daSkip2D_c::createHeap() {
 
 /* 80D4D4F4-80D4D588 0000F4 0094+00 1/1 0/0 0/0 .text            create__10daSkip2D_cFv */
 int daSkip2D_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daSkip2D_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daSkip2D_c);
 
     if (!fopAcM_entrySolidHeap(this, daSkip2D_createHeap, 0)) {
         return cPhs_ERROR_e;

rel/d/a/d_a_spinner/d_a_spinner.cpp

@@ -5,9 +5,6 @@
 
 #include "rel/d/a/d_a_spinner/d_a_spinner.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
-#include "d/bg/d_bg_w.h"
-#include "d/cc/d_cc_d.h"
 #include "d/a/d_a_alink.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "rel/d/a/d_a_mirror/d_a_mirror.h"

rel/d/a/d_a_sq/d_a_sq.cpp

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

rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp

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

rel/d/a/d_a_suspend/d_a_suspend.cpp

@@ -6,7 +6,6 @@
 #include "rel/d/a/d_a_suspend/d_a_suspend.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_actor_mng.h"
 
 /* 804D5118-804D51E0 000078 00C8+00 1/1 0/0 0/0 .text            create__7daSus_cFv */
 int daSus_c::create() {
@@ -36,10 +35,7 @@ int daSus_c::create() {
 
 /* 804D51E0-804D5234 000140 0054+00 1/0 0/0 0/0 .text            daSus_create__FP7daSus_c */
 static int daSus_create(daSus_c* i_this) {
-    if (!fopAcM_CheckCondition(i_this, 8)) {
-        new (i_this) daSus_c();
-        fopAcM_OnCondition(i_this, 8);
-    }
+    fopAcM_SetupActor(i_this, daSus_c);
 
     return i_this->create();
 }

rel/d/a/d_a_swBall/d_a_swBall.cpp

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

rel/d/a/d_a_swLBall/d_a_swLBall.cpp

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

rel/d/a/d_a_swTime/d_a_swTime.cpp

@@ -6,7 +6,6 @@
 #include "rel/d/a/d_a_swTime/d_a_swTime.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_actor_mng.h"
 
 
 /* 80D4F638-80D4F660 000078 0028+00 1/1 0/0 0/0 .text            Create__10daSwTime_cFv */
@@ -19,10 +18,7 @@ int daSwTime_c::Create() {
 
 /* 80D4F660-80D4F6C8 0000A0 0068+00 1/1 0/0 0/0 .text            create__10daSwTime_cFv */
 int daSwTime_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daSwTime_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daSwTime_c);
     if (!Create()) {
         return cPhs_ERROR_e;
     }

rel/d/a/d_a_swc00/d_a_swc00.cpp

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

rel/d/a/d_a_swc00/unknown_translation_unit_bss.cpp

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

rel/d/a/d_a_swhit0/d_a_swhit0.cpp

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

rel/d/a/d_a_talk/d_a_talk.cpp

@@ -5,7 +5,6 @@
 
 #include "rel/d/a/d_a_talk/d_a_talk.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/msg/d_msg_object.h"
 #include "f_op/f_op_msg_mng.h"
@@ -29,10 +28,7 @@ daTalk_c::~daTalk_c() {
 
 /* 80D663E4-80D664AC 0000E4 00C8+00 1/1 0/0 0/0 .text            create__8daTalk_cFv */
 int daTalk_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daTalk_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daTalk_c);
 
     if (getStatus() != 1) {
         return cPhs_ERROR_e;

rel/d/a/d_a_tbox/d_a_tbox.cpp

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

rel/d/a/d_a_tbox2/d_a_tbox2.cpp

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

rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp

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

rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp

@@ -7,7 +7,6 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_actor_mng.h"
 
 /* 80D66858-80D66860 000078 0008+00 1/1 0/0 0/0 .text            Create__10daTboxSw_cFv */
 int daTboxSw_c::Create() {
@@ -16,10 +15,7 @@ int daTboxSw_c::Create() {
 
 /* 80D66860-80D668C8 000080 0068+00 1/1 0/0 0/0 .text            create__10daTboxSw_cFv */
 int daTboxSw_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daTboxSw_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daTboxSw_c);
 
     if (!Create()) {
         return cPhs_ERROR_e;

rel/d/a/d_a_title/d_a_title.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "rel/d/a/d_a_title/d_a_title.h"
-#include "JSystem/JStudio/JStudio/stb.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 

rel/d/a/d_a_title/d_a_title_nonmatching.cpp

@@ -4,14 +4,6 @@
 //
 
 #include "rel/d/a/d_a_title/d_a_title.h"
-#include "JSystem/J2DGraph/J2DScreen.h"
-#include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "JSystem/JKernel/JKRMemArchive.h"
-#include "JSystem/JStudio/JStudio/stb.h"
-#include "dol2asm.h"
-#include "dolphin/types.h"
 #include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_overlap_mng.h"
@@ -303,10 +295,7 @@ int daTitle_c::CreateHeap() {
 
 /* 80D66CDC-80D66E7C 0002BC 01A0+00 1/1 0/0 0/0 .text            create__9daTitle_cFv */
 int daTitle_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daTitle_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daTitle_c);
     
     int phase_state = dComIfG_resLoad(&mPhaseReq, l_arcName);
     if (phase_state != cPhs_COMPLEATE_e) {

rel/d/a/d_a_vrbox/d_a_vrbox.cpp

@@ -136,10 +136,7 @@ static int daVrbox_solidHeapCB(fopAc_ac_c* i_this) {
 
 /* 804988DC-80498988 00043C 00AC+00 1/0 0/0 0/0 .text            daVrbox_Create__FP10fopAc_ac_c */
 static int daVrbox_Create(fopAc_ac_c* i_this) {
-    if (!fopAcM_CheckCondition(i_this, 8)) {
-        new (i_this) vrbox_class();
-        fopAcM_OnCondition(i_this, 8);
-    }
+    fopAcM_SetupActor(i_this, vrbox_class);
     vrbox_class* this_ = (vrbox_class*)i_this;
 
     this_->field_0x574 = 0;

rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp

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

rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp

@@ -4,9 +4,7 @@
  */
 
 #include "rel/d/a/d_a_warp_bug/d_a_warp_bug.h"
-#include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 
@@ -147,10 +145,7 @@ static int daWarpBug_Delete(daWarpBug_c* i_this) {
 }
 
 int daWarpBug_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daWarpBug_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daWarpBug_c);
 
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {

rel/d/a/d_a_ykgr/d_a_ykgr.cpp

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

rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp

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

rel/d/a/door/d_a_door_boss/unknown_translation_unit_bss.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "rel/d/a/door/d_a_door_boss/unknown_translation_unit_bss.h"
-#include "dol2asm.h"
 #include "dolphin/types.h"
 
 //