From bfc5d57658f11ce7f818d88339847e1b9ba55c18 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 1 Apr 2026 00:19:40 -0400 Subject: [PATCH] Use particle name enum in more places --- src/c/c_damagereaction.cpp | 2 +- src/d/actor/d_a_ep.cpp | 4 ++-- src/d/actor/d_a_jbo.cpp | 2 +- src/d/actor/d_a_kn.cpp | 2 +- src/d/actor/d_a_obj_canon.cpp | 10 +++++----- src/d/actor/d_a_obj_pirateship.cpp | 4 ++-- src/d/actor/d_a_obj_volcano.cpp | 9 ++++++--- src/d/actor/d_a_shand.cpp | 4 ++-- src/d/actor/d_a_stone2.cpp | 8 ++++---- src/d/actor/d_a_warpdm20.cpp | 2 +- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 14ff945bd..517e95b73 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -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) { diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index c1e8183fe..eef77e5f1 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -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)))) { diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp index 08b452a41..e3d75e7d8 100644 --- a/src/d/actor/d_a_jbo.cpp +++ b/src/d/actor/d_a_jbo.cpp @@ -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); } diff --git a/src/d/actor/d_a_kn.cpp b/src/d/actor/d_a_kn.cpp index c2d70ba02..299652b3c 100644 --- a/src/d/actor/d_a_kn.cpp +++ b/src/d/actor/d_a_kn.cpp @@ -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); diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index 525e2d88a..f3bdccc66 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/src/d/actor/d_a_obj_canon.cpp @@ -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 ¤t.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 ¤t.pos, &sp18, &scale, #else diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index 78026146c..feb7c7b1a 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -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, ¤t.angle, NULL, 0, &m4AC); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_SN_PIRATESHIPTAIL00, &m6C8, ¤t.angle, NULL, 0, &m4AC); JPABaseEmitter* emitter = m4AC.getEmitter(); if (emitter != NULL) { const JGeometry::TVec3 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, ¤t.pos, ¤t.angle, NULL, 0xff, NULL, -1, &m500); + m4FC = dComIfGp_particle_set(dPa_name::ID_AK_SN_PIRATESHIPSPLASH00, ¤t.pos, ¤t.angle, NULL, 0xff, NULL, -1, &m500); } } diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index e6c366dda..362b9a37f 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -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, diff --git a/src/d/actor/d_a_shand.cpp b/src/d/actor/d_a_shand.cpp index 82de9edf2..ea0f4a601 100644 --- a/src/d/actor/d_a_shand.cpp +++ b/src/d/actor/d_a_shand.cpp @@ -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); } } } diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index 408dbd4f3..c271f2703 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -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, ¤t.pos, &shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, &sp18); + JPABaseEmitter* emitter = dComIfGp_particle_set(particleID, ¤t.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; diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index a0c5afa02..60b31d5fc 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -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) {