Rename fopAcM_SetupActor to fopAcM_ct

docs/decompiling.md

@@ -142,10 +142,10 @@ For example, if you were to look at the actor's create function, you should see
 
 ![Create function in Ghidra](images/ghidra_setup_actor_macro.png)
 
-This code is constructing the actor when it's first created. You shouldn't write it out by hand - instead, use the `fopAcM_SetupActor` macro, like so:
+This code is constructing the actor when it's first created. You shouldn't write it out by hand - instead, use the `fopAcM_ct` macro, like so:
 
 ```cpp
-    fopAcM_SetupActor(this, daWall_c);
+    fopAcM_ct(this, daWall_c);
 ```
 
 That should expand out into the proper code when compiled. If something in there is missing even after using the macro, then you might not have set up all of the actor's member variables properly in the previous step, so add any missing fields now.

include/d/actor/d_a_npc_nz.h

@@ -19,7 +19,7 @@ public:
     };
 
     // objdiff says this is a weak function
-    // but defining it here with {} causes it to be inlined with fopAcM_SetupActor which breaks things
+    // but defining it here with {} causes it to be inlined with fopAcM_ct which breaks things
     daNpc_Nz_c();
 
     void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }

include/f_op/f_op_actor_mng.h

@@ -1,7 +1,7 @@
 #ifndef F_OP_ACTOR_MNG_H_
 #define F_OP_ACTOR_MNG_H_
 
-#include "new.h" // IWYU pragma: export // Used by the fopAcM_SetupActor macro.
+#include "new.h" // IWYU pragma: export // Used by the fopAcM_ct macro.
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_iter.h"
 #include "f_pc/f_pc_manager.h"
@@ -11,12 +11,16 @@
 #include "d/d_save.h"
 #include "d/d_event.h"
 
-#define fopAcM_SetupActor(ptr,ClassName) \
+// The name of this macro is official and comes from a TP debug assert: "fopAcM_ct No Call !!"
+#define fopAcM_ct(ptr,ClassName) \
     if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \
         new (ptr) ClassName(); \
         fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \
     }
 
+// Unofficial name, kept to avoid conflicts with open PRs. TODO: Remove later.
+#define fopAcM_SetupActor fopAcM_ct
+
 class J3DModelData;
 class daItem_c;
 

src/d/actor/d_a_acorn_leaf.cpp

