From 23cd3e5701b947e3c470fa42a8a66b3f5a881512 Mon Sep 17 00:00:00 2001
From: Demur Rumed <junkmute@hotmail.com>
Date: Fri, 27 Jun 2025 00:51:41 +0000
Subject: [PATCH] less loud dungeon loading zone cue

---
 .../accessible-actors/AccessibleActorList.cpp    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp b/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp
index d9f48d778..d4dd662d0 100644
--- a/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp
+++ b/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp
@@ -43,20 +43,18 @@ extern u8 sBgPoEventPuzzleState;
 }
 
 void accessible_torches(AccessibleActor* actor) {
-    ObjSyokudai* torche = (ObjSyokudai*)actor->actor;
+    ObjSyokudai* torch = (ObjSyokudai*)actor->actor;
     // temporary torches
     if ((actor->actor->params) == 4230 || (actor->actor->params) == 4220 || (actor->actor->params) == 4227 ||
         (actor->actor->params) == 4380 || actor->actor->params == 4321) {
-        if (torche->litTimer != 0) {
+        if (torch->litTimer != 0) {
             actor->policy.volume = 0.1;
             if ((actor->frameCount & 31) != 0) {
                 return;
             }
             ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_IT_BOMB_IGNIT);
-        } else {
-            if (actor->policy.volume != 1.0) {
-                actor->policy.volume = 1.0;
-            }
+        } else if (actor->policy.volume != 1.0) {
+            actor->policy.volume = 1.0;
         }
         if ((actor->frameCount & 31) != 0) {
             return;
@@ -69,15 +67,15 @@ void accessible_torches(AccessibleActor* actor) {
 
     // unlit permanent torches
     if ((actor->actor->params) == 8192) {
-        if (torche->litTimer == 0) {
+        if (torch->litTimer == 0) {
             ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_IT_BOMB_IGNIT);
         } else {
             ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EN_ANUBIS_FIRE);
         }
     }
+
     // lit permanent torches
     if ((actor->actor->params) == 9216 || (actor->actor->params) == 962) {
-
         actor->policy.volume = 0.5;
         actor->policy.distance = 200.0;
         ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EN_ANUBIS_FIRE);
@@ -205,7 +203,7 @@ void accessible_area_change(AccessibleActor* actor) {
     } else if (actor->sceneIndex == SCENE_HYRULE_FIELD) {
         ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_HORSE_RUN_LEVEL);
     } else if (actor->sceneIndex <= SCENE_GERUDO_TRAINING_GROUND) {
-        ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_FANTOM_WARP_S);
+        ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EN_STALTU_LAUGH);
     } else if (actor->sceneIndex >= SCENE_MARKET_ENTRANCE_DAY && actor->sceneIndex <= SCENE_MARKET_ENTRANCE_RUINS) {
         if (actor->play->sceneNum >= SCENE_MARKET_DAY && actor->play->sceneNum <= SCENE_MARKET_RUINS) {
             ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_HORSE_RUN_LEVEL);