Z2AudioLib work (#2339)

* Z2LinkMgr work, Z2AudioArcLoader matching

* Z2SeMgr matching

* Z2SpeechMgr2 almost done, Z2SoundHandles matching

9 files changed, 119 insertions, 109 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(&current.pos, NULL);
             } else {
                 procReturnInit(0);
                 dComIfGp_setHitMark(9, this, &current.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);
                 }
             }
         }
diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp
index eded62267b..86016b47f9 100644
--- a/src/d/actor/d_a_b_bh.cpp
+++ b/src/d/actor/d_a_b_bh.cpp
@@ -1369,7 +1369,7 @@ static int daB_BH_Execute(b_bh_class* i_this) {
                     }
                 }
             } else {
-                i_this->mSound.startCreatureSoundLevel(0x70109, 0, -1);
+                i_this->mSound.startCreatureSoundLevel(Z2SE_EN_BH_BURST, 0, -1);
 
                 if (i_this->field_0x909[i] == 0) {
                     i_this->field_0x909[i] = (YREG_S(5) + 1);
diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp
index a127920ed7..5eb3b2f2e0 100644
--- a/src/d/actor/d_a_e_oc.cpp
+++ b/src/d/actor/d_a_e_oc.cpp
@@ -731,7 +731,7 @@ void daE_OC_c::setStabPos() {
 /* 8072E528-8072E5A4 002048 007C+00 1/1 0/0 0/0 .text            setWaitSound__8daE_OC_cFv */
 void daE_OC_c::setWaitSound() {
     if (checkBck(0x1b) && mpMorf->checkFrame(0.0f)) {
-        mSound.startCreatureVoice(0x70180, -1);
+        mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT, -1);
     }
 }
 
@@ -739,9 +739,9 @@ void daE_OC_c::setWaitSound() {
 void daE_OC_c::setWalkSound() {
     if (checkBck(0x1d)) {
         if (mpMorf->checkFrame(14.0f)) {
-            mSound.startCreatureSound(0x70178, 0, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_FOOTNOTE_L, 0, -1);
         } else if (mpMorf->checkFrame(30.0f)) {
-            mSound.startCreatureSound(0x70179, 0, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_FOOTNOTE_R, 0, -1);
         }
     }
 }
@@ -750,11 +750,11 @@ void daE_OC_c::setWalkSound() {
 void daE_OC_c::setWalkStSound() {
     if (checkBck(0x1e)) {
         if (mpMorf->checkFrame(0.0f)) {
-            mSound.startCreatureVoice(0x7018e, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_WALK_ST, -1);
         } else if (mpMorf->checkFrame(1.0f)) {
-            mSound.startCreatureSound(0x70178, 0, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_FOOTNOTE_L, 0, -1);
         } else if (mpMorf->checkFrame(9.0f)) {
-            mSound.startCreatureSound(0x70179, 0, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_FOOTNOTE_R, 0, -1);
         }
     }
 }
@@ -763,16 +763,16 @@ void daE_OC_c::setWalkStSound() {
 void daE_OC_c::setDashSound() {
     if (checkBck(0xb)) {
         if (mpMorf->checkFrame(0.0f)) {
-            mSound.startCreatureVoice(0x7017f, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_DASH, -1);
         } else if (mpMorf->checkFrame(1.0f)) {
-            mSound.startCreatureSound(0x70178, 0, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_FOOTNOTE_L, 0, -1);
         } else if (mpMorf->checkFrame(8.5f)) {
-            mSound.startCreatureSound(0x70179, 0, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_FOOTNOTE_R, 0, -1);
         }
         if (mName == "E_OC") {
-            mSound.startCreatureSoundLevel(0x70193, 0, -1);
+            mSound.startCreatureSoundLevel(Z2SE_EN_OC_CLUB_DAGGLE, 0, -1);
         } else {
-            mSound.startCreatureSoundLevel(0x70537, 0, -1);
+            mSound.startCreatureSoundLevel(Z2SE_EN_OC_NATA_DAGGLE, 0, -1);
         }
     }
 }
@@ -781,11 +781,11 @@ void daE_OC_c::setDashSound() {
 void daE_OC_c::setWaitStSound() {
     if (checkBck(0x1c)) {
         if (mpMorf->checkFrame(0.0f)) {
-            mSound.startCreatureVoice(0x7018d, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
         } else if (mpMorf->checkFrame(6.5f) || mpMorf->checkFrame(20.0f)) {
-            mSound.startCreatureSound(0x70178, 0, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_FOOTNOTE_L, 0, -1);
         } else if (mpMorf->checkFrame(13.0f) || mpMorf->checkFrame(28.5f)) {
-            mSound.startCreatureSound(0x70179, 0, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_FOOTNOTE_R, 0, -1);
         }
     }
 }
@@ -821,10 +821,10 @@ void daE_OC_c::executeWait() {
         case 0:
             if (field_0x6b4 == 0) {
                 setBck(0x1b, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x70180, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT, -1);
             } else {
                 setBck(0x18, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7018b, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_STAND_WAIT, -1);
             }
             speedF = 0.0f;
             field_0x6bc = shape_angle.y;
@@ -848,7 +848,7 @@ void daE_OC_c::executeWait() {
             cLib_addCalcAngleS(&shape_angle.y, field_0x6bc, 4, 0x800, 0x100);
             if (field_0x6c0 == 0) {
                 setBck(0x16, 0, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7017c, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_SEARCH, -1);
                 mOcState = 2;
             }
             break;
@@ -858,7 +858,7 @@ void daE_OC_c::executeWait() {
             } else {
                 if (mpMorf->isStop()) {
                     setBck(0x1b, 2, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x70180, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT, -1);
                     if (field_0x6b4 == 0) {
                         field_0x6c0 = cM_rndF(10.0f) + 10.0f;
                         mOcState = 3;
@@ -977,15 +977,15 @@ void daE_OC_c::executeTalk() {
             if (rand_val < 0.2f) {
                 setBck(0x1a, 0, 5.0f, 1.0f);
                 mOcState = 3;
-                mSound.startCreatureVoice(0x7018f, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_TALK_B, -1);
             } else if (rand_val < 0.6f) {
                 setBck(0x19, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7018a, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_TALK, -1);
                 mOcState = 2;
                 field_0x6c0 = cM_rndF(30.0f) + 30.0f;
             } else {
                 setBck(0x18, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7018b, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_STAND_WAIT, -1);
                 mOcState = 2;
                 field_0x6c0 = cM_rndF(30.0f) + 30.0f;
             }
@@ -1044,7 +1044,7 @@ void daE_OC_c::executeFind() {
                     field_0x6c2 = field_0x6c0 + 0x14;
                     if (checkBck(0x1c) == 0) {
                         setBck(0x1c, 2, 5.0f, 1.0f);
-                        mSound.startCreatureVoice(0x7018d, -1);
+                        mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
                     }
                     field_0x6de = 1;
                 } else if (mOcState == 1) {
@@ -1056,11 +1056,11 @@ void daE_OC_c::executeFind() {
                     field_0x6e2 = 0;
                     field_0x6ca = 0x96;
                     setBck(0xd, 0, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x7017e, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_FIND, -1);
                 } else {
                     field_0x6c0 = cM_rndF(5.0f) + 5.0f;
                     setBck(0xd, 0, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x7017e, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_FIND, -1);
                 }
                 mOcState = 3;
                 speedF = 0.0f;
@@ -1069,10 +1069,10 @@ void daE_OC_c::executeFind() {
                     if (field_0x6de || pl_dist < 400.0f) {
                         setBck(0x1e, 2, 5.0f, 1.3f);
                         field_0x6de = 1;
-                        mSound.startCreatureVoice(0x7018e, -1);
+                        mSound.startCreatureVoice(Z2SE_EN_OC_V_WALK_ST, -1);
                     } else {
                         setBck(0xb, 2, 5.0f, 1.2f);
-                        mSound.startCreatureVoice(0x7017f, -1);
+                        mSound.startCreatureVoice(Z2SE_EN_OC_V_DASH, -1);
                     }
                     mOcState = 4;
                     field_0x6c0 = 0x1e;
@@ -1124,17 +1124,17 @@ void daE_OC_c::executeFind() {
                             if (speedF < 0.0f) {
                                 if (checkBck(0x1c) == 0 || mpMorf->getPlaySpeed() != 1.0f) {
                                     setBck(0x1c, 2, 5.0f, 1.0f);
-                                    mSound.startCreatureVoice(0x7018d, -1);
+                                    mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
                                 }
                             } else if (!speedF && (s16)cLib_distanceAngleS(shape_angle.y, pl_ang) < 0x1000) {
                                 if (checkBck(0x1c) == 0) {
                                     setBck(0x1c, 2, 5.0f, 1.0f);
-                                    mSound.startCreatureVoice(0x7018d, -1);
+                                    mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
                                 }
                             } else {
                                 if (checkBck(0x1e) == 0 || mpMorf->getPlaySpeed() != 1.3f) {
                                     setBck(0x1e, 2, 5.0f, 1.3f);
-                                    mSound.startCreatureVoice(0x7018e, -1);
+                                    mSound.startCreatureVoice(Z2SE_EN_OC_V_WALK_ST, -1);
                                 }
                             }
                         }
@@ -1151,17 +1151,17 @@ void daE_OC_c::executeFind() {
                         if (speedF < 0.0f) {
                             if (checkBck(0x1e) == 0 || mpMorf->getPlaySpeed() != -1.0f) {
                                 setBck(0x1e, 2, 5.0f, -1.0f);
-                                mSound.startCreatureVoice(0x7018e, -1);
+                                mSound.startCreatureVoice(Z2SE_EN_OC_V_WALK_ST, -1);
                             }
                         } else if (!speedF && (s16)cLib_distanceAngleS(shape_angle.y, pl_ang) < 0x1000) {
                             if (checkBck(0x1c) == 0) {
                                 setBck(0x1c, 2, 5.0f, 1.0f);
-                                mSound.startCreatureVoice(0x7018d, -1);
+                                mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
                             }
                         } else {
                             if (checkBck(0x1e) == 0 || mpMorf->getPlaySpeed() != 1.3f) {
                                 setBck(0x1e, 2, 5.0f, 1.3f);
-                                mSound.startCreatureVoice(0x7018e, -1);
+                                mSound.startCreatureVoice(Z2SE_EN_OC_V_WALK_ST, -1);
                             }
                         }
                         if (0 == strcmp("D_MN05", dComIfGp_getStartStageName())
@@ -1187,7 +1187,7 @@ void daE_OC_c::executeFind() {
                 break;
             case 5:
                 setBck(0x16, 0, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7017c, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_SEARCH, -1);
                 mOcState = 6;
                 field_0x6de = 0;
                 // fallthrough intentional.
@@ -1265,11 +1265,11 @@ void daE_OC_c::executeAttack() {
             if (cLib_chaseF(&speedF, 0.0f, 1.0f)) {
                 if (cM_rndF(1.0f) < 0.5f) {
                     setBck(5, 0, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x70184, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_ATTACK_B, -1);
                     mOcState = 1;
                 } else {
                     setBck(6, 0, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x70185, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_ATTACK_C, -1);
                     mOcState = 2;
                 }
                 field_0x6a0 = 0.0f;
@@ -1288,21 +1288,21 @@ void daE_OC_c::executeAttack() {
         case 1: {
             if (mOcState == 1) {
                 if (mpMorf->checkFrame(10.0f)) {
-                    mSound.startCreatureVoice(0x70186, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_ATTACK_B2, -1);
                 } else if (mpMorf->checkFrame(12.5f)) {
-                    mSound.startCreatureSound(0x70188, 0, -1);
+                    mSound.startCreatureSound(Z2SE_EN_OC_ATTACK_B, 0, -1);
                 } else if (mpMorf->checkFrame(19.0f)) {
                     if (mName == "E_OC") {
-                        mSound.startCreatureSound(0x70192, 0, -1);
+                        mSound.startCreatureSound(Z2SE_EN_OC_CLUB_HIT, 0, -1);
                     } else {
-                        mSound.startCreatureSound(0x70536, 0, -1);
+                        mSound.startCreatureSound(Z2SE_EN_OC_NATA_HIT, 0, -1);
                     }
                 }
             } else {
                 if (mpMorf->checkFrame(7.0f)) {
-                    mSound.startCreatureVoice(0x70187, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_ATTACK_C2, -1);
                 } else if (mpMorf->checkFrame(11.5f)) {
-                    mSound.startCreatureSound(0x70189, 0, -1);
+                    mSound.startCreatureSound(Z2SE_EN_OC_ATTACK_C, 0, -1);
                 }
             }
             if (mpMorf->getFrame() >= 14.0f && mpMorf->getFrame() <= 22.0f) {
@@ -1335,7 +1335,7 @@ void daE_OC_c::executeAttack() {
             field_0x6a0 = my_float;
             if (mpMorf->isStop()) {
                 setBck(0x1c, 2, 0.0f, 1.0f);
-                mSound.startCreatureVoice(0x7018d, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
                 if (field_0x6e3) {
                     setActionMode(0x10, 0);
                 } else {
@@ -1354,7 +1354,7 @@ void daE_OC_c::executeAttack() {
             field_0x6a0 = my_float;
             if (mpMorf->isStop()) {
                 setBck(0x1c, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7018d, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
                 if (field_0x6e3) {
                     setActionMode(0x10, 0);
                 } else {
@@ -1382,24 +1382,24 @@ void daE_OC_c::executeDamage() {
         case 0:
             speedF = 0.0f;
             setBck(0x9, 0, 0.0f, 1.0f);
-            mSound.startCreatureVoice(0x70182, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_DAMAGE_LR, -1);
             mOcState = 5;
             break;
         case 1:
             speedF = 0.0f;
             setBck(0xa, 0, 0.0f, 1.0f);
-            mSound.startCreatureVoice(0x70182, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_DAMAGE_LR, -1);
             mOcState = 5;
             break;
         case 2:
             speedF = 0.0f;
             setBck(0x8, 0, 0.0f, 1.0f);
-            mSound.startCreatureVoice(0x70182, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_DAMAGE_LR, -1);
             mOcState = 5;
             break;
         case 3: {
             setBck(0x8, 0, 0.0f, 1.0f);
-            mSound.startCreatureVoice(0x70181, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_DAMAGE, -1);
             mOcState = 5;
             s16 half_val = cLib_distanceAngleS(shape_angle.y, fopAcM_searchPlayerAngleY(this));
             if (half_val < 0x4000) {
@@ -1412,7 +1412,7 @@ void daE_OC_c::executeDamage() {
         }
         case 4:
             setBck(0xf, 0, 0.0f, 1.0f);
-            mSound.startCreatureVoice(0x701a2, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_GALE, -1);
             mOcState = 6;
             speedF = 0.0f;
             break;
@@ -1465,18 +1465,18 @@ void daE_OC_c::executeBigDamage() {
                     field_0x6bc = -0x1f60;
                 }
                 if (health < 1) {
-                    mSound.startCreatureVoice(0x70191, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_DEATH, -1);
                 } else {
-                    mSound.startCreatureVoice(0x70190, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_LEAP_SPIN, -1);
                 }
             } else {
                 field_0x6dc = 0;
                 setBck(0x13, 0, 0.0f, 1.0f);
                 field_0x6bc = 0;
                 if (health < 1) {
-                    mSound.startCreatureVoice(0x70191, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_DEATH, -1);
                 } else {
-                    mSound.startCreatureVoice(0x7017a, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_LEAP_A, -1);
                 }
             }
             offTgSph();
@@ -1508,10 +1508,10 @@ void daE_OC_c::executeBigDamage() {
                 field_0x6d8 = 0;
                 shape_angle.x = 0;
                 setBck(0x14, 0, 0.0f, 1.0f);
-                mSound.startCreatureSound(0x6002c, 0, -1);
+                mSound.startCreatureSound(Z2SE_CM_BODYFALL_M, 0, -1);
                 if (field_0x6dc) {
                     mpMorf->setFrame(5.0f);
-                    mSound.startCreatureSound(0x7017b, 0, -1);
+                    mSound.startCreatureSound(Z2SE_EN_OC_LEAP_B, 0, -1);
                 }
                 mOcState = 4;
                 fopAcM_effSmokeSet1(&field_0xe60, &field_0xe64, &current.pos, NULL, 2.0f, &tevStr, 1);
@@ -1520,10 +1520,10 @@ void daE_OC_c::executeBigDamage() {
         case 4:
             setGroundAngle();
             if (mpMorf->checkFrame(15.0f)) {
-                mSound.startCreatureSound(0x6002c, 0, -1);
+                mSound.startCreatureSound(Z2SE_CM_BODYFALL_M, 0, -1);
             }
             if (field_0x6dc == 0 && mpMorf->checkFrame(5.0f)) {
-                mSound.startCreatureSound(0x7017b, 0, -1);
+                mSound.startCreatureSound(Z2SE_EN_OC_LEAP_B, 0, -1);
             }
             checkDamageBg();
             if (mAcch.ChkWallHit()) {
@@ -1557,7 +1557,7 @@ void daE_OC_c::executeBigDamage() {
             }
             if (field_0x6c0 == 0) {
                 setBck(0x17, 0, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7017d, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_STAND, -1);
                 mOcState = 6;
                 offDownFlg();
             }
@@ -1581,10 +1581,10 @@ void daE_OC_c::executeWatch() {
             speedF = 0.0f;
             if (field_0x6de) {
                 setBck(0x1c, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7018d, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
             } else {
                 setBck(0x1b, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x70180, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT, -1);
             }
             field_0x6c0 = (s8) (cM_rndFX(15.0f) + 35.0f);
             mOcState = 1;
@@ -1600,10 +1600,10 @@ void daE_OC_c::executeWatch() {
             speedF = 0.0f;
             if (field_0x6de) {
                 setBck(0x1c, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x7018d, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT_ST, -1);
             } else {
                 setBck(0x1b, 2, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x70180, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT, -1);
             }
             field_0x6c0 = (s8) (cM_rndFX(15.0f) + 35.0f);
             mOcState = 3;
@@ -1612,7 +1612,7 @@ void daE_OC_c::executeWatch() {
             if (field_0x6c0 == 0) {
                 mOcState = 4;
                 setBck(7, 0, 5.0f, 1.0f);
-                mSound.startCreatureVoice(0x70183, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_CRY, -1);
             }
             break;
         case 4:
@@ -1645,13 +1645,13 @@ void daE_OC_c::executeSoundWatch() {
         case 0:
             speedF = 0.0f;
             setBck(0xd, 0, 5.0f, 1.0f);
-            mSound.startCreatureVoice(0x7017e, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_FIND, -1);
             field_0x6c0 = cM_rndF(30.0f) + 60.0f;
             mOcState = 1;
         case 1:
             if (field_0x6c0 == 0) {
                 setBck(0xb, 2, 5.0f, 1.2f);
-                mSound.startCreatureVoice(0x7017f, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_DASH, -1);
                 mOcState = 2;
                 field_0x6c0 = 0x3c;
             }
@@ -1699,7 +1699,7 @@ void daE_OC_c::executeDeath() {
             } else {
                 field_0x6c0 = 0x2d;
                 setBck(0xe, 0, 0.0f, 1.0f);
-                mSound.startCreatureVoice(0x7018c, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_FINISH, -1);
                 mOcState = 3;
                 offDownFlg();
             }
@@ -1707,7 +1707,7 @@ void daE_OC_c::executeDeath() {
         case 3:
             setSpitEffect();
             if (mpMorf->checkFrame(28.5f)) {
-                mSound.startCreatureSound(0x6002b, 0, -1);
+                mSound.startCreatureSound(Z2SE_CM_BODYFALL_S, 0, -1);
             }
         case 2:
             cLib_chaseF(&speedF, 0.0f, 1.0f);
@@ -1750,14 +1750,14 @@ void daE_OC_c::executeWaterDeath() {
     switch (mOcState) {
         case 0:
             setBck(0xC, 0, 0.0f, 1.0f);
-            mSound.startCreatureVoice(0x701AF, -1);
-            mSound.startCreatureSound(0x701B0, 0, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_DROWNED, -1);
+            mSound.startCreatureSound(Z2SE_EN_OC_DROWNED, 0, -1);
             current.pos.y += 140.0f;
             mOcState = 1;
             speedF = 0.0f;
             gravity = 0.0f;
             setWaterEffect();
-            mSound.startCreatureSound(0x60032, 0, -1);
+            mSound.startCreatureSound(Z2SE_CM_BODYFALL_WATER_M, 0, -1);
             offTgSph();
             break;
         case 1:
@@ -1831,7 +1831,7 @@ void daE_OC_c::executeDemoMaster() {
             return;
         }
         case 1:
-            mSound.startCreatureVoice(0x701B1, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_SAKEBU, -1);
             setBck(7, 0, 5.0f, 1.0f);
             mOcState = 2;
             field_0x6c0 = 15;
@@ -1849,19 +1849,19 @@ void daE_OC_c::executeDemoMaster() {
             if (mOcState == 4) {
                 if (mpMorf->isStop()) {
                     setBck(4, 0, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x701A4, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_ANGRY_B, -1);
                     mOcState = 5;
                 }
             } else {
                 if (mpMorf->checkFrame(9.0f)) {
-                    mSound.startCreatureSound(0x70189, 0, -1);
+                    mSound.startCreatureSound(Z2SE_EN_OC_ATTACK_C, 0, -1);
                 }
                 s16 angle = fopAcM_searchPlayerAngleY(this);
                 cLib_chaseAngleS(&field_0x6bc, angle + 0x8000, 0x200);
                 if (mpMorf->isStop()) {
                     mOcState = 6;
                     setBck(0x10, 0, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x701B2, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_JUMP, -1);
                     speedF = 10.0f;
                     speed.y = 40.0f;
                     field_0x6c0 = 0x28;
@@ -1898,7 +1898,7 @@ void daE_OC_c::executeDemoMaster() {
                 cLib_addCalc2(&field_0x6f8.y, my_vec_0.y + 2950.0f, 0.1f, 10.0f);
             }
             if (mAcch.ChkGroundHit()) {
-                mSound.startCreatureSound(0x6002B, 0, -1);
+                mSound.startCreatureSound(Z2SE_CM_BODYFALL_S, 0, -1);
                 fopAcM_effSmokeSet1(&field_0xe60, &field_0xe64, &current.pos, NULL, 2.0f, &tevStr, 1);
                 setBck(0x12, 0, 5.0f, 1.0f);
                 mOcState = 8;
@@ -1908,7 +1908,7 @@ void daE_OC_c::executeDemoMaster() {
             field_0x704 = 47.0f;
             cLib_addCalc2(&field_0x6f8.y, my_vec_0.y + 2950.0f, 0.1f, 10.0f);
             if (mpMorf->checkFrame(34.0f)) {
-                mSound.startCreatureVoice(0x7017E, -1);
+                mSound.startCreatureVoice(Z2SE_EN_OC_V_FIND, -1);
             }
             if (mpMorf->isStop()) {
                 field_0x6c8 = 30;
@@ -1945,14 +1945,14 @@ void daE_OC_c::executeDemoChild() {
             case 1:
                 if (mpParent->mOcState == 5) {
                     setBck(3, 0, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x701A3, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_ANGRY_A, -1);
                     mOcState = 5;
                 }
                 break;
             case 5:
                 if (mpMorf->isStop()) {
                     setBck(0x10, 0, 5.0f, 1.0f);
-                    mSound.startCreatureVoice(0x701B2, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_JUMP, -1);
                     mOcState = 6;
                     speedF = 10.0f;
                     speed.y = 40.0f;
@@ -1975,7 +1975,7 @@ void daE_OC_c::executeDemoChild() {
                 break;
             case 7:
                 if (mAcch.ChkGroundHit()) {
-                    mSound.startCreatureSound(0x6002B, 0, -1);
+                    mSound.startCreatureSound(Z2SE_CM_BODYFALL_S, 0, -1);
                     fopAcM_effSmokeSet1(&field_0xe60, &field_0xe64, &current.pos, NULL, 2.0f, &tevStr, 1);
                     setBck(0x12, 0, 5.0f, 1.0f);
                     mOcState = 8;
@@ -1983,7 +1983,7 @@ void daE_OC_c::executeDemoChild() {
                 break;
             case 8:
                 if (mpMorf->checkFrame(34.0f)) {
-                    mSound.startCreatureVoice(0x7017E, -1);
+                    mSound.startCreatureVoice(Z2SE_EN_OC_V_FIND, -1);
                 }
                 if (mpMorf->isStop()) {
                     setActionMode(3, 0);
@@ -2025,7 +2025,7 @@ void daE_OC_c::executeFallDead() {
     mPrevShapeAngle = shape_angle.y;
     switch (mOcState) {
         case 0:
-            mSound.startCreatureVoice(0x701A5, -1);
+            mSound.startCreatureVoice(Z2SE_EN_OC_V_FALL, -1);
             if (checkBck(0x15) || checkBck(0x13)) {
                 mOcState = 1;
             } else {
@@ -2071,7 +2071,7 @@ void daE_OC_c::executeFall() {
         case 1:
             if (mAcch.ChkGroundHit()) {
                 speedF = 0.0f;
-                mSound.startCreatureSound(0x6002B, 0, -1);
+                mSound.startCreatureSound(Z2SE_CM_BODYFALL_S, 0, -1);
                 fopAcM_effSmokeSet1(&field_0xe60, &field_0xe64, &current.pos, NULL, 2.0f, &tevStr, 1);
                 setBck(0x12, 0, 5.0f, 1.0f);
                 mOcState = 2;
diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp
index 9158023685..81cbb9d9c9 100644
--- a/src/d/actor/d_a_obj_Y_taihou.cpp
+++ b/src/d/actor/d_a_obj_Y_taihou.cpp
@@ -31,12 +31,12 @@ static void ccHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c
         int iVar1 = ((daObjYtaihou_c*)param_0)->getIronBallId();
         if (iVar1 == 0xffffffff && ((daObjCarry_c*)param_2)->getType() == daObjCarry_c::TYPE_IRON_BALL) {
             ((daObjYtaihou_c*)param_0)->setIronBall((daObjCarry_c*)param_2);
-            fopAcM_seStartCurrent(param_0, 0x801c9, 0);
+            fopAcM_seStartCurrent(param_0, Z2SE_OBJ_CANNON_CHARGE, 0);
         }
     } else if (fopAcM_GetProfName(param_2) == 0x221) {
         ((daObjYtaihou_c*)param_0)->startBomb();
         fopAcM_delete(param_2);
-        fopAcM_seStartCurrent(param_0, 0x801c9, 0);
+        fopAcM_seStartCurrent(param_0, Z2SE_OBJ_CANNON_CHARGE, 0);
     }
 }
 
@@ -220,9 +220,9 @@ void daObjYtaihou_c::rotateCheck() {
             field_0x772 = 0;
             daPy_getLinkPlayerActorClass()->offPushPullKeep();
             field_0x774 = -1;
-            fopAcM_seStartCurrent(this, 0x801cb, 0);
+            fopAcM_seStartCurrent(this, Z2SE_OBJ_CANNON_STOP, 0);
         } else {
-            fopAcM_seStartCurrentLevel(this, 0x801ca, 0);
+            fopAcM_seStartCurrentLevel(this, Z2SE_OBJ_CANNON_MOVE, 0);
         }
     } else if (field_0x774) {
         daPy_py_c* player_class = daPy_getLinkPlayerActorClass();
@@ -301,7 +301,7 @@ void daObjYtaihou_c::shotCheck() {
                 mParticleKeys[1] = dComIfGp_particle_set(mParticleKeys[1], 0x1df, &my_vec_0, &tevStr,
                                                      NULL, &l_effectScale, 0xff, NULL, -1,
                                                      NULL, NULL, NULL);
-                fopAcM_seStartCurrentLevel(this, 0x8000a, 0);
+                fopAcM_seStartCurrentLevel(this, Z2SE_OBJ_BOMB_IGNITION, 0);
             } else if (mStartBomb == 4) {
                 daObjCarry_c* pCarry = (daObjCarry_c*) fopAcM_SearchByID(mIronBallId);
                 if (pCarry) {
@@ -323,7 +323,7 @@ void daObjYtaihou_c::shotCheck() {
                 dComIfGp_particle_set(0x8ae5, &my_vec_1, &tevStr, &shape_angle, 0);
                 dComIfGp_particle_set(0x8ae6, &my_vec_1, &tevStr, &shape_angle, 0);
                 dComIfGp_getVibration().StartShock(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
-                fopAcM_seStartCurrent(this, 0x8000b, 0);
+                fopAcM_seStartCurrent(this, Z2SE_OBJ_BOMB_EXPLODE, 0);
                 speed.y = 40.0f;
             }
         }
diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp
index 5aa7a95295..c3aba8ef4f 100644
--- a/src/d/actor/d_a_obj_carry.cpp
+++ b/src/d/actor/d_a_obj_carry.cpp
@@ -200,7 +200,7 @@ const daObjCarry_dt_t daObjCarry_c::mData[] = {
         1000000.0f,
         50.0f,
         Z2SE_OBJ_BREAK_WOOD_S,
-        0x801D4,
+        Z2SE_OBJ_IRONBALL_HIT,
         Z2SE_OBJ_PUT_WATER_M,
         JA_SE_OBJ_FALL_MAGMA_S,
         Z2SE_OBJ_FALL_WATER_S,
@@ -287,8 +287,8 @@ const daObjCarry_dt_t daObjCarry_c::mData[] = {
         48.0f,
         250.0f,
         0.0f,
-        0x800F6,
-        0x800F7,
+        Z2SE_OBJ_SKULL_BREAK,
+        Z2SE_OBJ_SKULL_PUT,
         Z2SE_OBJ_PUT_WATER_S,
         JA_SE_OBJ_FALL_MAGMA_S,
         Z2SE_OBJ_FALL_WATER_S,
@@ -331,8 +331,8 @@ const daObjCarry_dt_t daObjCarry_c::mData[] = {
         60.0f,
         250.0f,
         0.0f,
-        0x800B9,
-        0x800B8,
+        Z2SE_OBJ_BOKKURI_BURST,
+        Z2SE_OBJ_BOKKURI_PUT,
         Z2SE_OBJ_PUT_WATER_S,
         JA_SE_OBJ_FALL_MAGMA_M,
         Z2SE_OBJ_FALL_WATER_M,
diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp
index 4636e66a00..36ddc2cf91 100644
--- a/src/d/actor/d_a_obj_lv1Candle00.cpp
+++ b/src/d/actor/d_a_obj_lv1Candle00.cpp
@@ -185,7 +185,8 @@ int daLv1Cdl00_c::Execute() {
                                     g_whiteColor, g_whiteColor, 0, 0.0f);
         dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff,
                                     g_whiteColor, g_whiteColor, 0, 0.0f);
-        mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+        mDoAud_seStartLevel(Z2SE_OBJ_FIRE_BURNING, &mTorchPos, 0,
+                            dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     }
 
     setBaseMtx();
@@ -200,7 +201,8 @@ int daLv1Cdl00_c::Execute() {
             } else {
                 fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff);
             }
-            mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+            mDoAud_seStart(Z2SE_OBJ_FIRE_IGNITION, &mTorchPos, 0,
+                           dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
             setLight();
         }
         if (gobj->GetAtType() == AT_TYPE_BOOMERANG && gobj->GetAtMtrl() == dCcD_MTRL_WIND && mIsLit == true) {
@@ -211,7 +213,8 @@ int daLv1Cdl00_c::Execute() {
             } else {
                 fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff);
             }
-            mDoAud_seStart(0x80019, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+            mDoAud_seStart(Z2SE_OBJ_FIRE_OFF, &mTorchPos, 0,
+                           dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
             cutLight();
         }
         cCcD_Obj* obj = mCyl.GetTgHitObj();
diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp
index 550250085a..69a5ee0f4d 100644
--- a/src/d/actor/d_a_obj_lv1Candle01.cpp
+++ b/src/d/actor/d_a_obj_lv1Candle01.cpp
@@ -149,7 +149,8 @@ int daLv1Cdl01_c::Execute(f32 (**param_0)[3][4]) {
                                     g_whiteColor, g_whiteColor, 0, 0.0f);
         dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff,
                                     g_whiteColor, g_whiteColor, 0, 0.0f);
-        mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+        mDoAud_seStartLevel(Z2SE_OBJ_FIRE_BURNING, &mTorchPos, 0,
+                            dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     }
 
     setBaseMtx();
@@ -159,12 +160,14 @@ int daLv1Cdl01_c::Execute(f32 (**param_0)[3][4]) {
         if (gobj->GetAtType() == AT_TYPE_LANTERN_SWING && gobj->GetAtMtrl() == dCcD_MTRL_FIRE && !mIsLit) {
             mIsLit = true;
             setLight();
-            mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+            mDoAud_seStart(Z2SE_OBJ_FIRE_IGNITION, &mTorchPos, 0,
+                           dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
         }
         if (gobj->GetAtType() == AT_TYPE_BOOMERANG && gobj->GetAtMtrl() == dCcD_MTRL_WIND && mIsLit == true) {
             mTimer = 30;
             mIsLit = false;
-            mDoAud_seStart(0x80019, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+            mDoAud_seStart(Z2SE_OBJ_FIRE_OFF, &mTorchPos, 0,
+                           dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
             cutLight();
         }
         cCcD_Obj* obj = mCyl.GetTgHitObj();
diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp
index 66b14d7494..7da6dda01c 100644
--- a/src/d/actor/d_a_obj_lv2Candle.cpp
+++ b/src/d/actor/d_a_obj_lv2Candle.cpp
@@ -280,7 +280,8 @@ int daLv2Candle_c::Execute() {
                                     g_whiteColor, g_whiteColor, 0, 0.0f);
         dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff,
                                     g_whiteColor, g_whiteColor, 0, 0.0f);
-        mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+        mDoAud_seStartLevel(Z2SE_OBJ_FIRE_BURNING, &mTorchPos, 0,
+                            dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     }
 
     if (field_0x734 != NULL) {
@@ -305,7 +306,8 @@ int daLv2Candle_c::Execute() {
             } else {
                 fopAcM_offSwitch(this, mSw);
             }
-            mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+            mDoAud_seStart(Z2SE_OBJ_FIRE_IGNITION, &mTorchPos, 0,
+                           dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
             setLight();
         }
         if (gobj->GetAtType() == AT_TYPE_BOOMERANG && gobj->GetAtMtrl() == dCcD_MTRL_WIND &&
@@ -313,7 +315,8 @@ int daLv2Candle_c::Execute() {
             mIsLit = false;
             mCyl.SetAtMtrl(dCcD_MTRL_NONE);
             cutLight();
-            mDoAud_seStart(0x80019, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+            mDoAud_seStart(Z2SE_OBJ_FIRE_OFF, &mTorchPos, 0,
+                           dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
             if (mSw == 0xff) {
                 mTimer = l_HIO.mTimer;
             }
diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp
index c64b556ae0..3648c0f6ef 100644
--- a/src/d/actor/d_a_obj_lv3Candle.cpp
+++ b/src/d/actor/d_a_obj_lv3Candle.cpp
@@ -147,7 +147,8 @@ int daLv3Candle_c::Execute() {
     dComIfGp_particle_setSimple(0x101, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f);
     dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f);
 
-    mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+    mDoAud_seStartLevel(Z2SE_OBJ_FIRE_BURNING, &mTorchPos, 0,
+                        dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 
     if (mSph.ChkTgHit()) {
         cCcD_Obj* obj = mSph.GetTgHitObj();