summaryrefslogtreecommitdiff
path: root/src/d
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2023-12-20 21:11:57 -0500
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2023-12-20 21:11:57 -0500
commit94465b0dbbdd94d2e579dc16996170d3d6a479e3 (patch)
treeaf04035726e41003b71b8fb640ef9a430bc8e563 /src/d
parentc29a149aff1aea831e5d7a07b973d9dacfcd4c5e (diff)
add c_cc_d and d_cc_d SPrm enums
Diffstat (limited to 'src/d')
-rw-r--r--src/d/actor/d_a_agbsw0.cpp4
-rw-r--r--src/d/actor/d_a_am.cpp20
-rw-r--r--src/d/actor/d_a_am2.cpp20
-rw-r--r--src/d/actor/d_a_arrow.cpp12
-rw-r--r--src/d/actor/d_a_bomb2.cpp8
-rw-r--r--src/d/actor/d_a_fan.cpp6
-rw-r--r--src/d/actor/d_a_hookshot.cpp2
-rw-r--r--src/d/actor/d_a_ib.cpp8
-rw-r--r--src/d/actor/d_a_item.cpp6
-rw-r--r--src/d/actor/d_a_lamp.cpp6
-rw-r--r--src/d/actor/d_a_nh.cpp6
-rw-r--r--src/d/actor/d_a_npc_kamome.cpp10
-rw-r--r--src/d/actor/d_a_npc_md.cpp18
-rw-r--r--src/d/actor/d_a_obj_barrier.cpp10
-rw-r--r--src/d/actor/d_a_obj_dragonhead.cpp2
-rw-r--r--src/d/actor/d_a_obj_hfuck1.cpp4
-rw-r--r--src/d/actor/d_a_obj_movebox.cpp4
-rw-r--r--src/d/actor/d_a_obj_mtest.cpp2
-rw-r--r--src/d/actor/d_a_obj_paper.cpp6
-rw-r--r--src/d/actor/d_a_obj_toripost.cpp6
-rw-r--r--src/d/actor/d_a_obj_zouK.cpp6
-rw-r--r--src/d/actor/d_a_player_main.cpp18
-rw-r--r--src/d/actor/d_a_race_item.cpp6
-rw-r--r--src/d/actor/d_a_rd.cpp6
-rw-r--r--src/d/actor/d_a_swattack.cpp2
-rw-r--r--src/d/actor/d_a_swhit0.cpp6
-rw-r--r--src/d/actor/d_a_switem.cpp4
-rw-r--r--src/d/actor/d_a_tag_ret.cpp2
-rw-r--r--src/d/d_npc.cpp6
29 files changed, 108 insertions, 108 deletions
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index cde9e9ce..1715a63b 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -35,7 +35,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_BOMB,
- /* SrcObjTg SPrm */ 0x09,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -46,7 +46,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index 61f39edc..530de706 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 */ 0x03,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1271,7 +1271,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x06,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGSphS
@@ -1292,7 +1292,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
- /* SrcObjCo SPrm */ 0x145,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_UNK40 | CO_SPRM_NO_CRR,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -1302,7 +1302,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x02,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGSphS
@@ -1322,8 +1322,8 @@ 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 */ 0x03,
- /* SrcObjCo SPrm */ 0x75,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -1333,7 +1333,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcGObjTg HitMark */ 0x0C,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x03,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
@@ -1352,10 +1352,10 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_UNK1000,
/* SrcObjAt Atp */ 2,
- /* SrcObjAt SPrm */ 0x0F,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
- /* SrcObjCo SPrm */ 0x75,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0x06,
@@ -1365,7 +1365,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcGObjTg HitMark */ 0x0C,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x03,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index 5652a68e..86050268 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 */ 0x03,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1380,7 +1380,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x06,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGSphS
@@ -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 */ 0x03,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1412,7 +1412,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x06,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGSphS
@@ -1433,8 +1433,8 @@ 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 */ 0x03,
- /* SrcObjCo SPrm */ 0x75,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -1444,7 +1444,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* SrcGObjTg HitMark */ 0x0C,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x03,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
@@ -1463,10 +1463,10 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_UNK1000,
/* SrcObjAt Atp */ 1,
- /* SrcObjAt SPrm */ 0x05,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK4,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
- /* SrcObjCo SPrm */ 0x61,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK20 | CO_SPRM_UNK40,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0x06,
@@ -1476,7 +1476,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* SrcGObjTg HitMark */ 0x0C,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x03,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index f641a03e..42e9b83c 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -29,12 +29,12 @@ const dCcD_SrcCps daArrow_c::m_at_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_NORMAL_ARROW,
/* SrcObjAt Atp */ 2,
- /* SrcObjAt SPrm */ 0xB,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
- /* SrcGObjAt Se */ 7,
- /* SrcGObjAt HitMark */ 0xD,
+ /* SrcGObjAt Se */ 0x07,
+ /* SrcGObjAt HitMark */ 0x0D,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
/* SrcGObjAt SPrm */ 0,
@@ -62,8 +62,8 @@ const dCcD_SrcSph daArrow_c::m_co_sph_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
- /* SrcObjCo SPrm */ 0x119,
- /* SrcGObjAt Se */ 7,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10 | CO_SPRM_NO_CRR,
+ /* SrcGObjAt Se */ 0x07,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
@@ -72,7 +72,7 @@ const dCcD_SrcSph daArrow_c::m_co_sph_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGSphS
diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp
index 86d944c2..4cdc5751 100644
--- a/src/d/actor/d_a_bomb2.cpp
+++ b/src/d/actor/d_a_bomb2.cpp
@@ -306,10 +306,10 @@ namespace daBomb2 {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_BOMB,
/* SrcObjAt Atp */ 0x04,
- /* SrcObjAt SPrm */ 0x0E,
+ /* SrcObjAt SPrm */ AT_SPRM_GRP,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
- /* SrcObjTg SPrm */ 0x09,
- /* SrcObjCo SPrm */ 0x79,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0x01,
@@ -319,7 +319,7 @@ namespace daBomb2 {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x02,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGSphS
diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp
index 3ee5962e..334247dc 100644
--- a/src/d/actor/d_a_fan.cpp
+++ b/src/d/actor/d_a_fan.cpp
@@ -29,7 +29,7 @@ static dCcD_SrcCps l_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_LEAF_WIND,
/* SrcObjAt Atp */ 0,
- /* SrcObjAt SPrm */ 0x0F,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -37,12 +37,12 @@ static dCcD_SrcCps l_cps_src = {
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
- /* SrcGObjAt SPrm */ 0x02,
+ /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCpsS
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp
index a65156d0..cd0ed6f5 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 */ 0x0B,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp
index 0903192e..ea1a6065 100644
--- a/src/d/actor/d_a_ib.cpp
+++ b/src/d/actor/d_a_ib.cpp
@@ -331,18 +331,18 @@ dCcD_SrcCyl daIball_c::m_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_LIGHT),
- /* SrcObjTg SPrm */ 0x09,
- /* SrcObjCo SPrm */ 0x79,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
- /* SrcGObjAt SPrm */ 0x04,
+ /* SrcGObjAt SPrm */ G_AT_SPRM_STOP_NO_CON_HIT,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 4bb76408..d2eec0e6 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -1478,8 +1478,8 @@ dCcD_SrcCyl daItem_c::m_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
- /* SrcObjTg SPrm */ 0x09,
- /* SrcObjCo SPrm */ 0x59,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10 | CO_SPRM_UNK40,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -1489,7 +1489,7 @@ dCcD_SrcCyl daItem_c::m_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp
index 7d6c135d..5b744e02 100644
--- a/src/d/actor/d_a_lamp.cpp
+++ b/src/d/actor/d_a_lamp.cpp
@@ -15,9 +15,9 @@ static dCcD_SrcSph sph_src = {
/* Flags */ 0,
/* SrcObjAt Type */ 0,
/* SrcObjAt Atp */ 0,
- /* SrcObjAt SPrm */ 0x0,
+ /* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_FIRE | AT_TYPE_UNK20000 | AT_TYPE_FIRE_ARROW | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000,
- /* SrcObjTg SPrm */ 0x9,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -28,7 +28,7 @@ static dCcD_SrcSph sph_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x00,
+ /* SrcGObjTg SPrm */ 0,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGSphS
diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp
index 140e985c..45ee7ec9 100644
--- a/src/d/actor/d_a_nh.cpp
+++ b/src/d/actor/d_a_nh.cpp
@@ -26,8 +26,8 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
- /* SrcObjTg SPrm */ 0x03,
- /* SrcObjCo SPrm */ 0x19,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -37,7 +37,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index b7b58ad9..903264fd 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -313,10 +313,10 @@ static dCcD_SrcSph l_sph_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_SWORD,
/* SrcObjAt Atp */ 0,
- /* SrcObjAt SPrm */ 0x09,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK8,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ 0,
- /* SrcObjCo SPrm */ 0x79,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -344,7 +344,7 @@ static dCcD_SrcSph l_tg_sph_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
- /* SrcObjTg SPrm */ 0x05,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK4,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -371,7 +371,7 @@ static dCcD_SrcCps l_kam_at_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_SWORD,
/* SrcObjAt Atp */ 0,
- /* SrcObjAt SPrm */ 0x09,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -379,7 +379,7 @@ static dCcD_SrcCps l_kam_at_cps_src = {
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
- /* SrcGObjAt SPrm */ 0x02,
+ /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index 6b96008b..c259ff10 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -54,8 +54,8 @@ 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 */ 0x05,
- /* SrcObjCo SPrm */ 0x75,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK4,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -65,7 +65,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
@@ -84,7 +84,7 @@ static dCcD_SrcCyl l_light_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_LIGHT,
- /* SrcObjTg SPrm */ 0x03,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -95,7 +95,7 @@ static dCcD_SrcCyl l_light_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
@@ -112,7 +112,7 @@ static dCcD_SrcCps l_fan_light_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_LIGHT,
/* SrcObjAt Atp */ 0,
- /* SrcObjAt SPrm */ 0x0F,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -120,7 +120,7 @@ static dCcD_SrcCps l_fan_light_cps_src = {
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
- /* SrcGObjAt SPrm */ 0x02,
+ /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 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 */ 0x03,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -155,7 +155,7 @@ static dCcD_SrcCyl l_wind_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index aa394ac4..36a0a8d7 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -22,15 +22,15 @@ static const dCcD_SrcCyl l_cyl_at_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_UNK800,
/* SrcObjAt Atp */ 1,
- /* SrcObjAt SPrm */ 5,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK4,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
- /* SrcGObjAt Spl */ 9,
+ /* SrcGObjAt Spl */ 0x09,
/* SrcGObjAt Mtrl */ 0,
- /* SrcGObjAt SPrm */ 3,
+ /* SrcGObjAt SPrm */ G_AT_SPRM_NO_CON_HIT | G_AT_SPRM_NO_HIT_MARK,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
@@ -54,7 +54,7 @@ static const dCcD_SrcCyl l_cyl_tg_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
- /* SrcObjTg SPrm */ 9,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -65,7 +65,7 @@ static const dCcD_SrcCyl l_cyl_tg_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 6,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp
index 7a882b4b..27e1c15f 100644
--- a/src/d/actor/d_a_obj_dragonhead.cpp
+++ b/src/d/actor/d_a_obj_dragonhead.cpp
@@ -21,7 +21,7 @@ static dCcD_SrcSph sph_check_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_FIRE_ARROW,
- /* SrcObjTg SPrm */ 0x09,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp
index 19809f85..54cd5cdf 100644
--- a/src/d/actor/d_a_obj_hfuck1.cpp
+++ b/src/d/actor/d_a_obj_hfuck1.cpp
@@ -24,7 +24,7 @@ namespace {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_HOOKSHOT,
- /* SrcObjTg SPrm */ 9,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -35,7 +35,7 @@ namespace {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 6,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGSphS
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 562799af..22b9d7e4 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -389,8 +389,8 @@ namespace daObjMovebox {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_BOMB,
- /* SrcObjTg SPrm */ 0x09,
- /* SrcObjCo SPrm */ 0x79,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp
index 07aa9634..f6f6022d 100644
--- a/src/d/actor/d_a_obj_mtest.cpp
+++ b/src/d/actor/d_a_obj_mtest.cpp
@@ -77,7 +77,7 @@ const dCcD_SrcCyl daObjMtest::Act_c::M_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_BOMB,
- /* SrcObjTg SPrm */ 0x09,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index 0bd6e98e..f5a578e3 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -61,8 +61,8 @@ namespace daObjPaper {
/* 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 */ 0x0F,
- /* SrcObjCo SPrm */ 0x79,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -72,7 +72,7 @@ namespace daObjPaper {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x03,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 5b952ff7..70457529 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -43,8 +43,8 @@ const dCcD_SrcCyl daObjTpost_c::m_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG),
- /* SrcObjTg SPrm */ 0x0F,
- /* SrcObjCo SPrm */ 0x79,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -54,7 +54,7 @@ const dCcD_SrcCyl daObjTpost_c::m_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x07,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp
index ea6c9063..1f68d5ab 100644
--- a/src/d/actor/d_a_obj_zouK.cpp
+++ b/src/d/actor/d_a_obj_zouK.cpp
@@ -33,8 +33,8 @@ namespace daObjZouk {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL & ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER),
- /* SrcObjTg SPrm */ 0x0F,
- /* SrcObjCo SPrm */ 0x79,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -44,7 +44,7 @@ namespace daObjZouk {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x03,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 37507654..ee0a17f4 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -1860,8 +1860,8 @@ 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 */ 0x05,
- /* SrcObjCo SPrm */ 0x73,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK4,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK2 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -1890,13 +1890,13 @@ static dCcD_SrcCyl l_wind_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_LEAF_WIND,
- /* SrcObjTg SPrm */ 0x05,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK4,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
- /* SrcGObjAt SPrm */ 0x02,
+ /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
@@ -1918,7 +1918,7 @@ static dCcD_SrcCyl l_at_cyl_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_SWORD,
/* SrcObjAt Atp */ 0x02,
- /* SrcObjAt SPrm */ 0x0B,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | 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 */ 0x0B,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | 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 */ 0x0B,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -1986,7 +1986,7 @@ static dCcD_SrcCps l_fan_wind_cps_src = {
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
- /* SrcGObjAt SPrm */ 0x02,
+ /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 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 */ 0x0B,
+ /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | 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 d2678b7a..b918238b 100644
--- a/src/d/actor/d_a_race_item.cpp
+++ b/src/d/actor/d_a_race_item.cpp
@@ -19,8 +19,8 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
- /* SrcObjTg SPrm */ 0x03,
- /* SrcObjCo SPrm */ 0x19,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -30,7 +30,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index 35429469..4ea7c897 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -38,8 +38,8 @@ const dCcD_SrcCyl daRd_c::m_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000),
- /* SrcObjTg SPrm */ 0x09,
- /* SrcObjCo SPrm */ 0x7F,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IGRP | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -49,7 +49,7 @@ const dCcD_SrcCyl daRd_c::m_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x06,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp
index 3273f6f2..aa96741c 100644
--- a/src/d/actor/d_a_swattack.cpp
+++ b/src/d/actor/d_a_swattack.cpp
@@ -18,7 +18,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
- /* SrcObjTg SPrm */ 0x09,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp
index 15426ae5..06762801 100644
--- a/src/d/actor/d_a_swhit0.cpp
+++ b/src/d/actor/d_a_swhit0.cpp
@@ -18,7 +18,7 @@ static dCcD_SrcSph l_sph_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), // 0xFF1DFEFF
- /* SrcObjTg SPrm */ 9,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -48,7 +48,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
- /* SrcObjCo SPrm */ 0x75,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -58,7 +58,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x00,
+ /* SrcGObjTg SPrm */ 0,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp
index 911ecf9b..3eff5098 100644
--- a/src/d/actor/d_a_switem.cpp
+++ b/src/d/actor/d_a_switem.cpp
@@ -20,7 +20,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
- /* SrcObjTg SPrm */ 0x09,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -31,7 +31,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp
index a0b968cd..fada836c 100644
--- a/src/d/actor/d_a_tag_ret.cpp
+++ b/src/d/actor/d_a_tag_ret.cpp
@@ -21,7 +21,7 @@ static dCcD_SrcCyl cyl_check_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
- /* SrcObjCo SPrm */ 0x119,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10 | CO_SPRM_NO_CRR,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp
index 8f672f76..f88451ab 100644
--- a/src/d/d_npc.cpp
+++ b/src/d/d_npc.cpp
@@ -932,8 +932,8 @@ dCcD_SrcCyl dNpc_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG),
- /* SrcObjTg SPrm */ 0x03,
- /* SrcObjCo SPrm */ 0x75,
+ /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
+ /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -943,7 +943,7 @@ dCcD_SrcCyl dNpc_cyl_src = {
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
- /* SrcGObjTg SPrm */ 0x04,
+ /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS