BLADERUNNER: SFX named constants and MissSound fix

Still pending cleaning up Ambient_Sounds_Add_Sound and Ambient_Sounds_Add_Looping_Sound calls
author: Thanasis Antoniou 2019-04-05 21:33:47 +0300
committer: Thanasis Antoniou 2019-04-05 21:35:55 +0300
commit: a0beaa6f4e925292f3ffaa8045e580cd579d3ed0 (patch)
tree: 8debb2e8a7d8d7a58295d939ea8cd8bfe2b3e8e5 /engines/bladerunner
parent: 62660da0bc8bdbaa464f8b25ee993f6dfb90aa85 (diff)
download: scummvm-rg350-a0beaa6f4e925292f3ffaa8045e580cd579d3ed0.tar.gz
scummvm-rg350-a0beaa6f4e925292f3ffaa8045e580cd579d3ed0.tar.bz2
scummvm-rg350-a0beaa6f4e925292f3ffaa8045e580cd579d3ed0.zip
132 files changed, 1398 insertions, 778 deletions
diff --git a/engines/bladerunner/ambient_sounds.cpp b/engines/bladerunner/ambient_sounds.cpp
index 08ec388de7..7d0db4763e 100644
--- a/engines/bladerunner/ambient_sounds.cpp
+++ b/engines/bladerunner/ambient_sounds.cpp
@@ -27,6 +27,7 @@
 #include "bladerunner/game_info.h"
 #include "bladerunner/savefile.h"
 #include "bladerunner/time.h"
+#include "bladerunner/game_constants.h"
 
 #include "common/debug.h"
 #include "common/system.h"
