Replace particle enums with official names

include/d/actor/d_a_beam.h

@@ -24,7 +24,7 @@ public:
         m690 = NULL;
     }
     void beamOn() {
-        m690 = dComIfGp_particle_set(dPa_name::ID_SCENE_8121, &current.pos);
+        m690 = dComIfGp_particle_set(dPa_name::ID_AK_SN_LASERROOT00, &current.pos);
     }
     bool checkHFloorParticle() { return !(s32)m5F8; }
     bool checkSmokeParticle() { return !(s32)m5F9; }

include/d/d_cc_d.h

@@ -89,15 +89,15 @@ enum dCcG_hitSe {
 
 enum CcG_At_HitMark {
     /* 0x0 */ dCcG_AtHitMark_None_e = dPa_name::ID_NONE,
-    /* 0x1 */ dCcG_AtHitMark_Unk1_e = dPa_name::ID_COMMON_0001,
-    /* 0xD */ dCcG_AtHitMark_Nrm_e = dPa_name::ID_COMMON_NORMAL_HIT,
-    /* 0xF */ dCcG_AtHitMark_Big_e = dPa_name::ID_COMMON_BIG_HIT,
+    /* 0x1 */ dCcG_AtHitMark_Unk1_e = dPa_name::ID_AK_JN_O_FIRE00,
+    /* 0xD */ dCcG_AtHitMark_Nrm_e = dPa_name::ID_AK_JN_OK,
+    /* 0xF */ dCcG_AtHitMark_Big_e = dPa_name::ID_AK_JN_CRITICALHIT,
 };
 
 enum CcG_Tg_HitMark {
-    /* 0x1 */ dCcG_TgHitMark_Unk1_e = dPa_name::ID_COMMON_0001,
-    /* 0xC */ dCcg_TgHitMark_Purple_e = dPa_name::ID_COMMON_PURPLE_HIT,
-    /* 0xD */ dCcG_TgHitMark_Nrm_e = dPa_name::ID_COMMON_NORMAL_HIT,
+    /* 0x1 */ dCcG_TgHitMark_Unk1_e = dPa_name::ID_AK_JN_O_FIRE00,
+    /* 0xC */ dCcg_TgHitMark_Purple_e = dPa_name::ID_AK_JN_NG,
+    /* 0xD */ dCcG_TgHitMark_Nrm_e = dPa_name::ID_AK_JN_OK,
     /* 0xFF */ dCcG_TgHitMark_Unk255_e = 0xFF,
 };
 

src/c/c_damagereaction.cpp

@@ -121,7 +121,7 @@ BOOL enemy_ice(enemyice* ei) {
         
         if (ei->mLightShrinkTimer == 1) { // Just started dying to light arrows.
             ei->mLightShrinkTimer++;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_LIGHT_EXPLOSION, &pos, NULL, &particleScale);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_ENEMYFLASH00, &pos, NULL, &particleScale);
             ac->tevStr.mFogColor.b = 0xFF;
             ac->tevStr.mFogColor.g = 0xFF;
             ac->tevStr.mFogColor.r = 0xFF;
@@ -219,7 +219,7 @@ BOOL enemy_ice(enemyice* ei) {
             particleScale.setall(ei->mParticleScale);
             pos = ac->current.pos;
             pos.y += ei->mYOffset;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0274, &pos, NULL, &particleScale);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_ENEMYFREEZE01, &pos, NULL, &particleScale);
         } else {
             return FALSE;
         }
@@ -330,15 +330,15 @@ BOOL enemy_ice(enemyice* ei) {
                 particleScale.setall(ei->mParticleScale);
                 pos = ac->current.pos;
                 pos.y += ei->mYOffset;
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0273, &pos, NULL, &particleScale);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0274, &pos, NULL, &particleScale);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_ENEMYFREEZE00, &pos, NULL, &particleScale);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_ENEMYFREEZE01, &pos, NULL, &particleScale);
                 
                 if (ei->mFreezeTimer == -2) {
                     // Shattered by Skull Hammer.
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &pos);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &pos);
                     csXyz angle(0, fopAcM_searchPlayerAngleY(ac), 0);
                     particleScale.setall(2.0f);
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &pos, &angle, &particleScale);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &pos, &angle, &particleScale);
                     dScnPly_ply_c::setPauseTimer(8);
                 }
                 
@@ -383,7 +383,7 @@ BOOL enemy_ice(enemyice* ei) {
                 particleScale.setall(ei->mParticleScale);
                 pos = ac->current.pos;
                 pos.y += ei->mYOffset;
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0277, &pos, NULL, &particleScale);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_ENEMYFREEZE02, &pos, NULL, &particleScale);
                 fopAcM_seStart(ac, JA_SE_CM_ICE_RECOVER, 0);
             }
         }
@@ -465,7 +465,7 @@ void enemy_fire(enemyfire* ef) {
                 }
                 cXyz scale;
                 scale.setall(ef->mParticleScale[i]);
-                ef->mpFlameEmitters[i] = dComIfGp_particle_set(dPa_name::ID_COMMON_03F1, &ac->current.pos, NULL, &scale);
+                ef->mpFlameEmitters[i] = dComIfGp_particle_set(dPa_name::ID_AK_JN_BODYABLAZE00, &ac->current.pos, NULL, &scale);
                 ef->mFlameTimers[i] = ef->mFireTimer - (s16)cM_rndF(60.0f);
                 if (ef->mFlameTimers[i] < 10) {
                     ef->mFlameTimers[i] = 10;
@@ -604,7 +604,7 @@ void enemy_fire_remove(enemyfire* ef) {
 /* 8001D428-8001D48C       .text enemy_piyo_set__FP10fopAc_ac_c */
 void enemy_piyo_set(fopAc_ac_c* enemy) {
     // Creates the rotating stars particle for when an enemy is stunned.
-    dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_SPIN, &enemy->attention_info.position);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOPIYO00, &enemy->attention_info.position);
 }
 
 /* 8001D48C-8001D890       .text wall_angle_get__FP10fopAc_ac_cs */

src/d/actor/d_a_agb.cpp

@@ -543,7 +543,7 @@ int daAgb_c::uploadMessageSend() {
             field_0x664 = 60;
 
             dComIfGs_onEventBit(dSv_event_flag_c::UNK_1A20);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_02E7, &current.pos, NULL, NULL, 255, &field_0x684);
+            dComIfGp_particle_set(dPa_name::ID_IT_JN_GBACURSOR00, &current.pos, NULL, NULL, 255, &field_0x684);
 
             JKRHeap::free(l_gbaCommand->getMemAddress(), NULL);
             delete l_gbaCommand;

src/d/actor/d_a_am.cpp

@@ -255,9 +255,9 @@ static BOOL medama_atari_check(am_class* i_this) {
                 cc_at_check(actor, &atInfo);
                 actor->max_health = 10;
                 actor->health = 10;
-                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);
         }
@@ -295,7 +295,7 @@ static BOOL medama_atari_check(am_class* i_this) {
             i_this->mAction = ACTION_DOUSA;
             i_this->mMode = MODE_DOUSA_OKIRU;
         } else {
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->mEyeballPos, &player->shape_angle);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &i_this->mEyeballPos, &player->shape_angle);
             fopAcM_seStart(actor, JA_SE_CM_AM_EYE_DAMAGE, 0);
             fopAcM_monsSeStart(actor, JA_SE_CV_AM_EYE_DAMAGE, 0x42);
             i_this->mAction = ACTION_ITAI_MOVE;
@@ -303,7 +303,7 @@ static BOOL medama_atari_check(am_class* i_this) {
         }
         break;
     default:
-        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);
         break;
     }
@@ -602,7 +602,7 @@ static void action_dousa(am_class* i_this) {
         fopAcM_seStart(actor, JA_SE_CM_AM_JUMP, 0);
         i_this->mSmokeCbs[0].remove();
         dComIfGp_particle_setToon(
-            dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &actor->shape_angle, NULL,
+            dPa_name::ID_AK_ST_AMOTHSMOKE00, &i_this->mWaistPos, &actor->shape_angle, NULL,
             0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(actor)
         );
         dComIfGp_getVibration().StartShock(3, -0x21, cXyz(0.0f, 1.0f, 0.0f));
@@ -638,7 +638,7 @@ static void action_dousa(am_class* i_this) {
                 i_this->m033C_demo = 
 #endif
                 dComIfGp_particle_setToon(
-                    dPa_name::ID_SCENE_A154, &i_this->mWaistPos, &actor->shape_angle, NULL,
+                    dPa_name::ID_AK_ST_AMOTHSMOKE02, &i_this->mWaistPos, &actor->shape_angle, NULL,
                     0xB9, &i_this->mSmokeCbs[2], fopAcM_GetRoomNo(actor)
                 );
             }
@@ -732,7 +732,7 @@ static void action_modoru_move(am_class* i_this) {
         if (i_this->mAcch.ChkGroundHit()) {
             i_this->mSmokeCbs[0].remove();
             dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &actor->shape_angle, NULL,
+                dPa_name::ID_AK_ST_AMOTHSMOKE00, &i_this->mWaistPos, &actor->shape_angle, NULL,
                 0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(actor)
             );
 
@@ -851,7 +851,7 @@ static void action_itai_move(am_class* i_this) {
         i_this->mSmokeCbs[3].remove();
         i_this->mStts.SetWeight(0xFF);
         dComIfGp_particle_setToon(
-            dPa_name::ID_SCENE_A155, &i_this->mJawPos, &actor->shape_angle, NULL,
+            dPa_name::ID_AK_ST_AMOTHSMOKE03, &i_this->mJawPos, &actor->shape_angle, NULL,
             0xB9, &i_this->mSmokeCbs[3], fopAcM_GetRoomNo(actor)
         );
         fopAcM_seStart(actor, JA_SE_CM_AM_MOUTH_CLOSE, 0);
@@ -874,11 +874,11 @@ static void action_itai_move(am_class* i_this) {
             i_this->mNeedleCyl.OnAtSetBit();
             i_this->mNeedleCyl.OnAtHitBit();
             dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A126, &i_this->mJawPos, &actor->shape_angle, NULL,
+                dPa_name::ID_AK_ST_AMOTHSMOKE01, &i_this->mJawPos, &actor->shape_angle, NULL,
                 0xB9, &i_this->mSmokeCbs[1], fopAcM_GetRoomNo(actor)
             );
-            i_this->m033C = dComIfGp_particle_set(dPa_name::ID_SCENE_8157, &i_this->mJawPos);
-            i_this->m0340 = dComIfGp_particle_set(dPa_name::ID_SCENE_8156, &i_this->mJawPos);
+            i_this->m033C = dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHBOMBEYE, &i_this->mJawPos);
+            i_this->m0340 = dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHBOMBMOUTH, &i_this->mJawPos);
         }
 
         if (!i_this->mpMorf->isStop()) {
@@ -895,7 +895,7 @@ static void action_itai_move(am_class* i_this) {
             i_this->mSmokeCbs[0].remove();
             fopAcM_seStart(actor, JA_SE_CM_AM_JUMP, 0);
             dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A125, &i_this->mWaistPos, &actor->shape_angle, NULL,
+                dPa_name::ID_AK_ST_AMOTHSMOKE00, &i_this->mWaistPos, &actor->shape_angle, NULL,
                 0xB9, &i_this->mSmokeCbs[0], fopAcM_GetRoomNo(actor)
             );
             dComIfGp_getVibration().StartShock(1, -0x21, cXyz(0.0f, 1.0f, 0.0f));
@@ -910,8 +910,8 @@ static void action_itai_move(am_class* i_this) {
             break;
         }
         anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8127, &i_this->mWaistPos);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8128, &i_this->mWaistPos);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHFLASH00, &i_this->mWaistPos);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHHAHEN00, &i_this->mWaistPos);
 
         fopAcM_seStart(actor, JA_SE_CM_AM_BEF_EXPLODE, 0);
         i_this->mTargetAngleY = actor->current.angle.y;
@@ -1006,8 +1006,8 @@ static BOOL daAM_Execute(am_class* i_this) {
     if (i_this->mAction != ACTION_ITAI_MOVE && i_this->mSpawnPosY - 1500.0f > actor->current.pos.y) {
         anm_init(i_this, AM_BCK_DEAD, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
 
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8127, &i_this->mWaistPos);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8128, &i_this->mWaistPos);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHFLASH00, &i_this->mWaistPos);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTHHAHEN00, &i_this->mWaistPos);
 
         fopAcM_seStart(actor, JA_SE_CM_AM_BEF_EXPLODE, 0);
 

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, &centerPos, 5, daDisItem_IBALL_e);
         fopAcM_onActor(actor);

src/d/actor/d_a_arrow.cpp

@@ -193,7 +193,7 @@ void daArrow_c::setBlur() {
 /* 800D4994-800D4A04       .text createBlur__9daArrow_cFv */
 void daArrow_c::createBlur() {
     if (!mBlurFollowCb.getEmitter()) {
-        dComIfGp_particle_setP1(dPa_name::ID_COMMON_0048, &current.pos, NULL, NULL, 0xFF, &mBlurFollowCb);
+        dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARW_BLUR00, &current.pos, NULL, NULL, 0xFF, &mBlurFollowCb);
     }
 }
 
@@ -339,7 +339,7 @@ void daArrow_c::ShieldReflect() {
 #if VERSION > VERSION_DEMO
             fopAcM_SetParam(ganondorf, 0x23);
             mSparkleTimer = 15 + REG0_S(3);
-            mpSparkleEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_03EE, &link->current.pos);
+            mpSparkleEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER01, &link->current.pos);
 #endif
         }
     }
@@ -383,7 +383,7 @@ bool daArrow_c::check_water_in() {
         
         if (mArrowType == TYPE_FIRE) {
             mInWaterTimer = 1;
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_035A, &waterHitPos);
+            dComIfGp_particle_setP1(dPa_name::ID_AK_JN_EVAPORATION00, &waterHitPos);
 #if VERSION > VERSION_DEMO
             if (!field_0x6e4)
 #endif
@@ -403,7 +403,7 @@ bool daArrow_c::check_water_in() {
                 dKy_arrowcol_chg_on(&current.pos, 1);
             }
         } else if (mArrowType == TYPE_LIGHT) {
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &waterHitPos);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWG_HITA00, &waterHitPos);
             fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
 #if VERSION > VERSION_DEMO
             if (!field_0x6e4)
@@ -683,7 +683,7 @@ BOOL daArrow_c::procMove() {
                             mDoMtx_stack_c::ZXYrotM(temp10.x, temp10.y, 0);
                             cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4);
                             
-                            dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &field_0x6a8, &temp10);
+                            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWG_HITA00, &field_0x6a8, &temp10);
                             fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
                             fopAcM_delete(this);
                         } else {
@@ -788,15 +788,15 @@ BOOL daArrow_c::procMove() {
             cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4);
             
             if (mArrowType == TYPE_FIRE) {
-                dComIfGp_particle_setP1(dPa_name::ID_COMMON_029A, &field_0x6a8, &temp10);
-                dComIfGp_particle_setP1(dPa_name::ID_COMMON_029B, &field_0x6a8, &temp10);
+                dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWF_HITA00, &field_0x6a8, &temp10);
+                dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWF_HITB00, &field_0x6a8, &temp10);
                 fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARW_EFF, 0);
                 field_0x698 = false;
             } else if (mArrowType == TYPE_ICE) {
                 if (dComIfG_Bgsp()->ChkGrpInf(mLinChk, 0x200)) {
                     fopAcM_create(PROC_Obj_Magmarock, NULL, &field_0x6a8, current.roomNo);
                 } else {
-                    dComIfGp_particle_setP1(dPa_name::ID_COMMON_029E, &field_0x6a8, &temp10);
+                    dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_HITA00, &field_0x6a8, &temp10);
                     
                     fopAcM_createChild(
                         PROC_ARROW_ICEEFF, fopAcM_GetID(this),
@@ -807,7 +807,7 @@ BOOL daArrow_c::procMove() {
                     fopAcM_seStartCurrent(this, JA_SE_OBJ_ICE_ARW_EFF, 0);
                 }
             } else if (mArrowType == TYPE_LIGHT) {
-                dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A1, &field_0x6a8, &temp10);
+                dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWG_HITA00, &field_0x6a8, &temp10);
                 fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
                 field_0x698 = false;
             }
@@ -831,7 +831,7 @@ BOOL daArrow_c::procMove() {
                 csXyz temp9;
                 cM3d_CalcVecZAngle(*triPla->GetNP(), &temp9);
                 
-                dComIfGp_particle_setP1(dPa_name::ID_COMMON_PURPLE_HIT, &field_0x6a8, &temp9);
+                dComIfGp_particle_setP1(dPa_name::ID_AK_JN_NG, &field_0x6a8, &temp9);
                 fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_REBOUND, mtrlSndId);
             } else {
                 fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_HIT, mtrlSndId);

src/d/actor/d_a_arrow_iceeff.cpp

@@ -199,7 +199,7 @@ bool daArrow_Iceeff_c::_execute() {
     daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(parentActorID));
     if(field_0xA38 == 0) {
         if(arrow == 0) {
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, &current.pos, &current.angle);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWICE_OUT00, &current.pos, &current.angle);
             fopAcM_delete(this);
 
             return true;
@@ -222,7 +222,7 @@ bool daArrow_Iceeff_c::_execute() {
             field_0xA30++;
         }
         else {
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, &current.pos, &current.angle);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWICE_OUT00, &current.pos, &current.angle);
             fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0);
             fopAcM_delete(arrow);
             fopAcM_delete(this);
@@ -237,7 +237,7 @@ bool daArrow_Iceeff_c::_execute() {
             csXyz angle;
             angle.set(-0x4000, 0, 0);
 
-            JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_COMMON_029E, &current.pos, &angle);
+            JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_HITA00, &current.pos, &angle);
             if(ptcl) {
                 JGeometry::TVec3<f32> scale(0.5f, 0.5f, 0.5f);
                 ptcl->setGlobalScale(scale);
@@ -261,13 +261,13 @@ bool daArrow_Iceeff_c::_execute() {
         }
 
         if(field_0xA30 == 0x23) {
-            JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &current.pos, NULL, &ripple_scale);
+            JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON01, &current.pos, NULL, &ripple_scale);
             if(ptcl) {
                 ptcl->setGlobalParticleScale(0.67f, 0.67f);
             }
         }
         else if(field_0xA30 == 0x28) {
-            JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, &current.pos);
+            JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWICE_OUT00, &current.pos);
             if(ptcl) {
                 ptcl->setAwayFromCenterSpeed(25.0f);
                 ptcl->setAwayFromAxisSpeed(5.0f);
@@ -277,7 +277,7 @@ bool daArrow_Iceeff_c::_execute() {
                 ptcl->setGlobalParticleScale(0.33f, 0.33f);
             }
             
-            dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &current.pos, NULL, &ripple_scale);
+            dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON03, &current.pos, NULL, &ripple_scale);
             fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0);
 
             field_0xA3C = 0;

src/d/actor/d_a_arrow_lighteff.cpp

@@ -147,23 +147,23 @@ void daArrow_Lighteff_c::CreateInit() {
 
     if(field_0x2E8 == 1) {
         if(field_0x2F4.getEmitter() == 0) {
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_0299, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWF_HINOKO00, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
         }
     }
     else if(field_0x2E8 == 2) {
         if(field_0x2F4.getEmitter() == 0) {
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_029C, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_KIRAKIRA00, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
         }
         if(field_0x308.getEmitter() == 0) {
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_029D, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x308);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_REIKI00, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x308);
         }
     }
     else if(field_0x2E8 == 3) {
         if(field_0x2F4.getEmitter() == 0) {
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_029F, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWG_TSUBU00, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x2F4);
         }
         if(field_0x308.getEmitter() == 0) {
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A0, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x308);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWG_FLASH00, &field_0x29C, &current.angle, NULL, 0xFF, &field_0x308);
         }
     }
 
@@ -373,7 +373,7 @@ bool daArrow_Lighteff_c::_execute() {
     if(field_0x2E8 == 1) {
         fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARROW_AMB, 0);
         if(!dComIfGp_checkCameraAttentionStatus(cam, 0x20)) {
-            dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &field_0x29C);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_JP_O_KAGEROU00, &field_0x29C);
         }
     }
     else if(field_0x2E8 == 2) {

src/d/actor/d_a_auction.cpp

@@ -1169,7 +1169,7 @@ void daAuction_c::eventMainMsgBikonC() {
         m7A8 = getNpcActorP(m827)->current.pos;
         m7A8.y += getPiconDispOfs(m827);
 
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8153, &m7A8, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this));
+        dComIfGp_particle_set(dPa_name::ID_IT_SN_PF_BIKON01, &m7A8, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this));
         mTimer = 30;
 
         if (m827 == 0) {

src/d/actor/d_a_bb.cpp

@@ -1542,7 +1542,7 @@ void bb_atack_move(bb_class* i_this) {
                     cXyz scale;
                     scale.x = scale.y = scale.z = 4.0f;
                     
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &a_this->eyePos, NULL, &scale);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, &a_this->eyePos, NULL, &scale);
 
                     i_this->unk_2F1 = 10;
                     i_this->unk_318[0] = l_bbHIO.unk_30;
@@ -2117,15 +2117,15 @@ void damage_check(bb_class* i_this) {
 #else
         if (sp30.mResultingAttackType == 14) {
             a_this->health = old_health;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, sp30.pParticlePos);
+            dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, sp30.pParticlePos);
         } else if (a_this->health <= 0) {
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0010, sp30.pParticlePos);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, sp30.pParticlePos);
             scale.x = 2.0f;
             scale.y = 2.0f;
             scale.z = 2.0f;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, sp30.pParticlePos, &player->shape_angle, &scale);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, sp30.pParticlePos, &player->shape_angle, &scale);
         } else {
-            dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, sp30.pParticlePos, &player->shape_angle);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, sp30.pParticlePos, &player->shape_angle);
         }
 #endif
 
@@ -2150,12 +2150,12 @@ void damage_check(bb_class* i_this) {
             fopAcM_monsSeStart(a_this, JA_SE_CV_BB_DAMAGE, 0);
         }
 
-        dComIfGp_particle_setToon(dPa_name::ID_COMMON_0438, &a_this->current.pos, &a_this->current.angle, NULL, 0xFF, NULL, 
+        dComIfGp_particle_setToon(dPa_name::ID_IT_JN_KG_HANE_A, &a_this->current.pos, &a_this->current.angle, NULL, 0xFF, NULL, 
             fopAcM_GetRoomNo(a_this), &a_this->tevStr.mColorK0, &a_this->tevStr.mColorK0);
         
         i_this->mParticleCallBack.remove();
 
-        emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_0439, &a_this->current.pos, &a_this->current.angle, NULL, 0xFF, &i_this->mParticleCallBack, 
+        emitter = dComIfGp_particle_setToon(dPa_name::ID_IT_JN_KG_HANE_B, &a_this->current.pos, &a_this->current.angle, NULL, 0xFF, &i_this->mParticleCallBack, 
             fopAcM_GetRoomNo(a_this));
 
         if (emitter != NULL) {

src/d/actor/d_a_bdk.cpp

@@ -838,14 +838,14 @@ void landing(bdk_class* i_this) {
                 dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
 
                 dComIfGp_particle_set(
-                    dPa_name::ID_SCENE_8131, &actor->current.pos, NULL, NULL,
+                    dPa_name::ID_IT_SN_DK_TYAKUTI_ROCK00, &actor->current.pos, NULL, NULL,
                     0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
                     &i_this->m6224.mColorK0, &i_this->m6224.mColorK0
                 );
                 if (i_this->m6078[0] == 0) {
                     i_this->m6078[0] = 100;
                     dComIfGp_particle_setToon(
-                        dPa_name::ID_SCENE_A132, &actor->current.pos, NULL, NULL,
+                        dPa_name::ID_IT_ST_DK_TYAKUTI_SMOKE00, &actor->current.pos, NULL, NULL,
                         0xB9, &i_this->m6080[0], (s8)fopAcM_GetRoomNo(actor)
                     );
                 }
@@ -1095,14 +1095,14 @@ void jida_attack(bdk_class* i_this) {
                     index = 1;
                 }
                 dComIfGp_particle_set(
-                dPa_name::ID_SCENE_8133, &i_this->m1174[index], NULL, NULL,
+                dPa_name::ID_IT_SN_DK_JIDANDA_ROCK00, &i_this->m1174[index], NULL, NULL,
                 0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
                 &i_this->m6224.mColorK0, &i_this->m6224.mColorK0
             );
             if (i_this->m6078[1] == 0) {
                 i_this->m6078[1] = 0xA;
                 dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A134, &i_this->m1174[index], 0, NULL, 0xB9,
+                dPa_name::ID_IT_ST_DK_JIDANDA_SMOKE00, &i_this->m1174[index], 0, NULL, 0xB9,
                 &i_this->m6080[1], (s8)fopAcM_GetRoomNo(actor)
                 );
             }
@@ -1175,7 +1175,7 @@ void kuti_attack(bdk_class* i_this) {
             i_this->m261C[0x27].m004 += actor->current.pos;
 
             dComIfGp_particle_set(
-                dPa_name::ID_SCENE_812D, &i_this->m261C[0x27].m004, NULL, NULL,
+                dPa_name::ID_IT_SN_DK_KUTI_SENKO00, &i_this->m261C[0x27].m004, NULL, NULL,
                 0xFF, NULL, -1
             );
             eff_hane_set(i_this, &i_this->m1168, 5, 0);
@@ -1244,12 +1244,12 @@ void kuti_attack(bdk_class* i_this) {
             i_this->m6078[2] = 0x3c;
 
             dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A12E, &i_this->m261C[0x27].m004, 0, NULL, 0xB9,
+                dPa_name::ID_IT_ST_DK_KUTI_SMOKE00, &i_this->m261C[0x27].m004, 0, NULL, 0xB9,
                 &i_this->m6080[2], (s8)fopAcM_GetRoomNo(actor)
             );
         }
         dComIfGp_particle_set(
-            dPa_name::ID_SCENE_812C, &i_this->m261C[0x27].m004, NULL, NULL,
+            dPa_name::ID_IT_SN_DK_KUTI_ROCK00, &i_this->m261C[0x27].m004, NULL, NULL,
             0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
             &i_this->m6224.mColorK0, &i_this->m6224.mColorK0
         );
@@ -1368,7 +1368,7 @@ void fly_attack(bdk_class* i_this) {
         if (i_this->m6078[3] == 0) {
             i_this->m6078[3] = 100;
             emitter = dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A135, &actor->current.pos, &actor->shape_angle, NULL,
+                dPa_name::ID_IT_ST_DK_BUTSUKARI_SMOKE00, &actor->current.pos, &actor->shape_angle, NULL,
                 0xB9, &i_this->m6080[3], (s8)fopAcM_GetRoomNo(actor)
             );
             if (emitter) {
@@ -1376,7 +1376,7 @@ void fly_attack(bdk_class* i_this) {
             }
         }
         emitter = dComIfGp_particle_set(
-            dPa_name::ID_SCENE_8137, &actor->current.pos, &actor->shape_angle, NULL,
+            dPa_name::ID_IT_SN_DK_DMG_HANE_M00, &actor->current.pos, &actor->shape_angle, NULL,
             0xFF, NULL, (s8)fopAcM_GetRoomNo(actor), &actor->tevStr.mColorK0, &actor->tevStr.mColorK0
         );
         if (emitter) {
@@ -1424,10 +1424,10 @@ void fly_attack(bdk_class* i_this) {
                 foot_eff_pos[i] = i_this->m1174[i];
 
                 i_this->mp6214[0 + i] = dComIfGp_particle_set(
-                dPa_name::ID_SCENE_812A, &foot_eff_pos[i], &actor->shape_angle);
+                dPa_name::ID_IT_SN_DK_TSUME_HIBANA_A00, &foot_eff_pos[i], &actor->shape_angle);
 
                 i_this->mp6214[2 + i] = dComIfGp_particle_set(
-                dPa_name::ID_SCENE_812B, &foot_eff_pos[i], &actor->shape_angle);
+                dPa_name::ID_IT_SN_DK_TSUME_HIBANA_B00, &foot_eff_pos[i], &actor->shape_angle);
             }
             i_this->m2619++;
         }
@@ -1581,8 +1581,8 @@ void damage_check(bdk_class* i_this) {
                 angle.z = 0;
                 angle.x = 0;
                 angle.y = player->shape_angle.y + 0x8000;
-                dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, i_this->mHeadTgSph.GetTgHitPosP(), &angle, &pos);
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8129, i_this->mHeadTgSph.GetTgHitPosP(), &actor->shape_angle, NULL);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, i_this->mHeadTgSph.GetTgHitPosP(), &angle, &pos);
+                dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_KAMEN_HAHEN00, i_this->mHeadTgSph.GetTgHitPosP(), &actor->shape_angle, NULL);
 
                 dKy_SordFlush_set(actor->current.pos, 1);
                 dComIfGp_getVibration().StartShock(REG0_S(2) + 5,
@@ -1633,7 +1633,7 @@ void damage_check(bdk_class* i_this) {
                 fopAcM_monsSeStart(actor, JA_SE_CV_DK_LAST_DAMAGE, 0);
             } else if (sVar1) {
                 JPABaseEmitter* emitter = dComIfGp_particle_set(
-                dPa_name::ID_SCENE_8137, &actor->current.pos, &actor->shape_angle, NULL,
+                dPa_name::ID_IT_SN_DK_DMG_HANE_M00, &actor->current.pos, &actor->shape_angle, NULL,
                 0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
                 &actor->tevStr.mColorK0, &actor->tevStr.mColorK0
                 );
@@ -1768,7 +1768,7 @@ void start(bdk_class* i_this) {
             anm_init(i_this, BDK_BCK_S_DEMO1, 5.0f, 2, 1.0f, -1, 0);
             fopAcM_seStart(actor, JA_SE_CM_DK_ROUND_UP, 0);
 
-            dComIfGp_particle_set(dPa_name::ID_SCENE_813C, &actor->current.pos, &actor->shape_angle, NULL,
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_DEMO_HANE00, &actor->current.pos, &actor->shape_angle, NULL,
             0xFF, &i_this->m61B0, (s8)fopAcM_GetRoomNo(actor),
             &actor->tevStr.mColorK0, &actor->tevStr.mColorK0);
         }
@@ -1793,7 +1793,7 @@ void start(bdk_class* i_this) {
             fopAcM_monsSeStart(actor, JA_SE_CV_DK_ENTER, 0);
             i_this->m61B0.remove();
             for (s32 i = 0; i < 2; i++) {
-                JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8158, &actor->current.pos, &actor->shape_angle, NULL,
+                JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_DEMO_HANE01, &actor->current.pos, &actor->shape_angle, NULL,
                 0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
                 &actor->tevStr.mColorK0, &actor->tevStr.mColorK0);
 
@@ -1827,19 +1827,19 @@ void end(bdk_class* i_this) {
         anm_init(i_this, BDK_BCK_LAST_DAMAGE1, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE1, 0);
         i_this->mState = 5;
         i_this->m2EC[0] = 0xB3;
-        particle_id = dPa_name::ID_SCENE_8139;
+        particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W00;
         break;
     case 1:
         anm_init(i_this, BDK_BCK_LAST_DAMAGE3, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE3, 0);
         i_this->mState = 5;
         i_this->m2EC[0] = 0xB3;
-        particle_id = dPa_name::ID_SCENE_815A;
+        particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W02;
         break;
     case 2:
         anm_init(i_this, BDK_BCK_LAST_DAMAGE2, 2.0f, 0, 1.0f, BDK_BAS_LAST_DAMAGE2, 0);
         i_this->mState = 5;
         i_this->m2EC[0] = 0;
-        particle_id = dPa_name::ID_SCENE_8159;
+        particle_id = dPa_name::ID_IT_SN_DK_LASTDMG_HANE_W01;
         break;
     case 5:
         if (i_this->mpMorf->isStop()) {
@@ -1849,7 +1849,7 @@ void end(bdk_class* i_this) {
 
             for (s32 i = 0; i <= 1; i++) {
                 JPABaseEmitter* emitter = dComIfGp_particle_set(
-                dPa_name::ID_SCENE_813A, &actor->current.pos, NULL, NULL,
+                dPa_name::ID_IT_SN_DK_DEAD_HANE_A00, &actor->current.pos, NULL, NULL,
                 0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
                 &actor->tevStr.mColorK0, &actor->tevStr.mColorK0);
 
@@ -1903,7 +1903,7 @@ void end(bdk_class* i_this) {
                 }
             }
             dComIfGp_particle_set(
-            dPa_name::ID_SCENE_813B, &actor->current.pos, NULL, NULL,
+            dPa_name::ID_IT_SN_DK_DEAD_HANE_B00, &actor->current.pos, NULL, NULL,
             0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
             &actor->tevStr.mColorK0, &actor->tevStr.mColorK0);
         }
@@ -1929,7 +1929,7 @@ void end(bdk_class* i_this) {
     cLib_addCalcAngleS2(&actor->current.angle.x, 0, 2, 0x800);
     if ((u16)particle_id) {
         JPABaseEmitter* emitter = dComIfGp_particle_set(
-        dPa_name::ID_SCENE_8138, &actor->current.pos, &actor->shape_angle, NULL,
+        dPa_name::ID_IT_SN_DK_LASTDMG_HANE_M00, &actor->current.pos, &actor->shape_angle, NULL,
         0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
         &actor->tevStr.mColorK0, &actor->tevStr.mColorK0);
         if (emitter) {
@@ -2144,7 +2144,7 @@ void t_lastattack(bdk_class* i_this) {
         i_this->mState++;
         dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
         dComIfGp_particle_set(
-            dPa_name::ID_SCENE_8131, &actor->current.pos, NULL, NULL,
+            dPa_name::ID_IT_SN_DK_TYAKUTI_ROCK00, &actor->current.pos, NULL, NULL,
             0xFF, NULL, (s8)fopAcM_GetRoomNo(actor),
             &i_this->m6224.mColorK0, &i_this->m6224.mColorK0);
 
@@ -2152,7 +2152,7 @@ void t_lastattack(bdk_class* i_this) {
             i_this->m6078[0] = 100;
 
         dComIfGp_particle_setToon(
-            dPa_name::ID_SCENE_A132, &actor->current.pos, NULL, NULL, 0xB9,
+            dPa_name::ID_IT_ST_DK_TYAKUTI_SMOKE00, &actor->current.pos, NULL, NULL, 0xB9,
             &i_this->m6080[0], (s8)fopAcM_GetRoomNo(actor));
         }
         break;
@@ -2241,10 +2241,10 @@ void t_down(bdk_class* i_this) {
             offset.y = 6900.f;
             offset.z = -3800.f;
 
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8147, &offset, NULL, NULL);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8148, &offset, NULL, NULL);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8149, &offset, NULL, NULL);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_814A, &offset, NULL, NULL);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_DOBON_HAMON00, &offset, NULL, NULL);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_DOBON_HAMON01, &offset, NULL, NULL);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_DOBON_SHIBUKI00, &offset, NULL, NULL);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_DOBON_WP00, &offset, NULL, NULL);
             fopAcM_seStart(actor, JA_SE_CM_DK_WATER_COLUMN, 0);
         }
         if (actor->current.pos.y < 5500.0f) {
@@ -2783,10 +2783,10 @@ void demo_camera(bdk_class* i_this) {
                 local_14C.z = 0;
                 for (s32 i = 0; i <= 2; i++) {
                     local_14C.y = 10000 + i * 0x5555 + REG8_S(4);
-                    dComIfGp_particle_setToon(dPa_name::ID_SCENE_A14F, &center_pos, &local_14C, NULL, 0xB9, &i_this->m6130[i], (s16)fopAcM_GetRoomNo(actor));
+                    dComIfGp_particle_setToon(dPa_name::ID_IT_ST_DK_FUTATOJI_SMOKE_A00, &center_pos, &local_14C, NULL, 0xB9, &i_this->m6130[i], (s16)fopAcM_GetRoomNo(actor));
                 }
-                dComIfGp_particle_setToon(dPa_name::ID_SCENE_A150, &center_pos2, NULL, NULL, 0xB9, &i_this->m6130[3], (s16)fopAcM_GetRoomNo(actor));
-                i_this->m6100[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_814E, &center_pos2, NULL, NULL, 0xFF);
+                dComIfGp_particle_setToon(dPa_name::ID_IT_ST_DK_FUTATOJI_SMOKE_B00, &center_pos2, NULL, NULL, 0xB9, &i_this->m6130[3], (s16)fopAcM_GetRoomNo(actor));
+                i_this->m6100[1] = dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_FUTATOJI_ROCK00, &center_pos2, NULL, NULL, 0xFF);
             }
             i_this->m25D4 = REG0_F(18) + 1.5f;
             mDoAud_seStart(JA_SE_ATM_MJT_JINARI, 0);
@@ -2910,7 +2910,7 @@ void demo_camera(bdk_class* i_this) {
                 for (i = 0; i <= 2; i++) {
                     a = &i_this->m6130[i];
                     local_154.y = i * 0x5555;
-                    dComIfGp_particle_setToon(dPa_name::ID_SCENE_A151, &center_pos,
+                    dComIfGp_particle_setToon(dPa_name::ID_IT_ST_DK_FUTATOJI_SMOKE_C00, &center_pos,
                     &local_154, NULL, 0xB9, a, (u8)fopAcM_GetRoomNo(actor));
                 }
                 i_this->m6130[3].remove();
@@ -3488,7 +3488,7 @@ static BOOL daBdk_Execute(bdk_class* i_this) {
     }
     if (i_this->m2618 != 0 && (i_this->m2618--, i_this->m2618 == 0)) {
         dComIfGp_particle_setToon(
-            dPa_name::ID_SCENE_A136, &i_this->m260C, &actor->shape_angle, NULL, 0xB9,
+            dPa_name::ID_IT_ST_DK_TOBITATI_SMOKE00, &i_this->m260C, &actor->shape_angle, NULL, 0xB9,
             &i_this->m6110, (s8)fopAcM_GetRoomNo(actor)
         );
     }

src/d/actor/d_a_bdkobj.cpp

@@ -257,9 +257,9 @@ static void tower_kaidan_move(bdkobj_class* i_this) {
             i_this->model = NULL;
             i_this->m299 = 100;
 
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8143, &i_this->current.pos, &i_this->current.angle);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8144, &i_this->current.pos, &i_this->current.angle);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8145, &i_this->current.pos, &i_this->current.angle);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_BRIDGE_L00, &i_this->current.pos, &i_this->current.angle);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_BRIDGE_S00, &i_this->current.pos, &i_this->current.angle);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_DK_BRIDGE_TENITA00, &i_this->current.pos, &i_this->current.angle);
             GXColor prim_col;
             prim_col.r = 0x46;
             prim_col.g = 0x3C;
