mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-07 10:15:29 -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(); }