diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2024-10-28 21:16:46 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2024-10-28 21:16:46 -0700 |
| commit | 70044ec8dd10369b64cc52424fb62f913fcfbed0 (patch) | |
| tree | 652d5da5de32e932457eacdf730e02e4d1bcf611 /src/d | |
| parent | 9388725dd313e8228c6549746a06fa6a7b00a354 (diff) | |
Clean up cc enums
Diffstat (limited to 'src/d')
61 files changed, 310 insertions, 308 deletions
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index b0d2ef0a..6f54bfee 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -32,7 +32,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -43,7 +43,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 9c3eadee..7b5459e9 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -268,7 +268,7 @@ static BOOL medama_atari_check(am_class* i_this) { if (i_this->mCurrBckIdx == AM_BCK_SLEEP || i_this->mCurrBckIdx == AM_BCK_SLEEP_LOOP) { anm_init(i_this, AM_BCK_OKIRU, 1.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, -1); i_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e; - i_this->mNeedleCyl.OnAtSPrmBit(AT_SPRM_SET); + i_this->mNeedleCyl.OnAtSPrmBit(cCcD_AtSPrm_Set_e); i_this->mNeedleCyl.OnAtHitBit(); i_this->mAction = ACTION_DOUSA; i_this->mState = 2; @@ -519,7 +519,7 @@ static void action_dousa(am_class* i_this) { // Fall-through case 4: { if (i_this->mCountDownTimers[2] == 1) { - i_this->mNeedleCyl.OnAtSPrmBit(AT_SPRM_SET); + i_this->mNeedleCyl.OnAtSPrmBit(cCcD_AtSPrm_Set_e); i_this->mNeedleCyl.OnAtHitBit(); } if (i_this->mCountDownTimers[2] != 0) { @@ -1186,7 +1186,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_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -1197,7 +1197,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -1218,7 +1218,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VS_UNK8 | CO_SPRM_NO_CRR, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsOther_e | cCcD_CoSPrm_NoCrr_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -1228,7 +1228,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -1248,18 +1248,18 @@ 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_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT, + /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -1278,20 +1278,20 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_UNK1000, /* SrcObjAt Atp */ 2, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_GrpAll_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK6, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT, + /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 78bbd3dd..18e4f4f5 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1319,7 +1319,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_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -1330,7 +1330,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -1351,7 +1351,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_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -1362,7 +1362,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -1383,18 +1383,18 @@ 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_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT, + /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -1413,20 +1413,20 @@ 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_VS_PLAYER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsPlayer_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_VS_UNK4 | CO_SPRM_VS_UNK8, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_VsPlayer_e | cCcD_CoSPrm_VsOther_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK6, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT, + /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index b0072683..71a96506 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -35,12 +35,12 @@ 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_VS_ENEMY | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcD_SE_ARROW, - /* SrcGObjAt HitMark */ G_AT_MARK_NORMAL_HIT, + /* SrcGObjAt Se */ dCcG_SE_ARROW, + /* SrcGObjAt HitMark */ dCcG_AtHitMark_Nrm_e, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, @@ -68,8 +68,8 @@ const dCcD_SrcSph daArrow_c::m_co_sph_src = { /* SrcObjAt SPrm */ 0, /* 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 */ dCcD_SE_ARROW, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsEnemy_e | cCcD_CoSPrm_NoCrr_e, + /* SrcGObjAt Se */ dCcG_SE_ARROW, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, @@ -78,7 +78,7 @@ const dCcD_SrcSph daArrow_c::m_co_sph_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -262,7 +262,7 @@ void daArrow_c::setDrawShapeMaterial() { if (mbSetByZelda) { mAtCps.SetAtAtp(4); mAtCps.SetAtType(arrow_mat[0].mAtType); - mAtCps.OnAtSPrmBit(AT_SPRM_GRP); + mAtCps.OnAtSPrmBit(cCcD_AtSPrm_GrpAll_e); } if (arrow_mat[mArrowType].mTipJointIdx != 0) { diff --git a/src/d/actor/d_a_att.cpp b/src/d/actor/d_a_att.cpp index aa787c6c..5c17d288 100644 --- a/src/d/actor/d_a_att.cpp +++ b/src/d/actor/d_a_att.cpp @@ -120,9 +120,9 @@ static s32 daAtt_Create(fopAc_ac_c* i_this) { /* Flags */ 0, /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_PLAYER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsPlayer_e, /* SrcObjTg Type */ AT_TYPE_HOOKSHOT, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -151,8 +151,8 @@ static s32 daAtt_Create(fopAc_ac_c* i_this) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -178,9 +178,9 @@ static s32 daAtt_Create(fopAc_ac_c* i_this) { /* Flags */ 0, /* SrcObjAt Type */ 0, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_PLAYER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsPlayer_e, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index bda5df3c..d56fe944 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -22,7 +22,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_WATER, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -33,7 +33,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cCcD_SrcCylAttr @@ -52,8 +52,8 @@ static dCcD_SrcSph l_sph_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -63,7 +63,7 @@ static dCcD_SrcSph l_sph_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -82,7 +82,7 @@ static dCcD_SrcSph l_sph_src2 = { /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -92,7 +92,7 @@ static dCcD_SrcSph l_sph_src2 = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index ac04b792..7c0305a8 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -211,9 +211,9 @@ static s32 daBita_Create(fopAc_ac_c* i_ac) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_FIRE, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcD_SE_UNK6, + /* SrcGObjAt Se */ dCcG_SE_UNK6, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 62e0be34..3590a0c7 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -1709,13 +1709,13 @@ static void attack_set(bk_class* i_this, u8 r28) { if (r28 == 2) { i_this->m1040.SetAtType(AT_TYPE_UNK2000); - i_this->m1040.SetAtSe(dCcD_SE_UNK6); + i_this->m1040.SetAtSe(dCcG_SE_UNK6); } else if (i_this->m02D5 != 0) { i_this->m1040.SetAtType(AT_TYPE_UNK800); - i_this->m1040.SetAtSe(dCcD_SE_UNK2); + i_this->m1040.SetAtSe(dCcG_SE_UNK2); } else { i_this->m1040.SetAtType(AT_TYPE_UNK2000); - i_this->m1040.SetAtSe(dCcD_SE_UNK4); + i_this->m1040.SetAtSe(dCcG_SE_UNK4); } if (r28 == 0) { @@ -3394,7 +3394,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -3404,7 +3404,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -3424,7 +3424,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -3432,10 +3432,10 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ G_TG_MARK_UNK1, + /* SrcGObjTg HitMark */ dCcG_TgHitMark_Unk1_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -3455,7 +3455,7 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -3463,10 +3463,10 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, /* SrcGObjTg Se */ 0, - /* SrcGObjTg HitMark */ G_TG_MARK_UNK1, + /* SrcGObjTg HitMark */ dCcG_TgHitMark_Unk1_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -3483,15 +3483,15 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_UNK800, /* SrcObjAt Atp */ 2, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_PLAYER | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsPlayer_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, - /* SrcGObjAt HitMark */ G_AT_MARK_NORMAL_HIT, + /* SrcGObjAt HitMark */ dCcG_AtHitMark_Nrm_e, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_NO_CON_HIT, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoConHit_e, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, @@ -3515,18 +3515,18 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcD_SE_UNK6, - /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT, + /* SrcGObjTg Se */ dCcG_SE_UNK6, + /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index f984e310..7e2fb2ea 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 */ AT_SPRM_GRP, + /* SrcObjAt SPrm */ cCcD_AtSPrm_GrpAll_e, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, @@ -319,7 +319,7 @@ namespace daBomb2 { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS @@ -966,7 +966,7 @@ namespace daBomb2 { void Act_c::mode_wait_init() { mState = 0; gravity = attr().gravity; - mSph.OnCoSPrmBit(CO_SPRM_SET); + mSph.OnCoSPrmBit(cCcD_CoSPrm_Set_e); } void Act_c::mode_wait() { @@ -1024,7 +1024,7 @@ namespace daBomb2 { speedF = 0.0f; speed = cXyz::Zero; off_carry(); - mSph.OffCoSPrmBit(CO_SPRM_SET); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); } void Act_c::mode_carry() { @@ -1060,9 +1060,9 @@ namespace daBomb2 { speed = cXyz::Zero; gravity = 0.0f; off_carry(); - mSph.OffTgSPrmBit(TG_SPRM_SET); - mSph.OffCoSPrmBit(CO_SPRM_SET); - mSph.OnAtSPrmBit(AT_SPRM_SET); + mSph.OffTgSPrmBit(cCcD_TgSPrm_Set_e); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); + mSph.OnAtSPrmBit(cCcD_AtSPrm_Set_e); fopAcM_cancelCarryNow(this); mBombTimer = 0; field_0x73C = 4; @@ -1080,9 +1080,9 @@ namespace daBomb2 { mState = 3; speed.y *= 0.8f; speedF *= 0.8f; - mSph.OffAtSPrmBit(AT_SPRM_SET); - mSph.OffTgSPrmBit(TG_SPRM_SET); - mSph.OffCoSPrmBit(CO_SPRM_SET); + mSph.OffAtSPrmBit(cCcD_AtSPrm_Set_e); + mSph.OffTgSPrmBit(cCcD_TgSPrm_Set_e); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); off_carry(); fopAcM_cancelCarryNow(this); field_0x698 = 4; diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index a613af1f..e49f1ab5 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -666,9 +666,9 @@ void daBomb_c::makeWaterEffect() { if(field_0x77D == 0) { fopAcM_seStart(this, JA_SE_OBJ_BOMB_WATER, 0); fopKyM_createWpillar(¤t.pos, 1.0f, 1.0f, 1); - mSph.OffTgSPrmBit(TG_SPRM_SET); - mSph.OffCoSPrmBit(CO_SPRM_SET); - mSph.OnAtSPrmBit(AT_SPRM_SET); + mSph.OffTgSPrmBit(cCcD_TgSPrm_Set_e); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); + mSph.OnAtSPrmBit(cCcD_AtSPrm_Set_e); mSph.SetR(200.0f); mSph.SetC(current.pos); if(mMassCounter != g_Counter.mCounter0) { @@ -828,9 +828,9 @@ int daBomb_c::procExplode_init() { field_0x6F0 = 0; } - mSph.OffTgSPrmBit(TG_SPRM_SET); - mSph.OffCoSPrmBit(CO_SPRM_SET); - mSph.OnAtSPrmBit(AT_SPRM_SET); + mSph.OffTgSPrmBit(cCcD_TgSPrm_Set_e); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); + mSph.OnAtSPrmBit(cCcD_AtSPrm_Set_e); mSph.SetR(200.0f); mSph.SetC(current.pos); if(mMassCounter != g_Counter.mCounter0) { @@ -927,7 +927,7 @@ bool daBomb_c::procCarry_init() { speedF = 0.0f; speed.set(cXyz::Zero); attention_info.flags &= ~fopAc_Attn_ACTION_CARRY_e; - mSph.OffCoSPrmBit(CO_SPRM_SET); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); return true; } @@ -963,7 +963,7 @@ bool daBomb_c::procWait_init() { change_state(STATE_1); } - mSph.OnCoSPrmBit(CO_SPRM_SET); + mSph.OnCoSPrmBit(cCcD_CoSPrm_Set_e); return true; } @@ -1367,10 +1367,10 @@ static dCcD_SrcSph l_sph_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_BOMB, /* SrcObjAt Atp */ 0x04, - /* SrcObjAt SPrm */ AT_SPRM_GRP, + /* SrcObjAt SPrm */ cCcD_AtSPrm_GrpAll_e, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, @@ -1380,7 +1380,7 @@ static dCcD_SrcSph l_sph_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index df7acaf0..72da83fc 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -20,8 +20,8 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsEnemy_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -31,7 +31,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cCcD_SrcCylAttr diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 140b3e41..95bf6b64 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -32,7 +32,7 @@ static dCcD_SrcCps l_cps_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_WIND, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_GrpAll_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, @@ -40,12 +40,12 @@ static dCcD_SrcCps l_cps_src = { /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoHitMark_e, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index c9381d4f..5e563c97 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -56,9 +56,9 @@ static s32 daHitobj_Create(fopAc_ac_c* pActor) { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_WATER, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index d6e69ba2..c5f353c2 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -337,11 +337,11 @@ static dCcD_SrcCps l_at_cps_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_HOOKSHOT, /* SrcObjAt Atp */ 0x01, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcD_SE_HOOKSHOT, + /* SrcGObjAt Se */ dCcG_SE_HOOKSHOT, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 81590467..d22e9631 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -489,18 +489,18 @@ dCcD_SrcCyl daIball_c::m_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_STOP_NO_CON_HIT, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_StopNoConHit_e, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 78e7aa1a..ba0a7a82 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -1472,8 +1472,8 @@ dCcD_SrcCyl daItem_c::m_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2 | CO_SPRM_VS_UNK8, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsEnemy_e | cCcD_CoSPrm_VsOther_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -1483,7 +1483,7 @@ dCcD_SrcCyl daItem_c::m_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index 0fbdc246..054fff13 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -18,7 +18,7 @@ static dCcD_SrcSph sph_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_FIRE | AT_TYPE_UNK20000 | AT_TYPE_FIRE_ARROW | AT_TYPE_WIND | AT_TYPE_UNK400000, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp index f4de35a4..e7a2db05 100644 --- a/src/d/actor/d_a_msw.cpp +++ b/src/d/actor/d_a_msw.cpp @@ -257,8 +257,8 @@ static s32 daMsw_Create(fopAc_ac_c* i_this) { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -268,7 +268,7 @@ static s32 daMsw_Create(fopAc_ac_c* i_this) { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 3175142e..ea981104 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 */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsEnemy_e, /* 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 */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index abcfad1f..2537735f 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -35,8 +35,8 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_VS_UNK8 | CO_SPRM_VS_UNK4 | CO_SPRM_VS_UNK2 | CO_SPRM_IS_UNK4 | CO_SPRM_SET, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_VsOther_e | cCcD_CoSPrm_VsPlayer_e | cCcD_CoSPrm_VsEnemy_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_Set_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -46,7 +46,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 5573af62..afa8d2a5 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -26,8 +26,8 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* 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 */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 5638ccf6..249f827d 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -31,8 +31,8 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VS_UNK2 | CO_SPRM_VS_UNK4 | CO_SPRM_VS_UNK8, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsEnemy_e | cCcD_CoSPrm_VsPlayer_e | cCcD_CoSPrm_VsOther_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -42,7 +42,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -61,7 +61,7 @@ static dCcD_SrcCyl l_cyl2_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -72,7 +72,7 @@ static dCcD_SrcCyl l_cyl2_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -89,7 +89,7 @@ static dCcD_SrcCyl l_cylAt_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_BOMB, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, @@ -102,7 +102,7 @@ static dCcD_SrcCyl l_cylAt_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -119,7 +119,7 @@ static dCcD_SrcCps l_cpsAt_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_UNK800, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_PLAYER | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsPlayer_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ AT_TYPE_ALL, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, @@ -132,7 +132,7 @@ static dCcD_SrcCps l_cpsAt_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 842a3a30..52a557ce 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -286,10 +286,10 @@ static dCcD_SrcSph l_sph_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_SWORD, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ AT_TYPE_ALL, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -317,7 +317,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_IS_PLAYER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsPlayer_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -344,7 +344,7 @@ static dCcD_SrcCps l_kam_at_cps_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_SWORD, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, @@ -352,7 +352,7 @@ static dCcD_SrcCps l_kam_at_cps_src = { /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoHitMark_e, /* 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 324e4fda..c6090fdd 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -49,8 +49,8 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG | AT_TYPE_WIND | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsPlayer_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -60,7 +60,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -79,7 +79,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_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -90,7 +90,7 @@ static dCcD_SrcCyl l_light_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -107,7 +107,7 @@ static dCcD_SrcCps l_fan_light_cps_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_LIGHT, /* SrcObjAt Atp */ 0, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_GrpAll_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, @@ -115,7 +115,7 @@ static dCcD_SrcCps l_fan_light_cps_src = { /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoHitMark_e, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, @@ -139,7 +139,7 @@ static dCcD_SrcCyl l_wind_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_WIND, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -150,7 +150,7 @@ static dCcD_SrcCyl l_wind_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 8bb7af03..7df508f0 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -27,8 +27,8 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~AT_TYPE_BOOMERANG, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_VSGRP | CO_SPRM_IS_UNK4 | CO_SPRM_SET, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_VsGrpAll_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_Set_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -38,7 +38,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 952f3a57..18baea74 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -1356,7 +1356,7 @@ static dCcD_SrcSph l_sph_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_WIND, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -1367,7 +1367,7 @@ static dCcD_SrcSph l_sph_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index ece99613..2e7897fe 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -23,7 +23,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_VS_PLAYER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsPlayer_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, @@ -31,7 +31,7 @@ static const dCcD_SrcCyl l_cyl_at_src = { /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK9, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_NO_CON_HIT | G_AT_SPRM_NO_HIT_MARK, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoConHit_e | dCcG_AtSPrm_NoHitMark_e, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, @@ -55,7 +55,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 */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -66,7 +66,7 @@ static const dCcD_SrcCyl l_cyl_tg_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* 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 efd069cc..32f7c3d9 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -22,7 +22,7 @@ static dCcD_SrcSph sph_check_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_FIRE_ARROW, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index 6159ba52..8d481118 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/src/d/actor/d_a_obj_ebomzo.cpp @@ -26,7 +26,7 @@ dCcD_SrcSph sph_check_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index f7dc2b05..3e46d3ec 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/src/d/actor/d_a_obj_eskban.cpp @@ -27,7 +27,7 @@ static dCcD_SrcCyl cyl_check_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -57,7 +57,7 @@ static dCcD_SrcCyl cyl_camera_src = { /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK8 | CO_SPRM_NO_CRR, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsOther_e | cCcD_CoSPrm_NoCrr_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -85,9 +85,9 @@ static dCcD_SrcSph sph_check_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK4 | CO_SPRM_VS_UNK2 | - CO_SPRM_NO_CRR, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsPlayer_e | cCcD_CoSPrm_VsEnemy_e | + cCcD_CoSPrm_NoCrr_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp index a46fdd4a..2c88625a 100644 --- a/src/d/actor/d_a_obj_ferris.cpp +++ b/src/d/actor/d_a_obj_ferris.cpp @@ -28,8 +28,8 @@ namespace daObjFerris { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_GrpAll_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -59,7 +59,7 @@ namespace daObjFerris { /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 616f6340..763c8081 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -62,8 +62,8 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -73,7 +73,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index b18d1afc..4ef9bdc7 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -25,7 +25,7 @@ namespace { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_HOOKSHOT, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -36,7 +36,7 @@ namespace { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* 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 26ec4b4f..79886801 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -318,8 +318,8 @@ namespace daObjMovebox { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* 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 3e8d9825..6b729455 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -45,7 +45,7 @@ const dCcD_SrcCyl daObjMtest::Act_c::M_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* 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 7136440b..52020ad9 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -95,8 +95,8 @@ namespace daObjPaper { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_GrpAll_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -106,7 +106,7 @@ namespace daObjPaper { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* 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 74489b86..a5dc57dd 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -48,8 +48,8 @@ const dCcD_SrcCyl daObjTpost_c::m_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_GrpAll_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -59,7 +59,7 @@ const dCcD_SrcCyl daObjTpost_c::m_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 7959f604..ef55c5ee 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -24,7 +24,7 @@ static dCcD_SrcCyl cyl_check_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_PGANON_SWORD, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 1185253a..2bb257fb 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -24,7 +24,7 @@ static dCcD_SrcCyl cyl_src_base = { /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_VS_UNK2 | CO_SPRM_IS_UNK8 | CO_SPRM_NO_CRR, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_VsEnemy_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_NoCrr_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 1ba835c7..3f8c2483 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_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_GrpAll_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e, /* 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 */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e, /* 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 13142f63..ba1a42f0 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -1971,11 +1971,11 @@ BOOL daPy_lk_c::changeDamageProc() { setDashDamage(); } else { u8 hitSe = mCyl.GetTgHitObjSe(); - if (hitSe == dCcD_SE_UNK6) { + if (hitSe == dCcG_SE_UNK6) { seStartOnlyReverb(JA_SE_OBJ_COL_N_BDY_MPLT); - } else if (hitSe == dCcD_SE_UNK2 || hitSe == dCcD_SE_UNK5) { + } else if (hitSe == dCcG_SE_UNK2 || hitSe == dCcG_SE_UNK5) { seStartOnlyReverb(JA_SE_OBJ_COL_SWS_NMTLP); - } else if (hitSe == dCcD_SE_UNK4) { + } else if (hitSe == dCcG_SE_UNK4) { seStartOnlyReverb(JA_SE_OBJ_COL_NWHP_NMTL); } else { seStartOnlyReverb(JA_SE_OBJ_COL_SWM_NSWL); diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc index 9cdeb5dd..2f8f9a61 100644 --- a/src/d/actor/d_a_player_main_data.inc +++ b/src/d/actor/d_a_player_main_data.inc @@ -49,15 +49,15 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK2 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsPlayer_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsEnemy_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcD_SE_UNK25, - /* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT, + /* SrcGObjTg Se */ dCcG_SE_UNK25, + /* SrcGObjTg HitMark */ dCcg_TgHitMark_Purple_e, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, /* SrcGObjTg SPrm */ 0, @@ -79,13 +79,13 @@ static dCcD_SrcCyl l_wind_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_WIND, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsPlayer_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoHitMark_e, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, @@ -107,12 +107,12 @@ static dCcD_SrcCyl l_at_cyl_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_SWORD, /* SrcObjAt Atp */ 0x02, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, - /* SrcGObjAt HitMark */ G_AT_MARK_BIG_HIT, + /* SrcGObjAt HitMark */ dCcG_AtHitMark_Big_e, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, @@ -137,12 +137,12 @@ static dCcD_SrcCps l_at_cps_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_SWORD, /* SrcObjAt Atp */ 0x01, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, - /* SrcGObjAt Se */ dCcD_SE_UNK1, - /* SrcGObjAt HitMark */ G_AT_MARK_NORMAL_HIT, + /* SrcGObjAt Se */ dCcG_SE_UNK1, + /* SrcGObjAt HitMark */ dCcG_AtHitMark_Nrm_e, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, @@ -167,7 +167,7 @@ static dCcD_SrcCps l_fan_wind_cps_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_WIND, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, @@ -175,7 +175,7 @@ static dCcD_SrcCps l_fan_wind_cps_src = { /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoHitMark_e, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, @@ -197,7 +197,7 @@ static dCcD_SrcSph l_fan_wind_sph_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_WIND, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsEnemy_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index a436e63f..c5dffe64 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -165,7 +165,7 @@ void daPy_lk_c::setNormalCutAtParam(u8 cutType) { radius = daPy_HIO_cut_c0::m.field_0x44; m35FC = daPy_HIO_cut_c0::m.field_0x48; } - setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK0, dCcD_SE_UNK1, G_AT_MARK_NORMAL_HIT, cutType, radius); + setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK0, dCcG_SE_UNK1, dCcG_AtHitMark_Nrm_e, cutType, radius); } /* 80155694-8015572C .text setFinishCutAtParam__9daPy_lk_cFUc */ @@ -181,7 +181,7 @@ void daPy_lk_c::setFinishCutAtParam(u8 cutType) { radius = daPy_HIO_cut_c0::m.field_0x44; m35FC = daPy_HIO_cut_c0::m.field_0x48; } - setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcD_SE_UNK1, G_AT_MARK_BIG_HIT, cutType, radius); + setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, cutType, radius); } /* 8015572C-801557C4 .text setExtraCutAtParam__9daPy_lk_cFUc */ @@ -197,7 +197,7 @@ void daPy_lk_c::setExtraCutAtParam(u8 cutType) { radius = daPy_HIO_cut_c0::m.field_0x64; m35FC = daPy_HIO_cut_c0::m.field_0x68; } - setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK0, dCcD_SE_UNK1, G_AT_MARK_NORMAL_HIT, cutType, radius); + setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK0, dCcG_SE_UNK1, dCcG_AtHitMark_Nrm_e, cutType, radius); } /* 801557C4-8015585C .text setExtraFinishCutAtParam__9daPy_lk_cFUc */ @@ -213,7 +213,7 @@ void daPy_lk_c::setExtraFinishCutAtParam(u8 cutType) { radius = daPy_HIO_cut_c0::m.field_0x64; m35FC = daPy_HIO_cut_c0::m.field_0x68; } - setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcD_SE_UNK1, G_AT_MARK_BIG_HIT, cutType, radius); + setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, cutType, radius); } /* 8015585C-80155970 .text setJumpCutAtParam__9daPy_lk_cFv */ @@ -231,13 +231,13 @@ void daPy_lk_c::setJumpCutAtParam() { radius = daPy_HIO_cut_c0::m.field_0x54; m35FC = daPy_HIO_cut_c0::m.field_0x58; } - setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcD_SE_UNK1, G_AT_MARK_BIG_HIT, 0xA, radius); + setAtParam(AT_TYPE_SWORD, atp, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, 0xA, radius); } else if (mEquipItem == dItem_SKULL_HAMMER_e) { - setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK1, dCcD_SE_UNK5, G_AT_MARK_NORMAL_HIT, 0x13, 50.0f); + setAtParam(AT_TYPE_SKULL_HAMMER, 4, dCcG_At_Spl_UNK1, dCcG_SE_UNK5, dCcG_AtHitMark_Nrm_e, 0x13, 50.0f); } else if (mActorKeepEquip.getActor()) { setEnemyWeaponAtParam(TRUE); } else { - setAtParam(AT_TYPE_MACHETE, 2, dCcG_At_Spl_UNK1, dCcD_SE_UNK1, G_AT_MARK_BIG_HIT, 0xE, 30.0f); + setAtParam(AT_TYPE_MACHETE, 2, dCcG_At_Spl_UNK1, dCcG_SE_UNK1, dCcG_AtHitMark_Big_e, 0xE, 30.0f); } } diff --git a/src/d/actor/d_a_player_weapon.inc b/src/d/actor/d_a_player_weapon.inc index 272a692a..b6b0ce3a 100644 --- a/src/d/actor/d_a_player_weapon.inc +++ b/src/d/actor/d_a_player_weapon.inc @@ -29,11 +29,11 @@ void daPy_lk_c::setEnemyWeaponAtParam(BOOL r4) { u8 hitMark; if (r4) { spl = dCcG_At_Spl_UNK1; - hitMark = G_AT_MARK_BIG_HIT; + hitMark = dCcG_AtHitMark_Big_e; cutType++; } else { spl = dCcG_At_Spl_UNK0; - hitMark = G_AT_MARK_NORMAL_HIT; + hitMark = dCcG_AtHitMark_Nrm_e; } setAtParam(boko->getAtType(), boko->getAtPoint(), spl, boko->getSeType(), hitMark, cutType, boko->getCpsR()); } diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index f484320a..9eb88854 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 */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsEnemy_e, /* 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 */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index e8f275d0..2eb66981 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -34,18 +34,18 @@ const dCcD_SrcCyl daRd_c::m_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IGRP | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IGrpAll_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, /* SrcGObjAt SPrm */ 0, - /* SrcGObjTg Se */ dCcD_SE_UNK23, + /* SrcGObjTg Se */ dCcG_SE_UNK23, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_CON_HIT | G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoConHit_e | dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS @@ -656,16 +656,16 @@ bool daRd_c::checkTgHit() { /* 00001650-000017D0 .text setCollision__6daRd_cFv */ void daRd_c::setCollision() { if (mMode == MODE_DEATH) { - mCyl.OffCoSPrmBit(CO_SPRM_VS_UNK2); - mCyl.OffCoSPrmBit(CO_SPRM_IS_UNK2); - mCyl.OffTgSPrmBit(TG_SPRM_SET); - mCyl.OffTgSPrmBit(TG_SPRM_IS_OTHER); + mCyl.OffCoSPrmBit(cCcD_CoSPrm_VsEnemy_e); + mCyl.OffCoSPrmBit(cCcD_CoSPrm_IsEnemy_e); + mCyl.OffTgSPrmBit(cCcD_TgSPrm_Set_e); + mCyl.OffTgSPrmBit(cCcD_TgSPrm_IsOther_e); } else if (mMode == MODE_ATTACK || mMode == MODE_CRY || dComIfGp_evmng_startCheck("DEFAULT_RD_CRY")) { - mCyl.OffCoSPrmBit(CO_SPRM_VS_UNK2); - mCyl.OffCoSPrmBit(CO_SPRM_IS_UNK2); + mCyl.OffCoSPrmBit(cCcD_CoSPrm_VsEnemy_e); + mCyl.OffCoSPrmBit(cCcD_CoSPrm_IsEnemy_e); } else { - mCyl.OnCoSPrmBit(CO_SPRM_VS_UNK2); - mCyl.OnCoSPrmBit(CO_SPRM_IS_UNK2); + mCyl.OnCoSPrmBit(cCcD_CoSPrm_VsEnemy_e); + mCyl.OnCoSPrmBit(cCcD_CoSPrm_IsEnemy_e); } if (isAnm(AnmPrm_SUWARIP)) { diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index 44722cf8..27c2acb3 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -29,8 +29,8 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsEnemy_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp index 360aab7f..e46ebd9d 100644 --- a/src/d/actor/d_a_swattack.cpp +++ b/src/d/actor/d_a_swattack.cpp @@ -17,7 +17,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_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* 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 75141a94..09615b74 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_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), // 0xFF1DFEFF - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* 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 */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index a4748826..661d486d 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 */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsOther_e, /* 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 */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* 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 deb2b9f2..6d92c6f4 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -20,7 +20,7 @@ static dCcD_SrcCyl cyl_check_src = { /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2 | CO_SPRM_NO_CRR, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsEnemy_e | cCcD_CoSPrm_NoCrr_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, diff --git a/src/d/actor/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp index 030ddc83..8c8b13b6 100644 --- a/src/d/actor/d_a_tama.cpp +++ b/src/d/actor/d_a_tama.cpp @@ -16,8 +16,8 @@ static dCcD_SrcSph l_sph_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_ALL, - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_VS_UNK2 | CO_SPRM_VS_UNK8 | CO_SPRM_IS_UNK4, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_VsEnemy_e | cCcD_CoSPrm_VsOther_e | cCcD_CoSPrm_IsPlayer_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -27,7 +27,7 @@ static dCcD_SrcSph l_sph_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGSphS diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index 53dd117e..c455b7b4 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -22,10 +22,10 @@ static dCcD_SrcCyl l_cyl_src = { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_UNK800, /* SrcObjAt Atp */ 0x1, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_PLAYER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsPlayer_e, /* SrcObjTg Type */ AT_TYPE_ALL, /* SrcObjTg SPrm */ 0, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2 | CO_SPRM_VS_UNK4 | CO_SPRM_VS_UNK8, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsEnemy_e | cCcD_CoSPrm_VsPlayer_e | cCcD_CoSPrm_VsOther_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ dCcG_At_Spl_UNK1, @@ -35,7 +35,7 @@ static dCcD_SrcCyl l_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cCcD_SrcCylAttr diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index d3d2af3c..8e0820e1 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -61,7 +61,7 @@ static dCcD_SrcTri l_tri_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ AT_TYPE_BOMB, - /* SrcObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_SHIELD_FRONT_RANGE, + /* SrcObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_ShieldFrontRange_e, /* SrcObjCo SPrm */ 0, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, @@ -72,7 +72,7 @@ static dCcD_SrcTri l_tri_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGTriS diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 75ebf520..e8f847f6 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -21,7 +21,7 @@ namespace daWindTag { /* Flags */ 0, /* SrcObjAt Type */ AT_TYPE_WIND, /* SrcObjAt Atp */ 0, - /* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_PLAYER | AT_SPRM_VS_OTHER, + /* SrcObjAt SPrm */ cCcD_AtSPrm_Set_e | cCcD_AtSPrm_VsPlayer_e | cCcD_AtSPrm_VsOther_e, /* SrcObjTg Type */ 0, /* SrcObjTg SPrm */ 0, /* SrcObjCo SPrm */ 0, @@ -29,12 +29,12 @@ namespace daWindTag { /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, /* SrcGObjAt Mtrl */ 0, - /* SrcGObjAt SPrm */ G_AT_SPRM_NO_HIT_MARK, + /* SrcGObjAt SPrm */ dCcG_AtSPrm_NoHitMark_e, /* SrcGObjTg Se */ 0, /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCpsS diff --git a/src/d/d_a_bomb_static.cpp b/src/d/d_a_bomb_static.cpp index ae4810fa..cff83124 100644 --- a/src/d/d_a_bomb_static.cpp +++ b/src/d/d_a_bomb_static.cpp @@ -41,9 +41,9 @@ void daBomb_c::setBombFire_ON() { void daBomb_c::setBombNoHit() { _prm_chk_version(); - mSph.OffTgSPrmBit(TG_SPRM_SET); - mSph.OffCoSPrmBit(CO_SPRM_SET); - mSph.OffAtSPrmBit(AT_SPRM_SET); + mSph.OffTgSPrmBit(cCcD_TgSPrm_Set_e); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); + mSph.OffAtSPrmBit(cCcD_AtSPrm_Set_e); mSph.ClrAtSet(); field_0x6F3 = true; @@ -53,14 +53,14 @@ void daBomb_c::setBombNoHit() { void daBomb_c::setBombOffCoSet() { _prm_chk_version(); - mSph.OffCoSPrmBit(CO_SPRM_SET); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); } /* 80068104-8006813C .text setBombOnCoSet__8daBomb_cFv */ void daBomb_c::setBombOnCoSet() { _prm_chk_version(); - mSph.OnCoSPrmBit(CO_SPRM_SET); + mSph.OnCoSPrmBit(cCcD_CoSPrm_Set_e); } /* 8006813C-800681CC .text setBombNoEff__8daBomb_cFv */ @@ -178,9 +178,9 @@ void daBomb2::Act_c::set_eat() { /* 800684AC-800684E0 .text set_no_hit__Q27daBomb25Act_cFv */ void daBomb2::Act_c::set_no_hit() { - mSph.OffTgSPrmBit(TG_SPRM_SET); - mSph.OffCoSPrmBit(CO_SPRM_SET); - mSph.OffAtSPrmBit(AT_SPRM_SET); + mSph.OffTgSPrmBit(cCcD_TgSPrm_Set_e); + mSph.OffCoSPrmBit(cCcD_CoSPrm_Set_e); + mSph.OffAtSPrmBit(cCcD_AtSPrm_Set_e); mSph.ClrAtSet(); } diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index 8c609858..da757329 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -37,7 +37,7 @@ dCcD_GStts::dCcD_GStts() { mAtOldApid = fpcM_ERROR_PROCESS_ID_e; mTgApid = fpcM_ERROR_PROCESS_ID_e; mTgOldApid = fpcM_ERROR_PROCESS_ID_e; - field_0x1C = 0; + mFlag = 0; } /* 800AB384-800AB3BC .text Ct__10dCcD_GSttsFv */ @@ -50,7 +50,7 @@ void dCcD_GStts::Ct() { mAtOldApid = fpcM_ERROR_PROCESS_ID_e; mTgApid = fpcM_ERROR_PROCESS_ID_e; mTgOldApid = fpcM_ERROR_PROCESS_ID_e; - field_0x1C = 0; + mFlag = 0; } /* 800AB3BC-800AB3DC .text Move__10dCcD_GSttsFv */ diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 95ed2c22..ed7bbff1 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -74,25 +74,25 @@ void dCcS::CalcTgPlusDmg(cCcD_Obj* obj1, cCcD_Obj* obj2, cCcD_Stts* stts1, cCcD_ } /* 800AD86C-800AD8EC .text ChkAtTgHitAfterCross__4dCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts */ -bool dCcS::ChkAtTgHitAfterCross(bool r4, bool r5, const cCcD_GObjInf* inf1_, const cCcD_GObjInf* inf2_, - cCcD_Stts* stts1_, cCcD_Stts* stts2_, cCcD_GStts* gstts1_, cCcD_GStts* gstts2_) { - dCcD_GObjInf* inf1 = (dCcD_GObjInf*)inf1_; - dCcD_GObjInf* inf2 = (dCcD_GObjInf*)inf2_; - dCcD_Stts* stts1 = (dCcD_Stts*)stts1_; - dCcD_Stts* stts2 = (dCcD_Stts*)stts2_; - dCcD_GStts* gstts1 = (dCcD_GStts*)gstts1_; - dCcD_GStts* gstts2 = (dCcD_GStts*)gstts2_; - fpc_ProcID r11 = stts1->GetApid(); - fpc_ProcID r3 = stts2->GetApid(); - if (r4) { - gstts1->SetAtApid(r3); - if (inf1->ChkAtNoConHit() && gstts1->GetAtOldApid() == stts2->GetApid()) { +bool dCcS::ChkAtTgHitAfterCross(bool i_setAt, bool i_setTg, const cCcD_GObjInf* i_atInf, const cCcD_GObjInf* i_tgInf, + cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts, cCcD_GStts* i_atGStts, cCcD_GStts* i_tgGStts) { + dCcD_GObjInf* atInf = (dCcD_GObjInf*)i_atInf; + dCcD_GObjInf* tgInf = (dCcD_GObjInf*)i_tgInf; + dCcD_Stts* atStts = (dCcD_Stts*)i_atStts; + dCcD_Stts* stts2 = (dCcD_Stts*)i_tgStts; + dCcD_GStts* atGStts = (dCcD_GStts*)i_atGStts; + dCcD_GStts* tgGStts = (dCcD_GStts*)i_tgGStts; + fpc_ProcID atApid = atStts->GetApid(); + fpc_ProcID tgApid = stts2->GetApid(); + if (i_setAt) { + atGStts->SetAtApid(tgApid); + if (atInf->ChkAtNoConHit() && atGStts->GetAtOldApid() == stts2->GetApid()) { return true; } } - if (r5) { - gstts2->SetTgApid(r11); - if (inf2->ChkTgNoConHit() && !inf1->ChkAtStopNoConHit() && gstts2->GetTgOldApid() == stts1->GetApid()) { + if (i_setTg) { + tgGStts->SetTgApid(atApid); + if (tgInf->ChkTgNoConHit() && !atInf->ChkAtStopNoConHit() && tgGStts->GetTgOldApid() == atStts->GetApid()) { return true; } } @@ -299,27 +299,27 @@ void dCcS::CalcParticleAngle(dCcD_GObjInf* i_atObjInf, cCcD_Stts* i_atStts, cCcD } /* 800ADFF8-800AE308 .text ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyz */ -void dCcS::ProcAtTgHitmark(bool, bool, cCcD_Obj* r6, cCcD_Obj* r7, dCcD_GObjInf* atInf, dCcD_GObjInf* tgInf, - cCcD_Stts* r10, cCcD_Stts* r30, dCcD_GStts*, dCcD_GStts* r4, cXyz* pos) +void dCcS::ProcAtTgHitmark(bool, bool, cCcD_Obj* atObj, cCcD_Obj* tgObj, dCcD_GObjInf* atInf, dCcD_GObjInf* tgInf, + cCcD_Stts* atStts, cCcD_Stts* tgStts, dCcD_GStts* atGStts, dCcD_GStts* tgGStts, cXyz* pos) { if (atInf->ChkAtNoHitMark()) { return; } if (tgInf->ChkTgNoHitMark()) { return; } if (tgInf->GetTgHitMark() == 0xFF) { return; } - if (!r4->ChkNoneActorPerfTblId()) { return; } + if (!tgGStts->ChkNoneActorPerfTblId()) { return; } - if (!ChkShield(r6, r7, atInf, tgInf)) { - if (atInf->GetAtHitMark() == 0) { return; } - if (atInf->GetAtHitMark() == 1 && tgInf->GetTgHitMark() == 1) { + if (!ChkShield(atObj, tgObj, atInf, tgInf)) { + if (atInf->GetAtHitMark() == dCcG_AtHitMark_None_e) { return; } + if (atInf->GetAtHitMark() == dCcG_AtHitMark_Unk1_e && tgInf->GetTgHitMark() == dCcG_TgHitMark_Unk1_e) { dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, pos); } else { csXyz angle; - CalcParticleAngle(atInf, r10, r30, &angle); - if (atInf->GetAtHitMark() == 0xF) { + CalcParticleAngle(atInf, atStts, tgStts, &angle); + if (atInf->GetAtHitMark() == dCcG_AtHitMark_Big_e) { dComIfGp_particle_set(0x10, pos); cXyz scale; scale.x = scale.y = scale.z = 2.0f; dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, pos, &angle, &scale); - } else if (atInf->GetAtHitMark() == 1) { + } else if (atInf->GetAtHitMark() == dCcG_AtHitMark_Unk1_e) { dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, pos, &angle); } else { dComIfGp_particle_set(atInf->GetAtHitMark(), pos, &angle); @@ -330,38 +330,40 @@ void dCcS::ProcAtTgHitmark(bool, bool, cCcD_Obj* r6, cCcD_Obj* r7, dCcD_GObjInf* if (tgInf->GetTgHitMark() == 0) { return; } dKy_SordFlush_set(*pos, 0); csXyz angle; - CalcParticleAngle(atInf, r10, r30, &angle); + CalcParticleAngle(atInf, atStts, tgStts, &angle); dComIfGp_particle_set(tgInf->GetTgHitMark(), pos, &angle); } } /* 800AE308-800AE5AC .text SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz */ -void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Obj* param_3, - cCcD_GObjInf* i_atObjInf, cCcD_GObjInf* i_tgObjInf, cCcD_Stts* param_6, - cCcD_Stts* param_7, cCcD_GStts* param_8, cCcD_GStts* param_9, - cXyz* i_hitPos) { +void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, + cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, + cCcD_GObjInf* i_atObjInf, cCcD_GObjInf* i_tgObjInf, + cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts, + cCcD_GStts* i_atGStts, cCcD_GStts* i_tgGStts, + cXyz* i_hitPos) { dCcD_GObjInf* atObjInf = (dCcD_GObjInf*)i_atObjInf; dCcD_GObjInf* tgObjInf = (dCcD_GObjInf*)i_tgObjInf; - dCcD_GStts* stts1 = (dCcD_GStts*)param_8; - dCcD_GStts* stts2 = (dCcD_GStts*)param_9; + dCcD_GStts* atGStts = (dCcD_GStts*)i_atGStts; + dCcD_GStts* tgGStts = (dCcD_GStts*)i_tgGStts; - bool chk_shield = ChkShield(param_2, param_3, atObjInf, tgObjInf); + bool chk_shield = ChkShield(i_atObj, i_tgObj, atObjInf, tgObjInf); if (i_setAt) { atObjInf->SetAtHitPos(*i_hitPos); atObjInf->SetAtRVec(*tgObjInf->GetTgVecP()); - if (stts1 != NULL && stts1->GetTgSpl() == 0) { - stts1->SetTgSpl(tgObjInf->GetTgSpl()); + if (atGStts != NULL && atGStts->GetTgSpl() == 0) { + atGStts->SetTgSpl(tgObjInf->GetTgSpl()); } - atObjInf->SetAtHitApid(param_7->GetApid()); + atObjInf->SetAtHitApid(i_tgStts->GetApid()); if (chk_shield) { atObjInf->OnAtShieldHit(); } - if (stts2->ChkNoActor()) { + if (tgGStts->ChkNoActor()) { atObjInf->OnAtHitNoActor(); } } @@ -370,17 +372,17 @@ void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Ob tgObjInf->SetTgHitPos(*i_hitPos); tgObjInf->SetTgRVec(*atObjInf->GetAtVecP()); - if (stts2 != NULL && stts1->GetAtSpl() == 0) { - stts2->SetAtSpl(atObjInf->GetAtSpl()); + if (tgGStts != NULL && atGStts->GetAtSpl() == 0) { + tgGStts->SetAtSpl(atObjInf->GetAtSpl()); } - tgObjInf->SetTgHitApid(param_6->GetApid()); + tgObjInf->SetTgHitApid(i_atStts->GetApid()); if (chk_shield) { tgObjInf->OnTgShieldHit(); } - if (stts1->ChkNoActor()) { + if (atGStts->ChkNoActor()) { tgObjInf->OnTgHitNoActor(); } } @@ -409,8 +411,8 @@ void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Ob atObjInf->SetAtEffCounterTimer(); tgObjInf->SetTgEffCounterTimer(); - ProcAtTgHitmark(i_setAt, i_setTg, param_2, param_3, atObjInf, tgObjInf, param_6, param_7, - stts1, stts2, i_hitPos); + ProcAtTgHitmark(i_setAt, i_setTg, i_atObj, i_tgObj, atObjInf, tgObjInf, i_atStts, i_tgStts, + atGStts, tgGStts, i_hitPos); } } @@ -482,4 +484,3 @@ bool dCcS::ChkNoHitGCo(cCcD_Obj* obj1, cCcD_Obj* obj2) { bool cCcS::ChkNoHitGAtTg(const cCcD_GObjInf*, const cCcD_GObjInf*, cCcD_GStts*, cCcD_GStts*) { return false; } - diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index f04a0dc9..9f7ea6ef 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -43,13 +43,13 @@ u32 at_se_get(cCcD_Obj* obj) { dCcD_GObjInf* gObjInf = dCcD_GetGObjInf(obj); if (gObjInf->ChkAtType(AT_TYPE_SKULL_HAMMER | AT_TYPE_STALFOS_MACE)) { return JA_SE_LK_HAMMER_HIT; - } else if (gObjInf->GetAtSe() == dCcD_SE_UNK4) { + } else if (gObjInf->GetAtSe() == dCcG_SE_UNK4) { return JA_SE_LK_W_WEP_HIT; - } else if (gObjInf->GetAtSe() == dCcD_SE_UNK5) { + } else if (gObjInf->GetAtSe() == dCcG_SE_UNK5) { return JA_SE_LK_MS_WEP_HIT; - } else if (gObjInf->GetAtSe() == dCcD_SE_ARROW) { + } else if (gObjInf->GetAtSe() == dCcG_SE_ARROW) { return JA_SE_LK_ARROW_HIT; - } else if (gObjInf->GetAtSe() == dCcD_SE_HOOKSHOT) { + } else if (gObjInf->GetAtSe() == dCcG_SE_HOOKSHOT) { return JA_SE_LK_HS_SPIKE; } else { return JA_SE_LK_SW_HIT_S; @@ -61,13 +61,13 @@ u32 at_se_getC(cCcD_Obj* obj) { dCcD_GObjInf* gObjInf = dCcD_GetGObjInf(obj); if (gObjInf->ChkAtType(AT_TYPE_SKULL_HAMMER | AT_TYPE_STALFOS_MACE)) { return JA_SE_LK_HAMMER_HIT; - } else if (gObjInf->GetAtSe() == dCcD_SE_UNK4) { + } else if (gObjInf->GetAtSe() == dCcG_SE_UNK4) { return JA_SE_LK_W_WEP_CRT_HIT; - } else if (gObjInf->GetAtSe() == dCcD_SE_UNK5) { + } else if (gObjInf->GetAtSe() == dCcG_SE_UNK5) { return JA_SE_LK_MS_WEP_CRT_HIT; - } else if (gObjInf->GetAtSe() == dCcD_SE_ARROW) { + } else if (gObjInf->GetAtSe() == dCcG_SE_ARROW) { return JA_SE_LK_ARROW_HIT; - } else if (gObjInf->GetAtSe() == dCcD_SE_HOOKSHOT) { + } else if (gObjInf->GetAtSe() == dCcG_SE_HOOKSHOT) { return JA_SE_LK_HS_SPIKE; } else { return JA_SE_LK_SW_CRT_HIT; diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index e93f2c24..f0bd33ec 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -6,6 +6,7 @@ #include "d/d_kankyo_rain.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_roof_chk.h" +#include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_kankyo_wether.h" diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index 97ff2e63..531189d8 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -949,8 +949,8 @@ dCcD_SrcCyl dNpc_cyl_src = { /* SrcObjAt Atp */ 0, /* SrcObjAt SPrm */ 0, /* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG), - /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY, - /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP, + /* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_IsEnemy_e, + /* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsPlayer_e | cCcD_CoSPrm_VsGrpAll_e, /* SrcGObjAt Se */ 0, /* SrcGObjAt HitMark */ 0, /* SrcGObjAt Spl */ 0, @@ -960,7 +960,7 @@ dCcD_SrcCyl dNpc_cyl_src = { /* SrcGObjTg HitMark */ 0, /* SrcGObjTg Spl */ 0, /* SrcGObjTg Mtrl */ 0, - /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjTg SPrm */ dCcG_TgSPrm_NoHitMark_e, /* SrcGObjCo SPrm */ 0, }, // cM3dGCylS |