@@ -271,7 +271,7 @@ static void tower_kaidan_move(bdkobj_class* i_this) {
             i_this->m938_demo =
 #endif
                 dComIfGp_particle_setToon(
-                    dPa_name::ID_SCENE_A146, &i_this->current.pos, &i_this->current.angle, NULL, 0xB4, &i_this->m918, (s8)fopAcM_GetRoomNo(i_this)
+                    dPa_name::ID_IT_ST_DK_BRIDGE_SMOKE00, &i_this->current.pos, &i_this->current.angle, NULL, 0xB4, &i_this->m918, (s8)fopAcM_GetRoomNo(i_this)
                 );
 #if VERSION == VERSION_DEMO
             JPABaseEmitter* emitter = i_this->m938_demo;
@@ -371,13 +371,13 @@ static BOOL daBdkobj_Execute(bdkobj_class* i_this) {
                     u16 uVar6;
                     u16 uVar4;
                     if (i_this->m298 == 0) {
-                        uVar8 = dPa_name::ID_SCENE_A13D;
-                        uVar6 = dPa_name::ID_SCENE_813E;
-                        uVar4 = dPa_name::ID_SCENE_813F;
+                        uVar8 = dPa_name::ID_IT_ST_DK_BLOCK_SMOKE00;
+                        uVar6 = dPa_name::ID_IT_SN_DK_BLOCK_S00;
+                        uVar4 = dPa_name::ID_IT_SN_DK_BLOCK_L00;
                     } else {
-                        uVar8 = dPa_name::ID_SCENE_A140;
-                        uVar6 = dPa_name::ID_SCENE_8141;
-                        uVar4 = dPa_name::ID_SCENE_8142;
+                        uVar8 = dPa_name::ID_IT_ST_DK_POLE_SMOKE00;
+                        uVar6 = dPa_name::ID_IT_SN_DK_POLE_S00;
+                        uVar4 = dPa_name::ID_IT_SN_DK_POLE_L00;
                     }
                     static csXyz eff_ang = at->shape_angle;
                     eff_ang.z = 0;

src/d/actor/d_a_beam.cpp

@@ -513,7 +513,7 @@ void daBeam_c::timer_change() {
     m5F6--;
     if (m5F6 > 0) {
         if (m690 == NULL) {
-            m690 = dComIfGp_particle_set(dPa_name::ID_SCENE_8121, &current.pos);
+            m690 = dComIfGp_particle_set(dPa_name::ID_AK_SN_LASERROOT00, &current.pos);
         }
 
         if (m5F4 == 0) {

src/d/actor/d_a_bita.cpp

@@ -85,9 +85,9 @@ static void mode_dead(bita_class* i_this) {
                 type = 1;
 
             if (type == 0) {
-                dComIfGp_particle_set(dPa_name::ID_SCENE_80E3, &i_this->current.pos, &i_this->shape_angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDBURNEDBOARD00, &i_this->current.pos, &i_this->shape_angle);
             } else {
-                dComIfGp_particle_set(dPa_name::ID_SCENE_80E4, &i_this->current.pos, &i_this->shape_angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDBURNEDBOARD01, &i_this->current.pos, &i_this->shape_angle);
             }
         }
 

src/d/actor/d_a_bk.cpp

@@ -170,7 +170,7 @@ static void smoke_set_s(bk_class* i_this, f32 rate) {
     case dBgS_Attr_SAND_e: {
         i_this->m0350.remove();
         JPABaseEmitter* emitter1 = dComIfGp_particle_setToon(
-            dPa_name::ID_COMMON_2022, &i_this->m0338, &i_this->m0344, NULL, 0xB9,
+            dPa_name::ID_AK_JT_ELEMENTSMOKE00, &i_this->m0338, &i_this->m0344, NULL, 0xB9,
             &i_this->m0350, fopAcM_GetRoomNo(i_this)
         );
         if (emitter1) {
@@ -185,7 +185,7 @@ static void smoke_set_s(bk_class* i_this, f32 rate) {
         break;
     }
     case dBgS_Attr_GRASS_e:
-        JPABaseEmitter* emitter2 = dComIfGp_particle_set(dPa_name::ID_COMMON_0024, &i_this->m0338, &i_this->m0344);
+        JPABaseEmitter* emitter2 = dComIfGp_particle_set(dPa_name::ID_AK_JN_ELEMENTKUSA00, &i_this->m0338, &i_this->m0344);
         if (emitter2) {
             emitter2->setRate(rate * 0.5f);
             emitter2->setMaxFrame(3);
@@ -2288,7 +2288,7 @@ temp_1B8:
                 i_this->m0314 = 0x10;
                 cXyz sp18;
                 sp18.x = sp18.y = sp18.z = 1.0f;
-                dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &i_this->m11E4, NULL, &sp18);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, &i_this->m11E4, NULL, &sp18);
             }
         }
         
@@ -2677,13 +2677,13 @@ static void yogan_fail(bk_class* i_this) {
         }
         // Fall-through
     case 1:
-        dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8061, &i_this->current.pos);
-        dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8058, &i_this->current.pos);
+        dComIfGp_particle_setSimple(dPa_name::ID_IT_SN_O_FIREK_KASU, &i_this->current.pos);
+        dComIfGp_particle_setSimple(dPa_name::ID_IT_SN_O_MAGT_FCHIP, &i_this->current.pos);
         
         if ((i_this->m02F8 & 7) == 0) {
             i_this->m0344.y = cM_rndF(0x10000);
             i_this->m0344.x = -0x2000;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_000E, &i_this->m116C, &i_this->m0344);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_TUBA00, &i_this->m116C, &i_this->m0344);
         }
         
         cLib_addCalcAngleS2(&i_this->current.angle.x, -0x4000, 10, 0x200);
@@ -3540,7 +3540,7 @@ static void damage_check(bk_class* i_this) {
         csXyz sp18(player->shape_angle);
         sp18.y += 0x8000;
         JPABaseEmitter* emitter = dComIfGp_particle_set(
-            dPa_name::ID_COMMON_002B, &i_this->m11CC, &sp18,
+            dPa_name::ID_AK_JN_ELEMENTKIKUZU00, &i_this->m11CC, &sp18,
             NULL, 0xFF, NULL, -1,
             &actor->tevStr.mColorK0, &actor->tevStr.mColorK0
         );
@@ -4436,7 +4436,7 @@ static BOOL daBk_Execute(bk_class* i_this) {
         i_this->m0336--;
         if (i_this->m0336 == 0) {
             i_this->m0344.y = i_this->current.angle.y;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_000E, &i_this->m116C, &i_this->m0344);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_TUBA00, &i_this->m116C, &i_this->m0344);
         }
     }
     

src/d/actor/d_a_bmd.cpp

@@ -173,7 +173,7 @@ void damage(bmd_class* i_this) {
             sVar5 = fopAcM_searchPlayerAngleY(actor);
             i_this->m93C = sVar5;
             i_this->mBD8 = 2000.0f;
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80F3, &actor->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMOPENHOUSHI00, &actor->current.pos);
             if (dComIfGp_getStartStageName()[0] == 'X') {
                 mDoAud_bgmStart(JA_BGM_UNK_151);
             } else {
@@ -188,7 +188,7 @@ void damage(bmd_class* i_this) {
         }
         if ((s16)i_this->mpMorf->getFrame() == 30) {
             for (s32 i = 0; i < (s32)ARRAY_SIZE(jno); i++) {
-                pJVar4 = dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0F4, &actor->current.pos, NULL, NULL, 0xB9, &i_this->mA90[i], fopAcM_GetRoomNo(actor));
+                pJVar4 = dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BKMOPENSMOKE00, &actor->current.pos, NULL, NULL, 0xB9, &i_this->mA90[i], fopAcM_GetRoomNo(actor));
                 if (pJVar4 != NULL) {
                     pJVar4->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(jno[i]));
                 }
@@ -222,7 +222,7 @@ void damage(bmd_class* i_this) {
             mDoAud_seStart(JA_SE_CM_BKM_BODY_CLOSE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
         }
         if ((s16)i_this->mpMorf->getFrame() == 27) {
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8100, &actor->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMCLOSEHOUSHI00, &actor->current.pos);
             if (dComIfGp_getStartStageName()[0] == 'X') {
                 mDoAud_bgmStart(JA_BGM_PAST_BKM);
             } else {
@@ -297,8 +297,8 @@ void damage(bmd_class* i_this) {
             dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
             mDoAud_seStart(JA_SE_CM_BKM_BODY_FALL, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
             actor->speed.y = 10.0f;
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80F1, &actor->current.pos);
-            dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0F2, &actor->current.pos, NULL, NULL, 0xB9, &i_this->mA90[5], (u8)actor->current.roomNo);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMDROPDOWNSOIL00, &actor->current.pos);
+            dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BKMDROPDOWNSMOKE00, &actor->current.pos, NULL, NULL, 0xB9, &i_this->mA90[5], (u8)actor->current.roomNo);
         } else {
             actor->speed.y = 0.0f;
         }
@@ -356,8 +356,8 @@ void eat(bmd_class* i_this) {
         return;
     case 3:
         if (i_this->mB78 == REG0_S(2) + 0x50) {
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80F8, &actor->current.pos);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80F7, &actor->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMHAKIDASHISMOKE00, &actor->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMHAKIDASHIHOUSHI01, &actor->current.pos);
             i_this->m314 = 100;
         }
         if (i_this->mB78 == 0x55) {
@@ -482,7 +482,7 @@ void start(bmd_class* i_this) {
             mDoAud_seStart(JA_SE_CM_BKM_FLW_TO_BUD, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
         }
         if (i_this->mB76 == 0xb1) {
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8100, &actor->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMCLOSEHOUSHI00, &actor->current.pos);
         }
         if (i_this->mB76 >= 0x96) {
             if (i_this->m331 > 0) {
@@ -550,7 +550,7 @@ void end(bmd_class* i_this) {
             i_this->mBD8 = 2000.0f;
             i_this->m332 = 9;
             for (s32 i = 0; i < (s32)ARRAY_SIZE(jno); i++) {
-                pJVar3 = dComIfGp_particle_set(dPa_name::ID_SCENE_80FF, &actor->current.pos);
+                pJVar3 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMHANAKARERU00, &actor->current.pos);
                 if (pJVar3 != NULL) {
                     pJVar3->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(jno[i]));
                 }
@@ -728,7 +728,7 @@ void core_move(bmd_class* i_this) {
         break;
     case 105:
         if ((s16)i_this->m2C4->getFrame() == 37) {
-            pJVar7 = dComIfGp_particle_set(dPa_name::ID_SCENE_80FE, &actor->current.pos);
+            pJVar7 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMCORESIGH00, &actor->current.pos);
             if (pJVar7 != NULL) {
                 pJVar7->setGlobalRTMatrix(i_this->m2C4->getModel()->getAnmMtx(5));
             }
@@ -817,7 +817,7 @@ void core_move(bmd_class* i_this) {
     i_this->mCoreSph.SetR(50.0f);
     dComIfG_Ccsp()->Set(&i_this->mCoreSph);
     if (bVar5) {
-        dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0FD, &i_this->m924, NULL, NULL, 0xB9, &i_this->mA90[6], (u8)actor->current.roomNo);
+        dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BKMCOREDEADSMOKE00, &i_this->m924, NULL, NULL, 0xB9, &i_this->mA90[6], (u8)actor->current.roomNo);
         mDoAud_seStart(JA_SE_CM_BKM_END_CORE_LEAP, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
     }
 }
@@ -873,7 +873,7 @@ void mk_move(bmd_class* i_this) {
             if ((int)i_this->m2C8->getFrame() == 6) {
                 local_28 = i_this->m2E0;
                 local_28.y += 10.0f;
-                pJVar3 = dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0FD, &local_28, NULL, NULL, 0xB9, &i_this->mA90[6], (u8)actor->current.roomNo);
+                pJVar3 = dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BKMCOREDEADSMOKE00, &local_28, NULL, NULL, 0xB9, &i_this->mA90[6], (u8)actor->current.roomNo);
                 if (pJVar3 != NULL) {
                     pJVar3->mGlobalDynamicsScale.x = 0.5f;
                     pJVar3->mGlobalDynamicsScale.y = 0.5f;
@@ -1086,7 +1086,7 @@ void move(bmd_class* i_this) {
     }
 }
 
-static u16 eff_name[] = {dPa_name::ID_SCENE_80EE, dPa_name::ID_SCENE_80EF, dPa_name::ID_SCENE_80F5};
+static u16 eff_name[] = {dPa_name::ID_AK_SN_BKMCOREWAIT00, dPa_name::ID_AK_SN_BKMCOREDAMAGE00, dPa_name::ID_AK_SN_BKMCOREBLOOD00};
 static u16 eff_joint[] = {0x0008, 0x0009, 0x0004};
 
 /* 00003BDC-00003D48       .text eff_cont__FP9bmd_class */

src/d/actor/d_a_bmdfoot.cpp

@@ -122,7 +122,7 @@ void wait(bmdfoot_class* i_this) {
         MTXCopy(i_this->m2B4->getModel()->getAnmMtx(eff_id[i]), *calc_mtx);
         MtxPosition(&local_98, &i_this->m3F8[i]);
         if (i_this->m3F4 == 0) {
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80ED, &i_this->m3F8[i], NULL, NULL, 0xFF, &i_this->m41C[i]);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMASIWAIT00, &i_this->m3F8[i], NULL, NULL, 0xFF, &i_this->m41C[i]);
         }
         if (i_this->m41C[i].getEmitter() != NULL) {
             if (iVar3 == 0) {
@@ -242,10 +242,10 @@ void attack_1(bmdfoot_class* i_this) {
             for (s32 i = 0; i < (s32)ARRAY_SIZE(jno); i++) {
                 MTXCopy(i_this->m2B4->getModel()->getAnmMtx(jno[i]), *calc_mtx);
                 MtxPosition(&local_5c, &cStack_68);
-                dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8065, &cStack_68, 0xFF, g_whiteColor, g_whiteColor, 0);
+                dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BKMSATTACKHOUSHI00, &cStack_68, 0xFF, g_whiteColor, g_whiteColor, 0);
             }
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8066, &i_this->mAE8, 0xFF, g_whiteColor, g_whiteColor, 0);
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_A06A, &i_this->mAE8, 0xB9, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BKMSATTACKSOIL00, &i_this->mAE8, 0xFF, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_ST_O_BKMSATTACKSMOKE00, &i_this->mAE8, 0xB9, g_whiteColor, g_whiteColor, 0);
         }
         if (i_this->m2B4->isStop()) {
             i_this->m2BA = 0;
@@ -303,7 +303,7 @@ s32 ug_move(bmdfoot_class* i_this) {
         i_this->mBA8 = 2;
         fVar7 = cM_rndF(10000.0f);
         i_this->m2B8 = (s16)(int)fVar7;
-        dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0FC, &i_this->mBAC, &i_this->mBB8, NULL, 0xB9, &i_this->m4B0, (u8)actor->current.roomNo);
+        dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BKMLATTACKSMOKE01, &i_this->mBAC, &i_this->mBB8, NULL, 0xB9, &i_this->m4B0, (u8)actor->current.roomNo);
         break;
     case 0xa:
         break;
@@ -373,9 +373,9 @@ void attack_2(bmdfoot_class* i_this) {
         if ((s32)i_this->m2B4->getFrame() == 49) {
             MTXCopy(i_this->m2B4->getModel()->getAnmMtx(0x11), *calc_mtx);
             MtxPosition(&local_3c, &local_48);
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8065, &local_48, 0xFF, g_whiteColor, g_whiteColor, 0);
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8066, &local_48, 0xFF, g_whiteColor, g_whiteColor, 0);
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_A06A, &local_48, 0xB9, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BKMSATTACKHOUSHI00, &local_48, 0xFF, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BKMSATTACKSOIL00, &local_48, 0xFF, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_ST_O_BKMSATTACKSMOKE00, &local_48, 0xB9, g_whiteColor, g_whiteColor, 0);
             mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_IN_G, &i_this->mAE8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
         }
         if (i_this->m2B4->isStop()) {
@@ -395,9 +395,9 @@ void attack_2(bmdfoot_class* i_this) {
     case 4:
         if ((s32)i_this->mAF4->getFrame() == 2) {
             local_48 = i_this->mBAC;
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8065, &local_48, 0xFF, g_whiteColor, g_whiteColor, 0);
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8066, &local_48, 0xFF, g_whiteColor, g_whiteColor, 0);
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_A06A, &local_48, 0xB9, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BKMSATTACKHOUSHI00, &local_48, 0xFF, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BKMSATTACKSOIL00, &local_48, 0xFF, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_ST_O_BKMSATTACKSMOKE00, &local_48, 0xB9, g_whiteColor, g_whiteColor, 0);
             mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_OUT_G, &i_this->mBAC, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
         }
         ug_move(i_this);
@@ -427,12 +427,12 @@ void attack_2(bmdfoot_class* i_this) {
     case 6:
         ug_move(i_this);
         if ((s32)i_this->mAF4->getFrame() == 12) {
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80F9, &i_this->mBAC);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80FA, &i_this->mBAC);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMLATTACKHOUSHI00, &i_this->mBAC);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMLATTACKSOIL00, &i_this->mBAC);
             i_this->m498[0].x = i_this->mBAC.x;
             i_this->m498[0].y = i_this->mBAC.y;
             i_this->m498[0].z = i_this->mBAC.z;
-            dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0FB, &i_this->m498[0], NULL, NULL, 0xB9, &i_this->m458[0], (u8)actor->current.roomNo);
+            dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BKMLATTACKSMOKE00, &i_this->m498[0], NULL, NULL, 0xB9, &i_this->m458[0], (u8)actor->current.roomNo);
             mDoAud_seStart(JA_SE_CM_BKM_ATKVINE_IN_G2, &i_this->mBAC, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
         }
         if (i_this->mAF4->isStop()) {
@@ -446,12 +446,12 @@ void attack_2(bmdfoot_class* i_this) {
         if ((s32)i_this->m2B4->getFrame() == 13) {
             local_48 = actor->current.pos;
             local_48.y = i_this->mBAC.y;
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80F9, &local_48);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80FA, &local_48);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMLATTACKHOUSHI00, &local_48);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BKMLATTACKSOIL00, &local_48);
             i_this->m498[1].x = local_48.x;
             i_this->m498[1].y = local_48.y;
             i_this->m498[1].z = local_48.z;
-            dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0FB, &i_this->m498[1], NULL, NULL, 0xB9, &i_this->m458[1], (u8)actor->current.roomNo);
+            dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BKMLATTACKSMOKE00, &i_this->m498[1], NULL, NULL, 0xB9, &i_this->m458[1], (u8)actor->current.roomNo);
         }
         if (i_this->m2B4->isStop()) {
             i_this->m2BA = 0;

src/d/actor/d_a_bmdhand.cpp

@@ -220,7 +220,7 @@ void cut_control(bmdhand_class* i_this) {
         pcVar6->m0C.y = (dVar9 * (pcVar6->m00.y - pcVar6->m0C.y));
         pcVar6->m0C.z = (dVar9 * (pcVar6->m00.z - pcVar6->m0C.z));
         if ((i == 0x13) && (i_this->m2CA != 0)) {
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8067, &pcVar6->m00, 0xFF, g_whiteColor, g_whiteColor, 0);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BKMTENTACLEBLOOD00, &pcVar6->m00, 0xFF, g_whiteColor, g_whiteColor, 0);
         }
     }
 }
@@ -498,8 +498,8 @@ void hand_move(bmdhand_class* i_this) {
                 fopAcM_monsSeStart(actor, JA_SE_CV_BKM_CUT_VINE_1, 0);
                 mDoAud_seStart(JA_SE_CM_BKM_CUT_VINE, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
                 local_58.setall(0.5f);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0013, &actor->eyePos, NULL, &local_58, 0xFF);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0016, &actor->eyePos, NULL, &local_58, 0xFF);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUBAKUEN, &actor->eyePos, NULL, &local_58, 0xFF);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUFLASH, &actor->eyePos, NULL, &local_58, 0xFF);
                 if (boss->m331 > 0) {
                     boss->m331--;
                     boss->m312 = 3;

src/d/actor/d_a_boko.cpp

@@ -284,7 +284,7 @@ void daBoko_c::setFlameEffect() {
     }
 
     if (mParticleCallBack.getEmitter() == NULL) {
-        dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &m2D0, NULL, &scale, 0xff, &mParticleCallBack);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_TORCH, &m2D0, NULL, &scale, 0xff, &mParticleCallBack);
         m320 = m2D0;
     }
 
@@ -320,7 +320,7 @@ void daBoko_c::setFlameEffect() {
     }
 
     if (!checkNoDraw()) {
-        dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &m2D0);
+        dComIfGp_particle_setSimple(dPa_name::ID_AK_JP_O_KAGEROU00, &m2D0);
     }
 }
 
@@ -752,7 +752,7 @@ BOOL daBoko_c::execute() {
         f32 waterY;
         if (bVar4 || (fopAcM_getWaterY(&m2D0, &waterY) && waterY >= m2D0.y)) {
             if (mFlameTimer != 0) {
-                dComIfGp_particle_set(dPa_name::ID_COMMON_035A, &m2D0);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_EVAPORATION00, &m2D0);
             }
             mFlameTimer = 0;
         }

src/d/actor/d_a_bomb2.cpp

@@ -697,10 +697,10 @@ namespace daBomb2 {
     }
 
     void Act_c::eff_explode_normal(const csXyz* rotation) {
-        dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &scale);
-        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, &current.pos, NULL, &scale);
-        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &scale);
-        dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &scale);
+        dComIfGp_particle_setP1(dPa_name::ID_IT_JN_BMEX_SENKO, &current.pos, rotation, &scale);
+        dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE01, &current.pos, NULL, &scale);
+        dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, &current.pos, NULL, &scale);
+        dComIfGp_particle_setToonP1(dPa_name::ID_IT_JT_BMEX_HAHEN, &current.pos, NULL, &scale);
     }
 
     void Act_c::eff_explode_water() {
@@ -729,8 +729,8 @@ namespace daBomb2 {
             field_0x6CC = field_0x6C0;
             field_0x6D8 = field_0x6C0;
 
-            dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &field_0x6C0, NULL, &scale, 0xFF, &mSparks);
-            dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_2012, &field_0x6C0, NULL, &scale, 0xDC, &mSmoke);
+            dComIfGp_particle_setP1(dPa_name::ID_IT_JN_BM_HIBANA, &field_0x6C0, NULL, &scale, 0xFF, &mSparks);
+            dComIfGp_particle_setToonP1(dPa_name::ID_IT_JT_BM_SMOKE, &field_0x6C0, NULL, &scale, 0xDC, &mSmoke);
             mSmoke.setOldPosP(&field_0x6CC, &field_0x6D8);
         }
     }

src/d/actor/d_a_bomb3.inc

@@ -690,7 +690,7 @@ void daBomb_c::makeFireEffect(cXyz& pos, csXyz& rotation) {
 
     rotation.x = rotation.x + 0x4000;
     rotation.z = rotation.z;
-    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &pos, &rotation, &scale);
+    dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, &pos, &rotation, &scale);
 
     dComIfGp_getVibration().StartShock(7, -0x21, cXyz(0.0f, 1.0f, 0.0f));
 }
