Clean up resource enums, more inline work

15 files changed, 98 insertions, 95 deletions

diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp
index 96509e21..f2699cb5 100644
--- a/src/d/actor/d_a_bomb2.cpp
+++ b/src/d/actor/d_a_bomb2.cpp
@@ -12,6 +12,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_sea.h"
 #include "d/actor/d_a_player.h"
+#include "d/res/res_vbakh.h"
 
 // Needed for the .data section to match.
 static f32 dummy1[3] = {1.0f, 1.0f, 1.0f};
diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc
index d0242966..403d90b6 100644
--- a/src/d/actor/d_a_bomb3.inc
+++ b/src/d/actor/d_a_bomb3.inc
@@ -13,6 +13,7 @@
 #include "f_op/f_op_kankyo_mng.h"
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_lib.h"
+#include "d/res/res_vbakh.h"
 
 // Needed for the .data section to match.
 static f32 dummy1[3] = {1.0f, 1.0f, 1.0f};
diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp
index cc35a9a5..aee05842 100644
--- a/src/d/actor/d_a_ghostship.cpp
+++ b/src/d/actor/d_a_ghostship.cpp
@@ -10,6 +10,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 #include "d/d_kankyo_wether.h"
+#include "d/res/res_cloth.h"
 
 enum AYUSH_RES_FILE_ID { // IDs and indexes are synced
     /* BDLM */
diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp
index 10ebf493..e60d8356 100644
--- a/src/d/actor/d_a_kytag05.cpp
+++ b/src/d/actor/d_a_kytag05.cpp
@@ -50,8 +50,7 @@ static BOOL daKytag05_Execute(kytag05_class* a_this) {
         return TRUE;
     }
     
-    if (dComIfGp_event_runCheck() && dComIfGp_evmng_startCheck("demo41") &&
-        g_dComIfG_gameInfo.play.getDemo()) {
+    if (dComIfGp_event_runCheck() && dComIfGp_evmng_startCheck("demo41") && dComIfGp_demo_get()) {
         u32 demoFrame = dComIfGp_demo_get()->getFrame();
         if(demoFrame >= 0x186) {
             f32 fVar7 = ((f32)demoFrame - 390.0f) / 100.0f;
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index b19cfbbe..195e642d 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -13,6 +13,7 @@
 #include "d/actor/d_a_item.h"
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_lib.h"
+#include "d/res/res_cloth.h"
 
 enum FDAI_RES_FILE_ID { // IDs and indexes are synced
     /* BCK */
diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp
index fc20d956..2b84f1a6 100644
--- a/src/d/actor/d_a_swhit0.cpp
+++ b/src/d/actor/d_a_swhit0.cpp
@@ -102,7 +102,7 @@ s32 daSwhit0_c::getSwNo2() {
 
 /* 000000C4-00000230       .text CreateHeap__10daSwhit0_cFv */
 BOOL daSwhit0_c::CreateHeap() {
-    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", 0x35);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_OBM_SYOUGEKISW);
     JUT_ASSERT(0xD5, modelData != 0);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202);
@@ -110,12 +110,12 @@ BOOL daSwhit0_c::CreateHeap() {
         return FALSE;
     }
 
-    J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", 0x0D);
+    J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Always", ALWAYS_BCK_OBM_SYOUGEKISW);
     if (mAnm.init(modelData, anm, true, 0x02, 1.0f, 0, -1, false) == 0) {
         return FALSE;
     }
 
-    J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", 0x58);
+    J3DAnmTextureSRTKey* texAnm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", ALWAYS_BTK_OBM_SYOUGEKISW);
     if (mTexAnm.init(modelData, texAnm, true, 0x02, 1.0f, 0, -1, false, 0) == 0) {
         return FALSE;
     }
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index 855ec248..08e8deba 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -550,7 +550,7 @@ BOOL dEvt_control_c::check() {
     }
 
     if (!runCheck() && checkStart())
-        g_dComIfG_gameInfo.play.getVibration().StopQuake(-1);
+        dComIfGp_getVibration().StopQuake(-1);
 
     soundProc();
     mOrderCount = 0;
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index ca161121..c5528d13 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -143,7 +143,7 @@ void dDlst_Gameover_CAPTURE_c::draw() {
 /* 8018E4B4-8018E77C       .text _create__11dGameover_cFv */
 s32 dGameover_c::_create() {
     s32 rt = dComIfG_resLoad(&mPhs, "Gover");
-    if (dMenu_flag() || (dComIfGp_getHeapLockFlag() != 0 && dComIfGp_getHeapLockFlag() != 4) || g_dComIfG_gameInfo.play.field_0x492a != 0)
+    if (dMenu_flag() || (dComIfGp_isHeapLockFlag() != 0 && dComIfGp_isHeapLockFlag() != 4) || g_dComIfG_gameInfo.play.field_0x492a != 0)
         return cPhs_INIT_e;
 
     if (rt == cPhs_COMPLEATE_e) {
diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp
index 50581895..8bf5702d 100644
--- a/src/d/d_item_data.cpp
+++ b/src/d/d_item_data.cpp
@@ -6,7 +6,8 @@
 #include "d/d_item_data.h"
 #include "d/d_particle_name.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dolphin/types.h"
+#include "d/res/res_always.h"
+#include "d/res/res_link.h"
 
 // Needed for the .data section to match.
 static f32 dummy1[3] = {1.0f, 1.0f, 1.0f};
@@ -488,7 +489,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         // 0x00: HEART
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00],
-        /* mBmdIdx      */ 0x002A,
+        /* mBmdIdx      */ ALWAYS_BDL_VHRTL,
         /* mSrtIdx      */ -1,
         /* mSrtIdx2     */ -1,
         /* mTevIdx      */ -1,
@@ -632,7 +633,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         // 0x09: S_MAGIC
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00],
-        /* mBmdIdx      */ 0x0032,
+        /* mBmdIdx      */ ALWAYS_BDL_MPODA,
         /* mSrtIdx      */ -1,
         /* mSrtIdx2     */ -1,
         /* mTevIdx      */ -1,
@@ -648,7 +649,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         // 0x0A: L_MAGIC
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00],
-        /* mBmdIdx      */ 0x0033,
+        /* mBmdIdx      */ ALWAYS_BDL_MPODB,
         /* mSrtIdx      */ -1,
         /* mSrtIdx2     */ -1,
         /* mTevIdx      */ -1,
@@ -744,7 +745,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         // 0x10: ARROW_10
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_BOW_01],
-        /* mBmdIdx      */ 0x001E,
+        /* mBmdIdx      */ ALWAYS_BDL_ARROWITEM,
         /* mSrtIdx      */ -1,
         /* mSrtIdx2     */ -1,
         /* mTevIdx      */ -1,
@@ -760,7 +761,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         // 0x11: ARROW_20
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_BOW_01],
-        /* mBmdIdx      */ 0x001E,
+        /* mBmdIdx      */ ALWAYS_BDL_ARROWITEM,
         /* mSrtIdx      */ -1,
         /* mSrtIdx2     */ -1,
         /* mTevIdx      */ -1,
@@ -776,7 +777,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         // 0x12: ARROW_30
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_BOW_01],
-        /* mBmdIdx      */ 0x001E,
+        /* mBmdIdx      */ ALWAYS_BDL_ARROWITEM,
         /* mSrtIdx      */ -1,
         /* mSrtIdx2     */ -1,
         /* mTevIdx      */ -1,
@@ -968,7 +969,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         // 0x1E: TRIPLE_HEART
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_BOTTLE_00],
-        /* mBmdIdx      */ 0x002A,
+        /* mBmdIdx      */ ALWAYS_BDL_VHRTL,
         /* mSrtIdx      */ -1,
         /* mSrtIdx2     */ -1,
         /* mTevIdx      */ -1,
@@ -4587,7 +4588,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x00: HEART
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x002A,
+        /* mBmdIdx   */ ALWAYS_BDL_VHRTL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4600,10 +4601,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x01: GREEN_RUPEE
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x003A,
-        /* mSrtIdx   */ 0x005D,
+        /* mBmdIdx   */ ALWAYS_BDL_VLUPL,
+        /* mSrtIdx   */ ALWAYS_BTK_VLUPL,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x0051,
+        /* mTevIdx   */ ALWAYS_BRK_VLUPL,
         /* mTevIdx2  */ -1,
         /* mBckIdx   */ -1,
         /* mTevFrm   */ 0x00,
@@ -4613,10 +4614,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x02: BLUE_RUPEE
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x003A,
-        /* mSrtIdx   */ 0x005D,
+        /* mBmdIdx   */ ALWAYS_BDL_VLUPL,
+        /* mSrtIdx   */ ALWAYS_BTK_VLUPL,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x0051,
+        /* mTevIdx   */ ALWAYS_BRK_VLUPL,
         /* mTevIdx2  */ -1,
         /* mBckIdx   */ -1,
         /* mTevFrm   */ 0x01,
@@ -4626,10 +4627,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x03: YELLOW_RUPEE
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x003A,
-        /* mSrtIdx   */ 0x005D,
+        /* mBmdIdx   */ ALWAYS_BDL_VLUPL,
+        /* mSrtIdx   */ ALWAYS_BTK_VLUPL,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x0051,
+        /* mTevIdx   */ ALWAYS_BRK_VLUPL,
         /* mTevIdx2  */ -1,
         /* mBckIdx   */ -1,
         /* mTevFrm   */ 0x02,
@@ -4639,10 +4640,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x04: RED_RUPEE
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x003A,
-        /* mSrtIdx   */ 0x005D,
+        /* mBmdIdx   */ ALWAYS_BDL_VLUPL,
+        /* mSrtIdx   */ ALWAYS_BTK_VLUPL,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x0051,
+        /* mTevIdx   */ ALWAYS_BRK_VLUPL,
         /* mTevIdx2  */ -1,
         /* mBckIdx   */ -1,
         /* mTevFrm   */ 0x03,
@@ -4652,10 +4653,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x05: PURPLE_RUPEE
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x003A,
-        /* mSrtIdx   */ 0x005D,
+        /* mBmdIdx   */ ALWAYS_BDL_VLUPL,
+        /* mSrtIdx   */ ALWAYS_BTK_VLUPL,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x0051,
+        /* mTevIdx   */ ALWAYS_BRK_VLUPL,
         /* mTevIdx2  */ -1,
         /* mBckIdx   */ -1,
         /* mTevFrm   */ 0x04,
@@ -4665,10 +4666,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x06: ORANGE_RUPEE
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x003A,
-        /* mSrtIdx   */ 0x005D,
+        /* mBmdIdx   */ ALWAYS_BDL_VLUPL,
+        /* mSrtIdx   */ ALWAYS_BTK_VLUPL,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x0051,
+        /* mTevIdx   */ ALWAYS_BRK_VLUPL,
         /* mTevIdx2  */ -1,
         /* mBckIdx   */ -1,
         /* mTevFrm   */ 0x05,
@@ -4678,8 +4679,8 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x07: KAKERA_HEART
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0038,
-        /* mSrtIdx   */ 0x005B,
+        /* mBmdIdx   */ ALWAYS_BDL_VHKAL,
+        /* mSrtIdx   */ ALWAYS_BTK_VHKAL,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
         /* mTevIdx2  */ -1,
@@ -4691,8 +4692,8 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x08: UTUWA_HEART
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0039,
-        /* mSrtIdx   */ 0x005C,
+        /* mBmdIdx   */ ALWAYS_BDL_VHUTL,
+        /* mSrtIdx   */ ALWAYS_BTK_VHUTL,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
         /* mTevIdx2  */ -1,
@@ -4704,7 +4705,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x09: S_MAGIC
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0032,
+        /* mBmdIdx   */ ALWAYS_BDL_MPODA,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4717,7 +4718,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x0A: L_MAGIC
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0033,
+        /* mBmdIdx   */ ALWAYS_BDL_MPODB,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4730,7 +4731,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x0B: BOMB_5
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_LINK],
-        /* mBmdIdx   */ 0x003C,
+        /* mBmdIdx   */ LINK_BDL_BOMB,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4743,7 +4744,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x0C: BOMB_10
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_LINK],
-        /* mBmdIdx   */ 0x003C,
+        /* mBmdIdx   */ LINK_BDL_BOMB,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4756,7 +4757,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x0D: BOMB_20
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_LINK],
-        /* mBmdIdx   */ 0x003C,
+        /* mBmdIdx   */ LINK_BDL_BOMB,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4769,7 +4770,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x0E: BOMB_30
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_LINK],
-        /* mBmdIdx   */ 0x003C,
+        /* mBmdIdx   */ LINK_BDL_BOMB,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4782,10 +4783,10 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x0F: SILVER_RUPEE
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x003A,
-        /* mSrtIdx   */ 0x005D,
+        /* mBmdIdx   */ ALWAYS_BDL_VLUPL,
+        /* mSrtIdx   */ ALWAYS_BTK_VLUPL,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x0051,
+        /* mTevIdx   */ ALWAYS_BRK_VLUPL,
         /* mTevIdx2  */ -1,
         /* mBckIdx   */ -1,
         /* mTevFrm   */ 0x06,
