Started using resource enums for old actors

24 files changed, 128 insertions, 68 deletions

diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc
index d841ac1f..184138eb 100644
--- a/src/d/actor/d_a_bomb3.inc
+++ b/src/d/actor/d_a_bomb3.inc
@@ -1476,18 +1476,18 @@ static actor_method_class l_daBomb_Method = {
 };
 
 actor_process_profile_definition g_profile_BOMB = {
-    fpcLy_CURRENT_e,
-    7,
-    fpcPi_CURRENT_e,
-    PROC_BOMB,
-    &g_fpcLf_Method.base,
-    sizeof(daBomb_c),
-    0,
-    0,
-    &g_fopAc_Method.base,
-    0x0115,
-    &l_daBomb_Method,
-    fopAcStts_CULL_e | fopAcStts_UNK40000_e,
-    fopAc_ACTOR_e,
-    fopAc_CULLBOX_CUSTOM_e,
+    /* LayerID      */ fpcLy_CURRENT_e,
+    /* ListID       */ 0x0007,
+    /* ListPrio     */ fpcPi_CURRENT_e,
+    /* ProcName     */ PROC_BOMB,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(daBomb_c),
+    /* SizeOther    */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Priority     */ 0x0115,
+    /* Actor SubMtd */ &l_daBomb_Method,
+    /* Status       */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
+    /* Group        */ fopAc_ACTOR_e,
+    /* CullType     */ fopAc_CULLBOX_CUSTOM_e,
 };
diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp
index a1aaeeac..969ea0dc 100644
--- a/src/d/actor/d_a_bwdg.cpp
+++ b/src/d/actor/d_a_bwdg.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_bwdg.h"
+#include "d/res/res_bwdg.h"
 #include "d/d_bg_w_hf.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
@@ -216,8 +217,8 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
         return FALSE;
     }
     
-    u16* r30 = (u16*)dComIfG_getObjectRes("Bwdg", 4);
-    cBgD_t* r3 = (cBgD_t*)dComIfG_getObjectRes("Bwdg", 7);
+    u16* r30 = (u16*)dComIfG_getObjectRes("Bwdg", BWDG_DAT_GRIDIDX);
+    cBgD_t* r3 = (cBgD_t*)dComIfG_getObjectRes("Bwdg", BWDG_DZB_HSAND1);
     if (!i_this->mpBgW->Set(r3, r30, 130.0f, 0x40, 0x40, 0)) {
         return TRUE;
     } else {
diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp
index a50adadd..eeb70503 100644
--- a/src/d/actor/d_a_esa.cpp
+++ b/src/d/actor/d_a_esa.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_esa.h"
+#include "d/res/res_link.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_s_play.h"
@@ -226,7 +227,7 @@ static BOOL daEsa_Delete(esa_class* i_this) {
 static BOOL daEsa_CreateHeap(fopAc_ac_c* i_actor) {
     esa_class* i_this = static_cast<esa_class*>(i_actor);
 
-    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", 0x2C));
+    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_ESA));
     JUT_ASSERT(0x1E8, modelData != 0);
     i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
 
diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp
index 49cf7af2..ce9cee43 100644
--- a/src/d/actor/d_a_fan.cpp
+++ b/src/d/actor/d_a_fan.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_fan.h"
+#include "d/res/res_yaflw00.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_level_se.h"
@@ -75,23 +76,23 @@ int daFan_c::CreateHeap() {
         return FALSE;
     mModel->setUserArea((u32)this);
 
-    modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, 0x08);
+    modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BDL_YAFLW00);
     JUT_ASSERT(0x17f, modelData != 0);
     mWindModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
     if (mWindModel == NULL)
         return FALSE;
 
-    J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, 0x0B);
+    J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_01);
     JUT_ASSERT(400, pbtk != 0);
     if (!mWindBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,-1, false, 0))
         return FALSE;
 
-    pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, 0x0C);
+    pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_02);
     JUT_ASSERT(0x19c, pbtk != 0);
     if (!mWindBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0,-1, false, 0))
         return FALSE;
 