@@ -726,8 +726,8 @@ void daBomb_c::setFuseEffect() {
         mFusePos2 = mFusePos;
         mFusePos3 = mFusePos;
 
-        dComIfGp_particle_setP1(dPa_name::ID_COMMON_FUSE_SPARKS, &mFusePos, NULL, &scale, 0xFF, &mSparks);
-        dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_2012, &mFusePos, NULL, &scale, 0xDC, &mSmoke);
+        dComIfGp_particle_setP1(dPa_name::ID_IT_JN_BM_HIBANA, &mFusePos, NULL, &scale, 0xFF, &mSparks);
+        dComIfGp_particle_setToonP1(dPa_name::ID_IT_JT_BM_SMOKE, &mFusePos, NULL, &scale, 0xDC, &mSmoke);
         mSmoke.field_0x0C = &mFusePos2;
         mSmoke.field_0x10 = &mFusePos3;
         mSmoke.field_0x04 = 0x14;
@@ -736,28 +736,28 @@ void daBomb_c::setFuseEffect() {
 
 /* 800DAD6C-800DAE54       .text eff_explode_normal__8daBomb_cFPC5csXyz */
 void daBomb_c::eff_explode_normal(const csXyz* rotation) {
-    dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &scale);
-    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, &current.pos, NULL, &scale);
-    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &scale);
-    dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &scale);
+    dComIfGp_particle_setP1(dPa_name::ID_IT_JN_BMEX_SENKO, &current.pos, rotation, &scale);
+    dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE01, &current.pos, NULL, &scale);
+    dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, &current.pos, NULL, &scale);
+    dComIfGp_particle_setToonP1(dPa_name::ID_IT_JT_BMEX_HAHEN, &current.pos, NULL, &scale);
 }
 
 /* 800DAE54-800DAF94       .text eff_explode_cheap__8daBomb_cFPC5csXyz */
 void daBomb_c::eff_explode_cheap(const csXyz* rotation) {
-    JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_LIGHT_FLASH, &current.pos, rotation, &scale);
+    JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_BMEX_SENKO, &current.pos, rotation, &scale);
     if(emitter) {
         emitter->setLifeTime(12);
         emitter->setGlobalParticleScale(0.5f, 0.67f);
     }
 
-    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_232A, &current.pos, NULL, &scale);
+    dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKELIGHT, &current.pos, NULL, &scale);
     
-    emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &current.pos, NULL, &scale);
+    emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, &current.pos, NULL, &scale);
     if(emitter) {
         emitter->setLifeTime(70);
     }
     
-    emitter = dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, &current.pos, NULL, &scale);
+    emitter = dComIfGp_particle_setToonP1(dPa_name::ID_IT_JT_BMEX_HAHEN, &current.pos, NULL, &scale);
     if(emitter) {
         emitter->setLifeTime(70);
         emitter->setAwayFromAxisSpeed(25.0f);

src/d/actor/d_a_boomerang.cpp

@@ -463,7 +463,7 @@ void daBoomerang_c::checkBgHit(cXyz* pi_start, cXyz* pi_end) {
     mLinChk.Set(pi_start, pi_end, this);
     if (dComIfG_Bgsp()->LineCross(&mLinChk)) {
         current.pos.set(mLinChk.GetCross());
-        dComIfGp_particle_setP1(dPa_name::ID_COMMON_PURPLE_HIT, &current.pos);
+        dComIfGp_particle_setP1(dPa_name::ID_AK_JN_NG, &current.pos);
         mIsReturning = true;
         current.angle.y += 0x8000;
         shape_angle.y = current.angle.y;

src/d/actor/d_a_bpw.cpp

@@ -511,7 +511,7 @@ BOOL body_atari_check(bpw_class* i_this) {
         local_58.x = 2.0f;
         local_58.y = 2.0f;
         local_58.z = 2.0f;
-        dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &local_4c, &player->shape_angle, &local_58);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, &local_4c, &player->shape_angle, &local_58);
     }
     return FALSE;
 }
@@ -541,13 +541,13 @@ s32 wall_HIT_check(bpw_class* i_this) {
     if (i_this->mAcchCir.ChkWallHit()) {
         dComIfG_Bgsp()->GetTriPnt(i_this->mAcchCir, &acStack_24, &cStack_30, &cStack_3c);
         if (dComIfG_Bgsp()->GetAttributeCode(i_this->mAcchCir) == dBgS_Attr_DAMAGE_e) {
-            dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &acStack_24, &player->shape_angle, &local_48);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &acStack_24, &player->shape_angle, &local_48);
 #if VERSION > VERSION_DEMO
             i_this->m408 = 0xb5;
 #endif
             return 2;
         } else {
-            dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &acStack_24, &player->shape_angle, &local_48);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &acStack_24, &player->shape_angle, &local_48);
             return 1;
         }
     } else {
@@ -676,7 +676,7 @@ void noroi_check(bpw_class* i_this) {
                 csXyz local_28 = actor->shape_angle;
                 camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
                 i_this->mFire1DousaPos = player2->getHeadTopPos();
-                dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->mFire1DousaPos);
+                dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &i_this->mFire1DousaPos);
                 local_28.y = camera->mAngle.y;
                 fopAcM_create(PROC_BPW, bpw_class::Actor_Type_TORITUKI_e, &i_this->mFire1DousaPos, fopAcM_GetRoomNo(actor), &local_28);
             }
@@ -1316,10 +1316,10 @@ void action_kougeki(bpw_class* i_this) {
         i_this->mSomeCountdownTimers[0] = 30;
         i_this->mSomeCountdownTimers[0] += (int)cM_rndF(i_this->mSomeCountdownTimers[0]);
 #if VERSION == VERSION_DEMO
-        i_this->m508_demo = dComIfGp_particle_set(dPa_name::ID_SCENE_82CE, &i_this->m394);
+        i_this->m508_demo = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWINHALE01, &i_this->m394);
 #else
         if (i_this->m540.getEmitter() != NULL) {
-            dComIfGp_particle_set(dPa_name::ID_SCENE_82CE, &i_this->m394, NULL, NULL, 0xff, &i_this->m540);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWINHALE01, &i_this->m394, NULL, NULL, 0xff, &i_this->m540);
         }
 #endif
         i_this->mActionState++;
@@ -1338,7 +1338,7 @@ void action_kougeki(bpw_class* i_this) {
         }
 #endif
         if (i_this->mSomeCountdownTimers[1] == 0) {
-            pJVar11 = dComIfGp_particle_set(dPa_name::ID_SCENE_82CD, &i_this->m394, &actor->shape_angle);
+            pJVar11 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWINHALE00, &i_this->m394, &actor->shape_angle);
             if (pJVar11 != NULL) {
                 pJVar11->setGlobalSRTMatrix(i_this->mpAnim->getModel()->getAnmMtx(2));
             }
@@ -1367,14 +1367,14 @@ void action_kougeki(bpw_class* i_this) {
             if (i_this->m52C.getEmitter() == NULL)
 #endif
             {
-                dComIfGp_particle_set(dPa_name::ID_SCENE_82CF, &i_this->m394, NULL, NULL, 0xff, DEMO_SELECT(NULL, &i_this->m52C));
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWBLOW00, &i_this->m394, NULL, NULL, 0xff, DEMO_SELECT(NULL, &i_this->m52C));
             }
             i_this->mFire1DousaPos = actor->current.pos;
             i_this->mFire1DousaPos.y = i_this->mAcch.GetGroundH();
             i_this->mFire1DousaRot = actor->shape_angle;
             if (i_this->m50C.getEmitter() == NULL) {
                 dComIfGp_particle_setToon(
-                    dPa_name::ID_SCENE_A2D0, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xa0, &i_this->m50C, fopAcM_GetRoomNo(actor)
+                    dPa_name::ID_AK_ST_BPWBLOWSMOKE00, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xa0, &i_this->m50C, fopAcM_GetRoomNo(actor)
                 );
             }
             anm_init(i_this, BPW_BCK_IKI_WAIT1, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f, -1);
@@ -1558,7 +1558,7 @@ void action_karada_taore(bpw_class* i_this) {
             i_this->mFire1DousaPos.y = i_this->mAcch.GetGroundH();
             i_this->m5E0[1].remove();
             pJVar4 = dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A401, &i_this->mFire1DousaPos, &actor->shape_angle, NULL, 0xb9, &i_this->m5E0[1], fopAcM_GetRoomNo(actor)
+                dPa_name::ID_AK_ST_BPWJUMPSMOKE00, &i_this->mFire1DousaPos, &actor->shape_angle, NULL, 0xb9, &i_this->m5E0[1], fopAcM_GetRoomNo(actor)
             );
             if (pJVar4 != NULL) {
                 dKy_get_seacolor(&local_24, &local_28);
@@ -1601,7 +1601,7 @@ void action_karada_taore(bpw_class* i_this) {
         i_this->mFire1DousaPos.y = i_this->mAcch.GetGroundH();
         i_this->m5E0[2].remove();
         pJVar4 = dComIfGp_particle_setToon(
-            dPa_name::ID_SCENE_A402, &i_this->mFire1DousaPos, &actor->shape_angle, NULL, 0xb9, &i_this->m5E0[2], fopAcM_GetRoomNo(actor)
+            dPa_name::ID_AK_ST_BPWPRESSSMOKE00, &i_this->mFire1DousaPos, &actor->shape_angle, NULL, 0xb9, &i_this->m5E0[2], fopAcM_GetRoomNo(actor)
         );
         if (pJVar4 != NULL) {
             dKy_get_seacolor(&local_24, &local_28);
@@ -1669,7 +1669,7 @@ void action_karada_taore(bpw_class* i_this) {
             i_this->mFire1DousaPos.y = i_this->mAcch.GetGroundH();
             i_this->m5E0[3].remove();
             pJVar4 = dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A403, &i_this->mFire1DousaPos, &actor->shape_angle, NULL, 0xb9, &i_this->m5E0[3], fopAcM_GetRoomNo(actor)
+                dPa_name::ID_AK_ST_BPWPRESSSMOKE01, &i_this->mFire1DousaPos, &actor->shape_angle, NULL, 0xb9, &i_this->m5E0[3], fopAcM_GetRoomNo(actor)
             );
             if (pJVar4 != NULL) {
                 dKy_get_seacolor(&local_24, &local_28);
@@ -1971,7 +1971,7 @@ void action_damage(bpw_class* i_this) {
             i_this->mFire1DousaPos.y = i_this->mAcch.GetGroundH();
             i_this->m5E0[0].remove();
             pJVar7 = dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A404, &i_this->mFire1DousaPos, &actor->shape_angle, NULL, 0xb9, &i_this->m5E0[0], fopAcM_GetRoomNo(actor)
+                dPa_name::ID_AK_ST_BPWSIRIMOTISMOKE00, &i_this->mFire1DousaPos, &actor->shape_angle, NULL, 0xb9, &i_this->m5E0[0], fopAcM_GetRoomNo(actor)
             );
             if (pJVar7 != NULL) {
                 dKy_get_seacolor(&local_64, &local_68);
@@ -1979,7 +1979,7 @@ void action_damage(bpw_class* i_this) {
                 pJVar7->setGlobalEnvColor(local_68.r, local_68.g, local_68.b);
             }
             fopAcM_seStart(actor, JA_SE_CM_BPW_DAMAGE_EXPLODE, 0);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8444, &actor->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWBUNRETUSMOKE00, &actor->current.pos);
             csXyz pwAngle = actor->shape_angle;
             local_58 = actor->current.pos;
             pwSpreadAmount = (int)(65536.0f / actor->health);
@@ -2715,7 +2715,7 @@ void action_bunri_dousa(bpw_class* i_this) {
             break;
         }
         REG20_S(0) = 0;
-        unk2 = dComIfGp_particle_set(dPa_name::ID_SCENE_8456, &actor->current.pos, &actor->shape_angle);
+        unk2 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWBREAKMASK00, &actor->current.pos, &actor->shape_angle);
         if (unk2 != NULL) {
             unk2->setGlobalPrmColor(g_env_light.mBG0_K0.r, g_env_light.mBG0_K0.g, g_env_light.mBG0_K0.b);
         }
@@ -3085,7 +3085,7 @@ void action_start_demo(bpw_class* i_this) {
         i_this->mFire1DousaPos = i_this->m3B8;
         i_this->mFire1DousaRot = actor->shape_angle;
         if (i_this->m554.getEmitter() == NULL) {
-            dComIfGp_particle_set(dPa_name::ID_SCENE_845A, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->m554);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWOPENINGSMOKE00, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->m554);
         }
         fopAcM_seStart(actor, JA_SE_CM_BPW_MASK_TO_BPW, 0);
         i_this->mActionState++;
@@ -3579,12 +3579,12 @@ void action_b_fire_1_dousa(bpw_class* i_this) {
         i_this->m49C = 40.0f;
         if (i_this->mFire1Dousa_Pa_followEcallBack.getEmitter() == NULL) {
             dComIfGp_particle_set(
-                dPa_name::ID_SCENE_8310, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->mFire1Dousa_Pa_followEcallBack
+                dPa_name::ID_AK_SN_BPWFLAMETHROWER00, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->mFire1Dousa_Pa_followEcallBack
             );
         }
         if (i_this->mFire1Dousa_Pa_followEcallBack2.getEmitter() == NULL) {
             dComIfGp_particle_set(
-                dPa_name::ID_SCENE_8311, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->mFire1Dousa_Pa_followEcallBack2
+                dPa_name::ID_AK_SN_BPWFLAMETHROWER01, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->mFire1Dousa_Pa_followEcallBack2
             );
         }
         i_this->mSomeCountdownTimers[0] = 5;
@@ -3617,7 +3617,7 @@ void action_b_fire_1_dousa(bpw_class* i_this) {
                 i_this->m680 = cM_atan2s(fVar1, fVar2);
             }
             if (i_this->m590.getEmitter() == NULL) {
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8312, &i_this->m66C, (csXyz*)&i_this->m67E, NULL, 0xff, &i_this->m590);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWFLAMETHROWER02, &i_this->m66C, (csXyz*)&i_this->m67E, NULL, 0xff, &i_this->m590);
             }
         } else {
             i_this->m590.remove();
@@ -3661,12 +3661,12 @@ void action_b_fire_2_dousa(bpw_class* i_this) {
         i_this->m49C = 40.0f;
         if (i_this->mFireDousa2_Pa_followEcallBack.getEmitter() == NULL) {
             dComIfGp_particle_set(
-                dPa_name::ID_SCENE_82D1, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->mFireDousa2_Pa_followEcallBack
+                dPa_name::ID_AK_SN_BPWFIRE00, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->mFireDousa2_Pa_followEcallBack
             );
         }
         if (i_this->mFireDousa2_Pa_followEcallBack2.getEmitter() == NULL) {
             dComIfGp_particle_set(
-                dPa_name::ID_SCENE_82D2, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->mFireDousa2_Pa_followEcallBack2
+                dPa_name::ID_AK_SN_BPWFIRE01, &i_this->mFire1DousaPos, &i_this->mFire1DousaRot, NULL, 0xff, &i_this->mFireDousa2_Pa_followEcallBack2
             );
         }
         iVar4 = cM_atan2s(player->current.pos.x - actor->current.pos.x, player->current.pos.z - actor->current.pos.z);
@@ -3693,9 +3693,9 @@ void action_b_fire_2_dousa(bpw_class* i_this) {
             local_30 = actor->current.pos;
             local_30.y = i_this->mAcch.GetGroundH();
             local_38.z = local_38.x = 0;
-            dComIfGp_particle_set(dPa_name::ID_SCENE_82D5, &local_30, &local_38);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_82D6, &local_30, &local_38);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_82D3, &local_30, &actor->current.angle);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWFLOORFIRE01, &local_30, &local_38);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWFLOORFIRE02, &local_30, &local_38);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWHITFIRE00, &local_30, &actor->current.angle);
             i_this->mFireDousa2_Pa_followEcallBack.remove();
             i_this->mFireDousa2_Pa_followEcallBack2.remove();
             if (i_this->mSomeCountdownTimers[1] == 0) {
@@ -3710,7 +3710,7 @@ void action_b_fire_2_dousa(bpw_class* i_this) {
             i_this->mActionState = 0x16;
         } else {
             if ((i_this->mAcch.ChkWallHit()) || (i_this->mDamageBallCoSph.ChkAtHit())) {
-                dComIfGp_particle_set(dPa_name::ID_SCENE_82D3, &actor->current.pos, &actor->current.angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BPWHITFIRE00, &actor->current.pos, &actor->current.angle);
                 i_this->mActionState = 0x17;
             }
         }
@@ -3907,7 +3907,7 @@ static BOOL daBPW_Execute(bpw_class* i_this) {
         kantera_draw_SUB(i_this);
         if (i_this->m3E7 == 0) {
             if (i_this->m5CC.getEmitter() == NULL) {
-                dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &i_this->m358, NULL, &actor->scale, 0xff, &i_this->m5CC);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_TORCH, &i_this->m358, NULL, &actor->scale, 0xff, &i_this->m5CC);
                 i_this->mFire1DousaPos = i_this->m358;
             }
             pJVar8 = i_this->m5CC.getEmitter();

src/d/actor/d_a_bridge.cpp

@@ -131,7 +131,7 @@ void kikuzu_set(bridge_class* i_this, cXyz* pPos) {
     csXyz shapeAngle = player->shape_angle;
     shapeAngle.y -= -0x8000;
 
-    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_COMMON_002B, pPos, &shapeAngle, NULL, 0xFF, NULL, -1, &i_this->actor.tevStr.mColorK0, &i_this->actor.tevStr.mColorK0, NULL);
+    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_ELEMENTKIKUZU00, pPos, &shapeAngle, NULL, 0xFF, NULL, -1, &i_this->actor.tevStr.mColorK0, &i_this->actor.tevStr.mColorK0, NULL);
     if (emitter != NULL) {
         emitter->setRate(10.0f);
         emitter->setMaxFrame(1);
@@ -973,7 +973,7 @@ static BOOL daBridge_Execute(bridge_class* i_this) {
                         bVar1 = true;
                     }
 
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &pBr->m3A8[0], &a_player->shape_angle);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &pBr->m3A8[0], &a_player->shape_angle);
                     kikuzu_set(i_this, &pBr->m3A8[0]);
                 }
 
@@ -997,7 +997,7 @@ static BOOL daBridge_Execute(bridge_class* i_this) {
                         bVar1 = true;
                     }
 
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &pBr->m3A8[1], &a_player->shape_angle);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &pBr->m3A8[1], &a_player->shape_angle);
                     kikuzu_set(i_this, &pBr->m3A8[1]);
                 }
             } else {
@@ -1007,14 +1007,14 @@ static BOOL daBridge_Execute(bridge_class* i_this) {
                     pBr->mCyl[0].OnTgNoConHit();
                     pBr->m3A0[0] = 15;
                     soundId = JA_SE_LK_HIT_SBRIDGE_CHAIN;
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, pBr->mCyl[0].GetTgHitPosP(), &a_player->shape_angle, &spB4);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, pBr->mCyl[0].GetTgHitPosP(), &a_player->shape_angle, &spB4);
                 }
 
                 if (pBr->mCyl[1].ChkTgHit() && (pBr->m3A0[1] < 10)) {
                     pBr->mCyl[1].OnTgNoConHit();
                     pBr->m3A0[1] = 15;
                     soundId = JA_SE_LK_HIT_SBRIDGE_CHAIN;
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, pBr->mCyl[1].GetTgHitPosP(), &a_player->shape_angle, &spB4);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, pBr->mCyl[1].GetTgHitPosP(), &a_player->shape_angle, &spB4);
                 }
             }
 
@@ -1054,7 +1054,7 @@ static BOOL daBridge_Execute(bridge_class* i_this) {
 
                 if (sp48.abs() < 50.0f) {
                     pBr->m3C0 = 30;
-                    pBr->m3C4 = dComIfGp_particle_set(dPa_name::ID_SCENE_80EA, &spA8);
+                    pBr->m3C4 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BRIDGEROPEFIRE00, &spA8);
                 }
             }
 
@@ -1086,7 +1086,7 @@ static BOOL daBridge_Execute(bridge_class* i_this) {
 
                 if (sp48.abs() < 50.0f) {
                     pBr->m3C2 = 30;
-                    pBr->m3C8 = dComIfGp_particle_set(dPa_name::ID_SCENE_80EA, &spA8);
+                    pBr->m3C8 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BRIDGEROPEFIRE00, &spA8);
                 }
             }
 

src/d/actor/d_a_bst.cpp

@@ -237,7 +237,7 @@ static void pos_move(bst_class* i_this, u8 param_2) {
 
 static u16 start_bck_d[] = {BST_BCK_BST_START, BST_BCK_LH_START, BST_BCK_RH_START};
 static u16 start2_bck_d[] = {0, BST_BCK_LH_START2, BST_BCK_RH_START2};
-static u16 start_smoke_name[] = {dPa_name::ID_SCENE_A1DE, dPa_name::ID_SCENE_A1DC, dPa_name::ID_SCENE_A1DD};
+static u16 start_smoke_name[] = {dPa_name::ID_AK_ST_BSTSTARTSMOKEHEAD00, dPa_name::ID_AK_ST_BSTSTARTSMOKELHAND00, dPa_name::ID_AK_ST_BSTSTARTSMOKERHAND00};
 
 /* 00000B1C-00000E58       .text stay__FP9bst_class */
 static void stay(bst_class* i_this) {
@@ -284,7 +284,7 @@ static void stay(bst_class* i_this) {
                 cXyz pos_vec;
                 cXyz vec(0.0f, 0.0f, 0.0f);
                 MtxPosition(&vec, &pos_vec);
-                dComIfGp_particle_setSimple(dPa_name::ID_SCENE_81D5, &pos_vec);
+                dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BSTFINGERFRAGMENT00, &pos_vec);
             }
         }
         cLib_addCalc2(&actor->current.pos.x, i_this->mTargetPos.x, 0.05f, 10.0f);
@@ -474,8 +474,8 @@ static void down_attack(bst_class* i_this) {
                 cXyz particle_pos;
                 particle_pos = actor->current.pos;
                 particle_pos.y = 1.0f;
-                dComIfGp_particle_setProjection(dPa_name::ID_SCENE_C1D6, &particle_pos);
-                dComIfGp_particle_setToon(dPa_name::ID_SCENE_A1D8, &particle_pos, NULL, NULL, 0xB9, &i_this->mPa_smokeEcallBack, fopAcM_GetRoomNo(actor));
+                dComIfGp_particle_setProjection(dPa_name::ID_AK_SP_BSTSHOCKWAVEH00, &particle_pos);
+                dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BSTATTACK1HSMOKE00, &particle_pos, NULL, NULL, 0xB9, &i_this->mPa_smokeEcallBack, fopAcM_GetRoomNo(actor));
             }
         } else {
             actor->speed.y += REG0_F(14) + 0.5f;
@@ -577,9 +577,9 @@ static void paa_attack(bst_class* i_this) {
                     fopAcM_seStartCurrent(actor, JA_SE_CM_BST_HAND_CLAP, 0);
                     csXyz local_70 = actor->shape_angle;
                     local_70.y += 0x4000;
-                    dComIfGp_particle_setProjection(dPa_name::ID_SCENE_C1D7, &i_this->mTargetPos, &local_70);
+                    dComIfGp_particle_setProjection(dPa_name::ID_AK_SP_BSTSHOCKWAVEV00, &i_this->mTargetPos, &local_70);
                     dComIfGp_particle_setToon(
-                        dPa_name::ID_SCENE_A1DA, &i_this->mTargetPos, &local_70, NULL, 0xB9, &i_this->mPa_smokeEcallBack, fopAcM_GetRoomNo(actor)
+                        dPa_name::ID_AK_ST_BSTCLAPSMOKE00, &i_this->mTargetPos, &local_70, NULL, 0xB9, &i_this->mPa_smokeEcallBack, fopAcM_GetRoomNo(actor)
                     );
                 }
                 i_this->m112A = REG0_S(8) + 5;
@@ -741,8 +741,8 @@ static void kumi_attack(bst_class* i_this) {
                 if (i_this->mBstPartType == bst_class::Type_LEFT_HAND_e) {
                     local_50 = i_this->mTargetPos;
                     local_50.y = 1.0f;
-                    dComIfGp_particle_setProjection(dPa_name::ID_SCENE_C1D6, &local_50);
-                    dComIfGp_particle_setToon(dPa_name::ID_SCENE_A1D9, &local_50, NULL, NULL, 0xb9, &i_this->mPa_smokeEcallBack, fopAcM_GetRoomNo(actor));
+                    dComIfGp_particle_setProjection(dPa_name::ID_AK_SP_BSTSHOCKWAVEH00, &local_50);
+                    dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BSTATTACK2HSMOKE00, &local_50, NULL, NULL, 0xb9, &i_this->mPa_smokeEcallBack, fopAcM_GetRoomNo(actor));
                     dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
                     fopAcM_seStartCurrent(actor, JA_SE_CM_BST_2_HAND_ATTACK, 0);
                 }
@@ -931,7 +931,7 @@ static void beam_set(bst_class* i_this) {
     }
 }
 
-static u16 charge_e_name[] = {dPa_name::ID_SCENE_81C2, dPa_name::ID_SCENE_81C3};
+static u16 charge_e_name[] = {dPa_name::ID_AK_SN_BSTENERGYCHARGE00, dPa_name::ID_AK_SN_BSTENERGYCHARGE01};
 
 /* 000035BC-00003B94       .text beam_attack__FP9bst_class */
 static void beam_attack(bst_class* i_this) {
@@ -1089,7 +1089,7 @@ static void head_damage(bst_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz v;
     f32 dist;
-    static u16 bomb_eff_name[] = {dPa_name::ID_SCENE_81E4, dPa_name::ID_SCENE_81E5, dPa_name::ID_SCENE_81E6, dPa_name::ID_SCENE_81E7};
+    static u16 bomb_eff_name[] = {dPa_name::ID_AK_SN_BSTBOMBNOSTRILSMOKEL00, dPa_name::ID_AK_SN_BSTBOMBNOSTRILSMOKER00, dPa_name::ID_AK_SN_BSTBOMBEARSMOKEL00, dPa_name::ID_AK_SN_BSTBOMBEARSMOKER00};
 
     i_this->mState = 10;
     i_this->m2E74[0] = 10;
@@ -1126,7 +1126,7 @@ static void head_damage(bst_class* i_this) {
             if (actor->current.pos.y <= REG0_F(14)) {
                 actor->current.pos.y = REG0_F(14);
                 dComIfGp_getVibration().StartShock(REG0_S(2) + 7, -0x21, cXyz(0.0f, 1.0f, 0.0f));
-                dComIfGp_particle_setToon(dPa_name::ID_SCENE_A1DB, &actor->current.pos, NULL, NULL, 0xB9, &i_this->mPa_smokeEcallBack, fopAcM_GetRoomNo(actor));
+                dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BSTDROPHEADSMOKE00, &actor->current.pos, NULL, NULL, 0xB9, &i_this->mPa_smokeEcallBack, fopAcM_GetRoomNo(actor));
                 i_this->m112A = REG0_S(7) + 4;
                 mDoAud_seStart(JA_SE_CM_BST_HEAD_FALL, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
                 mDoAud_seStart(JA_SE_CM_BST_MOUTH_OPEN, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -1173,7 +1173,7 @@ static void head_damage(bst_class* i_this) {
         }
         anm_init(i_this, BST_BCK_BOM_NOMI, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
         i_this->mDamage++;
-        i_this->m2EE0[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_81E3, &actor->current.pos);
+        i_this->m2EE0[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTBOMBFLASH00, &actor->current.pos);
         fopAcM_seStart(actor, JA_SE_CM_BST_MOUTH_CLOSE, 0);
         i_this->m10FC[0] = 0x3c;
         // fallthrough
@@ -1446,13 +1446,13 @@ static void damage_check(bst_class* i_this) {
                     i_this->mHurtRecoilAngle2 = -cM_atan2s(player_vec.y, std::sqrtf(SQUARE(player_vec.x) + SQUARE(player_vec.z)));
                     actor->speedF = 0.0f;
                     cXyz* hit_pos = i_this->mEyeSphs[eye_index].GetTgHitPosP();
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_0010, hit_pos);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, hit_pos);
                     cXyz scale;
                     scale.x = scale.y = scale.z = 2.0f;
                     csXyz angle;
                     angle.x = angle.z = 0;
                     angle.y = fopAcM_searchActorAngleY(actor, dComIfGp_getPlayer(0));
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, hit_pos, &angle, &scale);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, hit_pos, &angle, &scale);
                     dKy_SordFlush_set(*hit_pos, 1);
                 }
             }
@@ -1475,7 +1475,7 @@ static void damage_check(bst_class* i_this) {
                     i_this->mHurtRecoilAngle2 = -cM_atan2s(player_vec.y, std::sqrtf(SQUARE(player_vec.x) + SQUARE(player_vec.z)));
                     actor->speedF = 0.0f;
                     cXyz* hit_pos = i_this->mHandHurtCyl.GetTgHitPosP();
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_0010, hit_pos);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, hit_pos);
                     cXyz scale;
                     scale.z = 2.0f;
                     scale.y = 2.0f;
@@ -1483,7 +1483,7 @@ static void damage_check(bst_class* i_this) {
                     csXyz angle;
                     angle.x = angle.z = 0;
                     angle.y = fopAcM_searchActorAngleY(actor, dComIfGp_getPlayer(0));
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, hit_pos, &angle, &scale);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, hit_pos, &angle, &scale);
                     dKy_SordFlush_set(*hit_pos, 1);
                     i_this->mActionType = bst_class::ACTION_DAMAGE_e;
                     i_this->mDamage = 0;
@@ -1499,7 +1499,7 @@ static void damage_check(bst_class* i_this) {
     }
 }
 
-static u16 item_smoke_name[2] = {dPa_name::ID_SCENE_A1DF, dPa_name::ID_SCENE_A1E0};
+static u16 item_smoke_name[2] = {dPa_name::ID_AK_ST_BSTNOSTRILSMOKEL00, dPa_name::ID_AK_ST_BSTNOSTRILSMOKER00};
 
 /* 0000591C-00005D9C       .text hana_demo__FP9bst_class */
 static void hana_demo(bst_class* i_this) {
@@ -1583,7 +1583,7 @@ static void end_demo(bst_class* i_this) {
     case 2:
         anm_init(i_this, BST_BCK_BST_HIRAKU, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
         i_this->mDamage++;
-        i_this->m2EF4 = dComIfGp_particle_set(dPa_name::ID_SCENE_81E8, &actor->current.pos);
+        i_this->m2EF4 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTHALO00, &actor->current.pos);
         if (i_this->m2EF4 != NULL) {
             i_this->m2EF4->setGlobalRTMatrix(i_this->m02B8->getModel()->getAnmMtx(0));
         }
@@ -1882,14 +1882,14 @@ static void main_cont(bst_class* i_this) {
 /* 00006DC0-00006FA4       .text beam_eff_set__FP4cXyzsUc */
 static void beam_eff_set(cXyz* pos, short y, u8 set_angle) {
     if (!set_angle) {
-        dComIfGp_particle_set(dPa_name::ID_SCENE_81BF, pos);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_A1C0, pos);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_A1C1, pos);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTENERGYSHOTFLOOR00, pos);
+        dComIfGp_particle_set(dPa_name::ID_AK_ST_BSTENERGYSHOTSMOKE00, pos);
+        dComIfGp_particle_set(dPa_name::ID_AK_ST_BSTENERGYSHOTSMOKE01, pos);
     } else {
         csXyz angle(-0x4000, y, 0);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_81BF, pos, &angle);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_A1C0, pos, &angle);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_A1C1, pos, &angle);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTENERGYSHOTFLOOR00, pos, &angle);