@@ -248,7 +249,7 @@ int AmbientSounds::getVolume() const {
 }
 
 void AmbientSounds::playSample() {
-	playSound(66, 100, 0, 0, 0);
+	playSound(kSfxSPIN1A, 100, 0, 0, 0);
 }
 
 int AmbientSounds::findAvailableNonLoopingTrack() const {
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 2752baa393..b35c5bbee1 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -1485,9 +1485,9 @@ void BladeRunnerEngine::handleMouseClickEmpty(int x, int y, Vector3 &scenePositi
 	int actorId = Actor::findTargetUnderMouse(this, x, y);
 	int itemId = _items->findTargetUnderMouse(x, y);
 
-	if (_combat->isActive() && buttonDown && (actorId > 0 || itemId > 0)) {
+	if (_combat->isActive() && buttonDown && (actorId >= 0 || itemId >= 0)) {
 		_playerActor->stopWalking(false);
-		if (actorId > 0) {
+		if (actorId >= 0) {
 			_playerActor->faceActor(actorId, false);
 		} else {
 			_playerActor->faceItem(itemId, false);
diff --git a/engines/bladerunner/combat.cpp b/engines/bladerunner/combat.cpp
index a6677a1469..08d8ce2cc7 100644
--- a/engines/bladerunner/combat.cpp
+++ b/engines/bladerunner/combat.cpp
@@ -97,19 +97,19 @@ void Combat::disable() {
 }
 
 void Combat::setHitSound(int ammoType, int column, int soundId) {
-	_hitSoundId[ammoType * 3 + column] = soundId;
+	_hitSoundId[(kSoundCount/_vm->_settings->getAmmoTypesCount()) * ammoType + column] = soundId;
 }
 
 void Combat::setMissSound(int ammoType, int column, int soundId) {
-	_missSoundId[ammoType * 3 + column] = soundId;
+	_missSoundId[(kSoundCount/_vm->_settings->getAmmoTypesCount()) * ammoType + column] = soundId;
 }
 
 int Combat::getHitSound() const {
-	return _hitSoundId[3 * _vm->_settings->getAmmoType() + _vm->_rnd.getRandomNumber(2)];
+	return _hitSoundId[(kSoundCount/_vm->_settings->getAmmoTypesCount()) * _vm->_settings->getAmmoType() + _vm->_rnd.getRandomNumber(2)];
 }
 
 int Combat::getMissSound() const {
-	return _hitSoundId[3 * _vm->_settings->getAmmoType() + _vm->_rnd.getRandomNumber(2)];
+	return _missSoundId[(kSoundCount/_vm->_settings->getAmmoTypesCount()) * _vm->_settings->getAmmoType() + _vm->_rnd.getRandomNumber(2)];
 }
 
 void Combat::shoot(int actorId, Vector3 &to, int screenX) {
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index eefb019398..c01537e1fd 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -870,7 +870,7 @@ enum Flags {
 	kFlagUG09ToUG07 = 428,
 	kFlagUG08toUG13 = 429,
 	kFlagUG13toUG08 = 430,
-	kFlagUB08ElevatorUp = 431,
+	kFlagUG08ElevatorUp = 431,
 	kFlagUG09toCT12 = 432,
 	kFlagCT12ToUG09 = 433,
 	kFlagUG13toUG18 = 434, // is never checked
@@ -2316,27 +2316,628 @@ enum GoalMaggie {
 enum MusicTracks {
 	kMusicArabLoop = 0,  // Animoid Row track     (Not available at Frank Klepacki's website/portfolio for Blade Runner)
 	kMusicBatl226M = 1,  // "Battle Theme"
-	kMusicBRBlues = 2,   // "Blade Runner Blues"
-	kMusicKyoto = 3,     // "Etsuko Theme"
-	kMusicOneTime = 4,   // "One More Time, Love" (Not available at Frank Klepacki's website/portfolio for Blade Runner)
-	kMusicGothic3 = 5,   // "Gothic Club 2"
+	kMusicBRBlues  = 2,  // "Blade Runner Blues"
+	kMusicKyoto    = 3,  // "Etsuko Theme"
+	kMusicOneTime  = 4,  // "One More Time, Love" (Not available at Frank Klepacki's website/portfolio for Blade Runner)
+	kMusicGothic3  = 5,  // "Gothic Club 2"
 	kMusicArkdFly1 = 6,
 	kMusicArkDnce1 = 7,
-	kMusicTaffy2 = 8,    // "Taffy's Club 2"
-	kMusicTaffy3 = 9,
-	kMusicTaffy4 = 10,
+	kMusicTaffy2   = 8,  // "Taffy's Club 2"
+	kMusicTaffy3   = 9,
+	kMusicTaffy4   = 10,
 	kMusicBeating1 = 11,
 	kMusicCrysDie1 = 12,
-	kMusicGothic1 = 13,  // "Gothic Club"
-	kMusicGothic2 = 14,
-	kMusicStrip1 = 15,
+	kMusicGothic1  = 13, // "Gothic Club"
+	kMusicGothic2  = 14,
+	kMusicStrip1   = 15,
 	kMusicDkoDnce1 = 16,
-	kMusicCredits = 17,  // "Blade Runner End Credits"
-	kMusicMoraji = 18,
+	kMusicCredits  = 17, // "Blade Runner End Credits"
+	kMusicMoraji   = 18,
 	kMusicClovDie1 = 19,
 	kMusicClovDies = 20,
 	kMusicLoveSong = 21  // "Love Theme" (Lucy, Dektora, Subway drive ending)
 };
+
+enum SFXSounds {
+	kSfxCROSLOCK = 0,
+	kSfxSTEAM1   = 1,
+	kSfxSPINNY1  = 2,
+	kSfxFEMHURT1 = 3,
+	kSfxFEMHURT2 = 4,
+	kSfxGUNMISS1 = 5,
+	kSfxGUNMISS2 = 6,
+	kSfxGUNMISS3 = 7,
+	kSfxGUNMISS4 = 8,
+	kSfxHITTARG1 = 9,
+	kSfxHITTARG2 = 10,
+	kSfxHITTARG3 = 11,
+	kSfxLGCAL1   = 12,
+	kSfxLGCAL2   = 13,
+	kSfxLGCAL3   = 14,
+	kSfxMDCAL1   = 15,
+	kSfxMDCAL2   = 16,
+	kSfxRICO1    = 17,
+	kSfxRICO2    = 18,
+	kSfxRICO3    = 19,
+	kSfxRICOCHT1 = 20,
+	kSfxRICOCHT2 = 21,
+	kSfxRICOCHT3 = 22,
+	kSfxRICOCHT4 = 23,
+	kSfxRICOCHT5 = 24,
+	kSfxSMCAL1   = 25,
+	kSfxSMCAL2   = 26,
+	kSfxSMCAL3   = 27,
+	kSfxSMCAL4   = 28,
+	kSfxTARGUP1  = 29,
+	kSfxTARGUP2  = 30,
+	kSfxTARGUP3  = 31,
+	kSfxTARGUP4  = 32,
+	kSfxTARGUP5  = 33,
+	kSfxTARGUP6  = 34,
+	kSfxTARGUP7  = 35,
+	kSfxTRGSPIN1 = 36,
+	kSfxTRGSPIN2 = 37,
+	kSfxTRGSPIN3 = 38,
+	kSfxDRIPPY4  = 39,
+	kSfxDRIPPY10 = 40,
+	kSfxDRIPPY1  = 41,
+	kSfxDRIPPY2  = 42,
+	kSfxDRIPPY6  = 43,
+	kSfxDRIPPY7  = 44,
+	kSfxPSAMB6   = 45,
+	kSfxRTONE3   = 46,
+	kSfxSCANNER1 = 47,
+	kSfxSCANNER2 = 48,
+	kSfxSCANNER3 = 49,
+	kSfxSCANNER4 = 50,
+	kSfxSCANNER5 = 51,
+	kSfxSCANNER6 = 52,
+	kSfxSCANNER7 = 53,
+	kSfxCTRAIN1  = 54,
+	kSfxCTAMBL1  = 55,
+	kSfxCTAMBR1  = 56,
+	kSfxSTEAM3   = 57,
+	kSfxSTEAM6A  = 58,
+	kSfxNEON5    = 59,
+	kSfxNEON6    = 60,
+	kSfxDISH1    = 61,
+	kSfxDISH2    = 62,
+	kSfxDISH3    = 63,
+	kSfxDISH4    = 64,
+	kSfxDISH5    = 65,
+	kSfxSPIN1A   = 66,
+	kSfxSPIN2A   = 67,
+	kSfxSPIN2B   = 68,
+	kSfxSPIN3A   = 69,
+	kSfxBOOLOOP2 = 70,
+	kSfxBRBED5   = 71,
+	kSfxSWEEP2   = 72,
+	kSfxSWEEP3   = 73,
+	kSfxSWEEP4   = 74,
+	kSfxWINDLOP8 = 75,
+	kSfxPETDEAD1 = 76,
+	kSfxPETDEAD3 = 77,
+	kSfxPETDEAD4 = 78,
+	kSfxPETDEAD5 = 79,
+	kSfxRCAMB1   = 80,
+	kSfxRCAMBR1  = 81,
+	kSfxRCCARBY1 = 82,
+	kSfxRCCARBY2 = 83,
+	kSfxRCCARBY3 = 84,
+	kSfxRCRAIN1  = 85,
+	kSfxRCTALK1  = 86,
+	kSfxSIREN2   = 87,
+	kSfxRCTALK2  = 88,
+	kSfxRCTALK3  = 89,
+	kSfxPSDOOR1  = 90,
+	kSfxPSDOOR2  = 91,
+	kSfxPSPA6    = 92,
+	kSfxPSPA7    = 93,
+	kSfxPSPA8    = 94,
+	kSfxBOILPOT2 = 95,
+	kSfxKTCHRAIN = 96,
+	kSfxNEON7    = 97,
+	kSfxBIGFAN2  = 98,
+	kSfxROOFAIR1 = 99,
+	kSfxROOFRMB1 = 100,
+	kSfxROOFRAN1 = 101,
+	kSfxROOFLIT1 = 102,
+	kSfxRAINAWN1 = 103,
+	kSfxAPRTAMB5 = 104,
+	kSfxCTRUNOFF = 105,
+	kSfxCTROOFL1 = 106,
+	kSfxCTROOFR1 = 107,
+	kSfxDRAMB4   = 108,
+	kSfxBRBED3   = 109,
+	kSfxRESPRTR1 = 110,
+	kSfxDRAMB5   = 111,
+	kSfxFACTAMB2 = 112,
+	kSfxDRRAIN1  = 113,
+	kSfxSPINUP1  = 114,
+	kSfxSPINOPN3 = 115,
+	kSfxSPINOPN4 = 116,
+	kSfxCARUP3   = 117,
+	kSfxCARDOWN3 = 118,
+	kSfxSPINCLS1 = 119,
+	kSfxSERVOU1  = 120,
+	kSfxSERVOD1  = 121,
+	kSfxMTLHIT1  = 122,
+	kSfxSPNBEEP9 = 123,
+	kSfxPRISAMB3 = 124,
+	kSfxPRISSLM1 = 125,
+	kSfxPRISSLM2 = 126,
+	kSfxPRISSLM3 = 127,
+	kSfxSPINAMB2 = 128,
+	kSfxSPNAMB1  = 129,
+	kSfxSPNBEEP2 = 130,
+	kSfxSPNBEEP3 = 131,
+	kSfxSPNBEEP4 = 132,
+	kSfxSPNBEEP5 = 133,
+	kSfxSPNBEEP6 = 134,
+	kSfxSPNBEEP7 = 135,
+	kSfxSPNBEEP8 = 136,
+	kSfxPRISAMB1 = 137,
+	kSfxBRBED5X  = 138,
+	kSfxLABAMB1  = 139,
+	kSfxLABAMB2  = 140,
+	kSfxLABAMB3  = 141,
+	kSfxTUBES1   = 142,
+	kSfxTUBES2   = 143,
+	kSfxTUBES3   = 144,
+	kSfxTUBES4   = 145,
+	kSfxLABMISC1 = 146,
+	kSfxLABMISC2 = 147,
+	kSfxLABMISC3 = 148,
+	kSfxLABMISC4 = 149,
+	kSfxLABMISC5 = 150,
+	kSfxLABMISC6 = 151,
+	kSfxLABMISC7 = 152,
+	kSfxLABMISC8 = 153,
+	kSfxLABMISC9 = 154,
+	kSfxLABBUZZ1 = 155,
+	kSfxPAGE1    = 156,
+	kSfxPAGE2    = 157,
+	kSfxPAGE3    = 158,
+	kSfxUPTARG3  = 159,
+	kSfxCEMENTL1 = 160,
+	kSfxCEMENTL2 = 161,
+	kSfxCEMENTL3 = 162,
+	kSfxCEMENTL4 = 163,
+	kSfxCEMENTL5 = 164,
+	kSfxCEMENTR1 = 165,
+	kSfxCEMENTR2 = 166,
+	kSfxCEMENTR3 = 167,
+	kSfxCEMENTR4 = 168,
+	kSfxCEMENTR5 = 169,
+	kSfxCEMWETL1 = 170,
+	kSfxCEMWETL2 = 171,
+	kSfxCEMWETL3 = 172,
+	kSfxCEMWETL4 = 173,
+	kSfxCEMWETL5 = 174,
+	kSfxCEMWETR1 = 175,
+	kSfxCEMWETR2 = 176,
+	kSfxCEMWETR3 = 177,
+	kSfxCEMWETR4 = 178,
+	kSfxCEMWETR5 = 179,
+	kSfxGARBAGE4 = 180,
+	kSfx67_0470R = 181,
+	kSfx67_0480R = 182,
+	kSfx67_0500R = 183,
+	kSfx67_0540R = 184,
+	kSfx67_0560R = 185,
+	kSfx67_0870R = 186,
+	kSfx67_0880R = 187,
+	kSfx67_0900R = 188,
+	kSfx67_0940R = 189,
+	kSfx67_0960R = 190,
+	kSfx67_1070R = 191,
+	kSfx67_1080R = 192,
+	kSfx67_1100R = 193,
+	kSfx67_1140R = 194,
+	kSfx67_1160R = 195,
+	kSfxZUBWLK1  = 196,
+	kSfxZUBWLK2  = 197,
+	kSfxZUBWLK3  = 198,
+	kSfxZUBWLK4  = 199,
+	kSfxBIGPOT4  = 200,
+	kSfxMTLDOOR2 = 201,
+	kSfxPOTSPL4  = 202,
+	kSfxPOTSPL5  = 203,
+	kSfxBIGPOT3  = 204,
+	kSfxCTDRONE1 = 205,
+	kSfxZUBLAND1 = 206,
+	kSfxZUBDEAD1 = 207,
+	kSfxELDOORO2 = 208,
+	kSfxELDOORC1 = 209,
+	kSfxELEAMB3  = 210,
+	kSfxFOUNTAIN = 211,
+	kSfxBELLY1   = 212,
+	kSfxBELLY2   = 213,
+	kSfxBELLY3   = 214,
+	kSfxBELLY4   = 215,
+	kSfxBELLY5   = 216,
+	kSfxHUMMER1  = 217,
+	kSfxHUMMER2  = 218,
+	kSfxHUMMER3  = 219,
+	kSfxHUMMER4  = 220,
+	kSfxPUNCH1   = 221,
+	kSfxKICK1    = 222,
+	kSfxKICK2    = 223,
+	kSfxBANG1    = 224,
+	kSfxBANG2    = 225,
+	kSfxBANG3    = 226,
+	kSfxBANG4    = 227,
+	kSfxBANG5    = 228,
+	kSfxBANG6    = 229,
+	kSfxGLOOP1   = 230,
+	kSfxGLOOP2   = 231,
+	kSfxGLOOP3   = 232,
+	kSfxGLOOP4   = 233,
+	kSfxPIPER1   = 234,
+	kSfxSQUEAK1  = 235,
+	kSfxTB5LOOP1 = 236,
+	kSfxTB5LOOP2 = 237,
+	kSfxHCBELL1  = 238,
+	kSfxHCSING1  = 239,
+	kSfxINDFLUT1 = 240,
+	kSfxHCLOOP1  = 241,
+	kSfxHCANM8   = 242,
+	kSfxHCANM2   = 243,
+	kSfxHCANM3   = 244,
+	kSfxHCANM4   = 245,
+	kSfxHCANM5   = 246,
+	kSfxHCANM6   = 247,
+	kSfxHCANM7   = 248,
+	kSfxHCANM1   = 249,
+	kSfxDOGTOY3  = 250,
+	kSfxBARAMB2  = 251,
+	kSfxBARSFX1  = 252,
+	kSfxBARSFX2  = 253,
+	kSfxBARSFX3  = 254,
+	kSfxBARSFX4  = 255,
+	kSfxBARSFX5  = 256,
+	kSfxBARSFX6  = 257,
+	kSfxBARSFX7  = 258,
+	kSfxCLINK1   = 259,
+	kSfxCLINK2   = 260,
+	kSfxCLINK3   = 261,
+	kSfxCLINK4   = 262,
+	kSfxDOGBARK1 = 263,
+	kSfxDOGBARK3 = 264,
+	kSfxDOGBITE1 = 265,
+	kSfxDOGCRY1  = 266,
+	kSfxDOGCRY2  = 267,
+	kSfxDOGFAR1  = 268,
+	kSfxDOGFAR2  = 269,
+	kSfxDOGGUN1  = 270,
+	kSfxDOGGUN2  = 271,
+	kSfxDOGHURT1 = 272,
+	kSfxDOGMAD1  = 273,
+	kSfxDOGNEED1 = 274,
+	kSfxDOGNEED2 = 275,
+	kSfxDOGTAIL1 = 276,
+	kSfxDOGTAIL2 = 277,
+	kSfxDOGTOY1  = 278,
+	kSfxDOGTOY2  = 279,
+	kSfxBARAMB1  = 280,
+	kSfx14KBEEP1 = 281,
+	kSfxTBBEEP1  = 282,
+	kSfxTBDOOR1  = 283,
+	kSfxTBDOOR2  = 284,
+	kSfxTBLOOP1  = 285,
+	kSfxTRUCKBY1 = 286,
+	kSfxCHEVBY1  = 287,
+	kSfxFIREBD1  = 288,
+	kSfxGLASSY1  = 289,
+	kSfxGLASSY2  = 290,
+	kSfxBBDRIP1  = 291,
+	kSfxBBDRIP2  = 292,
+	kSfxBBDRIP3  = 293,
+	kSfxBBDRIP4  = 294,
+	kSfxBBDRIP5  = 295,
+	kSfxRADIATR1 = 296,
+	kSfxRADIATR2 = 297,
+	kSfxRADIATR3 = 298,
+	kSfxRADIATR4 = 299,
+	kSfxJESTMOV1 = 300,
+	kSfxINDXPLOD = 301,
+	kSfxJESTMUS1 = 302,
+	kSfxBBGRN1   = 303,
+	kSfxBBGRN2   = 304,
+	kSfxBBGRN3   = 305,
+	kSfxBBMOVE1  = 306,
+	kSfxBBMOVE2  = 307,
+	kSfxBBMOVE3  = 308,
+	kSfxHAUNT1   = 309,
+	kSfxHAUNT2   = 310,
+	kSfxMONKCYM1 = 311,
+	kSfxCAMERA2  = 312,
+	kSfxMONKEY1  = 313,
+	kSfxMONKEY2  = 314,
+	kSfxRUNAWAY1 = 315,
+	kSfxTRPDOOR1 = 316,
+	kSfxTRPDORO  = 317,
+	kSfxTRPDORC  = 318,
+	kSfxAUDLAFF1 = 319,
+	kSfxAUDLAFF2 = 320,
+	kSfxAUDLAFF3 = 321,
+	kSfxAUDLAFF4 = 322,
+	kSfxAUDLAFF5 = 323,
+	kSfxAUDLAFF6 = 324,
+	kSfxAUDLAFF7 = 325,
+	kSfxAUDLAFF8 = 326,
+	kSfxAUDLAFF9 = 327,
+	kSfxCHAINLNK = 328,
+	kSfxMAMASNG1 = 329,
+	kSfxROTIS2   = 330,
+	kSfxSTMLOOP7 = 331,
+	kSfxUGBED1   = 332,
+	kSfxUGBED2   = 333,
+	kSfxBIGFAN3  = 334,
+	kSfxGETITEM1 = 335,
+	kSfxFLORBUZZ = 336,
+	kSfxDESKBELL = 337,
+	kSfxCURTAIN1 = 338,
+	kSfxDRAWER1  = 339,
+	kSfxARCBED1  = 340,
+	kSfxCIRCUS1  = 341,
+	kSfxFORTUNE1 = 342,
+	kSfxCARCREK1 = 343,
+	kSfxCARLAND1 = 344,
+	kSfxDORSLID1 = 345,
+	kSfxDORSLID2 = 346,
+	kSfxKUNG1    = 347,
+	kSfxLOWERN1  = 348,
+	kSfxLOWERY1  = 349,
+	kSfxMAGCHNK1 = 350,
+	kSfxMAGDROP1 = 351,
+	kSfxMAGMOVE1 = 352,
+	kSfxMAGMOVE2 = 353,
+	kSfxRAISEN1  = 354,
+	kSfxRAISEY1  = 355,
+	kSfxBUMSNOR1 = 356,
+	kSfxBUMSNOR2 = 357,
+	kSfxBUMSNOR3 = 358,
+	kSfxSTONDOR1 = 359,
+	kSfxSTONDOR2 = 360,
+	kSfxSEXYAD2  = 361,
+	kSfxMUSBLEED = 362,
+	kSfxSUNROOM1 = 363,
+	kSfxSUNROOM2 = 364,
+	kSfxSUNROOM3 = 365,
+	kSfxSUNROOM4 = 366,
+	kSfxSUBWAY1  = 367,
+	kSfxYELL1M1  = 368,
+	kSfxGRUNT1M1 = 369,
+	kSfxGRUNT2M1 = 370,
+	kSfxHURT1M1  = 371,
+	kSfxCARGELE2 = 372,  // UG13 from/to UG08 elevator
+	kSfxCARUP3B  = 373,
+	kSfxCOLONY   = 374,
+	kSfxTHNDER2  = 375,
+	kSfxTHNDER3  = 376,
+	kSfxTHNDER4  = 377,
+	kSfxTHNDR1   = 378,
+	kSfxTHNDR2   = 379,
+	kSfxTHNDR3   = 380,
+	kSfxRAIN10   = 381,
+	kSfxRAINALY1 = 382,
+	kSfxSKINBED1 = 383,
+	kSfxRUMLOOP1 = 384,
+	kSfxPHONE1   = 385,
+	kSfxESPLOOP1 = 386,
+	kSfxESPLOOP2 = 387,
+	kSfxESPLOOP3 = 388,
+	kSfxSTEAMY1  = 389,
+	kSfxSTEAMY2  = 390,
+	kSfxSQUEAK2  = 391,
+	kSfxSQUEAK3  = 392,
+	kSfxSQUEAK4  = 393,
+	kSfxSQUEAK5  = 394,
+	kSfxGRUNT1M2 = 395,
+	kSfxGRUNT1M3 = 396,
+	kSfxGRUNT2M2 = 397,
+	kSfxGRUNT2M3 = 398,
+	kSfxHURT1M2  = 399,
+	kSfxHURT1M3  = 400,
+	kSfxYELL1M2  = 401,
+	kSfxYELL1M3  = 402,
+	kSfxVIDFONE1 = 403,
+	kSfxDRAIN1X  = 404,
+	kSfxTOILET1  = 405,
+	kSfxGARGLE1  = 406,
+	kSfxWASH1    = 407,
+	kSfxAPRTFAN1 = 408,
+	kSfxMA04VO1A = 409,  // Developer commentary for MA04 scene (McCoy's apartment)
+	kSfxCT01VO1A = 410,  // Developer commentary for CT01 scene (Howie Lee's, Chinatown)
+	kSfxHC01VO1A = 411,  // Developer commentary for HC01 scene (Hawker's Circle)
+	kSfxELEBAD1  = 412,
+	kSfxBR025_5A = 413,
+	kSfxBR027_1P = 414,
+	kSfxBR024_4B = 415,
+	kSfxBR029_3A = 416,
+	kSfxBR034_1A = 417,
+	kSfxBR030_3A = 418,
+	kSfxBR031_1P = 419,
+	kSfxBR028_2A = 420,
+	kSfxBR026_2A = 421,
+	kSfxBR032_7B = 422,
+	kSfxBR033_4B = 423,
+	kSfxBR035_7B = 424,
+	kSfxBR010_4A = 425,
+	kSfxBR011_2A = 426,
+	kSfxBR012_3B = 427,
+	kSfxBR013_3D = 428,
+	kSfxBR014_5A = 429,
+	kSfxBR015_3C = 430,
+	kSfxBR016_2B = 431,
+	kSfxBR017_2A = 432,
+	kSfxBR018_3E = 433,
+	kSfxBBELE2   = 434,
+	kSfxRATTY1   = 435,
+	kSfxRATTY2   = 436,
+	kSfxRATTY3   = 437,
+	kSfxRATTY4   = 438,
+	kSfxRATTY5   = 439,
+	kSfxSCARY1   = 440,
+	kSfxSCARY2   = 441,
+	kSfxSCARY3   = 442,
+	kSfxSCARY4   = 443,
+	kSfxSCARY5   = 444,
+	kSfxSCARY6   = 445,
+	kSfxSCARY7   = 446,
+	kSfxPNEUM5   = 447,
+	kSfxROBOTMV1 = 448,
+	kSfxMCGUN1   = 449,
+	kSfxMCGUN2   = 450,
+	kSfxDEKGLAS1 = 451,
+	kSfx35MM     = 452,
+	kSfx35MMBRK1 = 453,
+	kSfx35MMGO1  = 454,
+	kSfxBR027_3P = 455,
+	kSfxBRWIND2  = 456,
+	kSfxBUTN6    = 457,
+	kSfxBR018_1P = 458,
+	kSfxBR003_1A = 459,
+	kSfxBRTARGET = 460,
+	kSfxVKBEEP1  = 461,
+	kSfxVKBEEP2  = 462,
+	kSfxCAMCOP1  = 463,
+	kSfxKPAMB1   = 464,
+	kSfxMANHOLE1 = 465,
+	kSfxMETALL1  = 466,
+	kSfxMETALL2  = 467,
+	kSfxMETALL3  = 468,
+	kSfxMETALL4  = 469,
+	kSfxMETALL5  = 470,
+	kSfxMETALR1  = 471,
+	kSfxMETALR2  = 472,
+	kSfxMETALR3  = 473,
+	kSfxMETALR4  = 474,
+	kSfxMETALR5  = 475,
+	kSfxWOODL1   = 476,
+	kSfxWOODL2   = 477,
+	kSfxWOODL3   = 478,
+	kSfxWOODL4   = 479,
+	kSfxWOODL5   = 480,
+	kSfxWOODR1   = 481,
+	kSfxWOODR2   = 482,
+	kSfxWOODR3   = 483,
+	kSfxWOODR4   = 484,
+	kSfxWOODR5   = 485,
+	kSfxDIALOUT3 = 486,
+	kSfxBIKEMIX4 = 487,
+	kSfxCHAINBRK = 488,
+	kSfxGUNAIM1  = 489,
+	kSfxCAREXPL1 = 490,
+	kSfxCRYEXPL1 = 491,
+	kSfxSHOTCOK1 = 492,
+	kSfxSHOTGUN1 = 493,
+	kSfxDOGEXPL1 = 494,
+	kSfxBEEP16   = 495,
+	kSfxMECHAN1C = 496,
+	kSfxMECHAN1  = 497,
+	kSfxPANEL1   = 498,
+	kSfxPANEL2   = 499,
+	kSfxPANOPEN  = 500,
+	kSfxELECTRO1 = 501,
+	kSfxBEEP1    = 502,
+	kSfxBUTN4P   = 503,
+	kSfxBUTN4R   = 504,
+	kSfxBUTN5P   = 505,
+	kSfxBUTN5R   = 506,
+	kSfxTEXT1    = 507,
+	kSfxTEXT3    = 508,
+	kSfxBEEP10   = 509,
+	kSfxBEEP10A  = 510,
+	kSfxBEEP15   = 511,
+	kSfxMUSVOL8  = 512,
+	kSfxELECBP1  = 513,
+	kSfxCRZYEXPL = 514,
+	kSfxELEBUTN1 = 515,
+	kSfxELECLAB1 = 516,
+	kSfxGUNH1A   = 517,
+	kSfxGUNH1B   = 518,
+	kSfxGUNH1C   = 519,
+	kSfxGUNH2A   = 520,
+	kSfxGUNH2B   = 521,
+	kSfxGUNH2C   = 522,
+	kSfxGUNH3A   = 523,
+	kSfxGUNH3B   = 524,
+	kSfxGUNH3C   = 525,
+	kSfxGUNM1A   = 526,
+	kSfxGUNM1B   = 527,
+	kSfxGUNM1C   = 528,
+	kSfxGUNM2A   = 529,
+	kSfxGUNM2B   = 530,
+	kSfxGUNM2C   = 531,
+	kSfxGUNM3A   = 532,
+	kSfxGUNM3B   = 533,
+	kSfxGUNM3C   = 534,
+	kSfxGUNH1AR  = 535,
+	kSfxGUNH1BR  = 536,
+	kSfxGUNH1CR  = 537,
+	kSfxGUNH2AR  = 538,
+	kSfxGUNH2BR  = 539,
+	kSfxGUNH2CR  = 540,
+	kSfxGUNH3AR  = 541,
+	kSfxGUNH3BR  = 542,
+	kSfxGUNH3CR  = 543,
+	kSfxGUNM1AR  = 544,
+	kSfxGUNM1BR  = 545,
+	kSfxGUNM1CR  = 546,
+	kSfxGUNM2AR  = 547,
+	kSfxGUNM2BR  = 548,
+	kSfxGUNM2CR  = 549,
+	kSfxGUNM3AR  = 550,
+	kSfxGUNM3BR  = 551,
+	kSfxGUNM3CR  = 552,
+	kSfxGARBAGE  = 553,
+	kSfxBELLTONE = 554,
+	kSfxMALEHURT = 555,
+	kSfxHOLSTER1 = 556,
+	kSfxHEADHIT2 = 557,
+	kSfxUGLEVER1 = 558,
+	kSfxCOMPDWN4 = 559,
+	kSfxDROPGLAS = 560,
+	kSfxBRKFNGR1 = 561,
+	kSfxBOMBFAIL = 562,
+	kSfxBABYCRY2 = 563,
+	kSfxBRKROPE1 = 564,
+	kSfxKICKDOOR = 565,
+	kSfxDEKCLAP1 = 566,
+	kSfxWHISTLE1 = 567,
+	kSfxWHISTLE2 = 568,
+	kSfxWHISTLE3 = 569,
+	kSfxFEMORG1  = 570,
+	kSfxFEMORG2  = 571,
+	kSfxFEMORG3  = 572,
+	kSfxFEMORG4  = 573,
+	kSfxDOORLOCK = 574,
+	kSfxRIMSHOT1 = 575,
+	kSfxRIMSHOT2 = 576,
+	kSfxRIMSHOT3 = 577,
+	kSfxRIMSHOT4 = 578,
+	kSfxRIMSHOT5 = 579,
+	kSfxGOTSHOT1 = 580,
+	kSfxCOMEDY   = 581,
+	kSfxDRUGOUT  = 582,
+	kSfxPLANKDWN = 583,
+	kSfxBANGDOOR = 584,
+	kSfxCOMPBED1 = 585,
+	kSfxMOONBED2 = 586,
+	kSfxDATALOAD = 587,
+	kSfxBEEPNEAT = 588,
+	kSfxWINDLOOP = 589,
+	kSfxTBALARM  = 590,
+	kSfxLIGHTON  = 591,
+	kSfxCOMPON1  = 592,
+	kSfxCHARMTL7 = 593,
+	kSfxCHARMTL8 = 594,
+	kSfxCHARMTL9 = 595,
+	kSfxSHUTDOWN = 596
+};
+
 } // End of namespace BladeRunner
 
 #endif
diff --git a/engines/bladerunner/item_pickup.cpp b/engines/bladerunner/item_pickup.cpp
index cab75b28c1..797fc7c533 100644
--- a/engines/bladerunner/item_pickup.cpp
+++ b/engines/bladerunner/item_pickup.cpp
@@ -29,6 +29,7 @@
 #include "bladerunner/slice_renderer.h"
 #include "bladerunner/time.h"
 #include "bladerunner/zbuffer.h"
+#include "bladerunner/game_constants.h"
 
 namespace BladeRunner {
 
@@ -55,7 +56,7 @@ void ItemPickup::setup(int animationId, int screenX, int screenY) {
 	_screenRect.bottom = _screenY + 40;
 
 	int pan = (75 * (2 * _screenX - 640)) / 640; // map [0..640] to [-75..75]
-	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(335), 80, pan, pan, 50, 0);
+	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxGETITEM1), 80, pan, pan, 50, 0);
 
 	_timeLast = _vm->_time->currentSystem();
 }
diff --git a/engines/bladerunner/music.cpp b/engines/bladerunner/music.cpp
index 38afafa427..081d9c15cf 100644
--- a/engines/bladerunner/music.cpp
+++ b/engines/bladerunner/music.cpp
@@ -27,6 +27,7 @@
 #include "bladerunner/bladerunner.h"
 #include "bladerunner/game_info.h"
 #include "bladerunner/savefile.h"
+#include "bladerunner/game_constants.h"
 
 #include "common/timer.h"
 
@@ -169,7 +170,7 @@ int Music::getVolume() {
 
 void Music::playSample() {
 	if (!isPlaying()) {
-		play(_vm->_gameInfo->getSfxTrack(512), 100, 0, 2, -1, 0, 3);
+		play(_vm->_gameInfo->getSfxTrack(kSfxMUSVOL8), 100, 0, 2, -1, 0, 3);
 	}
 }
 
diff --git a/engines/bladerunner/script/ai/bryant.cpp b/engines/bladerunner/script/ai/bryant.cpp
index bedb19de63..2a76ee9655 100644
--- a/engines/bladerunner/script/ai/bryant.cpp
+++ b/engines/bladerunner/script/ai/bryant.cpp
@@ -117,7 +117,7 @@ void AIScriptBryant::ShotAtAndMissed() {
 
 bool AIScriptBryant::ShotAtAndHit() {
 	AI_Movement_Track_Flush(kActorBryant);
-	Sound_Play(3, 100, 0, 0, 50);
+	Sound_Play(kSfxFEMHURT1, 100, 0, 0, 50);  // a bug?
 
 	return false;
 }
diff --git a/engines/bladerunner/script/ai/bullet_bob.cpp b/engines/bladerunner/script/ai/bullet_bob.cpp
index 75acdfdb21..47e3852c29 100644
--- a/engines/bladerunner/script/ai/bullet_bob.cpp
+++ b/engines/bladerunner/script/ai/bullet_bob.cpp
@@ -264,10 +264,10 @@ bool AIScriptBulletBob::UpdateAnimation(int *animation, int *frame) {
 			*animation = 506;
 		}
 		if (_animationFrame == 10) {
-			Sound_Play(492, 75, 0, 0, 50);
+			Sound_Play(kSfxSHOTCOK1, 75, 0, 0, 50);
 		}
 		if (_animationFrame == 5) {
-			Sound_Play(493, 90, 0, 0, 50);
+			Sound_Play(kSfxSHOTGUN1, 90, 0, 0, 50);
 			Actor_Set_Goal_Number(kActorBulletBob, kGoalBulletBobShotMcCoy);
 		}
 		break;
diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index eba72e342a..542beb027a 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -832,10 +832,10 @@ bool AIScriptClovis::UpdateAnimation(int *animation, int *frame) {
 			} else {
 				snd = 9015;
 			}
-			Sound_Play_Speech_Line(5, snd, 75, 0, 99);
+			Sound_Play_Speech_Line(kActorClovis, snd, 75, 0, 99);
 		}
 		if (_animationFrame == 4) {
-			Actor_Combat_AI_Hit_Attempt(5);
+			Actor_Combat_AI_Hit_Attempt(kActorClovis);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			flag = true;
diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp
index 54fa6d6c30..b4e059ab6e 100644
--- a/engines/bladerunner/script/ai/dektora.cpp
+++ b/engines/bladerunner/script/ai/dektora.cpp
@@ -173,7 +173,7 @@ void AIScriptDektora::CompletedMovementTrack() {
 	case 272:
 		AI_Movement_Track_Flush(kActorDektora);
 		Actor_Face_Heading(kActorDektora, 0, 0);
-		Sound_Play(451, 71, 0, 0, 50);
+		Sound_Play(kSfxDEKGLAS1, 71, 0, 0, 50);
 
 		_animationState = 35;
 		_animationFrame = 0;
@@ -487,7 +487,7 @@ bool AIScriptDektora::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 			Actor_Face_Actor(kActorSteele, kActorDektora, true);
 			Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatAttack);
 			Delay(250);
-			Sound_Play(3, 100, 0, 0, 50);
+			Sound_Play(kSfxFEMHURT1, 100, 0, 0, 50);
 			Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11BurningGoToWindow);
 		} else {
 			Actor_Set_Goal_Number(kActorDektora, kGoalDektoraNR11BurningGoToMcCoy);
@@ -722,7 +722,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 		}
 
 		if (_animationFrame == 5) {
-			Actor_Combat_AI_Hit_Attempt(3);
+			Actor_Combat_AI_Hit_Attempt(kActorDektora);
 		}
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(141)) {
@@ -750,11 +750,11 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 			} else {
 				speech = 9015;
 			}
-			Sound_Play_Speech_Line(3, speech, 75, 0, 99);
+			Sound_Play_Speech_Line(kActorDektora, speech, 75, 0, 99);
 		}
 
 		if (_animationFrame == 6) {
-			Actor_Combat_AI_Hit_Attempt(3);
+			Actor_Combat_AI_Hit_Attempt(kActorDektora);
 		}
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(142)) {
@@ -943,7 +943,7 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 		}
 
 		if (_animationFrame == 11) {
-			Ambient_Sounds_Play_Sound(206, 80, -20, -20, 20);
+			Ambient_Sounds_Play_Sound(kSfxZUBLAND1, 80, -20, -20, 20);
 		}
 		break;
 
@@ -952,15 +952,15 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 		if (_animationFrame == 1) {
 			switch (Random_Query(0, 2)) {
 			case 0:
-				Sound_Play(567, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE1, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 
 			case 1:
-				Sound_Play(568, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE2, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 
 			case 2:
-				Sound_Play(569, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE3, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 			}
 		}
@@ -979,15 +979,15 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 		if (_animationFrame == 1) {
 			switch (Random_Query(0, 2)) {
 			case 0:
-				Sound_Play(567, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE1, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 
 			case 1:
-				Sound_Play(568, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE2, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 
 			case 2:
-				Sound_Play(569, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE3, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 			}
 		}
@@ -1005,15 +1005,15 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 		if (_animationFrame == 1) {
 			switch (Random_Query(0, 2)) {
 			case 0:
-				Sound_Play(567, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE1, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 
 			case 1:
-				Sound_Play(568, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE2, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 
 			case 2:
-				Sound_Play(569, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE3, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 			}
 		}
@@ -1030,15 +1030,15 @@ bool AIScriptDektora::UpdateAnimation(int *animation, int *frame) {
 		if (_animationFrame == 1) {
 			switch (Random_Query(0, 2)) {
 			case 0:
-				Sound_Play(567, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE1, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 
 			case 1:
-				Sound_Play(568, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE2, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 
 			case 2:
-				Sound_Play(569, (100 / Random_Query(5, 9)), 0, 0, 50);
+				Sound_Play(kSfxWHISTLE3, (100 / Random_Query(5, 9)), 0, 0, 50);
 				break;
 			}
 		}
diff --git a/engines/bladerunner/script/ai/desk_clerk.cpp b/engines/bladerunner/script/ai/desk_clerk.cpp
index f723b3335b..363a7e3d26 100644
--- a/engines/bladerunner/script/ai/desk_clerk.cpp
+++ b/engines/bladerunner/script/ai/desk_clerk.cpp
@@ -248,7 +248,7 @@ bool AIScriptDeskClerk::UpdateAnimation(int *animation, int *frame) {
 		*animation = 670;
 		_animationFrame++;
 		if (_animationFrame > Slice_Animation_Query_Number_Of_Frames(670) - 2) {
-			Ambient_Sounds_Play_Sound(206, 40, 30, 30, 99);
+			Ambient_Sounds_Play_Sound(kSfxZUBLAND1, 40, 30, 30, 99);
 			Actor_Set_Goal_Number(kActorDeskClerk, kGoalDeskClerkKnockedOut);
 			Actor_Change_Animation_Mode(kActorDeskClerk, kAnimationModeIdle);
 			*animation = 661;
diff --git a/engines/bladerunner/script/ai/early_q.cpp b/engines/bladerunner/script/ai/early_q.cpp
index 39fbb9fa36..4d67360f7b 100644
--- a/engines/bladerunner/script/ai/early_q.cpp
+++ b/engines/bladerunner/script/ai/early_q.cpp
@@ -401,7 +401,7 @@ bool AIScriptEarlyQ::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true);
 		Actor_Change_Animation_Mode(kActorEarlyQ, 23);
 		Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, false);
-		Ambient_Sounds_Play_Sound(582, 50, 99, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxDRUGOUT, 50, 99, 0, 0);
 		Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyNR04Drink);
 		break;
 
@@ -539,7 +539,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 		*animation = 381;
 		_animationFrame++;
 		if (_animationFrame == 18) {
-			Ambient_Sounds_Play_Sound(255, 99, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxBARSFX4, 99, 0, 0, 20);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorEarlyQ, 74);
@@ -641,16 +641,16 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 			_animationFrame++;
 		}
 		if (_animationFrame == 1) {
-			Ambient_Sounds_Play_Sound(555, 59, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxMALEHURT, 59, 0, 0, 20);
 		}
 		if (_animationFrame == 8) {
-			Ambient_Sounds_Play_Sound(254, 47, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxBARSFX3,  47, 0, 0, 20);
 		}
 		if (_animationFrame == 11) {
-			Ambient_Sounds_Play_Sound(560, 27, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxDROPGLAS, 27, 0, 0, 20);
 		}
 		if (_animationFrame == 14) {
-			Ambient_Sounds_Play_Sound(206, 41, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxZUBLAND1, 41, 0, 0, 20);
 		}
 		break;
 
@@ -686,7 +686,7 @@ bool AIScriptEarlyQ::UpdateAnimation(int *animation, int *frame) {
 		*animation = 364;
 		_animationFrame++;
 		if (_animationFrame == 2) {
-			Ambient_Sounds_Play_Sound(12, 60, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxLGCAL1, 60, 0, 0, 20);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(364)) {
 			_animationFrame = 0;
diff --git a/engines/bladerunner/script/ai/free_slot_a.cpp b/engines/bladerunner/script/ai/free_slot_a.cpp
index c80b4da778..5491f2eef7 100644
--- a/engines/bladerunner/script/ai/free_slot_a.cpp
+++ b/engines/bladerunner/script/ai/free_slot_a.cpp
@@ -393,10 +393,10 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 			} else {
 				snd = 9015;
 			}
-			Sound_Play_Speech_Line(64, snd, 75, 0, 99);
+			Sound_Play_Speech_Line(kActorFreeSlotA, snd, 75, 0, 99);
 		}
 		if (_animationFrame == 3) {
-			Ambient_Sounds_Play_Sound(438, 99, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxRATTY4, 99, 0, 0, 20);
 			Actor_Combat_AI_Hit_Attempt(kActorFreeSlotA);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(857)) {
@@ -416,7 +416,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		if (_animationFrame == 1) {
-			Ambient_Sounds_Play_Sound(437, 99, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxRATTY3, 99, 0, 0, 20);
 		}
 		*animation = 860;
 		_animationFrame++;
@@ -431,7 +431,7 @@ bool AIScriptFreeSlotA::UpdateAnimation(int *animation, int *frame) {
 		*animation = 859;
 		_animationFrame++;
 		if (_animationFrame == 0) {
-			Ambient_Sounds_Play_Sound(439, 99, 0, 0, 25);
+			Ambient_Sounds_Play_Sound(kSfxRATTY5, 99, 0, 0, 25);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(859) - 1) { // bug? shuld not be '-1'
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(859) - 1;
diff --git a/engines/bladerunner/script/ai/free_slot_b.cpp b/engines/bladerunner/script/ai/free_slot_b.cpp
index 431b27a062..e7bdfc7f11 100644
--- a/engines/bladerunner/script/ai/free_slot_b.cpp
+++ b/engines/bladerunner/script/ai/free_slot_b.cpp
@@ -302,7 +302,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 
 	case 6:
 		if (_animationFrame == 1) {
-			Ambient_Sounds_Play_Sound(437, 99, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxRATTY3, 99, 0, 0, 20);
 		}
 		*animation = 860;
 		_animationFrame++;
@@ -317,7 +317,7 @@ bool AIScriptFreeSlotB::UpdateAnimation(int *animation, int *frame) {
 		*animation = 859;
 		_animationFrame++;
 		if (_animationFrame == 1) {
-			Ambient_Sounds_Play_Sound(439, 99, 0, 0, 25);
+			Ambient_Sounds_Play_Sound(kSfxRATTY5, 99, 0, 0, 25);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(859)) {
 			_animationFrame = Slice_Animation_Query_Number_Of_Frames(859);
diff --git a/engines/bladerunner/script/ai/gaff.cpp b/engines/bladerunner/script/ai/gaff.cpp
index 57bdd8a2dc..bfcd163a0d 100644
--- a/engines/bladerunner/script/ai/gaff.cpp
+++ b/engines/bladerunner/script/ai/gaff.cpp
@@ -316,7 +316,7 @@ bool AIScriptGaff::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case kGoalGaffMA07ShootMcCoy:
 		Actor_Face_Actor(kActorGaff, kActorMcCoy, true);
 		Actor_Change_Animation_Mode(kActorGaff, kAnimationModeCombatAttack);
-		Sound_Play(27, 100, 0, 0, 50);
+		Sound_Play(kSfxSMCAL3, 100, 0, 0, 50);
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
 		Actor_Retired_Here(kActorMcCoy, 12, 12, true, -1);
 		return true;
diff --git a/engines/bladerunner/script/ai/general_doll.cpp b/engines/bladerunner/script/ai/general_doll.cpp
index 729bac22ed..7a62320153 100644
--- a/engines/bladerunner/script/ai/general_doll.cpp
+++ b/engines/bladerunner/script/ai/general_doll.cpp
@@ -156,7 +156,7 @@ bool AIScriptGeneralDoll::ShotAtAndHit() {
 	if (!Game_Flag_Query(kFlagGeneralDollShot)
 	 &&  Global_Variable_Query(kVariableGeneralDollShot) == 1
 	) {
-		Sound_Play(121, 100, 0, 0, 50);
+		Sound_Play(kSfxSERVOD1, 100, 0, 0, 50);
 		Game_Flag_Set(kFlagGeneralDollShot);
 		Actor_Set_Goal_Number(kActorGeneralDoll, 104);
 		ChangeAnimationMode(kAnimationModeDie);
diff --git a/engines/bladerunner/script/ai/generic_walker_a.cpp b/engines/bladerunner/script/ai/generic_walker_a.cpp
index 32a66e62d9..c7afdbc767 100644
--- a/engines/bladerunner/script/ai/generic_walker_a.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_a.cpp
@@ -160,7 +160,7 @@ bool AIScriptGenericWalkerA::ShotAtAndHit() {
 		AI_Movement_Track_Flush(kActorGenwalkerA);
 		_animationState = kGenericWalkerAStatesDie;
 		_animationFrame = 0;
-		Sound_Play(203, 100, 0, 0, 50);
+		Sound_Play(kSfxPOTSPL5, 100, 0, 0, 50);
 		movingStart();
 		return true;
 	}
diff --git a/engines/bladerunner/script/ai/generic_walker_b.cpp b/engines/bladerunner/script/ai/generic_walker_b.cpp
index 3bda0cfe55..acada61e42 100644
--- a/engines/bladerunner/script/ai/generic_walker_b.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_b.cpp
@@ -152,7 +152,7 @@ bool AIScriptGenericWalkerB::ShotAtAndHit() {
 		AI_Movement_Track_Flush(kActorGenwalkerB);
 		_animationState = kGenericWalkerBStatesDie;
 		_animationFrame = 0;
-		Sound_Play(203, 100, 0, 0, 50);
+		Sound_Play(kSfxPOTSPL5, 100, 0, 0, 50);
 		movingStart();
 		return true;
 	}
diff --git a/engines/bladerunner/script/ai/generic_walker_c.cpp b/engines/bladerunner/script/ai/generic_walker_c.cpp
index 99c07368b1..a70ebc09ff 100644
--- a/engines/bladerunner/script/ai/generic_walker_c.cpp
+++ b/engines/bladerunner/script/ai/generic_walker_c.cpp
@@ -153,7 +153,7 @@ bool AIScriptGenericWalkerC::ShotAtAndHit() {
 		AI_Movement_Track_Flush(kActorGenwalkerC);
 		_animationState = kGenericWalkerCStatesDie;
 		_animationFrame = 0;
-		Sound_Play(203, 100, 0, 0, 50);
+		Sound_Play(kSfxPOTSPL5, 100, 0, 0, 50);
 		movingStart();
 		return true;
 	}
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index 0a2df013bf..b5407198c7 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -160,7 +160,7 @@ void AIScriptGordo::CompletedMovementTrack() {
 
 	if (Actor_Query_Goal_Number(kActorGordo) == kGoalGordoNR02GoToPodium) {
 		if (Player_Query_Current_Set() == kSetNR02) {
-			Ambient_Sounds_Play_Sound(581, 58, 0, 0, 0);
+			Ambient_Sounds_Play_Sound(kSfxCOMEDY, 58, 0, 0, 0);
 			Actor_Face_Heading(kActorGordo, 0, false);
 			Loop_Actor_Travel_Stairs(kActorGordo, 4, true, kAnimationModeIdle);
 			Actor_Face_Heading(kActorGordo, 506, false);
@@ -544,8 +544,8 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Music_Stop(1);
 		Actor_Face_Actor(kActorMcCoy, kActorGordo, true);
 		Actor_Says(kActorGordo, 740, 17);
-		Sound_Play(575, 50, 0, 0, 50);
-		Sound_Play(319, 50, 0, 0, 50);
+		Sound_Play(kSfxRIMSHOT1, 50, 0, 0, 50);
+		Sound_Play(kSfxAUDLAFF1, 50, 0, 0, 50);
 		Actor_Says(kActorGordo, 750, 16);
 		Actor_Says(kActorGordo, 760, 15);
 		Actor_Says(kActorGordo, 770, 14);
@@ -557,8 +557,8 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 			Actor_Says(kActorMcCoy, 3910, 16);
 			if (Global_Variable_Query(kVariableHollowayArrest) == 2) {
 				Actor_Says(kActorGordo, 870, 16);
-				Sound_Play(576, 50, 0, 0, 50);
-				Sound_Play(319, 50, 0, 0, 50);
+				Sound_Play(kSfxRIMSHOT2, 50, 0, 0, 50);
+				Sound_Play(kSfxAUDLAFF1, 50, 0, 0, 50);
 				Actor_Set_Goal_Number(kActorHolloway, kGoalHollowayGoToNR02);
 				Actor_Says(kActorGordo, 880, 17);
 				Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR02WaitAtPodium);
@@ -569,8 +569,8 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		} else {
 			Actor_Says(kActorGordo, 790, 12);
 			Actor_Says(kActorMcCoy, 3890, 15);
-			Sound_Play(577, 50, 0, 0, 50);
-			Sound_Play(321, 50, 0, 0, 50);
+			Sound_Play(kSfxRIMSHOT3, 50, 0, 0, 50);
+			Sound_Play(kSfxAUDLAFF3, 50, 0, 0, 50);
 			Actor_Says(kActorGordo, 800, 15);
 			Actor_Says(kActorGordo, 810, 17);
 			Actor_Says(kActorMcCoy, 3895, 16);
@@ -579,8 +579,8 @@ bool AIScriptGordo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 			Actor_Says(kActorGordo, 830, 15);
 			Actor_Says(kActorMcCoy, 3905, 13);
 			Actor_Says(kActorGordo, 840, 13);
-			Sound_Play(578, 50, 0, 0, 50);
-			Sound_Play(321, 50, 0, 0, 50);
+			Sound_Play(kSfxRIMSHOT4, 50, 0, 0, 50);
+			Sound_Play(kSfxAUDLAFF3, 50, 0, 0, 50);
 			Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR02RunAway1);
 		}
 		break;
diff --git a/engines/bladerunner/script/ai/hanoi.cpp b/engines/bladerunner/script/ai/hanoi.cpp
index 87003f8c54..6472c5a801 100644
--- a/engines/bladerunner/script/ai/hanoi.cpp
+++ b/engines/bladerunner/script/ai/hanoi.cpp
@@ -512,11 +512,11 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 		_animationFrame++;
 
 		if (_animationFrame == 4) {
-			Ambient_Sounds_Play_Sound(492, 77, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxSHOTCOK1, 77, 0, 0, 20);
 		}
 
 		if (_animationFrame == 6) {
-			Ambient_Sounds_Play_Sound(493, 97, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxSHOTGUN1, 97, 0, 0, 20);
 		}
 
 		if (_animationFrame == 5) {
diff --git a/engines/bladerunner/script/ai/holloway.cpp b/engines/bladerunner/script/ai/holloway.cpp
index 425100338f..8efb3c933f 100644
--- a/engines/bladerunner/script/ai/holloway.cpp
+++ b/engines/bladerunner/script/ai/holloway.cpp
@@ -218,7 +218,7 @@ bool AIScriptHolloway::UpdateAnimation(int *animation, int *frame) {
 		_animationFrame++;
 
 		if (_animationFrame == 9) {
-			Ambient_Sounds_Play_Sound(222, 90, 99, 0, 0);
+			Ambient_Sounds_Play_Sound(kSfxKICK1, 90, 99, 0, 0);
 		}
 
 		if (_animationFrame == 10) {
diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp
index ec7bb30e37..0e0bb54934 100644
--- a/engines/bladerunner/script/ai/izo.cpp
+++ b/engines/bladerunner/script/ai/izo.cpp
@@ -557,10 +557,10 @@ bool AIScriptIzo::UpdateAnimation(int *animation, int *frame) {
 			} else {
 				snd = 9015;
 			}
-			Sound_Play_Speech_Line(7, snd, 75, 0, 99);
+			Sound_Play_Speech_Line(kActorIzo, snd, 75, 0, 99);
 		}
 		if (_animationFrame == 9) {
-			Actor_Combat_AI_Hit_Attempt(7);
+			Actor_Combat_AI_Hit_Attempt(kActorIzo);
 		}
 		if (Actor_Query_Goal_Number(kActorIzo) == kGoalIzoWaitingAtRC03
 		 && _animationFrame == 6
diff --git a/engines/bladerunner/script/ai/luther.cpp b/engines/bladerunner/script/ai/luther.cpp
index f868953ccb..78ac56a03f 100644
--- a/engines/bladerunner/script/ai/luther.cpp
+++ b/engines/bladerunner/script/ai/luther.cpp
@@ -90,7 +90,7 @@ bool AIScriptLuther::Update() {
 		Actor_Set_Targetable(kActorLuther, false);
 		Scene_Loop_Set_Default(5); // UG16MainLoopNoComputerLight
 		Scene_Loop_Start_Special(kSceneLoopModeOnce, 4, true); // UG16SparkLoop
-		Ambient_Sounds_Play_Sound(559, 50, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxCOMPDWN4, 50, 0, 0, 99);
 		Ambient_Sounds_Remove_Looping_Sound(516, 1);
 		return false;
 	}
@@ -370,7 +370,7 @@ bool AIScriptLuther::UpdateAnimation(int *animation, int *frame) {
 	case 12:
 		*animation = 359;
 		if (_animationFrame == 12) {
-			Ambient_Sounds_Play_Sound(557, 59, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxHEADHIT2, 59, 0, 0, 20);
 		}
 		if (_animationFrame < Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
 			_animationFrame++;
diff --git a/engines/bladerunner/script/ai/maggie.cpp b/engines/bladerunner/script/ai/maggie.cpp
index c1ff0e29de..dc4bf9a3bc 100644
--- a/engines/bladerunner/script/ai/maggie.cpp
+++ b/engines/bladerunner/script/ai/maggie.cpp
@@ -354,7 +354,7 @@ bool AIScriptMaggie::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case kGoalMaggieKP05Explode:
 		AI_Movement_Track_Flush(kActorMaggie);
 		Actor_Face_Actor(kActorMcCoy, kActorMaggie, true);
-		Sound_Play(494, 50, 0, 0, 100);
+		Sound_Play(kSfxDOGEXPL1, 50, 0, 0, 100);
 		Actor_Set_Goal_Number(kActorMaggie, kGoalMaggieDead);
 		Actor_Change_Animation_Mode(kActorMaggie, 51);
 		if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorMaggie) < 144) {
@@ -523,7 +523,7 @@ bool AIScriptMaggie::UpdateAnimation(int *animation, int *frame) {
 	case kMaggieStateHappyA:
 		*animation = 870;
 		if (_animationFrame == 1) {
-			Sound_Play(Random_Query(263, 264), 50, 0, 0, 50);
+			Sound_Play(Random_Query(kSfxDOGBARK1, kSfxDOGBARK3), 50, 0, 0, 50);
 		}
 		_animationFrame++;
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
@@ -614,7 +614,7 @@ bool AIScriptMaggie::ChangeAnimationMode(int mode) {
 	case 51:
 		_animationState = kMaggieStateExploding;
 		_animationFrame = 0;
-		Sound_Play(272, 50, 0, 0, 50);
+		Sound_Play(kSfxDOGHURT1, 50, 0, 0, 50);
 		break;
 
 	case kAnimationModeFeeding:
@@ -662,7 +662,7 @@ bool AIScriptMaggie::ChangeAnimationMode(int mode) {
 			_animationState = kMaggieStateHappyB;
 		}
 		var_45F3F8 = Random_Query(2, 6);
-		Sound_Play(276, 50, 0, 0, 50);
+		Sound_Play(kSfxDOGTAIL1, 50, 0, 0, 50);
 		break;
 
 	case 88:
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index 0fe9f84d21..2d99d4b1b8 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -32,7 +32,7 @@ AIScriptMcCoy::AIScriptMcCoy(BladeRunnerEngine *vm) : AIScriptBase(vm) {
 	_animationLoopFrameMax = 0;
 	_animationStateNextSpecial = 0;
 	_animationNextSpecial = 0;
-	_nextSoundId = 0;
+	_nextSoundId = -1;
 	_NR10SteeleShooting = false;
 	_fallSpeed = 0.0f;
 	_fallHeightCurrent = 0.0f;
@@ -427,11 +427,11 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 
 	case kGoalMcCoyCallWithGuzza:
-		Sound_Play(123, 50, 0, 0, 50);
+		Sound_Play(kSfxSPNBEEP9, 50, 0, 0, 50);
 		Delay(1000);
-		Sound_Play(403, 30, 0, 0, 50);
+		Sound_Play(kSfxVIDFONE1, 30, 0, 0, 50);
 		Delay(1000);
-		Sound_Play(123, 50, 0, 0, 50);
+		Sound_Play(kSfxSPNBEEP9, 50, 0, 0, 50);
 		Actor_Says(kActorGuzza, 1380, 3);
 		Actor_Says(kActorMcCoy, 6610, 13);
 		Actor_Says(kActorGuzza, 1390, 3);
@@ -461,7 +461,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Says(kActorMcCoy, 6700, 17);
 		Actor_Says(kActorGuzza, 1480, 3);
 		Actor_Says(kActorMcCoy, 6705, 11);
-		Sound_Play(123, 50, 0, 0, 50);
+		Sound_Play(kSfxSPNBEEP9, 50, 0, 0, 50);
 		return true;
 
 	case kGoalMcCoyUG15Fall:
@@ -779,7 +779,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		 && Actor_Query_Goal_Number(kActorMcCoy) == kGoalMcCoyNR11Shoot
 		 && _NR10SteeleShooting
 		) {
-			_nextSoundId = 27;
+			_nextSoundId = kSfxSMCAL3;
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationState = 17;
@@ -1200,9 +1200,10 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 47;
 		_animationFrame++;
 		if (_animationFrame == 6) {
-			Ambient_Sounds_Play_Sound(Random_Query(593, 595), 39, 0, 0, 99);
+			// Play one of kSfxCHARMTL7, kSfxCHARMTL8, kSfxCHARMTL9
+			Ambient_Sounds_Play_Sound(Random_Query(kSfxCHARMTL7, kSfxCHARMTL9), 39, 0, 0, 99);
 		}
-		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) { //why -1?
+		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) { //why -1? a bug?
 			_animationFrame = 0;
 		}
 		break;
@@ -1362,7 +1363,8 @@ bool AIScriptMcCoy::ChangeAnimationMode(int mode) {
 	case kAnimationModeIdle:
 		if (Game_Flag_Query(kFlagMcCoyTiedDown)) {
 			if (_animationFrame <= 6) {
-				Ambient_Sounds_Play_Sound(Random_Query(593, 595), 39, 0, 0, 99);
+				// Play one of kSfxCHARMTL7, kSfxCHARMTL8, kSfxCHARMTL9
+				Ambient_Sounds_Play_Sound(Random_Query(kSfxCHARMTL7, kSfxCHARMTL9), 39, 0, 0, 99);
 			}
 			_animationState = 57;
 			_animationFrame = 0;
diff --git a/engines/bladerunner/script/ai/moraji.cpp b/engines/bladerunner/script/ai/moraji.cpp
index 00234764bd..e7ae6691a8 100644
--- a/engines/bladerunner/script/ai/moraji.cpp
+++ b/engines/bladerunner/script/ai/moraji.cpp
@@ -153,7 +153,7 @@ bool AIScriptMoraji::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		// applies only when shot inside the Dermo Design Lab
 		Actor_Set_Targetable(kActorMoraji, false);
 #if BLADERUNNER_ORIGINAL_BUGS
-		Sound_Play(4, 100, 0, 0, 50);	// Original code has female scream here (FEMHURT2)
+		Sound_Play(kSfxFEMHURT2, 100, 0, 0, 50);	// Original code has female scream here (FEMHURT2)
 #else
 		Sound_Play_Speech_Line(kActorMoraji, 9020, 50, 0, 50); // fix: Use Moraji's death SPCHSFX, also lower volume
 #endif // BLADERUNNER_ORIGINAL_BUGS
@@ -315,7 +315,7 @@ bool AIScriptMoraji::UpdateAnimation(int *animation, int *frame) {
 			Actor_Set_Goal_Number(kActorMoraji, kGoalMorajiScream);
 		}
 		if (_animationFrame == 6) {
-			Ambient_Sounds_Play_Sound(488, 69, 0, 0, 20);
+			Ambient_Sounds_Play_Sound(kSfxCHAINBRK, 69, 0, 0, 20);
 		}
 		break;
 
diff --git a/engines/bladerunner/script/ai/mutant1.cpp b/engines/bladerunner/script/ai/mutant1.cpp
index bdd2548db4..51c9c705cd 100644
--- a/engines/bladerunner/script/ai/mutant1.cpp
+++ b/engines/bladerunner/script/ai/mutant1.cpp
@@ -474,7 +474,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 		*animation = 899;
 		_animationFrame++;
 		if (_animationFrame == 1) {
-			Ambient_Sounds_Play_Sound(371, 99, 0, 0, 25);
+			Ambient_Sounds_Play_Sound(kSfxHURT1M1, 99, 0, 0, 25);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(899)) {
 			Actor_Change_Animation_Mode(kActorMutant1, 0);
@@ -485,7 +485,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 		*animation = 900;
 		_animationFrame++;
 		if (_animationFrame == 1) {
-			Sound_Play(368, 100, 0, 0, 50);
+			Sound_Play(kSfxYELL1M1, 100, 0, 0, 50);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(900)) {
 			Actor_Change_Animation_Mode(kActorMutant1, 88);
@@ -501,7 +501,7 @@ bool AIScriptMutant1::UpdateAnimation(int *animation, int *frame) {
 		*animation = 899;
 		_animationFrame++;
 		if (_animationFrame == 9) {
-			Sound_Play(371, 100, 0, 0, 50);
+			Sound_Play(kSfxHURT1M1, 100, 0, 0, 50);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(899)) {
 			Actor_Change_Animation_Mode(kActorMutant1, 0);
diff --git a/engines/bladerunner/script/ai/mutant2.cpp b/engines/bladerunner/script/ai/mutant2.cpp
index 512f207a77..e1e851a381 100644
--- a/engines/bladerunner/script/ai/mutant2.cpp
+++ b/engines/bladerunner/script/ai/mutant2.cpp
@@ -436,7 +436,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 		*animation = 907;
 		_animationFrame++;
 		if (_animationFrame == 1) {
-			Sound_Play(401, 100, 0, 0, 50);
+			Sound_Play(kSfxYELL1M2, 100, 0, 0, 50);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Change_Animation_Mode(kActorMutant2, 88);
@@ -453,7 +453,7 @@ bool AIScriptMutant2::UpdateAnimation(int *animation, int *frame) {
 		_animationFrame += _var1;
 		if (_animationFrame == 4) {
 			_var1 = -1;
-			Sound_Play(399, 100, 0, 0, 50);
+			Sound_Play(kSfxHURT1M2, 100, 0, 0, 50);
 		} else {
 			if (!_animationFrame) {
 				Actor_Change_Animation_Mode(kActorMutant2, 0);
diff --git a/engines/bladerunner/script/ai/mutant3.cpp b/engines/bladerunner/script/ai/mutant3.cpp
index 990ed8c474..b612cba7bd 100644
--- a/engines/bladerunner/script/ai/mutant3.cpp
+++ b/engines/bladerunner/script/ai/mutant3.cpp
@@ -491,7 +491,7 @@ bool AIScriptMutant3::UpdateAnimation(int *animation, int *frame) {
 		*animation = 917;
 		_animationFrame += _var1;
 		if (_animationFrame == 3) {
-			Sound_Play(400, 100, 0, 0, 50);
+			Sound_Play(kSfxHURT1M3, 100, 0, 0, 50);
 			_var1 = -1;
 		} else {
 			if (!_animationFrame) {
diff --git a/engines/bladerunner/script/ai/officer_grayford.cpp b/engines/bladerunner/script/ai/officer_grayford.cpp
index 75c0718581..0e82ded8c0 100644
--- a/engines/bladerunner/script/ai/officer_grayford.cpp
+++ b/engines/bladerunner/script/ai/officer_grayford.cpp
@@ -973,7 +973,7 @@ bool AIScriptOfficerGrayford::UpdateAnimation(int *animation, int *frame) {
 		*animation = 616;
 		_animationFrame++;
 		if (_animationFrame == 11) {
-			Ambient_Sounds_Play_Sound(556, 25, 0, 0, 25);
+			Ambient_Sounds_Play_Sound(kSfxHOLSTER1, 25, 0, 0, 25);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 625;
diff --git a/engines/bladerunner/script/ai/photographer.cpp b/engines/bladerunner/script/ai/photographer.cpp
index 65460036ca..13c2269c4e 100644
--- a/engines/bladerunner/script/ai/photographer.cpp
+++ b/engines/bladerunner/script/ai/photographer.cpp
@@ -264,7 +264,7 @@ bool AIScriptPhotographer::UpdateAnimation(int *animation, int *frame) {
 	case 6:
 		*animation = 746;
 		if (_animationFrame == 11) {
-			Ambient_Sounds_Play_Sound(463, 80, -20, -20, 20);
+			Ambient_Sounds_Play_Sound(kSfxCAMCOP1, 80, -20, -20, 20);
 		}
 		if (_var1) {
 			--_var1;
diff --git a/engines/bladerunner/script/ai/runciter.cpp b/engines/bladerunner/script/ai/runciter.cpp
index 11ad906593..966a35c48e 100644
--- a/engines/bladerunner/script/ai/runciter.cpp
+++ b/engines/bladerunner/script/ai/runciter.cpp
@@ -118,7 +118,7 @@ void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatM
 			Actor_Says(kActorRunciter, 590, 13);
 			Actor_Says(kActorMcCoy, 4775, -1);
 			Actor_Says(kActorRunciter, 600, 17);
-			Sound_Play(492, 100, 0, 100, 50);
+			Sound_Play(kSfxSHOTCOK1, 100, 0, 100, 50);
 			Actor_Says(kActorMcCoy, 4780, -1);
 			Actor_Says(kActorRunciter, 610, 18);
 			Actor_Says(kActorMcCoy, 4785, -1);
@@ -140,7 +140,7 @@ void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatM
 			Actor_Says(kActorRunciter, 480, 17);
 			Actor_Says(kActorMcCoy, 4735, -1);
 			Actor_Says(kActorRunciter, 490, 16);
-			Sound_Play(492, 100, 0, 100, 50);
+			Sound_Play(kSfxSHOTCOK1, 100, 0, 100, 50);
 			Actor_Says(kActorMcCoy, 4740, -1);
 			Actor_Says(kActorRunciter, 500, 18);
 			Actor_Says(kActorRunciter, 510, 19);
diff --git a/engines/bladerunner/script/ai/sadik.cpp b/engines/bladerunner/script/ai/sadik.cpp
index fb34ae4ade..d931ac7fcc 100644
--- a/engines/bladerunner/script/ai/sadik.cpp
+++ b/engines/bladerunner/script/ai/sadik.cpp
@@ -26,7 +26,7 @@ namespace BladeRunner {
 
 AIScriptSadik::AIScriptSadik(BladeRunnerEngine *vm) : AIScriptBase(vm) {
 	_flag = 0;
-	_var1 = 0;
+	_nextSoundId = -1; // changed from original (0) to be more clear that this is an invalid sfx id
 	_var2 = 0;
 	_var3 = 0;
 	_var4 = 1;
@@ -39,7 +39,7 @@ void AIScriptSadik::Initialize() {
 	_animationNext = 0;
 
 	_flag = 0;
-	_var1 = 0;
+	_nextSoundId = -1; // changed from original (0) to be more clear that this is an invalid sfx id
 	_var2 = 0;
 	_var3 = 0;
 	_var4 = 1;
@@ -61,9 +61,9 @@ bool AIScriptSadik::Update() {
 		return true;
 	}
 
-	if (_var1 != 0) {
-		Sound_Play(_var1, 100, 0, 0, 50);
-		_var1 = 0;
+	if (_nextSoundId != -1) { // changed from original (0) to be more clear that this is an invalid sfx id
+		Sound_Play(_nextSoundId, 100, 0, 0, 50);
+		_nextSoundId = -1;   // changed from original (0) to be more clear that this is an invalid sfx id
 	}
 
 	if (Global_Variable_Query(kVariableChapter) == 3
@@ -311,7 +311,7 @@ bool AIScriptSadik::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 
 	case kGoalSadikBB11TalkWithClovis:
-		_var1 = 0;
+		_nextSoundId = -1; // changed from original (0) to be more clear that this is an invalid sfx id
 		return false;
 
 	case 200:
@@ -355,7 +355,7 @@ bool AIScriptSadik::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 
 	case kGoalSadikUG18PrepareShootMcCoy:
-		Sound_Play(12, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL1, 100, 0, 0, 50);
 		AI_Countdown_Timer_Start(kActorSadik, 0, 2);
 		return true;
 
@@ -363,7 +363,7 @@ bool AIScriptSadik::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		if (Player_Query_Current_Scene() == kSceneUG18) {
 			Actor_Force_Stop_Walking(kActorMcCoy);
 			Actor_Change_Animation_Mode(kActorSadik, kAnimationModeCombatAttack);
-			Sound_Play(12, 100, 0, 0, 50);
+			Sound_Play(kSfxLGCAL1, 100, 0, 0, 50);
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
 			Actor_Retired_Here(kActorMcCoy, 6, 6, true, -1);
 		}
@@ -671,7 +671,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 			} else {
 				snd = 9015;
 			}
-			Sound_Play_Speech_Line(8, snd, 75, 0, 99);
+			Sound_Play_Speech_Line(kActorSadik, snd, 75, 0, 99);
 		}
 		if (_animationFrame == 7) {
 			Actor_Combat_AI_Hit_Attempt(kActorSadik);
@@ -793,7 +793,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 		*animation = 345;
 		_animationFrame++;
 		if (_animationFrame == 23) {
-			_var1 = 201;
+			_nextSoundId = kSfxMTLDOOR2;
 		}
 		if (_animationFrame >= 25) {
 			_animationFrame = 0;
@@ -808,7 +808,7 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 		_animationFrame++;
 		if (Actor_Query_Goal_Number(kActorSadik) == kGoalSadikBB11KnockOutMcCoy) {
 			if (_animationFrame == 4) {
-				_var1 = 221;
+				_nextSoundId = kSfxPUNCH1;
 			}
 			if (_animationFrame == 6) {
 				Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeHit);
@@ -832,10 +832,10 @@ bool AIScriptSadik::UpdateAnimation(int *animation, int *frame) {
 		if (_animationFrame == 4) {
 			if (Actor_Query_Goal_Number(kActorSadik) == kGoalSadikBB11KnockOutMcCoy) {
 				Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
-				_var1 = 222;
+				_nextSoundId = kSfxKICK1;
 			} else {
 				Actor_Change_Animation_Mode(kActorMcCoy, 68);
-				_var1 = 223;
+				_nextSoundId = kSfxKICK2;
 			}
 		}
 
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index 7e29a4f09c..f44efeb2e8 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -739,7 +739,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 
 	case kGoalSteeleShootIzo:
 		Actor_Force_Stop_Walking(kActorMcCoy);
-		Sound_Play(27, 100, 0, 0, 50);
+		Sound_Play(kSfxSMCAL3, 100, 0, 0, 50);
 		Actor_Set_Goal_Number(kActorIzo, kGoalIzoDie);
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
 		Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
@@ -1111,7 +1111,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case kGoalSteeleNR01ShootGordo:
 		Player_Loses_Control();
 		Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatAttack);
-		Sound_Play(27, 100, 0, 0, 50);
+		Sound_Play(kSfxSMCAL3, 100, 0, 0, 50);
 		Game_Flag_Reset(kFlagSteeleAimingAtGordo);
 		Actor_Set_Targetable(kActorSteele, false);
 		Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR01Die);
@@ -1142,7 +1142,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case kGoalSteeleNR01ShootMcCoy:
 		ADQ_Flush();
 		Actor_Change_Animation_Mode(kActorSteele, kAnimationModeCombatAttack);
-		Sound_Play(27, 100, 0, 0, 50);
+		Sound_Play(kSfxSMCAL3, 100, 0, 0, 50);
 		Actor_Force_Stop_Walking(kActorMcCoy);
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
 		Actor_Retired_Here(kActorMcCoy, 12, 12, true, -1);
@@ -1182,7 +1182,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case kGoalSteeleNR01McCoyShotGun:
 		ADQ_Flush();
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeCombatAttack);
-		Sound_Play(27, 100, 0, 0, 50);
+		Sound_Play(kSfxSMCAL3, 100, 0, 0, 50);
 		_animationState = 38;
 		_animationFrame = 0;
 		Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR01ReleaseHostage);
@@ -1747,11 +1747,11 @@ bool AIScriptSteele::UpdateAnimation(int *animation, int *frame) {
 			} else {
 				snd = 9015;
 			}
-			Sound_Play_Speech_Line(1, snd, 75, 0, 99);
+			Sound_Play_Speech_Line(kActorSteele, snd, 75, 0, 99);
 		}
 
 		if (_animationFrame == 4) {
-			Actor_Combat_AI_Hit_Attempt(1);
+			Actor_Combat_AI_Hit_Attempt(kActorSteele);
 		}
 
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation) - 1) {
diff --git a/engines/bladerunner/script/ai/transient.cpp b/engines/bladerunner/script/ai/transient.cpp
index 9fb2e8705d..3edbbaa62d 100644
--- a/engines/bladerunner/script/ai/transient.cpp
+++ b/engines/bladerunner/script/ai/transient.cpp
@@ -89,13 +89,13 @@ void AIScriptTransient::TimerExpired(int timer) {
 			AI_Countdown_Timer_Start(kActorTransient, 0, Random_Query(20, 10));
 			switch (Random_Query(1, 3)) {
 			case 1:
-				Sound_Play(356, 50, 0, 0, 50);
+				Sound_Play(kSfxBUMSNOR1, 50, 0, 0, 50);
 				break;
 			case 2:
-				Sound_Play(357, 50, 0, 0, 50);
+				Sound_Play(kSfxBUMSNOR2, 50, 0, 0, 50);
 				break;
 			case 3:
-				Sound_Play(358, 50, 0, 0, 50);
+				Sound_Play(kSfxBUMSNOR3, 50, 0, 0, 50);
 				break;
 			}
 		} else if (Actor_Query_Goal_Number(kActorTransient) != 599) {
diff --git a/engines/bladerunner/script/ai/tyrell_guard.cpp b/engines/bladerunner/script/ai/tyrell_guard.cpp
index a7b9e31db3..a0b95bb32d 100644
--- a/engines/bladerunner/script/ai/tyrell_guard.cpp
+++ b/engines/bladerunner/script/ai/tyrell_guard.cpp
@@ -118,7 +118,7 @@ bool AIScriptTyrellGuard::GoalChanged(int currentGoalNumber, int newGoalNumber)
 		Delay(1000);
 		Actor_Says(kActorTyrellGuard, 320, 14);
 		Actor_Change_Animation_Mode(kActorTyrellGuard, 50);
-		Ambient_Sounds_Play_Sound(590, 100, 0, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxTBALARM, 100, 0, 0, 0);
 		Delay(1000);
 		Actor_Force_Stop_Walking(kActorMcCoy);
 		Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyArrested);
@@ -132,7 +132,7 @@ bool AIScriptTyrellGuard::GoalChanged(int currentGoalNumber, int newGoalNumber)
 
 	case kGoalTyrellGuardArrestMcCoy:
 		Actor_Change_Animation_Mode(kActorTyrellGuard, 50);
-		Ambient_Sounds_Play_Sound(590, 100, 0, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxTBALARM, 100, 0, 0, 0);
 		Delay(1000);
 		Actor_Force_Stop_Walking(kActorMcCoy);
 		Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyArrested);
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index b80baa323b..aad4bfd109 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -172,7 +172,7 @@ void AIScriptZuben::CompletedMovementTrack() {
 	} else {
 		if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT07RunToFreeSlotA) {
 			Music_Stop(2);
-			Sound_Play(574, 40, 100, 100, 50);
+			Sound_Play(kSfxDOORLOCK, 40, 100, 100, 50);
 			Delay(2000);
 			Game_Flag_Set(kFlagCT07toCT06);
 			Game_Flag_Set(kFlagZubenSpared);
@@ -872,7 +872,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 		*animation = 405;
 		_animationFrame++;
 		if (_animationFrame == 7) {
-			Sound_Play(207, 30, 0, 0, 50);
+			Sound_Play(kSfxZUBDEAD1, 30, 0, 0, 50);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -888,7 +888,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 		*animation = 393;
 		_animationFrame++;
 		if (_animationFrame == 7) {
-			Sound_Play(207, 30, 0, 0, 50);
+			Sound_Play(kSfxZUBDEAD1, 30, 0, 0, 50);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -1024,7 +1024,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 			Overlay_Play("ct02over", 1, false, true, 0);
 		}
 		if (_animationFrame == 6) {
-			Sound_Play(201, 40, 0, 0, 50);
+			Sound_Play(kSfxMTLDOOR2, 40, 0, 0, 50);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			Actor_Set_Frame_Rate_FPS(kActorZuben, -2);
@@ -1038,7 +1038,7 @@ bool AIScriptZuben::UpdateAnimation(int *animation, int *frame) {
 		*animation = 421;
 		_animationFrame++;
 		if (_animationFrame == 1) {
-			Sound_Play(206, 80, 0, 0, 50);
+			Sound_Play(kSfxZUBLAND1, 80, 0, 0, 50);
 		}
 		if (_animationFrame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			_animationFrame = 0;
diff --git a/engines/bladerunner/script/ai_script.h b/engines/bladerunner/script/ai_script.h
index edbe5f6d38..463d063b41 100644
--- a/engines/bladerunner/script/ai_script.h
+++ b/engines/bladerunner/script/ai_script.h
@@ -186,7 +186,7 @@ DECLARE_SCRIPT(Izo)
 END_SCRIPT
 
 DECLARE_SCRIPT(Sadik)
-	int _var1;
+	int _nextSoundId;
 	int _var2;
 	int _var3;
 	int _var4;
diff --git a/engines/bladerunner/script/esper_script.cpp b/engines/bladerunner/script/esper_script.cpp
index 0699a990d9..47d17aa592 100644
--- a/engines/bladerunner/script/esper_script.cpp
+++ b/engines/bladerunner/script/esper_script.cpp
@@ -187,21 +187,21 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4050, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueDragonflyAnklet)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueDragonflyAnklet, true, -1);
 			}
 		} else if (region == 1) {
 			Actor_Voice_Over(4040, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueLucy)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueLucy, true, -1);
 			}
 		} else if (region == 2) {
 			Actor_Voice_Over(4060, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueSushiMenu, true, -1);
 			}
 		}
@@ -212,28 +212,28 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4080, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueAnimalMurderSuspect)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueAnimalMurderSuspect, true, -1);
 			}
 		} else if (region == 4) {
 			Actor_Voice_Over(4110, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueMilitaryBoots)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueMilitaryBoots, true, -1);
 			}
 		} else if (region == 5) {
 			Actor_Voice_Over(4120, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kCluePartialLicenseNumber)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kCluePartialLicenseNumber, true, -1);
 			}
 		} else if (region == 6) {
 			Actor_Voice_Over(4070, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueCarColorAndMake)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueCarColorAndMake, true, -1);
 			}
 		}
@@ -244,14 +244,14 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4260, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueEarlyQAndLucy)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueEarlyQAndLucy, true, -1);
 			}
 		} else if (region == 7) {
 			Actor_Voice_Over(4190, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueScorpionbox)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueScorpionbox, true, -1);
 			}
 		}
@@ -262,7 +262,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4230, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueClovisflowers)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueClovisflowers, true, -1);
 			}
 			return true;
@@ -270,7 +270,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4040, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueLucyWithDektora)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueLucyWithDektora, true, -1);
 			}
 			return true;
@@ -282,14 +282,14 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4090, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueWomanInAnimoidRow)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueWomanInAnimoidRow, true, -1);
 			}
 		} else if (region == 12) {
 			Actor_Voice_Over(4180, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueScorpions)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueScorpions, true, -1);
 			}
 		}
@@ -300,7 +300,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Says(kActorMcCoy, 8830, 3);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueStrangeScale2)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueStrangeScale2, true, -1);
 			}
 		}
@@ -311,14 +311,14 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Says(kActorMcCoy, 6975, 3);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityCamera)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueChinaBarSecurityCamera, true, -1);
 			}
 		} else if (region == 15) {
 			Actor_Voice_Over(4220, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueIzosFriend)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueIzosFriend, true, -1);
 			}
 		}
@@ -329,14 +329,14 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4080, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueIzo)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueIzo, true, -1);
 			}
 		} else if (region == 17) {
 			Actor_Voice_Over(4210, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueGuzza)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueGuzza, true, -1);
 			}
 		}
