use enums in more places

src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp

@@ -416,7 +416,8 @@ u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* i_material, int i_i
     }
     bool ind_flag = !!(i_flags & 0x03000000) ? true : false; // fakematch? order gets messed up if you remove the ternary
     size += J3DMaterial::calcSizeColorBlock(0x40000000);
-    size += 0x124;  // TODO what is this
+    size += sizeof(J3DTexGenBlockPatched);
+    size += sizeof(J3DTevBlockPatched);
     size += J3DMaterial::calcSizeIndBlock(ind_flag);
     size += J3DMaterial::calcSizePEBlock(0x10000000, getMaterialMode(i_idx));
     J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];

src/d/actor/d_a_arrow_iceeff.cpp

@@ -19,7 +19,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 0000010C-00000324       .text CreateHeap__16daArrow_Iceeff_cFv */
 BOOL daArrow_Iceeff_c::CreateHeap() {
     if(field_0xA38 == 0) {
-        J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", 0x40));
+        J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GICER00));
         JUT_ASSERT(87, modelData != 0);
         for(int i = 0; i < 30; i++) {
             field_0x298[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
@@ -29,14 +29,14 @@ BOOL daArrow_Iceeff_c::CreateHeap() {
         }
     }
     else {
-        J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", 0x41));
+        J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GICER01));
         JUT_ASSERT(98, modelData != 0);
         mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
         if(mpModel == 0) {
             return false;
         }
         
-        J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Link", 0xD));
+        J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Link", LINK_BCK_GICER01));
         JUT_ASSERT(107, bck != 0);
         if(!mBck.init(modelData, bck, true, 0, 1.0f, 0, -1, false)) {
             return false;

src/d/actor/d_a_bomb2.cpp

@@ -15,6 +15,23 @@
 static f32 dummy1[3] = {1.0f, 1.0f, 1.0f};
 static f32 dummy2[3] = {1.0f, 1.0f, 1.0f};
 
+enum VBAKH_RES_FILE_ID { // IDs and indexes are synced
+    /* BCK */
+    VBAKH_BCK_VBAHX=0x5,
+    VBAKH_BCK_VBAKH=0x6,
+    VBAKH_BCK_VBAKM=0x7,
+    VBAKH_BCK_VBAMX=0x8,
+    
+    /* BDLM */
+    VBAKH_BDL_VBAKH=0xB,
+    VBAKH_BDL_VBAKM=0xC,
+    
+    /* BRK */
+    VBAKH_BRK_VBAHX=0xF,
+    VBAKH_BRK_VBAKM=0x10,
+    VBAKH_BRK_VBAMX=0x11,
+};
+
 namespace daBomb2 {
     namespace {
         struct Attr_c {
@@ -266,15 +283,15 @@ namespace daBomb2 {
     bool Act_c::create_heap_nut() {
         const char* resName = attr().resName;
 
-        J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(attr().resName, 0xC));
+        J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(attr().resName, VBAKH_BDL_VBAKM));
         JUT_ASSERT(0x303, mdl_data != 0);
         mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000022);
 
-        J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(resName, 0x7));
+        J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(resName, VBAKH_BCK_VBAKM));
         JUT_ASSERT(0x30D, bck_data != 0);
         int temp = mBck0.init(mdl_data, bck_data, true, 0, 1.0f, 0, -1, false);
 
-        J3DAnmTevRegKey* brk_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(resName, 0x10));
+        J3DAnmTevRegKey* brk_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(resName, VBAKH_BRK_VBAKM));
         JUT_ASSERT(0x314, brk_data != 0);
         int temp3 = mBrk0.init(mdl_data, brk_data, true, 0, 1.0f, 0, -1, false, 0);
 

src/d/actor/d_a_kytag04.cpp

@@ -9,7 +9,7 @@
 #include "dolphin/types.h"
 
 static BOOL daKytag04_Draw(kytag04_class*) {
-    return true;
+    return TRUE;
 }
 
 /* 00000080-00000138       .text daKytag04_Execute__FP13kytag04_class */
