diff --git a/include/d/actor/d_a_beam.h b/include/d/actor/d_a_beam.h index 580021269..84f283540 100644 --- a/include/d/actor/d_a_beam.h +++ b/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, ¤t.pos); + m690 = dComIfGp_particle_set(dPa_name::ID_AK_SN_LASERROOT00, ¤t.pos); } bool checkHFloorParticle() { return !(s32)m5F8; } bool checkSmokeParticle() { return !(s32)m5F9; } diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 1bb56c49f..916821877 100644 --- a/include/d/d_cc_d.h +++ b/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, }; diff --git a/include/d/d_particle_name.h b/include/d/d_particle_name.h index e070d3b17..b89cdd854 100644 --- a/include/d/d_particle_name.h +++ b/include/d/d_particle_name.h @@ -3,1057 +3,1175 @@ #include "dolphin/types.h" -// Most of the particle enum names in here are made up. -// dPa_name::ID_SCENE_END is the only official name that is known. +// Particle effect name enums. +// "dPa_name::ID_SCENE_END" is official and appears in debug assertion strings. +// dPa_name::ID_NONE is unofficial. +// All other names are derived from official name strings from TWWHD, e.g.: +// "ak_jn_o_fire00" => dPa_name::ID_AK_JN_O_FIRE00 +// The first two letters are an abbreviation of the author's name (e.g. "ak", "it"). +// The third letter is where the particle should be loaded from: +// j - Particle in the always-loaded particle bank common.jpc. +// s - Particle in a scene-specific particle bank (e.g. Pscene051.jpc). Corresponds to bit 0x8000 in the particle ID. +// The fourth letter is the type of particle: +// n - Normal. +// t - Toon. Corresponds to bit 0x2000 in the particle ID. +// p - Projection. Corresponds to bit 0x4000 in the particle ID. +// 1, 2, 4 - Unknown. +// The remaining characters are the name of the specific particle effect. +// Some of these names are duplicates, e.g. ID_AK_SN_BOSSWARPWIND00 is both 0x81EB and 0x820A. +// These duplicates are commented out for now. +// If any are actually used they should be uncommented and given a unique name to distinguish them (e.g. ID_AK_SN_BOSSWARPWIND00_81EB). namespace dPa_name { enum { ID_NONE = 0x0000, + ID_SCENE_END = 0x8466, }; // Particles in common.jpc. // Always loaded regardless of scene. enum { - ID_COMMON_0001 = 0x0001, - ID_COMMON_0002 = 0x0002, - ID_COMMON_0003 = 0x0003, - ID_COMMON_03DA = 0x03DA, - ID_COMMON_03DB = 0x03DB, - ID_COMMON_03DC = 0x03DC, - ID_COMMON_4004 = 0x4004, - ID_COMMON_445B = 0x445B, - ID_COMMON_SMOKE_DEBRIS = 0x2008, - ID_COMMON_SMOKE_CLOUD = 0x2009, - ID_COMMON_SMOKE_CIRCLE = 0x200A, - ID_COMMON_LIGHT_FLASH = 0x000B, - ID_COMMON_232A = 0x232A, - ID_COMMON_PURPLE_HIT = 0x000C, - ID_COMMON_NORMAL_HIT = 0x000D, - ID_COMMON_000E = 0x000E, - ID_COMMON_BIG_HIT = 0x000F, - ID_COMMON_0010 = 0x0010, - ID_COMMON_FUSE_SPARKS = 0x0011, - ID_COMMON_2012 = 0x2012, - ID_COMMON_0013 = 0x0013, - ID_COMMON_0014 = 0x0014, - ID_COMMON_0015 = 0x0015, - ID_COMMON_0016 = 0x0016, - ID_COMMON_0017 = 0x0017, - ID_COMMON_0018 = 0x0018, - ID_COMMON_0019 = 0x0019, - ID_COMMON_001A = 0x001A, - ID_COMMON_001B = 0x001B, - ID_COMMON_001C = 0x001C, - ID_COMMON_001D = 0x001D, - ID_COMMON_001E = 0x001E, - ID_COMMON_201F = 0x201F, - ID_COMMON_0020 = 0x0020, - ID_COMMON_0021 = 0x0021, - ID_COMMON_2022 = 0x2022, - ID_COMMON_0023 = 0x0023, - ID_COMMON_0024 = 0x0024, - ID_COMMON_0025 = 0x0025, - ID_COMMON_0026 = 0x0026, - ID_COMMON_2027 = 0x2027, - ID_COMMON_0028 = 0x0028, - ID_COMMON_0029 = 0x0029, - ID_COMMON_002A = 0x002A, - ID_COMMON_002B = 0x002B, - ID_COMMON_002C = 0x002C, - ID_COMMON_002D = 0x002D, - ID_COMMON_002E = 0x002E, - ID_COMMON_002F = 0x002F, - ID_COMMON_0030 = 0x0030, - ID_COMMON_0031 = 0x0031, - ID_COMMON_0032 = 0x0032, - ID_COMMON_0033 = 0x0033, - ID_COMMON_035C = 0x035C, - ID_COMMON_0034 = 0x0034, - ID_COMMON_0035 = 0x0035, - ID_COMMON_0036 = 0x0036, - ID_COMMON_0037 = 0x0037, - ID_COMMON_0038 = 0x0038, - ID_COMMON_0432 = 0x0432, - ID_COMMON_0039 = 0x0039, - ID_COMMON_003A = 0x003A, - ID_COMMON_203B = 0x203B, - ID_COMMON_003C = 0x003C, - ID_COMMON_003D = 0x003D, - ID_COMMON_003E = 0x003E, - ID_COMMON_003F = 0x003F, - ID_COMMON_0040 = 0x0040, - ID_COMMON_2041 = 0x2041, - ID_COMMON_0042 = 0x0042, - ID_COMMON_0043 = 0x0043, - ID_COMMON_0044 = 0x0044, - ID_COMMON_0045 = 0x0045, - ID_COMMON_0046 = 0x0046, - ID_COMMON_0047 = 0x0047, - ID_COMMON_0048 = 0x0048, - ID_COMMON_0049 = 0x0049, - ID_COMMON_004A = 0x004A, - ID_COMMON_004B = 0x004B, - ID_COMMON_004C = 0x004C, - ID_COMMON_004D = 0x004D, - ID_COMMON_004E = 0x004E, - ID_COMMON_004F = 0x004F, - ID_COMMON_0050 = 0x0050, - ID_COMMON_0051 = 0x0051, - ID_COMMON_0052 = 0x0052, - ID_COMMON_0053 = 0x0053, - ID_COMMON_0437 = 0x0437, - ID_COMMON_0054 = 0x0054, - ID_COMMON_0056 = 0x0056, - ID_COMMON_0057 = 0x0057, - ID_COMMON_01EA = 0x01EA, - ID_COMMON_01F1 = 0x01F1, - ID_COMMON_01F2 = 0x01F2, - ID_COMMON_01F3 = 0x01F3, - ID_COMMON_01F4 = 0x01F4, - ID_COMMON_01F5 = 0x01F5, - ID_COMMON_01F6 = 0x01F6, - ID_COMMON_01F7 = 0x01F7, - ID_COMMON_01F8 = 0x01F8, - ID_COMMON_01F9 = 0x01F9, - ID_COMMON_01FA = 0x01FA, - ID_COMMON_020D = 0x020D, - ID_COMMON_0214 = 0x0214, - ID_COMMON_0215 = 0x0215, - ID_COMMON_0216 = 0x0216, - ID_COMMON_027C = 0x027C, - ID_COMMON_023E = 0x023E, - ID_COMMON_023F = 0x023F, - ID_COMMON_LIGHT_EXPLOSION = 0x0272, - ID_COMMON_0273 = 0x0273, - ID_COMMON_0274 = 0x0274, - ID_COMMON_0277 = 0x0277, - ID_COMMON_STARS_SPIN = 0x027A, - ID_COMMON_STARS_BLOW = 0x027B, - ID_COMMON_0279 = 0x0279, - ID_COMMON_0285 = 0x0285, - ID_COMMON_0293 = 0x0293, - ID_COMMON_0299 = 0x0299, - ID_COMMON_029A = 0x029A, - ID_COMMON_029B = 0x029B, - ID_COMMON_029C = 0x029C, - ID_COMMON_029D = 0x029D, - ID_COMMON_029E = 0x029E, - ID_COMMON_0055 = 0x0055, - ID_COMMON_029F = 0x029F, - ID_COMMON_02A0 = 0x02A0, - ID_COMMON_02A1 = 0x02A1, - ID_COMMON_02E1 = 0x02E1, - ID_COMMON_02E2 = 0x02E2, - ID_COMMON_02EF = 0x02EF, - ID_COMMON_02E7 = 0x02E7, - ID_COMMON_0309 = 0x0309, - ID_COMMON_030A = 0x030A, - ID_COMMON_0314 = 0x0314, - ID_COMMON_0357 = 0x0357, - ID_COMMON_0358 = 0x0358, - ID_COMMON_0359 = 0x0359, - ID_COMMON_035A = 0x035A, - ID_COMMON_03DD = 0x03DD, - ID_COMMON_03DE = 0x03DE, - ID_COMMON_03DF = 0x03DF, - ID_COMMON_CUT_L_TREE_DOWN = 0x03E0, - ID_COMMON_03E1 = 0x03E1, - ID_COMMON_03E2 = 0x03E2, - ID_COMMON_03E3 = 0x03E3, - ID_COMMON_03E5 = 0x03E5, - ID_COMMON_03E6 = 0x03E6, - ID_COMMON_03E7 = 0x03E7, - ID_COMMON_03E8 = 0x03E8, - ID_COMMON_03E9 = 0x03E9, - ID_COMMON_03EA = 0x03EA, - ID_COMMON_03EB = 0x03EB, - ID_COMMON_03EC = 0x03EC, - ID_COMMON_03ED = 0x03ED, - ID_COMMON_03EE = 0x03EE, - ID_COMMON_03EF = 0x03EF, - ID_COMMON_03F0 = 0x03F0, - ID_COMMON_03F1 = 0x03F1, - ID_COMMON_23F2 = 0x23F2, - ID_COMMON_03F3 = 0x03F3, - ID_COMMON_03F4 = 0x03F4, - ID_COMMON_03F5 = 0x03F5, - ID_COMMON_03F6 = 0x03F6, - ID_COMMON_03F7 = 0x03F7, - ID_COMMON_03F8 = 0x03F8, - ID_COMMON_0429 = 0x0429, - ID_COMMON_0438 = 0x0438, - ID_COMMON_0439 = 0x0439, - ID_COMMON_243A = 0x243A, - ID_COMMON_043B = 0x043B, - ID_COMMON_043C = 0x043C, - ID_COMMON_043D = 0x043D, - ID_COMMON_043E = 0x043E, - ID_COMMON_043F = 0x043F, - ID_COMMON_0440 = 0x0440, - ID_COMMON_0441 = 0x0441, - ID_COMMON_0442 = 0x0442, - ID_COMMON_0453 = 0x0453, - ID_COMMON_0455 = 0x0455, - ID_COMMON_045C = 0x045C, - ID_COMMON_045D = 0x045D, - ID_COMMON_245E = 0x245E, - ID_COMMON_045F = 0x045F, - ID_COMMON_0460 = 0x0460, - ID_COMMON_0461 = 0x0461, - ID_COMMON_0462 = 0x0462, - ID_COMMON_0463 = 0x0463, - ID_COMMON_0464 = 0x0464, - ID_COMMON_0465 = 0x0465, - ID_COMMON_0467 = 0x0467, - ID_COMMON_0468 = 0x0468, - ID_COMMON_0469 = 0x0469, + ID_AK_JN_O_KUSA00 = 0x0000, + ID_AK_JN_O_FIRE00 = 0x0001, + ID_AK_JN_O_APPEARHEART = 0x0002, + ID_AK_JN_O_APPEARLUPY = 0x0003, + ID_AK_JP_O_KAGEROU00 = 0x4004, + ID_AK_JT_SMOKE00 = 0x2005, + ID_AK_JT_SMOKE01 = 0x2006, + ID_AK_JT_SMOKE02 = 0x2007, + ID_IT_JT_BMEX_HAHEN = 0x2008, + ID_IT_JT_BMEX_SMOKE01 = 0x2009, + ID_IT_JT_BMEX_SMOKE02 = 0x200A, + ID_IT_JN_BMEX_SENKO = 0x000B, + ID_AK_JN_NG = 0x000C, + ID_AK_JN_OK = 0x000D, + ID_AK_JN_TUBA00 = 0x000E, + ID_AK_JN_CRITICALHIT = 0x000F, + ID_AK_JN_CRITICALHITFLASH = 0x0010, + ID_IT_JN_BM_HIBANA = 0x0011, + ID_IT_JT_BM_SMOKE = 0x2012, + ID_AK_JN_SIBOUBAKUEN = 0x0013, + ID_AK_JN_SIBOUPOFU = 0x0014, + ID_AK_JN_SIBOUSPIRIT = 0x0015, + ID_AK_JN_SIBOUFLASH = 0x0016, + ID_AK_JN_M_TUBOHAHEN = 0x0017, + ID_AK_JN_TUBOKONAGONA = 0x0018, + ID_AK_JN_SHOTENBAKUEN = 0x0019, + ID_AK_JN_SHOTENPOFU = 0x001A, + ID_AK_JN_SHOTENSPIRIT = 0x001B, + ID_AK_JN_BREAKLIFEBALL = 0x001C, + ID_AK_JN_HAHENLIFEBALL = 0x001D, + ID_AK_JN_ROUNDATTACKTOE = 0x001E, + ID_AK_JT_ROUNDATTACKSMOKE = 0x201F, + ID_AK_JN_ROUNDATTACKSHIBUKI = 0x0020, + ID_AK_JN_ROUNDATTACKKUSA = 0x0021, + ID_AK_JT_ELEMENTSMOKE00 = 0x2022, + ID_AK_JN_ELEMENTSHIBUKI00 = 0x0023, + ID_AK_JN_ELEMENTKUSA00 = 0x0024, + ID_AK_JN_ROUNDATTACK00 = 0x0025, + ID_AK_JN_ROUNDATTACK01 = 0x0026, + ID_AK_JT_ELEMENTSMOKE01 = 0x2027, + ID_AK_JN_ROUNDATTACK02 = 0x0028, + ID_AK_JN_CHARGEPOWER00 = 0x0029, + ID_AK_JN_CHARGEPOWER01 = 0x002A, + ID_AK_JN_ELEMENTKIKUZU00 = 0x002B, + ID_AK_JN_ELEMENTHIBANA00 = 0x002C, + ID_HM_J2_RUPYLIGHT = 0x002D, + ID_HM_J2_GAMEOVER00 = 0x002E, + ID_HM_J2_GAMEOVER01 = 0x002F, + ID_HM_J2_GAMEOVERHA = 0x0030, + ID_AK_JN_WINDLINE00 = 0x0031, + ID_AK_JN_UCHIWAWIND00 = 0x0032, + ID_AK_JN_HAMON00 = 0x0033, + ID_AK_JN_SHIPIMPACT00 = 0x0034, + ID_AK_JN_SHIPSPLASH00 = 0x0035, + ID_AK_JN_SHIPTAIL00 = 0x0036, + ID_AK_JN_SHIPWAVE00 = 0x0037, + ID_IT_JN_LK_NURE_POTA00 = 0x0038, + ID_IT_JN_LK_NURE_SHIBUKI00 = 0x0039, + ID_IT_JN_LK_SWIMK_L = 0x003A, + ID_IT_JT_MIZUBASHIRA = 0x203B, + ID_IT_JN_MIZUSHIBUKI_A = 0x003C, + ID_IT_JN_WP_HAMON01 = 0x003D, + ID_IT_JN_WP_HAMON02 = 0x003E, + ID_IT_JN_WP_HAMON03 = 0x003F, + ID_IT_JN_WP_SHIBUKI = 0x0040, + ID_IT_JT_WATERSMOKE00 = 0x2041, + ID_IT_JN_ARWFIR_FCHIP00 = 0x0042, + ID_IT_JN_ARWFIR_FIRE00 = 0x0043, + ID_IT_JN_ARWICE_KIRA00 = 0x0044, + ID_IT_JN_ARWICE_SMOKE00 = 0x0045, + ID_IT_JN_ARWICE_SUITEKI00 = 0x0046, + ID_AK_JN_LOOTITEM00 = 0x0047, + ID_IT_JN_ARW_BLUR00 = 0x0048, + ID_AK_JN_UCHIWAWIND01 = 0x0049, + ID_AK_JN_LEAFFAN00 = 0x004A, + ID_AK_JN_LEAFPARACHUTE00 = 0x004B, + ID_AK_JN_LEAFPARACHUTE01 = 0x004C, + ID_AK_JN_AURALIMBS00 = 0x004D, + ID_AK_JN_AURABODY00 = 0x004E, + ID_AK_JN_AURAHEAD00 = 0x004F, + ID_AK_JN_TAKT00 = 0x0050, + ID_AK_JN_TAKT01 = 0x0051, + ID_AK_JN_CUREFAIRY00 = 0x0052, + ID_AK_JN_SALVAGE00 = 0x0053, + ID_AK_JN_KOKOHOLE00 = 0x0054, + ID_IT_JN_ARWICE_OUT00 = 0x0055, + ID_IT_JN_ARWFIR_OUT00 = 0x0056, + ID_IT_JN_LK_GEPPU00 = 0x0057, + ID_AK_JN_TORCH = 0x01EA, + ID_IT_JN_TAKARA_PAKAF = 0x01F1, + ID_IT_JN_TAKARA_NAKAF = 0x01F2, + ID_IT_JN_TAKARA_UEF = 0x01F3, + ID_IT_JN_TAKARA_TSUBU = 0x01F4, + ID_IT_JN_TAKARA_VOLM = 0x01F5, + ID_IT_JN_TAKARA_PAKAF_SOTO = 0x01F6, + ID_IT_JN_GETITEM_FLASH_L00 = 0x01F7, + ID_IT_JN_GETITEM_FLASH_S00 = 0x01F8, + ID_IT_JN_GETITEM_HALO00 = 0x01F9, + ID_IT_JN_GETITEM_STAR00 = 0x01FA, + ID_IT_JN_GETITEM_TSUBU00 = 0x01FB, + ID_IT_JN_GETITEM_GLOW00 = 0x01FC, + ID_IT_JN_GETITEM_FLASH_S01 = 0x01FD, + ID_AK_JN_FORESTWATER00 = 0x020D, + ID_IT_JN_HM_SENKO00 = 0x0214, + ID_IT_JN_HM_SENPU00 = 0x0215, + ID_IT_JN_HM_SYOGEKI00 = 0x0216, + ID_HM_J2_BATONINPUT00 = 0x023E, + ID_HM_J2_BATONINPUT01 = 0x023F, + ID_AK_JN_ENEMYFLASH00 = 0x0272, + ID_AK_JN_ENEMYFREEZE00 = 0x0273, + ID_AK_JN_ENEMYFREEZE01 = 0x0274, + ID_AK_JN_ENEMYFREEZE02 = 0x0277, + ID_IT_JT_PIYOPIYO00 = 0x2278, + ID_AK_JN_SPILLWATER00 = 0x0279, + ID_IT_JN_PIYOPIYO00 = 0x027A, + ID_IT_JN_PIYOHIT00 = 0x027B, + ID_IT_JN_HM_WP00 = 0x027C, + ID_AK_JN_SHIPWARPSPLASH00 = 0x0285, + ID_AK_JN_HEARTVESSEL = 0x0293, + ID_IT_JN_ARWF_HINOKO00 = 0x0299, + ID_IT_JN_ARWF_HITA00 = 0x029A, + ID_IT_JN_ARWF_HITB00 = 0x029B, + ID_IT_JN_ARWI_KIRAKIRA00 = 0x029C, + ID_IT_JN_ARWI_REIKI00 = 0x029D, + ID_IT_JN_ARWI_HITA00 = 0x029E, + ID_IT_JN_ARWG_TSUBU00 = 0x029F, + ID_IT_JN_ARWG_FLASH00 = 0x02A0, + ID_IT_JN_ARWG_HITA00 = 0x02A1, + ID_HM_J2_ARWG_FLAME00 = 0x02E1, + ID_HM_J2_ARWI_COLD00 = 0x02E2, + ID_HM_J2_ARWL_LIGHT00 = 0x02E3, + ID_IT_JN_GBACURSOR00 = 0x02E7, + ID_HM_J2_ARWF_LIGHT00 = 0x02EF, + ID_AK_JN_LIGHTSAVER00 = 0x0309, + ID_AK_JN_LIGHTSAVER01 = 0x030A, + ID_AK_JN_DROWNINGSPLASH00 = 0x0314, + ID_IT_JT_BMEX_SMOKELIGHT = 0x232A, + ID_AK_J4_GALESPOT00 = 0x0357, + ID_AK_J4_GALEMAPKIRAKIRA00 = 0x0358, + ID_AK_J4_NEXTSPOT00 = 0x0359, + ID_AK_JN_EVAPORATION00 = 0x035A, + ID_IT_JN_HAMON01 = 0x035C, + ID_IT_JN_O_KUSA_KEN = 0x03DA, + ID_IT_JN_O_KUSA_RUN = 0x03DB, + ID_IT_JN_O_HAPPA01 = 0x03DC, + ID_IT_JN_FLOWER_P = 0x03DD, + ID_IT_JN_FLOWER_W = 0x03DE, + ID_IT_JN_HAPPA02 = 0x03DF, + ID_IT_JN_SWOODLEAF00 = 0x03E0, + ID_IT_JN_MJTAIHOU_SMOKE01 = 0x03E1, + ID_IT_JN_M_STS_HAHEN = 0x03E2, + ID_IT_JN_STS_HAHEN = 0x03E3, + ID_IT_JN_BK_HAHEN = 0x03E4, + ID_IT_JN_TR_HAHEN_A = 0x03E5, + ID_IT_JN_TR_HAHEN_B = 0x03E6, + ID_IT_JN_TR_HAHEN_C = 0x03E7, + ID_IT_JN_DOKURO00 = 0x03E8, + ID_IT_JN_OMAMORI_TSUBU00 = 0x03E9, + ID_IT_JN_OMAMORI_FLASH00 = 0x03EA, + ID_AK_JN_APPEARCHEST00 = 0x03EB, + ID_AK_JN_APPEARCHEST01 = 0x03EC, + ID_AK_JN_CCTHUNDER00 = 0x03ED, + ID_AK_JN_CCTHUNDER01 = 0x03EE, + ID_AK_JN_CCFOOT00 = 0x03EF, + ID_AK_JN_CCHEAD00 = 0x03F0, + ID_AK_JN_BODYABLAZE00 = 0x03F1, + ID_AK_JT_LIFTROCKSMOKE00 = 0x23F2, + ID_AK_JN_BREAKGREATROCK00 = 0x03F3, + ID_AK_JN_M_BREAKGREATROCK00 = 0x03F4, + ID_AK_JN_BREAKLITTLEROCK00 = 0x03F5, + ID_AK_JN_M_BREAKLITTLEROCK00 = 0x03F6, + ID_AK_JN_BREAKFACEROCK00 = 0x03F7, + ID_AK_JN_M_BREAKFACEROCK00 = 0x03F8, + ID_AK_JN_KAMOME00 = 0x0429, + ID_AK_JN_LK_NURE_POTA01 = 0x0432, + ID_AK_JN_SALVAGELIGHT00 = 0x0437, + ID_IT_JN_KG_HANE_A = 0x0438, + ID_IT_JN_KG_HANE_B = 0x0439, + ID_IT_JT_KTR_SMOKE = 0x243A, + ID_IT_JN_KTR_FIRE = 0x043B, + ID_IT_JN_PUCHI_SHIBOUA = 0x043C, + ID_IT_JN_PUCHI_SHIBOUB = 0x043D, + ID_IT_JN_PUCHI_SHIBOUC = 0x043E, + ID_AK_JN_BREAKMAJUPLATE00 = 0x043F, + ID_AK_JN_BREAKMAJUCUP00 = 0x0440, + ID_AK_JN_BREAKMAJUPOT00 = 0x0441, + ID_AK_JN_RATSPLASH00 = 0x0442, + ID_AK_JN_BATTA00 = 0x0453, + ID_AK_JN_SHOOTINGSTAR00 = 0x0455, + ID_IT_JP_KAKOMI_KAGERO00 = 0x445B, + ID_IT_JN_SK_FIRE_A = 0x045C, + ID_IT_JN_SK_HAHEN_A = 0x045D, + ID_IT_JT_SK_SMOKE = 0x245E, + ID_IT_JN_TR2_SHIBUKI_A = 0x045F, + ID_IT_JN_TR2_SHIBUKI_B = 0x0460, + ID_IT_JN_KAKOMI_FIRE_A00 = 0x0461, + ID_IT_JN_KAKOMI_FIRE_B00 = 0x0462, + ID_IT_JN_KAKOMI_STEAM00 = 0x0463, + ID_AK_JN_ICETHAW00 = 0x0464, + ID_AK_JN_ICEHAHEN00 = 0x0465, + ID_AK_JN_OQDEADSPLASH00 = 0x0467, + ID_AK_JN_OQROCKATTACK00 = 0x0468, + ID_AK_JN_OQWAITSPLASH00 = 0x0469, }; - + // Particles that are scene-specific. // These are not in common.jpc, and must be loaded by a scene's particle bank. enum { - ID_SCENE_8058 = 0x8058, - ID_SCENE_8059 = 0x8059, - ID_SCENE_805A = 0x805A, - ID_SCENE_805B = 0x805B, - ID_SCENE_805C = 0x805C, - ID_SCENE_8221 = 0x8221, - ID_SCENE_8222 = 0x8222, - ID_SCENE_8060 = 0x8060, - ID_SCENE_8061 = 0x8061, - ID_SCENE_8062 = 0x8062, - ID_SCENE_8063 = 0x8063, - ID_SCENE_8064 = 0x8064, - ID_SCENE_8065 = 0x8065, - ID_SCENE_8066 = 0x8066, - ID_SCENE_8067 = 0x8067, - ID_SCENE_8068 = 0x8068, - ID_SCENE_8069 = 0x8069, - ID_SCENE_81D5 = 0x81D5, - ID_SCENE_8240 = 0x8240, - ID_SCENE_8241 = 0x8241, - ID_SCENE_8306 = 0x8306, - ID_SCENE_8407 = 0x8407, - ID_SCENE_8408 = 0x8408, - ID_SCENE_8409 = 0x8409, - ID_SCENE_8443 = 0x8443, - ID_SCENE_840A = 0x840A, - ID_SCENE_840B = 0x840B, - ID_SCENE_840C = 0x840C, - ID_SCENE_840D = 0x840D, - ID_SCENE_840E = 0x840E, - ID_SCENE_840F = 0x840F, - ID_SCENE_A410 = 0xA410, - ID_SCENE_A06A = 0xA06A, - ID_SCENE_C06B = 0xC06B, - ID_SCENE_C06C = 0xC06C, - ID_SCENE_C06D = 0xC06D, - ID_SCENE_C1D6 = 0xC1D6, - ID_SCENE_C1D7 = 0xC1D7, - ID_SCENE_C35D = 0xC35D, - ID_SCENE_C35E = 0xC35E, - ID_SCENE_C35F = 0xC35F, - ID_SCENE_C360 = 0xC360, - ID_SCENE_C32B = 0xC32B, - ID_SCENE_C32C = 0xC32C, - ID_SCENE_C361 = 0xC361, - ID_SCENE_C362 = 0xC362, - ID_SCENE_C363 = 0xC363, - ID_SCENE_C364 = 0xC364, - ID_SCENE_C365 = 0xC365, - ID_SCENE_C366 = 0xC366, - ID_SCENE_C367 = 0xC367, - ID_SCENE_C368 = 0xC368, - ID_SCENE_C369 = 0xC369, - ID_SCENE_C36A = 0xC36A, - ID_SCENE_C36B = 0xC36B, - ID_SCENE_C36C = 0xC36C, - ID_SCENE_C36D = 0xC36D, - ID_SCENE_C36E = 0xC36E, - ID_SCENE_C36F = 0xC36F, - ID_SCENE_C370 = 0xC370, - ID_SCENE_C371 = 0xC371, - ID_SCENE_C372 = 0xC372, - ID_SCENE_C373 = 0xC373, - ID_SCENE_C374 = 0xC374, - ID_SCENE_C375 = 0xC375, - ID_SCENE_C376 = 0xC376, - ID_SCENE_C377 = 0xC377, - ID_SCENE_C378 = 0xC378, - ID_SCENE_C379 = 0xC379, - ID_SCENE_C37A = 0xC37A, - ID_SCENE_C37B = 0xC37B, - ID_SCENE_C37C = 0xC37C, - ID_SCENE_C2B9 = 0xC2B9, - ID_SCENE_C3FC = 0xC3FC, - ID_SCENE_8072 = 0x8072, - ID_SCENE_8073 = 0x8073, - ID_SCENE_8076 = 0x8076, - ID_SCENE_8078 = 0x8078, - ID_SCENE_8083 = 0x8083, - ID_SCENE_8084 = 0x8084, - ID_SCENE_8085 = 0x8085, - ID_SCENE_8086 = 0x8086, - ID_SCENE_8089 = 0x8089, - ID_SCENE_808A = 0x808A, - ID_SCENE_808B = 0x808B, - ID_SCENE_808C = 0x808C, - ID_SCENE_8092 = 0x8092, - ID_SCENE_82C6 = 0x82C6, - ID_SCENE_82C7 = 0x82C7, - ID_SCENE_8095 = 0x8095, - ID_SCENE_8096 = 0x8096, - ID_SCENE_82F0 = 0x82F0, - ID_SCENE_82F1 = 0x82F1, - ID_SCENE_8099 = 0x8099, - ID_SCENE_809A = 0x809A, - ID_SCENE_809B = 0x809B, - ID_SCENE_809E = 0x809E, - ID_SCENE_809F = 0x809F, - ID_SCENE_80A0 = 0x80A0, - ID_SCENE_80A1 = 0x80A1, - ID_SCENE_80A2 = 0x80A2, - ID_SCENE_80A3 = 0x80A3, - ID_SCENE_80A4 = 0x80A4, - ID_SCENE_80A6 = 0x80A6, - ID_SCENE_80A7 = 0x80A7, - ID_SCENE_80A8 = 0x80A8, - ID_SCENE_80A9 = 0x80A9, - ID_SCENE_80AA = 0x80AA, - ID_SCENE_A0AB = 0xA0AB, - ID_SCENE_A0AC = 0xA0AC, - ID_SCENE_80B0 = 0x80B0, - ID_SCENE_80B1 = 0x80B1, - ID_SCENE_80B2 = 0x80B2, - ID_SCENE_80B3 = 0x80B3, - ID_SCENE_A0B4 = 0xA0B4, - ID_SCENE_A0B5 = 0xA0B5, - ID_SCENE_80B6 = 0x80B6, - ID_SCENE_8286 = 0x8286, - ID_SCENE_A307 = 0xA307, - ID_SCENE_80B7 = 0x80B7, - ID_SCENE_A0B8 = 0xA0B8, - ID_SCENE_80B9 = 0x80B9, - ID_SCENE_80BA = 0x80BA, - ID_SCENE_80BC = 0x80BC, - ID_SCENE_80BD = 0x80BD, - ID_SCENE_80C4 = 0x80C4, - ID_SCENE_80C5 = 0x80C5, - ID_SCENE_80C6 = 0x80C6, - ID_SCENE_80C7 = 0x80C7, - ID_SCENE_80C8 = 0x80C8, - ID_SCENE_80C9 = 0x80C9, - ID_SCENE_80CA = 0x80CA, - ID_SCENE_80CB = 0x80CB, - ID_SCENE_80CC = 0x80CC, - ID_SCENE_80CE = 0x80CE, - ID_SCENE_80CF = 0x80CF, - ID_SCENE_80D0 = 0x80D0, - ID_SCENE_80D1 = 0x80D1, - ID_SCENE_80D2 = 0x80D2, - ID_SCENE_80D3 = 0x80D3, - ID_SCENE_80D4 = 0x80D4, - ID_SCENE_80D5 = 0x80D5, - ID_SCENE_80D6 = 0x80D6, - ID_SCENE_80D7 = 0x80D7, - ID_SCENE_80D8 = 0x80D8, - ID_SCENE_80D9 = 0x80D9, - ID_SCENE_80DA = 0x80DA, - ID_SCENE_80DB = 0x80DB, - ID_SCENE_80DC = 0x80DC, - ID_SCENE_80DD = 0x80DD, - ID_SCENE_80DE = 0x80DE, - ID_SCENE_80E0 = 0x80E0, - ID_SCENE_A0E1 = 0xA0E1, - ID_SCENE_80E3 = 0x80E3, - ID_SCENE_80E4 = 0x80E4, - ID_SCENE_80E7 = 0x80E7, - ID_SCENE_80EA = 0x80EA, - ID_SCENE_80EC = 0x80EC, - ID_SCENE_80ED = 0x80ED, - ID_SCENE_80EE = 0x80EE, - ID_SCENE_80EF = 0x80EF, - ID_SCENE_80F1 = 0x80F1, - ID_SCENE_A0F2 = 0xA0F2, - ID_SCENE_80F3 = 0x80F3, - ID_SCENE_A0F4 = 0xA0F4, - ID_SCENE_80F5 = 0x80F5, - ID_SCENE_80F6 = 0x80F6, - ID_SCENE_80F7 = 0x80F7, - ID_SCENE_80F8 = 0x80F8, - ID_SCENE_80F9 = 0x80F9, - ID_SCENE_80FA = 0x80FA, - ID_SCENE_A0FB = 0xA0FB, - ID_SCENE_A0FC = 0xA0FC, - ID_SCENE_A0FD = 0xA0FD, - ID_SCENE_80FE = 0x80FE, - ID_SCENE_80FF = 0x80FF, - ID_SCENE_8100 = 0x8100, - ID_SCENE_8101 = 0x8101, - ID_SCENE_8104 = 0x8104, - ID_SCENE_8105 = 0x8105, - ID_SCENE_8106 = 0x8106, - ID_SCENE_8107 = 0x8107, - ID_SCENE_8108 = 0x8108, - ID_SCENE_8109 = 0x8109, - ID_SCENE_810A = 0x810A, - ID_SCENE_810B = 0x810B, - ID_SCENE_8225 = 0x8225, - ID_SCENE_810C = 0x810C, - ID_SCENE_810D = 0x810D, - ID_SCENE_810E = 0x810E, - ID_SCENE_810F = 0x810F, - ID_SCENE_A110 = 0xA110, - ID_SCENE_8112 = 0x8112, - ID_SCENE_8113 = 0x8113, - ID_SCENE_8114 = 0x8114, - ID_SCENE_82A8 = 0x82A8, - ID_SCENE_82A9 = 0x82A9, - ID_SCENE_8119 = 0x8119, - ID_SCENE_811A = 0x811A, - ID_SCENE_811B = 0x811B, - ID_SCENE_811C = 0x811C, - ID_SCENE_811D = 0x811D, - ID_SCENE_A11E = 0xA11E, - ID_SCENE_811F = 0x811F, - ID_SCENE_8120 = 0x8120, - ID_SCENE_8121 = 0x8121, - ID_SCENE_8122 = 0x8122, - ID_SCENE_8123 = 0x8123, - ID_SCENE_8124 = 0x8124, - ID_SCENE_A125 = 0xA125, - ID_SCENE_A126 = 0xA126, - ID_SCENE_8127 = 0x8127, - ID_SCENE_8128 = 0x8128, - ID_SCENE_8129 = 0x8129, - ID_SCENE_812A = 0x812A, - ID_SCENE_812B = 0x812B, - ID_SCENE_812C = 0x812C, - ID_SCENE_812D = 0x812D, - ID_SCENE_A12E = 0xA12E, - ID_SCENE_A12F = 0xA12F, - ID_SCENE_8130 = 0x8130, - ID_SCENE_8131 = 0x8131, - ID_SCENE_A132 = 0xA132, - ID_SCENE_8133 = 0x8133, - ID_SCENE_A134 = 0xA134, - ID_SCENE_A135 = 0xA135, - ID_SCENE_A136 = 0xA136, - ID_SCENE_8137 = 0x8137, - ID_SCENE_8138 = 0x8138, - ID_SCENE_8139 = 0x8139, - ID_SCENE_813A = 0x813A, - ID_SCENE_813B = 0x813B, - ID_SCENE_813C = 0x813C, - ID_SCENE_A13D = 0xA13D, - ID_SCENE_813E = 0x813E, - ID_SCENE_813F = 0x813F, - ID_SCENE_A140 = 0xA140, - ID_SCENE_8141 = 0x8141, - ID_SCENE_8142 = 0x8142, - ID_SCENE_8143 = 0x8143, - ID_SCENE_8144 = 0x8144, - ID_SCENE_8145 = 0x8145, - ID_SCENE_A146 = 0xA146, - ID_SCENE_8147 = 0x8147, - ID_SCENE_8148 = 0x8148, - ID_SCENE_8149 = 0x8149, - ID_SCENE_814A = 0x814A, - ID_SCENE_814B = 0x814B, - ID_SCENE_814C = 0x814C, - ID_SCENE_814D = 0x814D, - ID_SCENE_814E = 0x814E, - ID_SCENE_A14F = 0xA14F, - ID_SCENE_A150 = 0xA150, - ID_SCENE_A151 = 0xA151, - ID_SCENE_8152 = 0x8152, - ID_SCENE_8153 = 0x8153, - ID_SCENE_A154 = 0xA154, - ID_SCENE_A155 = 0xA155, - ID_SCENE_8156 = 0x8156, - ID_SCENE_8157 = 0x8157, - ID_SCENE_8158 = 0x8158, - ID_SCENE_8159 = 0x8159, - ID_SCENE_815A = 0x815A, - ID_SCENE_815B = 0x815B, - ID_SCENE_815C = 0x815C, - ID_SCENE_815D = 0x815D, - ID_SCENE_815E = 0x815E, - ID_SCENE_815F = 0x815F, - ID_SCENE_8160 = 0x8160, - ID_SCENE_8161 = 0x8161, - ID_SCENE_8162 = 0x8162, - ID_SCENE_8163 = 0x8163, - ID_SCENE_8164 = 0x8164, - ID_SCENE_8165 = 0x8165, - ID_SCENE_8166 = 0x8166, - ID_SCENE_8167 = 0x8167, - ID_SCENE_8168 = 0x8168, - ID_SCENE_8169 = 0x8169, - ID_SCENE_816A = 0x816A, - ID_SCENE_A16B = 0xA16B, - ID_SCENE_816C = 0x816C, - ID_SCENE_A16D = 0xA16D, - ID_SCENE_A16E = 0xA16E, - ID_SCENE_A16F = 0xA16F, - ID_SCENE_A170 = 0xA170, - ID_SCENE_A171 = 0xA171, - ID_SCENE_A172 = 0xA172, - ID_SCENE_A173 = 0xA173, - ID_SCENE_8174 = 0x8174, - ID_SCENE_8175 = 0x8175, - ID_SCENE_8176 = 0x8176, - ID_SCENE_8177 = 0x8177, - ID_SCENE_8178 = 0x8178, - ID_SCENE_822D = 0x822D, - ID_SCENE_8179 = 0x8179, - ID_SCENE_817A = 0x817A, - ID_SCENE_817B = 0x817B, - ID_SCENE_A17C = 0xA17C, - ID_SCENE_A17D = 0xA17D, - ID_SCENE_817E = 0x817E, - ID_SCENE_817F = 0x817F, - ID_SCENE_A180 = 0xA180, - ID_SCENE_A181 = 0xA181, - ID_SCENE_8182 = 0x8182, - ID_SCENE_8183 = 0x8183, - ID_SCENE_8411 = 0x8411, - ID_SCENE_8412 = 0x8412, - ID_SCENE_8184 = 0x8184, - ID_SCENE_8185 = 0x8185, - ID_SCENE_8186 = 0x8186, - ID_SCENE_A187 = 0xA187, - ID_SCENE_8188 = 0x8188, - ID_SCENE_8189 = 0x8189, - ID_SCENE_818A = 0x818A, - ID_SCENE_818B = 0x818B, - ID_SCENE_818C = 0x818C, - ID_SCENE_818D = 0x818D, - ID_SCENE_818E = 0x818E, - ID_SCENE_818F = 0x818F, - ID_SCENE_8190 = 0x8190, - ID_SCENE_8191 = 0x8191, - ID_SCENE_8192 = 0x8192, - ID_SCENE_8193 = 0x8193, - ID_SCENE_8194 = 0x8194, - ID_SCENE_8195 = 0x8195, - ID_SCENE_8196 = 0x8196, - ID_SCENE_8197 = 0x8197, - ID_SCENE_8198 = 0x8198, - ID_SCENE_8199 = 0x8199, - ID_SCENE_819A = 0x819A, - ID_SCENE_819B = 0x819B, - ID_SCENE_819C = 0x819C, - ID_SCENE_8217 = 0x8217, - ID_SCENE_827D = 0x827D, - ID_SCENE_819D = 0x819D, - ID_SCENE_819E = 0x819E, - ID_SCENE_819F = 0x819F, - ID_SCENE_81A0 = 0x81A0, - ID_SCENE_81A1 = 0x81A1, - ID_SCENE_81A2 = 0x81A2, - ID_SCENE_81A3 = 0x81A3, - ID_SCENE_81A4 = 0x81A4, - ID_SCENE_81A5 = 0x81A5, - ID_SCENE_81A6 = 0x81A6, - ID_SCENE_81A7 = 0x81A7, - ID_SCENE_81A8 = 0x81A8, - ID_SCENE_81A9 = 0x81A9, - ID_SCENE_81AA = 0x81AA, - ID_SCENE_81AB = 0x81AB, - ID_SCENE_A1BC = 0xA1BC, - ID_SCENE_81AE = 0x81AE, - ID_SCENE_81AF = 0x81AF, - ID_SCENE_81B0 = 0x81B0, - ID_SCENE_81B1 = 0x81B1, - ID_SCENE_81B2 = 0x81B2, - ID_SCENE_A1B3 = 0xA1B3, - ID_SCENE_81B4 = 0x81B4, - ID_SCENE_81B5 = 0x81B5, - ID_SCENE_81B6 = 0x81B6, - ID_SCENE_81B7 = 0x81B7, - ID_SCENE_81B8 = 0x81B8, - ID_SCENE_81BA = 0x81BA, - ID_SCENE_81BB = 0x81BB, - ID_SCENE_8213 = 0x8213, - ID_SCENE_8290 = 0x8290, - ID_SCENE_81BD = 0x81BD, - ID_SCENE_81BE = 0x81BE, - ID_SCENE_81BF = 0x81BF, - ID_SCENE_A1C0 = 0xA1C0, - ID_SCENE_A1C1 = 0xA1C1, - ID_SCENE_81C2 = 0x81C2, - ID_SCENE_81C3 = 0x81C3, - ID_SCENE_A1D8 = 0xA1D8, - ID_SCENE_A1D9 = 0xA1D9, - ID_SCENE_A1DA = 0xA1DA, - ID_SCENE_A1DB = 0xA1DB, - ID_SCENE_A1DC = 0xA1DC, - ID_SCENE_A1DD = 0xA1DD, - ID_SCENE_A1DE = 0xA1DE, - ID_SCENE_A1DF = 0xA1DF, - ID_SCENE_A1E0 = 0xA1E0, - ID_SCENE_81E1 = 0x81E1, - ID_SCENE_A1E2 = 0xA1E2, - ID_SCENE_81E3 = 0x81E3, - ID_SCENE_81E4 = 0x81E4, - ID_SCENE_81E5 = 0x81E5, - ID_SCENE_81E6 = 0x81E6, - ID_SCENE_81E7 = 0x81E7, - ID_SCENE_81E8 = 0x81E8, - ID_SCENE_81E9 = 0x81E9, - ID_SCENE_81C4 = 0x81C4, - ID_SCENE_81C5 = 0x81C5, - ID_SCENE_81C6 = 0x81C6, - ID_SCENE_81C7 = 0x81C7, - ID_SCENE_81C8 = 0x81C8, - ID_SCENE_81C9 = 0x81C9, - ID_SCENE_81CA = 0x81CA, - ID_SCENE_81CB = 0x81CB, - ID_SCENE_81CC = 0x81CC, - ID_SCENE_81CD = 0x81CD, - ID_SCENE_81CE = 0x81CE, - ID_SCENE_81CF = 0x81CF, - ID_SCENE_81EE = 0x81EE, - ID_SCENE_81EF = 0x81EF, - ID_SCENE_81F0 = 0x81F0, - ID_SCENE_8218 = 0x8218, - ID_SCENE_8219 = 0x8219, - ID_SCENE_821A = 0x821A, - ID_SCENE_821B = 0x821B, - ID_SCENE_821C = 0x821C, - ID_SCENE_821D = 0x821D, - ID_SCENE_821E = 0x821E, - ID_SCENE_8242 = 0x8242, - ID_SCENE_8243 = 0x8243, - ID_SCENE_8244 = 0x8244, - ID_SCENE_8245 = 0x8245, - ID_SCENE_8246 = 0x8246, - ID_SCENE_826B = 0x826B, - ID_SCENE_8405 = 0x8405, - ID_SCENE_8406 = 0x8406, - ID_SCENE_81D0 = 0x81D0, - ID_SCENE_81D1 = 0x81D1, - ID_SCENE_81D2 = 0x81D2, - ID_SCENE_81D3 = 0x81D3, - ID_SCENE_81D4 = 0x81D4, - ID_SCENE_820A = 0x820A, - ID_SCENE_820B = 0x820B, - ID_SCENE_820C = 0x820C, - ID_SCENE_81FE = 0x81FE, - ID_SCENE_81FF = 0x81FF, - ID_SCENE_8200 = 0x8200, - ID_SCENE_8201 = 0x8201, - ID_SCENE_8202 = 0x8202, - ID_SCENE_8203 = 0x8203, - ID_SCENE_8204 = 0x8204, - ID_SCENE_8205 = 0x8205, - ID_SCENE_8206 = 0x8206, - ID_SCENE_8207 = 0x8207, - ID_SCENE_8208 = 0x8208, - ID_SCENE_8209 = 0x8209, - ID_SCENE_82CC = 0x82CC, - ID_SCENE_820E = 0x820E, - ID_SCENE_820F = 0x820F, - ID_SCENE_821F = 0x821F, - ID_SCENE_8220 = 0x8220, - ID_SCENE_8223 = 0x8223, - ID_SCENE_8224 = 0x8224, - ID_SCENE_8226 = 0x8226, - ID_SCENE_8232 = 0x8232, - ID_SCENE_8294 = 0x8294, - ID_SCENE_82B1 = 0x82B1, - ID_SCENE_82B2 = 0x82B2, - ID_SCENE_822E = 0x822E, - ID_SCENE_822F = 0x822F, - ID_SCENE_A230 = 0xA230, - ID_SCENE_8268 = 0x8268, - ID_SCENE_8269 = 0x8269, - ID_SCENE_826A = 0x826A, - ID_SCENE_8231 = 0x8231, - ID_SCENE_8236 = 0x8236, - ID_SCENE_8237 = 0x8237, - ID_SCENE_8238 = 0x8238, - ID_SCENE_8239 = 0x8239, - ID_SCENE_823A = 0x823A, - ID_SCENE_823B = 0x823B, - ID_SCENE_823C = 0x823C, - ID_SCENE_823D = 0x823D, - ID_SCENE_8280 = 0x8280, - ID_SCENE_8281 = 0x8281, - ID_SCENE_8282 = 0x8282, - ID_SCENE_8283 = 0x8283, - ID_SCENE_8284 = 0x8284, - ID_SCENE_8287 = 0x8287, - ID_SCENE_8288 = 0x8288, - ID_SCENE_8289 = 0x8289, - ID_SCENE_A247 = 0xA247, - ID_SCENE_A248 = 0xA248, - ID_SCENE_8249 = 0x8249, - ID_SCENE_A24A = 0xA24A, - ID_SCENE_824B = 0x824B, - ID_SCENE_A24C = 0xA24C, - ID_SCENE_824D = 0x824D, - ID_SCENE_824E = 0x824E, - ID_SCENE_A24F = 0xA24F, - ID_SCENE_8250 = 0x8250, - ID_SCENE_A251 = 0xA251, - ID_SCENE_8252 = 0x8252, - ID_SCENE_8253 = 0x8253, - ID_SCENE_8254 = 0x8254, - ID_SCENE_8255 = 0x8255, - ID_SCENE_A256 = 0xA256, - ID_SCENE_8257 = 0x8257, - ID_SCENE_A258 = 0xA258, - ID_SCENE_8259 = 0x8259, - ID_SCENE_A25A = 0xA25A, - ID_SCENE_825B = 0x825B, - ID_SCENE_825C = 0x825C, - ID_SCENE_825D = 0x825D, - ID_SCENE_825E = 0x825E, - ID_SCENE_825F = 0x825F, - ID_SCENE_A260 = 0xA260, - ID_SCENE_A261 = 0xA261, - ID_SCENE_A262 = 0xA262, - ID_SCENE_A263 = 0xA263, - ID_SCENE_8264 = 0x8264, - ID_SCENE_8265 = 0x8265, - ID_SCENE_8266 = 0x8266, - ID_SCENE_A267 = 0xA267, - ID_SCENE_826C = 0x826C, - ID_SCENE_PEDESTAL_OCTAGON_GLOW = 0x826D, - ID_SCENE_826E = 0x826E, - ID_SCENE_826F = 0x826F, - ID_SCENE_8270 = 0x8270, - ID_SCENE_8271 = 0x8271, - ID_SCENE_8275 = 0x8275, - ID_SCENE_8276 = 0x8276, - ID_SCENE_827E = 0x827E, - ID_SCENE_827F = 0x827F, - ID_SCENE_828B = 0x828B, - ID_SCENE_828C = 0x828C, - ID_SCENE_828D = 0x828D, - ID_SCENE_828E = 0x828E, - ID_SCENE_828F = 0x828F, - ID_SCENE_8291 = 0x8291, - ID_SCENE_8292 = 0x8292, - ID_SCENE_8295 = 0x8295, - ID_SCENE_8296 = 0x8296, - ID_SCENE_8297 = 0x8297, - ID_SCENE_8298 = 0x8298, - ID_SCENE_82A2 = 0x82A2, - ID_SCENE_A2A3 = 0xA2A3, - ID_SCENE_82A4 = 0x82A4, - ID_SCENE_82A5 = 0x82A5, - ID_SCENE_82A6 = 0x82A6, - ID_SCENE_82A7 = 0x82A7, - ID_SCENE_82AA = 0x82AA, - ID_SCENE_82AB = 0x82AB, - ID_SCENE_82AC = 0x82AC, - ID_SCENE_82AD = 0x82AD, - ID_SCENE_82AE = 0x82AE, - ID_SCENE_82AF = 0x82AF, - ID_SCENE_82B0 = 0x82B0, - ID_SCENE_82B3 = 0x82B3, - ID_SCENE_82B4 = 0x82B4, - ID_SCENE_82B5 = 0x82B5, - ID_SCENE_82B6 = 0x82B6, - ID_SCENE_82B7 = 0x82B7, - ID_SCENE_82B8 = 0x82B8, - ID_SCENE_82BA = 0x82BA, - ID_SCENE_82BB = 0x82BB, - ID_SCENE_A2C2 = 0xA2C2, - ID_SCENE_A2C3 = 0xA2C3, - ID_SCENE_82EC = 0x82EC, - ID_SCENE_A2ED = 0xA2ED, - ID_SCENE_82EE = 0x82EE, - ID_SCENE_82C4 = 0x82C4, - ID_SCENE_82C5 = 0x82C5, - ID_SCENE_82C8 = 0x82C8, - ID_SCENE_82C9 = 0x82C9, - ID_SCENE_82CA = 0x82CA, - ID_SCENE_82CD = 0x82CD, - ID_SCENE_82CE = 0x82CE, - ID_SCENE_82CF = 0x82CF, - ID_SCENE_A2D0 = 0xA2D0, - ID_SCENE_82D1 = 0x82D1, - ID_SCENE_82D2 = 0x82D2, - ID_SCENE_82D3 = 0x82D3, - ID_SCENE_82D4 = 0x82D4, - ID_SCENE_82D5 = 0x82D5, - ID_SCENE_82D6 = 0x82D6, - ID_SCENE_8310 = 0x8310, - ID_SCENE_8311 = 0x8311, - ID_SCENE_8312 = 0x8312, - ID_SCENE_A401 = 0xA401, - ID_SCENE_A402 = 0xA402, - ID_SCENE_A403 = 0xA403, - ID_SCENE_A404 = 0xA404, - ID_SCENE_8444 = 0x8444, - ID_SCENE_8445 = 0x8445, - ID_SCENE_8456 = 0x8456, - ID_SCENE_845A = 0x845A, - ID_SCENE_82D7 = 0x82D7, - ID_SCENE_82D8 = 0x82D8, - ID_SCENE_82DD = 0x82DD, - ID_SCENE_82DE = 0x82DE, - ID_SCENE_82DF = 0x82DF, - ID_SCENE_A2E0 = 0xA2E0, - ID_SCENE_82EA = 0x82EA, - ID_SCENE_82EB = 0x82EB, - ID_SCENE_82E4 = 0x82E4, - ID_SCENE_82E5 = 0x82E5, - ID_SCENE_82E6 = 0x82E6, - ID_SCENE_830B = 0x830B, - ID_SCENE_830C = 0x830C, - ID_SCENE_8313 = 0x8313, - ID_SCENE_8315 = 0x8315, - ID_SCENE_833D = 0x833D, - ID_SCENE_8316 = 0x8316, - ID_SCENE_A320 = 0xA320, - ID_SCENE_833A = 0x833A, - ID_SCENE_A328 = 0xA328, - ID_SCENE_A33B = 0xA33B, - ID_SCENE_A329 = 0xA329, - ID_SCENE_837D = 0x837D, - ID_SCENE_837E = 0x837E, - ID_SCENE_837F = 0x837F, - ID_SCENE_8380 = 0x8380, - ID_SCENE_8381 = 0x8381, - ID_SCENE_8382 = 0x8382, - ID_SCENE_8383 = 0x8383, - ID_SCENE_8384 = 0x8384, - ID_SCENE_8385 = 0x8385, - ID_SCENE_833C = 0x833C, - ID_SCENE_83D9 = 0x83D9, - ID_SCENE_8386 = 0x8386, - ID_SCENE_8387 = 0x8387, - ID_SCENE_8388 = 0x8388, - ID_SCENE_8389 = 0x8389, - ID_SCENE_838A = 0x838A, - ID_SCENE_838B = 0x838B, - ID_SCENE_838C = 0x838C, - ID_SCENE_838D = 0x838D, - ID_SCENE_832D = 0x832D, - ID_SCENE_832E = 0x832E, - ID_SCENE_832F = 0x832F, - ID_SCENE_8330 = 0x8330, - ID_SCENE_838E = 0x838E, - ID_SCENE_838F = 0x838F, - ID_SCENE_8390 = 0x8390, - ID_SCENE_8391 = 0x8391, - ID_SCENE_8392 = 0x8392, - ID_SCENE_8393 = 0x8393, - ID_SCENE_8394 = 0x8394, - ID_SCENE_8395 = 0x8395, - ID_SCENE_8396 = 0x8396, - ID_SCENE_8397 = 0x8397, - ID_SCENE_8398 = 0x8398, - ID_SCENE_8399 = 0x8399, - ID_SCENE_839A = 0x839A, - ID_SCENE_839B = 0x839B, - ID_SCENE_839C = 0x839C, - ID_SCENE_839D = 0x839D, - ID_SCENE_839E = 0x839E, - ID_SCENE_839F = 0x839F, - ID_SCENE_83A0 = 0x83A0, - ID_SCENE_83A1 = 0x83A1, - ID_SCENE_83A2 = 0x83A2, - ID_SCENE_83A3 = 0x83A3, - ID_SCENE_83A4 = 0x83A4, - ID_SCENE_83A5 = 0x83A5, - ID_SCENE_83A6 = 0x83A6, - ID_SCENE_83A7 = 0x83A7, - ID_SCENE_83A8 = 0x83A8, - ID_SCENE_83A9 = 0x83A9, - ID_SCENE_83AA = 0x83AA, - ID_SCENE_83AB = 0x83AB, - ID_SCENE_83AC = 0x83AC, - ID_SCENE_83AD = 0x83AD, - ID_SCENE_83AE = 0x83AE, - ID_SCENE_83AF = 0x83AF, - ID_SCENE_83B0 = 0x83B0, - ID_SCENE_83B1 = 0x83B1, - ID_SCENE_83B2 = 0x83B2, - ID_SCENE_83B3 = 0x83B3, - ID_SCENE_83B4 = 0x83B4, - ID_SCENE_83B5 = 0x83B5, - ID_SCENE_83B6 = 0x83B6, - ID_SCENE_83B7 = 0x83B7, - ID_SCENE_83B8 = 0x83B8, - ID_SCENE_83B9 = 0x83B9, - ID_SCENE_83BA = 0x83BA, - ID_SCENE_83BB = 0x83BB, - ID_SCENE_83BC = 0x83BC, - ID_SCENE_83BD = 0x83BD, - ID_SCENE_83BE = 0x83BE, - ID_SCENE_83BF = 0x83BF, - ID_SCENE_83C0 = 0x83C0, - ID_SCENE_83C1 = 0x83C1, - ID_SCENE_83C2 = 0x83C2, - ID_SCENE_83C3 = 0x83C3, - ID_SCENE_83C4 = 0x83C4, - ID_SCENE_83C5 = 0x83C5, - ID_SCENE_8433 = 0x8433, - ID_SCENE_833E = 0x833E, - ID_SCENE_833F = 0x833F, - ID_SCENE_8340 = 0x8340, - ID_SCENE_8341 = 0x8341, - ID_SCENE_8342 = 0x8342, - ID_SCENE_8343 = 0x8343, - ID_SCENE_A344 = 0xA344, - ID_SCENE_83CD = 0x83CD, - ID_SCENE_83CE = 0x83CE, - ID_SCENE_83CF = 0x83CF, - ID_SCENE_83D0 = 0x83D0, - ID_SCENE_83D1 = 0x83D1, - ID_SCENE_83D2 = 0x83D2, - ID_SCENE_83D3 = 0x83D3, - ID_SCENE_83D4 = 0x83D4, - ID_SCENE_83D5 = 0x83D5, - ID_SCENE_83D6 = 0x83D6, - ID_SCENE_83D7 = 0x83D7, - ID_SCENE_8346 = 0x8346, - ID_SCENE_8347 = 0x8347, - ID_SCENE_8348 = 0x8348, - ID_SCENE_8349 = 0x8349, - ID_SCENE_834A = 0x834A, - ID_SCENE_834B = 0x834B, - ID_SCENE_834C = 0x834C, - ID_SCENE_834D = 0x834D, - ID_SCENE_834E = 0x834E, - ID_SCENE_834F = 0x834F, - ID_SCENE_8350 = 0x8350, - ID_SCENE_8351 = 0x8351, - ID_SCENE_8352 = 0x8352, - ID_SCENE_8353 = 0x8353, - ID_SCENE_8354 = 0x8354, - ID_SCENE_8355 = 0x8355, - ID_SCENE_8356 = 0x8356, - ID_SCENE_835B = 0x835B, - ID_SCENE_842D = 0x842D, - ID_SCENE_842E = 0x842E, - ID_SCENE_842F = 0x842F, - ID_SCENE_83F9 = 0x83F9, - ID_SCENE_83FA = 0x83FA, - ID_SCENE_83FB = 0x83FB, - ID_SCENE_A413 = 0xA413, - ID_SCENE_8414 = 0x8414, - ID_SCENE_8415 = 0x8415, - ID_SCENE_8416 = 0x8416, - ID_SCENE_8417 = 0x8417, - ID_SCENE_A418 = 0xA418, - ID_SCENE_8419 = 0x8419, - ID_SCENE_841A = 0x841A, - ID_SCENE_841B = 0x841B, - ID_SCENE_841C = 0x841C, - ID_SCENE_A470 = 0xA470, - ID_SCENE_8457 = 0x8457, - ID_SCENE_8458 = 0x8458, - ID_SCENE_8459 = 0x8459, - ID_SCENE_8426 = 0x8426, - ID_SCENE_8427 = 0x8427, - ID_SCENE_8454 = 0x8454, - ID_SCENE_8434 = 0x8434, - ID_SCENE_8435 = 0x8435, - ID_SCENE_8436 = 0x8436, - ID_SCENE_8428 = 0x8428, - ID_SCENE_WARPFOUT_WARP4 = 0x830E, - ID_SCENE_830F = 0x830F, - ID_SCENE_82D9 = 0x82D9, - ID_SCENE_82DA = 0x82DA, - ID_SCENE_82DB = 0x82DB, - ID_SCENE_82DC = 0x82DC, - ID_SCENE_846D = 0x846D, - ID_SCENE_846E = 0x846E, - ID_SCENE_846F = 0x846F, - ID_SCENE_83FD = 0x83FD, - ID_SCENE_83FE = 0x83FE, - ID_SCENE_841D = 0x841D, - ID_SCENE_841E = 0x841E, - ID_SCENE_A2CB = 0xA2CB, - ID_SCENE_8326 = 0x8326, - ID_SCENE_82F2 = 0x82F2, - ID_SCENE_82F3 = 0x82F3, - ID_SCENE_82F4 = 0x82F4, - ID_SCENE_82F5 = 0x82F5, - ID_SCENE_82F6 = 0x82F6, - ID_SCENE_82F7 = 0x82F7, - ID_SCENE_82F8 = 0x82F8, - ID_SCENE_82F9 = 0x82F9, - ID_SCENE_82FA = 0x82FA, - ID_SCENE_82FB = 0x82FB, - ID_SCENE_82FC = 0x82FC, - ID_SCENE_82FD = 0x82FD, - ID_SCENE_82FE = 0x82FE, - ID_SCENE_82FF = 0x82FF, - ID_SCENE_8300 = 0x8300, - ID_SCENE_8301 = 0x8301, - ID_SCENE_8302 = 0x8302, - ID_SCENE_8308 = 0x8308, - ID_SCENE_8304 = 0x8304, - ID_SCENE_8305 = 0x8305, - ID_SCENE_8317 = 0x8317, - ID_SCENE_8318 = 0x8318, - ID_SCENE_8319 = 0x8319, - ID_SCENE_831A = 0x831A, - ID_SCENE_831B = 0x831B, - ID_SCENE_831C = 0x831C, - ID_SCENE_831D = 0x831D, - ID_SCENE_831E = 0x831E, - ID_SCENE_831F = 0x831F, - ID_SCENE_82BC = 0x82BC, - ID_SCENE_82BD = 0x82BD, - ID_SCENE_83D8 = 0x83D8, - ID_SCENE_82BE = 0x82BE, - ID_SCENE_82BF = 0x82BF, - ID_SCENE_82C0 = 0x82C0, - ID_SCENE_82C1 = 0x82C1, - ID_SCENE_846A = 0x846A, - ID_SCENE_846B = 0x846B, - ID_SCENE_846C = 0x846C, - ID_SCENE_8321 = 0x8321, - ID_SCENE_8322 = 0x8322, - ID_SCENE_8323 = 0x8323, - ID_SCENE_8324 = 0x8324, - ID_SCENE_8331 = 0x8331, - ID_SCENE_8332 = 0x8332, - ID_SCENE_8333 = 0x8333, - ID_SCENE_8334 = 0x8334, - ID_SCENE_8338 = 0x8338, - ID_SCENE_8339 = 0x8339, - ID_SCENE_83C6 = 0x83C6, - ID_SCENE_83C7 = 0x83C7, - ID_SCENE_83C8 = 0x83C8, - ID_SCENE_83C9 = 0x83C9, - ID_SCENE_83CA = 0x83CA, - ID_SCENE_83CB = 0x83CB, - ID_SCENE_83CC = 0x83CC, - ID_SCENE_842A = 0x842A, - ID_SCENE_841F = 0x841F, - ID_SCENE_8420 = 0x8420, - ID_SCENE_8421 = 0x8421, - ID_SCENE_8422 = 0x8422, - ID_SCENE_8430 = 0x8430, - ID_SCENE_8423 = 0x8423, - ID_SCENE_8424 = 0x8424, - ID_SCENE_8425 = 0x8425, - ID_SCENE_8446 = 0x8446, - ID_SCENE_8447 = 0x8447, - ID_SCENE_8448 = 0x8448, - ID_SCENE_8449 = 0x8449, - ID_SCENE_844A = 0x844A, - ID_SCENE_844B = 0x844B, - ID_SCENE_844C = 0x844C, - ID_SCENE_844D = 0x844D, - ID_SCENE_844E = 0x844E, - ID_SCENE_844F = 0x844F, - ID_SCENE_8450 = 0x8450, - ID_SCENE_8451 = 0x8451, - ID_SCENE_8452 = 0x8452, - ID_SCENE_8327 = 0x8327, - ID_SCENE_842B = 0x842B, - ID_SCENE_8431 = 0x8431, - ID_SCENE_END = 0x8466, + ID_IT_SN_O_MAGT_FCHIP = 0x8058, + ID_IT_SN_O_MAGT_NETSU = 0x8059, + ID_AK_SN_O_FIRESHAFTHEAD = 0x805A, + ID_AK_SN_O_FIRESHAFTBODY = 0x805B, + ID_AK_SN_O_FIRESHAFTFOOT = 0x805C, + ID_IT_SN_O_KUSA_KEN = 0x805D, + ID_IT_SN_O_KUSA_RUN = 0x805E, + ID_IT_SN_O_HAPPA01 = 0x805F, + ID_IT_SN_O_MAGT_HAHEN_B = 0x8060, + ID_IT_SN_O_FIREK_KASU = 0x8061, + ID_AK_SN_O_BTDBROKENROCKTAIL00 = 0x8062, + ID_AK_SN_O_BTDPOPMAGMA00 = 0x8063, + ID_AK_SN_O_BTDPOPMAGMA01 = 0x8064, + ID_AK_SN_O_BKMSATTACKHOUSHI00 = 0x8065, + ID_AK_SN_O_BKMSATTACKSOIL00 = 0x8066, + ID_AK_SN_O_BKMTENTACLEBLOOD00 = 0x8067, + ID_IT_SN_O_KUROBOU_SIBOU00 = 0x8068, + ID_IT_SN_O_TN_MANTOFIRE00 = 0x8069, + ID_AK_ST_O_BKMSATTACKSMOKE00 = 0xA06A, + ID_AK_SP_O_FIREHOLEKAGEROU = 0xC06B, + ID_IT_SP_MAGT_KAGERO = 0xC06C, + ID_AK_SP_MTDRAGONKAGEROU = 0xC06D, + ID_IT_SP_KAKOMI_KAGERO00 = 0xC06E, + ID_IT_SN_KG_HANE_A = 0x806F, + ID_IT_SN_KG_HANE_B = 0x8070, + ID_IT_SN_KG_HANE_C = 0x8071, + ID_AK_SN_YOGANYUGE00 = 0x8072, + ID_AK_SN_YOGANYUGE01 = 0x8073, + ID_IT_ST_KTR_SMOKE = 0xA074, + ID_IT_SN_KTR_FIRE = 0x8075, + ID_IT_SN_KTR_YUKA = 0x8076, + ID_AK_SN_HEARTVESSEL = 0x8077, + ID_AK_SN_HIDARUMAFIRE = 0x8078, + ID_IT_SN_M_STS_HAHEN = 0x8079, + ID_IT_SN_STS_HAHEN = 0x807A, + ID_AK_SN_TORCH = 0x807B, + ID_IT_ST_LK_DOSUN01 = 0xA07C, + ID_IT_SN_SK_HAHEN_A = 0x807D, + ID_IT_ST_SK_DUST = 0xA07E, + ID_IT_SN_SK_FIRE_A = 0x807F, + ID_IT_SN_M_TR_HAHEN = 0x8080, + ID_IT_SN_TR_HAHEN_A = 0x8081, + ID_IT_SN_TR_HAHEN_B = 0x8082, + ID_IT_SN_WPOT_BITYA = 0x8083, + ID_IT_SN_WPOT_SHIBUKI = 0x8084, + ID_IT_SN_WPOT_PITYA = 0x8085, + ID_IT_SN_WPOT_YUKA = 0x8086, + ID_IT_ST_SK_SMOKE = 0xA087, + ID_IT_SN_HAPPA02 = 0x8088, + ID_AK_SN_OSHIRIKUROKOGE = 0x8089, + ID_AK_SN_FIRESHAFTFOOTBIG = 0x808A, + ID_AK_SN_STEAM00 = 0x808B, + ID_AK_SN_STEAM01 = 0x808C, + ID_IT_SN_TAKARA_PAKAF = 0x808D, + ID_IT_SN_TAKARA_NAKAF = 0x808E, + ID_IT_SN_TAKARA_UEF = 0x808F, + ID_IT_SN_TAKARA_TSUBU = 0x8090, + ID_IT_SN_BK_HAHEN = 0x8091, + ID_IT_SN_WPOT_PITYA_C = 0x8092, + ID_IT_SN_FLOWER_P = 0x8093, + ID_IT_SN_FLOWER_W = 0x8094, + ID_AK_SN_MAGTAILSTEAM = 0x8095, + ID_IT_SN_MAGT_HAHEN_A = 0x8096, + ID_AK_SN_APPEARCHEST00 = 0x8097, + ID_AK_SN_APPEARCHEST01 = 0x8098, + ID_IT_SN_FIREK_FIRE_A = 0x8099, + ID_IT_SN_FIREK_FIRE_B = 0x809A, + ID_IT_SN_FIREK_HAHEN = 0x809B, + ID_IT_SN_BK_MOEKASU_A = 0x809C, + ID_IT_SN_BK_MOEKASU_B = 0x809D, + ID_AK_SN_PITFALL00 = 0x809E, + ID_AK_SN_FIREBREATH00 = 0x809F, + ID_AK_SN_FIREBREATH01 = 0x80A0, + ID_AK_SN_ARMFIRECHIP = 0x80A1, + ID_AK_SN_BACKBONEFIRECHIP00 = 0x80A2, + ID_AK_SN_BACKBONEFIRECHIP01 = 0x80A3, + ID_AK_SN_BACKBONEFIRECHIP02 = 0x80A4, + ID_IT_SN_TAKARA_VOLM = 0x80A5, + ID_AK_SN_FIREBREATHSTORE00 = 0x80A6, + ID_AK_SN_FIREBREATHSTORE01 = 0x80A7, + ID_AK_SN_M_BTDMODELROCK00 = 0x80A8, + ID_AK_SN_BTDROCK00 = 0x80A9, + ID_AK_SN_BTDROCK01 = 0x80AA, + ID_AK_ST_BTDSMOKE00 = 0xA0AB, + ID_AK_ST_BTDSMOKE01 = 0xA0AC, + ID_IT_SN_TR2_HAHEN_A = 0x80AD, + ID_IT_SN_TR2_SHIBUKI_A = 0x80AE, + ID_IT_SN_TR2_SHIBUKI_B = 0x80AF, + ID_AK_SN_BTDCLAWROCKR00 = 0x80B0, + ID_AK_SN_BTDCLAWROCKL00 = 0x80B1, + ID_AK_SN_BTDCLAWROCKR01 = 0x80B2, + ID_AK_SN_BTDCLAWROCKL01 = 0x80B3, + ID_AK_ST_BTDCLAWSMOKER00 = 0xA0B4, + ID_AK_ST_BTDCLAWSMOKEL00 = 0xA0B5, + ID_AK_SN_PIGDASSUI = 0x80B6, + ID_AK_SN_BTDDRIPMAGMA00 = 0x80B7, + ID_AK_ST_BTDSMOKE02 = 0xA0B8, + ID_AK_SN_BTDBROKENROCK00 = 0x80B9, + ID_AK_SN_FLAMETHROWER00 = 0x80BA, + ID_IT_SN_TR_HAHEN_C = 0x80BB, + ID_AK_SN_BTDSPLASHMAGMA00 = 0x80BC, + ID_AK_SN_BTDSPLASHMAGMA01 = 0x80BD, + ID_IT_SN_GETITEM_FLASH_L00 = 0x80BE, + ID_IT_SN_GETITEM_FLASH_S00 = 0x80BF, + ID_IT_SN_GETITEM_HALO00 = 0x80C0, + ID_IT_SN_GETITEM_STAR00 = 0x80C1, + ID_IT_SN_GETITEM_TSUBU00 = 0x80C2, + ID_IT_SN_GETITEM_GLOW00 = 0x80C3, + ID_AK_SN_BTDBREAKSHELLARML = 0x80C4, + ID_AK_SN_BTDBREAKSHELLARMR = 0x80C5, + ID_AK_SN_BTDBREAKSHELLHEAD = 0x80C6, + ID_AK_SN_BTDBREAKSHELLBODY = 0x80C7, + ID_AK_SN_BTDCRACKSHELL00 = 0x80C8, + ID_AK_SN_BTDCRACKSHELL01 = 0x80C9, + ID_AK_SN_BTDCRACKSHELL02 = 0x80CA, + ID_IT_SN_DEMO_HAMON_S = 0x80CB, + ID_IT_SN_DEMO_SUIMEN_A = 0x80CC, + ID_IT_SN_DEMO_SUIMEN_B = 0x80CD, + ID_IT_SN_MIZUBASHIRA2 = 0x80CE, + ID_IT_SN_MAGT_HAHEN_C = 0x80CF, + ID_AK_SN_BTDBREAKDOWNARML = 0x80D0, + ID_AK_SN_BTDBREAKDOWNARMR = 0x80D1, + ID_AK_SN_BTDBREAKDOWNBODY00 = 0x80D2, + ID_AK_SN_BTDBREAKDOWNBODY01 = 0x80D3, + ID_AK_SN_BTDBREAKDOWNBODY02 = 0x80D4, + ID_IT_SN_YOGAN_HANE00 = 0x80D5, + ID_IT_SN_TORIZOKU_HANE00 = 0x80D6, + ID_AK_SN_WARPFLOWERMAIN00 = 0x80D7, + ID_AK_SN_WARPFLOWERLIGHTCHIP00 = 0x80D8, + ID_AK_SN_WARPFLOWERFLASH00 = 0x80D9, + ID_AK_SN_WARPFLOWERFLASH01 = 0x80DA, + ID_IT_SN_TORIZOKU_HANE01 = 0x80DB, + ID_IT_SN_DEMO_SHIBUKI_A = 0x80DC, + ID_IT_SN_DEMO_SHIBUKI_B = 0x80DD, + ID_AK_SN_BTDBREAKDOWNHEAD00 = 0x80DE, + ID_IT_SN_OMAMORI_TSUBU00 = 0x80DF, + ID_IT_SN_DKTYAKUTI_HAHEN00 = 0x80E0, + ID_IT_ST_DKTYAKUTI_SMOKE00 = 0xA0E1, + ID_IT_SN_TAKARA_PAKAF_SOTO = 0x80E2, + ID_AK_SN_BTDBURNEDBOARD00 = 0x80E3, + ID_AK_SN_BTDBURNEDBOARD01 = 0x80E4, + ID_IT_SN_GETITEM_FLASH_S01 = 0x80E5, + ID_IT_SN_OMAMORI_FLASH00 = 0x80E6, + ID_IT_SN_DKTYAKUTI_HANE00 = 0x80E7, + ID_AK_SN_BODYABLAZE00 = 0x80E8, + ID_IT_SN_GBACURSOR00 = 0x80E9, + ID_AK_SN_BRIDGEROPEFIRE00 = 0x80EA, + ID_IT_SN_DOKURO00 = 0x80EB, + ID_AK_SN_KINDANHOUSHI00 = 0x80EC, + ID_AK_SN_BKMASIWAIT00 = 0x80ED, + ID_AK_SN_BKMCOREWAIT00 = 0x80EE, + ID_AK_SN_BKMCOREDAMAGE00 = 0x80EF, + ID_AK_SN_WINDLINE00 = 0x80F0, + ID_AK_SN_BKMDROPDOWNSOIL00 = 0x80F1, + ID_AK_ST_BKMDROPDOWNSMOKE00 = 0xA0F2, + ID_AK_SN_BKMOPENHOUSHI00 = 0x80F3, + ID_AK_ST_BKMOPENSMOKE00 = 0xA0F4, + ID_AK_SN_BKMCOREBLOOD00 = 0x80F5, + ID_AK_SN_BKMHAKIDASHIHOUSHI00 = 0x80F6, + ID_AK_SN_BKMHAKIDASHIHOUSHI01 = 0x80F7, + ID_AK_SN_BKMHAKIDASHISMOKE00 = 0x80F8, + ID_AK_SN_BKMLATTACKHOUSHI00 = 0x80F9, + ID_AK_SN_BKMLATTACKSOIL00 = 0x80FA, + ID_AK_ST_BKMLATTACKSMOKE00 = 0xA0FB, + ID_AK_ST_BKMLATTACKSMOKE01 = 0xA0FC, + ID_AK_ST_BKMCOREDEADSMOKE00 = 0xA0FD, + ID_AK_SN_BKMCORESIGH00 = 0x80FE, + ID_AK_SN_BKMHANAKARERU00 = 0x80FF, + ID_AK_SN_BKMCLOSEHOUSHI00 = 0x8100, + ID_AK_SN_WARPFLOWERMAIN01 = 0x8101, + ID_IT_SN_KAKOMI_FIRE_A00 = 0x8102, + ID_IT_SN_KAKOMI_FIRE_B00 = 0x8103, + ID_AK_SN_MAGMAISLAND00 = 0x8104, + ID_AK_SN_MAGMAISLAND01 = 0x8105, + ID_IT_SN_BKBABA_YODARE_APP00 = 0x8106, + ID_IT_SN_BKBABA_YODARE_WAIT00 = 0x8107, + ID_IT_SN_BKBABA_YODAPOTA00 = 0x8108, + ID_IT_SN_BKBABA_YODARE_HIT00 = 0x8109, + ID_IT_SN_BKBABA_DEAD00 = 0x810A, + ID_AK_SN_WARPLIGHTSHAFT00 = 0x810B, + ID_IT_SN_BKBABA_YODARE_MOG00 = 0x810C, + ID_AK_SN_SIRENSUIRYU00 = 0x810D, + ID_AK_SN_SIRENSUIRYU01 = 0x810E, + ID_IT_SN_RBRIDGE_FLSH00 = 0x810F, + ID_IT_ST_JMPFLOWER_SMOKE00 = 0xA110, + ID_IT_SN_KAKOMI_STEAM00 = 0x8111, + ID_IT_SN_LK_BLUR00 = 0x8112, + ID_IT_SN_AOJI_PUNPUN00 = 0x8113, + ID_IT_SN_AOJI_DONDON00 = 0x8114, + ID_AK_SN_CCTHUNDER00 = 0x8115, + ID_AK_SN_CCTHUNDER01 = 0x8116, + ID_AK_SN_CCFOOT00 = 0x8117, + ID_AK_SN_CCHEAD00 = 0x8118, + ID_IT_SN_RBRIDGE_APP00 = 0x8119, + ID_IT_SN_MJMON_HAHEN_L00 = 0x811A, + ID_IT_SN_MJMON_HAHEN_S00 = 0x811B, + ID_IT_SN_MJMON_HAMON00 = 0x811C, + ID_IT_SN_MJMON_SHIBUKI00 = 0x811D, + ID_IT_ST_MJMON_SMOKE00 = 0xA11E, + ID_IT_SN_AOJI_AKAAKA00 = 0x811F, + ID_AK_SN_HEATFLOOR00 = 0x8120, + ID_AK_SN_LASERROOT00 = 0x8121, + ID_AK_SN_BUBBLEBOOT00 = 0x8122, + ID_AK_SN_BUBBLEBLUE00 = 0x8123, + ID_AK_SN_BUBBLERED00 = 0x8124, + ID_AK_ST_AMOTHSMOKE00 = 0xA125, + ID_AK_ST_AMOTHSMOKE01 = 0xA126, + ID_AK_SN_AMOTHFLASH00 = 0x8127, + ID_AK_SN_AMOTHHAHEN00 = 0x8128, + ID_IT_SN_DK_KAMEN_HAHEN00 = 0x8129, + ID_IT_SN_DK_TSUME_HIBANA_A00 = 0x812A, + ID_IT_SN_DK_TSUME_HIBANA_B00 = 0x812B, + ID_IT_SN_DK_KUTI_ROCK00 = 0x812C, + ID_IT_SN_DK_KUTI_SENKO00 = 0x812D, + ID_IT_ST_DK_KUTI_SMOKE00 = 0xA12E, + ID_IT_ST_DK_SENPU_SMOKE00 = 0xA12F, + ID_IT_SN_DK_SENPU_HANE00 = 0x8130, + ID_IT_SN_DK_TYAKUTI_ROCK00 = 0x8131, + ID_IT_ST_DK_TYAKUTI_SMOKE00 = 0xA132, + ID_IT_SN_DK_JIDANDA_ROCK00 = 0x8133, + ID_IT_ST_DK_JIDANDA_SMOKE00 = 0xA134, + ID_IT_ST_DK_BUTSUKARI_SMOKE00 = 0xA135, + ID_IT_ST_DK_TOBITATI_SMOKE00 = 0xA136, + ID_IT_SN_DK_DMG_HANE_M00 = 0x8137, + ID_IT_SN_DK_LASTDMG_HANE_M00 = 0x8138, + ID_IT_SN_DK_LASTDMG_HANE_W00 = 0x8139, + ID_IT_SN_DK_DEAD_HANE_A00 = 0x813A, + ID_IT_SN_DK_DEAD_HANE_B00 = 0x813B, + ID_IT_SN_DK_DEMO_HANE00 = 0x813C, + ID_IT_ST_DK_BLOCK_SMOKE00 = 0xA13D, + ID_IT_SN_DK_BLOCK_S00 = 0x813E, + ID_IT_SN_DK_BLOCK_L00 = 0x813F, + ID_IT_ST_DK_POLE_SMOKE00 = 0xA140, + ID_IT_SN_DK_POLE_S00 = 0x8141, + ID_IT_SN_DK_POLE_L00 = 0x8142, + ID_IT_SN_DK_BRIDGE_L00 = 0x8143, + ID_IT_SN_DK_BRIDGE_S00 = 0x8144, + ID_IT_SN_DK_BRIDGE_TENITA00 = 0x8145, + ID_IT_ST_DK_BRIDGE_SMOKE00 = 0xA146, + ID_IT_SN_DK_DOBON_HAMON00 = 0x8147, + ID_IT_SN_DK_DOBON_HAMON01 = 0x8148, + ID_IT_SN_DK_DOBON_SHIBUKI00 = 0x8149, + ID_IT_SN_DK_DOBON_WP00 = 0x814A, + ID_AK_SN_KUTANIVESSEL = 0x814B, + ID_AK_SN_HEATFLOOR01 = 0x814C, + ID_IT_SN_MT_WATER00 = 0x814D, + ID_IT_SN_DK_FUTATOJI_ROCK00 = 0x814E, + ID_IT_ST_DK_FUTATOJI_SMOKE_A00 = 0xA14F, + ID_IT_ST_DK_FUTATOJI_SMOKE_B00 = 0xA150, + ID_IT_ST_DK_FUTATOJI_SMOKE_C00 = 0xA151, + ID_IT_SN_PF_BIKON00 = 0x8152, + ID_IT_SN_PF_BIKON01 = 0x8153, + ID_AK_ST_AMOTHSMOKE02 = 0xA154, + ID_AK_ST_AMOTHSMOKE03 = 0xA155, + ID_AK_SN_AMOTHBOMBMOUTH = 0x8156, + ID_AK_SN_AMOTHBOMBEYE = 0x8157, + ID_IT_SN_DK_DEMO_HANE01 = 0x8158, + ID_IT_SN_DK_LASTDMG_HANE_W01 = 0x8159, + ID_IT_SN_DK_LASTDMG_HANE_W02 = 0x815A, + ID_AK_SN_BUBBLECURSE00 = 0x815B, + ID_AK_SN_BMOSWAIT00 = 0x815C, + ID_AK_SN_BMOSEYE00 = 0x815D, + ID_AK_SN_BMOSBALL00 = 0x815E, + ID_AK_SN_BMOSBREAK00 = 0x815F, + ID_AK_SN_BMOSBREAK01 = 0x8160, + ID_AK_SN_WARPPOTOPEN00 = 0x8161, + ID_AK_SN_WARPPOTCLOSE00 = 0x8162, + ID_AK_SN_SIRENBUTTONOFF = 0x8163, + ID_AK_SN_SIRENBUTTONON = 0x8164, + ID_AK_SN_WARPPOTFIRE00 = 0x8165, + ID_AK_SN_WARPPOTFIRE01 = 0x8166, + ID_IT_SN_BOKKURI_HAHEN00 = 0x8167, + ID_IT_SN_BOKKURI_TANE00 = 0x8168, + ID_IT_SN_BOKKURI_TOGE00 = 0x8169, + ID_IT_SN_BOKKURI_MATSU00 = 0x816A, + ID_IT_ST_BOKKURI_SMOKE00 = 0xA16B, + ID_IT_SN_TGSYOKU_ROCK00 = 0x816C, + ID_IT_ST_TGSYOKU_SMOKE00 = 0xA16D, + ID_IT_ST_SHIREN_WL1_HAHEN00 = 0xA16E, + ID_IT_ST_SHIREN_WL1_SMOKE00 = 0xA16F, + ID_IT_ST_SHIREN_WL2_HAHEN00 = 0xA170, + ID_IT_ST_SHIREN_WL2_SMOKE00 = 0xA171, + ID_IT_ST_SHIREN_WL3_HAHEN00 = 0xA172, + ID_IT_ST_SHIREN_WL3_SMOKE00 = 0xA173, + ID_IT_SN_RSTAIRS_F00 = 0x8174, + ID_IT_SN_RSTAIRS_S00 = 0x8175, + ID_AK_SN_DRUGPOT00 = 0x8176, + ID_AK_SN_DRUGPOT01 = 0x8177, + ID_AK_SN_DRUGPOT02 = 0x8178, + ID_AK_SN_STASE00 = 0x8179, + ID_AK_SN_STBIKON00 = 0x817A, + ID_AK_SN_STRECONSTRUCT00 = 0x817B, + ID_AK_ST_STSTARTSMOKE00 = 0xA17C, + ID_AK_ST_STWALKSMOKE00 = 0xA17D, + ID_AK_SN_STPARTSDEAD00 = 0x817E, + ID_IT_SN_KANOKE_ROCK00 = 0x817F, + ID_IT_ST_KANOKE_SMOKE00 = 0xA180, + ID_IT_ST_KANOKE_SMOKE01 = 0xA181, + ID_AK_SN_JBAPPEAR00 = 0x8182, + ID_AK_SN_JBAPPEAR01 = 0x8183, + ID_IT_SN_TSURU_TAIEKI00 = 0x8184, + ID_AK_SN_WGFLASH00 = 0x8185, + ID_AK_SN_WGROCK00 = 0x8186, + ID_AK_ST_WGSMOKE00 = 0xA187, + ID_AK_SN_NZCHAKKA00 = 0x8188, + ID_IT_SN_TG_KURURINP_KAMI_M00 = 0x8189, + ID_IT_SN_TG_KURURINP_KAMI_R00 = 0x818A, + ID_IT_SN_TG_KURURINP_KAMI_L00 = 0x818B, + ID_IT_SN_TG_KURURINP_BLUR_R00 = 0x818C, + ID_IT_SN_TG_KURURINP_BLUR_G00 = 0x818D, + ID_AK_SN_SIRENKEY00 = 0x818E, + ID_AK_SN_SIRENKEY01 = 0x818F, + ID_IT_SN_POST_TSUBA00 = 0x8190, + ID_AK_SN_MINIKAZANICE00 = 0x8191, + ID_AK_SN_MINIKAZANSMOKE00 = 0x8192, + ID_AK_SN_MINIKAZANKIRA00 = 0x8193, + ID_AK_SN_MINIKAZANSTEAM00 = 0x8194, + ID_AK_SN_MINIKAZANSTEAM01 = 0x8195, + ID_AK_SN_MINIKAZANSTEAM02 = 0x8196, + ID_AK_SN_MINIKAZANSTEAM03 = 0x8197, + ID_AK_SN_MINIKAZANSTEAM04 = 0x8198, + ID_AK_SN_MINIKAZANSTEAM05 = 0x8199, + ID_AK_SN_MINIKAZANSTEAM06 = 0x819A, + ID_IT_SN_MD_HANE00 = 0x819B, + ID_IT_SN_MD_HANE01 = 0x819C, + ID_IT_SN_MD_PIYOPIYO00 = 0x819D, + ID_IT_SN_MURU_ASE00 = 0x819E, + ID_AK_SN_VANISHWALL00 = 0x819F, + ID_AK_SN_VANISHFIGURE00 = 0x81A0, + ID_AK_SN_GMJETATTACKSMOKE00 = 0x81A1, + ID_AK_SN_GMJETATTACKFIRE00 = 0x81A2, + ID_AK_SN_GMRINPUN00 = 0x81A3, + ID_AK_SN_JITEAR00 = 0x81A4, + ID_AK_SN_JITEAR01 = 0x81A5, + ID_AK_SN_KAZEBREAKFLOOR00 = 0x81A6, + ID_AK_SN_MOZFIRE00 = 0x81A7, + ID_AK_SN_MOZFIRE01 = 0x81A8, + ID_AK_SN_HIRALBARRIER00 = 0x81A9, + ID_IT_SN_ICEL_SMOKE00 = 0x81AA, + ID_IT_SN_ICEL_SMOKE01 = 0x81AB, + ID_AK_ST_MAKORETREESMOKE00 = 0xA1AC, + ID_AK_ST_AMOTH2SMOKE00 = 0xA1AD, + ID_AK_SN_AMOTH2WEAKPOINT00 = 0x81AE, + ID_AK_SN_AMOTH2WEAKPOINT01 = 0x81AF, + ID_AK_SN_AMOTH2HAHEN00 = 0x81B0, + ID_AK_SN_KAZEMASKHAHEN00 = 0x81B1, + ID_AK_SN_WOODCAGE00 = 0x81B2, + ID_IT_ST_TN_KENSMOKE00 = 0xA1B3, + ID_IT_SN_TN_YOROIHAHENL00 = 0x81B4, + ID_IT_SN_TN_YOROIHAHENS00 = 0x81B5, + ID_IT_SN_TN_MANTOKIRE00 = 0x81B6, + ID_IT_SN_HAMSW_STAR00 = 0x81B7, + ID_IT_SN_HAMSW_SYOUGEKI00 = 0x81B8, + ID_IT_SN_SWOODLEAF00 = 0x81B9, + ID_IT_SN_DEKU_HAPPA00 = 0x81BA, + ID_AK_SN_WINDUPWATER00 = 0x81BB, + ID_AK_ST_MACORETREESMOKE00 = 0xA1BC, + ID_AK_SN_CCDRUGSTORE00 = 0x81BD, + ID_AK_SN_CCDRUGSTORE01 = 0x81BE, + ID_AK_SN_BSTENERGYSHOTFLOOR00 = 0x81BF, + ID_AK_ST_BSTENERGYSHOTSMOKE00 = 0xA1C0, + ID_AK_ST_BSTENERGYSHOTSMOKE01 = 0xA1C1, + ID_AK_SN_BSTENERGYCHARGE00 = 0x81C2, + ID_AK_SN_BSTENERGYCHARGE01 = 0x81C3, + ID_AK_SN_DRPAINBIKU00 = 0x81C4, + ID_AK_SN_DRPAINABARE00 = 0x81C5, + ID_AK_SN_DRPAINHO00 = 0x81C6, + ID_AK_SN_DRSPLASHMAGMA00 = 0x81C7, + ID_AK_SN_BSTWARP00 = 0x81C8, + ID_AK_SN_BSTWARP01 = 0x81C9, + ID_AK_SN_BSTWARP02 = 0x81CA, + ID_AK_SN_BSTWARP03 = 0x81CB, + ID_AK_SN_BPGARMSMOKE00 = 0x81CC, + ID_AK_SN_BPGLEGSMOKE00 = 0x81CD, + ID_AK_SN_BPGENERGYBALL00 = 0x81CE, + ID_AK_SN_BPGENERGYBALL01 = 0x81CF, + ID_IT_SN_TYDS_LAMP00 = 0x81D0, + ID_IT_SN_TYDS_FUTTOU00 = 0x81D1, + ID_IT_SN_TYDS_SMOKEA00 = 0x81D2, + ID_IT_SN_TYDS_SMOKEB00 = 0x81D3, + ID_IT_SN_TYDS_SMOKEC00 = 0x81D4, + ID_AK_SN_O_BSTFINGERFRAGMENT00 = 0x81D5, + ID_AK_SP_BSTSHOCKWAVEH00 = 0xC1D6, + ID_AK_SP_BSTSHOCKWAVEV00 = 0xC1D7, + ID_AK_ST_BSTATTACK1HSMOKE00 = 0xA1D8, + ID_AK_ST_BSTATTACK2HSMOKE00 = 0xA1D9, + ID_AK_ST_BSTCLAPSMOKE00 = 0xA1DA, + ID_AK_ST_BSTDROPHEADSMOKE00 = 0xA1DB, + ID_AK_ST_BSTSTARTSMOKELHAND00 = 0xA1DC, + ID_AK_ST_BSTSTARTSMOKERHAND00 = 0xA1DD, + ID_AK_ST_BSTSTARTSMOKEHEAD00 = 0xA1DE, + ID_AK_ST_BSTNOSTRILSMOKEL00 = 0xA1DF, + ID_AK_ST_BSTNOSTRILSMOKER00 = 0xA1E0, + ID_AK_SN_BSTKIRAKIRAARROW00 = 0x81E1, + ID_AK_ST_BSTDROPARROWSMOKE00 = 0xA1E2, + ID_AK_SN_BSTBOMBFLASH00 = 0x81E3, + ID_AK_SN_BSTBOMBNOSTRILSMOKEL00 = 0x81E4, + ID_AK_SN_BSTBOMBNOSTRILSMOKER00 = 0x81E5, + ID_AK_SN_BSTBOMBEARSMOKEL00 = 0x81E6, + ID_AK_SN_BSTBOMBEARSMOKER00 = 0x81E7, + ID_AK_SN_BSTHALO00 = 0x81E8, + ID_AK_SN_BSTSTAGEEFFECT00 = 0x81E9, + // ID_AK_SN_BOSSWARPWIND00 = 0x81EB, + // ID_AK_SN_BOSSWARPWIND01 = 0x81EC, + // ID_AK_SN_BOSSWARPKIRAKIRA00 = 0x81ED, + ID_AK_SN_BPGBREAKENERGYBALL00 = 0x81EE, + ID_AK_SN_BPGBREAKENERGYBALL01 = 0x81EF, + ID_AK_SN_BPGSMASHENERGYBALL00 = 0x81F0, + ID_IT_SN_DO_APPSHIBUKI00 = 0x81FE, + ID_IT_SN_DO_HITA_SHIBUKIA00 = 0x81FF, + ID_IT_SN_DO_HITA_SHIBUKIB00 = 0x8200, + ID_IT_SN_DO_HITB_SHIBUKIA00 = 0x8201, + ID_IT_SN_DO_HITB_SHIBUKIB00 = 0x8202, + ID_IT_SN_DO_HITC_SHIBUKIA00 = 0x8203, + ID_IT_SN_DO_HITC_SHIBUKIB00 = 0x8204, + ID_IT_SN_DO_DOWNSHIBUKI00 = 0x8205, + ID_IT_SN_DO_SMOKE00 = 0x8206, + ID_IT_SN_DO_SUIKOMIA00 = 0x8207, + ID_IT_SN_DO_SUIKOMIB00 = 0x8208, + ID_IT_SN_DO_SUIKOMIC00 = 0x8209, + // ID_AK_SN_BOSSWARPWIND00 = 0x820A, + // ID_AK_SN_BOSSWARPWIND01 = 0x820B, + // ID_AK_SN_BOSSWARPKIRAKIRA00 = 0x820C, + ID_AK_SN_DEKULEAFAPPEAR00 = 0x820E, + ID_AK_SN_DEKULEAFSHINE00 = 0x820F, + ID_AK_SN_OQDEADSPLASH00 = 0x8210, + ID_AK_SN_OQROCKATTACK00 = 0x8211, + ID_AK_SN_OQWAITSPLASH00 = 0x8212, + ID_AK_SN_TORNADOWIND00 = 0x8213, + ID_IT_SN_MD_HANE02 = 0x8217, + ID_AK_SN_BPGCREATEDARKBALL00 = 0x8218, + ID_AK_SN_BPGCREATEDARKBALL01 = 0x8219, + ID_AK_SN_BPGDARKBALL00 = 0x821A, + ID_AK_SN_BPGDARKBALL01 = 0x821B, + ID_AK_SN_BPGTHROWDARKBALLL00 = 0x821C, + ID_AK_SN_BPGTHROWDARKBALLR00 = 0x821D, + ID_AK_SN_BPGDARKSHOT00 = 0x821E, + ID_IT_SN_KINTOUN_FT00 = 0x821F, + ID_IT_SN_KINTOUN_RT00 = 0x8220, + ID_IT_SN_O_KINDANKUSA_KEN = 0x8221, + ID_IT_SN_O_KINDANKUSA_RUN = 0x8222, + ID_AK_SN_NIYATODANCEL00 = 0x8223, + ID_AK_SN_NIYATODANCER00 = 0x8224, + ID_AK_SN_SUBDUNLIGHTSHAFT00 = 0x8225, + ID_AK_SN_MIRRORSHIELD00 = 0x8226, + ID_AK_SN_BREAKGREATROCK00 = 0x8227, + ID_AK_SN_M_BREAKGREATROCK00 = 0x8228, + ID_AK_SN_BREAKLITTLEROCK00 = 0x8229, + ID_AK_SN_M_BREAKLITTLEROCK00 = 0x822A, + ID_AK_SN_BREAKFACEROCK00 = 0x822B, + ID_AK_SN_M_BREAKFACEROCK00 = 0x822C, + ID_AK_SN_DRUGPOT03 = 0x822D, + ID_AK_SN_FALLENLEAFRUN00 = 0x822E, + ID_AK_SN_FALLENLEAFFAN00 = 0x822F, + ID_AK_ST_FALLENLEAFSMOKE00 = 0xA230, + ID_AK_SN_MAGMALIFTSPLASH00 = 0x8231, + ID_AK_SN_HITSHIELDLIGHT00 = 0x8232, + ID_AK_SN_BREAKMAJUPLATE00 = 0x8233, + ID_AK_SN_BREAKMAJUCUP00 = 0x8234, + ID_AK_SN_BREAKMAJUPOT00 = 0x8235, + ID_AK_SN_VOLCANICASHESFAN00 = 0x8236, + ID_AK_SN_VOLCANICASHESRUN00 = 0x8237, + ID_AK_SN_WIZFIRE00 = 0x8238, + ID_AK_SN_WIZFIRE01 = 0x8239, + ID_AK_SN_WIZHITFIRE00 = 0x823A, + ID_AK_SN_WIZFLOORFIRE00 = 0x823B, + ID_AK_SN_WIZFLOORFIRE01 = 0x823C, + ID_AK_SN_WIZFLOORFIRE02 = 0x823D, + ID_IT_SN_O_BWK_BODY_SUNA00 = 0x8240, + ID_IT_SN_O_BWO_BODY_SUNA00 = 0x8241, + ID_AK_SN_BPGEXPLODEDARKBALL00 = 0x8242, + ID_AK_SN_BPGEXPLODEDARKBALL01 = 0x8243, + ID_AK_SN_BPGSMASHDARKSHOT00 = 0x8244, + ID_AK_SN_BPGHITDARKSHOT00 = 0x8245, + ID_AK_SN_BPGHITDARKSHOT01 = 0x8246, + ID_IT_ST_BWK_IDOU_MOKO00 = 0xA247, + ID_IT_ST_BWK_IDOU_SUNA00 = 0xA248, + ID_IT_SN_BWK_OUT_SUNA00 = 0x8249, + ID_IT_ST_BWK_OUT_SMOKE00 = 0xA24A, + ID_IT_SN_BWK_DIVE_SUNA00 = 0x824B, + ID_IT_ST_BWK_DIVE_SMOKE00 = 0xA24C, + ID_IT_SN_BWO_KAODASHI_SUNA00 = 0x824D, + ID_IT_SN_BWO_ATTACK_SUNA00 = 0x824E, + ID_IT_ST_BWO_PAKU_SMOKE00 = 0xA24F, + ID_IT_SN_BWO_PAKUAFTER_SUNA00 = 0x8250, + ID_IT_ST_BWO_PAKUAFTER_SMOKE00 = 0xA251, + ID_IT_SN_BWO_HIT_TAIEKI00 = 0x8252, + ID_IT_SN_BWO_HIT_SUNA00 = 0x8253, + ID_IT_SN_BWO_HITAFTER_HAKISUNA00 = 0x8254, + ID_IT_SN_BWO_HITAFTER_SUNA00 = 0x8255, + ID_IT_ST_BWO_HITAFTER_SMOKE00 = 0xA256, + ID_IT_SN_BWO_OUT_SUNA00 = 0x8257, + ID_IT_ST_BWO_OUT_SMOKE00 = 0xA258, + ID_IT_SN_BWO_DIVE_SUNA00 = 0x8259, + ID_IT_ST_BWO_DIVE_SMOKE00 = 0xA25A, + ID_IT_SN_BWK_SIBOUFLASH00 = 0x825B, + ID_IT_SN_BWK_SIBOUBAKUEN00 = 0x825C, + ID_IT_SN_BWO_SIBOUBAKUEN00 = 0x825D, + ID_IT_SN_BWO_SIBOUSUNA00 = 0x825E, + ID_IT_SN_LK_FKSHOT_SUNA00 = 0x825F, + ID_IT_ST_BW_SUNATAKI_SMOKEA = 0xA260, + ID_IT_ST_BW_SUNATAKI_SMOKEB = 0xA261, + ID_IT_ST_BW_SUNATAKI_SMOKEC = 0xA262, + ID_IT_ST_BW_TRYFDOWN_SMOKE00 = 0xA263, + ID_IT_SN_BW_TRYFDOWN_SUNA00 = 0x8264, + ID_IT_SN_BWO_LASTHIT_SUNA00 = 0x8265, + ID_IT_SN_BWO_LASTHIT_TAIEKI00 = 0x8266, + ID_IT_ST_BWO_LASTHIT_SMOKE00 = 0xA267, + ID_AK_SN_FALLENLEAFFIRE00 = 0x8268, + ID_AK_SN_FALLENLEAFFIRE01 = 0x8269, + ID_AK_SN_FALLENLEAFBOMB00 = 0x826A, + ID_AK_SN_BPGVANISHSMOKE00 = 0x826B, + ID_AK_SN_MACOREMUSIC00 = 0x826C, + ID_AK_SN_OTOMOBASELIGHT00 = 0x826D, + ID_AK_SN_OTOMOBEAM00 = 0x826E, + ID_AK_SN_OTOMOBEAM01 = 0x826F, + ID_AK_SN_OTOMOSEKIHILIGHT00 = 0x8270, + ID_AK_SN_OTOMOSEKIHILIGHT01 = 0x8271, + ID_IT_SN_BM_HANEL_FLYAWAY00 = 0x8275, + ID_IT_SN_BM_HANEL_LAND00 = 0x8276, + ID_IT_SN_MD_HANE03 = 0x827D, + ID_IT_SN_LK_FREEZSMOKE00 = 0x827E, + ID_IT_SN_LK_FREEZKIRA00 = 0x827F, + ID_AK_SN_WIZSUMMONSHOT00 = 0x8280, + ID_AK_SN_WIZSUMMONSHOT01 = 0x8281, + ID_AK_SN_WIZHITSUMMON00 = 0x8282, + ID_AK_SN_WIZSUMMONWIND00 = 0x8283, + ID_AK_SN_WIZSUMMONSMOKE00 = 0x8284, + ID_AK_SN_PIGGAS00 = 0x8286, + ID_AK_SN_WIZROD00 = 0x8287, + ID_AK_SN_WIZCASTMAGIC00 = 0x8288, + ID_AK_SN_WIZCASTMAGIC01 = 0x8289, + // ID_AK_SN_AUCTIONSMOKE00 = 0x828A, + // ID_AK_SN_AUCTIONSMOKE00 = 0x828B, + ID_AK_SN_FFSPLASH00 = 0x828C, + ID_AK_SN_FFHAMON00 = 0x828D, + ID_AK_SN_BIRDSTATUEHAHEN00 = 0x828E, + ID_AK_SN_BIRDSTATUESPLASH00 = 0x828F, + ID_AK_SN_AIRFLOWSPLASH00 = 0x8290, + ID_IT_SN_HRWARPA00 = 0x8291, + ID_IT_SN_HRWARPB00 = 0x8292, + ID_AK_SN_SASORIMIRROR00 = 0x8294, + ID_AK_SN_RYUDANMAESPLASH00 = 0x8295, + ID_AK_SN_RYUDANMAESPLASH01 = 0x8296, + ID_AK_SN_RYUDANMAESTEAM00 = 0x8297, + ID_AK_SN_RYUDANMAEHAMON00 = 0x8298, + ID_AK_SN_KOKIRIHOUSEHAHEN00 = 0x82A2, + ID_AK_ST_KOKIRIHOUSESMOKE00 = 0xA2A3, + ID_AK_SN_KOKIRIHOUSESPLASH00 = 0x82A4, + ID_AK_SN_KOKIRIHOUSESPLASH01 = 0x82A5, + ID_AK_SN_KOKIRIHOUSEHAMON00 = 0x82A6, + ID_AK_SN_KOKIRIHOUSEHAMON01 = 0x82A7, + ID_AK_SN_CCSPLIT00 = 0x82A8, + ID_AK_SN_CCBREAKHAHEN00 = 0x82A9, + ID_IT_SN_DEKLIFT_HAMONA00 = 0x82AA, + ID_IT_SN_DEKLIFT_HAMONB00 = 0x82AB, + ID_IT_SN_DEKLIFT_MIZUPOTA00 = 0x82AC, + ID_IT_SN_DEKLIFT_NUREATO00 = 0x82AD, + ID_IT_SN_TAKIURA_POTAA00 = 0x82AE, + ID_IT_SN_TAKIURA_POTAB00 = 0x82AF, + ID_IT_SN_TAKIURA_HAMON00 = 0x82B0, + ID_AK_SN_BREAKRDMROCK00 = 0x82B1, + ID_AK_SN_M_BREAKRDMROCK00 = 0x82B2, + ID_AK_SN_FOUNTAINFIGURE00 = 0x82B3, + ID_AK_SN_FOUNTAINFIGURE01 = 0x82B4, + ID_AK_SN_FOUNTAINFIGURE02 = 0x82B5, + ID_AK_SN_SWORDROOMFIRE00 = 0x82B6, + ID_AK_SN_SWORDROOMFIRE01 = 0x82B7, + ID_AK_SN_SWORDROOMFIRE02 = 0x82B8, + ID_IT_SP_DEMO20_INDWP00 = 0xC2B9, + ID_AK_SN_SIRENWATERGATE00 = 0x82BA, + ID_AK_SN_SIRENWATERGATE01 = 0x82BB, + ID_IT_SN_DEMO20_WPSENKO00 = 0x82BC, + ID_IT_SN_DEMO20_WPGLOW00 = 0x82BD, + ID_IT_SN_DEMO20_SENKO00 = 0x82BE, + ID_IT_SN_DEMO20_AWAA00 = 0x82BF, + ID_IT_SN_DEMO20_AWAB00 = 0x82C0, + ID_IT_SN_DEMO20_AWAC00 = 0x82C1, + ID_AK_ST_WINDOCTOPUS00 = 0xA2C2, + ID_AK_ST_WINDOCTOPUS01 = 0xA2C3, + ID_AK_SN_HANASAKAFLASH00 = 0x82C4, + ID_AK_SN_HANASAKAFLASH01 = 0x82C5, + ID_IT_SN_FLOWER_OF00 = 0x82C6, + ID_IT_SN_FLOWER_OL00 = 0x82C7, + ID_AK_SN_BPWFIREJOINT3 = 0x82C8, + ID_AK_SN_BPWFIREJOINT4 = 0x82C9, + ID_AK_SN_BPWFIREJOINT5 = 0x82CA, + ID_IT_ST_DEMO06_TRSMOKE00 = 0xA2CB, + ID_IT_SN_DO_HAKIDASHI00 = 0x82CC, + ID_AK_SN_BPWINHALE00 = 0x82CD, + ID_AK_SN_BPWINHALE01 = 0x82CE, + ID_AK_SN_BPWBLOW00 = 0x82CF, + ID_AK_ST_BPWBLOWSMOKE00 = 0xA2D0, + ID_AK_SN_BPWFIRE00 = 0x82D1, + ID_AK_SN_BPWFIRE01 = 0x82D2, + ID_AK_SN_BPWHITFIRE00 = 0x82D3, + ID_AK_SN_BPWFLOORFIRE00 = 0x82D4, + ID_AK_SN_BPWFLOORFIRE01 = 0x82D5, + ID_AK_SN_BPWFLOORFIRE02 = 0x82D6, + ID_IT_SN_FN_SHIBUKI00 = 0x82D7, + ID_IT_SN_FN_SHIBUKI01 = 0x82D8, + ID_AK_SN_GANONROOMFIRE00 = 0x82D9, + ID_AK_SN_GANONROOMFIRE01 = 0x82DA, + ID_AK_SN_GANONROOMFIRE02 = 0x82DB, + ID_AK_SN_GANONROOMSMOKE00 = 0x82DC, + ID_AK_SN_SIRENBREAKSHAFTHAHEN00 = 0x82DD, + ID_AK_SN_SIRENBREAKSHAFTHAHEN01 = 0x82DE, + ID_AK_SN_SIRENBREAKSHAFTHIT00 = 0x82DF, + ID_AK_ST_SIRENBREAKSHAFTSMOKE00 = 0xA2E0, + ID_IT_SN_MJTAIHOU_HAHEN00 = 0x82E4, + ID_IT_SN_MJTAIHOU_SMOKE00 = 0x82E5, + ID_IT_SN_MJTAIHOU_SENKO00 = 0x82E6, + ID_AK_ST_LIFTROCKSMOKE00 = 0xA2E8, + ID_IT_SN_MJTAIHOU_SMOKE01 = 0x82E9, + ID_AK_SN_TNTRAPBALL00 = 0x82EA, + ID_AK_SN_TNTRAPTHUNDER00 = 0x82EB, + ID_AK_SN_BREAKOCTOPUSHAHEN00 = 0x82EC, + ID_AK_ST_BREAKOCTOPUSSMOKE00 = 0xA2ED, + ID_AK_SN_POUGETLAMP00 = 0x82EE, + ID_AK_SN_WINDCHEST00 = 0x82F0, + ID_AK_SN_WINDCHEST01 = 0x82F1, + ID_IT_SN_DEMO19_PEARLGLOWD00 = 0x82F2, + ID_IT_SN_DEMO19_PEARLGLOWD01 = 0x82F3, + ID_IT_SN_DEMO19_PEARLGLOWF00 = 0x82F4, + ID_IT_SN_DEMO19_PEARLGLOWF01 = 0x82F5, + ID_IT_SN_DEMO19_PEARLGLOWN00 = 0x82F6, + ID_IT_SN_DEMO19_PEARLGLOWN01 = 0x82F7, + ID_IT_SN_DEMO19_PEARLFLASHD00 = 0x82F8, + ID_IT_SN_DEMO19_PEARLFLASHD01 = 0x82F9, + ID_IT_SN_DEMO19_PEARLFLASHF00 = 0x82FA, + ID_IT_SN_DEMO19_PEARLFLASHF01 = 0x82FB, + ID_IT_SN_DEMO19_PEARLFLASHN00 = 0x82FC, + ID_IT_SN_DEMO19_PEARLFLASHN01 = 0x82FD, + ID_IT_SN_DEMO19_PEARLHALO00 = 0x82FE, + ID_IT_SN_DEMO19_BEAMD00 = 0x82FF, + ID_IT_SN_DEMO19_BEAMF00 = 0x8300, + ID_IT_SN_DEMO19_BEAMN00 = 0x8301, + ID_IT_SN_DEMO19_DOGUFLASH00 = 0x8302, + ID_IT_SN_DEMO19_DOGUSMOKE00_JOA = 0x8303, + ID_IT_SN_DEMO19_DOGUHAHEN00 = 0x8304, + ID_IT_SN_DEMO19_DOGUSENKO00 = 0x8305, + ID_AK_SN_O_GHOSTSHIPFIRE00 = 0x8306, + ID_AK_ST_PIGDIGSMOKE00 = 0xA307, + ID_IT_SN_DEMO19_DOGUSMOKE00 = 0x8308, + ID_AK_SN_PERAPROOPEN00 = 0x830B, + ID_IT_SN_KO_HANAPACHIA = 0x830C, + ID_IT_SN_KO_HANABACHIB = 0x830D, + ID_AK_SN_DEMOWARPWIND00 = 0x830E, + ID_AK_SN_DEMOWARPWIND01 = 0x830F, + ID_AK_SN_BPWFLAMETHROWER00 = 0x8310, + ID_AK_SN_BPWFLAMETHROWER01 = 0x8311, + ID_AK_SN_BPWFLAMETHROWER02 = 0x8312, + ID_IT_SN_KO_HANAPACHIB = 0x8313, + ID_AK_SN_PIRATESHIPTAIL00 = 0x8315, + ID_AK_SN_GANONCASTLEWARP00 = 0x8316, + ID_IT_SN_DEMO19_HIKARIA = 0x8317, + ID_IT_SN_DEMO19_HIKARIB = 0x8318, + ID_IT_SN_DEMO19_HIKARIC = 0x8319, + ID_IT_SN_DEMO19_RAKUSUIA = 0x831A, + ID_IT_SN_DEMO19_RAKUSUIB = 0x831B, + ID_IT_SN_DEMO19_RAKUSUIC = 0x831C, + ID_IT_SN_DEMO19_RAKUSUID = 0x831D, + ID_IT_SN_DEMO19_RAKUSUIE = 0x831E, + ID_IT_SN_DEMO19_SHIBUKI00 = 0x831F, + ID_AK_ST_TRIFORCEBLOCKSMOKE00 = 0xA320, + ID_IT_SN_DEMO21_MSDZSENKOA = 0x8321, + ID_IT_SN_DEMO21_MSDZSENKOB = 0x8322, + ID_IT_SN_DEMO21_SHINE00 = 0x8323, + ID_IT_SN_DEMO21_HALO00 = 0x8324, + ID_AK_SN_ICETHAW00 = 0x8325, + ID_IT_SN_DEMO15_DEKUSEED00 = 0x8326, + ID_AK_SN_BREAKHIRALBARRIER00 = 0x8327, + ID_AK_ST_OTOMOSMOKE00 = 0xA328, + ID_AK_ST_TAPESTRYSMOKE00 = 0xA329, + ID_AK_SP_GNDAATTACK3BLURL00 = 0xC32B, + ID_AK_SP_GNDAATTACK3BLURR00 = 0xC32C, + ID_AK_SN_GNDAATTACK3HANDSPLASHL00 = 0x832D, + ID_AK_SN_GNDAATTACK3HANDSPLASHR00 = 0x832E, + ID_AK_SN_GNDAATTACK3FOOTSPLASHL00 = 0x832F, + ID_AK_SN_GNDAATTACK3FOOTSPLASHR00 = 0x8330, + ID_IT_SN_DEMO25_TFAPPA = 0x8331, + ID_IT_SN_DEMO25_TFAPPB = 0x8332, + ID_IT_SN_DEMO25_TFAPPC = 0x8333, + ID_IT_SN_DEMO25_TFSENKOA = 0x8334, + ID_IT_SN_PUCHI_SHIBOUA = 0x8335, + ID_IT_SN_PUCHI_SHIBOUB = 0x8336, + ID_IT_SN_PUCHI_SHIBOUC = 0x8337, + ID_IT_SN_DEMO25_PZHANDFLASHA = 0x8338, + ID_IT_SN_DEMO25_PZHANDFLASHB = 0x8339, + ID_AK_SN_TRIFORCEBLOCKFLASH00 = 0x833A, + ID_AK_ST_OTOMOSMOKE01 = 0xA33B, + ID_AK_SN_GNDLANDINGSPLASH00 = 0x833C, + ID_AK_SN_PIRATESHIPSPLASH00 = 0x833D, + ID_AK_SN_BOSSDOORHAHEN00 = 0x833E, + ID_AK_SN_BOSSDOORHAHEN01 = 0x833F, + ID_AK_SN_BOSSDOORHAHEN02 = 0x8340, + ID_AK_SN_BOSSDOORDOKURO00 = 0x8341, + ID_AK_SN_BOSSDOORDOKURO01 = 0x8342, + ID_AK_SN_BOSSDOORDOKURO02 = 0x8343, + ID_AK_ST_BOSSDOORSMOKE00 = 0xA344, + ID_AK_SN_ICEHAHEN00 = 0x8345, + ID_AK_SN_BIGFAIRYWAIT00 = 0x8346, + ID_AK_SN_BIGFAIRYTYPE1APP00 = 0x8347, + ID_AK_SN_BIGFAIRYTYPE1APP01 = 0x8348, + ID_AK_SN_BIGFAIRYTYPE2APP00 = 0x8349, + ID_AK_SN_BIGFAIRYTYPE2APP01 = 0x834A, + ID_AK_SN_BIGFAIRYTYPE3APP00 = 0x834B, + ID_AK_SN_BIGFAIRYTYPE3APP01 = 0x834C, + ID_AK_SN_BIGFAIRYTYPE4APP00 = 0x834D, + ID_AK_SN_BIGFAIRYTYPE4APP01 = 0x834E, + ID_AK_SN_BIGFAIRYTYPE1FLOWER00 = 0x834F, + ID_AK_SN_BIGFAIRYTYPE1FLOWER01 = 0x8350, + ID_AK_SN_BIGFAIRYTYPE2FLOWER00 = 0x8351, + ID_AK_SN_BIGFAIRYTYPE2FLOWER01 = 0x8352, + ID_AK_SN_BIGFAIRYTYPE3FLOWER00 = 0x8353, + ID_AK_SN_BIGFAIRYTYPE3FLOWER01 = 0x8354, + ID_AK_SN_BIGFAIRYTYPE4FLOWER00 = 0x8355, + ID_AK_SN_BIGFAIRYTYPE4FLOWER01 = 0x8356, + ID_AK_SN_GANONFALLSSPLASH00 = 0x835B, + ID_AK_SP_GNDAATTACK1BLURL00 = 0xC35D, + ID_AK_SP_GNDAATTACK1BLURR00 = 0xC35E, + ID_AK_SP_GNDAATTACK2BLURL00 = 0xC35F, + ID_AK_SP_GNDAATTACK2BLURR00 = 0xC360, + ID_AK_SP_GNDBATTACK1BLURL00 = 0xC361, + ID_AK_SP_GNDBATTACK1BLURR00 = 0xC362, + ID_AK_SP_GNDBATTACK2BLURL00 = 0xC363, + ID_AK_SP_GNDBATTACK2BLURR00 = 0xC364, + ID_AK_SP_GNDBATTACK3TBLURL00 = 0xC365, + ID_AK_SP_GNDBATTACK3TBLURR00 = 0xC366, + ID_AK_SP_GNDBATTACK3ABLURL00 = 0xC367, + ID_AK_SP_GNDBATTACK3ABLURR00 = 0xC368, + ID_AK_SP_GNDBATTACK3EBLURL00 = 0xC369, + ID_AK_SP_GNDBATTACK3EBLURR00 = 0xC36A, + ID_AK_SP_GNDJATTACKTBLURL00 = 0xC36B, + ID_AK_SP_GNDJATTACKTBLURR00 = 0xC36C, + ID_AK_SP_GNDJATTACKJBLURL00 = 0xC36D, + ID_AK_SP_GNDJATTACKJBLURR00 = 0xC36E, + ID_AK_SP_GNDJATTACKABLURL00 = 0xC36F, + ID_AK_SP_GNDJATTACKABLURR00 = 0xC370, + ID_AK_SP_GNDJATTACKEBLURL00 = 0xC371, + ID_AK_SP_GNDJATTACKEBLURR00 = 0xC372, + ID_AK_SP_GNDNATTACK1BLURL00 = 0xC373, + ID_AK_SP_GNDNATTACK1BLURR00 = 0xC374, + ID_AK_SP_GNDNATTACK2BLURL00 = 0xC375, + ID_AK_SP_GNDNATTACK2BLURR00 = 0xC376, + ID_AK_SP_GNDCOUNTERLBLURL00 = 0xC377, + ID_AK_SP_GNDCOUNTERLBLURR00 = 0xC378, + ID_AK_SP_GNDCOUNTERRBLURL00 = 0xC379, + ID_AK_SP_GNDCOUNTERRBLURR00 = 0xC37A, + ID_AK_SP_GNDLASTBLURL00 = 0xC37B, + ID_AK_SP_GNDLASTBLURR00 = 0xC37C, + ID_AK_SN_PZSHAKEHEADSPLASH00 = 0x837D, + ID_AK_SN_GNDBINTASPLASH00 = 0x837E, + ID_AK_SN_GNDHITOK00 = 0x837F, + ID_AK_SN_GNDHITNG00 = 0x8380, + ID_AK_SN_GNDASPECIALHIT00 = 0x8381, + ID_AK_SN_GNDLIGHTARROW00 = 0x8382, + ID_AK_SN_GNDLIGHTARROW01 = 0x8383, + ID_AK_SN_GNDFINISHOFF00 = 0x8384, + ID_AK_SN_GNDFINISHOFF01 = 0x8385, + ID_AK_SN_GNDAATTACK1HANDSPLASHL00 = 0x8386, + ID_AK_SN_GNDAATTACK1HANDSPLASHR00 = 0x8387, + ID_AK_SN_GNDAATTACK1FOOTSPLASHL00 = 0x8388, + ID_AK_SN_GNDAATTACK1FOOTSPLASHR00 = 0x8389, + ID_AK_SN_GNDAATTACK2HANDSPLASHL00 = 0x838A, + ID_AK_SN_GNDAATTACK2HANDSPLASHR00 = 0x838B, + ID_AK_SN_GNDAATTACK2FOOTSPLASHL00 = 0x838C, + ID_AK_SN_GNDAATTACK2FOOTSPLASHR00 = 0x838D, + ID_AK_SN_GNDBATTACK1HANDSPLASHL00 = 0x838E, + ID_AK_SN_GNDBATTACK1HANDSPLASHR00 = 0x838F, + ID_AK_SN_GNDBATTACK1FOOTSPLASHL00 = 0x8390, + ID_AK_SN_GNDBATTACK1FOOTSPLASHR00 = 0x8391, + ID_AK_SN_GNDBATTACK2HANDSPLASHL00 = 0x8392, + ID_AK_SN_GNDBATTACK2HANDSPLASHR00 = 0x8393, + ID_AK_SN_GNDBATTACK2FOOTSPLASHL00 = 0x8394, + ID_AK_SN_GNDBATTACK2FOOTSPLASHR00 = 0x8395, + // ID_AK_SN_GNDBATTACK3THANDSPLASH = 0x8396, + // ID_AK_SN_GNDBATTACK3THANDSPLASH = 0x8397, + // ID_AK_SN_GNDBATTACK3TFOOTSPLASH = 0x8398, + // ID_AK_SN_GNDBATTACK3TFOOTSPLASH = 0x8399, + // ID_AK_SN_GNDBATTACK3AHANDSPLASH = 0x839A, + // ID_AK_SN_GNDBATTACK3AHANDSPLASH = 0x839B, + // ID_AK_SN_GNDBATTACK3AFOOTSPLASH = 0x839C, + // ID_AK_SN_GNDBATTACK3AFOOTSPLASH = 0x839D, + // ID_AK_SN_GNDBATTACK3EHANDSPLASH = 0x839E, + // ID_AK_SN_GNDBATTACK3EHANDSPLASH = 0x839F, + // ID_AK_SN_GNDBATTACK3EFOOTSPLASH = 0x83A0, + // ID_AK_SN_GNDBATTACK3EFOOTSPLASH = 0x83A1, + ID_AK_SN_GNDJATTACKTHANDSPLASHL00 = 0x83A2, + ID_AK_SN_GNDJATTACKTHANDSPLASHR00 = 0x83A3, + ID_AK_SN_GNDJATTACKTFOOTSPLASHL00 = 0x83A4, + ID_AK_SN_GNDJATTACKTFOOTSPLASHR00 = 0x83A5, + ID_AK_SN_GNDJATTACKJHANDSPLASHL00 = 0x83A6, + ID_AK_SN_GNDJATTACKJHANDSPLASHR00 = 0x83A7, + ID_AK_SN_GNDJATTACKJFOOTSPLASHL00 = 0x83A8, + ID_AK_SN_GNDJATTACKJFOOTSPLASHR00 = 0x83A9, + ID_AK_SN_GNDJATTACKAHANDSPLASHL00 = 0x83AA, + ID_AK_SN_GNDJATTACKAHANDSPLASHR00 = 0x83AB, + ID_AK_SN_GNDJATTACKAFOOTSPLASHL00 = 0x83AC, + ID_AK_SN_GNDJATTACKAFOOTSPLASHR00 = 0x83AD, + ID_AK_SN_GNDJATTACKEHANDSPLASHL00 = 0x83AE, + ID_AK_SN_GNDJATTACKEHANDSPLASHR00 = 0x83AF, + ID_AK_SN_GNDJATTACKEFOOTSPLASHL00 = 0x83B0, + ID_AK_SN_GNDJATTACKEFOOTSPLASHR00 = 0x83B1, + ID_AK_SN_GNDNATTACK1HANDSPLASHL00 = 0x83B2, + ID_AK_SN_GNDNATTACK1HANDSPLASHR00 = 0x83B3, + ID_AK_SN_GNDNATTACK1FOOTSPLASHL00 = 0x83B4, + ID_AK_SN_GNDNATTACK1FOOTSPLASHR00 = 0x83B5, + ID_AK_SN_GNDNATTACK2HANDSPLASHL00 = 0x83B6, + ID_AK_SN_GNDNATTACK2HANDSPLASHR00 = 0x83B7, + ID_AK_SN_GNDNATTACK2FOOTSPLASHL00 = 0x83B8, + ID_AK_SN_GNDNATTACK2FOOTSPLASHR00 = 0x83B9, + ID_AK_SN_GNDCOUNTERLHANDSPLASHL00 = 0x83BA, + ID_AK_SN_GNDCOUNTERLHANDSPLASHR00 = 0x83BB, + ID_AK_SN_GNDCOUNTERLFOOTSPLASHL00 = 0x83BC, + ID_AK_SN_GNDCOUNTERLFOOTSPLASHR00 = 0x83BD, + ID_AK_SN_GNDCOUNTERRHANDSPLASHL00 = 0x83BE, + ID_AK_SN_GNDCOUNTERRHANDSPLASHR00 = 0x83BF, + ID_AK_SN_GNDCOUNTERRFOOTSPLASHL00 = 0x83C0, + ID_AK_SN_GNDCOUNTERRFOOTSPLASHR00 = 0x83C1, + ID_AK_SN_GNDLASTHANDSPLASHL00 = 0x83C2, + ID_AK_SN_GNDLASTHANDSPLASHR00 = 0x83C3, + ID_AK_SN_GNDLASTFOOTSPLASHL00 = 0x83C4, + ID_AK_SN_GNDLASTFOOTSPLASHR00 = 0x83C5, + ID_IT_SN_DEMO26_SFAPP00 = 0x83C6, + ID_IT_SN_DEMO26_SFAPP01 = 0x83C7, + ID_IT_SN_DEMO26_SFAPP02 = 0x83C8, + ID_IT_SN_DEMO26_FR00 = 0x83C9, + ID_IT_SN_DEMO26_FB00 = 0x83CA, + ID_IT_SN_DEMO26_FATTACKR00 = 0x83CB, + ID_IT_SN_DEMO26_FATTACKB00 = 0x83CC, + ID_AK_SN_GANONDOORSMOKE00 = 0x83CD, + ID_AK_SN_GANONDOORFLASH00 = 0x83CE, + ID_AK_SN_GANONDOORFLASH01 = 0x83CF, + ID_AK_SN_GANONDOORFLASH02 = 0x83D0, + ID_AK_SN_GANONDOORFLASH03 = 0x83D1, + ID_AK_SN_GANONDOORFLASH04 = 0x83D2, + ID_AK_SN_GANONDOORFLASH05 = 0x83D3, + ID_AK_SN_GANONDOORFLASH06 = 0x83D4, + ID_AK_SN_GANONDOORFLASH07 = 0x83D5, + ID_AK_SN_GANONDOORFLASH08 = 0x83D6, + ID_AK_SN_GANONDOORFLASH09 = 0x83D7, + ID_IT_SN_DEMO20_WPGLOW01 = 0x83D8, + ID_AK_SN_GNDKICKSPLASH00 = 0x83D9, + ID_AK_S1_TITLESMOKE00 = 0x83F9, + ID_AK_S1_TITLEWIND00 = 0x83FA, + ID_AK_S2_TITLEKIRAKIRA00 = 0x83FB, + ID_IT_SP_MJWPC00 = 0xC3FC, + ID_IT_SN_MJWPA00 = 0x83FD, + ID_IT_SN_MJWPB00 = 0x83FE, + ID_AK_SN_BPWLIGHTARROW00 = 0x83FF, + ID_AK_SN_BPWLIGHTARROW01 = 0x8400, + ID_AK_ST_BPWJUMPSMOKE00 = 0xA401, + ID_AK_ST_BPWPRESSSMOKE00 = 0xA402, + ID_AK_ST_BPWPRESSSMOKE01 = 0xA403, + ID_AK_ST_BPWSIRIMOTISMOKE00 = 0xA404, + ID_AK_SN_BPGLIGHTARROW00 = 0x8405, + ID_AK_SN_BPGLIGHTARROW01 = 0x8406, + ID_AK_SN_O_KGTCOMMONHAMON00 = 0x8407, + ID_AK_SN_O_KGTCOMMONHAMON01 = 0x8408, + ID_AK_SN_O_KGTCOMMONHAMON02 = 0x8409, + ID_AK_SN_O_KGTCOMMONMIZUHANE00 = 0x840A, + ID_AK_SN_O_KGTCOMMONPOTA00 = 0x840B, + ID_AK_SN_O_KGTCOMMONPOTA01 = 0x840C, + ID_AK_SN_O_KGTCOMMONSPLASH00 = 0x840D, + ID_AK_SN_O_KGTCOMMONSPLASH01 = 0x840E, + ID_AK_SN_O_KGTT2JUMPHANDSPLASH00 = 0x840F, + ID_AK_ST_O_KGTT2JUMPHANDSMOKE00 = 0xA410, + ID_AK_SN_JBLEAVE00 = 0x8411, + ID_AK_SN_JBLEAVE01 = 0x8412, + ID_AK_ST_KGTCOMMONSMOKE00 = 0xA413, + ID_AK_SN_KGTT1PUNCHSPLASH00 = 0x8414, + ID_AK_SN_KGTT1PUNCHSPLASH01 = 0x8415, + ID_AK_SN_KGTT1PUNCHHAMON00 = 0x8416, + ID_AK_SN_KGTT1PUNCHHAHEN00 = 0x8417, + ID_AK_ST_KGTT1PUNCHSMOKE00 = 0xA418, + ID_AK_SN_KGTT2CHESTPOTA00 = 0x8419, + ID_AK_SN_KGTT2STOMACHPOTA00 = 0x841A, + ID_AK_SN_KGTT2CHESTSPLASH00 = 0x841B, + ID_AK_SN_KGTT2STOMACHSPLASH00 = 0x841C, + ID_IT_SN_SHINDENTF_LIGHT00 = 0x841D, + ID_IT_SN_SHINDENTF_STAR00 = 0x841E, + ID_IT_SN_DEMO27_RAPP01 = 0x841F, + ID_IT_SN_DEMO27_RAPP02 = 0x8420, + ID_IT_SN_DEMO27_RAPP03 = 0x8421, + ID_IT_SN_DEMO27_RAPP04 = 0x8422, + ID_IT_SN_DEMO29_STAR00 = 0x8423, + ID_IT_SN_DEMO29_MSVUPA = 0x8424, + ID_IT_SN_DEMO29_MSVUPB = 0x8425, + ID_AK_SN_JBROCKGATE00 = 0x8426, + ID_AK_SN_JBROCKGATE01 = 0x8427, + ID_AK_SN_KIRA00 = 0x8428, + ID_IT_SN_DEMO26_DOLLVANISH00 = 0x842A, + ID_IT_SN_DEMO_KOUSEKI00 = 0x842B, + ID_AK_SN_LKLASTPOTA00 = 0x842C, + ID_AK_SN_GANONNIAGARASPLASH00 = 0x842D, + ID_AK_SN_GANONNIAGARASPLASH01 = 0x842E, + ID_AK_SN_GANONNIAGARASPLASH02 = 0x842F, + ID_IT_SN_DEMO28_MDNAMIDA00 = 0x8430, + ID_IT_SN_DEMO_KOUSEKI01 = 0x8431, + ID_AK_SN_GNDLASTCRYSTAL00 = 0x8433, + ID_IT_SN_SINJYU_GLOWD00 = 0x8434, + ID_IT_SN_SINJYU_GLOWN00 = 0x8435, + ID_IT_SN_SINJYU_GLOWF00 = 0x8436, + ID_AK_SN_O_KGTCOMMONHAMON03 = 0x8443, + ID_AK_SN_BPWBUNRETUSMOKE00 = 0x8444, + ID_AK_SN_BPWBUNRETUSMOKE01 = 0x8445, + ID_IT_SN_DEMO36_BOTAMIZU00 = 0x8446, + ID_IT_SN_DEMO36_AWA00 = 0x8447, + ID_IT_SN_DEMO36_TFPA = 0x8448, + ID_IT_SN_DEMO36_TFPB = 0x8449, + ID_IT_SN_DEMO36_TFPC = 0x844A, + ID_IT_SN_DEMO36_TFPFLYA = 0x844B, + ID_IT_SN_DEMO36_TFPFLYB = 0x844C, + ID_IT_SN_DEMO36_TFCA = 0x844D, + ID_IT_SN_DEMO36_TFCB = 0x844E, + ID_IT_SN_DEMO36_TFCC = 0x844F, + ID_IT_SN_DEMO36_TFCD = 0x8450, + ID_IT_SN_DEMO36_TFCE = 0x8451, + ID_IT_SN_DEMO_FAGET00 = 0x8452, + ID_AK_SN_JBROCKGATEHAMON00 = 0x8454, + ID_AK_SN_BPWBREAKMASK00 = 0x8456, + ID_AK_SN_KGTBREAKWEAKPOINT00 = 0x8457, + ID_AK_SN_KGTBREAKWEAKPOINT01 = 0x8458, + ID_AK_SN_KGTHITWEAKPOINT00 = 0x8459, + ID_AK_SN_BPWOPENINGSMOKE00 = 0x845A, + ID_IT_SN_DEMO_KOUSEKI02 = 0x8466, + ID_IT_SN_DEMO20_AWAD00 = 0x846A, + ID_IT_SN_DEMO20_AWAE00 = 0x846B, + ID_IT_SN_DEMO20_AWAF00 = 0x846C, + ID_AK_SN_DEMOGANONFIRE00 = 0x846D, + ID_AK_SN_DEMOGANONFIRE01 = 0x846E, + ID_AK_SN_DEMOGANONFIRE02 = 0x846F, + ID_AK_ST_KGTT2JUMPHANDSMOKE00 = 0xA470, }; extern u16 j_o_id[]; diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index b98ecf5ea..14ff945bd 100644 --- a/src/c/c_damagereaction.cpp +++ b/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 */ diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 1b6a34a9a..f69224a70 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/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, ¤t.pos, NULL, NULL, 255, &field_0x684); + dComIfGp_particle_set(dPa_name::ID_IT_JN_GBACURSOR00, ¤t.pos, NULL, NULL, 255, &field_0x684); JKRHeap::free(l_gbaCommand->getMemAddress(), NULL); delete l_gbaCommand; diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 5215efaeb..27852432e 100644 --- a/src/d/actor/d_a_am.cpp +++ b/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); diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index e2653e0ea..9c21ea633 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -159,9 +159,9 @@ static BOOL medama_atari_check(am2_class* i_this) { atInfo.pParticlePos = NULL; cc_at_check(actor, &atInfo); actor->health = origHealth; - dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, &actor->attention_info.position); + dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &actor->attention_info.position); } else { - dComIfGp_particle_set(dPa_name::ID_COMMON_PURPLE_HIT, &hitPos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_NG, &hitPos); } fopAcM_seStart(actor, JA_SE_LK_MS_WEP_HIT, 0x42); } @@ -189,7 +189,7 @@ static BOOL medama_atari_check(am2_class* i_this) { i_this->mAction = ACTION_DOUSA; i_this->mMode = 2; } else { - dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos, &player->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &hitPos, &player->shape_angle); fopAcM_seStart(actor, JA_SE_CM_AM2_PARALYZED, 0); fopAcM_monsSeStart(actor, JA_SE_CV_AM2_PARALYZED, 0x42); i_this->mAction = ACTION_MAHI; @@ -294,11 +294,11 @@ static BOOL week_atari_check(am2_class* i_this) { cc_at_check(actor, &atInfo); if (hitType == 1) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hitPos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &hitPos); cXyz particleScale(2.0f, 2.0f, 2.0f); - dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &hitPos, &player->shape_angle, &particleScale); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &hitPos, &player->shape_angle, &particleScale); } else { - dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, &hitPos, &player->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, &hitPos, &player->shape_angle); } i_this->mAction = ACTION_ITAI; @@ -434,7 +434,7 @@ static BOOL naraku_check(am2_class* i_this) { cXyz particleScale(1.0f, 1.0f, 1.0f); i_this->mRippleCb.remove(); - dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &actor->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &actor->current.pos, NULL, &particleScale, 0xFF, &i_this->mRippleCb); i_this->mRippleCb.setRate(0.0f); } } @@ -554,7 +554,7 @@ static void action_dousa(am2_class* i_this) { i_this->mSmokeCb.remove(); fopAcM_seStart(actor, JA_SE_CM_AM_JUMP_S, 0); - dComIfGp_particle_setToon(dPa_name::ID_SCENE_A125, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); + dComIfGp_particle_setToon(dPa_name::ID_AK_ST_AMOTHSMOKE00, &actor->current.pos, &actor->shape_angle, NULL, 0xB9, &i_this->mSmokeCb, fopAcM_GetRoomNo(actor)); if (i_this->mSmokeCb.getEmitter()) { i_this->mSmokeCb.getEmitter()->setRate(12.0f); JGeometry::TVec3 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 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 scale; @@ -941,8 +941,8 @@ static void action_itai(am2_class* i_this) { cXyz centerPos = actor->current.pos; centerPos.y += 50.0f; - dComIfGp_particle_set(dPa_name::ID_SCENE_81AF, &actor->current.pos, &actor->shape_angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_81B0, &actor->current.pos, &actor->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTH2WEAKPOINT01, &actor->current.pos, &actor->shape_angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_AMOTH2HAHEN00, &actor->current.pos, &actor->shape_angle); fopAcM_seStart(actor, JA_SE_CM_AM2_EXPLODE, 0); fopAcM_createDisappear(actor, ¢erPos, 5, daDisItem_IBALL_e); fopAcM_onActor(actor); diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 51a75bd78..ad287ed7c 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/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, ¤t.pos, NULL, NULL, 0xFF, &mBlurFollowCb); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARW_BLUR00, ¤t.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(¤t.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); diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index 7ce9ea299..8325b77b1 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -199,7 +199,7 @@ bool daArrow_Iceeff_c::_execute() { daArrow_c* arrow = static_cast(fopAcM_SearchByID(parentActorID)); if(field_0xA38 == 0) { if(arrow == 0) { - dComIfGp_particle_setP1(dPa_name::ID_COMMON_0055, ¤t.pos, ¤t.angle); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWICE_OUT00, ¤t.pos, ¤t.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, ¤t.pos, ¤t.angle); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWICE_OUT00, ¤t.pos, ¤t.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, ¤t.pos, &angle); + JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_HITA00, ¤t.pos, &angle); if(ptcl) { JGeometry::TVec3 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, ¤t.pos, NULL, &ripple_scale); + JPABaseEmitter* ptcl = dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON01, ¤t.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, ¤t.pos); + JPABaseEmitter* ptcl = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWICE_OUT00, ¤t.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, ¤t.pos, NULL, &ripple_scale); + dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON03, ¤t.pos, NULL, &ripple_scale); fopAcM_seStartCurrent(this, JA_SE_OBJ_MINI_ICE_BREAK, 0); field_0xA3C = 0; diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 8c0be80b9..7a11e48ce 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/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, ¤t.angle, NULL, 0xFF, &field_0x2F4); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWF_HINOKO00, &field_0x29C, ¤t.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, ¤t.angle, NULL, 0xFF, &field_0x2F4); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_KIRAKIRA00, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4); } if(field_0x308.getEmitter() == 0) { - dComIfGp_particle_setP1(dPa_name::ID_COMMON_029D, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x308); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWI_REIKI00, &field_0x29C, ¤t.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, ¤t.angle, NULL, 0xFF, &field_0x2F4); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWG_TSUBU00, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x2F4); } if(field_0x308.getEmitter() == 0) { - dComIfGp_particle_setP1(dPa_name::ID_COMMON_02A0, &field_0x29C, ¤t.angle, NULL, 0xFF, &field_0x308); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_ARWG_FLASH00, &field_0x29C, ¤t.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) { diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 8c4346f43..bb7917e34 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/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) { diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index bd03be1e4..b5c96ac2f 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/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) { diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 8bc6a6f54..181bc44bc 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/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, ¢er_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, ¢er_pos, &local_14C, NULL, 0xB9, &i_this->m6130[i], (s16)fopAcM_GetRoomNo(actor)); } - dComIfGp_particle_setToon(dPa_name::ID_SCENE_A150, ¢er_pos2, NULL, NULL, 0xB9, &i_this->m6130[3], (s16)fopAcM_GetRoomNo(actor)); - i_this->m6100[1] = dComIfGp_particle_set(dPa_name::ID_SCENE_814E, ¢er_pos2, NULL, NULL, 0xFF); + dComIfGp_particle_setToon(dPa_name::ID_IT_ST_DK_FUTATOJI_SMOKE_B00, ¢er_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, ¢er_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, ¢er_pos, + dComIfGp_particle_setToon(dPa_name::ID_IT_ST_DK_FUTATOJI_SMOKE_C00, ¢er_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) ); } diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index a121e2c59..51a8d586b 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/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; diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index cdc957ee9..70361f98f 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/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, ¤t.pos); + m690 = dComIfGp_particle_set(dPa_name::ID_AK_SN_LASERROOT00, ¤t.pos); } if (m5F4 == 0) { diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index 56c30bd75..7ecdc2410 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/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); } } diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 0bb7ba106..b9dd6782c 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/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); } } diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 585b5b520..4dd6a6a1a 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/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 */ diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index d2ec25ba0..68270249f 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/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; diff --git a/src/d/actor/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp index 53b4de71f..d0e5fa533 100644 --- a/src/d/actor/d_a_bmdhand.cpp +++ b/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; diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index 146473cc2..5e1ecae17 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/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; } diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index c5003dfc2..c1757ea22 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/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, ¤t.pos, rotation, &scale); - dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, ¤t.pos, NULL, &scale); - dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, ¤t.pos, NULL, &scale); - dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, ¤t.pos, NULL, &scale); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_BMEX_SENKO, ¤t.pos, rotation, &scale); + dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE01, ¤t.pos, NULL, &scale); + dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, ¤t.pos, NULL, &scale); + dComIfGp_particle_setToonP1(dPa_name::ID_IT_JT_BMEX_HAHEN, ¤t.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); } } diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index a2363e5fe..b71e333f1 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/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, ¤t.pos, rotation, &scale); - dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CLOUD, ¤t.pos, NULL, &scale); - dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, ¤t.pos, NULL, &scale); - dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, ¤t.pos, NULL, &scale); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_BMEX_SENKO, ¤t.pos, rotation, &scale); + dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE01, ¤t.pos, NULL, &scale); + dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, ¤t.pos, NULL, &scale); + dComIfGp_particle_setToonP1(dPa_name::ID_IT_JT_BMEX_HAHEN, ¤t.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, ¤t.pos, rotation, &scale); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_BMEX_SENKO, ¤t.pos, rotation, &scale); if(emitter) { emitter->setLifeTime(12); emitter->setGlobalParticleScale(0.5f, 0.67f); } - dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_232A, ¤t.pos, NULL, &scale); + dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKELIGHT, ¤t.pos, NULL, &scale); - emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_COMMON_SMOKE_CIRCLE, ¤t.pos, NULL, &scale); + emitter = dComIfGp_particle_setBombSmoke(dPa_name::ID_IT_JT_BMEX_SMOKE02, ¤t.pos, NULL, &scale); if(emitter) { emitter->setLifeTime(70); } - emitter = dComIfGp_particle_setToonP1(dPa_name::ID_COMMON_SMOKE_DEBRIS, ¤t.pos, NULL, &scale); + emitter = dComIfGp_particle_setToonP1(dPa_name::ID_IT_JT_BMEX_HAHEN, ¤t.pos, NULL, &scale); if(emitter) { emitter->setLifeTime(70); emitter->setAwayFromAxisSpeed(25.0f); diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 26a122bfa..ecc1a46f1 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/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, ¤t.pos); + dComIfGp_particle_setP1(dPa_name::ID_AK_JN_NG, ¤t.pos); mIsReturning = true; current.angle.y += 0x8000; shape_angle.y = current.angle.y; diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 5a6f49421..5a0995f0b 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/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(); diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index c054f2282..b4979b80d 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/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); } } diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index a1e16b600..78307aa0b 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/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; } diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index a0be3a5ef..edf7522ef 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/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(dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI)); J3DAnmTexPattern* anmTexPattern = static_cast(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)); diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index 8258a5045..643112b45 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/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(); diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index 5b0e54caf..3ebe97639 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/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; diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 99824b625..27c6a9742 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/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) { diff --git a/src/d/actor/d_a_coming3.cpp b/src/d/actor/d_a_coming3.cpp index d2f71bab3..e7e93f99c 100644 --- a/src/d/actor/d_a_coming3.cpp +++ b/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 */ diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index 0ddb8367a..40310fd1e 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/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, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0); + m690 = dComIfGp_particle_set(dPa_name::ID_AK_SN_FOUNTAINFIGURE00, ¤t.pos, ¤t.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, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0); + m694 = dComIfGp_particle_set(dPa_name::ID_AK_SN_FOUNTAINFIGURE01, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0); } if (m698 == NULL) { - m698 = dComIfGp_particle_set(dPa_name::ID_SCENE_82B5, ¤t.pos, ¤t.angle); + m698 = dComIfGp_particle_set(dPa_name::ID_AK_SN_FOUNTAINFIGURE02, ¤t.pos, ¤t.angle); } if (m698) { m698->becomeImmortalEmitter(); diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index 226ed7429..2bcc1dabc 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/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(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)); diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index 1b6ff7cb6..58d6717e2 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/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 diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index a90e2db68..5b5ca8619 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/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, ¤t.pos); + mpEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_DEKULEAFSHINE00, ¤t.pos); } else if (mpEmitter != NULL) { mpEmitter->setGlobalTranslation(current.pos); } diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 6593bd7b9..2a42e87cb 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/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, ¤t.pos, &angle); + mpEmitters[0] = dComIfGp_particle_set(dPa_name::ID_IT_JN_GETITEM_FLASH_L00, ¤t.pos, &angle); case 1: - mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F8, ¤t.pos, &angle); + mpEmitters[1] = dComIfGp_particle_set(dPa_name::ID_IT_JN_GETITEM_FLASH_S00, ¤t.pos, &angle); case 2: - mpEmitters[2] = dComIfGp_particle_set(dPa_name::ID_COMMON_01F9, ¤t.pos, &angle); + mpEmitters[2] = dComIfGp_particle_set(dPa_name::ID_IT_JN_GETITEM_HALO00, ¤t.pos, &angle); case 3: - mpEmitters[3] = dComIfGp_particle_set(dPa_name::ID_COMMON_01FA, ¤t.pos, &angle); + mpEmitters[3] = dComIfGp_particle_set(dPa_name::ID_IT_JN_GETITEM_STAR00, ¤t.pos, &angle); case 4: break; } diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 24bd05072..44d61bb26 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/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; } } diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 036051a6d..958aa2e63 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/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++; } } diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index 8e51c3f99..fef1b640a 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/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 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; diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 3ba12fbe4..c1e8183fe 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/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) { diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index 3793ce1d2..5c2f480ed 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/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); } diff --git a/src/d/actor/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp index 7a1257e98..d70ebda0e 100644 --- a/src/d/actor/d_a_fallrock.cpp +++ b/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, diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 0e8cc4107..9c7f47037 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/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) { diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp index 6daccac7a..582b1b36b 100644 --- a/src/d/actor/d_a_fgmahou.cpp +++ b/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); diff --git a/src/d/actor/d_a_fire.cpp b/src/d/actor/d_a_fire.cpp index f5582e64a..e35c9ab9f 100644 --- a/src/d/actor/d_a_fire.cpp +++ b/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, ¤t.pos); - field_0x8C0 = dComIfGp_particle_set(dPa_name::ID_COMMON_0462, ¤t.pos); - field_0x8C4 = dComIfGp_particle_setProjection(dPa_name::ID_COMMON_445B, ¤t.pos); + field_0x8BC = dComIfGp_particle_set(dPa_name::ID_IT_JN_KAKOMI_FIRE_A00, ¤t.pos); + field_0x8C0 = dComIfGp_particle_set(dPa_name::ID_IT_JN_KAKOMI_FIRE_B00, ¤t.pos); + field_0x8C4 = dComIfGp_particle_setProjection(dPa_name::ID_IT_JP_KAKOMI_KAGERO00, ¤t.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, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_IT_JN_KAKOMI_STEAM00, ¤t.pos); } else if (hit_obj->ChkAtType(AT_TYPE_WIND) && wind != field_0x2CC[0].GetTgHitAc()) { field_0x8E0 = *field_0x2CC[0].GetTgRVecP(); diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index bc057b833..382b79597 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/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, ¤t.pos, ¤t.angle); - JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_COMMON_2027, ¤t.pos, ¤t.angle, NULL, 255, &mSmokeCallBack, fopAcM_GetRoomNo(this)); + dComIfGp_particle_set(dPa_name::ID_AK_SN_KAZEBREAKFLOOR00, ¤t.pos, ¤t.angle); + JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_AK_JT_ELEMENTSMOKE01, ¤t.pos, ¤t.angle, NULL, 255, &mSmokeCallBack, fopAcM_GetRoomNo(this)); if (emtr != NULL) { emtr->setRate(30); emtr->setMaxFrame(1); diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 7f39deebd..43e3dc8fe 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/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, ¤t.pos, NULL, NULL, 0xFF, &mpFollowEcallBack, fopAcM_GetRoomNo(this)); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_SN_PITFALL00, ¤t.pos, NULL, NULL, 0xFF, &mpFollowEcallBack, fopAcM_GetRoomNo(this)); } JPABaseEmitter* emitter = mpFollowEcallBack.getEmitter(); diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index af15c2023..ee2acd7d6 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/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); } } diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 106e62a5c..93a9d27c0 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/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; } diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp index b96dd8e73..23a7a670d 100644 --- a/src/d/actor/d_a_himo3.cpp +++ b/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; diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 6e69d6dea..b4dfa342d 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/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, ¤t.pos); } else { dComIfGp_particle_setP1(m2A6, ¤t.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; diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index 697205282..3f88625da 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/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, ¤t.pos); + mEmitter2 = dComIfGp_particle_set(dPa_name::ID_AK_SN_HEATFLOOR01, ¤t.pos); if (mEmitter1 == NULL && !(fopAcM_GetParam(this) & 2)) - mEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_8120, ¤t.pos); + mEmitter1 = dComIfGp_particle_set(dPa_name::ID_AK_SN_HEATFLOOR00, ¤t.pos); cLib_chaseF(&mSpawnTimer, 60.0f, 5.0f); mbSpawnParticle = false; } else { diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 7dee2d810..23125b672 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/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, ¤t.pos, NULL, &scale, 0xFF, &mRippleCb); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, ¤t.pos, NULL, &scale, 0xFF, &mRippleCb); mRippleCb.setRate(0.0f); mMode = MODE_WATER; } diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 39bc530d9..52b18905b 100644 --- a/src/d/actor/d_a_item.cpp +++ b/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, ¤t.pos); + mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BSTKIRAKIRAARROW00, ¤t.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, ¤t.pos, NULL, NULL, 0xFF, &mPtclSmokeCb, fopAcM_GetRoomNo(this)); + JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_ST_BSTDROPARROWSMOKE00, ¤t.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, ¤t.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, ¤t.pos, NULL, &particleScale, 0xFF, &mPtclRippleCb); mPtclRippleCb.mRate = 0.0f; } diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp index 6116b79fc..009f5b10b 100644 --- a/src/d/actor/d_a_kanban.cpp +++ b/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; } diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index c2ca825df..a29019e95 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/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); } } diff --git a/src/d/actor/d_a_kita.cpp b/src/d/actor/d_a_kita.cpp index e99ccb795..ceb6b09c4 100644 --- a/src/d/actor/d_a_kita.cpp +++ b/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); diff --git a/src/d/actor/d_a_kn.cpp b/src/d/actor/d_a_kn.cpp index 514ad6a82..93993eb3b 100644 --- a/src/d/actor/d_a_kn.cpp +++ b/src/d/actor/d_a_kn.cpp @@ -112,7 +112,7 @@ void shibuki_set(kn_class* i_this) { JGeometry::TVec3 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); diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index 1f82761d0..cf0094ea4 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/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; diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index 7294989ef..e06f33b88 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/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); } diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index f67d77ac1..1840d1d49 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/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; diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index c36ddc7cb..592f432a2 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/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, ¤t.pos, ¤t.angle); + mpEmitter = dComIfGp_particle_set(dPa_name::ID_IT_SN_RBRIDGE_FLSH00, ¤t.pos, ¤t.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, ¤t.angle); - dComIfGp_particle_setProjection(dPa_name::ID_SCENE_8119, &pos2, ¤t.angle); + dComIfGp_particle_setProjection(dPa_name::ID_IT_SN_RBRIDGE_APP00, &pos1, ¤t.angle); + dComIfGp_particle_setProjection(dPa_name::ID_IT_SN_RBRIDGE_APP00, &pos2, ¤t.angle); set_on_se(); diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index cc52d7324..0a1139cf6 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/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, ¤t.angle); + mEmitter3 = dComIfGp_particle_set(dPa_name::ID_IT_SN_DEKLIFT_HAMONA00, &particlePos, ¤t.angle); if (mEmitter3) { mEmitter3->stopCreateParticle(); } diff --git a/src/d/actor/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp index 293fb62ef..01de62542 100644 --- a/src/d/actor/d_a_mdoor.cpp +++ b/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, ¤t.pos, &shape_angle, NULL, 0xAA, &m290, fopAcM_GetRoomNo(this)); + JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_JT_ELEMENTSMOKE00, ¤t.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, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WOODCAGE00, ¤t.pos, ¤t.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, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WOODCAGE00, ¤t.pos, ¤t.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); } diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp index 4c3dfa62b..58e61bd10 100644 --- a/src/d/actor/d_a_mflft.cpp +++ b/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); diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index 79b543785..19d316767 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/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, ¤t.pos); + JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_AK_SN_MACOREMUSIC00, ¤t.pos); mpEmitter = emtr; if (emtr != NULL) { mpEmitter->setGlobalRTMatrix(mMtx); diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp index 7da00df9a..7a80b9fdf 100644 --- a/src/d/actor/d_a_msw.cpp +++ b/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]); diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index a4445ca93..aecce1ec6 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/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, ¤t.pos); + JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_PERAPROOPEN00, ¤t.pos); if(emitter) { emitter->setGlobalRTMatrix(mpPropellerModel->getAnmMtx(m_center_jnt_num)); } diff --git a/src/d/actor/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp index 3f4751634..e58b2a463 100644 --- a/src/d/actor/d_a_npc_fa1.cpp +++ b/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, ¤t.pos, NULL, + JPABaseEmitter* pJVar4 = dComIfGp_particle_set(dPa_name::ID_AK_JN_CUREFAIRY00, ¤t.pos, NULL, NULL, 0xFF, &mSparklePtclCallback); mpEmitter = pJVar4; return TRUE; diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index a04a519f0..bcf9684a2 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/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, ¤t.pos, 0, 0, 0xB9, &field_0x2E0, fopAcM_GetRoomNo(this)); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, ¤t.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 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, ¤t.pos); + field_0x430 = dComIfGp_particle_set(dPa_name::ID_AK_SN_JITEAR01, ¤t.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, ¤t.pos); + field_0x430 = dComIfGp_particle_set(dPa_name::ID_AK_SN_JITEAR00, ¤t.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); diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index b1f511483..684b06523 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/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, ¤t.pos); + JPABaseEmitter* splashEmitter = dComIfGp_particle_set(dPa_name::ID_IT_JN_WP_SHIBUKI, ¤t.pos); if (splashEmitter) { splashEmitter->setRate(15.0f); splashEmitter->setGlobalScale(splash_scale); } - JPABaseEmitter* rippleEmitter = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, ¤t.pos); + JPABaseEmitter* rippleEmitter = dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON01, ¤t.pos); if (rippleEmitter) { rippleEmitter->setGlobalScale(ripple_scale); } diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index be7fb4d87..026b57fea 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/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, ¤t.pos, NULL, NULL, 0xFF, &m3058); + dComIfGp_particle_set(dPa_name::ID_AK_SN_HITSHIELDLIGHT00, ¤t.pos, NULL, NULL, 0xFF, &m3058); } } else if (m3058.getEmitter() == NULL) { - dComIfGp_particle_set(dPa_name::ID_SCENE_8232, ¤t.pos, NULL, NULL, 0xFF, &m3058); + dComIfGp_particle_set(dPa_name::ID_AK_SN_HITSHIELDLIGHT00, ¤t.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(), ¤t.pos, NULL); + m304C.makeEmitter(dPa_name::ID_AK_SN_MIRRORSHIELD00, mpHarpLightModel->getBaseTRMtx(), ¤t.pos, NULL); JPABaseEmitter* emitter = m304C.getEmitter(); JGeometry::TVec3 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, ¤t.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0); + m0508[1] = dComIfGp_particle_set(dPa_name::ID_IT_SN_MD_PIYOPIYO00, ¤t.pos, NULL, NULL, 0xFF, NULL, fopAcM_GetRoomNo(this), &tevStr.mColorK0, &tevStr.mColorK0); if (m0508[1]) { m0508[1]->becomeImmortalEmitter(); } diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index eadafec4e..7ddbbd024 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/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, ¤t.pos, ¤t.angle, 0, 0xB9, &field_0x914, fopAcM_GetRoomNo(this)); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, ¤t.pos, ¤t.angle, 0, 0xB9, &field_0x914, fopAcM_GetRoomNo(this)); if(emitter) { emitter->setRate(3.0f); emitter->setSpread(0.2f); diff --git a/src/d/actor/d_a_npc_nz_cut.inc b/src/d/actor/d_a_npc_nz_cut.inc index 10eb319d0..4fb97dade 100644 --- a/src/d/actor/d_a_npc_nz_cut.inc +++ b/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); } } } diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 4e9729941..4ec6f7697 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/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, ¤t.pos, &shape_angle, 0); + field_0x738.makeEmitter(dPa_name::ID_AK_SN_OTOMOBEAM00, ¤t.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, ¤t.pos, &shape_angle, 0); + field_0x740.makeEmitter(dPa_name::ID_AK_SN_OTOMOBEAM01, ¤t.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, ¤t.pos); + JPABaseEmitter* splash = dComIfGp_particle_set(dPa_name::ID_IT_JN_WP_SHIBUKI, ¤t.pos); if(splash) { splash->setRate(15.0f); splash->setGlobalScale(splash_scale); } - JPABaseEmitter* ripple = dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, ¤t.pos); + JPABaseEmitter* ripple = dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON01, ¤t.pos); if(ripple) { ripple->setGlobalScale(ripple_scale); } diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index 70975451b..cff7802b4 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/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 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, ¤t.pos, ¤t.angle, &pos); - dComIfGp_particle_set(dPa_name::ID_SCENE_818A, ¤t.pos, ¤t.angle, &pos); - dComIfGp_particle_set(dPa_name::ID_SCENE_818B, ¤t.pos, ¤t.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, ¤t.pos, ¤t.angle, &pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_TG_KURURINP_KAMI_R00, ¤t.pos, ¤t.angle, &pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_TG_KURURINP_KAMI_L00, ¤t.pos, ¤t.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 diff --git a/src/d/actor/d_a_npc_tc_cut.inc b/src/d/actor/d_a_npc_tc_cut.inc index 6bd789b97..3e45725f2 100644 --- a/src/d/actor/d_a_npc_tc_cut.inc +++ b/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 */ diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index 56f2f9daf..6d7d0a153 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/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,¤t.pos, NULL, NULL, 0xff, &mRippleCallBack); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00,¤t.pos, NULL, NULL, 0xff, &mRippleCallBack); } f32 temp = std::fabsf(speedF) * 0.1f; f32 temp2 = temp * temp; diff --git a/src/d/actor/d_a_obj_ajav.cpp b/src/d/actor/d_a_obj_ajav.cpp index 7e5f61577..d1f988f20 100644 --- a/src/d/actor/d_a_obj_ajav.cpp +++ b/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, ¤t.pos, &tevStr); diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index 9edeb1de7..f5f46c848 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/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 em_scl(1.0f, 0.8f, 1.0f); emitter->setEmitterScale(em_scl); diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index b70742d65..ff9b79db8 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/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(¤t.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); diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index f5794462c..ab9a8a29f 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/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); } } diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index 24199b0f5..525e2d88a 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/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); } diff --git a/src/d/actor/d_a_obj_demo_barrel.cpp b/src/d/actor/d_a_obj_demo_barrel.cpp index 251deeb64..2bcb61a40 100644 --- a/src/d/actor/d_a_obj_demo_barrel.cpp +++ b/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, ¤t.pos, NULL, NULL, 0xFF, NULL, -1, + dComIfGp_particle_set(dPa_name::ID_IT_JN_TR_HAHEN_A, ¤t.pos, NULL, NULL, 0xFF, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0, NULL); if (emitter != NULL) { static JGeometry::TVec3 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 */ diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index ecf6f39d0..1e056e129 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/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, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_SN_SINJYU_GLOWD00, &mPos, ¤t.angle); } else if (field_0x894 == 1) { - dComIfGp_particle_set(dPa_name::ID_SCENE_8436, &mPos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_SN_SINJYU_GLOWF00, &mPos, ¤t.angle); } else { - dComIfGp_particle_set(dPa_name::ID_SCENE_8435, &mPos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_SN_SINJYU_GLOWN00, &mPos, ¤t.angle); } } else if (field_0x8C4 == 125) { field_0x8A3 = true; diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index 782e8c7ee..d5acdb67c 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/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, ¤t.pos, ¤t.angle); + mpParticleEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_BIRDSTATUEHAHEN00, ¤t.pos, ¤t.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, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_BIRDSTATUESPLASH00, ¤t.pos, ¤t.angle); } } diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 96440bde2..39a8dea03 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/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, ¤t.pos, NULL, NULL, 0xB4, mParticleCallback, -1, NULL, NULL, &particle_scl); + JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, ¤t.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, ¤t.pos, + JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, ¤t.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, ¤t.pos, + JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, ¤t.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, ¤t.pos, + JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, ¤t.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, ¤t.pos, + JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_IT_ST_BOKKURI_SMOKE00, ¤t.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, ¤t.pos, + JPABaseEmitter *emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, ¤t.pos, NULL, NULL, 0xB4, mParticleCallback, -1, NULL, NULL, &particle_scl); if (emitter != NULL) { emitter->setRate(30.0f); diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index e4c2feaa3..0e1f336fe 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/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; diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index 22b8cb14e..a6035ef74 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/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); } diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index d4737659a..0d8f45a88 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/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 */ diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp index af3120f10..028c8b058 100644 --- a/src/d/actor/d_a_obj_homensmoke.cpp +++ b/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, ¤t.pos); + JPABaseEmitter* rubbleEmitter = dComIfGp_particle_setToon(dPa_name::ID_AK_SN_KAZEMASKHAHEN00, ¤t.pos); if (rubbleEmitter) { rubbleEmitter->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b); if (mType == 1) { diff --git a/src/d/actor/d_a_obj_ice.cpp b/src/d/actor/d_a_obj_ice.cpp index 26d23a89a..10aa0476f 100644 --- a/src/d/actor/d_a_obj_ice.cpp +++ b/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, ¤t.pos, NULL, &scale, 0xFF, NULL, -1, &tevStr.mColorK0); + JPABaseEmitter* emitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_ICETHAW00, ¤t.pos, NULL, &scale, 0xFF, NULL, -1, &tevStr.mColorK0); if (emitter != NULL) { #if VERSION == VERSION_DEMO JGeometry::TVec3 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, ¤t.pos, NULL, &scale, 0xFF, NULL, -1, &tevStr.mColorK0); + dComIfGp_particle_set(dPa_name::ID_AK_JN_ICETHAW00, ¤t.pos, NULL, &scale, 0xFF, NULL, -1, &tevStr.mColorK0); m43C = &daObjIce_c::fade_out_retire_act_proc; } #else diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index 51fa73208..7af5c0db5 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/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, ¤t.pos, ¤t.angle); + mEmitter1 = dComIfGp_particle_set(dPa_name::ID_IT_SN_ICEL_SMOKE00, ¤t.pos, ¤t.angle); } if(mEmitter2 == NULL) { - mEmitter2 = dComIfGp_particle_set(dPa_name::ID_SCENE_81AB, ¤t.pos, ¤t.angle); + mEmitter2 = dComIfGp_particle_set(dPa_name::ID_IT_SN_ICEL_SMOKE01, ¤t.pos, ¤t.angle); } } diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 8252c7b7b..625c872d5 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/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 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)); diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index 94418df7f..43d3ea9c6 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/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, ¤t.pos, ¤t.angle, NULL, 0xFF, + dPa_name::ID_AK_SN_KOKIRIHOUSEHAHEN00, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &color ); dComIfGp_particle_setToon( - dPa_name::ID_SCENE_A2A3, ¤t.pos, ¤t.angle, NULL, 0xB4, + dPa_name::ID_AK_ST_KOKIRIHOUSESMOKE00, ¤t.pos, ¤t.angle, NULL, 0xB4, &mSmokeCb, current.roomNo, &tevStr.mColorK0, &color ); } diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp index 21d6ce841..299329750 100644 --- a/src/d/actor/d_a_obj_leaves.cpp +++ b/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 diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp index 674d7079f..f4c2f2020 100644 --- a/src/d/actor/d_a_obj_mkie.cpp +++ b/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, ¤t.pos, &shape_angle, &scale, 0xff, NULL, -1, &tevStr.mColorK0, &envColor, NULL); + dComIfGp_particle_set(dPa_name::ID_AK_SN_VANISHFIGURE00, ¤t.pos, &shape_angle, &scale, 0xff, NULL, -1, &tevStr.mColorK0, &envColor, NULL); } /* 00000E84-00000EF4 .text sound_melt__Q29daObjMkie5Act_cFv */ diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp index d93ac27d5..6546ee9ea 100644 --- a/src/d/actor/d_a_obj_mkiek.cpp +++ b/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, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, current.roomNo, diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 917a6d1ef..3fc4a3fc6 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/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, ¤t.pos, ¤t.angle); + mEmitters[0] = dComIfGp_particle_set(dPa_name::ID_AK_SN_WGFLASH00, ¤t.pos, ¤t.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, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color); + mEmitters[1] = dComIfGp_particle_setProjection(dPa_name::ID_AK_SN_WGROCK00, ¤t.pos, ¤t.angle, NULL, 0xFF, NULL, current.roomNo, &tevStr.mColorK0, &emitter2Color); - mEmitters[2] = dComIfGp_particle_setToon(dPa_name::ID_SCENE_A187, ¤t.pos, ¤t.angle, NULL, 0xFF, &mSmokeCBs[2]); + mEmitters[2] = dComIfGp_particle_setToon(dPa_name::ID_AK_ST_WGSMOKE00, ¤t.pos, ¤t.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, ¤t.angle, NULL, 0xFF, &mSmokeCBs[3]); + mEmitters[3] = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &mBrokenPos, ¤t.angle, NULL, 0xFF, &mSmokeCBs[3]); if (mEmitters[3] != NULL) { mEmitters[3]->setVolumeSweep(0.5f); mEmitters[3]->setLifeTime(0x2D); diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 94b16f0e5..5b8e15292 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1519,7 +1519,7 @@ namespace daObjMovebox { for (int i = 0; i < (int)ARRAY_SIZE(mSmokeCbs); i++) { JPABaseEmitter* emitter = dComIfGp_particle_setToon( - dPa_name::ID_COMMON_2022, &mSmokeCbs[i].field_0x20, &mSmokeCbs[i].field_0x2C, + dPa_name::ID_AK_JT_ELEMENTSMOKE00, &mSmokeCbs[i].field_0x20, &mSmokeCbs[i].field_0x2C, &scl, 0xB9, &mSmokeCbs[i], fopAcM_GetRoomNo(this) ); if (emitter) { @@ -1716,7 +1716,7 @@ namespace daObjMovebox { cXyz particlePos; particlePos.set(current.pos.x, current.pos.y + 75.0f, current.pos.z); JPABaseEmitter* emitter = dComIfGp_particle_set( - dPa_name::ID_COMMON_03E6, &particlePos, NULL, NULL, 0xFF, NULL, -1, + dPa_name::ID_IT_JN_TR_HAHEN_B, &particlePos, NULL, NULL, 0xFF, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0, &particle_scale ); if (emitter) { diff --git a/src/d/actor/d_a_obj_mshokki.cpp b/src/d/actor/d_a_obj_mshokki.cpp index 8f167dcd2..4fd3f8281 100644 --- a/src/d/actor/d_a_obj_mshokki.cpp +++ b/src/d/actor/d_a_obj_mshokki.cpp @@ -221,7 +221,7 @@ void daObjMshokki_c::co_hitCallback(fopAc_ac_c* a_this, dCcD_GObjInf*, fopAc_ac_ /* 000004E4-00000610 .text break_proc__14daObjMshokki_cFv */ void daObjMshokki_c::break_proc() { - static u16 particle_id[] = {dPa_name::ID_COMMON_0441, dPa_name::ID_COMMON_043F, dPa_name::ID_COMMON_0440}; + static u16 particle_id[] = {dPa_name::ID_AK_JN_BREAKMAJUPOT00, dPa_name::ID_AK_JN_BREAKMAJUPLATE00, dPa_name::ID_AK_JN_BREAKMAJUCUP00}; dComIfGp_particle_set(particle_id[m60C], ¤t.pos, &shape_angle, NULL, 0xff, NULL, -1, &tevStr.mColorK0); fopAcM_seStartCurrent(this, JA_SE_OBJ_COL_SWC_CHNS, dComIfG_Bgsp()->GetMtrlSndId(mAcch.m_gnd)); diff --git a/src/d/actor/d_a_obj_ospbox.cpp b/src/d/actor/d_a_obj_ospbox.cpp index b94fffb79..1faac6af0 100644 --- a/src/d/actor/d_a_obj_ospbox.cpp +++ b/src/d/actor/d_a_obj_ospbox.cpp @@ -165,7 +165,7 @@ void daObjOspbox::Act_c::eff_break() { static cXyz particle_scale(2.0f, 2.0f, 1.0f); cXyz particle_pos(current.pos.x, current.pos.y + 75.0f, current.pos.z); JPABaseEmitter* emitter = dComIfGp_particle_set( - dPa_name::ID_COMMON_03E6, + dPa_name::ID_IT_JN_TR_HAHEN_B, &particle_pos, NULL, NULL, 0xFF, NULL, diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp index 824ca4053..a2673bc25 100644 --- a/src/d/actor/d_a_obj_shmrgrd.cpp +++ b/src/d/actor/d_a_obj_shmrgrd.cpp @@ -441,11 +441,11 @@ void daObjShmrgrd_c::crush_proc() { /* 00001178-00001340 .text eff_crush__14daObjShmrgrd_cFv */ void daObjShmrgrd_c::eff_crush() { if (mMode == MODE_UPPER) { - dComIfGp_particle_set(dPa_name::ID_SCENE_81B7, ¤t.pos); - dComIfGp_particle_set(dPa_name::ID_SCENE_81B8, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_HAMSW_STAR00, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_HAMSW_SYOUGEKI00, ¤t.pos); } static const cXyz particle_scale(1.5f, 1.5f, 1.0f); - JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, ¤t.pos, NULL, NULL, 200, &mSmokeCb, -1, NULL, NULL, &particle_scale); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, ¤t.pos, NULL, NULL, 200, &mSmokeCb, -1, NULL, NULL, &particle_scale); if (emitter) { emitter->setRate(30.0f); emitter->setMaxFrame(1); diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp index cb4842f9f..8e7384888 100644 --- a/src/d/actor/d_a_obj_swhammer.cpp +++ b/src/d/actor/d_a_obj_swhammer.cpp @@ -273,11 +273,11 @@ void daObjSwhammer::Act_c::crush_proc() { /* 00000BF0-00000DB8 .text eff_crush__Q213daObjSwhammer5Act_cFv */ void daObjSwhammer::Act_c::eff_crush() { if (mMode == 0) { - dComIfGp_particle_set(dPa_name::ID_SCENE_81B7, ¤t.pos); - dComIfGp_particle_set(dPa_name::ID_SCENE_81B8, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_HAMSW_STAR00, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_HAMSW_SYOUGEKI00, ¤t.pos); } static const cXyz particle_scale(1.5f, 1.5f, 1.0f); - JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, ¤t.pos, NULL, NULL, 200, &mSmokeCb, -1, NULL, NULL, &particle_scale); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, ¤t.pos, NULL, NULL, 200, &mSmokeCb, -1, NULL, NULL, &particle_scale); if (emitter) { emitter->setRate(30.0f); emitter->setMaxFrame(1); diff --git a/src/d/actor/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp index e195aa1c8..9e20747c9 100644 --- a/src/d/actor/d_a_obj_tide.cpp +++ b/src/d/actor/d_a_obj_tide.cpp @@ -442,7 +442,7 @@ void Act_c::mode_gmtw_demo() { if (--m2F4 <= 0) { m2F6 = 2; } else if (m2F4 == 0x3b) { - dComIfGp_particle_set(dPa_name::ID_SCENE_814D, &a_this->current.pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_MT_WATER00, &a_this->current.pos); dComIfG_Bgsp()->Regist(mpBgW, a_this); m2F7 = true; } diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index d0ad2d286..27ab5b3c1 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -357,7 +357,7 @@ int daObjTpost_c::getMsgXY() { col.b = REG12_S(2) + 0x80; mDoMtx_stack_c::copy(mMorf->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVec(&pos, &pos); - dComIfGp_particle_set(dPa_name::ID_COMMON_0057, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col); + dComIfGp_particle_set(dPa_name::ID_IT_JN_LK_GEPPU00, &pos, &shape_angle, &scale, 0xFF, NULL, -1, &col); break; case dItem_FATHER_LETTER_e: @@ -649,7 +649,7 @@ void daObjTpost_c::setAnm(s8 anmPrmIdx, bool param_2) { cXyz scale; scale.setall(1.0f); if(mMorf->getFrame() == 1.0f) { - dComIfGp_particle_set(dPa_name::ID_SCENE_8190, ¤t.pos, ¤t.angle, &scale); + dComIfGp_particle_set(dPa_name::ID_IT_SN_POST_TSUBA00, ¤t.pos, ¤t.angle, &scale); mDoAud_seStart(JA_SE_OBJ_POST_LUGGAGE_OUT); } } diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 8d09e17a4..144be0ddf 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -137,17 +137,17 @@ void daObjVfan::Act_c::init_mtx() { /* 000006BC-000009B4 .text ParticleSet__Q29daObjVfan5Act_cFv */ void daObjVfan::Act_c::ParticleSet() { - dComIfGp_particle_set(dPa_name::ID_SCENE_83CD, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83CE, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83CF, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83D0, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83D1, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83D2, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83D3, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83D4, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83D5, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83D6, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_83D7, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORSMOKE00, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH00, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH01, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH02, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH03, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH04, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH05, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH06, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH07, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH08, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONDOORFLASH09, ¤t.pos, ¤t.angle); } /* 000009B4-00000C74 .text Execute__Q29daObjVfan5Act_cFPPA3_A4_f */ diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index cf94172c9..fe7e15213 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -65,12 +65,12 @@ static char* l_daObjVgnfd_break_act_name[] = { }; static u16 l_daObjVgnfd_pt_table[] = { - dPa_name::ID_SCENE_833E, - dPa_name::ID_SCENE_833F, - dPa_name::ID_SCENE_8340, - dPa_name::ID_SCENE_8341, - dPa_name::ID_SCENE_8342, - dPa_name::ID_SCENE_8343, + dPa_name::ID_AK_SN_BOSSDOORHAHEN00, + dPa_name::ID_AK_SN_BOSSDOORHAHEN01, + dPa_name::ID_AK_SN_BOSSDOORHAHEN02, + dPa_name::ID_AK_SN_BOSSDOORDOKURO00, + dPa_name::ID_AK_SN_BOSSDOORDOKURO01, + dPa_name::ID_AK_SN_BOSSDOORDOKURO02, }; enum { @@ -395,7 +395,7 @@ bool daObjVgnfd_c::_execute() { emtr->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b); } } - dComIfGp_particle_setToon(dPa_name::ID_SCENE_A344, ¤t.pos, ¤t.angle, &scale, 0xA0, &mSmoke); + dComIfGp_particle_setToon(dPa_name::ID_AK_ST_BOSSDOORSMOKE00, ¤t.pos, ¤t.angle, &scale, 0xA0, &mSmoke); dComIfGp_getVibration().StartQuake(4, 11, cXyz(0.0f, 1.0f, 0.0f)); fopAcM_seStartCurrent(this, JA_SE_OBJ_B_BOSS_DR_BRK_2, 0); break; diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 271582765..98867682b 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -229,7 +229,7 @@ void daObjVmc::Act_c::daObjVmc_base_main() { #if VERSION == VERSION_DEMO m4B4_demo = #endif - dComIfGp_particle_setToon(dPa_name::ID_SCENE_A1BC, ¤t.pos, ¤t.angle, NULL, 0xFF, &mSmoke, fopAcM_GetRoomNo(this)); + dComIfGp_particle_setToon(dPa_name::ID_AK_ST_MACORETREESMOKE00, ¤t.pos, ¤t.angle, NULL, 0xFF, &mSmoke, fopAcM_GetRoomNo(this)); #if VERSION == VERSION_DEMO mCyl.Set(cyl_src_tree); #endif diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index dfaffc046..5d7b42486 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -58,43 +58,43 @@ void daObjVolcano::Act_c::StartFire() { } } this->field_0x2C8[0] = dComIfGp_particle_set( - dPa_name::ID_SCENE_805A, &this->field_0x4C4, + dPa_name::ID_AK_SN_O_FIRESHAFTHEAD, &this->field_0x4C4, &this->current.angle, &this->field_0x4AC); this->field_0x2C8[1] = dComIfGp_particle_set( - dPa_name::ID_SCENE_805B, &this->field_0x4D0, + dPa_name::ID_AK_SN_O_FIRESHAFTBODY, &this->field_0x4D0, &this->current.angle, &this->field_0x4AC); this->field_0x2C8[2] = dComIfGp_particle_set( - dPa_name::ID_SCENE_805C, &this->field_0x4DC, + dPa_name::ID_AK_SN_O_FIRESHAFTFOOT, &this->field_0x4DC, &this->current.angle, &this->field_0x4AC); this->field_0x2C8[3] = dComIfGp_particle_set( - dPa_name::ID_SCENE_8194, &this->current.pos, + dPa_name::ID_AK_SN_MINIKAZANSTEAM00, &this->current.pos, &this->current.angle, NULL); this->field_0x2C8[4] = dComIfGp_particle_set( - dPa_name::ID_SCENE_8195, &this->current.pos, + dPa_name::ID_AK_SN_MINIKAZANSTEAM01, &this->current.pos, &this->current.angle, NULL); this->field_0x2C8[5] = dComIfGp_particle_set( - dPa_name::ID_SCENE_8196, &this->current.pos, + dPa_name::ID_AK_SN_MINIKAZANSTEAM02, &this->current.pos, &this->current.angle, NULL); this->field_0x2C8[6] = dComIfGp_particle_set( - dPa_name::ID_SCENE_8197, &this->current.pos, + dPa_name::ID_AK_SN_MINIKAZANSTEAM03, &this->current.pos, &this->current.angle, NULL); this->field_0x2C8[7] = dComIfGp_particle_set( - dPa_name::ID_SCENE_8198, &this->current.pos, + dPa_name::ID_AK_SN_MINIKAZANSTEAM04, &this->current.pos, &this->current.angle, NULL); this->field_0x2C8[8] = dComIfGp_particle_set( - dPa_name::ID_SCENE_8199, &this->current.pos, + dPa_name::ID_AK_SN_MINIKAZANSTEAM05, &this->current.pos, &this->current.angle, NULL); this->field_0x2C8[9] = dComIfGp_particle_set( - dPa_name::ID_SCENE_819A, &this->current.pos, + dPa_name::ID_AK_SN_MINIKAZANSTEAM06, &this->current.pos, &this->current.angle, NULL); } diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index cf70d8bc2..7de3040ce 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -370,13 +370,13 @@ void daObj_Warpt_c::breakHuta(int arg1) { switch (arg1) { case 0: - dComIfGp_particle_set(dPa_name::ID_SCENE_8165, &m830); - dComIfGp_particle_set(dPa_name::ID_SCENE_8166, &m830); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WARPPOTFIRE00, &m830); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WARPPOTFIRE01, &m830); break; case 1: fopAcM_seStart(this, JA_SE_OBJ_COL_BRK_WRAILING, 0); - dComIfGp_particle_set(dPa_name::ID_COMMON_03E5, &m830, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TR_HAHEN_A, &m830, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); #if VERSION > VERSION_DEMO if (mpLidBgW != NULL && mpLidBgW->ChkUsed()) #endif @@ -437,7 +437,7 @@ void daObj_Warpt_c::checkHitSE() { /* 000010E0-00001178 .text modeOpenInit__13daObj_Warpt_cFv */ void daObj_Warpt_c::modeOpenInit() { if (m844.getEmitter() == NULL) { - dComIfGp_particle_set(dPa_name::ID_SCENE_8161, ¤t.pos, NULL, NULL, 0xff, &m844, -1, &m86C, &m870); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WARPPOTOPEN00, ¤t.pos, NULL, NULL, 0xff, &m844, -1, &m86C, &m870); } m858.remove(); } @@ -449,7 +449,7 @@ void daObj_Warpt_c::modeOpen() { /* 000011E8-00001258 .text modeCloseInit__13daObj_Warpt_cFv */ void daObj_Warpt_c::modeCloseInit() { - dComIfGp_particle_set(dPa_name::ID_SCENE_8162, ¤t.pos, NULL, NULL, 0xff, &m858, -1, &m86C, &m870); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WARPPOTCLOSE00, ¤t.pos, NULL, NULL, 0xff, &m858, -1, &m86C, &m870); } /* 00001258-00001388 .text modeClose__13daObj_Warpt_cFv */ diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp index 035ea9893..1802ec072 100644 --- a/src/d/actor/d_a_oship.cpp +++ b/src/d/actor/d_a_oship.cpp @@ -228,25 +228,25 @@ void daOship_c::createWave() { static const JGeometry::TVec3 wave_r_direction(-0.5, 1.0f, -0.3f); if (!mWaveCallback1.getEmitter()) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0037, &mWavePos, &mWaveRot, NULL, 0xFF, &mWaveCallback1); + dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWAVE00, &mWavePos, &mWaveRot, NULL, 0xFF, &mWaveCallback1); if (mWaveCallback1.getEmitter()) { mWaveCallback1.getEmitter()->setDirection(wave_l_direction); } } if (!mWaveCallback2.getEmitter()) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0037, &mWavePos, &mWaveRot, NULL, 0xFF, &mWaveCallback2); + dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWAVE00, &mWavePos, &mWaveRot, NULL, 0xFF, &mWaveCallback2); if (mWaveCallback2.getEmitter()) { mWaveCallback2.getEmitter()->setDirection(wave_r_direction); } } if (!mSplashCallback.getEmitter()) { - 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()) { - dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0036, &mTrackPos, &shape_angle, NULL, 0, &mTrackCallback); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_SHIPTAIL00, &mTrackPos, &shape_angle, NULL, 0, &mTrackCallback); JPABaseEmitter* emitter_p = mTrackCallback.getEmitter(); if (emitter_p) { Vec vec_scale = { 3.0f, 3.0f, 3.0f }; @@ -366,7 +366,7 @@ bool daOship_c::checkTgHit() { mSmokeRot[mSmokePtclCount] = shape_angle; mSmokeRot[mSmokePtclCount].y += mSmokeRotY[mSmokePtclCount]; dComIfGp_particle_set( - dPa_name::ID_COMMON_03E1, + dPa_name::ID_IT_JN_MJTAIHOU_SMOKE01, &mSmokePos, &mSmokeRot[mSmokePtclCount], &scale, 0xff, &mSmokeFollowCallback[mSmokePtclCount], fopAcM_GetRoomNo(this) @@ -375,10 +375,10 @@ bool daOship_c::checkTgHit() { } daPy_py_c* player_p = (daPy_py_c *) dComIfGp_getPlayer(0); - dComIfGp_particle_set(dPa_name::ID_COMMON_0010, &hit_pos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, &hit_pos); cXyz particle_scale(2.0f, 2.0f, 2.0f); - dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, &hit_pos, &player_p->shape_angle, &particle_scale); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, &hit_pos, &player_p->shape_angle, &particle_scale); mHitTimer = 5; diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 35e288e2f..c5bb99d6a 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -310,7 +310,7 @@ BOOL daPds_c::actionMoveEvent(int) { /* 00000AEC-00000B40 .text initialEffectSet__Q210daPedestal7daPds_cFi */ void daPds_c::initialEffectSet(int) { - mOctagonGlowCb.makeEmitter(dPa_name::ID_SCENE_PEDESTAL_OCTAGON_GLOW, ¤t.pos, &shape_angle, NULL); + mOctagonGlowCb.makeEmitter(dPa_name::ID_AK_SN_OTOMOBASELIGHT00, ¤t.pos, &shape_angle, NULL); initBrkAnm(0, true); } diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc index bbe8eff5f..2a83330f2 100644 --- a/src/d/actor/d_a_player_bottle.inc +++ b/src/d/actor/d_a_player_bottle.inc @@ -81,7 +81,7 @@ void daPy_lk_c::setBottleModel(u16 param_0) { } mDoExt_setCurrentHeap(oldHeap); if (param_0 == dItem_FOREST_WATER_e) { - m32F0.makeEmitter(dPa_name::ID_COMMON_020D, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32F0.makeEmitter(dPa_name::ID_AK_JN_FORESTWATER00, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); } } @@ -183,7 +183,7 @@ BOOL daPy_lk_c::procBottleDrink() { p_Var3 = &blue; } m33A8.makeEmitterColor( - dPa_name::ID_COMMON_0057, mpCLModel->getAnmMtx(0x12), ¤t.pos, &shape_angle, p_Var3, NULL + dPa_name::ID_IT_JN_LK_GEPPU00, mpCLModel->getAnmMtx(0x12), ¤t.pos, &shape_angle, p_Var3, NULL ); } } else { @@ -320,7 +320,7 @@ BOOL daPy_lk_c::procBottleOpen() { m34D4 = 1; static const Vec splash_scale = {0.3f, 0.3f, 0.3f}; JPABaseEmitter* emitter = dComIfGp_particle_setP1( - dPa_name::ID_COMMON_0040, &sp64, + dPa_name::ID_IT_JN_WP_SHIBUKI, &sp64, NULL, (cXyz*)&splash_scale, 0xFF, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0 ); @@ -330,7 +330,7 @@ BOOL daPy_lk_c::procBottleOpen() { } static const Vec ripple_scale = {0.5f, 0.5f, 0.5f}; if (r27) { - dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &sp64, NULL, (cXyz*)&ripple_scale); + dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON03, &sp64, NULL, (cXyz*)&ripple_scale); } else { m370C = sp64; m34D0 = 1; @@ -365,7 +365,7 @@ BOOL daPy_lk_c::procBottleOpen() { (frameCtrl.checkPass(9.0f)) ) { seStartOnlyReverb(JA_SE_LK_SPRINKLE_WATER); - m32E4.makeEmitterColor(dPa_name::ID_COMMON_0279, mpCLModel->getAnmMtx(0x08), ¤t.pos, &tevStr.mColorK0, &tevStr.mColorK0); + m32E4.makeEmitterColor(dPa_name::ID_AK_JN_SPILLWATER00, mpCLModel->getAnmMtx(0x08), ¤t.pos, &tevStr.mColorK0, &tevStr.mColorK0); dCcG_At_Spl spl; if (mEquipItem == dItem_WATER_BOTTLE_e) { spl = dCcG_At_Spl_UNK0; @@ -550,7 +550,7 @@ BOOL daPy_lk_c::procBottleGet_init() { mProcVar0.m3570 = 0; dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", &mProcVar0.m3570, 0); if (mEquipItem == dItem_FOREST_WATER_e) { - m32F0.makeEmitter(dPa_name::ID_COMMON_020D, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32F0.makeEmitter(dPa_name::ID_AK_JN_FORESTWATER00, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); } initShipRideUseItem(iVar1, 2); return true; diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index 5114ee3d4..f381731f8 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -830,7 +830,7 @@ BOOL daPy_lk_c::dProcLavaDamage_init() { commonProcInit(daPyProc_DEMO_LAVA_DAMAGE_e); mVelocity = 0.0f; setSingleMoveAnime(ANM_LAVADAM, m_HIO->mRestart.m.field_0x0, 0.0f, -1, m_HIO->mRestart.m.field_0x4); - m32E4.makeEmitter(dPa_name::ID_SCENE_8078, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_SN_HIDARUMAFIRE, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); if (dComIfGp_event_compulsory(this)) { dProcLavaDamage_init_sub(); } else { @@ -880,9 +880,9 @@ void daPy_lk_c::dProcFreezeDamage_init_sub(int param_0) { MtxP pMVar2 = mpCLModel->getAnmMtx(uVar1[i]); cXyz local_28; mDoMtx_multVecZero(pMVar2, &local_28); - dComIfGp_particle_setP1(dPa_name::ID_SCENE_827E, &local_28); + dComIfGp_particle_setP1(dPa_name::ID_IT_SN_LK_FREEZSMOKE00, &local_28); if (i >= 3) { - dComIfGp_particle_setP1(dPa_name::ID_SCENE_827F, &local_28); + dComIfGp_particle_setP1(dPa_name::ID_IT_SN_LK_FREEZKIRA00, &local_28); } } } @@ -938,7 +938,7 @@ void daPy_lk_c::dProcDead_init_sub2() { dCam_getBody()->StartEventCamera(9, fopAcM_GetID(this), 0); if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SWIM_e)) { dComIfGp_particle_setShipTail( - dPa_name::ID_COMMON_003F, + dPa_name::ID_IT_JN_WP_HAMON03, ¤t.pos, NULL, (cXyz*)&ripple_scale, @@ -1096,7 +1096,7 @@ BOOL daPy_lk_c::dProcDead() { acStack_30.y += 0x8000; } dComIfGp_particle_setP1( - dPa_name::ID_COMMON_0314, ¤t.pos, &acStack_30, NULL, 0xff, NULL, -1, &amb + dPa_name::ID_AK_JN_DROWNINGSPLASH00, ¤t.pos, &acStack_30, NULL, 0xff, NULL, -1, &amb ); } else { if (frameCtrl.checkPass(50.0f)) { @@ -1223,13 +1223,13 @@ BOOL daPy_lk_c::dProcTalismanWait_init() { setSingleMoveAnime(ANM_WAITPICKUP, 1.0f, 0.0f, -1, m_HIO->mHoldup.m.field_0x48); mVelocity = 0.0f; setTalismanModel(); - m32E4.makeEmitter(dPa_name::ID_COMMON_03E9, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_IT_JN_OMAMORI_TSUBU00, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); mpEquipItemModel->setBaseTRMtx(mpCLModel->getAnmMtx(12)); mDoMtx_stack_c::copy(mpCLModel->getAnmMtx(12)); f32 adjust = (cM_ssin(g_Counter.mTimer * 1512)); mDoMtx_stack_c::transM(7.0f, 0.0f, 15.0f + 3.0f * adjust); mDoMtx_stack_c::multVecZero(&m338C.getPos()); - dComIfGp_particle_setP1(dPa_name::ID_COMMON_03EA, &m338C.getPos(), NULL, NULL, 0xff, &m338C, -1); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_OMAMORI_FLASH00, &m338C.getPos(), NULL, NULL, 0xff, &m338C, -1); initShipRideUseItem(iVar2, 1); return true; } @@ -1759,7 +1759,7 @@ BOOL daPy_lk_c::dProcVorcanoFail_init() { speed.y = 18.0f; gravity = 0.0f; setSingleMoveAnime(ANM_LAVADAM, m_HIO->mRestart.m.field_0x0, 0.0f, -1, m_HIO->mRestart.m.field_0x4); - m32E4.makeEmitter(dPa_name::ID_SCENE_8078, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_SN_HIDARUMAFIRE, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); return true; } diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index c4b1a3f91..b7ce0d105 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -228,7 +228,7 @@ BOOL daPy_lk_c::procFanSwing() { mFanSwingCb.deleteCallBack(); } mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &local_6c); - dComIfGp_particle_setP1(dPa_name::ID_COMMON_004A, &local_6c, &shape_angle, NULL, 0xff, &mFanSwingCb, -1); + dComIfGp_particle_setP1(dPa_name::ID_AK_JN_LEAFFAN00, &local_6c, &shape_angle, NULL, 0xff, &mFanSwingCb, -1); } if (frameCtrl.getFrame() < 22.0f) { @@ -264,7 +264,7 @@ BOOL daPy_lk_c::procFanSwing() { } mpYuchw00Brk->setFrame(0.0f); m33E8.end(); - m33E8.makeEmitter(dPa_name::ID_COMMON_0032, mpYuchw00Model->getAnmMtx(2), &local_60, NULL); + m33E8.makeEmitter(dPa_name::ID_AK_JN_UCHIWAWIND00, mpYuchw00Model->getAnmMtx(2), &local_60, NULL); pJVar5 = m33E8.getEmitter(); if (pJVar5 != NULL) { pJVar5->setGlobalPrmColor(tevStr.mColorC0.r, tevStr.mColorC0.g, tevStr.mColorC0.b); @@ -281,7 +281,7 @@ BOOL daPy_lk_c::procFanSwing() { if (local_48.y >= current.pos.y - 50.0f) { int attrib_code = dComIfG_Bgsp()->GetAttributeCode(mGndChk); if (!strcmp(dComIfGp_getStartStageName(), "Adanmae")) { - dComIfGp_particle_setP1(dPa_name::ID_SCENE_8236, &local_48, &shape_angle); + dComIfGp_particle_setP1(dPa_name::ID_AK_SN_VOLCANICASHESFAN00, &local_48, &shape_angle); } dPa_control_c::mSmokeEcallback.onWindOff(); int iStack_84; @@ -372,13 +372,13 @@ BOOL daPy_lk_c::procFanGlide() { m34D2--; } if (frameCtrl.checkPass(4.0f)) { - JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_004B, ¤t.pos); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_AK_JN_LEAFPARACHUTE00, ¤t.pos); if (emitter) { emitter->setGlobalRTMatrix(mpCLModel->getAnmMtx(0xf)); } } if (frameCtrl.getRate() < 0.01f && mProcVar0.m3570 == 0 && m32E4.getEmitter() == NULL) { - m32E4.makeEmitter(dPa_name::ID_COMMON_004C, mpCLModel->getAnmMtx(0xf), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_JN_LEAFPARACHUTE01, mpCLModel->getAnmMtx(0xf), ¤t.pos, NULL); } if (frameCtrl.getFrame() > 2.0f || mProcVar0.m3570 != 0) { diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc index 5202957e5..b108b39d9 100644 --- a/src/d/actor/d_a_player_hammer.inc +++ b/src/d/actor/d_a_player_hammer.inc @@ -72,15 +72,15 @@ void daPy_lk_c::setHammerQuake(cBgS_PolyInfo* param_1, const cXyz* param_2, int local_38.y = mDoMtx_stack_c::now[1][3]; local_38.z = mDoMtx_stack_c::now[2][3]; if (!fopAcM_getWaterY(&local_38, &local_54) || (local_54 < (5.0f + local_38.y))) { - emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0214, &local_38); + emitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_HM_SENKO00, &local_38); if (emitter != NULL) { emitter->setGlobalRTMatrix(mDoMtx_stack_c::get()); } - emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0215, &local_38); + emitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_HM_SENPU00, &local_38); if (emitter != NULL) { emitter->setGlobalRTMatrix(mDoMtx_stack_c::get()); } - emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0216, &local_38); + emitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_HM_SYOGEKI00, &local_38); if (emitter != NULL) { emitter->setGlobalRTMatrix(mDoMtx_stack_c::get()); } @@ -93,9 +93,9 @@ void daPy_lk_c::setHammerQuake(cBgS_PolyInfo* param_1, const cXyz* param_2, int } if (bVar2) { attrib_code = dBgS_Attr_WATER_e; - dComIfGp_particle_setP1(dPa_name::ID_COMMON_027C, &local_38); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_HM_WP00, &local_38); dComIfGp_particle_setShipTail( - dPa_name::ID_COMMON_003D, &local_38, NULL, NULL, 0xFF, &dPa_control_c::mSingleRippleEcallBack + dPa_name::ID_IT_JN_WP_HAMON01, &local_38, NULL, NULL, 0xFF, &dPa_control_c::mSingleRippleEcallBack ); } else { attrib_code = dComIfG_Bgsp()->GetAttributeCode(*param_1); @@ -146,14 +146,14 @@ void daPy_lk_c::setHammerWaterSplash() { mGndChk.SetPos(&local_28); if (!(local_50 < dComIfG_Bgsp()->GroundCross(&mGndChk) + 5.0f)) { local_28.y = local_50; - dComIfGp_particle_setP1(dPa_name::ID_COMMON_027C, &local_28); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_HM_WP00, &local_28); dComIfGp_particle_setShipTail( - dPa_name::ID_COMMON_003D, &local_28, NULL, NULL, 0xFF, &dPa_control_c::mSingleRippleEcallBack + dPa_name::ID_IT_JN_WP_HAMON01, &local_28, NULL, NULL, 0xFF, &dPa_control_c::mSingleRippleEcallBack ); GXColor amb, dif; dKy_get_seacolor(&amb, &dif); JPABaseEmitter* emitter = - dComIfGp_particle_setP1(dPa_name::ID_COMMON_0023, &local_28, NULL, NULL, 0xFF, NULL, -1, &amb); + dComIfGp_particle_setP1(dPa_name::ID_AK_JN_ELEMENTSHIBUKI00, &local_28, NULL, NULL, 0xFF, NULL, -1, &amb); if (emitter != NULL) { emitter->setRate(60.0f); emitter->setSpread(1.0f); diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 7b3185168..2513fbc4c 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -7702,7 +7702,7 @@ BOOL daPy_lk_c::procLargeDamage_init(int param_1, int param_2, s16 param_3, s16 if ((!strcmp(dComIfGp_getStartStageName(), "kinBOSS")) || (!strcmp(dComIfGp_getStartStageName(), "Xboss1"))) { - m32E4.makeEmitter(dPa_name::ID_SCENE_80F6, mpCLModel->getAnmMtx(0x1), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_SN_BKMHAKIDASHIHOUSHI00, mpCLModel->getAnmMtx(0x1), ¤t.pos, NULL); } dComIfGp_getVibration().StartShock(6, -0x21, cXyz(0.0f, 1.0f, 0.0f)); } else if (param_1 == -3) { @@ -8176,7 +8176,7 @@ BOOL daPy_lk_c::procLavaDamage_init() { mVelocity = 15.0f + (40.0f * dVar3); speed.y = 32.0f + (36.0f * dVar3); setSingleMoveAnime(ANM_LAVADAM, m_HIO->mRestart.m.field_0x0, 0.0f, -1, m_HIO->mRestart.m.field_0x4); - m32E4.makeEmitter(dPa_name::ID_SCENE_8078, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_SN_HIDARUMAFIRE, mpCLModel->getAnmMtx(0), ¤t.pos, NULL); voiceStart(4); seStartMapInfo(JA_SE_LK_FALL_MAGMA); current.angle.y = cM_atan2s(current.pos.x, current.pos.z); @@ -9687,7 +9687,7 @@ void daPy_lk_c::checkLightHit() { } if (mFanLightCps.ChkAtHit()) { if (m3438.getEmitter() == NULL) { - dComIfGp_particle_setP1(dPa_name::ID_SCENE_8232, ¤t.pos, NULL, NULL, 0xFF, + dComIfGp_particle_setP1(dPa_name::ID_AK_SN_HITSHIELDLIGHT00, ¤t.pos, NULL, NULL, 0xFF, &m3438); } cM3d_lineVsPosSuisenCross(mFanLightCps.GetStart(), mFanLightCps.GetEnd(), @@ -9721,7 +9721,7 @@ void daPy_lk_c::checkLightHit() { checkResetFlg0(daPyRFlg0_UNK200000)) { if (m342C.getEmitter() == NULL) { - m342C.makeEmitter(dPa_name::ID_SCENE_8226, mpEquippedShieldModel->getBaseTRMtx(), + m342C.makeEmitter(dPa_name::ID_AK_SN_MIRRORSHIELD00, mpEquippedShieldModel->getBaseTRMtx(), ¤t.pos, NULL); } } else if (m342C.getEmitter() != NULL) { @@ -9978,7 +9978,7 @@ void daPy_lk_c::setCollision() { } } JPABaseEmitter* emitter1 = dComIfGp_particle_setP1( - dPa_name::ID_COMMON_0025, + dPa_name::ID_AK_JN_ROUNDATTACK00, ¤t.pos, &shape_angle, NULL, @@ -9990,7 +9990,7 @@ void daPy_lk_c::setCollision() { NULL ); JPABaseEmitter* emitter2 = dComIfGp_particle_setP1( - dPa_name::ID_COMMON_0026, + dPa_name::ID_AK_JN_ROUNDATTACK01, ¤t.pos, &shape_angle, NULL, @@ -10002,7 +10002,7 @@ void daPy_lk_c::setCollision() { NULL ); JPABaseEmitter* emitter3 = dComIfGp_particle_setP1( - dPa_name::ID_COMMON_0028, + dPa_name::ID_AK_JN_ROUNDATTACK02, ¤t.pos, &shape_angle, NULL, @@ -10173,7 +10173,7 @@ void daPy_lk_c::setCollision() { 0 ); mpYbafo00Model->setBaseTRMtx(mDoMtx_stack_c::get()); - JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0049, &sp88); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_AK_JN_UCHIWAWIND01, &sp88); if (emitter != NULL) { emitter->setGlobalRTMatrix(mDoMtx_stack_c::get()); emitter->setGlobalPrmColor(tevStr.mColorK0.r, tevStr.mColorK0.g, tevStr.mColorK0.b); @@ -12695,7 +12695,7 @@ cPhs_State daPy_lk_c::makeBgWait() { m357C = m3580; if (sceneMode == 4) { mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &local_50); - dComIfGp_particle_setP1(dPa_name::ID_SCENE_8089, &local_50); + dComIfGp_particle_setP1(dPa_name::ID_AK_SN_OSHIRIKUROKOGE, &local_50); } if ((dComIfGs_getLastSceneMode() & 0x8000) != 0) { changeDragonShield(0); diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index 1590ff7ef..b7c608dca 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -646,7 +646,7 @@ void daPy_lk_c::setWaterRipple() { ) { if (m3280.getEmitter() == NULL) { - dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, ¤t.pos, NULL, NULL, 0xFF, &m3280); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, ¤t.pos, NULL, NULL, 0xFF, &m3280); } f32 var_f1 = (0.1f * std::fabsf(getSpeedF())); @@ -661,7 +661,7 @@ void daPy_lk_c::setWaterRipple() { if (emitter != NULL && ((emitter->mGlobalParticleScale.x < 0.8f && checkNoResetFlg0(daPyFlg0_UNK80)) || (emitter->mGlobalParticleScale.x > 0.8f && !checkNoResetFlg0(daPyFlg0_UNK80)))) { m3280.remove(); - emitter = dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, ¤t.pos, NULL, NULL, 0xFF, &m3280); + emitter = dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, ¤t.pos, NULL, NULL, 0xFF, &m3280); } if (emitter != NULL) { @@ -762,7 +762,7 @@ void daPy_lk_c::setWaterRipple() { if (((mAcch.ChkGroundHit() || checkModeFlg(ModeFlg_SWIM)) && mCurrAttributeCode == dBgS_Attr_WATERFALL_e) || (checkModeFlg(ModeFlg_HANG) && m3588 == 0x17)) { if (m3400.getEmitter() == NULL) { - m3400.makeEmitter(dPa_name::ID_COMMON_0023, mpCLModel->getAnmMtx(15), ¤t.pos, NULL); + m3400.makeEmitter(dPa_name::ID_AK_JN_ELEMENTSHIBUKI00, mpCLModel->getAnmMtx(15), ¤t.pos, NULL); JPABaseEmitter* emitter = m3400.getEmitter(); if (emitter != NULL) { @@ -776,7 +776,7 @@ void daPy_lk_c::setWaterRipple() { cXyz local_ac; mDoMtx_multVecZero(mpCLModel->getAnmMtx(0), &local_ac); - dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &local_ac, NULL, (cXyz*)&waterfall_ripple_scale); + dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON03, &local_ac, NULL, (cXyz*)&waterfall_ripple_scale); m34CD = 15; dComIfGp_getVibration().StartQuake(4, 1, cXyz(0.0f, 1.0f, 0.0f)); } else { @@ -825,14 +825,14 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa footEffect->setPos(i_pos); footEffect->setAngle(&angle); - if (effectID == dPa_name::ID_COMMON_0023) { + if (effectID == dPa_name::ID_AK_JN_ELEMENTSHIBUKI00) { if (checkNoResetFlg0(daPyFlg0_UNK80) && m35D0 > 10.0f + i_pos->y) { footEffect->getPos().y = m35D0 - 10.0f; } - } else if (mCurProc == daPyProc_CUT_ROLL_e && effectID == dPa_name::ID_COMMON_2022) { + } else if (mCurProc == daPyProc_CUT_ROLL_e && effectID == dPa_name::ID_AK_JT_ELEMENTSMOKE00) { effectID = -2; } else if (param_3 == 5) { - effectID = dPa_name::ID_COMMON_2027; + effectID = dPa_name::ID_AK_JT_ELEMENTSMOKE01; } s32 oldEffectID = footEffect->getID(); @@ -843,10 +843,10 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa } if (effectID == -2) { - emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_2022, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)m_HIO->mBasic.m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); - } else if (effectID == dPa_name::ID_COMMON_2022 || effectID == dPa_name::ID_COMMON_2027) { + emitter = dComIfGp_particle_setP1(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)m_HIO->mBasic.m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); + } else if (effectID == dPa_name::ID_AK_JT_ELEMENTSMOKE00 || effectID == dPa_name::ID_AK_JT_ELEMENTSMOKE01) { emitter = dComIfGp_particle_setToonP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&smoke_scale, (u8)m_HIO->mBasic.m.field_0x2, footEffect->getSmokeCallBack(), fopAcM_GetRoomNo(this)); - } else if (effectID == dPa_name::ID_COMMON_0024) { + } else if (effectID == dPa_name::ID_AK_JN_ELEMENTKUSA00) { GXColor color = {tevStr.mColorC0.r, tevStr.mColorC0.g, tevStr.mColorC0.b, tevStr.mColorC0.a}; emitter = dComIfGp_particle_setP1(effectID, &footEffect->getPos(), &footEffect->getAngle(), (cXyz*)&grass_scale, 0xFF, footEffect->getOtherCallBack(), -1, &color, &tevStr.mColorK0); } else { @@ -860,13 +860,13 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa } if (effectID == -2) { - effectID = dPa_name::ID_COMMON_2022; + effectID = dPa_name::ID_AK_JT_ELEMENTSMOKE00; } } if (emitter != NULL) { if (param_3 == 5) { - if (effectID == dPa_name::ID_COMMON_2027) { + if (effectID == dPa_name::ID_AK_JT_ELEMENTSMOKE01) { emitter->setLifeTime(40); emitter->setRate(10.0f); emitter->setEmitterScale(heavy_emit_smoke_scale); @@ -875,7 +875,7 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa } else { emitter->setRate(15.0f); emitter->setSpread(1.0f); - if (effectID == dPa_name::ID_COMMON_0024) { + if (effectID == dPa_name::ID_AK_JN_ELEMENTKUSA00) { emitter->setDirectionalSpeed(12.0f); } } @@ -886,7 +886,7 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa emitter->setRate(8.0f); emitter->setSpread(0.3f); } else if (param_3 == 2) { - if (effectID == dPa_name::ID_COMMON_0024) { + if (effectID == dPa_name::ID_AK_JN_ELEMENTKUSA00) { emitter->setGlobalScale(run_grass_scale); emitter->setRate(10.0f); emitter->setSpread(1.0f); @@ -896,7 +896,7 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa emitter->setSpread(1.0f); emitter->setGlobalScale(run_splash_scale); } - } else if (param_3 == 4 && effectID == dPa_name::ID_COMMON_0023) { + } else if (param_3 == 4 && effectID == dPa_name::ID_AK_JN_ELEMENTSHIBUKI00) { emitter->setRate(3.0f); emitter->setSpread(0.2f); } else { @@ -954,7 +954,7 @@ void daPy_lk_c::setFootEffect() { GXColor amb, dif; dKy_get_seacolor(&amb, &dif); - JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0023, &p, NULL, NULL, 0xFF, &m3410, -1, &amb); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_AK_JN_ELEMENTSHIBUKI00, &p, NULL, NULL, 0xFF, &m3410, -1, &amb); if (emitter != NULL) { emitter->setLifeTime(15); emitter->setRate(4.0f); @@ -969,7 +969,7 @@ void daPy_lk_c::setFootEffect() { if (strcmp(dComIfGp_getStartStageName(), "Adanmae") == 0) { if (checkResetFlg0(daPyRFlg0_UNK10)) { if (getFootOnGround() && m35D0 <= current.pos.y) { - dComIfGp_particle_setP1(dPa_name::ID_SCENE_8237, &pos, ¤t.angle); + dComIfGp_particle_setP1(dPa_name::ID_AK_SN_VOLCANICASHESRUN00, &pos, ¤t.angle); } } } @@ -982,7 +982,7 @@ void daPy_lk_c::setFootEffect() { s32 var_r29; if ( checkResetFlg0(daPyRFlg0_UNK10) && getFootOnGround() && - (checkHeavyStateOn() || effectID == dPa_name::ID_COMMON_0023 || effectID == dPa_name::ID_COMMON_0024) + (checkHeavyStateOn() || effectID == dPa_name::ID_AK_JN_ELEMENTSHIBUKI00 || effectID == dPa_name::ID_AK_JN_ELEMENTKUSA00) ) { if (getRightFootOnGround()) { m34BE = 2; @@ -1089,12 +1089,12 @@ void daPy_lk_c::setSwimTail() { static JGeometry::TVec3 tail_scale(1.0f, 1.0f, -1.0f); if (mSwimTailEcallBack[0].getEmitter() == NULL) { - dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003A, &mSwimTailEcallBack[0].getPos(), ¤t.angle, &scale, 0xFF, &mSwimTailEcallBack[0]); + dComIfGp_particle_setShipTail(dPa_name::ID_IT_JN_LK_SWIMK_L, &mSwimTailEcallBack[0].getPos(), ¤t.angle, &scale, 0xFF, &mSwimTailEcallBack[0]); mSwimTailEcallBack[0].onRightFlg(); } if (mSwimTailEcallBack[1].getEmitter() == NULL) { - dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003A, &mSwimTailEcallBack[1].getPos(), ¤t.angle, &scale, 0xFF, &mSwimTailEcallBack[1]); + dComIfGp_particle_setShipTail(dPa_name::ID_IT_JN_LK_SWIMK_L, &mSwimTailEcallBack[1].getPos(), ¤t.angle, &scale, 0xFF, &mSwimTailEcallBack[1]); } } @@ -1104,7 +1104,7 @@ void daPy_lk_c::setCutWaterSplash() { cXyz pos; mDoMtx_multVecZero(mpCLModel->getAnmMtx(4), &pos); - dComIfGp_particle_setP1(dPa_name::ID_COMMON_0039, &pos); + dComIfGp_particle_setP1(dPa_name::ID_IT_JN_LK_NURE_SHIBUKI00, &pos); } } @@ -1113,7 +1113,7 @@ void daPy_lk_c::setSwimWaterDrop(daPy_waterDropEcallBack_c* callBack) { f32 tmp = m35D0 + 10.0f; if (checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP) || !checkNoResetFlg0(daPy_lk_c::daPyFlg0_UNK80) || (callBack->getPos().y > tmp && !checkModeFlg(ModeFlg_SWIM))) { if (callBack->getEmitter() == NULL && (callBack->checkReady() || checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP))) { - JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0038, &callBack->getPos(), NULL, NULL, 0xFF, callBack); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_LK_NURE_POTA00, &callBack->getPos(), NULL, NULL, 0xFF, callBack); if (emitter != NULL) { emitter->setParticleCallBackPtr(daPy_waterDropEcallBack_c::getPcallBack()); @@ -1161,11 +1161,11 @@ void daPy_lk_c::setWaterDrop() { mAcch.GetRoofHeight() == G_CM3D_F_INF ) { if (m3460[0].getEmitter() == NULL) { - m3460[0].makeEmitter(dPa_name::ID_COMMON_0432, mpCLModel->getAnmMtx(0x0E), ¤t.pos, NULL); + m3460[0].makeEmitter(dPa_name::ID_AK_JN_LK_NURE_POTA01, mpCLModel->getAnmMtx(0x0E), ¤t.pos, NULL); } if (m3460[1].getEmitter() == NULL) { - m3460[1].makeEmitter(dPa_name::ID_COMMON_0432, mpCLModel->getAnmMtx(0x02), ¤t.pos, NULL); + m3460[1].makeEmitter(dPa_name::ID_AK_JN_LK_NURE_POTA01, mpCLModel->getAnmMtx(0x02), ¤t.pos, NULL); } m334C.end(); @@ -1197,7 +1197,7 @@ void daPy_lk_c::setDamageFlameEmitter() { for (int i = 0; i < (s32)ARRAY_SIZE(mDmEcallBack); i++, jointNoP++, dmECB++) { cXyz jointPos; mDoMtx_multVecZero(mpCLModel->getAnmMtx(*jointNoP), &jointPos); - dmECB->makeEmitter(dPa_name::ID_COMMON_03F1, mpCLModel->getAnmMtx(*jointNoP), &jointPos, NULL); + dmECB->makeEmitter(dPa_name::ID_AK_JN_BODYABLAZE00, mpCLModel->getAnmMtx(*jointNoP), &jointPos, NULL); if (dmECB->getEmitter() == NULL) { continue; } @@ -1215,7 +1215,7 @@ void daPy_lk_c::setDamageCurseEmitter() { if (!daPy_dmEcallBack_c::checkCurse()) { endDamageEmitter(); - mDmEcallBack[0].makeEmitter(dPa_name::ID_SCENE_815B, mpCLModel->getAnmMtx(0x1E), ¤t.pos, NULL); + mDmEcallBack[0].makeEmitter(dPa_name::ID_AK_SN_BUBBLECURSE00, mpCLModel->getAnmMtx(0x1E), ¤t.pos, NULL); if (checkUpperReadyThrowAnime()) { resetActAnimeUpper(UPPER_MOVE2_e, -1.0f); @@ -1232,8 +1232,8 @@ void daPy_lk_c::setDamageElecEmitter() { if (!daPy_dmEcallBack_c::checkElec()) { endDamageEmitter(); - mDmEcallBack[0].makeEmitter(dPa_name::ID_COMMON_03ED, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); - mDmEcallBack[1].makeEmitter(dPa_name::ID_COMMON_03EE, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); + mDmEcallBack[0].makeEmitter(dPa_name::ID_AK_JN_CCTHUNDER00, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); + mDmEcallBack[1].makeEmitter(dPa_name::ID_AK_JN_CCTHUNDER01, mpCLModel->getAnmMtx(4), ¤t.pos, NULL); } daPy_dmEcallBack_c::setElec(m_HIO->mDam.mElecDamage.m.field_0x2); @@ -1263,7 +1263,7 @@ void daPy_lk_c::endFlameDamageEmitter() { mDoMtx_multVecZero(mDmEcallBack[i].getMtx(), &pos); pos.y = m35D0; - dComIfGp_particle_set(dPa_name::ID_COMMON_035A, &pos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_EVAPORATION00, &pos); } } @@ -1311,12 +1311,12 @@ BOOL daPy_lk_c::setItemWaterEffect(fopAc_ac_c* i_actor, BOOL inWater, BOOL trigg pos = i_actor->old.pos * var_f31 + i_actor->current.pos * (1.0f - var_f31); } - dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003D, &pos, NULL, &eff_scale0); - dComIfGp_particle_setSingleRipple(dPa_name::ID_COMMON_003F, &pos, NULL, &eff_scale0); + dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON01, &pos, NULL, &eff_scale0); + dComIfGp_particle_setSingleRipple(dPa_name::ID_IT_JN_WP_HAMON03, &pos, NULL, &eff_scale0); GXColor amb, dif; dKy_get_seacolor(&amb, &dif); - JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0023, &pos, NULL, &eff_scale2, 0xFF, NULL, -1, &amb); + JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_AK_JN_ELEMENTSHIBUKI00, &pos, NULL, &eff_scale2, 0xFF, NULL, -1, &amb); if (emitter != NULL) { emitter->setMaxFrame(1); diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc index c2a55fb5b..da1cc266c 100644 --- a/src/d/actor/d_a_player_rope.inc +++ b/src/d/actor/d_a_player_rope.inc @@ -158,7 +158,7 @@ BOOL daPy_lk_c::checkRopeSwingWall(cXyz* r4, cXyz* r5, s16* r6, f32* r7) { foot_effect->setAngle(&angle); JPABaseEmitter* emitter = dComIfGp_particle_setToonP1( - dPa_name::ID_COMMON_2022, + dPa_name::ID_AK_JT_ELEMENTSMOKE00, &foot_effect->getPos(), &foot_effect->getAngle(), NULL, m_HIO->mBasic.m.field_0x2, foot_effect->getSmokeCallBack(), fopAcM_GetRoomNo(this) diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc index 44b498f09..99adf7969 100644 --- a/src/d/actor/d_a_player_swim.inc +++ b/src/d/actor/d_a_player_swim.inc @@ -337,7 +337,7 @@ BOOL daPy_lk_c::procSwimUp_init(BOOL param_1) { onNoResetFlg0(daPyFlg0_UNK100); if (param_1) { - mEmitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0040, ¤t.pos); + mEmitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_WP_SHIBUKI, ¤t.pos); if (mEmitter) { mEmitter->setRate(15.0f); @@ -345,7 +345,7 @@ BOOL daPy_lk_c::procSwimUp_init(BOOL param_1) { mEmitter->setGlobalParticleScale(splash_scale); } - mEmitter = dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003D, ¤t.pos, NULL, NULL, 0xFF, &dPa_control_c::mSingleRippleEcallBack); + mEmitter = dComIfGp_particle_setShipTail(dPa_name::ID_IT_JN_WP_HAMON01, ¤t.pos, NULL, NULL, 0xFF, &dPa_control_c::mSingleRippleEcallBack); if (mEmitter) { mEmitter->setGlobalDynamicsScale(ripple_scale); diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 1c417f12d..6e6ac0da9 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -172,7 +172,7 @@ void daPy_lk_c::setLightSaver() { { simpleAnmPlay(mpSwordBtk); if ((m3454.getEmitter() == NULL) && (checkChanceMode() || checkNoResetFlg1(daPyFlg1_SOUP_POWER_UP))) { - pJVar7 = m3454.makeEmitter(dPa_name::ID_COMMON_0309, mpSwordModel1->getAnmMtx(2), ¤t.pos, NULL); + pJVar7 = m3454.makeEmitter(dPa_name::ID_AK_JN_LIGHTSAVER00, mpSwordModel1->getAnmMtx(2), ¤t.pos, NULL); if (pJVar7 != 0) { if (checkMasterSwordEquip()) { pJVar7->setGlobalDynamicsScale(d_scale); @@ -210,7 +210,7 @@ void daPy_lk_c::setLightSaver() { pbVar8 = &s_env1; } pJVar7 = dComIfGp_particle_setP1( - dPa_name::ID_COMMON_030A, ¤t.pos, NULL, NULL, 0xFF, NULL, -1, pbVar9, pbVar8, NULL + dPa_name::ID_AK_JN_LIGHTSAVER01, ¤t.pos, NULL, NULL, 0xFF, NULL, -1, pbVar9, pbVar8, NULL ); if (pJVar7 != 0) { pJVar7->setGlobalRTMatrix(mpEquipItemModel->getAnmMtx(2)); @@ -516,7 +516,7 @@ int daPy_lk_c::changeCutReverseProc(daPy_ANM param_0) { JPABaseEmitter* emitter; if (attrib_code == dBgS_Attr_WOOD_e) { emitter = dComIfGp_particle_setP1( - dPa_name::ID_COMMON_002B, + dPa_name::ID_AK_JN_ELEMENTKIKUZU00, mLinkLinChk.GetCrossP(), &local_44, NULL, @@ -535,7 +535,7 @@ int daPy_lk_c::changeCutReverseProc(daPy_ANM param_0) { } else { local_44.x += 0x4000; emitter = - dComIfGp_particle_setP1(dPa_name::ID_COMMON_002C, mLinkLinChk.GetCrossP(), &local_44); + dComIfGp_particle_setP1(dPa_name::ID_AK_JN_ELEMENTHIBANA00, mLinkLinChk.GetCrossP(), &local_44); if (emitter != 0) { emitter->setAwayFromAxisSpeed(20.0f); emitter->setRate(20.0f); @@ -1388,21 +1388,21 @@ BOOL daPy_lk_c::procCutTurn_init(int param_0) { offResetFlg0(daPyRFlg0_UNK8000000); mAtCyl.SetR(m35A4 * 0.5f); if (!checkNoResetFlg0(daPyFlg0_UNK80000000)) { - m32E4.makeEmitter(dPa_name::ID_COMMON_001E, mpCLModel->getAnmMtx(0x28), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_JN_ROUNDATTACKTOE, mpCLModel->getAnmMtx(0x28), ¤t.pos, NULL); if (mCurrAttributeCode == dBgS_Attr_GRASS_e) { GXColor color = {tevStr.mColorC0.r, tevStr.mColorC0.g, tevStr.mColorC0.b, tevStr.mColorC0.a}; m32F0.makeEmitterColor( - dPa_name::ID_COMMON_0021, mpCLModel->getAnmMtx(0x23), ¤t.pos, &color, &tevStr.mColorK0 + dPa_name::ID_AK_JN_ROUNDATTACKKUSA, mpCLModel->getAnmMtx(0x23), ¤t.pos, &color, &tevStr.mColorK0 ); m35A0 = 18.0f; } else if (mCurrAttributeCode == dBgS_Attr_WATER_e) { GXColor amb, dif; dKy_get_seacolor(&amb, &dif); - m32F0.makeEmitterColor(dPa_name::ID_COMMON_0020, mpCLModel->getAnmMtx(0x23), ¤t.pos, &amb, NULL); + m32F0.makeEmitterColor(dPa_name::ID_AK_JN_ROUNDATTACKSHIBUKI, mpCLModel->getAnmMtx(0x23), ¤t.pos, &amb, NULL); m35A0 = 17.0f; } else { dComIfGp_particle_setToonP1( - dPa_name::ID_COMMON_201F, + dPa_name::ID_AK_JT_ROUNDATTACKSMOKE, ¤t.pos, NULL, NULL, @@ -1613,7 +1613,7 @@ BOOL daPy_lk_c::procCutRollEnd_init() { static JGeometry::TVec3 emitter_trans(0.0f, 55.0f, 0.0f); static JGeometry::TVec3 particle_scale(0.76f, 0.76f, 0.76f); JPABaseEmitter* emitter = - m33A8.makeEmitter(dPa_name::ID_COMMON_STARS_SPIN, mpCLModel->getAnmMtx(15), ¤t.pos, NULL); + m33A8.makeEmitter(dPa_name::ID_IT_JN_PIYOPIYO00, mpCLModel->getAnmMtx(15), ¤t.pos, NULL); if (emitter != NULL) { emitter->becomeImmortalEmitter(); emitter->setVolumeSize(5); @@ -1687,8 +1687,8 @@ BOOL daPy_lk_c::procCutTurnMove_init() { dComIfGp_getMiniGameType() != 6) { pcVar4 = checkNormalSwordEquip() ? NULL : (cXyz*)&eff_scale; - m32E4.makeEmitter(dPa_name::ID_COMMON_0029, mpCLModel->getAnmMtx(8), ¤t.pos, pcVar4); - m32F0.makeEmitter(dPa_name::ID_COMMON_002A, mpCLModel->getAnmMtx(8), ¤t.pos, pcVar4); + m32E4.makeEmitter(dPa_name::ID_AK_JN_CHARGEPOWER00, mpCLModel->getAnmMtx(8), ¤t.pos, pcVar4); + m32F0.makeEmitter(dPa_name::ID_AK_JN_CHARGEPOWER01, mpCLModel->getAnmMtx(8), ¤t.pos, pcVar4); m34D0 = 0x2f; } else { m34D0 = -1; diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index 5d03a4055..c9e1acc97 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -274,7 +274,7 @@ BOOL daPy_lk_c::procTactWait_init(int r30) { initShipRideUseItem(r31, 2); m34D2 = -1; - m32E4.makeEmitter(dPa_name::ID_COMMON_0050, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_JN_TAKT00, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); mProcVar0.m3570 = r30; m34D8 = 0; m3574 = -1; @@ -552,7 +552,7 @@ BOOL daPy_lk_c::procTactPlay_init(s32 r27, int r30, int r31) { } } - m32E4.makeEmitter(dPa_name::ID_COMMON_0051, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_JN_TAKT01, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); m34D0 = 0; m3574 = r30; m3624 = 0; @@ -804,7 +804,7 @@ BOOL daPy_lk_c::procTactPlayOriginal_init() { mDoAud_tact_setStickPos(mProcVar0.m3570, m3574); mDoAud_tact_playArmSwing(mProcVar0.m3570, m3574); setTactModel(); - m32E4.makeEmitter(dPa_name::ID_COMMON_0051, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); + m32E4.makeEmitter(dPa_name::ID_AK_JN_TAKT01, mpEquipItemModel->getBaseTRMtx(), ¤t.pos, NULL); m34D6 = 0xF; m34DA = 0; mDoAud_taktModeMute(); diff --git a/src/d/actor/d_a_player_vomit.inc b/src/d/actor/d_a_player_vomit.inc index 68c3c83f4..45fe421d8 100644 --- a/src/d/actor/d_a_player_vomit.inc +++ b/src/d/actor/d_a_player_vomit.inc @@ -169,7 +169,7 @@ BOOL daPy_lk_c::procVomitJump_init(int param_0) { m34D4 = 0; m34D0 = 2; m33A8.makeEmitterColor( - dPa_name::ID_SCENE_8112, + dPa_name::ID_IT_SN_LK_BLUR00, mpCLModel->getAnmMtx(0x12), ¤t.pos, (csXyz*)&shape_angle, diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 0d294a6c3..6c2993afc 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -205,7 +205,7 @@ void action_dousa(pw_class* i_this) { i_this->m3A4 = 0.0f; first_mode_change(i_this); i_this->m38C = fopAcM_searchPlayerAngleY(i_this); - JPABaseEmitter* particle = dComIfGp_particle_set(dPa_name::ID_SCENE_82EE, &i_this->m2CC, &i_this->shape_angle); + JPABaseEmitter* particle = dComIfGp_particle_set(dPa_name::ID_AK_SN_POUGETLAMP00, &i_this->m2CC, &i_this->shape_angle); if (particle != NULL) { particle->setGlobalRTMatrix(i_this->mpMorf->getModel()->getAnmMtx(0x17)); // j_pw_item_r1 joint } diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index a7a0cd6f7..109bb4d6e 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -656,7 +656,7 @@ bool daRd_c::checkTgHit() { } break; case AT_TYPE_GRAPPLING_HOOK: - 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 = 0xE; r29 = false; @@ -671,16 +671,16 @@ bool daRd_c::checkTgHit() { cXyz* hitPos = mCyl.GetTgHitPosP(); cc_at_check(this, &atInfo); if (mHitType == 1 || mHitType == 7 || mHitType == 8 || health <= 0) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0010, mCyl.GetTgHitPosP()); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, mCyl.GetTgHitPosP()); cXyz scale(2.0f, 2.0f, 2.0f); - dComIfGp_particle_set(dPa_name::ID_COMMON_BIG_HIT, hitPos, &player->shape_angle, &scale); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHIT, hitPos, &player->shape_angle, &scale); if (health <= 0) { modeProcInit(MODE_DEATH); } else { modeProcInit(MODE_DAMAGE); } } 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); modeProcInit(MODE_DAMAGE); } } else if (mHitType == 0xE) { diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index cdd92b106..8c141ed74 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -79,7 +79,7 @@ bool daSalvage_c::CreateInit() { mSalvageHazureEventIdx = dComIfGp_evmng_getEventIdx("SALVAGE_HAZURE", 0xff); mSlvgGetItemLeftEventIdx = dComIfGp_evmng_getEventIdx("SLVG_GETITEM_LEFT", 0xff); mEventIdx = dComIfGp_evmng_getEventIdx("SLVG_HAZURE_LEFT", 0xff); - mEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0437, ¤t.pos); + mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_SALVAGELIGHT00, ¤t.pos); if (mEmitter != NULL) { mEmitter->setStatus(1); } diff --git a/src/d/actor/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp index 613cced35..3039a04f3 100644 --- a/src/d/actor/d_a_sbox.cpp +++ b/src/d/actor/d_a_sbox.cpp @@ -299,24 +299,24 @@ void daSbox_c::demoInitOpen() { mDoAud_subBgmStart(JA_BGM_OPEN_BOX); setFlag(2); - dComIfGp_particle_set(dPa_name::ID_COMMON_01F1, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_COMMON_01F2, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_COMMON_01F6, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_PAKAF, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_NAKAF, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_PAKAF_SOTO, ¤t.pos, ¤t.angle); cXyz scale; scale.set(0.7f, 1.0f, 1.0f); - JPABaseEmitter* pJVar1 = dComIfGp_particle_set(dPa_name::ID_COMMON_01F3, ¤t.pos, ¤t.angle); + JPABaseEmitter* pJVar1 = dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_UEF, ¤t.pos, ¤t.angle); if (pJVar1 != NULL) { pJVar1->setEmitterScale(scale); } - JPABaseEmitter* pJVar2 = dComIfGp_particle_set(dPa_name::ID_COMMON_01F4, ¤t.pos, ¤t.angle); + JPABaseEmitter* pJVar2 = dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_TSUBU, ¤t.pos, ¤t.angle); if (pJVar2 != NULL) { pJVar2->setEmitterScale(scale); } - mEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_01F5, ¤t.pos, ¤t.angle); + mEmitter = dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_VOLM, ¤t.pos, ¤t.angle); if (mEmitter != NULL) { m300 = 0; mEmitter->setGlobalAlpha(0); diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 90dbe6de0..c6689121a 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -2742,8 +2742,8 @@ BOOL daShip_c::procStartModeWarp() { m03BC.x = 0; m03BC.y = shape_angle.y + 0x8000; m03BC.z = 0; - dComIfGp_particle_set(dPa_name::ID_COMMON_0285, ¤t.pos, &shape_angle, NULL, 0xFF, &m1984, -1, &diff); - dComIfGp_particle_set(dPa_name::ID_COMMON_0285, ¤t.pos, &m03BC, NULL, 0xFF, &m1998, -1, &diff); + dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWARPSPLASH00, ¤t.pos, &shape_angle, NULL, 0xFF, &m1984, -1, &diff); + dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWARPSPLASH00, ¤t.pos, &m03BC, NULL, 0xFF, &m1998, -1, &diff); } if (pfVar2 != NULL) { pfVar2->current.pos.y = current.pos.y - 700.0f; @@ -2789,8 +2789,8 @@ BOOL daShip_c::procTactWarp_init() { m03BC.x = 0; m03BC.y = shape_angle.y + 0x8000; m03BC.z = 0; - dComIfGp_particle_set(dPa_name::ID_COMMON_0285, ¤t.pos, &shape_angle, NULL, 0xFF, &m1984, -1, amb); - dComIfGp_particle_set(dPa_name::ID_COMMON_0285, ¤t.pos, &m03BC, NULL, 0xFF, &m1998, -1, amb); + dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWARPSPLASH00, ¤t.pos, &shape_angle, NULL, 0xFF, &m1984, -1, amb); + dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWARPSPLASH00, ¤t.pos, &m03BC, NULL, 0xFF, &m1998, -1, amb); return TRUE; } @@ -2936,8 +2936,8 @@ BOOL daShip_c::procStartModeThrow() { amb.g = amb.g * 0.23529412f + 195.0f; amb.b = amb.b * 0.23529412f + 195.0f; current.pos.y = m03F4; - dComIfGp_particle_set(dPa_name::ID_SCENE_82D7, ¤t.pos, &shape_angle, NULL, 0xFF, NULL, -1, &amb); - dComIfGp_particle_set(dPa_name::ID_SCENE_82D8, ¤t.pos, &shape_angle, NULL, 0xFF, NULL, -1, &amb); + dComIfGp_particle_set(dPa_name::ID_IT_SN_FN_SHIBUKI00, ¤t.pos, &shape_angle, NULL, 0xFF, NULL, -1, &amb); + dComIfGp_particle_set(dPa_name::ID_IT_SN_FN_SHIBUKI01, ¤t.pos, &shape_angle, NULL, 0xFF, NULL, -1, &amb); current.pos.y = m03F4 - 50.0f; } } @@ -2990,29 +2990,29 @@ void daShip_c::setEffectData(float param_1, short param_2) { if (std::fabsf(speedF) > 3.0f && mFwdVel * speedF > 0.0f) { if (mFwdVel > 11.0f) { if (mWaveL.getEmitter() == NULL) { - mEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0037, &mEffPos, &shape_angle, NULL, 0xFF, &mWaveL); + mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWAVE00, &mEffPos, &shape_angle, NULL, 0xFF, &mWaveL); mWaveL.setTimer(20); if (mEmitter) { mEmitter->setDirection(wave_l_direction); } } if (mWaveR.getEmitter() == NULL) { - mEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0037, &mEffPos, &shape_angle, NULL, 0xFF, &mWaveR); + mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPWAVE00, &mEffPos, &shape_angle, NULL, 0xFF, &mWaveR); mWaveR.setTimer(20); if (mEmitter) { mEmitter->setDirection(wave_r_direction); } } if (mSplash.getEmitter() == NULL) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0035, &mEffPos, &shape_angle, NULL, 0xFF, &mSplash); + dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPSPLASH00, &mEffPos, &shape_angle, NULL, 0xFF, &mSplash); } } if (mTrack.getEmitter() == NULL) { - dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0036, ¤t.pos, &shape_angle, NULL, 0, &mTrack); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_SHIPTAIL00, ¤t.pos, &shape_angle, NULL, 0, &mTrack); } if (checkStateFlg((daSHIP_SFLG)(daSFLG_FLY_e | daSFLG_LAND_e))) { dKy_get_seacolor(&amb, &diff); - mEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0034, &mEffPos, &shape_angle, NULL, 0xFF, NULL, -1, &amb); + mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_SHIPIMPACT00, &mEffPos, &shape_angle, NULL, 0xFF, NULL, -1, &amb); if (mEmitter) { fVar1 = 10.0f; fVar2 = (-(speed.y - -15.0f) / 30.0f) * 50.0f + 10.0f; @@ -3330,7 +3330,7 @@ void daShip_c::setRopePos() { m1020.z = r3->z; if (mRipple.getEmitter() == NULL) { - dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &m1020, NULL, &ripple_scale, 0xFF, &mRipple); + dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &m1020, NULL, &ripple_scale, 0xFF, &mRipple); if (mRipple.getEmitter() != NULL) { mRipple.setRate(0.0f); @@ -3355,7 +3355,7 @@ void daShip_c::setRopePos() { if (m19AC.getEmitter() == NULL) { ropeSegments = mRopeLine.getPos(0); - emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0038, ropeSegments, NULL, NULL, 0xFF, &m19AC); + emitter = dComIfGp_particle_setP1(dPa_name::ID_IT_JN_LK_NURE_POTA00, ropeSegments, NULL, NULL, 0xFF, &m19AC); if(emitter) { emitter->setGlobalParticleScale(1.5f, 1.5f); @@ -3369,7 +3369,7 @@ void daShip_c::setRopePos() { dComIfGp_getVibration().StartShock(3, 1, cXyz(0.0f, 1.0f, 0.0f)); if (m19C0.getEmitter() == NULL) { - emitter = dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_0033, &m1074, NULL, &ripple_scale, 0xFF, &m19C0); + emitter = dComIfGp_particle_setShipTail(dPa_name::ID_AK_JN_HAMON00, &m1074, NULL, &ripple_scale, 0xFF, &m19C0); if (emitter) { emitter->setVolumeSize(30); diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp index c487c1c08..46e7a45d8 100644 --- a/src/d/actor/d_a_ssk.cpp +++ b/src/d/actor/d_a_ssk.cpp @@ -103,10 +103,10 @@ void nomal_move(ssk_class* i_this) { i_this->m2BA = 2; dComIfGp_particle_set( - dPa_name::ID_SCENE_816C, &i_this->actor.current.pos, NULL, NULL, 0xff, NULL, -1, &i_this->actor.tevStr.mColorK0, &i_this->actor.tevStr.mColorK0 + dPa_name::ID_IT_SN_TGSYOKU_ROCK00, &i_this->actor.current.pos, NULL, NULL, 0xff, NULL, -1, &i_this->actor.tevStr.mColorK0, &i_this->actor.tevStr.mColorK0 ); dComIfGp_particle_setToon( - dPa_name::ID_SCENE_A16D, &i_this->actor.current.pos, &i_this->actor.shape_angle, NULL, 0xb9, &i_this->m2D0, fopAcM_GetRoomNo(&i_this->actor) + dPa_name::ID_IT_ST_TGSYOKU_SMOKE00, &i_this->actor.current.pos, &i_this->actor.shape_angle, NULL, 0xb9, &i_this->m2D0, fopAcM_GetRoomNo(&i_this->actor) ); } break; diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index afa30ea9b..70148c11d 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -95,9 +95,9 @@ BOOL daSteamTag_c::createEmitter() { if (mEmitterNum < 8) { u16 particleID; if (((s16)cM_rndF(100.0f) % 2) != 0) { - particleID = dPa_name::ID_SCENE_808B; + particleID = dPa_name::ID_AK_SN_STEAM00; } else { - particleID = dPa_name::ID_SCENE_808C; + particleID = dPa_name::ID_AK_SN_STEAM01; } mpEmitter = dComIfGp_particle_setToon(particleID, ¤t.pos, ¤t.angle, &scale, getData()->steam_alpha); if (mpEmitter) { diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index ddb2e8dbe..33979a864 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -723,11 +723,11 @@ void Act_c::eff_break() { cXyz sp18; sp18.set(current.pos.x, current.pos.y + data().m04, current.pos.z); - dComIfGp_particle_set(dPa_name::ID_COMMON_03E3, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); + dComIfGp_particle_set(dPa_name::ID_IT_JN_STS_HAHEN, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); J3DModelData* pJVar1 = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPI_KOISHI); J3DAnmTexPattern* pJVar2 = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", ALWAYS_BTP_MPI_KOISHI); - JPABaseEmitter* pJVar3 = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_COMMON_03E2, &sp18); + JPABaseEmitter* pJVar3 = (JPABaseEmitter*)dComIfGp_particle_set(dPa_name::ID_IT_JN_M_STS_HAHEN, &sp18); if (pJVar3 != NULL) { dPa_J3DmodelEmitter_c* modelEmitter = new dPa_J3DmodelEmitter_c(pJVar3, pJVar1, tevStr, pJVar2, data().m88, 0); diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index 9517b910c..408dbd4f3 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -364,15 +364,15 @@ void Act_c::eff_b_break(unsigned short arg1) { /* 0000143C-000015D8 .text eff_break_ebrock__Q28daStone25Act_cFv */ void Act_c::eff_break_ebrock() { - eff_m_break(dPa_name::ID_COMMON_03F4, 2); - eff_b_break(dPa_name::ID_COMMON_03F3); + eff_m_break(dPa_name::ID_AK_JN_M_BREAKGREATROCK00, 2); + eff_b_break(dPa_name::ID_AK_JN_BREAKGREATROCK00); static cXyz offset_vec(0.0f, 250.0f, 0.0f); mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); mDoMtx_stack_c::multVec(&offset_vec, &m67C); - JPABaseEmitter* pJVar1 = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &m67C, NULL, NULL, 200, &m65C); + JPABaseEmitter* pJVar1 = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &m67C, NULL, NULL, 200, &m65C); if (pJVar1 != NULL) { pJVar1->setRate(30.0f); pJVar1->setMaxFrame(1); @@ -387,15 +387,15 @@ void Act_c::eff_break_ebrock() { /* 000015D8-00001774 .text eff_break_ekao__Q28daStone25Act_cFv */ void Act_c::eff_break_ekao() { - eff_m_break(dPa_name::ID_COMMON_03F8, 3); - eff_b_break(dPa_name::ID_COMMON_03F7); + eff_m_break(dPa_name::ID_AK_JN_M_BREAKFACEROCK00, 3); + eff_b_break(dPa_name::ID_AK_JN_BREAKFACEROCK00); static cXyz offset_vec(0.0f, 250.0f, 0.0f); mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); mDoMtx_stack_c::multVec(&offset_vec, &m67C); - JPABaseEmitter* pJVar1 = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &m67C, NULL, NULL, 200, &m65C); + JPABaseEmitter* pJVar1 = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &m67C, NULL, NULL, 200, &m65C); if (pJVar1 != NULL) { pJVar1->setRate(30.0f); pJVar1->setMaxFrame(1); @@ -410,15 +410,15 @@ void Act_c::eff_break_ekao() { /* 00001774-00001910 .text eff_break_ebrock2__Q28daStone25Act_cFv */ void Act_c::eff_break_ebrock2() { - eff_m_break(dPa_name::ID_COMMON_03F6, 2); - eff_b_break(dPa_name::ID_COMMON_03F5); + eff_m_break(dPa_name::ID_AK_JN_M_BREAKLITTLEROCK00, 2); + eff_b_break(dPa_name::ID_AK_JN_BREAKLITTLEROCK00); static cXyz offset_vec(0.0f, 100.0f, 0.0f); mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); mDoMtx_stack_c::multVec(&offset_vec, &m67C); - JPABaseEmitter* pJVar1 = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2027, &m67C, NULL, NULL, 200, &m65C); + JPABaseEmitter* pJVar1 = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE01, &m67C, NULL, NULL, 200, &m65C); if (pJVar1 != NULL) { pJVar1->setRate(30.0f); pJVar1->setMaxFrame(1); @@ -457,7 +457,7 @@ void Act_c::eff_lift_smoke_start() { cXyz sp1C; sp1C.setall(attr().m5C); - dComIfGp_particle_setToon(dPa_name::ID_COMMON_23F2, ¤t.pos, NULL, &sp1C, 0x80, &m688, -1, &color, &tev.mColorK0, NULL); + dComIfGp_particle_setToon(dPa_name::ID_AK_JT_LIFTROCKSMOKE00, ¤t.pos, NULL, &sp1C, 0x80, &m688, -1, &color, &tev.mColorK0, NULL); } } diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index 9729f8449..f5ce2c2af 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -138,7 +138,7 @@ static BOOL daSyan_Execute(syan_class* i_this) { if (!i_this->emtrEnabled[i]) { i_this->emtrEnabled[i] = true; static cXyz fire_scale(0.7f, 0.7f, 0.7f); - dComIfGp_particle_set(dPa_name::ID_COMMON_01EA, &i_this->partPos[i], NULL, &fire_scale, 0xFF, &i_this->emtrCallBack[i]); + dComIfGp_particle_set(dPa_name::ID_AK_JN_TORCH, &i_this->partPos[i], NULL, &fire_scale, 0xFF, &i_this->emtrCallBack[i]); } else { JPABaseEmitter* emtr = i_this->emtrCallBack[i].getEmitter(); if (emtr != NULL) { @@ -162,7 +162,7 @@ static BOOL daSyan_Execute(syan_class* i_this) { i_this->emtrCallBack[i].getEmitter()->setGlobalParticleScale(scale); cXyz pos(i_this->partPos[i].x, i_this->partPos[i].y + REG0_F(7) + 20.0f, i_this->partPos[i].z); - dComIfGp_particle_setSimple(dPa_name::ID_COMMON_4004, &pos); + dComIfGp_particle_setSimple(dPa_name::ID_AK_JP_O_KAGEROU00, &pos); } } } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 70d8ef36d..4a03f6905 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -668,14 +668,14 @@ void daTbox_c::demoInitAppear_Tact() { angle.y = current.angle.y; angle.z = current.angle.z; - dComIfGp_particle_set(dPa_name::ID_SCENE_82F1, ¤t.pos, &angle); - dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, ¤t.pos, &angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WINDCHEST01, ¤t.pos, &angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WINDCHEST00, ¤t.pos, &angle); angle.y += 0x5555; - dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, ¤t.pos, &angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WINDCHEST00, ¤t.pos, &angle); angle.y += 0x5555; - dComIfGp_particle_set(dPa_name::ID_SCENE_82F0, ¤t.pos, &angle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WINDCHEST00, ¤t.pos, &angle); fopAcM_seStart(this, JA_SE_OBJ_TRIFORCE_BOX_IN, 0); } @@ -684,8 +684,8 @@ void daTbox_c::demoInitAppear_Tact() { void daTbox_c::demoInitAppear() { fopAcM_seStart(this, JA_SE_OBJ_KOUBAKU_TBOX, 0); - dComIfGp_particle_set(dPa_name::ID_COMMON_03EB, ¤t.pos); - dComIfGp_particle_set(dPa_name::ID_COMMON_03EC, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_APPEARCHEST00, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_APPEARCHEST01, ¤t.pos); } /* 00001B38-00001CF4 .text demoProcAppear_Tact__8daTbox_cFv */ @@ -731,7 +731,7 @@ void daTbox_c::demoProcAppear() { } if (mAppearTimer == 0x05) { - JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_COMMON_2022, ¤t.pos, NULL, NULL, 0xB9, &mSmokeCB); + JPABaseEmitter* emitter = dComIfGp_particle_setToon(dPa_name::ID_AK_JT_ELEMENTSMOKE00, ¤t.pos, NULL, NULL, 0xB9, &mSmokeCB); if (emitter != NULL) { emitter->setRate(100.0f); @@ -891,13 +891,13 @@ void daTbox_c::OpenInit() { flagOn(daTboxFlg_OPENING_e); - dComIfGp_particle_set(dPa_name::ID_COMMON_01F1, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_COMMON_01F2, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_COMMON_01F3, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_COMMON_01F4, ¤t.pos, ¤t.angle); - dComIfGp_particle_set(dPa_name::ID_COMMON_01F6, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_PAKAF, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_NAKAF, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_UEF, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_TSUBU, ¤t.pos, ¤t.angle); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_PAKAF_SOTO, ¤t.pos, ¤t.angle); - mSmokeEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_01F5, ¤t.pos, ¤t.angle); + mSmokeEmitter = dComIfGp_particle_set(dPa_name::ID_IT_JN_TAKARA_VOLM, ¤t.pos, ¤t.angle); if (mSmokeEmitter != NULL) { mSmokeEmitter->mGlobalPrmColor.a = 0; } diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 4bbdf0025..70e3ae238 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -245,7 +245,7 @@ void daTitle_proc_c::calc_2d_alpha() { 0.0f ); - mpEmitter = dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83F9, &pos); + mpEmitter = dComIfGp_particle_set2Dback(dPa_name::ID_AK_S1_TITLESMOKE00, &pos); } else { pos.set( ((this->pane[4].mPosTopLeftOrig.x - 320.0f) - this->m094) + attr().field_0x30, @@ -286,7 +286,7 @@ void daTitle_proc_c::calc_2d_alpha() { m00C.set(pane[4].mPosTopLeftOrig.x - 320.0f, pane[4].mPosTopLeftOrig.y - 240.0f, 0.0f); - mpEmitter2 = dComIfGp_particle_set2Dfore(dPa_name::ID_SCENE_83FB, &m00C); + mpEmitter2 = dComIfGp_particle_set2Dfore(dPa_name::ID_AK_S2_TITLEKIRAKIRA00, &m00C); } else if (m018 > 80 && m018 <= 115 && mpEmitter2 != NULL) { m00C.x += (pane[5].mPosTopLeftOrig.x - pane[4].mPosTopLeftOrig.x) / 35.0f; @@ -316,7 +316,7 @@ void daTitle_proc_c::calc_2d_alpha() { } else { if (mpEmitter == NULL) { pos.set(pane[4].mPosTopLeftOrig.x - 320.0f, pane[4].mPosTopLeftOrig.y - 240.0f, 0.0f); - mpEmitter = dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83F9, &pos); + mpEmitter = dComIfGp_particle_set2Dback(dPa_name::ID_AK_S1_TITLESMOKE00, &pos); } else { pos.set( ((pane[4].mPosTopLeftOrig.x - 320.0f) - m094) + attr().field_0x30, @@ -359,7 +359,7 @@ void daTitle_proc_c::calc_2d_alpha() { angle.y = 0; angle.z = (s16)cM_rndFX(4000.0f); - dComIfGp_particle_set2Dback(dPa_name::ID_SCENE_83FA, &pos, &angle); + dComIfGp_particle_set2Dback(dPa_name::ID_AK_S1_TITLEWIND00, &pos, &angle); } else { m020 -= 1; } diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index 57a2e6d2d..b6de10fc3 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -175,7 +175,7 @@ BOOL daTornado_c::execute() { mPtclTimer -= 1; } else { mPtclTimer = 10; - dComIfGp_particle_set(dPa_name::ID_SCENE_8213, ¤t.pos, NULL, (cXyz*)&wind_scale); + dComIfGp_particle_set(dPa_name::ID_AK_SN_TORNADOWIND00, ¤t.pos, NULL, (cXyz*)&wind_scale); } fopAcM_seStartCurrent(this, JA_SE_OBJ_TORNADE_SUS, 100); @@ -321,7 +321,7 @@ cPhs_State daTornado_c::create() { dKyw_tornado_Notice(¤t.pos); mpModelUnder->setBaseScale(under_scale); mCenter = current.pos; - dComIfGp_particle_set(dPa_name::ID_SCENE_81BB, &mCenter, NULL, NULL, 0xFF, &mPtclCb); + dComIfGp_particle_set(dPa_name::ID_AK_SN_WINDUPWATER00, &mCenter, NULL, NULL, 0xFF, &mPtclCb); fopAcM_OnStatus(this, fopAcStts_SHOWMAP_e); } mDoMtx_stack_c::transS(current.pos); diff --git a/src/d/actor/d_a_tpota.cpp b/src/d/actor/d_a_tpota.cpp index c3ee58c7e..826c73239 100644 --- a/src/d/actor/d_a_tpota.cpp +++ b/src/d/actor/d_a_tpota.cpp @@ -13,7 +13,7 @@ #include "d/d_particle.h" #include "d/d_com_inf_game.h" -const u16 l_daTpota_idx_table[2] = {dPa_name::ID_SCENE_82AE, dPa_name::ID_SCENE_82AF}; +const u16 l_daTpota_idx_table[2] = {dPa_name::ID_IT_SN_TAKIURA_POTAA00, dPa_name::ID_IT_SN_TAKIURA_POTAB00}; /* 00000078-000001D0 .text _create__9daTpota_cFv */ cPhs_State daTpota_c::_create() { @@ -46,7 +46,7 @@ bool daTpota_c::_delete() { /* 00000298-000002FC .text make_ripple__9daTpota_cF4cXyz */ void daTpota_c::make_ripple(cXyz i_position) { - dComIfGp_particle_set(dPa_name::ID_SCENE_82B0, &i_position, + dComIfGp_particle_set(dPa_name::ID_IT_SN_TAKIURA_HAMON00, &i_position, NULL, NULL, 0xff, NULL, -1, NULL, NULL, NULL); } diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index 973d633e1..7665d2b03 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -3091,14 +3091,14 @@ void Act_c::set_tensor_afl() { void Act_c::eff_drop_water() { for (s32 i = 0; i < ARRAY_SSIZE(m70C); i++) { if (m70C[i].isEnd()) { - dComIfGp_particle_set(dPa_name::ID_SCENE_8085, &m700, &shape_angle, NULL, 0xff, &m70C[i], -1, NULL, NULL, NULL); + dComIfGp_particle_set(dPa_name::ID_IT_SN_WPOT_PITYA, &m700, &shape_angle, NULL, 0xff, &m70C[i], -1, NULL, NULL, NULL); break; } } for (s32 i = 0; i < ARRAY_SSIZE(m748); i++) { if (m748[i].isEnd()) { - dComIfGp_particle_set(dPa_name::ID_SCENE_8092, &m700, &shape_angle, NULL, 0xff, &m748[i], -1, NULL, NULL, NULL); + dComIfGp_particle_set(dPa_name::ID_IT_SN_WPOT_PITYA_C, &m700, &shape_angle, NULL, 0xff, &m748[i], -1, NULL, NULL, NULL); break; } } @@ -3112,7 +3112,7 @@ void Act_c::eff_land_smoke() { /* 00006744-00006888 .text eff_break_barrel__Q27daTsubo5Act_cFv */ void Act_c::eff_break_barrel() { cXyz sp18(current.pos.x, current.pos.y + data().mAcchRoofHeight * 0.5f, current.pos.z); - JPABaseEmitter* pJVar1 = dComIfGp_particle_set(dPa_name::ID_COMMON_03E5, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); + JPABaseEmitter* pJVar1 = dComIfGp_particle_set(dPa_name::ID_IT_JN_TR_HAHEN_A, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); if (pJVar1 != NULL) { static JGeometry::TVec3 em_scl(1.0f, 0.8f, 1.0f); pJVar1->setEmitterScale(em_scl); @@ -3126,7 +3126,7 @@ void Act_c::eff_break_tsubo() { J3DModelData* pJVar2 = (J3DModelData*)(dComIfG_getObjectRes("Always", ALWAYS_BDL_MPM_TUBO)); J3DAnmTexPattern* pJVar3 = static_cast(dComIfG_getObjectRes("Always", ALWAYS_BTP_MPM_TUBO)); JPABaseEmitter* pJVar4 = - static_cast(dComIfGp_particle_set(dPa_name::ID_COMMON_0017, ¤t.pos, NULL, (cXyz*)data().get_particle_scale())); + static_cast(dComIfGp_particle_set(dPa_name::ID_AK_JN_M_TUBOHAHEN, ¤t.pos, NULL, (cXyz*)data().get_particle_scale())); if (pJVar4 != NULL) { dPa_J3DmodelEmitter_c* modelEmitter = new dPa_J3DmodelEmitter_c(pJVar4, pJVar2, tevStr, pJVar3, uVar1, 0); if (modelEmitter != NULL) { @@ -3140,7 +3140,7 @@ void Act_c::eff_break_tsubo() { color.b = tevStr.mColorC0.b; color.a = tevStr.mColorC0.a; dComIfGp_particle_set( - dPa_name::ID_COMMON_0018, + dPa_name::ID_AK_JN_TUBOKONAGONA, ¤t.pos, NULL, (cXyz*)data().get_particle_scale(), @@ -3158,7 +3158,7 @@ void Act_c::eff_break_stool() { cXyz sp18(current.pos.x, current.pos.y + 35.0f, current.pos.z); static cXyz particle_scl(1.0f, 0.8f, 1.0f); JPABaseEmitter* pJVar1 = - dComIfGp_particle_set(dPa_name::ID_COMMON_03E7, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0, &particle_scl); + dComIfGp_particle_set(dPa_name::ID_IT_JN_TR_HAHEN_C, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0, &particle_scl); if (pJVar1 != NULL) { pJVar1->setDirectionalSpeed(25.0f); } @@ -3169,7 +3169,7 @@ void Act_c::eff_break_stool() { void Act_c::eff_break_skull() { cXyz sp18(current.pos.x, current.pos.y + 20.0f, current.pos.z); - dComIfGp_particle_set(dPa_name::ID_COMMON_03E8, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); + dComIfGp_particle_set(dPa_name::ID_IT_JN_DOKURO00, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); daObjEff::Act_c::make_skull_smoke(&sp18); } @@ -3197,7 +3197,7 @@ void Act_c::eff_break_try() { void Act_c::eff_break_pinecone() { cXyz sp18(current.pos.x, current.pos.y + data().mAcchRoofHeight * 0.5f, current.pos.z); - dComIfGp_particle_set(dPa_name::ID_SCENE_816A, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); + dComIfGp_particle_set(dPa_name::ID_IT_SN_BOKKURI_MATSU00, &sp18, NULL, NULL, 0xff, NULL, -1, &tevStr.mColorK0, &tevStr.mColorK0); daObjEff::Act_c::make_pinecone_smoke(&sp18); } @@ -3225,7 +3225,7 @@ void Act_c::eff_hit_lava_splash() { /* 00006E50-00006ED4 .text eff_kutani_set__Q27daTsubo5Act_cFv */ void Act_c::eff_kutani_set() { if (m798 != 0 && --m798 == 0) { - dComIfGp_particle_set(dPa_name::ID_SCENE_814B, ¤t.pos, NULL, NULL, 0xff, &m784); + dComIfGp_particle_set(dPa_name::ID_AK_SN_KUTANIVESSEL, ¤t.pos, NULL, NULL, 0xff, &m784); } } diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 037d5a305..fea546797 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -264,14 +264,14 @@ void daWall_c::set_tri() { /* 00000D84-00000F74 .text set_effect__8daWall_cFv */ void daWall_c::set_effect() { u16 projection_id[] = { - dPa_name::ID_SCENE_A16E, - dPa_name::ID_SCENE_A170, - dPa_name::ID_SCENE_A172, + dPa_name::ID_IT_ST_SHIREN_WL1_HAHEN00, + dPa_name::ID_IT_ST_SHIREN_WL2_HAHEN00, + dPa_name::ID_IT_ST_SHIREN_WL3_HAHEN00, }; u16 particle_id[] = { - dPa_name::ID_SCENE_A16F, - dPa_name::ID_SCENE_A171, - dPa_name::ID_SCENE_A173, + dPa_name::ID_IT_ST_SHIREN_WL1_SMOKE00, + dPa_name::ID_IT_ST_SHIREN_WL2_SMOKE00, + dPa_name::ID_IT_ST_SHIREN_WL3_SMOKE00, }; csXyz local_28 = current.angle; diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index 2be33e667..4f8ad9418 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -468,7 +468,7 @@ BOOL daWarpdm20_c::set_effect(unsigned short arg1) { /* 000014CC-00001550 .text set_wpsenko__12daWarpdm20_cFv */ void daWarpdm20_c::set_wpsenko() { if (!m2F8) { - dComIfGp_particle_set(dPa_name::ID_SCENE_82BC, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_DEMO20_WPSENKO00, ¤t.pos); m2F8 = true; } } diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp index e0d60018b..2873f0af3 100644 --- a/src/d/actor/d_a_warpfout.cpp +++ b/src/d/actor/d_a_warpfout.cpp @@ -141,7 +141,7 @@ void daWarpfout_c::initWarp4(int) { fopAc_ac_c* link = dComIfGp_getLinkPlayer(); for (int i = 0; i < 6; i++) { - dComIfGp_particle_set(dPa_name::ID_SCENE_WARPFOUT_WARP4, &link->current.pos); + dComIfGp_particle_set(dPa_name::ID_AK_SN_DEMOWARPWIND00, &link->current.pos); } } @@ -164,7 +164,7 @@ void daWarpfout_c::set_effect_wind01(cXyz effectPos, s16 effectAngleZOffset) { csXyz effectAngle = get_effect_angle(); effectAngle.z += effectAngleZOffset; - dComIfGp_particle_set(dPa_name::ID_SCENE_830F, &effectPos, &effectAngle); + dComIfGp_particle_set(dPa_name::ID_AK_SN_DEMOWARPWIND01, &effectPos, &effectAngle); } /* 000005F4-00000670 .text get_effect_angle__12daWarpfout_cFv */ diff --git a/src/d/actor/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp index 2fcc4db95..5b317f0bc 100644 --- a/src/d/actor/d_a_warpgn.cpp +++ b/src/d/actor/d_a_warpgn.cpp @@ -113,9 +113,9 @@ void daWarpgn_c::CreateInit() { fopAcM_setCullSizeFar(this, 1.0f); set_mtx(); - mpEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_83FD, ¤t.pos); - mpEmitter2 = dComIfGp_particle_set(dPa_name::ID_SCENE_83FE, ¤t.pos); - mpEmitter3 = dComIfGp_particle_setProjection(dPa_name::ID_SCENE_C3FC, ¤t.pos); + mpEmitter1 = dComIfGp_particle_set(dPa_name::ID_IT_SN_MJWPA00, ¤t.pos); + mpEmitter2 = dComIfGp_particle_set(dPa_name::ID_IT_SN_MJWPB00, ¤t.pos); + mpEmitter3 = dComIfGp_particle_setProjection(dPa_name::ID_IT_SP_MJWPC00, ¤t.pos); if (mpEmitter1 != NULL) { mpEmitter1->stopCreateParticle(); diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index dc22839ee..90b4e4daf 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -187,7 +187,7 @@ bool daWarphr_c::_execute() { m2E4 = true; } } else { - m2B0 = dComIfGp_particle_setProjection(dPa_name::ID_SCENE_C2B9, ¤t.pos); + m2B0 = dComIfGp_particle_setProjection(dPa_name::ID_IT_SP_DEMO20_INDWP00, ¤t.pos); mDoGph_gInf_c::offMonotone(); } } @@ -275,8 +275,8 @@ BOOL daWarphr_c::actStartWarp(int) { /* 00000CF4-00000DEC .text initWarp__10daWarphr_cFi */ void daWarphr_c::initWarp(int) { - dComIfGp_particle_set(dPa_name::ID_SCENE_8291, ¤t.pos); - m2AC = dComIfGp_particle_set(dPa_name::ID_SCENE_8292, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_HRWARPA00, ¤t.pos); + m2AC = dComIfGp_particle_set(dPa_name::ID_IT_SN_HRWARPB00, ¤t.pos); mDoAud_seStart(JA_SE_LK_HL_WAPR_U_IN); } @@ -288,8 +288,8 @@ BOOL daWarphr_c::actWarp(int) { /* 00000E14-00000F70 .text initWarpArrive__10daWarphr_cFi */ void daWarphr_c::initWarpArrive(int) { - dComIfGp_particle_set(dPa_name::ID_SCENE_8291, ¤t.pos); - m2AC = dComIfGp_particle_set(dPa_name::ID_SCENE_8292, ¤t.pos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_HRWARPA00, ¤t.pos); + m2AC = dComIfGp_particle_set(dPa_name::ID_IT_SN_HRWARPB00, ¤t.pos); set_end_anim(); diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 1122ab398..865c3dccf 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -166,7 +166,7 @@ void daWindTag::daWindTag_c::CreateInit() { mEfColor.g = mEfTevStr.mColorC0.g; mEfColor.b = mEfTevStr.mColorC0.b; mEfColor.a = mEfTevStr.mColorC0.a; - mpEmitter = dComIfGp_particle_set(dPa_name::ID_SCENE_8290, ¤t.pos, NULL, &scale, 0xFF, NULL, fopAcM_GetRoomNo(this), &mEfColor); + mpEmitter = dComIfGp_particle_set(dPa_name::ID_AK_SN_AIRFLOWSPLASH00, ¤t.pos, NULL, &scale, 0xFF, NULL, fopAcM_GetRoomNo(this), &mEfColor); if (mpEmitter != NULL) mpEmitter->setGlobalScale(efScale); } diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index bffc6afef..0dc7903a2 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -130,7 +130,7 @@ void daYgcwp_c::init_mtx() { /* 00000588-000005F0 .text make_shine__9daYgcwp_cFv */ void daYgcwp_c::make_shine() { - dComIfGp_particle_set(dPa_name::ID_SCENE_8316, ¤t.pos, NULL, &scale); + dComIfGp_particle_set(dPa_name::ID_AK_SN_GANONCASTLEWARP00, ¤t.pos, NULL, &scale); } /* 000005F0-00000654 .text set_timer__9daYgcwp_cFv */ diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 55ef3c429..32d5fa0cc 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -143,7 +143,7 @@ cPhs_State daYkgr_c::_create() { if (m_emitter == NULL) { fopAc_ac_c* player = dComIfGp_getPlayer(0); current.pos = player->current.pos; - m_emitter = dComIfGp_particle_setProjection(dPa_name::ID_SCENE_C06D, ¤t.pos); + m_emitter = dComIfGp_particle_setProjection(dPa_name::ID_AK_SP_MTDRAGONKAGEROU, ¤t.pos); if (m_emitter != NULL) { m_emitter->setParticleCallBackPtr(&YkgrCB); YkgrCB.setParam(-3.0f); diff --git a/src/d/d_a_leaflift_static.cpp b/src/d/d_a_leaflift_static.cpp index bec7f2720..55afb2453 100644 --- a/src/d/d_a_leaflift_static.cpp +++ b/src/d/d_a_leaflift_static.cpp @@ -35,11 +35,11 @@ BOOL daLlift_c::MoveUpLift() { else if ((upVel != 0.0f) && (mbIsAscending == FALSE)) { fopAcM_seStart(this, JA_SE_OBJ_LOTUS_LIFT_UP, 0); mbIsAscending = TRUE; - mEmitter1 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AC, ¤t.pos, ¤t.angle); + mEmitter1 = dComIfGp_particle_set(dPa_name::ID_IT_SN_DEKLIFT_MIZUPOTA00, ¤t.pos, ¤t.angle); mEmitter2 = NULL; upLiftPos = current.pos; upLiftPos.y = mWaterY; - mEmitter4 = dComIfGp_particle_set(dPa_name::ID_SCENE_82AB, &upLiftPos, ¤t.angle); + mEmitter4 = dComIfGp_particle_set(dPa_name::ID_IT_SN_DEKLIFT_HAMONB00, &upLiftPos, ¤t.angle); mEmitterTimer = 0; if (mEmitter3) { mEmitter3->stopCreateParticle(); diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index a9031bd79..b04940f3b 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -20,7 +20,7 @@ namespace daObj { case dBgS_Attr_WATER_e: { scaleV.setall(scale * 0.85f); - JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_COMMON_0023, &ac->current.pos, NULL, &scaleV); + JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_AK_JN_ELEMENTSHIBUKI00, &ac->current.pos, NULL, &scaleV); if (pEmtr != NULL) { pEmtr->setRate(20.0f); pEmtr->setMaxFrame(1); @@ -32,7 +32,7 @@ namespace daObj { case dBgS_Attr_GRASS_e: { scaleV.setall(scale); - JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_COMMON_0024, &ac->current.pos, NULL, &scaleV); + JPABaseEmitter* pEmtr = dComIfGp_particle_set(dPa_name::ID_AK_JN_ELEMENTKUSA00, &ac->current.pos, NULL, &scaleV); if (pEmtr != NULL) { pEmtr->setLifeTime(20); pEmtr->setRate(50.0f); diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 4a1fee476..06f4ae489 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -310,17 +310,17 @@ void dCcS::ProcAtTgHitmark(bool, bool, cCcD_Obj* atObj, cCcD_Obj* tgObj, dCcD_GO if (!ChkShield(atObj, tgObj, atInf, tgInf)) { if (atInf->GetAtHitMark() == dCcG_AtHitMark_None_e) { return; } if (atInf->GetAtHitMark() == dCcG_AtHitMark_Unk1_e && tgInf->GetTgHitMark() == dCcG_TgHitMark_Unk1_e) { - dComIfGp_particle_set(dPa_name::ID_COMMON_STARS_BLOW, pos); + dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, pos); } else { csXyz angle; CalcParticleAngle(atInf, atStts, tgStts, &angle); if (atInf->GetAtHitMark() == dCcG_AtHitMark_Big_e) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0010, pos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, pos); cXyz scale; scale.x = scale.y = scale.z = 2.0f; - dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, pos, &angle, &scale); + dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, pos, &angle, &scale); } else if (atInf->GetAtHitMark() == dCcG_AtHitMark_Unk1_e) { - dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, pos, &angle); + dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, pos, &angle); } else { dComIfGp_particle_set(atInf->GetAtHitMark(), pos, &angle); } diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 9c8c6c69d..7d9288075 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -226,13 +226,13 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* tgActor, CcAtInfo* atInfo) { pauseTime = 6 + REG0_S(7); if (atInfo->pParticlePos) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0010, atInfo->pParticlePos); + dComIfGp_particle_set(dPa_name::ID_AK_JN_CRITICALHITFLASH, atInfo->pParticlePos); cXyz scale; scale.x = scale.y = scale.z = 2.0f; csXyz angle; angle.x = angle.z = 0; angle.y = fopAcM_searchPlayerAngleY(tgActor); - dComIfGp_particle_set(dPa_name::ID_COMMON_NORMAL_HIT, atInfo->pParticlePos, &angle, &scale); + dComIfGp_particle_set(dPa_name::ID_AK_JN_OK, atInfo->pParticlePos, &angle, &scale); } } else { u32 r29 = fopAcM_GetName(tgActor) == PROC_ST ? 0x33 : 0x20; diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp index 38100a037..0dee8e4d7 100644 --- a/src/d/d_door.cpp +++ b/src/d/d_door.cpp @@ -392,7 +392,7 @@ void dDoor_info_c::setPosAndAngle(cXyz* pPos, s16 angle) { void dDoor_smoke_c::smokeInit(dDoor_info_c* door) { mPos = door->current.pos; mRot.y = door->shape_angle.y; - JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_COMMON_2022, &mPos, &mRot, NULL, 0xAA, &mSmokeCb, fopAcM_GetRoomNo(door)); + JPABaseEmitter* emtr = dComIfGp_particle_set(dPa_name::ID_AK_JT_ELEMENTSMOKE00, &mPos, &mRot, NULL, 0xAA, &mSmokeCb, fopAcM_GetRoomNo(door)); m34 = 0; m35 = 0; if (emtr != NULL) { diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index d0262a1d3..37461fa31 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -265,7 +265,7 @@ BOOL dDlst_GameOverScrnDraw_c::animeOpen() { anime1(i); if (letter[i].mUserArea == 5) { cXyz temp(x[i], 50.0f, 0.0f); - dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002E, &temp); + dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_GAMEOVER00, &temp); } } @@ -327,12 +327,12 @@ BOOL dDlst_GameOverScrnDraw_c::animeClose() { /* 8018F05C-8018F0CC .text setEmitter0__24dDlst_GameOverScrnDraw_cF4cXyz */ void dDlst_GameOverScrnDraw_c::setEmitter0(cXyz pos) { - mpEmitter0 = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002F, &pos); + mpEmitter0 = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_GAMEOVER01, &pos); } /* 8018F0CC-8018F13C .text setEmitter1__24dDlst_GameOverScrnDraw_cF4cXyz */ void dDlst_GameOverScrnDraw_c::setEmitter1(cXyz pos) { - mpEmitter1 = dComIfGp_particle_set2DmenuFore(dPa_name::ID_COMMON_0030, &pos); + mpEmitter1 = dComIfGp_particle_set2DmenuFore(dPa_name::ID_HM_J2_GAMEOVERHA, &pos); } /* 8018F13C-8018F334 .text anime1__24dDlst_GameOverScrnDraw_cFi */ diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp index 78f8ef0fd..37f2ec9a0 100644 --- a/src/d/d_grass.cpp +++ b/src/d/d_grass.cpp @@ -150,7 +150,7 @@ void setBatta(cXyz* pos, GXColor* color) { strcmp(dComIfGp_getStartStageName(), "Xboss1") != 0 && cM_rnd() > 0.99f ) { - dComIfGp_particle_set(dPa_name::ID_COMMON_0453, pos, NULL, NULL, 0xFF, NULL, -1, color, color); + dComIfGp_particle_set(dPa_name::ID_AK_JN_BATTA00, pos, NULL, NULL, 0xFF, NULL, -1, color, color); } } @@ -329,8 +329,8 @@ dGrass_packet_c::dGrass_packet_c() { mDLSize = 0xa0; mpDLCut = l_Vmori_01DL; mDLCutSize = 0x80; - mCoParticle = dPa_name::ID_SCENE_8222; - mAtParticle = dPa_name::ID_SCENE_8221; + mCoParticle = dPa_name::ID_IT_SN_O_KINDANKUSA_RUN; + mAtParticle = dPa_name::ID_IT_SN_O_KINDANKUSA_KEN; } else { mpPosArr = (f32*)l_pos; mpColorArr = l_color; @@ -341,8 +341,8 @@ dGrass_packet_c::dGrass_packet_c() { mDLSize = 0xa0; mpDLCut = l_Oba_kusa_a_cutDL; mDLCutSize = 0x80; - mCoParticle = dPa_name::ID_COMMON_03DB; - mAtParticle = dPa_name::ID_COMMON_03DA; + mCoParticle = dPa_name::ID_IT_JN_O_KUSA_RUN; + mAtParticle = dPa_name::ID_IT_JN_O_KUSA_KEN; } } diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index caad1681e..b05e86abb 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -9973,48 +9973,48 @@ dItem_data_item_info dItem_data::item_info[0x100] = { dItem_data_effect_info dItem_data::effect_info[] = { { // 0x00: dItem_HEART_e - dPa_name::ID_COMMON_0002, + dPa_name::ID_AK_JN_O_APPEARHEART, dPa_name::ID_SCENE_END, }, { // 0x01: dItem_GREEN_RUPEE_e - dPa_name::ID_COMMON_0003, + dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { // 0x02: dItem_BLUE_RUPEE_e - dPa_name::ID_COMMON_0003, + dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { // 0x03: dItem_YELLOW_RUPEE_e - dPa_name::ID_COMMON_0003, + dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { // 0x04: dItem_RED_RUPEE_e - dPa_name::ID_COMMON_0003, + dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { // 0x05: dItem_PURPLE_RUPEE_e - dPa_name::ID_COMMON_0003, + dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { // 0x06: dItem_ORANGE_RUPEE_e - dPa_name::ID_COMMON_0002, + dPa_name::ID_AK_JN_O_APPEARHEART, dPa_name::ID_SCENE_END, }, { // 0x07: dItem_HEART_PIECE_e dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x08: dItem_HEART_CONTAINER_e dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x09: dItem_SMALL_MAGIC_e @@ -10078,7 +10078,7 @@ dItem_data_effect_info dItem_data::effect_info[] = { }, { // 0x15: dItem_SMALL_KEY_e - dPa_name::ID_COMMON_0003, + dPa_name::ID_AK_JN_O_APPEARLUPY, dPa_name::ID_SCENE_END, }, { @@ -10319,37 +10319,37 @@ dItem_data_effect_info dItem_data::effect_info[] = { { // 0x45: dItem_SKULL_NECKLACE_e dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x46: dItem_BOKOBABA_SEED_e dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x47: dItem_GOLDEN_FEATHER_e dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x48: BOKO_BELT dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x49: dItem_RED_JELLY_e dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x4A: dItem_GREEN_JELLY_e dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x4B: dItem_BLUE_JELLY_e dPa_name::ID_SCENE_END, - dPa_name::ID_COMMON_0293, + dPa_name::ID_AK_JN_HEARTVESSEL, }, { // 0x4C: dItem_MAP_e diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 72bc725ff..4c9cbb508 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -143,7 +143,7 @@ void dKyr_kamome_move() { pWind->mKamomeEff[i].mAngleYSpeed = cM_rndFX(1.0f); pWind->mKamomeEff[i].mScale = 0.0f; pWind->mKamomeEff[i].mTimer = 300.0f + cM_rndF(180.0f); - pWind->mKamomeEff[i].mpEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0429, &pWind->mKamomeEff[i].mPos); + pWind->mKamomeEff[i].mpEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_KAMOME00, &pWind->mKamomeEff[i].mPos); pWind->mKamomeEff[i].mStatus++; } else { pWind->mKamomeEff[i].mTimer--; @@ -367,7 +367,7 @@ void dKyr_wind_move() { pos.y = windEff.mBasePos.y + windEff.mPos.y; pos.z = windEff.mBasePos.z + windEff.mPos.z; - windEff.mpEmitter = dComIfGp_particle_set(dPa_name::ID_COMMON_0031, &pos); + windEff.mpEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_WINDLINE00, &pos); if (windEff.mpEmitter != NULL) { windEff.mpEmitter->setGlobalAlpha(0); windEff.mpEmitter->setGlobalScale(JGeometry::TVec3(fVar23, fVar23, fVar23)); diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp index cc447478b..61602c479 100644 --- a/src/d/d_mesg.cpp +++ b/src/d/d_mesg.cpp @@ -1571,7 +1571,7 @@ void dMesg_screenDataItem_c::createScreen() { f32 y = (field_0x1b4.mSize.y / 2.0f + field_0x1b4.pane->getGlbBounds().i.y - 240.0f) - 10.0f; f32 x = (field_0x1b4.mSize.x / 2.0f + field_0x1b4.pane->getGlbBounds().i.x - 320.0f) + 10.0f; cXyz pos(x, y, 0.0f); - field_0x3e4 = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_02E1, &pos); + field_0x3e4 = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_ARWG_FLAME00, &pos); } } diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index 2e21e9a36..9bd4d5b13 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -2561,7 +2561,7 @@ void dMeter_xyMove(sub_meter_class* i_Meter) { i_Meter->field_0x2f2c[j]->playDrawParticle(); i_Meter->field_0x2f2c[j]->setGlobalAlpha(i_Meter->field_0x2080[i].mNowAlpha); } else { - i_Meter->field_0x2f2c[j] = dComIfGp_particle_set2DmenuFore(dPa_name::ID_COMMON_002D, &local_38); + i_Meter->field_0x2f2c[j] = dComIfGp_particle_set2DmenuFore(dPa_name::ID_HM_J2_RUPYLIGHT, &local_38); } } } @@ -4687,7 +4687,7 @@ void dMeter_rupyAlpha(sub_meter_class* i_Meter) { i_Meter->mpRupyParticle->stopDrawParticle(); } else { local_2c.set(i_Meter->field_0x2a20.mPosCenter.x - 320.0f, i_Meter->field_0x2a20.mPosCenter.y - 240.0f, 0.0f); - i_Meter->mpRupyParticle = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002D, &local_2c); + i_Meter->mpRupyParticle = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_RUPYLIGHT, &local_2c); } } else { fVar8 = dMeter_alphaOpen(&i_Meter->field_0x2a20.mUserArea, &i_Meter->field_0x19f0[0].mUserArea); @@ -4696,7 +4696,7 @@ void dMeter_rupyAlpha(sub_meter_class* i_Meter) { i_Meter->mpRupyParticle->playDrawParticle(); } else { local_38.set(i_Meter->field_0x2a20.mPosCenter.x - 320.0f, i_Meter->field_0x2a20.mPosCenter.y - 240.0f, 0.0f); - i_Meter->mpRupyParticle = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002D, &local_38); + i_Meter->mpRupyParticle = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_RUPYLIGHT, &local_38); } } for (s32 i = 0; i < 4; i++) { @@ -4728,7 +4728,7 @@ void dMeter_rupyInit(sub_meter_class* i_Meter) { } g_dComIfG_gameInfo.play.mItemNowRupee = i_Meter->mRupyCount; local_48.set(i_Meter->field_0x2a20.mPosCenter.x - 320.0f, i_Meter->field_0x2a20.mPosCenter.y - 240.0f, 0.0f); - i_Meter->mpRupyParticle = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002D, &local_48); + i_Meter->mpRupyParticle = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_RUPYLIGHT, &local_48); } /* 801FC2FC-801FC624 .text dMeter_rupyMove__FP15sub_meter_class */ @@ -5783,9 +5783,9 @@ void dMeter_arwInit(sub_meter_class* i_Meter) { /* 801FF76C-801FFEB0 .text dMeter_arwMove__FP15sub_meter_class */ void dMeter_arwMove(sub_meter_class* i_Meter) { static const u16 particleName[] = { - dPa_name::ID_COMMON_02E1, - dPa_name::ID_COMMON_02E2, - dPa_name::ID_COMMON_02EF, + dPa_name::ID_HM_J2_ARWG_FLAME00, + dPa_name::ID_HM_J2_ARWI_COLD00, + dPa_name::ID_HM_J2_ARWF_LIGHT00, }; f32 dVar15; diff --git a/src/d/d_metronome.cpp b/src/d/d_metronome.cpp index 10e0f0c9c..2365e7459 100644 --- a/src/d/d_metronome.cpp +++ b/src/d/d_metronome.cpp @@ -340,14 +340,14 @@ void dMetronome_c::melodyShow() { pos.y = pane_wn[mBeat - 1].mPosCenter.y - 240.0f; } - dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_023E, &pos); + dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_BATONINPUT00, &pos); if (daPy_getPlayerLinkActorClass()->getTactTopPos(&tactTop)) { mDoLib_project(&tactTop, &sparklePos); sparklePos.x -= 320.0f; sparklePos.y -= 240.0f; - mpEmitter = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_023F, &sparklePos); + mpEmitter = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_BATONINPUT01, &sparklePos); mpEmitter->becomeImmortalEmitter(); } diff --git a/src/d/d_msg.cpp b/src/d/d_msg.cpp index 69a55e2f8..7d62c5dc8 100644 --- a/src/d/d_msg.cpp +++ b/src/d/d_msg.cpp @@ -2588,16 +2588,16 @@ s32 dMsg_openItemProc(sub_msg_class* i_Msg) { f32 y = (i_Msg->m0624[8].mSize.y * tmp + i_Msg->m0624[8].pane->getGlbBounds().i.y) - 240.0f; f32 x = (i_Msg->m0624[8].mSize.x * tmp + i_Msg->m0624[8].pane->getGlbBounds().i.x) - 320.0f; local_1c.set(x, y, 0.0f); - i_Msg->m10B4[0] = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002D, &local_1c); + i_Msg->m10B4[0] = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_RUPYLIGHT, &local_1c); if (i_Msg->mMsgNo == 0xbe) { - i_Msg->m10B4[1] = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_002D, &local_1c); + i_Msg->m10B4[1] = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_RUPYLIGHT, &local_1c); } } else if (i_Msg->mMsgNo == 0x9a) { f32 tmp = 0.5f; f32 y = ((i_Msg->m0624[8].mSize.y * tmp + i_Msg->m0624[8].pane->getGlbBounds().i.y) - 240.0f) - 10.0f; f32 x = ((i_Msg->m0624[8].mSize.x * tmp + i_Msg->m0624[8].pane->getGlbBounds().i.x) - 320.0f) + 10.0f; local_28.set(x, y, 0.0f); - i_Msg->m10B4[0] = dComIfGp_particle_set2Dfore(dPa_name::ID_COMMON_02E1, &local_28); + i_Msg->m10B4[0] = dComIfGp_particle_set2Dfore(dPa_name::ID_HM_J2_ARWG_FLAME00, &local_28); } dMeter_Info.field_0x0 = 2; } else { diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index b54f93fa4..1d10a8396 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -518,7 +518,7 @@ JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* manager, u16 effe mGrpID = groupID; mResID = effectID; if (createEmitter(manager)) { - if (effectID == dPa_name::ID_SCENE_A06A || effectID == dPa_name::ID_SCENE_A410) { + if (effectID == dPa_name::ID_AK_ST_O_BKMSATTACKSMOKE00 || effectID == dPa_name::ID_AK_ST_O_KGTT2JUMPHANDSMOKE00) { mbIsSmoke = true; mpBaseEmitter->mpParticleCallBack = &dPa_control_c::mSmokePcallback; } else { @@ -805,7 +805,7 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs cXyz ptclScale; JPABaseEmitter* emtr = NULL; - if (*i_return_id == dPa_name::ID_COMMON_0023) { + if (*i_return_id == dPa_name::ID_AK_JN_ELEMENTSHIBUKI00) { if (flag & 0x04) { ptclScale.set(scale3, scale3, scale3); GXColor amb, dif; @@ -816,7 +816,7 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs emtr = setNormal(*i_return_id, pos, angle, &ptclScale, 0xFF, NULL, -1, &amb, NULL, NULL); } } - } else if (*i_return_id == dPa_name::ID_COMMON_0024) { + } else if (*i_return_id == dPa_name::ID_AK_JN_ELEMENTKUSA00) { if (flag & 0x02) { ptclScale.set(scale2, scale2, scale2); @@ -832,9 +832,9 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(int code, const cXyz* pos, const cs emtr = setNormal(*i_return_id, pos, angle, &ptclScale, 0xFF, NULL, -1, &amb, &i_tevStr->mColorK0, NULL); } } - } else if (*i_return_id == dPa_name::ID_COMMON_2022) { + } else if (*i_return_id == dPa_name::ID_AK_JT_ELEMENTSMOKE00) { if (flag & 0x08) - *i_return_id = dPa_name::ID_COMMON_2027; + *i_return_id = dPa_name::ID_AK_JT_ELEMENTSMOKE01; if (flag & 0x09) { ptclScale.set(scale1, scale1, scale1); @@ -866,11 +866,11 @@ JPABaseEmitter* dPa_control_c::setSimpleLand(cBgS_PolyInfo& polyInfo, const cXyz /* 8007DA58-8007DAA8 .text checkAtrCodeEffect__13dPa_control_cFi */ s32 dPa_control_c::checkAtrCodeEffect(int code) { if (code == dBgS_Attr_WATER_e) { - return dPa_name::ID_COMMON_0023; + return dPa_name::ID_AK_JN_ELEMENTSHIBUKI00; } else if (code == dBgS_Attr_GRASS_e) { - return dPa_name::ID_COMMON_0024; + return dPa_name::ID_AK_JN_ELEMENTKUSA00; } else if (code != dBgS_Attr_UNK1B_e && code != dBgS_Attr_ICE_e && code != dBgS_Attr_GIANT_FLOWER_e && code != dBgS_Attr_CARPET_e) { - return dPa_name::ID_COMMON_2022; + return dPa_name::ID_AK_JT_ELEMENTSMOKE00; } else { return -1; } diff --git a/src/d/d_particle_name.cpp b/src/d/d_particle_name.cpp index de599fec1..2a2a6c2f5 100644 --- a/src/d/d_particle_name.cpp +++ b/src/d/d_particle_name.cpp @@ -9,49 +9,49 @@ namespace dPa_name { u16 j_o_id[] = { dPa_name::ID_NONE, - dPa_name::ID_COMMON_0001, - dPa_name::ID_COMMON_0002, - dPa_name::ID_COMMON_0003, - dPa_name::ID_COMMON_03DA, - dPa_name::ID_COMMON_03DB, - dPa_name::ID_COMMON_03DC, - dPa_name::ID_COMMON_4004, + dPa_name::ID_AK_JN_O_FIRE00, + dPa_name::ID_AK_JN_O_APPEARHEART, + dPa_name::ID_AK_JN_O_APPEARLUPY, + dPa_name::ID_IT_JN_O_KUSA_KEN, + dPa_name::ID_IT_JN_O_KUSA_RUN, + dPa_name::ID_IT_JN_O_HAPPA01, + dPa_name::ID_AK_JP_O_KAGEROU00, }; u16 s_o_id[] = { - dPa_name::ID_SCENE_8058, - dPa_name::ID_SCENE_8059, - dPa_name::ID_SCENE_805A, - dPa_name::ID_SCENE_805B, - dPa_name::ID_SCENE_805C, - dPa_name::ID_SCENE_8221, - dPa_name::ID_SCENE_8222, - dPa_name::ID_SCENE_8060, - dPa_name::ID_SCENE_8061, - dPa_name::ID_SCENE_8062, - dPa_name::ID_SCENE_8063, - dPa_name::ID_SCENE_8064, - dPa_name::ID_SCENE_8065, - dPa_name::ID_SCENE_8066, - dPa_name::ID_SCENE_8067, - dPa_name::ID_SCENE_8068, - dPa_name::ID_SCENE_8069, - dPa_name::ID_SCENE_81D5, - dPa_name::ID_SCENE_8240, - dPa_name::ID_SCENE_8241, - dPa_name::ID_SCENE_8306, - dPa_name::ID_SCENE_8407, - dPa_name::ID_SCENE_8408, - dPa_name::ID_SCENE_8409, - dPa_name::ID_SCENE_8443, - dPa_name::ID_SCENE_840A, - dPa_name::ID_SCENE_840B, - dPa_name::ID_SCENE_840C, - dPa_name::ID_SCENE_840D, - dPa_name::ID_SCENE_840E, - dPa_name::ID_SCENE_840F, - dPa_name::ID_SCENE_A410, - dPa_name::ID_SCENE_A06A, - dPa_name::ID_SCENE_C06B, + dPa_name::ID_IT_SN_O_MAGT_FCHIP, + dPa_name::ID_IT_SN_O_MAGT_NETSU, + dPa_name::ID_AK_SN_O_FIRESHAFTHEAD, + dPa_name::ID_AK_SN_O_FIRESHAFTBODY, + dPa_name::ID_AK_SN_O_FIRESHAFTFOOT, + dPa_name::ID_IT_SN_O_KINDANKUSA_KEN, + dPa_name::ID_IT_SN_O_KINDANKUSA_RUN, + dPa_name::ID_IT_SN_O_MAGT_HAHEN_B, + dPa_name::ID_IT_SN_O_FIREK_KASU, + dPa_name::ID_AK_SN_O_BTDBROKENROCKTAIL00, + dPa_name::ID_AK_SN_O_BTDPOPMAGMA00, + dPa_name::ID_AK_SN_O_BTDPOPMAGMA01, + dPa_name::ID_AK_SN_O_BKMSATTACKHOUSHI00, + dPa_name::ID_AK_SN_O_BKMSATTACKSOIL00, + dPa_name::ID_AK_SN_O_BKMTENTACLEBLOOD00, + dPa_name::ID_IT_SN_O_KUROBOU_SIBOU00, + dPa_name::ID_IT_SN_O_TN_MANTOFIRE00, + dPa_name::ID_AK_SN_O_BSTFINGERFRAGMENT00, + dPa_name::ID_IT_SN_O_BWK_BODY_SUNA00, + dPa_name::ID_IT_SN_O_BWO_BODY_SUNA00, + dPa_name::ID_AK_SN_O_GHOSTSHIPFIRE00, + dPa_name::ID_AK_SN_O_KGTCOMMONHAMON00, + dPa_name::ID_AK_SN_O_KGTCOMMONHAMON01, + dPa_name::ID_AK_SN_O_KGTCOMMONHAMON02, + dPa_name::ID_AK_SN_O_KGTCOMMONHAMON03, + dPa_name::ID_AK_SN_O_KGTCOMMONMIZUHANE00, + dPa_name::ID_AK_SN_O_KGTCOMMONPOTA00, + dPa_name::ID_AK_SN_O_KGTCOMMONPOTA01, + dPa_name::ID_AK_SN_O_KGTCOMMONSPLASH00, + dPa_name::ID_AK_SN_O_KGTCOMMONSPLASH01, + dPa_name::ID_AK_SN_O_KGTT2JUMPHANDSPLASH00, + dPa_name::ID_AK_ST_O_KGTT2JUMPHANDSMOKE00, + dPa_name::ID_AK_ST_O_BKMSATTACKSMOKE00, + dPa_name::ID_AK_SP_O_FIREHOLEKAGEROU, }; } diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index 12d79a27f..7b2e9ffbf 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -772,7 +772,7 @@ void dWood::Unit_c::cc_hit_before_cut(dWood::Packet_c *packet) { g_env_light.settingTevStruct(TEV_TYPE_BG0, &mPos, &mTevStr); // Spawn cut down particles (a bunch of leaves) - dComIfGp_particle_set(dPa_name::ID_COMMON_CUT_L_TREE_DOWN, &mPos, NULL, + dComIfGp_particle_set(dPa_name::ID_IT_JN_SWOODLEAF00, &mPos, NULL, NULL, 0xff, NULL, -1, &mTevStr.mColorK0, NULL, NULL); diff --git a/src/d/d_wpot_water.cpp b/src/d/d_wpot_water.cpp index 5a099e83f..f87ce1999 100644 --- a/src/d/d_wpot_water.cpp +++ b/src/d/d_wpot_water.cpp @@ -63,9 +63,9 @@ static BOOL dWpotWater_Delete(dWpotWater_c* i_this) { cPhs_State dWpotWater_c::create() { new (this) dWpotWater_c(); - dComIfGp_particle_set(dPa_name::ID_SCENE_8083, &mPos); - dComIfGp_particle_set(dPa_name::ID_SCENE_8084, &mPos); - emtr = dComIfGp_particle_set(dPa_name::ID_SCENE_8086, &mPos, NULL, NULL, 0xAA, &dWpotWater_c::mEcallback); + dComIfGp_particle_set(dPa_name::ID_IT_SN_WPOT_BITYA, &mPos); + dComIfGp_particle_set(dPa_name::ID_IT_SN_WPOT_SHIBUKI, &mPos); + emtr = dComIfGp_particle_set(dPa_name::ID_IT_SN_WPOT_YUKA, &mPos, NULL, NULL, 0xAA, &dWpotWater_c::mEcallback); if (emtr == NULL) { return cPhs_ERROR_e; } else { diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index e7a187909..e270ff703 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -98,6 +98,6 @@ int fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { scale.x = i_size; scale.y = i_size; scale.z = i_size; - dComIfGp_particle_set(dPa_name::ID_SCENE_80D5, i_pos, NULL, &scale); + dComIfGp_particle_set(dPa_name::ID_IT_SN_YOGAN_HANE00, i_pos, NULL, &scale); return -1; }