+        dComIfGp_particle_set(dPa_name::ID_AK_ST_BSTENERGYSHOTSMOKE00, pos, &angle);
+        dComIfGp_particle_set(dPa_name::ID_AK_ST_BSTENERGYSHOTSMOKE01, pos, &angle);
     }
 }
 
@@ -2267,7 +2267,7 @@ void demo_camera(bst_class* i_this) {
         cLib_addCalc2(&i_this->m2EC8, 55.0f, 0.1f, 0.4f);
         if (i_this->msFrameCount == 200) {
             local_58.setall(0.0f);
-            pJVar9 = dComIfGp_particle_set(dPa_name::ID_SCENE_81E9, &local_58);
+            pJVar9 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTSTAGEEFFECT00, &local_58);
             i_this->m2EF8 = pJVar9;
             JAIZelBasic::zel_basic->field_0x1dd4 = 1;
         }

src/d/actor/d_a_btd.cpp

@@ -306,12 +306,12 @@ void hahen_set2(btd_class* i_this) {
     local_1c.y = i_this->m02FC[8].y;
     local_1c.z = i_this->m02FC[8].z;
     local_1c.y = i_this->m02FC[8].y - (REG0_F(14) + 100.0f);
-    dComIfGp_particle_set(dPa_name::ID_SCENE_80AA, &local_1c);
+    dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDROCK01, &local_1c);
     local_1c.x = i_this->m02FC[10].x;
     local_1c.y = i_this->m02FC[10].y;
     local_1c.z = i_this->m02FC[10].z;
     local_1c.y = i_this->m02FC[10].y - (REG0_F(14) + 100.0f);
-    dComIfGp_particle_set(dPa_name::ID_SCENE_80AA, &local_1c);
+    dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDROCK01, &local_1c);
     mDoAud_seStart(JA_SE_CM_BTD_ARM_STRIKE, &i_this->m02FC[8], 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
     mDoAud_seStart(JA_SE_CM_BTD_ARM_STRIKE, &i_this->m02FC[10], 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
     dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
@@ -322,7 +322,7 @@ void hahen_set_s(btd_class* i_this, cXyz* param_2, csXyz* param_3) {
     fopAc_ac_c* actor = &i_this->actor;
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI));
     J3DAnmTexPattern* anmTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI));
-    JPABaseEmitter* emitter = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_SCENE_80A8, param_2, param_3);
+    JPABaseEmitter* emitter = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_AK_SN_M_BTDMODELROCK00, param_2, param_3);
     if (emitter != NULL) {
         emitter->mGlobalParticleScale.x = 4.0f;
         emitter->mGlobalParticleScale.y = 4.0f;
@@ -332,14 +332,14 @@ void hahen_set_s(btd_class* i_this, cXyz* param_2, csXyz* param_3) {
             dComIfGp_particle_addModelEmitter(modelEmitter);
         }
     }
-    dComIfGp_particle_set(dPa_name::ID_SCENE_80A9, param_2);
+    dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDROCK00, param_2);
 }
 
 /* 00000D84-00000E44       .text smoke_set_s__FP9btd_classP4cXyzP5csXyz */
 void smoke_set_s(btd_class* i_this, cXyz* param_2, csXyz* param_3) {
     fopAc_ac_c* actor = &i_this->actor;
-    dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0AB, param_2, param_3, NULL, 0xB9, &i_this->mPa_SmokeEcallBack[0], fopAcM_GetRoomNo(actor));
-    dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0AC, param_2, param_3, NULL, 0xB9, &i_this->mPa_SmokeEcallBack[1], fopAcM_GetRoomNo(actor));
+    dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BTDSMOKE00, param_2, param_3, NULL, 0xB9, &i_this->mPa_SmokeEcallBack[0], fopAcM_GetRoomNo(actor));
+    dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BTDSMOKE01, param_2, param_3, NULL, 0xB9, &i_this->mPa_SmokeEcallBack[1], fopAcM_GetRoomNo(actor));
 }
 
 /* 00000E44-00000F14       .text hahen_set__FP9btd_classSc */
@@ -399,7 +399,7 @@ void startdemo(btd_class* i_this) {
         local_48.x = 0.0f;
         local_48.y = 0.0f;
         local_48.z = 0.0f;
-        dComIfGp_particle_set(dPa_name::ID_SCENE_80BD, &local_48, &actor->current.angle);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDSPLASHMAGMA01, &local_48, &actor->current.angle);
         break;
     case 2:
         if (i_this->m6E1A <= 0x46) {
@@ -472,14 +472,14 @@ void damage_check(btd_class* i_this) {
         actor->health -= local_34.mDamage;
         if ((actor->health <= 0) || (l_HIO.m06 != 0)) {
             dScnPly_ply_c::nextPauseTimer = REG0_S(7) + 8;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->m03E0);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &i_this->m03E0);
             local_40.z = 2.0f;
             local_40.y = 2.0f;
             local_40.x = 2.0f;
             local_48.z = 0;
             local_48.x = 0;
             local_48.y = fopAcM_searchActorAngleY(actor, daPy_getPlayerActorClass());
-            dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &i_this->m03E0, &local_48, &local_40);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &i_this->m03E0, &local_48, &local_40);
             i_this->m02E4 = 0xb;
             i_this->mGohmaState = 0x32;
             mDoAud_seStart(JA_SE_LK_LAST_HIT, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -579,20 +579,20 @@ void kubi_calc(btd_class* i_this) {
 /* 00001A84-000028C4       .text damage__FP9btd_class */
 s32 damage(btd_class* i_this) {
     static s32 hibi_brk[] = {BTD_BRK_HIBI01, BTD_BRK_HIBI02, BTD_BRK_HIBI03};
-    static u16 hibi_eff_name[] = {dPa_name::ID_SCENE_80C8, dPa_name::ID_SCENE_80C9, dPa_name::ID_SCENE_80CA};
+    static u16 hibi_eff_name[] = {dPa_name::ID_AK_SN_BTDCRACKSHELL00, dPa_name::ID_AK_SN_BTDCRACKSHELL01, dPa_name::ID_AK_SN_BTDCRACKSHELL02};
     static u16 hahen_eff_name[] = {
-        dPa_name::ID_SCENE_80C4,
-        dPa_name::ID_SCENE_80C4,
-        dPa_name::ID_SCENE_80C4,
-        dPa_name::ID_SCENE_80C4,
-        dPa_name::ID_SCENE_80C5,
-        dPa_name::ID_SCENE_80C5,
-        dPa_name::ID_SCENE_80C5,
-        dPa_name::ID_SCENE_80C5,
-        dPa_name::ID_SCENE_80C6,
-        dPa_name::ID_SCENE_80C7,
-        dPa_name::ID_SCENE_80C7,
-        dPa_name::ID_SCENE_80C7
+        dPa_name::ID_AK_SN_BTDBREAKSHELLARML,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLARML,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLARML,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLARML,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLARMR,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLARMR,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLARMR,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLARMR,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLHEAD,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLBODY,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLBODY,
+        dPa_name::ID_AK_SN_BTDBREAKSHELLBODY
     };
     static s32 hahen_eff_index[] = {0x2E, 0x21, 0x24, 0x42, 0x31, 0x27, 0x2A, 0x46, 0x37, 0x20, 0x2D, 0x34};
     fopAc_ac_c* actor = &i_this->actor;
@@ -735,7 +735,7 @@ s32 damage(btd_class* i_this) {
                 anm_init(i_this, BTD_BCK_MOTIAGE3, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
                 dr2_class* dr2Var = (dr2_class*)dr2;
                 mDoAud_seStart(JA_SE_CM_BTD_JUMP_DOWN, &dr2Var->unk_4A8, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
-                dComIfGp_particle_set(dPa_name::ID_SCENE_80BC, &actor->current.pos, &actor->current.angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDSPLASHMAGMA00, &actor->current.pos, &actor->current.angle);
                 i_this->mGohmaState++;
                 i_this->m02EC[0] = 0x1e;
             }
@@ -825,25 +825,25 @@ s32 damage(btd_class* i_this) {
 /* 000028C4-000036A0       .text end__FP9btd_class */
 void end(btd_class* i_this) {
     static u16 last_eff_name[] = {
-        dPa_name::ID_SCENE_80D2,
-        dPa_name::ID_SCENE_80D3,
-        dPa_name::ID_SCENE_80D4,
-        dPa_name::ID_SCENE_80D0,
-        dPa_name::ID_SCENE_80D0,
-        dPa_name::ID_SCENE_80D0,
-        dPa_name::ID_SCENE_80D0,
-        dPa_name::ID_SCENE_80D0,
-        dPa_name::ID_SCENE_80D0,
-        dPa_name::ID_SCENE_80D0,
-        dPa_name::ID_SCENE_80D0,
-        dPa_name::ID_SCENE_80D1,
-        dPa_name::ID_SCENE_80D1,
-        dPa_name::ID_SCENE_80D1,
-        dPa_name::ID_SCENE_80D1,
-        dPa_name::ID_SCENE_80D1,
-        dPa_name::ID_SCENE_80D1,
-        dPa_name::ID_SCENE_80D1,
-        dPa_name::ID_SCENE_80D1
+        dPa_name::ID_AK_SN_BTDBREAKDOWNBODY00,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNBODY01,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNBODY02,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARML,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARML,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARML,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARML,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARML,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARML,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARML,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARML,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARMR,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARMR,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARMR,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARMR,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARMR,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARMR,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARMR,
+        dPa_name::ID_AK_SN_BTDBREAKDOWNARMR
     };
     static s32 last_eff_index[] = {0x20, 0x2D, 0x34, 0x42, 0x43, 0x2E, 0x2F, 0x21, 0x22, 0x24, 0x25, 0x46, 0x47, 0x31, 0x32, 0x27, 0x28, 0x2A, 0x2B};
     fopAc_ac_c* actor = &i_this->actor;
@@ -921,7 +921,7 @@ void end(btd_class* i_this) {
             actor->speedF = 30.0f;
             i_this->m02EC[0] = 0x46;
             mDoAud_seStart(JA_SE_CM_BTD_LAST_EXPLODE, &static_center_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
-            pJVar6 = dComIfGp_particle_set(dPa_name::ID_SCENE_80DE, &i_this->m6E50);
+            pJVar6 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDBREAKDOWNHEAD00, &i_this->m6E50);
             i_this->m6038 = pJVar6;
             i_this->m6E48 = 30.0f;
             dComIfGp_getVibration().StartShock(REG0_S(2) + 5, -0x21, cXyz(0.0f, 1.0f, 0.0f));
@@ -1853,12 +1853,12 @@ void sibuki_move(btd_class* i_this) {
                 sibuikiS->m00 = 0;
                 if ((local_38.abs() < 1500.0f) && (i_this->m6E14 < 20)) {
                     i_this->m6E14++;
-                    dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8064, &sibuikiS->m04, 0xff, g_whiteColor, g_whiteColor, 0);
+                    dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BTDPOPMAGMA01, &sibuikiS->m04, 0xff, g_whiteColor, g_whiteColor, 0);
                     mDoAud_seStart(JA_SE_OBJ_BTD_FIRE_DROP, &sibuikiS->m04, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
                     sibuikiS->m00 = 0;
                 }
             } else {
-                dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8063, &sibuikiS->m04, 0xff, g_whiteColor, g_whiteColor, 0);
+                dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BTDPOPMAGMA00, &sibuikiS->m04, 0xff, g_whiteColor, g_whiteColor, 0);
             }
         } else {
             sibuikiS->m00++;
@@ -2212,24 +2212,24 @@ static f32 at_size[] = {
 /* 000072BC-00007608       .text btd_effect__FP9btd_class */
 void btd_effect(btd_class* i_this) {
     static s32 eff_index[] = {0x43, 0x47, 0x20, 0x2D, 0x34};
-    static u16 eff_name[] = {dPa_name::ID_SCENE_80A1, dPa_name::ID_SCENE_80A1, dPa_name::ID_SCENE_80A2, dPa_name::ID_SCENE_80A3, dPa_name::ID_SCENE_80A4};
+    static u16 eff_name[] = {dPa_name::ID_AK_SN_ARMFIRECHIP, dPa_name::ID_AK_SN_ARMFIRECHIP, dPa_name::ID_AK_SN_BACKBONEFIRECHIP00, dPa_name::ID_AK_SN_BACKBONEFIRECHIP01, dPa_name::ID_AK_SN_BACKBONEFIRECHIP02};
     static u16 effF_name[] = {
-        dPa_name::ID_SCENE_80A6,
-        dPa_name::ID_SCENE_80A7,
-        dPa_name::ID_SCENE_80A0,
-        dPa_name::ID_SCENE_809F,
-        dPa_name::ID_SCENE_80B1,
-        dPa_name::ID_SCENE_80B3,
-        dPa_name::ID_SCENE_A0B5
+        dPa_name::ID_AK_SN_FIREBREATHSTORE00,
+        dPa_name::ID_AK_SN_FIREBREATHSTORE01,
+        dPa_name::ID_AK_SN_FIREBREATH01,
+        dPa_name::ID_AK_SN_FIREBREATH00,
+        dPa_name::ID_AK_SN_BTDCLAWROCKL00,
+        dPa_name::ID_AK_SN_BTDCLAWROCKL01,
+        dPa_name::ID_AK_ST_BTDCLAWSMOKEL00
     };
     static u16 effF_nameR[] = {
-        dPa_name::ID_SCENE_80A6,
-        dPa_name::ID_SCENE_80A7,
-        dPa_name::ID_SCENE_80A0,
-        dPa_name::ID_SCENE_809F,
-        dPa_name::ID_SCENE_80B0,
-        dPa_name::ID_SCENE_80B2,
-        dPa_name::ID_SCENE_A0B4
+        dPa_name::ID_AK_SN_FIREBREATHSTORE00,
+        dPa_name::ID_AK_SN_FIREBREATHSTORE01,
+        dPa_name::ID_AK_SN_FIREBREATH01,
+        dPa_name::ID_AK_SN_FIREBREATH00,
+        dPa_name::ID_AK_SN_BTDCLAWROCKR00,
+        dPa_name::ID_AK_SN_BTDCLAWROCKR01,
+        dPa_name::ID_AK_ST_BTDCLAWSMOKER00
     };
     fopAc_ac_c* actor = &i_this->actor;
     mDoExt_McaMorf* iVar2;
@@ -2264,9 +2264,9 @@ void btd_effect(btd_class* i_this) {
                     iVar4->setGlobalRTMatrix(iVar2->getModel()->getAnmMtx(0x3a));
                 }
             } else if (i == 6) {
-                userID = dPa_name::ID_SCENE_A0B5;
+                userID = dPa_name::ID_AK_ST_BTDCLAWSMOKEL00;
                 if (i_this->m02EA != 0) {
-                    userID = dPa_name::ID_SCENE_A0B4;
+                    userID = dPa_name::ID_AK_ST_BTDCLAWSMOKER00;
                 }
                 iVar4 =
                     dComIfGp_particle_setToon((s16)userID, &actor->current.pos, NULL, NULL, 0xB9, &i_this->mPa_SmokeEcallBack[2], (u8)fopAcM_GetRoomNo(actor));

src/d/actor/d_a_bwd.cpp

@@ -297,9 +297,9 @@ void fly_pos_move(bwd_class* i_this, s16 param_2, s16 param_3) {
                 i_this->m17C4 = 199;
                 i_this->m3B08[1] = 1;
                 i_this->m3B0C[1] = i_this->m3954;
-                dComIfGp_particle_setToon(dPa_name::ID_SCENE_A25A, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3978[0], (s8)actor->current.roomNo);
+                dComIfGp_particle_setToon(dPa_name::ID_IT_ST_BWO_DIVE_SMOKE00, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3978[0], (s8)actor->current.roomNo);
                 i_this->m3978[0].setColor(eff_col);
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8259, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3AB8[0], (s8)actor->current.roomNo);
+                dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_DIVE_SUNA00, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3AB8[0], (s8)actor->current.roomNo);
                 mDoAud_seStart(JA_SE_CM_BWD_IN_SAND_1, &i_this->m3954, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
                 i_this->m3AE0[0] = 0x6e;
             } else if (i_this->m3AE0[1] == 0) {
@@ -310,9 +310,9 @@ void fly_pos_move(bwd_class* i_this, s16 param_2, s16 param_3) {
                 ;
                 i_this->m3C15 = 2;
                 i_this->m3C14 = 0x5a;
-                dComIfGp_particle_setToon(dPa_name::ID_SCENE_A258, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3978[1], (s8)actor->current.roomNo);
+                dComIfGp_particle_setToon(dPa_name::ID_IT_ST_BWO_OUT_SMOKE00, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3978[1], (s8)actor->current.roomNo);
                 i_this->m3978[1].setColor(eff_col);
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8257, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3AB8[1], (s8)actor->current.roomNo);
+                dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_OUT_SUNA00, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3AB8[1], (s8)actor->current.roomNo);
                 mDoAud_seStart(JA_SE_CM_BWD_OUT_SAND_1, &i_this->m3954, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
                 i_this->m3AE0[1] = 0x6e;
             }
@@ -552,14 +552,14 @@ void sita_hit(bwd_class* i_this) {
             break;
         }
         i_this->m1BB5++;
-        dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->m1908[29].m04);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &i_this->m1908[29].m04);
         local_38.z = 2.0f;
         local_38.y = 2.0f;
         local_38.x = 2.0f;
         local_40.z = 0;
         local_40.x = 0;
         local_40.y = fopAcM_searchPlayerAngleY(actor);
-        dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &i_this->m1908[29].m04, &local_40, &local_38);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &i_this->m1908[29].m04, &local_40, &local_38);
         if ((i_this->m1BB5 >= 4) || (l_HIO.m06 != 0)) {
             fopAcM_monsSeStart(actor, JA_SE_CV_BWD_LAST_HIT, 0);
             i_this->m18AE = 0xc;
@@ -587,17 +587,17 @@ void sita_hit(bwd_class* i_this) {
         i_this->m18CC[0] = 300;
         i_this->m3954.x = actor->current.pos.x;
         i_this->m3954.z = actor->current.pos.z;
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8253, &i_this->m3954, &actor->shape_angle);
-        pJVar5 = dComIfGp_particle_set(dPa_name::ID_SCENE_8252, &i_this->m3954);
+        dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_HIT_SUNA00, &i_this->m3954, &actor->shape_angle);
+        pJVar5 = dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_HIT_TAIEKI00, &i_this->m3954);
         i_this->m3964 = pJVar5;
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8254, &i_this->m3954, &actor->shape_angle);
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8255, &i_this->m3954, &actor->shape_angle);
+        dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_HITAFTER_HAKISUNA00, &i_this->m3954, &actor->shape_angle);
+        dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_HITAFTER_SUNA00, &i_this->m3954, &actor->shape_angle);
         if (i_this->m3AE4 == 0) {
             i_this->m3AE4 = 0x4d;
             i_this->m3954.x = actor->current.pos.x;
             i_this->m3954.z = actor->current.pos.z;
             dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A256, &i_this->m3954, &actor->shape_angle, NULL, eff_col.a, &i_this->m3978[2], (s8)actor->current.roomNo
+                dPa_name::ID_IT_ST_BWO_HITAFTER_SMOKE00, &i_this->m3954, &actor->shape_angle, NULL, eff_col.a, &i_this->m3978[2], (s8)actor->current.roomNo
             );
             i_this->m3978[2].setColor(eff_col);
         }
@@ -710,7 +710,7 @@ void eat_attack(bwd_class* i_this) {
         i_this->m18B0++;
         i_this->m3954.x = actor->current.pos.x;
         i_this->m3954.z = actor->current.pos.z;
-        dComIfGp_particle_set(dPa_name::ID_SCENE_824E, &i_this->m3954, &actor->shape_angle);
+        dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_ATTACK_SUNA00, &i_this->m3954, &actor->shape_angle);
         mDoAud_seStart(JA_SE_CV_BWD_ATTACK, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
         break;
     case 1:
@@ -722,7 +722,7 @@ void eat_attack(bwd_class* i_this) {
                 i_this->m3954.x = actor->current.pos.x;
                 i_this->m3954.z = actor->current.pos.z;
                 dComIfGp_particle_setToon(
-                    dPa_name::ID_SCENE_A24F, &i_this->m3954, &actor->shape_angle, NULL, eff_col.a, &i_this->m3978[3], (s8)actor->current.roomNo
+                    dPa_name::ID_IT_ST_BWO_PAKU_SMOKE00, &i_this->m3954, &actor->shape_angle, NULL, eff_col.a, &i_this->m3978[3], (s8)actor->current.roomNo
                 );
                 i_this->m3978[3].setColor(eff_col);
             }
@@ -743,14 +743,14 @@ void eat_attack(bwd_class* i_this) {
             i_this->m3C1E++;
             i_this->m3954.x = actor->current.pos.x;
             i_this->m3954.z = actor->current.pos.z;
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8250, &i_this->m3954, &actor->shape_angle);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_PAKUAFTER_SUNA00, &i_this->m3954, &actor->shape_angle);
             if (i_this->m3AE8 == 0) {
                 i_this->m3AE8 = 0x3c;
                 i_this->m3978[4].remove();
                 i_this->m3954.x = actor->current.pos.x;
                 i_this->m3954.z = actor->current.pos.z;
                 dComIfGp_particle_setToon(
-                    dPa_name::ID_SCENE_A251, &i_this->m3954, &actor->shape_angle, NULL, eff_col.a, &i_this->m3978[4], (s8)actor->current.roomNo
+                    dPa_name::ID_IT_ST_BWO_PAKUAFTER_SMOKE00, &i_this->m3954, &actor->shape_angle, NULL, eff_col.a, &i_this->m3978[4], (s8)actor->current.roomNo
                 );
                 i_this->m3978[4].setColor(eff_col);
             }
@@ -794,10 +794,10 @@ void eat_attack(bwd_class* i_this) {
                     i_this->m3978[5].remove();
                     i_this->m3954.x = actor->current.pos.x;
                     i_this->m3954.z = actor->current.pos.z;
-                    dComIfGp_particle_setToon(dPa_name::ID_SCENE_A24A, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3978[5], (s8)actor->current.roomNo);
+                    dComIfGp_particle_setToon(dPa_name::ID_IT_ST_BWK_OUT_SMOKE00, &i_this->m3954, NULL, NULL, eff_col.a, &i_this->m3978[5], (s8)actor->current.roomNo);
                     i_this->m3978[5].setColor(eff_col);
                 }
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8249, &player->current.pos);
+                dComIfGp_particle_set(dPa_name::ID_IT_SN_BWK_OUT_SUNA00, &player->current.pos);
                 mDoAud_seStart(JA_SE_CM_BWD_SPIT_OUT, &i_this->m3954, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
             } else {
                 local_38 = i_this->m1908[0].m04;
@@ -1071,12 +1071,12 @@ void end(bwd_class* i_this) {
             i_this->m3954.x = actor->current.pos.x;
             i_this->m3954.z = actor->current.pos.z;
             dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A267, &i_this->m3954, &actor->shape_angle, NULL, eff_col.a, &i_this->m3978[6], (s8)actor->current.roomNo
+                dPa_name::ID_IT_ST_BWO_LASTHIT_SMOKE00, &i_this->m3954, &actor->shape_angle, NULL, eff_col.a, &i_this->m3978[6], (s8)actor->current.roomNo
             );
             i_this->m3978[6].setColor(eff_col);
         }
-        dComIfGp_particle_set(dPa_name::ID_SCENE_8265, &i_this->m3954, &actor->shape_angle);
-        pJVar8 = dComIfGp_particle_set(dPa_name::ID_SCENE_8266, &i_this->m3954);
+        dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_LASTHIT_SUNA00, &i_this->m3954, &actor->shape_angle);
+        pJVar8 = dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_LASTHIT_TAIEKI00, &i_this->m3954);
         i_this->m3968 = pJVar8;
         i_this->m3C24 = 0;
         mDoAud_seStart(JA_SE_CM_BWD_LAST_HEAD_BACK, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -1182,8 +1182,8 @@ void end(bwd_class* i_this) {
             csXyz local_d4(0, 0, 0);
             local_d4.x = (s16)(int)cM_rndF(65536.0f);
             local_d4.y = (s16)(int)cM_rndF(65536.0f);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_825D, i_this->m0418 + i_this->m3C24, &local_d4, &local_c0);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_825E, i_this->m0418 + i_this->m3C24, &local_d4, &local_c0);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_SIBOUBAKUEN00, i_this->m0418 + i_this->m3C24, &local_d4, &local_c0);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_SIBOUSUNA00, i_this->m0418 + i_this->m3C24, &local_d4, &local_c0);
             mDoAud_seStart(JA_SE_CM_MONS_EXPLODE, i_this->m0418 + i_this->m3C24, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
             i_this->m02D4[i_this->m3C24] = NULL;
             if (i_this->m3C24 == 0) {
@@ -2000,7 +2000,7 @@ static BOOL daBwd_Execute(bwd_class* i_this) {
                     local_110.z = REG0_F(0xf);
                     MtxPosition(&local_110, &i_this->m0418[i]);
                     if (((i & 1) == 0) && (i_this->m03C4[i] < 0.1f)) {
-                        dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8241, &i_this->m0418[i], 0xff, g_whiteColor, g_whiteColor, 0);
+                        dComIfGp_particle_setSimple(dPa_name::ID_IT_SN_O_BWO_BODY_SUNA00, &i_this->m0418[i], 0xff, g_whiteColor, g_whiteColor, 0);
                     }
                     i_this->m0374[i]->setPlaySpeed(i_this->m03C4[i]);
                     i_this->m0374[i]->play();
@@ -2103,7 +2103,7 @@ static BOOL daBwd_Execute(bwd_class* i_this) {
                         suna_gr_ang[iVar15].x = 0;
                         suna_gr_ang[iVar15].y = cM_atan2s(-suna_gr_pos[iVar15].x, -suna_gr_pos[iVar15].z);
                         dComIfGp_particle_setToon(
-                            dPa_name::ID_SCENE_A260,
+                            dPa_name::ID_IT_ST_BW_SUNATAKI_SMOKEA,
                             &suna_gr_pos[iVar15],
                             &suna_gr_ang[iVar15],
                             NULL,
@@ -2168,7 +2168,7 @@ static BOOL daBwd_Execute(bwd_class* i_this) {
         if (i_this->m3960 == 1) {
             i_this->m3960++;
             i_this->m3AF4.remove();
-            dComIfGp_particle_set(dPa_name::ID_SCENE_824D, &i_this->m3954, &actor->shape_angle, NULL, 0xff, &i_this->m3AF4, (s8)actor->current.roomNo);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_BWO_KAODASHI_SUNA00, &i_this->m3954, &actor->shape_angle, NULL, 0xff, &i_this->m3AF4, (s8)actor->current.roomNo);
         } else if (i_this->m3960 < 0) {
             i_this->m3960 = 0;
             i_this->m3AF4.remove();

src/d/actor/d_a_canon.cpp

@@ -211,12 +211,12 @@ void daCanon_c::makeFireEffect(cXyz& arg1, csXyz& arg2, int arg3) {
     sp18.z = 0;
 
     if (arg3 == 0) {
-        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &arg1, &arg2, &sp2C);
+        dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, &arg1, &arg2, &sp2C);
     } else {
-        dComIfGp_particle_set(dPa_name::ID_COMMON_LIGHT_FLASH, &arg1, &sp18, &sp2C);
-        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, &arg1, &arg2, &sp2C);
-        dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &arg1, &arg2, &sp2C);
-        dComIfGp_particle_setToon(dPa_name::ID_COMMON_SMOKE_DEBRIS, &arg1, &arg2, &sp2C);
+        dComIfGp_particle_set(dPa_name::ID_IT_JN_BMEX_SENKO, &arg1, &sp18, &sp2C);
+        dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE01, &arg1, &arg2, &sp2C);
+        dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, &arg1, &arg2, &sp2C);
+        dComIfGp_particle_setToon(dPa_name::ID_IT_JT_BMEX_HAHEN, &arg1, &arg2, &sp2C);
     }
 
     plight.mPos = arg1;

src/d/actor/d_a_cc.cpp

@@ -215,12 +215,12 @@ static BOOL daCC_Draw(cc_class* i_this) {
 
 /* 00000900-00000AB0       .text cc_eff_set__FP8cc_classUc */
 void cc_eff_set(cc_class* i_this, unsigned char arg1) {
-    u16 userID = dPa_name::ID_COMMON_03F0;
+    u16 userID = dPa_name::ID_AK_JN_CCHEAD00;
     cXyz sp1C = i_this->m470;
     GXColor sp18 = {};
 
     if (arg1 != 0) {
-        userID = dPa_name::ID_COMMON_03EF;
+        userID = dPa_name::ID_AK_JN_CCFOOT00;
         sp1C = i_this->actor.current.pos;
     }
 
@@ -263,7 +263,7 @@ void anm_init(cc_class* i_this, const int transformResIdx, const float morf, con
 void damage_mode_move(cc_class* i_this) {
     i_this->m2F6 = 2;
     if (i_this->m2F5 != 0x2d && i_this->m2F5 != 0x2e) {
-        dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &i_this->actor.attention_info.position);
+        dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &i_this->actor.attention_info.position);
         i_this->mCurrAction = 3;
         i_this->m2F5 = 0x28;
     }
@@ -330,11 +330,11 @@ void naraku_check(cc_class* i_this) {
                 cXyz sp18(0.5f, 0.5f, 0.5f);
 #if VERSION == VERSION_DEMO
                 i_this->m368.remove();
-                dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m368);
+                dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m368);
                 i_this->m368.setRate(0.0f);
 #else
                 i_this->m390.remove();
-                dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m390);
+                dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->actor.current.pos, NULL, &sp18, 0xff, &i_this->m390);
                 i_this->m390.setRate(0.0f);
 #endif
             }
@@ -489,9 +489,9 @@ BOOL body_atari_check(cc_class* i_this) {
         if ((i_this->m304 != 0) && (pdVar7 != NULL) && (dComIfGp_getPlayer(0) != pdVar7)) {
             i_this->m304 = 2;
             a_this->health = 0;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &sp30);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &sp30);
             cXyz sp24(2.0f, 2.0f, 2.0f);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &sp30, &player->shape_angle, &sp24);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &sp30, &player->shape_angle, &sp24);
             i_this->mCurrAction = 3;
             i_this->m2F5 = 0x28;
             return TRUE;
