`fopAcM_Register` cleanup (#3047)

* use macro `fopAcM_Register` more consistently

* replace fopAcM_RegisterCreateID with version that doesn't create `a_this`

100 files changed, 172 insertions, 185 deletions

diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp
index a5fe1caeaf..5408b1eb9d 100644
--- a/src/d/actor/d_a_L7demo_dr.cpp
+++ b/src/d/actor/d_a_L7demo_dr.cpp
@@ -289,7 +289,7 @@ static int daDr_IsDelete(daDr_c* i_this) {
 }
 
 int daDr_c::_delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "DR");
 
     if (heap != NULL) {
         mpModelMorf->stopZelAnime();
diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp
index 01e50a0a9b..fd01b3be72 100644
--- a/src/d/actor/d_a_andsw.cpp
+++ b/src/d/actor/d_a_andsw.cpp
@@ -99,7 +99,8 @@ static int daAndsw_Delete(daAndsw_c* i_this) {
 }
 
 static int daAndsw_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daAndsw_c, i_this, "Andsw");
+    daAndsw_c* a_this = (daAndsw_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Andsw");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp
index a114328562..fcd6fcb8f6 100644
--- a/src/d/actor/d_a_b_bh.cpp
+++ b/src/d/actor/d_a_b_bh.cpp
@@ -1409,7 +1409,7 @@ static int daB_BH_IsDelete(b_bh_class* i_this) {
 
 static int daB_BH_Delete(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
-    fpc_ProcID id = fopAcM_GetID(a_this);
+    fopAcM_RegisterDeleteID(a_this, "B_BH");
     
     dComIfG_resDelete(&i_this->mPhase, "B_BH");
     if (i_this->mInitHIO) {
diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp
index 7b06127363..fc3e8a35ac 100644
--- a/src/d/actor/d_a_b_mgn.cpp
+++ b/src/d/actor/d_a_b_mgn.cpp
@@ -3379,14 +3379,10 @@ int daB_MGN_c::_delete() {
 }
 
 static int daB_MGN_Delete(daB_MGN_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "B_MGN");
     return i_this->_delete();
 }
 
-#if DEBUG
-char* const unused = "Delete -> B_MGN(id=%d)\n";
-#endif
-
 int daB_MGN_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN);
     JUT_ASSERT(4010, modelData != NULL);
diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp
index 8853c08d03..6a37355dba 100644
--- a/src/d/actor/d_a_boomerang.cpp
+++ b/src/d/actor/d_a_boomerang.cpp
@@ -1341,6 +1341,7 @@ daBoomerang_c::~daBoomerang_c() {
 }
 
 static int daBoomerang_Delete(daBoomerang_c* i_this) {
+    fopAcM_RegisterDeleteID(i_this, "Boomerang");
     i_this->~daBoomerang_c();
     return 1;
 }
@@ -1419,7 +1420,7 @@ static dCcD_SrcCyl l_windAtCylSrc = {
 };
 
 int daBoomerang_c::create() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterCreateID(this, "Boomerang");
     fopAcM_ct(this, daBoomerang_c);
 
     if (!fopAcM_entrySolidHeap(this, daBoomerang_createHeap, 0xC0D0)) {
diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp
index f238b3ed5e..c5650cc69e 100644
--- a/src/d/actor/d_a_canoe.cpp
+++ b/src/d/actor/d_a_canoe.cpp
@@ -168,7 +168,7 @@ int daCanoe_c::create() {
 
 static int daCanoe_Create(fopAc_ac_c* i_this) {
     daCanoe_c* a_this = (daCanoe_c*)i_this;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterCreateID(i_this, "Canoe");
     return a_this->create();
 }
 
@@ -178,7 +178,7 @@ daCanoe_c::~daCanoe_c() {
 }
 
 static int daCanoe_Delete(daCanoe_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "Canoe");
     i_this->~daCanoe_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp
index f6d7e88ada..a13161b797 100644
--- a/src/d/actor/d_a_cow.cpp
+++ b/src/d/actor/d_a_cow.cpp
@@ -3265,7 +3265,7 @@ static int daCow_Draw(void* actor) {
 }
 
 int daCow_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "COW");
     dComIfG_resDelete(&mPhase, "Cow");
 
     if (heap != NULL) {
diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp
index a5a071d17c..c9eda75917 100644
--- a/src/d/actor/d_a_demo00.cpp
+++ b/src/d/actor/d_a_demo00.cpp
@@ -1837,7 +1837,8 @@ static int daDemo00_Delete(daDemo00_c* i_this) {
 }
 
 static int daDemo00_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daDemo00_c, i_this, "Demo00");
+    daDemo00_c* a_this = (daDemo00_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Demo00");
     fopAcM_ct(a_this, daDemo00_c);
 
     a_this->field_0x6a2 = 0;
diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp
index 9e6fb93316..420c0baf39 100644
--- a/src/d/actor/d_a_do.cpp
+++ b/src/d/actor/d_a_do.cpp
@@ -2342,7 +2342,7 @@ static int daDo_IsDelete(do_class* i_this) {
 }
 
 static int daDo_Delete(do_class* i_this) {
-    u32 actor_id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "Do");
     dComIfG_resDelete(&i_this->mPhase, "Do");
     if (i_this->mHIOInit) {
         hio_set = false;
diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp
index 501e43930a..133194549a 100644
--- a/src/d/actor/d_a_door_spiral.cpp
+++ b/src/d/actor/d_a_door_spiral.cpp
@@ -1173,7 +1173,8 @@ int daSpiral_Delete(daSpiral_c* i_this) {
 }
 
 int daSpiral_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daSpiral_c, i_this, "Door10");
+    daSpiral_c* a_this = (daSpiral_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Door10");
     fopAcM_ct(a_this, daSpiral_c);
     return a_this->create();
 }
diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp
index ed18d46750..24bdf27b69 100644
--- a/src/d/actor/d_a_e_bg.cpp
+++ b/src/d/actor/d_a_e_bg.cpp
@@ -1283,7 +1283,7 @@ int daE_BG_c::_delete() {
 }
 
 static int daE_BG_Delete(daE_BG_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_BG");
     return i_this->_delete();
 }
 
diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp
index a8ff9d589d..3f2cfdef58 100644
--- a/src/d/actor/d_a_e_bs.cpp
+++ b/src/d/actor/d_a_e_bs.cpp
@@ -779,7 +779,7 @@ static int daE_BS_IsDelete(e_bs_class* i_this) {
 
 static int daE_BS_Delete(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_BS");
     dComIfG_resDelete(&i_this->phase, "E_BS");
 
     if (i_this->HIOInit) {
diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp
index 525be53779..d636a9be5d 100644
--- a/src/d/actor/d_a_e_bu.cpp
+++ b/src/d/actor/d_a_e_bu.cpp
@@ -990,7 +990,7 @@ static int daE_BU_IsDelete(e_bu_class* i_this) {
 
 static int daE_BU_Delete(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
-    fpc_ProcID id = fopAcM_GetID(actor);
+    fopAcM_RegisterDeleteID(actor, "E_BU");
     dComIfG_resDelete(&i_this->phase, "E_BU");
 
     if (i_this->HIOInit != 0) {
diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp
index d606d9eaaf..4c360fdece 100644
--- a/src/d/actor/d_a_e_cr.cpp
+++ b/src/d/actor/d_a_e_cr.cpp
@@ -443,7 +443,7 @@ static int daE_CR_IsDelete(e_cr_class* a_this) {
 
 static int daE_CR_Delete(e_cr_class* a_this) {
     fopEn_enemy_c* actor = &a_this->enemy;
-    fpc_ProcID id = fopAcM_GetID(a_this);
+    fopAcM_RegisterDeleteID(a_this, "E_CR");
     dComIfG_resDelete(&a_this->phase, "E_CR");
 
     if (a_this->HIOInit) {
diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp
index 8db1b18c37..ebb18c0874 100644
--- a/src/d/actor/d_a_e_cr_egg.cpp
+++ b/src/d/actor/d_a_e_cr_egg.cpp
@@ -140,7 +140,7 @@ static int daE_CR_EGG_IsDelete(e_cr_egg_class* a_this) {
 static int daE_CR_EGG_Delete(e_cr_egg_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
-    fpc_ProcID id = fopAcM_GetID(actor);
+    fopAcM_RegisterDeleteID(actor, "E_CR_EGG");
     dComIfG_resDelete(&a_this->phase, "E_CR");
     a_this->sound.stopAnime();
     return 1;
@@ -162,7 +162,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
 static int daE_CR_EGG_Create(fopAc_ac_c* i_this) {
     e_cr_egg_class* a_this = (e_cr_egg_class*)i_this;
-    fopAcM_ct(i_this, e_cr_egg_class);
+    fopAcM_ct(&a_this->enemy, e_cr_egg_class);
 
     int phase_state = dComIfG_resLoad(&a_this->phase, "E_CR");
     if (phase_state == cPhs_COMPLEATE_e) {
diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp
index 8b6bb55690..bb03745617 100644
--- a/src/d/actor/d_a_e_db.cpp
+++ b/src/d/actor/d_a_e_db.cpp
@@ -2015,7 +2015,7 @@ static int daE_DB_IsDelete(e_db_class* i_this) {
 
 static int daE_DB_Delete(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_DB");
     dComIfG_resDelete(&i_this->phase, "E_db");
 
     if (i_this->HIOInit) {
diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp
index 3f431340ec..05cde04abe 100644
--- a/src/d/actor/d_a_e_df.cpp
+++ b/src/d/actor/d_a_e_df.cpp
@@ -642,7 +642,7 @@ static int daE_DF_IsDelete(daE_DF_c* i_this) {
 }
 
 static int daE_DF_Delete(daE_DF_c* i_this) {
-    fpc_ProcID proc_id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_DF");
     return i_this->Delete();
 }
 
@@ -655,7 +655,7 @@ int daE_DF_c::Create() {
         mArg0 = (u8)fopAcM_GetParam(this);
 
         if (mArg0 != 0xff && dComIfGs_isSwitch(mArg0, fopAcM_GetRoomNo(this))) {
-            OS_REPORT("E_WS やられ後なので再セットしません");
+            OS_REPORT("E_WS やられ後なので再セットしません\n");
             return cPhs_ERROR_e;
         }
 
@@ -706,7 +706,7 @@ int daE_DF_c::Create() {
 
 static int daE_DF_Create(fopAc_ac_c* i_this) {
     daE_DF_c* a_this = (daE_DF_c*)i_this;
-    fpc_ProcID proc_id = fopAcM_GetID(i_this);
+    fopAcM_RegisterCreateID(i_this, "E_DF");
     return a_this->Create();
 }
 
diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp
index e97bc0672a..a21506dcba 100644
--- a/src/d/actor/d_a_e_dk.cpp
+++ b/src/d/actor/d_a_e_dk.cpp
@@ -932,7 +932,7 @@ int daE_DK_c::_delete() {
 }
 
 static int daE_DK_Delete(daE_DK_c* i_this) {
-    fpc_ProcID unusedId = fopAcM_GetID(i_this); // debug match
+    fopAcM_RegisterDeleteID(i_this, "E_DK");
     return i_this->_delete();
 }
 
diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp
index 24b19326f8..6186a8f9fc 100644
--- a/src/d/actor/d_a_e_dn.cpp
+++ b/src/d/actor/d_a_e_dn.cpp
@@ -3282,7 +3282,7 @@ static int daE_DN_IsDelete(e_dn_class* i_this) {
 
 static int daE_DN_Delete(e_dn_class* i_this) {
     fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor;
-    fpc_ProcID no = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_DN");
 
     dComIfG_resDelete(&i_this->phase, "E_dn");
 
diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp
index 73bebf54ed..807bf0a0c7 100644
--- a/src/d/actor/d_a_e_fb.cpp
+++ b/src/d/actor/d_a_e_fb.cpp
@@ -817,12 +817,6 @@ void daE_FB_c::dead_eff_set() {
     }
 }
 
-#if DEBUG
-static char* dummy_117771() {
-    return "Delete -> E_FB(id=%d)\n";
-}
-#endif
-
 int daE_FB_c::execute() {
     if (field_0x69c != 0) {
         --field_0x69c;
@@ -869,7 +863,7 @@ int daE_FB_c::_delete() {
 }
 
 static int daE_FB_Delete(daE_FB_c* i_this) {
-    int id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_FB");
     return static_cast<daE_FB_c*>(i_this)->_delete();
 }
 
diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp
index 00fa54d706..84d4a1f155 100644
--- a/src/d/actor/d_a_e_ga.cpp
+++ b/src/d/actor/d_a_e_ga.cpp
@@ -153,18 +153,18 @@ static int daE_Ga_IsDelete(e_ga_class* a_this) {
 
 static u8 hio_set;
 
-static int daE_Ga_Delete(e_ga_class* a_this) {
-    fopAc_ac_c* actor = &a_this->actor;
-    fpc_ProcID id = fopAcM_GetID(actor);
+static int daE_Ga_Delete(e_ga_class* i_this) {
+    fopAc_ac_c* actor = &i_this->actor;
+    fopAcM_RegisterDeleteID(i_this, "E_Ga");
 
-    if (a_this->initialized) {
+    if (i_this->initialized) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ga", 3);
         dComIfGp_removeSimpleModel(modelData, fopAcM_GetRoomNo(actor));
     }
 
-    dComIfG_resDelete(&a_this->phase, "E_ga");
+    dComIfG_resDelete(&i_this->phase, "E_ga");
 
-    if (a_this->HIOInit) {
+    if (i_this->HIOInit) {
         hio_set = FALSE;
     }
 
diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp
index 5bbec45128..b7b9f9e63c 100644
--- a/src/d/actor/d_a_e_gb.cpp
+++ b/src/d/actor/d_a_e_gb.cpp
@@ -1544,10 +1544,8 @@ static int daE_GB_IsDelete(e_gb_class* i_this) {
 }
 
 static int daE_GB_Delete(e_gb_class* i_this) {
-    "Delete -> E_GB(id=%d)\n";
-
     fopEn_enemy_c* actor = &i_this->actor;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_GB");
 
     dComIfG_resDelete(&i_this->phase, "E_gb");
     if (i_this->hioInit != 0) {
diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp
index 3aa28fb726..46d1cd9645 100644
--- a/src/d/actor/d_a_e_hb.cpp
+++ b/src/d/actor/d_a_e_hb.cpp
@@ -1323,7 +1323,7 @@ static int daE_HB_IsDelete(e_hb_class* i_this) {
 
 static int daE_HB_Delete(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_HB");
     dComIfG_resDelete(&i_this->phase, "E_hb");
 
     if (i_this->HIOInit) {
diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp
index 4a9e4f96c3..4aa37a6964 100644
--- a/src/d/actor/d_a_e_hm.cpp
+++ b/src/d/actor/d_a_e_hm.cpp
@@ -1393,7 +1393,7 @@ static int daE_HM_IsDelete(daE_HM_c* i_this) {
 }
 
 static int daE_HM_Delete(daE_HM_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_HM");
     return i_this->Delete();
 }
 
diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp
index 483f0d8346..2443bb8a49 100644
--- a/src/d/actor/d_a_e_hp.cpp
+++ b/src/d/actor/d_a_e_hp.cpp
@@ -1132,14 +1132,14 @@ int daE_HP_c::_delete() {
 }
 
 static int daE_HP_Delete(daE_HP_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_HP");
     return i_this->_delete();
 }
 
 int daE_HP_c::CreateHeap() {
-    J3DModelData* modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 19);
-    JUT_ASSERT(0x764, modeldata != NULL);
-    mpMorfSO = new mDoExt_McaMorfSO(modeldata, NULL, NULL,
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 19);
+    JUT_ASSERT(0x764, modelData != NULL);
+    mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL,
                                     (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 13), 2, 1.0f, 0,
                                     -1, &mSound1, 0x80000, 0x11000084);
     if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) {
@@ -1159,10 +1159,10 @@ int daE_HP_c::CreateHeap() {
         }
     }
 
-    modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 20);
-    JUT_ASSERT(0x78b, modeldata != NULL);
+    modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 20);
+    JUT_ASSERT(0x78b, modelData != NULL);
 
-    mpModel = mDoExt_J3DModel__create(modeldata, 0x80000, 0x11000084);
+    mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpModel == NULL) {
         return 0;
     }
@@ -1174,9 +1174,9 @@ int daE_HP_c::CreateHeap() {
         }
     }
 
-    modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 18);
+    modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 18);
     mpMorf =
-        new mDoExt_McaMorf(modeldata, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 4),
+        new mDoExt_McaMorf(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 4),
                            2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084);
 
     if (mpMorf == NULL || mpMorf->getModel() == 0) {
diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp
index bc582884bb..d299ea6a63 100644
--- a/src/d/actor/d_a_e_hz.cpp
+++ b/src/d/actor/d_a_e_hz.cpp
@@ -1870,7 +1870,7 @@ int daE_HZ_c::_delete() {
 }
 
 static int daE_HZ_Delete(daE_HZ_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_HZ");
     return i_this->_delete();
 }
 
diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp
index f99e754c62..0a13dc9227 100644
--- a/src/d/actor/d_a_e_mb.cpp
+++ b/src/d/actor/d_a_e_mb.cpp
@@ -619,7 +619,7 @@ static int daE_MB_IsDelete(e_mb_class* i_this) {
 
 static int daE_MB_Delete(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
-    fpc_ProcID id = fopAcM_GetID(a_this);
+    fopAcM_RegisterDeleteID(a_this, "E_MB");
 
     dComIfG_resDelete(&i_this->mPhase, "E_mb");
     
diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp
index cd109f1e16..dbc3cdf3ff 100644
--- a/src/d/actor/d_a_e_md.cpp
+++ b/src/d/actor/d_a_e_md.cpp
@@ -102,7 +102,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
 static int daE_MD_Create(fopAc_ac_c* i_this) {
     daE_MD_c* a_this = (daE_MD_c*)i_this;
-    fpc_ProcID id = fopAcM_GetID(a_this);
+    fpc_ProcID id = fopAcM_GetID(i_this);
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp
index 422ff3b5f7..ed9d3e1eb8 100644
--- a/src/d/actor/d_a_e_mk.cpp
+++ b/src/d/actor/d_a_e_mk.cpp
@@ -2774,7 +2774,7 @@ static int daE_MK_IsDelete(e_mk_class* i_this) {
 
 static int daE_MK_Delete(e_mk_class* i_this) {
     fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_MK");
 
     dComIfG_resDelete(&i_this->phase, "E_mk");
     if (i_this->hioInit != 0) {
diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp
index 46624ca064..1b3d2202a8 100644
--- a/src/d/actor/d_a_e_rdy.cpp
+++ b/src/d/actor/d_a_e_rdy.cpp
@@ -4758,7 +4758,7 @@ static int daE_RDY_IsDelete(e_rdy_class* i_this) {
 
 static int daE_RDY_Delete(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
-    fpc_ProcID unused = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_RDY");
     dComIfG_resDelete(&i_this->mPhase, i_this->mpArcName);
 
     if (i_this->mHIOInit) {
diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp
index bda0eb701b..22bae365c5 100644
--- a/src/d/actor/d_a_e_sh.cpp
+++ b/src/d/actor/d_a_e_sh.cpp
@@ -1109,7 +1109,7 @@ static int daE_SH_IsDelete(e_sh_class* i_this) {
 
 static int daE_SH_Delete(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
-    fpc_ProcID unusedId = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_SH");
 
     dComIfG_resDelete(&i_this->mPhase, "E_sh");
 
diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp
index 9c02533746..171a108c34 100644
--- a/src/d/actor/d_a_e_sm2.cpp
+++ b/src/d/actor/d_a_e_sm2.cpp
@@ -1399,7 +1399,7 @@ static int daE_SM2_IsDelete(e_sm2_class* i_this) {
 
 static int daE_SM2_Delete(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
-    fpc_ProcID id = fopAcM_GetID(&i_this->enemy);
+    fopAcM_RegisterDeleteID(&i_this->enemy, "E_SM2");
 
     #if DEBUG
     l_HIO.removeHIO(i_this->enemy);
diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp
index f18148632d..56cba89fc7 100644
--- a/src/d/actor/d_a_e_wb.cpp
+++ b/src/d/actor/d_a_e_wb.cpp
@@ -5470,7 +5470,7 @@ static int daE_WB_IsDelete(e_wb_class* i_this) {
 
 static int daE_WB_Delete(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
-    fpc_ProcID unused = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_WB");
     dComIfG_resDelete(&i_this->mPhase, i_this->mResName);
     if (i_this->field_0x17e0 != 0) {
         hio_set = false;
diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp
index 7bc63dfba9..d8d20b688e 100644
--- a/src/d/actor/d_a_e_yg.cpp
+++ b/src/d/actor/d_a_e_yg.cpp
@@ -1299,7 +1299,7 @@ static int daE_YG_IsDelete(e_yg_class* i_this) {
 
 static int daE_YG_Delete(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "E_YG");
 
     dComIfG_resDelete(&i_this->mPhase, "E_YG");
 
diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp
index 4dbe0d2a74..7eb4b89c9d 100644
--- a/src/d/actor/d_a_fr.cpp
+++ b/src/d/actor/d_a_fr.cpp
@@ -643,7 +643,7 @@ static int daFr_IsDelete(fr_class* i_this) {
 }
 
 static int daFr_Delete(fr_class* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "Fr");
 
     dComIfG_resDelete(&i_this->mPhase, "Fr");
     if (i_this->field_0x9e4) {
diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp
index 301245e996..e6303ca10e 100644
--- a/src/d/actor/d_a_horse.cpp
+++ b/src/d/actor/d_a_horse.cpp
@@ -791,9 +791,9 @@ int daHorse_c::create() {
 }
 
 static int daHorse_Create(fopAc_ac_c* i_this) {
-    daHorse_c* this_horse = (daHorse_c*)i_this;
-    fpc_ProcID unused = fopAcM_GetID(i_this);
-    return this_horse->create();
+    daHorse_c* a_this = (daHorse_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "HORSE");
+    return a_this->create();
 }
 
 void daHorse_c::setBasAnime(int param_0) {
@@ -4535,7 +4535,7 @@ daHorse_c::~daHorse_c() {
 }
 
 static int daHorse_Delete(daHorse_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "HORSE");
     i_this->~daHorse_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp
index 3364fd3989..ccd1add973 100644
--- a/src/d/actor/d_a_hozelda.cpp
+++ b/src/d/actor/d_a_hozelda.cpp
@@ -243,7 +243,7 @@ int daHoZelda_c::create() {
 
 static int daHoZelda_Create(fopAc_ac_c* i_this) {
     daHoZelda_c* a_this = (daHoZelda_c*)i_this;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterCreateID(i_this, "HOZELDA");
     return a_this->create();
 }
 
@@ -269,7 +269,7 @@ daHoZelda_c::~daHoZelda_c() {
 }
 
 static int daHoZelda_Delete(daHoZelda_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "HOZELDA");
     i_this->~daHoZelda_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp
index ed46b10ddd..89983fa7ab 100644
--- a/src/d/actor/d_a_kago.cpp
+++ b/src/d/actor/d_a_kago.cpp
@@ -3712,7 +3712,7 @@ int daKago_c::_delete() {
 }
 
 static int daKago_Delete(daKago_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "Kago");
     return i_this->_delete();
 }
 
diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp
index af433d0a77..a65520e4da 100644
--- a/src/d/actor/d_a_mant.cpp
+++ b/src/d/actor/d_a_mant.cpp
@@ -759,13 +759,14 @@ static bool daMant_IsDelete(mant_class* i_this) {
 }
 
 static int daMant_Delete(mant_class* i_this) {
+    fopAcM_RegisterDeleteID(i_this, "Mant");
     return 1;
 }
 
 static int daMant_Create(fopAc_ac_c* i_this) {
     mant_class* m_this = (mant_class*)i_this;
 
-    fpc_ProcID unusedId = fopAcM_GetID(m_this);
+    fopAcM_RegisterCreateID(m_this, "Mant");
 
     fopAcM_ct(m_this, mant_class);
     //m_this->field_0x0570.field_0x74 = 0;
diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp
index 3016f58aaa..77e43ed910 100644
--- a/src/d/actor/d_a_mg_rod.cpp
+++ b/src/d/actor/d_a_mg_rod.cpp
@@ -6059,7 +6059,7 @@ static int dmg_rod_IsDelete(dmg_rod_class* i_this) {
 
 static int dmg_rod_Delete(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "Mg_rod");
     dComIfG_resDelete(&i_this->phase, i_this->arcname);
 
     if (i_this->HIOInit) {
@@ -6077,10 +6077,6 @@ static int dmg_rod_Delete(dmg_rod_class* i_this) {
     return 1;
 }
 
-static void dummy_report_str_1() {
-    OS_REPORT("Delete -> Mg_rod(id=%d)\n");
-}
-
 static int useHeapInit(fopAc_ac_c* i_this) {
     dmg_rod_class* a_this = (dmg_rod_class*)i_this;
     J3DModel* model;
diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp
index dd09eff513..01070517e1 100644
--- a/src/d/actor/d_a_midna.cpp
+++ b/src/d/actor/d_a_midna.cpp
@@ -664,9 +664,9 @@ cPhs__Step daMidna_c::create() {
 }
 
 static cPhs__Step daMidna_Create(fopAc_ac_c* i_this) {
-    daMidna_c* actor = (daMidna_c*)i_this;
-    fpc_ProcID id = fopAcM_GetID(i_this);
-    return actor->create();
+    daMidna_c* a_this = (daMidna_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "MIDNA");
+    return a_this->create();
 }
 
 void daMidna_c::allAnimePlay() {
@@ -3578,7 +3578,7 @@ daMidna_c::~daMidna_c() {
 }
 
 static int daMidna_Delete(daMidna_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "MIDNA");
     i_this->~daMidna_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp
index b083ecdcbc..99c2512ec5 100644
--- a/src/d/actor/d_a_npc_bans.cpp
+++ b/src/d/actor/d_a_npc_bans.cpp
@@ -517,7 +517,7 @@ int daNpc_Bans_c::CreateHeap() {
 
 int daNpc_Bans_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Bans_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_BANS");
     this->~daNpc_Bans_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp
index 0af2697a1f..7492657fd4 100644
--- a/src/d/actor/d_a_npc_blue_ns.cpp
+++ b/src/d/actor/d_a_npc_blue_ns.cpp
@@ -229,7 +229,7 @@ int daNpcBlueNS_c::isDelete() {
 }
 
 int daNpcBlueNS_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_BLUENS");
     this->~daNpcBlueNS_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp
index 4fa1b66694..8944f68811 100644
--- a/src/d/actor/d_a_npc_bouS.cpp
+++ b/src/d/actor/d_a_npc_bouS.cpp
@@ -416,7 +416,7 @@ int daNpcBouS_c::CreateHeap() {
 }
 
 int daNpcBouS_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_BOU_S");
     this->~daNpcBouS_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp
index e2432ee8ba..f366e69161 100644
--- a/src/d/actor/d_a_npc_chat.cpp
+++ b/src/d/actor/d_a_npc_chat.cpp
@@ -2777,7 +2777,7 @@ BOOL daNpcChat_c::CreateHeap() {
 }
 
 int daNpcChat_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_CHAT");
     this->~daNpcChat_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp
index b871c8d635..5986711619 100644
--- a/src/d/actor/d_a_npc_chin.cpp
+++ b/src/d/actor/d_a_npc_chin.cpp
@@ -369,12 +369,8 @@ int daNpcChin_c::CreateHeap() {
     return 1;
 }
 
-static void dummy() {
-    OS_REPORT("Delete -> NPC_CHIN(id=%d)\n");
-}
-
 int daNpcChin_c::Delete() {
-    fpc_ProcID unusedId = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_CHIN");
     OS_REPORT("----------------------daNpcChin_c::Delete!!\n");
     this->~daNpcChin_c();
     return 1;
diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp
index 20e61bd91d..21b089eb67 100644
--- a/src/d/actor/d_a_npc_clerka.cpp
+++ b/src/d/actor/d_a_npc_clerka.cpp
@@ -208,7 +208,7 @@ int daNpc_clerkA_c::CreateHeap() {
 }
 
 int daNpc_clerkA_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_CLERKA");
     this->~daNpc_clerkA_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp
index 9b22c324f7..c6400f90a0 100644
--- a/src/d/actor/d_a_npc_clerkb.cpp
+++ b/src/d/actor/d_a_npc_clerkb.cpp
@@ -219,7 +219,7 @@ int daNpc_clerkB_c::CreateHeap() {
 }
 
 int daNpc_clerkB_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_CLERKB");
     this->~daNpc_clerkB_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp
index 0ca1ee24ee..21398595be 100644
--- a/src/d/actor/d_a_npc_clerkt.cpp
+++ b/src/d/actor/d_a_npc_clerkt.cpp
@@ -201,7 +201,7 @@ int daNpcClerkT_c::CreateHeap() {
 }
 
 int daNpcClerkT_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_CLERKT");
     this->~daNpcClerkT_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp
index a981119eb0..811cc82019 100644
--- a/src/d/actor/d_a_npc_df.cpp
+++ b/src/d/actor/d_a_npc_df.cpp
@@ -323,8 +323,8 @@ static int daNpc_Df_IsDelete(npc_df_class* i_this) {
 }
 
 static int daNpc_Df_Delete(npc_df_class* i_this) {
-    fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
-    fpc_ProcID id = fopAcM_GetID(actor);
+    fopAc_ac_c* actor = &i_this->actor;
+    fopAcM_RegisterDeleteID(&i_this->actor, "Npc_Df");
 
     if (i_this->field_0x573) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Npc_df", 3);
diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp
index d7ac07b853..72a4f2bf16 100644
--- a/src/d/actor/d_a_npc_doc.cpp
+++ b/src/d/actor/d_a_npc_doc.cpp
@@ -259,7 +259,7 @@ int daNpc_Doc_c::CreateHeap() {
 
 int daNpc_Doc_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Doc_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_DOC");
     this->~daNpc_Doc_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp
index 313d4b449b..0b4e8250f3 100644
--- a/src/d/actor/d_a_npc_drainSol.cpp
+++ b/src/d/actor/d_a_npc_drainSol.cpp
@@ -174,7 +174,7 @@ int daNpcDrSol_c::CreateHeap() {
 }
 
 int daNpcDrSol_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_DRSOL");
     this->~daNpcDrSol_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp
index edc0f1d386..d1d2c852ac 100644
--- a/src/d/actor/d_a_npc_du.cpp
+++ b/src/d/actor/d_a_npc_du.cpp
@@ -584,7 +584,7 @@ static int daNpc_Du_IsDelete(npc_du_class* i_this) {
 
 static int daNpc_Du_Delete(npc_du_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "Npc_Du");
 
     dComIfG_resDelete(&i_this->mPhase, "Npc_Du");
 
diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp
index f35d28ef42..e0ea3bdeaf 100644
--- a/src/d/actor/d_a_npc_fairy.cpp
+++ b/src/d/actor/d_a_npc_fairy.cpp
@@ -726,7 +726,7 @@ bool daNpc_Fairy_c::afterSetMotionAnm(int i_idx, int i_bck_attr, f32 i_morf, int
 
 int daNpc_Fairy_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Fairy_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_FAIRY");
     this->~daNpc_Fairy_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp
index 6dd71c0900..450f5ca415 100644
--- a/src/d/actor/d_a_npc_gro.cpp
+++ b/src/d/actor/d_a_npc_gro.cpp
@@ -518,7 +518,7 @@ int daNpc_grO_c::CreateHeap() {
 }
 
 int daNpc_grO_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_GRO");
     this->~daNpc_grO_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp
index ee704017c7..760b8a6139 100644
--- a/src/d/actor/d_a_npc_grs.cpp
+++ b/src/d/actor/d_a_npc_grs.cpp
@@ -259,7 +259,7 @@ int daNpc_grS_c::CreateHeap() {
 }
 
 int daNpc_grS_c::Delete() {
-    fpc_ProcID unusedId = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_GRS");
     this->~daNpc_grS_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp
index 016975028f..bbf8240ce3 100644
--- a/src/d/actor/d_a_npc_hoz.cpp
+++ b/src/d/actor/d_a_npc_hoz.cpp
@@ -408,7 +408,7 @@ int daNpc_Hoz_c::CreateHeap() {
 
 int daNpc_Hoz_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Hoz_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_HOZ");
     this->~daNpc_Hoz_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp
index a1ad459fdc..b5e812256a 100644
--- a/src/d/actor/d_a_npc_inko.cpp
+++ b/src/d/actor/d_a_npc_inko.cpp
@@ -407,7 +407,7 @@ static int daNpc_Inko_IsDelete(npc_inko_class* i_this) {
 
 static int daNpc_Inko_Delete(npc_inko_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "Npc_Inko");
     dComIfG_resDelete(&i_this->phase, "Npc_inko");
 
     if (actor->heap != NULL) {
diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp
index fcdb9344cd..9be15f2f63 100644
--- a/src/d/actor/d_a_npc_kkri.cpp
+++ b/src/d/actor/d_a_npc_kkri.cpp
@@ -430,7 +430,7 @@ int daNpc_Kkri_c::CreateHeap() {
 
 int daNpc_Kkri_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Kkri_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_KKRI");
     this->~daNpc_Kkri_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp
index de8756360b..e8725b9f70 100644
--- a/src/d/actor/d_a_npc_myna2.cpp
+++ b/src/d/actor/d_a_npc_myna2.cpp
@@ -281,7 +281,7 @@ int daNpc_myna2_c::CreateHeap() {
 }
 
 int daNpc_myna2_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_MYNA2");
     this->~daNpc_myna2_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp
index 0685272d75..5aa501fd1b 100644
--- a/src/d/actor/d_a_npc_pachi_maro.cpp
+++ b/src/d/actor/d_a_npc_pachi_maro.cpp
@@ -651,7 +651,7 @@ int daNpc_Pachi_Maro_c::CreateHeap() {
 
 int daNpc_Pachi_Maro_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Pachi_Maro_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_Pachi_MARO");
     this->~daNpc_Pachi_Maro_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp
index bd27296dc2..1bfcdc3c15 100644
--- a/src/d/actor/d_a_npc_pachi_taro.cpp
+++ b/src/d/actor/d_a_npc_pachi_taro.cpp
@@ -901,7 +901,7 @@ int daNpc_Pachi_Taro_c::CreateHeap() {
 
 int daNpc_Pachi_Taro_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Pachi_Taro_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_TARO");
     this->~daNpc_Pachi_Taro_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp
index f82ef91e57..d0aea1a003 100644
--- a/src/d/actor/d_a_npc_post.cpp
+++ b/src/d/actor/d_a_npc_post.cpp
@@ -521,7 +521,7 @@ int daNpc_Post_c::CreateHeap() {
 
 int daNpc_Post_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_POST");
     this->~daNpc_Post_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp
index a3576806d4..08798a086f 100644
--- a/src/d/actor/d_a_npc_rafrel.cpp
+++ b/src/d/actor/d_a_npc_rafrel.cpp
@@ -349,9 +349,7 @@ int daNpcRafrel_c::CreateHeap() {
 }
 
 int daNpcRafrel_c::Delete() {
-    "Delete -> NPC_RAFREL(id=%d)\n";
-    
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_RAFREL");
     this->~daNpcRafrel_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp
index d54e922857..2ecf943314 100644
--- a/src/d/actor/d_a_npc_shaman.cpp
+++ b/src/d/actor/d_a_npc_shaman.cpp
@@ -328,7 +328,7 @@ int daNpc_Sha_c::CreateHeap() {
 
 int daNpc_Sha_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Sha_c -> コンストラクト\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_SHAMAN");
     this->~daNpc_Sha_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp
index ddfc244175..25383f05a1 100644
--- a/src/d/actor/d_a_npc_soldierA.cpp
+++ b/src/d/actor/d_a_npc_soldierA.cpp
@@ -311,7 +311,7 @@ int daNpc_SoldierA_c::CreateHeap() {
 }
 
 int daNpc_SoldierA_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_SOLDIERa");
     this->~daNpc_SoldierA_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp
index d26caca468..8c98eff41f 100644
--- a/src/d/actor/d_a_npc_soldierB.cpp
+++ b/src/d/actor/d_a_npc_soldierB.cpp
@@ -273,7 +273,7 @@ int daNpc_SoldierB_c::CreateHeap() {
 }
 
 int daNpc_SoldierB_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_SOLDIERb");
     this->~daNpc_SoldierB_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp
index 29df164a3f..453a84e96d 100644
--- a/src/d/actor/d_a_npc_theB.cpp
+++ b/src/d/actor/d_a_npc_theB.cpp
@@ -326,7 +326,7 @@ int daNpcTheB_c::CreateHeap() {
 }
 
 int daNpcTheB_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_THEB");
     this->~daNpcTheB_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp
index 45ca1dad16..12cf5fd0ed 100644
--- a/src/d/actor/d_a_npc_tkc.cpp
+++ b/src/d/actor/d_a_npc_tkc.cpp
@@ -297,7 +297,7 @@ int daNpcTkc_c::CreateHeap() {
 }
 
 int daNpcTkc_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_TKC");
     this->~daNpcTkc_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp
index af8bc88422..8cf5ac0250 100644
--- a/src/d/actor/d_a_npc_tkj.cpp
+++ b/src/d/actor/d_a_npc_tkj.cpp
@@ -251,7 +251,7 @@ int daNpcTkj_c::CreateHeap() {
 
 int daNpcTkj_c::Delete() {
     OS_REPORT("|%06d:%x|daNpcTkj_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_TKJ");
     this->~daNpcTkj_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp
index cfa98ce53f..40fd053ab2 100644
--- a/src/d/actor/d_a_npc_yamid.cpp
+++ b/src/d/actor/d_a_npc_yamid.cpp
@@ -297,7 +297,7 @@ int daNpc_yamiD_c::CreateHeap() {
 
 int daNpc_yamiD_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_yamiD_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID reg_r30 = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_YAMID");
     this->~daNpc_yamiD_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp
index 4eafe9a6e3..21f3bec668 100644
--- a/src/d/actor/d_a_npc_yamis.cpp
+++ b/src/d/actor/d_a_npc_yamis.cpp
@@ -232,7 +232,7 @@ int daNpc_yamiS_c::CreateHeap() {
 }
 
 int daNpc_yamiS_c::Delete() {
-    fpc_ProcID reg_r30 = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_YAMIS");
     this->~daNpc_yamiS_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp
index c281758b95..ad9587867c 100644
--- a/src/d/actor/d_a_npc_yamit.cpp
+++ b/src/d/actor/d_a_npc_yamit.cpp
@@ -235,7 +235,7 @@ int daNpc_yamiT_c::CreateHeap() {
 }
 
 int daNpc_yamiT_c::Delete() {
-    fpc_ProcID reg_r30 = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_YAMIT");
     this->~daNpc_yamiT_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp
index 0fc5427d39..87f497110e 100644
--- a/src/d/actor/d_a_npc_ykm.cpp
+++ b/src/d/actor/d_a_npc_ykm.cpp
@@ -750,15 +750,11 @@ int daNpc_ykM_c::CreateHeap() {
 
 int daNpc_ykM_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_ykM_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID unusedId = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_YKM");
     this->~daNpc_ykM_c();
     return 1;
 }
 
-static void dummy_string() {
-    OS_REPORT("Delete -> NPC_YKM(id=%d)\n", 0);
-}
-
 int daNpc_ykM_c::Execute() {
     return execute();
 }
diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp
index 70c6694dac..013ff2ccd1 100644
--- a/src/d/actor/d_a_npc_ykw.cpp
+++ b/src/d/actor/d_a_npc_ykw.cpp
@@ -431,7 +431,7 @@ int daNpc_ykW_c::CreateHeap() {
 
 int daNpc_ykW_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_ykW_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_YKW");
     this->~daNpc_ykW_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp
index 072467a470..a3aee281b0 100644
--- a/src/d/actor/d_a_npc_zanb.cpp
+++ b/src/d/actor/d_a_npc_zanb.cpp
@@ -239,7 +239,7 @@ int daNpc_zanB_c::CreateHeap() {
 
 int daNpc_zanB_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_zanB_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_ZANB");
     this->~daNpc_zanB_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp
index eaa27db6b9..4108246ea9 100644
--- a/src/d/actor/d_a_npc_zelda.cpp
+++ b/src/d/actor/d_a_npc_zelda.cpp
@@ -285,7 +285,7 @@ int daNpc_Zelda_c::CreateHeap() {
 
 int daNpc_Zelda_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Zelda_c -> Delete\n", g_Counter.mCounter0, this);
-    fpc_ProcID unusedId = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "NPC_ZELDA");
     this->~daNpc_Zelda_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp
index fd00d5b5a4..dbe848e6d3 100644
--- a/src/d/actor/d_a_obj_brg.cpp
+++ b/src/d/actor/d_a_obj_brg.cpp
@@ -1407,6 +1407,7 @@ static int daObj_Brg_IsDelete(obj_brg_class* i_this) {
 }
 
 static int daObj_Brg_Delete(obj_brg_class* i_this) {
+    fopAcM_RegisterDeleteID(i_this, "Obj_Brg");
     dComIfG_resDelete(&i_this->mPhase, "Obj_brg");
 
     if (i_this->mpBgW != NULL) {
@@ -1600,7 +1601,7 @@ static int CallbackCreateHeap(fopAc_ac_c* i_this) {
         }
     }
 
-    OS_REPORT("BGSV SET 1! \n");
+    OS_REPORT("BGSV SET 1!\n");
 
     a_this->mpBgW = new dBgWSv();
     if (a_this->mpBgW == NULL) {
@@ -1638,7 +1639,7 @@ static int daObj_Brg_Create(fopAc_ac_c* i_this) {
     int sp54;
     br_s* part;
     int loop, sp60, brno, iter;
-    int fop_id = fopAcM_GetID(i_this);
+    fopAcM_RegisterCreateID(i_this, "Obj_Brg");
     fopAcM_ct(i_this, obj_brg_class);
 
     phase_state = dComIfG_resLoad(&a_this->mPhase, "Obj_brg");
diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp
index d608eab9f5..aaa8e78b18 100644
--- a/src/d/actor/d_a_obj_cblock.cpp
+++ b/src/d/actor/d_a_obj_cblock.cpp
@@ -221,13 +221,6 @@ void daObjCBlk_c::block_mode_proc_call() {
     (this->*(l_func[field_0xc1e]))();
 }
 
-#if DEBUG
-static void dummy5() {
-    OS_REPORT("Delete -> ChainBlock(id=%d)\n");
-    OS_REPORT("Create -> ChainBlock(id=%d)\n");
-}
-#endif
-
 void daObjCBlk_c::initWait() {
     field_0xc1f = 0;
 }
@@ -381,14 +374,14 @@ static int daObjCBlk_Execute(daObjCBlk_c* i_this) {
 }
 
 static int daObjCBlk_Delete(daObjCBlk_c* i_this) {
-    fpc_ProcID unusedId = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "ChainBlock");
     return i_this->MoveBGDelete();
 }
 
 static int daObjCBlk_Create(fopAc_ac_c* i_this) {
-    daObjCBlk_c* cblock = static_cast<daObjCBlk_c*>(i_this);
-    fpc_ProcID unusedId = fopAcM_GetID(i_this);
-    return cblock->create();
+    daObjCBlk_c* a_this = (daObjCBlk_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "ChainBlock");
+    return a_this->create();
 }
 
 #if DEBUG
diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp
index 91d587f860..fe01cc25ed 100644
--- a/src/d/actor/d_a_obj_cowdoor.cpp
+++ b/src/d/actor/d_a_obj_cowdoor.cpp
@@ -83,16 +83,14 @@ static int daCowdoor_Execute(daCowdoor_c* i_this) {
 }
 
 static int daCowdoor_Delete(daCowdoor_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
-    (void)"Delete -> Cowdoor(id=%d)\n";
+    fopAcM_RegisterDeleteID(i_this, "Cowdoor");
     return i_this->MoveBGDelete();
 }
 
 static int daCowdoor_Create(fopAc_ac_c* i_this) {
-    daCowdoor_c* cowDoor = (daCowdoor_c*)i_this;
-    fpc_ProcID id = fopAcM_GetID(i_this);
-    (void)"Create -> Cowdoor(id=%d)\n";
-    return cowDoor->create();
+    daCowdoor_c* a_this = (daCowdoor_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Cowdoor");
+    return a_this->create();
 }
 
 static actor_method_class l_daCowdoor_Method = {
diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp
index d19a478842..17f9676e98 100644
--- a/src/d/actor/d_a_obj_crope.cpp
+++ b/src/d/actor/d_a_obj_crope.cpp
@@ -103,7 +103,8 @@ int daObjCrope_c::create() {
 }
 
 static int daObjCrope_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjCrope_c, i_this, "Obj_Crope");
+    daObjCrope_c* a_this = (daObjCrope_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Obj_Crope");
     return static_cast<daObjCrope_c*>(i_this)->create();
 }
 
diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp
index 8434e43d05..f5efa564b4 100644
--- a/src/d/actor/d_a_obj_damCps.cpp
+++ b/src/d/actor/d_a_obj_damCps.cpp
@@ -188,7 +188,8 @@ static int daObjDamCps_Delete(daObjDamCps_c* i_this) {
 }
 
 static int daObjDamCps_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjDamCps_c, i_this, "DamCps");
+    daObjDamCps_c* a_this = (daObjDamCps_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "DamCps");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp
index c829b2c55a..a8ca4fb33d 100644
--- a/src/d/actor/d_a_obj_ice_s.cpp
+++ b/src/d/actor/d_a_obj_ice_s.cpp
@@ -176,7 +176,8 @@ static int daObjIce_s_Delete(daObjIce_s_c* i_this) {
 }
 
 static int daObjIce_s_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjIce_s_c, i_this, "Obj_Ice_s");
+    daObjIce_s_c* a_this = (daObjIce_s_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Obj_Ice_s");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp
index 47c8c9e643..1488fb78d1 100644
--- a/src/d/actor/d_a_obj_ita.cpp
+++ b/src/d/actor/d_a_obj_ita.cpp
@@ -170,7 +170,8 @@ static int daObjIta_Delete(daObjIta_c* i_this) {
 }
 
 static int daObjIta_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjIta_c, i_this, "Obj_Ita");
+    daObjIta_c* a_this = (daObjIta_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Obj_Ita");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp
index 9898f83085..a0f7dd01ba 100644
--- a/src/d/actor/d_a_obj_kuwagata.cpp
+++ b/src/d/actor/d_a_obj_kuwagata.cpp
@@ -129,7 +129,8 @@ int daObjKUW_c::CreateHeap() {
 }
 
 static int daObjKUW_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjKUW_c, i_this, "Obj_Kuw");
+    daObjKUW_c* a_this = (daObjKUW_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Obj_Kuw");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp
index 059cb6601a..d7c7f631cc 100644
--- a/src/d/actor/d_a_obj_kznkarm.cpp
+++ b/src/d/actor/d_a_obj_kznkarm.cpp
@@ -439,7 +439,8 @@ inline int daObjKznkarm_c::create() {
 }
 
 static int daObjKznkarm_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjKznkarm_c, i_this, "KznkArm");
+    daObjKznkarm_c* a_this = (daObjKznkarm_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "KznkArm");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp
index 73b707e5b0..6c671e1c98 100644
--- a/src/d/actor/d_a_obj_mhole.cpp
+++ b/src/d/actor/d_a_obj_mhole.cpp
@@ -370,8 +370,9 @@ static int daObjMHole_Delete(daObjMHole_c* i_this) {
 }
 
 static int daObjMHole_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjMHole_c,i_this, "MHole");
-    return static_cast<daObjMHole_c*>(i_this)->create();
+    daObjMHole_c* a_this = (daObjMHole_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "MHole");
+    return a_this->create();
 }
 
 static actor_method_class l_daObjMHole_Method = {
diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp
index 9d596501ad..91076e19a7 100644
--- a/src/d/actor/d_a_obj_mirror_6pole.cpp
+++ b/src/d/actor/d_a_obj_mirror_6pole.cpp
@@ -120,8 +120,9 @@ int daObjMirror6Pole_c::create() {
 }
 
 static int daObjMirror6Pole_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjMirror6Pole_c, i_this, "Obj_Mirror6Pole");
-    return static_cast<daObjMirror6Pole_c*>(i_this)->create();
+    daObjMirror6Pole_c* a_this = (daObjMirror6Pole_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Obj_Mirror6Pole");
+    return a_this->create();
 }
 
 daObjMirror6Pole_c::~daObjMirror6Pole_c() {
diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp
index 1fd555dd57..2108194aa2 100644
--- a/src/d/actor/d_a_obj_poFire.cpp
+++ b/src/d/actor/d_a_obj_poFire.cpp
@@ -428,7 +428,8 @@ static int daPoFire_Delete(daPoFire_c* i_this) {
 }
 
 static int daPoFire_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daPoFire_c, i_this, "daPoFire");
+    daPoFire_c* a_this = (daPoFire_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "daPoFire");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp
index 12ce066a39..46690f8648 100644
--- a/src/d/actor/d_a_obj_sakuita_rope.cpp
+++ b/src/d/actor/d_a_obj_sakuita_rope.cpp
@@ -373,9 +373,10 @@ int daObjItaRope_c::create() {
     return rv;
 }
 
-static int daObjItaRope_Create(fopAc_ac_c* i_actor) {
-    fopAcM_RegisterCreateID(daObjItaRope_c, i_actor, "Obj_ItaRope");
-    return static_cast<daObjItaRope_c*>(i_actor)->create();
+static int daObjItaRope_Create(fopAc_ac_c* i_this) {
+    daObjItaRope_c* a_this = (daObjItaRope_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Obj_ItaRope");
+    return a_this->create();
 }
 
 static actor_method_class l_daObjItaRope_Method = {
diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp
index b7ce69ed51..26e74a6e66 100644
--- a/src/d/actor/d_a_obj_shield.cpp
+++ b/src/d/actor/d_a_obj_shield.cpp
@@ -356,7 +356,8 @@ static int daItemShield_Delete(daItemShield_c* i_this) {
 }
 
 static int daItemShield_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daItemShield_c, i_this, "ObjSShield");
+    daItemShield_c* a_this = (daItemShield_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "ObjSShield");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp
index cc2614aba4..d20800fdd7 100644
--- a/src/d/actor/d_a_obj_smallkey.cpp
+++ b/src/d/actor/d_a_obj_smallkey.cpp
@@ -539,13 +539,14 @@ static int daKey_Execute(daKey_c* i_this) {
 }
 
 static int daKey_Delete(daKey_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "ObjSKey");
     return i_this->_delete();
 }
 
 static int daKey_Create(fopAc_ac_c* i_this) {
-    fpc_ProcID id = fopAcM_GetID(i_this);
-    return ((daKey_c*)i_this)->create();
+    daKey_c* a_this = (daKey_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "ObjSKey");
+    return a_this->create();
 }
 
 static actor_method_class l_daKey_Method = {
diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp
index 6f76e114b0..1ebcc0f21f 100644
--- a/src/d/actor/d_a_obj_spinLift.cpp
+++ b/src/d/actor/d_a_obj_spinLift.cpp
@@ -262,14 +262,14 @@ static int daSpinLift_Execute(daSpinLift_c* i_this) {
 }
 
 static int daSpinLift_Delete(daSpinLift_c* i_this) {
-    fpc_ProcID proc_id = fopAcM_GetID(i_this);
+    fopAcM_RegisterCreateID(i_this, "daSpinLift");
     return i_this->MoveBGDelete();
 }
 
-static int daSpinLift_Create(fopAc_ac_c* a_this) {
-    daSpinLift_c* i_this = (daSpinLift_c*)a_this;
-    fpc_ProcID proc_id = fopAcM_GetID(a_this);
-    return i_this->create();
+static int daSpinLift_Create(fopAc_ac_c* i_this) {
+    daSpinLift_c* a_this = (daSpinLift_c*)i_this;
+    fopAcM_RegisterDeleteID(i_this, "daSpinLift");
+    return a_this->create();
 }
 
 static actor_method_class l_daSpinLift_Method = {
diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp
index 8dfb91bab4..e3f435c630 100644
--- a/src/d/actor/d_a_obj_swchain.cpp
+++ b/src/d/actor/d_a_obj_swchain.cpp
@@ -1180,14 +1180,14 @@ static int daObjSwChain_Execute(daObjSwChain_c* i_this) {
 }
 
 static int daObjSwChain_Delete(daObjSwChain_c* i_this) {
-    fpc_ProcID unused = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "SwChain");
     return i_this->_delete();
 }
 
-static int daObjSwChain_Create(fopAc_ac_c* a_this) {
-    daObjSwChain_c* i_this = (daObjSwChain_c*)a_this;
-    fpc_ProcID unused = fopAcM_GetID(a_this);
-    return i_this->create1st();
+static int daObjSwChain_Create(fopAc_ac_c* i_this) {
+    daObjSwChain_c* a_this = (daObjSwChain_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "SwChain");
+    return a_this->create1st();
 }
 
 static actor_method_class l_daObjSwChain_Method = {
diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp
index c921014d4d..f01ec869f7 100644
--- a/src/d/actor/d_a_obj_tks.cpp
+++ b/src/d/actor/d_a_obj_tks.cpp
@@ -206,7 +206,7 @@ int daObjTks_c::CreateHeap() {
 }
 
 int daObjTks_c::Delete() {
-    fpc_ProcID id = fopAcM_GetID(this);
+    fopAcM_RegisterDeleteID(this, "OBJ_TKS");
     this->~daObjTks_c();
     return 1;
 }
diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp
index 733451be37..051d5e9a33 100644
--- a/src/d/actor/d_a_obj_twGate.cpp
+++ b/src/d/actor/d_a_obj_twGate.cpp
@@ -207,7 +207,8 @@ static int daTwGate_Delete(daTwGate_c* i_this) {
 }
 
 static int daTwGate_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daTwGate_c, i_this, "daTwGate");
+    daTwGate_c* a_this = (daTwGate_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "daTwGate");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp
index 9940fcfb93..47dae42331 100644
--- a/src/d/actor/d_a_obj_vground.cpp
+++ b/src/d/actor/d_a_obj_vground.cpp
@@ -125,7 +125,8 @@ static int daObjVGnd_Delete(daObjVGnd_c* i_this) {
 }
 
 static int daObjVGnd_Create(fopAc_ac_c* i_this) {
-    fopAcM_RegisterCreateID(daObjVGnd_c, i_this, "Sample");
+    daObjVGnd_c* a_this = (daObjVGnd_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "Sample");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp
index d5b98afc33..942b8a4bce 100644
--- a/src/d/actor/d_a_obj_waterGate.cpp
+++ b/src/d/actor/d_a_obj_waterGate.cpp
@@ -196,13 +196,13 @@ static int daWtGate_Execute(daWtGate_c* i_this) {
 }
 
 static int daWtGate_Delete(daWtGate_c* i_this) {
-    const fpc_ProcID procID = fopAcM_GetID(i_this);
+    fopAcM_RegisterDeleteID(i_this, "daWtGate");
     return i_this->MoveBGDelete();
 }
 
 static int daWtGate_Create(fopAc_ac_c* i_this) {
     daWtGate_c* const waterGate = static_cast<daWtGate_c*>(i_this);
-    const fpc_ProcID procID = fopAcM_GetID(i_this);
+    fopAcM_RegisterCreateID(i_this, "daWtGate");
     return waterGate->create();
 }
 
diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp
index cb28097ce8..d7d68f7ec9 100644
--- a/src/d/actor/d_a_obj_wood_statue.cpp
+++ b/src/d/actor/d_a_obj_wood_statue.cpp
@@ -447,21 +447,22 @@ int daObjWStatue_c::_delete() {
     return 1;
 }
 
-static int daObjWStatue_Draw(daObjWStatue_c * i_this) {
+static int daObjWStatue_Draw(daObjWStatue_c* i_this) {
     return i_this->draw();
 }
 
-static int daObjWStatue_Execute(daObjWStatue_c * i_this) {
+static int daObjWStatue_Execute(daObjWStatue_c* i_this) {
     return i_this->execute();
 }
 
-static int daObjWStatue_Delete(daObjWStatue_c * i_this) {
+static int daObjWStatue_Delete(daObjWStatue_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "ObjLife");
     return i_this->_delete();
 }
 
-static int daObjWStatue_Create(fopAc_ac_c * i_this) {
-    fopAcM_RegisterCreateID(daObjWStatue_c, i_this, "ObjLife");
+static int daObjWStatue_Create(fopAc_ac_c* i_this) {
+    daObjWStatue_c* a_this = (daObjWStatue_c*)i_this;
+    fopAcM_RegisterCreateID(i_this, "ObjLife");
     return a_this->create();
 }
 
diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp
index 066936d634..31cc323f2a 100644
--- a/src/d/actor/d_a_tag_waterfall.cpp
+++ b/src/d/actor/d_a_tag_waterfall.cpp
@@ -182,6 +182,7 @@ int daTagWaterFall_c::_delete() {
 }
 
 static int daTagWaterFall_Delete(daTagWaterFall_c* i_this) {
+    fopAcM_RegisterDeleteID(i_this, "Tag_WaterFall");
     return i_this->_delete();
 }