@@ -35,12 +35,12 @@ static BOOL daKytag04_Execute(kytag04_class* i_this) {
 /* 00000138-00000160       .text daKytag04_IsDelete__FP13kytag04_class */
 static BOOL daKytag04_IsDelete(kytag04_class* i_this) {
     dKy_change_colpat(i_this->mOffColPat);
-    return true;
+    return TRUE;
 }
 
 /* 00000160-00000168       .text daKytag04_Delete__FP13kytag04_class */
 static BOOL daKytag04_Delete(kytag04_class*) {
-    return true;
+    return TRUE;
 }
 
 /* 00000168-00000208       .text daKytag04_Create__FP10fopAc_ac_c */
@@ -55,7 +55,7 @@ static int daKytag04_Create(fopAc_ac_c* i_this)  {
     a_this->mScaleY = a_this->mScale.y * 100.0f;
     a_this->mTimer = 0;
     a_this->mTimerThreshold = 5;
-    return 4;
+    return cPhs_COMPLEATE_e;
 }
 
 static actor_method_class l_daKytag04_Method = {

src/d/actor/d_a_mbdoor.cpp

@@ -11,6 +11,28 @@
 #include "m_Do/m_Do_mtx.h"
 #include "d/actor/d_a_player.h"
 
+enum MBDOOR_RES_FILE_ID { // IDs and indexes are synced
+    /* BDL */
+    MBDOOR_BDL_S_MBD_L=0x4,
+    MBDOOR_BDL_S_MBD_R=0x5,
+    MBDOOR_BDL_S_MBDFU=0x6,
+    MBDOOR_BDL_S_MBDTO=0x7,
+    
+    /* DZB */
+    MBDOOR_DZB_S_MBDFU=0xA,
+};
+
+enum GBDOOR_RES_FILE_ID { // IDs and indexes are synced
+    /* BDL */
+    GBDOOR_BDL_V_GBD_L=0x4,
+    GBDOOR_BDL_V_GBD_R=0x5,
+    GBDOOR_BDL_V_GBDFU=0x6,
+    GBDOOR_BDL_V_GBDTO=0x7,
+    
+    /* DZB */
+    GBDOOR_DZB_GBD=0xA,
+};
+
 /* 00000078-00000084       .text getSwbit__10daMbdoor_cFv */
 u8 daMbdoor_c::getSwbit() {
     return fopAcM_GetParam(this) & 0xFF;
@@ -40,9 +62,9 @@ const char* daMbdoor_c::getArcName() {
 u32 daMbdoor_c::getFuBdl() {
     switch (getShapeType()) {
     case 1:
-        return 6; // v_gbdfu.bdl
+        return GBDOOR_BDL_V_GBDFU;
     default:
-        return 6; // s_mbdfu.bdl
+        return MBDOOR_BDL_S_MBDFU;
     }
 }
 
@@ -50,9 +72,9 @@ u32 daMbdoor_c::getFuBdl() {
 u32 daMbdoor_c::getLBdl() {
     switch (getShapeType()) {
     case 1:
-        return 4; // v_gbd_l.bdl
+        return GBDOOR_BDL_V_GBD_L;
     default:
-        return 4; // s_mbd_l.bdl
+        return MBDOOR_BDL_S_MBD_L;
     }
 }
 
@@ -60,9 +82,9 @@ u32 daMbdoor_c::getLBdl() {
 u32 daMbdoor_c::getRBdl() {
     switch (getShapeType()) {
     case 1:
-        return 5; // v_gbd_r.bdl
+        return GBDOOR_BDL_V_GBD_R;
     default:
-        return 5; // s_mbd_r.bdl
+        return MBDOOR_BDL_S_MBD_R;
     }
 }
 
@@ -70,9 +92,9 @@ u32 daMbdoor_c::getRBdl() {
 u32 daMbdoor_c::getToBdl() {
     switch (getShapeType()) {
     case 1:
-        return 7; // v_gbdto.bdl
+        return GBDOOR_BDL_V_GBDTO;
     default:
-        return 7; // s_mbdto.bdl
+        return MBDOOR_BDL_S_MBDTO;
     }
 }
 
@@ -80,9 +102,9 @@ u32 daMbdoor_c::getToBdl() {
 u32 daMbdoor_c::getDzb() {
     switch (getShapeType()) {
     case 1:
-        return 0xA; // gbd.dzb
+        return GBDOOR_DZB_GBD;
     default:
-        return 0xA; // s_mbdfu.dzb
+        return MBDOOR_DZB_S_MBDFU;
     }
 }
 

src/d/actor/d_a_obj_AjavW.cpp

@@ -12,6 +12,17 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 
+enum AJAVW_RES_FILE_ID { // IDs and indexes are synced
+    /* BDLM */
+    AJAVW_BDL_AJAVW=0x5,
+    
+    /* BTK */
+    AJAVW_BTK_AJAVW=0x8,
+    
+    /* DZB */
+    AJAVW_DZB_AJAVW=0xB,
+};
+
 namespace {
     static const char l_arcname[] = "AjavW";
 };
@@ -25,8 +36,8 @@ BOOL daObjAjavW_c::solidHeapCB(fopAc_ac_c* i_this) {
 bool daObjAjavW_c::create_heap() {
     bool ret = true;
 
-    J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 0x05));
-    J3DAnmTextureSRTKey * pBtk = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes(l_arcname, 0x08);
+    J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, AJAVW_BDL_AJAVW));
+    J3DAnmTextureSRTKey * pBtk = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes(l_arcname, AJAVW_BTK_AJAVW);
 
     if (!pModelData || !pBtk) {
         JUT_ASSERT(0xa7, 0);
@@ -34,7 +45,7 @@ bool daObjAjavW_c::create_heap() {
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222);
         s32 btkRet = mBtkAnm.init(pModelData, pBtk, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
-        mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, 0x0B), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx());
+        mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, AJAVW_DZB_AJAVW), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx());
 
         if (!mpModel || !btkRet || !mpBgW)
             ret = false;

src/d/actor/d_a_obj_eayogn.cpp

@@ -12,6 +12,14 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 
+enum EAYOGN_RES_FILE_ID { // IDs and indexes are synced
+    /* BDL */
+    EAYOGN_BDL_EAYOGN=0x4,
+    
+    /* DZB */
+    EAYOGN_DZB_EAYOGN=0x7,
+};
+
 const char daObjEayogn_c::M_arcname[7] = "Eayogn";
 
 /* 00000078-00000098       .text solidHeapCB__13daObjEayogn_cFP10fopAc_ac_c */
@@ -23,13 +31,13 @@ BOOL daObjEayogn_c::solidHeapCB(fopAc_ac_c* i_this) {
 BOOL daObjEayogn_c::create_heap() {
     BOOL ret = FALSE;
 
-    J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, 0x04));
+    J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, EAYOGN_BDL_EAYOGN));
     JUT_ASSERT(0x5c, mdl_data != 0);
 
     if (mdl_data != NULL) {
         mpModel = mDoExt_J3DModel__create(mdl_data, 0x00, 0x11020203);
         if (mpModel != NULL) {
-            mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, 0x07), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx());
+            mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(M_arcname, EAYOGN_DZB_EAYOGN), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx());
             if (mpBgW != NULL)
                 ret = TRUE;
         }

