mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 06:34:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

start adding particle/hitmark enums + some d_cc_s

Browse Source
This commit is contained in:
LagoLunatic
2023-12-30 00:50:19 -05:00
parent 5b3810dba9
commit 82b429b72f
18 changed files with 135 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_cc_d.h
+24 -17
View File
@@ -8,6 +8,7 @@
#include "SSystem/SComponent/c_cc_d.h"
#include "f_pc/f_pc_manager.h"
#include "d/d_particle_name.h"
enum dCcG_At_SPrm {
G_AT_SPRM_NO_CON_HIT = 0x01,
@@ -30,9 +31,13 @@ enum dCcG_Co_SPrm {
enum dCcD_hitSe {};
enum CcG_At_HitMark {
/* 0xD */ G_AT_MARK_NORMAL_HIT = dPa_name::ID_COMMON_NORMAL_HIT,
/* 0xF */ G_AT_MARK_BIG_HIT = dPa_name::ID_COMMON_BIG_HIT,
};
enum CcG_Tg_HitMark {
CcG_Tg_UNK_MARK_6 = 6,
CcG_Tg_UNK_MARK_8 = 8,
/* 0xC */ G_TG_MARK_PURPLE_HIT = dPa_name::ID_COMMON_PURPLE_HIT,
};
enum dCcG_At_Spl {};
@@ -106,7 +111,7 @@ public:
unsigned int GetAtOldApid() { return mAtOldApid; }
unsigned int GetTgOldApid() { return mTgOldApid; }
bool ChkNoActor() { return field_0x1C & 1; }
bool ChkNoneActorPerfTblId() { return field_0x08 == 0xFFFF; }
bool ChkNoneActorPerfTblId() { return mActorPerfTblId == 0xFFFF; }
dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mAtSpl; }
void SetAtSpl(dCcG_At_Spl spl) { mAtSpl = spl; }
dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mTgSpl; }
@@ -117,7 +122,7 @@ public:
/* 0x04 */ u8 mAtSpl;
/* 0x05 */ u8 mTgSpl;
/* 0x06 */ u8 mRoomId;
/* 0x08 */ u16 field_0x08;
/* 0x08 */ u16 mActorPerfTblId;
/* 0x0C */ int mAtApid;
/* 0x10 */ int mAtOldApid;
/* 0x14 */ int mTgApid;
@@ -217,7 +222,7 @@ public:
void SetHitMark(u8 mark) { mHitMark = mark; }
void SetSe(u8 se) { mSe = se; }
void SetMtrl(u8 mtrl) { mMtrl = mtrl; }
void SetAtSpl(dCcG_At_Spl spl) { mSpl = spl; }
void SetSpl(dCcG_At_Spl spl) { mSpl = spl; }
u8 GetSe() { return mSe; }
u8 GetSpl() { return mSpl; }
u8 GetMtrl() { return mMtrl; }
@@ -251,6 +256,7 @@ public:
void SetHitMark(CcG_Tg_HitMark mark) { mHitMark = mark; }
s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; }
u8 GetSpl() { return mSpl; }
void SetSpl(dCcG_Tg_Spl spl) { mSpl = spl; }
u8 GetHitMark() { return mHitMark; }
void SetRVec(cXyz& vec) { mRVec = vec; }
cXyz* GetVecP() { return &mVec; }
@@ -313,14 +319,21 @@ public:
void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); }
void SetTgVec(cXyz& vec) { mGObjTg.SetVec(vec); }
bool ChkAtNoMass() { return mGObjAt.ChkSPrm(G_AT_SPRM_NO_MASS); }
bool ChkAtNoHitMark() { return mGObjAt.ChkSPrm(G_AT_SPRM_NO_HIT_MARK); }
void OnAtNoHitMark() { mGObjAt.OnSPrm(G_AT_SPRM_NO_HIT_MARK); }
void OffAtNoHitMark() { mGObjAt.OffSPrm(G_AT_SPRM_NO_HIT_MARK); }
bool ChkTgNoHitMark() { return mGObjTg.ChkSPrm(G_TG_SPRM_NO_HIT_MARK); }
void OnTgNoHitMark() { mGObjTg.OnSPrm(G_TG_SPRM_NO_HIT_MARK); }
void OffTgNoHitMark() { mGObjTg.OffSPrm(G_TG_SPRM_NO_HIT_MARK); }
bool ChkAtNoConHit() { return mGObjAt.ChkSPrm(G_AT_SPRM_NO_CON_HIT); }
void OnAtNoConHit() { mGObjAt.OnSPrm(G_AT_SPRM_NO_CON_HIT); }
void OffAtNoConHit() { mGObjAt.OffSPrm(G_AT_SPRM_NO_CON_HIT); }
bool ChkTgNoConHit() { return mGObjTg.ChkSPrm(G_TG_SPRM_NO_CON_HIT); }
void OnTgNoConHit() { mGObjTg.OnSPrm(G_TG_SPRM_NO_CON_HIT); }
int GetAtHitMark() { return mGObjAt.GetHitMark(); }
int GetTgHitMark() { return mGObjTg.GetHitMark(); }
void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); }
void SetTgHitMark(CcG_Tg_HitMark mark) { mGObjTg.SetHitMark(mark); }
void SetAtSe(u8 se) { mGObjAt.SetSe(se); }
void SetTgSe(u8 se) { mGObjTg.SetSe(se); }
void SetAtMtrl(u8 mtrl) { mGObjAt.SetMtrl(mtrl); }
@@ -329,27 +342,26 @@ public:
cXyz* GetAtVecP() { return mGObjAt.GetVecP(); }
cXyz* GetTgVecP() { return mGObjTg.GetVecP(); }
cXyz* GetTgRVecP() { return mGObjTg.GetRVecP(); }
void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetAtSpl(spl); }
dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mGObjAt.GetSpl(); }
void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetSpl(spl); }
dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); }
void SetTgSpl(dCcG_Tg_Spl spl) { mGObjTg.SetSpl(spl); }
void SetAtHitCallback(dCcD_HitCallback callback) { mGObjAt.SetHitCallback(callback); }
void SetTgHitCallback(dCcD_HitCallback callback) { mGObjTg.SetHitCallback(callback); }
void SetCoHitCallback(dCcD_HitCallback callback) { mGObjCo.SetHitCallback(callback); }
u8 GetAtSe() { return mGObjAt.GetSe(); }
dCcG_At_Spl GetAtSpl() { return (dCcG_At_Spl)mGObjAt.GetSpl(); }
u8 GetAtMtrl() { return mGObjAt.GetMtrl(); }
u8 GetTgMtrl() { return mGObjTg.GetMtrl(); }
fopAc_ac_c* GetTgHitAc() { return mGObjTg.GetAc(); }
void SetTgShieldFrontRangeYAngle(s16* angle) { mGObjTg.SetShieldFrontRangeYAngle(angle); }
void SetTgHitMark(CcG_Tg_HitMark mark) { mGObjTg.SetHitMark(mark); }
bool ChkTgShield() { return mGObjTg.ChkSPrm(G_TG_SPRM_SHIELD); }
void OnTgShield() { mGObjTg.OnSPrm(G_TG_SPRM_SHIELD); }
void OffTgShield() { mGObjTg.OffSPrm(G_TG_SPRM_SHIELD); }
bool ChkTgShieldFrontRange() { return mGObjTg.ChkSPrm(G_TG_SPRM_SHIELD_FRONT_RANGE); }
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(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(); }
@@ -367,11 +379,6 @@ public:
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(); }
bool ChkAtEffCounter() { return mGObjAt.ChkEffCounter(); }
bool ChkTgEffCounter() { return mGObjTg.ChkEffCounter(); }
void ClrAtEffCounter() { mGObjAt.ClrEffCounter(); }
include/d/d_kankyo.h
+1
View File
@@ -393,6 +393,7 @@ void dKy_instant_timechg(f32);
void dKy_instant_rainchg();
SND_INFLUENCE * dKy_Sound_get();
void dKy_Sound_set(cXyz i_pos, int param_1, unsigned int i_actorID, int param_3);
void dKy_SordFlush_set(cXyz hitPos, int lightType);
void dKy_itudemo_se();
void dKy_actor_addcol_set(s16, s16, s16, f32);
void dKy_actor_addcol_amb_set(s16, s16, s16, f32);
include/d/d_particle.h
+1
View File
@@ -6,6 +6,7 @@
#include "JSystem/JGeometry.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "d/d_particle_name.h"
#include "f_pc/f_pc_node.h"
#include "m_Do/m_Do_ext.h"
include/d/d_particle_name.h
+14
View File
@@ -4,6 +4,20 @@
#include "dolphin/types.h"
namespace dPa_name {
enum {
ID_COMMON_SMOKE_DEBRIS = 0x2008,
ID_COMMON_SMOKE_CLOUD = 0x2009,
ID_COMMON_SMOKE_CIRCLE = 0x200A,
ID_COMMON_LIGHT_FLASH = 0xB,
ID_COMMON_PURPLE_HIT = 0xC,
ID_COMMON_NORMAL_HIT = 0xD,
ID_COMMON_BIG_HIT = 0xF,
ID_COMMON_FUSE_SPARKS = 0x11,
ID_COMMON_LIGHT_EXPLOSION = 0x272,
ID_COMMON_STARS_SPIN = 0x27A,
ID_COMMON_STARS_BLOW = 0x27B,
};
enum {
ID_SCENE_END = 0x8466,
};