-    J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, 0x05);
+    J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BCK_YAFLW00);
     JUT_ASSERT(0x1a9, pbck != 0);
     if (!mWindBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,-1, false))
         return FALSE;
diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp
index 90794b7d..2b7072d7 100644
--- a/src/d/actor/d_a_floor.cpp
+++ b/src/d/actor/d_a_floor.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_floor.h"
+#include "d/res/res_hhyu1.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
@@ -34,7 +35,7 @@ BOOL daFloor_c::Delete() {
 
 /* 0000012C-000001E8       .text CreateHeap__9daFloor_cFv */
 int daFloor_c::CreateHeap() {
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, 0x04);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HHYU1_BDL_HHYU1);
     JUT_ASSERT(0xc1, modelData != 0);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mpModel == NULL)
diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp
index 536f8d33..66ec33bd 100644
--- a/src/d/actor/d_a_kaji.cpp
+++ b/src/d/actor/d_a_kaji.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_kaji.h"
+#include "d/res/res_kaji.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "m_Do/m_Do_mtx.h"
@@ -23,15 +24,15 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 
 /* 00000098-000001F4       .text CreateHeap__8daKaji_cFv */
 BOOL daKaji_c::CreateHeap() {
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, 0x11); // asoda.bdl
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KAJI_INDEX_BDL_ASODA);
     JUT_ASSERT(0x55, modelData != 0);
     
     mpMorf = new mDoExt_McaMorf(
         modelData,
         NULL, NULL,
-        (J3DAnmTransformKey*)dComIfG_getObjectRes("Kaji", 0xE), // kj_wait.bck
+        (J3DAnmTransformKey*)dComIfG_getObjectRes("Kaji", KAJI_INDEX_BCK_KJ_WAIT),
         J3DFrameCtrl::LOOP_REPEAT_e, 0.0f, 0, -1, 1,
-        dComIfG_getObjectRes("Kaji", 0x8), // kj_wait.bas
+        dComIfG_getObjectRes("Kaji", KAJI_INDEX_BAS_KJ_WAIT),
         0x00080000,
         0x11000002
     );
diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp
index 1fe3a5ea..1f5d2fe1 100644
--- a/src/d/actor/d_a_kt.cpp
+++ b/src/d/actor/d_a_kt.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_kt.h"
+#include "d/res/res_kt.h"
 #include "d/d_bg_s_gnd_chk.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
@@ -299,10 +300,10 @@ static BOOL daKt_Delete(kt_class* i_this) {
 static BOOL daKt_solidHeapCB(fopAc_ac_c* i_ac) {
     kt_class* i_this = (kt_class*)i_ac;
 
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kt", 0x0B);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kt", KT_INDEX_BMD_KT_MODEL);
     i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x10000, 0x11020203);
 
-    J3DModelData* modelDataWing = (J3DModelData*)dComIfG_getObjectRes("Kt", 0x0A);
+    J3DModelData* modelDataWing = (J3DModelData*)dComIfG_getObjectRes("Kt", KT_INDEX_BMD_KT_HANE);
     i_this->mpModelWing = mDoExt_J3DModel__create(modelDataWing, 0x10000, 0x11020203);
 
     return modelData != NULL && modelDataWing != NULL && i_this->mpModel != NULL && i_this->mpModelWing != NULL;
diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp
index 4511bb67..8b627592 100644
--- a/src/d/actor/d_a_lamp.cpp
+++ b/src/d/actor/d_a_lamp.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_lamp.h"
+#include "d/res/res_lamp.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
@@ -159,7 +160,7 @@ static BOOL daLamp_Delete(lamp_class* i_this) {
 
 /* 00000678-0000073C       .text useHeapInit__FP10lamp_class */
 static BOOL useHeapInit(lamp_class* i_this) {
-    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Lamp", 3));
+    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Lamp", LAMP_BMD_LAMP_00));
     JUT_ASSERT(0x170, modelData != 0);
 
     i_this->mModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index 7e010cee..a5aa112d 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_mozo.h"
+#include "d/res/res_mozo.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_com_inf_game.h"
@@ -54,13 +55,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 
 /* 000007AC-00000A24       .text CreateHeap__8daMozo_cFv */
 BOOL daMozo_c::CreateHeap() {
-    J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", 9);
+    J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", MOZO_BDL_MOZ);
     
     mDoExt_McaMorf* newMorf =  new mDoExt_McaMorf(
         mdlData,
         0,
         0,
-        static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", 6)),
+        static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", MOZO_BCK_MOZ)),
         J3DFrameCtrl::LOOP_REPEAT_e,
         1.0f,
         0,
@@ -73,10 +74,10 @@ BOOL daMozo_c::CreateHeap() {
     
     mAnimMorf = newMorf;
 
-    m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", 0x0C);
+    m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_BRK_MOZ);
     JUT_ASSERT(0x16A, m_brk != 0);
 
-    m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", 0x0F);
+    m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_BTK_MOZ);
     JUT_ASSERT(0x16D, m_btk != 0);
 
     int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, 0, 1.0f, 0, -1, false, 0);
diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp
index b27bc4c8..bacd3166 100644
--- a/src/d/actor/d_a_npc_nz.cpp
+++ b/src/d/actor/d_a_npc_nz.cpp
@@ -4,6 +4,8 @@
 //
 
 #include "d/actor/d_a_npc_nz.h"
+#include "d/res/res_nz.h"
+#include "d/res/res_npcnz.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_lib.h"
@@ -145,7 +147,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 
 /* 00000D18-00000F98       .text _createHeap__10daNpc_Nz_cFv */
 BOOL daNpc_Nz_c::_createHeap() {
-    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_bdl_arc_name, 3));
+    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_bdl_arc_name, NPCNZ_BDL_NZ));
     JUT_ASSERT(0xD0, modelData != 0);
 
     mpMorf = new mDoExt_McaMorf(
@@ -179,7 +181,7 @@ BOOL daNpc_Nz_c::_createHeap() {
         }
     }
 
