d_cc_uty OK

9 files changed, 28 insertions, 28 deletions

diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index 732cced5..24f0fed7 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -260,7 +260,7 @@ static BOOL medama_atari_check(am_class* i_this) {
     switch (hitObj->GetAtType()) {
     case AT_TYPE_GRAPPLING_HOOK:
         if (i_this->mCurrBckIdx != AM_BCK_SLEEP && i_this->mCurrBckIdx != AM_BCK_SLEEP_LOOP) {
-            if (i_this->mItemStealLeft > 0) {
+            if (i_this->mStealItemLeft > 0) {
                 i_this->mMaxHealth = 10;
                 i_this->mHealth = 10;
                 atInfo.mpObj = i_this->mEyeSph.GetTgHitObj();
@@ -1192,7 +1192,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
             return cPhs_ERROR_e;
         }
 
-        i_this->mItemStealLeft = 3;
+        i_this->mStealItemLeft = 3;
 
         i_this->mSmokeCbs[0].setRateOff(0);
         i_this->mSmokeCbs[1].setRateOff(0);
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index 13875624..e6831e8c 100644
--- a/src/d/actor/d_a_am2.cpp
+++ b/src/d/actor/d_a_am2.cpp
@@ -168,7 +168,7 @@ static BOOL medama_atari_check(am2_class* i_this) {
 
             if (hitObj->GetAtType() & AT_TYPE_GRAPPLING_HOOK) {
                 if (i_this->mCurrBckIdx != AM2_BCK_SLEEP) {
-                    if (i_this->mItemStealLeft > 0) {
+                    if (i_this->mStealItemLeft > 0) {
                         s8 origHealth = i_this->mHealth;
                         i_this->mHealth = 10;
                         atInfo.mpObj = i_this->mEyeSph.GetTgHitObj();
@@ -1338,7 +1338,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
         i_this->mItemTableIdx = dComIfGp_CharTbl()->GetNameIndex("amos2", 0);
         i_this->mMaxHealth = 2;
         i_this->mHealth = 2;
-        i_this->mItemStealLeft = 3;
+        i_this->mStealItemLeft = 3;
         i_this->model = i_this->mpMorf->getModel();
         
         fopAcM_SetMtx(i_this, i_this->mpMorf->mpModel->getBaseTRMtx());
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 6dab7328..ea775d5b 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -33,7 +33,7 @@ const dCcD_SrcCps daArrow_c::m_at_cps_src = {
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
-        /* SrcGObjAt Se      */ 0x07,
+        /* SrcGObjAt Se      */ dCcD_SE_ARROW,
         /* SrcGObjAt HitMark */ G_AT_MARK_NORMAL_HIT,
         /* SrcGObjAt Spl     */ 0,
         /* SrcGObjAt Mtrl    */ 0,
@@ -63,7 +63,7 @@ const dCcD_SrcSph daArrow_c::m_co_sph_src = {
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2 | CO_SPRM_NO_CRR,
-        /* SrcGObjAt Se      */ 0x07,
+        /* SrcGObjAt Se      */ dCcD_SE_ARROW,
         /* SrcGObjAt HitMark */ 0,
         /* SrcGObjAt Spl     */ 0,
         /* SrcGObjAt Mtrl    */ 0,
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index ab5c2a48..ecddbace 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -863,7 +863,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
             i_this->mEnemyFire.mParticleScale[i] = fire_sc[i];
         }
         
-        i_this->mItemStealLeft = 3;
+        i_this->mStealItemLeft = 3;
         
         daBk_Execute(i_this);
     }
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp
index b2ef9d27..9378a900 100644
--- a/src/d/actor/d_a_hookshot.cpp
+++ b/src/d/actor/d_a_hookshot.cpp
@@ -343,7 +343,7 @@ static dCcD_SrcCps l_at_cps_src = {
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
-        /* SrcGObjAt Se      */ 0x08,
+        /* SrcGObjAt Se      */ dCcD_SE_HOOKSHOT,
         /* SrcGObjAt HitMark */ 0,
         /* SrcGObjAt Spl     */ 0,
         /* SrcGObjAt Mtrl    */ 0,
diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp
index 9ef730bb..3d63fa4d 100644
--- a/src/d/actor/d_a_obj_akabe.cpp
+++ b/src/d/actor/d_a_obj_akabe.cpp
@@ -21,7 +21,7 @@ namespace daObjAkabe {
 
     /* 00000078-0000009C       .text solidHeapCB__Q210daObjAkabe5Act_cFP10fopAc_ac_c */
     BOOL Act_c::solidHeapCB(fopAc_ac_c* i_this) {
-        return ((Act_c*)i_this)->create_heap() & 0xFF; // Fakematch
+        return ((Act_c*)i_this)->create_heap() & 0xFF; // Fakematch (see comment in create_heap)
     }
 
     /* 0000009C-000001A4       .text create_heap__Q210daObjAkabe5Act_cFv */
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 23fb0c86..a9415712 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -1749,7 +1749,7 @@ BOOL daPy_lk_c::changeDamageProc() {
     }
     
     BOOL r30;
-    int r29;
+    int damage;
     s32 r28 = dBgS_Attr_NORMAL_e;
     
     if (checkNoResetFlg1(daPyFlg1_UNK4) || (
@@ -1781,12 +1781,12 @@ BOOL daPy_lk_c::changeDamageProc() {
     
     if (r28 != dBgS_Attr_NORMAL_e) {
         r30 = TRUE;
-        r29 = 1;
+        damage = 1;
     } else {
         r30 = FALSE;
-        r29 = mStts.GetDmg();
-        if (mCyl.ChkTgHit() && mCyl.GetTgHitGObj() && mCyl.GetTgHitGObj()->GetAtType() == 0x20) {
-            r29 = 1;
+        damage = mStts.GetDmg();
+        if (mCyl.ChkTgHit() && mCyl.GetTgHitGObj() && mCyl.GetTgHitGObj()->GetAtType() == AT_TYPE_BOMB) {
+            damage = 1;
         }
     }
     
@@ -1804,7 +1804,7 @@ BOOL daPy_lk_c::changeDamageProc() {
     
     if (checkModeFlg(ModeFlg_04000000)) {
         if (r30 || mCyl.ChkTgHit() && !checkSuccessGuard(r27)) {
-            setDamagePoint(-r29);
+            setDamagePoint(-damage);
             mDamageWaitTimer = daPy_HIO_dam_c0::m.field_0x2;
             
             voiceStart(2);
@@ -1828,7 +1828,7 @@ BOOL daPy_lk_c::changeDamageProc() {
             }
         }
     } else {
-        if (mAtCps[0].GetAtType() != 0x80 && mAtCps[0].GetAtType() != 0x100) {
+        if (mAtCps[0].GetAtType() != AT_TYPE_BOKO_STICK && mAtCps[0].GetAtType() != AT_TYPE_WATER) {
             cXyz sp8;
             if (checkElecReturnDamage(&mAtCps[0], &sp8) ||
                 checkElecReturnDamage(&mAtCps[1], &sp8) ||
@@ -1864,7 +1864,7 @@ BOOL daPy_lk_c::changeDamageProc() {
                 
                 setDamageEmitter();
                 changePlayer(this);
-                setDamagePoint(-r29);
+                setDamagePoint(-damage);
                 fopAc_ac_c* grabActor = mActorKeepGrab.getActor();
                 if (daPy_dmEcallBack_c::checkElec()) {
                     if (procElecDamage_init(NULL)) {
@@ -1891,17 +1891,17 @@ BOOL daPy_lk_c::changeDamageProc() {
                 if (daPy_lk_c::checkPlayerFly() || r27 == 6 || r27 == 1 || r27 == 9) {
                     return procLargeDamage_init(-1, 1, 0, 0);
                 }
-                if (checkNormalDamage(r29)) {
+                if (checkNormalDamage(damage)) {
                     return procDamage_init();
                 }
                 setDashDamage();
             } else {
                 u8 hitSe = mCyl.GetTgHitObjSe();
-                if (hitSe == 6) {
+                if (hitSe == dCcD_SE_UNK6) {
                     seStartOnlyReverb(JA_SE_OBJ_COL_N_BDY_MPLT);
-                } else if (hitSe == 2 || hitSe == 5) {
+                } else if (hitSe == dCcD_SE_UNK2 || hitSe == dCcD_SE_UNK5) {
                     seStartOnlyReverb(JA_SE_OBJ_COL_SWS_NMTLP);
-                } else if (hitSe == 4) {
+                } else if (hitSe == dCcD_SE_UNK4) {
                     seStartOnlyReverb(JA_SE_OBJ_COL_NWHP_NMTL);
                 } else {
                     seStartOnlyReverb(JA_SE_OBJ_COL_SWM_NSWL);
@@ -1918,7 +1918,7 @@ BOOL daPy_lk_c::changeDamageProc() {
             if (mHeldItemType == 0x101) {
                 deleteEquipItem(FALSE);
             }
-            setDamagePoint(-r29);
+            setDamagePoint(-damage);
             
             if (r28 == dBgS_Attr_ELECTRICITY_e) {
                 setDamageElecEmitter();
@@ -1927,7 +1927,7 @@ BOOL daPy_lk_c::changeDamageProc() {
                 }
             }
             
-            if (checkNormalDamage(r29)) {
+            if (checkNormalDamage(damage)) {
                 return procPolyDamage_init();
             }
             
@@ -2790,7 +2790,7 @@ void daPy_lk_c::setAtParam(u32 type, int atp, dCcG_At_Spl spl, u8 se, u8 hitMark
         atp *= 2;
     }
     if (type != AT_TYPE_SWORD) {
-        field_0x291 = 0;
+        mCutCount = 0;
     }
     for (int i = 0; i < ARRAY_SIZE(mAtCps); i++, cps++) {
         cps->SetAtType(type);
diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc
index 3349f89f..adf4fd33 100644
--- a/src/d/actor/d_a_player_main_data.inc
+++ b/src/d/actor/d_a_player_main_data.inc
@@ -57,7 +57,7 @@ static dCcD_SrcCyl l_cyl_src = {
         /* SrcGObjAt Spl     */ 0,
         /* SrcGObjAt Mtrl    */ 0,
         /* SrcGObjAt SPrm    */ 0,
-        /* SrcGObjTg Se      */ 0x25,
+        /* SrcGObjTg Se      */ dCcD_SE_UNK25,
         /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT,
         /* SrcGObjTg Spl     */ 0,
         /* SrcGObjTg Mtrl    */ 0,
@@ -142,7 +142,7 @@ static dCcD_SrcCps l_at_cps_src = {
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
-        /* SrcGObjAt Se      */ 0x01,
+        /* SrcGObjAt Se      */ dCcD_SE_UNK1,
         /* SrcGObjAt HitMark */ G_AT_MARK_NORMAL_HIT,
         /* SrcGObjAt Spl     */ 0,
         /* SrcGObjAt Mtrl    */ 0,
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index 5611faed..0f0661a8 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -45,7 +45,7 @@ const dCcD_SrcCyl daRd_c::m_cyl_src = {
         /* SrcGObjAt Spl     */ 0,
         /* SrcGObjAt Mtrl    */ 0,
         /* SrcGObjAt SPrm    */ 0,
-        /* SrcGObjTg Se      */ 0x23,
+        /* SrcGObjTg Se      */ dCcD_SE_UNK23,
         /* SrcGObjTg HitMark */ 0,
         /* SrcGObjTg Spl     */ 0,
         /* SrcGObjTg Mtrl    */ 0,
@@ -1813,7 +1813,7 @@ void daRd_c::createInit() {
     
     mD3C = 1;
     mD40 = 1;
-    mItemStealLeft = 5;
+    mStealItemLeft = 5;
     
     mEnemyFire.mpMcaMorf = mpMorf;
     mEnemyFire.mpActor = this;