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

Use particle name enum in more places

Browse Source
This commit is contained in:
LagoLunatic
2026-04-01 00:19:40 -04:00
parent 899cd54394
commit bfc5d57658
10 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/c/c_damagereaction.cpp
+1 -1
View File
@@ -1299,7 +1299,7 @@ int dr_damage_set(damagereaction* dr) {
dr->mParticleAngle.y = wall_angle_get(dr->mpEnemy, cM_atan2s(-dr->m42C.x, -dr->m42C.z));
dr->mParticleAngle.x = 0x4000;
dr->mParticleCallBack.end();
JPABaseEmitter* pEmitter = dComIfGp_particle_setToon(0x2022, &dr->mParticlePos, &dr->mParticleAngle, NULL, 0xB9, &dr->mParticleCallBack, fopAcM_GetRoomNo(dr->mpEnemy));
JPABaseEmitter* pEmitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &dr->mParticlePos, &dr->mParticleAngle, NULL, 0xB9, &dr->mParticleCallBack, fopAcM_GetRoomNo(dr->mpEnemy));
if(pEmitter) {
f32 scale;
if(dr->mEnemyType == damagereaction::TYPE_BOKOBLIN) {
src/d/actor/d_a_ep.cpp
+2 -2
View File
@@ -264,7 +264,7 @@ void ep_move(ep_class* i_this) {
cLib_addCalc2(&i_this->mLightPower, i_this->m4E0, 0.5f, 0.2f);
if (i_this->mType != 2) {
if (i_this->m7D4 < (s16)(REG0_S(7) + 7)) {
dComIfGp_particle_setSimple(1, &pos);
dComIfGp_particle_setSimple(dPa_name::ID_AK_JN_O_FIRE00, &pos);
if (i_this->m7D4 == 0 && i_this->mSph1.ChkTgHit()) {
cCcD_Obj* hitObj = i_this->mSph1.GetTgHitObj();
@@ -282,7 +282,7 @@ void ep_move(ep_class* i_this) {
}
pos.y += 20.0f;
dComIfGp_particle_setSimple(0x4004, &pos);
dComIfGp_particle_setSimple(dPa_name::ID_AK_JP_O_KAGEROU00, &pos);
}
if (i_this->mTimers[3] == 1 && (i_this->m507 == 0xFF || !dComIfGs_isSwitch(i_this->m507, fopAcM_GetRoomNo(&i_this->actor)))) {
src/d/actor/d_a_jbo.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ void jbo_move(jbo_class* i_this) {
fopAcM_seStart(actor, JA_SE_OBJ_JFLOWER_OUT, 0);
i_this->mAnimationSpeed = 0;
i_this->mAnimRotation = 0;
JPABaseEmitter* emitter = dComIfGp_particle_setToon(0xa110, &i_this->mParticlePos);
JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_IT_ST_JMPFLOWER_SMOKE00, &i_this->mParticlePos);
if (emitter != NULL) {
emitter->setGlobalAlpha(100);
}
src/d/actor/d_a_kn.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ void smoke_set(kn_class* i_this) {
s.set(fVar1, fVar1, fVar1);
i_this->m314.remove();
i_this->m334 = dComIfGp_particle_setToon(0x2027, &i_this->m300, &i_this->actor.shape_angle, NULL, 0xb9, &i_this->m314, fopAcM_GetRoomNo(&i_this->actor));
i_this->m334 = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &i_this->m300, &i_this->actor.shape_angle, NULL, 0xb9, &i_this->m314, fopAcM_GetRoomNo(&i_this->actor));
if (i_this->m334 != NULL) {
i_this->m334->setMaxFrame(0x19);
i_this->m334->setAwayFromCenterSpeed(0.0f);
src/d/actor/d_a_obj_canon.cpp
+5 -5
View File
@@ -143,20 +143,20 @@ BOOL daObj_Canon_c::_createHeap() {
}
/* 000004CC-000005AC .text setEffect__13daObj_Canon_cFUs */
void daObj_Canon_c::setEffect(u16 param_1) {
void daObj_Canon_c::setEffect(u16 particleID) {
#if VERSION == VERSION_DEMO
csXyz sp18 = shape_angle;
#endif
GXColor* prmColor = NULL, *envColor = NULL;
if(param_1 == dPa_name::ID_IT_SN_MJTAIHOU_HAHEN00) {
if(particleID == dPa_name::ID_IT_SN_MJTAIHOU_HAHEN00) {
prmColor = &tevStr.mColorK0;
envColor = &tevStr.mColorK0;
}
if(param_1 == dPa_name::ID_IT_JN_MJTAIHOU_SMOKE01) {
if(particleID == dPa_name::ID_IT_JN_MJTAIHOU_SMOKE01) {
dComIfGp_particle_set(
param_1,
particleID,
#if VERSION == VERSION_DEMO
&current.pos, &sp18, &scale,
#else
@@ -169,7 +169,7 @@ void daObj_Canon_c::setEffect(u16 param_1) {
}
else {
dComIfGp_particle_set(
param_1,
particleID,
#if VERSION == VERSION_DEMO
&current.pos, &sp18, &scale,
#else
src/d/actor/d_a_obj_pirateship.cpp
+2 -2
View File
@@ -290,7 +290,7 @@ BOOL daObjPirateship::Act_c::CreateHeap() {
void daObjPirateship::Act_c::CreateWave() {
m6C8 = current.pos;
if (m4AC.getEmitter() == NULL) {
dComIfGp_particle_setShipTail(0x8315, &m6C8, &current.angle, NULL, 0, &m4AC);
dComIfGp_particle_setShipTail(dPa_name::ID_AK_SN_PIRATESHIPTAIL00, &m6C8, &current.angle, NULL, 0, &m4AC);
JPABaseEmitter* emitter = m4AC.getEmitter();
if (emitter != NULL) {
const JGeometry::TVec3<f32> scale = (Vec){20.0f, 20.0f, 20.0f};
@@ -305,7 +305,7 @@ void daObjPirateship::Act_c::CreateWave() {
{
GXColor sea_color;
dKy_get_seacolor(&m500, &sea_color);
m4FC = dComIfGp_particle_set(0x833d, &current.pos, &current.angle, NULL, 0xff, NULL, -1, &m500);
m4FC = dComIfGp_particle_set(dPa_name::ID_AK_SN_PIRATESHIPSPLASH00, &current.pos, &current.angle, NULL, 0xff, NULL, -1, &m500);
}
}
src/d/actor/d_a_obj_volcano.cpp
+6 -3
View File
@@ -285,21 +285,24 @@ void daObjVolcano::Act_c::daObjVolcano_freeze_demo_wait() {
field_0x4E8 = 0;
StopFire();
dComIfGp_particle_set(
0x8191, &this->field_0x4B8,
dPa_name::ID_AK_SN_MINIKAZANICE00,
&this->field_0x4B8,
&this->current.angle,
&scale, 0xff,
NULL, -1,
NULL, NULL,
NULL);
dComIfGp_particle_set(
0x8192, &this->field_0x4B8,
dPa_name::ID_AK_SN_MINIKAZANSMOKE00,
&this->field_0x4B8,
&this->current.angle,
&scale, 0xff,
NULL, -1,
NULL, NULL,
NULL);
dComIfGp_particle_set(
0x8193, &this->field_0x4B8,
dPa_name::ID_AK_SN_MINIKAZANKIRA00,
&this->field_0x4B8,
&this->current.angle,
&scale, 0xff,
NULL, -1,
src/d/actor/d_a_shand.cpp
+2 -2
View File
@@ -350,8 +350,8 @@ void hand_move(shand_class* i_this) {
i_this->field_300 = cM_rndF(20.0f) + 30.0f;
*i_this->field_314 = 1;
cXyz particle_scale(0.5f, 0.5f, 0.5f);
dComIfGp_particle_set(19, &hit_atInfo.mpActor->eyePos, NULL, &particle_scale);
dComIfGp_particle_set(22, &hit_atInfo.mpActor->eyePos, NULL, &particle_scale);
dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUBAKUEN, &hit_atInfo.mpActor->eyePos, NULL, &particle_scale);
dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUFLASH, &hit_atInfo.mpActor->eyePos, NULL, &particle_scale);
}
}
}
src/d/actor/d_a_stone2.cpp
+4 -4
View File
@@ -329,16 +329,16 @@ bool Act_c::damage_bg_proc_directly() {
}
/* 00001214-00001368 .text eff_m_break__Q28daStone25Act_cFUsUs */
void Act_c::eff_m_break(unsigned short arg1, unsigned short arg2) {
void Act_c::eff_m_break(u16 particleID, u16 texAnmFrame) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI);
J3DAnmTexPattern* texAnm = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI);
cXyz sp18;
sp18.setall(attr().m54);
JPABaseEmitter* emitter = dComIfGp_particle_set(arg1, &current.pos, &shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, &sp18);
JPABaseEmitter* emitter = dComIfGp_particle_set(particleID, &current.pos, &shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, &sp18);
if (emitter != NULL) {
emitter->setGlobalRTMatrix(mpModel->getBaseTRMtx());
dPa_J3DmodelEmitter_c* modelEmitter = new dPa_J3DmodelEmitter_c(emitter, modelData, tevStr, texAnm, arg2, 0);
dPa_J3DmodelEmitter_c* modelEmitter = new dPa_J3DmodelEmitter_c(emitter, modelData, tevStr, texAnm, texAnmFrame, 0);
if (modelEmitter != NULL) {
dComIfGp_particle_addModelEmitter(modelEmitter);
}
@@ -346,7 +346,7 @@ void Act_c::eff_m_break(unsigned short arg1, unsigned short arg2) {
}
/* 00001368-0000143C .text eff_b_break__Q28daStone25Act_cFUs */
void Act_c::eff_b_break(unsigned short arg1) {
void Act_c::eff_b_break(u16 arg1) {
GXColor sp18;
sp18.r = tevStr.mColorC0.r;
sp18.g = tevStr.mColorC0.g;
src/d/actor/d_a_warpdm20.cpp
+1 -1
View File
@@ -448,7 +448,7 @@ f32 daWarpdm20_c::getSeaY(cXyz arg1) {
}
/* 00001418-000014CC .text set_effect__12daWarpdm20_cFUs */
BOOL daWarpdm20_c::set_effect(unsigned short arg1) {
BOOL daWarpdm20_c::set_effect(u16 arg1) {
BOOL ret;
if (mRippleCallback.getEmitter() == NULL) {