diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2025-03-22 02:03:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-21 23:03:43 -0700 |
| commit | 5a7b9f62d684b1d3744f39abdfc54b8ad7a64ead (patch) | |
| tree | 070d7e0bb632536825ac7f3536b7f1efefb223f7 /src/d/actor/d_a_arrow.cpp | |
| parent | cf87a207b67152210522b10ec2863ad69f4817ac (diff) | |
Z2AudioLib work (#2339)
* Z2LinkMgr work, Z2AudioArcLoader matching
* Z2SeMgr matching
* Z2SpeechMgr2 almost done, Z2SoundHandles matching
Diffstat (limited to 'src/d/actor/d_a_arrow.cpp')
| -rw-r--r-- | src/d/actor/d_a_arrow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 4401511f5f..084217c6de 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -573,7 +573,7 @@ int daArrow_c::procWait() { } } - mSoundObjArrow.startLevelSound(0x8000a, 0, mReverb); + mSoundObjArrow.startLevelSound(Z2SE_OBJ_BOMB_IGNITION, 0, mReverb); } if(dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 2)) { @@ -614,7 +614,7 @@ int daArrow_c::procMove() { bVar14 = TRUE; } else if (water_next_pos == 1) { fopKyM_createWpillar(field_0x5dc.GetCrossP(), 0.3f, 0); - mDoAud_seStart(0x60031, field_0x5dc.GetCrossP(), 0, mReverb); + mDoAud_seStart(Z2SE_CM_BODYFALL_WATER_S, field_0x5dc.GetCrossP(), 0, mReverb); } field_0x945 = 1; @@ -787,13 +787,13 @@ int daArrow_c::procMove() { 0.0f ); if (mArrowType == 4) { - se_id = 0x40018; + se_id = Z2SE_HIT_PACHINKO; current.angle = angle; procSlingHitInit(¤t.pos, NULL); } else { procReturnInit(0); dComIfGp_setHitMark(9, this, ¤t.pos, &angle, NULL, 0); - se_id = 0x40017; + se_id = Z2SE_HIT_AL_ARROW_REBOUND; } } else { setBlur(); @@ -860,7 +860,7 @@ int daArrow_c::procMove() { u32 sound_id; if (mArrowType == 2) { - sound_id = 0x6001c; + sound_id = Z2SE_ZELDA_ARROW_FLY; } else { if (fopAcM_GetParam(this) == 2) { if (mArrowType == 1) { @@ -1032,7 +1032,7 @@ int daArrow_c::procSlingHitInit(cXyz* param_0, dCcD_GObjInf* param_1) { hitmark = 9; if (hit_ac != NULL && param_1->GetAtHitGObj() != NULL) { if (param_1->GetAtHitGObj()->ChkTgNoSlingHitInfSet()) { - mDoAud_seStart(0x40018, param_0, 0x2d, mReverb); + mDoAud_seStart(Z2SE_HIT_PACHINKO, param_0, 0x2d, mReverb); } } } |