@@ -4795,7 +4796,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x10: ARROW_10
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x001E,
+        /* mBmdIdx   */ ALWAYS_BDL_ARROWITEM,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4808,7 +4809,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x11: ARROW_20
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x001E,
+        /* mBmdIdx   */ ALWAYS_BDL_ARROWITEM,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4821,7 +4822,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x12: ARROW_30
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x001E,
+        /* mBmdIdx   */ ALWAYS_BDL_ARROWITEM,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4860,7 +4861,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x15: SMALL_KEY
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x002B,
+        /* mBmdIdx   */ ALWAYS_BDL_VKEYL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4873,12 +4874,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x16: RECOVER_FAIRY
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x001F,
+        /* mBmdIdx   */ ALWAYS_BDL_FA,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x000C,
+        /* mBckIdx   */ ALWAYS_BCK_FA,
         /* mTevFrm   */ -1,
         /* mUnknown  */ 0x11000022,
         /* mHeapSize */ 0x4000
@@ -4977,7 +4978,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x1E: TRIPLE_HEART
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x002A,
+        /* mBmdIdx   */ ALWAYS_BDL_VHRTL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -4990,12 +4991,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x1F: PENDANT
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0029,
+        /* mBmdIdx   */ ALWAYS_BDL_VHAPL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x0015,
+        /* mBckIdx   */ ALWAYS_BCK_VHAPL,
         /* mTevFrm   */ -1,
         /* mUnknown  */ 0x11000022,
         /* mHeapSize */ 0x0FE0
