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/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp

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

rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp

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

rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp

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

rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp

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

rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp

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

rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp

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

rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp

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

rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp

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

rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp

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

rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp

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

rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp

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

rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp

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

rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp

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

rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp

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

rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp

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

rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp

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

rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp

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

rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp

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

rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp

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

rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp

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

rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp

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

rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp

@@ -24,10 +24,7 @@ static bool daObjBombf_createHeap(fopAc_ac_c* i_this) {
 
 /* 80BBAA84-80BBAB9C 000104 0118+00 1/1 0/0 0/0 .text            create__12daObjBombf_cFv */
 int daObjBombf_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daObjBombf_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daObjBombf_c);
 
     int phase = dComIfG_resLoad(&field_0x568, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {

rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp

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

rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp

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

rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp

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

rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp

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

rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp

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

rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp

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

rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp

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

rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp

@@ -1,15 +1,19 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_obj_carry
-//
+/**
+ * @file d_a_obj_carry.cpp
+ * @brief Actor - Various carriable objects
+ */
 
 #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
-#include "rel/d/a/d_a_mirror/d_a_mirror.h"
-#include "MSL_C/string.h"
+#include "rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.h"
+#include "rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.h"
+#include "rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.h"
 #include "d/d_stage.h"
+#include "d/d_lib.h"
 #include "dol2asm.h"
 #include "dolphin/os/OS.h"
-#include "dolphin/types.h"
+#include "d/d_procname.h"
+#include "SSystem/SComponent/c_math.h"
+#include "JSystem/JKernel/JKRHeap.h"
 
 //
 // Types:
@@ -38,12 +42,12 @@ struct dPa_control_c {
     static u8 mTsubo[64];
 };
 
-struct dJntColData_c {};
+// struct dJntColData_c {};
 
-struct dJntCol_c {
-    /* 80035C8C */ dJntCol_c();
-    /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
-};
+// struct dJntCol_c {
+//     /* 80035C8C */ dJntCol_c();
+//     /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
+// };
 
 struct dCcMassS_Mng {
     /* 80085D98 */ void Set(cCcD_Obj*, u8);
@@ -405,7 +409,7 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern u8 ZeroQuat[16];
+// extern "C" extern u8 ZeroQuat[16];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__8dCcD_Cps[36];
@@ -1975,25 +1979,30 @@ SECTION_DATA static u8 l_func[168] = {
 #pragma pop
 
 /* 8047B110-8047B130 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCarry_Method */
-SECTION_DATA static void* l_daObjCarry_Method[8] = {
-    (void*)daObjCarry_Create__FP10fopAc_ac_c,
-    (void*)daObjCarry_Delete__FP12daObjCarry_c,
-    (void*)daObjCarry_Execute__FP12daObjCarry_c,
-    (void*)NULL,
-    (void*)daObjCarry_Draw__FP12daObjCarry_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daObjCarry_Method = {
+    (process_method_func)daObjCarry_Create__FP10fopAc_ac_c,
+    (process_method_func)daObjCarry_Delete__FP12daObjCarry_c,
+    (process_method_func)daObjCarry_Execute__FP12daObjCarry_c,
+    0,
+    (process_method_func)daObjCarry_Draw__FP12daObjCarry_c
 };
 
 /* 8047B130-8047B160 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Carry */
-SECTION_DATA extern void* g_profile_Obj_Carry[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0008FFFD,
-    (void*)0x02FC0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000E28, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x00F40000, (void*)&l_daObjCarry_Method,
-    (void*)0x00040500, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_Obj_Carry = {
+    -3,                     // mLayerID
+    8,                      // mListID
+    -3,                     // mListPrio
+    PROC_Obj_Carry,         // mProcName
+    &g_fpcLf_Method.mBase,  // mSubMtd
+    sizeof(daObjCarry_c),   // mSize
+    0,                      // mSizeOther
+    0,                      // mParameters
+    &g_fopAc_Method.base,   // mSubMtd
+    0x000000F4,             // mPriority
+    &l_daObjCarry_Method,   // mSubMtd
+    0x00040500,             // mStatus
+    0,                      // mActorType
+    0xE                     // mCullType
 };
 
 /* 8047B160-8047B16C 000B10 000C+00 1/1 0/0 0/0 .data            __vt__12dBgS_AcchCir */
@@ -2117,15 +2126,19 @@ COMPILER_STRIP_GATE(0x8047A380, &lit_3930);
 
 /* 8046F340-8046F3E0 0003C0 00A0+00 1/0 0/0 0/0 .text
  * TgHitCallBackBokkuri__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void TgHitCallBackBokkuri(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
+static void TgHitCallBackBokkuri(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
                                      fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/func_8046F340.s"
+
+        daObjCarry_c* obj_carry = static_cast<daObjCarry_c*>(param_0);
+      if (obj_carry && param_2 && 
+            param_3->ChkAtType(AT_TYPE_SHIELD_ATTACK) && 
+            fopAcM_IsActor(param_2) && 
+            fopAcM_GetName(param_2) == PROC_ALINK) {
+        obj_carry->field_0xd5c = FLOAT_LABEL(lit_3927) + cM_rndF(FLOAT_LABEL(lit_3928));
+        obj_carry->field_0xd60 = FLOAT_LABEL(lit_3929) + cM_rndF(FLOAT_LABEL(lit_3930));
+        obj_carry->field_0xd68 = 4000;
+      }
 }
-#pragma pop
 
 /* 8046F3E0-8046F3E4 000460 0004+00 1/0 0/0 0/0 .text
  * CoHitCallBackBase__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
@@ -2169,6 +2182,28 @@ COMPILER_STRIP_GATE(0x8047A394, &lit_3962);
 
 /* 8046F3E4-8046F4AC 000464 00C8+00 1/0 0/0 0/0 .text
  * CoHitCallBackBokkuri__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
+#ifdef NONMATCHING
+// literals
+static void CoHitCallBackBokkuri(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
+                                     fopAc_ac_c* param_2, dCcD_GObjInf* param_3) {
+    daObjCarry_c* _param_0 = static_cast<daObjCarry_c*>(param_0);
+
+    if (_param_0 && param_2 && _param_0->mStts.GetCCMoveP()) {
+        if ((f32)fabs(_param_0->mStts.GetCCMoveP()->x) > FLOAT_LABEL(lit_3958)) {
+            if ((f32)fabs(_param_0->mStts.GetCCMoveP()->z) > FLOAT_LABEL(lit_3958)) {
+
+                _param_0->field_0xd5c = FLOAT_LABEL(lit_3959) + cM_rndF(FLOAT_LABEL(lit_3960));
+                _param_0->field_0xd60 = FLOAT_LABEL(lit_3961) + cM_rndF(FLOAT_LABEL(lit_3962));
+                
+                if (_param_0->field_0xdb0 != 0) {
+                    _param_0->field_0xd5c *= FLOAT_LABEL(lit_3958);
+                    _param_0->field_0xd60 *= FLOAT_LABEL(lit_3958);
+                }
+            }
+        }
+    }
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -2178,92 +2213,101 @@ static asm void CoHitCallBackBokkuri(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
 #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/func_8046F3E4.s"
 }
 #pragma pop
+#endif
 
 /* 8046F4AC-8046F52C 00052C 0080+00 1/1 0/0 0/0 .text            s_swA_sub__FPvPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void s_swA_sub(void* param_0, void* param_1) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/s_swA_sub__FPvPv.s"
+static void* s_swA_sub(void* param_0, void* param_1) {
+    daObjSwBallA_c* ball = static_cast<daObjSwBallA_c*>(param_0);
+    daObjCarry_c* carry = static_cast<daObjCarry_c*>(param_1);
+
+    if (fopAcM_IsActor(ball) && 
+        fopAcM_GetName(ball) == PROC_Obj_SwBallA &&
+        ball && carry) {
+            if (ball->getSwbit() == carry->getSwbit2()) {
+                return param_0;
+            }
+        }
+    return 0;
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 8047B1D8-8047B1DC 000000 0004+00 3/3 0/0 0/0 .bss             l_sw_id */
-static u8 l_sw_id[4];
+static s32 l_sw_id;
 
 /* 8046F52C-8046F59C 0005AC 0070+00 2/2 0/0 0/0 .text            s_sw_sub__FPvPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void s_sw_sub(void* param_0, void* param_1) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/s_sw_sub__FPvPv.s"
+static void* s_sw_sub(void* param_0, void* param_1) {
+    daObjSwBallB_c* ball = static_cast<daObjSwBallB_c*>(param_0);
+
+    if (fopAcM_IsActor(ball) && 
+        fopAcM_GetName(ball) == PROC_Obj_SwBallB &&
+        ball && ball->getID() == l_sw_id) {
+            return param_0;
+        }
+    return 0;
 }
-#pragma pop
 
 /* 8046F59C-8046F610 00061C 0074+00 1/1 0/0 0/0 .text            s_setA_sub__FPvPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void s_setA_sub(void* param_0, void* param_1) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/s_setA_sub__FPvPv.s"
+static void* s_setA_sub(void* param_0, void* param_1) {
+    daTagSetBall_c* ball = static_cast<daTagSetBall_c*>(param_0);
+
+    if (fopAcM_IsActor(ball) && 
+        fopAcM_GetName(ball) == PROC_Tag_SetBall &&
+        ball && param_1 && ball->getType() == 0xF) {
+            return param_0;
+        }
+    return 0;
 }
-#pragma pop
 
 /* 8046F610-8046F684 000690 0074+00 1/1 0/0 0/0 .text            s_setB_sub__FPvPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void s_setB_sub(void* param_0, void* param_1) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/s_setB_sub__FPvPv.s"
+static void* s_setB_sub(void* param_0, void* param_1) {
+    daTagSetBall_c* ball = static_cast<daTagSetBall_c*>(param_0);
+
+    if (fopAcM_IsActor(ball) && 
+        fopAcM_GetName(ball) == PROC_Tag_SetBall &&
+        ball && param_1 && ball->getType() == 0) {
+            return param_0;
+        }
+    return 0;
 }
-#pragma pop
 
 /* 8046F684-8046F6A4 000704 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void CheckCreateHeap(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/CheckCreateHeap__FP10fopAc_ac_c.s"
+static void CheckCreateHeap(fopAc_ac_c* i_this) {
+    static_cast<daObjCarry_c*>(i_this)->CreateHeap();
 }
-#pragma pop
 
 /* 8046F6A4-8046F6BC 000724 0018+00 40/40 0/0 0/0 .text            data__12daObjCarry_cFv */
+#ifdef NONMATCHING
+u8 daObjCarry_c::data() {
+    return mData[mType]; // mData needs to be setup properly first
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daObjCarry_c::data() {
+asm u8 daObjCarry_c::data() {
     nofralloc
 #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/data__12daObjCarry_cFv.s"
 }
 #pragma pop
+#endif
 
 /* 8046F6BC-8046F6D4 00073C 0018+00 3/3 0/0 0/0 .text            getArcName__12daObjCarry_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCarry_c::getArcName() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/getArcName__12daObjCarry_cFv.s"
+void* daObjCarry_c::getArcName() {
+    return l_arcName[mType]; // l_arcName needs to be setup properly at some point
 }
-#pragma pop
 
 /* 8046F6D4-8046F6EC 000754 0018+00 1/1 0/0 0/0 .text            getBmdName__12daObjCarry_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCarry_c::getBmdName() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/getBmdName__12daObjCarry_cFv.s"
+void* daObjCarry_c::getBmdName() {
+    return l_bmdName[mType]; // l_bmdName needs to be setup properly at some point
 }
-#pragma pop
 
 /* 8046F6EC-8046F724 00076C 0038+00 2/2 0/0 0/0 .text            checkFlag__12daObjCarry_cFUc */
+#ifdef NONMATCHING
+// need to finish data() first
+u8 daObjCarry_c::checkFlag(u8 param_0) {
+    return cLib_checkBit(data(), param_0);
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -2272,16 +2316,16 @@ asm void daObjCarry_c::checkFlag(u8 param_0) {
 #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkFlag__12daObjCarry_cFUc.s"
 }
 #pragma pop
+#endif
 
 /* 8046F724-8046F7AC 0007A4 0088+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjCarry_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCarry_c::initBaseMtx() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/initBaseMtx__12daObjCarry_cFv.s"
+void daObjCarry_c::initBaseMtx() {
+    field_0xcf4 = cXyz::Zero;
+    field_0xd00 = 0;
+    field_0xd3c = ZeroQuat;
+    field_0xd4c = field_0xd3c;
+    setBaseMtx();
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 8047A398-8047A39C 000A8C 0004+00 0/1 0/0 0/0 .rodata          @4166 */
@@ -2323,6 +2367,46 @@ SECTION_RODATA static u8 const lit_4171[8] = {
 COMPILER_STRIP_GATE(0x8047A3AC, &lit_4171);
 
 /* 8046F7AC-8046FACC 00082C 0320+00 3/4 0/0 0/0 .text            setBaseMtx__12daObjCarry_cFv */
+#ifdef NONMATCHING
+// literals + data setup
+void daObjCarry_c::setBaseMtx() {
+    Mtx mStack_0x58;
+     
+    if (field_0xcf4.isZero()) {
+        mDoMtx_identity(mStack_0x58);
+    } else {
+        C_MTXRotAxisRad(mStack_0x58,&field_0xcf4,cM_s2rad(field_0xd00));
+    }
+
+    if (mType == TYPE_BOKKURI) {
+        mDoMtx_stack_c::transS(current.pos.x,current.pos.y + (f32)data(),current.pos.z);
+        mDoMtx_stack_c::transM(0.0f,mScale.x*(f32)data(),0.0f);
+        mDoMtx_stack_c::concat(mStack_0x58);
+        mDoMtx_stack_c::transM(0.0f,-mScale.x*(f32)data(),0.0f);
+        mDoMtx_stack_c::ZXYrotM(shape_angle.x+field_0xd64,shape_angle.y+field_0xd6a,shape_angle.z+field_0xd66);
+        mDoMtx_stack_c::transM(0.0f,mScale.x * 35.0f * field_0xd84,field_0xd84 * -25.0f);
+        mDoMtx_stack_c::XrotM(field_0xd84*16384.0f);
+
+    } else if (mType == TYPE_KIBAKO || mType == TYPE_TARU || mType == TYPE_DOKURO) {
+        mDoMtx_stack_c::transS(current.pos.x,current.pos.y + (f32)data(),current.pos.z);
+        mDoMtx_stack_c::transM(0.0f,(f32)data(),0.0f);
+        mDoMtx_stack_c::concat(mStack_0x58);
+        mDoMtx_stack_c::transM(0.0f,-(f32)data(),0.0f);
+        mDoMtx_stack_c::ZXYrotM(shape_angle);
+    } else {
+        mDoMtx_quatMultiply(&field_0xd4c,&field_0xd3c,&field_0xd4c);
+        mDoMtx_stack_c::transS(current.pos.x,(f32)data() + current.pos.y + field_0xddc,current.pos.z);
+        mDoMtx_stack_c::transM(0.0f,(f32)data(),0.0f);
+        mDoMtx_stack_c::quatM(&field_0xd4c);
+        mDoMtx_stack_c::transM(0.0,(f32)data(),0.0);
+        mDoMtx_stack_c::ZXYrotM(shape_angle);
+        field_0xd3c = field_0xd4c;
+    }
+    
+    mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get());
+    mpModel->setBaseScale(mScale);
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -2331,16 +2415,26 @@ asm void daObjCarry_c::setBaseMtx() {
 #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/setBaseMtx__12daObjCarry_cFv.s"
 }
 #pragma pop
+#endif
 
 /* 8046FACC-8046FB78 000B4C 00AC+00 1/1 0/0 0/0 .text            preInit__12daObjCarry_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daObjCarry_c::preInit() {
-    nofralloc
-#include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/preInit__12daObjCarry_cFv.s"
+s32 daObjCarry_c::preInit() {
+    fopAcM_SetupActor(this, daObjCarry_c);
+    if (field_0xd15 == 0) {
+        field_0xd16 = orig.angle.x;
+        field_0xd18 = orig.angle.z;
+        orig.angle.z = 0;
+        orig.angle.x = 0;
+        current.angle.z = 0;
+        current.angle.x = 0;
+        shape_angle.z = 0;
+        shape_angle.x = 0;
+        mOnMoveBG = checkOnMoveBg();
+        field_0xd15 = 1;
+    }
+    mType = getType_private();
+    return 1;
 }
-#pragma pop
 
 /* 8046FB78-8046FD90 000BF8 0218+00 1/1 0/0 0/0 .text            __ct__12daObjCarry_cFv */
 #pragma push
@@ -2898,6 +2992,11 @@ COMPILER_STRIP_GATE(0x8047A424, &lit_5876);
 #pragma pop
 
 /* 80472B54-80472D8C 003BD4 0238+00 1/1 0/0 0/0 .text            crr_pos__12daObjCarry_cFv */
+#ifdef NONMATCHING
+void daObjCarry_c::crr_pos() {
+    
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -2906,6 +3005,7 @@ asm void daObjCarry_c::crr_pos() {
 #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/crr_pos__12daObjCarry_cFv.s"
 }
 #pragma pop
+#endif
 
 /* 80472D8C-80472E5C 003E0C 00D0+00 1/1 0/0 0/0 .text            check_sink__12daObjCarry_cFPf */
 #pragma push

rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp

@@ -4,13 +4,10 @@
 //
 
 #include "rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.h"
-#include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/JKernel/JKRHeap.h"
-#include "SSystem/SComponent/c_phase.h"
 #include "d/bg/d_bg_w.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "global.h"
@@ -93,10 +90,7 @@ public:
     }
 
     int create() {
-        if (!fopAcM_CheckCondition(this, 8)) {
-            new (this) daObjCatDoor_c();
-            fopAcM_OnCondition(this, 8);
-        }
+        fopAcM_SetupActor(this, daObjCatDoor_c);
 
         int phase_state = dComIfG_resLoad(&mPhaseReq, l_arcName);
         if (phase_state != cPhs_COMPLEATE_e) {

rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp

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

rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp

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

rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp

@@ -145,10 +145,7 @@ int daObjBoard_c::Delete() {
 
 /* 8057BCFC-8057BD5C 00041C 0060+00 1/0 0/0 0/0 .text daObjBoard_create1st__FP12daObjBoard_c */
 static int daObjBoard_create1st(daObjBoard_c* i_this) {
-    if (!fopAcM_CheckCondition(i_this, 8)) {
-        new (i_this) daObjBoard_c();
-        fopAcM_OnCondition(i_this, 8);
-    }
+    fopAcM_SetupActor(i_this, daObjBoard_c);
 
     return i_this->create1st();
 }

rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp

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

rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp

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

rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp

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

rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp

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

rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp

@@ -42,10 +42,7 @@ static const char* l_dzbName = "A_UHDoor.dzb";
 
 /* 80BCC93C-80BCCA1C 0001BC 00E0+00 1/1 0/0 0/0 .text            create__11daCowdoor_cFv */
 int daCowdoor_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daCowdoor_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daCowdoor_c);
     int phase = dComIfG_resLoad(&field_0x5a0, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
         phase =

rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp

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

rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp

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

rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp

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

rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp

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

rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp

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

rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp

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

rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp

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

rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp

@@ -77,10 +77,7 @@ int daObjCrystal_c::CreateHeap() {
 
 /* 80BD6664-80BD6718 000344 00B4+00 1/1 0/0 0/0 .text            create__14daObjCrystal_cFv */
 int daObjCrystal_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daObjCrystal_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daObjCrystal_c);
 
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {

rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp

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

rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp

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

rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp

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

rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp

@@ -6,16 +6,12 @@
 #include "rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "d/a/d_a_player.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 
 /* 80BDC618-80BDC73C 000078 0124+00 1/1 0/0 0/0 .text            create__14daObjDigholl_cFv */
 int daObjDigholl_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daObjDigholl_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daObjDigholl_c);
     field_0x569 = fopAcM_GetParam(this);
     field_0x56a = fopAcM_GetParam(this) >> 8;
     field_0x56c = fopAcM_GetParam(this) >> 0x10 & 0xff;

rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp

@@ -11,10 +11,7 @@
 
 /* 8057BF98-8057C138 000078 01A0+00 1/1 0/0 0/0 .text            create__12daObjDigpl_cFv */
 int daObjDigpl_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daObjDigpl_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daObjDigpl_c);
 
     mType = (fopAcM_GetParam(this) >> 8) & 0xF;
     mSwitch = fopAcM_GetParam(this) & 0xFF;

rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp

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

rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp

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

rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp

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

rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp

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

rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp

@@ -15,10 +15,7 @@ struct daObj {
 
 /* 8057C9D8-8057CA94 000078 00BC+00 1/1 0/0 0/0 .text            _create__Q28daObjEff5Act_cFv */
 int daObjEff::Act_c::_create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) Act_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, Act_c);
 
     if (daObj::PrmAbstract<Act_c::Prm_e>(this, PRM_8, PRM_0) == 3) {
         s32 roomNo = fopAcM_GetRoomNo(this);

rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp

@@ -225,10 +225,7 @@ void daObjE_CREATE_c::NameChk() {
 
 /* 80BE3770-80BE3878 000670 0108+00 1/1 0/0 0/0 .text            create__15daObjE_CREATE_cFv */
 int daObjE_CREATE_c::create() {
-    if (!fopAcM_CheckCondition(this, 8)) {
-        new (this) daObjE_CREATE_c();
-        fopAcM_OnCondition(this, 8);
-    }
+    fopAcM_SetupActor(this, daObjE_CREATE_c);
 
     NameChk();
     u32 enemyType = fopAcM_GetParam(this) & 0xF;

rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp

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

rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp

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

rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp

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

rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp

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

rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp

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

rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp

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

rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp

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

rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp

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

rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp

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

rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp

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

rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp

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

rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp

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

rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp

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

rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp

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

rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp

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

rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp

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

rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp

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

rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp

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

rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_bss.cpp

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

rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp

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

rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp

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

rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp

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

rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp

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

rel/d/a/obj/d_a_obj_gpTaru/d_a_obj_gpTaru.cpp

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

rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp

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

rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp

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

rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp

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

rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp

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

rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp

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

rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp

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

rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp

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

rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp

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

rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp

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