c_cc_d inlines and enums progress

14 files changed, 26 insertions, 28 deletions

diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp
index d8067ba6..5d88b46d 100644
--- a/src/SSystem/SComponent/c_cc_d.cpp
+++ b/src/SSystem/SComponent/c_cc_d.cpp
@@ -218,9 +218,7 @@ void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) {
 /* 80241C5C-80241C98       .text Set__8cCcD_ObjFRC11cCcD_SrcObj */
 void cCcD_Obj::Set(const cCcD_SrcObj& src) {
     mFlags = src.mFlags;
-    mObjAt.Set(src.mSrcObjHitInf.mObjAt);
-    mObjTg.Set(src.mSrcObjHitInf.mObjTg);
-    mObjCo.Set(src.mSrcObjHitInf.mObjCo);
+    cCcD_ObjHitInf::Set(src.mSrcObjHitInf);
 }
 
 /* 80241C98-80241D68       .text CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz */
diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp
index c161866d..0cb602e3 100644
--- a/src/c/c_damagereaction.cpp
+++ b/src/c/c_damagereaction.cpp
@@ -80,7 +80,7 @@ dCcD_SrcCyl cc_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_GRP,
         /* SrcObjTg  Type    */ AT_TYPE_ALL,
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
         /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index 530de706..42e4a28f 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -1260,7 +1260,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
                 /* SrcObjAt  Atp     */ 0,
                 /* SrcObjAt  SPrm    */ 0,
                 /* SrcObjTg  Type    */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK,
-                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
                 /* SrcObjCo  SPrm    */ 0,
                 /* SrcGObjAt Se      */ 0,
                 /* SrcGObjAt HitMark */ 0,
@@ -1322,7 +1322,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
                 /* SrcObjAt  Atp     */ 0,
                 /* SrcObjAt  SPrm    */ 0,
                 /* SrcObjTg  Type    */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
-                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
                 /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
                 /* SrcGObjAt Se      */ 0,
                 /* SrcGObjAt HitMark */ 0,
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index 86050268..37911ece 100644
--- a/src/d/actor/d_a_am2.cpp
+++ b/src/d/actor/d_a_am2.cpp
@@ -1369,7 +1369,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
                 /* SrcObjAt  Atp     */ 0,
                 /* SrcObjAt  SPrm    */ 0,
                 /* SrcObjTg  Type    */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK,
-                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
                 /* SrcObjCo  SPrm    */ 0,
                 /* SrcGObjAt Se      */ 0,
                 /* SrcGObjAt HitMark */ 0,
@@ -1401,7 +1401,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
                 /* SrcObjAt  Atp     */ 0,
                 /* SrcObjAt  SPrm    */ 0,
                 /* SrcObjTg  Type    */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
-                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
                 /* SrcObjCo  SPrm    */ 0,
                 /* SrcGObjAt Se      */ 0,
                 /* SrcGObjAt HitMark */ 0,
@@ -1433,7 +1433,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
                 /* SrcObjAt  Atp     */ 0,
                 /* SrcObjAt  SPrm    */ 0,
                 /* SrcObjTg  Type    */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
-                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+                /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
                 /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
                 /* SrcGObjAt Se      */ 0,
                 /* SrcGObjAt HitMark */ 0,
@@ -1463,7 +1463,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
                 /* Flags             */ 0,
                 /* SrcObjAt  Type    */ AT_TYPE_UNK1000,
                 /* SrcObjAt  Atp     */ 1,
-                /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_UNK4,
+                /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_VS_PLAYER,
                 /* SrcObjTg  Type    */ 0,
                 /* SrcObjTg  SPrm    */ 0,
                 /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK20 | CO_SPRM_UNK40,
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 42e9b83c..6a0f68fb 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -29,7 +29,7 @@ const dCcD_SrcCps daArrow_c::m_at_cps_src = {
         /* Flags             */ 0,
         /* SrcObjAt  Type    */ AT_TYPE_NORMAL_ARROW,
         /* SrcObjAt  Atp     */ 2,
-        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
+        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp
index cd0ed6f5..05fb8e2f 100644
--- a/src/d/actor/d_a_hookshot.cpp
+++ b/src/d/actor/d_a_hookshot.cpp
@@ -277,7 +277,7 @@ static dCcD_SrcCps l_at_cps_src = {
         /* Flags             */ 0,
         /* SrcObjAt  Type    */ AT_TYPE_HOOKSHOT,
         /* SrcObjAt  Atp     */ 0x01,
-        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
+        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp
index 45ee7ec9..4b4c15bb 100644
--- a/src/d/actor/d_a_nh.cpp
+++ b/src/d/actor/d_a_nh.cpp
@@ -26,7 +26,7 @@ static dCcD_SrcCyl l_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ AT_TYPE_ALL,
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
         /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index 903264fd..d82ebbbe 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -344,7 +344,7 @@ static dCcD_SrcSph l_tg_sph_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ AT_TYPE_ALL,
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK4,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
         /* SrcObjCo  SPrm    */ 0,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index c259ff10..10638479 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -54,7 +54,7 @@ static dCcD_SrcCyl l_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ ~(AT_TYPE_BOOMERANG | AT_TYPE_LEAF_WIND | AT_TYPE_LIGHT),
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK4,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
         /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
@@ -84,7 +84,7 @@ static dCcD_SrcCyl l_light_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ AT_TYPE_LIGHT,
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
         /* SrcObjCo  SPrm    */ 0,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
@@ -144,7 +144,7 @@ static dCcD_SrcCyl l_wind_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ AT_TYPE_LEAF_WIND,
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
         /* SrcObjCo  SPrm    */ 0,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index 36a0a8d7..2bf46774 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -22,7 +22,7 @@ static const dCcD_SrcCyl l_cyl_at_src = {
         /* Flags             */ 0,
         /* SrcObjAt  Type    */ AT_TYPE_UNK800,
         /* SrcObjAt  Atp     */ 1,
-        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_UNK4,
+        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_VS_PLAYER,
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index ee0a17f4..03935a7d 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -1860,7 +1860,7 @@ static dCcD_SrcCyl l_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK4,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
         /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK2 | CO_SPRM_VSGRP,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
@@ -1890,7 +1890,7 @@ static dCcD_SrcCyl l_wind_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ AT_TYPE_LEAF_WIND,
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK4,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
         /* SrcObjCo  SPrm    */ 0,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
@@ -1918,7 +1918,7 @@ static dCcD_SrcCyl l_at_cyl_src = {
         /* Flags             */ 0,
         /* SrcObjAt  Type    */ AT_TYPE_SWORD,
         /* SrcObjAt  Atp     */ 0x02,
-        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
+        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
@@ -1948,7 +1948,7 @@ static dCcD_SrcCps l_at_cps_src = {
         /* Flags             */ 0,
         /* SrcObjAt  Type    */ AT_TYPE_SWORD,
         /* SrcObjAt  Atp     */ 0x01,
-        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
+        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
@@ -1978,7 +1978,7 @@ static dCcD_SrcCps l_fan_wind_cps_src = {
         /* Flags             */ 0,
         /* SrcObjAt  Type    */ AT_TYPE_LEAF_WIND,
         /* SrcObjAt  Atp     */ 0,
-        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
+        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
@@ -2008,7 +2008,7 @@ static dCcD_SrcSph l_fan_wind_sph_src = {
         /* Flags             */ 0,
         /* SrcObjAt  Type    */ AT_TYPE_LEAF_WIND,
         /* SrcObjAt  Atp     */ 0,
-        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
+        /* SrcObjAt  SPrm    */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
         /* SrcObjTg  Type    */ 0,
         /* SrcObjTg  SPrm    */ 0,
         /* SrcObjCo  SPrm    */ 0,
diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp
index b918238b..ee5379e9 100644
--- a/src/d/actor/d_a_race_item.cpp
+++ b/src/d/actor/d_a_race_item.cpp
@@ -19,7 +19,7 @@ static dCcD_SrcCyl l_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ AT_TYPE_ALL,
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
         /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,
diff --git a/src/d/d_a_bomb_static.cpp b/src/d/d_a_bomb_static.cpp
index 9ddd0bb2..4a3adc8b 100644
--- a/src/d/d_a_bomb_static.cpp
+++ b/src/d/d_a_bomb_static.cpp
@@ -39,7 +39,7 @@ void daBomb_c::setBombNoHit() {
     mSph.OffTgSPrmBit(TG_SPRM_SET);
     mSph.OffCoSPrmBit(CO_SPRM_SET);
     mSph.OffAtSPrmBit(AT_SPRM_SET);
-    mSph.OffAtSPrmBit(AT_SPRM_SET);
+    mSph.ClrAtSet();
 
     field_0x6F3 = true;
 }
@@ -156,7 +156,7 @@ void daBomb2::Act_c::set_no_hit() {
     mSph.OffTgSPrmBit(TG_SPRM_SET);
     mSph.OffCoSPrmBit(CO_SPRM_SET);
     mSph.OffAtSPrmBit(AT_SPRM_SET);
-    mSph.OffAtSPrmBit(AT_SPRM_SET);
+    mSph.ClrAtSet();
 }
 
 bool daBomb2::Act_c::chk_explode() {
diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp
index f88451ab..326a8e5f 100644
--- a/src/d/d_npc.cpp
+++ b/src/d/d_npc.cpp
@@ -932,7 +932,7 @@ dCcD_SrcCyl dNpc_cyl_src = {
         /* SrcObjAt  Atp     */ 0,
         /* SrcObjAt  SPrm    */ 0,
         /* SrcObjTg  Type    */ ~(AT_TYPE_BOOMERANG),
-        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_UNK2,
+        /* SrcObjTg  SPrm    */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
         /* SrcObjCo  SPrm    */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
         /* SrcGObjAt Se      */ 0,
         /* SrcGObjAt HitMark */ 0,