diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-03-20 16:02:41 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2026-03-20 16:02:41 -0400 |
| commit | 061fa893eb46c1eac3d9de55f6ded86f33c9a281 (patch) | |
| tree | 2af696561f546013a17c96c6bc3155b683e19ccb /src/d/d_particle.cpp | |
| parent | 70a0a15b353605bee794a204248f53bcb057673e (diff) | |
Replace particle enums with official names
Diffstat (limited to 'src/d/d_particle.cpp')
| -rw-r--r-- | src/d/d_particle.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index b54f93fa..1d10a839 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; } |