@@ -348,7 +348,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Says(kActorMcCoy, 8775, 3);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueKingstonKitchenBox2)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueKingstonKitchenBox2, true, -1);
 			}
 			break;
@@ -357,7 +357,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4160, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueDogCollar2)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueDogCollar2, true, -1);
 			}
 			break;
@@ -368,7 +368,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(2160, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueBombingSuspect, true, -1);
 			}
 			break;
@@ -377,7 +377,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Says(kActorMcCoy, 8890, 3);
 			if (!Actor_Clue_Query(kActorMcCoy, kCluePlasticExplosive)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kCluePlasticExplosive, true, -1);
 			}
 			break;
@@ -390,7 +390,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Says(kActorMcCoy, 8705, 3);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueMoonbusReflection)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueMoonbusReflection, true, -1);
 			}
 			break;
@@ -399,7 +399,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4240, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueMcCoyAtMoonbus)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueMcCoyAtMoonbus, true, -1);
 			}
 			break;
@@ -408,7 +408,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 			Actor_Voice_Over(4220, kActorVoiceOver);
 			if (!Actor_Clue_Query(kActorMcCoy, kClueClovisAtMoonbus)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueClovisAtMoonbus, true, -1);
 			}
 			break;
@@ -416,7 +416,7 @@ bool ESPERScript::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 		case 25:
 			if (!Actor_Clue_Query(kActorMcCoy, kClueSadikAtMoonbus)) {
 				Actor_Says(kActorMcCoy, 6945, 3);
-				Sound_Play(417, 50, 0, 0, 50);
+				Sound_Play(kSfxBR034_1A, 50, 0, 0, 50);
 				Actor_Clue_Acquire(kActorMcCoy, kClueSadikAtMoonbus, true, -1);
 			}
 			break;
