1 files changed, 15 insertions, 15 deletions

diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp
index 3f211ffe..bf669e8c 100644
--- a/src/d/actor/d_a_dr2.cpp
+++ b/src/d/actor/d_a_dr2.cpp
@@ -5,7 +5,7 @@
 
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "d/actor/d_a_dr2.h"
-#include "d/res/res_dr2.h"
+#include "res/Object/Dr2.h"
 #include "m_Do/m_Do_ext.h"
 #include "d/d_bg_w.h"
 #include "d/d_s_play.h"
@@ -530,7 +530,7 @@ void dr_move(dr2_class* i_this) {
         case 0:
             if (i_this->unk_50C) {
                 i_this->unk_4C6 = 0;
-                J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Dr2", DR2_BCK_DR_BOSS_DEMO1);
+                J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BCK_DR_BOSS_DEMO1_e);
                 i_this->mpMorf2->setAnm(pAnimRes, 0, 1.0f, 1.0f, 0.0f, -1.0f, NULL);
                 i_this->unk_4C4 = 1;
             }
@@ -649,7 +649,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     dr2_class* i_this = (dr2_class*)a_this;
 
     i_this->mpMorf1 = new mDoExt_McaMorf(
-        (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_DR_SIPPO),
+        (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_DR_SIPPO_e),
         NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203
     );
     
@@ -662,7 +662,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
     }
     i_this->mpMorf1->getModel()->setUserArea((u32)i_this);
 
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BDL_IWA00);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BDL_IWA00_e);
     JUT_ASSERT(DEMO_SELECT(1347, 1361), modelData != NULL);
 
     i_this->unk_418 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -670,7 +670,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_GAN_MAGMA);
+    modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_GAN_MAGMA_e);
     JUT_ASSERT(DEMO_SELECT(1356, 1370), modelData != NULL);
 
     i_this->unk_41C = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -683,7 +683,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_GAN_MAGMA);
+    J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_GAN_MAGMA_e);
     BOOL init = i_this->unk_420->init(i_this->unk_41C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE);
 #if VERSION > VERSION_DEMO
     if (!init) {
@@ -701,15 +701,15 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         }
     }
 
-    i_this->mpMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_DR), 
-                            NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr2", DR2_BCK_DR_BOSS_DEMO1), 
+    i_this->mpMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_DR_e), 
+                            NULL, NULL, (J3DAnmTransformKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BCK_DR_BOSS_DEMO1_e), 
                             J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203);
 
     if (i_this->mpMorf2 == NULL || i_this->mpMorf2->getModel() == NULL) {
         return FALSE;
     }
 
-    modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO1);
+    modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_MBYO1_e);
     JUT_ASSERT(DEMO_SELECT(1405, 1429), modelData != NULL);
 
     i_this->unk_428 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -717,7 +717,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", DR2_BMD_MBYO2);
+    modelData = (J3DModelData*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BMD_MBYO2_e);
     JUT_ASSERT(DEMO_SELECT(1412, 1436), modelData != NULL);
 
     i_this->unk_42C = mDoExt_J3DModel__create(modelData,0,0x11020203);
@@ -730,7 +730,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_MBYO1);
+    srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_MBYO1_e);
     if (!i_this->unk_430->init(i_this->unk_428->getModelData(), srtKey, true, J3DFrameCtrl::EMode_LOOP)) {
         return FALSE;
     }
@@ -740,7 +740,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", DR2_BTK_MBYO2);
+    srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BTK_MBYO2_e);
     if (!i_this->unk_434->init(i_this->unk_42C->getModelData(), srtKey, true, J3DFrameCtrl::EMode_NONE)) {
         return FALSE;
     }
@@ -750,7 +750,7 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dr2", DR2_BRK_MBYO2);
+    J3DAnmTevRegKey* tevRegKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_BRK_MBYO2_e);
     if (!i_this->unk_438->init(i_this->unk_42C->getModelData(), tevRegKey, true, J3DFrameCtrl::EMode_NONE)) {
         return FALSE;
     }
@@ -765,11 +765,11 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
         return FALSE;
     }
 
-    cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", DR2_DZB_MBYO1);
+    cBgD_t* cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_DZB_MBYO1_e);
     i_this->mpBgW1->Set(cBgD, dBgW::MOVE_BG_e, &i_this->unk_440);
     i_this->mpBgW1->SetCrrFunc(dBgS_MoveBGProc_Typical);
 
-    cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", DR2_DZB_MBYO2);
+    cBgD = (cBgD_t*)dComIfG_getObjectRes("Dr2", dRes_INDEX_DR2_DZB_MBYO2_e);
     i_this->mpBgW2->Set(cBgD, dBgW::MOVE_BG_e, &i_this->unk_470);
     i_this->mpBgW2->SetCrrFunc(dBgS_MoveBGProc_Typical);