mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 05:37:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace particle enums with official names

Browse Source
This commit is contained in:
LagoLunatic
2026-03-20 16:02:41 -04:00
parent 70a0a15b35
commit 061fa893eb
166 changed files with 2137 additions and 2019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_player_main.cpp
+9 -9
View File
@@ -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), &current.pos, NULL);
m32E4.makeEmitter(dPa_name::ID_AK_SN_BKMHAKIDASHIHOUSHI00, mpCLModel->getAnmMtx(0x1), &current.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), &current.pos, NULL);
m32E4.makeEmitter(dPa_name::ID_AK_SN_HIDARUMAFIRE, mpCLModel->getAnmMtx(0), &current.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, &current.pos, NULL, NULL, 0xFF,
dComIfGp_particle_setP1(dPa_name::ID_AK_SN_HITSHIELDLIGHT00, &current.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(),
&current.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,
&current.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,
&current.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,
&current.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);