--- a/mm7_6.cpp	Fri Feb 15 19:53:40 2013 +0200
+++ b/mm7_6.cpp	Fri Feb 15 22:38:05 2013 +0200
@@ -4071,7 +4071,7 @@
                       }
                       if ( v727 != 0.0 )
                       {
-                        pPlayer->PlaySound(49, 0);
+                        pPlayer->PlaySound(SPEECH_49, 0);
                         goto LABEL_1162;
                       }
                     }
@@ -5312,7 +5312,7 @@
             pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, v1, v1, -1, v1, v1, v1, v1);
             v318 = v726;
             v3->spellnum = v1;
-            v318->PlaySound(43, v1);
+            v318->PlaySound(SPEECH_43, v1);
           }
           goto LABEL_83;
         }
@@ -6089,7 +6089,7 @@
           || HIDWORD(pParty->pPlayers[v396].pConditions[14]) | LODWORD(pParty->pPlayers[v396].pConditions[14]) )
         {
           if ( !(HIDWORD(pParty->pPlayers[v396].pConditions[1]) | LODWORD(pParty->pPlayers[v396].pConditions[1])) )
-            pParty->pPlayers[v396].PlaySound(25, v1);
+            pParty->pPlayers[v396].PlaySound(SPEECH_25, v1);
           if ( v731 == 4 )
           {
             v397 = v3->uPlayerID_2;
@@ -6424,7 +6424,7 @@
         if ( HIDWORD(pParty->pPlayers[v440].pConditions[5]) | LODWORD(pParty->pPlayers[v440].pConditions[5]) )
         {
           if ( !(HIDWORD(pParty->pPlayers[v440].pConditions[1]) | LODWORD(pParty->pPlayers[v440].pConditions[1])) )
-            pParty->pPlayers[v440].PlaySound(25, v1);
+            pParty->pPlayers[v440].PlaySound(SPEECH_25, v1);
           if ( v731 == 4 )
           {
             v441 = v3->uPlayerID_2;
@@ -7740,7 +7740,7 @@
         v222 = (char *)HIDWORD(v733);
         if ( v223 )
 LABEL_439:
-          ((Player *)v222)->PlaySound(103, v1);
+          ((Player *)v222)->PlaySound(SPEECH_103, v1);
       }
       v222 += 6972;
       HIDWORD(v733) = (int)v222;
@@ -8049,7 +8049,7 @@
         else
         {
           v34 = 5;
-          v1->PlaySound(50, v3);
+          v1->PlaySound(SPEECH_50, v3);
         }
         switch ( v34 )
         {
@@ -9110,14 +9110,12 @@
             v5->Add(partyAction);
             break;
           case INPUT_Yell:
-            //__debugbreak();
-            if ( !pCurrentScreen
-              && uActiveCharacter )
+            if (!pCurrentScreen && uActiveCharacter)
             {
               pParty->Yell();
-              pPlayers[uActiveCharacter]->PlaySound(65, 0);
+              pPlayers[uActiveCharacter]->PlaySound(SPEECH_Yell, 0);
             }
-            break;
+          break;
           case INPUT_Pass:
             //__debugbreak();
             if ( pCurrentScreen )