mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-08 12:17:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

add c_cc_d and d_cc_d SPrm enums

Browse Source
This commit is contained in:
LagoLunatic
2023-12-20 21:11:57 -05:00
parent c29a149aff
commit 94465b0dbb
32 changed files with 202 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+34 -23
View File
@@ -7,14 +7,7 @@
#include "SSystem/SComponent/c_m3d_g_sph.h"
#include "SSystem/SComponent/c_m3d_g_tri.h"
typedef struct _GXColor GXColor;
class fopAc_ac_c;
enum CcG_Tg_HitMark {
CcG_Tg_UNK_MARK_6 = 6,
CcG_Tg_UNK_MARK_8 = 8,
};
class cCcD_PntAttr;
class cCcD_CpsAttr;
class cCcD_TriAttr;
@@ -52,20 +45,38 @@ enum cCcD_ObjAtType {
/* 0xFFFFFFFF */ AT_TYPE_ALL = ~0,
};
enum AtSPrm_e {
AT_SPRM_SET = 1,
AT_SPRM_NO_TG_HIT_INF_SET = 0x10,
enum cCcD_AtSPrm_e {
/* 0x01 */ AT_SPRM_SET = 0x01,
/* 0x02 */ AT_SPRM_UNK2 = 0x02,
/* 0x04 */ AT_SPRM_UNK4 = 0x04,
/* 0x08 */ AT_SPRM_UNK8 = 0x08,
/* 0x0E */ AT_SPRM_GRP = AT_SPRM_UNK2 | AT_SPRM_UNK4 | AT_SPRM_UNK8,
/* 0x10 */ AT_SPRM_NO_TG_HIT_INF_SET = 0x10,
};
enum TgSPrm_e {
TG_SPRM_SET = 1,
TG_SPRM_NO_AT_HIT_INF_SET = 0x10,
enum cCcD_TgSPrm_e {
/* 0x01 */ TG_SPRM_SET = 0x01,
/* 0x02 */ TG_SPRM_UNK2 = 0x02,
/* 0x04 */ TG_SPRM_UNK4 = 0x04,
/* 0x08 */ TG_SPRM_UNK8 = 0x08,
/* 0x0E */ TG_SPRM_GRP = TG_SPRM_UNK2 | TG_SPRM_UNK4 | TG_SPRM_UNK8,
/* 0x10 */ TG_SPRM_NO_AT_HIT_INF_SET = 0x10,
};
enum CoSPrm_e {
CO_SPRM_SET = 1,
CO_SPRM_NO_CRR = 0x100,
CO_SPRM_NO_CO_HIT_INF_SET = 0x200,
enum cCcD_CoSPrm_e {
/* 0x0001 */ CO_SPRM_SET = 0x01,
/* 0x0002 */ CO_SPRM_UNK2 = 0x02,
/* 0x0004 */ CO_SPRM_UNK4 = 0x04,
/* 0x0008 */ CO_SPRM_UNK8 = 0x08,
/* 0x0010 */ CO_SPRM_UNK10 = 0x10,
/* 0x0020 */ CO_SPRM_UNK20 = 0x20,
/* 0x0040 */ CO_SPRM_UNK40 = 0x40,
/* 0x000E */ CO_SPRM_IGRP = CO_SPRM_UNK2 | CO_SPRM_UNK4 | CO_SPRM_UNK8,
/* 0x001E */ CO_SPRM_GRP = CO_SPRM_IGRP | CO_SPRM_UNK10,
/* 0x0070 */ CO_SPRM_VSGRP = CO_SPRM_UNK10 | CO_SPRM_UNK20 | CO_SPRM_UNK40,
/* 0x0080 */ CO_SPRM_SPH_3D_CRR = 0x80,
/* 0x0100 */ CO_SPRM_NO_CRR = 0x100,
/* 0x0200 */ CO_SPRM_NO_CO_HIT_INF_SET = 0x200,
};
class cCcD_ShapeAttr {
@@ -430,7 +441,7 @@ public:
}
void ClrHit() { ClrRPrm(1); ClrObj(); }
int GetType() const { return mType; }
u32 GetGrp() const { return MskSPrm(0xE); }
u32 GetGrp() const { return MskSPrm(AT_SPRM_GRP); }
bool ChkSet() const { return MskSPrm(AT_SPRM_SET); }
u8 GetAtp() const { return mAtp; }
u32 MskType(u32 msk) const { return mType & msk; }
@@ -464,7 +475,7 @@ public:
}
int GetType() const { return mType; }
void SetType(u32 type) { mType = type; }
u32 GetGrp() const { return MskSPrm(0xE); }
u32 GetGrp() const { return MskSPrm(TG_SPRM_GRP); }
bool ChkSet() const { return MskSPrm(TG_SPRM_SET); }
void ClrSet() { OffSPrmBit(TG_SPRM_SET); }
u32 ChkHit() { return MskRPrm(1); }
@@ -485,12 +496,12 @@ public:
void ClrHit() { ClrRPrm(1); ClrObj(); }
void SetIGrp(u32);
void SetVsGrp(u32);
u32 GetGrp() const { return MskSPrm(0x1E); }
u32 GetGrp() const { return MskSPrm(CO_SPRM_GRP); }
bool ChkSet() const { return MskSPrm(CO_SPRM_SET); }
u32 GetVsGrp() const { return MskSPrm(0x70); }
u32 GetIGrp() const { return MskSPrm(0xE); }
u32 GetVsGrp() const { return MskSPrm(CO_SPRM_VSGRP); }
u32 GetIGrp() const { return MskSPrm(CO_SPRM_IGRP); }
u32 ChkNoCrr() const { return MskSPrm(CO_SPRM_NO_CRR); }
u32 ChkSph3DCrr() const { return MskSPrm(0x80); }
u32 ChkSph3DCrr() const { return MskSPrm(CO_SPRM_SPH_3D_CRR); }
void ClrSet() { OffSPrmBit(CO_SPRM_SET); }
u32 ChkHit() { return MskRPrm(1); }
include/d/d_cc_d.h
+54 -36
View File
@@ -9,8 +9,32 @@
#include "SSystem/SComponent/c_cc_d.h"
#include "f_pc/f_pc_manager.h"
enum dCcG_At_SPrm {
G_AT_SPRM_NO_CON_HIT = 0x01,
G_AT_SPRM_NO_HIT_MARK = 0x02,
G_AT_SPRM_STOP_NO_CON_HIT = 0x04,
G_AT_SPRM_NO_MASS = 0x08,
};
enum dCcG_Tg_SPrm {
G_TG_SPRM_SHIELD = 0x01,
G_TG_SPRM_NO_CON_HIT = 0x02,
G_TG_SPRM_NO_HIT_MARK = 0x04,
G_TG_SPRM_SHIELD_FRONT_RANGE = 0x08,
};
enum dCcG_Co_SPrm {
G_CO_SPRM_AT_LASSO = 0x01,
G_CO_SPRM_TG_LASSO = 0x02,
};
enum dCcD_hitSe {};
enum CcG_Tg_HitMark {
CcG_Tg_UNK_MARK_6 = 6,
CcG_Tg_UNK_MARK_8 = 8,
};
enum dCcG_At_Spl {};
enum dCcG_Tg_Spl {};
@@ -167,16 +191,16 @@ public:
virtual ~dCcD_GAtTgCoCommonBase() {}
void ClrEffCounter() { mEffCounter = 0; }
u32 GetSPrm() const { return mSPrm; }
u32 GetRPrm() const { return mRPrm; }
u32 MskSPrm(u32 mask) const { return mSPrm & mask; }
u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
bool ChkSPrm(u32 mask) const { return MskSPrm(mask); }
u32 GetSPrm() { return mSPrm; }
u32 GetRPrm() { return mRPrm; }
u32 MskSPrm(u32 mask) { return mSPrm & mask; }
u32 MskRPrm(u32 mask) { return mRPrm & mask; }
bool ChkSPrm(u32 mask) { return MskSPrm(mask); }
void OnSPrm(u32 flag) { mSPrm |= flag; }
void OnRPrm(u32 flag) { mRPrm |= flag; }
void OffSPrm(u32 flag) { mSPrm &= ~flag; }
void OffRPrm(u32 flag) { mRPrm &= ~flag; }
bool ChkRPrm(u32 flag) const { return MskRPrm(flag); }
bool ChkRPrm(u32 flag) { return MskRPrm(flag); }
void SetHitCallback(dCcD_HitCallback callback) { mHitCallback = callback; }
dCcD_HitCallback GetHitCallback() { return mHitCallback; }
}; // Size = 0x1C
@@ -288,14 +312,14 @@ public:
void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); }
void SetTgVec(cXyz& vec) { mGObjTg.SetVec(vec); }
bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); }
void OnAtNoHitMark() { mGObjAt.OnSPrm(2); }
void OffAtNoHitMark() { mGObjAt.OffSPrm(2); }
void OnTgNoHitMark() { mGObjTg.OnSPrm(4); }
void OffTgNoHitMark() { mGObjTg.OffSPrm(4); }
void OnAtNoConHit() { mGObjAt.OnSPrm(1); }
void OffAtNoConHit() { mGObjAt.OffSPrm(1); }
void OnTgNoConHit() { mGObjTg.OnSPrm(2); }
bool ChkAtNoMass() { return mGObjAt.ChkSPrm(G_AT_SPRM_NO_MASS); }
void OnAtNoHitMark() { mGObjAt.OnSPrm(G_AT_SPRM_NO_HIT_MARK); }
void OffAtNoHitMark() { mGObjAt.OffSPrm(G_AT_SPRM_NO_HIT_MARK); }
void OnTgNoHitMark() { mGObjTg.OnSPrm(G_TG_SPRM_NO_HIT_MARK); }
void OffTgNoHitMark() { mGObjTg.OffSPrm(G_TG_SPRM_NO_HIT_MARK); }
void OnAtNoConHit() { mGObjAt.OnSPrm(G_AT_SPRM_NO_CON_HIT); }
void OffAtNoConHit() { mGObjAt.OffSPrm(G_AT_SPRM_NO_CON_HIT); }
void OnTgNoConHit() { mGObjTg.OnSPrm(G_TG_SPRM_NO_CON_HIT); }
void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); }
void SetAtSe(u8 se) { mGObjAt.SetSe(se); }
void SetTgSe(u8 se) { mGObjTg.SetSe(se); }
@@ -316,22 +340,18 @@ public:
fopAc_ac_c* GetTgHitAc() { return mGObjTg.GetAc(); }
void SetTgShieldFrontRangeYAngle(s16* angle) { mGObjTg.SetShieldFrontRangeYAngle(angle); }
void SetTgHitMark(CcG_Tg_HitMark mark) { mGObjTg.SetHitMark(mark); }
void OnTgShield() { mGObjTg.OnSPrm(0x1); }
void OffTgShield() { mGObjTg.OffSPrm(0x1); }
void OnTgShieldFrontRange() { mGObjTg.OnSPrm(0x8); }
void OffTgShieldFrontRange() { mGObjTg.OffSPrm(0x8); }
bool ChkTgIronBallRebound() { return mGObjTg.ChkSPrm(0x100); }
void OnTgShield() { mGObjTg.OnSPrm(G_TG_SPRM_SHIELD); }
void OffTgShield() { mGObjTg.OffSPrm(G_TG_SPRM_SHIELD); }
void OnTgShieldFrontRange() { mGObjTg.OnSPrm(G_TG_SPRM_SHIELD_FRONT_RANGE); }
void OffTgShieldFrontRange() { mGObjTg.OffSPrm(G_TG_SPRM_SHIELD_FRONT_RANGE); }
s16* GetTgShieldFrontRangeYAngle() { return mGObjTg.GetShieldFrontRangeYAngle(); }
bool ChkTgShield() { return mGObjTg.ChkSPrm(1); }
bool ChkTgSpShield() { return mGObjTg.ChkSPrm(0x40); }
bool ChkTgSmallShield() { return mGObjTg.ChkSPrm(0x10); }
bool ChkTgShieldFrontRange() { return mGObjTg.ChkSPrm(8); }
bool ChkAtNoConHit() { return mGObjAt.ChkSPrm(1); }
bool ChkAtStopNoConHit() { return mGObjAt.ChkSPrm(0x4); }
bool ChkTgNoConHit() { return mGObjTg.ChkSPrm(2); }
bool ChkTgStopNoConHit() { return mGObjTg.ChkSPrm(0x2000); }
bool ChkCoAtLasso() { return mGObjCo.ChkSPrm(1); }
bool ChkCoTgLasso() { return mGObjCo.ChkSPrm(2); }
bool ChkTgShield() { return mGObjTg.ChkSPrm(G_TG_SPRM_SHIELD); }
bool ChkTgShieldFrontRange() { return mGObjTg.ChkSPrm(G_TG_SPRM_SHIELD_FRONT_RANGE); }
bool ChkAtNoConHit() { return mGObjAt.ChkSPrm(G_AT_SPRM_NO_CON_HIT); }
bool ChkAtStopNoConHit() { return mGObjAt.ChkSPrm(G_AT_SPRM_STOP_NO_CON_HIT); }
bool ChkTgNoConHit() { return mGObjTg.ChkSPrm(G_TG_SPRM_NO_CON_HIT); }
bool ChkCoAtLasso() { return mGObjCo.ChkSPrm(G_CO_SPRM_AT_LASSO); }
bool ChkCoTgLasso() { return mGObjCo.ChkSPrm(G_CO_SPRM_TG_LASSO); }
dCcD_HitCallback GetCoHitCallback() { return mGObjCo.GetHitCallback(); }
dCcD_HitCallback GetAtHitCallback() { return mGObjAt.GetHitCallback(); }
dCcD_HitCallback GetTgHitCallback() { return mGObjTg.GetHitCallback(); }
@@ -344,13 +364,11 @@ public:
void OffAtHitNoActor() { mGObjAt.OffRPrm(2); }
void OnTgHitNoActor() { mGObjTg.OnRPrm(1); }
void OffTgHitNoActor() { mGObjTg.OffRPrm(1); }
bool ChkCoHitNoActor() const { return mGObjCo.ChkRPrm(1); }
bool ChkAtHitNoActor() const { return mGObjAt.ChkRPrm(2); }
bool ChkTgHitNoActor() const { return mGObjTg.ChkRPrm(1); }
bool ChkAtNoHitMark() { return mGObjAt.ChkSPrm(2); }
bool ChkTgNoHitMark() { return mGObjTg.ChkSPrm(4); }
bool ChkTgHookShotNoHitMark() { return mGObjTg.ChkSPrm(0x400); }
bool ChkTgArrowNoHitMark() { return mGObjTg.ChkSPrm(0x1000); }
bool ChkCoHitNoActor() { return mGObjCo.ChkRPrm(1); }
bool ChkAtHitNoActor() { return mGObjAt.ChkRPrm(2); }
bool ChkTgHitNoActor() { return mGObjTg.ChkRPrm(1); }
bool ChkAtNoHitMark() { return mGObjAt.ChkSPrm(G_AT_SPRM_NO_HIT_MARK); }
bool ChkTgNoHitMark() { return mGObjTg.ChkSPrm(G_TG_SPRM_NO_HIT_MARK); }
dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); }
int GetTgHitMark() { return mGObjTg.GetHitMark(); }
int GetAtHitMark() { return mGObjAt.GetHitMark(); }
src/c/c_damagereaction.cpp
+6 -6
View File
@@ -78,10 +78,10 @@ dCcD_SrcCyl cc_cyl_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_SKULL_HAMMER,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0x0F,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* 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,
@@ -91,7 +91,7 @@ dCcD_SrcCyl cc_cyl_src = {
/* 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
@@ -408,7 +408,7 @@ dCcD_SrcSph fire_at_sph_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_FIRE,
/* SrcObjAt Atp */ 0x02,
/* SrcObjAt SPrm */ 0x0F,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -416,7 +416,7 @@ dCcD_SrcSph fire_at_sph_src = {
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
/* SrcGObjAt SPrm */ 0x01,
/* SrcGObjAt SPrm */ G_AT_SPRM_NO_CON_HIT,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
src/d/actor/d_a_agbsw0.cpp
+2 -2
View File
@@ -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
src/d/actor/d_a_am.cpp
+10 -10
View File
@@ -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
src/d/actor/d_a_am2.cpp
+10 -10
View File
@@ -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
src/d/actor/d_a_arrow.cpp
+6 -6
View File
@@ -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
src/d/actor/d_a_bomb2.cpp
+4 -4
View File
@@ -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
src/d/actor/d_a_fan.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_hookshot.cpp
+1 -1
View File
@@ -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,
src/d/actor/d_a_ib.cpp
+4 -4
View File
@@ -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
src/d/actor/d_a_item.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_lamp.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_nh.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_npc_kamome.cpp
+5 -5
View File
@@ -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,
src/d/actor/d_a_npc_md.cpp
+9 -9
View File
@@ -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
src/d/actor/d_a_obj_barrier.cpp
+5 -5
View File
@@ -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
src/d/actor/d_a_obj_dragonhead.cpp
+1 -1
View File
@@ -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,
src/d/actor/d_a_obj_hfuck1.cpp
+2 -2
View File
@@ -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
src/d/actor/d_a_obj_movebox.cpp
+2 -2
View File
@@ -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,
src/d/actor/d_a_obj_mtest.cpp
+1 -1
View File
@@ -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,
src/d/actor/d_a_obj_paper.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_obj_toripost.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_obj_zouK.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_player_main.cpp
+9 -9
View File
@@ -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,
src/d/actor/d_a_race_item.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_rd.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_swattack.cpp
+1 -1
View File
@@ -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,
src/d/actor/d_a_swhit0.cpp
+3 -3
View File
@@ -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
src/d/actor/d_a_switem.cpp
+2 -2
View File
@@ -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
src/d/actor/d_a_tag_ret.cpp
+1 -1
View File
@@ -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,
src/d/d_npc.cpp
+3 -3
View File
@@ -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