-    if (field_0x934.init(1, 10, static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, 0x2E)), 0)) {
+    if (field_0x934.init(1, 10, static_cast<ResTIMG*>(dComIfG_getObjectRes(m_arc_name, NZ_BTI_SIPPO)), 0)) {
         return TRUE;
     } else {
         return FALSE;
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index 0201cb04..be1d6f80 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "d/actor/d_a_npc_os.h"
+#include "d/res/res_os.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
@@ -235,13 +236,13 @@ static BOOL tunoNodeCallBack(J3DNode* node, int param_1) {
 
 /* 00000988-00000C94       .text createHeap__10daNpc_Os_cFv */
 BOOL daNpc_Os_c::createHeap() {
-    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Os", 9));
+    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Os", OS_BDL_OS));
     JUT_ASSERT(0x2F9, modelData != 0);
 
     mpMorf = new mDoExt_McaMorf(
         modelData,
         NULL, NULL,
-        static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Os", 6)),
+        static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Os", OS_BCK_OS_MOVE01)),
         J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1,
         NULL,
         0x00080000,
diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp
index 655452f8..dbc8ea75 100644
--- a/src/d/actor/d_a_obj_Vteng.cpp
+++ b/src/d/actor/d_a_obj_Vteng.cpp
@@ -42,7 +42,15 @@ bool daObjVteng_c::create_heap() {
         JUT_ASSERT(0xb7, 0);
         ret = false;
     } else {
-        mpMorf = new mDoExt_McaMorf(pModelData, NULL, NULL, pAnm, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0x3B, -1, 0, NULL, 0x00, 0x11020203);
+        mpMorf = new mDoExt_McaMorf(
+            pModelData,
+            NULL, NULL,
+            pAnm,
+            J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0x3B, -1, 0,
+            NULL,
+            0x00000000,
+            0x11020203
+        );
         if (!mpMorf) {
             ret = false;
         } else {
diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp
index 321d2b94..ad841b4e 100644
--- a/src/d/actor/d_a_obj_bscurtain.cpp
+++ b/src/d/actor/d_a_obj_bscurtain.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_obj_bscurtain.h"
+#include "d/res/res_ptc.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JUtility/JUTAssert.h"
@@ -43,9 +44,9 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 BOOL daObj_Bscurtain_c::CreateHeap() {
     J3DModelData* modelData;
     if ((fpcM_GetParam(this) & 0xFF) != 1 || dComIfGs_isEventBit(0x1F08) != 0) {
-        modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, 0x03);
+        modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, PTC_INDEX_BDL_PTCO);
     } else {
-        modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, 0x04);
+        modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, PTC_INDEX_BDL_PTCU);
     }
 
     JUT_ASSERT(0xa9, modelData != 0);
diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp
index 92859e25..1f0b89ae 100644
--- a/src/d/actor/d_a_obj_cafelmp.cpp
+++ b/src/d/actor/d_a_obj_cafelmp.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_obj_cafelmp.h"
+#include "d/res/res_cafelmp.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
@@ -19,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 
 /* 00000098-0000015C       .text CreateHeap__14daObjCafelmp_cFv */
 BOOL daObjCafelmp_c::CreateHeap() {
-    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Cafelmp", 0x03));
+    J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Cafelmp", CAFELMP_BDL_YLAMP));
     JUT_ASSERT(0x51, modelData != 0);
     mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
     if (!mpModel)
diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp
index 464f35d0..5d53adf9 100644
--- a/src/d/actor/d_a_obj_gong.cpp
+++ b/src/d/actor/d_a_obj_gong.cpp
@@ -42,7 +42,15 @@ bool daObjGong::Act_c::create_heap() {
     J3DAnmTransformKey* bck = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(M_arcname, 0x07));
     JUT_ASSERT(0xbd, (modelData != 0) && (bck != 0));
 
-    mpMorf = new mDoExt_McaMorf(modelData, NULL, NULL, bck, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 0, NULL, 0, 0x11020203);
+    mpMorf = new mDoExt_McaMorf(
+        modelData,
+        NULL, NULL,
+        bck,
+        J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 0,
+        NULL,
+        0x00000000,
+        0x11020203
+    );
     J3DModel * model = mpMorf != NULL ? mpMorf->getModel() : NULL;
 
     bool ret = false;
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 4418b8e2..8dd1f0f3 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "d/actor/d_a_obj_toripost.h"
+#include "d/res/res_toripost.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/actor/d_a_player.h"
@@ -87,10 +88,18 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 
 /* 0000010C-0000022C       .text _createHeap__12daObjTpost_cFv */
 BOOL daObjTpost_c::_createHeap() {
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, 9);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, TORIPOST_BDL_VPOST);
     JUT_ASSERT(132, modelData != 0);
 
-    mMorf = new mDoExt_McaMorf(modelData, 0, 0, 0, -1, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000022);
+    mMorf = new mDoExt_McaMorf(
+        modelData,
+        NULL, NULL,
+        NULL,
+        -1, 1.0f, 0, -1, 1,
+        NULL,
+        0x00080000,
+        0x11000022
+    );
 
     if(mMorf == NULL || mMorf->getModel() == NULL) {
         return FALSE;
diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp
index 8018b062..d56ff75b 100644
--- a/src/d/actor/d_a_obj_vfan.cpp
+++ b/src/d/actor/d_a_obj_vfan.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_obj_vfan.h"
+#include "d/res/res_vfan.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
@@ -47,7 +48,7 @@ static dCcD_SrcCyl cyl_check_src = {
 
 /* 00000078-00000134       .text CreateHeap__Q29daObjVfan5Act_cFv */
 int daObjVfan::Act_c::CreateHeap() {
-    J3DModelData* model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, 4));
+    J3DModelData* model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, VFAN_BDL_V_FAN_00));
 
     JUT_ASSERT(0x8c, model_data != 0);
 
diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp
index a79a7e26..28b8797f 100644
--- a/src/d/actor/d_a_obj_zouK.cpp
+++ b/src/d/actor/d_a_obj_zouK.cpp
@@ -70,7 +70,15 @@ bool daObjZouk::Act_c::create_heap() {
     M_bck_data = (J3DAnmTransformKey*)dComIfG_getObjectRes(M_arcname, 0x05);
     JUT_ASSERT(0x175, M_bck_data != 0);
     if (mdl_data != NULL && M_bck_data != NULL) {
-        M_anm = new mDoExt_McaMorf(mdl_data, NULL, NULL, M_bck_data, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, 1, NULL, 0, 0x11020203);
+        M_anm = new mDoExt_McaMorf(
+            mdl_data,
+            NULL, NULL,
+            M_bck_data,
+            J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, 1,
+            NULL,
+            0x00000000,
+            0x11020203
+        );
     }
     JUT_ASSERT(0x183, M_anm != 0);
     if (M_anm != NULL) {
diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp
index c4411e6a..90ed1fe0 100644
--- a/src/d/actor/d_a_sail.cpp
+++ b/src/d/actor/d_a_sail.cpp
@@ -4,10 +4,11 @@
 //
 
 #include "d/actor/d_a_sail.h"
+#include "d/res/res_kaizokusen.h"
+#include "d/res/res_cloth.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_obj_pirateship.h"
-#include "d/res/res_cloth.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_lib.h"
@@ -459,7 +460,7 @@ void daSail_packet_c::setNrmVtx(cXyz*, int, int) {
 /* 00000870-000010D8       .text draw__15daSail_packet_cFv */
 void daSail_packet_c::draw() {
     /* Nonmatching */
-    dComIfG_getObjectRes("Kaizokusen", 0xA);
+    dComIfG_getObjectRes("Kaizokusen", KAIZOKUSEN_INDEX_BTI_TXA_KAIZOKU_HO);
     dComIfG_getObjectRes("Cloth", CLOTH_BTI_CLOTHTOON);
 }
 
@@ -513,7 +514,7 @@ static BOOL daSail_Delete(sail_class* i_this) {
 /* 000021D8-00002254       .text daSail_checkCreateHeap__FP10fopAc_ac_c */
 static BOOL daSail_checkCreateHeap(fopAc_ac_c* i_actor) {
     sail_class* i_this = (sail_class*)i_actor;
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kaizokusen", 0xD);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kaizokusen", KAIZOKUSEN_INDEX_BDL_AMAST);
     if (modelData == NULL) {
         return FALSE;
     }
diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp
index 5f63c68d..1041233e 100644
--- a/src/d/actor/d_a_swtact.cpp
+++ b/src/d/actor/d_a_swtact.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_swtact.h"
+#include "d/res/res_itact.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
@@ -30,7 +31,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_ac) {
 
 /* 000000CC-00000194       .text CreateHeap__10daSwTact_cFv */
 BOOL daSwTact_c::CreateHeap() {
-    J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, 3);
+    J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, ITACT_BDL_ITACT);
     JUT_ASSERT(0xe1, modelData != 0);
     model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (model == NULL)
diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp
index bd7e59d0..067cc5c4 100644
--- a/src/d/actor/d_a_swtdoor.cpp
+++ b/src/d/actor/d_a_swtdoor.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/actor/d_a_swtdoor.h"
+#include "d/res/res_swtdoor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
@@ -49,7 +50,7 @@ static BOOL daSwtdoor_Delete(swtdoor_class* i_this) {
 /* 000001F4-00000260       .text useHeapInit__FP10fopAc_ac_c */
 static BOOL useHeapInit(fopAc_ac_c* i_ac) {
     swtdoor_class * i_this = (swtdoor_class *)i_ac;
-    J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Swtdoor", 3);
+    J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Swtdoor", SWTDOOR_BMD_SWTDOOR);
     i_this->model = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (i_this->model == NULL)
         return FALSE;
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index c9810ecc..385e7f0e 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -70,7 +70,15 @@ dAttention_c::dAttention_c(fopAc_ac_c* player, u32 playerNo) {
     }
 
     for (s32 i = 0; i < (s32)ARRAY_SIZE(draw); i++) {
-        draw[i].anm = new mDoExt_McaMorf(modelData, &mCallBack, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Always", ALWAYS_BCK_YJ_LOOP), J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1, NULL, 0x80000, 0x1000003);
+        draw[i].anm = new mDoExt_McaMorf(
+            modelData,
+            &mCallBack, NULL,
+            (J3DAnmTransformKey*)dComIfG_getObjectRes("Always", ALWAYS_BCK_YJ_LOOP),
+            J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, 1,
+            NULL,
+            0x00080000,
+            0x01000003
+        );
         JUT_ASSERT(0xe3, draw[i].anm != 0 && draw[i].anm->getModel() != 0);
         draw[i].mpAnmClr = NULL;
         draw[i].mpAnmMatClr = new J3DMatColorAnm[anmColNum];
diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp
index 31926415..aff06074 100644
--- a/src/d/d_s_logo.cpp
+++ b/src/d/d_s_logo.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/res/res_logo.h"
+#include "d/res/res_system.h"
 #include "f_op/f_op_scene.h"
 #include "f_op/f_op_scene_mng.h"
 #include "c/c_dylink.h"
@@ -675,12 +676,12 @@ s32 phase_1(dScnLogo_c* i_this) {
 
     ResTIMG * toonImage;
 
-    toonImage = (ResTIMG *)dComIfG_getObjectRes("System", 3);
+    toonImage = (ResTIMG *)dComIfG_getObjectRes("System", SYSTEM_BTI_TOON);
 
     JUT_ASSERT(VERSION_SELECT(1208, 1426, 1466), toonImage != 0);
     dDlst_list_c::setToonImage(toonImage);
 
-    toonImage = (ResTIMG *)dComIfG_getObjectRes("System", 4);
+    toonImage = (ResTIMG *)dComIfG_getObjectRes("System", SYSTEM_BTI_TOONEX);
     JUT_ASSERT(VERSION_SELECT(1213, 1431, 1471), toonImage != 0);
     dDlst_list_c::setToonExImage(toonImage);
 
diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp
index 1e12b2d6..bd4b9796 100644
--- a/src/d/d_throwstone.cpp
+++ b/src/d/d_throwstone.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/d_throwstone.h"
+#include "d/res/res_aisi.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
@@ -21,7 +22,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_actor) {
 
 /* 8023B564-8023B5DC       .text CreateHeap__14daThrowstone_cFv */
 BOOL daThrowstone_c::CreateHeap() {
-    J3DModelData* pModelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, 0x03);
+    J3DModelData* pModelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, AISI_INDEX_BDL_AISI);
     if (pModelData == NULL)
         return FALSE;
 
@@ -117,18 +118,18 @@ static actor_method_class daThrowstoneMethodTable = {
 };
 
 actor_process_profile_definition g_profile_THROWSTONE = {
-    fpcLy_CURRENT_e,
-    2,
-    fpcPi_CURRENT_e,
-    PROC_THROWSTONE,
-    &g_fpcLf_Method.base,
-    sizeof(daThrowstone_c),
-    0,
-    0,
-    &g_fopAc_Method.base,
-    0x01CE,
-    &daThrowstoneMethodTable,
-    fopAcStts_CULL_e | fopAcStts_UNK40000_e,
-    fopAc_ACTOR_e,
-    fopAc_CULLBOX_0_e,
+    /* LayerID      */ fpcLy_CURRENT_e,
+    /* ListID       */ 0x0002,
+    /* ListPrio     */ fpcPi_CURRENT_e,
+    /* ProcName     */ PROC_THROWSTONE,
+    /* Proc SubMtd  */ &g_fpcLf_Method.base,
+    /* Size         */ sizeof(daThrowstone_c),
+    /* SizeOther    */ 0,
+    /* Parameters   */ 0,
+    /* Leaf SubMtd  */ &g_fopAc_Method.base,
+    /* Priority     */ 0x01CE,
+    /* Actor SubMtd */ &daThrowstoneMethodTable,
+    /* Status       */ fopAcStts_CULL_e | fopAcStts_UNK40000_e,
+    /* Group        */ fopAc_ACTOR_e,
+    /* CullType     */ fopAc_CULLBOX_0_e,
 };