@@ -704,11 +704,11 @@ BOOL body_atari_check(cc_class* i_this) {
             cc_at_check(a_this, &sp3C);
 
             if ((i_this->m2F6 == 1) || (i_this->m2F6 == 6) || (a_this->health <= 0)) {
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &sp30);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &sp30);
                 cXyz sp18(2.0f, 2.0f, 2.0f);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &sp30, &player->shape_angle, &sp18);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &sp30, &player->shape_angle, &sp18);
             } else {
-                dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &sp30, &player->shape_angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &sp30, &player->shape_angle);
             }
         }
 
@@ -1208,7 +1208,7 @@ void action_damage_move(cc_class* i_this) {
         case 4:
         case 9:
             anm_init(i_this, CC_BCK_MAHI, 0.0f, 0, 1.0f, -1);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &a_this->attention_info.position);
+            dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &a_this->attention_info.position);
             i_this->m32C = 0.0f;
             i_this->m330 = 0.0f;
             i_this->m348 = 0;
@@ -1320,7 +1320,7 @@ void action_damage_move(cc_class* i_this) {
         i_this->m301 = 1;
         i_this->m2D8->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("CC", CC_BCK_CC_PTCL), 0, 0.0f, 1.0f, 0.0f, -1.0f, NULL);
 
-        pJVar6 = dComIfGp_particle_set(dPa_name::ID_SCENE_82A8, &a_this->attention_info.position, &a_this->current.angle);
+        pJVar6 = dComIfGp_particle_set(dPa_name::ID_AK_SN_CCSPLIT00, &a_this->attention_info.position, &a_this->current.angle);
         if (pJVar6 != NULL) {
             f32 tmp = (a_this->tevStr.mColorK0.r / 255.0f);
             sp18.r = tmp * 40.0f;
@@ -1932,7 +1932,7 @@ void action_up_check(cc_class* i_this) {
             }
 
             cXyz sp24 = *i_this->mCyl.GetTgHitPosP();
-            dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &sp24, &player->shape_angle);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, &sp24, &player->shape_angle);
 
             switch (pcVar6->GetAtType()) {
             case AT_TYPE_SWORD:
@@ -1968,7 +1968,7 @@ void action_up_check(cc_class* i_this) {
     }
 
     if (bVar4) {
-        JPABaseEmitter* pJVar7 = dComIfGp_particle_set(dPa_name::ID_SCENE_82A9, &a_this->attention_info.position, &a_this->current.angle);
+        JPABaseEmitter* pJVar7 = dComIfGp_particle_set(dPa_name::ID_AK_SN_CCBREAKHAHEN00, &a_this->attention_info.position, &a_this->current.angle);
         if (pJVar7 != NULL) {
             pJVar7->setGlobalPrmColor(a_this->tevStr.mColorK0.r, a_this->tevStr.mColorK0.g, a_this->tevStr.mColorK0.b);
             pJVar7->setGlobalEnvColor(a_this->tevStr.mColorK0.r, a_this->tevStr.mColorK0.g, a_this->tevStr.mColorK0.b);
@@ -2212,18 +2212,18 @@ static BOOL daCC_Execute(cc_class* i_this) {
 
         case 1:
 #if VERSION == VERSION_DEMO
-            i_this->mpEmitter1 = dComIfGp_particle_set(dPa_name::ID_COMMON_03ED, &i_this->actor.current.pos);
-            i_this->mpEmitter2 = dComIfGp_particle_set(dPa_name::ID_COMMON_03EE, &i_this->actor.current.pos);
+            i_this->mpEmitter1 = dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER00, &i_this->actor.current.pos);
+            i_this->mpEmitter2 = dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER01, &i_this->actor.current.pos);
             if (i_this->mpEmitter1 != NULL && i_this->mpEmitter2 != NULL) {
                 i_this->m2F7++;
             }
 #else
             if (i_this->m368.getEmitter() == NULL) {
-                dComIfGp_particle_set(dPa_name::ID_COMMON_03ED, &i_this->m3A4, NULL, NULL, 0xff, &i_this->m368);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER00, &i_this->m3A4, NULL, NULL, 0xff, &i_this->m368);
             }
 
             if (i_this->m37C.getEmitter() == NULL) {
-                dComIfGp_particle_set(dPa_name::ID_COMMON_03EE, &i_this->m3A4, NULL, NULL, 0xff, &i_this->m37C);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CCTHUNDER01, &i_this->m3A4, NULL, NULL, 0xff, &i_this->m37C);
             }
 
             if (i_this->m368.getEmitter() != NULL && i_this->m37C.getEmitter() != NULL) {

src/d/actor/d_a_coming3.cpp

@@ -331,7 +331,7 @@ void daComing3::Act_c::eff_break_tsubo() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPM_TUBO);
     texPattern = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", ALWAYS_BTP_MPM_TUBO);
     
-    JPABaseEmitter* baseEmitter = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_COMMON_0017, &sp1C, NULL, &sp34);
+    JPABaseEmitter* baseEmitter = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_AK_JN_M_TUBOHAHEN, &sp1C, NULL, &sp34);
     if (baseEmitter != NULL) {
         dPa_J3DmodelEmitter_c* modelEmitter;
         modelEmitter = new dPa_J3DmodelEmitter_c(baseEmitter, modelData, tevStr, texPattern, 0, 0);
@@ -346,7 +346,7 @@ void daComing3::Act_c::eff_break_tsubo() {
     sp18.b = tevStr.mColorC0.b;
     sp18.a = tevStr.mColorC0.a;
     dPa_selectTexEcallBack* cb = &dPa_control_c::mTsubo[1];
-    dComIfGp_particle_set(dPa_name::ID_COMMON_0018, &sp1C, NULL, &sp34, 0xFF, cb, -1, &sp18, &tevStr.mColorK0);
+    dComIfGp_particle_set(dPa_name::ID_AK_JN_TUBOKONAGONA, &sp1C, NULL, &sp34, 0xFF, cb, -1, &sp18, &tevStr.mColorK0);
 }
 
 /* 000014DC-00001590       .text coming_process_main__Q29daComing35Act_cFv */

src/d/actor/d_a_dai_item.cpp

@@ -547,7 +547,7 @@ bool daStandItem_c::actionFobj09() {
             m698 = NULL;
         }
         if (m690 == NULL) {
-            m690 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B3, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0);
+            m690 = dComIfGp_particle_set(dPa_name::ID_AK_SN_FOUNTAINFIGURE00, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0);
         } else {
             m690->setGlobalRTMatrix(m660);
         }
@@ -572,10 +572,10 @@ bool daStandItem_c::actionFobj09() {
                 m690 = NULL;
             }
             if (m694 == NULL) {
-                m694 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B4, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0);
+                m694 = dComIfGp_particle_set(dPa_name::ID_AK_SN_FOUNTAINFIGURE01, &current.pos, &current.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0);
             }
             if (m698 == NULL) {
-                m698 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B5, &current.pos, &current.angle);
+                m698 = dComIfGp_particle_set(dPa_name::ID_AK_SN_FOUNTAINFIGURE02, &current.pos, &current.angle);
             }
             if (m698) {
                 m698->becomeImmortalEmitter();

src/d/actor/d_a_daiocta.cpp

@@ -574,7 +574,7 @@ void daDaiocta_c::setEffect(u16 effect_name) {
     csXyz particle_angle(shape_angle);
 
     switch (effect_name) {
-        case dPa_name::ID_SCENE_81FE:
+        case dPa_name::ID_IT_SN_DO_APPSHIBUKI00:
 #if VERSION > VERSION_DEMO
             if (!mParticleCallback.getEmitter()) {
                 dComIfGp_particle_set(
@@ -591,22 +591,22 @@ void daDaiocta_c::setEffect(u16 effect_name) {
             );
 #endif
             break;
-        case dPa_name::ID_SCENE_81FF:
-        case dPa_name::ID_SCENE_8200:
-        case dPa_name::ID_SCENE_8201:
-        case dPa_name::ID_SCENE_8202:
-        case dPa_name::ID_SCENE_8203:
-        case dPa_name::ID_SCENE_8204:
-        case dPa_name::ID_SCENE_8205:
+        case dPa_name::ID_IT_SN_DO_HITA_SHIBUKIA00:
+        case dPa_name::ID_IT_SN_DO_HITA_SHIBUKIB00:
+        case dPa_name::ID_IT_SN_DO_HITB_SHIBUKIA00:
+        case dPa_name::ID_IT_SN_DO_HITB_SHIBUKIB00:
+        case dPa_name::ID_IT_SN_DO_HITC_SHIBUKIA00:
+        case dPa_name::ID_IT_SN_DO_HITC_SHIBUKIB00:
+        case dPa_name::ID_IT_SN_DO_DOWNSHIBUKI00:
             dComIfGp_particle_set(
                 effect_name, &particle_pos, NULL, NULL, 
                 0xFF, NULL, -1, &sea_color_ambient
             );
             break;
-        case dPa_name::ID_SCENE_8207:
-        case dPa_name::ID_SCENE_8208:
-        case dPa_name::ID_SCENE_8209:
-        case dPa_name::ID_SCENE_82CC:
+        case dPa_name::ID_IT_SN_DO_SUIKOMIA00:
+        case dPa_name::ID_IT_SN_DO_SUIKOMIB00:
+        case dPa_name::ID_IT_SN_DO_SUIKOMIC00:
+        case dPa_name::ID_IT_SN_DO_HAKIDASHI00:
             dComIfGp_particle_set(
                 effect_name, &particle_pos, &particle_angle, NULL, 
                 0xFF, NULL, -1, &sea_color_ambient
@@ -912,7 +912,7 @@ void daDaiocta_c::modeAppearInit() {
     mpAuzu = fopAcM_create(PROC_Obj_Auzu, auzu_parameters, &auzu_pos, tevStr.mRoomNo);
 #endif
 
-    setEffect(dPa_name::ID_SCENE_81FE);
+    setEffect(dPa_name::ID_IT_SN_DO_APPSHIBUKI00);
     mDoAud_bgmAllMute(90);
     for (int i = 0; i < ARRAY_SSIZE(mDaioctaEyePcId); i++) {
         daDaiocta_Eye_c* big_octo_eye_p;
@@ -1005,8 +1005,8 @@ void daDaiocta_c::modeDamageInit() {
         setAnm();
         mPrmIdx = 4;
 
-        setEffect(dPa_name::ID_SCENE_8201);
-        setEffect(dPa_name::ID_SCENE_8202);
+        setEffect(dPa_name::ID_IT_SN_DO_HITB_SHIBUKIA00);
+        setEffect(dPa_name::ID_IT_SN_DO_HITB_SHIBUKIB00);
     }
 }
 
@@ -1039,8 +1039,8 @@ void daDaiocta_c::modeDamageBombInit() {
         mPrmIdx = 2;
         setAnm();
         mPrmIdx = 3;
-        setEffect(dPa_name::ID_SCENE_81FF);
-        setEffect(dPa_name::ID_SCENE_8200);
+        setEffect(dPa_name::ID_IT_SN_DO_HITA_SHIBUKIA00);
+        setEffect(dPa_name::ID_IT_SN_DO_HITA_SHIBUKIB00);
     }
 }
 
@@ -1067,9 +1067,9 @@ void daDaiocta_c::modeDamageBomb() {
 /* 00002778-000028FC       .text modeDemoInit__11daDaiocta_cFv */
 void daDaiocta_c::modeDemoInit() {
     attention_info.flags = 0;
-    setEffect(dPa_name::ID_SCENE_8207);
-    setEffect(dPa_name::ID_SCENE_8208);
-    setEffect(dPa_name::ID_SCENE_8209);
+    setEffect(dPa_name::ID_IT_SN_DO_SUIKOMIA00);
+    setEffect(dPa_name::ID_IT_SN_DO_SUIKOMIB00);
+    setEffect(dPa_name::ID_IT_SN_DO_SUIKOMIC00);
     J3DModelData* model_data_p = mpSuikomiModel->getModelData();
     
     J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey *>(dComIfG_getObjectRes(m_arc_name, DAIOCTA_BRK_GDO_SUI00));
@@ -1223,8 +1223,8 @@ void daDaiocta_c::modeDeleteInit() {
     fopAcM_seStart(this, JA_SE_CV_DO_DIE, 0);
     fopAcM_seStart(this, JA_SE_CM_DO_JITABATA, 0);
     fopAcM_seStart(this, JA_SE_LK_LAST_HIT, 0);
-    setEffect(dPa_name::ID_SCENE_8203);
-    setEffect(dPa_name::ID_SCENE_8204);
+    setEffect(dPa_name::ID_IT_SN_DO_HITC_SHIBUKIA00);
+    setEffect(dPa_name::ID_IT_SN_DO_HITC_SHIBUKIB00);
 }
 
 /* 00003284-000036A8       .text modeDelete__11daDaiocta_cFv */
@@ -1238,7 +1238,7 @@ void daDaiocta_c::modeDelete() {
             mPrmIdx = 5;
             if (mPrmIdx == 5 && mpMorf->isStop()) {
                 fopAcM_monsSeStart(this, JA_SE_CV_DO_SINK, 0);
-                setEffect(dPa_name::ID_SCENE_8205);
+                setEffect(dPa_name::ID_IT_SN_DO_DOWNSHIBUKI00);
                 daObjAuzu::Act_c* auzu_p = (daObjAuzu::Act_c *) fopAcM_SearchByID(mpAuzu);
                 auzu_p->to_disappear();
                 dComIfGp_getVibration().StartQuake(7, -0x21, cXyz(0.0f, 1.0f, 0.0f));
@@ -1344,7 +1344,7 @@ void daDaiocta_c::setAnm() {
 
     if (mAnmIdx == 6) {
         if (mpMorf->getFrame() == 1.0f) {
-            setEffect(dPa_name::ID_SCENE_82CC);
+            setEffect(dPa_name::ID_IT_SN_DO_HAKIDASHI00);
         }
         if (mpMorf->getFrame() == 26.0f) {
             dComIfGp_getVibration().StartShock(7, -0x21, cXyz(0.0f, 1.0f, 0.0f));

src/d/actor/d_a_daiocta_eye.cpp

@@ -192,7 +192,7 @@ void daDaiocta_Eye_c::_coHit(fopAc_ac_c* i_actor) {
                 mbIsDead = true;
                 m295 = true;
                 dComIfGp_particle_set(
-                    dPa_name::ID_SCENE_8206, &mParticlePos, &shape_angle, 
+                    dPa_name::ID_IT_SN_DO_SMOKE00, &mParticlePos, &shape_angle, 
                     NULL, 0xFF, &mParticleCallback, fopAcM_GetRoomNo(this)
                 );
                 modeDeathInit();
@@ -257,11 +257,11 @@ void daDaiocta_Eye_c::checkTgHit() {
         if (damaged == true) {        
             daPy_py_c* player_p = daPy_getPlayerActorClass();
             cXyz tg_hit_pos = *mSph.GetTgHitPosP();
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &tg_hit_pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &tg_hit_pos);
             if (health <= 0) {
                 cXyz hit_particle_scale(2.0f, 2.0f, 2.0f);
                 dComIfGp_particle_set(
-                    dPa_name::ID_COMMON_BIG_HIT, 
+                    dPa_name::ID_AK_JN_CRITICALHIT, 
                     &tg_hit_pos, 
                     &player_p->shape_angle, 
                     &hit_particle_scale

src/d/actor/d_a_deku_item.cpp

@@ -176,7 +176,7 @@ void daDekuItem_c::mode_wait() {
     }
 
     if (mpEmitter == NULL) {
-        mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_820F, &current.pos);
+        mpEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DEKULEAFSHINE00, &current.pos);
     } else if (mpEmitter != NULL) {
         mpEmitter->setGlobalTranslation(current.pos);
     }

src/d/actor/d_a_demo_item.cpp

@@ -296,13 +296,13 @@ void daDitem_c::setParticle() {
     
     switch (m_effect_type[m_itemNo]) {
     case 0:
-        mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F7, &current.pos, &angle);
+        mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_IT_JN_GETITEM_FLASH_L00, &current.pos, &angle);
     case 1:
-        mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F8, &current.pos, &angle);
+        mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_IT_JN_GETITEM_FLASH_S00, &current.pos, &angle);
     case 2:
-        mpEmitters[2] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F9, &current.pos, &angle);
+        mpEmitters[2] = dComIfGp_particle_set(dPa_name::ID_IT_JN_GETITEM_HALO00, &current.pos, &angle);
     case 3:
-        mpEmitters[3] = dComIfGp_particle_set(dPa_name::ID_COMMON_01FA, &current.pos, &angle);
+        mpEmitters[3] = dComIfGp_particle_set(dPa_name::ID_IT_JN_GETITEM_STAR00, &current.pos, &angle);
     case 4:
         break;
     }

src/d/actor/d_a_disappear.cpp

@@ -78,21 +78,21 @@ void set_disappear(disappear_class* i_this, float scale) {
         case 0xB:
         case 0xC:
         case 0xD:
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0014, &i_this->current.pos, NULL, &particleScale);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUPOFU, &i_this->current.pos, NULL, &particleScale);
             // Fall-through
         case 0x3:
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0013, &i_this->current.pos, NULL, &particleScale);
-            dComIfGp_particle_setStripes(dPa_name::ID_COMMON_0015, &i_this->current.pos, NULL, &particleScale, 0xFF, 0x96);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0016, &i_this->current.pos, NULL, &particleScale);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUBAKUEN, &i_this->current.pos, NULL, &particleScale);
+            dComIfGp_particle_setStripes(dPa_name::ID_AK_JN_SIBOUSPIRIT, &i_this->current.pos, NULL, &particleScale, 0xFF, 0x96);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUFLASH, &i_this->current.pos, NULL, &particleScale);
             break;
         case 0x1:
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0013, &i_this->current.pos, NULL, &particleScale);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0016, &i_this->current.pos, NULL, &particleScale);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUBAKUEN, &i_this->current.pos, NULL, &particleScale);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_SIBOUFLASH, &i_this->current.pos, NULL, &particleScale);
             break;
         case 0x4:
-            dComIfGp_particle_set(dPa_name::ID_COMMON_043C, &i_this->current.pos);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_043D, &i_this->current.pos);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_043E, &i_this->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_IT_JN_PUCHI_SHIBOUA, &i_this->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_IT_JN_PUCHI_SHIBOUB, &i_this->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_IT_JN_PUCHI_SHIBOUC, &i_this->current.pos);
             break;
     }
 }

src/d/actor/d_a_dr.cpp

@@ -94,7 +94,7 @@ static void move(dr_class* i_this) {
         anm_init(i_this, DR_BCK_DR_BIKU1, l_HIO.mBiku1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_BIKU1);
         i_this->mMode++;
         i_this->mCountDownTimers[0] = l_HIO.m0E;
-        i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C4, &i_this->current.pos);
+        i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINBIKU00, &i_this->current.pos);
         i_this->m2C9 = 0;
         // Fall-through
     case 11:
@@ -112,7 +112,7 @@ static void move(dr_class* i_this) {
             if (i_this->mCountDownTimers[0] != 0) {
                 if (cM_rndF(1.0f) < 0.5f) {
                     anm_init(i_this, DR_BCK_DR_ABARE1, l_HIO.mAbare1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_ABARE1);
-                    i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C5, &i_this->current.pos);
+                    i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINABARE00, &i_this->current.pos);
                     i_this->mCountDownTimers[1] = 500;
                 } else {
                     anm_init(i_this, DR_BCK_DR_ABARE2, l_HIO.mAbare2Morf, J3DFrameCtrl::EMode_NONE, 1.0f, DR_BAS_ABARE2);
@@ -122,14 +122,14 @@ static void move(dr_class* i_this) {
                     MtxP rootJntMtx = i_this->mpMorf->getModel()->getAnmMtx(0x00); // dr_all_root joint
                     cMtx_copy(rootJntMtx, *calc_mtx);
                     MtxPosition(&offset, &rootPos);
-                    dComIfGp_particle_set(dPa_name::ID_SCENE_81C7, &rootPos);
+                    dComIfGp_particle_set(dPa_name::ID_AK_SN_DRSPLASHMAGMA00, &rootPos);
                     
                     fopAcM_seStart(i_this, JA_SE_CM_DRG_MTOP_MAGMA, 0);
                     i_this->mCountDownTimers[1] = 0;
                 }
             } else {
                 anm_init(i_this, DR_BCK_DR_HO1, l_HIO.mHo1Morf, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
-                i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81C6, &i_this->current.pos);
+                i_this->mpBreathEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DRPAINHO00, &i_this->current.pos);
                 i_this->mMode++;
             }
         }

src/d/actor/d_a_dr2.cpp

@@ -286,7 +286,7 @@ void iwa_move(dr2_class* i_this) {
                 i_this->unk_50D = REG0_S(2) + 30;
                 i_this->unk_50E = true;
                 i_this->unk_510 = 1;
-                dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0B8, &i_this->unk_4A8, &i_this->unk_4B4, NULL, 0xb9, &i_this->unk_4EC, fopAcM_GetRoomNo(a_this));
+                dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BTDSMOKE02, &i_this->unk_4A8, &i_this->unk_4B4, NULL, 0xb9, &i_this->unk_4EC, fopAcM_GetRoomNo(a_this));
                 fopAcM_seStartCurrent(a_this, JA_SE_CM_BTD_ROCK_FALL, 0);
             }
             break;
@@ -327,7 +327,7 @@ void iwa_move(dr2_class* i_this) {
 #if VERSION == VERSION_DEMO
                 i_this->unk_4D4_demo = 
 #endif
-                dComIfGp_particle_set(dPa_name::ID_SCENE_80B7, &i_this->unk_4A8, &i_this->unk_4B4, NULL, 0xFF, &i_this->unk_4D8);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDDRIPMAGMA00, &i_this->unk_4A8, &i_this->unk_4B4, NULL, 0xFF, &i_this->unk_4D8);
                 i_this->unk_424 = 1;
             }
             break;
@@ -356,7 +356,7 @@ void iwa_move(dr2_class* i_this) {
 #else
                 i_this->unk_4D8.remove();
 #endif
-                dComIfGp_particle_setToon(dPa_name::ID_SCENE_A0B8, &i_this->unk_4A8, &i_this->unk_4B4, NULL, 0xb9, &i_this->unk_4EC, fopAcM_GetRoomNo(a_this));
+                dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BTDSMOKE02, &i_this->unk_4A8, &i_this->unk_4B4, NULL, 0xb9, &i_this->unk_4EC, fopAcM_GetRoomNo(a_this));
 
                 i_this->unk_50D = REG0_S(2) + 10;
                 i_this->unk_50E = true;
@@ -396,7 +396,7 @@ void iwa_move(dr2_class* i_this) {
                 i_this->unk_4D4->becomeInvalidEmitter();
             }
 
-            i_this->unk_4D4 = dComIfGp_particle_set(dPa_name::ID_SCENE_80B9, &i_this->unk_4A8);
+            i_this->unk_4D4 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BTDBROKENROCK00, &i_this->unk_4A8);
             if (i_this->unk_4D4 != NULL) {
                 i_this->unk_4D4->setRate(i_this->unk_50D);
                 i_this->unk_50E++;
@@ -432,7 +432,7 @@ void iwa_move(dr2_class* i_this) {
                 JGeometry::TVec3<f32> tvec;
                 link->getObject()->getGlobalPosition(tvec);
                 sp40 = tvec;
-                dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8062, &sp40, 0xB9);
+                dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_BTDBROKENROCKTAIL00, &sp40, 0xB9);
                 link = link->getNext();
             }
             break;

src/d/actor/d_a_ep.cpp

@@ -356,7 +356,7 @@ void ep_move(ep_class* i_this) {
 
             cXyz scale;
             scale.z = scale.y = scale.x = REG0_F(6) + 1.0f;
-            i_this->mpEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &pos, NULL, &scale);
+            i_this->mpEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_TORCH, &pos, NULL, &scale);
         }
 
         if (i_this->mpEmitter != NULL) {

src/d/actor/d_a_esa.cpp

@@ -111,7 +111,7 @@ void esa_1_move(esa_class* i_this) {
                     i_this->mActionState = 3;
                     if(i_this->field_0x2A4.getEmitter() == NULL) {
                         static cXyz ripple_scale(0.2f, 0.2f, 0.2f);
-                        dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4);
+                        dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4);
                         if(i_this->field_0x2A4.getEmitter()) {
                             i_this->field_0x2A4.setRate(0.4f);
                         }
@@ -174,7 +174,7 @@ void esa_1_move(esa_class* i_this) {
 
                 if(i_this->field_0x2A4.getEmitter() == NULL) {
                     static cXyz ripple_scale(0.2f, 0.2f, 0.2f);
-                    dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4);
+                    dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->current.pos, 0, &ripple_scale, 0xFF, &i_this->field_0x2A4);
                     if(i_this->field_0x2A4.getEmitter()) {
                         i_this->field_0x2A4.setRate(0.4f);
                     }

src/d/actor/d_a_fallrock.cpp

@@ -249,7 +249,7 @@ void daFallRock_c::setParticle(int param_1, cXyz* pos) {
     switch (param_1) {
         case 0: {
             dComIfGp_particle_set(
-                dPa_name::ID_COMMON_03E3,
+                dPa_name::ID_IT_JN_STS_HAHEN,
                 &pos_copy,
                 NULL,
                 &particle_scale,
@@ -266,7 +266,7 @@ void daFallRock_c::setParticle(int param_1, cXyz* pos) {
                 dComIfG_getObjectRes(m_arcname, ALWAYS_BTP_MPI_KOISHI);
 
             JPABaseEmitter* emitter = (JPABaseEmitter*)dComIfGp_particle_set(
-                dPa_name::ID_COMMON_03E2,
+                dPa_name::ID_IT_JN_M_STS_HAHEN,
                 &pos_copy,
                 NULL,
                 &particle_scale,

src/d/actor/d_a_fganon.cpp

@@ -498,8 +498,8 @@ void tama_set(fganon_class* i_this) {
                         i_this->mEmitters3[i] = NULL;
                     }
                 }
-                i_this->mEmitters3[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_821A, &tempPos, NULL);
-                i_this->mEmitters3[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_821B, &tempPos, NULL);
+                i_this->mEmitters3[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGDARKBALL00, &tempPos, NULL);
+                i_this->mEmitters3[1] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGDARKBALL01, &tempPos, NULL);
                 i_this->m672 = 250;
                 i_this->m671 = 2;
                 i_this->mpBrkAnm3->setPlaySpeed(1.0f);
@@ -510,8 +510,8 @@ void tama_set(fganon_class* i_this) {
             case 3: {
                 i_this->mpBrkAnm3->setPlaySpeed(-1.0f);
                 i_this->m671 = 4;
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8242, &tempPos, &i_this->shape_angle);
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8243, &tempPos, &i_this->shape_angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGEXPLODEDARKBALL00, &tempPos, &i_this->shape_angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGEXPLODEDARKBALL01, &tempPos, &i_this->shape_angle);
                 break;
             }
             case 4: {
@@ -578,8 +578,8 @@ void shot2(fganon_class* i_this) {
                     i_this->mEmitters2[i] = NULL;
                 }
             }
-            i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_8218, &i_this->current.pos, NULL);
-            i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_8219, &i_this->current.pos, NULL);
+            i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGCREATEDARKBALL00, &i_this->current.pos, NULL);
+            i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGCREATEDARKBALL01, &i_this->current.pos, NULL);
             fopAcM_monsSeStart(i_this, JA_SE_CV_PG_EBALL_MAKE_L, 0);
             i_this->mMode++;
             // Fall-through
@@ -615,8 +615,8 @@ void shot2(fganon_class* i_this) {
             }
             anm_init(i_this, FGANON_BCK_NAGERU_S1, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f, -1);
             i_this->mMode++;
-            i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_821C, &i_this->current.pos, NULL);
-            i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_821D, &i_this->current.pos, NULL);
+            i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGTHROWDARKBALLL00, &i_this->current.pos, NULL);
+            i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGTHROWDARKBALLR00, &i_this->current.pos, NULL);
             // Fall-through
         }
         case 3: {
@@ -1322,7 +1322,7 @@ void damage_check(fganon_class* i_this) {
                     fopAcM_monsSeStart(i_this, JA_SE_CV_PG_DIE, 0);
                     fopAcM_seStart(a_this, JA_SE_CM_PG_END_2, 0);
                     
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->eyePos, NULL);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &i_this->eyePos, NULL);
                     
                     local_44.z = 2.0f;
                     local_44.y = 2.0f;
@@ -1332,7 +1332,7 @@ void damage_check(fganon_class* i_this) {
                     local_a0.x = 0.0f;
                     local_a0.y = fopAcM_searchPlayerAngleY(i_this);
                     
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &i_this->eyePos, &local_a0, &local_44);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &i_this->eyePos, &local_a0, &local_44);
                     dKy_SordFlush_set(i_this->eyePos, 1);
 
                     i_this->mAction = 22;
@@ -1346,12 +1346,12 @@ void damage_check(fganon_class* i_this) {
 
                     fopAcM_seStart(a_this, JA_SE_CM_L_ARROW_SHRINK, 0);
 
-                    mEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8405, &i_this->current.pos, NULL);
+                    mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGLIGHTARROW00, &i_this->current.pos, NULL);
                     if (mEmitter != NULL) {
                         mEmitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(10));
                     }
 
-                    mEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8406, &i_this->current.pos, NULL);
+                    mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGLIGHTARROW01, &i_this->current.pos, NULL);
                     if (mEmitter != NULL) {
                         mEmitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(10));
                     }
@@ -1390,7 +1390,7 @@ void damage_check(fganon_class* i_this) {
                     return;
                 }
 
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->eyePos, NULL);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &i_this->eyePos, NULL);
 
                 local_44.z = 2.0f;
                 local_44.y = 2.0f;
@@ -1400,7 +1400,7 @@ void damage_check(fganon_class* i_this) {
                 local_a0.x = 0.0f;
                 local_a0.y = fopAcM_searchPlayerAngleY(i_this);
 
-                dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &i_this->eyePos, &local_a0, &local_44);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &i_this->eyePos, &local_a0, &local_44);
                 dKy_SordFlush_set(i_this->eyePos, 1);
                 
                 i_this->mAction = 8;
@@ -1422,7 +1422,7 @@ void damage_check(fganon_class* i_this) {
     }
     if (i_this->m68F) {
         if ((i_this->mCyl.ChkTgHit()) || (master->mAction == 8)) {
-            mEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_826B, &i_this->current.pos, NULL);
+            mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGVANISHSMOKE00, &i_this->current.pos, NULL);
             if (mEmitter != NULL) {
                 mEmitter->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(0));
             }