@@ -129,7 +129,7 @@ fpc_ProcID daAleaf_c::create_acorn_sub(bool arg1) {
 
 /* 0000049C-000005EC       .text _create__9daAleaf_cFv */
 cPhs_State daAleaf_c::_create() {
-    fopAcM_SetupActor(this, daAleaf_c);
+    fopAcM_ct(this, daAleaf_c);
 
     cPhs_State ret = dComIfG_resLoad(&unk_290, daAleaf_c::m_arcname);
     if (ret == cPhs_COMPLEATE_e) {

src/d/actor/d_a_agb.cpp

@@ -1774,7 +1774,7 @@ BOOL daAgb_c::createHeap() {
 /* 800D3B58-800D3D2C       .text daAgb_Create__FP10fopAc_ac_c */
 static cPhs_State daAgb_Create(fopAc_ac_c* i_this) {
     daAgb_c* a_this = (daAgb_c*)i_this;
-    fopAcM_SetupActor(i_this, daAgb_c);
+    fopAcM_ct(i_this, daAgb_c);
 
     cPhs_State phase = dComIfG_resLoad(&a_this->mPhase, "Agb");
     if (phase == cPhs_COMPLEATE_e) {

src/d/actor/d_a_agbsw0.cpp

@@ -2572,7 +2572,7 @@ static BOOL daAgbsw0_Delete(daAgbsw0_c* i_this) {
 
 /* 00004E98-00004F80       .text daAgbsw0_Create__FP10fopAc_ac_c */
 static cPhs_State daAgbsw0_Create(fopAc_ac_c* i_this) {
-    fopAcM_SetupActor(i_this, daAgbsw0_c);
+    fopAcM_ct(i_this, daAgbsw0_c);
 
     return static_cast<daAgbsw0_c*>(i_this)->create();
 }

src/d/actor/d_a_alldie.cpp

@@ -67,7 +67,7 @@ BOOL daAlldie_c::execute() {
 }
 
 cPhs_State daAlldie_c::create() {
-    fopAcM_SetupActor(this, daAlldie_c);
+    fopAcM_ct(this, daAlldie_c);
 
     if (!dComIfGs_isSwitch(getSwbit(), fopAcM_GetRoomNo(this))) {
         setActio(ACT_CHECK);

src/d/actor/d_a_am.cpp

@@ -1164,7 +1164,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
 
 /* 00003C00-00003F5C       .text daAM_Create__FP10fopAc_ac_c */
 static cPhs_State daAM_Create(fopAc_ac_c* i_this) {
-    fopAcM_SetupActor(i_this, am_class);
+    fopAcM_ct(i_this, am_class);
 
     am_class* a_this = (am_class*)i_this;
 

src/d/actor/d_a_am2.cpp

@@ -1271,7 +1271,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
 
 /* 00003E70-00004250       .text daAM2_Create__FP10fopAc_ac_c */
 static cPhs_State daAM2_Create(fopAc_ac_c* i_this) {
-    fopAcM_SetupActor(i_this, am2_class);
+    fopAcM_ct(i_this, am2_class);
 
     am2_class* a_this = (am2_class*)i_this;
 

src/d/actor/d_a_amiprop.cpp

@@ -118,7 +118,7 @@ void daAmiProp_c::CreateInit() {
 
 /* 00000318-00000444       .text _create__11daAmiProp_cFv */
 cPhs_State daAmiProp_c::_create() {
-    fopAcM_SetupActor(this, daAmiProp_c);
+    fopAcM_ct(this, daAmiProp_c);
     cPhs_State ret = dComIfG_resLoad(&mPhase, daAmiProp_c::m_arcname);
 
     if (ret == cPhs_COMPLEATE_e) {

src/d/actor/d_a_andsw0.cpp

@@ -318,7 +318,7 @@ static BOOL daAndsw0_Delete(andsw0_class*) {
 
 /* 00000974-00000A64       .text daAndsw0_Create__FP10fopAc_ac_c */
 static cPhs_State daAndsw0_Create(fopAc_ac_c* ac) {
-    fopAcM_SetupActor(ac, andsw0_class);
+    fopAcM_ct(ac, andsw0_class);
 
     andsw0_class * i_this = (andsw0_class *)ac;
     i_this->mNumSwitchesToCheck = (fopAcM_GetParam(ac) >> 0) & 0xFF;

src/d/actor/d_a_andsw2.cpp

@@ -180,7 +180,7 @@ BOOL daAndsw2_c::execute() {
 cPhs_State daAndsw2_c::create() {
     int sw = getSwbit();
     
-    fopAcM_SetupActor(this, daAndsw2_c);
+    fopAcM_ct(this, daAndsw2_c);
     
     switch (getType()) {
     case TYPE_ONE_OFF:

src/d/actor/d_a_arrow.cpp

@@ -1216,7 +1216,7 @@ BOOL daArrow_c::_draw() {
 
 /* 800D7960-800D7A38       .text _create__9daArrow_cFv */
 cPhs_State daArrow_c::_create() {
-    fopAcM_SetupActor(this, daArrow_c);
+    fopAcM_ct(this, daArrow_c);
     
     checkCreater();
     

src/d/actor/d_a_arrow_iceeff.cpp

@@ -110,7 +110,7 @@ void daArrow_Iceeff_c::set_mtx() {
 }
 
 cPhs_State daArrow_Iceeff_c::_create() {
-    fopAcM_SetupActor(this, daArrow_Iceeff_c);
+    fopAcM_ct(this, daArrow_Iceeff_c);
 
     void* arrow = fopAcM_SearchByID(parentActorID);
     if(arrow == 0) {

src/d/actor/d_a_arrow_lighteff.cpp

@@ -190,7 +190,7 @@ void daArrow_Lighteff_c::set_mtx() {
 }
 
 cPhs_State daArrow_Lighteff_c::_create() {
-    fopAcM_SetupActor(this, daArrow_Lighteff_c);
+    fopAcM_ct(this, daArrow_Lighteff_c);
 
     field_0x2EA = 0;
     if(!fopAcM_entrySolidHeap(this, &CheckCreateHeap, 0x2660)) {

src/d/actor/d_a_atdoor.cpp

@@ -97,9 +97,9 @@ cPhs_State daAtdoor_c::create() {
     if (ret != cPhs_COMPLEATE_e) {
         return ret;
     }
-    fopAcM_SetupActor(this, daAtdoor_c);
+    fopAcM_ct(this, daAtdoor_c);
 #else
-    fopAcM_SetupActor(this, daAtdoor_c);
+    fopAcM_ct(this, daAtdoor_c);
     if (ret != cPhs_COMPLEATE_e) {
         return ret;
     }

src/d/actor/d_a_att.cpp

@@ -200,7 +200,7 @@ static cPhs_State daAtt_Create(fopAc_ac_c* i_this) {
     };
     
     att_class* a_this = (att_class*)i_this;
-    fopAcM_SetupActor(i_this, att_class);
+    fopAcM_ct(i_this, att_class);
     
     a_this->m2B5 = fopAcM_GetParam(a_this) & 0xFF;
     a_this->attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 4;

src/d/actor/d_a_auction.cpp

@@ -229,7 +229,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 
 /* 00000664-000006F4       .text _create__11daAuction_cFv */
 cPhs_State daAuction_c::_create() {
-    fopAcM_SetupActor(this, daAuction_c);
+    fopAcM_ct(this, daAuction_c);
 
     cPhs_State phase_state = dComIfG_resLoad(&mPhs, "Pspl");
 

src/d/actor/d_a_bb.cpp

@@ -2700,7 +2700,7 @@ static cPhs_State daBb_Create(fopAc_ac_c* a_this) {
 
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Bb");
 
-    fopAcM_SetupActor(a_this, bb_class);
+    fopAcM_ct(a_this, bb_class);
 
     if (ret == cPhs_COMPLEATE_e) {
         i_this->unk_2D8 = (fopAcM_GetParam(i_this) >> 0) & 0xFF;

src/d/actor/d_a_bdk.cpp

@@ -4004,7 +4004,7 @@ static cPhs_State daBdk_Create(fopAc_ac_c* a_this) {
         }},
     };
 
-    fopAcM_SetupActor(a_this, bdk_class);
+    fopAcM_ct(a_this, bdk_class);
     bdk_class* i_this = (bdk_class*)a_this;
     fopAc_ac_c* actor = &i_this->actor;
 

src/d/actor/d_a_bdkobj.cpp

@@ -561,7 +561,7 @@ static cPhs_State daBdkobj_Create(fopAc_ac_c* a_this) {
     };
 
     bdkobj_class* i_this = (bdkobj_class*)a_this;
-    fopAcM_SetupActor(a_this, bdkobj_class);
+    fopAcM_ct(a_this, bdkobj_class);
 
     cPhs_State res = dComIfG_resLoad(&i_this->mPhase, "Bdkobj");
     if (res == cPhs_ERROR_e) {

src/d/actor/d_a_beam.cpp

@@ -597,9 +597,9 @@ cPhs_State daBeam_c::_create() {
 #if VERSION == VERSION_DEMO
     cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
     if (PVar1 == cPhs_COMPLEATE_e) {
-        fopAcM_SetupActor(this, daBeam_c);
+        fopAcM_ct(this, daBeam_c);
 #else
-    fopAcM_SetupActor(this, daBeam_c);
+    fopAcM_ct(this, daBeam_c);
     cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
     if (PVar1 == cPhs_COMPLEATE_e) {
 #endif

src/d/actor/d_a_bflower.cpp

@@ -235,7 +235,7 @@ int daBFlower_c::init_bck_anm(s16 param) {
 
 /* 0000080C-000008AC       .text _create__11daBFlower_cFv */
 cPhs_State daBFlower_c::_create() {
-    fopAcM_SetupActor(this, daBFlower_c);
+    fopAcM_ct(this, daBFlower_c);
 
     cPhs_State phase_state = dComIfG_resLoad(&mPhs, m_arcname);
 

src/d/actor/d_a_bg.cpp

@@ -341,7 +341,7 @@ static cPhs_State daBg_Create(fopAc_ac_c* i_ac) {
 
 /* 800D9094-800D9318       .text create__6daBg_cFv */
 cPhs_State daBg_c::create() {
-    fopAcM_SetupActor(this, daBg_c);
+    fopAcM_ct(this, daBg_c);
 
     s32 roomNo = fopAcM_GetParam(this);
     JKRExpHeap * roomHeap = dStage_roomControl_c::getMemoryBlock(roomNo);

src/d/actor/d_a_bgn.cpp

@@ -331,7 +331,7 @@ static cPhs_State daBgn_Create(fopAc_ac_c* i_this) {
             /* Radius */ 70.0f,
         }},
     };
-    fopAcM_SetupActor(i_this, bgn_class);
+    fopAcM_ct(i_this, bgn_class);
 }
 
 static actor_method_class l_daBgn_Method = {

src/d/actor/d_a_bita.cpp

@@ -234,7 +234,7 @@ static cPhs_State daBita_Create(fopAc_ac_c* i_ac) {
         }},
     };
 
-    fopAcM_SetupActor(i_ac, bita_class);
+    fopAcM_ct(i_ac, bita_class);
     bita_class* i_this = (bita_class*)i_ac;
 
     cPhs_State rt = dComIfG_resLoad(&i_this->mPhs, "Bita");

src/d/actor/d_a_bk.cpp

@@ -4743,7 +4743,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
 
 /* 0000E310-0000EA2C       .text daBk_Create__FP10fopAc_ac_c */
 static cPhs_State daBk_Create(fopAc_ac_c* i_actor) {
-    fopAcM_SetupActor(i_actor, bk_class);
+    fopAcM_ct(i_actor, bk_class);
     bk_class* i_this = (bk_class*)i_actor;
     
     cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhase, "Bk");

src/d/actor/d_a_bmd.cpp

@@ -1941,7 +1941,7 @@ static cPhs_State daBmd_Create(fopAc_ac_c* a_this) {
     cXyz local_30;
 
     bmd_class* i_this = (bmd_class*)a_this;
-    fopAcM_SetupActor(a_this, bmd_class);
+    fopAcM_ct(a_this, bmd_class);
     res = dComIfG_resLoad(&i_this->mPhs, "Bmd");
 #if VERSION == VERSION_DEMO
     if (res == cPhs_ERROR_e) {

src/d/actor/d_a_bmdfoot.cpp

@@ -811,7 +811,7 @@ static cPhs_State daBmdfoot_Create(fopAc_ac_c* a_this) {
     };
     cPhs_State res;
 
-    fopAcM_SetupActor(a_this, bmdfoot_class);
+    fopAcM_ct(a_this, bmdfoot_class);
     bmdfoot_class* i_this = (bmdfoot_class*)a_this;
     res = dComIfG_resLoad(&i_this->m2AC, "Bmdfoot");
     if (res == cPhs_ERROR_e) {

src/d/actor/d_a_bmdhand.cpp

@@ -770,7 +770,7 @@ static cPhs_State daBmdhand_Create(fopAc_ac_c* a_this) {
     cPhs_State res;
 
     fopAc_ac_c* actor = a_this;
-    fopAcM_SetupActor(actor, bmdhand_class);
+    fopAcM_ct(actor, bmdhand_class);
     bmdhand_class* i_this = (bmdhand_class*)a_this;
     res = dComIfG_resLoad(&i_this->m2AC, "Bmdhand");
     if (res == cPhs_ERROR_e) {

src/d/actor/d_a_boko.cpp

@@ -946,7 +946,7 @@ cPhs_State daBoko_c::create() {
         }},
     };
 
-    fopAcM_SetupActor(this, daBoko_c);
+    fopAcM_ct(this, daBoko_c);
 
     u32 type = fopAcM_GetParam(this);
     if (type == Type_UNK_7_e) {

src/d/actor/d_a_bomb2.cpp

@@ -404,7 +404,7 @@ namespace daBomb2 {
     }
 
     cPhs_State Act_c::_create() {
-        fopAcM_SetupActor(this, Act_c);
+        fopAcM_ct(this, Act_c);
 
         cPhs_State status = dComIfG_resLoad(&mPhase, attr().resName);
 

src/d/actor/d_a_bomb3.inc

@@ -1375,7 +1375,7 @@ cPhs_State daBomb_c::create() {
         mType = 0;
     }
 
-    fopAcM_SetupActor(this, daBomb_c);
+    fopAcM_ct(this, daBomb_c);
 
     cPhs_State status = mType == 1 ? dComIfG_resLoad(&mPhase, attrType().resName) : cPhs_COMPLEATE_e;
 

src/d/actor/d_a_boomerang.cpp

@@ -797,7 +797,7 @@ static dCcD_SrcCps l_at_cps_src = {
 
 /* 800E2CE8-800E2EF0       .text create__13daBoomerang_cFv */
 cPhs_State daBoomerang_c::create() {
-    fopAcM_SetupActor(this, daBoomerang_c);
+    fopAcM_ct(this, daBoomerang_c);
 
     if (!fopAcM_entrySolidHeap(this, daBoomerang_createHeap, 0xD40)) {
         return cPhs_ERROR_e;

src/d/actor/d_a_boss_item.cpp

@@ -24,7 +24,7 @@ static BOOL daBossItem_Delete(bossitem_class* i_this) {
 /* 00000088-00000128       .text daBossItem_Create__FP10fopAc_ac_c */
 static cPhs_State daBossItem_Create(fopAc_ac_c* i_this) {
     bossitem_class* a_this = (bossitem_class*)i_this;
-    fopAcM_SetupActor(i_this, bossitem_class);
+    fopAcM_ct(i_this, bossitem_class);
 
     int stageNo = daBossItem_prm::getStage(a_this);
     BOOL isStageBossDead = dComIfGs_isStageBossEnemy(stageNo);

src/d/actor/d_a_bpw.cpp

@@ -4370,12 +4370,12 @@ static cPhs_State daBPW_Create(fopAc_ac_c* a_this) {
     fopAc_ac_c* actor = a_this;
     csXyz sp18 = actor->shape_angle;
 #if VERSION > VERSION_DEMO
-    fopAcM_SetupActor(actor, bpw_class);
+    fopAcM_ct(actor, bpw_class);
 #endif
     res = dComIfG_resLoad(&i_this->m2AC, "BPW");
     if (res == cPhs_COMPLEATE_e) {
 #if VERSION == VERSION_DEMO
-        fopAcM_SetupActor(actor, bpw_class);
+        fopAcM_ct(actor, bpw_class);
 #endif
         i_this->mType = (bpw_class::Actor_Type_e)fopAcM_GetParam(actor);
         i_this->mUnknownParam2 = (bpw_class::Damage_Action_e)((uint)fopAcM_GetParam(actor) >> 8);

src/d/actor/d_a_branch.cpp

@@ -192,13 +192,13 @@ static BOOL daBranch_Delete(daBranch_c* i_this) {
 
 inline cPhs_State daBranch_c::create() {
 #if VERSION > VERSION_DEMO
-    fopAcM_SetupActor(this, daBranch_c);
+    fopAcM_ct(this, daBranch_c);
 #endif
 
     cPhs_State phase_state = dComIfG_resLoad(&mPhase, daBranch_c::m_arcname);
     if (phase_state == cPhs_COMPLEATE_e) {
 #if VERSION == VERSION_DEMO
-        fopAcM_SetupActor(this, daBranch_c);
+        fopAcM_ct(this, daBranch_c);
 #endif
 
         if (!fopAcM_entrySolidHeap(this, daBranch_c::solidHeapCB, 0x4000)) {

src/d/actor/d_a_bridge.cpp

@@ -1452,9 +1452,9 @@ static cPhs_State daBridge_Create(fopAc_ac_c* a_this) {
 #if VERSION == VERSION_DEMO
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Bridge");
     if (ret == cPhs_COMPLEATE_e) {
-        fopAcM_SetupActor(&i_this->actor, bridge_class);
+        fopAcM_ct(&i_this->actor, bridge_class);
 #else
-    fopAcM_SetupActor(&i_this->actor, bridge_class);
+    fopAcM_ct(&i_this->actor, bridge_class);
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Bridge");
     if (ret == cPhs_COMPLEATE_e) {
 #endif

src/d/actor/d_a_bst.cpp

@@ -3053,7 +3053,7 @@ static cPhs_State daBst_Create(fopAc_ac_c* a_this) {
         }},
     };
 
-    fopAcM_SetupActor(a_this, bst_class);
+    fopAcM_ct(a_this, bst_class);
     cPhs_State res;
     bst_class* i_this = (bst_class*)a_this;
     fopAc_ac_c* actor = &i_this->actor;

src/d/actor/d_a_btd.cpp

@@ -2866,7 +2866,7 @@ static cPhs_State daBtd_Create(fopAc_ac_c* a_this) {
     cPhs_State res;
 
     fopAc_ac_c* actor = a_this;
-    fopAcM_SetupActor(actor, btd_class);
+    fopAcM_ct(actor, btd_class);
     btd_class* i_this = (btd_class*)a_this;
     res = dComIfG_resLoad(&i_this->m02AC, "Btd");
     if (res != cPhs_COMPLEATE_e) {

src/d/actor/d_a_bwd.cpp

@@ -2530,7 +2530,7 @@ static cPhs_State daBwd_Create(fopAc_ac_c* a_this) {
     f32 fVar1;
     cPhs_State res;
 
-    fopAcM_SetupActor(a_this, bwd_class);
+    fopAcM_ct(a_this, bwd_class);
     bwd_class* i_this = (bwd_class*)a_this;
     fopAc_ac_c* actor = &i_this->actor;
     res = dComIfG_resLoad(&i_this->mPhaseBwd, "Bwd");

src/d/actor/d_a_bwdg.cpp

@@ -220,7 +220,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
 /* 000009A0-00000B5C       .text daBwdg_Create__FP10fopAc_ac_c */
 static cPhs_State daBwdg_Create(fopAc_ac_c* i_actor) {
     bwdg_class* i_this = (bwdg_class*)i_actor;
-    fopAcM_SetupActor(i_this, bwdg_class);
+    fopAcM_ct(i_this, bwdg_class);
     
     cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhase, "Bwdg");
     if (phase_state == cPhs_COMPLEATE_e) {

src/d/actor/d_a_bwds.cpp

@@ -1033,7 +1033,7 @@ static cPhs_State daBwds_Create(fopAc_ac_c* a_this) {
     };
 
     bwds_class* i_this = (bwds_class*)a_this;
-    fopAcM_SetupActor(&i_this->actor, bwds_class);
+    fopAcM_ct(&i_this->actor, bwds_class);
 
     cPhs_State res = dComIfG_resLoad(&i_this->m02AC, "Bwds");
     if (res == cPhs_COMPLEATE_e) {

src/d/actor/d_a_canon.cpp

@@ -589,7 +589,7 @@ static cPhs_State daCanonCreate(void* i_this) {
 
 /* 00002094-000023C0       .text _create__9daCanon_cFv */
 cPhs_State daCanon_c::_create() {
-    fopAcM_SetupActor(this, daCanon_c);
+    fopAcM_ct(this, daCanon_c);
 
     cPhs_State PVar1 = dComIfG_resLoad(&mPhase, M_arcname);
     if (PVar1 == cPhs_COMPLEATE_e) {

src/d/actor/d_a_cc.cpp

@@ -2580,7 +2580,7 @@ static cPhs_State daCC_Create(fopAc_ac_c* a_this) {
 
     cc_class* i_this = (cc_class*)a_this;
 
-    fopAcM_SetupActor(a_this, cc_class);
+    fopAcM_ct(a_this, cc_class);
 
     cPhs_State PVar3 = dComIfG_resLoad(&i_this->mPhase, "CC");
     if (PVar3 == cPhs_COMPLEATE_e) {

src/d/actor/d_a_coming2.cpp

@@ -589,7 +589,7 @@ void daComing2::Act_c::coming_process_main() {
 
 /* 00002154-00002264       .text _create__Q29daComing25Act_cFv */
 cPhs_State daComing2::Act_c::_create() {
-    fopAcM_SetupActor(this, daComing2::Act_c);
+    fopAcM_ct(this, daComing2::Act_c);
     unk_299 = -1;
     init_barrel_info();
     init_coming_info();

src/d/actor/d_a_coming3.cpp

@@ -433,7 +433,7 @@ bool daComing3::Act_c::create_heap() {
 
 /* 000018CC-00001A24       .text _create__Q29daComing35Act_cFv */
 cPhs_State daComing3::Act_c::_create() {
-    fopAcM_SetupActor(this, daComing3::Act_c);
+    fopAcM_ct(this, daComing3::Act_c);
 
     cPhs_State ret = dComIfG_resLoad(&mPhase, M_arcname);
     if (ret == cPhs_COMPLEATE_e) {

src/d/actor/d_a_dai.cpp

@@ -114,7 +114,7 @@ void daDai_c::CreateInit() {
 
 /* 000003A8-00000494       .text _create__7daDai_cFv */
 cPhs_State daDai_c::_create() {
-    fopAcM_SetupActor(this, daDai_c);
+    fopAcM_ct(this, daDai_c);
 
     if (!checkItemGet(dItem_DELIVERY_BAG_e, TRUE)) {
         return cPhs_ERROR_e;

src/d/actor/d_a_dai_item.cpp

@@ -373,7 +373,7 @@ void daStandItem_c::CreateInit() {
 
 /* 800E3E94-800E4048       .text _create__13daStandItem_cFv */
 cPhs_State daStandItem_c::_create() {
-    fopAcM_SetupActor(this, daStandItem_c);
+    fopAcM_ct(this, daStandItem_c);
 
     mItemNo = fopAcM_GetParam(this);
     mItemType = convItemNo(mItemNo);

src/d/actor/d_a_daiocta.cpp

@@ -1687,7 +1687,7 @@ void daDaiocta_c::createInit() {
 
 /* 00004660-00004918       .text _create__11daDaiocta_cFv */
 cPhs_State daDaiocta_c::_create() {
-    fopAcM_SetupActor(this, daDaiocta_c);
+    fopAcM_ct(this, daDaiocta_c);
     cPhs_State state = dComIfG_resLoad(&mPhs, m_arc_name);
 
     if (state == cPhs_COMPLEATE_e) {

src/d/actor/d_a_daiocta_eye.cpp

@@ -469,7 +469,7 @@ void daDaiocta_Eye_c::createInit() {
 
 /* 000012D4-00001450       .text _create__15daDaiocta_Eye_cFv */
 cPhs_State daDaiocta_Eye_c::_create() {
-    fopAcM_SetupActor(this, daDaiocta_Eye_c);
+    fopAcM_ct(this, daDaiocta_Eye_c);
     cPhs_State result = dComIfG_resLoad(&mPhs, m_arc_name);
     if (result == cPhs_COMPLEATE_e) {
         if (!fopAcM_entrySolidHeap(this, createHeap_CB, m_heapsize)) {

src/d/actor/d_a_deku_item.cpp

@@ -107,7 +107,7 @@ void daDekuItem_c::CreateInit() {
 
 /* 000003A8-00000598       .text _create__12daDekuItem_cFv */
 cPhs_State daDekuItem_c::_create() {
-    fopAcM_SetupActor(this, daDekuItem_c);
+    fopAcM_ct(this, daDekuItem_c);
 
     mItemBitNo = daDekuItem_prm::getItemBitNo(this);
 

src/d/actor/d_a_demo00.cpp

@@ -428,7 +428,7 @@ static BOOL daDemo00_Delete(daDemo00_c* i_this) {
 /* 800E78D0-800E7964       .text daDemo00_Create__FP10fopAc_ac_c */
 static cPhs_State daDemo00_Create(fopAc_ac_c* i_ac) {
     daDemo00_c* i_this = (daDemo00_c*)i_ac;
-    fopAcM_SetupActor(i_this, daDemo00_c);
+    fopAcM_ct(i_this, daDemo00_c);
     dKy_tevstr_init(&i_this->tevStr, dComIfGp_roomControl_getStayNo(), 0xFF);
     i_this->setAction(&daDemo00_c::actStandby);
     i_this->nextRes.reset();

src/d/actor/d_a_demo_dk.cpp

@@ -126,7 +126,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
 static cPhs_State daDEMO_DK_Create(fopAc_ac_c* a_this) {
     demo_dk_class* i_this = (demo_dk_class*)a_this;
     
-    fopAcM_SetupActor(&i_this->actor, demo_dk_class);
+    fopAcM_ct(&i_this->actor, demo_dk_class);
 
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "DEMO_DK");
     if (ret == cPhs_COMPLEATE_e) {

src/d/actor/d_a_demo_item.cpp

@@ -454,7 +454,7 @@ BOOL daDitem_c::Delete() {
 }
 
 cPhs_State daDitem_c::create() {
-    fopAcM_SetupActor(this, daDitem_c);
+    fopAcM_ct(this, daDitem_c);
     
     m_itemNo = daDitem_prm::getNo(this);
     

src/d/actor/d_a_demo_kmm.cpp

@@ -59,9 +59,9 @@ cPhs_State daDemo_Kmm_c::create() {
     if (ret != cPhs_COMPLEATE_e) {
         return ret;
     }
-    fopAcM_SetupActor(this, daDemo_Kmm_c);
+    fopAcM_ct(this, daDemo_Kmm_c);
 #else
-    fopAcM_SetupActor(this, daDemo_Kmm_c);
+    fopAcM_ct(this, daDemo_Kmm_c);
     cPhs_State ret = dComIfG_resLoad(&this->mPhase, M_arcname);
     if (ret != cPhs_COMPLEATE_e) {
         return ret;

src/d/actor/d_a_disappear.cpp

@@ -101,7 +101,7 @@ void set_disappear(disappear_class* i_this, float scale) {
 static cPhs_State daDisappear_Create(fopAc_ac_c* i_this) {
     disappear_class* dis = static_cast<disappear_class*>(i_this);
 
-    fopAcM_SetupActor(dis, disappear_class);
+    fopAcM_ct(dis, disappear_class);
 
     dis->health = fopAcM_GetParam(dis) & 0xFF; // Drop type param is stored in health
     f32 scaleMag = ((fopAcM_GetParam(dis) >> 8) & 0xFF) * 0.1f;

src/d/actor/d_a_dk.cpp

@@ -370,7 +370,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
 /* 00000FFC-000011EC       .text daDk_Create__FP10fopAc_ac_c */
 static cPhs_State daDk_Create(fopAc_ac_c* i_this) {
     dk_class* a_this = (dk_class*)i_this;
-    fopAcM_SetupActor(i_this, dk_class);
+    fopAcM_ct(i_this, dk_class);
 
     cPhs_State res = dComIfG_resLoad(&a_this->mPhs, "Dk");
     if (res == cPhs_COMPLEATE_e) {

src/d/actor/d_a_door10.cpp

@@ -867,7 +867,7 @@ static BOOL daDoor10_Delete(daDoor10_c* i_this) {
 
 /* 00001E18-00001EA8       .text daDoor10_Create__FP10fopAc_ac_c */
 static cPhs_State daDoor10_Create(fopAc_ac_c* a_this) {
-    fopAcM_SetupActor(a_this, daDoor10_c);
+    fopAcM_ct(a_this, daDoor10_c);
     return ((daDoor10_c*)a_this)->create();
 }
 

src/d/actor/d_a_door12.cpp

@@ -893,7 +893,7 @@ static BOOL daDoor12_Delete(daDoor12_c* i_this) {
 
 /* 00001CC4-00001D3C       .text daDoor12_Create__FP10fopAc_ac_c */
 static cPhs_State daDoor12_Create(fopAc_ac_c* a_this) {
-    fopAcM_SetupActor(a_this, daDoor12_c);
+    fopAcM_ct(a_this, daDoor12_c);
 
     return ((daDoor12_c*)a_this)->create();
 }

src/d/actor/d_a_dr.cpp

@@ -248,13 +248,13 @@ static cPhs_State daDr_Create(fopAc_ac_c* i_this) {
     dr_class* a_this = (dr_class*)i_this;
 
 #if VERSION > VERSION_DEMO
-    fopAcM_SetupActor(a_this, dr_class);
+    fopAcM_ct(a_this, dr_class);
 #endif
 
     cPhs_State phase_state = dComIfG_resLoad(&a_this->mPhs, "Dr");
     if (phase_state == cPhs_COMPLEATE_e) {
 #if VERSION == VERSION_DEMO
-        fopAcM_SetupActor(a_this, dr_class);
+        fopAcM_ct(a_this, dr_class);
 #endif
 
         if (!fopAcM_entrySolidHeap(a_this, createHeap, 0xF000)) {

src/d/actor/d_a_dr2.cpp

@@ -782,7 +782,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
 static cPhs_State daDr2_Create(fopAc_ac_c* a_this) {
     dr2_class* i_this = (dr2_class*)a_this;
 
-    fopAcM_SetupActor(&i_this->actor, dr2_class);
+    fopAcM_ct(&i_this->actor, dr2_class);
 
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Dr2");
     if (ret == cPhs_COMPLEATE_e) {

src/d/actor/d_a_dummy.cpp

@@ -22,7 +22,7 @@ bool daDummy::Act_c::create_heap() {
 
 /* 000000A4-0000015C       .text _create__Q27daDummy5Act_cFv */
 cPhs_State daDummy::Act_c::_create() {  
-    fopAcM_SetupActor(this, Act_c);
+    fopAcM_ct(this, Act_c);
 
     if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) {
         set_mtx();

src/d/actor/d_a_ep.cpp

@@ -641,9 +641,9 @@ static cPhs_State daEp_Create(fopAc_ac_c* a_this) {
 #if VERSION == VERSION_DEMO
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Ep");
     if (ret == cPhs_COMPLEATE_e) {
-        fopAcM_SetupActor(a_this, ep_class);
+        fopAcM_ct(a_this, ep_class);
 #else
-    fopAcM_SetupActor(a_this, ep_class);
+    fopAcM_ct(a_this, ep_class);
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Ep");
     if (ret == cPhs_COMPLEATE_e) {
 #endif

src/d/actor/d_a_esa.cpp

@@ -243,7 +243,7 @@ static BOOL daEsa_CreateHeap(fopAc_ac_c* i_actor) {
 static cPhs_State daEsa_Create(fopAc_ac_c* i_actor) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
-    fopAcM_SetupActor(i_actor, esa_class);
+    fopAcM_ct(i_actor, esa_class);
 
     esa_class* i_this = static_cast<esa_class*>(i_actor);
 

src/d/actor/d_a_fallrock.cpp

@@ -189,13 +189,13 @@ static cPhs_State daFallRock_Create(fopAc_ac_c* i_this) {
 /* 00001050-0000127C       .text create__12daFallRock_cFv */
 cPhs_State daFallRock_c::create() {
 #if VERSION > VERSION_DEMO
-    fopAcM_SetupActor(this, daFallRock_c);
+    fopAcM_ct(this, daFallRock_c);
 #endif
 
     cPhs_State res = dComIfG_resLoad(&mPhs, m_arcname);
     if (res == cPhs_COMPLEATE_e) {
 #if VERSION == VERSION_DEMO
-        fopAcM_SetupActor(this, daFallRock_c);
+        fopAcM_ct(this, daFallRock_c);
 #endif
 
         if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xB80)) {

src/d/actor/d_a_fan.cpp

@@ -156,7 +156,7 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) {
 
 /* 000006F4-00000900       .text _create__7daFan_cFv */
 cPhs_State daFan_c::_create() {
-    fopAcM_SetupActor(this, daFan_c);
+    fopAcM_ct(this, daFan_c);
 
     mType = daFan_prm::getType(this);
     cPhs_State rt1 = dComIfG_resLoad(&mPhs, m_arcname[mType]);

src/d/actor/d_a_ff.cpp

@@ -288,7 +288,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
 
 /* 000013D4-0000164C       .text daFf_Create__FP10fopAc_ac_c */
 static cPhs_State daFf_Create(fopAc_ac_c* i_this) {
-    fopAcM_SetupActor(i_this, ff_class);
+    fopAcM_ct(i_this, ff_class);
     ff_class* a_this = (ff_class*)i_this;
     cPhs_State phase_state = dComIfG_resLoad(&a_this->mPhs, "Ff");
 

src/d/actor/d_a_fganon.cpp

@@ -2735,7 +2735,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) {
 static cPhs_State daFganon_Create(fopAc_ac_c* a_this) {
     fganon_class* i_this = (fganon_class*)a_this;
     fopEn_enemy_c* e_this = (fopEn_enemy_c*)a_this;
-    fopAcM_SetupActor(a_this, fganon_class);
+    fopAcM_ct(a_this, fganon_class);
     s32 res;
     s32 res2;
     

src/d/actor/d_a_fgmahou.cpp

@@ -401,13 +401,13 @@ static cPhs_State daFgmahou_Create(fopAc_ac_c* a_this) {
     fgmahou_class* i_this = static_cast<fgmahou_class*>(a_this);
 
 #if VERSION > VERSION_DEMO
-    fopAcM_SetupActor(i_this, fgmahou_class);
+    fopAcM_ct(i_this, fgmahou_class);
 #endif
 
     cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhs, "Fganon");
     if(phase_state == cPhs_COMPLEATE_e) {
     #if VERSION == VERSION_DEMO
-        fopAcM_SetupActor(i_this, fgmahou_class);
+        fopAcM_ct(i_this, fgmahou_class);
     #endif
 
         i_this->mOrbNumber = fopAcM_GetParam(i_this) & 0xF;

src/d/actor/d_a_fire.cpp

@@ -219,7 +219,7 @@ BOOL daFire_c::CreateInit() {
 
 /* 00000518-00000758       .text _create__8daFire_cFv */
 cPhs_State daFire_c::_create() {
-    fopAcM_SetupActor(this, daFire_c);
+    fopAcM_ct(this, daFire_c);
 
     field_0x8BC = dComIfGp_particle_set(dPa_name::ID_IT_JN_KAKOMI_FIRE_A00, &current.pos);
     field_0x8C0 = dComIfGp_particle_set(dPa_name::ID_IT_JN_KAKOMI_FIRE_B00, &current.pos);

src/d/actor/d_a_floor.cpp

@@ -56,7 +56,7 @@ BOOL daFloor_c::Create() {
 
 /* 0000025C-00000354       .text _create__9daFloor_cFv */
 cPhs_State daFloor_c::_create() {
-    fopAcM_SetupActor(this, daFloor_c);
+    fopAcM_ct(this, daFloor_c);
 
     mSwitchNo = daFloor_prm::getSwitchNo(this);
     if (mSwitchNo != 0xFF && dComIfGs_isSwitch(mSwitchNo, fopAcM_GetHomeRoomNo(this)))

src/d/actor/d_a_fm.cpp

@@ -3441,7 +3441,7 @@ void daFm_c::createInit() {
 
 /* 000090DC-00009258       .text _create__6daFm_cFv */
 cPhs_State daFm_c::_create() {
-    fopAcM_SetupActor(this, daFm_c);
+    fopAcM_ct(this, daFm_c);
     cPhs_State phase_state = dComIfG_resLoad(&mPhs, m_arc_name);
     if(phase_state == cPhs_COMPLEATE_e) {
         if(parentActorID != -1) {

src/d/actor/d_a_ghostship.cpp

@@ -236,7 +236,7 @@ void daGhostship_c::getArg() {
 }
 
 cPhs_State daGhostship_c::_create() {
-    fopAcM_SetupActor(this, daGhostship_c);
+    fopAcM_ct(this, daGhostship_c);
 
     cPhs_State result = dComIfG_resLoad(&mPhs, m_arc_name);
     if(result != cPhs_COMPLEATE_e) {

src/d/actor/d_a_goal_flag.cpp

@@ -574,7 +574,7 @@ cPhs_State daGoal_Flag_c::_create() {
     u8 arc_index;
     dPath* path_p;
 
-    fopAcM_SetupActor(this, daGoal_Flag_c);
+    fopAcM_ct(this, daGoal_Flag_c);
 
     u8 prm = fopAcM_GetParam(this) & 0xFF;
     cloth_resload_state = dComIfG_resLoad(&mClothPhs, "Cloth");

src/d/actor/d_a_grass.cpp

@@ -131,7 +131,7 @@ static cPhs_State daGrass_Create(fopAc_ac_c* i_ac) {
 
     grass_class * i_this = (grass_class*)i_ac;
 
-    fopAcM_SetupActor(i_this, grass_class);
+    fopAcM_ct(i_this, grass_class);
 
     u32 grp = daGrass_prm::getType(i_this);
     OffsetData * offset = &l_offsetData[grp];

src/d/actor/d_a_gy_ctrl.cpp

@@ -531,7 +531,7 @@ bool daGy_Ctrl_c::checkGyCtrlExist() {
 
 /* 00001458-000016AC       .text _create__11daGy_Ctrl_cFv */
 cPhs_State daGy_Ctrl_c::_create() {
-    fopAcM_SetupActor(this, daGy_Ctrl_c);
+    fopAcM_ct(this, daGy_Ctrl_c);
 
     getArg();
 

src/d/actor/d_a_himo2.cpp

@@ -1798,7 +1798,7 @@ static cPhs_State daHimo2_Create(fopAc_ac_c* i_this) {
     himo2_class* a_this = (himo2_class*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
-    fopAcM_SetupActor(i_this, himo2_class);
+    fopAcM_ct(i_this, himo2_class);
 
     cPhs_State phase_state;
     if (!fopAcM_entrySolidHeap(&a_this->actor, CallbackCreateHeap, REG0_S(9) + 0x9050)) {

src/d/actor/d_a_himo3.cpp

@@ -760,7 +760,7 @@ static cPhs_State daHimo3_Create(fopAc_ac_c* a_this) {
 
     himo3_class* i_this = (himo3_class*)a_this;
 
-    fopAcM_SetupActor(a_this, himo3_class);
+    fopAcM_ct(a_this, himo3_class);
 
     cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "Himo3");
     if (PVar1 == cPhs_COMPLEATE_e) {

src/d/actor/d_a_hitobj.cpp

@@ -46,7 +46,7 @@ static BOOL daHitobj_Delete(hitobj_class* i_this) {
 /* 00000120-0000025C       .text daHitobj_Create__FP10fopAc_ac_c */
 static cPhs_State daHitobj_Create(fopAc_ac_c* pActor) {
     hitobj_class* i_this = (hitobj_class*)pActor;
-    fopAcM_SetupActor(i_this, hitobj_class);
+    fopAcM_ct(i_this, hitobj_class);
 
     cPhs_State res = dComIfG_resLoad(&(i_this->mPhs), "Hitobj");
     if (res == cPhs_COMPLEATE_e) {

src/d/actor/d_a_hmlif.cpp

@@ -249,7 +249,7 @@ BOOL daHmlif_c::Create() {
 
 /* 000007C8-00000930       .text daHmlifCreate__9daHmlif_cFv */
 cPhs_State daHmlif_c::daHmlifCreate() {
-    fopAcM_SetupActor(this, daHmlif_c);
+    fopAcM_ct(this, daHmlif_c);
     m489 = daHmlif_prm::getType(this);
     cPhs_State PVar2 = dComIfG_resLoad(&mPhase, m_arcname[m489]);
     if (PVar2 == cPhs_COMPLEATE_e) {

src/d/actor/d_a_hookshot.cpp

@@ -543,7 +543,7 @@ static dCcD_SrcCps l_at_cps_src = {
 
 /* 800F2C14-800F2CC8       .text create__12daHookshot_cFv */
 cPhs_State daHookshot_c::create() {
-    fopAcM_SetupActor(this, daHookshot_c);
+    fopAcM_ct(this, daHookshot_c);
     
     mShape.setUserArea(reinterpret_cast<u32>(this));
     mLinChk.ClrSttsRoofOff();

src/d/actor/d_a_hot_floor.cpp

@@ -55,7 +55,7 @@ cPhs_State daHot_Floor_c::CreateInit() {
 cPhs_State daHot_Floor_c::_create() {
 #if VERSION > VERSION_DEMO
     // Bug: This actor is never initialized in the demo.
-    fopAcM_SetupActor(this, daHot_Floor_c);
+    fopAcM_ct(this, daHot_Floor_c);
 #endif
     return CreateInit();
 }

src/d/actor/d_a_hys.cpp

@@ -78,7 +78,7 @@ BOOL daHys_c::CreateHeap() {
 }
 
 cPhs_State daHys_c::_create() {
-    fopAcM_SetupActor(this, daHys_c);
+    fopAcM_ct(this, daHys_c);
 
     mType = fopAcM_GetParam(this) >> 8;
     cPhs_State res = dComIfG_resLoad(&mPhs, m_arcname[mType]);

src/d/actor/d_a_ib.cpp

@@ -408,7 +408,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 
 /* 800F4698-800F4870       .text _daIball_create__9daIball_cFv */
 cPhs_State daIball_c::_daIball_create() {
-    fopAcM_SetupActor(this, daIball_c);
+    fopAcM_ct(this, daIball_c);
     
     if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x3500)) {
         return cPhs_ERROR_e;

src/d/actor/d_a_ikari.cpp

@@ -128,7 +128,7 @@ bool daIkari_c::_draw() {
 cPhs_State daIkari_c::_create() {
     cPhs_State phase = dComIfG_resLoad(&mPhs, M_arcname);
 
-    fopAcM_SetupActor(this, daIkari_c);
+    fopAcM_ct(this, daIkari_c);
 
     if (phase == cPhs_COMPLEATE_e) {
         getArg();

src/d/actor/d_a_item.cpp

@@ -216,7 +216,7 @@ void daItem_c::CreateInit() {
 
 /* 800F53EC-800F5668       .text _daItem_create__8daItem_cFv */
 cPhs_State daItem_c::_daItem_create() {
-    fopAcM_SetupActor(this, daItem_c);
+    fopAcM_ct(this, daItem_c);
     
     m_itemNo = daItem_prm::getItemNo(this);
     

src/d/actor/d_a_jbo.cpp

@@ -190,13 +190,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
 /* 0000081C-00000A90       .text daJBO_Create__FP10fopAc_ac_c */
 static cPhs_State daJBO_Create(fopAc_ac_c* i_this) {
     #if VERSION > VERSION_DEMO
-    fopAcM_SetupActor(i_this, jbo_class);
+    fopAcM_ct(i_this, jbo_class);
     #endif
     jbo_class* a_this = (jbo_class*)i_this;
     cPhs_State state = dComIfG_resLoad(&a_this->mPhs, "JBO");
     if (state == cPhs_COMPLEATE_e) {
         #if VERSION == VERSION_DEMO
-        fopAcM_SetupActor(i_this, jbo_class);
+        fopAcM_ct(i_this, jbo_class);
         #endif
         if (!fopAcM_entrySolidHeap(i_this, &useHeapInit, 0x1c20)) {
             return cPhs_ERROR_e;

src/d/actor/d_a_kaji.cpp

@@ -43,7 +43,7 @@ BOOL daKaji_c::CreateHeap() {
 }
 
 cPhs_State daKaji_c::_create() {
-    fopAcM_SetupActor(this, daKaji_c);
+    fopAcM_ct(this, daKaji_c);
     
     cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname);
     if (phase_state == cPhs_COMPLEATE_e) {

src/d/actor/d_a_kamome.cpp

@@ -1485,9 +1485,9 @@ static cPhs_State daKamome_Create(fopAc_ac_c* a_this) {
 #if VERSION == VERSION_DEMO
     cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "Kamome");
     if (PVar1 == cPhs_COMPLEATE_e) {
-        fopAcM_SetupActor(a_this, kamome_class);
+        fopAcM_ct(a_this, kamome_class);
 #else
-    fopAcM_SetupActor(a_this, kamome_class);
+    fopAcM_ct(a_this, kamome_class);
 
     cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "Kamome");
     if (PVar1 == cPhs_COMPLEATE_e) {

src/d/actor/d_a_kamome2.cpp

@@ -324,7 +324,7 @@ static cPhs_State daKamome2_Create(fopAc_ac_c* a_this) {
 
     cPhs_State iVar1 = dComIfG_resLoad(&i_this->mPhase, "Kamome");
     if (iVar1 == cPhs_COMPLEATE_e) {
-        fopAcM_SetupActor(a_this, kamome2_class);
+        fopAcM_ct(a_this, kamome2_class);
 
         i_this->m2A4 = fopAcM_GetParam(a_this);
         if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0x59A0)) {

src/d/actor/d_a_kanban.cpp

@@ -1082,7 +1082,7 @@ static cPhs_State daKanban_Create(fopAc_ac_c* a_this) {
     u32 maxHeapSize = 0;
     kanban_class* i_this = (kanban_class*)a_this;
 
-    fopAcM_SetupActor(&i_this->actor, kanban_class);
+    fopAcM_ct(&i_this->actor, kanban_class);
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Kanban");
 
     if (ret == cPhs_COMPLEATE_e) {

src/d/actor/d_a_kantera.cpp

@@ -379,7 +379,7 @@ static cPhs_State daKantera_Create(fopAc_ac_c* a_this) {
 
     kantera_class* i_this = (kantera_class*)a_this;
 
-    fopAcM_SetupActor(a_this, kantera_class);
+    fopAcM_ct(a_this, kantera_class);
 
     i_this->mParam0 = fopAcM_GetParam(a_this);
     i_this->mParam1 = fopAcM_GetParam(a_this) >> 8;

src/d/actor/d_a_ki.cpp

@@ -1369,7 +1369,7 @@ static cPhs_State daKi_Create(fopAc_ac_c* a_this) {
 
     ki_class* i_this = (ki_class*)a_this;
 
-    fopAcM_SetupActor(a_this, ki_class);
+    fopAcM_ct(a_this, ki_class);
 
     cPhs_State ret = dComIfG_resLoad(&i_this->mPhase, "Ki");
     if (ret == cPhs_COMPLEATE_e) {

src/d/actor/d_a_kita.cpp

@@ -420,7 +420,7 @@ static cPhs_State daKita_Create(fopAc_ac_c* a_this) {
     };
     
     kita_class* i_this = static_cast<kita_class*>(a_this);
-    fopAcM_SetupActor(a_this, kita_class);
+    fopAcM_ct(a_this, kita_class);
     cPhs_State ret;
 
     ret = dComIfG_resLoad(&i_this->mPhs, "Kita");

src/d/actor/d_a_kmon.cpp

@@ -95,7 +95,7 @@ void daKmon_c::checkTalk() {
 }
 
 cPhs_State daKmon_c::_create() {
-    fopAcM_SetupActor(this, daKmon_c);
+    fopAcM_ct(this, daKmon_c);
 
     cPhs_State state = dComIfG_resLoad(&mPhase, daKmon_c::m_arcname);
     if(state == cPhs_COMPLEATE_e) {

src/d/actor/d_a_kn.cpp

@@ -518,9 +518,9 @@ static cPhs_State daKN_Create(fopAc_ac_c* a_this) {
 #if VERSION == VERSION_DEMO
     cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "KN");
     if (PVar1 == cPhs_COMPLEATE_e) {
-        fopAcM_SetupActor(&i_this->actor, kn_class);
+        fopAcM_ct(&i_this->actor, kn_class);
 #else
-    fopAcM_SetupActor(a_this, kn_class);
+    fopAcM_ct(a_this, kn_class);
     cPhs_State PVar1 = dComIfG_resLoad(&i_this->mPhase, "KN");
     if (PVar1 == cPhs_COMPLEATE_e) {
 #endif

src/d/actor/d_a_knob00.cpp

@@ -375,9 +375,9 @@ cPhs_State daKnob00_c::create() {
     if (ret != cPhs_COMPLEATE_e) {
         return ret;
     }
-    fopAcM_SetupActor(this, daKnob00_c);
+    fopAcM_ct(this, daKnob00_c);
 #else
-    fopAcM_SetupActor(this, daKnob00_c);
+    fopAcM_ct(this, daKnob00_c);
     if (ret != cPhs_COMPLEATE_e) {
         return ret;
     }

src/d/actor/d_a_kokiie.cpp

@@ -376,7 +376,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* a_this) {
 static cPhs_State daKokiie_Create(fopAc_ac_c* a_this) {
     kokiie_class* i_this = (kokiie_class*)a_this;
 
-    fopAcM_SetupActor(a_this, kokiie_class);
+    fopAcM_ct(a_this, kokiie_class);
 
     cPhs_State PVar3 = dComIfG_resLoad(&i_this->mPhase, "Kokiie");
 #if VERSION == VERSION_DEMO

src/d/actor/d_a_komore.cpp

@@ -46,7 +46,7 @@ bool daKomore::Act_c::create_heap() {
 
 /* 000001F8-000002F8       .text _create__Q28daKomore5Act_cFv */
 cPhs_State daKomore::Act_c::_create() {
-    fopAcM_SetupActor(this, Act_c);
+    fopAcM_ct(this, Act_c);
     cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname);
     if (phase_state == cPhs_COMPLEATE_e) {
         if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) {