diff --git a/include/d/d_map_path_fmap.h b/include/d/d_map_path_fmap.h
index 582e92dfcd..07f00091f5 100644
--- a/include/d/d_map_path_fmap.h
+++ b/include/d/d_map_path_fmap.h
@@ -57,7 +57,7 @@ public:
         return &mpTypeGroupData[i_typeGroupNo];
     }
 
-    /* 0x0 */ fmpTresTypeGroupDataList_c mpTypeGroupData[17];
+    /* 0x0 */ fmpTresTypeGroupDataList_c mpTypeGroupData[DUSK_IF_ELSE(35, 17)];
 };
 
 class dMenu_Fmap_data_c {
diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp
index 8ded221cfa..e4c13e0bc0 100644
--- a/src/d/actor/d_a_title.cpp
+++ b/src/d/actor/d_a_title.cpp
@@ -101,15 +101,7 @@ void daTit_HIO_c::genMessage(JORMContext* mctx) {
 #endif
 
 int daTitle_c::CreateHeap() {
-
-    #if TARGET_PC
-    if (dusk::tphd_active()) {
-#undef l_arcName
-#define l_arcName "Title"
-    }
-    #endif
-
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 10);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 10);
     JUT_ASSERT(258, modelData);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000285);
 
@@ -117,16 +109,16 @@ int daTitle_c::CreateHeap() {
         return 0;
     }
 
-    int res = mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7), 1, 0, 2.0f, 0, -1, false);
+    int res = mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 7), 1, 0, 2.0f, 0, -1, false);
     JUT_ASSERT(276, res == 1);
 
-    res = mBpk.init(modelData, (J3DAnmColor*)dComIfG_getObjectRes(l_arcName, 13), 1, 0, 2.0f, 0, -1);
+    res = mBpk.init(modelData, (J3DAnmColor*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 13), 1, 0, 2.0f, 0, -1);
     JUT_ASSERT(283, res == 1);
 
-    res = mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 16), 1, 0, 2.0f, 0, -1);
+    res = mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 16), 1, 0, 2.0f, 0, -1);
     JUT_ASSERT(290, res == 1);
 
-    res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 19), 1, 0, 2.0f, 0, -1);
+    res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName), 19), 1, 0, 2.0f, 0, -1);
     JUT_ASSERT(297, res == 1);
 
     return 1;
@@ -140,7 +132,7 @@ static procFunc daTitleProc[6] = {
 int daTitle_c::create() {
     fopAcM_ct(this, daTitle_c);
 
-    int phase_state = dComIfG_resLoad(&mPhaseReq, l_arcName);
+    int phase_state = dComIfG_resLoad(&mPhaseReq, DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName));
     if (phase_state != cPhs_COMPLEATE_e) {
         return phase_state;
     }
@@ -416,7 +408,7 @@ int daTitle_c::Draw() {
 int daTitle_c::Delete() {
     mDoHIO_DELETE_CHILD(g_daTitHIO.id);
 
-    dComIfG_resDelete(&mPhaseReq, l_arcName);
+    dComIfG_resDelete(&mPhaseReq, DUSK_IF_ELSE(dusk::tphd_active() ? "Title" : l_arcName, l_arcName));
     JKR_DELETE(mTitle.Scr);
     JKR_DELETE(field_0x600);
 
diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp
index 36b2ed1865..15f6517f29 100644
--- a/src/d/d_s_logo.cpp
+++ b/src/d/d_s_logo.cpp
@@ -1644,7 +1644,7 @@ void dScnLogo_c::dvdDataLoad() {
     mpRubyResCommand = onMemMount("/res/Fontus/rubyres.arc");
 #endif
 
-    mParticleCommand = mDoDvdThd_toMainRam_c::create(PARTICLE_COM_PATH, 0, dComIfGp_particle_getResHeap());
+    mParticleCommand = mDoDvdThd_toMainRam_c::create(DUSK_IF_ELSE(dusk::tphd_active() ? "/res/Particle/common-r.jpc" : PARTICLE_COM_PATH, PARTICLE_COM_PATH), 0, dComIfGp_particle_getResHeap());
 
     mItemTableCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/item_table.bin", 0, NULL);
     JUT_ASSERT(2620, mItemTableCommand != NULL);