@@ -1443,7 +1443,7 @@ void damage_check(fganon_class* i_this) {
                                                                                               dComIfGs_getSelectEquip(0) == dItem_MASTER_SWORD_2_e)) {
                         atInfo.mpActor = cc_at_check(i_this, &atInfo);
                         if (atInfo.mbDead) {
-                            dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->eyePos, NULL);
+                            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &i_this->eyePos, NULL);
                             
                             local_44.x = 2.0f;
                             local_44.y = 2.0f;
@@ -1465,7 +1465,7 @@ void damage_check(fganon_class* i_this) {
                         local_a0.x = 0.0f;
                         local_a0.y = fopAcM_searchPlayerAngleY(i_this);
 
-                        dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, pPos, &local_a0, &local_44);
+                        dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, pPos, &local_a0, &local_44);
 
                         if ((i_this->mAction == 7) || (i_this->mAction == 10)) {
                             i_this->mAction = 8;
@@ -1501,7 +1501,7 @@ void damage_check(fganon_class* i_this) {
             }
             else {
                 fopAcM_monsSeStart(i_this, JA_SE_CV_PG_HIT_EBALL, 0);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &i_this->eyePos, NULL);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &i_this->eyePos, NULL);
 
                 local_44.z = 2.0f;
                 local_44.y = 2.0f;
@@ -1511,7 +1511,7 @@ void damage_check(fganon_class* i_this) {
                 local_a0.x = 0.0f;
                 local_a0.y = fopAcM_searchPlayerAngleY(i_this);
 
-                dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &i_this->eyePos, &local_a0, &local_44);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &i_this->eyePos, &local_a0, &local_44);
                 dKy_SordFlush_set(i_this->eyePos, 1);
 
                 i_this->mAction = 8;
@@ -2061,8 +2061,8 @@ void energy_ball_move(fganon_class* i_this) {
                 i_this->mEmitters2[i] = NULL;
             }
         }
-        i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_81CE, &a_this->current.pos, NULL);
-        i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_81CF, &a_this->current.pos, NULL);
+        i_this->mEmitters2[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGENERGYBALL00, &a_this->current.pos, NULL);
+        i_this->mEmitters2[1] = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGENERGYBALL01, &a_this->current.pos, NULL);
         i_this->m408 = 2;
     }
     if (i_this->m408 == 2) {
@@ -2207,7 +2207,7 @@ void energy_ball_move(fganon_class* i_this) {
                 }
                 csXyz local_7c(0,0,0);
                 local_7c.y = (short)cM_atan2s(i_this->m3F8.x, i_this->m3F8.z);
-                dComIfGp_particle_set(dPa_name::ID_SCENE_81F0, &i_this->m3E0, &local_7c);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGSMASHENERGYBALL00, &i_this->m3E0, &local_7c);
 #if VERSION == VERSION_USA
                 mDoAud_seStart(JA_SE_LK_PG_BOMB_STRIKE, &i_this->m3E0, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
 #endif
@@ -2270,8 +2270,8 @@ void energy_ball_move(fganon_class* i_this) {
 
             csXyz local_7c(0,0,0);
 
-            dComIfGp_particle_set(dPa_name::ID_SCENE_81EE, &i_this->m3E0, &local_7c, 0);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_81EF, &i_this->m3E0, &local_7c, 0);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGBREAKENERGYBALL00, &i_this->m3E0, &local_7c, 0);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGBREAKENERGYBALL01, &i_this->m3E0, &local_7c, 0);
 
             mDoAud_seStart(JA_SE_OBJ_PG_EBALL_EXP_S, &i_this->m3E0, 100, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
 
@@ -2307,7 +2307,7 @@ void* mahou_se_set(void* i_act, void* i_other) {
 }
 
 static u32 jno[2] = {0x7, 0xD};
-static u16 eno[2] = {dPa_name::ID_SCENE_81CD, dPa_name::ID_SCENE_81CC};
+static u16 eno[2] = {dPa_name::ID_AK_SN_BPGLEGSMOKE00, dPa_name::ID_AK_SN_BPGARMSMOKE00};
 
 /* 000086B4-0000924C       .text daFganon_Execute__FP12fganon_class */
 static BOOL daFganon_Execute(fganon_class* i_this) {

src/d/actor/d_a_fgmahou.cpp

@@ -82,7 +82,7 @@ static void move(fgmahou_class* i_this) {
             i_this->mTimers[0] = REG8_S(9) + 5;
             i_this->mTimers[1] = 0x14;
 
-            i_this->mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_821E, &i_this->current.pos);
+            i_this->mpEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGDARKSHOT00, &i_this->current.pos);
 
             i_this->mTgSph.SetR(REG6_F(5) + 110.0f);
 
@@ -118,7 +118,7 @@ static void move(fgmahou_class* i_this) {
                 break;
             }
 
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8244, &i_this->current.pos, &i_this->home.angle);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGSMASHDARKSHOT00, &i_this->current.pos, &i_this->home.angle);
             fopAcM_seStartCurrent(i_this, JA_SE_LK_PG_BOMB_STRIKE, 0);
 
             i_this->mState = 5;
@@ -212,9 +212,9 @@ static void move(fgmahou_class* i_this) {
             i_this->field_0x780 = 0x32;
             i_this->health = 1;
 
-            JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_SCENE_8245, &i_this->current.pos);
+            JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGHITDARKSHOT00, &i_this->current.pos);
             pEmtr->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(1));
-            JPABaseEmitter* pEmtr2 = dComIfGp_particle_set(dPa_name::ID_SCENE_8246, &i_this->current.pos);
+            JPABaseEmitter* pEmtr2 = dComIfGp_particle_set(dPa_name::ID_AK_SN_BPGHITDARKSHOT01, &i_this->current.pos);
             pEmtr2->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(1));
 
             fopAcM_seStartCurrent(i_this, JA_SE_OBJ_PG_EBALL_EXP_L, 0);

src/d/actor/d_a_fire.cpp

@@ -221,9 +221,9 @@ BOOL daFire_c::CreateInit() {
 cPhs_State daFire_c::_create() {
     fopAcM_SetupActor(this, daFire_c);
 
-    field_0x8BC = dComIfGp_particle_set(dPa_name::ID_COMMON_0461, &current.pos);
-    field_0x8C0 = dComIfGp_particle_set(dPa_name::ID_COMMON_0462, &current.pos);
-    field_0x8C4 = dComIfGp_particle_setProjection(dPa_name::ID_COMMON_445B, &current.pos);
+    field_0x8BC = dComIfGp_particle_set(dPa_name::ID_IT_JN_KAKOMI_FIRE_A00, &current.pos);
+    field_0x8C0 = dComIfGp_particle_set(dPa_name::ID_IT_JN_KAKOMI_FIRE_B00, &current.pos);
+    field_0x8C4 = dComIfGp_particle_setProjection(dPa_name::ID_IT_JP_KAKOMI_KAGERO00, &current.pos);
 
     if (!CreateInit()) {
         return cPhs_ERROR_e;
@@ -282,7 +282,7 @@ void daFire_c::ctrlEffect() {
                     field_0x8D1 = 0;
                     flag = true;
                     execStopNowFire();
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_0463, &current.pos);
+                    dComIfGp_particle_set(dPa_name::ID_IT_JN_KAKOMI_STEAM00, &current.pos);
                 } else if (hit_obj->ChkAtType(AT_TYPE_WIND) && wind != field_0x2CC[0].GetTgHitAc()) {
                     field_0x8E0 = *field_0x2CC[0].GetTgRVecP();
 

src/d/actor/d_a_floor.cpp

@@ -98,8 +98,8 @@ BOOL daFloor_c::Execute(Mtx**) {
 
 /* 00000548-00000640       .text set_effect__9daFloor_cFv */
 void daFloor_c::set_effect() {
-    dComIfGp_particle_set(dPa_name::ID_SCENE_81A6, &current.pos, &current.angle);
-    JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_COMMON_2027, &current.pos, &current.angle, NULL, 255, &mSmokeCallBack, fopAcM_GetRoomNo(this));
+    dComIfGp_particle_set(dPa_name::ID_AK_SN_KAZEBREAKFLOOR00, &current.pos, &current.angle);
+    JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &current.pos, &current.angle, NULL, 255, &mSmokeCallBack, fopAcM_GetRoomNo(this));
     if (emtr != NULL) {
         emtr->setRate(30);
         emtr->setMaxFrame(1);

src/d/actor/d_a_fm.cpp

@@ -860,7 +860,7 @@ bool daFm_c::checkTgHit() {
                 fopAcM_seStart(this, JA_SE_LK_W_WEP_HIT, 0x44);
                 temp = false;
                 mHitType = 4;
-                dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &attention_info.position);
+                dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &attention_info.position);
                 fopAcM_monsSeStart(this, JA_SE_CV_FM_DAMAGE, 0);
                 modeProcInit(0x13);
                 break;
@@ -907,7 +907,7 @@ bool daFm_c::checkTgHit() {
 
             case AT_TYPE_GRAPPLING_HOOK:
                 fopAcM_monsSeStart(this, JA_SE_CV_FM_DAMAGE, 0);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &attention_info.position);
+                dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &attention_info.position);
                 fopAcM_seStart(this, JA_SE_LK_W_WEP_HIT, 0x44);
                 mHitType = 0xD;
                 temp = false;
@@ -921,9 +921,9 @@ bool daFm_c::checkTgHit() {
         if (temp) {
             cc_at_check(this, &atInfo);
             if (mHitType == 1 || mHitType == 8 || mHitType == 9 || mHitType== 0xc || health <= 0) {
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0010, hitPos);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, hitPos);
                 cXyz temp2(2.0f, 2.0f, 2.0f);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, hitPos, &player->shape_angle, &temp2);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, hitPos, &player->shape_angle, &temp2);
 
                 if (health <= 0) {
                     fopAcM_monsSeStart(this, JA_SE_CV_FM_DIE, 0);
@@ -942,7 +942,7 @@ bool daFm_c::checkTgHit() {
                     modeProcInit(10);
                 }
             } 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);
 
                 fopAcM_monsSeStart(this, JA_SE_CV_FM_DAMAGE, 0);
                 modeProcInit(10);
@@ -2991,7 +2991,7 @@ int daFm_c::setRnd(int param_1, int param_2) {
 /* 00008044-00008114       .text setHoleEffect__6daFm_cFv */
 void daFm_c::setHoleEffect() {
     if(mpFollowEcallBack.getEmitter() == NULL) {
-        dComIfGp_particle_setShipTail(dPa_name::ID_SCENE_809E, &current.pos, NULL, NULL, 0xFF, &mpFollowEcallBack, fopAcM_GetRoomNo(this));
+        dComIfGp_particle_setShipTail(dPa_name::ID_AK_SN_PITFALL00, &current.pos, NULL, NULL, 0xFF, &mpFollowEcallBack, fopAcM_GetRoomNo(this));
     }
     JPABaseEmitter* emitter = mpFollowEcallBack.getEmitter();
     

src/d/actor/d_a_ghostship.cpp

@@ -355,7 +355,7 @@ bool daGhostship_c::_execute() {
 
         dLib_setCirclePath(&mPaths[i]);
         if(mAlpha != 0.0f) {
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8306, &mPaths[i].mPos);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_SN_O_GHOSTSHIPFIRE00, &mPaths[i].mPos);
         }
     }
 

src/d/actor/d_a_himo2.cpp

@@ -711,7 +711,7 @@ int himo2_bg_check(himo2_class* i_this) {
                 mDoAud_seStart(JA_SE_LK_MS_WEP_HIT, &actor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
                 if (iVar4 == dBgS_Attr_WOOD_e) {
                     pJVar5 = dComIfGp_particle_set(
-                        dPa_name::ID_COMMON_002B,
+                        dPa_name::ID_AK_JN_ELEMENTKIKUZU00,
                         &actor->current.pos,
                         &local_38,
                         NULL,
@@ -728,7 +728,7 @@ int himo2_bg_check(himo2_class* i_this) {
                     }
                 } else {
                     local_38.x = local_38.x + 0x4000;
-                    pJVar5 = dComIfGp_particle_set(dPa_name::ID_COMMON_002C, &actor->current.pos, &local_38);
+                    pJVar5 = dComIfGp_particle_set(dPa_name::ID_AK_JN_ELEMENTHIBANA00, &actor->current.pos, &local_38);
                     if (pJVar5 != NULL) {
                         pJVar5->mInitialVelAxis = 15.0f;
                     }

src/d/actor/d_a_himo3.cpp

@@ -496,7 +496,7 @@ static BOOL daHimo3_Execute(himo3_class* i_this) {
 #if VERSION == VERSION_DEMO
                 i_this->demo_m20FC =
 #endif
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &i_this->m1624, NULL, &fire_scale, 0xff, &i_this->m20FC);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_TORCH, &i_this->m1624, NULL, &fire_scale, 0xff, &i_this->m20FC);
 #if VERSION == VERSION_DEMO
                 i_this->m2110 = 1;
 #endif
@@ -552,7 +552,7 @@ static BOOL daHimo3_Execute(himo3_class* i_this) {
             }
 
             cXyz sp1C(i_this->m1624.x, DEMO_SELECT(i_this->m1624.y + REG0_F(7), i_this->m1624.y) + 20.0f, i_this->m1624.z);
-            dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &sp1C);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_JP_O_KAGEROU00, &sp1C);
             i_this->m1600.mPos = i_this->m1624;
             i_this->m1600.mColor.r = 600;
             i_this->m1600.mColor.g = 400;

src/d/actor/d_a_hookshot.cpp

@@ -259,7 +259,7 @@ BOOL daHookshot_c::procShot() {
         mCurrProcFunc = &daHookshot_c::procReturn;
     } else if (m2A3 || current.pos.abs(daPy_getPlayerLinkActorClass()->getHookshotRootPos()) >= 1500.0f) {
         if (m2A3) {
-            if (m2A6 == dPa_name::ID_SCENE_825F) {
+            if (m2A6 == dPa_name::ID_IT_SN_LK_FKSHOT_SUNA00) {
                 dComIfGp_particle_setP1(m2A6, &current.pos);
             } else {
                 dComIfGp_particle_setP1(m2A6, &current.pos, &m2BA);
@@ -298,9 +298,9 @@ BOOL daHookshot_c::procShot() {
                         dComIfG_Bgsp()->GetAttributeCode(mLinChk) == dBgS_Attr_SAND_e
                     )
                 ) {
-                    m2A6 = dPa_name::ID_SCENE_825F;
+                    m2A6 = dPa_name::ID_IT_SN_LK_FKSHOT_SUNA00;
                 } else {
-                    m2A6 = dPa_name::ID_COMMON_PURPLE_HIT;
+                    m2A6 = dPa_name::ID_AK_JN_NG;
                 }
                 mMtrlSndId = dComIfG_Bgsp()->GetMtrlSndId(mLinChk);
                 m2A3 = true;

src/d/actor/d_a_hot_floor.cpp

@@ -71,9 +71,9 @@ bool daHot_Floor_c::_delete() {
 bool daHot_Floor_c::_execute() {
     if (mbSpawnParticle) {
         if (mEmitter2 == NULL && !(fopAcM_GetParam(this) & 1))
-            mEmitter2 = dComIfGp_particle_set(dPa_name::ID_SCENE_814C, &current.pos);
+            mEmitter2 = dComIfGp_particle_set(dPa_name::ID_AK_SN_HEATFLOOR01, &current.pos);
         if (mEmitter1 == NULL && !(fopAcM_GetParam(this) & 2))
-            mEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_8120, &current.pos);
+            mEmitter1 = dComIfGp_particle_set(dPa_name::ID_AK_SN_HEATFLOOR00, &current.pos);
         cLib_chaseF(&mSpawnTimer, 60.0f, 5.0f);
         mbSpawnParticle = false;
     } else {

src/d/actor/d_a_ib.cpp

@@ -88,17 +88,17 @@ void daIball_c::createDisappearEffect(int param_1, int color_idx) {
     pos.y += m_data.mYOffset;
     switch (param_1) {
     case 0:
-        dComIfGp_particle_set(dPa_name::ID_COMMON_001C, &pos, NULL, &scale, 0xFF, dPa_control_c::getLifeBallSetColorEcallBack(color_idx));
-        dComIfGp_particle_set(dPa_name::ID_COMMON_001D, &pos, NULL, &scale);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_BREAKLIFEBALL, &pos, NULL, &scale, 0xFF, dPa_control_c::getLifeBallSetColorEcallBack(color_idx));
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_HAHENLIFEBALL, &pos, NULL, &scale);
         if (color_idx == 2) {
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0047, &pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_LOOTITEM00, &pos);
         }
         fopAcM_seStartCurrent(this, JA_SE_OBJ_CUT_INOCHIDAMA, 0);
         break;
     case 1:
-        dComIfGp_particle_set(dPa_name::ID_COMMON_0019, &pos, NULL, &scale);
-        dComIfGp_particle_set(dPa_name::ID_COMMON_001A, &pos, NULL, &scale);
-        dComIfGp_particle_set(dPa_name::ID_COMMON_001B, &pos, NULL, &scale);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_SHOTENBAKUEN, &pos, NULL, &scale);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_SHOTENPOFU, &pos, NULL, &scale);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_SHOTENSPIRIT, &pos, NULL, &scale);
         fopAcM_seStartCurrent(this, JA_SE_CM_INOCHIDAMA_BREAK, 0);
         break;
     }
@@ -214,7 +214,7 @@ void daIball_c::checkGeo() {
             particle_scale.setall(0.25f);
             cXyz particle_pos(current.pos);
             particle_pos.y = lavaY;
-            dComIfGp_particle_set(dPa_name::ID_SCENE_80D5, &particle_pos, NULL, &particle_scale);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_YOGAN_HANE00, &particle_pos, NULL, &particle_scale);
             fopAcM_delete(this);
         }
     }
@@ -246,7 +246,7 @@ void daIball_c::mode_wait() {
 
 /* 800F3F6C-800F3FE8       .text mode_water_init__9daIball_cFv */
 void daIball_c::mode_water_init() {
-    dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &current.pos, NULL, &scale, 0xFF, &mRippleCb);
+    dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &current.pos, NULL, &scale, 0xFF, &mRippleCb);
     mRippleCb.setRate(0.0f);
     mMode = MODE_WATER;
 }

src/d/actor/d_a_item.cpp

@@ -210,7 +210,7 @@ void daItem_c::CreateInit() {
     animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
     
     if (fopAcM_SearchByName(PROC_BST)) { // Gohdan
-        mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_81E1, &current.pos);
+        mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTKIRAKIRAARROW00, &current.pos);
     }
 }
 
@@ -1064,7 +1064,7 @@ BOOL daItem_c::itemActionForArrow() {
         mOnGroundTimer++;
         
         if (mOnGroundTimer == 1 && fopAcM_SearchByName(PROC_BST)) { // Gohdan
-            JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_A1E2, &current.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this));
+            JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_ST_BSTDROPARROWSMOKE00, &current.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this));
             if (emitter) {
                 emitter->setMaxFrame(1);
             }
@@ -1248,7 +1248,7 @@ void daItem_c::mode_water_init() {
     temp3 *= scale.x;
     particleScale.setall(temp3);
     
-    dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &current.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb);
+    dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &current.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb);
     mPtclRippleCb.mRate = 0.0f;
 }
 

src/d/actor/d_a_kanban.cpp

@@ -192,7 +192,7 @@ BOOL sea_water_check(kanban_class* i_this) {
         if ((iVar3 == 1) && (i_this->m29C == 0)) {
             cXyz sp30(0.5f, 0.5f, 0.5f);
             i_this->m514.remove();
-            dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->m528, NULL, &sp30, 0xFF, &i_this->m514);
+            dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->m528, NULL, &sp30, 0xFF, &i_this->m514);
             i_this->m2BC = 0;
             i_this->m29C = 1;
             i_this->m514.setRate(0.0f);
@@ -317,7 +317,7 @@ void cut_point_check(kanban_class* i_this) {
 
     if (parameters != 0) {
         cXyz sp18 = *i_this->m5B0.GetTgHitPosP();
-        dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &sp18, &player->shape_angle);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &sp18, &player->shape_angle);
         dScnPly_ply_c::setPauseTimer(1);
         a_this->current.angle.z = i_this->m2C4;
         
@@ -370,7 +370,7 @@ void mother_move(kanban_class* i_this) {
                                 i_this->m29A = 1;
                                 i_this->m2C0 = 20;
                                 cXyz sp18 = *i_this->m5B0.GetTgHitPosP();
-                                dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &sp18, &player->shape_angle);
+                                dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &sp18, &player->shape_angle);
                                 dScnPly_ply_c::setPauseTimer(1);
                                 return;
                             }

src/d/actor/d_a_ki.cpp

@@ -436,7 +436,7 @@ void ki_fire_set_move(ki_class* i_this) {
             a_this->speed.y = REG8_F(9) + 97.0f + cM_rndF(30.0f);
             anm_init(i_this, KI_BCK_WAIT1, 1.0f, 2, 1.0f, KI_BAS_WAIT1);
             i_this->mBehaviorType = 1;
-            i_this->m91C = dComIfGp_particle_set(dPa_name::ID_SCENE_8099, &a_this->current.pos, NULL, NULL, 0xFF, &i_this->m908);
+            i_this->m91C = dComIfGp_particle_set(dPa_name::ID_IT_SN_FIREK_FIRE_A, &a_this->current.pos, NULL, NULL, 0xFF, &i_this->m908);
 
         case 1:
             a_this->shape_angle.x += 0x1400;
@@ -450,8 +450,8 @@ void ki_fire_set_move(ki_class* i_this) {
                     dComIfGp_particle_forceDeleteEmitter(i_this->m91C);
                     i_this->m91C = NULL;
                 }
-                dComIfGp_particle_set(dPa_name::ID_SCENE_809A, &a_this->current.pos);
-                dComIfGp_particle_set(dPa_name::ID_SCENE_809B, &a_this->current.pos);
+                dComIfGp_particle_set(dPa_name::ID_IT_SN_FIREK_FIRE_B, &a_this->current.pos);
+                dComIfGp_particle_set(dPa_name::ID_IT_SN_FIREK_HAHEN, &a_this->current.pos);
             }
             break;
 
@@ -1043,7 +1043,7 @@ static BOOL daKi_Execute(ki_class* i_this) {
     if (i_this->mDamageType != 0) {
         i_this->m920->play();
         if (i_this->mAction != ki_class::ACT_FAIL_MOVE_e) {
-            dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8061, &i_this->actor.current.pos);
+            dComIfGp_particle_setSimple(dPa_name::ID_IT_SN_O_FIREK_KASU, &i_this->actor.current.pos);
             fopAcM_seStart(&i_this->actor, JA_SE_OBJ_TORCH_BURNING, 0);
         }
     }

src/d/actor/d_a_kita.cpp

@@ -221,8 +221,8 @@ void kita_move(kita_class* i_this) {
                         i_this->field_360 = 2;
                         fopAcM_seStart(actor, JA_SE_OBJ_P_FLOWER_LAND_W, 0);
                         cXyz particle_scale(3.0, 3.0, 3.0);
-                        dComIfGp_particle_set(dPa_name::ID_SCENE_828C, &actor->current.pos);
-                        dComIfGp_particle_set(dPa_name::ID_COMMON_003F, &actor->current.pos, 0, &particle_scale);
+                        dComIfGp_particle_set(dPa_name::ID_AK_SN_FFSPLASH00, &actor->current.pos);
+                        dComIfGp_particle_set(dPa_name::ID_IT_JN_WP_HAMON03, &actor->current.pos, 0, &particle_scale);
 
                         dComIfGp_getVibration().StartShock(REG0_S(2) + 4, -0x21, cXyz(0.0, 1.0, 0.0));
                     }
@@ -308,7 +308,7 @@ static BOOL daKita_Execute(kita_class* i_this) {
     i_this->pm_bgw->Move();
     if(i_this->field_360 == 2){
         if(i_this->mBaseEmitter == NULL){
-            i_this->mBaseEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_828D, &i_this->current.pos);
+            i_this->mBaseEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_FFHAMON00, &i_this->current.pos);
         }
         else {
             i_this->mBaseEmitter->setGlobalTranslation(i_this->current.pos.x, i_this->current.pos.y - (REG0_F(17) + 40.0f), i_this->current.pos.z);

src/d/actor/d_a_kn.cpp

@@ -112,7 +112,7 @@ void shibuki_set(kn_class* i_this) {
     JGeometry::TVec3<f32> s;
     s.set(fVar1, fVar1, fVar1);
 
-    JPABaseEmitter* pJVar2 = dComIfGp_particle_set(dPa_name::ID_COMMON_0023, &i_this->actor.current.pos);
+    JPABaseEmitter* pJVar2 = dComIfGp_particle_set(dPa_name::ID_AK_JN_ELEMENTSHIBUKI00, &i_this->actor.current.pos);
     if (pJVar2 != NULL) {
         pJVar2->setRate(1.5f);
         pJVar2->setSpread(1.0f);

src/d/actor/d_a_kokiie.cpp

@@ -143,10 +143,10 @@ void kokiie_move(kokiie_class* i_this) {
         if (i_this->m37A == (s16)(REG0_S(5) + 0x40)) {
             cXyz sp44 = actor->current.pos;
             sp44.y = 1170.0f;
-            dComIfGp_particle_set(dPa_name::ID_SCENE_82A4, &sp44);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_82A5, &sp44);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_82A6, &actor->current.pos);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_82A7, &sp44);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_KOKIRIHOUSESPLASH00, &sp44);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_KOKIRIHOUSESPLASH01, &sp44);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_KOKIRIHOUSEHAMON00, &actor->current.pos);
+            dComIfGp_particle_set(dPa_name::ID_AK_SN_KOKIRIHOUSEHAMON01, &sp44);
         }
 
         i_this->m374 = (REG0_F(9) + 5180.0f) - 3800.0f;

src/d/actor/d_a_ks.cpp

@@ -148,7 +148,7 @@ void naraku_check(ks_class* i_this) {
             local_18.setall(0.5f);
 
             i_this->m52C.remove();
-            dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &i_this->current.pos, NULL, &local_18, 0xFF, &i_this->m52C);
+            dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &i_this->current.pos, NULL, &local_18, 0xFF, &i_this->m52C);
             i_this->m52C.setRate(0.0f);
         }
 
@@ -292,7 +292,7 @@ BOOL body_atari_check(ks_class* i_this) {
                 }
                 
                 mParticleScale.setall(REG8_F(0) + 0.8f); 
-                dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &mTgHitPos, &player->shape_angle, &mParticleScale);     
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &mTgHitPos, &player->shape_angle, &mParticleScale);     
                 
                 break;
             }
@@ -346,7 +346,7 @@ BOOL body_atari_check(ks_class* i_this) {
             }
             default: {
                 mParticleScale.setall(REG8_F(0) + 0.8f);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &mTgHitPos, &player->shape_angle, &mParticleScale);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &mTgHitPos, &player->shape_angle, &mParticleScale);
                 break;
             }
         }
@@ -671,7 +671,7 @@ void dead_eff_set(ks_class* i_this, cXyz* i_pos) {
     else {
         fopAcM_seStart(i_this, JA_SE_CM_KS_DIE, 0);
 
-        dComIfGp_particle_setSimple(dPa_name::ID_SCENE_8068, i_pos);
+        dComIfGp_particle_setSimple(dPa_name::ID_IT_SN_O_KUROBOU_SIBOU00, i_pos);
 
         gm_birth_delet(i_this);
     }

src/d/actor/d_a_lamp.cpp

@@ -55,7 +55,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) {
     if (!i_this->mParticleInit) {
         static cXyz fire_scale(0.5f, 0.5f, 0.5f);
 
-        dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &i_this->mPos, NULL, &fire_scale, 0xFF, &i_this->mPa);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_TORCH, &i_this->mPos, NULL, &fire_scale, 0xFF, &i_this->mPa);
         i_this->mParticleInit = 1;
         i_this->mParticlePower = 1.0f;
     }
