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

Add default parameters for particle inlines

Browse Source
This commit is contained in:
LagoLunatic
2023-10-10 18:01:27 -04:00
parent 7e226cc930
commit 888bb95051
12 changed files with 149 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_arrow.cpp
+10 -10
View File
@@ -191,7 +191,7 @@ void daArrow_c::setBlur() {
/* 800D4994-800D4A04 .text createBlur__9daArrow_cFv */
void daArrow_c::createBlur() {
if (!mPtclFollowCb.getEmitter()) {
dComIfGp_particle_setP1(0x48, &current.pos, NULL, NULL, 0xFF, &mPtclFollowCb, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0x48, &current.pos, NULL, NULL, 0xFF, &mPtclFollowCb);
}
}
@@ -347,7 +347,7 @@ void daArrow_c::ShieldReflect() {
targetAngleX = -cLib_targetAngleX(&link->current.pos, &ganondorfChestPos);
fpcM_SetParam(ganondorf, 0x23);
field_0x608 = g_regHIO.mChild[0].mShortRegs[3] + 15;
mpSparkleEmitter = dComIfGp_particle_set(0x3EE, &link->current.pos, NULL, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
mpSparkleEmitter = dComIfGp_particle_set(0x3EE, &link->current.pos);
}
// // Regswaps without creating a fake inline.
@@ -395,7 +395,7 @@ bool daArrow_c::check_water_in() {
if (mArrowType == TYPE_FIRE) {
mInWaterTimer = 1;
dComIfGp_particle_setP1(0x35A, &waterHitPos, NULL, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0x35A, &waterHitPos);
if (field_0x6e4 == 0) {
dKy_arrowcol_chg_on(&current.pos, 0);
}
@@ -409,7 +409,7 @@ bool daArrow_c::check_water_in() {
dKy_arrowcol_chg_on(&current.pos, 1);
}
} else if (mArrowType == TYPE_LIGHT) {
dComIfGp_particle_setP1(0x2A1, &waterHitPos, NULL, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0x2A1, &waterHitPos);
fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
if (field_0x6e4 == 0) {
dKy_arrowcol_chg_on(&current.pos, 2);
@@ -693,7 +693,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(0x2A1, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0x2A1, &field_0x6a8, &temp10);
fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
fopAcM_delete(this);
} else {
@@ -794,15 +794,15 @@ BOOL daArrow_c::procMove() {
cMtx_copy(mDoMtx_stack_c::get(), field_0x6b4);
if (mArrowType == TYPE_FIRE) {
dComIfGp_particle_setP1(0x29A, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0x29B, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0x29A, &field_0x6a8, &temp10);
dComIfGp_particle_setP1(0x29B, &field_0x6a8, &temp10);
fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARW_EFF, 0);
field_0x698 = 0;
} else if (mArrowType == TYPE_ICE) {
if (dComIfG_Bgsp()->ChkGrpInf(mLinChk, 0x200)) {
fopAcM_create(PROC_Obj_Magmarock, NULL, &field_0x6a8, current.roomNo, NULL, NULL, -1, NULL);
} else {
dComIfGp_particle_setP1(0x29E, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0x29E, &field_0x6a8, &temp10);
fopAcM_createChild(
PROC_ARROW_ICEEFF, fpcM_GetID(this),
@@ -813,7 +813,7 @@ BOOL daArrow_c::procMove() {
fopAcM_seStartCurrent(this, JA_SE_OBJ_ICE_ARW_EFF, 0);
}
} else if (mArrowType == TYPE_LIGHT) {
dComIfGp_particle_setP1(0x2A1, &field_0x6a8, &temp10, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0x2A1, &field_0x6a8, &temp10);
fopAcM_seStartCurrent(this, JA_SE_OBJ_LIGHT_ARW_EFF, 0);
field_0x698 = 0;
}
@@ -831,7 +831,7 @@ BOOL daArrow_c::procMove() {
csXyz temp9;
cM3d_CalcVecZAngle(triPla->mNormal, &temp9);
dComIfGp_particle_setP1(0xC, &field_0x6a8, &temp9, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
dComIfGp_particle_setP1(0xC, &field_0x6a8, &temp9);
fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_REBOUND, mtrlSndId);
} else {
fopAcM_seStartCurrent(this, JA_SE_LK_ARROW_HIT, mtrlSndId);