mirror of
https://github.com/zeldaret/tww.git
synced 2026-07-30 23:54:54 -04:00
start adding particle/hitmark enums + some d_cc_s
This commit is contained in:
@@ -268,9 +268,9 @@ static BOOL medama_atari_check(am_class* i_this) {
|
||||
cc_at_check(i_this, &atInfo);
|
||||
i_this->mMaxHealth = 10;
|
||||
i_this->mHealth = 10;
|
||||
dComIfGp_particle_set(0x27B, &i_this->mAttentionInfo.mPosition);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->mAttentionInfo.mPosition);
|
||||
} else {
|
||||
dComIfGp_particle_set(0xC, &hitPos);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &hitPos);
|
||||
}
|
||||
fopAcM_seStart(i_this, JA_SE_LK_MS_WEP_HIT, 0x42);
|
||||
}
|
||||
@@ -319,7 +319,7 @@ static BOOL medama_atari_check(am_class* i_this) {
|
||||
}
|
||||
break;
|
||||
default:
|
||||
dComIfGp_particle_set(0xC, &hitPos);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &hitPos);
|
||||
fopAcM_seStart(i_this, JA_SE_LK_MS_WEP_HIT, 0x42);
|
||||
break;
|
||||
}
|
||||
@@ -1330,7 +1330,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
|
||||
/* SrcGObjAt Mtrl */ 0,
|
||||
/* SrcGObjAt SPrm */ 0,
|
||||
/* SrcGObjTg Se */ 0,
|
||||
/* SrcGObjTg HitMark */ 0x0C,
|
||||
/* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT,
|
||||
/* SrcGObjTg Spl */ 0,
|
||||
/* SrcGObjTg Mtrl */ 0,
|
||||
/* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
|
||||
@@ -1362,7 +1362,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
|
||||
/* SrcGObjAt Mtrl */ 0,
|
||||
/* SrcGObjAt SPrm */ 0,
|
||||
/* SrcGObjTg Se */ 0,
|
||||
/* SrcGObjTg HitMark */ 0x0C,
|
||||
/* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT,
|
||||
/* SrcGObjTg Spl */ 0,
|
||||
/* SrcGObjTg Mtrl */ 0,
|
||||
/* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
|
||||
|
||||
@@ -175,9 +175,9 @@ static BOOL medama_atari_check(am2_class* i_this) {
|
||||
atInfo.pParticlePos = NULL;
|
||||
cc_at_check(i_this, &atInfo);
|
||||
i_this->mHealth = origHealth;
|
||||
dComIfGp_particle_set(0x27B, &i_this->mAttentionInfo.mPosition);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->mAttentionInfo.mPosition);
|
||||
} else {
|
||||
dComIfGp_particle_set(0xC, &hitPos);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &hitPos);
|
||||
}
|
||||
fopAcM_seStart(i_this, JA_SE_LK_MS_WEP_HIT, 0x42);
|
||||
}
|
||||
@@ -315,9 +315,9 @@ static BOOL week_atari_check(am2_class* i_this) {
|
||||
if (hitType == 1) {
|
||||
dComIfGp_particle_set(0x10, &hitPos);
|
||||
cXyz particleScale(2.0f, 2.0f, 2.0f);
|
||||
dComIfGp_particle_set(0xF, &hitPos, &player->shape_angle, &particleScale);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &hitPos, &player->shape_angle, &particleScale);
|
||||
} else {
|
||||
dComIfGp_particle_set(0xD, &hitPos, &player->shape_angle);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &hitPos, &player->shape_angle);
|
||||
}
|
||||
|
||||
i_this->mAction = ACTION_ITAI;
|
||||
@@ -1441,7 +1441,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
|
||||
/* SrcGObjAt Mtrl */ 0,
|
||||
/* SrcGObjAt SPrm */ 0,
|
||||
/* SrcGObjTg Se */ 0,
|
||||
/* SrcGObjTg HitMark */ 0x0C,
|
||||
/* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT,
|
||||
/* SrcGObjTg Spl */ 0,
|
||||
/* SrcGObjTg Mtrl */ 0,
|
||||
/* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
|
||||
@@ -1473,7 +1473,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
|
||||
/* SrcGObjAt Mtrl */ 0,
|
||||
/* SrcGObjAt SPrm */ 0,
|
||||
/* SrcGObjTg Se */ 0,
|
||||
/* SrcGObjTg HitMark */ 0x0C,
|
||||
/* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT,
|
||||
/* SrcGObjTg Spl */ 0,
|
||||
/* SrcGObjTg Mtrl */ 0,
|
||||
/* SrcGObjTg SPrm */ G_TG_SPRM_SHIELD | G_TG_SPRM_NO_CON_HIT,
|
||||
|
||||
@@ -34,7 +34,7 @@ const dCcD_SrcCps daArrow_c::m_at_cps_src = {
|
||||
/* SrcObjTg SPrm */ 0,
|
||||
/* SrcObjCo SPrm */ 0,
|
||||
/* SrcGObjAt Se */ 0x07,
|
||||
/* SrcGObjAt HitMark */ 0x0D,
|
||||
/* SrcGObjAt HitMark */ G_AT_MARK_NORMAL_HIT,
|
||||
/* SrcGObjAt Spl */ 0,
|
||||
/* SrcGObjAt Mtrl */ 0,
|
||||
/* SrcGObjAt SPrm */ 0,
|
||||
@@ -836,7 +836,7 @@ BOOL daArrow_c::procMove() {
|
||||
csXyz temp9;
|
||||
cM3d_CalcVecZAngle(triPla->mNormal, &temp9);
|
||||
|
||||
dComIfGp_particle_setP1(0xC, &field_0x6a8, &temp9);
|
||||
dComIfGp_particle_setP1(dPa_name::ID_COMMON_PURPLE_HIT, &field_0x6a8, &temp9);
|
||||
fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_REBOUND, mtrlSndId);
|
||||
} else {
|
||||
fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_HIT, mtrlSndId);
|
||||
|
||||
@@ -196,7 +196,7 @@ bool daArrow_Iceeff_c::_execute() {
|
||||
daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(mParentPcId));
|
||||
if(field_0xA38 == 0) {
|
||||
if(arrow == 0) {
|
||||
dComIfGp_particle_setP1(0x55, ¤t.pos, ¤t.angle, 0);
|
||||
dComIfGp_particle_setP1(0x55, ¤t.pos, ¤t.angle);
|
||||
fopAcM_delete(this);
|
||||
|
||||
return true;
|
||||
@@ -219,7 +219,7 @@ bool daArrow_Iceeff_c::_execute() {
|
||||
field_0xA30++;
|
||||
}
|
||||
else {
|
||||
dComIfGp_particle_setP1(0x55, ¤t.pos, ¤t.angle, 0);
|
||||
dComIfGp_particle_setP1(0x55, ¤t.pos, ¤t.angle);
|
||||
fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0);
|
||||
fopAcM_delete(arrow);
|
||||
fopAcM_delete(this);
|
||||
@@ -234,7 +234,7 @@ bool daArrow_Iceeff_c::_execute() {
|
||||
csXyz angle;
|
||||
angle.set(-0x4000, 0, 0);
|
||||
|
||||
JPABaseEmitter* ptcl = dComIfGp_particle_setP1(0x29E, ¤t.pos, &angle, 0);
|
||||
JPABaseEmitter* ptcl = dComIfGp_particle_setP1(0x29E, ¤t.pos, &angle);
|
||||
if(ptcl) {
|
||||
JGeometry::TVec3<f32> scale(0.5f, 0.5f, 0.5f);
|
||||
ptcl->setGlobalScale(scale);
|
||||
@@ -258,14 +258,14 @@ bool daArrow_Iceeff_c::_execute() {
|
||||
}
|
||||
|
||||
if(field_0xA30 == 0x23) {
|
||||
JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(0x3D, ¤t.pos, 0, &ripple_scale);
|
||||
JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(0x3D, ¤t.pos, NULL, &ripple_scale);
|
||||
if(ptcl) {
|
||||
JGeometry::TVec3<f32> scale(0.67f, 0.67f, 1.0f);
|
||||
ptcl->setGlobalParticleScale(scale);
|
||||
}
|
||||
}
|
||||
else if(field_0xA30 == 0x28) {
|
||||
JPABaseEmitter* ptcl = dComIfGp_particle_setP1(0x55, ¤t.pos, 0, 0);
|
||||
JPABaseEmitter* ptcl = dComIfGp_particle_setP1(0x55, ¤t.pos);
|
||||
if(ptcl) {
|
||||
ptcl->setAwayFromCenterSpeed(25.0f);
|
||||
ptcl->setAwayFromAxisSpeed(5.0f);
|
||||
@@ -276,7 +276,7 @@ bool daArrow_Iceeff_c::_execute() {
|
||||
ptcl->setGlobalParticleScale(scale2);
|
||||
}
|
||||
|
||||
dComIfGp_particle_setSingleRipple(0x3F, ¤t.pos, 0, &ripple_scale);
|
||||
dComIfGp_particle_setSingleRipple(0x3F, ¤t.pos, NULL, &ripple_scale);
|
||||
fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0);
|
||||
|
||||
field_0xA3C = 0;
|
||||
|
||||
@@ -145,23 +145,23 @@ void daArrow_Lighteff_c::CreateInit() {
|
||||
|
||||
if(field_0x2E8 == 1) {
|
||||
if(field_0x2F4.getEmitter() == 0) {
|
||||
dComIfGp_particle_setP1(0x299, &field_0x29C, ¤t.angle, 0, 0xFF, &field_0x2F4);
|
||||
dComIfGp_particle_setP1(0x299, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4);
|
||||
}
|
||||
}
|
||||
else if(field_0x2E8 == 2) {
|
||||
if(field_0x2F4.getEmitter() == 0) {
|
||||
dComIfGp_particle_setP1(0x29C, &field_0x29C, ¤t.angle, 0, 0xFF, &field_0x2F4);
|
||||
dComIfGp_particle_setP1(0x29C, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4);
|
||||
}
|
||||
if(field_0x308.getEmitter() == 0) {
|
||||
dComIfGp_particle_setP1(0x29D, &field_0x29C, ¤t.angle, 0, 0xFF, &field_0x308);
|
||||
dComIfGp_particle_setP1(0x29D, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x308);
|
||||
}
|
||||
}
|
||||
else if(field_0x2E8 == 3) {
|
||||
if(field_0x2F4.getEmitter() == 0) {
|
||||
dComIfGp_particle_setP1(0x29F, &field_0x29C, ¤t.angle, 0, 0xFF, &field_0x2F4);
|
||||
dComIfGp_particle_setP1(0x29F, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4);
|
||||
}
|
||||
if(field_0x308.getEmitter() == 0) {
|
||||
dComIfGp_particle_setP1(0x2A0, &field_0x29C, ¤t.angle, 0, 0xFF, &field_0x308);
|
||||
dComIfGp_particle_setP1(0x2A0, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x308);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -701,10 +701,10 @@ namespace daBomb2 {
|
||||
}
|
||||
|
||||
void Act_c::eff_explode_normal(const csXyz* rotation) {
|
||||
dComIfGp_particle_setP1(0xB, ¤t.pos, rotation, &mScale, 0xFF, 0, -1, 0, 0, 0);
|
||||
dComIfGp_particle_setBombSmoke(0x2009, ¤t.pos, 0, &mScale, 0xFF);
|
||||
dComIfGp_particle_setBombSmoke(0x200A, ¤t.pos, 0, &mScale, 0xFF);
|
||||
dComIfGp_particle_setToonP1(0x2008, ¤t.pos, 0, &mScale, 0xFF, 0, -1, 0, 0, 0);
|
||||
dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, ¤t.pos, rotation, &mScale);
|
||||
dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, ¤t.pos, NULL, &mScale);
|
||||
dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, ¤t.pos, NULL, &mScale);
|
||||
dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, ¤t.pos, NULL, &mScale);
|
||||
}
|
||||
|
||||
void Act_c::eff_explode_water() {
|
||||
@@ -733,8 +733,8 @@ namespace daBomb2 {
|
||||
field_0x6CC = field_0x6C0;
|
||||
field_0x6D8 = field_0x6C0;
|
||||
|
||||
dComIfGp_particle_setP1(0x11, &field_0x6C0, 0, &mScale, 0xFF, &mSparks, -1, 0, 0, 0);
|
||||
dComIfGp_particle_setToonP1(0x2012, &field_0x6C0, 0, &mScale, 0xDC, &mSmoke, -1, 0, 0, 0);
|
||||
dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &field_0x6C0, NULL, &mScale, 0xFF, &mSparks);
|
||||
dComIfGp_particle_setToonP1(0x2012, &field_0x6C0, NULL, &mScale, 0xDC, &mSmoke);
|
||||
mSmoke.setOldPosP(&field_0x6CC, &field_0x6D8);
|
||||
}
|
||||
}
|
||||
|
||||
+11
-11
@@ -637,7 +637,7 @@ void daBomb_c::makeFireEffect(cXyz& pos, csXyz& rotation) {
|
||||
|
||||
rotation.x = rotation.x + 0x4000;
|
||||
rotation.z = rotation.z;
|
||||
dComIfGp_particle_setBombSmoke(0x200A, &pos, &rotation, &scale);
|
||||
dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &pos, &rotation, &scale);
|
||||
|
||||
dComIfGp_getVibration().StartShock(7, -0x21, cXyz(0.0f, 1.0f, 0.0f));
|
||||
}
|
||||
@@ -673,8 +673,8 @@ void daBomb_c::setFuseEffect() {
|
||||
mFusePos2 = mFusePos;
|
||||
mFusePos3 = mFusePos;
|
||||
|
||||
dComIfGp_particle_setP1(0x11, &mFusePos, 0, &mScale, 0xFF, &mSparks, -1, 0, 0, 0);
|
||||
dComIfGp_particle_setToonP1(0x2012, &mFusePos, 0, &mScale, 0xDC, &mSmoke, -1, 0, 0, 0);
|
||||
dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &mFusePos, NULL, &mScale, 0xFF, &mSparks);
|
||||
dComIfGp_particle_setToonP1(0x2012, &mFusePos, NULL, &mScale, 0xDC, &mSmoke);
|
||||
mSmoke.field_0x0C = &mFusePos2;
|
||||
mSmoke.field_0x10 = &mFusePos3;
|
||||
mSmoke.field_0x04 = 0x14;
|
||||
@@ -682,27 +682,27 @@ void daBomb_c::setFuseEffect() {
|
||||
}
|
||||
|
||||
void daBomb_c::eff_explode_normal(const csXyz* rotation) {
|
||||
dComIfGp_particle_setP1(0xB, ¤t.pos, rotation, &mScale, 0xFF, 0, -1, 0, 0, 0);
|
||||
dComIfGp_particle_setBombSmoke(0x2009, ¤t.pos, 0, &mScale);
|
||||
dComIfGp_particle_setBombSmoke(0x200A, ¤t.pos, 0, &mScale);
|
||||
dComIfGp_particle_setToonP1(0x2008, ¤t.pos, 0, &mScale, 0xFF, 0, -1, 0, 0, 0);
|
||||
dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, ¤t.pos, rotation, &mScale);
|
||||
dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, ¤t.pos, NULL, &mScale);
|
||||
dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, ¤t.pos, NULL, &mScale);
|
||||
dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, ¤t.pos, NULL, &mScale);
|
||||
}
|
||||
|
||||
void daBomb_c::eff_explode_cheap(const csXyz* rotation) {
|
||||
JPABaseEmitter* emitter = dComIfGp_particle_setP1(0xB, ¤t.pos, rotation, &mScale, 0xFF, 0, -1, 0, 0, 0);
|
||||
JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, ¤t.pos, rotation, &mScale);
|
||||
if(emitter) {
|
||||
emitter->mLifeTime = 0xC;
|
||||
JGeometry::TVec3<f32> vec(0.5f, 0.67f, 1.0f);
|
||||
emitter->setGlobalParticleScale(vec);
|
||||
}
|
||||
|
||||
dComIfGp_particle_setBombSmoke(0x232A, ¤t.pos, 0, &mScale);
|
||||
emitter = dComIfGp_particle_setBombSmoke(0x200A, ¤t.pos, 0, &mScale);
|
||||
dComIfGp_particle_setBombSmoke(0x232A, ¤t.pos, NULL, &mScale);
|
||||
emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, ¤t.pos, NULL, &mScale);
|
||||
if(emitter) {
|
||||
emitter->mLifeTime = 0x46;
|
||||
}
|
||||
|
||||
emitter = dComIfGp_particle_setToonP1(0x2008, ¤t.pos, 0, &mScale, 0xFF, 0, -1, 0, 0, 0);
|
||||
emitter = dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, ¤t.pos, NULL, &mScale);
|
||||
if(emitter) {
|
||||
emitter->mLifeTime = 0x46;
|
||||
emitter->mInitialVelAxis = 25.0f;
|
||||
|
||||
@@ -75,15 +75,15 @@ void set_disappear(disappear_class* i_this, float scale) {
|
||||
case 0xB:
|
||||
case 0xC:
|
||||
case 0xD:
|
||||
dComIfGp_particle_set(0x14, &i_this->current.pos, 0, &particleScale);
|
||||
dComIfGp_particle_set(0x14, &i_this->current.pos, NULL, &particleScale);
|
||||
case 3:
|
||||
dComIfGp_particle_set(0x13, &i_this->current.pos, 0, &particleScale);
|
||||
dComIfGp_particle_setStripes(0x15, &i_this->current.pos, 0, &particleScale, 0xFF, 0x96);
|
||||
dComIfGp_particle_set(0x16, &i_this->current.pos, 0, &particleScale);
|
||||
dComIfGp_particle_set(0x13, &i_this->current.pos, NULL, &particleScale);
|
||||
dComIfGp_particle_setStripes(0x15, &i_this->current.pos, NULL, &particleScale, 0xFF, 0x96);
|
||||
dComIfGp_particle_set(0x16, &i_this->current.pos, NULL, &particleScale);
|
||||
break;
|
||||
case 1:
|
||||
dComIfGp_particle_set(0x13, &i_this->current.pos, 0, &particleScale);
|
||||
dComIfGp_particle_set(0x16, &i_this->current.pos, 0, &particleScale);
|
||||
dComIfGp_particle_set(0x13, &i_this->current.pos, NULL, &particleScale);
|
||||
dComIfGp_particle_set(0x16, &i_this->current.pos, NULL, &particleScale);
|
||||
break;
|
||||
case 4:
|
||||
dComIfGp_particle_set(0x043C, &i_this->current.pos);
|
||||
|
||||
@@ -343,7 +343,7 @@ int daObjTpost_c::getMsgXY() {
|
||||
col.b = g_regHIO.mChild[12].mShortRegs[2] + 0x80;
|
||||
mDoMtx_stack_c::copy(mMorf->getModel()->mpNodeMtx[2]);
|
||||
mDoMtx_stack_c::multVec(&pos, &pos);
|
||||
dComIfGp_particle_set(0x57, &pos, &shape_angle, &scale, 0xFF, 0, -1, &col);
|
||||
dComIfGp_particle_set(0x57, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col);
|
||||
|
||||
break;
|
||||
case 0x98:
|
||||
|
||||
@@ -1870,7 +1870,7 @@ static dCcD_SrcCyl l_cyl_src = {
|
||||
/* SrcGObjAt Mtrl */ 0,
|
||||
/* SrcGObjAt SPrm */ 0,
|
||||
/* SrcGObjTg Se */ 0x25,
|
||||
/* SrcGObjTg HitMark */ 0x0C,
|
||||
/* SrcGObjTg HitMark */ G_TG_MARK_PURPLE_HIT,
|
||||
/* SrcGObjTg Spl */ 0,
|
||||
/* SrcGObjTg Mtrl */ 0,
|
||||
/* SrcGObjTg SPrm */ 0,
|
||||
@@ -1925,7 +1925,7 @@ static dCcD_SrcCyl l_at_cyl_src = {
|
||||
/* SrcObjTg SPrm */ 0,
|
||||
/* SrcObjCo SPrm */ 0,
|
||||
/* SrcGObjAt Se */ 0,
|
||||
/* SrcGObjAt HitMark */ 0x0F,
|
||||
/* SrcGObjAt HitMark */ G_AT_MARK_BIG_HIT,
|
||||
/* SrcGObjAt Spl */ 0x01,
|
||||
/* SrcGObjAt Mtrl */ 0,
|
||||
/* SrcGObjAt SPrm */ 0,
|
||||
@@ -1955,7 +1955,7 @@ static dCcD_SrcCps l_at_cps_src = {
|
||||
/* SrcObjTg SPrm */ 0,
|
||||
/* SrcObjCo SPrm */ 0,
|
||||
/* SrcGObjAt Se */ 0x01,
|
||||
/* SrcGObjAt HitMark */ 0x0D,
|
||||
/* SrcGObjAt HitMark */ G_AT_MARK_NORMAL_HIT,
|
||||
/* SrcGObjAt Spl */ 0,
|
||||
/* SrcGObjAt Mtrl */ 0,
|
||||
/* SrcGObjAt SPrm */ 0,
|
||||
|
||||
@@ -645,7 +645,7 @@ bool daRd_c::checkTgHit() {
|
||||
}
|
||||
break;
|
||||
case AT_TYPE_GRAPPLING_HOOK:
|
||||
dComIfGp_particle_set(0x27B, &mAttentionInfo.mPosition);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &mAttentionInfo.mPosition);
|
||||
fopAcM_seStart(this, JA_SE_LK_W_WEP_HIT, 0x44);
|
||||
mHitType = 0xE;
|
||||
r29 = false;
|
||||
@@ -662,14 +662,14 @@ bool daRd_c::checkTgHit() {
|
||||
if (mHitType == 1 || mHitType == 7 || mHitType == 8 || mHealth <= 0) {
|
||||
dComIfGp_particle_set(0x10, mCyl.GetTgHitPosP());
|
||||
cXyz scale(2.0f, 2.0f, 2.0f);
|
||||
dComIfGp_particle_set(0xF, temp, &player->shape_angle, &scale);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, temp, &player->shape_angle, &scale);
|
||||
if (mHealth <= 0) {
|
||||
modeProcInit(MODE_DEATH);
|
||||
} else {
|
||||
modeProcInit(MODE_DAMAGE);
|
||||
}
|
||||
} else {
|
||||
dComIfGp_particle_set(0xD, temp, &player->shape_angle);
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, temp, &player->shape_angle);
|
||||
modeProcInit(MODE_DAMAGE);
|
||||
}
|
||||
} else if (mHitType == 0xE) {
|
||||
|
||||
+2
-2
@@ -32,7 +32,7 @@ dCcD_GStts::dCcD_GStts() {
|
||||
mAtSpl = 0;
|
||||
mTgSpl = 0;
|
||||
mRoomId = 0;
|
||||
field_0x08 = -1;
|
||||
mActorPerfTblId = -1;
|
||||
mAtApid = -1;
|
||||
mAtOldApid = -1;
|
||||
mTgApid = -1;
|
||||
@@ -45,7 +45,7 @@ void dCcD_GStts::Ct() {
|
||||
mAtSpl = 0;
|
||||
mTgSpl = 0;
|
||||
mRoomId = 0;
|
||||
field_0x08 = -1;
|
||||
mActorPerfTblId = -1;
|
||||
mAtApid = -1;
|
||||
mAtOldApid = -1;
|
||||
mTgApid = -1;
|
||||
|
||||
+35
-2
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "d/d_cc_s.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
|
||||
/* 800AD5B0-800AD5E4 .text Ct__4dCcSFv */
|
||||
void dCcS::Ct() {
|
||||
@@ -58,8 +59,40 @@ void dCcS::CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*) {
|
||||
}
|
||||
|
||||
/* 800ADFF8-800AE308 .text ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyz */
|
||||
void dCcS::ProcAtTgHitmark(bool, bool, cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, dCcD_GStts*, dCcD_GStts*, cXyz*) {
|
||||
/* Nonmatching */
|
||||
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)
|
||||
{
|
||||
if (atInf->ChkAtNoHitMark()) { return; }
|
||||
if (tgInf->ChkTgNoHitMark()) { return; }
|
||||
if (tgInf->GetTgHitMark() == 0xFF) { return; }
|
||||
if (!r4->ChkNoneActorPerfTblId()) { return; }
|
||||
|
||||
if (!ChkShield(r6, r7, atInf, tgInf)) {
|
||||
if (atInf->GetAtHitMark() == 0) { return; }
|
||||
if (atInf->GetAtHitMark() == 1 && tgInf->GetTgHitMark() == 1) {
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, pos);
|
||||
} else {
|
||||
csXyz angle;
|
||||
CalcParticleAngle(atInf, r10, r30, &angle);
|
||||
if (atInf->GetAtHitMark() == 0xF) {
|
||||
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) {
|
||||
dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, pos, &angle);
|
||||
} else {
|
||||
dComIfGp_particle_set(atInf->GetAtHitMark(), pos, &angle);
|
||||
}
|
||||
dKy_SordFlush_set(*pos, 1);
|
||||
}
|
||||
} else {
|
||||
if (tgInf->GetTgHitMark() == 0) { return; }
|
||||
dKy_SordFlush_set(*pos, 0);
|
||||
csXyz angle;
|
||||
CalcParticleAngle(atInf, r10, r30, &angle);
|
||||
dComIfGp_particle_set(tgInf->GetTgHitMark(), pos, &angle);
|
||||
}
|
||||
}
|
||||
|
||||
/* 800AE308-800AE5AC .text SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz */
|
||||
|
||||
Reference in New Issue
Block a user