@@ -63,7 +63,7 @@ static BOOL daLamp_Execute(lamp_class* i_this) {
     if (i_this->mPa.getEmitter()) {
         cXyz whitePartPos = i_this->mPos;
         whitePartPos.y += 20.0f;
-        dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &whitePartPos);
+        dComIfGp_particle_setSimple(dPa_name::ID_AK_JP_O_KAGEROU00, &whitePartPos);
         cLib_addCalc2(&i_this->mParticlePower, cM_rndF(0.2f) + 1.0f, 0.5f, 0.02f);
     } else {
         i_this->mParticlePower = 0.0f;

src/d/actor/d_a_lbridge.cpp

@@ -74,7 +74,7 @@ void daLbridge_c::CreateInit() {
     fopAcM_setCullSizeBox(this, -600.0f, -100.0f, -150.0f, 600.0f, 100.0f, 150.0f);
     fopAcM_setCullSizeFar(this, 1.5f);
 
-    mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_810F, &current.pos, &current.angle);
+    mpEmitter = dComIfGp_particle_set(dPa_name::ID_IT_SN_RBRIDGE_FLSH00, &current.pos, &current.angle);
 
     if (mpEmitter != NULL) {
         mpEmitter->stopDrawParticle();
@@ -233,8 +233,8 @@ void daLbridge_c::appear_bridge() {
     pos1.z += 100.0f;
     pos2.z -= 100.0f;
 
-    dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8119, &pos1, &current.angle);
-    dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8119, &pos2, &current.angle);
+    dComIfGp_particle_setProjection(dPa_name::ID_IT_SN_RBRIDGE_APP00, &pos1, &current.angle);
+    dComIfGp_particle_setProjection(dPa_name::ID_IT_SN_RBRIDGE_APP00, &pos2, &current.angle);
 
     set_on_se();
 

src/d/actor/d_a_leaflift.cpp

@@ -117,7 +117,7 @@ void daLlift_c::CreateInit() {
     if (mWaterY != -G_CM3D_F_INF) {
         cXyz particlePos = current.pos;
         particlePos.y = mWaterY + 1.0f; 
-        mEmitter3 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AA, &particlePos, &current.angle);
+        mEmitter3 = dComIfGp_particle_set(dPa_name::ID_IT_SN_DEKLIFT_HAMONA00, &particlePos, &current.angle);
         if (mEmitter3) {
             mEmitter3->stopCreateParticle();
         }

src/d/actor/d_a_mdoor.cpp

@@ -91,7 +91,7 @@ void daMdoor_c::calcMtx() {
 
 /* 0000029C-00000344       .text smokeInit__9daMdoor_cFv */
 void daMdoor_c::smokeInit() {
-    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_COMMON_2022, &current.pos, &shape_angle, NULL, 0xAA, &m290, fopAcM_GetRoomNo(this));
+    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &current.pos, &shape_angle, NULL, 0xAA, &m290, fopAcM_GetRoomNo(this));
     if (emitter != NULL) {
         emitter->setRate(16.0f);
         emitter->setSpread(0.35f);
@@ -216,7 +216,7 @@ void daMdoor_c::demoProc() {
             case 2:
                 speedF = 0.0f;
                 if (getShapeType() != 1) {
-                    dComIfGp_particle_set(dPa_name::ID_SCENE_81B2, &current.pos, &current.angle);
+                    dComIfGp_particle_set(dPa_name::ID_AK_SN_WOODCAGE00, &current.pos, &current.angle);
                 }
                 fopAcM_seStart(this, JA_SE_OBJ_CAGE_OPEN, 0);
                 break;
@@ -231,7 +231,7 @@ void daMdoor_c::demoProc() {
                 if (chkFlag(1)) {
                     clrFlag(1);
                     if (getShapeType() != 1) {
-                        dComIfGp_particle_set(dPa_name::ID_SCENE_81B2, &current.pos, &current.angle);
+                        dComIfGp_particle_set(dPa_name::ID_AK_SN_WOODCAGE00, &current.pos, &current.angle);
                     }
                     smokeInit();
                 }
@@ -311,7 +311,7 @@ BOOL daMdoor_actionOpen(daMdoor_c* i_this) {
         if (i_this->m2C4 == 0) {
             i_this->speedF = 0.0f;
             if (i_this->getShapeType() != 1) {
-                dComIfGp_particle_set(dPa_name::ID_SCENE_81B2, &i_this->current.pos, &i_this->current.angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_WOODCAGE00, &i_this->current.pos, &i_this->current.angle);
             }
             fopAcM_seStart(i_this, JA_SE_OBJ_CAGE_OPEN, 0);
         }

src/d/actor/d_a_mflft.cpp

@@ -105,7 +105,7 @@ void kikuzu_set(mflft_class* i_this, cXyz* arg1) {
     sp18.y -= -0x8000;
 
     JPABaseEmitter* pJVar4 = dComIfGp_particle_set(
-        dPa_name::ID_COMMON_002B, arg1, &sp18, NULL, 0xff, NULL, -1, &i_this->actor.tevStr.mColorK0, &i_this->actor.tevStr.mColorK0, NULL
+        dPa_name::ID_AK_JN_ELEMENTKIKUZU00, arg1, &sp18, NULL, 0xff, NULL, -1, &i_this->actor.tevStr.mColorK0, &i_this->actor.tevStr.mColorK0, NULL
     );
     if (pJVar4 != NULL) {
         pJVar4->setRate(10.0f);
@@ -304,7 +304,7 @@ void mflft_move(mflft_class* i_this) {
             if (i_this->actor.speed.y < -50.0f) {
                 i_this->m2C4 = 2000.0f;
                 i_this->m2BC = 2000.0f;
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8231, &i_this->actor.current.pos, &i_this->actor.shape_angle);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_MAGMALIFTSPLASH00, &i_this->actor.current.pos, &i_this->actor.shape_angle);
                 fopAcM_seStartCurrent(&i_this->actor, JA_SE_OBJ_BAL_LIFT_LANDING, 0);
                 dComIfGp_getVibration().StartShock(REG0_S(2) + DEMO_SELECT(4, 5), -0x21, cXyz(0.0f, 1.0f, 0.0f));
             }
@@ -380,7 +380,7 @@ void himo_move(mflft_class* i_this) {
                 if (ccAtInfo.mpActor != NULL) {
                     sp48 = i_this->m2D8[i];
                     sp48.y = ccAtInfo.mpActor->eyePos.y;
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &sp48, &player->shape_angle);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &sp48, &player->shape_angle);
                     kikuzu_set(i_this, &sp48);
                     mDoAud_seStart(soundId, &ccAtInfo.mpActor->eyePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(&i_this->actor)));
                 }
@@ -412,7 +412,7 @@ void eff_cont(mflft_class* i_this) {
         break;
 
     case 1:
-        i_this->m774 = dComIfGp_particle_set(dPa_name::ID_SCENE_8105, &sp24);
+        i_this->m774 = dComIfGp_particle_set(dPa_name::ID_AK_SN_MAGMAISLAND01, &sp24);
         if (i_this->m774 != NULL) {
             cXyz s(1.8f, 1.8f, 1.8f);
             i_this->m774->setGlobalScale(s);

src/d/actor/d_a_mmusic.cpp

@@ -121,7 +121,7 @@ bool daMmusic::Act_c::_execute() {
     if (mpEmitter == NULL && field_0x298 == 1) {
         set_mtx();
         cXyz scale(1.0f, 1.0f, 1.0f);
-        JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_SCENE_826C, &current.pos);
+        JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_AK_SN_MACOREMUSIC00, &current.pos);
         mpEmitter = emtr;
         if (emtr != NULL) {
             mpEmitter->setGlobalRTMatrix(mMtx);

src/d/actor/d_a_msw.cpp

@@ -177,7 +177,7 @@ static BOOL daMsw_Execute(msw_class* i_this) {
 
             cXyz scale;
             scale.x = scale.y = scale.z = 2.0f;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, i_this->mChainCyls[chainIdx].GetTgHitPosP(), &player->shape_angle, &scale);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, i_this->mChainCyls[chainIdx].GetTgHitPosP(), &player->shape_angle, &scale);
         }
         i_this->mChainCyls[chainIdx].SetC(i_this->m2E0[chainIdx]);
 

src/d/actor/d_a_npc_cb1.cpp

@@ -747,7 +747,7 @@ BOOL daNpc_Cb1_c::flyAction(BOOL param_1, f32 param_2, s16 param_3, BOOL param_4
         }
         else if(mpMorf->checkFrame(6.0f)) {
             fopAcM_seStart(this, JA_SE_CM_PRAPELLO_OPEN, 0);
-            JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_830B, &current.pos);
+            JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_PERAPROOPEN00, &current.pos);
             if(emitter) {
                 emitter->setGlobalRTMatrix(mpPropellerModel->getAnmMtx(m_center_jnt_num));
             }

src/d/actor/d_a_npc_fa1.cpp

@@ -293,7 +293,7 @@ int daNpc_Fa1_c::createInit() {
         setPointLightParam();
         dKy_efplight_set(&mPointLight);
     }
-    JPABaseEmitter* pJVar4 = dComIfGp_particle_set(dPa_name::ID_COMMON_0052, &current.pos, NULL,
+    JPABaseEmitter* pJVar4 = dComIfGp_particle_set(dPa_name::ID_AK_JN_CUREFAIRY00, &current.pos, NULL,
                                                    NULL, 0xFF, &mSparklePtclCallback);
     mpEmitter = pJVar4;
     return TRUE;

src/d/actor/d_a_npc_ji1.cpp

@@ -372,7 +372,7 @@ void daNpc_Ji1_c::normalSubActionHarpoonGuard(s16 param_1) {
             field_0xD74++;
             field_0xD68 = 0;
             setAnm(9, 0.0f, 1);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, field_0x7E0.GetTgHitPosP());
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, field_0x7E0.GetTgHitPosP());
             fopAcM_seStart(this, JA_SE_CV_JI_DEFENCE, 0);
             fopAcM_seStart(this, JA_SE_OBJ_COL_SWS_NMTLP, 0);
         }
@@ -2052,7 +2052,7 @@ u32 daNpc_Ji1_c::setParticle(int max, f32 rate, f32 spread) {
 #endif
     dtParticle();
     if(field_0x2E0.getEmitter() == 0) {
-        JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &current.pos, 0, 0, 0xB9, &field_0x2E0, fopAcM_GetRoomNo(this));
+        JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &current.pos, 0, 0, 0xB9, &field_0x2E0, fopAcM_GetRoomNo(this));
         if(emitter) {
             emitter->setRate(rate);
             emitter->setSpread(spread);
@@ -2076,7 +2076,7 @@ void daNpc_Ji1_c::dtParticle() {
 /* 000058F0-000059E8       .text setParticleAT__11daNpc_Ji1_cFiff */
 u32 daNpc_Ji1_c::setParticleAT(int max, f32 rate, f32 spread) {
     if(field_0x300.getEmitter() == 0) {
-        JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &field_0x320, 0, 0, 0xB9, &field_0x300, fopAcM_GetRoomNo(this));
+        JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &field_0x320, 0, 0, 0xB9, &field_0x300, fopAcM_GetRoomNo(this));
         if(field_0x300.getEmitter()) {
             JGeometry::TVec3<f32> scaleVec;
             scaleVec.x = 2.0f;
@@ -4204,7 +4204,7 @@ void daNpc_Ji1_c::setAnimFromMsgNo(u32 msgNo) {
             if(field_0x430 != 0) {
                 field_0x430->becomeInvalidEmitter();
                 field_0x430 = 0;
-                field_0x430 = dComIfGp_particle_set(dPa_name::ID_SCENE_81A5, &current.pos);
+                field_0x430 = dComIfGp_particle_set(dPa_name::ID_AK_SN_JITEAR01, &current.pos);
             }
 
             setAnm(0x18, 8.0f, 0);
@@ -4395,7 +4395,7 @@ BOOL daNpc_Ji1_c::setAnm(int param_1, f32 param_2, int param_3) {
                 pSoundAnimRes = dComIfG_getObjectRes("Ji", JI_BAS_JI_NAKU);
 
                 if(field_0x430 == 0) {
-                    field_0x430 = dComIfGp_particle_set(dPa_name::ID_SCENE_81A4, &current.pos);
+                    field_0x430 = dComIfGp_particle_set(dPa_name::ID_AK_SN_JITEAR00, &current.pos);
                     harpoonRelease(0);
                 }
 
@@ -5219,8 +5219,8 @@ void daNpc_Ji1_c::setHitParticle(cXyz* param_1, u32 param_2) {
         scale = *param_1;
     }
 
-    dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, field_0x7E0.GetTgHitPosP(), &angle, &scale);
-    dComIfGp_particle_set(dPa_name::ID_COMMON_0010, field_0x7E0.GetTgHitPosP(), 0, &scale);
+    dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, field_0x7E0.GetTgHitPosP(), &angle, &scale);
+    dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, field_0x7E0.GetTgHitPosP(), 0, &scale);
     fopAcM_seStart(this, JA_SE_CM_JI_DAMAGE, 0);
     fopAcM_seStart(this, param_2, 0);
     dKy_SordFlush_set(*field_0x7E0.GetTgHitPosP(), 0);
@@ -5228,7 +5228,7 @@ void daNpc_Ji1_c::setHitParticle(cXyz* param_1, u32 param_2) {
 
 /* 000114EC-0001161C       .text setGuardParticle__11daNpc_Ji1_cFv */
 void daNpc_Ji1_c::setGuardParticle() {
-    dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, field_0x7E0.GetTgHitPosP());
+    dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, field_0x7E0.GetTgHitPosP());
     fopAcM_seStart(this, JA_SE_OBJ_COL_SWS_NMTLP, 0);
     fopAcM_seStart(this, JA_SE_CV_JI_DEFENCE, 0);
     dKy_SordFlush_set(*field_0x7E0.GetTgHitPosP(), 0);

src/d/actor/d_a_npc_kamome.cpp

@@ -1347,13 +1347,13 @@ BOOL daNpc_kam_c::execute() {
                 if (!isWaterHit()) {
                     onWaterHit();
                     
-                    JPABaseEmitter* splashEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0040, &current.pos);
+                    JPABaseEmitter* splashEmitter = dComIfGp_particle_set(dPa_name::ID_IT_JN_WP_SHIBUKI, &current.pos);
                     if (splashEmitter) {
                         splashEmitter->setRate(15.0f);
                         splashEmitter->setGlobalScale(splash_scale);
                     }
                     
-                    JPABaseEmitter* rippleEmitter = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &current.pos);
+                    JPABaseEmitter* rippleEmitter = dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON01, &current.pos);
                     if (rippleEmitter) {
                         rippleEmitter->setGlobalScale(ripple_scale);
                     }

src/d/actor/d_a_npc_md.cpp

@@ -1048,13 +1048,13 @@ BOOL daNpc_Md_c::mirrorCancelCheck() {
 
 /* 00003648-00003674       .text setWingEmitter__10daNpc_Md_cFv */
 void daNpc_Md_c::setWingEmitter() {
-    particle_set(&m0508[0], dPa_name::ID_SCENE_819B);
+    particle_set(&m0508[0], dPa_name::ID_IT_SN_MD_HANE00);
 }
 
 /* 00003674-000036C0       .text setHane02Emitter__10daNpc_Md_cFv */
 void daNpc_Md_c::setHane02Emitter() {
-    particle_set(&m0508[2], dPa_name::ID_SCENE_8217);
-    particle_set(&m0508[3], dPa_name::ID_SCENE_8217);
+    particle_set(&m0508[2], dPa_name::ID_IT_SN_MD_HANE02);
+    particle_set(&m0508[3], dPa_name::ID_IT_SN_MD_HANE02);
 }
 
 /* 000036C0-000036FC       .text deleteHane02Emitter__10daNpc_Md_cFv */
@@ -1065,8 +1065,8 @@ void daNpc_Md_c::deleteHane02Emitter() {
 
 /* 000036FC-00003748       .text setHane03Emitter__10daNpc_Md_cFv */
 void daNpc_Md_c::setHane03Emitter() {
-    particle_set(&m0508[4], dPa_name::ID_SCENE_827D);
-    particle_set(&m0508[5], dPa_name::ID_SCENE_827D);
+    particle_set(&m0508[4], dPa_name::ID_IT_SN_MD_HANE03);
+    particle_set(&m0508[5], dPa_name::ID_IT_SN_MD_HANE03);
 }
 
 /* 00003748-00003784       .text deleteHane03Emitter__10daNpc_Md_cFv */
@@ -1137,10 +1137,10 @@ BOOL daNpc_Md_c::lightHitCheck() {
             fopAc_ac_c* hitActor = mCps.GetAtHitAc();
             if (fopAcM_CheckStatus(this, fopAcStts_CARRY_e) && !isNoCarryAction()) {
                 if (hitActor != dComIfGp_getLinkPlayer() && m3058.getEmitter() == NULL) {
-                    dComIfGp_particle_set(dPa_name::ID_SCENE_8232, &current.pos, NULL, NULL, 0xFF, &m3058);
+                    dComIfGp_particle_set(dPa_name::ID_AK_SN_HITSHIELDLIGHT00, &current.pos, NULL, NULL, 0xFF, &m3058);
                 }
             } else if (m3058.getEmitter() == NULL) {
-                dComIfGp_particle_set(dPa_name::ID_SCENE_8232, &current.pos, NULL, NULL, 0xFF, &m3058);
+                dComIfGp_particle_set(dPa_name::ID_AK_SN_HITSHIELDLIGHT00, &current.pos, NULL, NULL, 0xFF, &m3058);
             }
             
             cM3d_lineVsPosSuisenCross(mCps.GetStart(), mCps.GetEnd(), *mCps.GetAtHitPosP(), &m3058.getPos());
@@ -1158,7 +1158,7 @@ BOOL daNpc_Md_c::lightHitCheck() {
         }
         
         if (m304C.getEmitter() == NULL) {
-            m304C.makeEmitter(dPa_name::ID_SCENE_8226, mpHarpLightModel->getBaseTRMtx(), &current.pos, NULL);
+            m304C.makeEmitter(dPa_name::ID_AK_SN_MIRRORSHIELD00, mpHarpLightModel->getBaseTRMtx(), &current.pos, NULL);
             JPABaseEmitter* emitter = m304C.getEmitter();
             JGeometry::TVec3<f32> temp;
             temp.set(1.0f, 1.0f, 1.0f);
@@ -2685,7 +2685,7 @@ BOOL daNpc_Md_c::setAnm(int anmIdx) {
     
     if (m312D == 0x10) {
         if (m0508[1] == NULL) {
-            m0508[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_819D, &current.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0);
+            m0508[1] = dComIfGp_particle_set(dPa_name::ID_IT_SN_MD_PIYOPIYO00, &current.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0);
             if (m0508[1]) {
                 m0508[1]->becomeImmortalEmitter();
             }

src/d/actor/d_a_npc_nz.cpp

@@ -911,7 +911,7 @@ void daNpc_Nz_c::setSmokeParticle() {
     }
 
     if(field_0x914.getEmitter() == NULL) {
-        JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &current.pos, &current.angle, 0, 0xB9, &field_0x914, fopAcM_GetRoomNo(this));
+        JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &current.pos, &current.angle, 0, 0xB9, &field_0x914, fopAcM_GetRoomNo(this));
         if(emitter) {
             emitter->setRate(3.0f);
             emitter->setSpread(0.2f);

src/d/actor/d_a_npc_nz_cut.inc

@@ -334,7 +334,7 @@ void daNpc_Nz_c::cutSetAnmProc() {
 
             mDoMtx_stack_c::copy(pModel->getAnmMtx(m_jnt.getHeadJntNum()));
             mDoMtx_stack_c::multVec(&temp4, &pos);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0057, &pos, &shape_angle, &scale, 0xFF, 0, -1, &color);
+            dComIfGp_particle_set(dPa_name::ID_IT_JN_LK_GEPPU00, &pos, &shape_angle, &scale, 0xFF, 0, -1, &color);
         }
     }
 }

src/d/actor/d_a_npc_os.cpp

@@ -562,7 +562,7 @@ void daNpc_Os_c::eventOrderCheck() {
 /* 00001300-000013D4       .text makeBeam__10daNpc_Os_cFi */
 void daNpc_Os_c::makeBeam(int param_1) {
     if(field_0x738.getEmitter() == NULL) {
-        field_0x738.makeEmitter(dPa_name::ID_SCENE_826E, &current.pos, &shape_angle, 0);
+        field_0x738.makeEmitter(dPa_name::ID_AK_SN_OTOMOBEAM00, &current.pos, &shape_angle, 0);
 
         if(param_1) {
             fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_LIGHT_ST, 0);
@@ -570,7 +570,7 @@ void daNpc_Os_c::makeBeam(int param_1) {
     }
 
     if(field_0x740.getEmitter() == NULL) {
-        field_0x740.makeEmitter(dPa_name::ID_SCENE_826F, &current.pos, &shape_angle, 0);
+        field_0x740.makeEmitter(dPa_name::ID_AK_SN_OTOMOBEAM01, &current.pos, &shape_angle, 0);
     }
 }
 
@@ -934,7 +934,7 @@ BOOL daNpc_Os_c::carryNpcAction(void* param_1) {
             }
             else {
                 fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_PUT, 0);
-                smokeSet(dPa_name::ID_SCENE_A328);
+                smokeSet(dPa_name::ID_AK_ST_OTOMOSMOKE00);
                 setNpcAction(&daNpc_Os_c::waitNpcAction, 0);
 
                 return true;
@@ -969,7 +969,7 @@ BOOL daNpc_Os_c::throwNpcAction(void* param_1) {
     else if(field_0x7A9 != -1) {
         if(mAcch.ChkGroundHit()) {
             fopAcM_seStartCurrent(this, JA_SE_OBJ_OSTATUE_PUT, 0);
-            smokeSet(dPa_name::ID_SCENE_A33B);
+            smokeSet(dPa_name::ID_AK_ST_OTOMOSMOKE01);
             setNpcAction(&daNpc_Os_c::waitNpcAction, 0);
         }
 
@@ -995,7 +995,7 @@ BOOL daNpc_Os_c::jumpNpcAction(void* param_1) {
     }
     else if(field_0x7A9 != -1) {
         if(mAcch.ChkGroundHit()) {
-            smokeSet(dPa_name::ID_SCENE_A33B);
+            smokeSet(dPa_name::ID_AK_ST_OTOMOSMOKE01);
             setNpcAction(&daNpc_Os_c::waitNpcAction, 0);
         }
 
@@ -2116,7 +2116,7 @@ void daNpc_Os_c::animationPlay() {
     mPrevMorfFrame = frame;
 
     if(field_0x78C == 1 && mpMorf->checkFrame(17.0f)) {
-        smokeSet(dPa_name::ID_SCENE_A328);
+        smokeSet(dPa_name::ID_AK_ST_OTOMOSMOKE00);
     }
 
     playBrkAnm();
@@ -2312,13 +2312,13 @@ BOOL daNpc_Os_c::execute() {
                 if(!isWaterHit()) {
                     onWaterHit();
 
-                    JPABaseEmitter* splash = dComIfGp_particle_set(dPa_name::ID_COMMON_0040, &current.pos);
+                    JPABaseEmitter* splash = dComIfGp_particle_set(dPa_name::ID_IT_JN_WP_SHIBUKI, &current.pos);
                     if(splash) {
                         splash->setRate(15.0f);
                         splash->setGlobalScale(splash_scale);
                     }
 
-                    JPABaseEmitter* ripple = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &current.pos);
+                    JPABaseEmitter* ripple = dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON01, &current.pos);
                     if(ripple) {
                         ripple->setGlobalScale(ripple_scale);
                     }

src/d/actor/d_a_npc_tc.cpp

@@ -232,7 +232,7 @@ void daNpc_Tc_c::playTexPatternAnm() {
 void daNpc_Tc_c::smoke_set(f32 i_rate, f32 i_spread, f32 i_initialVelOmni, f32 i_initialVelAxis, f32 i_initialVelDir) {
     static JGeometry::TVec3<f32> smoke_scale(1.0f, 1.0f, 1.0);
     if(mSmokeCallBack.getEmitter() == NULL) {
-        dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, &mSmokePos, &mSmokeAngle, NULL, 0xB9, &mSmokeCallBack, fopAcM_GetRoomNo(this));
+        dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &mSmokePos, &mSmokeAngle, NULL, 0xB9, &mSmokeCallBack, fopAcM_GetRoomNo(this));
     }
 
     if(mSmokeCallBack.getEmitter() != NULL) {
@@ -531,11 +531,11 @@ void daNpc_Tc_c::setAnm() {
         pos.setall(1.0f);
 
         if (mpMorf->getFrame() == 1.0f) {
-            dComIfGp_particle_set(dPa_name::ID_SCENE_8189, &current.pos, &current.angle, &pos);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_818A, &current.pos, &current.angle, &pos);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_818B, &current.pos, &current.angle, &pos);
-            dComIfGp_particle_set(dPa_name::ID_SCENE_818C, &mParticlePos, NULL, NULL, 0xff, &field_0x714, fopAcM_GetRoomNo(this));
-            dComIfGp_particle_set(dPa_name::ID_SCENE_818D, &mParticlePos, NULL, NULL, 0xff, &field_0x728, fopAcM_GetRoomNo(this));
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_TG_KURURINP_KAMI_M00, &current.pos, &current.angle, &pos);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_TG_KURURINP_KAMI_R00, &current.pos, &current.angle, &pos);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_TG_KURURINP_KAMI_L00, &current.pos, &current.angle, &pos);
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_TG_KURURINP_BLUR_R00, &mParticlePos, NULL, NULL, 0xff, &field_0x714, fopAcM_GetRoomNo(this));
+            dComIfGp_particle_set(dPa_name::ID_IT_SN_TG_KURURINP_BLUR_G00, &mParticlePos, NULL, NULL, 0xff, &field_0x728, fopAcM_GetRoomNo(this));
         }
 
         if (mpMorf->getFrame() == 88.0f) {
@@ -587,7 +587,7 @@ void daNpc_Tc_c::setAnm() {
             cXyz particleScale;
             particleScale.setall(1.0f);
 
-            JPABaseEmitter* pEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8152, &particlePos, NULL, &particleScale);
+            JPABaseEmitter* pEmitter = dComIfGp_particle_set(dPa_name::ID_IT_SN_PF_BIKON00, &particlePos, NULL, &particleScale);
             
             pEmitter->setGlobalParticleScale(0.62f, 0.6f);
             fopAcM_seStart(this, JA_SE_CM_CMN_NOTICE, 0); // regswap for demo likely happens here, daNpc_Tc_c::cutEffectStart also has a regswap with identical code

src/d/actor/d_a_npc_tc_cut.inc

@@ -263,7 +263,7 @@ void daNpc_Tc_c::cutEffectStart(int) {
 
     particleScale.setall(1.0f);
 
-    JPABaseEmitter* pEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8152, &pos, NULL, &particleScale);
+    JPABaseEmitter* pEmitter = dComIfGp_particle_set(dPa_name::ID_IT_SN_PF_BIKON00, &pos, NULL, &particleScale);
     pEmitter->setGlobalParticleScale(0.62f, 0.6f);
     fopAcM_seStart(this, JA_SE_CM_CMN_NOTICE, 0);
     /* Nonmatching */

src/d/actor/d_a_npc_zl1.cpp

@@ -1951,7 +1951,7 @@ void daNpc_Zl1_c::setWaterRipple() {
     if(!field_0x7CA) {
         if(mObjAcch.ChkWaterIn()) {
             if(mRippleCallBack.getEmitter() == NULL) {
-                dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033,&current.pos, NULL, NULL, 0xff, &mRippleCallBack);
+                dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00,&current.pos, NULL, NULL, 0xff, &mRippleCallBack);
             }
             f32 temp = std::fabsf(speedF) * 0.1f;
             f32 temp2 = temp * temp;

src/d/actor/d_a_obj_ajav.cpp

@@ -163,7 +163,7 @@ void daObjAjav::daObjAjav_make_splash(cXyz i_splashPos, f32 i_scale) {
     scale.x = i_scale;
     scale.y = 4.0f;
     scale.z = scale.x;
-    dComIfGp_particle_set(dPa_name::ID_COMMON_003C, &i_splashPos,  NULL, &scale);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_MIZUSHIBUKI_A, &i_splashPos,  NULL, &scale);
 }
 
 /* 000001AC-00000268       .text make_hamon__Q29daObjAjav6Part_cF4cXyzf */
@@ -182,7 +182,7 @@ void daObjAjav::Part_c::make_hamon(cXyz i_hamonPos, f32 i_scale) {
         i_hamonPos.y = water_height;
     }
 
-    dComIfGp_particle_set(dPa_name::ID_COMMON_003F, &i_hamonPos, NULL, &scale);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_WP_HAMON03, &i_hamonPos, NULL, &scale);
 }
 
 /* 00000268-0000026C       .text no_proc__Q29daObjAjav6Part_cFPQ29daObjAjav5Act_c */
@@ -416,7 +416,7 @@ void daObjAjav::Part_c::draw_shy(daObjAjav::Act_c*) {
 
 /* 00001090-00001168       .text make_fall_rock__Q29daObjAjav6Part_cFi */
 void daObjAjav::Part_c::make_fall_rock(BOOL i_increasedRate) {
-    JPABaseEmitter* particle_emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8427, &mRockParticlePos);
+    JPABaseEmitter* particle_emitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_JBROCKGATE01, &mRockParticlePos);
     if (particle_emitter && mpTevStr) {
         if (i_increasedRate != FALSE) {
             particle_emitter->setRate(20.0f);
@@ -634,7 +634,7 @@ BOOL daObjAjav::Act_c::damage_part() {
 /* 00002124-000021EC       .text make_shot_rock__Q29daObjAjav5Act_cFv */
 void daObjAjav::Act_c::make_shot_rock() {
     cXyz sph_center = mSph.GetC();
-    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8426, &sph_center);
+    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_JBROCKGATE00, &sph_center);
     if (emitter) {
         g_env_light.settingTevStruct(TEV_TYPE_BG0, &sph_center, &tevStr);
         emitter->setGlobalPrmColor(
@@ -661,7 +661,7 @@ void daObjAjav::Act_c::make_hamon2(cXyz i_hamonPos, f32 i_scale) {
         i_hamonPos.y = water_height;
     }
 
-    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8454, &i_hamonPos, NULL, &scale);
+    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_JBROCKGATEHAMON00, &i_hamonPos, NULL, &scale);
 
     if (emitter) {
         g_env_light.settingTevStruct(TEV_TYPE_BG1, &current.pos, &tevStr);

src/d/actor/d_a_obj_barrel.cpp

@@ -474,7 +474,7 @@ void daObjBarrel::Act_c::set_walk_rot() {
 /* 00001710-00001824       .text eff_break__Q211daObjBarrel5Act_cFv */
 void daObjBarrel::Act_c::eff_break() {
     cXyz pos(current.pos.x, current.pos.y + 50.0f, current.pos.z);
-    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_COMMON_03E5, &pos, NULL, NULL, 0xFF, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0);
+    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_IT_JN_TR_HAHEN_A, &pos, NULL, NULL, 0xFF, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0);
     if (emitter) {
         static JGeometry::TVec3<f32> em_scl(1.0f, 0.8f, 1.0f);
         emitter->setEmitterScale(em_scl);

src/d/actor/d_a_obj_barrel2.cpp

@@ -698,9 +698,9 @@ void daObjBarrel2::Act_c::eff_break() {
     sp20.set(current.pos.x, current.pos.y + attr()->m14 * attr()->m50 * tmp, current.pos.z);
     sp2C.setall(tmp);
 
-    dComIfGp_particle_set(dPa_name::ID_COMMON_0460, &sp20, NULL, &sp2C);
-    dComIfGp_particle_set(dPa_name::ID_COMMON_045F, &sp20, NULL, &sp2C);
-    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_COMMON_03E6, &sp20, NULL, &sp2C, 0xFF, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_TR2_SHIBUKI_B, &sp20, NULL, &sp2C);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_TR2_SHIBUKI_A, &sp20, NULL, &sp2C);
+    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_IT_JN_TR_HAHEN_B, &sp20, NULL, &sp2C, 0xFF, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0);
 
     if (emitter != NULL) {
         emitter->setLifeTime(30);
@@ -726,13 +726,13 @@ void daObjBarrel2::Act_c::eff_explode() {
     sp18.y = fopCamM_GetAngleY(camera) - -0x8000;
     sp18.z = 0;
 
-    dComIfGp_particle_set(dPa_name::ID_COMMON_LIGHT_FLASH, &sp20, &sp18, &sp2C);
-    dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, &sp20, NULL, &sp2C);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_BMEX_SENKO, &sp20, &sp18, &sp2C);
+    dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, &sp20, NULL, &sp2C);
     fopKyM_createWpillar(&current.pos, attr()->m6C, attr()->m70, 1);
-    dComIfGp_particle_setToon(dPa_name::ID_COMMON_2041, &sp20, NULL, &sp2C);
-    dComIfGp_particle_set(dPa_name::ID_COMMON_003C, &sp20, NULL, &sp2C);
+    dComIfGp_particle_setToon(dPa_name::ID_IT_JT_WATERSMOKE00, &sp20, NULL, &sp2C);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_MIZUSHIBUKI_A, &sp20, NULL, &sp2C);
 
-    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_COMMON_03E6, &sp20, NULL, &sp2C);
+    JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_IT_JN_TR_HAHEN_B, &sp20, NULL, &sp2C);
     if (emitter != NULL) {
         emitter->setLifeTime(40);
         emitter->setAwayFromAxisSpeed(10.0f);

src/d/actor/d_a_obj_barrier.cpp

@@ -412,7 +412,7 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente
         mDoMtx_stack_c::ZXYrotM(0, angle.y, 0);
         mpModel[effect_idx]->setBaseTRMtx(mDoMtx_stack_c::get());
 
-        dComIfGp_particle_set(dPa_name::ID_SCENE_81A9, &pos, &angle);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_HIRALBARRIER00, &pos, &angle);
     }
 }
 

src/d/actor/d_a_obj_canon.cpp

@@ -149,12 +149,12 @@ void daObj_Canon_c::setEffect(u16 param_1) {
 #endif
 
     GXColor* prmColor = NULL, *envColor = NULL;
-    if(param_1 == dPa_name::ID_SCENE_82E4) {
+    if(param_1 == dPa_name::ID_IT_SN_MJTAIHOU_HAHEN00) {
         prmColor = &tevStr.mColorK0;
         envColor = &tevStr.mColorK0;
     }
 
-    if(param_1 == dPa_name::ID_COMMON_03E1) {
+    if(param_1 == dPa_name::ID_IT_JN_MJTAIHOU_SMOKE01) {
         dComIfGp_particle_set(
             param_1,
 #if VERSION == VERSION_DEMO
@@ -216,12 +216,12 @@ bool daObj_Canon_c::checkTgHit() {
 
         if(hit) {
             field_0x440 = 5;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &hitPos);
 
             if(health <= 0) {
                 daPy_py_c* player = daPy_getPlayerActorClass();
                 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);
                 fopAcM_seStart(this, JA_SE_LK_LAST_HIT, 0);
                 modeProcInit(2);
             }
@@ -381,10 +381,10 @@ void daObj_Canon_c::modeDeleteInit() {
         dComIfGs_onSwitch(field_0x295, fopAcM_GetRoomNo(this));
     }
 
-    setEffect(dPa_name::ID_SCENE_82E4);
-    setEffect(dPa_name::ID_SCENE_82E5);
-    setEffect(dPa_name::ID_SCENE_82E6);
-    setEffect(dPa_name::ID_COMMON_03E1);
+    setEffect(dPa_name::ID_IT_SN_MJTAIHOU_HAHEN00);
+    setEffect(dPa_name::ID_IT_SN_MJTAIHOU_SMOKE00);
+    setEffect(dPa_name::ID_IT_SN_MJTAIHOU_SENKO00);
+    setEffect(dPa_name::ID_IT_JN_MJTAIHOU_SMOKE01);
 
     fopAcM_OffStatus(this, fopAcStts_SHOWMAP_e | 0x1F);
 }

src/d/actor/d_a_obj_demo_barrel.cpp

@@ -17,7 +17,7 @@ const char daObj_Demo_Barrel_c::M_arcname[] = "DBarrel";
 /* 00000078-00000144       .text setParticleHahen__19daObj_Demo_Barrel_cFv */
 void daObj_Demo_Barrel_c::setParticleHahen() {
     JPABaseEmitter* emitter =
-        dComIfGp_particle_set(dPa_name::ID_COMMON_03E5, &current.pos, NULL, NULL, 0xFF, NULL, -1,
+        dComIfGp_particle_set(dPa_name::ID_IT_JN_TR_HAHEN_A, &current.pos, NULL, NULL, 0xFF, NULL, -1,
                               &tevStr.mColorK0, &tevStr.mColorK0, NULL);
     if (emitter != NULL) {
         static JGeometry::TVec3<f32> em_scl(1.0f, 0.8f, 1.0f);
@@ -31,13 +31,13 @@ void daObj_Demo_Barrel_c::setParticleSibuki() {
     sp18.y = 100.0f;
     m2D0 = current.pos;
     m2D0.y = dBgS_ObjGndChk_Wtr_Func(sp18);
-    dComIfGp_particle_set(dPa_name::ID_COMMON_003D, &m2D0);
-    dComIfGp_particle_set(dPa_name::ID_COMMON_003E, &m2D0);
-    dComIfGp_particle_set(dPa_name::ID_SCENE_80CB, &m2D0);
-    dComIfGp_particle_set(dPa_name::ID_SCENE_80CC, &m2D0);
-    dComIfGp_particle_set(dPa_name::ID_SCENE_80CE, &m2D0);
-    dComIfGp_particle_set(dPa_name::ID_SCENE_80DC, &m2D0);
-    dComIfGp_particle_set(dPa_name::ID_SCENE_80DD, &m2D0);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_WP_HAMON01, &m2D0);
+    dComIfGp_particle_set(dPa_name::ID_IT_JN_WP_HAMON02, &m2D0);
+    dComIfGp_particle_set(dPa_name::ID_IT_SN_DEMO_HAMON_S, &m2D0);
+    dComIfGp_particle_set(dPa_name::ID_IT_SN_DEMO_SUIMEN_A, &m2D0);
+    dComIfGp_particle_set(dPa_name::ID_IT_SN_MIZUBASHIRA2, &m2D0);
+    dComIfGp_particle_set(dPa_name::ID_IT_SN_DEMO_SHIBUKI_A, &m2D0);
+    dComIfGp_particle_set(dPa_name::ID_IT_SN_DEMO_SHIBUKI_B, &m2D0);
 }
 
 /* 00000378-00000398       .text CheckCreateHeap__FP10fopAc_ac_c */

src/d/actor/d_a_obj_doguu.cpp

@@ -472,11 +472,11 @@ void daObjDoguu_c::privateCut() {
                     mDoMtx_stack_c::multVecZero(&mPos);
                     
                     if (field_0x894 == 0) {
-                        dComIfGp_particle_set(dPa_name::ID_SCENE_8434, &mPos, &current.angle);
+                        dComIfGp_particle_set(dPa_name::ID_IT_SN_SINJYU_GLOWD00, &mPos, &current.angle);
                     } else if (field_0x894 == 1) {
-                        dComIfGp_particle_set(dPa_name::ID_SCENE_8436, &mPos, &current.angle);
+                        dComIfGp_particle_set(dPa_name::ID_IT_SN_SINJYU_GLOWF00, &mPos, &current.angle);
                     } else {
-                        dComIfGp_particle_set(dPa_name::ID_SCENE_8435, &mPos, &current.angle);
+                        dComIfGp_particle_set(dPa_name::ID_IT_SN_SINJYU_GLOWN00, &mPos, &current.angle);
                     }
                 } else if (field_0x8C4 == 125) {
                     field_0x8A3 = true;

src/d/actor/d_a_obj_ebomzo.cpp

@@ -139,7 +139,7 @@ void daObjEbomzo::Act_c::check() {
                     const u8 r = tevStr.mColorK0.r;
                     const u8 g = tevStr.mColorK0.g;
                     const u8 b = tevStr.mColorK0.b;
-                    mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_828E, &current.pos, &current.angle);
+                    mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BIRDSTATUEHAHEN00, &current.pos, &current.angle);
                     if (mpParticleEmitter) mpParticleEmitter->setGlobalPrmColor(r, g, b);
                 }
             }
@@ -164,7 +164,7 @@ void daObjEbomzo::Act_c::demo() {
             mpParticleEmitter = NULL;
         }
 
-        dComIfGp_particle_set(dPa_name::ID_SCENE_828F, &current.pos, &current.angle);
+        dComIfGp_particle_set(dPa_name::ID_AK_SN_BIRDSTATUESPLASH00, &current.pos, &current.angle);
     }
 }
 

src/d/actor/d_a_obj_eff.cpp

@@ -164,7 +164,7 @@ bool daObjEff::Act_c::create_heap() {
 /* 00000898-00000998       .text eff_set_barrel_smoke__Q28daObjEff5Act_cFv */
 BOOL daObjEff::Act_c::eff_set_barrel_smoke() {
     static cXyz particle_scl(2.5f, 2.5f, 1.0f);
-    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &current.pos, NULL,  NULL, 0xB4, mParticleCallback, -1, NULL, NULL, &particle_scl);
+    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &current.pos, NULL,  NULL, 0xB4, mParticleCallback, -1, NULL, NULL, &particle_scl);
     if (emitter != NULL) {
         emitter->setVolumeSize(0x28);
         emitter->setRate(20.0f);
@@ -180,7 +180,7 @@ BOOL daObjEff::Act_c::eff_set_barrel_smoke() {
 /* 000009D4-00000AD0       .text eff_set_stool_smoke__Q28daObjEff5Act_cFv */
 BOOL daObjEff::Act_c::eff_set_stool_smoke() {
     static cXyz particle_scl(2.5f, 2.5f, 1.0f);
-    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &current.pos,
+    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &current.pos,
                                                         NULL,  NULL, 0xB4, mParticleCallback, -1, NULL, NULL, &particle_scl);
     if (emitter != NULL) {
         emitter->setVolumeSize(0x1E);
@@ -197,7 +197,7 @@ BOOL daObjEff::Act_c::eff_set_stool_smoke() {
 /* 00000AD0-00000BC0       .text eff_set_skull_smoke__Q28daObjEff5Act_cFv */
 BOOL daObjEff::Act_c::eff_set_skull_smoke() {
     static cXyz particle_scl(1.6f, 1.6f, 1.0f);
-    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &current.pos,
+    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &current.pos,
                                                         NULL,  NULL, 0xB4, mParticleCallback, -1, NULL, NULL, &particle_scl);
     if (emitter != NULL) {
         emitter->setRate(10.0f);
@@ -217,7 +217,7 @@ BOOL daObjEff::Act_c::eff_set_land_smoke() {
     pScale.y = scale.y;
     pScale.z = scale.z;
 
-    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &current.pos,
+    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &current.pos,
                                                         NULL,  &pScale, 0xB4, mParticleCallback, -1, NULL, NULL, NULL);
     if (emitter != NULL) {
         emitter->setVolumeSize(0x1E);
@@ -239,7 +239,7 @@ BOOL daObjEff::Act_c::eff_set_land_smoke() {
 
 /* 00000D24-00000D98       .text eff_set_pinecone_smoke__Q28daObjEff5Act_cFv */
 BOOL daObjEff::Act_c::eff_set_pinecone_smoke() {
-    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_SCENE_A16B, &current.pos,
+    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_IT_ST_BOKKURI_SMOKE00, &current.pos,
                                                         NULL,  NULL, 0xB4, mParticleCallback, -1, NULL, NULL, NULL);
     return emitter != NULL;
 }
@@ -247,7 +247,7 @@ BOOL daObjEff::Act_c::eff_set_pinecone_smoke() {
 /* 00000D98-00000E80       .text eff_set_woodBox_smoke__Q28daObjEff5Act_cFv */
 BOOL daObjEff::Act_c::eff_set_woodBox_smoke() {
     static cXyz particle_scl(2.5f, 2.5f, 1.0f);
-    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &current.pos,
+    JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &current.pos,
                                                         NULL,  NULL, 0xB4, mParticleCallback, -1, NULL, NULL, &particle_scl);
     if (emitter != NULL) {
         emitter->setRate(30.0f);

src/d/actor/d_a_obj_eskban.cpp

@@ -242,8 +242,8 @@ void daObjEskban::Act_c::eff_b_break(u16 particleID) {
 
 /* 00000D44-00000EF0       .text daObjEskban_effect_set__Q211daObjEskban5Act_cFv */
 void daObjEskban::Act_c::daObjEskban_effect_set() {
-    eff_m_break(dPa_name::ID_SCENE_82B1, 2);
-    eff_b_break(dPa_name::ID_SCENE_82B2);
+    eff_m_break(dPa_name::ID_AK_SN_BREAKRDMROCK00, 2);
+    eff_b_break(dPa_name::ID_AK_SN_M_BREAKRDMROCK00);
 
     static cXyz offset_vec(0, 250, 0);
     mDoMtx_stack_c::copy(mpModel->getBaseTRMtx());
@@ -251,7 +251,7 @@ void daObjEskban::Act_c::daObjEskban_effect_set() {
     if (!M_smoke) {
         return;
     }
-    JPABaseEmitter* pBEmtr = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mSmokePos, NULL, NULL, 0xc8,
+    JPABaseEmitter* pBEmtr = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &mSmokePos, NULL, NULL, 0xc8,
                                                        M_smoke, -1, NULL, NULL, NULL);
     if (!pBEmtr) {
         return;

src/d/actor/d_a_obj_gryw00.cpp

@@ -43,11 +43,11 @@ BOOL daObjGryw00_c::setup_high_water_level_btk_anm() {
 /* 00000168-000002D0       .text particle_set__13daObjGryw00_cFv */
 void daObjGryw00_c::particle_set() {
     cXyz homePos = this->home.pos;
-    dComIfGp_particle_set(dPa_name::ID_SCENE_8295, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL);
-    dComIfGp_particle_set(dPa_name::ID_SCENE_8297, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL);
-    mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_8296, &homePos, NULL, NULL, 0xff, NULL, -1, NULL,
+    dComIfGp_particle_set(dPa_name::ID_AK_SN_RYUDANMAESPLASH00, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL);
+    dComIfGp_particle_set(dPa_name::ID_AK_SN_RYUDANMAESTEAM00, &homePos, NULL, NULL, 0xff, NULL, -1, NULL, &tevStr.mColorK0, NULL);
+    mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_RYUDANMAESPLASH01, &homePos, NULL, NULL, 0xff, NULL, -1, NULL,
                                           &tevStr.mColorK0, NULL);
-    mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_8298, &homePos, NULL, NULL, 0xff, NULL, -1, NULL,
+    mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_AK_SN_RYUDANMAEHAMON00, &homePos, NULL, NULL, 0xff, NULL, -1, NULL,
                                           &tevStr.mColorK0, NULL);
 }
 

src/d/actor/d_a_obj_hha.cpp

@@ -84,8 +84,8 @@ const HHA_RES_FILE_ID l_daObjHha_dzb_idx_table[2] = {HHA_DZB_HHA1, HHA_DZB_HHA2}
 const HHA_RES_FILE_ID l_daObjHha_btk_idx_table[2] = {HHA_BTK_YSWTR00_01, HHA_BTK_YSWTR00_02};
 const J3DFrameCtrl::Attribute_e l_daObjHha_btk_mode_table[2] = {J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_NONE};
 const u16 l_daObjHha_splash_id_table[] = {
-    dPa_name::ID_SCENE_810D,
-    dPa_name::ID_SCENE_810E,
+    dPa_name::ID_AK_SN_SIRENSUIRYU00,
+    dPa_name::ID_AK_SN_SIRENSUIRYU01,
 };
 
 /* 00000078-00000170       .text init_data__14daObjHhaPart_cFffUsUcUc */

src/d/actor/d_a_obj_homensmoke.cpp

@@ -89,7 +89,7 @@ namespace daObjHomensmoke {
                 cMtx_multVec(mMtx, &norse_offsetS, &mSmokePos);
             }
             
-            JPABaseEmitter* smokeEmitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mSmokePos, NULL, NULL, 0xFF, &mSmokeCb, fopAcM_GetRoomNo(this));
+            JPABaseEmitter* smokeEmitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &mSmokePos, NULL, NULL, 0xFF, &mSmokeCb, fopAcM_GetRoomNo(this));
             if (smokeEmitter) {
                 static f32 rate_table[2] = {1.0f, 0.5f};
                 f32 rate = rate_table[mType & 1];
@@ -105,7 +105,7 @@ namespace daObjHomensmoke {
                 smokeEmitter->setGlobalParticleScale(scale);
             }
             
-            JPABaseEmitter* rubbleEmitter = dComIfGp_particle_setToon(dPa_name::ID_SCENE_81B1, &current.pos);
+            JPABaseEmitter* rubbleEmitter = dComIfGp_particle_setToon(dPa_name::ID_AK_SN_KAZEMASKHAHEN00, &current.pos);
             if (rubbleEmitter) {
                 rubbleEmitter->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b);
                 if (mType == 1) {

src/d/actor/d_a_obj_ice.cpp

@@ -209,7 +209,7 @@ void daObjIce_c::tg_hitCallback(fopAc_ac_c* a_this, dCcD_GObjInf* arg1, fopAc_ac
                     csXyz sp18(0, 0, 0);
                     sp18.x = cM_atan2s(-pPos->y + i_this->current.pos.y, pPos->z - i_this->current.pos.z);
                     sp18.y = cM_atan2s(pPos->x - i_this->current.pos.x, pPos->z - i_this->current.pos.z);
-                    dComIfGp_particle_set(dPa_name::ID_COMMON_0465, pPos, &sp18, NULL, 0xFF, NULL, -1, &i_this->tevStr.mColorK0);
+                    dComIfGp_particle_set(dPa_name::ID_AK_JN_ICEHAHEN00, pPos, &sp18, NULL, 0xFF, NULL, -1, &i_this->tevStr.mColorK0);
                     break;
                 }
                 case AT_TYPE_BOMB:
@@ -326,7 +326,7 @@ void daObjIce_c::wait_act_proc() {
 
     case 1: {
         m458 = 0x5a;
-        JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0464, &current.pos, NULL, &scale, 0xFF, NULL, -1, &tevStr.mColorK0);
+        JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_ICETHAW00, &current.pos, NULL, &scale, 0xFF, NULL, -1, &tevStr.mColorK0);
         if (emitter != NULL) {
 #if VERSION == VERSION_DEMO
             JGeometry::TVec3<f32> s;
@@ -356,7 +356,7 @@ void daObjIce_c::wait_act_proc() {
                 dComIfG_Bgsp()->Release(mBgw);
             }
             m458 = 0x5A;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0464, &current.pos, NULL, &scale, 0xFF, NULL, -1, &tevStr.mColorK0);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_ICETHAW00, &current.pos, NULL, &scale, 0xFF, NULL, -1, &tevStr.mColorK0);
             m43C = &daObjIce_c::fade_out_retire_act_proc;
         }
 #else

src/d/actor/d_a_obj_iceisland.cpp

@@ -41,10 +41,10 @@ BOOL daObjIceisland_c::CreateHeap() {
 /* 00000338-00000410       .text daObjIceisland_particle_set__16daObjIceisland_cFv */
 void daObjIceisland_c::daObjIceisland_particle_set() {
     if(mEmitter1 == NULL) {
-        mEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_81AA, &current.pos, &current.angle);
+        mEmitter1 = dComIfGp_particle_set(dPa_name::ID_IT_SN_ICEL_SMOKE00, &current.pos, &current.angle);
     }
     if(mEmitter2 == NULL) {
-        mEmitter2 = dComIfGp_particle_set(dPa_name::ID_SCENE_81AB, &current.pos, &current.angle);
+        mEmitter2 = dComIfGp_particle_set(dPa_name::ID_IT_SN_ICEL_SMOKE01, &current.pos, &current.angle);
     }
 }
 

src/d/actor/d_a_obj_ikada.cpp

@@ -197,11 +197,11 @@ void daObj_Ikada_c::_ride(fopAc_ac_c* actor) {
 
             if (bomb->getBombRestTime() <= 1) {
                 cXyz sp24 = actor->current.pos;
-                dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &sp24);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &sp24);
 
                 daPy_py_c* player = daPy_getPlayerActorClass();
                 cXyz sp18(2.0f, 2.0f, 2.0f);
-                dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &sp24, &player->shape_angle, &sp18);
+                dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &sp24, &player->shape_angle, &sp18);
                 fopAcM_seStart(this, JA_SE_LK_LAST_HIT, 0);
 
                 if (mBombSmokeEasterEgg.getEmitter() == NULL) {
@@ -210,7 +210,7 @@ void daObj_Ikada_c::_ride(fopAc_ac_c* actor) {
                     mBombSmokeRot.y += mBombSmokeAngle;
                     mBombSmokePos = current.pos;
                     dComIfGp_particle_setShipTail(
-                        dPa_name::ID_COMMON_03E1, &mBombSmokePos, &mBombSmokeRot, &scale, 0xff, &mBombSmokeEasterEgg, fopAcM_GetRoomNo(this)
+                        dPa_name::ID_IT_JN_MJTAIHOU_SMOKE01, &mBombSmokePos, &mBombSmokeRot, &scale, 0xff, &mBombSmokeEasterEgg, fopAcM_GetRoomNo(this)
                     );
                     m04A8 = 230;
                 }
@@ -270,10 +270,10 @@ bool daObj_Ikada_c::checkTgHit() {
 
         if (ret) {
             m12E4 = 5;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &sp4C);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &sp4C);
             daPy_py_c* player = daPy_getPlayerActorClass();
             sp40.set(2.0f, 2.0f, 2.0f);
-            dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &sp4C, &player->shape_angle, &sp40);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &sp4C, &player->shape_angle, &sp40);
             fopAcM_seStart(this, JA_SE_LK_LAST_HIT, 0);
 
             if (mBombSmokeEasterEgg.getEmitter() == NULL) {
@@ -282,7 +282,7 @@ bool daObj_Ikada_c::checkTgHit() {
                 mBombSmokeRot.y += mBombSmokeAngle;
                 mBombSmokePos = current.pos;
                 dComIfGp_particle_setShipTail(
-                    dPa_name::ID_COMMON_03E1, &mBombSmokePos, &mBombSmokeRot, &scale, 0xff, &mBombSmokeEasterEgg, fopAcM_GetRoomNo(this)
+                    dPa_name::ID_IT_JN_MJTAIHOU_SMOKE01, &mBombSmokePos, &mBombSmokeRot, &scale, 0xff, &mBombSmokeEasterEgg, fopAcM_GetRoomNo(this)
                 );
                 m04A8 = 230;
             }
@@ -326,25 +326,25 @@ void daObj_Ikada_c::createWave() {
     static JGeometry::TVec3<f32> wave_r_direction(-0.5f, 1.0f, -0.3f);
 
     if (mWaveLCallback.getEmitter() == NULL) {
-        dComIfGp_particle_set(dPa_name::ID_COMMON_0037, &mWavePos, &mWaveRot, NULL, 0xff, &mWaveLCallback);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWAVE00, &mWavePos, &mWaveRot, NULL, 0xff, &mWaveLCallback);
         if (mWaveLCallback.getEmitter() != NULL) {
             mWaveLCallback.getEmitter()->setDirection(wave_l_direction);
         }
     }
 
     if (mWaveRCallback.getEmitter() == NULL) {
-        dComIfGp_particle_set(dPa_name::ID_COMMON_0037, &mWavePos, &mWaveRot, NULL, 0xff, &mWaveRCallback);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWAVE00, &mWavePos, &mWaveRot, NULL, 0xff, &mWaveRCallback);
         if (mWaveRCallback.getEmitter() != NULL) {
             mWaveRCallback.getEmitter()->setDirection(wave_r_direction);
         }
     }
 
     if (mSplashCallBack.getEmitter() == NULL) {
-        dComIfGp_particle_set(dPa_name::ID_COMMON_0035, &mWavePos, &mWaveRot, NULL, 0xff, &mSplashCallBack);
+        dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPSPLASH00, &mWavePos, &mWaveRot, NULL, 0xff, &mSplashCallBack);
     }
 
     if (mTrackCallBack.getEmitter() == NULL) {
-        dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0036, &mTrackPos, &shape_angle, NULL, 0x0, &mTrackCallBack);
+        dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_SHIPTAIL00, &mTrackPos, &shape_angle, NULL, 0x0, &mTrackCallBack);
 
         JPABaseEmitter* emitter = mTrackCallBack.getEmitter();
         if (emitter != NULL) {
@@ -552,7 +552,7 @@ void daObj_Ikada_c::setRopePos() {
         m0444.z = ptr->z;
 
         if (mRippleCallBack.getEmitter() == NULL) {
-            dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &m0444, NULL, &ripple_scale, 0xff, &mRippleCallBack);
+            dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &m0444, NULL, &ripple_scale, 0xff, &mRippleCallBack);
             if (mRippleCallBack.getEmitter() != NULL) {
                 mRippleCallBack.setRate(0.0f);
                 if (m0440 == 0) {
@@ -1072,14 +1072,14 @@ void daObj_Ikada_c::epProc() {
             fire_scale.x = REG12_F(10) + 0.5f;
             fire_scale.y = fire_scale.x;
             fire_scale.z = fire_scale.x;
-            dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &mFirePos, NULL, &fire_scale, 0xff, &mFireParticle);
+            dComIfGp_particle_set(dPa_name::ID_AK_JN_TORCH, &mFirePos, NULL, &fire_scale, 0xff, &mFireParticle);
         }
 
         if (mFireParticle.getEmitter() != NULL) {
             cXyz sp18 = mFirePos;
             sp18.y += 20.0f;
 
-            dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &sp18);
+            dComIfGp_particle_setSimple(dPa_name::ID_AK_JP_O_KAGEROU00, &sp18);
 
             if (cLib_calcTimer(&mEpTimer0) == 0) {
                 mEpTimer0 = (s16)(REG0_F(3) + cM_rndF(REG0_F(2) + 5.0f));

src/d/actor/d_a_obj_kanat.cpp

@@ -90,11 +90,11 @@ BOOL daObjKanat::Act_c::Execute(Mtx** pMtx) {
             color.b = tevStr.mColorC0.b;
             color.a = tevStr.mColorC0.a;
             dComIfGp_particle_set(
-                dPa_name::ID_SCENE_82A2, &current.pos, &current.angle, NULL, 0xFF,
+                dPa_name::ID_AK_SN_KOKIRIHOUSEHAHEN00, &current.pos, &current.angle, NULL, 0xFF,
                 NULL, current.roomNo, &tevStr.mColorK0, &color
             );
             dComIfGp_particle_setToon(
-                dPa_name::ID_SCENE_A2A3, &current.pos, &current.angle, NULL, 0xB4,
+                dPa_name::ID_AK_ST_KOKIRIHOUSESMOKE00, &current.pos, &current.angle, NULL, 0xB4,
                 &mSmokeCb, current.roomNo, &tevStr.mColorK0, &color
             );
         }

src/d/actor/d_a_obj_leaves.cpp

@@ -190,12 +190,12 @@ void daObjLeaves_c::birthEffect(int arg1, cXyz* arg2, csXyz* arg3, GXColor* arg4
     }; // size = 0x14
 
     static ParticleData particle_data[] = {
-        {dPa_name::ID_SCENE_822F, 0, 0, -12.0f},
-        {dPa_name::ID_SCENE_A230, 1, 0, -12.0f},
-        {dPa_name::ID_SCENE_822E, 0, 0, -12.0f},
-        {dPa_name::ID_SCENE_8268, 0, 60, -3.0f},
-        {dPa_name::ID_SCENE_8269, 0, 60, -3.0f},
-        {dPa_name::ID_SCENE_826A, 0, 0, -12.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFFAN00, 0, 0, -12.0f},
+        {dPa_name::ID_AK_ST_FALLENLEAFSMOKE00, 1, 0, -12.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFRUN00, 0, 0, -12.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFFIRE00, 0, 60, -3.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFFIRE01, 0, 60, -3.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFBOMB00, 0, 0, -12.0f},
     };
 #else
     struct ParticleData {
@@ -207,12 +207,12 @@ void daObjLeaves_c::birthEffect(int arg1, cXyz* arg2, csXyz* arg3, GXColor* arg4
     }; // size = 0x14
 
     static ParticleData particle_data[] = {
-        {dPa_name::ID_SCENE_822F, 0, 0, 1, -12.0f},
-        {dPa_name::ID_SCENE_A230, 1, 0, 1, -12.0f},
-        {dPa_name::ID_SCENE_822E, 0, 0, 1, -12.0f},
-        {dPa_name::ID_SCENE_8268, 0, 60, 120, -3.0f},
-        {dPa_name::ID_SCENE_8269, 0, 60, 120, -3.0f},
-        {dPa_name::ID_SCENE_826A, 0, 0, 1, -12.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFFAN00, 0, 0, 1, -12.0f},
+        {dPa_name::ID_AK_ST_FALLENLEAFSMOKE00, 1, 0, 1, -12.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFRUN00, 0, 0, 1, -12.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFFIRE00, 0, 60, 120, -3.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFFIRE01, 0, 60, 120, -3.0f},
+        {dPa_name::ID_AK_SN_FALLENLEAFBOMB00, 0, 0, 1, -12.0f},
     };
 #endif
 

src/d/actor/d_a_obj_mkie.cpp

@@ -271,7 +271,7 @@ void daObjMkie::Act_c::eff_break() {
     envColor.b = (u8)tevStr.mColorC0.b;
     envColor.a = (u8)tevStr.mColorC0.a;
 
-    dComIfGp_particle_set(dPa_name::ID_SCENE_81A0, &current.pos, &shape_angle, &scale, 0xff, NULL, -1, &tevStr.mColorK0, &envColor, NULL);
+    dComIfGp_particle_set(dPa_name::ID_AK_SN_VANISHFIGURE00, &current.pos, &shape_angle, &scale, 0xff, NULL, -1, &tevStr.mColorK0, &envColor, NULL);
 }
 
 /* 00000E84-00000EF4       .text sound_melt__Q29daObjMkie5Act_cFv */

src/d/actor/d_a_obj_mkiek.cpp

@@ -166,7 +166,7 @@ void daObjMkiek::Act_c::demo_wait() {
             color.g = tevStr.mColorC0.g;
             color.b = tevStr.mColorC0.b;
             color.a = tevStr.mColorC0.a;
-            dComIfGp_particle_setProjection(dPa_name::ID_SCENE_819F,
+            dComIfGp_particle_setProjection(dPa_name::ID_AK_SN_VANISHWALL00,
                 &current.pos, &current.angle, NULL,
                 0xFF, NULL,
                 current.roomNo,

src/d/actor/d_a_obj_mknjd.cpp

@@ -608,7 +608,7 @@ bool daObjMknjD::Act_c::daObjMknjD_break() {
     /* Particles and sound effects */
     // After 1 frame, the particles for the statue splitting in half spawn.
     if (mBreakTimer == 1) {
-        mEmitters[0] = dComIfGp_particle_set(dPa_name::ID_SCENE_8185, &current.pos, &current.angle);
+        mEmitters[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_WGFLASH00, &current.pos, &current.angle);
 
         GXColor emitter2Color;
         emitter2Color.r = tevStr.mColorC0.r;
@@ -616,9 +616,9 @@ bool daObjMknjD::Act_c::daObjMknjD_break() {
         emitter2Color.b = tevStr.mColorC0.b;
         emitter2Color.a = tevStr.mColorC0.a;
         
-        mEmitters[1] = dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8186, &current.pos, &current.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color);
+        mEmitters[1] = dComIfGp_particle_setProjection(dPa_name::ID_AK_SN_WGROCK00, &current.pos, &current.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color);
 
-        mEmitters[2] = dComIfGp_particle_setToon(dPa_name::ID_SCENE_A187, &current.pos, &current.angle, NULL, 0xFF, &mSmokeCBs[2]);
+        mEmitters[2] = dComIfGp_particle_setToon(dPa_name::ID_AK_ST_WGSMOKE00, &current.pos, &current.angle, NULL, 0xFF, &mSmokeCBs[2]);
         mSmokeCBs[2].setRateOff(0);
 
         fopAcM_seStartCurrent(this, JA_SE_OBJ_SAGE_GATE_CREAK, 0);
@@ -651,7 +651,7 @@ bool daObjMknjD::Act_c::daObjMknjD_break() {
         mBrokenPos = current.pos;
         mBrokenPos.y += 350.0f;
 
-        mEmitters[3] = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &mBrokenPos, &current.angle, NULL, 0xFF, &mSmokeCBs[3]);
+        mEmitters[3] = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &mBrokenPos, &current.angle, NULL, 0xFF, &mSmokeCBs[3]);
         if (mEmitters[3] != NULL) {
             mEmitters[3]->setVolumeSweep(0.5f);
             mEmitters[3]->setLifeTime(0x2D);