src/d/actor/d_a_obj_ganonbed.cpp

@@ -12,6 +12,15 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 
+enum GBED_RES_FILE_ID { // IDs and indexes are synced
+    /* BDL */
+    GBED_BDL_K_GBED=0x4,
+    
+    /* DZB */
+    GBED_DZB_K_GBED=0x7,
+    GBED_DZB_VTENG=0x8,
+};
+
 namespace {
     static const char l_arcname[] = "Gbed";
 };
@@ -33,14 +42,14 @@ BOOL daObjGbed_c::solidHeapCB(fopAc_ac_c* i_this) {
 bool daObjGbed_c::create_heap() {
     bool ret = true;
 
-    J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 0x04));
+    J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, GBED_BDL_K_GBED));
 
     if (!pModelData) {
         JUT_ASSERT(0xb1, 0);
         ret = false;
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022);
-        mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, 0x07), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx());
+        mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, GBED_DZB_K_GBED), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx());
 
         if (!mpModel || !mpBgW)
             ret = false;

src/d/actor/d_a_obj_hfuck1.cpp

@@ -13,6 +13,14 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 
+enum HFUCK1_RES_FILE_ID { // IDs and indexes are synced
+    /* BDL */
+    HFUCK1_BDL_HFUCK1=0x4,
+    
+    /* DZB */
+    HFUCK1_DZB_HFUCK1=0x7,
+};
+
 namespace {
     static const char l_arcname[] = "Hfuck1";
 
@@ -65,14 +73,14 @@ BOOL daObjHfuck1_c::solidHeapCB(fopAc_ac_c* i_this) {
 bool daObjHfuck1_c::create_heap() {
     bool ret = true;
 
-    J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, 0x04));
+    J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, HFUCK1_BDL_HFUCK1));
 
     if (!pModelData) {
         JUT_ASSERT(0xf5, 0);
         ret = false;
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022);
-        mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, 0x07), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx());
+        mpBgW = dBgW_NewSet((cBgD_t*)dComIfG_getObjectRes(l_arcname, HFUCK1_DZB_HFUCK1), cBgW::MOVE_BG_e, &mpModel->getBaseTRMtx());
 
         if (!mpModel || !mpBgW)
             ret = false;

src/d/actor/d_a_obj_mknjd.cpp

