BLADERUNNER: SFX named constants and MissSound fix

Still pending cleaning up Ambient_Sounds_Add_Sound and Ambient_Sounds_Add_Looping_Sound calls

14 files changed, 76 insertions, 70 deletions

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;