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