@@ -339,7 +339,7 @@ int daObjMknjD::Act_c::Delete() {
 s32 daObjMknjD::Act_c::Mthd_Delete() {
     int bgDeleteResult = MoveBGDelete();
     
-    if (fpcM_CreateResult(this) != 3) {
+    if (fpcM_CreateResult(this) != cPhs_UNK3_e) {
         dComIfG_resDelete(&mPhs, M_arcname);
     }
 

src/d/actor/d_a_seatag.cpp

@@ -6,25 +6,25 @@
 #include "d/d_procname.h"
 
 static BOOL daSeatag_Draw(daSeatag_c*) {
-    return true;
+    return TRUE;
 }
 
 static  BOOL daSeatag_Execute(daSeatag_c*) {
-    return true;
+    return TRUE;
 }
 
 static BOOL daSeatag_IsDelete(daSeatag_c*) {
-    return true;
+    return TRUE;
 }
 
 static BOOL daSeatag_Delete(daSeatag_c* a_this) {
     a_this->~daSeatag_c();
-    return 1;
+    return TRUE;
 }
 
 static int daSeatag_Create(fopAc_ac_c* a_this) {
     fopAcM_SetupActor(a_this, daSeatag_c);
-    return 4;
+    return cPhs_COMPLEATE_e;
 }
 static actor_method_class l_daSeatag_Method = {
     (process_method_func)daSeatag_Create,

src/d/actor/d_a_tag_etc.cpp

@@ -133,7 +133,7 @@ s32 daTag_Etc_c::create() {
     mAttentionInfo.mFlags = fopAc_Attn_ACTION_TALK_e;
     mAttentionInfo.mPosition.y += 150.0f;
     mEyePos.y += 150.0f;
-    return 4;
+    return cPhs_COMPLEATE_e;
 }
 
 /* 00000458-00000460       .text daTag_Etc_action_wait__FP11daTag_Etc_c */

src/d/d_door.cpp

@@ -290,9 +290,9 @@ void dDoor_msg_c::proc(cXyz*) {
 /* 8006D0DC-8006D11C       .text resLoad__12dDoor_hkyo_cFv */
 s32 dDoor_hkyo_c::resLoad() {
     if (m11 == 0) {
-        return 4;
+        return cPhs_COMPLEATE_e;
     }
-    dComIfG_resLoad(&mPhs, "Hkyo");
+    return dComIfG_resLoad(&mPhs, "Hkyo");
 }
 
 /* 8006D11C-8006D154       .text resDelete__12dDoor_hkyo_cFv */

src/f_pc/f_pc_base.cpp

@@ -116,22 +116,22 @@ base_process_class* fpcBs_Create(s16 i_profName, unsigned int i_procID, void* i_
 /* 8003CB5C-8003CC08       .text fpcBs_SubCreate__FP18base_process_class */
 s32 fpcBs_SubCreate(base_process_class* i_proc) {
     switch (fpcMtd_Create(i_proc->mpPcMtd, i_proc)) {
-    case 2:
+    case cPhs_NEXT_e:
     case cPhs_COMPLEATE_e:
         fpcBs_DeleteAppend(i_proc);
-        i_proc->mCreateResult = 2;
-        return 2;
+        i_proc->mCreateResult = cPhs_NEXT_e;
+        return cPhs_NEXT_e;
     case cPhs_INIT_e:
-    case 1:
+    case cPhs_LOADING_e:
         i_proc->mInitState = 1;
-        i_proc->mCreateResult = 0;
+        i_proc->mCreateResult = cPhs_INIT_e;
         return cPhs_INIT_e;
-    case 3:
-        i_proc->mCreateResult = 3;
-        return 3;
+    case cPhs_UNK3_e:
+        i_proc->mCreateResult = cPhs_UNK3_e;
+        return cPhs_UNK3_e;
     case cPhs_ERROR_e:
     default:
-        i_proc->mCreateResult = 5;
+        i_proc->mCreateResult = cPhs_ERROR_e;
         return cPhs_ERROR_e;
     }
 }

src/f_pc/f_pc_method.cpp

@@ -4,13 +4,14 @@
 //
 
 #include "f_pc/f_pc_method.h"
+#include "SSystem/SComponent/c_phase.h"
 
 /* 8003EF00-8003EF38       .text fpcMtd_Method__FPFPv_iPv */
 s32 fpcMtd_Method(process_method_func i_methodFunc, void* i_data) {
     if (i_methodFunc != NULL)
         return i_methodFunc(i_data);
     else
-        return 1;
+        return cPhs_LOADING_e;
 }
 
 /* 8003EF38-8003EF5C       .text fpcMtd_Execute__FP20process_method_classPv */