@@ -5276,7 +5277,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x35: MAGIC_ARROW
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_LINK],
-        /* mBmdIdx   */ 0x0037,
+        /* mBmdIdx   */ LINK_BDL_ARROW,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -5289,7 +5290,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x36: LIGHT_ARROW
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_LINK],
-        /* mBmdIdx   */ 0x0037,
+        /* mBmdIdx   */ LINK_BDL_ARROW,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
@@ -5484,12 +5485,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x45: SKULL_NECKLACE
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0027,
+        /* mBmdIdx   */ ALWAYS_BDL_VDOKL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x0012,
+        /* mBckIdx   */ ALWAYS_BCK_VDOKL,
         /* mTevFrm   */ -1,
         /* mUnknown  */ 0x11000022,
         /* mHeapSize */ 0x08A0
@@ -5497,12 +5498,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x46: BOKOBABA_SEED
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0026,
+        /* mBmdIdx   */ ALWAYS_BDL_VBOKL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x0010,
+        /* mBckIdx   */ ALWAYS_BCK_VBOKL,
         /* mTevFrm   */ -1,
         /* mUnknown  */ 0x11000022,
         /* mHeapSize */ 0x0720
@@ -5510,12 +5511,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x47: GOLDEN_FEATHER
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0037,
-        /* mSrtIdx   */ 0x005A,
+        /* mBmdIdx   */ ALWAYS_BDL_VHANL,
+        /* mSrtIdx   */ ALWAYS_BTK_VHANL,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x0050,
+        /* mTevIdx   */ ALWAYS_BRK_VHANL,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x0014,
+        /* mBckIdx   */ ALWAYS_BCK_VHANL,
         /* mTevFrm   */ -1,
         /* mUnknown  */ 0x11000222,
         /* mHeapSize */ 0x0EC0
