diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-03-20 16:02:41 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-03-20 16:02:41 -0400 |
| commit | 061fa893eb46c1eac3d9de55f6ded86f33c9a281 (patch) | |
| tree | 2af696561f546013a17c96c6bc3155b683e19ccb /src/d/actor/d_a_am2.cpp | |
| parent | 70a0a15b353605bee794a204248f53bcb057673e (diff) | |
Replace particle enums with official names
Diffstat (limited to 'src/d/actor/d_a_am2.cpp')
| -rw-r--r-- | src/d/actor/d_a_am2.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index e2653e0e..9c21ea63 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -159,9 +159,9 @@ static BOOL medama_atari_check(am2_class* i_this) { atInfo.pParticlePos = NULL; cc_at_check(actor, &atInfo); actor->health = origHealth; - dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &actor->attention_info.position); + dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &actor->attention_info.position); } else { - dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &hitPos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, &hitPos); } fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x42); } @@ -189,7 +189,7 @@ static BOOL medama_atari_check(am2_class* i_this) { i_this->mAction = ACTION_DOUSA; i_this->mMode = 2; } else { - dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos, &player->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &hitPos, &player->shape_angle); fopAcM_seStart(actor, JA_SE_CM_AM2_PARALYZED, 0); fopAcM_monsSeStart(actor, JA_SE_CV_AM2_PARALYZED, 0x42); i_this->mAction = ACTION_MAHI; @@ -294,11 +294,11 @@ static BOOL week_atari_check(am2_class* i_this) { cc_at_check(actor, &atInfo); if (hitType == 1) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &hitPos); cXyz particleScale(2.0f, 2.0f, 2.0f); - dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &hitPos, &player->shape_angle, &particleScale); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &hitPos, &player->shape_angle, &particleScale); } else { - dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &hitPos, &player->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &hitPos, &player->shape_angle); } i_this->mAction = ACTION_ITAI; @@ -434,7 +434,7 @@ static BOOL naraku_check(am2_class* i_this) { cXyz particleScale(1.0f, 1.0f, 1.0f); i_this->mRippleCb.remove(); - dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &actor->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &actor->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb); i_this->mRippleCb.setRate(0.0f); } } @@ -554,7 +554,7 @@ static void action_dousa(am2_class* i_this) { i_this->mSmokeCb.remove(); fopAcM_seStart(actor, JA_SE_CM_AM_JUMP_S, 0); - dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); + dComIfGp_particle_setToon(dPa_name::ID_AK_ST_AMOTHSMOKE00, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); if (i_this->mSmokeCb.getEmitter()) { i_this->mSmokeCb.getEmitter()->setRate(12.0f); JGeometry::TVec3<f32> scale; @@ -736,7 +736,7 @@ static void action_mahi(am2_class* i_this) { i_this->mSmokeCb.remove(); fopAcM_seStart(actor, JA_SE_CM_AM2_LANDING, 0); - dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); + dComIfGp_particle_setToon(dPa_name::ID_AK_ST_AMOTHSMOKE00, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); if (i_this->mSmokeCb.getEmitter()) { i_this->mSmokeCb.getEmitter()->setRate(12.0f); JGeometry::TVec3<f32> scale; @@ -850,7 +850,7 @@ static void action_itai(am2_class* i_this) { actor->speedF = 20.0f; fopAcM_monsSeStart(actor, JA_SE_CV_AM2_DAMAGE, 0x42); - dComIfGp_particle_set(dPa_name::ID_SCENE_81AE, &i_this->mWeakPos, &actor->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTH2WEAKPOINT00, &i_this->mWeakPos, &actor->shape_angle); if (actor->health > 0) { anm_init(i_this, AM2_BCK_DAMAGE, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1); @@ -909,7 +909,7 @@ static void action_itai(am2_class* i_this) { if (i_this->mAcch.ChkGroundHit()) { i_this->mSmokeCb.remove(); - dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); + dComIfGp_particle_setToon(dPa_name::ID_AK_ST_AMOTHSMOKE00, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); if (i_this->mSmokeCb.getEmitter()) { i_this->mSmokeCb.getEmitter()->setRate(12.0f); JGeometry::TVec3<f32> scale; @@ -941,8 +941,8 @@ static void action_itai(am2_class* i_this) { cXyz centerPos = actor->current.pos; centerPos.y += 50.0f; - dComIfGp_particle_set(dPa_name::ID_SCENE_81AF, &actor->current.pos, &actor->shape_angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_81B0, &actor->current.pos, &actor->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTH2WEAKPOINT01, &actor->current.pos, &actor->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTH2HAHEN00, &actor->current.pos, &actor->shape_angle); fopAcM_seStart(actor, JA_SE_CM_AM2_EXPLODE, 0); fopAcM_createDisappear(actor, ¢erPos, 5, daDisItem_IBALL_e); fopAcM_onActor(actor); |
