Use joint enums in several different places (#981)

Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp
index 62679751..ba8fb2b6 100644
--- a/src/d/actor/d_a_bmd.cpp
+++ b/src/d/actor/d_a_bmd.cpp
@@ -55,9 +55,9 @@ static BOOL core_nodeCallBack(J3DNode* node, int calcTiming) {
         s32 jntNo = joint->getJntNo();
         J3DModel* model = j3dSys.getModel();
         bmd_class* i_this = (bmd_class*)model->getUserArea();
-        if (((i_this != 0) && (jntNo != 0)) && (jntNo != 5)) {
+        if (((i_this != 0) && (jntNo != BKM_COA_JNT_KUBI1_e)) && (jntNo != BKM_COA_JNT_SITAAGO_e)) {
             MTXCopy(model->getAnmMtx(jntNo), *calc_mtx);
-            if (jntNo < 7) {
+            if (jntNo < BKM_COA_JNT_TOSAKA1_e) {
                 cMtx_XrotM(*calc_mtx, i_this->m90C[0].x);
                 cMtx_ZrotM(*calc_mtx, i_this->m90C[0].z);
             } else {
@@ -77,7 +77,7 @@ void mk_draw(bmd_class* i_this) {
     if (i_this->m2DC != 0) {
         g_env_light.setLightTevColorType(i_this->mpBodyMorf->getModel(), &actor->tevStr);
         i_this->mpMakarMorf->entryDL();
-        i_this->mpMakarFaceModel->setBaseTRMtx(i_this->mpMakarMorf->getModel()->getAnmMtx(1));
+        i_this->mpMakarFaceModel->setBaseTRMtx(i_this->mpMakarMorf->getModel()->getAnmMtx(CB_JNT_BACKBONE_e));
         g_env_light.setLightTevColorType(i_this->mpMakarFaceModel, &actor->tevStr);
         mDoExt_modelUpdateDL(i_this->mpMakarFaceModel);
     }
@@ -141,7 +141,7 @@ void damage(bmd_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz local_40;
     cXyz local_4c;
-    static s32 jno[] = {0x1A, 0x23, 0x2C, 0x35, 0x3E};
+    static s32 jno[] = {BKM_JNT_HANAA5_e, BKM_JNT_HANAB5_e, BKM_JNT_HANAC5_e, BKM_JNT_HANAD5_e, BKM_JNT_HANAE5_e};
 
 #if VERSION > VERSION_DEMO
     s8 bVar1 = false;
@@ -510,7 +510,7 @@ void start(bmd_class* i_this) {
 /* 00001B48-00001EFC       .text end__FP9bmd_class */
 void end(bmd_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
-    static s32 jno[] = {0x19, 0x22, 0x2B, 0x34, 0x3D};
+    static s32 jno[] = {BKM_JNT_HANAA4_e, BKM_JNT_HANAB4_e, BKM_JNT_HANAC4_e, BKM_JNT_HANAD4_e, BKM_JNT_HANAE4_e};
 
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     i_this->m940 = 0;
@@ -737,7 +737,7 @@ void core_move(bmd_class* i_this) {
         if ((int)i_this->mpHeadDeadMorf->getFrame() == 37) {
             pJVar7 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMCORESIGH00, &actor->current.pos);
             if (pJVar7 != NULL) {
-                pJVar7->setGlobalRTMatrix(i_this->mpHeadDeadMorf->getModel()->getAnmMtx(5));
+                pJVar7->setGlobalRTMatrix(i_this->mpHeadDeadMorf->getModel()->getAnmMtx(BKM_COA_DEADMODEL_JNT_UWAAGO_e));
             }
             fopAcM_monsSeStart(actor, JA_SE_CV_BKM_DIE, 0);
         }
@@ -789,7 +789,7 @@ void core_move(bmd_class* i_this) {
         pJVar11->setBaseTRMtx(mDoMtx_stack_c::get());
         i_this->mpHeadMorf->play(&actor->eyePos, 0, 0);
         i_this->mpHeadMorf->calc();
-        MTXCopy(pJVar11->getAnmMtx(6), *calc_mtx);
+        MTXCopy(pJVar11->getAnmMtx(BKM_COA_JNT_UWAAGO_e), *calc_mtx);
         local_40.x = 0.0f;
         local_40.y = -20.0f;
         local_40.z = 30.0f;
@@ -812,7 +812,7 @@ void core_move(bmd_class* i_this) {
         pJVar11->setBaseTRMtx(mDoMtx_stack_c::get());
         i_this->mpHeadDeadMorf->play(&actor->eyePos, 0, 0);
         i_this->mpHeadDeadMorf->calc();
-        MTXCopy(pJVar11->getAnmMtx(REG0_S(4) + 1), *calc_mtx);
+        MTXCopy(pJVar11->getAnmMtx(REG0_S(4) + (s16)BKM_COA_DEADMODEL_JNT_KOUTOUBU_e), *calc_mtx);
         local_40.z = 0.0f;
         local_40.y = 0.0f;
         local_40.x = 0.0f;