@@ -5523,12 +5524,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x48: BOKO_BELT
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0025,
-        /* mSrtIdx   */ 0x0059,
+        /* mBmdIdx   */ ALWAYS_BDL_VBELL,
+        /* mSrtIdx   */ ALWAYS_BTK_VBELL,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x000F,
+        /* mBckIdx   */ ALWAYS_BCK_VBELL,
         /* mTevFrm   */ -1,
         /* mUnknown  */ 0x11000222,
         /* mHeapSize */ 0x0760
@@ -5536,12 +5537,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x49: RED_JELLY
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0036,
+        /* mBmdIdx   */ ALWAYS_BDL_VCHUL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x004F,
+        /* mTevIdx   */ ALWAYS_BRK_VCHUL,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x0011,
+        /* mBckIdx   */ ALWAYS_BCK_VCHUL,
         /* mTevFrm   */ 0x01,
         /* mUnknown  */ 0x11000022,
         /* mHeapSize */ 0x0800
@@ -5549,12 +5550,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x4A: GREEN_JELLY
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0036,
+        /* mBmdIdx   */ ALWAYS_BDL_VCHUL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x004F,
+        /* mTevIdx   */ ALWAYS_BRK_VCHUL,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x0011,
+        /* mBckIdx   */ ALWAYS_BCK_VCHUL,
         /* mTevFrm   */ 0x00,
         /* mUnknown  */ 0x11000022,
         /* mHeapSize */ 0x0800