diff --git a/engines/bladerunner/script/init_script.cpp b/engines/bladerunner/script/init_script.cpp
index 7de781f90e..8143ab4571 100644
--- a/engines/bladerunner/script/init_script.cpp
+++ b/engines/bladerunner/script/init_script.cpp
@@ -27,13 +27,13 @@
 namespace BladeRunner {
 
 void InitScript::SCRIPT_Initialize_Game() {
-	Assign_Player_Gun_Hit_Sounds(0, 517, 518, 519);
-	Assign_Player_Gun_Hit_Sounds(1, 520, 521, 522);
-	Assign_Player_Gun_Hit_Sounds(2, 523, 524, 525);
+	Assign_Player_Gun_Hit_Sounds(0, kSfxGUNH1A, kSfxGUNH1B, kSfxGUNH1C);
+	Assign_Player_Gun_Hit_Sounds(1, kSfxGUNH2A, kSfxGUNH2B, kSfxGUNH2C);
+	Assign_Player_Gun_Hit_Sounds(2, kSfxGUNH3A, kSfxGUNH3B, kSfxGUNH3C);
 
-	Assign_Player_Gun_Miss_Sounds(0, 526, 527, 528);
-	Assign_Player_Gun_Miss_Sounds(1, 529, 530, 531);
-	Assign_Player_Gun_Miss_Sounds(2, 532, 533, 534);
+	Assign_Player_Gun_Miss_Sounds(0, kSfxGUNM1A, kSfxGUNM1B, kSfxGUNM1C);
+	Assign_Player_Gun_Miss_Sounds(1, kSfxGUNM2A, kSfxGUNM2B, kSfxGUNM2C);
+	Assign_Player_Gun_Miss_Sounds(2, kSfxGUNM3A, kSfxGUNM3B, kSfxGUNM3C);
 
 	Init_Globals();
 	Init_Game_Flags();
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index a5acc146c2..db44941425 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -74,10 +74,10 @@ void SceneScriptAR01::InitializeScene() {
 	Ambient_Sounds_Add_Sound(247, 3, 30, 11, 11,   50, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(248, 3, 30, 11, 11,   50, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(249, 3, 30, 11, 11,   50, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound( 68, 10, 180, 16,  25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound( 69, 10, 180, 16,  25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(375, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -343,16 +343,16 @@ bool SceneScriptAR01::ClickedOn2DRegion(int region) {
 
 void SceneScriptAR01::SceneFrameAdvanced(int frame) {
 	if (frame == 16) {
-		Ambient_Sounds_Play_Sound(118, 40, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxCARDOWN3,  40,   0,   0, 99);
 	}
 	if (frame == 78 || frame == 199) {
-		Ambient_Sounds_Play_Sound(116, 100, -50, -50, 99);
+		Ambient_Sounds_Play_Sound(kSfxSPINOPN4, 100, -50, -50, 99);
 	}
 	if (frame == 122 || frame == 242) {
-		Ambient_Sounds_Play_Sound(119, 100, -50, -50, 99);
+		Ambient_Sounds_Play_Sound(kSfxSPINCLS1, 100, -50, -50, 99);
 	}
 	if (frame == 256) {
-		Ambient_Sounds_Play_Sound(117, 40, -50, 80, 99);
+		Ambient_Sounds_Play_Sound(kSfxCARUP3,    40, -50,  80, 99);
 	}
 	if ((frame == 75
 	  || frame == 196
diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp
index b23507909b..7b7351bff3 100644
--- a/engines/bladerunner/script/scene/ar02.cpp
+++ b/engines/bladerunner/script/scene/ar02.cpp
@@ -53,10 +53,10 @@ void SceneScriptAR02::InitializeScene() {
 	Ambient_Sounds_Add_Sound(247, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(248, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(249, 3, 30, 16, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound( 68, 10, 180, 16,  25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound( 69, 10, 180, 16,  25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(375, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp
index 7c40138cf2..5c1b6abd65 100644
--- a/engines/bladerunner/script/scene/bb01.cpp
+++ b/engines/bladerunner/script/scene/bb01.cpp
@@ -57,10 +57,10 @@ void SceneScriptBB01::InitializeScene() {
 	Ambient_Sounds_Add_Sound(378, 5, 120, 25, 33, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(379, 5, 120, 25, 33, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(380, 5, 120, 25, 33, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 
 	if ( Game_Flag_Query(kFlagSpinnerAtBB01)
 	 && !Game_Flag_Query(kFlagDR02toBB01)
@@ -210,27 +210,27 @@ bool SceneScriptBB01::ClickedOn2DRegion(int region) {
 
 void SceneScriptBB01::SceneFrameAdvanced(int frame) {
 	if (frame == 193) {
-		Sound_Play(118, 40, 0, 0, 50);
+		Sound_Play(kSfxCARDOWN3, 40, 0, 0, 50);
 	}
 
 	if (frame == 241
 	 || frame == 363
 	) {
-		Sound_Play(116, 100, -50, -50, 50);
+		Sound_Play(kSfxSPINOPN4, 100, -50, -50, 50);
 	}
 
 	if (frame == 286
 	 || frame == 407
 	) {
-		Sound_Play(119, 100, -50, -50, 50);
+		Sound_Play(kSfxSPINCLS1, 100, -50, -50, 50);
 	}
 
 	if (frame == 433) {
-		Sound_Play(117, 40, -50, 80, 50);
+		Sound_Play(kSfxCARUP3,    40, -50, 80, 50);
 	}
 
 	if (frame == 120) {
-		Sound_Play(286, Random_Query(33, 33), 100, -100, 50);
+		Sound_Play(kSfxTRUCKBY1, Random_Query(33, 33), 100, -100, 50);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb02.cpp b/engines/bladerunner/script/scene/bb02.cpp
index f07a37aab8..082c5325fa 100644
--- a/engines/bladerunner/script/scene/bb02.cpp
+++ b/engines/bladerunner/script/scene/bb02.cpp
@@ -139,11 +139,11 @@ bool SceneScriptBB02::ClickedOn2DRegion(int region) {
 
 void SceneScriptBB02::SceneFrameAdvanced(int frame) {
 	if (frame == 1) {
-		Ambient_Sounds_Play_Sound(434, 40, -50, -50, 0);
+		Ambient_Sounds_Play_Sound(kSfxBBELE2, 40, -50, -50, 0);
 	}
 
 	if (frame == 124) {
-		Ambient_Sounds_Play_Sound(434, 40, -50, -50, 0);
+		Ambient_Sounds_Play_Sound(kSfxBBELE2, 40, -50, -50, 0);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb06.cpp b/engines/bladerunner/script/scene/bb06.cpp
index b2b185d630..d25b1fcfa0 100644
--- a/engines/bladerunner/script/scene/bb06.cpp
+++ b/engines/bladerunner/script/scene/bb06.cpp
@@ -197,7 +197,7 @@ bool SceneScriptBB06::ClickedOn2DRegion(int region) {
 
 void SceneScriptBB06::SceneFrameAdvanced(int frame) {
 	if (frame == 34) {
-		Ambient_Sounds_Play_Sound(447, 40, -50, -50, 10);
+		Ambient_Sounds_Play_Sound(kSfxPNEUM5,  40, -50, -50, 10);
 	}
 #if BLADERUNNER_ORIGINAL_BUGS // Sebastian's Doll Fix
 #else
@@ -209,16 +209,16 @@ void SceneScriptBB06::SceneFrameAdvanced(int frame) {
 	}
 #endif // BLADERUNNER_ORIGINAL_BUGS
 	if (frame == 16) {
-		Ambient_Sounds_Play_Sound(448, 20, -50, -50, 10);
+		Ambient_Sounds_Play_Sound(kSfxROBOTMV1, 20, -50, -50, 10);
 	}
 	if (frame == 20) {
-		Ambient_Sounds_Play_Sound(448, 20, -50, -50, 10);
+		Ambient_Sounds_Play_Sound(kSfxROBOTMV1, 20, -50, -50, 10);
 	}
 	if (frame == 25) {
-		Ambient_Sounds_Play_Sound(448, 20, -50, -50, 10);
+		Ambient_Sounds_Play_Sound(kSfxROBOTMV1, 20, -50, -50, 10);
 	}
 	if (frame == 29) {
-		Ambient_Sounds_Play_Sound(448, 20, -50, -50, 10);
+		Ambient_Sounds_Play_Sound(kSfxROBOTMV1, 20, -50, -50, 10);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp
index 060ae28dd4..590abdd5f2 100644
--- a/engines/bladerunner/script/scene/bb07.cpp
+++ b/engines/bladerunner/script/scene/bb07.cpp
@@ -153,7 +153,7 @@ bool SceneScriptBB07::ClickedOn2DRegion(int region) {
 		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -568.63f, 252.59f, -1114.81f, 0, true, false, 0)) {
 			Actor_Face_Heading(kActorMcCoy, 229, false);
 			if (!Game_Flag_Query(kFlagBB07ElectricityOn)) {
-				Ambient_Sounds_Play_Sound(592, 40, 20, 20, 99);
+				Ambient_Sounds_Play_Sound(kSfxCOMPON1, 40, 20, 20, 99);
 				Overlay_Play("BB07OVER", 1, false, true, 0);
 				Overlay_Play("BB07OVER", 2, true, false, 0);
 				Game_Flag_Set(kFlagBB07ElectricityOn);
diff --git a/engines/bladerunner/script/scene/bb10.cpp b/engines/bladerunner/script/scene/bb10.cpp
index 7e7fd78567..8e0da6b032 100644
--- a/engines/bladerunner/script/scene/bb10.cpp
+++ b/engines/bladerunner/script/scene/bb10.cpp
@@ -138,7 +138,7 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) {
 bool SceneScriptBB10::ClickedOn2DRegion(int region) {
 	if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 225.58f, 67.2f, -102.1f, 0, true, false, 0)) {
 		Actor_Face_Heading(kActorMcCoy, 274, false);
-		Sound_Play(Random_Query(289, 290), 40, 70, 70, 50);
+		Sound_Play(Random_Query(kSfxGLASSY1, kSfxGLASSY2), 40, 70, 70, 50);
 		switch (region) {
 		case 0:
 			Overlay_Remove("BB10OVR1");
diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp
index 1c841829ea..b844e93234 100644
--- a/engines/bladerunner/script/scene/bb11.cpp
+++ b/engines/bladerunner/script/scene/bb11.cpp
@@ -108,7 +108,7 @@ void SceneScriptBB11::SceneFrameAdvanced(int frame) {
 		Game_Flag_Set(kFlagBB11SadikPunchedMcCoy);
 	} else {
 		if (frame == 1) {
-			Sound_Play(74, 10, -100, 100, 50);
+			Sound_Play(kSfxSWEEP4, 10, -100, 100, 50);
 		}
 	}
 }
diff --git a/engines/bladerunner/script/scene/bb12.cpp b/engines/bladerunner/script/scene/bb12.cpp
index 666738044c..a51136c301 100644
--- a/engines/bladerunner/script/scene/bb12.cpp
+++ b/engines/bladerunner/script/scene/bb12.cpp
@@ -124,11 +124,11 @@ void SceneScriptBB12::SceneFrameAdvanced(int frame) {
 	 || frame == 33
 	 || frame == 41
 	) {
-		Sound_Play(311, 17, -30, -30, 50);
+		Sound_Play(kSfxMONKCYM1, 17, -30, -30, 50);
 	}
 
 	if (frame == 3) {
-		Sound_Play(313, 16, -30, -30, 50);
+		Sound_Play(kSfxMONKEY1,  16, -30, -30, 50);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp
index cf31d735ee..f9e9016d6c 100644
--- a/engines/bladerunner/script/scene/ct01.cpp
+++ b/engines/bladerunner/script/scene/ct01.cpp
@@ -85,10 +85,10 @@ void SceneScriptCT01::InitializeScene() {
 	Ambient_Sounds_Add_Sound(62, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(63, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(64, 10, 30, 16, 20, 0, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound(68,  10, 40, 33, 50,    0,   0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(69,  10, 40, 33, 50,    0,   0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(375, 20, 40, 33, 50, -100, 100, -101, -101, 0, 0);
@@ -373,15 +373,15 @@ void SceneScriptCT01::SceneFrameAdvanced(int frame) {
 	 )
 	 && ((frame - 1) % 10) == 0
 	) {
-		Ambient_Sounds_Play_Sound(Random_Query(59, 60), 25, 30, 30, 0);
+		Ambient_Sounds_Play_Sound(Random_Query(kSfxNEON5, kSfxNEON6), 25, 30, 30, 0);
 	}
 
 	if (frame == 23) {
-		Ambient_Sounds_Play_Sound(118, 40, 99, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxCARDOWN3, 40,  99,   0,  0);
 	}
 
 	if (frame == 316) {
-		Ambient_Sounds_Play_Sound(373, 50, -50, 100, 99);
+		Ambient_Sounds_Play_Sound(kSfxCARUP3B,  50, -50, 100, 99);
 	}
 
 	if (frame == 196
@@ -391,16 +391,16 @@ void SceneScriptCT01::SceneFrameAdvanced(int frame) {
 		if (v3 == 0) {
 			Overlay_Play("ct01spnr", 0, false, true, 0);
 			if (Random_Query(0, 1)) {
-				Ambient_Sounds_Play_Sound(68, Random_Query(33, 50), 0, 0, 0);
+				Ambient_Sounds_Play_Sound(kSfxSPIN2B, Random_Query(33, 50), 0, 0, 0);
 			} else {
-				Ambient_Sounds_Play_Sound(67, Random_Query(33, 50), 0, 0, 0);
+				Ambient_Sounds_Play_Sound(kSfxSPIN2A, Random_Query(33, 50), 0, 0, 0);
 			}
 		} else if (v3 == 1) {
 			Overlay_Play("ct01spnr", 1, false, true, 0);
 			if (Random_Query(0, 1)) {
-				Ambient_Sounds_Play_Sound(69, Random_Query(33, 50), 0, 0, 0);
+				Ambient_Sounds_Play_Sound(kSfxSPIN3A, Random_Query(33, 50), 0, 0, 0);
 			} else {
-				Ambient_Sounds_Play_Sound(66, Random_Query(33, 50), 0, 0, 0);
+				Ambient_Sounds_Play_Sound(kSfxSPIN1A, Random_Query(33, 50), 0, 0, 0);
 			}
 		}
 	}
diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp
index b5aa8f6b17..4be9afa2df 100644
--- a/engines/bladerunner/script/scene/ct02.cpp
+++ b/engines/bladerunner/script/scene/ct02.cpp
@@ -57,10 +57,10 @@ void SceneScriptCT02::InitializeScene() {
 	Ambient_Sounds_Add_Sound(62, 10, 30, 7, 7, 100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(63, 10, 30, 8, 8, 100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(64, 10, 30, 7, 7, 100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 19, 100, 100, -101, -101, 1, 1);
 	if (Game_Flag_Query(kFlagCT02PotTipped)) {
 		Scene_Loop_Set_Default(kCT02LoopMainPotTipped);
 	} else {
@@ -281,16 +281,16 @@ bool SceneScriptCT02::ClickedOn2DRegion(int region) {
 
 void SceneScriptCT02::SceneFrameAdvanced(int frame) {
 	if (frame == 6 || frame == 12 || frame == 19 || frame == 25 || frame == 46 || frame == 59) {
-		Sound_Play(97, Random_Query(25, 33), -70, -70, 50);
+		Sound_Play(kSfxNEON7, Random_Query(25, 33), -70, -70, 50);
 	}
 	if (frame == 72) {
-		Sound_Play(200, 50, 0, 0, 50);
+		Sound_Play(kSfxBIGPOT4, 50, 0, 0, 50);
 	}
 	if (frame == 71) {
-		Sound_Play(204, 40, 0, 0, 50);
+		Sound_Play(kSfxBIGPOT3, 40, 0, 0, 50);
 	}
 	if (frame == 72) {
-		Sound_Play(203, 60, -20, 40, 50);
+		Sound_Play(kSfxPOTSPL5, 60, -20, 40, 50);
 	}
 	if (frame == 61) {
 		Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
diff --git a/engines/bladerunner/script/scene/ct03.cpp b/engines/bladerunner/script/scene/ct03.cpp
index 62a8022425..f674a8d8cb 100644
--- a/engines/bladerunner/script/scene/ct03.cpp
+++ b/engines/bladerunner/script/scene/ct03.cpp
@@ -48,10 +48,10 @@ void SceneScriptCT03::InitializeScene() {
 	Ambient_Sounds_Add_Sound(62,  3, 30,  8, 10, -100, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(63,  3, 30,  8, 10, -100, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(64,  3, 30,  8, 10, -100, 0, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound(376, 10, 60, 33, 50, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(377, 10, 60, 33, 50, -100, 100, -101, -101, 0, 0);
 }
diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp
index a7740b0be2..5b074b3c31 100644
--- a/engines/bladerunner/script/scene/ct04.cpp
+++ b/engines/bladerunner/script/scene/ct04.cpp
@@ -47,10 +47,10 @@ void SceneScriptCT04::InitializeScene() {
 	Ambient_Sounds_Add_Looping_Sound(105, 34, 100, 1);
 	Ambient_Sounds_Add_Sound(68, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(69, 10, 40, 33, 50, 0, 0, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound(376, 10, 60, 33, 50, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(377, 10, 60, 33, 50, -100, 100, -101, -101, 0, 0);
 }
@@ -133,7 +133,7 @@ bool SceneScriptCT04::ClickedOn3DObject(const char *objectName, bool a2) {
 		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 75, 0, true, false)) {
 			Actor_Face_Heading(kActorMcCoy, 707, false);
 			Actor_Change_Animation_Mode(kActorMcCoy, 38);
-			Ambient_Sounds_Play_Sound(553, 45, 30, 30, 0);
+			Ambient_Sounds_Play_Sound(kSfxGARBAGE, 45, 30, 30, 0);
 			Actor_Voice_Over(1810, kActorVoiceOver);
 			Actor_Voice_Over(1820, kActorVoiceOver);
 			return true;
@@ -244,7 +244,7 @@ bool SceneScriptCT04::ClickedOn2DRegion(int region) {
 void SceneScriptCT04::SceneFrameAdvanced(int frame) {
 	if (Game_Flag_Query(kFlagCT04BodyDumped)) {
 		Game_Flag_Reset(kFlagCT04BodyDumped);
-		Sound_Play(180, 100, 80, 80, 50);
+		Sound_Play(kSfxGARBAGE4, 100, 80, 80, 50);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ct05.cpp b/engines/bladerunner/script/scene/ct05.cpp
index 1fc53f825e..99846897e9 100644
--- a/engines/bladerunner/script/scene/ct05.cpp
+++ b/engines/bladerunner/script/scene/ct05.cpp
@@ -193,19 +193,19 @@ void SceneScriptCT05::SceneFrameAdvanced(int frame) {
 	) {
 		switch (Random_Query(0, 4)) {
 		case 4:
-			Sound_Play(40, Random_Query(25, 50), -70, -70, 50);
+			Sound_Play(kSfxDRIPPY10, Random_Query(25, 50), -70, -70, 50);
 			break;
 		case 3:
-			Sound_Play(44, Random_Query(25, 50), -70, -70, 50);
+			Sound_Play(kSfxDRIPPY7, Random_Query(25, 50), -70, -70, 50);
 			break;
 		case 2:
-			Sound_Play(43, Random_Query(25, 50), -70, -70, 50);
+			Sound_Play(kSfxDRIPPY6, Random_Query(25, 50), -70, -70, 50);
 			break;
 		case 1:
-			Sound_Play(42, Random_Query(25, 50), -70, -70, 50);
+			Sound_Play(kSfxDRIPPY2, Random_Query(25, 50), -70, -70, 50);
 			break;
 		case 0:
-			Sound_Play(41, Random_Query(25, 50), -70, -70, 50);
+			Sound_Play(kSfxDRIPPY1, Random_Query(25, 50), -70, -70, 50);
 			break;
 		}
 	}
diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp
index 1c5ace1941..22c0b939fb 100644
--- a/engines/bladerunner/script/scene/ct06.cpp
+++ b/engines/bladerunner/script/scene/ct06.cpp
@@ -42,10 +42,10 @@ void SceneScriptCT06::InitializeScene() {
 	}
 	Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1);
 	Ambient_Sounds_Add_Looping_Sound(205,  20, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound(67,  80, 180, 16, 25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(68,  50, 180, 16, 25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(379, 50, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -129,10 +129,10 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) {
 	if (exitId == 1) {
 		if (Actor_Query_Goal_Number(kActorZuben) == kGoalZubenCT06HideAtFreeSlotA) {
 			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 203.91f, -58.02f, 0.47f, 0, 1, false, 0)) {
-				Ambient_Sounds_Remove_Sound(196, true);
-				Ambient_Sounds_Remove_Sound(197, true);
-				Ambient_Sounds_Remove_Sound(198, true);
-				Ambient_Sounds_Remove_Sound(199, true);
+				Ambient_Sounds_Remove_Sound(kSfxZUBWLK1, true);
+				Ambient_Sounds_Remove_Sound(kSfxZUBWLK2, true);
+				Ambient_Sounds_Remove_Sound(kSfxZUBWLK3, true);
+				Ambient_Sounds_Remove_Sound(kSfxZUBWLK4, true);
 				Player_Loses_Control();
 				Actor_Set_Goal_Number(kActorZuben, kGoalZubenCT06JumpDown);
 				Game_Flag_Reset(kFlagNotUsed212);
diff --git a/engines/bladerunner/script/scene/ct07.cpp b/engines/bladerunner/script/scene/ct07.cpp
index f431085a10..d653afdb2c 100644
--- a/engines/bladerunner/script/scene/ct07.cpp
+++ b/engines/bladerunner/script/scene/ct07.cpp
@@ -28,14 +28,14 @@ void SceneScriptCT07::InitializeScene() {
 	Setup_Scene_Information(202.32f, -58.23f, -12.86f, 225);
 	Actor_Put_In_Set(kActorZuben, kSetCT07);
 	Actor_Set_At_XYZ(kActorZuben, -9.68f, -58.23f, 11.14f, 250);
-	
+
 	Ambient_Sounds_Add_Looping_Sound( 54, 30,  90, 1);
 	Ambient_Sounds_Add_Looping_Sound(205, 20,   1, 1);
 	Ambient_Sounds_Add_Looping_Sound( 56, 40, 100, 1);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound( 67, 80, 180, 16,  25,   0,   0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound( 68, 50, 180, 16,  25,   0,   0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(379, 10,  60, 50, 100,   0,   0, -101, -101, 0, 0);
diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp
index eb1aea0843..40f9699bba 100644
--- a/engines/bladerunner/script/scene/ct08.cpp
+++ b/engines/bladerunner/script/scene/ct08.cpp
@@ -59,10 +59,10 @@ void SceneScriptCT08::InitializeScene() {
 
 	Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1);
 	Ambient_Sounds_Add_Looping_Sound(205,  20, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound( 67, 80, 180, 16,  25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound( 68, 50, 180, 16,  25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(379,  5, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -158,7 +158,7 @@ bool SceneScriptCT08::ClickedOn2DRegion(int region) {
 			Game_Flag_Reset(kFlagMcCoyTiedDown);
 			Player_Set_Combat_Mode_Access(true);
 			Scene_Exits_Enable();
-			Ambient_Sounds_Play_Sound(564, 40, 99, 0, 0);
+			Ambient_Sounds_Play_Sound(kSfxBRKROPE1, 40, 99, 0, 0);
 			Scene_2D_Region_Remove(0);
 			Player_Loses_Control();
 		}
diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp
index 4211ae015e..c209928239 100644
--- a/engines/bladerunner/script/scene/ct09.cpp
+++ b/engines/bladerunner/script/scene/ct09.cpp
@@ -59,7 +59,7 @@ bool SceneScriptCT09::ClickedOn3DObject(const char *objectName, bool a2) {
 		if (Actor_Query_Which_Set_In(kActorLeon) != kSetCT09) {
 			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 229.0f, 348.52f, 851.0f, 36, true, false, 0)) {
 				Actor_Face_Object(kActorMcCoy, "BELL", true);
-				Sound_Play(337, 100, 0, 0, 50);
+				Sound_Play(kSfxDESKBELL, 100, 0, 0, 50);
 				if (!Actor_Query_Goal_Number(kActorDeskClerk)) {
 					Actor_Says(kActorDeskClerk, 160, kAnimationModeTalk);
 				}
@@ -155,7 +155,7 @@ void SceneScriptCT09::SceneFrameAdvanced(int frame) {
 	 || frame == 46
 	 || frame == 59
 	) {
-		Sound_Play(97, Random_Query(47, 47), 70, 70, 50);
+		Sound_Play(kSfxNEON7, Random_Query(47, 47), 70, 70, 50); // a bug? random min == max
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp
index 3052fac9e8..a3ffcd38dc 100644
--- a/engines/bladerunner/script/scene/ct10.cpp
+++ b/engines/bladerunner/script/scene/ct10.cpp
@@ -68,7 +68,7 @@ void SceneScriptCT10::checkCabinet() {
 	if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 10.6f, 0.0f, -50.5f, 0, true, false, 0)) {
 		Player_Loses_Control();
 		Actor_Face_Heading(kActorMcCoy, 0, false);
-		Sound_Play(339, 100, 0, 0, 50);
+		Sound_Play(kSfxDRAWER1, 100, 0, 0, 50);
 		Delay(1000);
 		if (Actor_Clue_Query(kActorMcCoy, kClueHoldensBadge)) {
 			Actor_Voice_Over(3700, kActorVoiceOver);
@@ -87,7 +87,7 @@ bool SceneScriptCT10::ClickedOn3DObject(const char *objectName, bool a2) {
 			Actor_Face_Heading(kActorMcCoy, 850, false);
 			Actor_Change_Animation_Mode(kActorMcCoy, 38);
 			Delay(1000);
-			Sound_Play(338, 33, 0, 0, 50);
+			Sound_Play(kSfxCURTAIN1, 33, 0, 0, 50);
 			Delay(3000);
 			if (Actor_Clue_Query(kActorMcCoy, kClueStrangeScale1)) {
 				Actor_Voice_Over(3700, kActorVoiceOver);
diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp
index 8160b9a2fe..282ad25cfd 100644
--- a/engines/bladerunner/script/scene/ct12.cpp
+++ b/engines/bladerunner/script/scene/ct12.cpp
@@ -52,10 +52,10 @@ void SceneScriptCT12::InitializeScene() {
 	Ambient_Sounds_Add_Looping_Sound(54, 33,    1, 1);
 	Ambient_Sounds_Add_Looping_Sound(55, 20, -100, 1);
 	Ambient_Sounds_Add_Looping_Sound(56, 20, -100, 1);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound( 68, 60, 180, 20,  33, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound( 69, 60, 180, 16,  25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(375, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -220,7 +220,7 @@ bool SceneScriptCT12::ClickedOn2DRegion(int region) {
 
 void SceneScriptCT12::SceneFrameAdvanced(int frame) {
 	if (((frame - 1) % 10) == 0) {
-		Sound_Play(Random_Query(59, 60), 10, -80, -80, 50);
+		Sound_Play(Random_Query(kSfxNEON5, kSfxNEON6), 10, -80, -80, 50);
 	}
 
 	if (frame == 160) {
@@ -228,15 +228,15 @@ void SceneScriptCT12::SceneFrameAdvanced(int frame) {
 	}
 
 	if (frame == 152) {
-		Sound_Play(116, 100, 40, 0, 50);
+		Sound_Play(kSfxSPINOPN4, 100, 40, 0, 50);
 	}
 
 	if (frame == 203) {
-		Sound_Play(119, 100, 40, 0, 50);
+		Sound_Play(kSfxSPINCLS1, 100, 40, 0, 50);
 	}
 
 	if (frame == 212) {
-		Sound_Play(117, 40, 0, 0, 50);
+		Sound_Play(kSfxCARUP3,    40, 0, 0, 50);
 	}
 
 	if (frame == 269) {
diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp
index 0c6c1c8110..1bdf9a3117 100644
--- a/engines/bladerunner/script/scene/ct51.cpp
+++ b/engines/bladerunner/script/scene/ct51.cpp
@@ -77,7 +77,7 @@ bool SceneScriptCT51::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == kItemRagDoll) {
 		Actor_Clue_Acquire(kActorMcCoy, kClueRagDoll, true, -1);
 		Item_Pickup_Spin_Effect(943, 260, 200);
-		Ambient_Sounds_Play_Sound(563, 40, 99, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxBABYCRY2, 40, 99, 0, 0);
 		Item_Remove_From_World(kItemRagDoll);
 		return true;
 	}
diff --git a/engines/bladerunner/script/scene/dr01.cpp b/engines/bladerunner/script/scene/dr01.cpp
index e1cdbb5027..af9198c1b9 100644
--- a/engines/bladerunner/script/scene/dr01.cpp
+++ b/engines/bladerunner/script/scene/dr01.cpp
@@ -62,10 +62,10 @@ void SceneScriptDR01::InitializeScene() {
 	Ambient_Sounds_Add_Looping_Sound( 54, 50,  0, 1);
 	Ambient_Sounds_Add_Looping_Sound(219, 12, 85, 1);
 	Ambient_Sounds_Add_Looping_Sound( 98, 14, 85, 1);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound( 67, 5, 80, 16,  25, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound( 66, 5, 80, 16,  25, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(378, 5, 80, 50, 100, -100, 100, -101, -101, 0, 0);
@@ -251,7 +251,7 @@ void SceneScriptDR01::SceneFrameAdvanced(int frame) {
 		Actor_Set_Invisible(kActorMcCoy, false);
 	}
 	if (frame == 2) {
-		Ambient_Sounds_Play_Sound(487, 40, -40, 100, 99);
+		Ambient_Sounds_Play_Sound(kSfxBIKEMIX4, 40, -40, 100, 99);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/dr02.cpp b/engines/bladerunner/script/scene/dr02.cpp
index 4011cf55bb..ad473e6dda 100644
--- a/engines/bladerunner/script/scene/dr02.cpp
+++ b/engines/bladerunner/script/scene/dr02.cpp
@@ -160,7 +160,7 @@ bool SceneScriptDR02::ClickedOn2DRegion(int region) {
 
 void SceneScriptDR02::SceneFrameAdvanced(int frame) {
 	if (frame == 1) {
-		Sound_Play(1, 10, 85, 85, 50);
+		Sound_Play(kSfxSTEAM1, 10, 85, 85, 50);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/dr03.cpp b/engines/bladerunner/script/scene/dr03.cpp
index 008cf45840..4c6ad5b27f 100644
--- a/engines/bladerunner/script/scene/dr03.cpp
+++ b/engines/bladerunner/script/scene/dr03.cpp
@@ -172,9 +172,9 @@ void SceneScriptDR03::SceneFrameAdvanced(int frame) {
 	 || frame == 49
 	) {
 		if (Random_Query(0, 1)) {
-			Sound_Play(97, Random_Query(20, 33), 80, 80, 50);
+			Sound_Play(kSfxNEON7, Random_Query(20, 33), 80, 80, 50);
 		} else {
-			Sound_Play(59, Random_Query(5, 6), 80, 80, 50);
+			Sound_Play(kSfxNEON5, Random_Query(5, 6), 80, 80, 50);
 		}
 	}
 }
diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp
index 8b5225e8d3..f71b62febf 100644
--- a/engines/bladerunner/script/scene/dr04.cpp
+++ b/engines/bladerunner/script/scene/dr04.cpp
@@ -53,10 +53,10 @@ void SceneScriptDR04::InitializeScene() {
 	Ambient_Sounds_Add_Looping_Sound( 54, 50,    1,   1);
 	Ambient_Sounds_Add_Looping_Sound(288, 55, -100,   1);
 	Ambient_Sounds_Add_Looping_Sound(217, 28, -100, 100);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound( 67, 40, 180, 16, 25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound( 66, 40, 180, 16, 25, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(378,  5, 80, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -225,7 +225,7 @@ void SceneScriptDR04::SceneFrameAdvanced(int frame) {
 
 		switch (frame) {
 		case 193:
-			Sound_Play(301, 100, 0, 100, 50);
+			Sound_Play(kSfxINDXPLOD, 100, 0, 100, 50);
 			Actor_Set_Goal_Number(kActorMoraji, kGoalMorajiChooseFate);
 			Player_Loses_Control();
 			Actor_Force_Stop_Walking(kActorMcCoy);
diff --git a/engines/bladerunner/script/scene/dr05.cpp b/engines/bladerunner/script/scene/dr05.cpp
index 254c8ef5e8..65ba400b45 100644
--- a/engines/bladerunner/script/scene/dr05.cpp
+++ b/engines/bladerunner/script/scene/dr05.cpp
@@ -141,7 +141,7 @@ bool SceneScriptDR05::ClickedOn2DRegion(int region) {
 
 void SceneScriptDR05::SceneFrameAdvanced(int frame) {
 	if (frame == 49) {
-		Sound_Play(148, Random_Query(50, 50), 80, 80, 50);
+		Sound_Play(kSfxLABMISC3, Random_Query(50, 50), 80, 80, 50);
 	}
 
 	if (Game_Flag_Query(kFlagDR05BombWillExplode)) {
diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp
index 0d549f57e3..ef1e83d074 100644
--- a/engines/bladerunner/script/scene/dr06.cpp
+++ b/engines/bladerunner/script/scene/dr06.cpp
@@ -154,7 +154,7 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
 			if (!Game_Flag_Query(kFlagDR06MannequinHeadOpen)) {
 				Overlay_Play("DR06ovr2", 0, true, false, 0);
 				Game_Flag_Set(kFlagDR06MannequinHeadOpen);
-				Sound_Play(160, 100, 0, 0, 50);
+				Sound_Play(kSfxCEMENTL1, 100, 0, 0, 50);
 				if (!Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
 					Actor_Voice_Over(850, kActorVoiceOver);
 					Item_Pickup_Spin_Effect(944, 171, 280);
@@ -169,12 +169,12 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
 			} else {
 				Overlay_Remove("DR06ovr2");
 				Game_Flag_Reset(kFlagDR06MannequinHeadOpen);
-				Sound_Play(161, 100, 0, 0, 50);
+				Sound_Play(kSfxCEMENTL2, 100, 0, 0, 50);
 			}
 
 			Global_Variable_Increment(kVariableDR06MannequinHeadOpened, 1);
 			if (Global_Variable_Query(kVariableDR06MannequinHeadOpened) > 12) {
-				Sound_Play(204, 100, 0, 0, 50);
+				Sound_Play(kSfxBIGPOT3, 100, 0, 0, 50);
 				Unclickable_Object("X2_TORSO04HIRES");
 			}
 		}
diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index 10d64a17db..899d02953a 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -201,15 +201,15 @@ void SceneScriptHC01::SceneFrameAdvanced(int frame) {
 	}
 
 	if (frame == 61) {
-		Ambient_Sounds_Play_Sound(312, 90, 0, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxCAMERA2,  90,   0,   0, 0);
 	}
 
 	if (frame == 65) {
-		Ambient_Sounds_Play_Sound(315, 50, 0, 100, 0);
+		Ambient_Sounds_Play_Sound(kSfxRUNAWAY1, 50,   0, 100, 0);
 	}
 
 	if (frame == 80) {
-		Ambient_Sounds_Play_Sound(316, 40, 100, 100, 0);
+		Ambient_Sounds_Play_Sound(kSfxTRPDOOR1, 40, 100, 100, 0);
 		Item_Add_To_World(kItemGreenPawnLock, 931, kSetHC01_HC02_HC03_HC04, 582.0f, 27.0f, -41.0f, 0, 8, 8, true, true, false, true);
 	}
 }
diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp
index 9a3f7e7ffd..e713f03663 100644
--- a/engines/bladerunner/script/scene/hc02.cpp
+++ b/engines/bladerunner/script/scene/hc02.cpp
@@ -202,11 +202,11 @@ bool SceneScriptHC02::ClickedOn2DRegion(int region) {
 
 void SceneScriptHC02::SceneFrameAdvanced(int frame) {
 	if (frame == 70) {
-		Sound_Play(73, 11, 50, -90, 50);
+		Sound_Play(kSfxSWEEP3, 11, 50, -90, 50);
 	}
 
 	if (frame == 58) {
-		Sound_Play(73, 11, 50, -90, 50);
+		Sound_Play(kSfxSWEEP3, 11, 50, -90, 50);
 	}
 
 	if (frame == 69
@@ -217,7 +217,7 @@ void SceneScriptHC02::SceneFrameAdvanced(int frame) {
 	 || frame == 113
 	 || frame == 119
 	) {
-		Sound_Play(60, Random_Query(6, 7), -20, 20, 50);
+		Sound_Play(kSfxNEON6, Random_Query(6, 7), -20, 20, 50);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp
index 3d93906df9..b3be29bc5b 100644
--- a/engines/bladerunner/script/scene/hc03.cpp
+++ b/engines/bladerunner/script/scene/hc03.cpp
@@ -194,14 +194,14 @@ void SceneScriptHC03::SceneFrameAdvanced(int frame) {
 	 || frame == 121
 	 || frame == 131
 	) {
-		Sound_Play(281, Random_Query(33, 50), 50, 50, 50);
+		Sound_Play(kSfx14KBEEP1, Random_Query(33, 50), 50, 50, 50);
 	}
 
 	if (!Game_Flag_Query(kFlagHC03TrapDoorOpened)
 	 &&  frame == 66
 	) {
-		Ambient_Sounds_Play_Sound(328, 90, 0, -40, 99);
-		Sound_Play(201, Random_Query(47, 47), 0, -40, 50);
+		Ambient_Sounds_Play_Sound(kSfxCHAINLNK, 90, 0, -40, 99);
+		Sound_Play(kSfxMTLDOOR2, Random_Query(47, 47), 0, -40, 50);
 		Scene_Exit_Add_2D_Exit(1, 400, 275, 515, 375, 2);
 		Game_Flag_Set(kFlagHC03TrapDoorOpened);
 	}
diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp
index 799d9a5d80..6c6442c538 100644
--- a/engines/bladerunner/script/scene/hf01.cpp
+++ b/engines/bladerunner/script/scene/hf01.cpp
@@ -300,23 +300,23 @@ bool SceneScriptHF01::ClickedOn2DRegion(int region) {
 
 void SceneScriptHF01::SceneFrameAdvanced(int frame) {
 	if (frame == 10) {
-		Sound_Play(118, 40, 0, 0, 50);
+		Sound_Play(kSfxCARDOWN3, 40, 0, 0, 50);
 	}
 
 	if (frame == 72
 	 || frame == 193
 	) {
-		Sound_Play(116, 100, -50, -50, 50);
+		Sound_Play(kSfxSPINOPN4, 100, -50, -50, 50);
 	}
 
 	if (frame == 88
 	 || frame == 214
 	) {
-		Sound_Play(119, 100, -50, -50, 50);
+		Sound_Play(kSfxSPINCLS1, 100, -50, -50, 50);
 	}
 
 	if (frame == 242) {
-		Sound_Play(117, 40, -50, 80, 50);
+		Sound_Play(kSfxCARUP3,    40, -50, 80, 50);
 	}
 
 	if (Actor_Query_Goal_Number(kActorMurray) == 1) {
diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp
index a4be7591e8..08baa223ec 100644
--- a/engines/bladerunner/script/scene/hf02.cpp
+++ b/engines/bladerunner/script/scene/hf02.cpp
@@ -72,7 +72,7 @@ bool SceneScriptHF02::MouseClick(int x, int y) {
 }
 
 bool SceneScriptHF02::ClickedOn3DObject(const char *objectName, bool a2) {
-	Sound_Play(342, 47, -80, 0, 50);
+	Sound_Play(kSfxFORTUNE1, 47, -80, 0, 50); // a bug? Which object should this be?
 	return false;
 }
 
diff --git a/engines/bladerunner/script/scene/hf04.cpp b/engines/bladerunner/script/scene/hf04.cpp
index a6524313e1..09d717d53d 100644
--- a/engines/bladerunner/script/scene/hf04.cpp
+++ b/engines/bladerunner/script/scene/hf04.cpp
@@ -110,11 +110,11 @@ bool SceneScriptHF04::ClickedOn2DRegion(int region) {
 
 void SceneScriptHF04::SceneFrameAdvanced(int frame) {
 	if (frame == 62) {
-		Sound_Play(359, Random_Query(43, 43), 0, 0, 50);
+		Sound_Play(kSfxSTONDOR1, Random_Query(43, 43), 0, 0, 50);
 	}
 
 	if (frame == 154) {
-		Sound_Play(360, Random_Query(43, 43), 0, 0, 50);
+		Sound_Play(kSfxSTONDOR2, Random_Query(43, 43), 0, 0, 50);
 	}
 
 	if (frame == 179
diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp
index 54ffe91b79..501804c98a 100644
--- a/engines/bladerunner/script/scene/hf05.cpp
+++ b/engines/bladerunner/script/scene/hf05.cpp
@@ -92,7 +92,7 @@ bool SceneScriptHF05::ClickedOn3DObject(const char *objectName, bool a2) {
 			 ||  Game_Flag_Query(kFlagHF05Hole)
 			) {
 				Actor_Change_Animation_Mode(kActorMcCoy, 23);
-				Sound_Play(412, 100, 0, 0, 50);
+				Sound_Play(kSfxELEBAD1, 100, 0, 0, 50);
 				return true;
 			}
 
@@ -120,7 +120,7 @@ bool SceneScriptHF05::ClickedOn3DObject(const char *objectName, bool a2) {
 			if (getCompanionActor() == kActorMcCoy) {
 				ADQ_Flush();
 				ADQ_Add(kActorVoiceOver, 940, -1);
-				Ambient_Sounds_Play_Sound(147, 50, 99, 0, 0);
+				Ambient_Sounds_Play_Sound(kSfxLABMISC2, 50, 99, 0, 0);
 				Delay(1500);
 				Loop_Actor_Walk_To_XYZ(kActorMcCoy, 181.54f, 40.63f, 388.09f, 0, false, true, 0);
 				Actor_Face_Heading(kActorMcCoy, 0, false);
@@ -129,13 +129,13 @@ bool SceneScriptHF05::ClickedOn3DObject(const char *objectName, bool a2) {
 			} else {
 				if (getCompanionActor() == kActorDektora) {
 					Actor_Face_Heading(kActorDektora, 0, false);
-					Ambient_Sounds_Play_Sound(147, 50, 99, 0, 0);
+					Ambient_Sounds_Play_Sound(kSfxLABMISC2, 50, 99, 0, 0);
 					Delay(3000);
 					Actor_Face_Heading(kActorDektora, 0, false);
 					Actor_Change_Animation_Mode(kActorDektora, 23);
 				} else {
 					Actor_Face_Heading(kActorLucy, 0, false);
-					Ambient_Sounds_Play_Sound(147, 50, 99, 0, 0);
+					Ambient_Sounds_Play_Sound(kSfxLABMISC2, 50, 99, 0, 0);
 					Delay(3000);
 					Actor_Face_Heading(kActorLucy, 0, false);
 					Actor_Change_Animation_Mode(kActorLucy, 13);
@@ -213,56 +213,56 @@ bool SceneScriptHF05::ClickedOn2DRegion(int region) {
 void SceneScriptHF05::SceneFrameAdvanced(int frame) {
 	switch (frame) {
 	case 126:
-		Sound_Play(352, 90, -20, 70, 50);
+		Sound_Play(kSfxMAGMOVE1, 90, -20,  70, 50);
 		break;
 
 	case 152:
-		Sound_Play(346, 90, 0, 0, 50);
+		Sound_Play(kSfxDORSLID2, 90,   0,   0, 50);
 		break;
 
 	case 156:
-		Sound_Play(348, 47, 100, 100, 50);
+		Sound_Play(kSfxLOWERN1,  47, 100, 100, 50);
 		break;
 
 	case 161:
-		Sound_Play(345, 90, 0, 0, 50);
+		Sound_Play(kSfxDORSLID1, 90,   0,   0, 50);
 		break;
 
 	case 176:
-		Sound_Play(350, 32, 100, 100, 50);
+		Sound_Play(kSfxMAGCHNK1, 32, 100, 100, 50);
 		break;
 
 	case 178:
-		Sound_Play(355, 47, 100, 100, 50);
+		Sound_Play(kSfxRAISEY1,  47, 100, 100, 50);
 		break;
 
 	case 179:
-		Sound_Play(490, 90, 0, 0, 50);
+		Sound_Play(kSfxCAREXPL1, 90,   0,   0, 50);
 		Music_Play(kMusicBatl226M, 50, 0, 2, -1, 0, 0);
 		break;
 
 	case 186:
-		Sound_Play(343, 32, 100, 100, 50);
+		Sound_Play(kSfxCARCREK1, 32, 100, 100, 50);
 		break;
 
 	case 209:
-		Sound_Play(353, 90, 100, -20, 50);
+		Sound_Play(kSfxMAGMOVE2, 90, 100, -20, 50);
 		break;
 
 	case 243:
-		Sound_Play(349, 40, -20, -20, 50);
+		Sound_Play(kSfxLOWERY1,  40, -20, -20, 50);
 		break;
 
 	case 261:
-		Sound_Play(344, 47, -20, -20, 50);
+		Sound_Play(kSfxCARLAND1, 47, -20, -20, 50);
 		break;
 
 	case 268:
-		Sound_Play(351, 58, -20, -20, 50);
+		Sound_Play(kSfxMAGDROP1, 58, -20, -20, 50);
 		break;
 
 	case 269:
-		Sound_Play(354, 43, -20, -20, 50);
+		Sound_Play(kSfxRAISEN1,  43, -20, -20, 50);
 		break;
 	}
 	//return true;
@@ -687,7 +687,7 @@ void SceneScriptHF05::talkWithCrazyLegs1() {
 	}
 	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 307.0f, 40.63f, 184.0f, 0, false, false, 0);
 	Loop_Actor_Walk_To_Actor(kActorCrazylegs, kActorMcCoy, 72, false, false);
-	Ambient_Sounds_Play_Sound(149, 99, 99, 0, 0);
+	Ambient_Sounds_Play_Sound(kSfxLABMISC4, 99, 99, 0, 0);
 	Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
 	Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -740,15 +740,15 @@ void SceneScriptHF05::talkWithCrazyLegs1() {
 
 void SceneScriptHF05::addAmbientSounds() {
 	Ambient_Sounds_Add_Sound(87, 20, 80, 20, 100, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(23, 250, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(23, 330, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(23, 340, 5, 90, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(23, 360, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(24, 380, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(24, 510, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(38,  80, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(38, 160, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(38, 280, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    250, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    330, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    340, 5, 90, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    360, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorDispatcher,       80, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorDispatcher,      160, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorDispatcher,      280, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
 }
 
 int SceneScriptHF05::getCompanionActor() {
diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp
index a5f8b0d022..89b8055c58 100644
--- a/engines/bladerunner/script/scene/hf06.cpp
+++ b/engines/bladerunner/script/scene/hf06.cpp
@@ -301,7 +301,7 @@ void SceneScriptHF06::steelInterruption() {
 	Delay(500);
 	Scene_Loop_Set_Default(3);
 	Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true);
-	Sound_Play(562, 50, 0, 0, 50);
+	Sound_Play(kSfxBOMBFAIL, 50, 0, 0, 50);
 	Game_Flag_Set(kFlagHF06SteelInterruption);
 	Scene_Exits_Disable();
 	Non_Player_Actor_Combat_Mode_On(kActorSteele, kActorCombatStateUncover, true, actorId, 15, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, 0, 0, 100, 10, 300, false);
@@ -309,15 +309,15 @@ void SceneScriptHF06::steelInterruption() {
 
 void SceneScriptHF06::addAmbientSounds() {
 	Ambient_Sounds_Add_Sound(87, 20, 80, 20, 100, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(23, 250, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(23, 330, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(23, 340, 5, 90, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(23, 360, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(24, 380, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(24, 510, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(38,  80, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(38, 160, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(38, 280, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    250, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    330, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    340, 5, 90, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    360, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorDispatcher,       80, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorDispatcher,      160, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorDispatcher,      280, 5, 70, 7, 10, -50, 50, -101, -101, 1, 1);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp
index a8355fbb04..2ccd520b52 100644
--- a/engines/bladerunner/script/scene/kp03.cpp
+++ b/engines/bladerunner/script/scene/kp03.cpp
@@ -182,7 +182,7 @@ bool SceneScriptKP03::ClickedOn2DRegion(int region) {
 
 void SceneScriptKP03::SceneFrameAdvanced(int frame) {
 	if (frame == 123) {
-		Ambient_Sounds_Play_Sound(491, 99, -60, 100, 99);
+		Ambient_Sounds_Play_Sound(kSfxCRYEXPL1, 99, -60, 100, 99);
 	}
 
 	if ( Game_Flag_Query(kFlagKP03BombActive)
@@ -308,7 +308,7 @@ void SceneScriptKP03::saveSteele() {
 	Scene_Loop_Start_Special(kSceneLoopModeOnce, kKP03MainLoopBombNoWire, false);
 	Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP03Leave);
 	Actor_Says(kActorMcCoy, 2195, 14);
-	Ambient_Sounds_Play_Sound(151, 40, -60, -60, 0);
+	Ambient_Sounds_Play_Sound(kSfxLABMISC6, 40, -60, -60, 0);
 	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1.0f, -36.55f, 111.0f, 0, false, false, 0);
 	Actor_Set_Goal_Number(kActorSteele, kGoalSteeleKP05Enter);
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
diff --git a/engines/bladerunner/script/scene/ma01.cpp b/engines/bladerunner/script/scene/ma01.cpp
index 4d0ac5523e..70e093fc87 100644
--- a/engines/bladerunner/script/scene/ma01.cpp
+++ b/engines/bladerunner/script/scene/ma01.cpp
@@ -215,31 +215,31 @@ bool SceneScriptMA01::ClickedOn2DRegion(int region) {
 
 void SceneScriptMA01::SceneFrameAdvanced(int frame) {
 	if (frame == 15) {
-		Ambient_Sounds_Play_Sound(102, 70, -100, 100, 0);
+		Ambient_Sounds_Play_Sound(kSfxROOFLIT1,  70, -100, 100,  0);
 	}
 
 	if (frame == 61
 	 || frame == 183
 	) {
-		Ambient_Sounds_Play_Sound(116, 100, 40, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxSPINOPN4, 100,   40,   0, 99);
 	}
 
 	if (frame == 107
 	 || frame == 227
 	) {
-		Ambient_Sounds_Play_Sound(119, 100, 40, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxSPINCLS1, 100,   40,   0, 99);
 	}
 
 	if (frame == 1) {
-		Ambient_Sounds_Play_Sound(118, 40, -60, 20, 99);
+		Ambient_Sounds_Play_Sound(kSfxCARDOWN3,  40,  -60,  20, 99);
 	}
 
 	if (frame == 241) {
-		Ambient_Sounds_Play_Sound(117, 40, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxCARUP3,    40,    0,   0, 99);
 	}
 
 	if (frame == 58) {
-		Sound_Play(122, 17, 20, 20, 50);
+		Sound_Play(kSfxMTLHIT1, 17, 20, 20, 50);
 	}
 
 	if ((frame == 75
diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp
index 49d2f551e9..ecda102bbf 100644
--- a/engines/bladerunner/script/scene/ma02.cpp
+++ b/engines/bladerunner/script/scene/ma02.cpp
@@ -245,7 +245,7 @@ void SceneScriptMA02::talkWithRajif() {
 	Actor_Says(kActorMcCoy, 2375, 13);
 	Actor_Says(kActorRajif, 20, 13);
 	Actor_Says(kActorMcCoy, 2380, 13);
-	Sound_Play(492, 100, 0, 100, 50);
+	Sound_Play(kSfxSHOTCOK1, 100, 0, 100, 50);
 	Actor_Says(kActorRajif, 40, 13);
 	Delay(3000);
 }
diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp
index 0302296bcd..12f83c9390 100644
--- a/engines/bladerunner/script/scene/ma04.cpp
+++ b/engines/bladerunner/script/scene/ma04.cpp
@@ -106,7 +106,7 @@ bool SceneScriptMA04::ClickedOn3DObject(const char *objectName, bool a2) {
 			Game_Flag_Set(kFlagMA04WatchedTV);
 			Unclickable_Object("BED-TV-1");
 			Unclickable_Object("BED-TV-2");
-			Sound_Play(132, 100, 0, 0, 50);
+			Sound_Play(kSfxSPNBEEP4, 100, 0, 0, 50);
 			turnOnTV();
 			return false;
 		}
@@ -149,7 +149,7 @@ bool SceneScriptMA04::ClickedOnExit(int exitId) {
 	}
 	if (exitId == kMA04ExitKitchen) {
 		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7115.0f, 954.0f, 1742.0f, 0, true, false, 0)) {
-			int sounds[] = {252, 405, 404, 407, 406};
+			int sounds[] = {kSfxBARSFX1, kSfxTOILET1, kSfxDRAIN1X, kSfxWASH1, kSfxGARGLE1};
 			Ambient_Sounds_Play_Sound(sounds[Random_Query(0, 4)], 50, 0, 0, 0);
 			Delay(3000);
 			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7139.0f, 954.0f, 1746.0f, 0, true, false, 1);
@@ -171,8 +171,8 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
 			Actor_Face_Heading(kActorMcCoy, 256, false);
 			if (isPhoneRinging()) {
 				Actor_Says(kActorMcCoy, 2680, 0);
-				Ambient_Sounds_Remove_Sound(403, true);
-				Sound_Play(123, 100, 0, 0, 50);
+				Ambient_Sounds_Remove_Sound(kSfxVIDFONE1, true);
+				Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 				Overlay_Remove("MA04OVER");
 				Delay(500);
 				if (Game_Flag_Query(kFlagMcCoyIsHelpingReplicants)) {
@@ -190,7 +190,7 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
 				return false;
 			}
 			if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredZuben) && !Game_Flag_Query(kFlagMA04PhoneMessageFromClovis)) {
-				Sound_Play(123, 100, 0, 0, 50);
+				Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 				Overlay_Remove("MA04OVER");
 				Delay(500);
 				Actor_Says(kActorClovis, 310, 3);
@@ -201,12 +201,12 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
 					Actor_Voice_Over(1320, kActorVoiceOver);
 				}
 				Actor_Says(kActorMcCoy, 2445, 13);
-				Sound_Play(123, 100, 0, 0, 50);
+				Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 				Game_Flag_Set(kFlagMA04PhoneMessageFromClovis);
 				return true;
 			}
 			if (Actor_Clue_Query(kActorLucy, kClueMcCoyLetZubenEscape) && !Game_Flag_Query(kFlagMA04PhoneMessageFromLucy)) {
-				Sound_Play(123, 100, 0, 0, 50);
+				Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 				Overlay_Remove("MA04OVER");
 				Delay(500);
 				Actor_Says(kActorLucy, 500, 3);
@@ -217,7 +217,7 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
 					Actor_Voice_Over(1350, kActorVoiceOver);
 				}
 				Actor_Says(kActorMcCoy, 2445, 13);
-				Sound_Play(123, 100, 0, 0, 50);
+				Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 				Game_Flag_Set(kFlagMA04PhoneMessageFromLucy);
 				return true;
 			}
@@ -241,7 +241,7 @@ void SceneScriptMA04::SceneFrameAdvanced(int frame) {
 		Set_Fade_Density(0.0f);
 	}
 	if (frame == 121 && (Game_Flag_Query(kFlagZubenRetired) || Game_Flag_Query(kFlagZubenSpared)) && !Game_Flag_Query(kFlagPS04GuzzaTalkZubenRetired)) {
-		Sound_Play(403, 50, 0, 0, 50);
+		Sound_Play(kSfxVIDFONE1, 50, 0, 0, 50);
 	}
 }
 
@@ -265,11 +265,11 @@ void SceneScriptMA04::PlayerWalkedIn() {
 	Game_Flag_Reset(kFlagMA04McCoySleeping);
 	if (Game_Flag_Query(kFlagChapter1Ended)) {
 		if (Global_Variable_Query(kVariableChapter) == 2 && !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallGuzza)) {
-			Sound_Play(403, 100, 0, 0, 50);
+			Sound_Play(kSfxVIDFONE1, 100, 0, 0, 50);
 			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7176.0f, 954.0f, 1806.0f, 0, false, false, 0);
 			Actor_Face_Heading(kActorMcCoy, 256, true);
 			Actor_Says(kActorMcCoy, 2680, 0);
-			Sound_Play(123, 100, 0, 0, 50);
+			Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 			Delay(500);
 			Actor_Says(kActorGuzza, 0, 3);
 			Actor_Says(kActorMcCoy, 2685, 13);
@@ -282,7 +282,7 @@ void SceneScriptMA04::PlayerWalkedIn() {
 			Actor_Says(kActorMcCoy, 2700, 3);
 			Actor_Says(kActorGuzza, 60, 3);
 			Actor_Says(kActorGuzza, 70, 3);
-			Sound_Play(123, 100, 0, 0, 50);
+			Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 			Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallGuzza, false, kActorGuzza);
 			Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationTyrellBuilding, true);
 			Game_Flag_Set(kFlagRC01PoliceDone);
@@ -390,7 +390,7 @@ void SceneScriptMA04::phoneCallWithDektora() {
 		Actor_Says(kActorDektora, 410, 3);
 		Actor_Says(kActorMcCoy, 2525, 15);
 		Actor_Says(kActorDektora, 420, 3);
-		Sound_Play(123, 100, 0, 0, 50);
+		Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 		Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallDektora1, true, -1);
 	} else {
 		Actor_Says_With_Pause(kActorMcCoy, 2505, 0.5f, 19);
@@ -403,7 +403,7 @@ void SceneScriptMA04::phoneCallWithDektora() {
 		Actor_Says_With_Pause(kActorDektora, 470, 1.0f, 3);
 		Actor_Says(kActorDektora, 480, 3);
 		Actor_Says(kActorDektora, 490, 3);
-		Sound_Play(123, 100, 0, 0, 50);
+		Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 		Actor_Says(kActorMcCoy, 2540, 15);
 		Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallDektora2, true, -1);
 	}
@@ -443,7 +443,7 @@ void SceneScriptMA04::phoneCallWithLucy() {
 		}
 		Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallLucy1, true, -1);
 	}
-	Sound_Play(123, 100, 0, 0, 50);
+	Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 }
 
 void SceneScriptMA04::phoneCallWithSteele() {
@@ -463,7 +463,7 @@ void SceneScriptMA04::phoneCallWithSteele() {
 	Actor_Says(kActorMcCoy, 2665, 13);
 	Actor_Says(kActorSteele, 810, 3);
 	Actor_Says(kActorSteele, 820, 3);
-	Sound_Play(123, 100, 0, 0, 50);
+	Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 	Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallCrystal, true, -1);
 }
 
@@ -495,7 +495,7 @@ void SceneScriptMA04::phoneCallWithClovis() {
 	Actor_Says(kActorClovis, 500, 3);
 	Actor_Says(kActorClovis, 530, 3);
 	Actor_Says(kActorClovis, 540, 3);
-	Sound_Play(123, 100, 0, 0, 50);
+	Sound_Play(kSfxSPNBEEP9, 100, 0, 0, 50);
 	Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallClovis, true, -1);
 }
 
diff --git a/engines/bladerunner/script/scene/ma05.cpp b/engines/bladerunner/script/scene/ma05.cpp
index 164ca91a73..8985abed70 100644
--- a/engines/bladerunner/script/scene/ma05.cpp
+++ b/engines/bladerunner/script/scene/ma05.cpp
@@ -44,10 +44,10 @@ void SceneScriptMA05::InitializeScene() {
 	Ambient_Sounds_Add_Looping_Sound(101, 90, 0, 1);
 	Ambient_Sounds_Add_Looping_Sound(99, 40, -100, 1);
 	Ambient_Sounds_Add_Looping_Sound(103, 50, 60, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 0, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 27, 47, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound(68, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(69, 10, 100, 25, 50, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(375, 10, 70, 50, 100, 0, 0, -101, -101, 0, 0);
@@ -105,7 +105,7 @@ bool SceneScriptMA05::ClickedOn2DRegion(int region) {
 
 void SceneScriptMA05::SceneFrameAdvanced(int frame) {
 	if (frame == 20) {
-		Sound_Play(102, 70, -100, 100, 50);
+		Sound_Play(kSfxROOFLIT1, 70, -100, 100, 50);
 	}
 	//return true;
 }
@@ -118,7 +118,7 @@ void SceneScriptMA05::PlayerWalkedIn() {
 	if ((Random_Query(0, 4) == 1 || (Game_Flag_Query(kFlagChapter1Ending) && !Game_Flag_Query(kFlagChapter1Ended))) && Global_Variable_Query(kVariableChapter) == 1) {
 		Scene_Loop_Set_Default(kMA05LoopMain);
 		Scene_Loop_Start_Special(kSceneLoopModeOnce, kMA05LoopSpinner, true);
-		Sound_Play(69, 100, 0, 0, 50);
+		Sound_Play(kSfxSPIN3A, 100, 0, 0, 50);
 	}
 	if (Game_Flag_Query(kFlagChapter1Ending) && !Game_Flag_Query(kFlagChapter1Ended)) {
 		if (!Game_Flag_Query(kFlagDirectorsCut)) {
diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp
index 8d7bc4e504..f702ee8b9b 100644
--- a/engines/bladerunner/script/scene/ma06.cpp
+++ b/engines/bladerunner/script/scene/ma06.cpp
@@ -40,7 +40,7 @@ void SceneScriptMA06::InitializeScene() {
 	Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kMA06LoopDoorOpen, false);
 	Scene_Loop_Set_Default(kMA06LoopMain);
 
-	Sound_Play(209, 100, 50, 50, 100);
+	Sound_Play(kSfxELDOORC1, 100, 50, 50, 100);
 }
 
 void SceneScriptMA06::SceneLoaded() {
@@ -86,7 +86,7 @@ void SceneScriptMA06::PlayerWalkedIn() {
 	activateElevator();
 
 	if (isElevatorOnDifferentFloor()) {
-		Sound_Play(114, 25, 0, 0, 50);
+		Sound_Play(kSfxSPINUP1, 25, 0, 0, 50);
 		Delay(4000);
 	}
 
@@ -103,7 +103,7 @@ void SceneScriptMA06::PlayerWalkedIn() {
 	}
 
 	Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA06LoopDoorClose, true);
-	Sound_Play(208, 100, 50, 50, 50);
+	Sound_Play(kSfxELDOORO2, 100, 50, 50, 50);
 	//return true;
 }
 
@@ -150,7 +150,7 @@ void SceneScriptMA06::activateElevator() {
 			if (Game_Flag_Query(kFlagSpinnerAtMA01)) {
 				Game_Flag_Set(kFlagMA06toMA01);
 			} else {
-				Sound_Play(412, 100, 0, 0, 50);
+				Sound_Play(kSfxELEBAD1, 100, 0, 0, 50);
 				Delay(500);
 				Actor_Says(kActorAnsweringMachine, 610, 3);
 			}
@@ -159,7 +159,7 @@ void SceneScriptMA06::activateElevator() {
 			if (Global_Variable_Query(kVariableChapter) == 4
 			 && Game_Flag_Query(kFlagMA02RajifTalk)
 			) {
-				Sound_Play(412, 100, 0, 0, 50);
+				Sound_Play(kSfxELEBAD1, 100, 0, 0, 50);
 				Delay(500);
 				Actor_Says(kActorAnsweringMachine, 610, kAnimationModeTalk);
 				Delay(500);
diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp
index b7548d228a..7e0ce8c804 100644
--- a/engines/bladerunner/script/scene/nr01.cpp
+++ b/engines/bladerunner/script/scene/nr01.cpp
@@ -260,7 +260,7 @@ bool SceneScriptNR01::ClickedOn2DRegion(int region) {
 	if (region == 0
 	 && Player_Query_Combat_Mode()
 	) {
-		Sound_Play(517, 100, 0, 0, 50);
+		Sound_Play(kSfxGUNH1A, 100, 0, 0, 50);
 		Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR01McCoyShotGun);
 		Scene_2D_Region_Remove(0);
 	}
@@ -268,7 +268,7 @@ bool SceneScriptNR01::ClickedOn2DRegion(int region) {
 	if (region == 1
 	 && Player_Query_Combat_Mode()
 	) {
-		Sound_Play(517, 100, 0, 0, 50);
+		Sound_Play(kSfxGUNH1A, 100, 0, 0, 50);
 		Actor_Set_Goal_Number(kActorGordo, kGoalGordoNR01Die);
 		Actor_Set_Goal_Number(kActorSteele, kGoalSteeleNR01McCoyShotGordo);
 		Scene_2D_Region_Remove(1);
@@ -280,11 +280,11 @@ bool SceneScriptNR01::ClickedOn2DRegion(int region) {
 
 void SceneScriptNR01::SceneFrameAdvanced(int frame) {
 	if (frame == 61) {
-		Sound_Play(118, 40, 0, 0, 50);
+		Sound_Play(kSfxCARDOWN3, 40, 0, 0, 50);
 	}
 
 	if (frame == 184) {
-		Sound_Play(117, 40, 80, 80, 50);
+		Sound_Play(kSfxCARUP3, 40, 80, 80, 50);
 	}
 	//return 0;
 }
diff --git a/engines/bladerunner/script/scene/nr02.cpp b/engines/bladerunner/script/scene/nr02.cpp
index cdd9671bf5..ea156784d7 100644
--- a/engines/bladerunner/script/scene/nr02.cpp
+++ b/engines/bladerunner/script/scene/nr02.cpp
@@ -31,26 +31,26 @@ void SceneScriptNR02::InitializeScene() {
 
 	Scene_Exit_Add_2D_Exit(0, 0, 105, 75, 291, 3);
 
-	Ambient_Sounds_Add_Looping_Sound(280, 50, 38, 0);
-	Ambient_Sounds_Add_Sound(252, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(254, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(255, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(256, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(257, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(258, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(259, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(260, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(261, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(262, 3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(182, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(184, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(185, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(186, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(188, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(189, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(191, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(192, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(195, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Looping_Sound(kSfxBARAMB1, 50, 38, 0);
+	Ambient_Sounds_Add_Sound(kSfxBARSFX1,  3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBARSFX3,  3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBARSFX4,  3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBARSFX5,  3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBARSFX6,  3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBARSFX7,  3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxCLINK1,   3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxCLINK2,   3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxCLINK3,   3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxCLINK4,   3, 60, 25, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_0480R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_0540R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_0560R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_0870R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_0900R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_0940R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_1070R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_1080R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfx67_1160R, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
 }
 
 void SceneScriptNR02::SceneLoaded() {
@@ -86,15 +86,15 @@ bool SceneScriptNR02::ClickedOn3DObject(const char *objectName, bool a2) {
 				Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyCallWithGuzza);
 				Game_Flag_Set(kFlagCallWithGuzza);
 			} else {
-				Sound_Play(123, 50, 0, 0, 50);
+				Sound_Play(kSfxSPNBEEP9, 50, 0, 0, 50);
 				Delay(1000);
-				Sound_Play(403, 30, 0, 0, 50);
+				Sound_Play(kSfxVIDFONE1, 30, 0, 0, 50);
 				Delay(1500);
-				Sound_Play(403, 30, 0, 0, 50);
+				Sound_Play(kSfxVIDFONE1, 30, 0, 0, 50);
 				Delay(1500);
-				Sound_Play(403, 30, 0, 0, 50);
+				Sound_Play(kSfxVIDFONE1, 30, 0, 0, 50);
 				Delay(1500);
-				Sound_Play(123, 50, 0, 0, 50);
+				Sound_Play(kSfxSPNBEEP9, 50, 0, 0, 50);
 				Delay(1000);
 				Actor_Says(kActorMcCoy, 170, 14);
 			}
@@ -205,22 +205,22 @@ void SceneScriptNR02::DialogueQueueFlushed(int a1) {
 	if (Player_Query_Current_Scene() == kSceneNR02
 	 && Actor_Query_Goal_Number(kActorGordo) == kGoalGordoNR02TellJoke1
 	) {
-		Sound_Play(575, 50, 0, 0, 50);
-		Sound_Play(321, 50, 0, 0, 50);
+		Sound_Play(kSfxRIMSHOT1, 50, 0, 0, 50);
+		Sound_Play(kSfxAUDLAFF3, 50, 0, 0, 50);
 	}
 
 	if (Player_Query_Current_Scene() == kSceneNR02
 	 && Actor_Query_Goal_Number(kActorGordo) == kGoalGordoNR02TellJoke2
 	) {
-		Sound_Play(576, 50, 0, 0, 50);
-		Sound_Play(323, 50, 0, 0, 50);
+		Sound_Play(kSfxRIMSHOT2, 50, 0, 0, 50);
+		Sound_Play(kSfxAUDLAFF5, 50, 0, 0, 50);
 	}
 
 	if (Player_Query_Current_Scene() == kSceneNR02
 	 && Actor_Query_Goal_Number(kActorGordo) == kGoalGordoNR02TellJoke3
 	) {
-		Sound_Play(579, 50, 0, 0, 50);
-		Sound_Play(324, 50, 0, 0, 50);
+		Sound_Play(kSfxRIMSHOT5, 50, 0, 0, 50);
+		Sound_Play(kSfxAUDLAFF6, 50, 0, 0, 50);
 	}
 
 	// Gordo on the podium
diff --git a/engines/bladerunner/script/scene/nr03.cpp b/engines/bladerunner/script/scene/nr03.cpp
index 2962ddbe22..479ab7315e 100644
--- a/engines/bladerunner/script/scene/nr03.cpp
+++ b/engines/bladerunner/script/scene/nr03.cpp
@@ -252,11 +252,11 @@ void SceneScriptNR03::SceneFrameAdvanced(int frame) {
 	}
 
 	if (frame == 72) {
-		Sound_Play(345, 83, -70, -70, 50);
+		Sound_Play(kSfxDORSLID1, 83, -70, -70, 50);
 	}
 
 	if (frame == 76) {
-		Sound_Play(353, 62, -70, -70, 50);
+		Sound_Play(kSfxMAGMOVE2, 62, -70, -70, 50);
 	}
 
 	if (frame > 70
diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp
index 22ff810f26..ffea441df8 100644
--- a/engines/bladerunner/script/scene/nr04.cpp
+++ b/engines/bladerunner/script/scene/nr04.cpp
@@ -183,7 +183,7 @@ bool SceneScriptNR04::ClickedOn2DRegion(int region) {
 				Player_Loses_Control();
 				Actor_Voice_Over(4180, kActorVoiceOver);
 				Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
-				Ambient_Sounds_Play_Sound(555, 90, 99, 0, 0);
+				Ambient_Sounds_Play_Sound(kSfxMALEHURT, 90, 99, 0, 0);
 				Delay(350);
 				Actor_Set_At_XYZ(kActorMcCoy, 109.0f, 0.0f, 374.0f, 0);
 				Actor_Retired_Here(kActorMcCoy, 12, 12, true, -1);
diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp
index 342849ecf9..fcf12b62c3 100644
--- a/engines/bladerunner/script/scene/nr05.cpp
+++ b/engines/bladerunner/script/scene/nr05.cpp
@@ -157,11 +157,11 @@ void SceneScriptNR05::SceneFrameAdvanced(int frame) {
 	}
 
 	if (frame == 78) {
-		Sound_Play(345, 83, 70, 70, 50);
+		Sound_Play(kSfxDORSLID1, 83, 70, 70, 50);
 	}
 
 	if (frame == 86) {
-		Sound_Play(353, 62, 70, 70, 50);
+		Sound_Play(kSfxMAGMOVE2, 62, 70, 70, 50);
 	}
 
 	rotateActorOnGround(kActorHysteriaPatron2);
diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp
index fe9c71031f..52a5b95b62 100644
--- a/engines/bladerunner/script/scene/nr08.cpp
+++ b/engines/bladerunner/script/scene/nr08.cpp
@@ -150,7 +150,7 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
 	) {
 		Set_Fade_Density((frame - 76) / 14.0f);
 		Music_Stop(3);
-		Ambient_Sounds_Play_Sound(566, 27, 0, 99, 0);
+		Ambient_Sounds_Play_Sound(kSfxDEKCLAP1, 27, 0, 99, 0);
 	} else if (frame >= 91
 	        && frame < 120
 	) {
@@ -198,7 +198,7 @@ void SceneScriptNR08::PlayerWalkedIn() {
 	 && !Game_Flag_Query(kFlagNR08DektoraShow)
 	) {
 		Game_Flag_Set(kFlagNR08DektoraShow);
-		Ambient_Sounds_Play_Sound(566, 27, 0, 99, 0);
+		Ambient_Sounds_Play_Sound(kSfxDEKCLAP1, 27, 0, 99, 0);
 		Music_Play(kMusicArkdFly1, 61, 0, 1, -1, 0, 0);
 		Outtake_Play(kOuttakeDektora, true, -1);
 	} else {
diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp
index a3f7adcd84..61e886a321 100644
--- a/engines/bladerunner/script/scene/nr10.cpp
+++ b/engines/bladerunner/script/scene/nr10.cpp
@@ -75,7 +75,7 @@ bool SceneScriptNR10::ClickedOn3DObject(const char *objectName, bool combatMode)
 		Actor_Set_Invisible(kActorMcCoy, false);
 		Actor_Set_Invisible(kActorDektora, false);
 		Ambient_Sounds_Remove_Looping_Sound(452, true);
-		Sound_Play(453, 52, 0, 0, 50);
+		Sound_Play(kSfx35MMBRK1, 52, 0, 0, 50);
 		Scene_Loop_Set_Default(0);
 		Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, true);
 		Un_Combat_Target_Object("BOX18");
diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp
index a8b59dacfb..40b7f13942 100644
--- a/engines/bladerunner/script/scene/nr11.cpp
+++ b/engines/bladerunner/script/scene/nr11.cpp
@@ -251,39 +251,39 @@ bool SceneScriptNR11::ClickedOn2DRegion(int region) {
 
 void SceneScriptNR11::SceneFrameAdvanced(int frame) {
 	if (frame == 62) {
-		Ambient_Sounds_Play_Sound(449, 40, 100, 100, 10);
+		Ambient_Sounds_Play_Sound(kSfxMCGUN1,  40, 100, 100, 10);
 	}
 
 	if (frame == 67) {
-		Ambient_Sounds_Play_Sound(449, 30, 90, 90, 10);
+		Ambient_Sounds_Play_Sound(kSfxMCGUN1,  30,  90,  90, 10);
 	}
 
 	if (frame == 74) {
-		Ambient_Sounds_Play_Sound(450, 50, 83, 83, 10);
+		Ambient_Sounds_Play_Sound(kSfxMCGUN2,  50,  83,  83, 10);
 	}
 
 	if (frame == 80) {
-		Ambient_Sounds_Play_Sound(449, 60, 65, 65, 10);
+		Ambient_Sounds_Play_Sound(kSfxMCGUN1,  60,  65,  65, 10);
 	}
 
 	if (frame == 92) {
-		Ambient_Sounds_Play_Sound(450, 30, 50, 50, 10);
+		Ambient_Sounds_Play_Sound(kSfxMCGUN2,  30,  50,  50, 10);
 	}
 
 	if (frame == 97) {
-		Ambient_Sounds_Play_Sound(449, 50, -40, -40, 10);
+		Ambient_Sounds_Play_Sound(kSfxMCGUN1,  50, -40, -40, 10);
 	}
 
 	if (frame == 103) {
-		Ambient_Sounds_Play_Sound(450, 40, -27, -27, 10);
+		Ambient_Sounds_Play_Sound(kSfxMCGUN2,  40, -27, -27, 10);
 	}
 
 	if (frame == 109) {
-		Ambient_Sounds_Play_Sound(449, 60, -20, -20, 10);
+		Ambient_Sounds_Play_Sound(kSfxMCGUN1,  60, -20, -20, 10);
 	}
 
 	if (frame == 62) {
-		Ambient_Sounds_Play_Sound(122, 80, 100, 100, 15);
+		Ambient_Sounds_Play_Sound(kSfxMTLHIT1, 80, 100, 100, 15);
 	}
 
 	if (Game_Flag_Query(kFlagNR11BreakWindow)) {
diff --git a/engines/bladerunner/script/scene/ps01.cpp b/engines/bladerunner/script/scene/ps01.cpp
index c80562f1ad..453e085651 100644
--- a/engines/bladerunner/script/scene/ps01.cpp
+++ b/engines/bladerunner/script/scene/ps01.cpp
@@ -192,33 +192,33 @@ void SceneScriptPS01::SceneFrameAdvanced(int frame) {
 	if (frame == 71
 	 || frame == 188
 	) {
-		Sound_Play(116, 100, 40, 0, 50);
+		Sound_Play(kSfxSPINOPN4, 100, 40, 0, 50);
 	}
 
 	if (frame == 108
 	 || frame == 228
 	) {
-		Sound_Play(119, 100, 40, 0, 50);
+		Sound_Play(kSfxSPINCLS1, 100, 40, 0, 50);
 	}
 
 	if (frame == 1) {
-		Sound_Play(118, 40, 0, 0, 50);
+		Sound_Play(kSfxCARDOWN3,  40, 0, 0, 50);
 	}
 
 	if (frame == 76) {
-		Sound_Play(121, 50, 0, 0, 50);
+		Sound_Play(kSfxSERVOD1,   50, 0, 0, 50);
 	}
 
 	if (frame == 192) {
-		Sound_Play(120, 50, 0, 0, 50);
+		Sound_Play(kSfxSERVOU1,   50, 0, 0, 50);
 	}
 
 	if (frame == 59) {
-		Sound_Play(122, 15, 0, 0, 50);
+		Sound_Play(kSfxMTLHIT1,   15, 0, 0, 50);
 	}
 
 	if (frame == 275) {
-		Sound_Play(117, 40, 0, 0, 50);
+		Sound_Play(kSfxCARUP3,    40, 0, 0, 50);
 	}
 
 	if (!Game_Flag_Query(kFlagArrivedFromSpinner2)) {
diff --git a/engines/bladerunner/script/scene/ps02.cpp b/engines/bladerunner/script/scene/ps02.cpp
index d655b9686b..d3d97648fa 100644
--- a/engines/bladerunner/script/scene/ps02.cpp
+++ b/engines/bladerunner/script/scene/ps02.cpp
@@ -112,11 +112,11 @@ bool SceneScriptPS02::ClickedOn2DRegion(int region) {
 
 void SceneScriptPS02::SceneFrameAdvanced(int frame) {
 	if (frame == 1) {
-		Ambient_Sounds_Play_Sound(208, 45, 0, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxELDOORO2, 45, 0, 0, 0);
 	}
 
 	if (frame == 91) {
-		Ambient_Sounds_Play_Sound(209, 45, 0, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxELDOORC1, 45, 0, 0, 0);
 	}
 	//return true;
 }
diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp
index e3261c44f3..612ad75cf1 100644
--- a/engines/bladerunner/script/scene/ps05.cpp
+++ b/engines/bladerunner/script/scene/ps05.cpp
@@ -133,7 +133,7 @@ bool SceneScriptPS05::ClickedOn2DRegion(int region) {
 
 void SceneScriptPS05::SceneFrameAdvanced(int frame) {
 	if (frame == 1 || frame == 16 || frame == 31 || frame == 46) {
-		Sound_Play(149, Random_Query(10, 10), 70, 70, 50);
+		Sound_Play(kSfxLABMISC4, Random_Query(10, 10), 70, 70, 50);
 	}
 	//return true;
 }
diff --git a/engines/bladerunner/script/scene/ps06.cpp b/engines/bladerunner/script/scene/ps06.cpp
index dde7c220a3..3f37ffa8ed 100644
--- a/engines/bladerunner/script/scene/ps06.cpp
+++ b/engines/bladerunner/script/scene/ps06.cpp
@@ -86,13 +86,13 @@ bool SceneScriptPS06::ClickedOn3DObject(const char *objectName, bool a2) {
 			return true;
 		} else {
 			Actor_Clues_Transfer_New_To_Mainframe(kActorMcCoy);
-			Ambient_Sounds_Play_Sound(587, 50, 0, 0, 99);
+			Ambient_Sounds_Play_Sound(kSfxDATALOAD, 50, 0, 0, 99);
 			Delay(2000);
 			Actor_Says(kActorAnsweringMachine, 340,  kAnimationModeTalk);
 			Actor_Clues_Transfer_New_From_Mainframe(kActorMcCoy);
-			Ambient_Sounds_Play_Sound(587, 50, 0, 0, 99);
+			Ambient_Sounds_Play_Sound(kSfxDATALOAD, 50, 0, 0, 99);
 			Delay(2000);
-			Ambient_Sounds_Play_Sound(588, 80, 0, 0, 99);
+			Ambient_Sounds_Play_Sound(kSfxBEEPNEAT, 80, 0, 0, 99);
 			Actor_Says(kActorAnsweringMachine, 350, kAnimationModeTalk);
 			return true;
 		}
diff --git a/engines/bladerunner/script/scene/ps07.cpp b/engines/bladerunner/script/scene/ps07.cpp
index 86c8eaa5dc..3ce7d4254a 100644
--- a/engines/bladerunner/script/scene/ps07.cpp
+++ b/engines/bladerunner/script/scene/ps07.cpp
@@ -52,8 +52,8 @@ bool SceneScriptPS07::MouseClick(int x, int y) {
 }
 
 bool SceneScriptPS07::ClickedOn3DObject(const char *objectName, bool a2) {
-	if (Object_Query_Click("L.MOUSE", objectName)) {
-		Sound_Play(155, 70, 0, 0, 50);
+	if (Object_Query_Click("L.MOUSE", objectName)) { // a bug? Which object is this?
+		Sound_Play(kSfxLABBUZZ1, 70, 0, 0, 50);
 		if (Actor_Query_Goal_Number(kActorKlein) < 4 && Actor_Query_Goal_Number(kActorKlein) > 0) {
 			Actor_Face_Actor(kActorMcCoy, kActorKlein, true);
 			Actor_Set_Goal_Number(kActorKlein, 3);
diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp
index d7f48b0f1f..ee94b1e0e1 100644
--- a/engines/bladerunner/script/scene/ps09.cpp
+++ b/engines/bladerunner/script/scene/ps09.cpp
@@ -254,7 +254,7 @@ void SceneScriptPS09::SceneFrameAdvanced(int frame) {
 	 || frame == 52
 	 || frame == 54
 	) {
-		Sound_Play(97, Random_Query(50, 33), 10, 10, 50);
+		Sound_Play(kSfxNEON7, Random_Query(50, 33), 10, 10, 50); // TODO needs support for swapped min, max in Random_Query
 	}
 	//return true;
 }
diff --git a/engines/bladerunner/script/scene/ps10.cpp b/engines/bladerunner/script/scene/ps10.cpp
index e2cbb5eb7c..19932495b0 100644
--- a/engines/bladerunner/script/scene/ps10.cpp
+++ b/engines/bladerunner/script/scene/ps10.cpp
@@ -51,7 +51,7 @@ static const int *getPoliceMazePS10TrackData1() {   // Enemy linked series (kIte
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIWaitRandom,      3000, 5000,
 		kPMTIObstacleSet,     kItemPS10Target1,
-		kPMTIPlaySound,       159, 100,
+		kPMTIPlaySound,       kSfxUPTARG3, 100,
 		kPMTIMove,            14,
 		kPMTIWait,            1000,
 		kPMTIRotate,          740, 80,
@@ -63,7 +63,7 @@ static const int *getPoliceMazePS10TrackData1() {   // Enemy linked series (kIte
 		kPMTIWait,            0,
 		kPMTIRotate,          488, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIWait,            0,
 		kPMTIRotate,          740, 80,
 		kPMTIPausedReset,     kItemPS10Target2,     // kItemPS10Target2 continues the route of this item
@@ -113,7 +113,7 @@ static const int *getPoliceMazePS10TrackData3() {   // Enemy (kItemPS10Target3)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 5000,
 		kPMTIObstacleSet,     kItemPS10Target3,
-		kPMTIPlaySound,       159, 100,
+		kPMTIPlaySound,       kSfxUPTARG3, 100,
 		kPMTITargetSet,       kItemPS10Target3, 1,
 		kPMTIEnemyReset,      kItemPS10Target3,
 		kPMTIMove,            5,
@@ -123,12 +123,12 @@ static const int *getPoliceMazePS10TrackData3() {   // Enemy (kItemPS10Target3)
 		kPMTIWait,            0,
 		kPMTIRotate,          491, 80,
 		kPMTIWait,            500,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIWait,            500,
 		kPMTIRotate,          233, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          993, 80,
-		kPMTIPlaySound,       34, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS10Target3,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -154,7 +154,7 @@ static const int *getPoliceMazePS10TrackData4() {   // Innocent (kItemPS10Target
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 6000,
 		kPMTIObstacleSet,     kItemPS10Target4,
-		kPMTIPlaySound,       159, 100,
+		kPMTIPlaySound,       kSfxUPTARG3, 100,
 		kPMTITargetSet,       kItemPS10Target4, 1,
 		kPMTIEnemyReset,      kItemPS10Target4,
 		kPMTIMove,            34,
@@ -187,7 +187,7 @@ static const int *getPoliceMazePS10TrackData5() {   // Innocent (kItemPS10Target
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      4000, 6000,
 		kPMTIObstacleSet,     kItemPS10Target5,
-		kPMTIPlaySound,       159, 100,
+		kPMTIPlaySound,       kSfxUPTARG3, 100,
 		kPMTITargetSet,       kItemPS10Target5, 1,
 		kPMTIEnemyReset,      kItemPS10Target5,
 		kPMTIMove,            5,
@@ -195,7 +195,7 @@ static const int *getPoliceMazePS10TrackData5() {   // Innocent (kItemPS10Target
 		kPMTIRotate,          512, 100,
 		kPMTIWait,            2000,
 		kPMTIRotate,          0, -100,
-		kPMTIPlaySound,       34, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTILeave,
 		kPMTIObstacleReset,   kItemPS10Target5,
@@ -224,7 +224,7 @@ static const int *getPoliceMazePS10TrackData6() {   // Enemy (kItemPS10Target6)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      4000, 6000,
 		kPMTIObstacleSet,     kItemPS10Target6,
-		kPMTIPlaySound,       159, 100,
+		kPMTIPlaySound,       kSfxUPTARG3, 100,
 		kPMTITargetSet,       kItemPS10Target6, 1,
 		kPMTIEnemyReset,      kItemPS10Target6,
 		kPMTIMove,            7,
@@ -234,12 +234,12 @@ static const int *getPoliceMazePS10TrackData6() {   // Enemy (kItemPS10Target6)
 		kPMTIWait,            0,
 		kPMTIRotate,          500, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIWait,            0,
 		kPMTIRotate,          750, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          999, 80,
-		kPMTIPlaySound,       34, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS10Target6,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -298,7 +298,7 @@ static const int *getPoliceMazePS10TrackData8() {   // Enemy (kItemPS10Target8)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      4000, 6000,
 		kPMTIObstacleSet,     kItemPS10Target8,
-		kPMTIPlaySound,       159, 100,
+		kPMTIPlaySound,       kSfxUPTARG3, 100,
 		kPMTITargetSet,       kItemPS10Target8, 1,
 		kPMTIEnemyReset,      kItemPS10Target8,
 		kPMTIMove,            34,
@@ -307,7 +307,7 @@ static const int *getPoliceMazePS10TrackData8() {   // Enemy (kItemPS10Target8)
 		kPMTIRotate,          491, 80,
 		kPMTIMove,            20,
 		kPMTIWait,            0,                    // this results in shooting too fast - TODO maybe introduce a small wait here (50 or 150)
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS10Target8,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -336,44 +336,44 @@ static const int *getPoliceMazePS10TrackData9() {   // Special (kItemPS10Target9
 		kPMTITargetSet,       kItemPS10Target9, 1,
 		kPMTIEnemySet,        kItemPS10Target9,
 		kPMTIObstacleSet,     kItemPS10Target9,
-		kPMTIPlaySound,       0, 33,
+		kPMTIPlaySound,       kSfxCROSLOCK, 33,
 		kPMTIMove,            23,
-		kPMTIPlaySound,       0, 33,
+		kPMTIPlaySound,       kSfxCROSLOCK, 33,
 		kPMTIWait,            200,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIRotate,          498, 100,
-		kPMTIPlaySound,       0, 33,
+		kPMTIPlaySound,       kSfxCROSLOCK, 33,
 		kPMTIWait,            100,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       32, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIMove,            35,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIWait,            100,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       0, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxCROSLOCK, 33,
 		kPMTIMove,            23,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIWait,            100,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       32, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIRotate,          758, 100,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIMove,            89,
-		kPMTIPlaySound,       0, 33,
+		kPMTIPlaySound,       kSfxCROSLOCK, 33,
 		kPMTIWaitRandom,      4000, 6000,
 		kPMTITargetSet,       kItemPS10Target9, 1,  // intended: special: "second" enemy (re-using the target of the track)
 		kPMTIEnemySet,        kItemPS10Target9,     // intended: special: "second" enemy (re-using the target of the track)
 		kPMTIFacing,          216,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIMove,            69,
 		kPMTIWait,            100,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIRotate,          498, 100,
 		kPMTIWait,            100,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       0, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxCROSLOCK, 33,
 		kPMTIRotate,          216, 100,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS10Target9,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -401,25 +401,25 @@ void SceneScriptPS10::InitializeScene() {
 	Scene_Exit_Add_2D_Exit(1, 0, 0, 20, 479, 3);
 
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(0);
-	Ambient_Sounds_Add_Looping_Sound(387, 50, 1, 1);
-	Ambient_Sounds_Add_Looping_Sound( 54, 50, 1, 1);
-	Ambient_Sounds_Add_Sound(  1, 10,  50, 16, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(389,  5,  50, 16, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(390,  6,  50, 16, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(443,  2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(444,  2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(445,  2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(446,  2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(303,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(304,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(305,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(306,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(307,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(308,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Looping_Sound(kSfxESPLOOP2, 50, 1, 1);
+	Ambient_Sounds_Add_Looping_Sound(kSfxCTRAIN1,  50, 1, 1);
+	Ambient_Sounds_Add_Sound(kSfxSTEAM1,  10,  50, 16, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSTEAMY1,  5,  50, 16, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSTEAMY2,  6,  50, 16, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSCARY4,   2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSCARY5,   2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSCARY6,   2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSCARY7,   2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBGRN1,   5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBGRN2,   5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBGRN3,   5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBMOVE1,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBMOVE2,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBMOVE3,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
 #if BLADERUNNER_ORIGINAL_BUGS
 #else
 	// Moved here from PS15
-	Sound_Play(155, 90, 0, 0, 50);  // LABBUZZ1.AUD
+	Sound_Play(kSfxLABBUZZ1, 90, 0, 0, 50);
 #endif // BLADERUNNER_ORIGINAL_BUGS
 }
 
@@ -501,14 +501,14 @@ bool SceneScriptPS10::ClickedOnItem(int itemId, bool combatMode) {
 	if (Player_Query_Combat_Mode()) {
 		switch (itemId) {
 		case kItemPS10Target4:
-			Sound_Play(4, 50, 0, 0, 50);    // FEMHURT2
+			Sound_Play(kSfxFEMHURT2, 50, 0, 0, 50);
 			break;
 		case kItemPS10Target5:              // fall-through
 		case kItemPS10Target7:
-			Sound_Play(555, 50, 0, 0, 50);  // MALEHURT
+			Sound_Play(kSfxMALEHURT, 50, 0, 0, 50);
 			break;
 		default:
-			Sound_Play(2, 12, 0, 0, 50);    // SPINNY1
+			Sound_Play(kSfxSPINNY1,  12, 0, 0, 50);
 			break;
 		}
 
diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp
index 0100370c2a..1331f4cf4f 100644
--- a/engines/bladerunner/script/scene/ps11.cpp
+++ b/engines/bladerunner/script/scene/ps11.cpp
@@ -61,13 +61,13 @@ static const int *getPoliceMazePS11TrackData9() {   // Enemy (kItemPS11Target1)
 		kPMTIWaitRandom,      5000, 6000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS11Target1,
-		kPMTIPlaySound,       31, 33,
+		kPMTIPlaySound,       kSfxTARGUP3, 33,
 		kPMTITargetSet,       kItemPS11Target1, 1,
 		kPMTIEnemySet,        kItemPS11Target1,
 		kPMTIMove,            7,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       34, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIWait,            500,
 		kPMTIObstacleReset,   kItemPS11Target1,
@@ -104,7 +104,7 @@ static const int *getPoliceMazePS11TrackData10() {  // Enemy (kItemPS11Target2,
 		kPMTIEnemyReset,      kItemPS11Target3,     // both targets should clear their enemy flag here
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS11Target2,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTIMove,            14,
 		kPMTIWait,            500,
 		kPMTIPausedReset,     kItemPS11Target3,
@@ -129,12 +129,12 @@ static const int *getPoliceMazePS11TrackData11() {  // Enemy (kItemPS11Target2,
 		kPMTIMove,            25,
 		kPMTIWait,            500,
 		kPMTIEnemySet,        kItemPS11Target3,		// rotate - reveal -- no need to set target 2 as enemy too, since it's gone
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIRotate,          644, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          388, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           12, 33,
+		kPMTIShoot,           kSfxLGCAL1, 33,
 		kPMTIMove,            79,
 		kPMTIObstacleReset,   kItemPS11Target3,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -206,7 +206,7 @@ static const int *getPoliceMazePS11TrackData13() {  // Enemy (kItemPS11Target5)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      4000, 8000,
 		kPMTIObstacleSet,     kItemPS11Target5,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS11Target5, 1,
 		kPMTIEnemySet,        kItemPS11Target5,
 		kPMTIMove,            4,
@@ -227,8 +227,8 @@ static const int *getPoliceMazePS11TrackData13() {  // Enemy (kItemPS11Target5)
 		kPMTIWait,            0,
 		kPMTIRotate,          340, 80,
 		kPMTIWait,            200,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       34, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS11Target5,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -261,7 +261,7 @@ static const int *getPoliceMazePS11TrackData14() {  // Enemy (kItemPS11Target6)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 6000,
 		kPMTIObstacleSet,     kItemPS11Target6,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTIMove,            5,
 		kPMTIWait,            500,
 		kPMTIEnemySet,        kItemPS11Target6,     // rotate - reveal
@@ -273,8 +273,8 @@ static const int *getPoliceMazePS11TrackData14() {  // Enemy (kItemPS11Target6)
 		kPMTIRotate,          260, 80,              // corrected orientation - face towards McCoy
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       34, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS11Target6,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -305,7 +305,7 @@ static const int *getPoliceMazePS11TrackData15() {  // Special (kItemPS11Target7
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 7000,
 		kPMTIObstacleSet,     kItemPS11Target7,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIEnemyReset,      kItemPS11Target7,
 #if BLADERUNNER_ORIGINAL_BUGS
 #else
@@ -336,7 +336,7 @@ static const int *getPoliceMazePS11TrackData16() {  // Innocent (kItemPS11Target
 		kPMTIEnemyReset,      kItemPS11Target8,     // [redundant after bug fix]
 		kPMTIMove,            25,
 		kPMTIWait,            500,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIRotate,          644, 100,
 		kPMTIWait,            0,
 		kPMTIRotate,          388, 200,
@@ -379,10 +379,10 @@ static const int *getPoliceMazePS11TrackData17() {  // Special (kItemPS11Target9
 		kPMTIObstacleSet,     kItemPS11Target9,     // make visible after the wait period, not before
 		kPMTITargetSet,       kItemPS11Target9, 1,  // set Target-able after the wait period, not before
 #endif // BLADERUNNER_ORIGINAL_BUGS
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIMove,            10,
 		kPMTIWait,            0,                    // this results in shooting too fast - TODO maybe introduce a small wait here (50 or 150)
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTITargetSet,       kItemPS11Target9, 1,  // intended: special: "second" enemy (re-using the target of the track)
 		kPMTIEnemySet,        kItemPS11Target9,     // intended: special: "second" enemy (re-using the target of the track)
@@ -391,7 +391,7 @@ static const int *getPoliceMazePS11TrackData17() {  // Special (kItemPS11Target9
 		kPMTIEnemySet,        kItemPS11Target9,     // intended: special: "third" enemy (re-using the target of the track)
 		kPMTIMove,            10,
 		kPMTIWait,            0,                    // this results in shooting too fast - TODO maybe introduce a small wait here (50 or 150)
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            24,
 		kPMTIWait,            1000,
 		kPMTIObstacleReset,   kItemPS11Target9,
@@ -430,9 +430,9 @@ static const int *getPoliceMazePS11TrackData18() {  // Special (kItemPS11Target1
 		kPMTIWaitRandom,      4000, 6000,
 		kPMTIObstacleSet,     kItemPS11Target10,
 		kPMTIMove,            5,
-		kPMTIPlaySound,       19, 33,
+		kPMTIPlaySound,       kSfxRICO3, 33,
 #if BLADERUNNER_ORIGINAL_BUGS
-		kPMTIPlaySound,       3, 33,                // FEMHURT1 - Wrong sound
+		kPMTIPlaySound,       kSfxFEMHURT1, 33,     // FEMHURT1 - Wrong sound
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIWait,            1000,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -447,7 +447,7 @@ static const int *getPoliceMazePS11TrackData18() {  // Special (kItemPS11Target1
 		kPMTIWait,            0,
 		kPMTIRotate,          512, 200,
 		kPMTIWait,            1000,
-		kPMTIShoot,           12, 33,
+		kPMTIShoot,           kSfxLGCAL1, 33,
 		kPMTIPausedReset,     kItemPS11Target11,
 		kPMTIObstacleReset,   kItemPS11Target10,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -472,9 +472,9 @@ static const int *getPoliceMazePS11TrackData19() {  // Special (kItemPS11Target1
 		kPMTITargetSet,       kItemPS11Target11, 1, // intended: special: "second" enemy (re-using the target of the track)
 		kPMTIEnemySet,        kItemPS11Target11,    // intended: special: "second" enemy (re-using the target of the track)
 		kPMTIMove,            2,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIWait,            1000,
-		kPMTIShoot,           12, 33,
+		kPMTIShoot,           kSfxLGCAL1, 33,
 		kPMTIMove,            kItemPS11Target11,
 		kPMTIWait,            500,
 		kPMTIObstacleReset,   kItemPS11Target11,
@@ -506,9 +506,9 @@ static const int *getPoliceMazePS11TrackData20() {  // Enemy (kItemPS11Target12)
 		kPMTIEnemySet,        kItemPS11Target12,
 		kPMTIObstacleSet,     kItemPS11Target12,
 		kPMTIMove,            9,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS11Target12,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -578,9 +578,9 @@ static const int *getPoliceMazePS11TrackData22() {  // Enemy (kItemPS11Target14)
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS11Target14,
 		kPMTIMove,            7,
-		kPMTIPlaySound,       32, 33,
+		kPMTIPlaySound,       kSfxTARGUP4, 33,
 		kPMTIWait,            1000,
-		kPMTIShoot,           12, 33,
+		kPMTIShoot,           kSfxLGCAL1, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS11Target14,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -645,7 +645,7 @@ static const int *getPoliceMazePS11TrackData27() {  // Enemy (kItemPS11Target16)
 		kPMTIObstacleSet,     kItemPS11Target16,
 		kPMTIMove,            14,
 		kPMTIWait,            1000,
-		kPMTIShoot,           12, 33,
+		kPMTIShoot,           kSfxLGCAL1, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS11Target16,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -757,15 +757,15 @@ bool SceneScriptPS11::ClickedOnItem(int itemId, bool combatMode) {
 		switch (itemId) {
 		case kItemPS11Target4:              // fall-through
 		case kItemPS11Target15:
-			Sound_Play(555, 50, 0, 0, 50);  // MALEHURT
+			Sound_Play(kSfxMALEHURT, 50, 0, 0, 50);
 			break;
 		case kItemPS11Target7:              // fall-through
 		case kItemPS11Target8:              // fall-through
 		case kItemPS11Target13:
-			Sound_Play(4, 50, 0, 0, 50);    // FEMHURT2
+			Sound_Play(kSfxFEMHURT2, 50, 0, 0, 50);
 			break;
 		default:
-			Sound_Play(2, 12, 0, 0, 50);    // SPINNY1
+			Sound_Play(kSfxSPINNY1,  12, 0, 0, 50);
 			break;
 		}
 
diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp
index 6f745b03e2..e3262f0bdf 100644
--- a/engines/bladerunner/script/scene/ps12.cpp
+++ b/engines/bladerunner/script/scene/ps12.cpp
@@ -57,13 +57,13 @@ static const int *getPoliceMazePS12TrackData29() { // Enemy (kItemPS12Target1) -
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      4000, 10000,
 		kPMTIObstacleSet,     kItemPS12Target1,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target1, 1,
 		kPMTIEnemySet,        kItemPS12Target1,
 		kPMTIMove,            5,
 		kPMTIWait,            500,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       34, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS12Target1,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -90,13 +90,13 @@ static const int *getPoliceMazePS12TrackData30() { // Enemy (kItemPS12Target2) -
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 9000,
 		kPMTIObstacleSet,     kItemPS12Target2,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target2, 1,
 		kPMTIEnemySet,        kItemPS12Target2,
 		kPMTIMove,            5,
 		kPMTIWait,            500,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       34, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS12Target2,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -134,13 +134,13 @@ static const int *getPoliceMazePS12TrackData31() { // Innocent (kItemPS12Target3
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS12Target3,
 		kPMTIMove,            5,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            1000,
 		kPMTIRotate,          968, 100,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            500,
 		kPMTIMove,            0,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTILeave,
 		kPMTIObstacleReset,   kItemPS12Target3,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -167,14 +167,14 @@ static const int *getPoliceMazePS12TrackData32() { // Enemy (kItemPS12Target4)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 10000,
 		kPMTIObstacleSet,     kItemPS12Target4,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target4, 1,
 		kPMTIEnemySet,        kItemPS12Target4,
 		kPMTIMove,            5,
 		kPMTIWait,            500,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIRotate,          498, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            500,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS12Target4,
@@ -205,12 +205,12 @@ static const int *getPoliceMazePS12TrackData33() { // Innocent (kItemPS12Target5
 		kPMTITargetSet,       kItemPS12Target5, 1,
 		kPMTIEnemyReset,      kItemPS12Target5,
 		kPMTIMove,            5,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            1000,
 		kPMTIRotate,          284, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          28, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            1000,
 		kPMTIMove,            0,
 		kPMTILeave,
@@ -250,27 +250,27 @@ static const int *getPoliceMazePS12TrackData34() {  // Special (kItemPS12Target6
 		kPMTIEnemySet,        kItemPS12Target7,
 		kPMTIEnemySet,        kItemPS12Target8,
 		kPMTIMove,            5,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            1000,
 		kPMTIRotate,          376, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          168, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIMove,            9,
 		kPMTIRotate,          33, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          15, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            500,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            5,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIRotate,          168, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          376, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          469, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            500,
 		kPMTITargetSet,       kItemPS12Target6, 1,  // intended: special: "second" enemy (re-using the targets of the track)
 		kPMTITargetSet,       kItemPS12Target7, 1,  // intended: special: "second" enemy (re-using the targets of the track)
@@ -285,19 +285,19 @@ static const int *getPoliceMazePS12TrackData34() {  // Special (kItemPS12Target6
 		kPMTIRotate,          33, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          15, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            500,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            5,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            0,
 		kPMTIRotate,          469, 80,
 		kPMTIWait,            500,
 		kPMTIRotate,          198, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            0,
 		kPMTIMove,            19,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            0,
 #if BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleReset,   kItemPS12Target6,
@@ -354,7 +354,7 @@ static const int *getPoliceMazePS12TrackData36() {  // Enemy (kItemPS12Target6,
 		kPMTIPosition,        0,
 		kPMTIObstacleSet,     kItemPS12Target8,     // redundant (original)
 		kPMTIMove,            9,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            1000,
 		kPMTIObstacleReset,   kItemPS12Target6,
 		kPMTIObstacleReset,   kItemPS12Target7,
@@ -392,12 +392,12 @@ static const int *getPoliceMazePS12TrackData37() {  // Special: Innocent (kItemP
 		kPMTIPosition,        0,
 		kPMTIWait,            2000,
 		kPMTIObstacleSet,     kItemPS12Target9,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target9, 1,
 		kPMTIEnemyReset,      kItemPS12Target9,
 		kPMTIMove,            9,
 		kPMTIWait,            3000,
-		kPMTIPlaySound,       34, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTILeave,
 		kPMTIObstacleReset,   kItemPS12Target9,
@@ -425,13 +425,13 @@ static const int *getPoliceMazePS12TrackData38() {  // Enemy (kItemPS12Target10)
 		kPMTIPosition,        0,
 		kPMTIWait,            3000,
 		kPMTIObstacleSet,     kItemPS12Target10,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target10, 1,
 		kPMTIEnemySet,        kItemPS12Target10,
 		kPMTIMove,            9,
 		kPMTIWait,            1000,
-		kPMTIShoot,           12, 33,
-		kPMTIPlaySound,       34, 33,
+		kPMTIShoot,           kSfxLGCAL1, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS12Target10,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -464,16 +464,16 @@ static const int *getPoliceMazePS12TrackData39() {  // Enemy (kItemPS12Target11)
 		kPMTIWaitRandom,      5000, 6000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS12Target11,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target11, 1,
 		kPMTIMove,            5,
 		kPMTIWait,            1000,
 		kPMTIEnemySet,        kItemPS12Target11,    // rotate - reveal
 		kPMTIRotate,          1010, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            500,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       34, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS12Target11,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -501,16 +501,16 @@ static const int *getPoliceMazePS12TrackData40() {  // Enemy (kItemPS12Target12)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      4000, 8000,
 		kPMTIObstacleSet,     kItemPS12Target12,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTITargetSet,       kItemPS12Target12, 1,
 		kPMTIMove,            5,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            500,
 		kPMTIEnemySet,        kItemPS12Target12,    // rotate - reveal
 		kPMTIRotate,          968, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS12Target12,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -537,16 +537,16 @@ static const int *getPoliceMazePS12TrackData41() {  // Innocent (kItemPS12Target
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      4000, 6000,
 		kPMTIObstacleSet,     kItemPS12Target13,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target13, 1,
 		kPMTIEnemyReset,      kItemPS12Target13,
 		kPMTIMove,            5,
 		kPMTIWait,            500,
 		kPMTIRotate,          1010, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            1000,
 		kPMTIMove,            0,
-		kPMTIPlaySound,       34, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTILeave,
 		kPMTIObstacleReset,   kItemPS12Target13,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -575,13 +575,13 @@ static const int *getPoliceMazePS12TrackData42() {  // Enemy (kItemPS12Target14)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      2000, 5000,
 		kPMTIObstacleSet,     kItemPS12Target14,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTITargetSet,       kItemPS12Target14, 1,
 		kPMTIEnemySet,        kItemPS12Target14,
 		kPMTIMove,            5,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS12Target14,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -608,7 +608,7 @@ static const int *getPoliceMazePS12TrackData43() {  // Innocent (kItemPS12Target
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      5000, 7000,
 		kPMTIObstacleSet,     kItemPS12Target15,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target15, 1,
 		kPMTIEnemyReset,      kItemPS12Target15,
 		kPMTIMove,            9,
@@ -616,9 +616,9 @@ static const int *getPoliceMazePS12TrackData43() {  // Innocent (kItemPS12Target
 		kPMTIRotate,          284, 80,
 		kPMTIWait,            0,
 		kPMTIRotate,          28, 80,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIWait,            2000,
-		kPMTIPlaySound,       34, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTILeave,
 		kPMTIObstacleReset,   kItemPS12Target15,
@@ -650,7 +650,7 @@ static const int *getPoliceMazePS12TrackData44() {  // Innocent (kItemPS12Target
 		kPMTIWaitRandom,      5000, 6000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS12Target16,
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTITargetSet,       kItemPS12Target16, 1,
 		kPMTIEnemyReset,      kItemPS12Target16,
 		kPMTIMove,            5,
@@ -659,7 +659,7 @@ static const int *getPoliceMazePS12TrackData44() {  // Innocent (kItemPS12Target
 #else
 		kPMTIWaitRandom,      2000, 3000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
-		kPMTIPlaySound,       29, 33,
+		kPMTIPlaySound,       kSfxTARGUP1, 33,
 		kPMTIMove,            0,
 		kPMTILeave,
 		kPMTIObstacleReset,   kItemPS12Target16,
@@ -688,7 +688,7 @@ static const int *getPoliceMazePS12TrackData45() {  // Enemy (kItemPS12Target17)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 10000,
 		kPMTIObstacleSet,     kItemPS12Target17,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS12Target17, 1,
 		kPMTIMove,            9,
 		kPMTIWait,            1000,
@@ -697,8 +697,8 @@ static const int *getPoliceMazePS12TrackData45() {  // Enemy (kItemPS12Target17)
 		kPMTIWait,            0,
 		kPMTIRotate,          28, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
-		kPMTIPlaySound,       34, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
+		kPMTIPlaySound,       kSfxTARGUP6, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS12Target17,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -811,15 +811,15 @@ bool SceneScriptPS12::ClickedOnItem(int itemId, bool a2) {
 		case kItemPS12Target3:              // fall through
 		case kItemPS12Target9:              // fall through
 		case kItemPS12Target13:             // fall through
-			Sound_Play(4, 50, 0, 0, 50);    // FEMHURT2
+			Sound_Play(kSfxFEMHURT2, 50, 0, 0, 50);
 			break;
 		case kItemPS12Target5:              // fall through
 		case kItemPS12Target15:             // fall through
 		case kItemPS12Target16:             // fall through
-			Sound_Play(555, 50, 0, 0, 50);  // MALEHURT
+			Sound_Play(kSfxMALEHURT, 50, 0, 0, 50);
 			break;
 		default:
-			Sound_Play(2, 12, 0, 0, 50);    // SPINNY1
+			Sound_Play(kSfxSPINNY1,  12, 0, 0, 50);
 			break;
 		}
 #if BLADERUNNER_ORIGINAL_BUGS
diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp
index 2f7bed8129..084e144b92 100644
--- a/engines/bladerunner/script/scene/ps13.cpp
+++ b/engines/bladerunner/script/scene/ps13.cpp
@@ -76,13 +76,13 @@ static const int *getPoliceMazePS13TrackData46() {  // Enemy (kItemPS13Target1)
 		kPMTIPosition,        0,
 		kPMTIWait,            2000,
 		kPMTIObstacleSet,     kItemPS13Target1,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target1, 1,
 		kPMTIEnemySet,        kItemPS13Target1,
 		kPMTIWait,            1000,
 		kPMTIMove,            5,
 		kPMTIWait,            500,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIWait,            500,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS13Target1,
@@ -114,12 +114,12 @@ static const int *getPoliceMazePS13TrackData47() {  // Enemy (kItemPS13Target2)
 		kPMTIWaitRandom,      5000, 6000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS13Target2,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target2, 1,
 		kPMTIEnemySet,        kItemPS13Target2,
 		kPMTIMove,            9,
 		kPMTIWait,            2000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS13Target2,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -150,7 +150,7 @@ static const int *getPoliceMazePS13TrackData48() {  // Innocent (kItemPS13Target
 		kPMTIWaitRandom,      2000, 3000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS13Target3,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target3, 1,
 		kPMTIEnemyReset,      kItemPS13Target3,
 		kPMTIMove,            9,
@@ -182,12 +182,12 @@ static const int *getPoliceMazePS13TrackData49() {  // Enemy (kItemPS13Target4)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 3000,
 		kPMTIObstacleSet,     kItemPS13Target4,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target4, 1,
 		kPMTIEnemySet,        kItemPS13Target4,
 		kPMTIMove,            9,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS13Target4,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -215,7 +215,7 @@ static const int *getPoliceMazePS13TrackData50() {  // Innocent (kItemPS13Target
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      3000, 5000,
 		kPMTIObstacleSet,     kItemPS13Target5,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target5, 1,
 		kPMTIEnemyReset,      kItemPS13Target5,
 		kPMTIMove,            9,
@@ -251,12 +251,12 @@ static const int *getPoliceMazePS13TrackData51() {  // Enemy (kItemPS13Target6)
 		kPMTIWaitRandom,      2000, 3000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS13Target6,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target6, 1,
 		kPMTIEnemySet,        kItemPS13Target6,
 		kPMTIMove,            9,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIWait,            500,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS13Target6,
@@ -284,7 +284,7 @@ static const int *getPoliceMazePS13TrackData52() {  // Enemy (kItemPS13Target7)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      5000, 10000,
 		kPMTIObstacleSet,     kItemPS13Target7,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target7, 1,
 		kPMTIEnemyReset,      kItemPS13Target7,
 		kPMTIMove,            9,
@@ -294,7 +294,7 @@ static const int *getPoliceMazePS13TrackData52() {  // Enemy (kItemPS13Target7)
 		kPMTIWait,            0,
 		kPMTIRotate,          833, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS13Target7,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -325,14 +325,14 @@ static const int *getPoliceMazePS13TrackData53() {  // Enemy (kItemPS13Target8)
 		kPMTIWaitRandom,      3000, 4000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS13Target8,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target8, 1,
 		kPMTIEnemyReset,      kItemPS13Target8,
 		kPMTIMove,            5,
 		kPMTIEnemySet,        kItemPS13Target8,     // rotate - reveal
 		kPMTIRotate,          868, 200,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIRotate,          356, 60,
 		kPMTIWait,            1000,
 		kPMTIMove,            0,
@@ -365,7 +365,7 @@ static const int *getPoliceMazePS13TrackData54() {  // Enemy (kItemPS13Target9)
 		kPMTIPosition,        0,
 		kPMTIWaitRandom,      10000, 20000,
 		kPMTIObstacleSet,     kItemPS13Target9,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target9, 1,
 		kPMTIEnemyReset,      kItemPS13Target9,
 		kPMTIMove,            3,
@@ -373,7 +373,7 @@ static const int *getPoliceMazePS13TrackData54() {  // Enemy (kItemPS13Target9)
 		kPMTIEnemySet,        kItemPS13Target9,     // rotate - reveal
 		kPMTIRotate,          768, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIMove,            0,
 		kPMTIObstacleReset,   kItemPS13Target9,
 #if BLADERUNNER_ORIGINAL_BUGS
@@ -410,7 +410,7 @@ static const int *getPoliceMazePS13TrackData55() {  // Enemy linked series (kIte
 #else
 		kPMTIWaitRandom,      1000, 2000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTIEnemyReset,      kItemPS13Target10,
 #if BLADERUNNER_ORIGINAL_BUGS
 #else
@@ -471,7 +471,7 @@ static const int *getPoliceMazePS13TrackData57() {  // Enemy linked series (kIte
 		kPMTIWait,            0,
 		kPMTIRotate,          843, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIWait,            500,
 		kPMTIMove,            14,
 		kPMTIObstacleReset,   kItemPS13Target12,
@@ -504,7 +504,7 @@ static const int *getPoliceMazePS13TrackData58() {  // Special (kItemPS13Target1
 		kPMTIWaitRandom,      3000, 4000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS13Target13,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target13, 1,
 		kPMTIEnemyReset,      kItemPS13Target13,
 		kPMTIMove,            9,
@@ -548,7 +548,7 @@ static const int *getPoliceMazePS13TrackData62() {  // Enemy (kItemPS13Target14)
 		kPMTIWaitRandom,      3000, 4000,
 #endif // BLADERUNNER_ORIGINAL_BUGS
 		kPMTIObstacleSet,     kItemPS13Target14,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target14, 1,
 		kPMTIEnemyReset,      kItemPS13Target14,
 		kPMTIMove,            14,
@@ -558,7 +558,7 @@ static const int *getPoliceMazePS13TrackData62() {  // Enemy (kItemPS13Target14)
 		kPMTIWait,            0,
 		kPMTIRotate,          937, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIWait,            500,
 		kPMTIRotate,          650, 80,
 		kPMTIWait,            0,
@@ -589,7 +589,7 @@ static const int *getPoliceMazePS13TrackData63() {  // Enemy (kItemPS13Target15)
 		kPMTIPosition,        0,
 		kPMTIWait,            3000,
 		kPMTIObstacleSet,     kItemPS13Target15,
-		kPMTIPlaySound,       33, 33,
+		kPMTIPlaySound,       kSfxTARGUP5, 33,
 		kPMTITargetSet,       kItemPS13Target15, 1,
 		kPMTIEnemyReset,      kItemPS13Target15,
 		kPMTIMove,            9,
@@ -599,7 +599,7 @@ static const int *getPoliceMazePS13TrackData63() {  // Enemy (kItemPS13Target15)
 		kPMTIWait,            0,
 		kPMTIRotate,          960, 80,
 		kPMTIWait,            1000,
-		kPMTIShoot,           27, 33,
+		kPMTIShoot,           kSfxSMCAL3, 33,
 		kPMTIWait,            500,
 		kPMTIRotate,          710, 80,
 		kPMTIWait,            0,
@@ -696,14 +696,14 @@ bool SceneScriptPS13::ClickedOnItem(int itemId, bool a2) {
 		switch (itemId) {
 		case kItemPS13Target3:             // fall-through
 		case kItemPS13Target5:
-			Sound_Play(4, 50, 0, 0, 50);   // FEMHURT2
+			Sound_Play(kSfxFEMHURT2, 50, 0, 0, 50);
 			break;
 		case kItemPS13Target10:            // fall-through
 		case kItemPS13Target11:
-			Sound_Play(555, 50, 0, 0, 50); // MALEHURT
+			Sound_Play(kSfxMALEHURT, 50, 0, 0, 50);
 			break;
 		default:
-			Sound_Play(2, 12, 0, 0, 50);   // SPINNY1
+			Sound_Play(kSfxSPINNY1,  12, 0, 0, 50);
 			break;
 		}
 #if BLADERUNNER_ORIGINAL_BUGS
diff --git a/engines/bladerunner/script/scene/ps15.cpp b/engines/bladerunner/script/scene/ps15.cpp
index c8405e0e75..63abb75b5d 100644
--- a/engines/bladerunner/script/scene/ps15.cpp
+++ b/engines/bladerunner/script/scene/ps15.cpp
@@ -127,7 +127,7 @@ bool SceneScriptPS15::ClickedOnExit(int exitId) {
 			// Sometimes the scene transition code (or the Ambient_Sounds_Remove_All_Non_Looping_Sounds)
 			// would stop this from playing (rare occasions)
 			// Solution: moved into PS10 code
-			Sound_Play(155, 90, 0, 0, 50);  // LABBUZZ1.AUD
+			Sound_Play(kSfxLABBUZZ1, 90, 0, 0, 50);
 #endif // BLADERUNNER_ORIGINAL_BUGS
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp
index effe5587a0..d2d8c2be7b 100644
--- a/engines/bladerunner/script/scene/rc01.cpp
+++ b/engines/bladerunner/script/scene/rc01.cpp
@@ -587,25 +587,25 @@ bool SceneScriptRC01::ClickedOn2DRegion(int region) {
 
 void SceneScriptRC01::SceneFrameAdvanced(int frame) {
 	if (frame == 1) {
-		Sound_Play(118, 40, 0, 0, 50); // CARDOWN3.AUD
+		Sound_Play(kSfxCARDOWN3, 40, 0, 0, 50);
 	}
 	if (frame == 61 || frame == 362) {
-		Sound_Play(116, 100, 80, 80, 50); // SPINOPN4.AUD
+		Sound_Play(kSfxSPINOPN4, 100, 80, 80, 50);
 	}
 	if (frame == 108 || frame == 409) {
-		Sound_Play(119, 100, 80, 80, 50); // SPINCLS1.AUD
+		Sound_Play(kSfxSPINCLS1, 100, 80, 80, 50);
 	}
 	if (frame == 183 || frame == 484) {
-		Sound_Play(116, 100, 80, 80, 50); // SPINOPN4.AUD
+		Sound_Play(kSfxSPINOPN4, 100, 80, 80, 50);
 	}
 	if (frame == 228 || frame == 523) {
-		Sound_Play(119, 100, 80, 80, 50); // SPINCLS1.AUD
+		Sound_Play(kSfxSPINCLS1, 100, 80, 80, 50);
 	}
 	if (frame == 243 || frame == 545) {
-		Sound_Play(117, 40, 80, 80, 50); // CARUP3.AUD
+		Sound_Play(kSfxCARUP3, 40, 80, 80, 50);
 	}
 	if (frame == 315) {
-		Sound_Play(118, 40, 80, 80, 50); // CARDOWN3.AUD
+		Sound_Play(kSfxCARDOWN3, 40, 80, 80, 50);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp
index 93bedec479..4079d60080 100644
--- a/engines/bladerunner/script/scene/rc02.cpp
+++ b/engines/bladerunner/script/scene/rc02.cpp
@@ -49,12 +49,12 @@ void SceneScriptRC02::InitializeScene() {
 	Ambient_Sounds_Add_Sound(77, 5, 40,  6,  6, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(78, 5, 40,  6,  6, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(79, 5, 40,  6,  6, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(23, 250, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(23, 330, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(24, 380, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(24, 510, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(38,  80, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(38, 160, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    250, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerLeary,    330, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 380, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorOfficerGrayford, 510, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorDispatcher,       80, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorDispatcher,      160, 10, 60, 5, 5, 100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound(87, 20, 80, 10, 20, 100, 100, -101, -101, 0, 0);
 }
 
diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp
index c37edd586b..253b1faccb 100644
--- a/engines/bladerunner/script/scene/rc03.cpp
+++ b/engines/bladerunner/script/scene/rc03.cpp
@@ -55,10 +55,10 @@ void SceneScriptRC03::InitializeScene() {
 	Ambient_Sounds_Add_Sound(82, 5, 30, 40, 70, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(83, 5, 30, 40, 75, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(84, 5, 30, 40, 70, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Speech_Sound(60,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
-	Ambient_Sounds_Add_Speech_Sound(60, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy,  0, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 20, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 40, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
+	Ambient_Sounds_Add_Speech_Sound(kActorBlimpGuy, 50, 10, 260, 17, 24, -100, 100, -101, -101, 1, 1);
 	Ambient_Sounds_Add_Sound(68,  60, 180, 16,  25,    0,   0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(69,  60, 180, 16,  25,    0,   0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(375, 60, 180, 50, 100,    0,   0, -101, -101, 0, 0);
@@ -238,10 +238,10 @@ bool SceneScriptRC03::ClickedOn2DRegion(int region) {
 
 void SceneScriptRC03::SceneFrameAdvanced(int frame) {
 	if (frame == 1) {
-		Sound_Play(286, Random_Query(33, 33), 100, -100, 50);
+		Sound_Play(kSfxTRUCKBY1, Random_Query(33, 33), 100, -100, 50);
 	}
 	if (frame == 15) {
-		Sound_Play(287, Random_Query(50, 50), -100, 100, 50);
+		Sound_Play(kSfxCHEVBY1,  Random_Query(50, 50), -100, 100, 50);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp
index ab16bdc317..af405833b9 100644
--- a/engines/bladerunner/script/scene/tb05.cpp
+++ b/engines/bladerunner/script/scene/tb05.cpp
@@ -197,10 +197,10 @@ bool SceneScriptTB05::ClickedOn2DRegion(int region) {
 
 void SceneScriptTB05::SceneFrameAdvanced(int frame) {
 	if (frame == 61) {
-		Sound_Play(150, Random_Query(52, 52), 0, 0, 50);
+		Sound_Play(kSfxLABMISC5, Random_Query(52, 52), 0, 0, 50);
 	}
 	if (frame == 63) {
-		Sound_Play(283, Random_Query(55, 55), 0, 0, 50);
+		Sound_Play(kSfxTBDOOR1,  Random_Query(55, 55), 0, 0, 50);
 	}
 	//return true;
 }
diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp
index aa20c591dd..9305504528 100644
--- a/engines/bladerunner/script/scene/tb06.cpp
+++ b/engines/bladerunner/script/scene/tb06.cpp
@@ -159,10 +159,10 @@ bool SceneScriptTB06::ClickedOn2DRegion(int region) {
 
 void SceneScriptTB06::SceneFrameAdvanced(int frame) {
 	if (frame == 61) {
-		Sound_Play(150, Random_Query(52, 52), 0, 0, 50);
+		Sound_Play(kSfxLABMISC5, Random_Query(52, 52), 0, 0, 50);
 	}
 	if (frame == 63) {
-		Sound_Play(283, Random_Query(55, 55), 0, 0, 50);
+		Sound_Play(kSfxTBDOOR1,  Random_Query(55, 55), 0, 0, 50);
 	}
 	//return true;
 }
diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp
index 6290ad74ed..b76128dbdf 100644
--- a/engines/bladerunner/script/scene/tb07.cpp
+++ b/engines/bladerunner/script/scene/tb07.cpp
@@ -177,7 +177,7 @@ bool SceneScriptTB07::ClickedOn2DRegion(int region) {
 
 void SceneScriptTB07::SceneFrameAdvanced(int frame) {
 	if (frame == 66) {
-		Ambient_Sounds_Play_Sound(591, 20, 99, 0, 0);
+		Ambient_Sounds_Play_Sound(kSfxLIGHTON, 20, 99, 0, 0);
 	}
 	//return false;
 }
diff --git a/engines/bladerunner/script/scene/ug04.cpp b/engines/bladerunner/script/scene/ug04.cpp
index 83234fb745..288fcec297 100644
--- a/engines/bladerunner/script/scene/ug04.cpp
+++ b/engines/bladerunner/script/scene/ug04.cpp
@@ -123,8 +123,8 @@ bool SceneScriptUG04::ClickedOn2DRegion(int region) {
 }
 
 void SceneScriptUG04::SceneFrameAdvanced(int frame) {
-	if (frame == 1) {
-		Ambient_Sounds_Play_Sound(367, 90, -100, 100, 100);
+	if (frame == 1) { // TODO - Maybe only play this sound when the train shows up
+		Ambient_Sounds_Play_Sound(kSfxSUBWAY1, 90, -100, 100, 100);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ug07.cpp b/engines/bladerunner/script/scene/ug07.cpp
index 7683437b83..8b8a70a5d1 100644
--- a/engines/bladerunner/script/scene/ug07.cpp
+++ b/engines/bladerunner/script/scene/ug07.cpp
@@ -136,13 +136,13 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) {
 				if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredDektora)) {
 					Actor_Says(kActorClovis, 560, 3);
 					Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyUG07BrokenFinger);
-					Sound_Play(561, 100, 0, 0, 50);
+					Sound_Play(kSfxBRKFNGR1, 100, 0, 0, 50);
 					Delay(2000);
 				}
 				if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredLucy)) {
 					Actor_Says(kActorClovis, 570, 3);
 					Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyUG07BrokenFinger);
-					Sound_Play(561, 100, 0, 0, 50);
+					Sound_Play(kSfxBRKFNGR1, 100, 0, 0, 50);
 					Delay(2000);
 				}
 				Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyUG07Released);
diff --git a/engines/bladerunner/script/scene/ug08.cpp b/engines/bladerunner/script/scene/ug08.cpp
index 65e790b7c6..492b3d3998 100644
--- a/engines/bladerunner/script/scene/ug08.cpp
+++ b/engines/bladerunner/script/scene/ug08.cpp
@@ -58,14 +58,14 @@ void SceneScriptUG08::InitializeScene() {
 	Ambient_Sounds_Add_Sound(305, 5,  50, 17, 37, -100, 100, -101, -101, 0, 0);
 
 	if (!Game_Flag_Query(kFlagUG08Entered)) {
-		Game_Flag_Set(kFlagUB08ElevatorUp);
+		Game_Flag_Set(kFlagUG08ElevatorUp);
 		Game_Flag_Set(kFlagUG08Entered);
 	}
 
 	if (Game_Flag_Query(kFlagUG13toUG08)) {
 		Scene_Loop_Start_Special(kSceneLoopModeLoseControl, kUG08LoopElevatorComingUp, false);
 		Scene_Loop_Set_Default(kUG08LoopMainLoopElevator);
-	} else if (Game_Flag_Query(kFlagUB08ElevatorUp)) {
+	} else if (Game_Flag_Query(kFlagUG08ElevatorUp)) {
 		Scene_Loop_Set_Default(kUG08LoopMainLoopElevator);
 	} else {
 		Scene_Loop_Set_Default(kUG08LoopMainNoElevator);
@@ -115,7 +115,7 @@ bool SceneScriptUG08::ClickedOnExit(int exitId) {
 			Player_Loses_Control();
 			Actor_Set_Invisible(kActorMcCoy, true);
 			Game_Flag_Set(kFlagUG08toUG13);
-			Game_Flag_Reset(kFlagUB08ElevatorUp);
+			Game_Flag_Reset(kFlagUG08ElevatorUp);
 			Set_Enter(kSetUG13, kSceneUG13);
 			Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kUG08LoopElevatorGoingDown, false);
 			return false;
@@ -130,7 +130,7 @@ bool SceneScriptUG08::ClickedOn2DRegion(int region) {
 
 void SceneScriptUG08::SceneFrameAdvanced(int frame) {
 	if (frame == 91) {
-		Ambient_Sounds_Play_Sound(372, 90, 0, 0, 100);
+		Ambient_Sounds_Play_Sound(kSfxCARGELE2, 90, 0, 0, 100);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp
index 335d71570d..373c2b8038 100644
--- a/engines/bladerunner/script/scene/ug10.cpp
+++ b/engines/bladerunner/script/scene/ug10.cpp
@@ -201,22 +201,22 @@ bool SceneScriptUG10::ClickedOn2DRegion(int region) {
 
 void SceneScriptUG10::SceneFrameAdvanced(int frame) {
 	if (frame == 121) {
-		Ambient_Sounds_Play_Sound(558, 90, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxUGLEVER1, 90, 0, 0, 99);
 	}
 	if (frame == 127) {
-		Ambient_Sounds_Play_Sound(353, 90, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxMAGMOVE2, 90, 0, 0, 99);
 	}
 	if (frame == 147) {
-		Ambient_Sounds_Play_Sound(353, 90, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxMAGMOVE2, 90, 0, 0, 99);
 	}
 	if (frame == 1) {
-		Ambient_Sounds_Play_Sound(558, 90, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxUGLEVER1, 90, 0, 0, 99);
 	}
 	if (frame == 3) {
-		Ambient_Sounds_Play_Sound(353, 90, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxMAGMOVE2, 90, 0, 0, 99);
 	}
 	if (frame == 23) {
-		Ambient_Sounds_Play_Sound(353, 90, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxMAGMOVE2, 90, 0, 0, 99);
 	}
 	if (frame == 58 || frame == 179) {
 		Player_Gains_Control();
diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp
index b0a0f8ae87..7d10a9845b 100644
--- a/engines/bladerunner/script/scene/ug13.cpp
+++ b/engines/bladerunner/script/scene/ug13.cpp
@@ -40,20 +40,20 @@ void SceneScriptUG13::InitializeScene() {
 #endif // BLADERUNNER_ORIGINAL_BUGS
 	}
 
-	if (!Game_Flag_Query(kFlagUB08ElevatorUp)) {
+	if (!Game_Flag_Query(kFlagUG08ElevatorUp)) {
 		Scene_Exit_Add_2D_Exit(0, 394, 205, 464, 281, 0);
 	}
 	Scene_Exit_Add_2D_Exit(1, 560, 90, 639, 368, 1);
 	Scene_Exit_Add_2D_Exit(2, 108, 85, 175, 210, 3);
 
-	Ambient_Sounds_Add_Looping_Sound(331, 15, 0, 1);
-	Ambient_Sounds_Add_Looping_Sound(332, 40, 0, 1);
-	Ambient_Sounds_Add_Looping_Sound(333, 40, 0, 1);
-	Ambient_Sounds_Add_Sound(401, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
-	Ambient_Sounds_Add_Sound(402, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
-	Ambient_Sounds_Add_Sound(369, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
-	Ambient_Sounds_Add_Sound(397, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
-	Ambient_Sounds_Add_Sound(398, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
+	Ambient_Sounds_Add_Looping_Sound(kSfxSTMLOOP7, 15, 0, 1);
+	Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1,   40, 0, 1);
+	Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2,   40, 0, 1);
+	Ambient_Sounds_Add_Sound(kSfxYELL1M2,  2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxYELL1M3,  2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxGRUNT1M1, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxGRUNT2M2, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxGRUNT2M3, 2, 120, 11, 12, -100, 100, -100, 100, 0, 0);
 
 	if ( Global_Variable_Query(kVariableChapter) == 4
 	 && !Game_Flag_Query(kFlagCT04HomelessKilledByMcCoy)
@@ -68,7 +68,7 @@ void SceneScriptUG13::InitializeScene() {
 	if (Game_Flag_Query(kFlagUG08toUG13)) {
 		Scene_Loop_Start_Special(0, 0, 0);
 		Scene_Loop_Set_Default(1);
-	} else if (Game_Flag_Query(kFlagUB08ElevatorUp)) {
+	} else if (Game_Flag_Query(kFlagUG08ElevatorUp)) {
 		Scene_Loop_Set_Default(4);
 	} else {
 		Scene_Loop_Set_Default(1);
@@ -104,22 +104,22 @@ bool SceneScriptUG13::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BOLLARD", objectName)) {
 		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 7.0f, 44.0f, -695.0f, 0, true, false, 0)) {
 			Actor_Face_Object(kActorMcCoy, "BOLLARD", true);
-			if (Game_Flag_Query(kFlagUB08ElevatorUp)) {
+			if (Game_Flag_Query(kFlagUG08ElevatorUp)) {
 				Scene_Loop_Set_Default(1);
 #if BLADERUNNER_ORIGINAL_BUGS
 #else
 				// start elevator sound, but wait a bit before starting the special loop
-				Ambient_Sounds_Play_Sound(372, 90, 0, 0, 100);
+				Ambient_Sounds_Play_Sound(kSfxCARGELE2, 90, 0, 0, 100);
 				Delay(1500);
 #endif // BLADERUNNER_ORIGINAL_BUGS
 				Scene_Loop_Start_Special(kSceneLoopModeOnce, 0, false);
-				Game_Flag_Reset(kFlagUB08ElevatorUp);
+				Game_Flag_Reset(kFlagUG08ElevatorUp);
 				Game_Flag_Set(kFlagUG13CallElevator);
 				return true;
 			} else {
 				Scene_Loop_Set_Default(4);
 				Scene_Loop_Start_Special(kSceneLoopModeOnce, 3, false);
-				Game_Flag_Set(kFlagUB08ElevatorUp);
+				Game_Flag_Set(kFlagUG08ElevatorUp);
 				Scene_Exit_Remove(0);
 				return true;
 			}
@@ -195,7 +195,7 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) {
 		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, 54.63f, -883.0f, 0, true, false, 0)) {
 			Player_Loses_Control();
 			Game_Flag_Set(kFlagUG13toUG08);
-			Game_Flag_Set(kFlagUB08ElevatorUp);
+			Game_Flag_Set(kFlagUG08ElevatorUp);
 			Set_Enter(kSetUG08, kSceneUG08);
 			Scene_Loop_Start_Special(kSceneLoopModeChangeSet, 3, false);
 		}
@@ -237,7 +237,7 @@ bool SceneScriptUG13::ClickedOn2DRegion(int region) {
 
 void SceneScriptUG13::SceneFrameAdvanced(int frame) {
 	if (frame == 94) {
-		Ambient_Sounds_Play_Sound(372, 90, 0, 0, 100);
+		Ambient_Sounds_Play_Sound(kSfxCARGELE2, 90, 0, 0, 100);
 	}
 
 	if (Game_Flag_Query(kFlagUG13CallElevator)
@@ -306,11 +306,11 @@ void SceneScriptUG13::PlayerWalkedOut() {
 	Actor_Set_Invisible(kActorMcCoy, false);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	if (Game_Flag_Query(kFlagUG13toUG08)) {
-		Ambient_Sounds_Remove_Sound(401, false);
-		Ambient_Sounds_Remove_Sound(402, false);
-		Ambient_Sounds_Remove_Sound(369, false);
-		Ambient_Sounds_Remove_Sound(397, false);
-		Ambient_Sounds_Remove_Sound(398, false);
+		Ambient_Sounds_Remove_Sound(kSfxYELL1M2,  false);
+		Ambient_Sounds_Remove_Sound(kSfxYELL1M3,  false);
+		Ambient_Sounds_Remove_Sound(kSfxGRUNT1M1, false);
+		Ambient_Sounds_Remove_Sound(kSfxGRUNT2M2, false);
+		Ambient_Sounds_Remove_Sound(kSfxGRUNT2M3, false);
 	} else {
 		Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 	}
diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp
index 436c6f2b79..fc60598d2e 100644
--- a/engines/bladerunner/script/scene/ug15.cpp
+++ b/engines/bladerunner/script/scene/ug15.cpp
@@ -177,7 +177,7 @@ void SceneScriptUG15::SceneFrameAdvanced(int frame) {
 	}
 
 	if (frame == 61) {
-		Ambient_Sounds_Play_Sound(583, 80, 0, 0, 99);
+		Ambient_Sounds_Play_Sound(kSfxPLANKDWN, 80, 0, 0, 99);
 	}
 
 	if ( Game_Flag_Query(kFlagUG15BridgeWillBreak)
diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp
index ff14e4bb0e..a00aae36df 100644
--- a/engines/bladerunner/script/scene/ug16.cpp
+++ b/engines/bladerunner/script/scene/ug16.cpp
@@ -40,9 +40,9 @@ void SceneScriptUG16::InitializeScene() {
 	Scene_Exit_Add_2D_Exit(1, 375, 166, 407, 251, 3);
 	Scene_Exit_Add_2D_Exit(2, 461, 148, 523, 248, 0);
 
-	Ambient_Sounds_Add_Looping_Sound(516, 33, 81, 0);
-	Ambient_Sounds_Add_Looping_Sound(332, 40,  0, 1);
-	Ambient_Sounds_Add_Looping_Sound(333, 40,  0, 1);
+	Ambient_Sounds_Add_Looping_Sound(kSfxELECLAB1, 33, 81, 0);
+	Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1,   40,  0, 1);
+	Ambient_Sounds_Add_Looping_Sound(kSfxUGBED2,   40,  0, 1);
 
 	if (Game_Flag_Query(kFlagUG16ComputerOff)) {
 		Scene_Loop_Set_Default(5);
@@ -88,7 +88,7 @@ bool SceneScriptUG16::ClickedOn3DObject(const char *objectName, bool a2) {
 				Delay(1000);
 				Actor_Voice_Over(3480, kActorVoiceOver);
 				Actor_Change_Animation_Mode(kActorMcCoy, 38);
-				Sound_Play(339, 100, 0, 0, 50);
+				Sound_Play(kSfxDRAWER1, 100, 0, 0, 50);
 				Delay(1000);
 				Item_Pickup_Spin_Effect(948, 460, 287);
 				Actor_Voice_Over(2740, kActorVoiceOver);
@@ -185,7 +185,7 @@ bool SceneScriptUG16::ClickedOn2DRegion(int region) {
 
 void SceneScriptUG16::SceneFrameAdvanced(int frame) {
 	if (frame == 132) {
-		Ambient_Sounds_Remove_Looping_Sound(516, true);
+		Ambient_Sounds_Remove_Looping_Sound(kSfxELECLAB1, true);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp
index 292062a589..3b9d7c0d89 100644
--- a/engines/bladerunner/script/scene/ug18.cpp
+++ b/engines/bladerunner/script/scene/ug18.cpp
@@ -30,32 +30,32 @@ void SceneScriptUG18::InitializeScene() {
 
 	Scene_Exit_Add_2D_Exit(0, 0, 158, 100, 340, 3);
 
-	Ambient_Sounds_Add_Looping_Sound(105, 71, 0, 1);
-	Ambient_Sounds_Add_Looping_Sound( 95, 45, 0, 1);
-	Ambient_Sounds_Add_Looping_Sound(332, 76, 0, 1);
-	Ambient_Sounds_Add_Sound(291, 2,  20, 25, 33, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(292, 2,  20, 25, 33, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(293, 2,  20, 25, 33, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(294, 2,  20, 25, 33, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(402, 2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(368, 2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(369, 2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(397, 2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(398, 2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(295, 2,  20, 25, 25, -100, 100, -100,  100, 0, 0);
-	Ambient_Sounds_Add_Sound(303, 5,  50, 47, 57, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(304, 5,  50, 47, 57, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(305, 5,  50, 47, 57, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(  1, 5,  50, 47, 57, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound( 57, 5,  50, 17, 37, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound( 58, 5,  50, 17, 37, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(306, 5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(307, 5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(308, 5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(196, 5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(197, 5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(198, 5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(199, 5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Looping_Sound(kSfxCTRUNOFF, 71, 0, 1);
+	Ambient_Sounds_Add_Looping_Sound(kSfxBOILPOT2, 45, 0, 1);
+	Ambient_Sounds_Add_Looping_Sound(kSfxUGBED1,   76, 0, 1);
+	Ambient_Sounds_Add_Sound(kSfxBBDRIP1,  2,  20, 25, 33, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBDRIP2,  2,  20, 25, 33, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBDRIP3,  2,  20, 25, 33, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBDRIP4,  2,  20, 25, 33, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxYELL1M3,  2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxYELL1M1,  2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxGRUNT1M1, 2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxGRUNT2M2, 2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxGRUNT2M3, 2, 120, 11, 12, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBDRIP5,  2,  20, 25, 25, -100, 100, -100,  100, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBGRN1,   5,  50, 47, 57, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBGRN2,   5,  50, 47, 57, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBGRN3,   5,  50, 47, 57, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSTEAM1,   5,  50, 47, 57, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSTEAM3,   5,  50, 17, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxSTEAM6A,  5,  50, 17, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBMOVE1,  5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBMOVE2,  5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxBBMOVE3,  5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxZUBWLK1,  5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxZUBWLK2,  5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxZUBWLK3,  5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(kSfxZUBWLK4,  5,  50, 27, 37, -100, 100, -101, -101, 0, 0);
 
 	Scene_Loop_Set_Default(4);
 
@@ -199,7 +199,7 @@ void SceneScriptUG18::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 		case 305:
 			Actor_Change_Animation_Mode(kActorSadik, kAnimationModeCombatAttack);
-			Sound_Play(12, 100, 0, 0, 50);
+			Sound_Play(kSfxLGCAL1, 100, 0, 0, 50);
 			Actor_Force_Stop_Walking(kActorMcCoy);
 			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
 			Player_Loses_Control();
@@ -231,7 +231,7 @@ void SceneScriptUG18::DialogueQueueFlushed(int a1) {
 	case kGoalGuzzaUG18Target:
 		Actor_Set_Goal_Number(kActorGuzza, kGoalGuzzaUG18WillGetShotBySadik);
 		Actor_Change_Animation_Mode(kActorSadik, kAnimationModeCombatAttack);
-		Sound_Play(14, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL3, 100, 0, 0, 50);
 		Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatHit);
 		ADQ_Add(kActorClovis, 630, 13);
 		Actor_Set_Goal_Number(kActorClovis, kGoalClovisUG18SadikWillShootGuzza);
@@ -240,19 +240,19 @@ void SceneScriptUG18::DialogueQueueFlushed(int a1) {
 	case kGoalGuzzaUG18ShotByMcCoy:
 		// Bug in the game, shot animation is not reset so McCoy looks still while he is shooting
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeCombatAttack);
-		Sound_Play(13, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL2, 100, 0, 0, 50);
 		Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatHit);
 		Delay(900);
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeCombatAttack);
-		Sound_Play(14, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL3, 100, 0, 0, 50);
 		Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatHit);
 		Delay(1100);
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeCombatAttack);
-		Sound_Play(12, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL1, 100, 0, 0, 50);
 		Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatHit);
 		Delay(900);
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeCombatAttack);
-		Sound_Play(14, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL3, 100, 0, 0, 50);
 		Actor_Change_Animation_Mode(kActorGuzza, 61);
 		Overlay_Play("UG18over", 1, false, true, 0);
 		Actor_Set_Goal_Number(kActorGuzza, kGoalGuzzaUG18FallDown);
@@ -268,7 +268,7 @@ void SceneScriptUG18::DialogueQueueFlushed(int a1) {
 
 	case kGoalGuzzaUG18ShootMcCoy:
 		Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatAttack);
-		Sound_Play(13, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL2, 100, 0, 0, 50);
 		Actor_Force_Stop_Walking(kActorMcCoy);
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
 		Player_Loses_Control();
@@ -280,7 +280,7 @@ void SceneScriptUG18::DialogueQueueFlushed(int a1) {
 	switch (Actor_Query_Goal_Number(kActorClovis)) {
 	case kGoalClovisUG18SadikWillShootGuzza:
 		Actor_Change_Animation_Mode(kActorSadik, kAnimationModeCombatAttack);
-		Sound_Play(14, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL3, 100, 0, 0, 50);
 		Actor_Change_Animation_Mode(kActorGuzza, kAnimationModeCombatHit);
 		ADQ_Add(kActorClovis, 640, 13);
 		ADQ_Add(kActorGuzza, 1210, 13);
@@ -289,7 +289,7 @@ void SceneScriptUG18::DialogueQueueFlushed(int a1) {
 
 	case kGoalClovisUG18SadikIsShootingGuzza:
 		Actor_Change_Animation_Mode(kActorSadik, kAnimationModeCombatAttack);
-		Sound_Play(14, 100, 0, 0, 50);
+		Sound_Play(kSfxLGCAL3, 100, 0, 0, 50);
 		Actor_Change_Animation_Mode(kActorGuzza, 61);
 		ADQ_Add_Pause(2000);
 		ADQ_Add(kActorClovis, 650, 14);
diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp
index 9242b294c4..9e2454b895 100644
--- a/engines/bladerunner/script/script.cpp
+++ b/engines/bladerunner/script/script.cpp
@@ -333,7 +333,8 @@ void ScriptBase::Actor_Says_With_Pause(int actorId, int sentenceId, float pause,
 	if (_vm->_sitcomMode) {
 		int rnd = Random_Query(1, 100);
 		if (rnd <= actor->getSitcomRatio()) {
-			Sound_Play(Random_Query(319, 327), 40, 0, 0, 50);
+			// Choose one of the nine (9) tracks between kSfxAUDLAFF1 and kSfxAUDLAFF9
+			Sound_Play(Random_Query(kSfxAUDLAFF1, kSfxAUDLAFF9), 40, 0, 0, 50);
 		}
 	}
 
diff --git a/engines/bladerunner/settings.cpp b/engines/bladerunner/settings.cpp
index 6c3e5a7e33..f86536e572 100644
--- a/engines/bladerunner/settings.cpp
+++ b/engines/bladerunner/settings.cpp
@@ -148,6 +148,10 @@ bool Settings::openNewScene() {
 	return true;
 }
 
+int Settings::getAmmoTypesCount() {
+	return kAmmoTypesCount;
+}
+
 int Settings::getAmmoType() const {
 	return _ammoType;
 }
@@ -220,7 +224,7 @@ void Settings::save(SaveFileWriteStream &f) {
 	f.writeInt(_unk0);
 	f.writeInt(_difficulty);
 	f.writeInt(_ammoType);
-	for (int i = 0; i != 3; ++i) {
+	for (int i = 0; i != kAmmoTypesCount; ++i) {
 		f.writeInt(_ammoAmounts[i]);
 	}
 }
@@ -233,7 +237,7 @@ void Settings::load(SaveFileReadStream &f) {
 	_unk0 = f.readInt();
 	_difficulty = f.readInt();
 	_ammoType = f.readInt();
-	for (int i = 0; i != 3; ++i) {
+	for (int i = 0; i != kAmmoTypesCount; ++i) {
 		_ammoAmounts[i] = f.readInt();
 	}
 }
diff --git a/engines/bladerunner/settings.h b/engines/bladerunner/settings.h
index 393c11d053..5fe7cebb60 100644
--- a/engines/bladerunner/settings.h
+++ b/engines/bladerunner/settings.h
@@ -30,6 +30,8 @@ class SaveFileReadStream;
 class SaveFileWriteStream;
 
 class Settings {
+	static const int kAmmoTypesCount = 3;
+
 	BladeRunnerEngine *_vm;
 
 	int   _chapter;
@@ -55,7 +57,7 @@ class Settings {
 	int   _playerAgenda;
 
 	int   _ammoType;
-	int   _ammoAmounts[3];
+	int   _ammoAmounts[kAmmoTypesCount];
 
 	bool  _learyMode;
 
@@ -117,6 +119,7 @@ public:
 
 	bool openNewScene();
 
+	static int getAmmoTypesCount();
 	int getAmmoType() const;
 	void setAmmoType(int ammoType);
 	int getAmmo(int ammoType) const;
diff --git a/engines/bladerunner/ui/elevator.cpp b/engines/bladerunner/ui/elevator.cpp
index 9baca0f3f4..2f7d7e1dff 100644
--- a/engines/bladerunner/ui/elevator.cpp
+++ b/engines/bladerunner/ui/elevator.cpp
@@ -313,7 +313,7 @@ void Elevator::mouseOutCallback(int, void *self) {
 
 void Elevator::mouseDownCallback(int, void *self) {
 	Elevator *elevator = ((Elevator *)self);
-	elevator->_vm->_audioPlayer->playAud(elevator->_vm->_gameInfo->getSfxTrack(515), 100, 0, 0, 50, 0);
+	elevator->_vm->_audioPlayer->playAud(elevator->_vm->_gameInfo->getSfxTrack(kSfxELEBUTN1), 100, 0, 0, 50, 0);
 }
 
 void Elevator::mouseUpCallback(int buttonId, void *self) {
diff --git a/engines/bladerunner/ui/esper.cpp b/engines/bladerunner/ui/esper.cpp
index 472e726fdb..641415472d 100644
--- a/engines/bladerunner/ui/esper.cpp
+++ b/engines/bladerunner/ui/esper.cpp
@@ -128,7 +128,7 @@ void ESPER::close() {
 	delete _script;
 	_script = nullptr;
 
-	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(424), 25, 0, 0, 50, 0);
+	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBR035_7B), 25, 0, 0, 50, 0);
 
 	unloadPhotos();
 	_shapesPhotos.clear();
@@ -193,7 +193,7 @@ void ESPER::handleMouseDown(int x, int y, bool mainButton) {
 		if (_statePhoto != kEsperPhotoStateVideoZoomOut) {
 			if (_screen.contains(x, y)) {
 				_isMouseDown = true;
-				playSound(460, 100);
+				playSound(kSfxBRTARGET, 100);
 			}
 			if (_mouseOverScroll >= 0 && _mouseOverScroll <= 3 && !_isScrolling) {
 				scrollingStart(_mouseOverScroll);
@@ -270,7 +270,7 @@ void ESPER::addPhoto(const char *name, int photoId, int shapeId) {
 			_shapesPhotos[shapeId],
 			nullptr);
 	}
-	playSound(420, 25);
+	playSound(kSfxBR028_2A, 25);
 	wait(300);
 	tick();
 }
@@ -493,9 +493,9 @@ void ESPER::activate(bool withOpening) {
 
 	if (withOpening) {
 		setStateMain(kEsperMainStateOpening);
-		playSound(413, 25);
+		playSound(kSfxBR025_5A, 25);
 		wait(1000);
-		playSound(414, 25);
+		playSound(kSfxBR027_1P, 25);
 		wait(2000);
 	} else {
 		_buttons->deactivate();
@@ -505,7 +505,7 @@ void ESPER::activate(bool withOpening) {
 	_buttons->activate(nullptr, nullptr, mouseDownCallback, mouseUpCallback, this);
 	_buttons->defineImage(kPhotoCount + 3, Common::Rect(42, 403, 76, 437), nullptr, nullptr, _shapeButton, nullptr);
 
-	playSound(415, 25);
+	playSound(kSfxBR024_4B, 25);
 	wait(1000);
 
 	setStateMain(kEsperMainStateList);
@@ -608,7 +608,7 @@ void ESPER::draw(Graphics::Surface &surface) {
 			drawPhotoWithGrid(surface);
 			if (!drawSelectionZooming(surface)) {
 				setStatePhoto(kEsperPhotoStateSelectionBlinking);
-				playSound(418, 25);
+				playSound(kSfxBR030_3A, 25);
 			}
 			break;
 		case kEsperPhotoStateSelectionBlinking:
@@ -701,7 +701,7 @@ bool ESPER::drawSelectionZooming(Graphics::Surface &surface) {
 		zooming = false;
 	}
 	if (zooming) {
-		playSound(416, 20);
+		playSound(kSfxBR029_3A, 20);
 	}
 	return needMoreZooming;
 }
@@ -880,7 +880,7 @@ void ESPER::drawVideoZooming(Graphics::Surface &surface) {
 	int timeNow = _vm->_time->current();
 	if (timeNow > _timeZoomNext) {
 		_timeZoomNext = timeNow + 300;
-		playSound(419, 25);
+		playSound(kSfxBR031_1P, 25);
 		flash = true;
 		advanceFrame = true;
 		_blur += _zoomDelta * 5.0f;
@@ -906,7 +906,7 @@ void ESPER::drawVideoZoomOut(Graphics::Surface &surface) {
 	int timeNow = _vm->_time->current();
 	if (timeNow > _timeZoomNext && _vqaLastFrame > 0) {
 		_timeZoomNext = timeNow + 300;
-		playSound(419, 25);
+		playSound(kSfxBR031_1P, 25);
 		_vqaPlayerPhoto->seekToFrame(_vqaLastFrame);
 		int nextFrame = _vqaPlayerPhoto->getFrameCount() / 4;
 		if (nextFrame <= 0) {
@@ -1134,7 +1134,7 @@ void ESPER::flashViewport() {
 
 void ESPER::copyImageScale(Graphics::Surface *src, Common::Rect srcRect, Graphics::Surface *dst, Common::Rect dstRect) {
 	if (_flash) {
-		playSound(419, 25);
+		playSound(kSfxBR031_1P, 25);
 	}
 
 	int srcDstWidthRatio  = srcRect.width()  / dstRect.width();
@@ -1219,7 +1219,7 @@ void ESPER::copyImageScale(Graphics::Surface *src, Common::Rect srcRect, Graphic
 
 void ESPER::copyImageBlur(Graphics::Surface *src, Common::Rect srcRect, Graphics::Surface *dst, Common::Rect dstRect, float blur) {
 	if (_flash) {
-		playSound(419, 25);
+		playSound(kSfxBR031_1P, 25);
 	}
 
 	int srcDstWidthRatio  = srcRect.width()  / dstRect.width();
@@ -1456,8 +1456,8 @@ void ESPER::selectPhoto(int photoId) {
 	resetViewport();
 	setStateMain(kEsperMainStatePhotoOpening);
 	setStatePhoto(kEsperPhotoStateOpening);
-	playSound(422, 25);
-	playSound(423, 25);
+	playSound(kSfxBR032_7B, 25);
+	playSound(kSfxBR033_4B, 25);
 }
 
 void ESPER::unloadPhotos() {
diff --git a/engines/bladerunner/ui/kia.cpp b/engines/bladerunner/ui/kia.cpp
index af26851b27..4234f9f648 100644
--- a/engines/bladerunner/ui/kia.cpp
+++ b/engines/bladerunner/ui/kia.cpp
@@ -234,7 +234,7 @@ void KIA::tick() {
 		_playerActorDialogueState = 0;
 	} else if (_playerActorDialogueState == 0) {
 		if (_playerSliceModelId == -1 && _playerPhotographId == -1 && _playerImage.getPixels() == nullptr) {
-			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(495), 70, 0, 0, 50, 0);
+			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBEEP16), 70, 0, 0, 50, 0);
 		}
 		_playerActorDialogueState = 1;
 	} else if (_playerActorDialogueState == 200) {
@@ -272,7 +272,7 @@ void KIA::tick() {
 			if (_playerVqaFrame < 8) {
 				int newVqaFrame  = MIN(timeDiffDiv48 + _playerVqaFrame, 8);
 				if (_playerVqaFrame <= 0 && newVqaFrame > 0) {
-					_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(497), 100, 70, 70, 50, 0);
+					_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxMECHAN1), 100, 70, 70, 50, 0);
 				}
 				_playerVqaFrame = newVqaFrame;
 			}
@@ -280,7 +280,7 @@ void KIA::tick() {
 			if (_playerVqaFrame > 0) {
 				int newVqaFrame = MAX(_playerVqaFrame - timeDiffDiv48, 0);
 				if (_playerVqaFrame >= 8 && newVqaFrame < 8) {
-					_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(496), 100, 70, 70, 50, 0);
+					_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxMECHAN1C), 100, 70, 70, 50, 0);
 				}
 				_playerVqaFrame = newVqaFrame;
 			}
@@ -561,7 +561,7 @@ void KIA::playActorDialogue(int actorId, int sentenceId) {
 
 void KIA::playSliceModel(int sliceModelId) {
 	if (_playerVqaFrame == 8) {
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(502), 70, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBEEP1), 70, 0, 0, 50, 0);
 	}
 	_playerSliceModelId = sliceModelId;
 }
@@ -572,7 +572,7 @@ void KIA::playPhotograph(int photographId) {
 		_playerPhotograph = nullptr;
 	}
 	if (_playerVqaFrame == 8) {
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(502), 70, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBEEP1), 70, 0, 0, 50, 0);
 	}
 	_playerPhotographId = photographId;
 	_playerPhotograph = new Shape(_vm);
@@ -588,7 +588,7 @@ void KIA::mouseDownCallback(int buttonId, void *callbackData) {
 	switch (buttonId) {
 	case 0:
 	case 6:
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(503), 100, -65, -65, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN4P), 100, -65, -65, 50, 0);
 		break;
 	case 1:
 	case 2:
@@ -603,13 +603,13 @@ void KIA::mouseDownCallback(int buttonId, void *callbackData) {
 	case 12:
 	case 13:
 	case 14:
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(505), 70, 0, 0, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN5P), 70, 0, 0, 50, 0);
 		if (buttonId == 12){
-			self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(596), 70, 0, 0, 50, 0);
+			self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxSHUTDOWN), 70, 0, 0, 50, 0);
 		}
 		break;
 	case 15:
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(503), 70, 0, 0, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN4P), 70, 0, 0, 50, 0);
 		break;
 	default:
 		break;
@@ -621,7 +621,7 @@ void KIA::mouseUpCallback(int buttonId, void *callbackData) {
 	switch (buttonId) {
 	case 0:
 	case 6:
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(504), 100, -65, -65, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN4R), 100, -65, -65, 50, 0);
 		break;
 	case 1:
 	case 2:
@@ -636,10 +636,10 @@ void KIA::mouseUpCallback(int buttonId, void *callbackData) {
 	case 12:
 	case 13:
 	case 14:
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(506), 70, 0, 0, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN5R), 70, 0, 0, 50, 0);
 		break;
 	case 15:
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(504), 100, 0, 0, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN4R), 100, 0, 0, 50, 0);
 		break;
 	default:
 		break;
@@ -679,7 +679,7 @@ void KIA::init() {
 		_playerVqaPlayer->open();
 		_playerVqaPlayer->setLoop(0, -1, kLoopSetModeJustStart, nullptr, nullptr);
 	}
-	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(501), 70, 0, 0, 50, 0);
+	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxELECTRO1), 70, 0, 0, 50, 0);
 
 	_vm->_time->pause();
 }
@@ -1256,13 +1256,13 @@ void KIA::playTransitionSound(int transitionId) {
 	case 10:
 	case 11:
 	case 12:
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(498), 100, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxPANEL1),  100, 0, 0, 50, 0);
 		break;
 	case 13:
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(499), 100, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxPANEL2),  100, 0, 0, 50, 0);
 		break;
 	case 14:
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(500), 100, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxPANOPEN), 100, 0, 0, 50, 0);
 		break;
 	}
 }
diff --git a/engines/bladerunner/ui/kia_section_clues.cpp b/engines/bladerunner/ui/kia_section_clues.cpp
index 0157d72c48..495458f7cd 100644
--- a/engines/bladerunner/ui/kia_section_clues.cpp
+++ b/engines/bladerunner/ui/kia_section_clues.cpp
@@ -210,7 +210,7 @@ void KIASectionClues::scrollBoxCallback(void *callbackData, void *source, int li
 	} else if (source == self->_cluesScrollBox && lineData >= 0) {
 		if (mouseButton) {
 			if (self->_vm->_gameFlags->query(kFlagKIAPrivacyAddon)) {
-				self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(511), 70, 0, 0, 50, 0);
+				self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBEEP15), 70, 0, 0, 50, 0);
 
 				if (self->_clues->isPrivate(lineData)) {
 					self->_clues->setPrivate(lineData, false);
@@ -232,7 +232,7 @@ void KIASectionClues::mouseUpCallback(int buttonId, void *callbackData) {
 	KIASectionClues *self = (KIASectionClues *)callbackData;
 
 	if (buttonId <= 1) {
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(510), 100, 0, 0, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBEEP10A), 100, 0, 0, 50, 0);
 	}
 
 	self->onButtonPressed(buttonId);
diff --git a/engines/bladerunner/ui/kia_section_crimes.cpp b/engines/bladerunner/ui/kia_section_crimes.cpp
index 3d82056a3b..f3452a8d3f 100644
--- a/engines/bladerunner/ui/kia_section_crimes.cpp
+++ b/engines/bladerunner/ui/kia_section_crimes.cpp
@@ -240,7 +240,7 @@ void KIASectionCrimes::scrollBoxCallback(void *callbackData, void *source, int l
 	if (source == self->_cluesScrollBox && lineData >= 0) {
 		if (mouseButton) {
 			if (self->_vm->_gameFlags->query(kFlagKIAPrivacyAddon)) {
-				self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(511), 70, 0, 0, 50, 0);
+				self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBEEP15), 70, 0, 0, 50, 0);
 
 				if (self->_clues->isPrivate(lineData)) {
 					self->_clues->setPrivate(lineData, false);
diff --git a/engines/bladerunner/ui/kia_section_load.cpp b/engines/bladerunner/ui/kia_section_load.cpp
index 62facbde39..dac7bebb64 100644
--- a/engines/bladerunner/ui/kia_section_load.cpp
+++ b/engines/bladerunner/ui/kia_section_load.cpp
@@ -28,6 +28,7 @@
 #include "bladerunner/savefile.h"
 #include "bladerunner/text_resource.h"
 #include "bladerunner/time.h"
+#include "bladerunner/game_constants.h"
 #include "bladerunner/ui/kia.h"
 #include "bladerunner/ui/kia_shapes.h"
 #include "bladerunner/ui/ui_container.h"
@@ -170,7 +171,7 @@ void KIASectionLoad::scrollBoxCallback(void *callbackData, void *source, int lin
 			self->_vm->loadGameState(self->_saveList[lineData].getSaveSlot());
 		}
 
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(513), 90, 0, 0, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxELECBP1), 90, 0, 0, 50, 0);
 		self->_vm->_kia->resume();
 		self->_scheduledSwitch = true;
 	}
diff --git a/engines/bladerunner/ui/kia_section_pogo.cpp b/engines/bladerunner/ui/kia_section_pogo.cpp
index 037cea957c..4388c0f849 100644
--- a/engines/bladerunner/ui/kia_section_pogo.cpp
+++ b/engines/bladerunner/ui/kia_section_pogo.cpp
@@ -28,6 +28,7 @@
 #include "bladerunner/game_info.h"
 #include "bladerunner/text_resource.h"
 #include "bladerunner/time.h"
+#include "bladerunner/game_constants.h"
 
 namespace BladeRunner {
 
@@ -228,7 +229,7 @@ void KIASectionPogo::open() {
 
 	_timeLast = _vm->_time->currentSystem();
 
-	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(319), 100, 0, 0, 50, 0);
+	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxAUDLAFF1), 100, 0, 0, 50, 0);
 }
 
 void KIASectionPogo::draw(Graphics::Surface &surface) {
diff --git a/engines/bladerunner/ui/kia_section_save.cpp b/engines/bladerunner/ui/kia_section_save.cpp
index 26e666ac5e..b8fcd2e62d 100644
--- a/engines/bladerunner/ui/kia_section_save.cpp
+++ b/engines/bladerunner/ui/kia_section_save.cpp
@@ -29,6 +29,7 @@
 #include "bladerunner/savefile.h"
 #include "bladerunner/text_resource.h"
 #include "bladerunner/time.h"
+#include "bladerunner/game_constants.h"
 #include "bladerunner/ui/kia.h"
 #include "bladerunner/ui/kia_shapes.h"
 #include "bladerunner/ui/ui_container.h"
@@ -299,7 +300,7 @@ void KIASectionSave::scrollBoxCallback(void *callbackData, void *source, int lin
 			self->_inputBox->setText(self->_saveList[self->_selectedLineId].getDescription());
 		}
 
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(131), 40, 0, 0, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxSPNBEEP3), 40, 0, 0, 50, 0);
 		self->_vm->_kia->resume();
 	}
 }
@@ -329,7 +330,7 @@ void KIASectionSave::onButtonPressed(int buttonId, void *callbackData) {
 		}
 	} else if (buttonId == 1) {
 		self->changeState(kStateNormal);
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(134), 90, -50, -50, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxSPNBEEP6), 90, -50, -50, 50, 0);
 	} else if (buttonId == 2) {
 		if (self->_state == kStateOverwrite)
 		{
@@ -372,7 +373,7 @@ void KIASectionSave::changeState(State state) {
 			_vm->_kia->_shapes->get(131),
 			_vm->_textOptions->getText(39) // Yes
 		);
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(135), 90, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxSPNBEEP7), 90, 0, 0, 50, 0);
 	}
 }
 
@@ -415,7 +416,7 @@ void KIASectionSave::save() {
 
 	delete saveFile;
 
-	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(513), 90, 0, 0, 50, 0);
+	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxELECBP1), 90, 0, 0, 50, 0);
 
 	_scheduledSwitch = true;
 }
diff --git a/engines/bladerunner/ui/kia_section_settings.cpp b/engines/bladerunner/ui/kia_section_settings.cpp
index a2908ad581..288e0b48a3 100644
--- a/engines/bladerunner/ui/kia_section_settings.cpp
+++ b/engines/bladerunner/ui/kia_section_settings.cpp
@@ -320,7 +320,7 @@ void KIASectionSettings::checkBoxCallback(void *callbackData, void *source) {
 
 void KIASectionSettings::mouseInCallback(int buttonId, void *callbackData) {
 	KIASectionSettings *self = (KIASectionSettings *)callbackData;
-	self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(508), 100, 0, 0, 50, 0);
+	self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxTEXT3), 100, 0, 0, 50, 0);
 }
 
 void KIASectionSettings::mouseUpCallback(int buttonId, void *callbackData) {
@@ -331,27 +331,27 @@ void KIASectionSettings::mouseUpCallback(int buttonId, void *callbackData) {
 void KIASectionSettings::onButtonPressed(int buttonId) {
 	switch (buttonId) {
 	case 0:
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(513), 90, -30, -30, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxELECBP1), 90, -30, -30, 50, 0);
 		_vm->_settings->setPlayerAgenda(0);
 		initConversationChoices();
 		break;
 	case 1:
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(513), 90, -15, -15, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxELECBP1), 90, -15, -15, 50, 0);
 		_vm->_settings->setPlayerAgenda(1);
 		initConversationChoices();
 		break;
 	case 2:
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(513), 90, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxELECBP1), 90, 0, 0, 50, 0);
 		_vm->_settings->setPlayerAgenda(2);
 		initConversationChoices();
 		break;
 	case 3:
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(513), 90, 15, 15, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxELECBP1), 90, 15, 15, 50, 0);
 		_vm->_settings->setPlayerAgenda(3);
 		initConversationChoices();
 		break;
 	case 4:
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(513), 90, 30, 30, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxELECBP1), 90, 30, 30, 50, 0);
 		_vm->_settings->setPlayerAgenda(4);
 		initConversationChoices();
 		break;
diff --git a/engines/bladerunner/ui/kia_section_suspects.cpp b/engines/bladerunner/ui/kia_section_suspects.cpp
index 26bd87547b..bf397321fd 100644
--- a/engines/bladerunner/ui/kia_section_suspects.cpp
+++ b/engines/bladerunner/ui/kia_section_suspects.cpp
@@ -317,7 +317,7 @@ void KIASectionSuspects::scrollBoxCallback(void *callbackData, void *source, int
 	if (source == self->_cluesScrollBox && lineData >= 0) {
 		if (mouseButton) {
 			if (self->_vm->_gameFlags->query(kFlagKIAPrivacyAddon)) {
-				self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(511), 70, 0, 0, 50, 0);
+				self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBEEP15), 70, 0, 0, 50, 0);
 
 				if (self->_clues->isPrivate(lineData)) {
 					self->_clues->setPrivate(lineData, false);
diff --git a/engines/bladerunner/ui/ui_check_box.cpp b/engines/bladerunner/ui/ui_check_box.cpp
index 0e572c287e..76cecd227c 100644
--- a/engines/bladerunner/ui/ui_check_box.cpp
+++ b/engines/bladerunner/ui/ui_check_box.cpp
@@ -26,6 +26,7 @@
 #include "bladerunner/bladerunner.h"
 #include "bladerunner/game_info.h"
 #include "bladerunner/time.h"
+#include "bladerunner/game_constants.h"
 #include "bladerunner/ui/kia.h"
 #include "bladerunner/ui/kia_shapes.h"
 
@@ -113,7 +114,7 @@ void UICheckBox::setChecked(bool isChecked) {
 void UICheckBox::handleMouseMove(int mouseX, int mouseY) {
 	if (_rect.contains(mouseX, mouseY)) {
 		if (!_hasFocus && _isEnabled && !_isPressed ) {
-			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(508), 100, 0, 0, 50, 0);
+			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxTEXT3), 100, 0, 0, 50, 0);
 		}
 		_hasFocus = true;
 	} else {
@@ -128,7 +129,7 @@ void UICheckBox::handleMouseDown(bool alternateButton) {
 			if (_valueChangedCallback) {
 				_valueChangedCallback(_callbackData, this);
 			}
-			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(509), 100, 0, 0, 50, 0);
+			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBEEP10), 100, 0, 0, 50, 0);
 		} else {
 			_isPressed = true;
 		}
diff --git a/engines/bladerunner/ui/ui_scroll_box.cpp b/engines/bladerunner/ui/ui_scroll_box.cpp
index 15b0a59712..5bf96c77fe 100644
--- a/engines/bladerunner/ui/ui_scroll_box.cpp
+++ b/engines/bladerunner/ui/ui_scroll_box.cpp
@@ -28,6 +28,7 @@
 #include "bladerunner/game_info.h"
 #include "bladerunner/shape.h"
 #include "bladerunner/time.h"
+#include "bladerunner/game_constants.h"
 #include "bladerunner/ui/kia.h"
 #include "bladerunner/ui/kia_shapes.h"
 
@@ -172,9 +173,9 @@ void UIScrollBox::handleMouseMove(int mouseX, int mouseY) {
 
 		if (newHoveredLine != _hoveredLine && newHoveredLine >= 0 && newHoveredLine < _lineCount) {
 			if (_lines[newHoveredLine]->lineData >= 0 && _selectedLineState == 0) {
-				int soundId = 507;
+				int soundId = kSfxTEXT1;
 				if (_lines[newHoveredLine]->flags & 0x01 ) {
-					soundId = 508;
+					soundId = kSfxTEXT3;
 				}
 				_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(soundId), 100, 0, 0, 50, 0);
 			}
@@ -268,7 +269,7 @@ void UIScrollBox::handleMouseDown(bool alternateButton) {
 			}
 
 			if (_lines[_selectedLineIndex]->flags & 0x01) {
-				_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(509), 100, 0, 0, 50, 0);
+				_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBEEP10), 100, 0, 0, 50, 0);
 			}
 		}
 	}
diff --git a/engines/bladerunner/ui/ui_slider.cpp b/engines/bladerunner/ui/ui_slider.cpp
index 88d9567639..c008331c82 100644
--- a/engines/bladerunner/ui/ui_slider.cpp
+++ b/engines/bladerunner/ui/ui_slider.cpp
@@ -25,6 +25,7 @@
 #include "bladerunner/audio_player.h"
 #include "bladerunner/bladerunner.h"
 #include "bladerunner/game_info.h"
+#include "bladerunner/game_constants.h"
 
 namespace BladeRunner {
 
@@ -111,7 +112,7 @@ void UISlider::handleMouseMove(int mouseX, int mouseY) {
 	_mouseX = mouseX;
 	if (_rect.contains(mouseX, mouseY)) {
 		if (!_hasFocus && _isEnabled && _pressedStatus == 0) {
-			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(508), 100, 0, 0, 50, 0);
+			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxTEXT3), 100, 0, 0, 50, 0);
 		}
 		_hasFocus = true;
 	} else {
diff --git a/engines/bladerunner/ui/vk.cpp b/engines/bladerunner/ui/vk.cpp
index 6186452ad2..d6055d5133 100644
--- a/engines/bladerunner/ui/vk.cpp
+++ b/engines/bladerunner/ui/vk.cpp
@@ -146,7 +146,7 @@ void VK::close() {
 		_vm->_audioPlayer->stop(_soundTrackId3, false);
 	}
 
-	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(458), 33, 0, 0, 50, 0);
+	_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBR018_1P), 33, 0, 0, 50, 0);
 
 	_script->shutdown(_actorId, _humanProbability, _replicantProbability, _anxiety);
 
@@ -329,11 +329,11 @@ void VK::mouseDownCallback(int buttonId, void *callbackData) {
 	case 3:
 	case 4:
 		if (self->_calibrationStarted) {
-			self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(457), 100, 0, 0, 50, 0);
+			self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN6), 100, 0, 0, 50, 0);
 		}
 		break;
 	case 5:
-		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(457), 100, 0, 0, 50, 0);
+		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxBUTN6), 100, 0, 0, 50, 0);
 		break;
 	default:
 		return;
@@ -482,14 +482,14 @@ void VK::draw() {
 	}
 
 	if (frame == 0) {
-		_soundTrackId2 = _vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(426), 33, 0, 0, 50, 0);
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(431), 50, 0, 0, 50, 0);
+		_soundTrackId2 = _vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBR011_2A), 33, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBR016_2B), 50, 0, 0, 50, 0);
 	} else if (frame == 26) {
 		setAdjustment(158);
 		_vm->_audioPlayer->stop(_soundTrackId2, false);
-		_soundTrackId1 = _vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(429), 50, 30, 30, 50, kAudioPlayerLoop);
+		_soundTrackId1 = _vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBR014_5A), 50, 30, 30, 50, kAudioPlayerLoop);
 	} else if (frame == 40) {
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(428), 33, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBR013_3D), 33, 0, 0, 50, 0);
 		eyeAnimates(1);
 	} else if (frame == 59) {
 		_vm->_mouse->enable();
@@ -505,7 +505,7 @@ void VK::draw() {
 		}
 	} else if (frame == 140) {
 		if (_vm->_rnd.getRandomNumberRng(0, 10) > 6) {
-			_soundTrackId3 = _vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(459), 83, 0, 0, 50, 0);
+			_soundTrackId3 = _vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBR003_1A), 83, 0, 0, 50, 0);
 		}
 	}
 
@@ -528,11 +528,11 @@ void VK::draw() {
 			} else {
 				if (_humanProbability >= 80) {
 					_buttons->setImageShapeUp(6, _shapes[13]);
-					_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(0), 100, 0, 0, 50, 0);
+					_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxCROSLOCK), 100, 0, 0, 50, 0);
 				}
 				if (_replicantProbability >= 80) {
 					_buttons->setImageShapeUp(7, _shapes[14]);
-					_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(0), 100, 0, 0, 50, 0);
+					_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxCROSLOCK), 100, 0, 0, 50, 0);
 				}
 				_blinkState = 1;
 			}
@@ -591,7 +591,7 @@ void VK::draw() {
 				_blinkState = false;
 			} else {
 				_buttons->setImageShapeUp(0, _shapes[2]);
-				_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(461), 50, 0, 0, 50, 0);
+				_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxVKBEEP1), 50, 0, 0, 50, 0);
 				_blinkState = true;
 			}
 			_timeNextBlink = timeNow + 600;
@@ -627,7 +627,7 @@ void VK::draw() {
 				_buttons->setImageShapeUp(4, _shapes[11]);
 				_blinkState = 1;
 
-				_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(462), 33, 0, 0, 50, 0);
+				_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxVKBEEP2), 33, 0, 0, 50, 0);
 			}
 			_timeNextBlink = timeNow + 600;
 		}
@@ -654,7 +654,7 @@ void VK::draw() {
 					_needleValueDelta = 0;
 				}
 			}
-			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(455), 20, 0, 0, 50, 0);
+			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBR027_3P), 20, 0, 0, 50, 0);
 			_timeNextNeedleStep = timeNow + 66;
 		}
 
@@ -790,7 +790,7 @@ void VK::drawReplicantGauge(Graphics::Surface &surface) {
 
 void VK::calibrate() {
 	if (_calibrationCounter >= 3 || _testStarted) {
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(460), 100, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBRTARGET), 100, 0, 0, 50, 0);
 	} else {
 		_vm->_mouse->disable();
 		_script->calibrate(_actorId);
@@ -834,13 +834,13 @@ void VK::beginTest() {
 		_buttons->setImageShapeUp(4, nullptr);
 		_vm->_mouse->enable();
 	} else {
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(460), 100, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBRTARGET), 100, 0, 0, 50, 0);
 	}
 }
 
 void VK::startAdjustement() {
 	if (_testStarted) {
-		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(460), 100, 0, 0, 50, 0);
+		_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBRTARGET), 100, 0, 0, 50, 0);
 	} else {
 		_isAdjusting = true;
 	}
@@ -872,7 +872,7 @@ void VK::setAdjustmentFromMouse() {
 		_vm->_mouse->getXY(&mouseX, &mouseY);
 		setAdjustment(mouseX);
 		if (_adjustmentTarget != _adjustment) {
-			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(456), 100, 0, 0, 50, 0);
+			_vm->_audioPlayer->playAud(_vm->_gameInfo->getSfxTrack(kSfxBRWIND2), 100, 0, 0, 50, 0);
 		}
 		_adjustmentTarget = _adjustment;
 		_adjustmentDelta = 0;
author	Thanasis Antoniou	2019-04-05 21:33:47 +0300
committer	Thanasis Antoniou	2019-04-05 21:35:55 +0300
commit	a0beaa6f4e925292f3ffaa8045e580cd579d3ed0 (patch)
tree	8debb2e8a7d8d7a58295d939ea8cd8bfe2b3e8e5 /engines/bladerunner
parent	62660da0bc8bdbaa464f8b25ee993f6dfb90aa85 (diff)
download	scummvm-rg350-a0beaa6f4e925292f3ffaa8045e580cd579d3ed0.tar.gz scummvm-rg350-a0beaa6f4e925292f3ffaa8045e580cd579d3ed0.tar.bz2 scummvm-rg350-a0beaa6f4e925292f3ffaa8045e580cd579d3ed0.zip