@@ -5562,12 +5563,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x4B: BLUE_JELLY
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0036,
+        /* mBmdIdx   */ ALWAYS_BDL_VCHUL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
-        /* mTevIdx   */ 0x004F,
+        /* mTevIdx   */ ALWAYS_BRK_VCHUL,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x0011,
+        /* mBckIdx   */ ALWAYS_BCK_VCHUL,
         /* mTevFrm   */ 0x02,
         /* mUnknown  */ 0x11000022,
         /* mHeapSize */ 0x0800
@@ -6277,12 +6278,12 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
     {
         // 0x82: BIRD_ESA_5
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
-        /* mBmdIdx   */ 0x0028,
+        /* mBmdIdx   */ ALWAYS_BDL_VESAL,
         /* mSrtIdx   */ -1,
         /* mSrtIdx2  */ -1,
         /* mTevIdx   */ -1,
         /* mTevIdx2  */ -1,
-        /* mBckIdx   */ 0x0013,
+        /* mBckIdx   */ ALWAYS_BCK_VESAL,
         /* mTevFrm   */ -1,
         /* mUnknown  */ 0x11000022,
         /* mHeapSize */ 0x0740
diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp
index 02a23171..9144ce9e 100644
--- a/src/d/d_kankyo_rain.cpp
+++ b/src/d/d_kankyo_rain.cpp
@@ -712,8 +712,7 @@ void dKyr_rain_init() {
 
 /* 8008D0B4-8008D0DC       .text rain_bg_chk__FP19dKankyo_rain_Packeti */
 void rain_bg_chk(dKankyo_rain_Packet* pPkt, int idx) {
-    camera_class* pCamera = g_dComIfG_gameInfo.play.mCameraInfo[0].mpCamera;
-    pPkt->mEff[idx].field_0x30 = pCamera->mLookat.mCenter.y + -800.0f;
+    pPkt->mEff[idx].field_0x30 = dComIfGp_getCamera(0)->mLookat.mCenter.y + -800.0f;
 }
 
 /* 8008D0DC-8008D53C       .text overhead_bg_chk__Fv */
diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp
index 6db70244..dff2dcc3 100644
--- a/src/d/d_particle.cpp
+++ b/src/d/d_particle.cpp
@@ -444,7 +444,7 @@ void dPa_control_c::createCommon(const void* param_1) {
     mEmitterMng = new(mHeap, 0) JPAEmitterManager(mCommonResMng, 3000, 150, 200, mHeap);
     JUT_ASSERT(1324, mEmitterMng != 0);
     JKRHeap* oldHeap = mDoExt_setCurrentHeap(mHeap);
-    mModelControl = new dPa_modelControl_c((J3DModelData*)g_dComIfG_gameInfo.mResControl.getObjectRes("Always", 0x31));
+    mModelControl = new dPa_modelControl_c((J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPODA));
     JUT_ASSERT(1332, mModelControl != 0);
     for (u16 i = 0; i < 8; i++) {
         u16 var1 = dPa_name::j_o_id[i];
diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp
index 74fdff0d..26cd2d45 100644
--- a/src/d/d_place_name.cpp
+++ b/src/d/d_place_name.cpp
@@ -135,7 +135,7 @@ void dPlace_name_c::draw() {
 s32 dPn_c::_create() {
     s32 rt = dComIfG_resLoad(&mPhs, "PName");
 
-    if (dMenu_flag() || (g_dComIfG_gameInfo.play.getHeapLockFlag() != 0 && g_dComIfG_gameInfo.play.getHeapLockFlag() != 10) || g_dComIfG_gameInfo.play.field_0x492a != 0)
+    if (dMenu_flag() || (dComIfGp_isHeapLockFlag() != 0 && dComIfGp_isHeapLockFlag() != 10) || g_dComIfG_gameInfo.play.field_0x492a != 0)
         return cPhs_INIT_e;
 
     if (mState == 0) {
@@ -143,8 +143,8 @@ s32 dPn_c::_create() {
             dRes_info_c * resInfo = dComIfG_getObjectResInfo("PName");
             JUT_ASSERT(VERSION_SELECT(147, 169, 169), resInfo != 0);
 
-            mpHeap = g_dComIfG_gameInfo.play.getExpHeap2D();
-            g_dComIfG_gameInfo.play.setHeapLockFlag(10);
+            mpHeap = dComIfGp_getExpHeap2D();
+            dComIfGp_setHeapLockFlag(10);
             JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
             dPn_scrn = new dPlace_name_c();
             JUT_ASSERT(VERSION_SELECT(155, 177, 177), dPn_scrn != 0);
@@ -202,9 +202,9 @@ s32 dPn_c::_create() {
 
 /* 801614E8-80161554       .text _execute__5dPn_cFv */
 BOOL dPn_c::_execute() {
-    if (g_dComIfG_gameInfo.play.mPlacenameState == 2) {
+    if (dComIfGp_checkStageName() == 2) {
         dPn_scrn->_openAnime();
-    } else if (g_dComIfG_gameInfo.play.mPlacenameState == 1) {
+    } else if (dComIfGp_checkStageName() == 1) {
         if (dPn_scrn->_closeAnime())
             fopMsgM_Delete(this);
     }
@@ -228,7 +228,7 @@ BOOL dPn_c::_delete() {
         delete dvd;
     mpHeap->free(mpTIMG);
     mpHeap->freeAll();
-    g_dComIfG_gameInfo.play.offHeapLockFlag();
+    dComIfGp_offHeapLockFlag();
     mDoExt_setCurrentHeap(oldHeap);
     dComIfG_resDelete(&mPhs, "PName");
     return TRUE;
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp
index c4c07b8b..c11ea4e2 100644
--- a/src/d/d_save.cpp
+++ b/src/d/d_save.cpp
@@ -1792,16 +1792,16 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) {
         buffer += sizeof(dSv_player_status_c_c);
     }
     
-    memcpy(g_dComIfG_gameInfo.save.getPSave(), buffer,  sizeof(dSv_memory_c) * dSv_save_c::STAGE_MAX);
+    memcpy(dComIfGs_getPCourseInfo(), buffer,  sizeof(dSv_memory_c) * dSv_save_c::STAGE_MAX);
     buffer += sizeof(dSv_memory_c) * dSv_save_c::STAGE_MAX;
     
-    memcpy(g_dComIfG_gameInfo.save.getPOcean(), buffer,  sizeof(dSv_ocean_c));
+    memcpy(dComIfGs_getPOcean(), buffer,  sizeof(dSv_ocean_c));
     buffer += sizeof(dSv_ocean_c);
     
-    memcpy(g_dComIfG_gameInfo.save.getPEvent(), buffer,  sizeof(dSv_event_c));
+    memcpy(dComIfGs_getPEvent(), buffer,  sizeof(dSv_event_c));
     buffer += sizeof(dSv_event_c);
     
-    memcpy(g_dComIfG_gameInfo.save.getPReserve(), buffer,  sizeof(dSv_reserve_c));
+    memcpy(dComIfGs_getPReserve(), buffer,  sizeof(dSv_reserve_c));
     buffer += sizeof(dSv_reserve_c);
     
     s32 load_size = buffer - buffer_start;
diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp
index 017511af..94a5dcce 100644
--- a/src/d/d_shop.cpp
+++ b/src/d/d_shop.cpp
@@ -1344,7 +1344,7 @@ u8 dShop_BoughtErrorStatus(ShopItems_c* shopItems, int param_2, int param_3) {
     
     if (buyCond & Shop_BuyCond_MUST_OWN_ITEM_e) {
         if (itemData->mMustOwnItemNo == BOW) {
-            if (g_dComIfG_gameInfo.save.getPlayer().getItem().getItem(0xC) == 0xFF) {
+            if (dComIfGs_getItem(0xC) == 0xFF) {
                 errorStatus |= Shop_BuyCond_MUST_OWN_ITEM_e;
             }
         } else {
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index 00f538d6..80d7317c 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -61,7 +61,7 @@ void fopMsgM_hyrule_language_check(u32) {
 
 /* 8002AE28-8002AED4       .text fopMsgM_setStageLayer__FPv */
 s32 fopMsgM_setStageLayer(void* proc) {
-    scene_class* stageProc = fopScnM_SearchByID(g_dComIfG_gameInfo.play.getRoomControl()->mProcID);
+    scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
     JUT_ASSERT(0x189, stageProc != 0);
     u32 layer = fpcM_LayerID(stageProc);
     return fpcM_ChangeLayerID(proc, layer);