BLADERUNNER: introduced some game constants

Game script are more readable now
Fixed name of Officer Leary

133 files changed, 10417 insertions, 11174 deletions

diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index f783791ba1..fa9e2c3373 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -122,9 +122,9 @@ void Actor::setup(int actorId) {
 	_animationMode = -1;
 	_screenRectangle = Common::Rect(-1, -1, -1, -1);
 
-	_combatAnimationMode = 4;
-	_unknown1 = 7;
-	_unknown2 = 8;
+	_animationModeCombatIdle = kAnimationModeCombatIdle;
+	_animationModeCombatWalk = kAnimationModeCombatWalk;
+	_animationModeCombatRun = kAnimationModeCombatRun;
 
 	int actorCount = (int)_vm->_gameInfo->getActorCount();
 	for (int i = 0; i != actorCount; ++i)
@@ -138,8 +138,9 @@ void Actor::setup(int actorId) {
 }
 
 void Actor::changeAnimationMode(int animationMode, bool force) {
-	if (force)
+	if (force) {
 		_animationMode = -1;
+	}
 
 	if (animationMode != _animationMode) {
 		_vm->_aiScripts->ChangeAnimationMode(_id, animationMode);
@@ -276,7 +277,7 @@ void Actor::movementTrackNext(bool omitAiScript) {
 				delay = 1;
 			}
 			if (delay > 1) {
-				changeAnimationMode(0, false);
+				changeAnimationMode(kAnimationModeIdle, false);
 			}
 			countdownTimerStart(3, delay);
 		}
@@ -321,7 +322,7 @@ void Actor::movementTrackWaypointReached() {
 			if (_vm->_aiScripts->ReachedMovementTrackWaypoint(_id, _movementTrackWalkingToWaypointId)) {
 				seconds = _movementTrackDelayOnNextWaypoint;
 				if (seconds > 1) {
-					changeAnimationMode(0, false);
+					changeAnimationMode(kAnimationModeIdle, false);
 					seconds = _movementTrackDelayOnNextWaypoint; // todo: analyze if movement is changed in some aiscript->ChangeAnimationMode?
 				}
 				countdownTimerStart(3, seconds);
@@ -577,19 +578,19 @@ bool Actor::tick(bool forceDraw, Common::Rect *screenRect) {
 			this->_targetFacing = -1;
 
 			bool walked = _walkInfo->tick(_id, -positionChange.y, false);
+
 			Vector3 pos;
 			int facing;
 			_walkInfo->getCurrentPosition(_id, &pos, &facing);
-
 			setAtXYZ(pos, facing, false, this->_isMoving, false);
 			if (walked) {
-				_vm->_actors[_id]->changeAnimationMode(0);
+				_vm->_actors[_id]->changeAnimationMode(kAnimationModeIdle);
 
 				this->movementTrackWaypointReached();
 				if (this->inCombat()) {
-					this->changeAnimationMode(this->_combatAnimationMode, false);
+					this->changeAnimationMode(this->_animationModeCombatIdle, false);
 				} else {
-					this->changeAnimationMode(0, false);
+					this->changeAnimationMode(kAnimationModeIdle, false);
 				}
 			}
 		} else {
@@ -784,11 +785,11 @@ void Actor::stopWalking(bool value) {
 	}
 
 	if (isWalking()) {
-		_walkInfo->stop(_id, true, _combatAnimationMode, 0);
+		_walkInfo->stop(_id, true, _animationModeCombatIdle, 0);
 	} else if (inCombat()) {
-		changeAnimationMode(_combatAnimationMode, false);
+		changeAnimationMode(_animationModeCombatIdle, false);
 	} else {
-		changeAnimationMode(0, false);
+		changeAnimationMode(kAnimationModeIdle, false);
 	}
 }
 
@@ -952,15 +953,15 @@ void Actor::setHealth(int hp, int maxHp) {
 	}
 }
 
-void Actor::combatModeOn(int a2, int a3, int otherActorId, int a5, int combatAnimationMode, int a7, int a8, int a9, int a10, int a11, int ammoDamage, int a13, int a14) {
-	_combatAnimationMode = combatAnimationMode;
-	_unknown1 = a7;
-	_unknown2 = a8;
+void Actor::combatModeOn(int a2, int a3, int otherActorId, int a5, int animationModeCombatIdle, int animationModeCombatWalk, int animationModeCombatRun, int a9, int a10, int a11, int ammoDamage, int a13, int a14) {
+	_animationModeCombatIdle = animationModeCombatIdle;
+	_animationModeCombatWalk = animationModeCombatWalk;
+	_animationModeCombatRun = animationModeCombatRun;
 	_inCombat = true;
 	if (_id > 0)
 		_combatInfo->combatOn(_id, a2, a3, otherActorId, a5, a9, a10, a11, ammoDamage, a13, a14);
 	stopWalking(false);
-	changeAnimationMode(_combatAnimationMode, false);
+	changeAnimationMode(_animationModeCombatIdle, false);
 	int i;
 	for (i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
 		Actor *otherActor = _vm->_actors[i];
@@ -975,7 +976,7 @@ void Actor::combatModeOff() {
 		_combatInfo->combatOff();
 	_inCombat = false;
 	stopWalking(false);
-	changeAnimationMode(0, false);
+	changeAnimationMode(kAnimationModeIdle, false);
 	int i;
 	for (i = 0; i < (int)_vm->_gameInfo->getActorCount(); i++) {
 		Actor *otherActor = _vm->_actors[i];
diff --git a/engines/bladerunner/actor.h b/engines/bladerunner/actor.h
index 40bcae5b70..ecbddfeaf4 100644
--- a/engines/bladerunner/actor.h
+++ b/engines/bladerunner/actor.h
@@ -92,7 +92,9 @@ private:
 	int _width;
 	int _height;
 	int _animationMode;
-	int _combatAnimationMode;
+	int _animationModeCombatIdle;
+	int _animationModeCombatWalk;
+	int _animationModeCombatRun;
 	int _fps;
 	int _frame_ms;
 	int _animationId;
@@ -106,9 +108,6 @@ private:
 
 	float _scale;
 
-	int _unknown1;
-	int _unknown2;
-
 	Vector3 _actorSpeed;
 
 public:
diff --git a/engines/bladerunner/actor_clues.cpp b/engines/bladerunner/actor_clues.cpp
index f9a4389b71..f6b0848a20 100644
--- a/engines/bladerunner/actor_clues.cpp
+++ b/engines/bladerunner/actor_clues.cpp
@@ -92,7 +92,6 @@ bool ActorClues::isAcquired(int clueId) {
 	if (clueIndex == -1) {
 		return false;
 	}
-
 	return _clues[clueIndex]._flags & 0x01;
 }
 
diff --git a/engines/bladerunner/actor_walk.cpp b/engines/bladerunner/actor_walk.cpp
index 6287ac8ad0..54f6c2dc68 100644
--- a/engines/bladerunner/actor_walk.cpp
+++ b/engines/bladerunner/actor_walk.cpp
@@ -30,7 +30,6 @@
 #include "bladerunner/scene_objects.h"
 #include "bladerunner/set.h"
 
-
 namespace BladeRunner {
 
 ActorWalk::ActorWalk(BladeRunnerEngine *vm) {
@@ -79,9 +78,9 @@ bool ActorWalk::setup(int actorId, bool run, const Vector3 &from, const Vector3
 
 	int animationMode;
 	if (_vm->_actors[actorId]->inCombat()) {
-		animationMode = run ? 8 : 7;
+		animationMode = run ? kAnimationModeCombatRun : kAnimationModeCombatWalk;
 	} else {
-		animationMode = run ? 2 : 1;
+		animationMode = run ? kAnimationModeRun : kAnimationModeWalk;
 	}
 
 	_vm->_actors[actorId]->changeAnimationMode(animationMode);
diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index ec54a7c76a..b3885e8fb8 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -268,8 +268,8 @@ bool BladeRunnerEngine::startup(bool hasSavegames) {
 	if (!_textKIA->open("KIA"))
 		return false;
 
-	_textSpindest = new TextResource(this);
-	if (!_textSpindest->open("SPINDEST"))
+	_textSpinnerDestinations = new TextResource(this);
+	if (!_textSpinnerDestinations->open("SPINDEST"))
 		return false;
 
 	_textVK = new TextResource(this);
@@ -351,7 +351,7 @@ void BladeRunnerEngine::initChapterAndScene() {
 	}
 
 	for (int i = 0, end = _gameInfo->getActorCount(); i != end; ++i) {
-		_actors[i]->changeAnimationMode(0);
+		_actors[i]->changeAnimationMode(kAnimationModeIdle);
 	}
 
 	for (int i = 1, end = _gameInfo->getActorCount(); i != end; ++i) { // skip first actor, probably player
@@ -410,8 +410,8 @@ void BladeRunnerEngine::shutdown() {
 	delete _textKIA;
 	_textKIA = nullptr;
 
-	delete _textSpindest;
-	_textSpindest = nullptr;
+	delete _textSpinnerDestinations;
+	_textSpinnerDestinations = nullptr;
 
 	delete _textVK;
 	_textVK = nullptr;
diff --git a/engines/bladerunner/bladerunner.h b/engines/bladerunner/bladerunner.h
index fd62f35bed..3fc8a23cf1 100644
--- a/engines/bladerunner/bladerunner.h
+++ b/engines/bladerunner/bladerunner.h
@@ -36,6 +36,15 @@
 
 namespace BladeRunner {
 
+enum AnimationModes : int {
+	kAnimationModeIdle = 0,
+	kAnimationModeWalk = 1,
+	kAnimationModeRun = 2,
+	kAnimationModeCombatIdle = 4,
+	kAnimationModeCombatWalk = 7,
+	kAnimationModeCombatRun = 8
+};
+
 class Actor;
 class ADQ;
 class AIScripts;
@@ -105,7 +114,7 @@ public:
 	TextResource    *_textCrimes;
 	TextResource    *_textCluetype;
 	TextResource    *_textKIA;
-	TextResource    *_textSpindest;
+	TextResource    *_textSpinnerDestinations;
 	TextResource    *_textVK;
 	TextResource    *_textOptions;
 
diff --git a/engines/bladerunner/combat.cpp b/engines/bladerunner/combat.cpp
index 7564faa23d..79ea2ad7bf 100644
--- a/engines/bladerunner/combat.cpp
+++ b/engines/bladerunner/combat.cpp
@@ -50,7 +50,7 @@ Combat::~Combat() {
 
 void Combat::activate() {
 	if(_enabled) {
-		_vm->_playerActor->combatModeOn(-1, -1, -1, -1, 4, 7, 8, -1, -1, -1, _vm->_combat->_ammoDamage[_vm->_settings->getAmmoType()], 0, 0);
+		_vm->_playerActor->combatModeOn(-1, -1, -1, -1, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, -1, -1, -1, _vm->_combat->_ammoDamage[_vm->_settings->getAmmoType()], 0, 0);
 		_active = true;
 	}
 }
diff --git a/engines/bladerunner/crimes_database.cpp b/engines/bladerunner/crimes_database.cpp
index c142a05318..0caa683665 100644
--- a/engines/bladerunner/crimes_database.cpp
+++ b/engines/bladerunner/crimes_database.cpp
@@ -49,24 +49,24 @@ CrimesDatabase::~CrimesDatabase() {
 	delete[] _crimes;
 }
 
-void CrimesDatabase::setCrime(int crimeId, int value) {
-	_crimes[crimeId] = value;
+void CrimesDatabase::setCrime(int clueId, int crimeId) {
+	_crimes[clueId] = crimeId;
 }
 
-int CrimesDatabase::getCrime(int crimeId) {
-	return _crimes[crimeId];
+int CrimesDatabase::getCrime(int clueId) {
+	return _crimes[clueId];
 }
 
-void CrimesDatabase::setAssetType(int assetId, int assetType) {
-	_assetTypes[assetId] = assetType;
+void CrimesDatabase::setAssetType(int clueId, int assetType) {
+	_assetTypes[clueId] = assetType;
 }
 
-int CrimesDatabase::getAssetType(int assetId) {
-	return _assetTypes[assetId];
+int CrimesDatabase::getAssetType(int clueId) {
+	return _assetTypes[clueId];
 }
 
-const char *CrimesDatabase::getClueText(int id) {
-	return _cluesText->getText(id);
+const char *CrimesDatabase::getClueText(int clueId) {
+	return _cluesText->getText(clueId);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/crimes_database.h b/engines/bladerunner/crimes_database.h
index fc82bf2075..830b58db67 100644
--- a/engines/bladerunner/crimes_database.h
+++ b/engines/bladerunner/crimes_database.h
@@ -38,13 +38,13 @@ public:
 	CrimesDatabase(BladeRunnerEngine *vm, const char *cluesResource, int crimesCount);
 	~CrimesDatabase();
 
-	void setCrime(int crimeId, int value);
-	int getCrime(int crimeId);
+	void setCrime(int clueId, int crimeId);
+	int getCrime(int clueId);
 
-	void setAssetType(int assetId, int assetType);
-	int getAssetType(int assetId);
+	void setAssetType(int clueId, int assetType);
+	int getAssetType(int clueId);
 
-	const char *getClueText(int id);
+	const char *getClueText(int clueId);
 };
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/module.mk b/engines/bladerunner/module.mk
index 408d5ae207..ec861fcb7f 100644
--- a/engines/bladerunner/module.mk
+++ b/engines/bladerunner/module.mk
@@ -46,7 +46,7 @@ MODULE_OBJS = \
 	script/ai.o \
 	script/ai/mccoy.o \
 	script/ai/runciter.o \
-	script/ai/officer_leroy.o \
+	script/ai/officer_leary.o \
 	script/scene.o \
 	script/scene/ar01.o \
 	script/scene/ar02.o \
diff --git a/engines/bladerunner/script/ai.cpp b/engines/bladerunner/script/ai.cpp
index d51200dc55..57ef099907 100644
--- a/engines/bladerunner/script/ai.cpp
+++ b/engines/bladerunner/script/ai.cpp
@@ -37,9 +37,9 @@ AIScripts::AIScripts(BladeRunnerEngine *vm, int actorsCount) : _vm(vm), _inScrip
 		_actorUpdating[i] = false;
 	}
 
-	_AIScripts[0]  = new AIScriptMcCoy(_vm);
-	_AIScripts[15] = new AIScriptRunciter(_vm);
-	_AIScripts[23] = new AIScriptOfficerLeroy(_vm);
+	_AIScripts[kActorMcCoy]  = new AIScriptMcCoy(_vm);
+	_AIScripts[kActorRunciter] = new AIScriptRunciter(_vm);
+	_AIScripts[kActorOfficerLeary] = new AIScriptOfficerLeary(_vm);
 }
 
 AIScripts::~AIScripts() {
@@ -53,8 +53,9 @@ AIScripts::~AIScripts() {
 
 void AIScripts::Initialize(int actor) {
 	assert(actor < _actorsCount);
-	if (_AIScripts[actor])
+	if (_AIScripts[actor]) {
 		_AIScripts[actor]->Initialize();
+	}
 }
 
 void AIScripts::Update(int actor) {
diff --git a/engines/bladerunner/script/ai.h b/engines/bladerunner/script/ai.h
index 056b22a333..a68820eaad 100644
--- a/engines/bladerunner/script/ai.h
+++ b/engines/bladerunner/script/ai.h
@@ -127,7 +127,7 @@ DECLARE_SCRIPT(Runciter)
 	int var_45CD88;
 END_SCRIPT
 
-DECLARE_SCRIPT(OfficerLeroy)
+DECLARE_SCRIPT(OfficerLeary)
 	int var_45D5B0_animation_state;
 	int var_45D5B4_animation_frame;
 	int var_45D5B8;
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index fb9561cbcb..bda6b093e6 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -38,7 +38,7 @@ void AIScriptMcCoy::Initialize() {
 	dword_45A0F8 = -1;
 	dword_45A0FC = 0;
 	off_45A100 = 0;
-	Actor_Set_Goal_Number(0, 0);
+	Actor_Set_Goal_Number(kActorMcCoy, 0);
 }
 
 bool AIScriptMcCoy::Update() {
@@ -46,26 +46,26 @@ bool AIScriptMcCoy::Update() {
 		Sound_Play(dword_45A0F8, 100, 0, 0, 50);
 		dword_45A0F8 = -1;
 	}
-	switch (Actor_Query_Goal_Number(0)) {
+	switch (Actor_Query_Goal_Number(kActorMcCoy)) {
 	case 101:
-		Actor_Set_Goal_Number(0, 102);
+		Actor_Set_Goal_Number(kActorMcCoy, 102);
 		return true;
 	case 102:
-		if (Actor_Query_Inch_Distance_From_Waypoint(0, 316) < 36 && !Game_Flag_Query(375)) {
-			Actor_Change_Animation_Mode(0, 21);
+		if (Actor_Query_Inch_Distance_From_Waypoint(kActorMcCoy, 316) < 36 && !Game_Flag_Query(375)) {
+			Actor_Change_Animation_Mode(kActorMcCoy, 21);
 			Game_Flag_Set(375);
 		}
-		if (Actor_Query_Inch_Distance_From_Waypoint(0, 316) < 4) {
-			Actor_Set_Goal_Number(0, 103);
+		if (Actor_Query_Inch_Distance_From_Waypoint(kActorMcCoy, 316) < 4) {
+			Actor_Set_Goal_Number(kActorMcCoy, 103);
 		}
 		return true;
 	case 201:
-		Actor_Set_Goal_Number(0, 0);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
 		if (Player_Query_Current_Set() == 55) {
-			Loop_Actor_Walk_To_XYZ(0, -166.0f, -70.19f, -501.0f, 0, 0, false, 0);
-			Actor_Face_Heading(0, 300, false);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -166.0f, -70.19f, -501.0f, 0, 0, false, 0);
+			Actor_Face_Heading(kActorMcCoy, 300, false);
 		} else {
-			Loop_Actor_Walk_To_XYZ(0, -461.0f, 0.0f, -373.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -461.0f, 0.0f, -373.0f, 0, 0, false, 0);
 		}
 		Player_Gains_Control();
 		return true;
@@ -77,15 +77,15 @@ bool AIScriptMcCoy::Update() {
 		}
 		break;
 	case 221:
-		Actor_Set_Goal_Number(0, 0);
-		Actor_Set_Goal_Number(18, 212);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
+		Actor_Set_Goal_Number(kActorEarlyQ, 212);
 		return true;
 	case 309:
 		sub_4053E0();
 		break;
 	case 391:
-		Actor_Retired_Here(0, 12, 48, 1, -1);
-		Actor_Set_Goal_Number(0, 599);
+		Actor_Retired_Here(kActorMcCoy, 12, 48, 1, -1);
+		Actor_Set_Goal_Number(kActorMcCoy, 599);
 		break;
 	case 231:
 		sub_4053E0();
@@ -153,9 +153,9 @@ void AIScriptMcCoy::ReceivedClue(int clueId, int fromActorId) {
 		Global_Variable_Increment(48, 1);
 		break;
 	}
-	if (Global_Variable_Query(49) > 6 && Global_Variable_Query(1) > 3 && !Actor_Clue_Query(0, 126)) {
+	if (Global_Variable_Query(49) > 6 && Global_Variable_Query(1) > 3 && !Actor_Clue_Query(kActorMcCoy, kClueGuzzaFramedMcCoy)) {
 		Delay(500);
-		Actor_Voice_Over(3320, 99);
+		Actor_Voice_Over(3320, kActorVoiceOver);
 		switch (clueId) {
 		case 66:
 		case 80:
@@ -163,40 +163,40 @@ void AIScriptMcCoy::ReceivedClue(int clueId, int fromActorId) {
 		case 83:
 		case 121:
 		case 128:
-			Actor_Voice_Over(3340, 99);
-			Actor_Voice_Over(3350, 99);
-			Actor_Voice_Over(3360, 99);
-			Actor_Voice_Over(3370, 99);
-			Actor_Voice_Over(3380, 99);
+			Actor_Voice_Over(3340, kActorVoiceOver);
+			Actor_Voice_Over(3350, kActorVoiceOver);
+			Actor_Voice_Over(3360, kActorVoiceOver);
+			Actor_Voice_Over(3370, kActorVoiceOver);
+			Actor_Voice_Over(3380, kActorVoiceOver);
 			break;
 		case 124:
-			Actor_Voice_Over(3330, 99);
+			Actor_Voice_Over(3330, kActorVoiceOver);
 			break;
 		case 120:
-			Actor_Voice_Over(3390, 99);
-			Actor_Voice_Over(3400, 99);
-			Actor_Voice_Over(3420, 99);
+			Actor_Voice_Over(3390, kActorVoiceOver);
+			Actor_Voice_Over(3400, kActorVoiceOver);
+			Actor_Voice_Over(3420, kActorVoiceOver);
 			break;
 		}
-		Actor_Clue_Acquire(0, 126, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kClueGuzzaFramedMcCoy, 1, -1);
 		if (clueId == 125) {
-			Actor_Voice_Over(2780, 99);
-			Actor_Voice_Over(2800, 99);
-			Actor_Voice_Over(2810, 99);
-		} else if (Actor_Clue_Query(0, 125)) {
-			Actor_Voice_Over(3430, 99);
-			Actor_Voice_Over(3440, 99);
-			Actor_Voice_Over(3450, 99);
-			Actor_Voice_Over(3460, 99);
-			Actor_Voice_Over(3470, 99);
-			Actor_Voice_Over(3480, 99);
-			Actor_Voice_Over(3490, 99);
-			Actor_Voice_Over(3500, 99);
+			Actor_Voice_Over(2780, kActorVoiceOver);
+			Actor_Voice_Over(2800, kActorVoiceOver);
+			Actor_Voice_Over(2810, kActorVoiceOver);
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueFolder)) {
+			Actor_Voice_Over(3430, kActorVoiceOver);
+			Actor_Voice_Over(3440, kActorVoiceOver);
+			Actor_Voice_Over(3450, kActorVoiceOver);
+			Actor_Voice_Over(3460, kActorVoiceOver);
+			Actor_Voice_Over(3470, kActorVoiceOver);
+			Actor_Voice_Over(3480, kActorVoiceOver);
+			Actor_Voice_Over(3490, kActorVoiceOver);
+			Actor_Voice_Over(3500, kActorVoiceOver);
 		} else {
-			Actor_Voice_Over(3510, 99);
-			Actor_Voice_Over(3520, 99);
-			Actor_Voice_Over(3530, 99);
-			Actor_Voice_Over(3540, 99);
+			Actor_Voice_Over(3510, kActorVoiceOver);
+			Actor_Voice_Over(3520, kActorVoiceOver);
+			Actor_Voice_Over(3530, kActorVoiceOver);
+			Actor_Voice_Over(3540, kActorVoiceOver);
 		}
 	}
 }
@@ -223,24 +223,24 @@ void AIScriptMcCoy::ShotAtAndHit() {
 }
 
 void AIScriptMcCoy::Retired(int byActorId) {
-	if (byActorId == 1 && Actor_Query_In_Set(1, 42)) {
-		if (Actor_Query_In_Set(3, 42) && Actor_Query_Goal_Number(3) != 599) {
-			Non_Player_Actor_Combat_Mode_On(1, 3, 1, 3, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
-		} else if (Actor_Query_In_Set(6, 42) && Actor_Query_Goal_Number(6) != 599) {
-			Non_Player_Actor_Combat_Mode_On(1, 3, 1, 6, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (byActorId == kActorSteele && Actor_Query_In_Set(kActorSteele, 42)) {
+		if (Actor_Query_In_Set(kActorDektora, 42) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+			Non_Player_Actor_Combat_Mode_On(kActorSteele, 3, 1, kActorDektora, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+		} else if (Actor_Query_In_Set(kActorLucy, 42) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+			Non_Player_Actor_Combat_Mode_On(kActorSteele, 3, 1, kActorLucy, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 		}
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(23, 41) && Actor_Query_In_Set(3, 41) && Actor_Query_Goal_Number(3) != 599) {
-		Non_Player_Actor_Combat_Mode_On(23, 3, 1, 3, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerLeary, 41) && Actor_Query_In_Set(kActorDektora, 41) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 3, 1, kActorDektora, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(24, 41) && Actor_Query_In_Set(3, 41) && Actor_Query_Goal_Number(3) != 599) {
-		Non_Player_Actor_Combat_Mode_On(24, 3, 1, 3, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerGrayford, 41) && Actor_Query_In_Set(kActorDektora, 41) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, 3, 1, kActorDektora, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(23, 41) && Actor_Query_In_Set(6, 41) && Actor_Query_Goal_Number(6) != 599) {
-		Non_Player_Actor_Combat_Mode_On(23, 3, 1, 6, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerLeary, 41) && Actor_Query_In_Set(kActorLucy, 41) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 3, 1, kActorLucy, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(24, 41) && Actor_Query_In_Set(6, 41) && Actor_Query_Goal_Number(6) != 599) {
-		Non_Player_Actor_Combat_Mode_On(24, 3, 1, 6, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerGrayford, 41) && Actor_Query_In_Set(kActorLucy, 41) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, 3, 1, kActorLucy, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
 }
 
@@ -262,26 +262,26 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		sub_405920();
 		return true;
 	case 100:
-		Actor_Set_At_Waypoint(0, 315, 263);
+		Actor_Set_At_Waypoint(kActorMcCoy, 315, 263);
 		dword_45A0D0_animation_state = 53;
 		dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		return true;
 	case 102:
-		Async_Actor_Walk_To_Waypoint(0, 316, 0, 1);
+		Async_Actor_Walk_To_Waypoint(kActorMcCoy, 316, 0, 1);
 		return true;
 	case 103:
-		Actor_Face_Actor(0, 8, true);
+		Actor_Face_Actor(kActorMcCoy, kActorSadik, true);
 		return true;
 	case 231:
 		Player_Set_Combat_Mode(false);
 		Preload(18);
 		Set_Enter(59, 63);
 		Player_Loses_Control();
-		Actor_Force_Stop_Walking(0);
-		Actor_Put_In_Set(0, 59);
-		Actor_Set_At_XYZ(0, 14.0f, 110.84f, -300.0f, 926);
-		Actor_Change_Animation_Mode(0, 48);
+		Actor_Force_Stop_Walking(kActorMcCoy);
+		Actor_Put_In_Set(kActorMcCoy, 59);
+		Actor_Set_At_XYZ(kActorMcCoy, 14.0f, 110.84f, -300.0f, 926);
+		Actor_Change_Animation_Mode(kActorMcCoy, 48);
 		dword_45A0D0_animation_state = 27;
 		dword_45A0D4_animation_frame = 0;
 		flt_462714 = 2.84f;
@@ -289,11 +289,11 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		off_45A100 = -6.0f;
 		return true;
 	case 230:
-		dword_45A0FC = Actor_Query_Goal_Number(1) == 215;
-		Actor_Change_Animation_Mode(0, 6);
+		dword_45A0FC = Actor_Query_Goal_Number(kActorSteele) == 215;
+		Actor_Change_Animation_Mode(kActorMcCoy, 6);
 		return true;
 	case 220:
-		Actor_Change_Animation_Mode(0, 75);
+		Actor_Change_Animation_Mode(kActorMcCoy, 75);
 		return true;
 	case 212:
 		Global_Variable_Set(47, 0);
@@ -304,33 +304,33 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
 		return true;
 	case 211:
-		Actor_Face_Heading(0, 512, false);
-		Actor_Face_Heading(0, 768, true);
+		Actor_Face_Heading(kActorMcCoy, 512, false);
+		Actor_Face_Heading(kActorMcCoy, 768, true);
 		if (Random_Query(0, 1)) {
-			Actor_Change_Animation_Mode(0, 18);
+			Actor_Change_Animation_Mode(kActorMcCoy, 18);
 		} else {
-			Actor_Change_Animation_Mode(0, 16);
+			Actor_Change_Animation_Mode(kActorMcCoy, 16);
 		}
 		Delay(150);
-		Actor_Change_Animation_Mode(0, 0);
-		Actor_Set_Goal_Number(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
 		Player_Gains_Control();
 		return true;
 	case 210:
-		Actor_Put_In_Set(0, 54);
-		Actor_Set_At_XYZ(0, -204.0, 24.0, -817.0, 256);
-		Actor_Set_Invisible(0, false);
+		Actor_Put_In_Set(kActorMcCoy, 54);
+		Actor_Set_At_XYZ(kActorMcCoy, -204.0, 24.0, -817.0, 256);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		if (Game_Flag_Query(627)) {
-			Actor_Set_Goal_Number(0, 212);
+			Actor_Set_Goal_Number(kActorMcCoy, 212);
 		} else {
 			dword_45A0D0_animation_state = 53;
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
-			Actor_Set_Invisible(0, false);
+			Actor_Set_Invisible(kActorMcCoy, false);
 		}
 		return true;
 	case 200:
 		Player_Loses_Control();
-		Actor_Change_Animation_Mode(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		return true;
 	case 301:
 		dword_45A0D0_animation_state = 62;
@@ -350,39 +350,39 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Sound_Play(403, 30, 0, 0, 50);
 		Delay(1000);
 		Sound_Play(123, 50, 0, 0, 50);
-		Actor_Says(4, 1380, 3);
-		Actor_Says(0, 6610, 13);
-		Actor_Says(4, 1390, 3);
-		Actor_Says(0, 6615, 18);
-		Actor_Says(4, 1420, 3);
-		Actor_Says(0, 6625, 11);
-		Actor_Says(4, 1430, 3);
-		Actor_Says(0, 6630, 12);
-		Actor_Says(0, 6635, 17);
-		Actor_Says(0, 6640, 13);
-		Actor_Says(0, 6645, 19);
-		Actor_Says(0, 6650, 18);
-		Actor_Says(0, 6655, 11);
-		Actor_Says(4, 1440, 3);
-		Actor_Says(0, 6660, 17);
-		Actor_Says(0, 6665, 13);
+		Actor_Says(kActorGuzza, 1380, 3);
+		Actor_Says(kActorMcCoy, 6610, 13);
+		Actor_Says(kActorGuzza, 1390, 3);
+		Actor_Says(kActorMcCoy, 6615, 18);
+		Actor_Says(kActorGuzza, 1420, 3);
+		Actor_Says(kActorMcCoy, 6625, 11);
+		Actor_Says(kActorGuzza, 1430, 3);
+		Actor_Says(kActorMcCoy, 6630, 12);
+		Actor_Says(kActorMcCoy, 6635, 17);
+		Actor_Says(kActorMcCoy, 6640, 13);
+		Actor_Says(kActorMcCoy, 6645, 19);
+		Actor_Says(kActorMcCoy, 6650, 18);
+		Actor_Says(kActorMcCoy, 6655, 11);
+		Actor_Says(kActorGuzza, 1440, 3);
+		Actor_Says(kActorMcCoy, 6660, 17);
+		Actor_Says(kActorMcCoy, 6665, 13);
 		Delay(1000);
-		Actor_Says(4, 1450, 3);
-		Actor_Says(0, 6670, 14);
-		Actor_Says(0, 6675, 11);
-		Actor_Says(4, 1460, 3);
-		Actor_Says(0, 6680, 12);
-		Actor_Says(4, 1470, 3);
-		Actor_Says(0, 6685, 13);
+		Actor_Says(kActorGuzza, 1450, 3);
+		Actor_Says(kActorMcCoy, 6670, 14);
+		Actor_Says(kActorMcCoy, 6675, 11);
+		Actor_Says(kActorGuzza, 1460, 3);
+		Actor_Says(kActorMcCoy, 6680, 12);
+		Actor_Says(kActorGuzza, 1470, 3);
+		Actor_Says(kActorMcCoy, 6685, 13);
 		Delay(500);
-		Actor_Says(0, 6695, 16);
-		Actor_Says(0, 6700, 17);
-		Actor_Says(4, 1480, 3);
-		Actor_Says(0, 6705, 11);
+		Actor_Says(kActorMcCoy, 6695, 16);
+		Actor_Says(kActorMcCoy, 6700, 17);
+		Actor_Says(kActorGuzza, 1480, 3);
+		Actor_Says(kActorMcCoy, 6705, 11);
 		Sound_Play(123, 50, 0, 0, 50);
 		return true;
 	case 390:
-		Actor_Force_Stop_Walking(0);
+		Actor_Force_Stop_Walking(kActorMcCoy);
 		Player_Loses_Control();
 		flt_462710 = 48.07f;
 		off_45A100 = -4.0f;
@@ -393,22 +393,22 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		}
 		return true;
 	case 400:
-		Actor_Set_Health(0, 50, 50);
+		Actor_Set_Health(kActorMcCoy, 50, 50);
 		Game_Flag_Set(373);
 		v5 = Global_Variable_Query(45);
 		if (v5 == 1) {
-			Actor_Modify_Friendliness_To_Other(1, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
 		} else if (v5 == 2) {
-			Actor_Modify_Friendliness_To_Other(1, 0, -5);
-			Actor_Modify_Friendliness_To_Other(5, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 3);
 		} else if (v5 == 3) {
-			Actor_Modify_Friendliness_To_Other(1, 0, -5);
-			Actor_Modify_Friendliness_To_Other(5, 0, 5);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 5);
 		}
 		if (Game_Flag_Query(666)) {
-			Actor_Modify_Friendliness_To_Other(1, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
 		}
-		if (Actor_Query_Friendliness_To_Other(1, 0) < Actor_Query_Friendliness_To_Other(5, 0)) {
+		if (Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy) < Actor_Query_Friendliness_To_Other(kActorClovis, kActorMcCoy)) {
 			Game_Flag_Set(653);
 		}
 		v7 = Global_Variable_Query(45);
@@ -438,7 +438,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 500:
 		Music_Stop(3);
 		Player_Set_Combat_Mode(false);
-		Actor_Change_Animation_Mode(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		dword_45A0D0_animation_state = 0;
 		dword_45A0D4_animation_frame = 0;
 		Game_Flag_Set(465);
@@ -455,7 +455,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 52;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(52)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
@@ -473,7 +473,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 50;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(50)) {
-			Actor_Change_Animation_Mode(0, 53);
+			Actor_Change_Animation_Mode(kActorMcCoy, 53);
 			*animation = 51;
 		}
 		break;
@@ -486,26 +486,26 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame--;
 		}
 		if (dword_45A0D4_animation_frame <= 0) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D0_animation_state = 0;
 			dword_45A0D4_animation_frame = 0;
 			Game_Flag_Reset(627);
 			Scene_Exits_Enable();
 			Player_Set_Combat_Mode_Access(true);
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 		}
 		break;
 	case 67:
 		*animation = 53;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(53)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D0_animation_state = 0;
 			dword_45A0D4_animation_frame = 0;
-			if (Actor_Query_Goal_Number(0) == 220) {
-				Actor_Change_Animation_Mode(0, 48);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 220) {
+				Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			}
 		}
 		break;
@@ -513,7 +513,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 40;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(40)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
@@ -526,7 +526,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 		}
 		break;
 	case 64:
@@ -561,8 +561,8 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			if (Actor_Query_Goal_Number(0) == 200) {
-				Actor_Set_Goal_Number(0, 201);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 200) {
+				Actor_Set_Goal_Number(kActorMcCoy, 201);
 			}
 		}
 		break;
@@ -620,12 +620,12 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(49)) {
 			dword_45A0D4_animation_frame = 0;
-			if (Actor_Query_Which_Set_In(0) == 87) {
+			if (Actor_Query_Which_Set_In(kActorMcCoy) == 87) {
 				dword_45A0D0_animation_state = 27;
 			} else {
 				*animation = 19;
 				dword_45A0D0_animation_state = 0;
-				Actor_Change_Animation_Mode(0, 0);
+				Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			}
 		}
 		break;
@@ -633,7 +633,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 32;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame == 7) {
-			Actor_Change_Animation_Mode(66, 52);
+			Actor_Change_Animation_Mode(kActorMaggie, 52);
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 19;
@@ -644,15 +644,15 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 18;
 		dword_45A0D4_animation_frame--;
 		if (dword_45A0D4_animation_frame <= 0) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			if (Actor_Query_Goal_Number(0) == 100) {
-				Actor_Set_Goal_Number(0, 101);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 100) {
+				Actor_Set_Goal_Number(kActorMcCoy, 101);
 			}
-			if (Actor_Query_Goal_Number(0) == 210) {
-				Actor_Set_Goal_Number(0, 211);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 210) {
+				Actor_Set_Goal_Number(kActorMcCoy, 211);
 			}
 		}
 		break;
@@ -670,7 +670,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(28)) {
 			Player_Set_Combat_Mode(true);
 			sub_405800();
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 			dword_45A0D4_animation_frame = 0;
 			Player_Gains_Control();
 		}
@@ -683,7 +683,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 34;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(34)) {
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			sub_405660();
@@ -708,7 +708,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		break;
 	case 46:
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		*animation = 36;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(36)) {
@@ -716,14 +716,14 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			Player_Gains_Control();
 			sub_405660();
-			Actor_Face_Heading(0, (Actor_Query_Facing_1024(0) + 512) & 1023, false);
+			Actor_Face_Heading(kActorMcCoy, (Actor_Query_Facing_1024(kActorMcCoy) + 512) & 1023, false);
 		}
 		break;
 	case 45:
 		*animation = 35;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(35)) {
-			Actor_Set_Invisible(0, true);
+			Actor_Set_Invisible(kActorMcCoy, true);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			sub_405660();
@@ -737,7 +737,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(30)) {
 			*animation = 19;
 			sub_405660();
-			Actor_Set_At_XYZ(0, -203.41f, -621.3f, 724.57f, 538);
+			Actor_Set_At_XYZ(kActorMcCoy, -203.41f, -621.3f, 724.57f, 538);
 			Player_Gains_Control();
 		}
 		break;
@@ -749,13 +749,13 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		switch (dword_45A0D4_animation_frame) {
 		case 9:
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 			break;
 		case 4:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		case 1:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		}
 		break;
@@ -767,13 +767,13 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		switch (dword_45A0D4_animation_frame) {
 		case 9:
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 			break;
 		case 4:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		case 1:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		}
 		break;
@@ -785,9 +785,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 9) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 4) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(359)) {
 			sub_4059D0(-0.2f);
@@ -801,9 +801,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 8) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 3) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(358)) {
 			sub_405940(0.5f);
@@ -817,9 +817,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 8) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 3) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(359)) {
 			sub_4059D0(-0.2f);
@@ -833,9 +833,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 9) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 4) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(358)) {
 			sub_405940(0.5f);
@@ -848,10 +848,10 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 4;
 		if (dword_45A0D4_animation_frame == 6) {
-			Sound_Left_Footstep_Run(0);
+			Sound_Left_Footstep_Run(kActorMcCoy);
 		}
 		if (dword_45A0D4_animation_frame == 0) {
-			Sound_Right_Footstep_Run(0);
+			Sound_Right_Footstep_Run(kActorMcCoy);
 		}
 		break;
 	case 36:
@@ -861,10 +861,10 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 3;
 		if (dword_45A0D4_animation_frame == 15) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		}
 		if (dword_45A0D4_animation_frame == 6) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		break;
 	case 32:
@@ -879,9 +879,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 14;
 		if (dword_45A0D4_animation_frame == 5) {
-			Sound_Left_Footstep_Run(0);
+			Sound_Left_Footstep_Run(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 12) {
-			Sound_Right_Footstep_Run(0);
+			Sound_Right_Footstep_Run(kActorMcCoy);
 		}
 		break;
 	case 30:
@@ -891,9 +891,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 		}
 		if (dword_45A0D4_animation_frame == 2) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 10) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		}
 		break;
 	case 29:
@@ -904,7 +904,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0E0 = 1;
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
-			Actor_Change_Animation_Mode(0, 48);
+			Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			*animation = 18;
 			dword_45A0D0_animation_state = 27;
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
@@ -926,8 +926,8 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			dword_45A0D0_animation_state = 50;
 			sub_4054F0();
-			if (Actor_Query_Goal_Number(0) == 220) {
-				Actor_Set_Goal_Number(0, 221);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 220) {
+				Actor_Set_Goal_Number(kActorMcCoy, 221);
 			}
 		}
 		break;
@@ -938,7 +938,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		}
 		break;
 	case 25:
@@ -948,7 +948,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		}
 		break;
 	case 24:
@@ -958,7 +958,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Change_Animation_Mode(0, 4);
+			Actor_Change_Animation_Mode(kActorMcCoy, 4);
 		}
 		break;
 	case 23:
@@ -968,7 +968,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Change_Animation_Mode(0, 4);
+			Actor_Change_Animation_Mode(kActorMcCoy, 4);
 		}
 		break;
 	case 22:
@@ -979,14 +979,14 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 	case 21:
 		*animation = 12;
 		dword_45A0D4_animation_frame++;
-		if (dword_45A0D4_animation_frame == 1 && Actor_Query_Goal_Number(0) == 230 && dword_45A0FC == 1) {
+		if (dword_45A0D4_animation_frame == 1 && Actor_Query_Goal_Number(kActorMcCoy) == 230 && dword_45A0FC == 1) {
 			dword_45A0F8 = 27;
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(12)) {
 			dword_45A0D0_animation_state = 17;
 			dword_45A0D4_animation_frame = 0;
 			*animation = 12;
-			if (Actor_Query_Goal_Number(0) == 230) {
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 230) {
 				dword_45A0D4_animation_frame = 0;
 				dword_45A0D0_animation_state = 21;
 				dword_45A0FC = 1;
@@ -1386,7 +1386,7 @@ bool AIScriptMcCoy::ChangeAnimationMode(int mode) {
 		}
 		return true;
 	case 20:
-		v2 = Actor_Query_Which_Set_In(0);
+		v2 = Actor_Query_Which_Set_In(kActorMcCoy);
 		if (v2 == 27) {
 			dword_45A0D0_animation_state = 51;
 			dword_45A0D4_animation_frame = 0;
@@ -1665,33 +1665,33 @@ void AIScriptMcCoy::FledCombat() {}
 
 void AIScriptMcCoy::sub_4053E0() {
 	float x, y, z;
-	Actor_Query_XYZ(0, &x, &y, &z);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	flt_462710 = flt_462710 + off_45A100;
 	if (flt_462714 < flt_462710) {
 		off_45A100 = off_45A100 - 0.2f;
 	} else {
 		flt_462710 = flt_462714;
-		Actor_Set_Goal_Number(0, 0);
-		Actor_Retired_Here(0, 12, 48, 1, -1);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
+		Actor_Retired_Here(kActorMcCoy, 12, 48, 1, -1);
 	}
-	return Actor_Set_At_XYZ(0, x, flt_462710, z, Actor_Query_Facing_1024(0));
+	return Actor_Set_At_XYZ(kActorMcCoy, x, flt_462710, z, Actor_Query_Facing_1024(kActorMcCoy));
 }
 
 void AIScriptMcCoy::sub_4054F0() {
-	if (Actor_Query_Which_Set_In(0) == 87 && Actor_Query_Goal_Number(0) != 390 && !Game_Flag_Query(682)) {
+	if (Actor_Query_Which_Set_In(kActorMcCoy) == 87 && Actor_Query_Goal_Number(kActorMcCoy) != 390 && !Game_Flag_Query(682)) {
 		float x, y, z;
-		Actor_Query_XYZ(0, &x, &y, &z);
+		Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 		if ((z < 220.0f) && (-210.0f < x) && (-70.0f > x)) {
 			Game_Flag_Set(682);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
-			Actor_Set_Goal_Number(0, 390);
-			Actor_Query_XYZ(64, &x, &y, &z);
+			Actor_Set_Goal_Number(kActorMcCoy, 390);
+			Actor_Query_XYZ(kActorFreeSlotA, &x, &y, &z);
 			if (-200.0 < x && -62.0f > x) {
-				Actor_Set_Goal_Number(64, 309);
+				Actor_Set_Goal_Number(kActorFreeSlotA, 309);
 			}
 		} else {
-			Actor_Set_Goal_Number(0, 391);
+			Actor_Set_Goal_Number(kActorMcCoy, 391);
 		}
 	}
 }
@@ -1801,7 +1801,7 @@ void AIScriptMcCoy::sub_405800() {
 }
 
 void AIScriptMcCoy::sub_4058B0() {
-	int v0 = Actor_Query_Which_Set_In(0);
+	int v0 = Actor_Query_Which_Set_In(kActorMcCoy);
 	if (v0 == 27) {
 		dword_45A0D0_animation_state = 51;
 		dword_45A0D4_animation_frame = 0;
@@ -1820,8 +1820,8 @@ void AIScriptMcCoy::sub_405920() {
 
 void AIScriptMcCoy::sub_405940(float a1) {
 	float x, y, z;
-	int currentAngle = Actor_Query_Facing_1024(0);
-	Actor_Query_XYZ(0, &x, &y, &z);
+	int currentAngle = Actor_Query_Facing_1024(kActorMcCoy);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	int angle = currentAngle - 12;
 	y = y + a1;
 	if (angle < 0) {
@@ -1830,13 +1830,13 @@ void AIScriptMcCoy::sub_405940(float a1) {
 	if (angle > 1023) {
 		angle -= 1024;
 	}
-	Actor_Set_At_XYZ(0, x, y, z, angle);
+	Actor_Set_At_XYZ(kActorMcCoy, x, y, z, angle);
 }
 
 void AIScriptMcCoy::sub_4059D0(float a1) {
 	float x, y, z;
-	int currentAngle = Actor_Query_Facing_1024(0);
-	Actor_Query_XYZ(0, &x, &y, &z);
+	int currentAngle = Actor_Query_Facing_1024(kActorMcCoy);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	int angle = currentAngle + 15;
 	y = y + a1;
 	if (angle < 0) {
@@ -1845,7 +1845,7 @@ void AIScriptMcCoy::sub_4059D0(float a1) {
 	if (angle > 1023) {
 		angle -= 1024;
 	}
-	return Actor_Set_At_XYZ(0, x, y, z, angle);
+	return Actor_Set_At_XYZ(kActorMcCoy, x, y, z, angle);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai/officer_leroy.cpp b/engines/bladerunner/script/ai/officer_leary.cpp
index 9dc41650e8..5c48d0670b 100644
--- a/engines/bladerunner/script/ai/officer_leroy.cpp
+++ b/engines/bladerunner/script/ai/officer_leary.cpp
@@ -24,118 +24,118 @@
 
 namespace BladeRunner {
 
-void AIScriptOfficerLeroy::Initialize() {
+void AIScriptOfficerLeary::Initialize() {
 	var_45D5B0_animation_state = 0;
 	var_45D5B4_animation_frame = 0;
 	var_462880 = 0;
 	var_45D5B8 = 0;
 	var_45D5BC = 0;
 
-	Actor_Put_In_Set(23, 69);
-	Actor_Set_At_XYZ(23, -261.80f, 6.00f, 79.58f, 512);
-	Actor_Set_Goal_Number(23, 0);
-	Actor_Set_Frame_Rate_FPS(23, 8);
+	Actor_Put_In_Set(kActorOfficerLeary, 69);
+	Actor_Set_At_XYZ(kActorOfficerLeary, -261.80f, 6.00f, 79.58f, 512);
+	Actor_Set_Goal_Number(kActorOfficerLeary, 0);
+	Actor_Set_Frame_Rate_FPS(kActorOfficerLeary, 8);
 }
 
-bool AIScriptOfficerLeroy::Update() {
-	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(23) < 300) {
-		AI_Movement_Track_Flush(23);
-		Actor_Set_Goal_Number(23, 300);
-	} else if (Global_Variable_Query(1) == 5 && Actor_Query_Goal_Number(23) < 400) {
-		AI_Movement_Track_Flush(23);
-		Actor_Set_Goal_Number(23, 400);
+bool AIScriptOfficerLeary::Update() {
+	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(kActorOfficerLeary) < 300) {
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 300);
+	} else if (Global_Variable_Query(1) == 5 && Actor_Query_Goal_Number(kActorOfficerLeary) < 400) {
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 400);
 	} else if (!Game_Flag_Query(182) && Game_Flag_Query(147) == 1 && Game_Flag_Query(163) == 1 && Player_Query_Current_Scene() != 78 && Global_Variable_Query(1) < 3) {
 		Game_Flag_Set(186);
-		Actor_Set_Goal_Number(23, 3);
-	} else if (Actor_Query_Goal_Number(23) != 1 && Actor_Query_Goal_Number(23) != 2 && Game_Flag_Query(199) == 1) {
+		Actor_Set_Goal_Number(kActorOfficerLeary, 3);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) != 1 && Actor_Query_Goal_Number(kActorOfficerLeary) != 2 && Game_Flag_Query(199) == 1) {
 		Game_Flag_Reset(199);
-	} else if (Global_Variable_Query(15) > 4 && !Actor_Clue_Query(23, 239)) {
-		Actor_Clue_Acquire(23, 239, 1, -1);
+	} else if (Global_Variable_Query(15) > 4 && !Actor_Clue_Query(kActorOfficerLeary, kClueMcCoyIsStupid)) {
+		Actor_Clue_Acquire(kActorOfficerLeary, kClueMcCoyIsStupid, 1, -1);
 	} else if (Game_Flag_Query(629) == 1) {
 		Game_Flag_Reset(629);
 	} else if (Game_Flag_Query(623) == 1 && !Game_Flag_Query(664)) {
 		Game_Flag_Set(664);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 310 && Actor_Query_Which_Set_In(23) != Player_Query_Current_Set()) {
-		Non_Player_Actor_Combat_Mode_Off(23);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 599 && Actor_Query_Which_Set_In(23) != Player_Query_Current_Set()) {
-		Actor_Set_Health(23, 40, 40);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 305) {
-		switch (Actor_Query_Which_Set_In(23)) {
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 310 && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set()) {
+		Non_Player_Actor_Combat_Mode_Off(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 599 && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set()) {
+		Actor_Set_Health(kActorOfficerLeary, 40, 40);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 305) {
+		switch (Actor_Query_Which_Set_In(kActorOfficerLeary)) {
 		case 7:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 0, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 0, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 20:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 1, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 1, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 33:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 5, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 5, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 53:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 7, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 7, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 54:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 3, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 3, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 70:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 18, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 18, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 74:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 77:
 		case 78:
 		case 79:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 81:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 13, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 13, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 83:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 84:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 16, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 16, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 86:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 17, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 17, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		}
@@ -143,28 +143,28 @@ bool AIScriptOfficerLeroy::Update() {
 	return false;
 }
 
-void AIScriptOfficerLeroy::TimerExpired(int timer) {
+void AIScriptOfficerLeary::TimerExpired(int timer) {
 	if (timer == 1) {
-		AI_Countdown_Timer_Reset(23, 1);
-		if (Actor_Query_In_Set(0, 41)) {
-			Actor_Set_Goal_Number(23, 430);
-			Actor_Set_Goal_Number(24, 430);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		if (Actor_Query_In_Set(kActorMcCoy, 41)) {
+			Actor_Set_Goal_Number(kActorOfficerLeary, 430);
+			Actor_Set_Goal_Number(kActorOfficerGrayford, 430);
 		} else {
 			Game_Flag_Set(684);
 		}
 	} else if (timer == 2) {
-		AI_Countdown_Timer_Reset(23, 2);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 2);
 		sub_431420();
 	}
 }
 
-void AIScriptOfficerLeroy::CompletedMovementTrack() {
+void AIScriptOfficerLeary::CompletedMovementTrack() {
 	int v0;
 	unsigned int v1;
 
-	v0 = Actor_Query_Goal_Number(23);
+	v0 = Actor_Query_Goal_Number(kActorOfficerLeary);
 	if (v0 == 1) {
-		Actor_Set_Goal_Number(23, 2);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 2);
 		return;
 	}
 	//todo: tidyup
@@ -173,54 +173,54 @@ void AIScriptOfficerLeroy::CompletedMovementTrack() {
 		return;
 	}
 	if (!v1) {
-		Actor_Set_Goal_Number(23, 306);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 306);
 		return;
 	}
 	if (v1 != 2) {
 		if (v1 == 3) {
-			Actor_Change_Animation_Mode(23, 4);
-			Actor_Face_Actor(23, 0, true);
-			Actor_Set_Goal_Number(23, 309);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+			Actor_Set_Goal_Number(kActorOfficerLeary, 309);
 		}
 		return;
 	}
-	Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 12, 4, 7, 8, 0, -1, -1, 15, 300, 0);
+	Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 12, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, 0, -1, -1, 15, 300, 0);
 }
 
-void AIScriptOfficerLeroy::ReceivedClue(int clueId, int fromActorId) {
+void AIScriptOfficerLeary::ReceivedClue(int clueId, int fromActorId) {
 	if (clueId == 222) {
-		Actor_Modify_Friendliness_To_Other(23, 0, 5);
+		Actor_Modify_Friendliness_To_Other(kActorOfficerLeary, kActorMcCoy, 5);
 	}
 	if (clueId == 215) {
-		Actor_Modify_Friendliness_To_Other(23, 0, -4);
+		Actor_Modify_Friendliness_To_Other(kActorOfficerLeary, kActorMcCoy, -4);
 	}
 }
 
-void AIScriptOfficerLeroy::ClickedByPlayer() {}
+void AIScriptOfficerLeary::ClickedByPlayer() {}
 
-void AIScriptOfficerLeroy::EnteredScene(int sceneId) {}
+void AIScriptOfficerLeary::EnteredScene(int sceneId) {}
 
-void AIScriptOfficerLeroy::OtherAgentEnteredThisScene(int otherActorId) {}
+void AIScriptOfficerLeary::OtherAgentEnteredThisScene(int otherActorId) {}
 
-void AIScriptOfficerLeroy::OtherAgentExitedThisScene(int otherActorId) {}
+void AIScriptOfficerLeary::OtherAgentExitedThisScene(int otherActorId) {}
 
-void AIScriptOfficerLeroy::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {}
+void AIScriptOfficerLeary::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {}
 
-void AIScriptOfficerLeroy::ShotAtAndMissed() {}
+void AIScriptOfficerLeary::ShotAtAndMissed() {}
 
-void AIScriptOfficerLeroy::ShotAtAndHit() {
-	if (Actor_Query_Goal_Number(23) == 307) {
-		Actor_Set_Health(23, 50, 50);
+void AIScriptOfficerLeary::ShotAtAndHit() {
+	if (Actor_Query_Goal_Number(kActorOfficerLeary) == 307) {
+		Actor_Set_Health(kActorOfficerLeary, 50, 50);
 	}
 }
 
-void AIScriptOfficerLeroy::Retired(int byActorId) {
-	Actor_Set_Goal_Number(23, 599);
+void AIScriptOfficerLeary::Retired(int byActorId) {
+	Actor_Set_Goal_Number(kActorOfficerLeary, 599);
 	Game_Flag_Set(607);
 }
 
-int AIScriptOfficerLeroy::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
-	if (otherActorId) {
+int AIScriptOfficerLeary::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+	if (otherActorId != kActorMcCoy) {
 		return 0;
 	}
 	switch (clueId) {
@@ -250,168 +250,168 @@ int AIScriptOfficerLeroy::GetFriendlinessModifierIfGetsClue(int otherActorId, in
 	return 0;
 }
 
-bool AIScriptOfficerLeroy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	switch (newGoalNumber) {
 	case 1:
-		AI_Movement_Track_Flush(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
 		if (Random_Query(1, 2) == 1) {
-			AI_Movement_Track_Append(23, 57, 7);
-			AI_Movement_Track_Append(23, 58, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 57, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 58, 7);
 		} else {
-			AI_Movement_Track_Append(23, 58, 7);
-			AI_Movement_Track_Append(23, 57, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 58, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 57, 7);
 		}
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 2:
 		if (Random_Query(1, 3) == 1) {
-			if (Random_Query(1, 2) == 1 && !Actor_Clue_Query(23, 16)) {
-				Actor_Clue_Acquire(23, 16, 0, -1);
-			} else if (!Actor_Clue_Query(23, 17)) {
-				Actor_Clue_Acquire(23, 17, 0, -1);
+			if (Random_Query(1, 2) == 1 && !Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA)) {
+				Actor_Clue_Acquire(kActorOfficerLeary, kClueCrowdInterviewA, 0, -1);
+			} else if (!Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB)) {
+				Actor_Clue_Acquire(kActorOfficerLeary, kClueCrowdInterviewB, 0, -1);
 			}
 		}
 		if (Game_Flag_Query(182)) {
-			if (Actor_Clue_Query(23, 16) && Actor_Clue_Query(23, 17)) {
-				Actor_Set_Goal_Number(23, 0);
+			if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA) && Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB)) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 0);
 			} else {
-				Actor_Set_Goal_Number(23, 1);
+				Actor_Set_Goal_Number(kActorOfficerLeary, 1);
 			}
 		} else {
-			Actor_Set_Goal_Number(23, 0);
+			Actor_Set_Goal_Number(kActorOfficerLeary, 0);
 		}
 		return true;
 	case 3:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 39, Random_Query(120, 240));
-		AI_Movement_Track_Append(23, 35, 0);
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 39, Random_Query(120, 240));
+		AI_Movement_Track_Append(kActorOfficerLeary, 35, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 99:
-		AI_Movement_Track_Flush(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
 		return false;
 	case 102:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 107, 0);
-		AI_Movement_Track_Append(23, 108, 0);
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 107, 0);
+		AI_Movement_Track_Append(kActorOfficerLeary, 108, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 300:
-		Actor_Set_Goal_Number(23, 305);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
 		return true;
 	case 305:
-		AI_Movement_Track_Flush(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
 		switch (Random_Query(1, 10)) {
 		case 1:
-			AI_Movement_Track_Append(23, 398, 15);
-			AI_Movement_Track_Append(23, 399, 0);
-			AI_Movement_Track_Append(23, 400, 0);
-			AI_Movement_Track_Append(23, 401, 0);
-			AI_Movement_Track_Append_With_Facing(23, 402, 3, 276);
-			AI_Movement_Track_Append(23, 403, 0);
-			AI_Movement_Track_Append(23, 404, 15);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 398, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 399, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 400, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 401, 0);
+			AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 402, 3, 276);
+			AI_Movement_Track_Append(kActorOfficerLeary, 403, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 404, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 2:
-			AI_Movement_Track_Append(23, 385, 10);
-			AI_Movement_Track_Append(23, 242, 2);
-			AI_Movement_Track_Append(23, 386, 2);
-			AI_Movement_Track_Append(23, 387, 15);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 385, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 242, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 386, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 387, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 3:
-			AI_Movement_Track_Append(23, 390, 10);
-			AI_Movement_Track_Append(23, 391, 0);
-			AI_Movement_Track_Append(23, 392, 5);
-			AI_Movement_Track_Append(23, 345, 0);
-			AI_Movement_Track_Append(23, 393, 15);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 390, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 391, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 392, 5);
+			AI_Movement_Track_Append(kActorOfficerLeary, 345, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 393, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 4:
-			AI_Movement_Track_Append(23, 381, 15);
-			AI_Movement_Track_Append(23, 382, 0);
-			AI_Movement_Track_Append(23, 383, 15);
-			AI_Movement_Track_Append(23, 382, 3);
-			AI_Movement_Track_Append(23, 384, 0);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 381, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 382, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 383, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 382, 3);
+			AI_Movement_Track_Append(kActorOfficerLeary, 384, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 5:
-			AI_Movement_Track_Append(23, 388, 10);
-			AI_Movement_Track_Append(23, 389, 10);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 388, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 389, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 6:
-			AI_Movement_Track_Append(23, 385, 10);
-			AI_Movement_Track_Append(23, 242, 2);
-			AI_Movement_Track_Append(23, 386, 2);
-			AI_Movement_Track_Append(23, 387, 15);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 385, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 242, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 386, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 387, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 7:
-			AI_Movement_Track_Append(23, 394, 15);
-			AI_Movement_Track_Append(23, 395, 0);
-			AI_Movement_Track_Append(23, 396, 0);
-			AI_Movement_Track_Append(23, 397, 15);
-			AI_Movement_Track_Append(23, 396, 0);
-			AI_Movement_Track_Append(23, 395, 0);
-			AI_Movement_Track_Append(23, 430, 15);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 394, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 395, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 396, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 397, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 396, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 395, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 430, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 8:
 			switch (Random_Query(1, 7)) {
 			case 1:
-				AI_Movement_Track_Append(23, 302, 0);
-				AI_Movement_Track_Append(23, 407, 0);
-				AI_Movement_Track_Append(23, 408, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 302, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 407, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 408, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 2:
-				AI_Movement_Track_Append(23, 536, 0);
-				AI_Movement_Track_Append(23, 537, 0);
-				AI_Movement_Track_Append(23, 538, 1);
-				AI_Movement_Track_Append(23, 537, 0);
-				AI_Movement_Track_Append(23, 536, 0);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 536, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 537, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 538, 1);
+				AI_Movement_Track_Append(kActorOfficerLeary, 537, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 536, 0);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 3:
-				AI_Movement_Track_Append(23, 296, 10);
-				AI_Movement_Track_Append(23, 409, 2);
-				AI_Movement_Track_Append(23, 296, 10);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 296, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 409, 2);
+				AI_Movement_Track_Append(kActorOfficerLeary, 296, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 4:
-				AI_Movement_Track_Append(23, 411, 10);
-				AI_Movement_Track_Append(23, 412, 5);
-				AI_Movement_Track_Append(23, 411, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 411, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 412, 5);
+				AI_Movement_Track_Append(kActorOfficerLeary, 411, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 5:
-				AI_Movement_Track_Append(23, 413, 10);
-				AI_Movement_Track_Append(23, 414, 0);
-				AI_Movement_Track_Append_With_Facing(23, 431, 0, 1017);
-				AI_Movement_Track_Append(23, 432, 10);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 413, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 414, 0);
+				AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 431, 0, 1017);
+				AI_Movement_Track_Append(kActorOfficerLeary, 432, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 6:
-				AI_Movement_Track_Append(23, 415, 0);
-				AI_Movement_Track_Append_With_Facing(23, 416, 0, 620);
-				AI_Movement_Track_Append(23, 417, 0);
-				AI_Movement_Track_Append(23, 418, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 415, 0);
+				AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 416, 0, 620);
+				AI_Movement_Track_Append(kActorOfficerLeary, 417, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 418, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 7:
-				AI_Movement_Track_Append(23, 405, 10);
-				AI_Movement_Track_Append(23, 406, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 405, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 406, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				return false;
 			default:
 				return false;
@@ -419,74 +419,74 @@ bool AIScriptOfficerLeroy::GoalChanged(int currentGoalNumber, int newGoalNumber)
 			//no break
 		case 9:
 			if (Random_Query(1, 2) - 1 == 1) {
-				AI_Movement_Track_Append(23, 433, 10);
-				AI_Movement_Track_Append(23, 434, 0);
-				AI_Movement_Track_Append(23, 435, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 433, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 434, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 435, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				return false;
 			}
-			AI_Movement_Track_Append(23, 420, 10);
-			AI_Movement_Track_Append(23, 422, 2);
-			AI_Movement_Track_Append(23, 421, 1);
-			AI_Movement_Track_Append_With_Facing(23, 422, 4, 182);
-			AI_Movement_Track_Append(23, 420, 10);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 420, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 422, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 421, 1);
+			AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 422, 4, 182);
+			AI_Movement_Track_Append(kActorOfficerLeary, 420, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			//no break
 		case 10:
-			AI_Movement_Track_Append(23, 310, 0);
-			AI_Movement_Track_Append(23, 307, 0);
-			AI_Movement_Track_Append(23, 309, 0);
-			AI_Movement_Track_Append(23, 310, 0);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 310, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 307, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 309, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 310, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			return false;
 		default:
 			return false;
 		}
 		//no break
 	case 306:
-		Actor_Set_Goal_Number(23, 305);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
 		return true;
 	case 307:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append_With_Facing(23, 416, 0, 556);
-		Actor_Change_Animation_Mode(23, 4);
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 416, 0, 556);
+		Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 308:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append_Run_With_Facing(23, 440, 2, 355);
-		AI_Movement_Track_Append_Run_With_Facing(23, 441, 0, 825);
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append_Run_With_Facing(kActorOfficerLeary, 440, 2, 355);
+		AI_Movement_Track_Append_Run_With_Facing(kActorOfficerLeary, 441, 0, 825);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 400:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 35, 0);
-		AI_Movement_Track_Repeat(23);
-		Actor_Set_Goal_Number(23, 410);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 35, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
 		return true;
 	case 420:
-		AI_Countdown_Timer_Reset(23, 1);
-		AI_Countdown_Timer_Start(23, 1, 120);
-		Actor_Set_Goal_Number(23, 410);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 1, 120);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
 		return true;
 	case 425:
-		AI_Countdown_Timer_Reset(23, 1);
-		AI_Countdown_Timer_Start(23, 1, 60);
-		Actor_Set_Goal_Number(23, 410);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 1, 60);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
 		return true;
 	case 430:
-		Actor_Set_Goal_Number(23, 410);
-		Actor_Set_Goal_Number(24, 410);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
+		Actor_Set_Goal_Number(kActorOfficerGrayford, 410);
 		return false;
 	default:
 		return false;
 	}
 }
 
-bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
+bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 	int v57;
 	int a1;
 
@@ -519,7 +519,7 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 589;
 			var_45D5B0_animation_state = 0;
 			var_45D5B4_animation_frame = 0;
-			Actor_Change_Animation_Mode(23, 0);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 0);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -530,7 +530,7 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 589;
 			var_45D5B0_animation_state = 0;
 			var_45D5B4_animation_frame = 0;
-			Actor_Change_Animation_Mode(23, 0);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 0);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -555,7 +555,7 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 			var_45D5B0_animation_state = 21;
 			var_45D5B4_animation_frame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -566,7 +566,7 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 			var_45D5B0_animation_state = 21;
 			var_45D5B4_animation_frame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -575,19 +575,19 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 		var_45D5B4_animation_frame++;
 		if (var_45D5B4_animation_frame == 4) {
 			if (Random_Query(1, 2) == 1) {
-				Sound_Play_Speech_Line(23, 9010, 75, 0, 99);
+				Sound_Play_Speech_Line(kActorOfficerLeary, 9010, 75, 0, 99);
 			} else {
-				Sound_Play_Speech_Line(23, 9015, 75, 0, 99);
+				Sound_Play_Speech_Line(kActorOfficerLeary, 9015, 75, 0, 99);
 			}
 		}
 		if (var_45D5B4_animation_frame == 5) {
-			Actor_Combat_AI_Hit_Attempt(23);
+			Actor_Combat_AI_Hit_Attempt(kActorOfficerLeary);
 		}
 		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(581)) {
 			var_45D5B0_animation_state = 21;
 			var_45D5B4_animation_frame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -888,93 +888,143 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 	}
 }
 
-bool AIScriptOfficerLeroy::ChangeAnimationMode(int mode) {
+bool AIScriptOfficerLeary::ChangeAnimationMode(int mode) {
 	int v1;
 
 	switch (mode) {
-	case 28:
-		Game_Flag_Set(199);
-		break;
-	case 27:
-		Game_Flag_Reset(199);
-		break;
-	case 22:
-		if (Random_Query(0, 1)) {
-			var_45D5B0_animation_state = 25;
-		} else {
-			var_45D5B0_animation_state = 26;
-		}
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 21:
-		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 24) {
-			if (Random_Query(0, 1)) {
-				var_45D5B0_animation_state = 25;
-			} else {
-				var_45D5B0_animation_state = 26;
-			}
+	case kAnimationModeIdle:
+		switch (var_45D5B0_animation_state) {
+		case 21:
+		case 24:
+			var_45D5B0_animation_state = 23;
 			var_45D5B4_animation_frame = 0;
-		} else {
-			if (Random_Query(0, 1)) {
-				var_45D5B0_animation_state = 29;
-			} else {
-				var_45D5B0_animation_state = 30;
-			}
+			break;
+		case 20:
+			v1 = var_45D5B4_animation_frame;
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			var_45D5B4_animation_frame = v1;
+			var_45D5B0_animation_state = 21;
+			break;
+		case 11:
+		case 12:
+		case 13:
+		case 14:
+		case 15:
+		case 16:
+		case 17:
+		case 18:
+		case 19:
+			var_45D5BC = 1;
+			break;
+		case 0:
+		case 23:
+			break;
+		default:
+			var_45D5B0_animation_state = 0;
 			var_45D5B4_animation_frame = 0;
+			var_45D5B8 = Random_Query(0, 1);
+			break;
 		}
 		break;
-	case 19:
+	case kAnimationModeWalk:
+		var_45D5B0_animation_state = 3;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeRun:
+		var_45D5B0_animation_state = 4;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 3:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 19;
-			var_462884 = 600;
+			var_462880 = 11;
+			var_462884 = 592;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 19;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 11;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 18:
+	case kAnimationModeCombatIdle:
+		switch (var_45D5B0_animation_state) {
+		case 21:
+		case 22:
+		case 24:
+			break;
+		case 7:
+		case 8:
+		case 9:
+		case 10:
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			break;
+		case 0:
+			var_45D5B0_animation_state = 22;
+			var_45D5B4_animation_frame = 0;
+			break;
+		default:
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			break;
+		}
+		break;
+	case 6:
+		var_45D5B0_animation_state = 24;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeCombatWalk:
+		var_45D5B0_animation_state = 7;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeCombatRun:
+		var_45D5B0_animation_state = 8;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 12:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 18;
-			var_462884 = 599;
+			var_462880 = 12;
+			var_462884 = 593;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 18;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 12;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 17:
+	case 13:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 17;
-			var_462884 = 598;
+			var_462880 = 13;
+			var_462884 = 594;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 17;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 13;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 16:
+	case 14:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 16;
-			var_462884 = 597;
+			var_462880 = 14;
+			var_462884 = 595;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 16;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 14;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
@@ -987,227 +1037,168 @@ bool AIScriptOfficerLeroy::ChangeAnimationMode(int mode) {
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
 			var_45D5B0_animation_state = 15;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 14:
+	case 16:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 14;
-			var_462884 = 595;
+			var_462880 = 16;
+			var_462884 = 597;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 14;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 16;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 13:
+	case 17:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 13;
-			var_462884 = 594;
+			var_462880 = 17;
+			var_462884 = 598;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 13;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 17;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 12:
+	case 18:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 12;
-			var_462884 = 593;
+			var_462880 = 18;
+			var_462884 = 599;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
 		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 12;
+			var_45D5B0_animation_state = 18;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 8:
-		var_45D5B0_animation_state = 8;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 7:
-		var_45D5B0_animation_state = 7;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 6:
-		var_45D5B0_animation_state = 24;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 4:
-		switch (var_45D5B0_animation_state) {
-		case 21:
-		case 22:
-		case 24:
-			return true;
-		case 7:
-		case 8:
-		case 9:
-		case 10:
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 0:
-			var_45D5B0_animation_state = 22;
-			var_45D5B4_animation_frame = 0;
-			break;
-		default:
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			break;
-		}
-		break;
-	case 3:
+	case 19:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 11;
-			var_462884 = 592;
+			var_462880 = 19;
+			var_462884 = 600;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
 		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 11;
+			var_45D5B0_animation_state = 19;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 2:
-		var_45D5B0_animation_state = 4;
+	case 21:
+		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 24) {
+			if (Random_Query(0, 1)) {
+				var_45D5B0_animation_state = 25;
+			} else {
+				var_45D5B0_animation_state = 26;
+			}
+			var_45D5B4_animation_frame = 0;
+		} else {
+			if (Random_Query(0, 1)) {
+				var_45D5B0_animation_state = 29;
+			} else {
+				var_45D5B0_animation_state = 30;
+			}
+			var_45D5B4_animation_frame = 0;
+		}
+		break;
+	case 22:
+		if (Random_Query(0, 1)) {
+			var_45D5B0_animation_state = 25;
+		} else {
+			var_45D5B0_animation_state = 26;
+		}
 		var_45D5B4_animation_frame = 0;
 		break;
-	case 1:
-		var_45D5B0_animation_state = 3;
+	case 27:
+		Game_Flag_Reset(199);
+		break;
+	case 28:
+		Game_Flag_Set(199);
+		break;
+	case 44:
+		var_45D5B0_animation_state = 5;
 		var_45D5B4_animation_frame = 0;
 		break;
-	case 0:
-		switch (var_45D5B0_animation_state) {
-		case 21:
-		case 24:
-			var_45D5B0_animation_state = 23;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 20:
-			v1 = var_45D5B4_animation_frame;
-			Actor_Change_Animation_Mode(23, 4);
-			var_45D5B4_animation_frame = v1;
-			var_45D5B0_animation_state = 21;
-			break;
-		case 11:
-		case 12:
-		case 13:
-		case 14:
-		case 15:
-		case 16:
-		case 17:
-		case 18:
-		case 19:
-			var_45D5BC = 1;
-			break;
-		case 0:
-		case 23:
-			return true;
-		default:
-			var_45D5B0_animation_state = 0;
-			var_45D5B4_animation_frame = 0;
-			var_45D5B8 = Random_Query(0, 1);
-			break;
-		}
+	case 45:
+		var_45D5B0_animation_state = 6;
+		var_45D5B4_animation_frame = 0;
 		break;
-	case 5:
-	case 9:
-	case 10:
-	case 11:
-	case 20:
-	case 23:
-	case 24:
-	case 25:
-	case 26:
-		return true;
-	default:
-		switch (mode) {
-		case 58:
-			var_45D5B0_animation_state = 20;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 48:
-			if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 22 || var_45D5B0_animation_state == 24) {
-				var_45D5B0_animation_state = 28;
-				var_45D5B4_animation_frame = 0;
-			} else {
-				var_45D5B0_animation_state = 27;
-				var_45D5B4_animation_frame = 0;
-			}
-			break;
-		case 47:
-			var_45D5B0_animation_state = 10;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 46:
-			var_45D5B0_animation_state = 9;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 45:
-			var_45D5B0_animation_state = 6;
+	case 46:
+		var_45D5B0_animation_state = 9;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 47:
+		var_45D5B0_animation_state = 10;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 48:
+		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 22 || var_45D5B0_animation_state == 24) {
+			var_45D5B0_animation_state = 28;
 			var_45D5B4_animation_frame = 0;
-			break;
-		case 44:
-			var_45D5B0_animation_state = 5;
+		} else {
+			var_45D5B0_animation_state = 27;
 			var_45D5B4_animation_frame = 0;
-			break;
-		default:
-			return true;
 		}
 		break;
+	case 58:
+		var_45D5B0_animation_state = 20;
+		var_45D5B4_animation_frame = 0;
+		break;
 	}
 	return true;
 }
 
-void AIScriptOfficerLeroy::QueryAnimationState(int *animationState, int *animationFrame, int *a3, int *a4) {
+void AIScriptOfficerLeary::QueryAnimationState(int *animationState, int *animationFrame, int *a3, int *a4) {
 	*animationState = var_45D5B0_animation_state;
 	*animationFrame = var_45D5B4_animation_frame;
 	*a3 = var_462880;
 	*a4 = var_462884;
 }
 
-void AIScriptOfficerLeroy::SetAnimationState(int animationState, int animationFrame, int a3, int a4) {
+void AIScriptOfficerLeary::SetAnimationState(int animationState, int animationFrame, int a3, int a4) {
 	var_45D5B0_animation_state = animationState;
 	var_45D5B4_animation_frame = animationFrame;
 	var_462880 = a3;
 	var_462884 = a4;
 }
 
-bool AIScriptOfficerLeroy::ReachedMovementTrackWaypoint(int waypointId) {
+bool AIScriptOfficerLeary::ReachedMovementTrackWaypoint(int waypointId) {
 	if (waypointId == 57 || waypointId == 58) {
 		sub_431408();
-		AI_Countdown_Timer_Reset(23, 2);
-		AI_Countdown_Timer_Start(23, 2, 6);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 2);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 2, 6);
 	}
 	return true;
 }
 
-void AIScriptOfficerLeroy::FledCombat() {
-	Actor_Set_Goal_Number(23, 300);
+void AIScriptOfficerLeary::FledCombat() {
+	Actor_Set_Goal_Number(kActorOfficerLeary, 300);
 }
 
-bool AIScriptOfficerLeroy::sub_431408() {
+bool AIScriptOfficerLeary::sub_431408() {
 	Game_Flag_Set(199);
 	return true;
 }
 
-bool AIScriptOfficerLeroy::sub_431420() {
+bool AIScriptOfficerLeary::sub_431420() {
 	Game_Flag_Reset(199);
 	return true;
 }
diff --git a/engines/bladerunner/script/ai/runciter.cpp b/engines/bladerunner/script/ai/runciter.cpp
index 998f385a4f..d34b4a8a01 100644
--- a/engines/bladerunner/script/ai/runciter.cpp
+++ b/engines/bladerunner/script/ai/runciter.cpp
@@ -33,15 +33,15 @@ void AIScriptRunciter::Initialize() {
 	var_45CD80 = 1;
 	var_45CD84 = 0;
 	var_45CD88 = 0;
-	Actor_Set_Goal_Number(15, 0);
+	Actor_Set_Goal_Number(kActorRunciter, 0);
 }
 
 bool AIScriptRunciter::Update() {
-	if (Actor_Query_Goal_Number(15) == 0 && Game_Flag_Query(186)) {
-		Actor_Set_Goal_Number(15, 2);
+	if (Actor_Query_Goal_Number(kActorRunciter) == 0 && Game_Flag_Query(186)) {
+		Actor_Set_Goal_Number(kActorRunciter, 2);
 	}
-	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(15) < 300) {
-		Actor_Set_Goal_Number(15, 300);
+	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(kActorRunciter) < 300) {
+		Actor_Set_Goal_Number(kActorRunciter, 300);
 	}
 	return false;
 }
@@ -49,24 +49,24 @@ bool AIScriptRunciter::Update() {
 void AIScriptRunciter::TimerExpired(int timer) {}
 
 void AIScriptRunciter::CompletedMovementTrack() {
-	if (Actor_Query_Goal_Number(15) == 1) {
+	if (Actor_Query_Goal_Number(kActorRunciter) == 1) {
 		if (Player_Query_Current_Scene() == 79) {
 			switch (Random_Query(1, 5)) {
 			case 2:
 			case 3:
-				ADQ_Add(15, 530, -1);
+				ADQ_Add(kActorRunciter, 530, -1);
 				break;
 			case 1:
 			case 5:
-				ADQ_Add(15, 80, -1);
+				ADQ_Add(kActorRunciter, 80, -1);
 				break;
 			case 4:
-				ADQ_Add(15, 930, -1);
+				ADQ_Add(kActorRunciter, 930, -1);
 				break;
 			}
 		}
-		Actor_Set_Goal_Number(15, 99);
-		Actor_Set_Goal_Number(15, 1);
+		Actor_Set_Goal_Number(kActorRunciter, 99);
+		Actor_Set_Goal_Number(kActorRunciter, 1);
 		//return true;
 	}
 	//return false;
@@ -83,48 +83,48 @@ void AIScriptRunciter::OtherAgentEnteredThisScene(int otherActorId) {}
 void AIScriptRunciter::OtherAgentExitedThisScene(int otherActorId) {}
 
 void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
-	if (Actor_Query_Goal_Number(15) == 300 && combatMode == 1 && !Game_Flag_Query(705)) {
-		Actor_Set_Targetable(15, true);
-		Actor_Face_Actor(15, 0, true);
-		Actor_Says(15, 420, 12);
-		Actor_Face_Actor(0, 15, true);
-		Actor_Change_Animation_Mode(0, 5);
-		if (Actor_Clue_Query(0, 158)) {
-			Actor_Says(0, 4770, -1);
-			Actor_Says(15, 590, 13);
-			Actor_Says(0, 4775, -1);
-			Actor_Says(15, 600, 17);
+	if (Actor_Query_Goal_Number(kActorRunciter) == 300 && combatMode == 1 && !Game_Flag_Query(705)) {
+		Actor_Set_Targetable(kActorRunciter, true);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Actor_Says(kActorRunciter, 420, 12);
+		Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+		Actor_Change_Animation_Mode(kActorMcCoy, 5);
+		if (Actor_Clue_Query(kActorMcCoy, kClueZubensMotive)) {
+			Actor_Says(kActorMcCoy, 4770, -1);
+			Actor_Says(kActorRunciter, 590, 13);
+			Actor_Says(kActorMcCoy, 4775, -1);
+			Actor_Says(kActorRunciter, 600, 17);
 			Sound_Play(492, 100, 0, 100, 50);
-			Actor_Says(0, 4780, -1);
-			Actor_Says(15, 610, 18);
-			Actor_Says(0, 4785, -1);
-			Actor_Says(15, 620, 15);
+			Actor_Says(kActorMcCoy, 4780, -1);
+			Actor_Says(kActorRunciter, 610, 18);
+			Actor_Says(kActorMcCoy, 4785, -1);
+			Actor_Says(kActorRunciter, 620, 15);
 			if (Game_Flag_Query(46)) {
-				Actor_Says(15, 630, 12);
-				Actor_Says(15, 640, 17);
-				Actor_Says(0, 4790, -1);
-				Actor_Says(15, 650, 18);
-				Actor_Says(15, 660, 19);
-				Actor_Clue_Acquire(0, 280, 1, 15);
+				Actor_Says(kActorRunciter, 630, 12);
+				Actor_Says(kActorRunciter, 640, 17);
+				Actor_Says(kActorMcCoy, 4790, -1);
+				Actor_Says(kActorRunciter, 650, 18);
+				Actor_Says(kActorRunciter, 660, 19);
+				Actor_Clue_Acquire(kActorMcCoy, kClueRuncitersConfession1, 1, kActorRunciter);
 			} else {
-				Actor_Says(15, 670, 18);
-				Actor_Says(0, 4795, -1);
-				Actor_Says(15, 730, 17);
+				Actor_Says(kActorRunciter, 670, 18);
+				Actor_Says(kActorMcCoy, 4795, -1);
+				Actor_Says(kActorRunciter, 730, 17);
 			}
-		} else if (Actor_Clue_Query(0, 76)) {
-			Actor_Says(0, 4730, -1);
-			Actor_Says(15, 480, 17);
-			Actor_Says(0, 4735, -1);
-			Actor_Says(15, 490, 16);
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
+			Actor_Says(kActorMcCoy, 4730, -1);
+			Actor_Says(kActorRunciter, 480, 17);
+			Actor_Says(kActorMcCoy, 4735, -1);
+			Actor_Says(kActorRunciter, 490, 16);
 			Sound_Play(492, 100, 0, 100, 50);
-			Actor_Says(0, 4740, -1);
-			Actor_Says(15, 500, 18);
-			Actor_Says(15, 510, 19);
-			Actor_Says(0, 4745, -1);
-			Actor_Says(0, 4750, -1);
-			Actor_Says(15, 520, 17);
-			Actor_Says(15, 530, 18);
-			Actor_Says(15, 540, 16);
+			Actor_Says(kActorMcCoy, 4740, -1);
+			Actor_Says(kActorRunciter, 500, 18);
+			Actor_Says(kActorRunciter, 510, 19);
+			Actor_Says(kActorMcCoy, 4745, -1);
+			Actor_Says(kActorMcCoy, 4750, -1);
+			Actor_Says(kActorRunciter, 520, 17);
+			Actor_Says(kActorRunciter, 530, 18);
+			Actor_Says(kActorRunciter, 540, 16);
 		}
 		Game_Flag_Set(705);
 	}
@@ -133,19 +133,19 @@ void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatM
 void AIScriptRunciter::ShotAtAndMissed() {}
 
 void AIScriptRunciter::ShotAtAndHit() {
-	Actor_Set_Targetable(15, false);
-	Actor_Change_Animation_Mode(15, 48);
-	Actor_Set_Goal_Number(15, 599);
+	Actor_Set_Targetable(kActorRunciter, false);
+	Actor_Change_Animation_Mode(kActorRunciter, 48);
+	Actor_Set_Goal_Number(kActorRunciter, 599);
 	Delay(2000);
-	if (Actor_Clue_Query(0, 158)) {
-		Actor_Voice_Over(2050, 99);
-		Actor_Voice_Over(2060, 99);
+	if (Actor_Clue_Query(kActorMcCoy, kClueZubensMotive)) {
+		Actor_Voice_Over(2050, kActorVoiceOver);
+		Actor_Voice_Over(2060, kActorVoiceOver);
 	} else {
-		Actor_Voice_Over(2070, 99);
-		Actor_Voice_Over(2080, 99);
-		Actor_Voice_Over(2090, 99);
+		Actor_Voice_Over(2070, kActorVoiceOver);
+		Actor_Voice_Over(2080, kActorVoiceOver);
+		Actor_Voice_Over(2090, kActorVoiceOver);
 	}
-	Actor_Modify_Friendliness_To_Other(5, 0, 3);
+	Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 3);
 }
 
 void AIScriptRunciter::Retired(int byActorId) {}
@@ -156,38 +156,38 @@ int AIScriptRunciter::GetFriendlinessModifierIfGetsClue(int otherActorId, int cl
 
 bool AIScriptRunciter::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	if (newGoalNumber == 0) {
-		Actor_Put_In_Set(15, 16);
-		Actor_Set_At_Waypoint(15, 92, 567);
+		Actor_Put_In_Set(kActorRunciter, 16);
+		Actor_Set_At_Waypoint(kActorRunciter, 92, 567);
 		return false;
 	}
 	if (newGoalNumber == 1) {
-		AI_Movement_Track_Flush(15);
+		AI_Movement_Track_Flush(kActorRunciter);
 		if (Random_Query(0, 1) == 1) {
 			if (Random_Query(0, 1) == 0) {
-				AI_Movement_Track_Append_With_Facing(15, 89, Random_Query(6, 10), 567);
+				AI_Movement_Track_Append_With_Facing(kActorRunciter, 89, Random_Query(6, 10), 567);
 			}
-			AI_Movement_Track_Append_With_Facing(15, 93, Random_Query(2, 6), 1002);
-			AI_Movement_Track_Append(15, 92, 5);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 93, Random_Query(2, 6), 1002);
+			AI_Movement_Track_Append(kActorRunciter, 92, 5);
 		} else {
-			AI_Movement_Track_Append_With_Facing(15, 91, Random_Query(3, 10), 120);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 91, Random_Query(3, 10), 120);
 			if (Random_Query(1, 3) == 1) {
-				AI_Movement_Track_Append_With_Facing(15, 93, Random_Query(2, 6), 1002);
+				AI_Movement_Track_Append_With_Facing(kActorRunciter, 93, Random_Query(2, 6), 1002);
 			}
-			AI_Movement_Track_Append_With_Facing(15, 90, Random_Query(5, 10), 170);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 90, Random_Query(5, 10), 170);
 		}
-		AI_Movement_Track_Repeat(15);
+		AI_Movement_Track_Repeat(kActorRunciter);
 		return true;
 	}
 	if (newGoalNumber == 2) {
-		AI_Movement_Track_Flush(15);
-		AI_Movement_Track_Append(15, 39, 120);
-		AI_Movement_Track_Append(15, 40, 0);
-		AI_Movement_Track_Repeat(15);
+		AI_Movement_Track_Flush(kActorRunciter);
+		AI_Movement_Track_Append(kActorRunciter, 39, 120);
+		AI_Movement_Track_Append(kActorRunciter, 40, 0);
+		AI_Movement_Track_Repeat(kActorRunciter);
 		return false;
 	}
 	if (newGoalNumber == 300) {
-		Actor_Put_In_Set(15, 16);
-		Actor_Set_At_Waypoint(15, 93, 1007);
+		Actor_Put_In_Set(kActorRunciter, 16);
+		Actor_Set_At_Waypoint(kActorRunciter, 93, 1007);
 		return false;
 	}
 	return false;
@@ -242,7 +242,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 			var_45CD70_animation_state = 0;
 			var_45CD74_animation_frame = 0;
 			var_45CD78 = 0;
-			Actor_Change_Animation_Mode(15, 0);
+			Actor_Change_Animation_Mode(kActorRunciter, kAnimationModeCombatIdle);
 		}
 		*frame = var_45CD74_animation_frame;
 		break;
@@ -464,53 +464,67 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 }
 
 bool AIScriptRunciter::ChangeAnimationMode(int mode) {
-
 	switch (mode) {
-	case 23:
-		var_45CD70_animation_state = 12;
-		var_45CD74_animation_frame = 0;
+	case kAnimationModeCombatIdle:
+		if (var_45CD70_animation_state >= 2 && var_45CD70_animation_state <= 11) {
+			var_45CD88 = 1;
+		} else {
+			var_45CD70_animation_state = 0;
+			var_45CD74_animation_frame = 0;
+			var_45CD78 = 0;
+		}
 		break;
-	case 19:
+	case kAnimationModeWalk:
+		if (var_45CD70_animation_state > 1) {
+			var_45CD70_animation_state = 1;
+			var_45CD74_animation_frame = 0;
+		} else if (!var_45CD70_animation_state) {
+			var_45CD70_animation_state = 13;
+			var_462800 = 1;
+			var_462804 = 526;
+		}
+		break;
+	case 3:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 11;
-			var_462804 = 541;
+			var_462800 = 2;
+			var_462804 = 526;
 		}
 		var_45CD88 = 0;
 		break;
-	case 18:
+	case 12:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 10;
-			var_462804 = 540;
+			var_462800 = 4;
+			var_462804 = 534;
 		}
 		var_45CD88 = 0;
 		break;
-	case 17:
+	case 13:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 9;
-			var_462804 = 539;
+			var_462800 = 5;
+			var_462804 = 535;
 		}
 		var_45CD88 = 0;
 		break;
-	case 16:
+	case 14:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 8;
-			var_462804 = 538;
+			var_462800 = 6;
+			var_462804 = 536;
 		}
 		var_45CD88 = 0;
 		break;
@@ -525,87 +539,57 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
 		}
 		var_45CD88 = 0;
 		break;
-	case 14:
+	case 16:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 6;
-			var_462804 = 536;
+			var_462800 = 8;
+			var_462804 = 538;
 		}
 		var_45CD88 = 0;
 		break;
-	case 13:
+	case 17:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 5;
-			var_462804 = 535;
+			var_462800 = 9;
+			var_462804 = 539;
 		}
 		var_45CD88 = 0;
 		break;
-	case 12:
+	case 18:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 4;
-			var_462804 = 534;
+			var_462800 = 10;
+			var_462804 = 540;
 		}
 		var_45CD88 = 0;
 		break;
-	case 3:
+	case 19:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 2;
-			var_462804 = 526;
+			var_462800 = 11;
+			var_462804 = 541;
 		}
 		var_45CD88 = 0;
 		break;
-	case 1:
-		if (var_45CD70_animation_state > 1) {
-			var_45CD70_animation_state = 1;
-			var_45CD74_animation_frame = 0;
-		} else if (!var_45CD70_animation_state) {
-			var_45CD70_animation_state = 13;
-			var_462800 = 1;
-			var_462804 = 526;
-		}
-		break;
-	case 0:
-		if (var_45CD70_animation_state >= 2 && var_45CD70_animation_state <= 11) {
-			var_45CD88 = 1;
-		} else {
-			var_45CD70_animation_state = 0;
-			var_45CD74_animation_frame = 0;
-			var_45CD78 = 0;
-		}
-		break;
-	case 2:
-	case 4:
-	case 5:
-	case 6:
-	case 7:
-	case 8:
-	case 9:
-	case 10:
-	case 11:
-	case 20:
-	case 21:
-	case 22:
+	case 23:
+		var_45CD70_animation_state = 12;
+		var_45CD74_animation_frame = 0;
 		break;
-	default:
-		if (mode == 48) {
-			var_45CD70_animation_state = 14;
-			var_45CD74_animation_frame = 0;
-		}
+	case 48:
+		var_45CD70_animation_state = 14;
+		var_45CD74_animation_frame = 0;
 		break;
 	}
 	return true;
@@ -627,23 +611,21 @@ void AIScriptRunciter::SetAnimationState(int animationState, int animationFrame,
 
 bool AIScriptRunciter::ReachedMovementTrackWaypoint(int waypointId) {
 	switch (waypointId) {
-	case 93:
-		Actor_Face_Heading(15, 1002, true);
+	case 89:
+		Actor_Face_Heading(kActorRunciter, 567, true);
 		break;
-	case 92:
-		Actor_Face_Heading(15, 664, true);
+	case 90:
+		Actor_Face_Heading(kActorRunciter, 170, true);
 		break;
 	case 91:
-		Actor_Face_Heading(15, 120, true);
+		Actor_Face_Heading(kActorRunciter, 120, true);
 		break;
-	case 90:
-		Actor_Face_Heading(15, 170, true);
+	case 92:
+		Actor_Face_Heading(kActorRunciter, 664, true);
 		break;
-	case 89:
-		Actor_Face_Heading(15, 567, true);
+	case 93:
+		Actor_Face_Heading(kActorRunciter, 1002, true);
 		break;
-	default:
-		return true;
 	}
 	return true;
 }
diff --git a/engines/bladerunner/script/esper.cpp b/engines/bladerunner/script/esper.cpp
index 778542f6c9..873841b839 100644
--- a/engines/bladerunner/script/esper.cpp
+++ b/engines/bladerunner/script/esper.cpp
@@ -28,120 +28,120 @@ namespace BladeRunner {
 
 void ScriptESPER::SCRIPT_ESPER_DLL_Initialize() {
 	int v0 = 0;
-	if (Actor_Clue_Query(0, 12)) {
-		if (!Actor_Clue_Query(0, 28)) {
-			Actor_Says(39, 160, 3);
-			Actor_Says(39, 180, 3);
-			Actor_Clue_Acquire(0, 28, 1, 15);
+	if (Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueRuncitersViewA)) {
+			Actor_Says(kActorAnsweringMachine, 160, 3);
+			Actor_Says(kActorAnsweringMachine, 180, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueRuncitersViewA, 1, kActorRunciter);
 			v0 = 1;
 		}
 		ESPER_Add_Photo("RC02_FA.IMG", 0, 0);
-		if (!Actor_Clue_Query(0, 29)) {
-			Actor_Clue_Acquire(0, 29, 1, 15);
+		if (!Actor_Clue_Query(kActorMcCoy, kClueRuncitersViewB)) {
+			Actor_Clue_Acquire(kActorMcCoy, kClueRuncitersViewB, 1, kActorRunciter);
 		}
 		ESPER_Add_Photo("RC02_FA.IMG", 1, 1);
 	}
-	if (Actor_Clue_Query(0, 89)) {
-		if (!Actor_Clue_Query(0, 245)) {
-			Actor_Says(39, 160, 3);
-			Actor_Says(39, 170, 3);
-			Actor_Clue_Acquire(0, 245, 1, -1);
+	if (Actor_Clue_Query(kActorMcCoy, kClueEarlyQsClub)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueOuterDressingRoom)) {
+			Actor_Says(kActorAnsweringMachine, 160, 3);
+			Actor_Says(kActorAnsweringMachine, 170, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueOuterDressingRoom, 1, -1);
 			v0 = 1;
 		}
 		ESPER_Add_Photo("NR060000.IMG", 2, 2);
 	}
-	if (Actor_Clue_Query(0, 88)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDektorasDressingRoom)) {
 		ESPER_Add_Photo("NR070000.IMG", 3, 3);
 	}
-	if (Actor_Clue_Query(0, 246)) {
+	if (Actor_Clue_Query(kActorMcCoy, kCluePhotoOfMcCoy1)) {
 		ESPER_Add_Photo("HC01AR11.IMG", 4, 4);
 	}
-	if (Actor_Clue_Query(0, 247)) {
+	if (Actor_Clue_Query(kActorMcCoy, kCluePhotoOfMcCoy2)) {
 		ESPER_Add_Photo("HC01AR12.IMG", 5, 5);
 	}
-	if (Actor_Clue_Query(0, 260)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueChinaBar)) {
 		ESPER_Add_Photo("HC02CB1.IMG", 6, 6);
 	}
-	if (Actor_Clue_Query(0, 257)) {
-		if (!Actor_Clue_Query(0, 78)) {
-			Actor_Says(39, 160, 3);
-			Actor_Says(39, 170, 3);
-			Actor_Clue_Acquire(0, 78, 1, 32);
+	if (Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityDisc)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityPhoto)) {
+			Actor_Says(kActorAnsweringMachine, 160, 3);
+			Actor_Says(kActorAnsweringMachine, 170, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueChinaBarSecurityPhoto, 1, kActorHawkersBarkeep);
 			v0 = 1;
 		}
 		ESPER_Add_Photo("HC02CB2.IMG", 7, 7);
 	}
-	if (Actor_Clue_Query(0, 45)) {
-		if (!Actor_Clue_Query(0, 259)) {
-			Actor_Says(39, 160, 3);
-			Actor_Says(39, 170, 3);
-			Actor_Clue_Acquire(0, 259, 1, 17);
+	if (Actor_Clue_Query(kActorMcCoy, kClueTyrellSecurity)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueTyrellSecurityPhoto)) {
+			Actor_Says(kActorAnsweringMachine, 160, 3);
+			Actor_Says(kActorAnsweringMachine, 170, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSecurityPhoto, 1, kActorTyrellGuard);
 			v0 = 1;
 		}
 		ESPER_Add_Photo("TB060000.IMG", 8, 8);
 	}
-	if (Actor_Clue_Query(0, 86)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueMoonbus1)) {
 		ESPER_Add_Photo("KP06.IMG", 9, 9);
 	}
 	if (v0) {
-		Actor_Says(39, 200, 3);
+		Actor_Says(kActorAnsweringMachine, 200, 3);
 	}
 }
 
 void ScriptESPER::SCRIPT_ESPER_DLL_Photo_Selected(int photo) {
 	switch (photo) {
 	case 9:
-		Actor_Says(39, 270, 3);
+		Actor_Says(kActorAnsweringMachine, 270, 3);
 		ESPER_Define_Special_Region(22, 1208, 330, 1218, 340, 1050, 160, 1279, 550, 956, 203, 1278, 497, "KP06ESP1");
 		ESPER_Define_Special_Region(23, 854, 371, 858, 375, 790, 320, 940, 560, 722, 220, 1000, 505, "KP06ESP2");
 		ESPER_Define_Special_Region(24, 615, 325, 648, 365, 440, 220, 820, 959, 326, 140, 948, 474, "KP06ESP3");
 		ESPER_Define_Special_Region(25, 373, 417, 382, 426, 310, 370, 480, 560, 228, 323, 493, 509, "KP06ESP4");
 		break;
 	case 8:
-		Actor_Says(39, 230, 3);
+		Actor_Says(kActorAnsweringMachine, 230, 3);
 		ESPER_Define_Special_Region(18, 166, 623, 177, 632, 38, 528, 320, 770, 26, 530, 313, 771, "TB06ESP1");
 		ESPER_Define_Special_Region(19, 156, 356, 164, 360, 60, 280, 250, 460, 14, 251, 257, 459, "TB06ESP2");
 		ESPER_Define_Special_Region(20, 395, 158, 410, 185, 270, 70, 760, 640, 125, 0, 560, 307, "TB06ESP3");
 		ESPER_Define_Special_Region(21, 343, 269, 352, 276, 290, 200, 410, 340, 157, 118, 565, 405, "TB06ESP4");
 		break;
 	case 7:
-		Actor_Says(39, 250, 3);
+		Actor_Says(kActorAnsweringMachine, 250, 3);
 		ESPER_Define_Special_Region(16, 1171, 457, 1184, 466, 1060, 370, 1279, 730, 910, 300, 1279, 678, "HC02ESP3");
 		ESPER_Define_Special_Region(17, 328, 398, 340, 413, 250, 350, 460, 640, 100, 236, 530, 612, "HC02ESP4");
 		break;
 	case 6:
-		Actor_Says(39, 250, 3);
+		Actor_Says(kActorAnsweringMachine, 250, 3);
 		ESPER_Define_Special_Region(14, 879, 221, 882, 225, 640, 0, 1000, 512, 265, 146, 1014, 813, "HC02ESP5");
 		ESPER_Define_Special_Region(15, 660, 550, 678, 572, 560, 480, 850, 910, 265, 146, 1014, 813, "HC02ESP2");
 		break;
 	case 5:
-		Actor_Says(39, 240, 3);
+		Actor_Says(kActorAnsweringMachine, 240, 3);
 		ESPER_Define_Special_Region(13, 720, 485, 728, 491, 640, 390, 780, 630, 257, 94, 1013, 804, "HC01ESP3");
 		break;
 	case 4:
-		Actor_Says(39, 240, 3);
+		Actor_Says(kActorAnsweringMachine, 240, 3);
 		ESPER_Define_Special_Region(11, 420, 436, 434, 450, 350, 380, 520, 680, 257, 94, 1013, 804, "HC01ESP1");
 		ESPER_Define_Special_Region(12, 407, 489, 410, 509, 370, 450, 500, 560, 257, 94, 1013, 804, "HC01ESP2");
 		break;
 	case 3:
-		Actor_Says(39, 260, 3);
+		Actor_Says(kActorAnsweringMachine, 260, 3);
 		ESPER_Define_Special_Region(10, 893, 298, 901, 306, 770, 230, 980, 500, 340, 216, 942, 747, "NR07ESP1");
 		ESPER_Define_Special_Region(9, 479, 381, 482, 385, 430, 320, 520, 470, 265, 200, 815, 720, "NR07ESP2");
 		break;
 	case 2:
-		Actor_Says(39, 260, 3);
+		Actor_Says(kActorAnsweringMachine, 260, 3);
 		ESPER_Define_Special_Region(7, 102, 809, 108, 861, 20, 720, 200, 930, 191, 95, 1085, 870, "NR06ESP1");
 		ESPER_Define_Special_Region(8, 661, 437, 664, 443, 530, 320, 720, 600, 330, 200, 945, 750, "NR06ESP2");
 		break;
 	case 1:
-		Actor_Says(39, 220, 3);
+		Actor_Says(kActorAnsweringMachine, 220, 3);
 		ESPER_Define_Special_Region(3, 560, 210, 580, 220, 450, 130, 680, 540, 0, 0, 1279, 959, "RC02ESP4");
 		ESPER_Define_Special_Region(4, 584, 482, 595, 493, 460, 400, 660, 540, 0, 0, 1279, 959, "RC02ESP5");
 		ESPER_Define_Special_Region(5, 669, 322, 675, 329, 620, 230, 740, 390, 0, 0, 1279, 959, "RC02ESP6");
 		ESPER_Define_Special_Region(6, 698, 236, 748, 274, 600, 160, 850, 420, 160, 0, 1279, 750, "RC02ESP7");
 		break;
 	case 0:
-		Actor_Says(39, 220, 3);
+		Actor_Says(kActorAnsweringMachine, 220, 3);
 		ESPER_Define_Special_Region(0, 490, 511, 496, 517, 400, 440, 580, 580, 380, 260, 900, 710, "RC02ESP1");
 		ESPER_Define_Special_Region(1, 473, 342, 479, 349, 400, 300, 580, 580, 350, 250, 900, 710, "RC02ESP2");
 		ESPER_Define_Special_Region(2, 444, 215, 461, 223, 380, 120, 570, 340, 354, 160, 577, 354, "RC02ESP3");
@@ -156,34 +156,34 @@ bool ScriptESPER::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 	case 9:
 		switch (region) {
 		case 22:
-			Actor_Says(0, 8705, 3);
-			if (!Actor_Clue_Query(0, 274)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 8705, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueMoonbusReflection)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 274, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueMoonbusReflection, 1, -1);
 			}
 			break;
 		case 23:
-			Actor_Voice_Over(4240, 99);
-			if (!Actor_Clue_Query(0, 275)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4240, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueMcCoyAtMoonbus)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 275, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueMcCoyAtMoonbus, 1, -1);
 			}
 			break;
 		case 24:
-			Actor_Voice_Over(4220, 99);
-			if (!Actor_Clue_Query(0, 276)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4220, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueClovisAtMoonbus)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 276, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueClovisAtMoonbus, 1, -1);
 			}
 			break;
 		case 25:
-			if (!Actor_Clue_Query(0, 277)) {
-				Actor_Says(0, 6945, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueSadikAtMoonbus)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 277, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueSadikAtMoonbus, 1, -1);
 			}
 			break;
 		}
@@ -191,190 +191,190 @@ bool ScriptESPER::SCRIPT_ESPER_DLL_Special_Region_Selected(int photo, int region
 	case 8:
 		switch (region) {
 		case 18:
-			Actor_Says(0, 8775, 3);
-			if (!Actor_Clue_Query(0, 263)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 8775, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueKingstonKitchenBox2)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 263, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueKingstonKitchenBox2, 1, -1);
 			}
 			break;
 		case 19:
-			Actor_Voice_Over(4160, 99);
-			if (!Actor_Clue_Query(0, 262)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4160, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueDogCollar2)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 262, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueDogCollar2, 1, -1);
 			}
 			break;
 		case 20:
-			Actor_Voice_Over(2140, 99);
-			Actor_Voice_Over(2150, 99);
-			Actor_Voice_Over(2160, 99);
-			if (!Actor_Clue_Query(0, 47)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(2140, kActorVoiceOver);
+			Actor_Voice_Over(2150, kActorVoiceOver);
+			Actor_Voice_Over(2160, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 47, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueBombingSuspect, 1, -1);
 			}
 			break;
 		case 21:
-			Actor_Says(0, 8890, 3);
-			if (!Actor_Clue_Query(0, 261)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 8890, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kCluePlasticExplosive)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 261, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kCluePlasticExplosive, 1, -1);
 			}
 			break;
 		}
 		return false;
 	case 7:
 		if (region == 16) {
-			Actor_Voice_Over(4080, 99);
-			if (!Actor_Clue_Query(0, 255)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4080, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueIzo)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 255, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueIzo, 1, -1);
 			}
 		} else if (region == 17) {
-			Actor_Voice_Over(4210, 99);
-			if (!Actor_Clue_Query(0, 256)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4210, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueGuzza)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 256, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueGuzza, 1, -1);
 			}
 		}
 		return false;
 	case 6:
 		if (region == 14) {
-			Actor_Says(0, 6975, 3);
-			if (!Actor_Clue_Query(0, 254)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 6975, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityCamera)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 254, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueChinaBarSecurityCamera, 1, -1);
 			}
 		} else if (region == 15) {
-			Actor_Voice_Over(4220, 99);
-			if (!Actor_Clue_Query(0, 77)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4220, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueIzosFriend)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 77, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueIzosFriend, 1, -1);
 			}
 		}
 		return false;
 	case 5:
 		if (region == 13) {
-			Actor_Says(0, 8830, 3);
-			if (!Actor_Clue_Query(0, 253)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Says(kActorMcCoy, 8830, 3);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueStrangeScale2)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 253, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueStrangeScale2, 1, -1);
 			}
 		}
 		return false;
 	case 4:
 		if (region == 11) {
-			Actor_Voice_Over(4090, 99);
-			if (!Actor_Clue_Query(0, 251)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4090, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueWomanInAnimoidRow)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 251, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueWomanInAnimoidRow, 1, -1);
 			}
 		} else if (region == 12) {
-			Actor_Voice_Over(4180, 99);
-			if (!Actor_Clue_Query(0, 252)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4180, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueScorpions)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 252, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueScorpions, 1, -1);
 			}
 		}
 		return false;
 	case 3:
 		if (region == 9) {
-			Actor_Voice_Over(4230, 99);
-			if (!Actor_Clue_Query(0, 249)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4230, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueClovisflowers)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 249, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueClovisflowers, 1, -1);
 			}
 			return true;
 		} else if (region == 10) {
-			Actor_Voice_Over(4040, 99);
-			if (!Actor_Clue_Query(0, 250)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4040, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueLucyWithDektora)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 250, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueLucyWithDektora, 1, -1);
 			}
 			return true;
 		}
 		return false;
 	case 2:
 		if (region == 8) {
-			Actor_Voice_Over(4260, 99);
-			if (!Actor_Clue_Query(0, 248)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4260, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueEarlyQAndLucy)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 248, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueEarlyQAndLucy, 1, -1);
 			}
 		} else if (region == 7) {
-			Actor_Voice_Over(4190, 99);
-			if (!Actor_Clue_Query(0, 258)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4190, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueScorpionbox)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 258, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueScorpionbox, 1, -1);
 			}
 		}
 		return true;
 	case 1:
 		if (region == 3) {
-			Actor_Voice_Over(4080, 99);
-			if (!Actor_Clue_Query(0, 243)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4080, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueAnimalMurderSuspect)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 243, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueAnimalMurderSuspect, 1, -1);
 			}
 		} else if (region == 4) {
-			Actor_Voice_Over(4110, 99);
-			if (!Actor_Clue_Query(0, 244)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4110, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueMilitaryBoots)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 244, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueMilitaryBoots, 1, -1);
 			}
 		} else if (region == 5) {
-			Actor_Voice_Over(4120, 99);
-			if (!Actor_Clue_Query(0, 31)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4120, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kCluePartialLicenseNumber)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 31, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kCluePartialLicenseNumber, 1, -1);
 			}
 		} else if (region == 6) {
-			Actor_Voice_Over(4070, 99);
-			if (!Actor_Clue_Query(0, 30)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4070, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueCarColorAndMake)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 30, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueCarColorAndMake, 1, -1);
 			}
 		}
 		return true;
 	case 0:
 		if (region == 0) {
-			Actor_Voice_Over(4050, 99);
-			if (!Actor_Clue_Query(0, 14)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4050, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueDragonflyAnklet)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 14, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueDragonflyAnklet, 1, -1);
 			}
 		} else if (region == 1) {
-			Actor_Voice_Over(4040, 99);
-			if (!Actor_Clue_Query(0, 13)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4040, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueLucy)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 13, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueLucy, 1, -1);
 			}
 		} else if (region == 2) {
-			Actor_Voice_Over(4060, 99);
-			if (!Actor_Clue_Query(0, 9)) {
-				Actor_Says(0, 6945, 3);
+			Actor_Voice_Over(4060, kActorVoiceOver);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) {
+				Actor_Says(kActorMcCoy, 6945, 3);
 				Sound_Play(417, 50, 0, 0, 50);
-				Actor_Clue_Acquire(0, 9, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueSushiMenu, 1, -1);
 			}
 		}
 		return true;
diff --git a/engines/bladerunner/script/init.cpp b/engines/bladerunner/script/init.cpp
index 64136baed0..e1b8ee8d78 100644
--- a/engines/bladerunner/script/init.cpp
+++ b/engines/bladerunner/script/init.cpp
@@ -115,95 +115,419 @@ void ScriptInit::Init_Game_Flags() {
 
 void ScriptInit::Init_Clues() {
 	for (int i = 0; i != 288; ++i) {
-		Actor_Clue_Add_To_Database(0, i, 0, false, false, -1);
+		Actor_Clue_Add_To_Database(kActorMcCoy, i, 0, false, false, -1);
 	}
 }
 
-struct clue_weigth {
+struct ClueWeight {
 	int clue;
 	int weight;
 };
 
-static clue_weigth clues_actor_1[44] = {
-	{222, 100}, {227, 100}, {223, 100}, {224, 100}, {226, 100}, {228, 100}, {231, 100}, {162, 100},
-	{164, 100}, {166, 100}, {168, 100}, {170, 100}, {172, 100}, {174, 100}, {176, 100}, {239, 90},
-	{241, 90}, {242, 90}, {179, 90}, {180, 90}, {181, 90}, {8, 85}, {240, 85}, {216, 85},
-	{217, 85}, {178, 80}, {5, 65}, {9, 65}, {215, 65}, {218, 65}, {219, 65}, {220, 65},
-	{229, 65}, {211, 65}, {80, 65}, {108, 65}, {134, 65}, {135, 65}, {212, 55}, {221, 55},
-	{230, 55}, {6, 30}, {7, 30}, {65, 30}
+static ClueWeight ClueWeightsForSteele[44] = {
+	{kClueMcCoyRetiredZuben, 100},
+	{kClueMcCoyShotZubenintheback, 100},
+	{kClueMcCoyRetiredLucy, 100},
+	{kClueMcCoyRetiredDektora, 100},
+	{kClueMcCoyRetiredSadik, 100},
+	{kClueMcCoyRetiredLutherLance, 100},
+	{kClueClovisOrdersMcCoysDeath, 100},
+	{kClueVKDektoraReplicant, 100},
+	{kClueVKBobGorskyReplicant, 100},
+	{kClueVKLutherLanceReplicant, 100},
+	{kClueVKGrigorianReplicant, 100},
+	{kClueVKIzoReplicant, 100},
+	{kClueVKCrazylegsReplicant, 100},
+	{kClueVKRunciterReplicant, 100},
+	{kClueVKEarlyQReplicant, 100},
+	{kClueMcCoyIsStupid, 90},
+	{kClueMcCoyIsKind, 90},
+	{kClueMcCoyIsInsane, 90},
+	{kClueGrigorianInterviewA, 90},
+	{kClueGrigorianInterviewB1, 90},
+	{kClueGrigorianInterviewB2, 90},
+	{kClueChopstickWrapper, 85},
+	{kClueMcCoyIsAnnoying, 85},
+	{kClueMcCoyWarnedIzo, 85},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 85},
+	{kClueCrimeSceneNotes, 80},
+	{kClueShellCasings, 65},
+	{kClueSushiMenu, 65},
+	{kClueMcCoyLetZubenEscape, 65},
+	{kClueMcCoyHelpedDektora, 65},
+	{kClueMcCoyHelpedLucy, 65},
+	{kClueMcCoyHelpedGordo, 65},
+	{kClueMcCoyBetrayal, 65},
+	{kClueSightingMcCoyRuncitersShop, 65},
+	{kClueWeaponsOrderForm, 65},
+	{kClueHollowayInterview, 65},
+	{kClueRunciterConfession1, 65},
+	{kClueRunciterConfession2, 65},
+	{kClueMcCoyKilledRunciter1, 55},
+	{kClueMcCoyShotGuzza, 55},
+	{kClueMcCoyKilledRunciter2, 55},
+	{kClueCandy, 30},
+	{kClueToyDog, 30},
+	{kClueDogCollar1, 30}
 };
 
-static clue_weigth clues_actor_2[28] = {
-	{227, 70}, {240, 65}, {241, 70}, {242, 95}, {212, 70}, {213, 70}, {214, 70}, {215, 70},
-	{216, 95}, {217, 70}, {218, 70}, {219, 70}, {220, 70}, {221, 65}, {222, 70}, {223, 70},
-	{224, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {232, 70}, {116, 65},
-	{117, 65}, {145, 70}, {207, 55}, {211, 65}
+static ClueWeight ClueWeightsForGordo[28] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsAnnoying, 65},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyIsInsane, 95},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyWarnedIzo, 95},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyShotGuzza, 65},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kCluePowerSource, 70},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueSightingMcCoyRuncitersShop, 65}
 };
 
-static clue_weigth clues_actor_3[46] = {
-	{227, 70}, {240, 45}, {241, 70}, {242, 65}, {212, 70}, {213, 70}, {214, 70}, {215, 70},
-	{216, 65}, {217, 70}, {220, 70}, {219, 70}, {218, 70}, {221, 45}, {222, 70}, {223, 70},
-	{224, 70}, {225, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {95, 70},
-	{232, 70}, {239, 65}, {19, 65}, {25, 55}, {60, 60}, {69, 60}, {70, 60}, {92, 70},
-	{103, 65}, {121, 65}, {130, 70}, {147, 70}, {148, 65}, {149, 65}, {150, 65}, {151, 65},
-	{152, 65}, {116, 65}, {117, 65}, {145, 70}, {207, 55}, {211, 65}
+static ClueWeight ClueWeightsForDektora[46] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsAnnoying, 45},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyShotGuzza, 45},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredGordo, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueSuspectDektora, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueMcCoyIsStupid, 65},
+	{kClueZubenInterview, 65},
+	{kClueHowieLeeInterview, 55},
+	{kClueIzoInterview, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueEarlyQInterview, 70},
+	{kClueGordoInterview3, 65},
+	{kClueIzosStashRaided, 65},
+	{kClueGordoBlabs, 70},
+	{kClueDNATyrell, 70},
+	{kClueDNASebastian, 65},
+	{kClueDNAChew, 65},
+	{kClueDNAMoraji, 65},
+	{kClueDNALutherLance, 65},
+	{kClueDNAMarcus, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kCluePowerSource, 70},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueSightingMcCoyRuncitersShop, 65}
 };
 
-static clue_weigth clues_actor_4[23] = {
-	{241, 90}, {242, 90}, {240, 70}, {214, 75}, {216, 75}, {218, 75}, {219, 75}, {220, 75},
-	{215, 70}, {217, 70}, {222, 70}, {223, 70}, {224, 70}, {226, 70}, {228, 70}, {230, 70},
-	{73, 65}, {211, 65}, {80, 65}, {108, 65}, {134, 65}, {135, 65}, {212, 55}
+static ClueWeight ClueWeightsForGuzza[23] = {
+	{kClueMcCoyIsKind, 90},
+	{kClueMcCoyIsInsane, 90},
+	{kClueMcCoyIsAnnoying, 70},
+	{kClueMcCoyIsABladeRunner, 75},
+	{kClueMcCoyWarnedIzo, 75},
+	{kClueMcCoyHelpedDektora, 75},
+	{kClueMcCoyHelpedLucy, 75},
+	{kClueMcCoyHelpedGordo, 75},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueSightingSadikBradbury, 65},
+	{kClueSightingMcCoyRuncitersShop, 65},
+	{kClueWeaponsOrderForm, 65},
+	{kClueHollowayInterview, 65},
+	{kClueRunciterConfession1, 65},
+	{kClueRunciterConfession2, 65},
+	{kClueMcCoyKilledRunciter1, 55}
 };
 
-static clue_weigth clues_actor_5[46] = {
-	{227, 70}, {241, 70}, {212, 70}, {213, 70}, {214, 70}, {215, 70}, {217, 70}, {220, 70},
-	{219, 70}, {218, 70}, {222, 70}, {223, 70}, {224, 70}, {226, 70}, {228, 70}, {229, 70},
-	{230, 70}, {232, 70}, {130, 70}, {147, 70}, {145, 70}, {242, 65}, {216, 65}, {239, 65},
-	{19, 65}, {95, 65}, {103, 65}, {107, 65}, {121, 65}, {148, 65}, {149, 65}, {150, 65},
-	{151, 65}, {152, 65}, {116, 65}, {117, 65}, {211, 65}, {60, 60}, {69, 60}, {70, 60},
-	{92, 60}, {25, 55}, {133, 55}, {207, 55}, {240, 45}, {221, 45}
+static ClueWeight ClueWeightsForClovis[46] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueGordoBlabs, 70},
+	{kClueDNATyrell, 70},
+	{kCluePowerSource, 70},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyIsStupid, 65},
+	{kClueZubenInterview, 65},
+	{kClueSuspectDektora, 65},
+	{kClueGordoInterview3, 65},
+	{kClueDektoraInterview4, 65},
+	{kClueIzosStashRaided, 65},
+	{kClueDNASebastian, 65},
+	{kClueDNAChew, 65},
+	{kClueDNAMoraji, 65},
+	{kClueDNALutherLance, 65},
+	{kClueDNAMarcus, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kClueSightingMcCoyRuncitersShop, 65},
+	{kClueIzoInterview, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueEarlyQInterview, 60},
+	{kClueHowieLeeInterview, 55},
+	{kClueDektoraConfession, 55},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueMcCoyIsAnnoying, 45},
+	{kClueMcCoyShotGuzza, 45}
 };
 
-static clue_weigth clues_actor_6[47] = {
-	{227, 70}, {240, 45}, {241, 70}, {242, 65}, {212, 70}, {213, 70}, {214, 70}, {215, 70},
-	{216, 65}, {217, 70}, {220, 70}, {219, 70}, {218, 70}, {221, 45}, {222, 70}, {223, 70},
-	{224, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {232, 70}, {239, 65},
-	{19, 65}, {25, 55}, {60, 60}, {69, 60}, {70, 60}, {92, 60}, {95, 65}, {103, 65},
-	{107, 65}, {121, 55}, {130, 70}, {133, 70}, {147, 70}, {148, 65}, {149, 65}, {150, 65},
-	{151, 65}, {152, 65}, {116, 65}, {117, 65}, {145, 70}, {207, 55}, {211, 65}
+static ClueWeight ClueWeightsForLucy[47] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsAnnoying, 45},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyShotGuzza, 45},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueMcCoyIsStupid, 65},
+	{kClueZubenInterview, 65},
+	{kClueHowieLeeInterview, 55},
+	{kClueIzoInterview, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueEarlyQInterview, 60},
+	{kClueSuspectDektora, 65},
+	{kClueGordoInterview3, 65},
+	{kClueDektoraInterview4, 65},
+	{kClueIzosStashRaided, 55},
+	{kClueGordoBlabs, 70},
+	{kClueDektoraConfession, 70},
+	{kClueDNATyrell, 70},
+	{kClueDNASebastian, 65},
+	{kClueDNAChew, 65},
+	{kClueDNAMoraji, 65},
+	{kClueDNALutherLance, 65},
+	{kClueDNAMarcus, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kCluePowerSource, 70},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueSightingMcCoyRuncitersShop, 65}
 };
 
-static clue_weigth clues_actor_7_and_8[47] = {
-	{227, 70}, {240, 45}, {241, 70}, {242, 65}, {212, 70}, {213, 70}, {214, 70}, {215, 70},
-	{216, 65}, {217, 70}, {220, 70}, {219, 70}, {218, 70}, {221, 45}, {222, 70}, {223, 70},
-	{224, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {232, 70}, {239, 65},
-	{19, 45}, {25, 45}, {60, 45}, {69, 45}, {70, 45}, {92, 45}, {95, 45}, {103, 45},
-	{107, 45}, {121, 45}, {130, 45}, {133, 45}, {147, 70}, {148, 70}, {149, 70}, {150, 70},
-	{151, 70}, {152, 70}, {116, 65}, {117, 65}, {145, 70}, {207, 55}, {211, 65}
+static ClueWeight ClueWeightsForIzoAndSadik[47] = {
+	{kClueMcCoyShotZubenintheback, 70},
+	{kClueMcCoyIsAnnoying, 45},
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoysDescription, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyLetZubenEscape, 70},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyShotGuzza, 45},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueEarlyAttemptedToSeduceLucy, 70},
+	{kClueMcCoyIsStupid, 65},
+	{kClueZubenInterview, 45},
+	{kClueHowieLeeInterview, 45},
+	{kClueIzoInterview, 45},
+	{kClueGordoInterview1, 45},
+	{kClueGordoInterview2, 45},
+	{kClueEarlyQInterview, 45},
+	{kClueSuspectDektora, 45},
+	{kClueGordoInterview3, 45},
+	{kClueDektoraInterview4, 45},
+	{kClueIzosStashRaided, 45},
+	{kClueGordoBlabs, 45},
+	{kClueDektoraConfession, 45},
+	{kClueDNATyrell, 70},
+	{kClueDNASebastian, 70},
+	{kClueDNAChew, 70},
+	{kClueDNAMoraji, 70},
+	{kClueDNALutherLance, 70},
+	{kClueDNAMarcus, 70},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kCluePowerSource, 70},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueSightingMcCoyRuncitersShop, 65}
 };
 
-static clue_weigth clues_actor_9[49] = {
-	{241, 70}, {212, 70}, {214, 70}, {217, 70}, {220, 70}, {219, 70}, {218, 70}, {222, 70},
-	{223, 70}, {224, 70}, {226, 70}, {228, 70}, {229, 70}, {230, 70}, {231, 70}, {130, 70},
-	{133, 70}, {147, 70}, {148, 70}, {149, 70}, {150, 70}, {151, 70}, {152, 70}, {145, 70},
-	{227, 65}, {240, 65}, {242, 65}, {213, 65}, {215, 65}, {216, 65}, {221, 65}, {239, 65},
-	{95, 65}, {103, 65}, {107, 65}, {121, 65}, {116, 65}, {117, 65}, {211, 65}, {99, 65},
-	{236, 65}, {60, 60}, {69, 60}, {70, 60}, {232, 55}, {92, 55}, {207, 55}, {19, 50},
-	{25, 40}
+static ClueWeight ClueWeightsForCrazylegs[49] = {
+	{kClueMcCoyIsKind, 70},
+	{kClueMcCoyKilledRunciter1, 70},
+	{kClueMcCoyIsABladeRunner, 70},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 70},
+	{kClueMcCoyHelpedGordo, 70},
+	{kClueMcCoyHelpedLucy, 70},
+	{kClueMcCoyHelpedDektora, 70},
+	{kClueMcCoyRetiredZuben, 70},
+	{kClueMcCoyRetiredLucy, 70},
+	{kClueMcCoyRetiredDektora, 70},
+	{kClueMcCoyRetiredSadik, 70},
+	{kClueMcCoyRetiredLutherLance, 70},
+	{kClueMcCoyBetrayal, 70},
+	{kClueMcCoyKilledRunciter2, 70},
+	{kClueClovisOrdersMcCoysDeath, 70},
+	{kClueGordoBlabs, 70},
+	{kClueDektoraConfession, 70},
+	{kClueDNATyrell, 70},
+	{kClueDNASebastian, 70},
+	{kClueDNAChew, 70},
+	{kClueDNAMoraji, 70},
+	{kClueDNALutherLance, 70},
+	{kClueDNAMarcus, 70},
+	{kCluePowerSource, 70},
+	{kClueMcCoyShotZubenintheback, 65},
+	{kClueMcCoyIsAnnoying, 65},
+	{kClueMcCoyIsInsane, 65},
+	{kClueMcCoysDescription, 65},
+	{kClueMcCoyLetZubenEscape, 65},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyShotGuzza, 65},
+	{kClueMcCoyIsStupid, 65},
+	{kClueSuspectDektora, 65},
+	{kClueGordoInterview3, 65},
+	{kClueDektoraInterview4, 65},
+	{kClueIzosStashRaided, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kClueSightingMcCoyRuncitersShop, 65},
+	{kClueGrigoriansNote, 65},
+	{kClueCrazysInvolvement, 65},
+	{kClueIzoInterview, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueEarlyAttemptedToSeduceLucy, 55},
+	{kClueEarlyQInterview, 55},
+	{kClueCrystalArrestedCrazylegs, 55},
+	{kClueZubenInterview, 50},
+	{kClueHowieLeeInterview, 40}
 };
 
-static clue_weigth clues_actor_10[44] = {
-	{241, 70}, {130, 70}, {147, 70}, {145, 70}, {240, 65}, {216, 65}, {217, 65}, {219, 65},
-	{218, 65}, {221, 65}, {223, 65}, {224, 65}, {226, 65}, {229, 65}, {239, 65}, {95, 65},
-	{121, 65}, {148, 65}, {149, 65}, {150, 65}, {152, 65}, {116, 65}, {117, 65}, {214, 60},
-	{215, 60}, {69, 60}, {70, 60}, {211, 60}, {242, 55}, {213, 55}, {220, 55}, {222, 55},
-	{60, 55}, {107, 55}, {133, 55}, {103, 50}, {92, 45}, {207, 45}, {227, 35}, {212, 35},
-	{230, 35}, {232, 35}, {19, 30}, {25, 30}
+static ClueWeight ClueWeightsForLuther[44] = {
+	{kClueMcCoyIsKind, 70},
+	{kClueGordoBlabs, 70},
+	{kClueDNATyrell, 70},
+	{kCluePowerSource, 70},
+	{kClueMcCoyIsAnnoying, 65},
+	{kClueMcCoyWarnedIzo, 65},
+	{kClueMcCoyHelpedIzoIzoIsAReplicant, 65},
+	{kClueMcCoyHelpedLucy, 65},
+	{kClueMcCoyHelpedDektora, 65},
+	{kClueMcCoyShotGuzza, 65},
+	{kClueMcCoyRetiredLucy, 65},
+	{kClueMcCoyRetiredDektora, 65},
+	{kClueMcCoyRetiredSadik, 65},
+	{kClueMcCoyBetrayal, 65},
+	{kClueMcCoyIsStupid, 65},
+	{kClueSuspectDektora, 65},
+	{kClueIzosStashRaided, 65},
+	{kClueDNASebastian, 65},
+	{kClueDNAChew, 65},
+	{kClueDNAMoraji, 65},
+	{kClueDNAMarcus, 65},
+	{kClueCrazylegsInterview1, 65},
+	{kClueCrazylegsInterview2, 65},
+	{kClueMcCoyIsABladeRunner, 60},
+	{kClueMcCoyLetZubenEscape, 60},
+	{kClueGordoInterview1, 60},
+	{kClueGordoInterview2, 60},
+	{kClueSightingMcCoyRuncitersShop, 60},
+	{kClueMcCoyIsInsane, 55},
+	{kClueMcCoysDescription, 55},
+	{kClueMcCoyHelpedGordo, 55},
+	{kClueMcCoyRetiredZuben, 55},
+	{kClueIzoInterview, 55},
+	{kClueDektoraInterview4, 55},
+	{kClueDektoraConfession, 55},
+	{kClueGordoInterview3, 50},
+	{kClueEarlyQInterview, 45},
+	{kClueCrystalArrestedCrazylegs, 45},
+	{kClueMcCoyShotZubenintheback, 35},
+	{kClueMcCoyKilledRunciter1, 35},
+	{kClueMcCoyKilledRunciter2, 35},
+	{kClueEarlyAttemptedToSeduceLucy, 35},
+	{kClueZubenInterview, 30},
+	{kClueHowieLeeInterview, 30}
 };
 
 void ScriptInit::Init_Clues2() {
 	for (int i = 0; i != 288; ++i) {
-		Actor_Clue_Add_To_Database(99, i, 100, false, false, -1);
+		Actor_Clue_Add_To_Database(kActorVoiceOver, i, 100, false, false, -1);
 	}
 
 #define IMPORT_CLUE_TABLE(a, arr) \
@@ -211,1117 +535,1119 @@ void ScriptInit::Init_Clues2() {
 		Actor_Clue_Add_To_Database( a, arr[i].clue, arr[i].weight, 0, 0, -1);\
 	}
 
-	IMPORT_CLUE_TABLE( 1, clues_actor_1);
-	IMPORT_CLUE_TABLE( 2, clues_actor_2);
-	IMPORT_CLUE_TABLE( 3, clues_actor_3);
-	IMPORT_CLUE_TABLE( 4, clues_actor_4);
-	IMPORT_CLUE_TABLE( 5, clues_actor_5);
-	IMPORT_CLUE_TABLE( 6, clues_actor_6);
-	IMPORT_CLUE_TABLE( 7, clues_actor_7_and_8);
-	IMPORT_CLUE_TABLE( 9, clues_actor_9);
-	IMPORT_CLUE_TABLE(10, clues_actor_10);
+	IMPORT_CLUE_TABLE(kActorSteele, ClueWeightsForSteele);
+	IMPORT_CLUE_TABLE(kActorGordo, ClueWeightsForGordo);
+	IMPORT_CLUE_TABLE(kActorDektora, ClueWeightsForDektora);
+	IMPORT_CLUE_TABLE(kActorGuzza, ClueWeightsForGuzza);
+	IMPORT_CLUE_TABLE(kActorClovis, ClueWeightsForClovis);
+	IMPORT_CLUE_TABLE(kActorLucy, ClueWeightsForLucy);
+	IMPORT_CLUE_TABLE(kActorIzo, ClueWeightsForIzoAndSadik);
+	IMPORT_CLUE_TABLE(kActorSadik, ClueWeightsForIzoAndSadik);
+	IMPORT_CLUE_TABLE(kActorCrazylegs, ClueWeightsForCrazylegs);
+	IMPORT_CLUE_TABLE(kActorLuther, ClueWeightsForLuther);
 
 #undef IMPORT_CLUE_TABLE
 
-	Actor_Clue_Add_To_Database(11, 201, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 213, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 212, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 218, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 219, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 225, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 229, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 230, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 232, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(11, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 213, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 219, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 222, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 223, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 228, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 124, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(12, 131, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 227, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 214, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 215, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 217, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 220, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 222, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 224, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 226, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 232, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 60, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 69, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 70, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 92, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 95, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 19, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 103, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 107, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 121, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 130, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 133, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 147, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 148, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 149, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 150, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 152, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 207, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(13, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 5, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 239, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 240, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 241, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 242, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 212, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 215, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 216, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 230, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 0, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 73, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 211, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 108, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 134, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 135, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 66, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 109, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 110, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 111, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(14, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(15, 232, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(16, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 222, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 218, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 219, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 220, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 223, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 224, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 226, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 228, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 230, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 231, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 73, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(17, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 239, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 240, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 242, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 222, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 227, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 216, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 217, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 223, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 224, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 228, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 231, 100, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(18, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 219, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 213, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 229, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 232, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(19, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(20, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 214, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 223, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 147, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 148, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 150, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 152, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 117, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(21, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(22, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 27, 20, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 16, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 17, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 26, 25, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 227, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 219, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 239, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(1, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(23, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 227, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 219, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 239, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 17, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 16, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 27, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 26, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(24, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(25, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(25, 213, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(25, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 0, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 5, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 8, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 9, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 239, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 240, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 242, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 216, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 217, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(26, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 227, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 241, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 215, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 216, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 217, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 220, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 219, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 218, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 222, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 223, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 224, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 226, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 228, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 230, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 232, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 25, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 60, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 69, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 70, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 92, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 95, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 19, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 103, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 107, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 121, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 130, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 133, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 147, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 148, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 149, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 150, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 151, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 152, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 145, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 207, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(27, 211, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 25, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 64, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 69, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 111, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 124, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 219, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 241, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 217, 25, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 221, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 223, 75, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 225, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 222, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(28, 232, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(29, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 126, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 195, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 197, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 198, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 202, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 225, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 222, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 239, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(30, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(31, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 240, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 241, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 212, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 213, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 214, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 221, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 223, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 229, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 230, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 231, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 232, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 239, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 25, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 60, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 69, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 70, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 92, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 19, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 103, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 121, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 207, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(32, 211, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 5, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 8, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 9, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 239, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 240, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 242, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 216, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 217, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(33, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 126, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 195, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 197, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 198, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 202, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 219, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 225, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 222, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 239, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 80, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(34, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 214, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 223, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 147, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 148, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 150, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 152, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 117, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(35, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 0, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 5, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 8, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 9, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 239, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 240, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 242, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 222, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 216, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 217, 85, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(37, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 227, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 212, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 221, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 224, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 228, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 231, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(42, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 212, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(44, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 227, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 217, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 221, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 224, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 226, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 214, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 229, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 232, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 145, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(51, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 214, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 223, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 147, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 148, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 150, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 152, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 117, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(52, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 126, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 162, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 164, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 166, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 168, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 170, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 172, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 176, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 195, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 197, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 198, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 202, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 111, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 219, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 241, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 212, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 230, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 215, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 216, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 218, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 220, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 221, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 225, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 222, 90, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 242, 95, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(53, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 227, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 212, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 219, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 221, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 224, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 228, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 229, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 230, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 231, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 80, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 108, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 134, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 135, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 214, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(55, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 222, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 227, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 240, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 212, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 213, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 223, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 224, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 229, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 230, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 231, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 232, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 239, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 25, 30, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 60, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 69, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 70, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 92, 25, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 95, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 19, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 103, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 107, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 121, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 130, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 133, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 147, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 149, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 150, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 151, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 152, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 116, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 117, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 145, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 207, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(56, 211, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 241, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 227, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 217, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 221, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 224, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 226, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 228, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 214, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 229, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 232, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 145, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(57, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(58, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 227, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 240, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 242, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 212, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 213, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 215, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 216, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 217, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 220, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 219, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 218, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 221, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 222, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 224, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 226, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 228, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 230, 35, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 95, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 232, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 130, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 147, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 148, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 149, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 150, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 151, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 152, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 116, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 117, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 145, 50, false, false, -1);
-	Actor_Clue_Add_To_Database(59, 211, 60, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 239, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 241, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 222, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 227, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 212, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 215, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 216, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 217, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 218, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 219, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 220, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 221, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 223, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 224, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 226, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 228, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 229, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 230, 45, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 231, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 162, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 164, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 166, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 168, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 170, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 172, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 174, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 176, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 0, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 73, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 211, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 80, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 108, 55, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 134, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(62, 135, 40, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(66, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(67, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(68, 214, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 240, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 241, 70, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 242, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 239, 65, false, false, -1);
-	Actor_Clue_Add_To_Database(69, 214, 65, false, false, -1);
+	//note: this might look a bit weird, but it is implemented in this way in the original game - few weights are in table, others by direct call
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueBobShotInColdBlood, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoysDescription, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyKilledRunciter1, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyHelpedDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyHelpedLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyBetrayal, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueMcCoyKilledRunciter2, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueEarlyAttemptedToSeduceLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGrigorian, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoysDescription, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyHelpedLucy, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyRetiredZuben, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyRetiredLucy, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueMcCoyRetiredLutherLance, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueHomelessManKid, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTransient, kClueFlaskOfAbsinthe, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyShotZubenintheback, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsABladeRunner, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyLetZubenEscape, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyHelpedIzoIzoIsAReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyHelpedGordo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyRetiredZuben, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyRetiredDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyRetiredSadik, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueEarlyAttemptedToSeduceLucy, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueIzoInterview, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueGordoInterview1, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueGordoInterview2, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueEarlyQInterview, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueSuspectDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueZubenInterview, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueGordoInterview3, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDektoraInterview4, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueIzosStashRaided, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueGordoBlabs, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDektoraConfession, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNATyrell, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNASebastian, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNAChew, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNAMoraji, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueDNAMarcus, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueCrystalArrestedCrazylegs, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLance, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueShellCasings, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsStupid, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsAnnoying, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsKind, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsInsane, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyKilledRunciter1, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyLetZubenEscape, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyWarnedIzo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyKilledRunciter2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueOfficersStatement, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueSightingSadikBradbury, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueSightingMcCoyRuncitersShop, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueHollowayInterview, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueRunciterConfession1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueRunciterConfession2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueWeaponsCache, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueBakersBadge, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueHoldensBadge, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueCar, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBulletBob, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRunciter, kClueEarlyAttemptedToSeduceLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorInsectDealer, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredZuben, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyHelpedDektora, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyHelpedLucy, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyHelpedGordo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredLucy, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredDektora, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredSadik, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyRetiredLutherLance, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueMcCoyKilledRunciter2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueClovisOrdersMcCoysDeath, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueSightingSadikBradbury, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrellGuard, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsStupid, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsAnnoying, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsInsane, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredZuben, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyShotZubenintheback, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyWarnedIzo, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyHelpedIzoIzoIsAReplicant, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredLucy, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredDektora, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredLutherLance, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueClovisOrdersMcCoysDeath, 100, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQ, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyHelpedLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoysDescription, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueMcCoyBetrayal, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueEarlyAttemptedToSeduceLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorZuben, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHasan, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsABladeRunner, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyRetiredLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueDNATyrell, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueDNASebastian, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueDNAMoraji, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueDNAMarcus, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueCrazylegsInterview2, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMarcus, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMia, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueChromeDebris, 20, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueCrowdInterviewA, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueCrowdInterviewB, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kCluePaintTransfer, 25, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyShotZubenintheback, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyHelpedLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueMcCoyIsStupid, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSteele, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerLeary, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyShotZubenintheback, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyHelpedLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueMcCoyIsStupid, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueCrowdInterviewB, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueCrowdInterviewA, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueChromeDebris, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kCluePaintTransfer, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorOfficerGrayford, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHanoi, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHanoi, kClueMcCoysDescription, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHanoi, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueOfficersStatement, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueShellCasings, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueChopstickWrapper, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueSushiMenu, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyIsStupid, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyIsAnnoying, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyIsInsane, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyWarnedIzo, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyHelpedIzoIzoIsAReplicant, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorBaker, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyShotZubenintheback, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsKind, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyLetZubenEscape, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyWarnedIzo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyHelpedIzoIzoIsAReplicant, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyHelpedGordo, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyHelpedLucy, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyHelpedDektora, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredZuben, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredLucy, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredDektora, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredSadik, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyRetiredLutherLance, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyKilledRunciter2, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueEarlyAttemptedToSeduceLucy, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueHowieLeeInterview, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueIzoInterview, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueGordoInterview1, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueGordoInterview2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueEarlyQInterview, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueSuspectDektora, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueZubenInterview, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueGordoInterview3, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDektoraInterview4, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueIzosStashRaided, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueGordoBlabs, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDektoraConfession, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNATyrell, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNASebastian, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNAChew, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNAMoraji, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNALutherLance, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueDNAMarcus, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kCluePowerSource, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueCrystalArrestedCrazylegs, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorDeskClerk, kClueSightingMcCoyRuncitersShop, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueHowieLeeInterview, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueFishLadyInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueGordoInterview1, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueCar, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueHomelessManKid, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyHelpedLucy, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyIsKind, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyHelpedIzoIzoIsAReplicant, 25, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyShotGuzza, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyRetiredLucy, 75, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyRetiredGordo, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueMcCoyRetiredZuben, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHowieLee, kClueEarlyAttemptedToSeduceLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorFishDealer, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueGuzzaFramedMcCoy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyIncept, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kCluePoliceWeaponUsed, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoysWeaponUsedonBob, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRecoveredHoldensBadge, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredGordo, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyRetiredZuben, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueMcCoyIsStupid, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorKlein, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMurray, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsAnnoying, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsKind, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyKilledRunciter1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoysDescription, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsABladeRunner, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyShotGuzza, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyBetrayal, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyKilledRunciter2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueClovisOrdersMcCoysDeath, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueEarlyAttemptedToSeduceLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueMcCoyIsStupid, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueHowieLeeInterview, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueIzoInterview, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueGordoInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueGordoInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueEarlyQInterview, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueZubenInterview, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueGordoInterview3, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueIzosStashRaided, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueCrystalArrestedCrazylegs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHawkersBarkeep, kClueSightingMcCoyRuncitersShop, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueShellCasings, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueChopstickWrapper, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueSushiMenu, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyIsStupid, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyIsAnnoying, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyIsInsane, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyWarnedIzo, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyHelpedIzoIzoIsAReplicant, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorHolloway, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueGuzzaFramedMcCoy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyIncept, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kCluePoliceWeaponUsed, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoysWeaponUsedonBob, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRecoveredHoldensBadge, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyHelpedLucy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredGordo, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyRetiredZuben, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueMcCoyIsStupid, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueWeaponsOrderForm, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSergeantWalls, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsABladeRunner, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyRetiredLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueDNATyrell, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueDNASebastian, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueDNAMoraji, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueDNAMarcus, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueCrazylegsInterview2, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMoraji, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueOfficersStatement, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueShellCasings, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueChopstickWrapper, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueSushiMenu, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyIsStupid, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyIsAnnoying, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyIsInsane, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredZuben, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyWarnedIzo, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyHelpedIzoIzoIsAReplicant, 85, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorPhotographer, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyShotZubenintheback, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyKilledRunciter1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyShotGuzza, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredLutherLance, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueClovisOrdersMcCoysDeath, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorEarlyQBartender, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyKilledRunciter1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffyPatron, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyShotZubenintheback, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyHelpedIzoIzoIsAReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyShotGuzza, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyRetiredDektora, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyRetiredSadik, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyIsABladeRunner, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueMcCoyBetrayal, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueEarlyAttemptedToSeduceLucy, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kCluePowerSource, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTyrell, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsABladeRunner, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyRetiredLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueDNATyrell, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueDNASebastian, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueDNAMoraji, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueDNAMarcus, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueCrazylegsInterview2, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorChew, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueGuzzaFramedMcCoy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKDektoraReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKBobGorskyReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKLutherLanceReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKGrigorianReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKIzoReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKCrazylegsReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueVKEarlyQReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyIncept, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kCluePoliceWeaponUsed, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoysWeaponUsedonBob, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRecoveredHoldensBadge, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueCar, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyHelpedLucy, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyIsKind, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyKilledRunciter1, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyKilledRunciter2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyLetZubenEscape, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyWarnedIzo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyHelpedDektora, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyHelpedGordo, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyShotGuzza, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredGordo, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyRetiredZuben, 90, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyIsInsane, 95, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGaff, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyShotZubenintheback, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyKilledRunciter1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyHelpedLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyShotGuzza, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredLutherLance, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyBetrayal, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyKilledRunciter2, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueClovisOrdersMcCoysDeath, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueWeaponsOrderForm, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueHollowayInterview, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueRunciterConfession1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueRunciterConfession2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueMcCoyIsABladeRunner, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorTaffy, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyRetiredZuben, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyShotZubenintheback, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsAnnoying, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyKilledRunciter1, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoysDescription, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyRetiredLucy, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyRetiredDektora, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyBetrayal, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyKilledRunciter2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueClovisOrdersMcCoysDeath, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueEarlyAttemptedToSeduceLucy, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueMcCoyIsStupid, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueHowieLeeInterview, 30, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueIzoInterview, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueGordoInterview1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueGordoInterview2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueEarlyQInterview, 25, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueSuspectDektora, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueZubenInterview, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueGordoInterview3, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDektoraInterview4, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueIzosStashRaided, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueGordoBlabs, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDektoraConfession, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNATyrell, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNAChew, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNAMoraji, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNALutherLance, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueDNAMarcus, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueCrazylegsInterview1, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueCrazylegsInterview2, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kCluePowerSource, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueCrystalArrestedCrazylegs, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorSebastian, kClueSightingMcCoyRuncitersShop, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyIsKind, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyShotZubenintheback, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyHelpedIzoIzoIsAReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyShotGuzza, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyRetiredDektora, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyRetiredSadik, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyRetiredLutherLance, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyIsABladeRunner, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueMcCoyBetrayal, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueEarlyAttemptedToSeduceLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kCluePowerSource, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorRachael, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGeneralDoll, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyShotZubenintheback, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsAnnoying, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsInsane, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyKilledRunciter1, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoysDescription, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyLetZubenEscape, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyWarnedIzo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyHelpedIzoIzoIsAReplicant, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyHelpedGordo, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyHelpedLucy, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyHelpedDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyShotGuzza, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredZuben, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredSadik, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyRetiredLutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyKilledRunciter2, 35, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueSuspectDektora, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueEarlyAttemptedToSeduceLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueGordoBlabs, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNATyrell, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNASebastian, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNAChew, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNAMoraji, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNALutherLance, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueDNAMarcus, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueCrazylegsInterview1, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueCrazylegsInterview2, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kCluePowerSource, 50, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorIsabella, kClueSightingMcCoyRuncitersShop, 60, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyIsStupid, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyIsKind, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredZuben, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyShotZubenintheback, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyKilledRunciter1, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyLetZubenEscape, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyWarnedIzo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyHelpedIzoIzoIsAReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyHelpedDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyHelpedLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyHelpedGordo, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyShotGuzza, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredLucy, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredDektora, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredSadik, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyRetiredLutherLance, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyBetrayal, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueMcCoyKilledRunciter2, 45, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueClovisOrdersMcCoysDeath, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKDektoraReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKBobGorskyReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKLutherLanceReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKGrigorianReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKIzoReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKCrazylegsReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKRunciterReplicant, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueVKEarlyQReplicant, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueOfficersStatement, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueSightingSadikBradbury, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueSightingMcCoyRuncitersShop, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueWeaponsOrderForm, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueHollowayInterview, 55, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueRunciterConfession1, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorLeon, kClueRunciterConfession2, 40, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorMaggie, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerA, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerB, kClueMcCoyIsABladeRunner, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsAnnoying, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsKind, 70, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsInsane, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsStupid, 65, false, false, -1);
+	Actor_Clue_Add_To_Database(kActorGenwalkerC, kClueMcCoyIsABladeRunner, 65, false, false, -1);
 }
 
 void ScriptInit::Init_World_Waypoints() {
@@ -1860,459 +2186,459 @@ void ScriptInit::Init_World_Waypoints() {
 }
 
 void ScriptInit::Init_SDB() {
-	SDB_Set_Actor(0, 8);
+	SDB_Set_Actor(0, kActorSadik);
 	SDB_Set_Sex(0, 1);
-	SDB_Add_MO_Clue(0, 52);
-	SDB_Add_MO_Clue(0, 49);
-	SDB_Add_MO_Clue(0, 48);
-	SDB_Add_MO_Clue(0, 261);
-	SDB_Add_Whereabouts_Clue(0, 45);
-	SDB_Add_Whereabouts_Clue(0, 53);
-	SDB_Add_Whereabouts_Clue(0, 44);
-	SDB_Add_Whereabouts_Clue(0, 67);
-	SDB_Add_Whereabouts_Clue(0, 122);
-	SDB_Add_Replicant_Clue(0, 49);
-	SDB_Add_Replicant_Clue(0, 52);
-	SDB_Add_Replicant_Clue(0, 68);
-	SDB_Add_Replicant_Clue(0, 51);
-	SDB_Add_Replicant_Clue(0, 269);
-	SDB_Add_Replicant_Clue(0, 278);
-	SDB_Add_Replicant_Clue(0, 52);
-	SDB_Add_Non_Replicant_Clue(0, 74);
-	SDB_Add_Non_Replicant_Clue(0, 61);
-	SDB_Add_Non_Replicant_Clue(0, 270);
-	SDB_Add_Other_Clue(0, 180);
-	SDB_Add_Other_Clue(0, 181);
-	SDB_Add_Other_Clue(0, 266);
-	SDB_Add_Other_Clue(0, 47);
-	SDB_Add_Other_Clue(0, 277);
-	SDB_Add_Identity_Clue(0, 266);
-	SDB_Add_Photo_Clue(0, 47, 31);
-	SDB_Add_Photo_Clue(0, 277, 38);
-	SDB_Set_Actor(1, 5);
+	SDB_Add_MO_Clue(0, kClueCrystalsCase);
+	SDB_Add_MO_Clue(0, kClueDetonatorWire);
+	SDB_Add_MO_Clue(0, kClueSadiksGun);
+	SDB_Add_MO_Clue(0, kCluePlasticExplosive);
+	SDB_Add_Whereabouts_Clue(0, kClueTyrellSecurity);
+	SDB_Add_Whereabouts_Clue(0, kClueKingstonKitchenBox1);
+	SDB_Add_Whereabouts_Clue(0, kClueDragonflyEarring);
+	SDB_Add_Whereabouts_Clue(0, kClueChewInterview);
+	SDB_Add_Whereabouts_Clue(0, kClueHomelessManInterview1);
+	SDB_Add_Replicant_Clue(0, kClueDetonatorWire);
+	SDB_Add_Replicant_Clue(0, kClueCrystalsCase);
+	SDB_Add_Replicant_Clue(0, kClueMorajiInterview);
+	SDB_Add_Replicant_Clue(0, kClueAttemptedFileAccess);
+	SDB_Add_Replicant_Clue(0, kClueExpertBomber);
+	SDB_Add_Replicant_Clue(0, kClueRachaelInterview);
+	SDB_Add_Replicant_Clue(0, kClueCrystalsCase);
+	SDB_Add_Non_Replicant_Clue(0, kClueStaggeredbyPunches);
+	SDB_Add_Non_Replicant_Clue(0, kClueIzosWarning);
+	SDB_Add_Non_Replicant_Clue(0, kClueAmateurBomber);
+	SDB_Add_Other_Clue(0, kClueGrigorianInterviewB1);
+	SDB_Add_Other_Clue(0, kClueGrigorianInterviewB2);
+	SDB_Add_Other_Clue(0, kClueAct2Ended);
+	SDB_Add_Other_Clue(0, kClueBombingSuspect);
+	SDB_Add_Other_Clue(0, kClueSadikAtMoonbus);
+	SDB_Add_Identity_Clue(0, kClueAct2Ended);
+	SDB_Add_Photo_Clue(0, kClueBombingSuspect, 31);
+	SDB_Add_Photo_Clue(0, kClueSadikAtMoonbus, 38);
+	SDB_Set_Actor(1, kActorClovis);
 	SDB_Set_Sex(1, 1);
-	SDB_Add_MO_Clue(1, 5);
-	SDB_Add_MO_Clue(1, 11);
-	SDB_Add_Whereabouts_Clue(1, 40);
-	SDB_Add_Whereabouts_Clue(1, 29);
-	SDB_Add_Whereabouts_Clue(1, 67);
-	SDB_Add_Replicant_Clue(1, 0);
-	SDB_Add_Replicant_Clue(1, 2);
-	SDB_Add_Replicant_Clue(1, 68);
-	SDB_Add_Replicant_Clue(1, 156);
-	SDB_Add_Replicant_Clue(1, 157);
-	SDB_Add_Replicant_Clue(1, 107);
-	SDB_Add_Other_Clue(1, 243);
-	SDB_Add_Other_Clue(1, 4);
-	SDB_Add_Other_Clue(1, 61);
-	SDB_Add_Other_Clue(1, 266);
-	SDB_Add_Other_Clue(1, 276);
-	SDB_Add_Other_Clue(1, 243);
-	SDB_Add_Other_Clue(1, 77);
-	SDB_Add_Other_Clue(1, 244);
-	SDB_Add_Identity_Clue(1, 61);
-	SDB_Add_Identity_Clue(1, 266);
-	SDB_Add_Identity_Clue(1, 107);
-	SDB_Add_Photo_Clue(1, 276, 37);
-	SDB_Add_Photo_Clue(1, 243, 7);
-	SDB_Add_Photo_Clue(1, 77, 25);
-	SDB_Add_Photo_Clue(1, 244, 8);
-	SDB_Set_Actor(2, 19);
+	SDB_Add_MO_Clue(1, kClueShellCasings);
+	SDB_Add_MO_Clue(1, kClueLabShellCasings);
+	SDB_Add_Whereabouts_Clue(1, kClueDispatchHitAndRun);
+	SDB_Add_Whereabouts_Clue(1, kClueRuncitersViewB);
+	SDB_Add_Whereabouts_Clue(1, kClueChewInterview);
+	SDB_Add_Replicant_Clue(1, kClueOfficersStatement);
+	SDB_Add_Replicant_Clue(1, kClueDoorForced2);
+	SDB_Add_Replicant_Clue(1, kClueMorajiInterview);
+	SDB_Add_Replicant_Clue(1, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(1, kClueZubenTalksAboutLucy2);
+	SDB_Add_Replicant_Clue(1, kClueDektoraInterview4);
+	SDB_Add_Other_Clue(1, kClueAnimalMurderSuspect);
+	SDB_Add_Other_Clue(1, kClueGracefulFootprints);
+	SDB_Add_Other_Clue(1, kClueIzosWarning);
+	SDB_Add_Other_Clue(1, kClueAct2Ended);
+	SDB_Add_Other_Clue(1, kClueClovisAtMoonbus);
+	SDB_Add_Other_Clue(1, kClueAnimalMurderSuspect);
+	SDB_Add_Other_Clue(1, kClueIzosFriend);
+	SDB_Add_Other_Clue(1, kClueMilitaryBoots);
+	SDB_Add_Identity_Clue(1, kClueIzosWarning);
+	SDB_Add_Identity_Clue(1, kClueAct2Ended);
+	SDB_Add_Identity_Clue(1, kClueDektoraInterview4);
+	SDB_Add_Photo_Clue(1, kClueClovisAtMoonbus, 37);
+	SDB_Add_Photo_Clue(1, kClueAnimalMurderSuspect, 7);
+	SDB_Add_Photo_Clue(1, kClueIzosFriend, 25);
+	SDB_Add_Photo_Clue(1, kClueMilitaryBoots, 8);
+	SDB_Set_Actor(2, kActorZuben);
 	SDB_Set_Sex(2, 1);
-	SDB_Add_MO_Clue(2, 0);
-	SDB_Add_MO_Clue(2, 10);
-	SDB_Add_Whereabouts_Clue(2, 40);
-	SDB_Add_Whereabouts_Clue(2, 29);
-	SDB_Add_Replicant_Clue(2, 0);
-	SDB_Add_Replicant_Clue(2, 2);
-	SDB_Add_Replicant_Clue(2, 25);
-	SDB_Add_Replicant_Clue(2, 18);
-	SDB_Add_Replicant_Clue(2, 20);
-	SDB_Add_Replicant_Clue(2, 156);
-	SDB_Add_Replicant_Clue(2, 157);
-	SDB_Add_Non_Replicant_Clue(2, 3);
-	SDB_Add_Non_Replicant_Clue(2, 21);
-	SDB_Add_Non_Replicant_Clue(2, 158);
-	SDB_Add_Other_Clue(2, 16);
-	SDB_Add_Other_Clue(2, 19);
-	SDB_Add_Other_Clue(2, 273);
-	SDB_Add_Identity_Clue(2, 25);
-	SDB_Add_Identity_Clue(2, 18);
-	SDB_Add_Identity_Clue(2, 19);
-	SDB_Add_Identity_Clue(2, 273);
-	SDB_Add_Photo_Clue(2, 20, 33);
-	SDB_Set_Actor(3, 6);
+	SDB_Add_MO_Clue(2, kClueOfficersStatement);
+	SDB_Add_MO_Clue(2, kClueLabCorpses);
+	SDB_Add_Whereabouts_Clue(2, kClueDispatchHitAndRun);
+	SDB_Add_Whereabouts_Clue(2, kClueRuncitersViewB);
+	SDB_Add_Replicant_Clue(2, kClueOfficersStatement);
+	SDB_Add_Replicant_Clue(2, kClueDoorForced2);
+	SDB_Add_Replicant_Clue(2, kClueHowieLeeInterview);
+	SDB_Add_Replicant_Clue(2, kClueZubenRunsAway);
+	SDB_Add_Replicant_Clue(2, kClueZuben);
+	SDB_Add_Replicant_Clue(2, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(2, kClueZubenTalksAboutLucy2);
+	SDB_Add_Non_Replicant_Clue(2, kClueLimpingFootprints);
+	SDB_Add_Non_Replicant_Clue(2, kClueBigManLimping);
+	SDB_Add_Non_Replicant_Clue(2, kClueZubensMotive);
+	SDB_Add_Other_Clue(2, kClueCrowdInterviewA);
+	SDB_Add_Other_Clue(2, kClueZubenInterview);
+	SDB_Add_Other_Clue(2, kClueLucyInterview);
+	SDB_Add_Identity_Clue(2, kClueHowieLeeInterview);
+	SDB_Add_Identity_Clue(2, kClueZubenRunsAway);
+	SDB_Add_Identity_Clue(2, kClueZubenInterview);
+	SDB_Add_Identity_Clue(2, kClueLucyInterview);
+	SDB_Add_Photo_Clue(2, kClueZuben, 33);
+	SDB_Set_Actor(3, kActorLucy);
 	SDB_Set_Sex(3, 0);
-	SDB_Add_Whereabouts_Clue(3, 8);
-	SDB_Add_Whereabouts_Clue(3, 9);
-	SDB_Add_Whereabouts_Clue(3, 15);
-	SDB_Add_Whereabouts_Clue(3, 28);
-	SDB_Add_Whereabouts_Clue(3, 84);
-	SDB_Add_Whereabouts_Clue(3, 19);
-	SDB_Add_Replicant_Clue(3, 22);
-	SDB_Add_Replicant_Clue(3, 23);
-	SDB_Add_Replicant_Clue(3, 271);
-	SDB_Add_Replicant_Clue(3, 156);
-	SDB_Add_Replicant_Clue(3, 107);
-	SDB_Add_Replicant_Clue(3, 280);
-	SDB_Add_Non_Replicant_Clue(3, 7);
-	SDB_Add_Non_Replicant_Clue(3, 85);
-	SDB_Add_Non_Replicant_Clue(3, 6);
-	SDB_Add_Non_Replicant_Clue(3, 272);
-	SDB_Add_Non_Replicant_Clue(3, 157);
-	SDB_Add_Other_Clue(3, 13);
-	SDB_Add_Other_Clue(3, 16);
-	SDB_Add_Identity_Clue(3, 22);
-	SDB_Add_Identity_Clue(3, 107);
-	SDB_Add_Photo_Clue(3, 13, 5);
-	SDB_Set_Actor(4, 3);
-	SDB_Add_MO_Clue(4, 252);
-	SDB_Add_Replicant_Clue(4, 162);
-	SDB_Add_Replicant_Clue(4, 92);
-	SDB_Add_Replicant_Clue(4, 91);
-	SDB_Add_Replicant_Clue(4, 107);
-	SDB_Add_Non_Replicant_Clue(4, 163);
-	SDB_Add_Non_Replicant_Clue(4, 96);
-	SDB_Add_Non_Replicant_Clue(4, 97);
-	SDB_Add_Non_Replicant_Clue(4, 98);
-	SDB_Add_Non_Replicant_Clue(4, 94);
-	SDB_Add_Other_Clue(4, 91);
-	SDB_Add_Other_Clue(4, 251);
-	SDB_Add_Other_Clue(4, 260);
-	SDB_Add_Other_Clue(4, 113);
-	SDB_Add_Identity_Clue(4, 96);
-	SDB_Add_Identity_Clue(4, 97);
-	SDB_Add_Identity_Clue(4, 92);
-	SDB_Add_Photo_Clue(4, 251, 21);
-	SDB_Add_Photo_Clue(4, 260, 19);
-	SDB_Set_Actor(5, 2);
+	SDB_Add_Whereabouts_Clue(3, kClueChopstickWrapper);
+	SDB_Add_Whereabouts_Clue(3, kClueSushiMenu);
+	SDB_Add_Whereabouts_Clue(3, kClueReferenceLetter);
+	SDB_Add_Whereabouts_Clue(3, kClueRuncitersViewA);
+	SDB_Add_Whereabouts_Clue(3, kClueHysteriaToken);
+	SDB_Add_Whereabouts_Clue(3, kClueZubenInterview);
+	SDB_Add_Replicant_Clue(3, kClueRunciterInterviewA);
+	SDB_Add_Replicant_Clue(3, kClueRunciterInterviewB1);
+	SDB_Add_Replicant_Clue(3, kClueVKLucyReplicant);
+	SDB_Add_Replicant_Clue(3, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(3, kClueDektoraInterview4);
+	SDB_Add_Replicant_Clue(3, kClueRuncitersConfession1);
+	SDB_Add_Non_Replicant_Clue(3, kClueToyDog);
+	SDB_Add_Non_Replicant_Clue(3, kClueRagDoll);
+	SDB_Add_Non_Replicant_Clue(3, kClueCandy);
+	SDB_Add_Non_Replicant_Clue(3, kClueVKLucyHuman);
+	SDB_Add_Non_Replicant_Clue(3, kClueZubenTalksAboutLucy2);
+	SDB_Add_Other_Clue(3, kClueLucy);
+	SDB_Add_Other_Clue(3, kClueCrowdInterviewA);
+	SDB_Add_Identity_Clue(3, kClueRunciterInterviewA);
+	SDB_Add_Identity_Clue(3, kClueDektoraInterview4);
+	SDB_Add_Photo_Clue(3, kClueLucy, 5);
+	SDB_Set_Actor(4, kActorDektora);
+	SDB_Add_MO_Clue(4, kClueScorpions);
+	SDB_Add_Replicant_Clue(4, kClueVKDektoraReplicant);
+	SDB_Add_Replicant_Clue(4, kClueEarlyQInterview);
+	SDB_Add_Replicant_Clue(4, kClueDragonflyBelt);
+	SDB_Add_Replicant_Clue(4, kClueDektoraInterview4);
+	SDB_Add_Non_Replicant_Clue(4, kClueVKDektoraHuman);
+	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview2);
+	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview3);
+	SDB_Add_Non_Replicant_Clue(4, kClueDektorasCard);
+	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview1);
+	SDB_Add_Other_Clue(4, kClueDragonflyBelt);
+	SDB_Add_Other_Clue(4, kClueWomanInAnimoidRow);
+	SDB_Add_Other_Clue(4, kClueChinaBar);
+	SDB_Add_Other_Clue(4, kClueCarRegistration1);
+	SDB_Add_Identity_Clue(4, kClueDektoraInterview2);
+	SDB_Add_Identity_Clue(4, kClueDektoraInterview3);
+	SDB_Add_Identity_Clue(4, kClueEarlyQInterview);
+	SDB_Add_Photo_Clue(4, kClueWomanInAnimoidRow, 21);
+	SDB_Add_Photo_Clue(4, kClueChinaBar, 19);
+	SDB_Set_Actor(5, kActorGordo);
 	SDB_Set_Sex(5, 1);
-	SDB_Add_Whereabouts_Clue(5, 102);
-	SDB_Add_Identity_Clue(5, 69);
-	SDB_Add_Identity_Clue(5, 70);
-	SDB_Set_Actor(6, 7);
+	SDB_Add_Whereabouts_Clue(5, kClueStolenCheese);
+	SDB_Add_Identity_Clue(5, kClueGordoInterview1);
+	SDB_Add_Identity_Clue(5, kClueGordoInterview2);
+	SDB_Set_Actor(6, kActorIzo);
 	SDB_Set_Sex(6, 1);
-	SDB_Add_Whereabouts_Clue(6, 58);
-	SDB_Add_Whereabouts_Clue(6, 59);
-	SDB_Add_Whereabouts_Clue(6, 181);
-	SDB_Add_Whereabouts_Clue(6, 122);
-	SDB_Add_Replicant_Clue(6, 63);
-	SDB_Add_Other_Clue(6, 180);
-	SDB_Add_Other_Clue(6, 66);
-	SDB_Add_Other_Clue(6, 125);
-	SDB_Add_Other_Clue(6, 121);
-	SDB_Add_Other_Clue(6, 255);
-	SDB_Add_Other_Clue(6, 246);
-	SDB_Add_Other_Clue(6, 247);
-	SDB_Add_Other_Clue(6, 62);
-	SDB_Add_Other_Clue(6, 60);
-	SDB_Add_Identity_Clue(6, 181);
-	SDB_Add_Identity_Clue(6, 58);
-	SDB_Add_Identity_Clue(6, 59);
-	SDB_Add_Identity_Clue(6, 246);
-	SDB_Add_Identity_Clue(6, 247);
-	SDB_Add_Identity_Clue(6, 62);
-	SDB_Add_Identity_Clue(6, 60);
-	SDB_Add_Photo_Clue(6, 255, 26);
-	SDB_Set_Actor(7, 0);
-	SDB_Add_Replicant_Clue(7, 275);
-	SDB_Add_Other_Clue(7, 246);
-	SDB_Add_Other_Clue(7, 247);
-	SDB_Add_Identity_Clue(7, 275);
-	SDB_Add_Photo_Clue(7, 275, 36);
-	SDB_Add_Photo_Clue(7, 246, 17);
-	SDB_Add_Photo_Clue(7, 247, 18);
-	SDB_Set_Actor(8, 4);
-	SDB_Add_Other_Clue(8, 256);
-	SDB_Add_Other_Clue(8, 125);
-	SDB_Add_Other_Clue(8, 126);
-	SDB_Add_Identity_Clue(8, 256);
-	SDB_Add_Identity_Clue(8, 126);
-	SDB_Add_Identity_Clue(8, 125);
-	SDB_Add_Photo_Clue(8, 256, 27);
+	SDB_Add_Whereabouts_Clue(6, kClueBobInterview1);
+	SDB_Add_Whereabouts_Clue(6, kClueBobInterview2);
+	SDB_Add_Whereabouts_Clue(6, kClueGrigorianInterviewB2);
+	SDB_Add_Whereabouts_Clue(6, kClueHomelessManInterview1);
+	SDB_Add_Replicant_Clue(6, kClueGogglesReplicantIssue);
+	SDB_Add_Other_Clue(6, kClueGrigorianInterviewB1);
+	SDB_Add_Other_Clue(6, kClueWeaponsCache);
+	SDB_Add_Other_Clue(6, kClueFolder);
+	SDB_Add_Other_Clue(6, kClueIzosStashRaided);
+	SDB_Add_Other_Clue(6, kClueIzo);
+	SDB_Add_Other_Clue(6, kCluePhotoOfMcCoy1);
+	SDB_Add_Other_Clue(6, kCluePhotoOfMcCoy2);
+	SDB_Add_Other_Clue(6, kClueRadiationGoggles);
+	SDB_Add_Other_Clue(6, kClueIzoInterview);
+	SDB_Add_Identity_Clue(6, kClueGrigorianInterviewB2);
+	SDB_Add_Identity_Clue(6, kClueBobInterview1);
+	SDB_Add_Identity_Clue(6, kClueBobInterview2);
+	SDB_Add_Identity_Clue(6, kCluePhotoOfMcCoy1);
+	SDB_Add_Identity_Clue(6, kCluePhotoOfMcCoy2);
+	SDB_Add_Identity_Clue(6, kClueRadiationGoggles);
+	SDB_Add_Identity_Clue(6, kClueIzoInterview);
+	SDB_Add_Photo_Clue(6, kClueIzo, 26);
+	SDB_Set_Actor(7, kActorMcCoy);
+	SDB_Add_Replicant_Clue(7, kClueMcCoyAtMoonbus);
+	SDB_Add_Other_Clue(7, kCluePhotoOfMcCoy1);
+	SDB_Add_Other_Clue(7, kCluePhotoOfMcCoy2);
+	SDB_Add_Identity_Clue(7, kClueMcCoyAtMoonbus);
+	SDB_Add_Photo_Clue(7, kClueMcCoyAtMoonbus, 36);
+	SDB_Add_Photo_Clue(7, kCluePhotoOfMcCoy1, 17);
+	SDB_Add_Photo_Clue(7, kCluePhotoOfMcCoy2, 18);
+	SDB_Set_Actor(8, kActorGuzza);
+	SDB_Add_Other_Clue(8, kClueGuzza);
+	SDB_Add_Other_Clue(8, kClueFolder);
+	SDB_Add_Other_Clue(8, kClueGuzzaFramedMcCoy);
+	SDB_Add_Identity_Clue(8, kClueGuzza);
+	SDB_Add_Identity_Clue(8, kClueGuzzaFramedMcCoy);
+	SDB_Add_Identity_Clue(8, kClueFolder);
+	SDB_Add_Photo_Clue(8, kClueGuzza, 27);
 }
 
 void ScriptInit::Init_CDB() {
-	CDB_Set_Crime(0, 0);
-	CDB_Set_Crime(1, 0);
-	CDB_Set_Crime(2, 0);
-	CDB_Set_Crime(3, 0);
-	CDB_Set_Crime(4, 0);
-	CDB_Set_Crime(5, 0);
-	CDB_Set_Crime(6, 0);
-	CDB_Set_Crime(7, 0);
-	CDB_Set_Crime(8, 0);
-	CDB_Set_Crime(9, 0);
-	CDB_Set_Crime(10, 0);
-	CDB_Set_Crime(11, 0);
-	CDB_Set_Crime(12, 0);
-	CDB_Set_Crime(15, 0);
-	CDB_Set_Crime(16, 0);
-	CDB_Set_Crime(17, 0);
-	CDB_Set_Crime(22, 0);
-	CDB_Set_Crime(23, 0);
-	CDB_Set_Crime(24, 0);
-	CDB_Set_Crime(26, 0);
-	CDB_Set_Crime(27, 0);
-	CDB_Set_Crime(28, 0);
-	CDB_Set_Crime(29, 0);
-	CDB_Set_Crime(30, 0);
-	CDB_Set_Crime(37, 0);
-	CDB_Set_Crime(31, 0);
-	CDB_Set_Crime(39, 0);
-	CDB_Set_Crime(243, 0);
-	CDB_Set_Crime(244, 0);
-	CDB_Set_Crime(273, 0);
-	CDB_Set_Crime(113, 0);
-	CDB_Set_Crime(114, 0);
-	CDB_Set_Crime(115, 0);
-	CDB_Set_Crime(19, 0);
-	CDB_Set_Crime(13, 0);
-	CDB_Set_Crime(14, 0);
-	CDB_Set_Crime(20, 0);
-	CDB_Set_Crime(43, 1);
-	CDB_Set_Crime(44, 1);
-	CDB_Set_Crime(45, 1);
-	CDB_Set_Crime(46, 1);
-	CDB_Set_Crime(49, 1);
-	CDB_Set_Crime(50, 1);
-	CDB_Set_Crime(51, 1);
-	CDB_Set_Crime(53, 1);
-	CDB_Set_Crime(54, 1);
-	CDB_Set_Crime(55, 1);
-	CDB_Set_Crime(65, 1);
-	CDB_Set_Crime(278, 1);
-	CDB_Set_Crime(279, 1);
-	CDB_Set_Crime(47, 1);
-	CDB_Set_Crime(262, 1);
-	CDB_Set_Crime(263, 1);
-	CDB_Set_Crime(261, 1);
-	CDB_Set_Crime(259, 1);
-	CDB_Set_Crime(33, 8);
-	CDB_Set_Crime(86, 8);
-	CDB_Set_Crime(275, 8);
-	CDB_Set_Crime(276, 8);
-	CDB_Set_Crime(277, 8);
-	CDB_Set_Crime(271, 8);
-	CDB_Set_Crime(52, 8);
-	CDB_Set_Crime(144, 8);
-	CDB_Set_Crime(178, 5);
-	CDB_Set_Crime(179, 5);
-	CDB_Set_Crime(180, 5);
-	CDB_Set_Crime(181, 5);
-	CDB_Set_Crime(68, 3);
-	CDB_Set_Crime(269, 3);
-	CDB_Set_Crime(270, 3);
-	CDB_Set_Crime(66, 2);
-	CDB_Set_Crime(125, 2);
-	CDB_Set_Crime(121, 2);
-	CDB_Set_Crime(122, 2);
-	CDB_Set_Crime(123, 2);
-	CDB_Set_Crime(124, 2);
-	CDB_Set_Crime(128, 2);
-	CDB_Set_Crime(83, 2);
-	CDB_Set_Crime(125, 2);
-	CDB_Set_Crime(126, 2);
-	CDB_Set_Crime(74, 4);
-	CDB_Set_Crime(266, 4);
+	CDB_Set_Crime(kClueOfficersStatement, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueDoorForced1, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueDoorForced2, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLimpingFootprints, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueGracefulFootprints, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueShellCasings, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCandy, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueToyDog, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueChopstickWrapper, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueSushiMenu, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLabCorpses, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLabShellCasings, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRuncitersVideo, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueReferenceLetter, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCrowdInterviewA, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCrowdInterviewB, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRunciterInterviewA, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRunciterInterviewB1, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRunciterInterviewB2, kCrimeAnimalMurder);
+	CDB_Set_Crime(kCluePaintTransfer, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueChromeDebris, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRuncitersViewA, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueRuncitersViewB, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCarColorAndMake, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLicensePlate, kCrimeAnimalMurder);
+	CDB_Set_Crime(kCluePartialLicenseNumber, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLabPaintTransfer, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueAnimalMurderSuspect, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueMilitaryBoots, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLucyInterview, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCarRegistration1, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCarRegistration2, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueCarRegistration3, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueZubenInterview, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueLucy, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueDragonflyAnklet, kCrimeAnimalMurder);
+	CDB_Set_Crime(kClueZuben, kCrimeAnimalMurder);
+	CDB_Set_Crime(kCluePhoneCallGuzza, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueDragonflyEarring, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellSecurity, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellGuardInterview, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueDetonatorWire, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueVictimInformation, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueAttemptedFileAccess, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueKingstonKitchenBox1, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellSalesPamphlet1, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellSalesPamphlet2, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueDogCollar1, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueRachaelInterview, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellInterview, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueBombingSuspect, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueDogCollar2, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueKingstonKitchenBox2, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kCluePlasticExplosive, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueTyrellSecurityPhoto, kCrimeEisendullerMurder);
+	CDB_Set_Crime(kClueGaffsInformation, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueMoonbus1, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueMcCoyAtMoonbus, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueClovisAtMoonbus, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueSadikAtMoonbus, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueVKLucyReplicant, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueCrystalsCase, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kCluePhoneCallCrystal, kCrimeMoonbusHijacking);
+	CDB_Set_Crime(kClueCrimeSceneNotes, kCrimeFactoryBombing);
+	CDB_Set_Crime(kClueGrigorianInterviewA, kCrimeFactoryBombing);
+	CDB_Set_Crime(kClueGrigorianInterviewB1, kCrimeFactoryBombing);
+	CDB_Set_Crime(kClueGrigorianInterviewB2, kCrimeFactoryBombing);
+	CDB_Set_Crime(kClueMorajiInterview, kCrimeMorajiMurder);
+	CDB_Set_Crime(kClueExpertBomber, kCrimeMorajiMurder);
+	CDB_Set_Crime(kClueAmateurBomber, kCrimeMorajiMurder);
+	CDB_Set_Crime(kClueWeaponsCache, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueFolder, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueIzosStashRaided, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueHomelessManInterview1, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueHomelessManInterview2, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueHomelessManKid, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueOriginalRequisitionForm, kCrimeArmsDealing);
+	CDB_Set_Crime(kCluePoliceIssueWeapons, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueFolder, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueGuzzaFramedMcCoy, kCrimeArmsDealing);
+	CDB_Set_Crime(kClueStaggeredbyPunches, kCrimeBradburyAssault);
+	CDB_Set_Crime(kClueAct2Ended, kCrimeBradburyAssault);
 	int i = 0;
 	do {
 		CDB_Set_Clue_Asset_Type(i++, -1);
 	} while (i < 288);
-	CDB_Set_Clue_Asset_Type(0, 2);
-	CDB_Set_Clue_Asset_Type(2, 2);
-	CDB_Set_Clue_Asset_Type(3, 2);
-	CDB_Set_Clue_Asset_Type(4, 2);
-	CDB_Set_Clue_Asset_Type(5, 3);
-	CDB_Set_Clue_Asset_Type(6, 3);
-	CDB_Set_Clue_Asset_Type(7, 3);
-	CDB_Set_Clue_Asset_Type(8, 3);
-	CDB_Set_Clue_Asset_Type(9, 0);
-	CDB_Set_Clue_Asset_Type(10, 2);
-	CDB_Set_Clue_Asset_Type(11, 2);
-	CDB_Set_Clue_Asset_Type(12, 1);
-	CDB_Set_Clue_Asset_Type(13, 0);
-	CDB_Set_Clue_Asset_Type(14, 0);
-	CDB_Set_Clue_Asset_Type(15, 3);
-	CDB_Set_Clue_Asset_Type(16, 2);
-	CDB_Set_Clue_Asset_Type(17, 2);
-	CDB_Set_Clue_Asset_Type(19, 2);
-	CDB_Set_Clue_Asset_Type(20, 0);
-	CDB_Set_Clue_Asset_Type(21, 2);
-	CDB_Set_Clue_Asset_Type(22, 2);
-	CDB_Set_Clue_Asset_Type(23, 2);
-	CDB_Set_Clue_Asset_Type(24, 2);
-	CDB_Set_Clue_Asset_Type(25, 2);
-	CDB_Set_Clue_Asset_Type(26, 2);
-	CDB_Set_Clue_Asset_Type(27, 3);
-	CDB_Set_Clue_Asset_Type(28, 0);
-	CDB_Set_Clue_Asset_Type(29, 0);
-	CDB_Set_Clue_Asset_Type(30, 0);
-	CDB_Set_Clue_Asset_Type(31, 0);
-	CDB_Set_Clue_Asset_Type(32, 3);
-	CDB_Set_Clue_Asset_Type(33, 2);
-	CDB_Set_Clue_Asset_Type(34, -1);
-	CDB_Set_Clue_Asset_Type(35, -1);
-	CDB_Set_Clue_Asset_Type(36, 0);
-	CDB_Set_Clue_Asset_Type(37, 3);
-	CDB_Set_Clue_Asset_Type(39, 2);
-	CDB_Set_Clue_Asset_Type(40, 2);
-	CDB_Set_Clue_Asset_Type(41, 0);
-	CDB_Set_Clue_Asset_Type(43, 2);
-	CDB_Set_Clue_Asset_Type(44, 3);
-	CDB_Set_Clue_Asset_Type(45, 1);
-	CDB_Set_Clue_Asset_Type(46, 2);
-	CDB_Set_Clue_Asset_Type(47, 0);
-	CDB_Set_Clue_Asset_Type(48, 0);
-	CDB_Set_Clue_Asset_Type(49, 3);
-	CDB_Set_Clue_Asset_Type(50, 2);
-	CDB_Set_Clue_Asset_Type(51, 2);
-	CDB_Set_Clue_Asset_Type(52, 2);
-	CDB_Set_Clue_Asset_Type(53, 3);
-	CDB_Set_Clue_Asset_Type(54, 3);
-	CDB_Set_Clue_Asset_Type(55, 3);
-	CDB_Set_Clue_Asset_Type(56, 2);
-	CDB_Set_Clue_Asset_Type(57, 2);
-	CDB_Set_Clue_Asset_Type(58, 2);
-	CDB_Set_Clue_Asset_Type(59, 2);
-	CDB_Set_Clue_Asset_Type(60, 2);
-	CDB_Set_Clue_Asset_Type(61, 2);
-	CDB_Set_Clue_Asset_Type(62, 3);
-	CDB_Set_Clue_Asset_Type(63, 2);
-	CDB_Set_Clue_Asset_Type(64, 2);
-	CDB_Set_Clue_Asset_Type(65, 3);
-	CDB_Set_Clue_Asset_Type(66, 2);
-	CDB_Set_Clue_Asset_Type(67, 2);
-	CDB_Set_Clue_Asset_Type(68, 2);
-	CDB_Set_Clue_Asset_Type(69, 2);
-	CDB_Set_Clue_Asset_Type(70, 2);
-	CDB_Set_Clue_Asset_Type(71, 2);
-	CDB_Set_Clue_Asset_Type(72, 2);
-	CDB_Set_Clue_Asset_Type(74, 2);
-	CDB_Set_Clue_Asset_Type(75, 3);
-	CDB_Set_Clue_Asset_Type(76, 3);
-	CDB_Set_Clue_Asset_Type(77, 0);
-	CDB_Set_Clue_Asset_Type(78, 0);
-	CDB_Set_Clue_Asset_Type(79, 2);
-	CDB_Set_Clue_Asset_Type(80, 3);
-	CDB_Set_Clue_Asset_Type(81, 3);
-	CDB_Set_Clue_Asset_Type(84, 3);
-	CDB_Set_Clue_Asset_Type(85, 3);
-	CDB_Set_Clue_Asset_Type(86, 0);
-	CDB_Set_Clue_Asset_Type(87, 3);
-	CDB_Set_Clue_Asset_Type(88, 0);
-	CDB_Set_Clue_Asset_Type(89, 1);
-	CDB_Set_Clue_Asset_Type(93, 3);
-	CDB_Set_Clue_Asset_Type(94, 2);
-	CDB_Set_Clue_Asset_Type(96, 2);
-	CDB_Set_Clue_Asset_Type(97, 2);
-	CDB_Set_Clue_Asset_Type(98, 3);
-	CDB_Set_Clue_Asset_Type(99, 3);
-	CDB_Set_Clue_Asset_Type(100, 3);
-	CDB_Set_Clue_Asset_Type(101, 2);
-	CDB_Set_Clue_Asset_Type(102, 2);
-	CDB_Set_Clue_Asset_Type(103, 2);
-	CDB_Set_Clue_Asset_Type(104, 2);
-	CDB_Set_Clue_Asset_Type(105, 3);
-	CDB_Set_Clue_Asset_Type(106, 3);
-	CDB_Set_Clue_Asset_Type(107, 2);
-	CDB_Set_Clue_Asset_Type(108, 2);
-	CDB_Set_Clue_Asset_Type(109, 3);
-	CDB_Set_Clue_Asset_Type(110, 3);
-	CDB_Set_Clue_Asset_Type(112, 2);
-	CDB_Set_Clue_Asset_Type(113, 2);
-	CDB_Set_Clue_Asset_Type(114, 2);
-	CDB_Set_Clue_Asset_Type(115, 2);
-	CDB_Set_Clue_Asset_Type(116, 2);
-	CDB_Set_Clue_Asset_Type(117, 2);
-	CDB_Set_Clue_Asset_Type(118, 3);
-	CDB_Set_Clue_Asset_Type(119, 3);
-	CDB_Set_Clue_Asset_Type(120, 2);
-	CDB_Set_Clue_Asset_Type(121, 2);
-	CDB_Set_Clue_Asset_Type(122, 2);
-	CDB_Set_Clue_Asset_Type(123, 2);
-	CDB_Set_Clue_Asset_Type(124, 2);
-	CDB_Set_Clue_Asset_Type(126, 2);
-	CDB_Set_Clue_Asset_Type(127, 3);
-	CDB_Set_Clue_Asset_Type(128, 3);
-	CDB_Set_Clue_Asset_Type(129, 3);
-	CDB_Set_Clue_Asset_Type(131, 3);
-	CDB_Set_Clue_Asset_Type(133, 2);
-	CDB_Set_Clue_Asset_Type(134, 2);
-	CDB_Set_Clue_Asset_Type(135, 2);
-	CDB_Set_Clue_Asset_Type(136, 2);
-	CDB_Set_Clue_Asset_Type(137, 0);
-	CDB_Set_Clue_Asset_Type(138, 0);
-	CDB_Set_Clue_Asset_Type(139, 2);
-	CDB_Set_Clue_Asset_Type(140, 2);
-	CDB_Set_Clue_Asset_Type(141, 2);
-	CDB_Set_Clue_Asset_Type(142, 2);
-	CDB_Set_Clue_Asset_Type(143, 2);
-	CDB_Set_Clue_Asset_Type(144, 2);
-	CDB_Set_Clue_Asset_Type(145, 3);
-	CDB_Set_Clue_Asset_Type(146, 3);
-	CDB_Set_Clue_Asset_Type(178, 2);
-	CDB_Set_Clue_Asset_Type(179, 2);
-	CDB_Set_Clue_Asset_Type(180, 2);
-	CDB_Set_Clue_Asset_Type(181, 2);
-	CDB_Set_Clue_Asset_Type(147, 3);
-	CDB_Set_Clue_Asset_Type(148, 3);
-	CDB_Set_Clue_Asset_Type(149, 3);
-	CDB_Set_Clue_Asset_Type(150, 3);
-	CDB_Set_Clue_Asset_Type(151, 3);
-	CDB_Set_Clue_Asset_Type(152, 3);
-	CDB_Set_Clue_Asset_Type(243, 0);
-	CDB_Set_Clue_Asset_Type(244, 0);
-	CDB_Set_Clue_Asset_Type(245, 0);
-	CDB_Set_Clue_Asset_Type(246, 0);
-	CDB_Set_Clue_Asset_Type(247, 0);
-	CDB_Set_Clue_Asset_Type(248, 0);
-	CDB_Set_Clue_Asset_Type(249, 0);
-	CDB_Set_Clue_Asset_Type(250, 0);
-	CDB_Set_Clue_Asset_Type(251, 0);
-	CDB_Set_Clue_Asset_Type(252, 0);
-	CDB_Set_Clue_Asset_Type(253, 0);
-	CDB_Set_Clue_Asset_Type(254, 0);
-	CDB_Set_Clue_Asset_Type(255, 0);
-	CDB_Set_Clue_Asset_Type(256, 0);
-	CDB_Set_Clue_Asset_Type(257, 1);
-	CDB_Set_Clue_Asset_Type(258, 0);
-	CDB_Set_Clue_Asset_Type(259, 0);
-	CDB_Set_Clue_Asset_Type(260, 0);
-	CDB_Set_Clue_Asset_Type(261, 0);
-	CDB_Set_Clue_Asset_Type(262, 0);
-	CDB_Set_Clue_Asset_Type(263, 0);
-	CDB_Set_Clue_Asset_Type(264, 3);
-	CDB_Set_Clue_Asset_Type(265, 3);
-	CDB_Set_Clue_Asset_Type(269, 2);
-	CDB_Set_Clue_Asset_Type(270, 2);
-	CDB_Set_Clue_Asset_Type(271, 2);
-	CDB_Set_Clue_Asset_Type(272, 2);
-	CDB_Set_Clue_Asset_Type(162, 2);
-	CDB_Set_Clue_Asset_Type(163, 2);
-	CDB_Set_Clue_Asset_Type(164, 2);
-	CDB_Set_Clue_Asset_Type(165, 2);
-	CDB_Set_Clue_Asset_Type(168, 2);
-	CDB_Set_Clue_Asset_Type(169, 2);
-	CDB_Set_Clue_Asset_Type(174, 2);
-	CDB_Set_Clue_Asset_Type(175, 2);
-	CDB_Set_Clue_Asset_Type(273, 2);
-	CDB_Set_Clue_Asset_Type(274, 0);
-	CDB_Set_Clue_Asset_Type(275, 0);
-	CDB_Set_Clue_Asset_Type(276, 0);
-	CDB_Set_Clue_Asset_Type(277, 0);
-	CDB_Set_Clue_Asset_Type(156, 2);
-	CDB_Set_Clue_Asset_Type(157, 2);
-	CDB_Set_Clue_Asset_Type(158, 2);
-	CDB_Set_Clue_Asset_Type(278, 2);
-	CDB_Set_Clue_Asset_Type(279, 2);
-	CDB_Set_Clue_Asset_Type(280, 2);
-	CDB_Set_Clue_Asset_Type(283, 2);
-	CDB_Set_Clue_Asset_Type(284, 2);
-	CDB_Set_Clue_Asset_Type(285, 2);
-	CDB_Set_Clue_Asset_Type(286, 2);
-	CDB_Set_Clue_Asset_Type(287, 2);
-	CDB_Set_Clue_Asset_Type(125, 3);
+	CDB_Set_Clue_Asset_Type(kClueOfficersStatement, 2);
+	CDB_Set_Clue_Asset_Type(kClueDoorForced2, 2);
+	CDB_Set_Clue_Asset_Type(kClueLimpingFootprints, 2);
+	CDB_Set_Clue_Asset_Type(kClueGracefulFootprints, 2);
+	CDB_Set_Clue_Asset_Type(kClueShellCasings, 3);
+	CDB_Set_Clue_Asset_Type(kClueCandy, 3);
+	CDB_Set_Clue_Asset_Type(kClueToyDog, 3);
+	CDB_Set_Clue_Asset_Type(kClueChopstickWrapper, 3);
+	CDB_Set_Clue_Asset_Type(kClueSushiMenu, 0);
+	CDB_Set_Clue_Asset_Type(kClueLabCorpses, 2);
+	CDB_Set_Clue_Asset_Type(kClueLabShellCasings, 2);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersVideo, 1);
+	CDB_Set_Clue_Asset_Type(kClueLucy, 0);
+	CDB_Set_Clue_Asset_Type(kClueDragonflyAnklet, 0);
+	CDB_Set_Clue_Asset_Type(kClueReferenceLetter, 3);
+	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewA, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewB, 2);
+	CDB_Set_Clue_Asset_Type(kClueZubenInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueZuben, 0);
+	CDB_Set_Clue_Asset_Type(kClueBigManLimping, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewA, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB1, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB2, 2);
+	CDB_Set_Clue_Asset_Type(kClueHowieLeeInterview, 2);
+	CDB_Set_Clue_Asset_Type(kCluePaintTransfer, 2);
+	CDB_Set_Clue_Asset_Type(kClueChromeDebris, 3);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersViewA, 0);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersViewB, 0);
+	CDB_Set_Clue_Asset_Type(kClueCarColorAndMake, 0);
+	CDB_Set_Clue_Asset_Type(kCluePartialLicenseNumber, 0);
+	CDB_Set_Clue_Asset_Type(kClueBriefcase, 3);
+	CDB_Set_Clue_Asset_Type(kClueGaffsInformation, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrystalVisitedRunciters, -1);
+	CDB_Set_Clue_Asset_Type(kClueCrystalVisitedChinatown, -1);
+	CDB_Set_Clue_Asset_Type(kClueWantedPoster, 0);
+	CDB_Set_Clue_Asset_Type(kClueLicensePlate, 3);
+	CDB_Set_Clue_Asset_Type(kClueLabPaintTransfer, 2);
+	CDB_Set_Clue_Asset_Type(kClueDispatchHitAndRun, 2);
+	CDB_Set_Clue_Asset_Type(kClueInceptShotRoy, 0);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallGuzza, 2);
+	CDB_Set_Clue_Asset_Type(kClueDragonflyEarring, 3);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSecurity, 1);
+	CDB_Set_Clue_Asset_Type(kClueTyrellGuardInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueBombingSuspect, 0);
+	CDB_Set_Clue_Asset_Type(kClueSadiksGun, 0);
+	CDB_Set_Clue_Asset_Type(kClueDetonatorWire, 3);
+	CDB_Set_Clue_Asset_Type(kClueVictimInformation, 2);
+	CDB_Set_Clue_Asset_Type(kClueAttemptedFileAccess, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrystalsCase, 2);
+	CDB_Set_Clue_Asset_Type(kClueKingstonKitchenBox1, 3);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSalesPamphlet1, 3);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSalesPamphlet2, 3);
+	CDB_Set_Clue_Asset_Type(kCluePeruvianLadyInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueHasanInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueBobInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueBobInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueIzoInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueIzosWarning, 2);
+	CDB_Set_Clue_Asset_Type(kClueRadiationGoggles, 3);
+	CDB_Set_Clue_Asset_Type(kClueGogglesReplicantIssue, 2);
+	CDB_Set_Clue_Asset_Type(kClueFishLadyInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueDogCollar1, 3);
+	CDB_Set_Clue_Asset_Type(kClueWeaponsCache, 2);
+	CDB_Set_Clue_Asset_Type(kClueChewInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueMorajiInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueAnsweringMachineMessage, 2);
+	CDB_Set_Clue_Asset_Type(kClueChessTable, 2);
+	CDB_Set_Clue_Asset_Type(kClueStaggeredbyPunches, 2);
+	CDB_Set_Clue_Asset_Type(kClueMaggieBracelet, 3);
+	CDB_Set_Clue_Asset_Type(kClueEnvelope, 3);
+	CDB_Set_Clue_Asset_Type(kClueIzosFriend, 0);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityPhoto, 0);
+	CDB_Set_Clue_Asset_Type(kCluePurchasedScorpions, 2);
+	CDB_Set_Clue_Asset_Type(kClueWeaponsOrderForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueShippingForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueHysteriaToken, 3);
+	CDB_Set_Clue_Asset_Type(kClueRagDoll, 3);
+	CDB_Set_Clue_Asset_Type(kClueMoonbus1, 0);
+	CDB_Set_Clue_Asset_Type(kClueCheese, 3);
+	CDB_Set_Clue_Asset_Type(kClueDektorasDressingRoom, 0);
+	CDB_Set_Clue_Asset_Type(kClueEarlyQsClub, 1);
+	CDB_Set_Clue_Asset_Type(kClueStrangeScale1, 3);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview3, 2);
+	CDB_Set_Clue_Asset_Type(kClueDektorasCard, 3);
+	CDB_Set_Clue_Asset_Type(kClueGrigoriansNote, 3);
+	CDB_Set_Clue_Asset_Type(kClueCollectionReceipt, 3);
+	CDB_Set_Clue_Asset_Type(kClueSpecialIngredient, 2);
+	CDB_Set_Clue_Asset_Type(kClueStolenCheese, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview3, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordoConfession, 2);
+	CDB_Set_Clue_Asset_Type(kClueGordosLighter1, 3);
+	CDB_Set_Clue_Asset_Type(kClueGordosLighter2, 3);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview4, 2);
+	CDB_Set_Clue_Asset_Type(kClueHollowayInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueBakersBadge, 3);
+	CDB_Set_Clue_Asset_Type(kClueHoldensBadge, 3);
+	CDB_Set_Clue_Asset_Type(kClueCarIdentified, 2);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration1, 2);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration2, 2);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration3, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueLichenDogWrapper, 3);
+	CDB_Set_Clue_Asset_Type(kClueRequisitionForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueScaryChair, 2);
+	CDB_Set_Clue_Asset_Type(kClueIzosStashRaided, 2);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManInterview1, 2);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManInterview2, 2);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManKid, 2);
+	CDB_Set_Clue_Asset_Type(kClueGuzzaFramedMcCoy, 2);
+	CDB_Set_Clue_Asset_Type(kClueOriginalShippingForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueOriginalRequisitionForm, 3);
+	CDB_Set_Clue_Asset_Type(kClueCandyWrapper, 3);
+	CDB_Set_Clue_Asset_Type(kClueFlaskOfAbsinthe, 3);
+	CDB_Set_Clue_Asset_Type(kClueDektoraConfession, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterConfession1, 2);
+	CDB_Set_Clue_Asset_Type(kClueRunciterConfession2, 2);
+	CDB_Set_Clue_Asset_Type(kClueLutherLanceInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueMoonbus2, 0);
+	CDB_Set_Clue_Asset_Type(kClueMoonbusCloseup, 0);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallDektora1, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallDektora2, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallLucy1, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallLucy2, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallClovis, 2);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallCrystal, 2);
+	CDB_Set_Clue_Asset_Type(kCluePowerSource, 3);
+	CDB_Set_Clue_Asset_Type(kClueBomb, 3);
+	CDB_Set_Clue_Asset_Type(kClueCrimeSceneNotes, 2);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewA, 2);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewB1, 2);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewB2, 2);
+	CDB_Set_Clue_Asset_Type(kClueDNATyrell, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNASebastian, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNAChew, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNAMoraji, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNALutherLance, 3);
+	CDB_Set_Clue_Asset_Type(kClueDNAMarcus, 3);
+	CDB_Set_Clue_Asset_Type(kClueAnimalMurderSuspect, 0);
+	CDB_Set_Clue_Asset_Type(kClueMilitaryBoots, 0);
+	CDB_Set_Clue_Asset_Type(kClueOuterDressingRoom, 0);
+	CDB_Set_Clue_Asset_Type(kCluePhotoOfMcCoy1, 0);
+	CDB_Set_Clue_Asset_Type(kCluePhotoOfMcCoy2, 0);
+	CDB_Set_Clue_Asset_Type(kClueEarlyQAndLucy, 0);
+	CDB_Set_Clue_Asset_Type(kClueClovisflowers, 0);
+	CDB_Set_Clue_Asset_Type(kClueLucyWithDektora, 0);
+	CDB_Set_Clue_Asset_Type(kClueWomanInAnimoidRow, 0);
+	CDB_Set_Clue_Asset_Type(kClueScorpions, 0);
+	CDB_Set_Clue_Asset_Type(kClueStrangeScale2, 0);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityCamera, 0);
+	CDB_Set_Clue_Asset_Type(kClueIzo, 0);
+	CDB_Set_Clue_Asset_Type(kClueGuzza, 0);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityDisc, 1);
+	CDB_Set_Clue_Asset_Type(kClueScorpionbox, 0);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSecurityPhoto, 0);
+	CDB_Set_Clue_Asset_Type(kClueChinaBar, 0);
+	CDB_Set_Clue_Asset_Type(kCluePlasticExplosive, 0);
+	CDB_Set_Clue_Asset_Type(kClueDogCollar2, 0);
+	CDB_Set_Clue_Asset_Type(kClueKingstonKitchenBox2, 0);
+	CDB_Set_Clue_Asset_Type(kClueCrystalsCigarette, 3);
+	CDB_Set_Clue_Asset_Type(kClueSpinnerKeys, 3);
+	CDB_Set_Clue_Asset_Type(kClueExpertBomber, 2);
+	CDB_Set_Clue_Asset_Type(kClueAmateurBomber, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKLucyReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKLucyHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKDektoraReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKDektoraHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKBobGorskyReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKBobGorskyHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKGrigorianReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKGrigorianHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKRunciterReplicant, 2);
+	CDB_Set_Clue_Asset_Type(kClueVKRunciterHuman, 2);
+	CDB_Set_Clue_Asset_Type(kClueLucyInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueMoonbusReflection, 0);
+	CDB_Set_Clue_Asset_Type(kClueMcCoyAtMoonbus, 0);
+	CDB_Set_Clue_Asset_Type(kClueClovisAtMoonbus, 0);
+	CDB_Set_Clue_Asset_Type(kClueSadikAtMoonbus, 0);
+	CDB_Set_Clue_Asset_Type(kClueZubenTalksAboutLucy1, 2);
+	CDB_Set_Clue_Asset_Type(kClueZubenTalksAboutLucy2, 2);
+	CDB_Set_Clue_Asset_Type(kClueZubensMotive, 2);
+	CDB_Set_Clue_Asset_Type(kClueRachaelInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueTyrellInterview, 2);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersConfession1, 2);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewA, 2);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewB1, 2);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewB2, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview3, 2);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegGgrovels, 2);
+	CDB_Set_Clue_Asset_Type(kClueFolder, 3);
 }
 
 void ScriptInit::Init_Spinner() {
@@ -2329,274 +2655,274 @@ void ScriptInit::Init_Spinner() {
 }
 
 void ScriptInit::Init_Actor_Friendliness() {
-	Actor_Set_Friendliness_To_Other(1, 0, 65);
-	Actor_Set_Friendliness_To_Other(1, 4, 60);
-	Actor_Set_Friendliness_To_Other(1, 11, 30);
-	Actor_Set_Friendliness_To_Other(1, 15, 35);
-	Actor_Set_Friendliness_To_Other(1, 23, 65);
-	Actor_Set_Friendliness_To_Other(1, 24, 65);
-	Actor_Set_Friendliness_To_Other(1, 28, 70);
-	Actor_Set_Friendliness_To_Other(1, 30, 65);
-	Actor_Set_Friendliness_To_Other(1, 34, 80);
-	Actor_Set_Friendliness_To_Other(1, 53, 65);
-	Actor_Set_Friendliness_To_Other(2, 1, 45);
-	Actor_Set_Friendliness_To_Other(2, 4, 65);
-	Actor_Set_Friendliness_To_Other(2, 11, 70);
-	Actor_Set_Friendliness_To_Other(2, 12, 75);
-	Actor_Set_Friendliness_To_Other(2, 15, 30);
-	Actor_Set_Friendliness_To_Other(2, 19, 80);
-	Actor_Set_Friendliness_To_Other(2, 23, 40);
-	Actor_Set_Friendliness_To_Other(2, 24, 40);
-	Actor_Set_Friendliness_To_Other(2, 28, 70);
-	Actor_Set_Friendliness_To_Other(2, 53, 40);
-	Actor_Set_Friendliness_To_Other(4, 1, 75);
-	Actor_Set_Friendliness_To_Other(4, 2, 70);
-	Actor_Set_Friendliness_To_Other(4, 11, 40);
-	Actor_Set_Friendliness_To_Other(4, 12, 55);
-	Actor_Set_Friendliness_To_Other(4, 15, 40);
-	Actor_Set_Friendliness_To_Other(4, 19, 45);
-	Actor_Set_Friendliness_To_Other(4, 23, 55);
-	Actor_Set_Friendliness_To_Other(4, 24, 55);
-	Actor_Set_Friendliness_To_Other(4, 28, 60);
-	Actor_Set_Friendliness_To_Other(4, 30, 60);
-	Actor_Set_Friendliness_To_Other(4, 34, 60);
-	Actor_Set_Friendliness_To_Other(4, 53, 65);
-	Actor_Set_Friendliness_To_Other(5, 0, 63);
-	Actor_Set_Friendliness_To_Other(6, 0, 50);
-	Actor_Set_Friendliness_To_Other(11, 1, 30);
-	Actor_Set_Friendliness_To_Other(11, 2, 70);
-	Actor_Set_Friendliness_To_Other(11, 4, 30);
-	Actor_Set_Friendliness_To_Other(11, 12, 55);
-	Actor_Set_Friendliness_To_Other(11, 15, 60);
-	Actor_Set_Friendliness_To_Other(11, 19, 70);
-	Actor_Set_Friendliness_To_Other(11, 23, 30);
-	Actor_Set_Friendliness_To_Other(11, 24, 30);
-	Actor_Set_Friendliness_To_Other(11, 28, 65);
-	Actor_Set_Friendliness_To_Other(11, 53, 30);
-	Actor_Set_Friendliness_To_Other(12, 2, 75);
-	Actor_Set_Friendliness_To_Other(12, 4, 40);
-	Actor_Set_Friendliness_To_Other(12, 11, 35);
-	Actor_Set_Friendliness_To_Other(12, 15, 40);
-	Actor_Set_Friendliness_To_Other(12, 19, 65);
-	Actor_Set_Friendliness_To_Other(12, 23, 40);
-	Actor_Set_Friendliness_To_Other(12, 24, 40);
-	Actor_Set_Friendliness_To_Other(12, 28, 70);
-	Actor_Set_Friendliness_To_Other(12, 53, 45);
-	Actor_Set_Friendliness_To_Other(15, 1, 55);
-	Actor_Set_Friendliness_To_Other(15, 2, 40);
-	Actor_Set_Friendliness_To_Other(15, 4, 40);
-	Actor_Set_Friendliness_To_Other(15, 11, 35);
-	Actor_Set_Friendliness_To_Other(15, 12, 40);
-	Actor_Set_Friendliness_To_Other(15, 19, 40);
-	Actor_Set_Friendliness_To_Other(15, 23, 60);
-	Actor_Set_Friendliness_To_Other(15, 24, 60);
-	Actor_Set_Friendliness_To_Other(15, 28, 65);
-	Actor_Set_Friendliness_To_Other(15, 53, 65);
-	Actor_Set_Friendliness_To_Other(19, 1, 45);
-	Actor_Set_Friendliness_To_Other(19, 2, 90);
-	Actor_Set_Friendliness_To_Other(19, 4, 55);
-	Actor_Set_Friendliness_To_Other(19, 11, 65);
-	Actor_Set_Friendliness_To_Other(19, 12, 60);
-	Actor_Set_Friendliness_To_Other(19, 15, 35);
-	Actor_Set_Friendliness_To_Other(19, 23, 35);
-	Actor_Set_Friendliness_To_Other(19, 24, 35);
-	Actor_Set_Friendliness_To_Other(19, 28, 60);
-	Actor_Set_Friendliness_To_Other(19, 53, 35);
-	Actor_Set_Friendliness_To_Other(23, 1, 75);
-	Actor_Set_Friendliness_To_Other(23, 4, 75);
-	Actor_Set_Friendliness_To_Other(23, 11, 35);
-	Actor_Set_Friendliness_To_Other(23, 12, 45);
-	Actor_Set_Friendliness_To_Other(23, 15, 40);
-	Actor_Set_Friendliness_To_Other(23, 24, 80);
-	Actor_Set_Friendliness_To_Other(23, 28, 70);
-	Actor_Set_Friendliness_To_Other(23, 30, 85);
-	Actor_Set_Friendliness_To_Other(23, 34, 85);
-	Actor_Set_Friendliness_To_Other(23, 53, 85);
-	Actor_Set_Friendliness_To_Other(24, 1, 75);
-	Actor_Set_Friendliness_To_Other(24, 4, 75);
-	Actor_Set_Friendliness_To_Other(24, 11, 35);
-	Actor_Set_Friendliness_To_Other(24, 12, 45);
-	Actor_Set_Friendliness_To_Other(24, 15, 40);
-	Actor_Set_Friendliness_To_Other(24, 23, 80);
-	Actor_Set_Friendliness_To_Other(24, 28, 65);
-	Actor_Set_Friendliness_To_Other(24, 30, 80);
-	Actor_Set_Friendliness_To_Other(24, 34, 85);
-	Actor_Set_Friendliness_To_Other(24, 53, 85);
-	Actor_Set_Friendliness_To_Other(28, 0, 60);
-	Actor_Set_Friendliness_To_Other(28, 1, 60);
-	Actor_Set_Friendliness_To_Other(28, 2, 65);
-	Actor_Set_Friendliness_To_Other(28, 4, 65);
-	Actor_Set_Friendliness_To_Other(28, 12, 65);
-	Actor_Set_Friendliness_To_Other(28, 15, 40);
-	Actor_Set_Friendliness_To_Other(28, 19, 65);
-	Actor_Set_Friendliness_To_Other(28, 23, 70);
-	Actor_Set_Friendliness_To_Other(28, 24, 70);
-	Actor_Set_Friendliness_To_Other(28, 53, 70);
-	Actor_Set_Friendliness_To_Other(30, 1, 70);
-	Actor_Set_Friendliness_To_Other(30, 4, 75);
-	Actor_Set_Friendliness_To_Other(30, 11, 35);
-	Actor_Set_Friendliness_To_Other(30, 23, 70);
-	Actor_Set_Friendliness_To_Other(30, 24, 70);
-	Actor_Set_Friendliness_To_Other(30, 34, 65);
-	Actor_Set_Friendliness_To_Other(30, 53, 70);
-	Actor_Set_Friendliness_To_Other(34, 0, 70);
-	Actor_Set_Friendliness_To_Other(34, 1, 70);
-	Actor_Set_Friendliness_To_Other(34, 4, 80);
-	Actor_Set_Friendliness_To_Other(34, 11, 35);
-	Actor_Set_Friendliness_To_Other(34, 23, 70);
-	Actor_Set_Friendliness_To_Other(34, 24, 70);
-	Actor_Set_Friendliness_To_Other(34, 30, 65);
-	Actor_Set_Friendliness_To_Other(34, 53, 70);
-	Actor_Set_Friendliness_To_Other(53, 1, 70);
-	Actor_Set_Friendliness_To_Other(53, 4, 65);
-	Actor_Set_Friendliness_To_Other(53, 11, 35);
-	Actor_Set_Friendliness_To_Other(53, 15, 35);
-	Actor_Set_Friendliness_To_Other(53, 23, 70);
-	Actor_Set_Friendliness_To_Other(53, 24, 65);
-	Actor_Set_Friendliness_To_Other(53, 28, 80);
-	Actor_Set_Friendliness_To_Other(53, 30, 70);
-	Actor_Set_Friendliness_To_Other(53, 34, 70);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorMcCoy, 65);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorGuzza, 60);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorGrigorian, 30);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorRunciter, 35);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorOfficerLeary, 65);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorOfficerGrayford, 65);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorHowieLee, 70);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorKlein, 65);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorSergeantWalls, 80);
+	Actor_Set_Friendliness_To_Other(kActorSteele, kActorGaff, 65);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorSteele, 45);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorGuzza, 65);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorGrigorian, 70);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorTransient, 75);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorRunciter, 30);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorZuben, 80);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorOfficerLeary, 40);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorOfficerGrayford, 40);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorHowieLee, 70);
+	Actor_Set_Friendliness_To_Other(kActorGordo, kActorGaff, 40);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorSteele, 75);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorGordo, 70);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorGrigorian, 40);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorTransient, 55);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorZuben, 45);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorOfficerLeary, 55);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorOfficerGrayford, 55);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorHowieLee, 60);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorKlein, 60);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorSergeantWalls, 60);
+	Actor_Set_Friendliness_To_Other(kActorGuzza, kActorGaff, 65);
+	Actor_Set_Friendliness_To_Other(kActorClovis, kActorMcCoy, 63);
+	Actor_Set_Friendliness_To_Other(kActorLucy, kActorMcCoy, 50);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorSteele, 30);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorGordo, 70);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorGuzza, 30);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorTransient, 55);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorRunciter, 60);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorZuben, 70);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorOfficerLeary, 30);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorOfficerGrayford, 30);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorHowieLee, 65);
+	Actor_Set_Friendliness_To_Other(kActorGrigorian, kActorGaff, 30);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorGordo, 75);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorGuzza, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorZuben, 65);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorOfficerLeary, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorOfficerGrayford, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorHowieLee, 70);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorGaff, 45);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorSteele, 55);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorGordo, 40);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorGuzza, 40);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorTransient, 40);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorZuben, 40);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorOfficerLeary, 60);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorOfficerGrayford, 60);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorHowieLee, 65);
+	Actor_Set_Friendliness_To_Other(kActorRunciter, kActorGaff, 65);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorSteele, 45);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorGordo, 90);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorGuzza, 55);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorGrigorian, 65);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorTransient, 60);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorRunciter, 35);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorOfficerLeary, 35);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorOfficerGrayford, 35);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorHowieLee, 60);
+	Actor_Set_Friendliness_To_Other(kActorZuben, kActorGaff, 35);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorSteele, 75);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorGuzza, 75);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorTransient, 45);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorOfficerGrayford, 80);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorHowieLee, 70);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorKlein, 85);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorSergeantWalls, 85);
+	Actor_Set_Friendliness_To_Other(kActorOfficerLeary, kActorGaff, 85);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorSteele, 75);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorGuzza, 75);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorTransient, 45);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorOfficerLeary, 80);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorHowieLee, 65);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorKlein, 80);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorSergeantWalls, 85);
+	Actor_Set_Friendliness_To_Other(kActorOfficerGrayford, kActorGaff, 85);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorMcCoy, 60);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorSteele, 60);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorGordo, 65);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorGuzza, 65);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorTransient, 65);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorRunciter, 40);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorZuben, 65);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorOfficerLeary, 70);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorOfficerGrayford, 70);
+	Actor_Set_Friendliness_To_Other(kActorHowieLee, kActorGaff, 70);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorSteele, 70);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorGuzza, 75);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorOfficerLeary, 70);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorOfficerGrayford, 70);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorSergeantWalls, 65);
+	Actor_Set_Friendliness_To_Other(kActorKlein, kActorGaff, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorMcCoy, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorSteele, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorGuzza, 80);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorOfficerLeary, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorOfficerGrayford, 70);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorKlein, 65);
+	Actor_Set_Friendliness_To_Other(kActorSergeantWalls, kActorGaff, 70);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorSteele, 70);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorGuzza, 65);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorGrigorian, 35);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorRunciter, 35);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorOfficerLeary, 70);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorOfficerGrayford, 65);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorHowieLee, 80);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorKlein, 70);
+	Actor_Set_Friendliness_To_Other(kActorGaff, kActorSergeantWalls, 70);
 }
 
 void ScriptInit::Init_Actor_Combat_Aggressiveness() {
-	Actor_Set_Combat_Aggressiveness(4, 50);
-	Actor_Set_Combat_Aggressiveness(14, 50);
-	Actor_Set_Combat_Aggressiveness(17, 50);
-	Actor_Set_Combat_Aggressiveness(19, 90);
-	Actor_Set_Combat_Aggressiveness(2, 50);
-	Actor_Set_Combat_Aggressiveness(6, 0);
-	Actor_Set_Combat_Aggressiveness(7, 70);
-	Actor_Set_Combat_Aggressiveness(3, 60);
-	Actor_Set_Combat_Aggressiveness(1, 70);
-	Actor_Set_Combat_Aggressiveness(8, 80);
-	Actor_Set_Combat_Aggressiveness(5, 75);
-	Actor_Set_Combat_Aggressiveness(23, 70);
-	Actor_Set_Combat_Aggressiveness(24, 60);
-	Actor_Set_Combat_Aggressiveness(70, 40);
-	Actor_Set_Combat_Aggressiveness(71, 30);
-	Actor_Set_Combat_Aggressiveness(72, 30);
-	Actor_Set_Combat_Aggressiveness(64, 100);
+	Actor_Set_Combat_Aggressiveness(kActorGuzza, 50);
+	Actor_Set_Combat_Aggressiveness(kActorBulletBob, 50);
+	Actor_Set_Combat_Aggressiveness(kActorTyrellGuard, 50);
+	Actor_Set_Combat_Aggressiveness(kActorZuben, 90);
+	Actor_Set_Combat_Aggressiveness(kActorGordo, 50);
+	Actor_Set_Combat_Aggressiveness(kActorLucy, 0);
+	Actor_Set_Combat_Aggressiveness(kActorIzo, 70);
+	Actor_Set_Combat_Aggressiveness(kActorDektora, 60);
+	Actor_Set_Combat_Aggressiveness(kActorSteele, 70);
+	Actor_Set_Combat_Aggressiveness(kActorSadik, 80);
+	Actor_Set_Combat_Aggressiveness(kActorClovis, 75);
+	Actor_Set_Combat_Aggressiveness(kActorOfficerLeary, 70);
+	Actor_Set_Combat_Aggressiveness(kActorOfficerGrayford, 60);
+	Actor_Set_Combat_Aggressiveness(kActorMutant1, 40);
+	Actor_Set_Combat_Aggressiveness(kActorMutant2, 30);
+	Actor_Set_Combat_Aggressiveness(kActorMutant3, 30);
+	Actor_Set_Combat_Aggressiveness(kActorFreeSlotA, 100);
 }
 
 void ScriptInit::Init_Actor_Honesty() {
-	Actor_Set_Honesty(19, 90);
+	Actor_Set_Honesty(kActorZuben, 90);
 }
 
 void ScriptInit::Init_Actor_Intelligence() {
-	Actor_Set_Intelligence(19, 20);
-	Actor_Set_Intelligence(2, 70);
-	Actor_Set_Intelligence(6, 60);
-	Actor_Set_Intelligence(7, 75);
-	Actor_Set_Intelligence(3, 80);
-	Actor_Set_Intelligence(1, 80);
-	Actor_Set_Intelligence(8, 80);
-	Actor_Set_Intelligence(5, 100);
-	Actor_Set_Intelligence(23, 50);
-	Actor_Set_Intelligence(24, 40);
-	Actor_Set_Intelligence(70, 40);
-	Actor_Set_Intelligence(71, 20);
-	Actor_Set_Intelligence(72, 30);
-	Actor_Set_Intelligence(64, 10);
+	Actor_Set_Intelligence(kActorZuben, 20);
+	Actor_Set_Intelligence(kActorGordo, 70);
+	Actor_Set_Intelligence(kActorLucy, 60);
+	Actor_Set_Intelligence(kActorIzo, 75);
+	Actor_Set_Intelligence(kActorDektora, 80);
+	Actor_Set_Intelligence(kActorSteele, 80);
+	Actor_Set_Intelligence(kActorSadik, 80);
+	Actor_Set_Intelligence(kActorClovis, 100);
+	Actor_Set_Intelligence(kActorOfficerLeary, 50);
+	Actor_Set_Intelligence(kActorOfficerGrayford, 40);
+	Actor_Set_Intelligence(kActorMutant1, 40);
+	Actor_Set_Intelligence(kActorMutant2, 20);
+	Actor_Set_Intelligence(kActorMutant3, 30);
+	Actor_Set_Intelligence(kActorFreeSlotA, 10);
 }
 
 void ScriptInit::Init_Actor_Stability() {
-	Actor_Set_Stability(19, 35);
+	Actor_Set_Stability(kActorZuben, 35);
 }
 
 void ScriptInit::Init_Actor_Health() {
-	Actor_Set_Health(0, 50, 50);
-	Actor_Set_Health(1, 50, 50);
-	Actor_Set_Health(2, 50, 50);
-	Actor_Set_Health(3, 50, 50);
-	Actor_Set_Health(4, 50, 50);
-	Actor_Set_Health(5, 50, 50);
-	Actor_Set_Health(6, 50, 50);
-	Actor_Set_Health(7, 50, 50);
-	Actor_Set_Health(8, 50, 50);
-	Actor_Set_Health(9, 50, 50);
-	Actor_Set_Health(10, 50, 50);
-	Actor_Set_Health(11, 50, 50);
-	Actor_Set_Health(12, 50, 50);
-	Actor_Set_Health(13, 50, 50);
-	Actor_Set_Health(14, 50, 50);
-	Actor_Set_Health(15, 50, 50);
-	Actor_Set_Health(16, 50, 50);
-	Actor_Set_Health(17, 50, 50);
-	Actor_Set_Health(18, 50, 50);
-	Actor_Set_Health(19, 50, 50);
-	Actor_Set_Health(20, 50, 50);
-	Actor_Set_Health(21, 50, 50);
-	Actor_Set_Health(22, 50, 50);
-	Actor_Set_Health(23, 50, 50);
-	Actor_Set_Health(24, 50, 50);
-	Actor_Set_Health(25, 50, 50);
-	Actor_Set_Health(26, 50, 50);
-	Actor_Set_Health(27, 50, 50);
-	Actor_Set_Health(28, 50, 50);
-	Actor_Set_Health(29, 50, 50);
-	Actor_Set_Health(30, 50, 50);
-	Actor_Set_Health(31, 50, 50);
-	Actor_Set_Health(32, 50, 50);
-	Actor_Set_Health(33, 50, 50);
-	Actor_Set_Health(34, 50, 50);
-	Actor_Set_Health(35, 50, 50);
-	Actor_Set_Health(36, 50, 50);
-	Actor_Set_Health(37, 50, 50);
-	Actor_Set_Health(38, 50, 50);
-	Actor_Set_Health(40, 50, 50);
-	Actor_Set_Health(41, 50, 50);
-	Actor_Set_Health(42, 50, 50);
-	Actor_Set_Health(43, 50, 50);
-	Actor_Set_Health(44, 50, 50);
-	Actor_Set_Health(45, 50, 50);
-	Actor_Set_Health(46, 50, 50);
-	Actor_Set_Health(47, 50, 50);
-	Actor_Set_Health(48, 50, 50);
-	Actor_Set_Health(49, 50, 50);
-	Actor_Set_Health(50, 50, 50);
-	Actor_Set_Health(51, 50, 50);
-	Actor_Set_Health(52, 50, 50);
-	Actor_Set_Health(53, 50, 50);
-	Actor_Set_Health(54, 50, 50);
-	Actor_Set_Health(55, 50, 50);
-	Actor_Set_Health(56, 50, 50);
-	Actor_Set_Health(57, 50, 50);
-	Actor_Set_Health(58, 50, 50);
-	Actor_Set_Health(59, 50, 50);
-	Actor_Set_Health(62, 50, 50);
-	Actor_Set_Health(66, 50, 50);
-	Actor_Set_Health(67, 50, 50);
-	Actor_Set_Health(68, 50, 50);
-	Actor_Set_Health(69, 50, 50);
-	Actor_Set_Health(19, 80, 80);
-	Actor_Set_Health(2, 40, 40);
-	Actor_Set_Health(6, 20, 20);
-	Actor_Set_Health(7, 50, 50);
-	Actor_Set_Health(3, 60, 60);
-	Actor_Set_Health(1, 60, 60);
-	Actor_Set_Health(8, 60, 60);
-	Actor_Set_Health(5, 90, 90);
-	Actor_Set_Health(23, 40, 40);
-	Actor_Set_Health(24, 50, 50);
-	Actor_Set_Health(70, 30, 30);
-	Actor_Set_Health(71, 50, 50);
-	Actor_Set_Health(72, 20, 20);
-	Actor_Set_Health(64, 20, 20);
-	Actor_Set_Health(65, 20, 20);
+	Actor_Set_Health(kActorMcCoy, 50, 50);
+	Actor_Set_Health(kActorSteele, 50, 50);
+	Actor_Set_Health(kActorGordo, 50, 50);
+	Actor_Set_Health(kActorDektora, 50, 50);
+	Actor_Set_Health(kActorGuzza, 50, 50);
+	Actor_Set_Health(kActorClovis, 50, 50);
+	Actor_Set_Health(kActorLucy, 50, 50);
+	Actor_Set_Health(kActorIzo, 50, 50);
+	Actor_Set_Health(kActorSadik, 50, 50);
+	Actor_Set_Health(kActorCrazylegs, 50, 50);
+	Actor_Set_Health(kActorLuther, 50, 50);
+	Actor_Set_Health(kActorGrigorian, 50, 50);
+	Actor_Set_Health(kActorTransient, 50, 50);
+	Actor_Set_Health(kActorLance, 50, 50);
+	Actor_Set_Health(kActorBulletBob, 50, 50);
+	Actor_Set_Health(kActorRunciter, 50, 50);
+	Actor_Set_Health(kActorInsectDealer, 50, 50);
+	Actor_Set_Health(kActorTyrellGuard, 50, 50);
+	Actor_Set_Health(kActorEarlyQ, 50, 50);
+	Actor_Set_Health(kActorZuben, 50, 50);
+	Actor_Set_Health(kActorHasan, 50, 50);
+	Actor_Set_Health(kActorMarcus, 50, 50);
+	Actor_Set_Health(kActorMia, 50, 50);
+	Actor_Set_Health(kActorOfficerLeary, 50, 50);
+	Actor_Set_Health(kActorOfficerGrayford, 50, 50);
+	Actor_Set_Health(kActorHanoi, 50, 50);
+	Actor_Set_Health(kActorBaker, 50, 50);
+	Actor_Set_Health(kActorDeskClerk, 50, 50);
+	Actor_Set_Health(kActorHowieLee, 50, 50);
+	Actor_Set_Health(kActorFishDealer, 50, 50);
+	Actor_Set_Health(kActorKlein, 50, 50);
+	Actor_Set_Health(kActorMurray, 50, 50);
+	Actor_Set_Health(kActorHawkersBarkeep, 50, 50);
+	Actor_Set_Health(kActorHolloway, 50, 50);
+	Actor_Set_Health(kActorSergeantWalls, 50, 50);
+	Actor_Set_Health(kActorMoraji, 50, 50);
+	Actor_Set_Health(kActorTheBard, 50, 50);
+	Actor_Set_Health(kActorPhotographer, 50, 50);
+	Actor_Set_Health(kActorDispatcher, 50, 50);
+	Actor_Set_Health(kActorRajif, 50, 50);
+	Actor_Set_Health(kActorGovernorKolvig, 50, 50);
+	Actor_Set_Health(kActorEarlyQBartender, 50, 50);
+	Actor_Set_Health(kActorHawkersParrot, 50, 50);
+	Actor_Set_Health(kActorTaffyPatron, 50, 50);
+	Actor_Set_Health(kActorLockupGuard, 50, 50);
+	Actor_Set_Health(kActorTeenager, 50, 50);
+	Actor_Set_Health(kActorHysteriaPatron1, 50, 50);
+	Actor_Set_Health(kActorHysteriaPatron2, 50, 50);
+	Actor_Set_Health(kActorHysteriaPatron3, 50, 50);
+	Actor_Set_Health(kActorShoeshineMan, 50, 50);
+	Actor_Set_Health(kActorTyrell, 50, 50);
+	Actor_Set_Health(kActorChew, 50, 50);
+	Actor_Set_Health(kActorGaff, 50, 50);
+	Actor_Set_Health(kActorBryant, 50, 50);
+	Actor_Set_Health(kActorTaffy, 50, 50);
+	Actor_Set_Health(kActorSebastian, 50, 50);
+	Actor_Set_Health(kActorRachael, 50, 50);
+	Actor_Set_Health(kActorGeneralDoll, 50, 50);
+	Actor_Set_Health(kActorIsabella, 50, 50);
+	Actor_Set_Health(kActorLeon, 50, 50);
+	Actor_Set_Health(kActorMaggie, 50, 50);
+	Actor_Set_Health(kActorGenwalkerA, 50, 50);
+	Actor_Set_Health(kActorGenwalkerB, 50, 50);
+	Actor_Set_Health(kActorGenwalkerC, 50, 50);
+	Actor_Set_Health(kActorZuben, 80, 80);
+	Actor_Set_Health(kActorGordo, 40, 40);
+	Actor_Set_Health(kActorLucy, 20, 20);
+	Actor_Set_Health(kActorIzo, 50, 50);
+	Actor_Set_Health(kActorDektora, 60, 60);
+	Actor_Set_Health(kActorSteele, 60, 60);
+	Actor_Set_Health(kActorSadik, 60, 60);
+	Actor_Set_Health(kActorClovis, 90, 90);
+	Actor_Set_Health(kActorOfficerLeary, 40, 40);
+	Actor_Set_Health(kActorOfficerGrayford, 50, 50);
+	Actor_Set_Health(kActorMutant1, 30, 30);
+	Actor_Set_Health(kActorMutant2, 50, 50);
+	Actor_Set_Health(kActorMutant3, 20, 20);
+	Actor_Set_Health(kActorFreeSlotA, 20, 20);
+	Actor_Set_Health(kActorFreeSlotB, 20, 20);
 	if (Game_Flag_Query(45) == 1) {
-		Actor_Set_Health(2, 60, 60);
+		Actor_Set_Health(kActorGordo, 60, 60);
 	}
 	if (Game_Flag_Query(46) == 1) {
-		Actor_Set_Health(6, 40, 40);
+		Actor_Set_Health(kActorLucy, 40, 40);
 	}
 	if (Game_Flag_Query(44) == 1) {
-		Actor_Set_Health(7, 65, 65);
+		Actor_Set_Health(kActorIzo, 65, 65);
 	}
 	if (Game_Flag_Query(47) == 1) {
-		Actor_Set_Health(3, 70, 70);
+		Actor_Set_Health(kActorDektora, 70, 70);
 	}
 	if (Game_Flag_Query(48) == 1) {
-		Actor_Set_Health(8, 80, 80);
+		Actor_Set_Health(kActorSadik, 80, 80);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index 757ec35c55..d63679b093 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -68,7 +68,7 @@ void SceneScriptAR01::InitializeScene() {
 	Ambient_Sounds_Add_Sound(376, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(377, 10, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 	if (Game_Flag_Query(252) && !Game_Flag_Query(321) && !Game_Flag_Query(323)) {
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 		Game_Flag_Set(273);
 		Scene_Loop_Start_Special(0, 1, 0);
 		Scene_Loop_Set_Default(2);
@@ -103,56 +103,56 @@ bool SceneScriptAR01::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptAR01::ClickedOnActor(int actorId) {
-	if (actorId == 16 || actorId == 20) {
-		Actor_Face_Actor(0, actorId, true);
-		Actor_Says(0, 8910, 14);
+	if (actorId == kActorInsectDealer || actorId == kActorHasan) {
+		Actor_Face_Actor(kActorMcCoy, actorId, true);
+		Actor_Says(kActorMcCoy, 8910, 14);
 		return true;
 	}
-	if (actorId == 29) {
-		Actor_Set_Goal_Number(29, 2);
-		if (!Loop_Actor_Walk_To_XYZ(0, -120.73f, 0.0f, 219.17f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 29, true);
-			Actor_Face_Actor(29, 0, true);
+	if (actorId == kActorFishDealer) {
+		Actor_Set_Goal_Number(kActorFishDealer, 2);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -120.73f, 0.0f, 219.17f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorFishDealer, true);
+			Actor_Face_Actor(kActorFishDealer, kActorMcCoy, true);
 			if (Game_Flag_Query(328)) {
-				if (Actor_Clue_Query(0, 93) && !Actor_Clue_Query(0, 64)) {
-					Actor_Says(0, 40, 11);
-					Actor_Says(29, 120, 14);
-					Actor_Says(0, 45, 17);
-					Actor_Says(29, 130, 14);
-					Actor_Says(29, 140, 14);
-					Actor_Says(0, 50, 13);
-					Actor_Says(29, 150, 14);
-					Actor_Clue_Acquire(0, 64, 1, 0);
+				if (Actor_Clue_Query(kActorMcCoy, kClueStrangeScale1) && !Actor_Clue_Query(kActorMcCoy, kClueFishLadyInterview)) {
+					Actor_Says(kActorMcCoy, 40, 11);
+					Actor_Says(kActorFishDealer, 120, 14);
+					Actor_Says(kActorMcCoy, 45, 17);
+					Actor_Says(kActorFishDealer, 130, 14);
+					Actor_Says(kActorFishDealer, 140, 14);
+					Actor_Says(kActorMcCoy, 50, 13);
+					Actor_Says(kActorFishDealer, 150, 14);
+					Actor_Clue_Acquire(kActorMcCoy, kClueFishLadyInterview, 1, kActorMcCoy);
 				} else {
 					if (Random_Query(1, 2) == 1) {
-						Actor_Says(0, 30, 17);
-						Actor_Says(29, 100, 14);
-						Actor_Says(29, 110, 14);
-						Actor_Says(0, 35, 13);
+						Actor_Says(kActorMcCoy, 30, 17);
+						Actor_Says(kActorFishDealer, 100, 14);
+						Actor_Says(kActorFishDealer, 110, 14);
+						Actor_Says(kActorMcCoy, 35, 13);
 					} else {
-						Actor_Says(0, 30, 17);
-						Actor_Says(29, 220, 14);
+						Actor_Says(kActorMcCoy, 30, 17);
+						Actor_Says(kActorFishDealer, 220, 14);
 					}
 				}
-				Actor_Set_Goal_Number(29, 1);
+				Actor_Set_Goal_Number(kActorFishDealer, 1);
 			} else {
-				Actor_Says(0, 0, 18);
-				Actor_Says(29, 0, 14);
-				Actor_Says(29, 10, 14);
-				Actor_Says(29, 20, 14);
-				Actor_Says(29, 30, 14);
-				Actor_Says(0, 5, 17);
-				Actor_Says(29, 40, 14);
-				Actor_Says(0, 10, 13);
-				Actor_Says(29, 50, 14);
-				Actor_Says(0, 15, 17);
-				Actor_Says(29, 60, 14);
-				Actor_Says(29, 70, 14);
-				Actor_Says(29, 80, 14);
-				Actor_Says(29, 90, 14);
-				Actor_Says(0, 25, 13);
+				Actor_Says(kActorMcCoy, 0, 18);
+				Actor_Says(kActorFishDealer, 0, 14);
+				Actor_Says(kActorFishDealer, 10, 14);
+				Actor_Says(kActorFishDealer, 20, 14);
+				Actor_Says(kActorFishDealer, 30, 14);
+				Actor_Says(kActorMcCoy, 5, 17);
+				Actor_Says(kActorFishDealer, 40, 14);
+				Actor_Says(kActorMcCoy, 10, 13);
+				Actor_Says(kActorFishDealer, 50, 14);
+				Actor_Says(kActorMcCoy, 15, 17);
+				Actor_Says(kActorFishDealer, 60, 14);
+				Actor_Says(kActorFishDealer, 70, 14);
+				Actor_Says(kActorFishDealer, 80, 14);
+				Actor_Says(kActorFishDealer, 90, 14);
+				Actor_Says(kActorMcCoy, 25, 13);
 				Game_Flag_Set(328);
-				Actor_Set_Goal_Number(29, 1);
+				Actor_Set_Goal_Number(kActorFishDealer, 1);
 			}
 			return true;
 		}
@@ -166,23 +166,23 @@ bool SceneScriptAR01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptAR01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -358.0, 0.0, -149.0, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -477.0, 0.0, -149.0, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -358.0, 0.0, -149.0, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -477.0, 0.0, -149.0, 0, 0, false, 0);
 			Game_Flag_Set(322);
 			Game_Flag_Set(464);
 			Game_Flag_Reset(180);
 			Game_Flag_Set(479);
 			Set_Enter(8, 31);
-			Actor_Set_Goal_Number(29, 3);
+			Actor_Set_Goal_Number(kActorFishDealer, 3);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -182.0, 0.0, -551.0, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.0, 0.0, -551.0, 0, 1, false, 0)) {
 			Game_Flag_Set(320);
-			Async_Actor_Walk_To_XYZ(0, -222.0, 0.0, -690.0, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -222.0, 0.0, -690.0, 0, false);
 			Set_Enter(0, 1);
-			Actor_Set_Goal_Number(29, 3);
+			Actor_Set_Goal_Number(kActorFishDealer, 3);
 		}
 		return true;
 	}
@@ -190,27 +190,27 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) {
 		if (Game_Flag_Query(486) == 1) {
 			Spinner_Set_Selectable_Destination_Flag(6, 1);
 		}
-		int v1 = Loop_Actor_Walk_To_XYZ(0, -164.0f, 0.0f, 332.0f, 0, 1, false, 0);
-		Actor_Face_Heading(0, 545, false);
-		if (Actor_Query_Goal_Number(7) >= 2 && Actor_Query_Goal_Number(7) <= 103) {
+		int v1 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, -164.0f, 0.0f, 332.0f, 0, 1, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 545, false);
+		if (Actor_Query_Goal_Number(kActorIzo) >= 2 && Actor_Query_Goal_Number(kActorIzo) <= 103) {
 			Player_Loses_Control();
-			Actor_Put_In_Set(7, 0);
-			Actor_Set_At_XYZ(7, -448.0, 0.0, 130.0, 0);
-			Loop_Actor_Walk_To_XYZ(7, -323.0f, 0.64f, 101.74f, 48, 0, true, 0);
-			Loop_Actor_Walk_To_Actor(7, 0, 48, 0, true);
-			Actor_Face_Actor(7, 0, true);
-			Actor_Change_Animation_Mode(7, 6);
-			Actor_Says(0, 1800, 21);
-			Actor_Change_Animation_Mode(0, 48);
+			Actor_Put_In_Set(kActorIzo, 0);
+			Actor_Set_At_XYZ(kActorIzo, -448.0, 0.0, 130.0, 0);
+			Loop_Actor_Walk_To_XYZ(kActorIzo, -323.0f, 0.64f, 101.74f, 48, 0, true, 0);
+			Loop_Actor_Walk_To_Actor(kActorIzo, kActorMcCoy, 48, 0, true);
+			Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+			Actor_Change_Animation_Mode(kActorIzo, 6);
+			Actor_Says(kActorMcCoy, 1800, 21);
+			Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			Player_Gains_Control();
-			Actor_Retired_Here(0, 12, 48, 1, 7);
+			Actor_Retired_Here(kActorMcCoy, 12, 48, 1, kActorIzo);
 		} else if (!v1) {
 			if (Game_Flag_Query(486) && !Game_Flag_Query(660)) {
-				Actor_Voice_Over(4310, 99);
-				Actor_Voice_Over(4320, 99);
-				Actor_Voice_Over(4330, 99);
-				Actor_Voice_Over(4340, 99);
-				Actor_Voice_Over(4350, 99);
+				Actor_Voice_Over(4310, kActorVoiceOver);
+				Actor_Voice_Over(4320, kActorVoiceOver);
+				Actor_Voice_Over(4330, kActorVoiceOver);
+				Actor_Voice_Over(4340, kActorVoiceOver);
+				Actor_Voice_Over(4350, kActorVoiceOver);
 				Game_Flag_Set(660);
 			}
 			Game_Flag_Reset(176);
@@ -222,7 +222,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) {
 			Game_Flag_Reset(180);
 
 			int spinnerDest = Spinner_Interface_Choose_Dest(4, 0);
-			Actor_Face_Heading(0, 545, 0);
+			Actor_Face_Heading(kActorMcCoy, 545, false);
 
 			switch (spinnerDest) {
 			case 0:
@@ -290,7 +290,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) {
 				break;
 			default:
 				Game_Flag_Set(180);
-				Actor_Set_Invisible(0, 0);
+				Actor_Set_Invisible(kActorMcCoy, false);
 				break;
 			}
 		}
@@ -317,11 +317,11 @@ void SceneScriptAR01::SceneFrameAdvanced(int frame) {
 		Ambient_Sounds_Play_Sound(117, 40, -50, 80, 99);
 	}
 	if ((frame == 75 || frame == 196) && Game_Flag_Query(273)) {
-		Actor_Face_Heading(0, 545, false);
-		Actor_Change_Animation_Mode(0, 42);
+		Actor_Face_Heading(kActorMcCoy, 545, false);
+		Actor_Change_Animation_Mode(kActorMcCoy, 42);
 		Game_Flag_Reset(273);
 	} else if (frame == 196 && !Game_Flag_Query(273)) {
-		Actor_Change_Animation_Mode(0, 41);
+		Actor_Change_Animation_Mode(kActorMcCoy, 41);
 	}
 }
 
@@ -333,16 +333,16 @@ void SceneScriptAR01::PlayerWalkedIn() {
 		Game_Flag_Set(710);
 	}
 	if (Game_Flag_Query(323) == 1) {
-		Loop_Actor_Walk_To_XYZ(0, -358.0f, 0.0f, -149.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -358.0f, 0.0f, -149.0f, 0, 1, false, 0);
 		Game_Flag_Reset(323);
 	}
-	if (Actor_Query_Goal_Number(37) < 199) {
-		Actor_Set_Goal_Number(37, 199);
+	if (Actor_Query_Goal_Number(kActorPhotographer) < 199) {
+		Actor_Set_Goal_Number(kActorPhotographer, 199);
 	}
 }
 
 void SceneScriptAR01::PlayerWalkedOut() {
-	Actor_Set_Invisible(0, 0);
+	Actor_Set_Invisible(kActorMcCoy, false);
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	if (!Game_Flag_Query(479)) {
diff --git a/engines/bladerunner/script/scene/ar02.cpp b/engines/bladerunner/script/scene/ar02.cpp
index 0e754b3c24..0d81c31b8b 100644
--- a/engines/bladerunner/script/scene/ar02.cpp
+++ b/engines/bladerunner/script/scene/ar02.cpp
@@ -96,72 +96,72 @@ bool SceneScriptAR02::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptAR02::ClickedOnActor(int actorId) {
 	if (actorId == 16) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -386.96f, 0.0f, -1078.45f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 16, true);
-			Actor_Face_Actor(16, 0, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -386.96f, 0.0f, -1078.45f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorInsectDealer, true);
+			Actor_Face_Actor(kActorInsectDealer, kActorMcCoy, true);
 			if (Global_Variable_Query(1) == 2) {
 				if (Game_Flag_Query(329) && !Game_Flag_Query(366)) {
 					Game_Flag_Set(366);
 					Player_Loses_Control();
 					ADQ_Flush();
-					ADQ_Add(16, 210, 14);
-					Loop_Actor_Walk_To_XYZ(0, -350.66f, 0.0f, -1117.19f, 0, 0, false, 0);
-					Actor_Face_Actor(0, 16,true);
-					Actor_Says(0, 110, 18);
-					Actor_Says(16, 230, 14);
-					Actor_Says(0, 115, 18);
-					Actor_Says(16, 240, 14);
+					ADQ_Add(kActorInsectDealer, 210, 14);
+					Loop_Actor_Walk_To_XYZ(kActorMcCoy, -350.66f, 0.0f, -1117.19f, 0, 0, false, 0);
+					Actor_Face_Actor(kActorMcCoy, kActorInsectDealer, true);
+					Actor_Says(kActorMcCoy, 110, 18);
+					Actor_Says(kActorInsectDealer, 230, 14);
+					Actor_Says(kActorMcCoy, 115, 18);
+					Actor_Says(kActorInsectDealer, 240, 14);
 					Item_Pickup_Spin_Effect(956, 288, 257);
-					Actor_Says(16, 250, 14);
+					Actor_Says(kActorInsectDealer, 250, 14);
 					Player_Gains_Control();
 					sub_402AE0();
 				} else if (Game_Flag_Query(329)) {
-					Actor_Says(0, 75, 18);
-					Actor_Says(16, 60, 12);
-					Actor_Says(16, 70, 14);
+					Actor_Says(kActorMcCoy, 75, 18);
+					Actor_Says(kActorInsectDealer, 60, 12);
+					Actor_Says(kActorInsectDealer, 70, 14);
 				} else {
 					sub_402694();
 				}
 			} else if (Global_Variable_Query(1) > 2) {
-				if (Actor_Clue_Query(0, 56) && !Actor_Clue_Query(0, 90)) {
-					Actor_Says(0, 205, 16);
-					Actor_Says(16, 290, 12);
-					Actor_Says(16, 300, 13);
-					Actor_Says(0, 210, 15);
-					Actor_Says(16, 310, 12);
-					Actor_Says(0, 215, 13);
+				if (Actor_Clue_Query(kActorMcCoy, kCluePeruvianLadyInterview) && !Actor_Clue_Query(kActorMcCoy, kClueDragonflyCollection)) {
+					Actor_Says(kActorMcCoy, 205, 16);
+					Actor_Says(kActorInsectDealer, 290, 12);
+					Actor_Says(kActorInsectDealer, 300, 13);
+					Actor_Says(kActorMcCoy, 210, 15);
+					Actor_Says(kActorInsectDealer, 310, 12);
+					Actor_Says(kActorMcCoy, 215, 13);
 					if (Game_Flag_Query(374)) {
-						Actor_Says(0, 220, 14);
-						Actor_Says(16, 320, 12);
-						Actor_Says(0, 225, 13);
-						Actor_Says(16, 330, 14);
-						Actor_Says(0, 230, 19);
-						Actor_Says(16, 340, 13);
-						Actor_Says(16, 350, 12);
-						Actor_Says(0, 235, 16);
-						Actor_Clue_Acquire(0, 79, 0, 16);
+						Actor_Says(kActorMcCoy, 220, 14);
+						Actor_Says(kActorInsectDealer, 320, 12);
+						Actor_Says(kActorMcCoy, 225, 13);
+						Actor_Says(kActorInsectDealer, 330, 14);
+						Actor_Says(kActorMcCoy, 230, 19);
+						Actor_Says(kActorInsectDealer, 340, 13);
+						Actor_Says(kActorInsectDealer, 350, 12);
+						Actor_Says(kActorMcCoy, 235, 16);
+						Actor_Clue_Acquire(kActorMcCoy, kCluePurchasedScorpions, 0, kActorInsectDealer);
 					}
-					Actor_Clue_Acquire(0, 90, 0, 16);
+					Actor_Clue_Acquire(kActorMcCoy, kClueDragonflyCollection, 0, kActorInsectDealer);
 				} else {
-					Actor_Says(0, 240, 17);
-					Actor_Says(16, 360, 13);
-					Actor_Says(16, 370, 14);
-					Actor_Says(0, 245, 13);
+					Actor_Says(kActorMcCoy, 240, 17);
+					Actor_Says(kActorInsectDealer, 360, 13);
+					Actor_Says(kActorInsectDealer, 370, 14);
+					Actor_Says(kActorMcCoy, 245, 13);
 				}
 			}
 			return true;
 		}
 	}
 	if (actorId == 20 && Global_Variable_Query(1) == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -240.79f, 0.0f, -1328.89f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 20, true);
-			Actor_Face_Actor(20, 0, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -240.79f, 0.0f, -1328.89f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorHasan, true);
+			Actor_Face_Actor(kActorHasan, kActorMcCoy, true);
 			if (Game_Flag_Query(330)) {
 				sub_402CE4();
 				return false;
 			}
-			Actor_Says(20, 0, 14);
-			Actor_Says(0, 140, 18);
+			Actor_Says(kActorHasan, 0, 14);
+			Actor_Says(kActorMcCoy, 140, 18);
 			Game_Flag_Set(330);
 			return true;
 		}
@@ -171,24 +171,24 @@ bool SceneScriptAR02::ClickedOnActor(int actorId) {
 
 bool SceneScriptAR02::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 106) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -386.96f, 0.0f, -1078.45f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 16, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -386.96f, 0.0f, -1078.45f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorInsectDealer, true);
 			if (!Game_Flag_Query(331)) {
-				Actor_Says(16, 0, 14);
-				Actor_Says(0, 55, 18);
-				Actor_Says(16, 10, 14);
-				Actor_Says(0, 60, 18);
-				Actor_Says(16, 20, 14);
+				Actor_Says(kActorInsectDealer, 0, 14);
+				Actor_Says(kActorMcCoy, 55, 18);
+				Actor_Says(kActorInsectDealer, 10, 14);
+				Actor_Says(kActorMcCoy, 60, 18);
+				Actor_Says(kActorInsectDealer, 20, 14);
 				Game_Flag_Set(331);
 			} else if (Game_Flag_Query(331) && !Game_Flag_Query(367)) {
-				Actor_Says(0, 65, 21);
-				Actor_Says(16, 30, 14);
-				Actor_Says(16, 40, 14);
-				Actor_Says(0, 70, 18);
-				Actor_Says(16, 50, 14);
+				Actor_Says(kActorMcCoy, 65, 21);
+				Actor_Says(kActorInsectDealer, 30, 14);
+				Actor_Says(kActorInsectDealer, 40, 14);
+				Actor_Says(kActorMcCoy, 70, 18);
+				Actor_Says(kActorInsectDealer, 50, 14);
 				Game_Flag_Set(367);
 			} else {
-				Actor_Says(0, 8527, 14);
+				Actor_Says(kActorMcCoy, 8527, 14);
 			}
 			return true;
 		}
@@ -198,16 +198,16 @@ bool SceneScriptAR02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptAR02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -182.0f, 0.0f, -551.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.0f, 0.0f, -551.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(321);
-			Async_Actor_Walk_To_XYZ(0, -182.0f, 0.0f, -407.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -182.0f, 0.0f, -407.0f, 0, false);
 			Set_Enter(0, 0);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -465.0f, 0.0f, -799.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -560.0f, 0.0f, -799.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -465.0f, 0.0f, -799.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -560.0f, 0.0f, -799.0f, 0, 0, false, 0);
 			Game_Flag_Set(117);
 			Game_Flag_Reset(180);
 			Game_Flag_Set(182);
@@ -231,7 +231,7 @@ void SceneScriptAR02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptAR02::PlayerWalkedIn() {
 	if (Game_Flag_Query(116) == 1) {
-		Loop_Actor_Walk_To_XYZ(0, -465.0f, 0.0f, -799.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -465.0f, 0.0f, -799.0f, 0, 0, false, 0);
 		Game_Flag_Reset(116);
 	}
 	Game_Flag_Set(726);
@@ -247,10 +247,10 @@ void SceneScriptAR02::DialogueQueueFlushed(int a1) {
 
 void SceneScriptAR02::sub_402694() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 44) || Actor_Clue_Query(0, 47)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring) || Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(490, 3, 5, 5);
 	}
-	if (Actor_Clue_Query(0, 14) && !Actor_Clue_Query(0, 44) && !Actor_Clue_Query(0, 47)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyAnklet) && !Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring) && !Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(500, 3, 5, 5);
 	}
 	DM_Add_To_List_Never_Repeat_Once_Selected(510, 8, 3, -1);
@@ -262,37 +262,37 @@ void SceneScriptAR02::sub_402694() {
 	case 490:
 	case 500:
 		if (answerValue == 490) {
-			Actor_Says(0, 145, 15);
+			Actor_Says(kActorMcCoy, 145, 15);
 		} else {
-			Actor_Says(0, 150, 15);
+			Actor_Says(kActorMcCoy, 150, 15);
 		}
-		Actor_Says(16, 80, 14);
-		Actor_Says(0, 80, 16);
-		Actor_Says(16, 90, 12);
-		Actor_Says(0, 85, 17);
-		Actor_Says(16, 100, 14);
-		Actor_Says(16, 110, 12);
-		Actor_Says(16, 120, 12);
-		Actor_Says(0, 90, 13);
-		Actor_Says(16, 130, 12);
-		Actor_Says(16, 140, 14);
-		Actor_Says(0, 95, 15);
-		Actor_Says(16, 150, 12);
-		Actor_Says(16, 160, 13);
-		Actor_Says(16, 170, 14);
-		Actor_Says(0, 100, 16);
-		Actor_Says(16, 180, 13);
+		Actor_Says(kActorInsectDealer, 80, 14);
+		Actor_Says(kActorMcCoy, 80, 16);
+		Actor_Says(kActorInsectDealer, 90, 12);
+		Actor_Says(kActorMcCoy, 85, 17);
+		Actor_Says(kActorInsectDealer, 100, 14);
+		Actor_Says(kActorInsectDealer, 110, 12);
+		Actor_Says(kActorInsectDealer, 120, 12);
+		Actor_Says(kActorMcCoy, 90, 13);
+		Actor_Says(kActorInsectDealer, 130, 12);
+		Actor_Says(kActorInsectDealer, 140, 14);
+		Actor_Says(kActorMcCoy, 95, 15);
+		Actor_Says(kActorInsectDealer, 150, 12);
+		Actor_Says(kActorInsectDealer, 160, 13);
+		Actor_Says(kActorInsectDealer, 170, 14);
+		Actor_Says(kActorMcCoy, 100, 16);
+		Actor_Says(kActorInsectDealer, 180, 13);
 		Game_Flag_Set(329);
-		Actor_Clue_Acquire(0, 56, 1, 16);
+		Actor_Clue_Acquire(kActorMcCoy, kCluePeruvianLadyInterview, 1, kActorInsectDealer);
 		break;
 	case 510:
-		Actor_Says(0, 8475, 12);
-		Actor_Says(16, 190, 12);
-		Actor_Says(0, 105, 15);
-		Actor_Says(16, 200, 14);
+		Actor_Says(kActorMcCoy, 8475, 12);
+		Actor_Says(kActorInsectDealer, 190, 12);
+		Actor_Says(kActorMcCoy, 105, 15);
+		Actor_Says(kActorInsectDealer, 200, 14);
 		break;
 	case 520:
-		Actor_Says(0, 215, 16);
+		Actor_Says(kActorMcCoy, 215, 16);
 		break;
 	}
 }
@@ -307,29 +307,29 @@ void SceneScriptAR02::sub_402AE0() {
 	int answerValue = Dialogue_Menu_Query_Input();
 	Dialogue_Menu_Disappear();
 	if (answerValue == 530) {
-		Actor_Says(0, 120, 12);
+		Actor_Says(kActorMcCoy, 120, 12);
 		if (Query_Difficulty_Level() != 0) {
 			Global_Variable_Decrement(2, 15);
 		}
-		Actor_Clue_Acquire(0, 75, 1, 16);
-		Actor_Modify_Friendliness_To_Other(16, 0, 5);
+		Actor_Clue_Acquire(kActorMcCoy, kClueMaggieBracelet, 1, kActorInsectDealer);
+		Actor_Modify_Friendliness_To_Other(kActorInsectDealer, kActorMcCoy, 5);
 	} else if (answerValue == 540) {
-		Actor_Says(0, 125, 13);
-		Actor_Says(16, 260, 3);
-		Actor_Says(0, 130, 15);
-		Actor_Says(16, 270, 3);
-		Actor_Says(16, 280, 3);
-		Actor_Says(0, 135, 11);
-		Actor_Modify_Friendliness_To_Other(16, 0, -5);
+		Actor_Says(kActorMcCoy, 125, 13);
+		Actor_Says(kActorInsectDealer, 260, 3);
+		Actor_Says(kActorMcCoy, 130, 15);
+		Actor_Says(kActorInsectDealer, 270, 3);
+		Actor_Says(kActorInsectDealer, 280, 3);
+		Actor_Says(kActorMcCoy, 135, 11);
+		Actor_Modify_Friendliness_To_Other(kActorInsectDealer, kActorMcCoy, -5);
 	}
 }
 
 void SceneScriptAR02::sub_402CE4() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 93)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueStrangeScale1)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(550, 8, 5, 2);
 	}
-	if (Actor_Clue_Query(0, 44)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(560, 6, 5, 7);
 	}
 	Dialogue_Menu_Add_DONE_To_List(570);
@@ -338,48 +338,48 @@ void SceneScriptAR02::sub_402CE4() {
 	Dialogue_Menu_Disappear();
 	switch (answerValue) {
 	case 550:
-		Actor_Says(0, 145, 11);
-		Actor_Says(20, 30, 11);
-		Actor_Says(0, 160, 11);
-		Actor_Says(20, 40, 11);
-		Actor_Says(0, 165, 11);
-		Actor_Says(20, 50, 11);
-		Actor_Says(0, 170, 11);
-		Actor_Says(20, 60, 11);
-		Actor_Says(0, 175, 11);
+		Actor_Says(kActorMcCoy, 145, 11);
+		Actor_Says(kActorHasan, 30, 11);
+		Actor_Says(kActorMcCoy, 160, 11);
+		Actor_Says(kActorHasan, 40, 11);
+		Actor_Says(kActorMcCoy, 165, 11);
+		Actor_Says(kActorHasan, 50, 11);
+		Actor_Says(kActorMcCoy, 170, 11);
+		Actor_Says(kActorHasan, 60, 11);
+		Actor_Says(kActorMcCoy, 175, 11);
 		Game_Flag_Set(370);
 		break;
 	case 560:
-		Actor_Says(0, 150, 11);
-		Actor_Says(20, 140, 11);
-		Actor_Says(0, 185, 11);
-		Actor_Says(20, 150, 11);
-		Actor_Says(20, 160, 11);
-		Actor_Says(0, 190, 11);
-		Actor_Says(20, 170, 11);
-		Actor_Says(0, 195, 11);
-		Actor_Says(20, 180, 11);
-		Actor_Says(20, 190, 11);
-		Actor_Says(20, 200, 11);
-		Actor_Says(0, 200, 11);
-		Actor_Says(20, 210, 11);
-		Actor_Says(20, 220, 11);
-		Actor_Says(20, 230, 11);
+		Actor_Says(kActorMcCoy, 150, 11);
+		Actor_Says(kActorHasan, 140, 11);
+		Actor_Says(kActorMcCoy, 185, 11);
+		Actor_Says(kActorHasan, 150, 11);
+		Actor_Says(kActorHasan, 160, 11);
+		Actor_Says(kActorMcCoy, 190, 11);
+		Actor_Says(kActorHasan, 170, 11);
+		Actor_Says(kActorMcCoy, 195, 11);
+		Actor_Says(kActorHasan, 180, 11);
+		Actor_Says(kActorHasan, 190, 11);
+		Actor_Says(kActorHasan, 200, 11);
+		Actor_Says(kActorMcCoy, 200, 11);
+		Actor_Says(kActorHasan, 210, 11);
+		Actor_Says(kActorHasan, 220, 11);
+		Actor_Says(kActorHasan, 230, 11);
 		Game_Flag_Set(370);
 		break;
 	case 570:
-		if (Actor_Clue_Query(0, 57)) {
-			Actor_Says(0, 1315, 11);
+		if (Actor_Clue_Query(kActorMcCoy, kClueHasanInterview)) {
+			Actor_Says(kActorMcCoy, 1315, 11);
 		} else {
-			Actor_Says(0, 940, 13);
-			Actor_Says(20, 70, 12);
-			Actor_Says(20, 90, 12);
-			Actor_Says(0, 180, 15);
-			Actor_Says(20, 100, 14);
-			Actor_Says(20, 110, 12);
-			Actor_Says(20, 120, 13);
-			Actor_Modify_Friendliness_To_Other(20, 0, -1);
-			Actor_Clue_Acquire(0, 57, 0, 20);
+			Actor_Says(kActorMcCoy, 940, 13);
+			Actor_Says(kActorHasan, 70, 12);
+			Actor_Says(kActorHasan, 90, 12);
+			Actor_Says(kActorMcCoy, 180, 15);
+			Actor_Says(kActorHasan, 100, 14);
+			Actor_Says(kActorHasan, 110, 12);
+			Actor_Says(kActorHasan, 120, 13);
+			Actor_Modify_Friendliness_To_Other(kActorHasan, kActorMcCoy, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueHasanInterview, 0, kActorHasan);
 		}
 		break;
 	}
diff --git a/engines/bladerunner/script/scene/bb01.cpp b/engines/bladerunner/script/scene/bb01.cpp
index 25abb5bcda..b5728430da 100644
--- a/engines/bladerunner/script/scene/bb01.cpp
+++ b/engines/bladerunner/script/scene/bb01.cpp
@@ -85,8 +85,8 @@ bool SceneScriptBB01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		Loop_Actor_Walk_To_XYZ(0, -140.0f, 9.0f, 818.0f, 0, 1, false, 0);
-		if (!Loop_Actor_Walk_To_XYZ(0, -233.0f, 9.0f, 846.0f, 0, 1, false, 0)) {
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -140.0f, 9.0f, 818.0f, 0, 1, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -233.0f, 9.0f, 846.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(264);
 			Game_Flag_Reset(258);
 			Game_Flag_Set(177);
@@ -95,14 +95,14 @@ bool SceneScriptBB01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -125.39f, 9.0f, 372.45f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -125.39f, 9.0f, 372.45f, 0, 1, false, 0)) {
 			Game_Flag_Set(262);
 			Set_Enter(1, 3);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 43.0f, 0.0f, 1062.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 43.0f, 0.0f, 1062.0f, 0, 1, false, 0)) {
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
 			Game_Flag_Reset(179);
@@ -216,7 +216,7 @@ void SceneScriptBB01::PlayerWalkedIn() {
 	} else if (Game_Flag_Query(263)) {
 		Game_Flag_Reset(263);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, 43.0f, 0.0f, 954.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 43.0f, 0.0f, 954.0f, 0, 0, false, 0);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb02.cpp b/engines/bladerunner/script/scene/bb02.cpp
index 7b43ff4bb1..6022444d7e 100644
--- a/engines/bladerunner/script/scene/bb02.cpp
+++ b/engines/bladerunner/script/scene/bb02.cpp
@@ -88,7 +88,7 @@ bool SceneScriptBB02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 98.0f, -415.06f, -593.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 98.0f, -415.06f, -593.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(263);
@@ -97,7 +97,7 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -12.0f, -415.06f, -27.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -415.06f, -27.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
 			if (!Game_Flag_Query(493)) {
 				Scene_Loop_Start_Special(2, 0, 1);
@@ -110,8 +110,8 @@ bool SceneScriptBB02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 86.0f, -415.06f, 174.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 179.0f, -415.06f, 274.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 86.0f, -415.06f, 174.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 179.0f, -415.06f, 274.0f, 0, 0, false, 0);
 			Game_Flag_Set(282);
 			Game_Flag_Reset(493);
 			Set_Enter(21, 4);
@@ -139,10 +139,10 @@ void SceneScriptBB02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB02::PlayerWalkedIn() {
 	if (Game_Flag_Query(281)) {
-		Loop_Actor_Walk_To_XYZ(0, 86.0f, -415.06f, 174.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 86.0f, -415.06f, 174.0f, 0, 0, false, 0);
 		Game_Flag_Reset(281);
 	} else if (Game_Flag_Query(333)) {
-		Loop_Actor_Walk_To_XYZ(0, 35.0f, -415.06f, -27.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 35.0f, -415.06f, -27.0f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(333);
 	}
diff --git a/engines/bladerunner/script/scene/bb03.cpp b/engines/bladerunner/script/scene/bb03.cpp
index db2747fac1..de538c4523 100644
--- a/engines/bladerunner/script/scene/bb03.cpp
+++ b/engines/bladerunner/script/scene/bb03.cpp
@@ -84,8 +84,8 @@ bool SceneScriptBB03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 176.0f, 60.16f, -64.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 176.0f, 60.16f, 0.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 176.0f, 60.16f, -64.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 176.0f, 60.16f, 0.0f, 0, 0, false, 0);
 			Game_Flag_Set(283);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -94,7 +94,7 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 20.0f, 60.16f, 0.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 20.0f, 60.16f, 0.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(281);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -103,27 +103,27 @@ bool SceneScriptBB03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 204.0f, 60.16f, -164.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 204.0f, 60.16f, -164.0f, 0, 1, false, 0)) {
 			if (Global_Variable_Query(1) < 4) {
-				if (Actor_Query_Goal_Number(56) == 200) {
-					Actor_Says(56, 70, 3);
-					Actor_Says(0, 7010, 13);
-					Actor_Says(56, 80, 3);
-					Actor_Says(0, 7015, 12);
-					Actor_Says(56, 90, 3);
-					Actor_Says(0, 7020, 14);
-					Actor_Says(56, 100, 3);
-					Actor_Says(0, 7025, 15);
-					Actor_Says(56, 110, 3);
-					Actor_Set_Targetable(54, false);
-					Actor_Set_Targetable(58, false);
+				if (Actor_Query_Goal_Number(kActorSebastian) == 200) {
+					Actor_Says(kActorSebastian, 70, 3);
+					Actor_Says(kActorMcCoy, 7010, 13);
+					Actor_Says(kActorSebastian, 80, 3);
+					Actor_Says(kActorMcCoy, 7015, 12);
+					Actor_Says(kActorSebastian, 90, 3);
+					Actor_Says(kActorMcCoy, 7020, 14);
+					Actor_Says(kActorSebastian, 100, 3);
+					Actor_Says(kActorMcCoy, 7025, 15);
+					Actor_Says(kActorSebastian, 110, 3);
+					Actor_Set_Targetable(kActorBryant, false);
+					Actor_Set_Targetable(kActorGeneralDoll, false);
 				}
 				Game_Flag_Set(285);
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Set_Enter(22, 6);
 			} else {
-				Actor_Says(0, 8522, 3);
+				Actor_Says(kActorMcCoy, 8522, 3);
 			}
 		}
 		return true;
@@ -143,11 +143,11 @@ void SceneScriptBB03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB03::PlayerWalkedIn() {
 	if (Game_Flag_Query(286)) {
-		Loop_Actor_Walk_To_XYZ(0, 164.0f, 60.16f, -164.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 164.0f, 60.16f, -164.0f, 0, 0, false, 0);
 		Game_Flag_Reset(286);
 	}
 	if (Game_Flag_Query(284)) {
-		Loop_Actor_Walk_To_XYZ(0, 176.0f, 60.16f, -64.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 176.0f, 60.16f, -64.0f, 0, 0, false, 0);
 		Game_Flag_Reset(284);
 	}
 }
diff --git a/engines/bladerunner/script/scene/bb04.cpp b/engines/bladerunner/script/scene/bb04.cpp
index 3d7134c72f..793f786b5c 100644
--- a/engines/bladerunner/script/scene/bb04.cpp
+++ b/engines/bladerunner/script/scene/bb04.cpp
@@ -80,9 +80,9 @@ bool SceneScriptBB04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -92.0f, -26.6f, 45.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, -26.6f, 45.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
-			Loop_Actor_Walk_To_XYZ(0, -15.0f, -25.17f, 45.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -15.0f, -25.17f, 45.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(333);
@@ -92,7 +92,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -107.0f, -26.6f, 397.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -107.0f, -26.6f, 397.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(284);
@@ -115,7 +115,7 @@ void SceneScriptBB04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB04::PlayerWalkedIn() {
 	if (Game_Flag_Query(332)) {
-		Loop_Actor_Walk_To_XYZ(0, -92.0f, -26.6f, 45.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, -26.6f, 45.0f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(332);
 	}
diff --git a/engines/bladerunner/script/scene/bb05.cpp b/engines/bladerunner/script/scene/bb05.cpp
index d01054b8d1..a1047ccf50 100644
--- a/engines/bladerunner/script/scene/bb05.cpp
+++ b/engines/bladerunner/script/scene/bb05.cpp
@@ -72,10 +72,10 @@ void SceneScriptBB05::SceneLoaded() {
 	Clickable_Object("BOX06");
 	Unclickable_Object("BOX06");
 	Unclickable_Object("BOX14");
-	if (Actor_Query_Goal_Number(56) == 200) {
-		Actor_Set_Goal_Number(58, 299);
-		Actor_Put_In_Set(58, 97);
-		Actor_Set_At_Waypoint(58, 39, 0);
+	if (Actor_Query_Goal_Number(kActorSebastian) == 200) {
+		Actor_Set_Goal_Number(kActorGeneralDoll, 299);
+		Actor_Put_In_Set(kActorGeneralDoll, 97);
+		Actor_Set_At_Waypoint(kActorGeneralDoll, 39, 0);
 	}
 }
 
@@ -97,7 +97,7 @@ bool SceneScriptBB05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -212.0f, -60.31f, 131.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -212.0f, -60.31f, 131.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(286);
@@ -106,7 +106,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 95.0f, -60.31f, 331.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 95.0f, -60.31f, 331.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(297);
@@ -115,7 +115,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 271.0f, -60.31f, 203.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 271.0f, -60.31f, 203.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(299);
@@ -124,7 +124,7 @@ bool SceneScriptBB05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 151.0f, -60.34f, -108.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 151.0f, -60.34f, -108.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(301);
@@ -147,60 +147,60 @@ void SceneScriptBB05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB05::PlayerWalkedIn() {
 	if (Game_Flag_Query(298)) {
-		Loop_Actor_Walk_To_XYZ(0, 95.0f, -60.31f, 303.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 95.0f, -60.31f, 303.0f, 0, 0, false, 0);
 		Game_Flag_Reset(298);
 	} else if (Game_Flag_Query(300)) {
-		Loop_Actor_Walk_To_XYZ(0, 231.0f, -60.31f, 203.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 231.0f, -60.31f, 203.0f, 0, 0, false, 0);
 		Game_Flag_Reset(300);
 	} else if (Game_Flag_Query(302)) {
-		Loop_Actor_Walk_To_XYZ(0, 111.0f, -60.31f, -24.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 111.0f, -60.31f, -24.0f, 0, 0, false, 0);
 		Game_Flag_Reset(302);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, -76.0f, -60.31f, 131.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.0f, -60.31f, 131.0f, 0, 0, false, 0);
 		Game_Flag_Reset(285);
 	}
-	if (Actor_Query_Goal_Number(56) == 200) {
-		Actor_Face_Actor(56, 0, true);
-		Actor_Face_Actor(0, 56, true);
-		Actor_Says(56, 120, 13);
-		Actor_Says(0, 7030, 15);
-		Actor_Says(56, 130, 17);
-		Actor_Says(56, 140, 16);
-		Actor_Says(56, 150, 14);
-		Actor_Says(56, 160, 15);
-		Actor_Says(0, 7035, 14);
-		Actor_Says(56, 170, 12);
-		Actor_Says(0, 7040, 14);
-		Actor_Says(56, 180, 16);
-		Actor_Says(0, 7045, 14);
+	if (Actor_Query_Goal_Number(kActorSebastian) == 200) {
+		Actor_Face_Actor(kActorSebastian, kActorMcCoy, true);
+		Actor_Face_Actor(kActorMcCoy, kActorSebastian, true);
+		Actor_Says(kActorSebastian, 120, 13);
+		Actor_Says(kActorMcCoy, 7030, 15);
+		Actor_Says(kActorSebastian, 130, 17);
+		Actor_Says(kActorSebastian, 140, 16);
+		Actor_Says(kActorSebastian, 150, 14);
+		Actor_Says(kActorSebastian, 160, 15);
+		Actor_Says(kActorMcCoy, 7035, 14);
+		Actor_Says(kActorSebastian, 170, 12);
+		Actor_Says(kActorMcCoy, 7040, 14);
+		Actor_Says(kActorSebastian, 180, 16);
+		Actor_Says(kActorMcCoy, 7045, 14);
 		if (Game_Flag_Query(399)) {
-			Actor_Says(56, 190, 15);
-			Actor_Says(0, 7050, 17);
-			Actor_Says(56, 200, 16);
-			Actor_Says_With_Pause(56, 210, 1.5f, 14);
-			Actor_Says(0, 7055, 15);
+			Actor_Says(kActorSebastian, 190, 15);
+			Actor_Says(kActorMcCoy, 7050, 17);
+			Actor_Says(kActorSebastian, 200, 16);
+			Actor_Says_With_Pause(kActorSebastian, 210, 1.5f, 14);
+			Actor_Says(kActorMcCoy, 7055, 15);
 		} else {
-			Actor_Put_In_Set(58, 22);
-			Actor_Set_At_Waypoint(58, 134, 0);
-			Loop_Actor_Walk_To_Waypoint(58, 135, 0, 0, false);
-			Actor_Says(58, 0, 3);
-			Actor_Face_Actor(0, 58, true);
-			Actor_Face_Actor(56, 58, true);
-			Actor_Says(56, 220, 13);
-			Loop_Actor_Walk_To_Waypoint(58, 134, 0, 0, false);
-			Actor_Face_Actor(56, 0, true);
-			Actor_Face_Actor(0, 56, true);
-			Actor_Says(56, 230, 15);
-			Actor_Says(0, 7060, 17);
-			Actor_Says(56, 240, 12);
+			Actor_Put_In_Set(kActorGeneralDoll, 22);
+			Actor_Set_At_Waypoint(kActorGeneralDoll, 134, 0);
+			Loop_Actor_Walk_To_Waypoint(kActorGeneralDoll, 135, 0, 0, false);
+			Actor_Says(kActorGeneralDoll, 0, 3);
+			Actor_Face_Actor(kActorMcCoy, kActorGeneralDoll, true);
+			Actor_Face_Actor(kActorSebastian, kActorGeneralDoll, true);
+			Actor_Says(kActorSebastian, 220, 13);
+			Loop_Actor_Walk_To_Waypoint(kActorGeneralDoll, 134, 0, 0, false);
+			Actor_Face_Actor(kActorSebastian, kActorMcCoy, true);
+			Actor_Face_Actor(kActorMcCoy, kActorSebastian, true);
+			Actor_Says(kActorSebastian, 230, 15);
+			Actor_Says(kActorMcCoy, 7060, 17);
+			Actor_Says(kActorSebastian, 240, 12);
 		}
-		Actor_Says(0, 7065, 16);
-		Actor_Says(56, 250, 16);
-		Actor_Says(0, 7070, 18);
-		Actor_Set_Goal_Number(56, 205);
-		Actor_Set_Goal_Number(58, 201);
-		Actor_Set_Goal_Number(54, 101);
-		Actor_Set_Goal_Number(58, 200);
+		Actor_Says(kActorMcCoy, 7065, 16);
+		Actor_Says(kActorSebastian, 250, 16);
+		Actor_Says(kActorMcCoy, 7070, 18);
+		Actor_Set_Goal_Number(kActorSebastian, 205);
+		Actor_Set_Goal_Number(kActorGeneralDoll, 201);
+		Actor_Set_Goal_Number(kActorBryant, 101);
+		Actor_Set_Goal_Number(kActorGeneralDoll, 200);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb06.cpp b/engines/bladerunner/script/scene/bb06.cpp
index 48d983d74a..6cdf9076eb 100644
--- a/engines/bladerunner/script/scene/bb06.cpp
+++ b/engines/bladerunner/script/scene/bb06.cpp
@@ -76,13 +76,13 @@ bool SceneScriptBB06::MouseClick(int x, int y) {
 
 bool SceneScriptBB06::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BOX31", objectName)) {
-		if (!Loop_Actor_Walk_To_Scene_Object(0, "BOX31", 24, 1, false)) {
-			Actor_Face_Object(0, "BOX31", true);
+		if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BOX31", 24, true, false)) {
+			Actor_Face_Object(kActorMcCoy, "BOX31", true);
 			if (Game_Flag_Query(410)) {
-				Actor_Voice_Over(60, 99);
-				Actor_Voice_Over(70, 99);
+				Actor_Voice_Over(60, kActorVoiceOver);
+				Actor_Voice_Over(70, kActorVoiceOver);
 			} else {
-				Actor_Voice_Over(50, 99);
+				Actor_Voice_Over(50, kActorVoiceOver);
 			}
 		}
 	}
@@ -107,7 +107,7 @@ bool SceneScriptBB06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -37.0f, 0.0f, 178.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -37.0f, 0.0f, 178.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(298);
@@ -116,7 +116,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 101.0f, 0.0f, -25.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 101.0f, 0.0f, -25.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(393);
@@ -125,7 +125,7 @@ bool SceneScriptBB06::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -115.0f, 0.0f, -103.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -115.0f, 0.0f, -103.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(363);
@@ -163,7 +163,7 @@ void SceneScriptBB06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB06::PlayerWalkedIn() {
 	if (Game_Flag_Query(297)) {
-		Loop_Actor_Walk_To_XYZ(0, -36.0f, 0.0f, 145.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -36.0f, 0.0f, 145.0f, 0, 0, false, 0);
 		Game_Flag_Reset(297);
 	}
 }
diff --git a/engines/bladerunner/script/scene/bb07.cpp b/engines/bladerunner/script/scene/bb07.cpp
index f088732675..b53db970eb 100644
--- a/engines/bladerunner/script/scene/bb07.cpp
+++ b/engines/bladerunner/script/scene/bb07.cpp
@@ -66,20 +66,20 @@ bool SceneScriptBB07::MouseClick(int x, int y) {
 
 bool SceneScriptBB07::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("PRINTER", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -472.63f, 252.59f, -1086.81f, 0, 0, false, 0)) {
-			Actor_Face_Object(0, "PRINTER", true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -472.63f, 252.59f, -1086.81f, 0, 0, false, 0)) {
+			Actor_Face_Object(kActorMcCoy, "PRINTER", true);
 			if (Game_Flag_Query(396) && !Game_Flag_Query(398)) {
-				Actor_Voice_Over(130, 99);
+				Actor_Voice_Over(130, kActorVoiceOver);
 				Item_Pickup_Spin_Effect(941, 439, 242);
-				Actor_Voice_Over(140, 99);
+				Actor_Voice_Over(140, kActorVoiceOver);
 				Game_Flag_Set(398);
-				Actor_Clue_Acquire(0, 148, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueDNASebastian, 1, -1);
 			} else if (Game_Flag_Query(396) && Game_Flag_Query(398)) {
-				Actor_Face_Object(0, "PRINTER", true);
-				Actor_Says(0, 8570, 13);
+				Actor_Face_Object(kActorMcCoy, "PRINTER", true);
+				Actor_Says(kActorMcCoy, 8570, 13);
 			} else {
-				Actor_Face_Object(0, "PRINTER", true);
-				Actor_Says(0, 8575, 13);
+				Actor_Face_Object(kActorMcCoy, "PRINTER", true);
+				Actor_Says(kActorMcCoy, 8575, 13);
 			}
 		}
 	}
@@ -92,12 +92,12 @@ bool SceneScriptBB07::ClickedOnActor(int actorId) {
 
 bool SceneScriptBB07::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 83) {
-		if (!Loop_Actor_Walk_To_Item(0, 83, 36, 1, false)) {
-			Actor_Face_Item(0, 83, true);
+		if (!Loop_Actor_Walk_To_Item(kActorMcCoy, 83, 36, 1, false)) {
+			Actor_Face_Item(kActorMcCoy, 83, true);
 			if (Game_Flag_Query(396) == 1) {
-				Actor_Voice_Over(150, 99);
-				Actor_Voice_Over(160, 99);
-				Actor_Voice_Over(170, 99);
+				Actor_Voice_Over(150, kActorVoiceOver);
+				Actor_Voice_Over(160, kActorVoiceOver);
+				Actor_Voice_Over(170, kActorVoiceOver);
 			}
 		}
 	}
@@ -106,7 +106,7 @@ bool SceneScriptBB07::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB07::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -615.0f, 252.59f, -1018.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -615.0f, 252.59f, -1018.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Overlay_Remove("BB07OVER");
@@ -116,7 +116,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -619.0f, 252.59f, -1136.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -619.0f, 252.59f, -1136.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Overlay_Remove("BB07OVER");
@@ -126,7 +126,7 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -551.0f, 252.59f, -1004.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -551.0f, 252.59f, -1004.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Overlay_Remove("BB07OVER");
@@ -140,17 +140,17 @@ bool SceneScriptBB07::ClickedOnExit(int exitId) {
 
 bool SceneScriptBB07::ClickedOn2DRegion(int region) {
 	if (region == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -568.63f, 252.59f, -1114.81f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 229, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -568.63f, 252.59f, -1114.81f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 229, false);
 			if (Game_Flag_Query(396)) {
-				Actor_Says(0, 8585, 15);
+				Actor_Says(kActorMcCoy, 8585, 15);
 			} else {
 				Ambient_Sounds_Play_Sound(592, 40, 20, 20, 99);
 				Overlay_Play("BB07OVER", 1, 0, 1, 0);
 				Overlay_Play("BB07OVER", 2, 1, 0, 0);
 				Game_Flag_Set(396);
 				if (!Game_Flag_Query(398)) {
-					Actor_Says(39, 0, 3);
+					Actor_Says(kActorAnsweringMachine, 0, 3);
 				}
 			}
 		}
@@ -166,11 +166,11 @@ void SceneScriptBB07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB07::PlayerWalkedIn() {
 	if (Game_Flag_Query(299)) {
-		Loop_Actor_Walk_To_XYZ(0, -594.0f, 252.59f, -1018.0f, 6, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -594.0f, 252.59f, -1018.0f, 6, 0, false, 0);
 		Game_Flag_Reset(299);
 	}
 	if (Game_Flag_Query(365)) {
-		Loop_Actor_Walk_To_XYZ(0, -602.0f, 252.59f, -1124.0f, 6, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -602.0f, 252.59f, -1124.0f, 6, 0, false, 0);
 		Game_Flag_Reset(365);
 	}
 }
diff --git a/engines/bladerunner/script/scene/bb08.cpp b/engines/bladerunner/script/scene/bb08.cpp
index b88eef6e3f..6f8eab33c3 100644
--- a/engines/bladerunner/script/scene/bb08.cpp
+++ b/engines/bladerunner/script/scene/bb08.cpp
@@ -80,10 +80,10 @@ bool SceneScriptBB08::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB08::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 204.0f, 0.1f, 94.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 256, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 204.0f, 0.1f, 94.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 256, false);
 			Footstep_Sound_Override_On(2);
-			Loop_Actor_Travel_Ladder(0, 8, 1, 0);
+			Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 1, 0);
 			Footstep_Sound_Override_Off();
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -93,7 +93,7 @@ bool SceneScriptBB08::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 247.0f, 0.1f, 27.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 247.0f, 0.1f, 27.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(506);
@@ -116,14 +116,14 @@ void SceneScriptBB08::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB08::PlayerWalkedIn() {
 	if (Game_Flag_Query(219)) {
-		Actor_Set_At_XYZ(0, 204.0f, 96.1f, 94.0f, 256);
+		Actor_Set_At_XYZ(kActorMcCoy, 204.0f, 96.1f, 94.0f, 256);
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Ladder(0, 8, 0, 0);
+		Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 0, 0);
 		Footstep_Sound_Override_Off();
-		Actor_Face_Heading(0, 768, false);
+		Actor_Face_Heading(kActorMcCoy, 768, false);
 		Game_Flag_Reset(219);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, 188.0f, 0.1f, 28.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 188.0f, 0.1f, 28.0f, 0, 0, false, 0);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/bb09.cpp b/engines/bladerunner/script/scene/bb09.cpp
index dc3356e77b..886b3738e5 100644
--- a/engines/bladerunner/script/scene/bb09.cpp
+++ b/engines/bladerunner/script/scene/bb09.cpp
@@ -53,7 +53,7 @@ void SceneScriptBB09::InitializeScene() {
 	Ambient_Sounds_Add_Sound(308, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(309, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(310, 5, 50, 17, 27, -100, 100, -101, -101, 0, 0);
-	Actor_Set_Targetable(8, true);
+	Actor_Set_Targetable(kActorSadik, true);
 }
 
 void SceneScriptBB09::SceneLoaded() {
@@ -80,8 +80,8 @@ bool SceneScriptBB09::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB09::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 454.56f, -9.0f, 190.31f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 450.56f, -9.0f, 250.31f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 454.56f, -9.0f, 190.31f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 450.56f, -9.0f, 250.31f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(216);
@@ -91,7 +91,7 @@ bool SceneScriptBB09::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 71.0f, -9.0f, 136.0f, 72, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 71.0f, -9.0f, 136.0f, 72, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(219);
diff --git a/engines/bladerunner/script/scene/bb10.cpp b/engines/bladerunner/script/scene/bb10.cpp
index f40084be2d..281f141689 100644
--- a/engines/bladerunner/script/scene/bb10.cpp
+++ b/engines/bladerunner/script/scene/bb10.cpp
@@ -99,14 +99,14 @@ bool SceneScriptBB10::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB10::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 225.58f, 67.2f, -102.1f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 225.58f, 67.2f, -102.1f, 0, 1, false, 0)) {
 			Player_Set_Combat_Mode(false);
-			Actor_Face_Heading(0, 274, false);
+			Actor_Face_Heading(kActorMcCoy, 274, false);
 			Footstep_Sound_Override_On(2);
-			Loop_Actor_Travel_Stairs(0, 2, 1, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 2, 1, 0);
 			Footstep_Sound_Override_Off();
 			Footstep_Sound_Override_On(2);
-			Loop_Actor_Travel_Ladder(0, 3, 1, 0);
+			Loop_Actor_Travel_Ladder(kActorMcCoy, 3, 1, 0);
 			Footstep_Sound_Override_Off();
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -116,7 +116,7 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 206.01f, 66.84f, -261.62f, 0, 1, false, 0) && !Loop_Actor_Walk_To_XYZ(0, 151.67f, 66.84f, -313.06f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 206.01f, 66.84f, -261.62f, 0, 1, false, 0) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 151.67f, 66.84f, -313.06f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Reset(216);
@@ -129,8 +129,8 @@ bool SceneScriptBB10::ClickedOnExit(int exitId) {
 }
 
 bool SceneScriptBB10::ClickedOn2DRegion(int region) {
-	if (!Loop_Actor_Walk_To_XYZ(0, 225.58f, 67.2f, -102.1f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 274, false);
+	if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 225.58f, 67.2f, -102.1f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 274, false);
 		Sound_Play(Random_Query(289, 290), 40, 70, 70, 50);
 		switch (region) {
 		case 4:
@@ -179,18 +179,18 @@ void SceneScriptBB10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptBB10::PlayerWalkedIn() {
 	if (Game_Flag_Query(216)) {
 		Player_Loses_Control();
-		Actor_Set_At_XYZ(0, 214.01f, 66.84f, -349.62f, 462);
-		Loop_Actor_Walk_To_XYZ(0, 206.01f, 66.84f, -261.62f, 0, 0, false, 0);
+		Actor_Set_At_XYZ(kActorMcCoy, 214.01f, 66.84f, -349.62f, 462);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 206.01f, 66.84f, -261.62f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(216);
 	} else if (Game_Flag_Query(223)) {
-		Actor_Set_At_XYZ(0, 249.58f, 127.2f, -102.1f, 256);
+		Actor_Set_At_XYZ(kActorMcCoy, 249.58f, 127.2f, -102.1f, 256);
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Ladder(0, 3, 0, 0);
+		Loop_Actor_Travel_Ladder(kActorMcCoy, 3, 0, 0);
 		Footstep_Sound_Override_Off();
-		Actor_Face_Heading(0, 768, false);
+		Actor_Face_Heading(kActorMcCoy, 768, false);
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Stairs(0, 3, 0, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 0, 0);
 		Footstep_Sound_Override_Off();
 		Game_Flag_Reset(223);
 	}
diff --git a/engines/bladerunner/script/scene/bb11.cpp b/engines/bladerunner/script/scene/bb11.cpp
index 07dd2e2301..0216c7b015 100644
--- a/engines/bladerunner/script/scene/bb11.cpp
+++ b/engines/bladerunner/script/scene/bb11.cpp
@@ -83,7 +83,7 @@ bool SceneScriptBB11::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB11::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 43.39f, -10.27f, -68.52f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 43.39f, -10.27f, -68.52f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(223);
@@ -99,8 +99,8 @@ bool SceneScriptBB11::ClickedOn2DRegion(int region) {
 }
 
 void SceneScriptBB11::SceneFrameAdvanced(int frame) {
-	if (Actor_Query_Goal_Number(8) == 105 && !Game_Flag_Query(375)) {
-		Actor_Change_Animation_Mode(0, 48);
+	if (Actor_Query_Goal_Number(kActorSadik) == 105 && !Game_Flag_Query(375)) {
+		Actor_Change_Animation_Mode(kActorMcCoy, 48);
 		Game_Flag_Set(375);
 	} else {
 		if (frame == 1) {
@@ -113,9 +113,9 @@ void SceneScriptBB11::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptBB11::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(8) == 102 && Global_Variable_Query(1) == 2) {
-		Actor_Set_Invisible(0, true);
-		Actor_Set_Goal_Number(8, 103);
+	if (Actor_Query_Goal_Number(kActorSadik) == 102 && Global_Variable_Query(1) == 2) {
+		Actor_Set_Invisible(kActorMcCoy, true);
+		Actor_Set_Goal_Number(kActorSadik, 103);
 		Music_Play(11, 61, 0, 1, -1, 0, 0);
 		Player_Loses_Control();
 	}
diff --git a/engines/bladerunner/script/scene/bb12.cpp b/engines/bladerunner/script/scene/bb12.cpp
index 0546ae0225..289bd3fe4c 100644
--- a/engines/bladerunner/script/scene/bb12.cpp
+++ b/engines/bladerunner/script/scene/bb12.cpp
@@ -80,7 +80,7 @@ bool SceneScriptBB12::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB12::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -129.0f, 0.0f, 64.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -129.0f, 0.0f, 64.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(507);
@@ -89,7 +89,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 138.0f, 0.0f, 104.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 138.0f, 0.0f, 104.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(365);
@@ -98,7 +98,7 @@ bool SceneScriptBB12::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 54.0f, 0.0f, 200.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 54.0f, 0.0f, 200.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(302);
@@ -127,10 +127,10 @@ void SceneScriptBB12::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptBB12::PlayerWalkedIn() {
 	if (Game_Flag_Query(364)) {
-		Loop_Actor_Walk_To_XYZ(0, 114.0f, 0.0f, 104.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 114.0f, 0.0f, 104.0f, 0, 0, false, 0);
 		Game_Flag_Reset(364);
 	} else if (Game_Flag_Query(506)) {
-		Loop_Actor_Walk_To_XYZ(0, -101.0f, 0.0f, 64.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -101.0f, 0.0f, 64.0f, 0, 0, false, 0);
 		Game_Flag_Reset(506);
 	}
 }
diff --git a/engines/bladerunner/script/scene/bb51.cpp b/engines/bladerunner/script/scene/bb51.cpp
index 5ef20430fb..ac9f13db47 100644
--- a/engines/bladerunner/script/scene/bb51.cpp
+++ b/engines/bladerunner/script/scene/bb51.cpp
@@ -58,15 +58,15 @@ bool SceneScriptBB51::MouseClick(int x, int y) {
 
 bool SceneScriptBB51::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("V2CHESSTBL01", objectName)) {
-		Actor_Face_Object(0, "V2CHESSTBL01", true);
-		Actor_Voice_Over(80, 99);
-		Actor_Voice_Over(90, 99);
+		Actor_Face_Object(kActorMcCoy, "V2CHESSTBL01", true);
+		Actor_Voice_Over(80, kActorVoiceOver);
+		Actor_Voice_Over(90, kActorVoiceOver);
 	}
 	if (Object_Query_Click("TOP02", objectName)) {
-		Actor_Face_Object(0, "TOP02", true);
-		Actor_Voice_Over(100, 99);
-		Actor_Voice_Over(110, 99);
-		Actor_Voice_Over(120, 99);
+		Actor_Face_Object(kActorMcCoy, "TOP02", true);
+		Actor_Voice_Over(100, kActorVoiceOver);
+		Actor_Voice_Over(110, kActorVoiceOver);
+		Actor_Voice_Over(120, kActorVoiceOver);
 	}
 	return false;
 }
@@ -81,7 +81,7 @@ bool SceneScriptBB51::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptBB51::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 76.0f, 0.0f, 79.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 76.0f, 0.0f, 79.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(394);
@@ -90,7 +90,7 @@ bool SceneScriptBB51::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 55.0f, 0.0f, -96.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 55.0f, 0.0f, -96.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(395);
diff --git a/engines/bladerunner/script/scene/ct01.cpp b/engines/bladerunner/script/scene/ct01.cpp
index 84878d1b94..5a2c62cfbb 100644
--- a/engines/bladerunner/script/scene/ct01.cpp
+++ b/engines/bladerunner/script/scene/ct01.cpp
@@ -50,7 +50,7 @@ void SceneScriptCT01::InitializeScene() {
 		Setup_Scene_Information(-397.0f, -6.5f, 471.0f, 250);
 	}
 	Scene_Exit_Add_2D_Exit(0, 290, 256, 360, 304, 1);
-	if (Actor_Clue_Query(0, 18)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueZubenRunsAway)) {
 		Scene_Exit_Add_2D_Exit(1, 571, 233, 639, 367, 1);
 	}
 	if (Game_Flag_Query(94)) {
@@ -105,90 +105,90 @@ bool SceneScriptCT01::MouseClick(int x, int y) {
 bool SceneScriptCT01::ClickedOn3DObject(const char *objectName, bool a2) {
 //	if ("ASIANSITTINGANDEATI" == objectName) { //bug?
 	if (Object_Query_Click("ASIANSITTINGANDEATI", objectName)) {
-		Actor_Face_Object(0, "ASIANSITTINGANDEATI", true);
-		Actor_Says(0, 365, 13);
-		Actor_Says(28, 160, 13);
+		Actor_Face_Object(kActorMcCoy, "ASIANSITTINGANDEATI", true);
+		Actor_Says(kActorMcCoy, 365, 13);
+		Actor_Says(kActorHowieLee, 160, 13);
 		return true;
 	}
 	return false;
 }
 
 bool SceneScriptCT01::ClickedOnActor(int actorId) {
-	if (actorId == 28) {
-		Actor_Set_Goal_Number(28, 50);
-		if (!Loop_Actor_Walk_To_XYZ(0, -335.23f, -6.5f, 578.97f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 28, true);
-			Actor_Face_Actor(28, 0, true);
+	if (actorId == kActorHowieLee) {
+		Actor_Set_Goal_Number(kActorHowieLee, 50);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -335.23f, -6.5f, 578.97f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorHowieLee, true);
+			Actor_Face_Actor(kActorHowieLee, kActorMcCoy, true);
 			if (!Game_Flag_Query(26)) {
-				Actor_Says(0, 260, 18);
-				Actor_Says(28, 0, 14);
+				Actor_Says(kActorMcCoy, 260, 18);
+				Actor_Says(kActorHowieLee, 0, 14);
 				Game_Flag_Set(26);
-				Actor_Set_Goal_Number(28, 0);
-			} else if (!Game_Flag_Query(30) && Actor_Query_Friendliness_To_Other(28, 0) >= 40) {
+				Actor_Set_Goal_Number(kActorHowieLee, 0);
+			} else if (!Game_Flag_Query(30) && Actor_Query_Friendliness_To_Other(kActorHowieLee, kActorMcCoy) >= 40) {
 				sub_40269C();
-				Actor_Set_Goal_Number(28, 0);
+				Actor_Set_Goal_Number(kActorHowieLee, 0);
 			} else {
 				if (Game_Flag_Query(31)) {
-					Actor_Says(0, 330, 17);
-					Actor_Says(28, 130, 13);
-					Actor_Says(28, 140, 14);
-				} else if (Actor_Query_Friendliness_To_Other(28, 0) < 50) {
-					Actor_Says(0, 330, 13);
-					Actor_Says(28, 160, 15);
+					Actor_Says(kActorMcCoy, 330, 17);
+					Actor_Says(kActorHowieLee, 130, 13);
+					Actor_Says(kActorHowieLee, 140, 14);
+				} else if (Actor_Query_Friendliness_To_Other(kActorHowieLee, kActorMcCoy) < 50) {
+					Actor_Says(kActorMcCoy, 330, 13);
+					Actor_Says(kActorHowieLee, 160, 15);
 				} else {
-					Actor_Says(0, 310, 11);
-					Actor_Says(28, 10, 16);
+					Actor_Says(kActorMcCoy, 310, 11);
+					Actor_Says(kActorHowieLee, 10, 16);
 				}
-				Actor_Set_Goal_Number(28, 0);
+				Actor_Set_Goal_Number(kActorHowieLee, 0);
 			}
 			return true;
 		}
 	}
 	if (actorId == 19) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -335.23f, -6.5f, 578.97f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 19, true);
-			Actor_Says(0, 355, 18);
-			if (!Actor_Query_Goal_Number(19)) {
-				Actor_Says(19, 10, 16);
-				Actor_Face_Actor(28, 0, true);
-				Actor_Says(28, 150, 3);
-				Actor_Face_Actor(0, 28, true);
-				Actor_Says(0, 360, 13);
-				Actor_Modify_Friendliness_To_Other(28, 0, -5);
-				Actor_Modify_Friendliness_To_Other(19, 0, -4);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -335.23f, -6.5f, 578.97f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
+			Actor_Says(kActorMcCoy, 355, 18);
+			if (!Actor_Query_Goal_Number(kActorZuben)) {
+				Actor_Says(kActorZuben, 10, 16);
+				Actor_Face_Actor(kActorHowieLee, kActorMcCoy, true);
+				Actor_Says(kActorHowieLee, 150, 3);
+				Actor_Face_Actor(kActorMcCoy, kActorHowieLee, true);
+				Actor_Says(kActorMcCoy, 360, 13);
+				Actor_Modify_Friendliness_To_Other(kActorHowieLee, kActorMcCoy, -5);
+				Actor_Modify_Friendliness_To_Other(kActorZuben, kActorMcCoy, -4);
 			}
 			return true;
 		}
 	}
 	if (actorId == 2) {
 		//todo: some weird code in assembly EBP is used but may not be initialized, loc_401C78
-		if (!Actor_Query_Goal_Number(2)) {
-			if (Loop_Actor_Walk_To_XYZ(0, -338.1f, -6.5f, 419.65f, 6, 1, false, 0)) {
+		if (!Actor_Query_Goal_Number(kActorGordo)) {
+			if (Loop_Actor_Walk_To_XYZ(kActorMcCoy, -338.1f, -6.5f, 419.65f, 6, 1, false, 0)) {
 				return false;
 			}
 		}
 
-		Actor_Face_Actor(0, 2, true);
+		Actor_Face_Actor(kActorMcCoy, kActorGordo, true);
 		if (!Game_Flag_Query(32)) {
-			Actor_Says(0, 335, 18);
-			Actor_Says(2, 20, 30);
+			Actor_Says(kActorMcCoy, 335, 18);
+			Actor_Says(kActorGordo, 20, 30);
 			Game_Flag_Set(32);
-			Actor_Clue_Acquire(2, 213, 1, 0);
-			Actor_Clue_Acquire(0, 214, 1, 0);
-			Actor_Modify_Friendliness_To_Other(2, 0, -1);
-		} else if (Actor_Query_Goal_Number(2)) {
-			Actor_Says(0, 365, 14);
+			Actor_Clue_Acquire(kActorGordo, kClueMcCoysDescription, 1, kActorMcCoy);
+			Actor_Clue_Acquire(kActorMcCoy, kClueMcCoyIsABladeRunner, 1, kActorMcCoy);
+			Actor_Modify_Friendliness_To_Other(kActorGordo, kActorMcCoy, -1);
+		} else if (Actor_Query_Goal_Number(kActorGordo)) {
+			Actor_Says(kActorMcCoy, 365, 14);
 		} else {
-			Actor_Says(0, 340, 13);
-			Actor_Says(0, 345, 11);
-			Actor_Says(2, 30, 30);
-			Actor_Says(0, 350, 13);
-			Actor_Says(2, 40, 30);
-			Actor_Modify_Friendliness_To_Other(2, 0, -5);
+			Actor_Says(kActorMcCoy, 340, 13);
+			Actor_Says(kActorMcCoy, 345, 11);
+			Actor_Says(kActorGordo, 30, 30);
+			Actor_Says(kActorMcCoy, 350, 13);
+			Actor_Says(kActorGordo, 40, 30);
+			Actor_Modify_Friendliness_To_Other(kActorGordo, kActorMcCoy, -5);
 			Player_Loses_Control();
 		}
-		if (Actor_Query_Is_In_Current_Set(19)) {
-			Actor_Modify_Friendliness_To_Other(19, 0, -2);
+		if (Actor_Query_Is_In_Current_Set(kActorZuben)) {
+			Actor_Modify_Friendliness_To_Other(kActorZuben, kActorMcCoy, -2);
 		}
 		return true;
 	}
@@ -201,9 +201,9 @@ bool SceneScriptCT01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -327.5f, -6.5f, 352.28f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -327.5f, -6.5f, 352.28f, 0, 1, false, 0)) {
 			Player_Loses_Control();
-			Loop_Actor_Walk_To_Waypoint(0, 106, 0, 0, false);
+			Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 106, 0, 0, false);
 			Player_Gains_Control();
 			Game_Flag_Reset(247);
 			Set_Enter(27, 14);
@@ -211,14 +211,14 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -259.0f, -6.5f, 710.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -259.0f, -6.5f, 710.0f, 0, 1, false, 0)) {
 			Game_Flag_Reset(247);
 			Set_Enter(5, 15);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -419.0f, -6.5f, 696.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -419.0f, -6.5f, 696.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(123);
 			Game_Flag_Reset(247);
 			Set_Enter(4, 24);
@@ -226,9 +226,9 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -314.0f, -6.5f, 326.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -330.0f, -6.5f, 221.0f, 0, 0, true, 0);
-			Loop_Actor_Walk_To_XYZ(0, -530.0f, -6.5f, 241.0f, 0, 0, true, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -314.0f, -6.5f, 326.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -330.0f, -6.5f, 221.0f, 0, 0, true, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -530.0f, -6.5f, 241.0f, 0, 0, true, 0);
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
 			Game_Flag_Reset(179);
@@ -315,9 +315,9 @@ bool SceneScriptCT01::ClickedOnExit(int exitId) {
 			default:
 				Game_Flag_Set(176);
 				Player_Loses_Control();
-				Loop_Actor_Walk_To_XYZ(0, -530.0f, -6.5f, 241.0f, 0, 0, true, 0);
-				Loop_Actor_Walk_To_XYZ(0, -330.0f, -6.5f, 221.0f, 0, 0, true, 0);
-				Loop_Actor_Walk_To_XYZ(0, -314.0f, -6.5f, 326.0f, 0, 0, false, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -530.0f, -6.5f, 241.0f, 0, 0, true, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -330.0f, -6.5f, 221.0f, 0, 0, true, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -314.0f, -6.5f, 326.0f, 0, 0, false, 0);
 				Player_Gains_Control();
 				break;
 			}
@@ -376,20 +376,20 @@ void SceneScriptCT01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptCT01::PlayerWalkedIn() {
 	if (Game_Flag_Query(234)) {
-		Loop_Actor_Walk_To_XYZ(0, -327.2f, -6.5f, 352.28f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -327.2f, -6.5f, 352.28f, 0, 0, false, 0);
 		Game_Flag_Reset(234);
 	} else {
 		if (!Game_Flag_Query(247)) {
 			Game_Flag_Reset(247);
 		}
-		Loop_Actor_Walk_To_XYZ(0, -330.0f, -6.5f, 221.0f, 0, 0, false, 0);
-		Loop_Actor_Walk_To_XYZ(0, -314.0f, -6.5f, 326.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -330.0f, -6.5f, 221.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -314.0f, -6.5f, 326.0f, 0, 0, false, 0);
 		if (!Game_Flag_Query(25)) {
 			Game_Flag_Set(25);
 			if (!Game_Flag_Query(378)) {
-				Actor_Voice_Over(200, 99);
-				Actor_Voice_Over(210, 99);
-				Actor_Voice_Over(220, 99);
+				Actor_Voice_Over(200, kActorVoiceOver);
+				Actor_Voice_Over(210, kActorVoiceOver);
+				Actor_Voice_Over(220, kActorVoiceOver);
 			}
 		}
 	}
@@ -416,13 +416,13 @@ void SceneScriptCT01::DialogueQueueFlushed(int a1) {
 
 void SceneScriptCT01::sub_40269C() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 13)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueLucy)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(40, 4, 5, 6);
 	}
-	if ((Actor_Clue_Query(0, 8) || Actor_Clue_Query(0, 9)) && !Game_Flag_Query(27)) {
+	if ((Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) && !Game_Flag_Query(27)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(50, 5, 5, 4);
 	}
-	if (Actor_Clue_Query(0, 8) && Actor_Clue_Query(0, 9) && Game_Flag_Query(27) && !Game_Flag_Query(28)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) && Actor_Clue_Query(kActorMcCoy, kClueSushiMenu) && Game_Flag_Query(27) && !Game_Flag_Query(28)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(60, 3, 5, 5);
 	}
 	if (Game_Flag_Query(293)) {
@@ -430,7 +430,7 @@ void SceneScriptCT01::sub_40269C() {
 	} else if (Game_Flag_Query(29)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(80, 3, 4, 8);
 	}
-	if (Actor_Clue_Query(0, 30) && Actor_Clue_Query(0, 40) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueCarColorAndMake) && Actor_Clue_Query(kActorMcCoy, kClueDispatchHitAndRun) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(90, 5, 4, 5);
 	}
 	DM_Add_To_List_Never_Repeat_Once_Selected(70, 7, 3, -1);
@@ -440,74 +440,74 @@ void SceneScriptCT01::sub_40269C() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 40:
-		Actor_Says(0, 265, 11);
-		Actor_Says(28, 20, 14);
-		if (Actor_Query_Is_In_Current_Set(19)) {
-			if (!Actor_Query_Goal_Number(19)) {
-				Actor_Face_Actor(28, 19, true);
-				Actor_Says(28, 120, 14);
-				Actor_Face_Actor(19, 28, true);
-				Actor_Says(19, 40, 18);
-				Actor_Face_Heading(19, 103, false);
-				Actor_Face_Actor(28, 0, true);
-				Actor_Modify_Friendliness_To_Other(19, 0, -2);
-				if (Actor_Query_Is_In_Current_Set(2)) {
-					Actor_Modify_Friendliness_To_Other(2, 0, -3);
-					Actor_Clue_Acquire(2, 213, 1, 0);
+		Actor_Says(kActorMcCoy, 265, 11);
+		Actor_Says(kActorHowieLee, 20, 14);
+		if (Actor_Query_Is_In_Current_Set(kActorZuben)) {
+			if (!Actor_Query_Goal_Number(kActorZuben)) {
+				Actor_Face_Actor(kActorHowieLee, kActorZuben, true);
+				Actor_Says(kActorHowieLee, 120, 14);
+				Actor_Face_Actor(kActorZuben, kActorHowieLee, true);
+				Actor_Says(kActorZuben, 40, 18);
+				Actor_Face_Heading(kActorZuben, 103, false);
+				Actor_Face_Actor(kActorHowieLee, kActorMcCoy, true);
+				Actor_Modify_Friendliness_To_Other(kActorZuben, kActorMcCoy, -2);
+				if (Actor_Query_Is_In_Current_Set(kActorGordo)) {
+					Actor_Modify_Friendliness_To_Other(kActorGordo, kActorMcCoy, -3);
+					Actor_Clue_Acquire(kActorGordo, kClueMcCoysDescription, 1, kActorMcCoy);
 				}
 			}
 		}
 		break;
 	case 50:
-		if (Actor_Clue_Query(0, 8) == 1) {
-			Actor_Says(0, 270, 11);
-			Actor_Says(28, 30, 16);
+		if (Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) == 1) {
+			Actor_Says(kActorMcCoy, 270, 11);
+			Actor_Says(kActorHowieLee, 30, 16);
 		} else {
-			Actor_Says(0, 280, 11);
-			Actor_Says(28, 40, 14);
+			Actor_Says(kActorMcCoy, 280, 11);
+			Actor_Says(kActorHowieLee, 40, 14);
 		}
 		Game_Flag_Set(27);
 		break;
 	case 60:
-		if (Actor_Clue_Query(0, 9) == 1) {
-			Actor_Says(0, 270, 11);
-			Actor_Says(28, 40, 15);
+		if (Actor_Clue_Query(kActorMcCoy, kClueSushiMenu) == 1) {
+			Actor_Says(kActorMcCoy, 270, 11);
+			Actor_Says(kActorHowieLee, 40, 15);
 		} else {
-			Actor_Says(0, 270, 11);
-			Actor_Says(28, 30, 14);
+			Actor_Says(kActorMcCoy, 270, 11);
+			Actor_Says(kActorHowieLee, 30, 14);
 		}
-		Actor_Modify_Friendliness_To_Other(28, 0, 5);
+		Actor_Modify_Friendliness_To_Other(kActorHowieLee, kActorMcCoy, 5);
 		Game_Flag_Set(28);
 		break;
 	case 70:
-		Actor_Says(0, 290, 13);
-		if (Actor_Query_Friendliness_To_Other(28, 0) > 49 && (Global_Variable_Query(2) > 10 || Query_Difficulty_Level() == 0)) {
-			Actor_Says(28, 50, 3);
-			Actor_Says(28, 60, 3);
-			Actor_Face_Actor(28, 0, true);
-			Actor_Says(28, 70, 16);
-			Actor_Says(0, 325, 13);
+		Actor_Says(kActorMcCoy, 290, 13);
+		if (Actor_Query_Friendliness_To_Other(kActorHowieLee, kActorMcCoy) > 49 && (Global_Variable_Query(2) > 10 || Query_Difficulty_Level() == 0)) {
+			Actor_Says(kActorHowieLee, 50, 3);
+			Actor_Says(kActorHowieLee, 60, 3);
+			Actor_Face_Actor(kActorHowieLee, kActorMcCoy, true);
+			Actor_Says(kActorHowieLee, 70, 16);
+			Actor_Says(kActorMcCoy, 325, 13);
 			if (Query_Difficulty_Level() != 0) {
 				Global_Variable_Decrement(2, 10);
 			}
 			Game_Flag_Set(192);
 		} else {
-			Actor_Says(28, 130, 15);
+			Actor_Says(kActorHowieLee, 130, 15);
 		}
 		break;
 	case 80:
-		Actor_Says(0, 295, 11);
-		Actor_Says(28, 90, 14);
-		Actor_Says(28, 100, 13);
-		Actor_Clue_Acquire(0, 25, 1, 28);
-		Actor_Modify_Friendliness_To_Other(28, 0, -3);
+		Actor_Says(kActorMcCoy, 295, 11);
+		Actor_Says(kActorHowieLee, 90, 14);
+		Actor_Says(kActorHowieLee, 100, 13);
+		Actor_Clue_Acquire(kActorMcCoy, kClueHowieLeeInterview, 1, kActorHowieLee);
+		Actor_Modify_Friendliness_To_Other(kActorHowieLee, kActorMcCoy, -3);
 		break;
 	case 90:
-		Actor_Says(0, 300, 13);
-		Actor_Says(28, 110, 16);
+		Actor_Says(kActorMcCoy, 300, 13);
+		Actor_Says(kActorHowieLee, 110, 16);
 		break;
 	case 100:
-		Actor_Says(0, 305, 18);
+		Actor_Says(kActorMcCoy, 305, 18);
 		break;
 	}
 }
diff --git a/engines/bladerunner/script/scene/ct02.cpp b/engines/bladerunner/script/scene/ct02.cpp
index 111ad640d6..95e1a6a832 100644
--- a/engines/bladerunner/script/scene/ct02.cpp
+++ b/engines/bladerunner/script/scene/ct02.cpp
@@ -34,7 +34,7 @@ void SceneScriptCT02::InitializeScene() {
 		Setup_Scene_Information(-119.02f, -145.11f, 240.99f, 768);
 	}
 	Scene_Exit_Add_2D_Exit(0, 590, 0, 639, 479, 1);
-	if (Actor_Clue_Query(0, 18)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueZubenRunsAway)) {
 		Scene_Exit_Add_2D_Exit(1, 332, 163, 404, 297, 0);
 	} else {
 		Overlay_Play("ct02over", 0, 1, 0, 0);
@@ -87,15 +87,15 @@ void SceneScriptCT02::SceneLoaded() {
 	}
 	if (Game_Flag_Query(720)) {
 		Game_Flag_Reset(720);
-		Actor_Change_Animation_Mode(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		Player_Set_Combat_Mode(true);
 		Player_Gains_Control();
 	}
 }
 
 bool SceneScriptCT02::MouseClick(int x, int y) {
-	if (Actor_Query_Goal_Number(19) == 8) {
-		Actor_Set_Goal_Number(0, 1);
+	if (Actor_Query_Goal_Number(kActorZuben) == 8) {
+		Actor_Set_Goal_Number(kActorMcCoy, 1);
 		return true;
 	}
 	return false;
@@ -107,26 +107,26 @@ bool SceneScriptCT02::ClickedOn3DObject(const char *objectName, bool a2) {
 
 void SceneScriptCT02::sub_401ACC() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 13)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueLucy)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(270, 8, 5, 3);
 	}
-	if (Actor_Clue_Query(0, 22) && !Actor_Clue_Query(0, 13)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) && !Actor_Clue_Query(kActorMcCoy, kClueLucy)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(280, 8, 5, 3);
 	}
 	int v0 = 0;
-	if (Actor_Clue_Query(0, 2)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDoorForced2)) {
 		v0 = 1;
 	}
-	if (Actor_Clue_Query(0, 10)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueLabCorpses)) {
 		++v0;
 	}
-	if (Actor_Clue_Query(0, 3)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueLimpingFootprints)) {
 		++v0;
 	}
-	if (Actor_Clue_Query(0, 16)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueCrowdInterviewA)) {
 		++v0;
 	}
-	if (Actor_Clue_Query(0, 25)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueHowieLeeInterview)) {
 		++v0;
 	}
 	if (v0 > 3) {
@@ -138,58 +138,58 @@ void SceneScriptCT02::sub_401ACC() {
 	Dialogue_Menu_Disappear();
 	switch (answerValue) {
 	case 270:
-		Actor_Says(0, 380, 11);
-		Actor_Says(19, 30, 17);
-		Actor_Says(19, 40, 15);
-		Actor_Says(0, 410, 9);
-		Actor_Says(19, 50, 18);
-		Actor_Says(0, 415, 10);
-		Actor_Clue_Acquire(0, 19, 0, -1);
-		Actor_Modify_Friendliness_To_Other(19, 0, -5);
-		if (Actor_Query_Friendliness_To_Other(19, 0) < 44) {
+		Actor_Says(kActorMcCoy, 380, 11);
+		Actor_Says(kActorZuben, 30, 17);
+		Actor_Says(kActorZuben, 40, 15);
+		Actor_Says(kActorMcCoy, 410, 9);
+		Actor_Says(kActorZuben, 50, 18);
+		Actor_Says(kActorMcCoy, 415, 10);
+		Actor_Clue_Acquire(kActorMcCoy, kClueZubenInterview, 0, -1);
+		Actor_Modify_Friendliness_To_Other(kActorZuben, kActorMcCoy, -5);
+		if (Actor_Query_Friendliness_To_Other(kActorZuben, kActorMcCoy) < 44) {
 			Scene_Exits_Disable();
-			Actor_Clue_Acquire(0, 18, 1, -1);
-			Actor_Set_Goal_Number(19, 8);
+			Actor_Clue_Acquire(kActorMcCoy, kClueZubenRunsAway, 1, -1);
+			Actor_Set_Goal_Number(kActorZuben, 8);
 			Game_Flag_Set(293);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
 		}
 		break;
 	case 280:
-		Actor_Says(0, 385, 9);
-		Actor_Says(19, 40, 19);
-		Actor_Modify_Friendliness_To_Other(19, 0, -2);
-		if (Actor_Query_Friendliness_To_Other(19, 0) < 44) {
+		Actor_Says(kActorMcCoy, 385, 9);
+		Actor_Says(kActorZuben, 40, 19);
+		Actor_Modify_Friendliness_To_Other(kActorZuben, kActorMcCoy, -2);
+		if (Actor_Query_Friendliness_To_Other(kActorZuben, kActorMcCoy) < 44) {
 			Scene_Exits_Disable();
-			Actor_Clue_Acquire(0, 18, 1, -1);
-			Actor_Set_Goal_Number(19, 8);
+			Actor_Clue_Acquire(kActorMcCoy, kClueZubenRunsAway, 1, -1);
+			Actor_Set_Goal_Number(kActorZuben, 8);
 			Game_Flag_Set(293);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
 		}
 		break;
 	case 290:
-		Actor_Says(0, 395, 9);
-		Actor_Says(0, 400, 9);
-		Actor_Says(19, 70, 17);
-		Actor_Says(0, 420, 10);
-		Actor_Says(19, 80, 14);
-		Actor_Modify_Friendliness_To_Other(19, 0, -10);
-		if (Actor_Query_Friendliness_To_Other(19, 0) < 44) {
+		Actor_Says(kActorMcCoy, 395, 9);
+		Actor_Says(kActorMcCoy, 400, 9);
+		Actor_Says(kActorZuben, 70, 17);
+		Actor_Says(kActorMcCoy, 420, 10);
+		Actor_Says(kActorZuben, 80, 14);
+		Actor_Modify_Friendliness_To_Other(kActorZuben, kActorMcCoy, -10);
+		if (Actor_Query_Friendliness_To_Other(kActorZuben, kActorMcCoy) < 44) {
 			Scene_Exits_Disable();
-			Actor_Clue_Acquire(0, 18, 1, -1);
-			Actor_Set_Goal_Number(19, 8);
+			Actor_Clue_Acquire(kActorMcCoy, kClueZubenRunsAway, 1, -1);
+			Actor_Set_Goal_Number(kActorZuben, 8);
 			Game_Flag_Set(293);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
 		}
 		break;
 	case 300:
-		Actor_Says(0, 405, 11);
-		if (Actor_Query_Friendliness_To_Other(19, 0) < 44) {
+		Actor_Says(kActorMcCoy, 405, 11);
+		if (Actor_Query_Friendliness_To_Other(kActorZuben, kActorMcCoy) < 44) {
 			Scene_Exits_Disable();
-			Actor_Clue_Acquire(0, 18, 1, -1);
-			Actor_Set_Goal_Number(19, 8);
+			Actor_Clue_Acquire(kActorMcCoy, kClueZubenRunsAway, 1, -1);
+			Actor_Set_Goal_Number(kActorZuben, 8);
 			Game_Flag_Set(293);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
@@ -199,14 +199,14 @@ void SceneScriptCT02::sub_401ACC() {
 }
 
 bool SceneScriptCT02::ClickedOnActor(int actorId) {
-	if (actorId == 19 && Actor_Query_Goal_Number(19) == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -255.02f, -145.11f, 212.42f, 0, 1, false, 0)) {
-			Actor_Face_Actor(0, 19, true);
-			Actor_Face_Actor(19, 0, true);
+	if (actorId == 19 && Actor_Query_Goal_Number(kActorZuben) == 1) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -255.02f, -145.11f, 212.42f, 0, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
+			Actor_Face_Actor(kActorZuben, kActorMcCoy, true);
 			if (!Game_Flag_Query(59)) {
-				Actor_Says(0, 370, 10);
-				Actor_Says(19, 20, 19);
-				Actor_Says(0, 375, 9);
+				Actor_Says(kActorMcCoy, 370, 10);
+				Actor_Says(kActorZuben, 20, 19);
+				Actor_Says(kActorMcCoy, 375, 9);
 				Game_Flag_Set(59);
 			}
 			sub_401ACC();
@@ -222,7 +222,7 @@ bool SceneScriptCT02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -111.2f, -145.11f, 243.28f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -111.2f, -145.11f, 243.28f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(234);
@@ -234,9 +234,9 @@ bool SceneScriptCT02::ClickedOnExit(int exitId) {
 	if (exitId == 1) {
 		bool v1;
 		if (Player_Query_Combat_Mode()) {
-			v1 = Loop_Actor_Walk_To_XYZ(0, -154.83f, -145.11f, -82.61f, 0, 1, true, 0);
+			v1 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, -154.83f, -145.11f, -82.61f, 0, 1, true, 0);
 		} else {
-			v1 = Loop_Actor_Walk_To_XYZ(0, -154.83f, -145.11f, -82.61f, 0, 1, false, 0);
+			v1 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, -154.83f, -145.11f, -82.61f, 0, 1, false, 0);
 		}
 		if (!v1) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
@@ -282,10 +282,9 @@ void SceneScriptCT02::PlayerWalkedIn() {
 }
 
 void SceneScriptCT02::PlayerWalkedOut() {
-	if (Actor_Clue_Query(0, 18)) {
-		return;
+	if (!Actor_Clue_Query(kActorMcCoy, kClueZubenRunsAway)) {
+		Overlay_Remove("ct02over");
 	}
-	Overlay_Remove("ct02over");
 }
 
 void SceneScriptCT02::DialogueQueueFlushed(int a1) {
diff --git a/engines/bladerunner/script/scene/ct03.cpp b/engines/bladerunner/script/scene/ct03.cpp
index 5b18a239b5..df8f45e323 100644
--- a/engines/bladerunner/script/scene/ct03.cpp
+++ b/engines/bladerunner/script/scene/ct03.cpp
@@ -81,23 +81,23 @@ bool SceneScriptCT03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -745.09f, -619.09f, 293.36f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -745.09f, -619.09f, 293.36f, 0, 1, false, 0)) {
 			Game_Flag_Set(71);
 			Set_Enter(4, 13);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -604.38f, -616.15f, 221.6f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -604.38f, -616.15f, 221.6f, 0, 1, false, 0)) {
 			Game_Flag_Set(70);
 			Set_Enter(27, 14);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -150.0f, -621.3f, 357.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -150.0f, -621.3f, 357.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(72);
-			Async_Actor_Walk_To_XYZ(0, -67.0f, -621.3f, 477.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -67.0f, -621.3f, 477.0f, 0, false);
 			Set_Enter(5, 16);
 		}
 		return true;
@@ -116,8 +116,8 @@ void SceneScriptCT03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptCT03::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(19) == 2) {
-		Actor_Set_Goal_Number(19, 13);
+	if (Actor_Query_Goal_Number(kActorZuben) == 2) {
+		Actor_Set_Goal_Number(kActorZuben, 13);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ct04.cpp b/engines/bladerunner/script/scene/ct04.cpp
index a8987bdffa..17faf0a269 100644
--- a/engines/bladerunner/script/scene/ct04.cpp
+++ b/engines/bladerunner/script/scene/ct04.cpp
@@ -57,8 +57,8 @@ void SceneScriptCT04::SceneLoaded() {
 	if (Game_Flag_Query(72)) {
 		Game_Flag_Reset(72);
 	}
-	if (!Actor_Query_Goal_Number(12)) {
-		Actor_Change_Animation_Mode(12, 38);
+	if (!Actor_Query_Goal_Number(kActorTransient)) {
+		Actor_Change_Animation_Mode(kActorTransient, 38);
 	}
 }
 
@@ -68,20 +68,20 @@ bool SceneScriptCT04::MouseClick(int x, int y) {
 
 bool SceneScriptCT04::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (objectName) {
-		if (!Game_Flag_Query(137) && !Game_Flag_Query(169) && !Actor_Query_Goal_Number(12)) {
+		if (!Game_Flag_Query(137) && !Game_Flag_Query(169) && !Actor_Query_Goal_Number(kActorTransient)) {
 			Game_Flag_Set(137);
-			Actor_Set_Goal_Number(12, 2);
+			Actor_Set_Goal_Number(kActorTransient, 2);
 		}
 		if (Game_Flag_Query(169) && !Game_Flag_Query(170) && !Game_Flag_Query(171) && !Game_Flag_Query(172) && Global_Variable_Query(1) == 1) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -147.41f, -621.3f, 724.57f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -147.41f, -621.3f, 724.57f, 0, 1, false, 0)) {
 				Player_Loses_Control();
-				Actor_Face_Heading(0, 792, false);
-				Actor_Put_In_Set(12, 99);
-				Actor_Set_At_XYZ(12, 0, 0, 0, 0);
-				Actor_Change_Animation_Mode(0, 40);
-				Actor_Voice_Over(320, 99);
-				Actor_Voice_Over(330, 99);
-				Actor_Voice_Over(340, 99);
+				Actor_Face_Heading(kActorMcCoy, 792, false);
+				Actor_Put_In_Set(kActorTransient, 99);
+				Actor_Set_At_XYZ(kActorTransient, 0, 0, 0, 0);
+				Actor_Change_Animation_Mode(kActorMcCoy, 40);
+				Actor_Voice_Over(320, kActorVoiceOver);
+				Actor_Voice_Over(330, kActorVoiceOver);
+				Actor_Voice_Over(340, kActorVoiceOver);
 				Game_Flag_Set(170);
 				Game_Flag_Set(173);
 			}
@@ -89,33 +89,33 @@ bool SceneScriptCT04::ClickedOn3DObject(const char *objectName, bool a2) {
 		}
 		if (Game_Flag_Query(170)) {
 			if (Game_Flag_Query(172)) {
-				Actor_Voice_Over(270, 99);
-				Actor_Voice_Over(280, 99);
+				Actor_Voice_Over(270, kActorVoiceOver);
+				Actor_Voice_Over(280, kActorVoiceOver);
 			} else if (Game_Flag_Query(171)) {
-				Actor_Voice_Over(250, 99);
-				Actor_Voice_Over(260, 99);
+				Actor_Voice_Over(250, kActorVoiceOver);
+				Actor_Voice_Over(260, kActorVoiceOver);
 			} else {
-				Actor_Voice_Over(230, 99);
-				Actor_Voice_Over(240, 99);
+				Actor_Voice_Over(230, kActorVoiceOver);
+				Actor_Voice_Over(240, kActorVoiceOver);
 				Game_Flag_Reset(173);
 			}
 			return true;
 		}
 		if (Game_Flag_Query(174)) {
-			if (!Loop_Actor_Walk_To_Waypoint(0, 75, 0, 1, false)) {
-				Actor_Face_Heading(0, 707, false);
-				Actor_Change_Animation_Mode(0, 38);
+			if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 75, 0, 1, false)) {
+				Actor_Face_Heading(kActorMcCoy, 707, false);
+				Actor_Change_Animation_Mode(kActorMcCoy, 38);
 				Ambient_Sounds_Play_Sound(553, 45, 30, 30, 0);
-				Actor_Voice_Over(1810, 99);
-				Actor_Voice_Over(1820, 99);
+				Actor_Voice_Over(1810, kActorVoiceOver);
+				Actor_Voice_Over(1820, kActorVoiceOver);
 				return true;
 			}
 			return false;
 		}
-		if (!Loop_Actor_Walk_To_Waypoint(0, 75, 0, 1, false)) {
-			Actor_Face_Heading(0, 707, false);
-			Actor_Change_Animation_Mode(0, 38);
-			Actor_Clue_Acquire(0, 37, 1, -1);
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 75, 0, 1, false)) {
+			Actor_Face_Heading(kActorMcCoy, 707, false);
+			Actor_Change_Animation_Mode(kActorMcCoy, 38);
+			Actor_Clue_Acquire(kActorMcCoy, kClueLicensePlate, 1, -1);
 			Item_Pickup_Spin_Effect(952, 392, 225);
 			Game_Flag_Set(174);
 			return true;
@@ -134,46 +134,46 @@ void SceneScriptCT04::sub_401D4C() {
 	int answer = Dialogue_Menu_Query_Input();
 	Dialogue_Menu_Disappear();
 	if (answer == 410) {
-		Actor_Says(12, 10, 14);
-		Actor_Says(12, 20, 14);
-		Actor_Modify_Friendliness_To_Other(12, 0, 5);
+		Actor_Says(kActorTransient, 10, 14);
+		Actor_Says(kActorTransient, 20, 14);
+		Actor_Modify_Friendliness_To_Other(kActorTransient, kActorMcCoy, 5);
 		if (Query_Difficulty_Level() != 0) {
 			Global_Variable_Decrement(2, 10);
 		}
 	} else if (answer == 420) {
-		Actor_Says(0, 430, 3);
-		Actor_Says(12, 30, 14);
-		Actor_Modify_Friendliness_To_Other(12, 0, -5);
+		Actor_Says(kActorMcCoy, 430, 3);
+		Actor_Says(kActorTransient, 30, 14);
+		Actor_Modify_Friendliness_To_Other(kActorTransient, kActorMcCoy, -5);
 	}
 }
 
 bool SceneScriptCT04::ClickedOnActor(int actorId) {
 	if (actorId == 12) {
 		if (Game_Flag_Query(169)) {
-			if (!Loop_Actor_Walk_To_Actor(0, 12, 36, 1, false)) {
-				Actor_Voice_Over(290, 99);
-				Actor_Voice_Over(300, 99);
-				Actor_Voice_Over(310, 99);
+			if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorTransient, 36, 1, false)) {
+				Actor_Voice_Over(290, kActorVoiceOver);
+				Actor_Voice_Over(300, kActorVoiceOver);
+				Actor_Voice_Over(310, kActorVoiceOver);
 			}
 		} else {
-			Actor_Set_Targetable(12, false);
-			if (!Loop_Actor_Walk_To_Actor(0, 12, 36, 1, false)) {
-				Actor_Face_Actor(0, 12, true);
+			Actor_Set_Targetable(kActorTransient, false);
+			if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorTransient, 36, 1, false)) {
+				Actor_Face_Actor(kActorMcCoy, kActorTransient, true);
 				if (!Game_Flag_Query(137)) {
 					if (Game_Flag_Query(40)) {
-						Actor_Says(0, 435, 3);
-						Actor_Set_Goal_Number(12, 2);
+						Actor_Says(kActorMcCoy, 435, 3);
+						Actor_Set_Goal_Number(kActorTransient, 2);
 					} else {
 						Music_Stop(3);
-						Actor_Says(0, 425, 3);
-						Actor_Says(12, 0, 13);
+						Actor_Says(kActorMcCoy, 425, 3);
+						Actor_Says(kActorTransient, 0, 13);
 						sub_401D4C();
-						Actor_Set_Goal_Number(12, 2);
+						Actor_Set_Goal_Number(kActorTransient, 2);
 					}
 					Game_Flag_Set(137);
 				} else {
-					Actor_Face_Actor(0, 12, true);
-					Actor_Says(0, 435, 3);
+					Actor_Face_Actor(kActorMcCoy, kActorTransient, true);
+					Actor_Says(kActorMcCoy, 435, 3);
 				}
 			}
 		}
@@ -188,11 +188,11 @@ bool SceneScriptCT04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT04::ClickedOnExit(int exitId) {
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -82.86f, -621.3f, 769.03f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -82.86f, -621.3f, 769.03f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
-			if (!Actor_Query_Goal_Number(12)) {
-				Actor_Set_Goal_Number(12, 2);
+			if (!Actor_Query_Goal_Number(kActorTransient)) {
+				Actor_Set_Goal_Number(kActorTransient, 2);
 			}
 			Game_Flag_Set(74);
 			Set_Enter(28, 17);
@@ -200,7 +200,7 @@ bool SceneScriptCT04::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -187.0f, -621.3f, 437.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -187.0f, -621.3f, 437.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(73);
diff --git a/engines/bladerunner/script/scene/ct05.cpp b/engines/bladerunner/script/scene/ct05.cpp
index 9a0c334585..992a69dfe2 100644
--- a/engines/bladerunner/script/scene/ct05.cpp
+++ b/engines/bladerunner/script/scene/ct05.cpp
@@ -49,7 +49,7 @@ void SceneScriptCT05::InitializeScene() {
 	} else {
 		Scene_Loop_Set_Default(0);
 	}
-	if (Actor_Query_Goal_Number(53) == 1) {
+	if (Actor_Query_Goal_Number(kActorGaff) == 1) {
 		Overlay_Play("ct05over", 0, 1, 0, 0);
 	}
 }
@@ -82,46 +82,46 @@ bool SceneScriptCT05::MouseClick(int x, int y) {
 
 bool SceneScriptCT05::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("STAIR1", objectName)) {
-		Actor_Face_Object(0, objectName, true);
+		Actor_Face_Object(kActorMcCoy, objectName, true);
 		return true;
 	}
 	if (Object_Query_Click("STAIR2", objectName)) {
-		Actor_Face_Object(0, objectName, true);
+		Actor_Face_Object(kActorMcCoy, objectName, true);
 		return true;
 	}
 	if (Object_Query_Click("GRGDOOR", objectName)) {
-		Loop_Actor_Walk_To_Scene_Object(0, "GRGDOOR", 24, 1, false);
-		Actor_Face_Object(0, objectName, true);
-		Actor_Says(0, 8522, 12);
+		Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "GRGDOOR", 24, true, false);
+		Actor_Face_Object(kActorMcCoy, objectName, true);
+		Actor_Says(kActorMcCoy, 8522, 12);
 		return true;
 	}
 	if (Object_Query_Click("GRGDOOR2", objectName)) {
-		Loop_Actor_Walk_To_Scene_Object(0, "GRGDOOR2", 24, 1, false);
-		Actor_Face_Object(0, objectName, true);
-		Actor_Says(0, 8522, 12);
+		Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "GRGDOOR2", 24, true, false);
+		Actor_Face_Object(kActorMcCoy, objectName, true);
+		Actor_Says(kActorMcCoy, 8522, 12);
 		return true;
 	}
 	if (Object_Query_Click("TURBINE", objectName)) {
-		Loop_Actor_Walk_To_Scene_Object(0, "TURBINE", 36, 1, false);
-		Actor_Face_Object(0, objectName, true);
-		Actor_Says(0, 8528, 12);
+		Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "TURBINE", 36, true, false);
+		Actor_Face_Object(kActorMcCoy, objectName, true);
+		Actor_Says(kActorMcCoy, 8528, 12);
 		return true;
 	}
 	if (Object_Query_Click("LFTDOOR", objectName)) {
-		Actor_Face_Object(0, objectName, true);
-		Actor_Says(0, 8522, 12);
+		Actor_Face_Object(kActorMcCoy, objectName, true);
+		Actor_Says(kActorMcCoy, 8522, 12);
 		return true;
 	}
 	if (Object_Query_Click("BARREL", objectName)) {
-		Loop_Actor_Walk_To_Scene_Object(0, "BARREL", 36, 1, false);
-		Actor_Face_Object(0, objectName, true);
-		Actor_Says(0, 8529, 12);
+		Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BARREL", 36, true, false);
+		Actor_Face_Object(kActorMcCoy, objectName, true);
+		Actor_Says(kActorMcCoy, 8529, 12);
 		return true;
 	}
 	if (Object_Query_Click("GRNDPIPE", objectName)) {
-		Loop_Actor_Walk_To_Scene_Object(0, "GRNDPIPE", 24, 1, false);
-		Actor_Face_Object(0, objectName, true);
-		Actor_Says(0, 8528, 12);
+		Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "GRNDPIPE", 24, true, false);
+		Actor_Face_Object(kActorMcCoy, objectName, true);
+		Actor_Says(kActorMcCoy, 8528, 12);
 		return true;
 	}
 	return false;
@@ -137,9 +137,9 @@ bool SceneScriptCT05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -128.42f, -109.91f, 112.83f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -128.42f, -109.91f, 112.83f, 0, 1, false, 0)) {
 			Game_Flag_Set(76);
-			if (Actor_Query_Goal_Number(53) == 1) {
+			if (Actor_Query_Goal_Number(kActorGaff) == 1) {
 				Overlay_Remove("ct05over");
 			}
 			Set_Enter(4, 24);
@@ -147,11 +147,11 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -308.18f, -109.91f, 674.77f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -308.18f, -109.91f, 674.77f, 0, 1, false, 0)) {
 			Game_Flag_Set(75);
-			if (Actor_Query_Goal_Number(53) == 1) {
+			if (Actor_Query_Goal_Number(kActorGaff) == 1) {
 				Overlay_Remove("ct05over");
-				Actor_Set_Goal_Number(53, 5);
+				Actor_Set_Goal_Number(kActorGaff, 5);
 				Game_Flag_Set(409);
 			}
 			Set_Enter(5, 16);
@@ -159,15 +159,15 @@ bool SceneScriptCT05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 71.99f, -109.91f, 288.79f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 71.99f, -109.91f, 288.79f, 0, 1, false, 0)) {
 			Footstep_Sound_Override_On(2);
-			Actor_Face_Object(0, "STAIR 2", true);
-			Loop_Actor_Travel_Stairs(0, 9, 1, 0);
-			Actor_Set_At_XYZ(0, 99.73f, -19.91f, 134.97f, 256);
-			Loop_Actor_Travel_Stairs(0, 5, 1, 0);
+			Actor_Face_Object(kActorMcCoy, "STAIR 2", true);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 1, 0);
+			Actor_Set_At_XYZ(kActorMcCoy, 99.73f, -19.91f, 134.97f, 256);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 5, 1, 0);
 			Footstep_Sound_Override_Off();
 			Game_Flag_Set(77);
-			if (Actor_Query_Goal_Number(53) == 1) {
+			if (Actor_Query_Goal_Number(kActorGaff) == 1) {
 				Overlay_Remove("ct05over");
 			}
 			Set_Enter(29, 18);
@@ -211,21 +211,21 @@ void SceneScriptCT05::PlayerWalkedIn() {
 		Player_Loses_Control();
 		Game_Flag_Reset(74);
 		if (Player_Query_Combat_Mode()) {
-			Loop_Actor_Walk_To_XYZ(0, -308.18f, -109.91f, 674.77f, 0, 0, true, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -308.18f, -109.91f, 674.77f, 0, 0, true, 0);
 		} else {
-			Loop_Actor_Walk_To_XYZ(0, -308.18f, -109.91f, 674.77f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -308.18f, -109.91f, 674.77f, 0, 0, false, 0);
 		}
 		Player_Gains_Control();
 	}
 	if (Game_Flag_Query(78)) {
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Stairs(0, 7, 0, 0);
-		Actor_Set_At_XYZ(0, 90.73f, -19.91f, 164.97f, 520);
-		Loop_Actor_Travel_Stairs(0, 10, 0, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 7, 0, 0);
+		Actor_Set_At_XYZ(kActorMcCoy, 90.73f, -19.91f, 164.97f, 520);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 10, 0, 0);
 		Game_Flag_Reset(78);
 		Footstep_Sound_Override_Off();
-		if (Actor_Query_Goal_Number(2) == 2 && Game_Flag_Query(145)) {
-			Actor_Set_Goal_Number(2, 3);
+		if (Actor_Query_Goal_Number(kActorGordo) == 2 && Game_Flag_Query(145)) {
+			Actor_Set_Goal_Number(kActorGordo, 3);
 		}
 	}
 }
diff --git a/engines/bladerunner/script/scene/ct06.cpp b/engines/bladerunner/script/scene/ct06.cpp
index f334bd0132..e26b65c780 100644
--- a/engines/bladerunner/script/scene/ct06.cpp
+++ b/engines/bladerunner/script/scene/ct06.cpp
@@ -35,10 +35,10 @@ void SceneScriptCT06::InitializeScene() {
 	}
 	Scene_Exit_Add_2D_Exit(0, 0, 440, 639, 479, 2);
 	Scene_Exit_Add_2D_Exit(1, 401, 162, 536, 317, 0);
-	if (Game_Flag_Query(40) && Actor_Query_In_Set(19, 30)) {
-		Actor_Put_In_Set(19, 29);
-		Actor_Set_At_XYZ(19, 58.41f, -58.23f, -24.97f, 240);
-		Actor_Retired_Here(19, 72, 36, 1, 0);
+	if (Game_Flag_Query(40) && Actor_Query_In_Set(kActorZuben, 30)) {
+		Actor_Put_In_Set(kActorZuben, 29);
+		Actor_Set_At_XYZ(kActorZuben, 58.41f, -58.23f, -24.97f, 240);
+		Actor_Retired_Here(kActorZuben, 72, 36, 1, kActorMcCoy);
 	}
 	Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1);
 	Ambient_Sounds_Add_Looping_Sound(205, 20, 1, 1);
@@ -51,7 +51,7 @@ void SceneScriptCT06::InitializeScene() {
 	Ambient_Sounds_Add_Sound(379, 50, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(380, 70, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(377, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0);
-	if (Actor_Query_Goal_Number(19) == 13) {
+	if (Actor_Query_Goal_Number(kActorZuben) == 13) {
 		Ambient_Sounds_Add_Sound(196, 1, 5, 25, 25, -100, 100, -101, -101, 0, 0);
 		Ambient_Sounds_Add_Sound(197, 1, 5, 25, 25, -100, 100, -101, -101, 0, 0);
 		Ambient_Sounds_Add_Sound(198, 1, 5, 25, 25, -100, 100, -101, -101, 0, 0);
@@ -67,7 +67,7 @@ void SceneScriptCT06::SceneLoaded() {
 	Unobstacle_Object("INSULPIP01", true);
 	Unobstacle_Object("CB BOX04", true);
 	Unclickable_Object("DOOR");
-	if (Actor_Query_Goal_Number(19) == 13) {
+	if (Actor_Query_Goal_Number(kActorZuben) == 13) {
 		Preload(3);
 		Preload(4);
 		Preload(389);
@@ -88,22 +88,22 @@ bool SceneScriptCT06::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptCT06::ClickedOnActor(int actorId) {
 	if (actorId == 19) {
-		Loop_Actor_Walk_To_Actor(0, 19, 24, 1, false);
-		Actor_Face_Actor(0, 19, true);
+		Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorZuben, 24, 1, false);
+		Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
 		if (Game_Flag_Query(145)) {
-			Actor_Says(0, 8570, 13);
+			Actor_Says(kActorMcCoy, 8570, 13);
 			return false;
 		}
-		Actor_Clue_Acquire(0, 20, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kClueZuben, 1, -1);
 		Item_Pickup_Spin_Effect(984, 340, 369);
-		Actor_Voice_Over(350, 99);
-		Actor_Voice_Over(360, 99);
-		Actor_Voice_Over(370, 99);
+		Actor_Voice_Over(350, kActorVoiceOver);
+		Actor_Voice_Over(360, kActorVoiceOver);
+		Actor_Voice_Over(370, kActorVoiceOver);
 		if (!Game_Flag_Query(378)) {
-			Actor_Voice_Over(380, 99);
-			Actor_Voice_Over(390, 99);
-			Actor_Voice_Over(400, 99);
-			Actor_Voice_Over(410, 99);
+			Actor_Voice_Over(380, kActorVoiceOver);
+			Actor_Voice_Over(390, kActorVoiceOver);
+			Actor_Voice_Over(400, kActorVoiceOver);
+			Actor_Voice_Over(410, kActorVoiceOver);
 		}
 		Game_Flag_Set(145);
 		return true;
@@ -117,7 +117,7 @@ bool SceneScriptCT06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 20.41f, -58.23f, -2.17f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 20.41f, -58.23f, -2.17f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(78);
@@ -127,22 +127,22 @@ bool SceneScriptCT06::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (Actor_Query_Goal_Number(19) == 13) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 203.91f, -58.02f, 0.47f, 0, 1, false, 0)) {
+		if (Actor_Query_Goal_Number(kActorZuben) == 13) {
+			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);
 				Player_Loses_Control();
-				Actor_Set_Goal_Number(19, 11);
+				Actor_Set_Goal_Number(kActorZuben, 11);
 				Game_Flag_Reset(212);
 			}
 			return true;
 		}
-		if (!Loop_Actor_Walk_To_XYZ(0, 203.91f, -58.02f, 0.47f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 203.91f, -58.02f, 0.47f, 0, 1, false, 0)) {
 			if (Global_Variable_Query(1) < 3) {
-				Actor_Face_Object(0, "DOOR", true);
-				Actor_Says(0, 8522, 12);
+				Actor_Face_Object(kActorMcCoy, "DOOR", true);
+				Actor_Says(kActorMcCoy, 8522, 12);
 			} else {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
diff --git a/engines/bladerunner/script/scene/ct07.cpp b/engines/bladerunner/script/scene/ct07.cpp
index 8ee2412368..42bbcc4942 100644
--- a/engines/bladerunner/script/scene/ct07.cpp
+++ b/engines/bladerunner/script/scene/ct07.cpp
@@ -26,8 +26,8 @@ namespace BladeRunner {
 
 void SceneScriptCT07::InitializeScene() {
 	Setup_Scene_Information(202.32f, -58.23f, -12.86f, 225);
-	Actor_Put_In_Set(19, 30);
-	Actor_Set_At_XYZ(19, -9.68f, -58.23f, 11.14f, 250);
+	Actor_Put_In_Set(kActorZuben, 30);
+	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);
@@ -89,9 +89,9 @@ void SceneScriptCT07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptCT07::PlayerWalkedIn() {
 	Player_Gains_Control();
-	Non_Player_Actor_Combat_Mode_On(19, 0, 0, 0, 2, 4, 7, 8, 0, 0, 100, 15, 300, 0);
+	Non_Player_Actor_Combat_Mode_On(kActorZuben, 0, 0, kActorMcCoy, 2, 4, 7, 8, 0, 0, 100, 15, 300, 0);
 	Game_Flag_Set(516);
-	Actor_Face_Actor(0, 19, true);
+	Actor_Face_Actor(kActorMcCoy, kActorZuben, true);
 }
 
 void SceneScriptCT07::PlayerWalkedOut() {
diff --git a/engines/bladerunner/script/scene/ct08.cpp b/engines/bladerunner/script/scene/ct08.cpp
index 17cd8e5e61..afbe8deea6 100644
--- a/engines/bladerunner/script/scene/ct08.cpp
+++ b/engines/bladerunner/script/scene/ct08.cpp
@@ -39,7 +39,7 @@ void SceneScriptCT08::InitializeScene() {
 		Outtake_Play(6, 0, -1);
 		Game_Flag_Reset(679);
 	}
-	Actor_Force_Stop_Walking(0);
+	Actor_Force_Stop_Walking(kActorMcCoy);
 	if (Game_Flag_Query(380)) {
 		Setup_Scene_Information(-11.0f, 0.0f, -156.0f, 769);
 	} else if (Game_Flag_Query(79)) {
@@ -73,13 +73,13 @@ void SceneScriptCT08::InitializeScene() {
 }
 
 void SceneScriptCT08::SceneLoaded() {
-	Obstacle_Object("ASHTRAY", 1);
-	Unobstacle_Object("BLANKET03", 1);
-	if (!Actor_Clue_Query(0, 85)) {
-		Item_Add_To_World(85, 943, 6, 44.0f, 0.0f, -95.0f, 540, 12, 12, 0, 1, 0, 1);
+	Obstacle_Object("ASHTRAY", true);
+	Unobstacle_Object("BLANKET03", true);
+	if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) {
+		Item_Add_To_World(85, 943, 6, 44.0f, 0.0f, -95.0f, 540, 12, 12, false, true, false, true);
 	}
-	if (!Actor_Clue_Query(0, 87)) {
-		Item_Add_To_World(81, 936, 6, -102.0f, 2.0f, 41.0f, 432, 6, 6, 0, 1, 0, 1);
+	if (!Actor_Clue_Query(kActorMcCoy, kClueCheese)) {
+		Item_Add_To_World(81, 936, 6, -102.0f, 2.0f, 41.0f, 432, 6, 6, false, true, false, true);
 	}
 }
 
@@ -97,13 +97,13 @@ bool SceneScriptCT08::ClickedOnActor(int actorId) {
 
 bool SceneScriptCT08::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 81) {
-		if (!Loop_Actor_Walk_To_Item(0, 81, 36, 1, 0) && !Game_Flag_Query(550)) {
-			Actor_Clue_Acquire(0, 87, 1, -1);
+		if (!Loop_Actor_Walk_To_Item(kActorMcCoy, 81, 36, 1, false) && !Game_Flag_Query(550)) {
+			Actor_Clue_Acquire(kActorMcCoy, kClueCheese, 1, -1);
 			Item_Pickup_Spin_Effect(936, 266, 328);
 			Item_Remove_From_World(81);
-			Actor_Voice_Over(480, 99);
-			Actor_Voice_Over(490, 99);
-			Actor_Voice_Over(500, 99);
+			Actor_Voice_Over(480, kActorVoiceOver);
+			Actor_Voice_Over(490, kActorVoiceOver);
+			Actor_Voice_Over(500, kActorVoiceOver);
 		}
 		return true;
 	}
@@ -112,7 +112,7 @@ bool SceneScriptCT08::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT08::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -183.0f, 0.0f, 128.0f, 0, 1, 0, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -183.0f, 0.0f, 128.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(81);
@@ -121,8 +121,8 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -11.0f, 0.0f, -156.0f, 0, 1, 0, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 0.0f, 0.0f, -102.0f, 0, 0, 0, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -11.0f, 0.0f, -156.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, 0.0f, -102.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(379);
@@ -131,7 +131,7 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -143.0f, 0.0f, -92.0f, 0, 1, 0, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -143.0f, 0.0f, -92.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(80);
@@ -144,10 +144,10 @@ bool SceneScriptCT08::ClickedOnExit(int exitId) {
 
 bool SceneScriptCT08::ClickedOn2DRegion(int region) {
 	if (region == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -108.0f, 0.0f, -178.0f, 0, 1, 0, 0)) {
-			Actor_Face_Heading(0, 512, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -108.0f, 0.0f, -178.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 512, false);
 			Game_Flag_Reset(550);
-			Player_Set_Combat_Mode_Access(1);
+			Player_Set_Combat_Mode_Access(true);
 			Scene_Exits_Enable();
 			Ambient_Sounds_Play_Sound(564, 40, 99, 0, 0);
 			Scene_2D_Region_Remove(0);
@@ -166,10 +166,10 @@ void SceneScriptCT08::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptCT08::PlayerWalkedIn() {
 	if (Game_Flag_Query(550)) {
-		Actor_Change_Animation_Mode(0, 3);
-		Actor_Change_Animation_Mode(0, 0);
-		Actor_Set_At_XYZ(0, -148.0f, 0.0f, 4.0f, 256);
-		Player_Set_Combat_Mode_Access(0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 3);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
+		Actor_Set_At_XYZ(kActorMcCoy, -148.0f, 0.0f, 4.0f, 256);
+		Player_Set_Combat_Mode_Access(false);
 		Scene_Exits_Disable();
 		Game_Flag_Reset(380);
 		Game_Flag_Reset(79);
@@ -179,13 +179,13 @@ void SceneScriptCT08::PlayerWalkedIn() {
 	} else if (Game_Flag_Query(79)) {
 		Game_Flag_Reset(79);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, -156.0f, 0.0f, 128.0f, 0, 0, 0, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -156.0f, 0.0f, 128.0f, 0, 0, false, 0);
 		Game_Flag_Reset(84);
 	}
 }
 
 void SceneScriptCT08::PlayerWalkedOut() {
-	if (!Actor_Clue_Query(0, 85)) {
+	if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) {
 		Item_Remove_From_World(85);
 	}
 }
diff --git a/engines/bladerunner/script/scene/ct09.cpp b/engines/bladerunner/script/scene/ct09.cpp
index 0d70b5f13f..5320afc337 100644
--- a/engines/bladerunner/script/scene/ct09.cpp
+++ b/engines/bladerunner/script/scene/ct09.cpp
@@ -54,12 +54,12 @@ bool SceneScriptCT09::MouseClick(int x, int y) {
 
 bool SceneScriptCT09::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BELL", objectName)) {
-		if (Actor_Query_Which_Set_In(62) != 31) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 229.0f, 348.52f, 851.0f, 36, 1, false, 0)) {
-				Actor_Face_Object(0, "BELL", true);
+		if (Actor_Query_Which_Set_In(kActorLeon) != 31) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 229.0f, 348.52f, 851.0f, 36, 1, false, 0)) {
+				Actor_Face_Object(kActorMcCoy, "BELL", true);
 				Sound_Play(337, 100, 0, 0, 50);
-				if (!Actor_Query_Goal_Number(27)) {
-					Actor_Says(27, 160, 3);
+				if (!Actor_Query_Goal_Number(kActorDeskClerk)) {
+					Actor_Says(kActorDeskClerk, 160, 3);
 				}
 			}
 		}
@@ -70,28 +70,28 @@ bool SceneScriptCT09::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptCT09::ClickedOnActor(int actorId) {
 	if (actorId == 27) {
-		if (!Actor_Query_Goal_Number(27) && Actor_Query_Which_Set_In(62) != 31) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 270.0f, 348.52f, 846.0f, 12, 1, false, 0)) {
+		if (!Actor_Query_Goal_Number(kActorDeskClerk) && Actor_Query_Which_Set_In(kActorLeon) != 31) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 270.0f, 348.52f, 846.0f, 12, 1, false, 0)) {
 				Player_Loses_Control();
-				Actor_Face_Actor(0, 27, true);
+				Actor_Face_Actor(kActorMcCoy, kActorDeskClerk, true);
 				if (Global_Variable_Query(1) < 3) {
-					Actor_Says(0, 650, 3);
-					Actor_Says(27, 250, 12);
-					Actor_Says(0, 665, 18);
+					Actor_Says(kActorMcCoy, 650, 3);
+					Actor_Says(kActorDeskClerk, 250, 12);
+					Actor_Says(kActorMcCoy, 665, 18);
 				} else if (Game_Flag_Query(540)) {
-					Actor_Says(0, 650, 18);
-					Actor_Says(27, 220, 15);
+					Actor_Says(kActorMcCoy, 650, 18);
+					Actor_Says(kActorDeskClerk, 220, 15);
 				} else {
 					Game_Flag_Set(540);
-					Actor_Says(27, 170, 13);
-					Actor_Says(0, 630, 12);
-					Actor_Says(27, 180, 14);
-					Actor_Says(0, 635, 3);
-					Actor_Says(27, 190, 15);
-					Actor_Says(0, 640, 12);
-					Actor_Says(0, 645, 3);
-					Actor_Says(27, 200, 13);
-					Actor_Says(27, 210, 14);
+					Actor_Says(kActorDeskClerk, 170, 13);
+					Actor_Says(kActorMcCoy, 630, 12);
+					Actor_Says(kActorDeskClerk, 180, 14);
+					Actor_Says(kActorMcCoy, 635, 3);
+					Actor_Says(kActorDeskClerk, 190, 15);
+					Actor_Says(kActorMcCoy, 640, 12);
+					Actor_Says(kActorMcCoy, 645, 3);
+					Actor_Says(kActorDeskClerk, 200, 13);
+					Actor_Says(kActorDeskClerk, 210, 14);
 				}
 				Player_Gains_Control();
 			}
@@ -107,8 +107,8 @@ bool SceneScriptCT09::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT09::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 206.0f, 348.52f, 599.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 235.0f, 348.52f, 599.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 206.0f, 348.52f, 599.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 235.0f, 348.52f, 599.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(84);
@@ -117,7 +117,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 107.0f, 348.52f, 927.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 107.0f, 348.52f, 927.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(83);
@@ -126,7 +126,7 @@ bool SceneScriptCT09::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 159.0f, 349.0f, 570.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 159.0f, 349.0f, 570.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(82);
@@ -154,46 +154,46 @@ void SceneScriptCT09::PlayerWalkedIn() {
 	bool v0 = false;
 	if (Global_Variable_Query(1) == 3 && !Game_Flag_Query(538)) {
 		Game_Flag_Set(538);
-		Actor_Set_Goal_Number(62, 1);
+		Actor_Set_Goal_Number(kActorLeon, 1);
 		v0 = true;
 	}
 	if (Game_Flag_Query(85)) {
 		Game_Flag_Reset(85);
 	} else if (Game_Flag_Query(81)) {
 		if (v0) {
-			Async_Actor_Walk_To_XYZ(0, 206.0f, 348.52f, 599.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, 206.0f, 348.52f, 599.0f, 0, false);
 		} else {
-			Loop_Actor_Walk_To_XYZ(0, 206.0f, 348.52f, 599.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 206.0f, 348.52f, 599.0f, 0, 0, false, 0);
 		}
 		Game_Flag_Reset(81);
 	} else {
 		if (v0) {
-			Async_Actor_Walk_To_XYZ(0, 124.0f, 348.52f, 886.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 348.52f, 886.0f, 0, false);
 		} else {
-			Loop_Actor_Walk_To_XYZ(0, 124.0f, 348.52f, 886.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 348.52f, 886.0f, 0, 0, false, 0);
 		}
 		Game_Flag_Reset(304);
 	}
-	if (Actor_Query_Goal_Number(27) == 2) {
+	if (Actor_Query_Goal_Number(kActorDeskClerk) == 2) {
 		if (Game_Flag_Query(539)) {
-			Actor_Says(27, 70, 13);
-			Actor_Face_Actor(0, 27, true);
-			Actor_Says(0, 600, 17);
-			Actor_Says(27, 80, 14);
-			Actor_Says(0, 605, 13);
-			Actor_Says(27, 90, 15);
+			Actor_Says(kActorDeskClerk, 70, 13);
+			Actor_Face_Actor(kActorMcCoy, kActorDeskClerk, true);
+			Actor_Says(kActorMcCoy, 600, 17);
+			Actor_Says(kActorDeskClerk, 80, 14);
+			Actor_Says(kActorMcCoy, 605, 13);
+			Actor_Says(kActorDeskClerk, 90, 15);
 		} else {
-			Actor_Says(27, 20, 12);
-			Actor_Face_Actor(0, 27, true);
-			Actor_Says(0, 585, 18);
-			Actor_Says(27, 40, 15);
-			Actor_Says(0, 590, 16);
-			Actor_Says(27, 50, 14);
-			Actor_Says(0, 595, 14);
-			Actor_Says(27, 60, 13);
-			Actor_Modify_Friendliness_To_Other(27, 0, -1);
+			Actor_Says(kActorDeskClerk, 20, 12);
+			Actor_Face_Actor(kActorMcCoy, kActorDeskClerk, true);
+			Actor_Says(kActorMcCoy, 585, 18);
+			Actor_Says(kActorDeskClerk, 40, 15);
+			Actor_Says(kActorMcCoy, 590, 16);
+			Actor_Says(kActorDeskClerk, 50, 14);
+			Actor_Says(kActorMcCoy, 595, 14);
+			Actor_Says(kActorDeskClerk, 60, 13);
+			Actor_Modify_Friendliness_To_Other(kActorDeskClerk, kActorMcCoy, -1);
 		}
-		Actor_Set_Goal_Number(27, 0);
+		Actor_Set_Goal_Number(kActorDeskClerk, 0);
 	}
 }
 
@@ -201,10 +201,10 @@ void SceneScriptCT09::PlayerWalkedOut() {
 }
 
 void SceneScriptCT09::DialogueQueueFlushed(int a1) {
-	Actor_Force_Stop_Walking(0);
-	if (Actor_Query_Goal_Number(62) == 1 && !Game_Flag_Query(539)) {
+	Actor_Force_Stop_Walking(kActorMcCoy);
+	if (Actor_Query_Goal_Number(kActorLeon) == 1 && !Game_Flag_Query(539)) {
 		Player_Loses_Control();
-		Actor_Set_Goal_Number(62, 2);
+		Actor_Set_Goal_Number(kActorLeon, 2);
 		//return true;
 	} else {
 		//return false;
diff --git a/engines/bladerunner/script/scene/ct10.cpp b/engines/bladerunner/script/scene/ct10.cpp
index 406ea6d098..032f3fb763 100644
--- a/engines/bladerunner/script/scene/ct10.cpp
+++ b/engines/bladerunner/script/scene/ct10.cpp
@@ -63,16 +63,16 @@ bool SceneScriptCT10::MouseClick(int x, int y) {
 }
 
 void SceneScriptCT10::sub_401844() {
-	if (!Loop_Actor_Walk_To_XYZ(0, 10.6f, 0.0f, -50.5f, 0, 1, false, 0)) {
+	if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 10.6f, 0.0f, -50.5f, 0, 1, false, 0)) {
 		Player_Loses_Control();
-		Actor_Face_Heading(0, 0, false);
+		Actor_Face_Heading(kActorMcCoy, 0, false);
 		Sound_Play(339, 100, 0, 0, 50);
 		Delay(1000);
-		if (Actor_Clue_Query(0, 110)) {
-			Actor_Voice_Over(3700, 99);
+		if (Actor_Clue_Query(kActorMcCoy, kClueHoldensBadge)) {
+			Actor_Voice_Over(3700, kActorVoiceOver);
 		} else {
 			Item_Pickup_Spin_Effect(931, 435, 258);
-			Actor_Clue_Acquire(0, 110, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueHoldensBadge, 1, -1);
 		}
 		Player_Gains_Control();
 	}
@@ -80,21 +80,21 @@ void SceneScriptCT10::sub_401844() {
 
 bool SceneScriptCT10::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("TUB", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -41.0f, 0.0f, -106.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -41.0f, 0.0f, -106.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
-			Actor_Face_Heading(0, 850, false);
-			Actor_Change_Animation_Mode(0, 38);
+			Actor_Face_Heading(kActorMcCoy, 850, false);
+			Actor_Change_Animation_Mode(kActorMcCoy, 38);
 			Delay(1000);
 			Sound_Play(338, 33, 0, 0, 50);
 			Delay(3000);
-			if (Actor_Clue_Query(0, 93)) {
-				Actor_Voice_Over(3700, 99);
+			if (Actor_Clue_Query(kActorMcCoy, kClueStrangeScale1)) {
+				Actor_Voice_Over(3700, kActorVoiceOver);
 			} else {
-				Actor_Clue_Acquire(0, 93, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kClueStrangeScale1, 1, -1);
 				Item_Pickup_Spin_Effect(969, 364, 214);
 			}
 			Delay(1000);
-			Loop_Actor_Walk_To_XYZ(0, -41.0f, 0.0f, -82.0f, 0, 0, false, 1);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -41.0f, 0.0f, -82.0f, 0, 0, false, 1);
 			Player_Gains_Control();
 		}
 		return true;
@@ -116,8 +116,8 @@ bool SceneScriptCT10::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT10::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -93.0f, 0.0f, -38.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -121.0f, 0.0f, -78.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -93.0f, 0.0f, -38.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -121.0f, 0.0f, -78.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(85);
@@ -141,12 +141,12 @@ void SceneScriptCT10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptCT10::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_XYZ(0, -93.0f, 0.0f, -38.0f, 0, 0, false, 0);
-	Loop_Actor_Walk_To_XYZ(0, -49.0f, 0.0f, -38.0f, 0, 0, false, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -93.0f, 0.0f, -38.0f, 0, 0, false, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -49.0f, 0.0f, -38.0f, 0, 0, false, 0);
 	if (!Game_Flag_Query(525)) {
-		Actor_Voice_Over(450, 99);
-		Actor_Voice_Over(460, 99);
-		Actor_Voice_Over(470, 99);
+		Actor_Voice_Over(450, kActorVoiceOver);
+		Actor_Voice_Over(460, kActorVoiceOver);
+		Actor_Voice_Over(470, kActorVoiceOver);
 		Game_Flag_Set(525);
 	}
 }
diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp
index ee0019fb42..1aad413d60 100644
--- a/engines/bladerunner/script/scene/ct11.cpp
+++ b/engines/bladerunner/script/scene/ct11.cpp
@@ -58,7 +58,7 @@ void SceneScriptCT11::SceneLoaded() {
 			Scene_2D_Region_Add(0, 505, 316, 513, 321);
 			Game_Flag_Set(725);
 		}
-		if (!Actor_Clue_Query(0, 111)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueCar)) {
 			Scene_2D_Region_Add(1, 412, 258, 552, 358);
 		}
 	} else {
@@ -99,22 +99,22 @@ bool SceneScriptCT11::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT11::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 121.0f, 9.6800003f, -42.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 121.0f, 9.6800003f, -42.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(304);
 			Set_Enter(31, 21);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -300.0f, 9.6800003f, 66.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -400.0f, 9.6800003f, -70.0f, 0, 1, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -300.0f, 9.6800003f, 66.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -400.0f, 9.6800003f, -70.0f, 0, 1, false, 0);
 			Game_Flag_Set(86);
 			Set_Enter(4, 24);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 290.0f, 0.0f, 635.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 290.0f, 0.0f, 635.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(531);
 			Game_Flag_Reset(176);
 			Game_Flag_Set(177);
@@ -127,50 +127,50 @@ bool SceneScriptCT11::ClickedOnExit(int exitId) {
 
 bool SceneScriptCT11::ClickedOn2DRegion(int region) {
 	if (region == 0 && Game_Flag_Query(725)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 686.0f, 0.0f, 658.0f, 12, 1, false, 0)) {
-			Actor_Face_Heading(0, 47, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 686.0f, 0.0f, 658.0f, 12, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 47, false);
 			Item_Remove_From_World(115);
-			Actor_Clue_Acquire(0, 118, 0, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueLichenDogWrapper, 0, -1);
 			Item_Pickup_Spin_Effect(951, 510, 319);
 			Game_Flag_Reset(725);
 			Game_Flag_Set(645);
-			Actor_Voice_Over(550, 99);
-			Actor_Voice_Over(560, 99);
-			Actor_Voice_Over(570, 99);
-			Actor_Voice_Over(580, 99);
+			Actor_Voice_Over(550, kActorVoiceOver);
+			Actor_Voice_Over(560, kActorVoiceOver);
+			Actor_Voice_Over(570, kActorVoiceOver);
+			Actor_Voice_Over(580, kActorVoiceOver);
 		}
 		return true;
 	}
 	if (region == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 686.0f, 0.0f, 658.0f, 12, 1, false, 0)) {
-			Actor_Face_Heading(0, 47, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 686.0f, 0.0f, 658.0f, 12, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 47, false);
 			int temp = 0;
-			if (Actor_Clue_Query(0, 17)) {
+			if (Actor_Clue_Query(kActorMcCoy, kClueCrowdInterviewB)) {
 				temp = 1;
 			}
-			if (Actor_Clue_Query(0, 26)) {
+			if (Actor_Clue_Query(kActorMcCoy, kCluePaintTransfer)) {
 				++temp;
 			}
-			if (Actor_Clue_Query(0, 39)) {
+			if (Actor_Clue_Query(kActorMcCoy, kClueLabPaintTransfer)) {
 				++temp;
 			}
-			if (Actor_Clue_Query(0, 37)) {
+			if (Actor_Clue_Query(kActorMcCoy, kClueLicensePlate)) {
 				temp += 2;
 			}
-			if (Actor_Clue_Query(0, 30)) {
+			if (Actor_Clue_Query(kActorMcCoy, kClueCarColorAndMake)) {
 				temp += 2;
 			}
-			if (Actor_Clue_Query(0, 31)) {
+			if (Actor_Clue_Query(kActorMcCoy, kCluePartialLicenseNumber)) {
 				temp += 2;
 			}
-			if (temp <= 2 || Actor_Clue_Query(0, 111)) {
-				Actor_Says(0, 8525, 12);
+			if (temp <= 2 || Actor_Clue_Query(kActorMcCoy, kClueCar)) {
+				Actor_Says(kActorMcCoy, 8525, 12);
 			} else {
-				Actor_Voice_Over(510, 99);
-				Actor_Voice_Over(520, 99);
-				Actor_Voice_Over(530, 99);
-				Actor_Voice_Over(540, 99);
-				Actor_Clue_Acquire(0, 111, 0, -1);
+				Actor_Voice_Over(510, kActorVoiceOver);
+				Actor_Voice_Over(520, kActorVoiceOver);
+				Actor_Voice_Over(530, kActorVoiceOver);
+				Actor_Voice_Over(540, kActorVoiceOver);
+				Actor_Clue_Acquire(kActorMcCoy, kClueCar, 0, -1);
 				Scene_2D_Region_Remove(1);
 			}
 		}
@@ -187,16 +187,16 @@ void SceneScriptCT11::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptCT11::PlayerWalkedIn() {
 	if (Game_Flag_Query(91)) {
-		Loop_Actor_Walk_To_XYZ(0, -358.0f, 9.68f, 32.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -358.0f, 9.68f, 32.0f, 0, 0, false, 0);
 		Game_Flag_Reset(91);
 	} else if (Game_Flag_Query(558)) {
-		Loop_Actor_Walk_To_XYZ(0, 329.0f, 0.0f, 617.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 329.0f, 0.0f, 617.0f, 0, 0, false, 0);
 		Game_Flag_Reset(558);
 	} else {
 		Player_Loses_Control();
-		Actor_Set_Immunity_To_Obstacles(0, true);
-		Loop_Actor_Walk_To_XYZ(0, 125.0f, 9.68f, 74.0f, 0, 0, false, 0);
-		Actor_Set_Immunity_To_Obstacles(0, false);
+		Actor_Set_Immunity_To_Obstacles(kActorMcCoy, true);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 125.0f, 9.68f, 74.0f, 0, 0, false, 0);
+		Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false);
 		Player_Gains_Control();
 		Game_Flag_Reset(83);
 	}
diff --git a/engines/bladerunner/script/scene/ct12.cpp b/engines/bladerunner/script/scene/ct12.cpp
index a5f5c35dde..41ebdec25e 100644
--- a/engines/bladerunner/script/scene/ct12.cpp
+++ b/engines/bladerunner/script/scene/ct12.cpp
@@ -59,9 +59,9 @@ void SceneScriptCT12::InitializeScene() {
 	Ambient_Sounds_Add_Sound(375, 60, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(376, 50, 180, 50, 100, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(377, 50, 180, 50, 100, 0, 0, -101, -101, 0, 0);
-	if (Global_Variable_Query(1) < 2 && Actor_Query_Goal_Number(53) == 1) {
-		Actor_Put_In_Set(53, 4);
-		Actor_Set_At_XYZ(53, -534.0f, -6.5f, 952.0f, 367);
+	if (Global_Variable_Query(1) < 2 && Actor_Query_Goal_Number(kActorGaff) == 1) {
+		Actor_Put_In_Set(kActorGaff, 4);
+		Actor_Set_At_XYZ(kActorGaff, -534.0f, -6.5f, 952.0f, 367);
 		Game_Flag_Set(294);
 	}
 	if (Game_Flag_Query(123) && Game_Flag_Query(248)) {
@@ -105,29 +105,29 @@ bool SceneScriptCT12::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptCT12::ClickedOnActor(int actorId) {
 	if (actorId == 28) {
-		Actor_Face_Actor(0, 28, true);
-		Actor_Says(0, 8910, 16);
+		Actor_Face_Actor(kActorMcCoy, kActorHowieLee, true);
+		Actor_Says(kActorMcCoy, 8910, 16);
 	}
 	if (actorId == 24 && Global_Variable_Query(1) == 4 && Game_Flag_Query(671) && Game_Flag_Query(703)) {
-		Actor_Face_Actor(24, 0, true);
-		Actor_Face_Actor(0, 24, true);
-		Actor_Says(0, 710, 3);
-		Actor_Says(24, 20, 3);
-		Actor_Says(0, 715, 3);
-		Actor_Says(24, 30, 3);
-		Actor_Says(0, 720, 3);
-		Actor_Says(24, 40, 3);
-		Actor_Says(24, 50, 3);
-		Actor_Says(24, 60, 3);
-		Actor_Says(0, 725, 3);
-		Actor_Says(24, 70, 3);
-		Actor_Says(24, 80, 3);
-		Actor_Says(24, 90, 3);
-		Actor_Says(24, 100, 3);
-		Actor_Says(24, 110, 3);
+		Actor_Face_Actor(kActorOfficerGrayford, kActorMcCoy, true);
+		Actor_Face_Actor(kActorMcCoy, kActorOfficerGrayford, true);
+		Actor_Says(kActorMcCoy, 710, 3);
+		Actor_Says(kActorOfficerGrayford, 20, 3);
+		Actor_Says(kActorMcCoy, 715, 3);
+		Actor_Says(kActorOfficerGrayford, 30, 3);
+		Actor_Says(kActorMcCoy, 720, 3);
+		Actor_Says(kActorOfficerGrayford, 40, 3);
+		Actor_Says(kActorOfficerGrayford, 50, 3);
+		Actor_Says(kActorOfficerGrayford, 60, 3);
+		Actor_Says(kActorMcCoy, 725, 3);
+		Actor_Says(kActorOfficerGrayford, 70, 3);
+		Actor_Says(kActorOfficerGrayford, 80, 3);
+		Actor_Says(kActorOfficerGrayford, 90, 3);
+		Actor_Says(kActorOfficerGrayford, 100, 3);
+		Actor_Says(kActorOfficerGrayford, 110, 3);
 		Game_Flag_Set(629);
 		Game_Flag_Set(666);
-		Actor_Set_Goal_Number(0, 400);
+		Actor_Set_Goal_Number(kActorMcCoy, 400);
 	}
 	return false;
 }
@@ -138,7 +138,7 @@ bool SceneScriptCT12::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT12::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -419.14999f, -6.5f, 696.94f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -419.14999f, -6.5f, 696.94f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Game_Flag_Set(88);
 			Set_Enter(4, 13);
@@ -146,7 +146,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -182.69f, -6.5f, 696.94f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -182.69f, -6.5f, 696.94f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(89);
@@ -155,7 +155,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -386.13f, -6.5f, 1132.72f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -386.13f, -6.5f, 1132.72f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(90);
@@ -164,7 +164,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -493.0f, -6.5f, 1174.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -493.0f, -6.5f, 1174.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(91);
@@ -173,7 +173,7 @@ bool SceneScriptCT12::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 4) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -292.0f, -6.5f, 990.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -292.0f, -6.5f, 990.0f, 0, 1, false, 0)) {
 			if (Global_Variable_Query(1) == 4) {
 				Game_Flag_Set(629);
 			}
@@ -208,7 +208,7 @@ void SceneScriptCT12::SceneFrameAdvanced(int frame) {
 		Sound_Play(/*v1*/Random_Query(59, 60), 10, -80, -80, 50);
 	}
 	if (frame == 160) {
-		Actor_Change_Animation_Mode(53, 41);
+		Actor_Change_Animation_Mode(kActorGaff, 41);
 	}
 	if (frame == 152) {
 		Sound_Play(116, 100, 40, 0, 50);
@@ -222,7 +222,7 @@ void SceneScriptCT12::SceneFrameAdvanced(int frame) {
 	if (frame == 269) {
 		Player_Gains_Control();
 		Player_Set_Combat_Mode(false);
-		Actor_Set_Invisible(53, false);
+		Actor_Set_Invisible(kActorGaff, false);
 	}
 }
 
@@ -230,42 +230,42 @@ void SceneScriptCT12::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptCT12::PlayerWalkedIn() {
-	if (Global_Variable_Query(1) < 2 && !Game_Flag_Query(64) && Actor_Query_Goal_Number(53) == 1) {
+	if (Global_Variable_Query(1) < 2 && !Game_Flag_Query(64) && Actor_Query_Goal_Number(kActorGaff) == 1) {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_Actor(53, 0, 48, 0, false);
-		Actor_Face_Actor(53, 0, true);
-		Actor_Face_Actor(0, 53, true);
-		Actor_Says(53, 0, 3);
-		Actor_Says(0, 670, 3);
-		Actor_Says(53, 10, 3);
-		Actor_Says(0, 675, 3);
-		Actor_Says(53, 20, 3);
-		Actor_Says(0, 680, 3);
-		Actor_Says(53, 30, 3);
-		Actor_Says(0, 685, 3);
-		Actor_Says(53, 40, 3);
-		Actor_Says(0, 690, 3);
-		Actor_Clue_Acquire(0, 33, 1, 53);
+		Loop_Actor_Walk_To_Actor(kActorGaff, kActorMcCoy, 48, 0, false);
+		Actor_Face_Actor(kActorGaff, kActorMcCoy, true);
+		Actor_Face_Actor(kActorMcCoy, kActorGaff, true);
+		Actor_Says(kActorGaff, 0, 3);
+		Actor_Says(kActorMcCoy, 670, 3);
+		Actor_Says(kActorGaff, 10, 3);
+		Actor_Says(kActorMcCoy, 675, 3);
+		Actor_Says(kActorGaff, 20, 3);
+		Actor_Says(kActorMcCoy, 680, 3);
+		Actor_Says(kActorGaff, 30, 3);
+		Actor_Says(kActorMcCoy, 685, 3);
+		Actor_Says(kActorGaff, 40, 3);
+		Actor_Says(kActorMcCoy, 690, 3);
+		Actor_Clue_Acquire(kActorMcCoy, kClueGaffsInformation, 1, kActorGaff);
 		Game_Flag_Set(64);
-		CDB_Set_Crime(20, 8);
+		CDB_Set_Crime(kClueZuben, kCrimeMoonbusHijacking);
 		if (Game_Flag_Query(64) && Game_Flag_Query(40)) {
-			Actor_Says(53, 50, 3);
-			Actor_Says(0, 695, 3);
-			Actor_Says(53, 60, 3);
-			Actor_Says(0, 700, 3);
-			Actor_Says(53, 70, 3);
-			Actor_Clue_Acquire(53, 222, 1, -1);
+			Actor_Says(kActorGaff, 50, 3);
+			Actor_Says(kActorMcCoy, 695, 3);
+			Actor_Says(kActorGaff, 60, 3);
+			Actor_Says(kActorMcCoy, 700, 3);
+			Actor_Says(kActorGaff, 70, 3);
+			Actor_Clue_Acquire(kActorGaff, kClueMcCoyRetiredZuben, 1, -1);
 		} else if (Game_Flag_Query(64) && Game_Flag_Query(41)) {
-			Actor_Says(53, 80, 3);
-			Actor_Says(53, 90, 3);
-			Actor_Says(0, 705, 3);
-			Actor_Says(53, 100, 3);
-			Actor_Clue_Acquire(53, 215, 1, -1);
+			Actor_Says(kActorGaff, 80, 3);
+			Actor_Says(kActorGaff, 90, 3);
+			Actor_Says(kActorMcCoy, 705, 3);
+			Actor_Says(kActorGaff, 100, 3);
+			Actor_Clue_Acquire(kActorGaff, kClueMcCoyLetZubenEscape, 1, -1);
 		}
-		Actor_Set_Goal_Number(53, 2);
+		Actor_Set_Goal_Number(kActorGaff, 2);
 	}
 	if (Game_Flag_Query(86)) {
-		Loop_Actor_Walk_To_XYZ(0, -520.0f, -6.5f, 1103.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -520.0f, -6.5f, 1103.0f, 0, 0, false, 0);
 		Game_Flag_Reset(86);
 	}
 }
diff --git a/engines/bladerunner/script/scene/ct51.cpp b/engines/bladerunner/script/scene/ct51.cpp
index 8fb866c554..b25a8fd790 100644
--- a/engines/bladerunner/script/scene/ct51.cpp
+++ b/engines/bladerunner/script/scene/ct51.cpp
@@ -41,10 +41,10 @@ void SceneScriptCT51::InitializeScene() {
 void SceneScriptCT51::SceneLoaded() {
 	Unobstacle_Object("BLANKET03", true);
 	Clickable_Object("BED02");
-	if (!Actor_Clue_Query(0, 85)) {
+	if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) {
 		Item_Add_To_World(85, 943, 6, 44.0f, 0.0f, -95.0f, 540, 24, 24, false, true, false, true);
 	}
-	if (!Actor_Clue_Query(0, 86)) {
+	if (!Actor_Clue_Query(kActorMcCoy, kClueMoonbus1)) {
 		Item_Add_To_World(120, 984, 6, 44.0f, 0.0f, -22.0f, 0, 12, 12, false, true, false, true);
 	}
 }
@@ -55,13 +55,13 @@ bool SceneScriptCT51::MouseClick(int x, int y) {
 
 bool SceneScriptCT51::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BED02", objectName)) {
-		if (Actor_Clue_Query(0, 84)) {
-			Actor_Says(0, 8580, 12);
+		if (Actor_Clue_Query(kActorMcCoy, kClueHysteriaToken)) {
+			Actor_Says(kActorMcCoy, 8580, 12);
 			return false;
 		}
 		Item_Pickup_Spin_Effect(970, 203, 200);
-		Actor_Clue_Acquire(0, 84, 1, -1);
-		Actor_Voice_Over(420, 99);
+		Actor_Clue_Acquire(kActorMcCoy, kClueHysteriaToken, 1, -1);
+		Actor_Voice_Over(420, kActorVoiceOver);
 		return true;
 	}
 	return false;
@@ -73,17 +73,17 @@ bool SceneScriptCT51::ClickedOnActor(int actorId) {
 
 bool SceneScriptCT51::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 85) {
-		Actor_Clue_Acquire(0, 85, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kClueRagDoll, 1, -1);
 		Item_Pickup_Spin_Effect(943, 260, 200);
 		Ambient_Sounds_Play_Sound(563, 40, 99, 0, 0);
 		Item_Remove_From_World(85);
 		return true;
 	}
 	if (itemId == 120) {
-		Actor_Clue_Acquire(0, 86, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kClueMoonbus1, 1, -1);
 		Item_Pickup_Spin_Effect(984, 490, 307);
 		Item_Remove_From_World(120);
-		Actor_Says(0, 8527, 3);
+		Actor_Says(kActorMcCoy, 8527, 3);
 		return true;
 	}
 	return false;
@@ -91,8 +91,8 @@ bool SceneScriptCT51::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptCT51::ClickedOnExit(int exitId) {
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 0.0f, 0.0f, -102.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -11.0f, 0.0f, -156.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, 0.0f, -102.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -11.0f, 0.0f, -156.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(380);
@@ -118,7 +118,7 @@ void SceneScriptCT51::PlayerWalkedIn() {
 }
 
 void SceneScriptCT51::PlayerWalkedOut() {
-	if (!Actor_Clue_Query(0, 85)) {
+	if (!Actor_Clue_Query(kActorMcCoy, kClueRagDoll)) {
 		Item_Remove_From_World(85);
 	}
 }
diff --git a/engines/bladerunner/script/scene/dr01.cpp b/engines/bladerunner/script/scene/dr01.cpp
index 0da58d4e71..dd3303ab16 100644
--- a/engines/bladerunner/script/scene/dr01.cpp
+++ b/engines/bladerunner/script/scene/dr01.cpp
@@ -106,8 +106,8 @@ bool SceneScriptDR01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptDR01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -835.0f, -0.04f, -118.0f, 0, 1, false, 0)) {
-			Async_Actor_Walk_To_XYZ(0, -911.0f, -0.04f, -118.0f, 0, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -835.0f, -0.04f, -118.0f, 0, 1, false, 0)) {
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -911.0f, -0.04f, -118.0f, 0, false);
 			Ambient_Sounds_Adjust_Looping_Sound(112, 10, -100, 1);
 			Game_Flag_Set(224);
 			Set_Enter(7, 26);
@@ -115,15 +115,15 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -711.0f, -0.04f, 70.0f, 0, 1, false, 0)) {
-			Async_Actor_Walk_To_XYZ(0, -796.0f, -0.04f, 166.0f, 0, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -711.0f, -0.04f, 70.0f, 0, 1, false, 0)) {
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -796.0f, -0.04f, 166.0f, 0, false);
 			Game_Flag_Set(10);
 			Set_Enter(7, 28);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (Loop_Actor_Walk_To_XYZ(0, -372.0f, -0.04f, -82.0f, 0, 1, false, 0)) {
+		if (Loop_Actor_Walk_To_XYZ(kActorMcCoy, -372.0f, -0.04f, -82.0f, 0, 1, false, 0)) {
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
 			Game_Flag_Reset(179);
@@ -191,7 +191,7 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) {
 			default:
 				Player_Loses_Control();
 				Game_Flag_Set(177);
-				Loop_Actor_Walk_To_XYZ(0, -447.39f, 0.16f, -92.38f, 0, 0, true, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -447.39f, 0.16f, -92.38f, 0, 0, true, 0);
 				Player_Gains_Control();
 				break;
 			}
@@ -201,10 +201,10 @@ bool SceneScriptDR01::ClickedOnExit(int exitId) {
 
 	if (exitId == 3) {
 		float x, y, z;
-		Actor_Query_XYZ(0, &x, &y, &z);
+		Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 		bool v7 = false;
 		if (-1200 < x) {
-			v7 = Loop_Actor_Walk_To_XYZ(0, -1236.4f, -0.04f, -13.91f, 0, 1, false, 0);
+			v7 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1236.4f, -0.04f, -13.91f, 0, 1, false, 0);
 		}
 		if (!v7) {
 			Game_Flag_Set(558);
@@ -223,9 +223,9 @@ bool SceneScriptDR01::ClickedOn2DRegion(int region) {
 
 void SceneScriptDR01::SceneFrameAdvanced(int frame) {
 	if (frame < 75) {
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 	} else {
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 	}
 	if (frame == 2) {
 		Ambient_Sounds_Play_Sound(487, 40, -40, 100, 99);
@@ -237,10 +237,10 @@ void SceneScriptDR01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptDR01::PlayerWalkedIn() {
 	if (Game_Flag_Query(531)) {
-		Async_Actor_Walk_To_XYZ(0, -757.15f, -0.04f, 24.64f, 0, false);
+		Async_Actor_Walk_To_XYZ(kActorMcCoy, -757.15f, -0.04f, 24.64f, 0, false);
 	} else if (!Game_Flag_Query(225) && !Game_Flag_Query(11)) {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(0, -447.39f, 0.16f, -92.38f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -447.39f, 0.16f, -92.38f, 0, 0, false, 0);
 		Player_Gains_Control();
 	}
 	Game_Flag_Reset(225);
diff --git a/engines/bladerunner/script/scene/dr02.cpp b/engines/bladerunner/script/scene/dr02.cpp
index 2ff8f14a0f..874a829473 100644
--- a/engines/bladerunner/script/scene/dr02.cpp
+++ b/engines/bladerunner/script/scene/dr02.cpp
@@ -117,8 +117,8 @@ bool SceneScriptDR02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptDR02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -835.0f, -0.04f, -118.0f, 0, 1, false, 0)) {
-			Async_Actor_Walk_To_XYZ(0, -727.0f, -0.04f, -118.0f, 0, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -835.0f, -0.04f, -118.0f, 0, 1, false, 0)) {
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -727.0f, -0.04f, -118.0f, 0, false);
 			Game_Flag_Set(225);
 			Set_Enter(7, 25);
 		}
@@ -127,9 +127,9 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -1162.0f, 7.18f, -322.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1162.0f, 7.18f, -322.0f, 0, 1, false, 0)) {
 			if (Global_Variable_Query(1) > 2) {
-				Actor_Says(0, 8522, 15);
+				Actor_Says(kActorMcCoy, 8522, 15);
 			} else {
 				Game_Flag_Set(226);
 				Set_Enter(34, 27);
@@ -138,7 +138,7 @@ bool SceneScriptDR02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -1258.0f, 7.18f, -314.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1258.0f, 7.18f, -314.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(265);
 			Game_Flag_Reset(177);
 			Game_Flag_Set(258);
diff --git a/engines/bladerunner/script/scene/dr03.cpp b/engines/bladerunner/script/scene/dr03.cpp
index f0de30deb8..3fe1a91f64 100644
--- a/engines/bladerunner/script/scene/dr03.cpp
+++ b/engines/bladerunner/script/scene/dr03.cpp
@@ -32,11 +32,11 @@ void SceneScriptDR03::InitializeScene() {
 	Setup_Scene_Information(330.31f, 4.27f, -910.91f, 297);
 	Scene_Exit_Add_2D_Exit(0, 377, 122, 445, 266, 0);
 	if (Global_Variable_Query(1) == 3) {
-		Actor_Put_In_Set(52, 34);
-		Actor_Set_At_XYZ(52, 431.21f, 4.27f, -776.26f, 0);
+		Actor_Put_In_Set(kActorChew, 34);
+		Actor_Set_At_XYZ(kActorChew, 431.21f, 4.27f, -776.26f, 0);
 	} else {
-		Actor_Put_In_Set(52, 34);
-		Actor_Set_At_XYZ(52, 360.77f, 4.4f, -806.67f, 126);
+		Actor_Put_In_Set(kActorChew, 34);
+		Actor_Set_At_XYZ(kActorChew, 360.77f, 4.4f, -806.67f, 126);
 	}
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	Ambient_Sounds_Add_Looping_Sound(110, 7, 0, 1);
@@ -45,9 +45,9 @@ void SceneScriptDR03::InitializeScene() {
 }
 
 void SceneScriptDR03::SceneLoaded() {
-	Obstacle_Object("W2-CENTCASE02", 1);
-	Obstacle_Object("W2-CARTTOP", 1);
-	Obstacle_Object("W2-TANKAFLUID01", 1);
+	Obstacle_Object("W2-CENTCASE02", true);
+	Obstacle_Object("W2-CARTTOP", true);
+	Obstacle_Object("W2-TANKAFLUID01", true);
 }
 
 bool SceneScriptDR03::MouseClick(int x, int y) {
@@ -60,61 +60,61 @@ bool SceneScriptDR03::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptDR03::ClickedOnActor(int actorId) {
 	if (actorId == 52) {
-		Actor_Face_Actor(0, 52, 1);
-		Actor_Face_Actor(52, 0, 1);
+		Actor_Face_Actor(kActorMcCoy, kActorChew, true);
+		Actor_Face_Actor(kActorChew, kActorMcCoy, true);
 		if (!Game_Flag_Query(267)) {
-			Actor_Says(0, 755, 18);
-			Actor_Says(52, 10, 14);
-			Actor_Says(0, 760, 18);
-			Actor_Says(52, 20, 14);
-			Actor_Says(0, 765, 18);
-			Actor_Says(52, 30, 14);
+			Actor_Says(kActorMcCoy, 755, 18);
+			Actor_Says(kActorChew, 10, 14);
+			Actor_Says(kActorMcCoy, 760, 18);
+			Actor_Says(kActorChew, 20, 14);
+			Actor_Says(kActorMcCoy, 765, 18);
+			Actor_Says(kActorChew, 30, 14);
 			Game_Flag_Set(267);
 			return true;
 		}
-		if (Actor_Clue_Query(0, 67)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueChewInterview)) {
 			if (Game_Flag_Query(266) && Game_Flag_Query(267)) {
-				Actor_Says(0, 815, 18);
-				Actor_Says(52, 60, 14);
-				Actor_Says(52, 70, 14);
-				Actor_Says(52, 80, 14);
-				Actor_Says(0, 820, 18);
-				Actor_Says(52, 90, 14);
-				Actor_Says(0, 825, 18);
-				Actor_Says(52, 100, 14);
+				Actor_Says(kActorMcCoy, 815, 18);
+				Actor_Says(kActorChew, 60, 14);
+				Actor_Says(kActorChew, 70, 14);
+				Actor_Says(kActorChew, 80, 14);
+				Actor_Says(kActorMcCoy, 820, 18);
+				Actor_Says(kActorChew, 90, 14);
+				Actor_Says(kActorMcCoy, 825, 18);
+				Actor_Says(kActorChew, 100, 14);
 				Game_Flag_Reset(266);
 				Game_Flag_Set(505);
 				return true;
 			}
-			if ((Actor_Clue_Query(0, 147) || Actor_Clue_Query(0, 71) || Actor_Clue_Query(0, 76) || Actor_Clue_Query(0, 67))
+			if ((Actor_Clue_Query(kActorMcCoy, kClueDNATyrell) || Actor_Clue_Query(kActorMcCoy, kClueAnsweringMachineMessage) || Actor_Clue_Query(kActorMcCoy, kClueEnvelope) || Actor_Clue_Query(kActorMcCoy, kClueChewInterview))
 				&& Game_Flag_Query(505)) {
 				sub_401B18();
 			} else {
-				Actor_Says(0, 810, 18);
-				Actor_Says(52, 40, 14);
-				Actor_Says(52, 50, 14);
+				Actor_Says(kActorMcCoy, 810, 18);
+				Actor_Says(kActorChew, 40, 14);
+				Actor_Says(kActorChew, 50, 14);
 			}
 			return true;
 		}
-		Actor_Says(0, 770, 12);
-		Actor_Says(52, 110, 12);
-		Actor_Says(52, 120, 13);
-		Actor_Says(0, 835, 13);
-		Actor_Says(52, 130, 14);
-		Actor_Says(0, 840, 16);
-		Actor_Says(52, 140, 15);
+		Actor_Says(kActorMcCoy, 770, 12);
+		Actor_Says(kActorChew, 110, 12);
+		Actor_Says(kActorChew, 120, 13);
+		Actor_Says(kActorMcCoy, 835, 13);
+		Actor_Says(kActorChew, 130, 14);
+		Actor_Says(kActorMcCoy, 840, 16);
+		Actor_Says(kActorChew, 140, 15);
 		if (!Game_Flag_Query(505)) {
-			Actor_Says(52, 150, 13);
-			Actor_Says(0, 845, 17);
-			Actor_Says(52, 170, 18);
-			Actor_Says(52, 180, 16);
-			Actor_Says(0, 850, 15);
-			Actor_Says(52, 190, 14);
-			Actor_Says(52, 200, 13);
-			Actor_Says(0, 855, 18);
-			Actor_Says(52, 210, 12);
+			Actor_Says(kActorChew, 150, 13);
+			Actor_Says(kActorMcCoy, 845, 17);
+			Actor_Says(kActorChew, 170, 18);
+			Actor_Says(kActorChew, 180, 16);
+			Actor_Says(kActorMcCoy, 850, 15);
+			Actor_Says(kActorChew, 190, 14);
+			Actor_Says(kActorChew, 200, 13);
+			Actor_Says(kActorMcCoy, 855, 18);
+			Actor_Says(kActorChew, 210, 12);
 		}
-		Actor_Clue_Acquire(0, 67, 1, 52);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew);
 		return true;
 	}
 	return false;
@@ -126,7 +126,7 @@ bool SceneScriptDR03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptDR03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 330.31f, 4.27f, -910.91f, 24, 1, 0, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 330.31f, 4.27f, -910.91f, 24, 1, false, 0)) {
 			Game_Flag_Set(227);
 			Set_Enter(7, 26);
 		}
@@ -155,14 +155,14 @@ void SceneScriptDR03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptDR03::PlayerWalkedIn() {
 	if (!Game_Flag_Query(226)) {
 		if (Random_Query(1, 2) == 1) {
-			Actor_Says(52, 660, 14);
-			Actor_Says(52, 680, 14);
+			Actor_Says(kActorChew, 660, 14);
+			Actor_Says(kActorChew, 680, 14);
 		} else if (Random_Query(1, 2) == 2) {
-			Actor_Says(52, 670, 14);
-			Actor_Says(52, 620, 14);
+			Actor_Says(kActorChew, 670, 14);
+			Actor_Says(kActorChew, 620, 14);
 		} else {
-			Actor_Says(52, 690, 14);
-			Actor_Says(52, 710, 14);
+			Actor_Says(kActorChew, 690, 14);
+			Actor_Says(kActorChew, 710, 14);
 		}
 	}
 }
@@ -175,20 +175,20 @@ void SceneScriptDR03::DialogueQueueFlushed(int a1) {
 
 void SceneScriptDR03::sub_401B18() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 67) || Actor_Clue_Query(0, 71) || Actor_Clue_Query(0, 68)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueChewInterview) || Actor_Clue_Query(kActorMcCoy, kClueAnsweringMachineMessage) || Actor_Clue_Query(kActorMcCoy, kClueMorajiInterview)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(650, 5, 5, 5);
 	}
-	if (Actor_Clue_Query(0, 67)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueChewInterview)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(660, 5, 5, 5);
 	}
-	if (Actor_Clue_Query(0, 279)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueTyrellInterview)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(670, 6, 5, 2);
 	}
 	if (Game_Flag_Query(505)) {
-		if (Actor_Clue_Query(0, 71)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueAnsweringMachineMessage)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(680, 8, 8, 8);
 		}
-		if (Actor_Clue_Query(0, 76)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(1270, 2, 5, 7);
 		}
 	}
@@ -198,89 +198,89 @@ void SceneScriptDR03::sub_401B18() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 640:
-		Actor_Says(0, 770, 12);
-		Actor_Says(52, 110, 12);
-		Actor_Says(52, 120, 13);
-		Actor_Says(0, 835, 13);
-		Actor_Says(52, 130, 14);
-		Actor_Says(0, 840, 16);
-		Actor_Says(52, 140, 15);
+		Actor_Says(kActorMcCoy, 770, 12);
+		Actor_Says(kActorChew, 110, 12);
+		Actor_Says(kActorChew, 120, 13);
+		Actor_Says(kActorMcCoy, 835, 13);
+		Actor_Says(kActorChew, 130, 14);
+		Actor_Says(kActorMcCoy, 840, 16);
+		Actor_Says(kActorChew, 140, 15);
 		if (!Game_Flag_Query(505)) {
-			Actor_Says(52, 150, 13);
-			Actor_Says(0, 845, 17);
-			Actor_Says(52, 170, 18);
-			Actor_Says(52, 180, 16);
-			Actor_Says(0, 850, 15);
-			Actor_Says(52, 190, 14);
-			Actor_Says(52, 200, 13);
-			Actor_Says(0, 855, 18);
-			Actor_Says(52, 210, 12);
+			Actor_Says(kActorChew, 150, 13);
+			Actor_Says(kActorMcCoy, 845, 17);
+			Actor_Says(kActorChew, 170, 18);
+			Actor_Says(kActorChew, 180, 16);
+			Actor_Says(kActorMcCoy, 850, 15);
+			Actor_Says(kActorChew, 190, 14);
+			Actor_Says(kActorChew, 200, 13);
+			Actor_Says(kActorMcCoy, 855, 18);
+			Actor_Says(kActorChew, 210, 12);
 		}
-		Actor_Clue_Acquire(0, 67, 1, 52);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew);
 		break;
 	case 650:
-		Actor_Says(0, 775, 11);
-		Actor_Says(52, 220, 14);
-		Actor_Says(0, 860, 11);
-		Actor_Says(52, 230, 14);
-		Actor_Says(0, 865, 11);
-		Actor_Says(52, 240, 14);
-		Actor_Says(52, 250, 14);
+		Actor_Says(kActorMcCoy, 775, 11);
+		Actor_Says(kActorChew, 220, 14);
+		Actor_Says(kActorMcCoy, 860, 11);
+		Actor_Says(kActorChew, 230, 14);
+		Actor_Says(kActorMcCoy, 865, 11);
+		Actor_Says(kActorChew, 240, 14);
+		Actor_Says(kActorChew, 250, 14);
 		break;
 	case 660:
-		Actor_Says(0, 780, 13);
+		Actor_Says(kActorMcCoy, 780, 13);
 		if (Game_Flag_Query(505)) {
-			Actor_Says(52, 260, 14);
-			Actor_Says(52, 270, 13);
-			Actor_Says(52, 280, 12);
+			Actor_Says(kActorChew, 260, 14);
+			Actor_Says(kActorChew, 270, 13);
+			Actor_Says(kActorChew, 280, 12);
 		} else {
-			Actor_Says(52, 260, 14);
-			Actor_Says(52, 270, 13);
-			Actor_Says(52, 280, 12);
-			Actor_Says(0, 870, 18);
-			Actor_Says(52, 290, 15);
+			Actor_Says(kActorChew, 260, 14);
+			Actor_Says(kActorChew, 270, 13);
+			Actor_Says(kActorChew, 280, 12);
+			Actor_Says(kActorMcCoy, 870, 18);
+			Actor_Says(kActorChew, 290, 15);
 			if (!Game_Flag_Query(266)) {
-				Actor_Says(52, 300, 12);
+				Actor_Says(kActorChew, 300, 12);
 			}
 		}
-		Actor_Clue_Acquire(0, 67, 1, 52);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChewInterview, 1, kActorChew);
 		break;
 	case 670:
-		Actor_Says(0, 765, 12);
-		Actor_Says(0, 790, 13);
-		Actor_Says(52, 310, 12);
-		Actor_Says(52, 320, 3);
+		Actor_Says(kActorMcCoy, 765, 12);
+		Actor_Says(kActorMcCoy, 790, 13);
+		Actor_Says(kActorChew, 310, 12);
+		Actor_Says(kActorChew, 320, 3);
 		break;
 	case 680:
-		Actor_Says(0, 795, 3);
+		Actor_Says(kActorMcCoy, 795, 3);
 		if (Game_Flag_Query(505) == 1) {
-			Actor_Says(52, 330, 12);
-			Actor_Says(52, 340, 15);
-			Actor_Says(0, 875, 16);
-			Actor_Says(52, 350, 12);
-			Actor_Says(52, 360, 15);
+			Actor_Says(kActorChew, 330, 12);
+			Actor_Says(kActorChew, 340, 15);
+			Actor_Says(kActorMcCoy, 875, 16);
+			Actor_Says(kActorChew, 350, 12);
+			Actor_Says(kActorChew, 360, 15);
 			Game_Flag_Set(326);
 		} else {
-			Actor_Says(52, 320, 13);
-			Actor_Says(52, 150, 14);
+			Actor_Says(kActorChew, 320, 13);
+			Actor_Says(kActorChew, 150, 14);
 			Game_Flag_Set(326);
 		}
 		break;
 	case 1270:
-		Actor_Says(0, 800, 16);
-		Actor_Says(52, 370, 3);
-		Actor_Says(0, 880, 15);
-		Actor_Says(52, 380, 13);
-		Actor_Says(52, 390, 12);
-		Actor_Says(0, 885, 14);
-		Actor_Says(52, 400, 13);
-		Actor_Says(52, 410, 15);
-		Actor_Says(0, 890, 18);
-		Actor_Says(52, 420, 13);
-		Actor_Says(52, 430, 12);
+		Actor_Says(kActorMcCoy, 800, 16);
+		Actor_Says(kActorChew, 370, 3);
+		Actor_Says(kActorMcCoy, 880, 15);
+		Actor_Says(kActorChew, 380, 13);
+		Actor_Says(kActorChew, 390, 12);
+		Actor_Says(kActorMcCoy, 885, 14);
+		Actor_Says(kActorChew, 400, 13);
+		Actor_Says(kActorChew, 410, 15);
+		Actor_Says(kActorMcCoy, 890, 18);
+		Actor_Says(kActorChew, 420, 13);
+		Actor_Says(kActorChew, 430, 12);
 		break;
 	case 690:
-		Actor_Says(0, 805, 3);
+		Actor_Says(kActorMcCoy, 805, 3);
 		break;
 	}
 }
diff --git a/engines/bladerunner/script/scene/dr04.cpp b/engines/bladerunner/script/scene/dr04.cpp
index 4e2a101560..f11c462db6 100644
--- a/engines/bladerunner/script/scene/dr04.cpp
+++ b/engines/bladerunner/script/scene/dr04.cpp
@@ -93,29 +93,29 @@ bool SceneScriptDR04::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptDR04::ClickedOnActor(int actorId) {
 	if (actorId == 35 && !Player_Query_Combat_Mode()) {
-		if (Actor_Query_Goal_Number(35) != 21) {
-			if (Actor_Query_Goal_Number(35) == 23) {
-				if (!Loop_Actor_Walk_To_Actor(0, 35, 36, 1, false)) {
-					Actor_Set_Goal_Number(24, 106);
+		if (Actor_Query_Goal_Number(kActorMoraji) != 21) {
+			if (Actor_Query_Goal_Number(kActorMoraji) == 23) {
+				if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorMoraji, 36, 1, false)) {
+					Actor_Set_Goal_Number(kActorOfficerGrayford, 106);
 					return true;
 				}
 			}
 			return false;
 		}
-		if (!Loop_Actor_Walk_To_Waypoint(0, 109, 0, 1, true)) {
-			Actor_Face_Actor(0, 35, true);
-			Actor_Says(0, 945, 13);
-			Actor_Says(35, 0, 3);
-			Actor_Says(35, 10, 3);
-			Actor_Says(0, 950, 13);
-			Actor_Says(35, 20, 3);
-			Actor_Says(35, 30, 3);
-			Actor_Says(0, 955, 13);
-			Actor_Says_With_Pause(35, 40, 0, 3);
-			Actor_Says(35, 50, 3);
-			Actor_Clue_Acquire(0, 68, 1, 35);
-			Actor_Set_Goal_Number(35, 22);
-			Actor_Set_Goal_Number(24, 101);
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 109, 0, 1, true)) {
+			Actor_Face_Actor(kActorMcCoy, kActorMoraji, true);
+			Actor_Says(kActorMcCoy, 945, 13);
+			Actor_Says(kActorMoraji, 0, 3);
+			Actor_Says(kActorMoraji, 10, 3);
+			Actor_Says(kActorMcCoy, 950, 13);
+			Actor_Says(kActorMoraji, 20, 3);
+			Actor_Says(kActorMoraji, 30, 3);
+			Actor_Says(kActorMcCoy, 955, 13);
+			Actor_Says_With_Pause(kActorMoraji, 40, 0, 3);
+			Actor_Says(kActorMoraji, 50, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueMorajiInterview, 1, kActorMoraji);
+			Actor_Set_Goal_Number(kActorMoraji, 22);
+			Actor_Set_Goal_Number(kActorOfficerGrayford, 101);
 			return true;
 		}
 		return false;
@@ -128,22 +128,22 @@ bool SceneScriptDR04::ClickedOnItem(int itemId, bool a2) {
 }
 
 bool SceneScriptDR04::ClickedOnExit(int exitId) {
-	if (Actor_Query_Goal_Number(35) == 21) {
-		Actor_Force_Stop_Walking(0);
-		Actor_Set_Goal_Number(35, 22);
-		Actor_Set_Goal_Number(24, 101);
+	if (Actor_Query_Goal_Number(kActorMoraji) == 21) {
+		Actor_Force_Stop_Walking(kActorMcCoy);
+		Actor_Set_Goal_Number(kActorMoraji, 22);
+		Actor_Set_Goal_Number(kActorOfficerGrayford, 101);
 		return true;
 	}
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -761.0f, -0.04f, 97.0f, 0, 1, false, 0)) {
-			Async_Actor_Walk_To_XYZ(0, -683.0f, -0.04f, 43.0f, 0, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -761.0f, -0.04f, 97.0f, 0, 1, false, 0)) {
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -683.0f, -0.04f, 43.0f, 0, false);
 			Game_Flag_Set(11);
 			Set_Enter(7, 25);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -1067.0f, 7.18f, 421.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1067.0f, 7.18f, 421.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(232);
 			Game_Flag_Set(228);
 			Set_Enter(35, 29);
@@ -151,15 +151,15 @@ bool SceneScriptDR04::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -851.0f, 6.98f, 560.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -851.0f, 6.98f, 560.0f, 0, 1, false, 0)) {
 			Footstep_Sound_Override_On(3);
-			Actor_Set_Immunity_To_Obstacles(0, true);
-			Actor_Face_Heading(0, 512, false);
-			Loop_Actor_Travel_Stairs(0, 7, 1, 0);
-			Loop_Actor_Walk_To_XYZ(0, -899.0f, 71.64f, 647.0f, 0, 0, false, 0);
-			Actor_Face_Heading(0, 0, false);
-			Loop_Actor_Travel_Stairs(0, 7, 1, 0);
-			Actor_Set_Immunity_To_Obstacles(0, false);
+			Actor_Set_Immunity_To_Obstacles(kActorMcCoy, true);
+			Actor_Face_Heading(kActorMcCoy, 512, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 7, 1, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -899.0f, 71.64f, 647.0f, 0, 0, false, 0);
+			Actor_Face_Heading(kActorMcCoy, 0, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 7, 1, 0);
+			Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false);
 			Footstep_Sound_Override_Off();
 			Game_Flag_Set(230);
 			Set_Enter(36, 30);
@@ -175,7 +175,7 @@ bool SceneScriptDR04::ClickedOn2DRegion(int region) {
 
 bool SceneScriptDR04::sub_401160() {
 	float x, y, z;
-	Actor_Query_XYZ(0, &x, &y, &z);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	return (x + 1089.94f) * (x + 1089.94f) + (z - 443.49f) * (z - 443.49f) >= (360.0f * 360.0f);
 }
 
@@ -186,7 +186,7 @@ void SceneScriptDR04::SceneFrameAdvanced(int frame) {
 		Scene_Loop_Set_Default(1);
 		Scene_Loop_Start_Special(2, 6, 1);
 		Music_Stop(4);
-		Actor_Set_Goal_Number(35, 99);
+		Actor_Set_Goal_Number(kActorMoraji, 99);
 	} else {
 		if (Game_Flag_Query(271)) {
 			Game_Flag_Reset(271);
@@ -198,25 +198,25 @@ void SceneScriptDR04::SceneFrameAdvanced(int frame) {
 		switch (frame) {
 		case 193:
 			Sound_Play(301, 100, 0, 100, 50);
-			Actor_Set_Goal_Number(35, 30);
+			Actor_Set_Goal_Number(kActorMoraji, 30);
 			Player_Loses_Control();
-			Actor_Force_Stop_Walking(0);
+			Actor_Force_Stop_Walking(kActorMcCoy);
 			if (sub_401160()) {
 				if (Player_Query_Combat_Mode()) {
-					Actor_Change_Animation_Mode(0, 22);
+					Actor_Change_Animation_Mode(kActorMcCoy, 22);
 				} else {
-					Actor_Change_Animation_Mode(0, 21);
+					Actor_Change_Animation_Mode(kActorMcCoy, 21);
 				}
 			} else {
-				Sound_Play_Speech_Line(0, 9905, 100, 0, 99);
-				Actor_Change_Animation_Mode(0, 48);
-				Actor_Retired_Here(0, 6, 6, 1, -1);
+				Sound_Play_Speech_Line(kActorMcCoy, 9905, 100, 0, 99);
+				Actor_Change_Animation_Mode(kActorMcCoy, 48);
+				Actor_Retired_Here(kActorMcCoy, 6, 6, 1, -1);
 			}
 			Player_Gains_Control();
 			break;
 		case 235:
-			if (Actor_Query_Goal_Number(35) != 20 && Actor_Query_Goal_Number(35) != 21 && Actor_Query_Goal_Number(35) != 99) {
-				Actor_Set_Goal_Number(24, 101);
+			if (Actor_Query_Goal_Number(kActorMoraji) != 20 && Actor_Query_Goal_Number(kActorMoraji) != 21 && Actor_Query_Goal_Number(kActorMoraji) != 99) {
+				Actor_Set_Goal_Number(kActorOfficerGrayford, 101);
 			}
 			Scene_Exits_Enable();
 			break;
@@ -234,21 +234,21 @@ void SceneScriptDR04::PlayerWalkedIn() {
 	if (Game_Flag_Query(515)) {
 		Player_Loses_Control();
 		Delay(4000);
-		Actor_Retired_Here(0, 6, 6, 1, -1);
+		Actor_Retired_Here(kActorMcCoy, 6, 6, 1, -1);
 	} else {
 		if (Game_Flag_Query(269) && !Game_Flag_Query(272)) {
 			Scene_Exits_Disable();
 		}
 		if (Game_Flag_Query(231)) {
 			Footstep_Sound_Override_On(3);
-			Actor_Set_Immunity_To_Obstacles(0, true);
-			Actor_Face_Heading(0, 512, false);
-			Loop_Actor_Travel_Stairs(0, 7, 0, 0);
-			Loop_Actor_Walk_To_XYZ(0, -851.0f, 71.64f, 647.0f, 0, 0, false, 0);
-			Actor_Face_Heading(0, 0, false);
-			Loop_Actor_Travel_Stairs(0, 7, 0, 0);
-			Loop_Actor_Walk_To_XYZ(0, -774.85f, 7.18f, 386.67001f, 0, 0, false, 0);
-			Actor_Set_Immunity_To_Obstacles(0, false);
+			Actor_Set_Immunity_To_Obstacles(kActorMcCoy, true);
+			Actor_Face_Heading(kActorMcCoy, 512, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 7, 0, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -851.0f, 71.64f, 647.0f, 0, 0, false, 0);
+			Actor_Face_Heading(kActorMcCoy, 0, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 7, 0, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -774.85f, 7.18f, 386.67001f, 0, 0, false, 0);
+			Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false);
 			Footstep_Sound_Override_Off();
 		}
 	}
diff --git a/engines/bladerunner/script/scene/dr05.cpp b/engines/bladerunner/script/scene/dr05.cpp
index 0d3908bd94..a1c831199b 100644
--- a/engines/bladerunner/script/scene/dr05.cpp
+++ b/engines/bladerunner/script/scene/dr05.cpp
@@ -46,7 +46,7 @@ void SceneScriptDR05::SceneLoaded() {
 	Clickable_Object("T2 DOORWAY");
 	if (!Game_Flag_Query(272)) {
 		Item_Add_To_World(78, 932, 35, -1.57f, 31.33f, 75.21f, 540, 16, 16, true, true, false, true);
-		if (!Actor_Query_Goal_Number(35)) {
+		if (!Actor_Query_Goal_Number(kActorMoraji)) {
 			Item_Add_To_World(122, 931, 35, 37.35f, 1.59f, 46.72f, 0, 20, 20, true, true, false, true);
 		}
 	}
@@ -58,16 +58,16 @@ bool SceneScriptDR05::MouseClick(int x, int y) {
 
 bool SceneScriptDR05::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("T2 DOORWAY", objectName)) {
-		if (Game_Flag_Query(276) || Actor_Query_Goal_Number(35)) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 57.61f, 0.3f, 69.27f, 0, 1, false, 0)) {
-				Actor_Face_Object(0, "T2 DOORWAY", true);
-				Actor_Says(0, 8522, 13);
-				Actor_Says(0, 8521, 14);
+		if (Game_Flag_Query(276) || Actor_Query_Goal_Number(kActorMoraji)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 57.61f, 0.3f, 69.27f, 0, 1, false, 0)) {
+				Actor_Face_Object(kActorMcCoy, "T2 DOORWAY", true);
+				Actor_Says(kActorMcCoy, 8522, 13);
+				Actor_Says(kActorMcCoy, 8521, 14);
 			}
 		} else {
-			Actor_Face_Object(0, "T2 DOORWAY", true);
-			Actor_Says(0, 1020, 14);
-			Actor_Says(35, 90, 13);
+			Actor_Face_Object(kActorMcCoy, "T2 DOORWAY", true);
+			Actor_Says(kActorMcCoy, 1020, 14);
+			Actor_Says(kActorMoraji, 90, 13);
 		}
 		return true;
 	}
@@ -82,21 +82,21 @@ bool SceneScriptDR05::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 78) {
 		if (Player_Query_Combat_Mode()) {
 			Game_Flag_Set(271);
-			Actor_Set_Goal_Number(35, 30);
-		} else if (!Game_Flag_Query(272) && !Loop_Actor_Walk_To_Item(0, 78, 24, 1, true) && Actor_Query_Goal_Number(35) != 11) {
-			if (!Actor_Query_Goal_Number(35)) {
-				Actor_Says_With_Pause(0, 1015, 0.1f, 12);
-				Actor_Says(35, 70, 13);
+			Actor_Set_Goal_Number(kActorMoraji, 30);
+		} else if (!Game_Flag_Query(272) && !Loop_Actor_Walk_To_Item(kActorMcCoy, 78, 24, 1, true) && Actor_Query_Goal_Number(kActorMoraji) != 11) {
+			if (!Actor_Query_Goal_Number(kActorMoraji)) {
+				Actor_Says_With_Pause(kActorMcCoy, 1015, 0.1f, 12);
+				Actor_Says(kActorMoraji, 70, 13);
 			}
-			Actor_Set_Goal_Number(35, 30);
+			Actor_Set_Goal_Number(kActorMoraji, 30);
 		}
 		//return true; //bug?
 	}
-	if (itemId == 122 && Player_Query_Combat_Mode() && !Actor_Query_Goal_Number(35)) {
+	if (itemId == 122 && Player_Query_Combat_Mode() && Actor_Query_Goal_Number(kActorMoraji) == 0) {
 		Overlay_Play("DR05OVER", 1, 0, 1, 0);
 		Item_Remove_From_World(122);
 		Game_Flag_Set(270);
-		Actor_Set_Goal_Number(35, 10);
+		Actor_Set_Goal_Number(kActorMoraji, 10);
 		Music_Play(18, 71, 0, 0, -1, 0, 2);
 		return true;
 	}
@@ -105,7 +105,7 @@ bool SceneScriptDR05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptDR05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -22.0f, 0.3f, 221.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -22.0f, 0.3f, 221.0f, 0, 1, false, 0)) {
 			Game_Flag_Reset(232);
 			Game_Flag_Set(229);
 			Set_Enter(7, 28);
@@ -127,7 +127,7 @@ void SceneScriptDR05::SceneFrameAdvanced(int frame) {
 		Item_Remove_From_World(78);
 		Game_Flag_Reset(271);
 		Game_Flag_Set(272);
-		Actor_Set_Goal_Number(35, 30);
+		Actor_Set_Goal_Number(kActorMoraji, 30);
 	}
 }
 
@@ -139,34 +139,34 @@ void SceneScriptDR05::PlayerWalkedIn() {
 		Item_Remove_From_World(122);
 	}
 	if (Game_Flag_Query(272)) {
-		Loop_Actor_Walk_To_XYZ(0, -10.0f, 0.3f, 133.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -10.0f, 0.3f, 133.0f, 0, 0, false, 0);
 		if (!Game_Flag_Query(511)) {
 			Game_Flag_Set(511);
 			if (Game_Flag_Query(48)) {
-				Actor_Voice_Over(730, 99);
-				Actor_Voice_Over(740, 99);
-				Actor_Voice_Over(750, 99);
-				Actor_Voice_Over(760, 99);
-				Actor_Clue_Acquire(0, 269, 1, -1);
+				Actor_Voice_Over(730, kActorVoiceOver);
+				Actor_Voice_Over(740, kActorVoiceOver);
+				Actor_Voice_Over(750, kActorVoiceOver);
+				Actor_Voice_Over(760, kActorVoiceOver);
+				Actor_Clue_Acquire(kActorMcCoy, kClueExpertBomber, 1, -1);
 			} else {
-				Actor_Voice_Over(670, 99);
-				Actor_Voice_Over(680, 99);
-				Actor_Voice_Over(700, 99);
-				Actor_Voice_Over(710, 99);
-				Actor_Voice_Over(720, 99);
-				Actor_Clue_Acquire(0, 270, 1, -1);
+				Actor_Voice_Over(670, kActorVoiceOver);
+				Actor_Voice_Over(680, kActorVoiceOver);
+				Actor_Voice_Over(700, kActorVoiceOver);
+				Actor_Voice_Over(710, kActorVoiceOver);
+				Actor_Voice_Over(720, kActorVoiceOver);
+				Actor_Clue_Acquire(kActorMcCoy, kClueAmateurBomber, 1, -1);
 			}
 		}
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, -10.0f, 0.3f, 133.0f, 0, 0, true, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -10.0f, 0.3f, 133.0f, 0, 0, true, 0);
 	}
-	if (!Game_Flag_Query(274) && !Actor_Query_Goal_Number(35)) {
-		Actor_Face_Actor(0, 35, true);
-		Actor_Says(0, 1010, 13);
-		Actor_Face_Item(0, 78, true);
+	if (!Game_Flag_Query(274) && !Actor_Query_Goal_Number(kActorMoraji)) {
+		Actor_Face_Actor(kActorMcCoy, kActorMoraji, true);
+		Actor_Says(kActorMcCoy, 1010, 13);
+		Actor_Face_Item(kActorMcCoy, 78, true);
 		Player_Set_Combat_Mode(true);
-		Actor_Says(35, 60, 12);
-		Actor_Change_Animation_Mode(0, 0);
+		Actor_Says(kActorMoraji, 60, 12);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		Game_Flag_Set(274);
 		//return true;
 	}
@@ -176,8 +176,8 @@ void SceneScriptDR05::PlayerWalkedIn() {
 void SceneScriptDR05::PlayerWalkedOut() {
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
-	if (Actor_Query_Goal_Number(35) == 10 || Actor_Query_Goal_Number(35) == 18 || Actor_Query_Goal_Number(35) == 19) {
-		Actor_Set_Goal_Number(35, 11);
+	if (Actor_Query_Goal_Number(kActorMoraji) == 10 || Actor_Query_Goal_Number(kActorMoraji) == 18 || Actor_Query_Goal_Number(kActorMoraji) == 19) {
+		Actor_Set_Goal_Number(kActorMoraji, 11);
 		//return true;
 	}
 	//return false;
diff --git a/engines/bladerunner/script/scene/dr06.cpp b/engines/bladerunner/script/scene/dr06.cpp
index 9000111638..e17a436e33 100644
--- a/engines/bladerunner/script/scene/dr06.cpp
+++ b/engines/bladerunner/script/scene/dr06.cpp
@@ -56,7 +56,7 @@ void SceneScriptDR06::SceneLoaded() {
 	Clickable_Object("X2_MON01A04");
 	Clickable_Object("X2_TORSO04HIRES");
 	Clickable_Object("BOX16");
-	if (Actor_Clue_Query(0, 76)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
 		Unclickable_Object("X2_TORSO04HIRES");
 	}
 }
@@ -67,8 +67,8 @@ bool SceneScriptDR06::MouseClick(int x, int y) {
 
 bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BOX16", objectName)) {
-		Loop_Actor_Walk_To_XYZ(0, -743.0f, 136.6f, -1091.0f, 0, 1, false, 0);
-		Actor_Face_Object(0, "BOX16", true);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -743.0f, 136.6f, -1091.0f, 0, 1, false, 0);
+		Actor_Face_Object(kActorMcCoy, "BOX16", true);
 		if (!Game_Flag_Query(268)) {
 			Overlay_Play("DR06over", 1, 1, 1, 0);
 			Ambient_Sounds_Add_Looping_Sound(300, 47, -75, 0);
@@ -81,57 +81,57 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
 		return true;
 	}
 	if (Object_Query_Click("X2_MON01A04", objectName)) {
-		if (Actor_Clue_Query(0, 71)) {
-			Actor_Face_Object(0, "X2_MON01A04", true);
-			Actor_Says(0, 8570, 13);
-		} else if (!Loop_Actor_Walk_To_XYZ(0, -684.94f, 136.6f, -1136.12f, 0, 1, false, 0)) {
-			Actor_Face_Object(0, "X2_MON01A04", true);
-			Actor_Says(39, 10, 3);
-			Actor_Says(39, 20, 3);
-			Actor_Says(39, 30, 3);
-			Actor_Says(0, 1025, 13);
-			Actor_Says(56, 0, 3);
-			Actor_Says(56, 10, 3);
-			Actor_Says(56, 20, 3);
-			Actor_Says(56, 30, 3);
-			Actor_Says(56, 40, 3);
-			Actor_Says(56, 50, 3);
-			Actor_Says(39, 40, 3);
-			Actor_Says(0, 1030, 13);
-			Actor_Says(39, 50, 3);
-			Actor_Clue_Acquire(0, 71, 1, 39);
+		if (Actor_Clue_Query(kActorMcCoy, kClueAnsweringMachineMessage)) {
+			Actor_Face_Object(kActorMcCoy, "X2_MON01A04", true);
+			Actor_Says(kActorMcCoy, 8570, 13);
+		} else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -684.94f, 136.6f, -1136.12f, 0, 1, false, 0)) {
+			Actor_Face_Object(kActorMcCoy, "X2_MON01A04", true);
+			Actor_Says(kActorAnsweringMachine, 10, 3);
+			Actor_Says(kActorAnsweringMachine, 20, 3);
+			Actor_Says(kActorAnsweringMachine, 30, 3);
+			Actor_Says(kActorMcCoy, 1025, 13);
+			Actor_Says(kActorSebastian, 0, 3);
+			Actor_Says(kActorSebastian, 10, 3);
+			Actor_Says(kActorSebastian, 20, 3);
+			Actor_Says(kActorSebastian, 30, 3);
+			Actor_Says(kActorSebastian, 40, 3);
+			Actor_Says(kActorSebastian, 50, 3);
+			Actor_Says(kActorAnsweringMachine, 40, 3);
+			Actor_Says(kActorMcCoy, 1030, 13);
+			Actor_Says(kActorAnsweringMachine, 50, 3);
+			Actor_Clue_Acquire(kActorMcCoy, kClueAnsweringMachineMessage, 1, kActorAnsweringMachine);
 		}
 		return true;
 	}
 	if (Object_Query_Click("X2_MON01D01", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -645.34f, 136.6f, -1047.37f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 329, false);
-			if (Actor_Clue_Query(0, 125) && Actor_Clue_Query(0, 126) && !Game_Flag_Query(670)) {
-				Actor_Set_Goal_Number(0, 350);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -645.34f, 136.6f, -1047.37f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 329, false);
+			if (Actor_Clue_Query(kActorMcCoy, kClueFolder) && Actor_Clue_Query(kActorMcCoy, kClueGuzzaFramedMcCoy) && !Game_Flag_Query(670)) {
+				Actor_Set_Goal_Number(kActorMcCoy, 350);
 				Game_Flag_Set(670);
 			} else if (Game_Flag_Query(280)) {
-				Actor_Says(0, 8570, 13);
+				Actor_Says(kActorMcCoy, 8570, 13);
 			} else {
-				Actor_Voice_Over(770, 99);
-				Actor_Voice_Over(780, 99);
-				Actor_Voice_Over(790, 99);
-				Actor_Voice_Over(800, 99);
+				Actor_Voice_Over(770, kActorVoiceOver);
+				Actor_Voice_Over(780, kActorVoiceOver);
+				Actor_Voice_Over(790, kActorVoiceOver);
+				Actor_Voice_Over(800, kActorVoiceOver);
 				Game_Flag_Set(280);
 			}
 		}
 		return true;
 	}
 	if (Object_Query_Click("X2_KEYBRD02", objectName) && !Game_Flag_Query(278)) {
-		Loop_Actor_Walk_To_XYZ(0, -655.57f, 136.6f, -1092.64f, 0, 1, false, 0);
-		Actor_Face_Object(0, "X2_KEYBRD02", true);
-		Actor_Voice_Over(830, 99);
-		Actor_Voice_Over(840, 99);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -655.57f, 136.6f, -1092.64f, 0, 1, false, 0);
+		Actor_Face_Object(kActorMcCoy, "X2_KEYBRD02", true);
+		Actor_Voice_Over(830, kActorVoiceOver);
+		Actor_Voice_Over(840, kActorVoiceOver);
 		Game_Flag_Set(278);
 		return true;
 	}
 	if (Object_Query_Click("X2_TORSO04HIRES", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -700.0f, 136.6f, -1133.0f, 4, 1, false, 0)) {
-			Actor_Face_Object(0, "x2_TORSO04HIRES", true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -700.0f, 136.6f, -1133.0f, 4, 1, false, 0)) {
+			Actor_Face_Object(kActorMcCoy, "x2_TORSO04HIRES", true);
 			if (Global_Variable_Query(39) > 12) {
 				return true;
 			}
@@ -143,13 +143,13 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
 				Overlay_Play("DR06ovr2", 0, 1, 0, 0);
 				Game_Flag_Set(548);
 				Sound_Play(160, 100, 0, 0, 50);
-				if (!Actor_Clue_Query(0, 76)) {
-					Actor_Voice_Over(850, 99);
+				if (!Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
+					Actor_Voice_Over(850, kActorVoiceOver);
 					Item_Pickup_Spin_Effect(944, 171, 280);
-					Actor_Voice_Over(860, 99);
-					Actor_Voice_Over(870, 99);
-					Actor_Voice_Over(880, 99);
-					Actor_Clue_Acquire(0, 76, 1, 13);
+					Actor_Voice_Over(860, kActorVoiceOver);
+					Actor_Voice_Over(870, kActorVoiceOver);
+					Actor_Voice_Over(880, kActorVoiceOver);
+					Actor_Clue_Acquire(kActorMcCoy, kClueEnvelope, 1, kActorLance);
 					if (Query_Difficulty_Level() != 0) {
 						Global_Variable_Increment(2, 200);
 					}
@@ -163,8 +163,8 @@ bool SceneScriptDR06::ClickedOn3DObject(const char *objectName, bool a2) {
 		}
 		return true;
 	}
-	Actor_Face_Object(0, "X2_MON01D01", true);
-	Actor_Says(0, 8525, 13);
+	Actor_Face_Object(kActorMcCoy, "X2_MON01D01", true);
+	Actor_Says(kActorMcCoy, 8525, 13);
 	return true;
 }
 
@@ -178,14 +178,14 @@ bool SceneScriptDR06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptDR06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -733.0f, 136.6f, -980.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -733.0f, 136.6f, -980.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(231);
 			Set_Enter(7, 28);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -707.57f, 136.6f, -1132.64f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -707.57f, 136.6f, -1132.64f, 0, 1, false, 0)) {
 			Game_Flag_Set(552);
 			Set_Enter(19, 100);
 		}
@@ -206,7 +206,7 @@ void SceneScriptDR06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptDR06::PlayerWalkedIn() {
 	if (Game_Flag_Query(230)) {
-		Loop_Actor_Walk_To_XYZ(0, -729.57f, 136.6f, -1016.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -729.57f, 136.6f, -1016.0f, 0, 0, false, 0);
 	}
 	Game_Flag_Reset(230);
 	Game_Flag_Reset(551);
diff --git a/engines/bladerunner/script/scene/hc01.cpp b/engines/bladerunner/script/scene/hc01.cpp
index 891fa3e216..1505339e68 100644
--- a/engines/bladerunner/script/scene/hc01.cpp
+++ b/engines/bladerunner/script/scene/hc01.cpp
@@ -93,31 +93,31 @@ bool SceneScriptHC01::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptHC01::ClickedOnActor(int actorId) {
-	if (actorId == 7 && (Actor_Query_Goal_Number(7) == 150 || Actor_Query_Goal_Number(7) == 0)) {
-		AI_Movement_Track_Pause(7);
-		if (!Loop_Actor_Walk_To_XYZ(0, 624.43f, 0.14f, 83.0f, 0, 1, false, 0)) {
+	if (actorId == 7 && (Actor_Query_Goal_Number(kActorIzo) == 150 || Actor_Query_Goal_Number(kActorIzo) == 0)) {
+		AI_Movement_Track_Pause(kActorIzo);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 624.43f, 0.14f, 83.0f, 0, 1, false, 0)) {
 			if (Game_Flag_Query(400)) {
-				Actor_Face_Actor(0, 7, true);
-				Actor_Face_Actor(7, 0, true);
+				Actor_Face_Actor(kActorMcCoy, kActorIzo, true);
+				Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
 				sub_402384();
 			} else {
-				Actor_Face_Actor(7, 0, true);
-				Actor_Says_With_Pause(7, 10, 0.2f, 13);
-				Actor_Face_Actor(0, 7, true);
-				Actor_Says(7, 20, 17);
-				Actor_Says(0, 1035, 18);
-				Actor_Says_With_Pause(7, 30, 0.2f, 17);
-				Actor_Says_With_Pause(7, 40, 0.0f, 13);
-				Actor_Says(7, 50, 12);
-				Actor_Says_With_Pause(0, 1040, 1.2f, 13);
-				Actor_Says(7, 60, 16);
-				Actor_Says_With_Pause(7, 70, 1.0f, 13);
-				Actor_Says_With_Pause(0, 1045, 0.6f, 14);
-				Actor_Says(7, 80, 18);
+				Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+				Actor_Says_With_Pause(kActorIzo, 10, 0.2f, 13);
+				Actor_Face_Actor(kActorMcCoy, kActorIzo, true);
+				Actor_Says(kActorIzo, 20, 17);
+				Actor_Says(kActorMcCoy, 1035, 18);
+				Actor_Says_With_Pause(kActorIzo, 30, 0.2f, 17);
+				Actor_Says_With_Pause(kActorIzo, 40, 0.0f, 13);
+				Actor_Says(kActorIzo, 50, 12);
+				Actor_Says_With_Pause(kActorMcCoy, 1040, 1.2f, 13);
+				Actor_Says(kActorIzo, 60, 16);
+				Actor_Says_With_Pause(kActorIzo, 70, 1.0f, 13);
+				Actor_Says_With_Pause(kActorMcCoy, 1045, 0.6f, 14);
+				Actor_Says(kActorIzo, 80, 18);
 				Game_Flag_Set(400);
 			}
 		}
-		AI_Movement_Track_Unpause(7);
+		AI_Movement_Track_Unpause(kActorIzo);
 	}
 	return false;
 }
@@ -131,11 +131,11 @@ bool SceneScriptHC01::ClickedOnItem(int itemId, bool a2) {
 		Delay(1500);
 		Item_Pickup_Spin_Effect(984, 330, 384);
 		if (Game_Flag_Query(374)) {
-			Actor_Clue_Acquire(0, 246, 1, 7);
+			Actor_Clue_Acquire(kActorMcCoy, kCluePhotoOfMcCoy1, 1, kActorIzo);
 		} else {
-			Actor_Clue_Acquire(0, 247, 1, 7);
+			Actor_Clue_Acquire(kActorMcCoy, kCluePhotoOfMcCoy2, 1, kActorIzo);
 		}
-		Actor_Clue_Acquire(0, 260, 1, 7);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChinaBar, 1, kActorIzo);
 		return true;
 	}
 	return false;
@@ -143,7 +143,7 @@ bool SceneScriptHC01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHC01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 814.0f, 0.14f, 153.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 814.0f, 0.14f, 153.0f, 0, 1, false, 0)) {
 			Music_Adjust(12, 0, 2);
 			Game_Flag_Set(323);
 			Set_Enter(0, 0);
@@ -153,16 +153,16 @@ bool SceneScriptHC01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 607.0f, 0.14f, 9.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 607.0f, 0.14f, 9.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(386);
 			Set_Enter(8, 33);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 105.0f, 0.14f, 103.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 105.0f, 0.14f, 103.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(384);
-			Async_Actor_Walk_To_XYZ(0, -57.0f, 0.14f, 83.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -57.0f, 0.14f, 83.0f, 0, false);
 			Set_Enter(8, 32);
 		}
 		return true;
@@ -202,7 +202,7 @@ void SceneScriptHC01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptHC01::PlayerWalkedIn() {
 	if (Game_Flag_Query(385)) {
-		Loop_Actor_Walk_To_XYZ(0, 105.0f, 0.14f, 103.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 105.0f, 0.14f, 103.0f, 0, 0, false, 0);
 		Game_Flag_Reset(385);
 	}
 	if (Game_Flag_Query(387)) {
@@ -224,36 +224,36 @@ void SceneScriptHC01::DialogueQueueFlushed(int a1) {
 
 void SceneScriptHC01::sub_402384() {
 	if (!Game_Flag_Query(401)) {
-		Actor_Says(0, 1055, 13);
-		Actor_Says(7, 130, 13);
-		Actor_Says_With_Pause(0, 1060, 0.2f, 13);
-		Actor_Says(7, 140, 13);
+		Actor_Says(kActorMcCoy, 1055, 13);
+		Actor_Says(kActorIzo, 130, 13);
+		Actor_Says_With_Pause(kActorMcCoy, 1060, 0.2f, 13);
+		Actor_Says(kActorIzo, 140, 13);
 		Game_Flag_Set(401);
 	}
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 56) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kCluePeruvianLadyInterview) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1020, 6, 7, 3);
-	} else if (Actor_Clue_Query(0, 44) || Actor_Clue_Query(0, 47) || Actor_Clue_Query(0, 14)) {
+	} else if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring) || Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect) || Actor_Clue_Query(kActorMcCoy, kClueDragonflyAnklet)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1010, 6, 7, 3);
 	}
-	if (Actor_Clue_Query(0, 58) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueBobInterview1) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1030, 1, 5, 7);
-	} else if (Actor_Clue_Query(0, 5) == 1) {
+	} else if (Actor_Clue_Query(kActorMcCoy, kClueShellCasings) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1040, 4, 4, 6);
 	}
-	if (Actor_Clue_Query(0, 181) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1050, -1, 3, 8);
-	} else if (Actor_Clue_Query(0, 180) == 1) {
+	} else if (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1060, -1, 3, 8);
 	}
 	if (!Dialogue_Menu_Query_List_Size()) {
-		Actor_Says_With_Pause(0, 1105, 1.2f, 13);
-		if (Actor_Query_Friendliness_To_Other(7, 0) < 50) {
-			Actor_Says(7, 550, 15);
+		Actor_Says_With_Pause(kActorMcCoy, 1105, 1.2f, 13);
+		if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 50) {
+			Actor_Says(kActorIzo, 550, 15);
 		} else {
-			Actor_Says(7, 250, 13);
-			Actor_Modify_Friendliness_To_Other(7, 0, -1);
-			if (Actor_Query_Friendliness_To_Other(7, 0) < 47 && Query_Difficulty_Level() == 0) {
+			Actor_Says(kActorIzo, 250, 13);
+			Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -1);
+			if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47 && Query_Difficulty_Level() == 0) {
 				sub_40346C();
 			}
 		}
@@ -267,148 +267,148 @@ void SceneScriptHC01::sub_402384() {
 		Dialogue_Menu_Disappear();
 		if (answer == 1020) {
 			Dialogue_Menu_Remove_From_List(1020);
-			Actor_Says(0, 1065, 15);
-			Actor_Says(7, 160, 3);
-			Actor_Says(0, 1110, 16);
-			Actor_Says(7, 170, 3);
-			Actor_Says(7, 180, 3);
-			Actor_Says(7, 190, 12);
+			Actor_Says(kActorMcCoy, 1065, 15);
+			Actor_Says(kActorIzo, 160, 3);
+			Actor_Says(kActorMcCoy, 1110, 16);
+			Actor_Says(kActorIzo, 170, 3);
+			Actor_Says(kActorIzo, 180, 3);
+			Actor_Says(kActorIzo, 190, 12);
 			if (Query_Difficulty_Level() < 2) {
-				Actor_Modify_Friendliness_To_Other(7, 0, -2);
+				Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -2);
 			}
 		}
 		if (answer == 1010) {
 			Dialogue_Menu_Remove_From_List(1010);
-			Actor_Clue_Acquire(0, 60, 0, 7);
-			Actor_Says(0, 1070, 13);
-			Actor_Says(7, 200, 17);
-			Actor_Says(7, 210, 12);
-			Actor_Says(0, 1115, 12);
-			Actor_Says(7, 220, 16);
-			Actor_Says(7, 230, 3);
-			Actor_Says(7, 240, 15);
+			Actor_Clue_Acquire(kActorMcCoy, kClueIzoInterview, 0, kActorIzo);
+			Actor_Says(kActorMcCoy, 1070, 13);
+			Actor_Says(kActorIzo, 200, 17);
+			Actor_Says(kActorIzo, 210, 12);
+			Actor_Says(kActorMcCoy, 1115, 12);
+			Actor_Says(kActorIzo, 220, 16);
+			Actor_Says(kActorIzo, 230, 3);
+			Actor_Says(kActorIzo, 240, 15);
 			if (Query_Difficulty_Level() < 2) {
-				Actor_Modify_Friendliness_To_Other(7, 0, -1);
+				Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -1);
 			}
 		}
 		if (answer == 1010 || answer == 1020) {
-			Actor_Says_With_Pause(0, 1120, 0.9f, 17);
-			Actor_Says(7, 250, 13);
-			Actor_Says(0, 1125, 14);
-			if (Actor_Query_Friendliness_To_Other(7, 0) < 47) {
-				Actor_Set_Goal_Number(7, 1);
+			Actor_Says_With_Pause(kActorMcCoy, 1120, 0.9f, 17);
+			Actor_Says(kActorIzo, 250, 13);
+			Actor_Says(kActorMcCoy, 1125, 14);
+			if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47) {
+				Actor_Set_Goal_Number(kActorIzo, 1);
 				Player_Loses_Control();
-				Actor_Says(7, 90, 3);
-				Actor_Face_Actor(7, 0, true);
-				Actor_Says(7, 100, 3);
-				Actor_Says(7, 110, 3);
-				Actor_Says_With_Pause(0, 1050, 0.2f, 3);
-				Actor_Says(7, 120, 3);
-				Actor_Set_Goal_Number(7, 2);
+				Actor_Says(kActorIzo, 90, 3);
+				Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+				Actor_Says(kActorIzo, 100, 3);
+				Actor_Says(kActorIzo, 110, 3);
+				Actor_Says_With_Pause(kActorMcCoy, 1050, 0.2f, 3);
+				Actor_Says(kActorIzo, 120, 3);
+				Actor_Set_Goal_Number(kActorIzo, 2);
 			}
 			end = true;
 		}
 		if (answer == 1030) {
 			Dialogue_Menu_Remove_From_List(1030);
-			Actor_Says(0, 1075, 18);
-			Actor_Says(7, 260, 12);
-			Actor_Says(7, 270, 16);
-			Actor_Says(0, 1130, 14);
-			Actor_Says(7, 280, 17);
-			Actor_Says(0, 1135, 15);
-			Actor_Says(7, 290, 15);
-			Actor_Says(7, 300, 12);
-			Actor_Says(7, 310, 17);
-			Actor_Says(0, 1140, 3);
+			Actor_Says(kActorMcCoy, 1075, 18);
+			Actor_Says(kActorIzo, 260, 12);
+			Actor_Says(kActorIzo, 270, 16);
+			Actor_Says(kActorMcCoy, 1130, 14);
+			Actor_Says(kActorIzo, 280, 17);
+			Actor_Says(kActorMcCoy, 1135, 15);
+			Actor_Says(kActorIzo, 290, 15);
+			Actor_Says(kActorIzo, 300, 12);
+			Actor_Says(kActorIzo, 310, 17);
+			Actor_Says(kActorMcCoy, 1140, 3);
 			if (Query_Difficulty_Level() < 2) {
-				Actor_Modify_Friendliness_To_Other(7, 0, -2);
+				Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -2);
 			}
-			if (Actor_Query_Friendliness_To_Other(7, 0) < 47) {
-				Actor_Set_Goal_Number(7, 1);
+			if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47) {
+				Actor_Set_Goal_Number(kActorIzo, 1);
 				Player_Loses_Control();
-				Actor_Says(7, 90, 3);
-				Actor_Face_Actor(7, 0, true);
-				Actor_Says(7, 100, 3);
-				Actor_Says(7, 110, 3);
-				Actor_Says_With_Pause(0, 1050, 0.2f, 3);
-				Actor_Says(7, 120, 3);
-				Actor_Set_Goal_Number(7, 2);
+				Actor_Says(kActorIzo, 90, 3);
+				Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+				Actor_Says(kActorIzo, 100, 3);
+				Actor_Says(kActorIzo, 110, 3);
+				Actor_Says_With_Pause(kActorMcCoy, 1050, 0.2f, 3);
+				Actor_Says(kActorIzo, 120, 3);
+				Actor_Set_Goal_Number(kActorIzo, 2);
 			}
 			end = true;
 		}
 		if (answer == 1040) {
 			Dialogue_Menu_Remove_From_List(1040);
-			Actor_Says(0, 1080, 15);
-			Actor_Says(0, 1085, 17);
-			Actor_Says(7, 320, 17);
-			Actor_Says(0, 1145, 13);
-			Actor_Says(7, 330, 17);
-			Actor_Says(7, 340, 13);
-			Actor_Says(7, 350, 12);
+			Actor_Says(kActorMcCoy, 1080, 15);
+			Actor_Says(kActorMcCoy, 1085, 17);
+			Actor_Says(kActorIzo, 320, 17);
+			Actor_Says(kActorMcCoy, 1145, 13);
+			Actor_Says(kActorIzo, 330, 17);
+			Actor_Says(kActorIzo, 340, 13);
+			Actor_Says(kActorIzo, 350, 12);
 			end = true;
 		}
 		if (answer == 1050) {
 			Dialogue_Menu_Remove_From_List(1050);
-			Actor_Says(0, 1090, 18);
-			Actor_Says(7, 360, 14);
-			Actor_Says(0, 1150, 17);
-			Actor_Says(7, 370, 13);
-			Actor_Says(0, 1155, 15);
-			Actor_Says(7, 380, 12);
-			Actor_Says(0, 1160, 14);
-			Actor_Says(0, 1165, 18);
-			Actor_Says(7, 390, 16);
-			Actor_Says(0, 1170, 12);
-			Actor_Says(7, 400, 13);
-			Actor_Says(0, 1180, 14);
-			Actor_Says(7, 410, 12);
-			Actor_Says(7, 420, 16);
-			Actor_Says(7, 430, 17);
-			Actor_Says(7, 440, 13);
-			Actor_Modify_Friendliness_To_Other(7, 0, -4);
-			if (Actor_Query_Friendliness_To_Other(7, 0) < 47) {
-				Actor_Set_Goal_Number(7, 1);
+			Actor_Says(kActorMcCoy, 1090, 18);
+			Actor_Says(kActorIzo, 360, 14);
+			Actor_Says(kActorMcCoy, 1150, 17);
+			Actor_Says(kActorIzo, 370, 13);
+			Actor_Says(kActorMcCoy, 1155, 15);
+			Actor_Says(kActorIzo, 380, 12);
+			Actor_Says(kActorMcCoy, 1160, 14);
+			Actor_Says(kActorMcCoy, 1165, 18);
+			Actor_Says(kActorIzo, 390, 16);
+			Actor_Says(kActorMcCoy, 1170, 12);
+			Actor_Says(kActorIzo, 400, 13);
+			Actor_Says(kActorMcCoy, 1180, 14);
+			Actor_Says(kActorIzo, 410, 12);
+			Actor_Says(kActorIzo, 420, 16);
+			Actor_Says(kActorIzo, 430, 17);
+			Actor_Says(kActorIzo, 440, 13);
+			Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -4);
+			if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47) {
+				Actor_Set_Goal_Number(kActorIzo, 1);
 				Player_Loses_Control();
-				Actor_Says(7, 90, 3);
-				Actor_Face_Actor(7, 0, true);
-				Actor_Says(7, 100, 3);
-				Actor_Says(7, 110, 3);
-				Actor_Says_With_Pause(0, 1050, 0.2f, 3);
-				Actor_Says(7, 120, 3);
-				Actor_Set_Goal_Number(7, 2);
+				Actor_Says(kActorIzo, 90, 3);
+				Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+				Actor_Says(kActorIzo, 100, 3);
+				Actor_Says(kActorIzo, 110, 3);
+				Actor_Says_With_Pause(kActorMcCoy, 1050, 0.2f, 3);
+				Actor_Says(kActorIzo, 120, 3);
+				Actor_Set_Goal_Number(kActorIzo, 2);
 			}
 			end = true;
 		}
 		if (answer == 1060) {
 			Dialogue_Menu_Remove_From_List(1060);
-			Actor_Says(0, 1095, 15);
-			Actor_Says_With_Pause(0, 1100, 1.2f, 18);
-			Actor_Says(7, 450, 12);
-			Actor_Says(7, 460, 13);
-			Actor_Says(0, 1185, 18);
-			Actor_Says(7, 470, 14);
-			Actor_Says(0, 1190, 14);
-			Actor_Says(7, 480, 13);
-			Actor_Says(0, 1195, 16);
-			Actor_Says(0, 1200, 18);
-			Actor_Says(7, 490, 12);
-			Actor_Says(0, 1205, 14);
-			Actor_Says(7, 500, 14);
-			Actor_Says(7, 510, 17);
-			Actor_Says(7, 520, 16);
-			Actor_Says(7, 530, 15);
-			Actor_Says(0, 1210, 16);
-			Actor_Modify_Friendliness_To_Other(7, 0, -4);
-			if (Actor_Query_Friendliness_To_Other(7, 0) < 47) {
-				Actor_Set_Goal_Number(7, 1);
+			Actor_Says(kActorMcCoy, 1095, 15);
+			Actor_Says_With_Pause(kActorMcCoy, 1100, 1.2f, 18);
+			Actor_Says(kActorIzo, 450, 12);
+			Actor_Says(kActorIzo, 460, 13);
+			Actor_Says(kActorMcCoy, 1185, 18);
+			Actor_Says(kActorIzo, 470, 14);
+			Actor_Says(kActorMcCoy, 1190, 14);
+			Actor_Says(kActorIzo, 480, 13);
+			Actor_Says(kActorMcCoy, 1195, 16);
+			Actor_Says(kActorMcCoy, 1200, 18);
+			Actor_Says(kActorIzo, 490, 12);
+			Actor_Says(kActorMcCoy, 1205, 14);
+			Actor_Says(kActorIzo, 500, 14);
+			Actor_Says(kActorIzo, 510, 17);
+			Actor_Says(kActorIzo, 520, 16);
+			Actor_Says(kActorIzo, 530, 15);
+			Actor_Says(kActorMcCoy, 1210, 16);
+			Actor_Modify_Friendliness_To_Other(kActorIzo, kActorMcCoy, -4);
+			if (Actor_Query_Friendliness_To_Other(kActorIzo, kActorMcCoy) < 47) {
+				Actor_Set_Goal_Number(kActorIzo, 1);
 				Player_Loses_Control();
-				Actor_Says(7, 90, 3);
-				Actor_Face_Actor(7, 0, true);
-				Actor_Says(7, 100, 3);
-				Actor_Says(7, 110, 3);
-				Actor_Says_With_Pause(0, 1050, 0.2f, 3);
-				Actor_Says(7, 120, 3);
-				Actor_Set_Goal_Number(7, 2);
+				Actor_Says(kActorIzo, 90, 3);
+				Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+				Actor_Says(kActorIzo, 100, 3);
+				Actor_Says(kActorIzo, 110, 3);
+				Actor_Says_With_Pause(kActorMcCoy, 1050, 0.2f, 3);
+				Actor_Says(kActorIzo, 120, 3);
+				Actor_Set_Goal_Number(kActorIzo, 2);
 			}
 			end = true;
 		}
@@ -419,15 +419,15 @@ void SceneScriptHC01::sub_402384() {
 }
 
 void SceneScriptHC01::sub_40346C() {
-	Actor_Set_Goal_Number(7, 1);
+	Actor_Set_Goal_Number(kActorIzo, 1);
 	Player_Loses_Control();
-	Actor_Says(7, 90, 3);
-	Actor_Face_Actor(7, 0, true);
-	Actor_Says(7, 100, 3);
-	Actor_Says(7, 110, 3);
-	Actor_Says_With_Pause(0, 1050, 0.2f, 3);
-	Actor_Says(7, 120, 3);
-	Actor_Set_Goal_Number(7, 2);
+	Actor_Says(kActorIzo, 90, 3);
+	Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+	Actor_Says(kActorIzo, 100, 3);
+	Actor_Says(kActorIzo, 110, 3);
+	Actor_Says_With_Pause(kActorMcCoy, 1050, 0.2f, 3);
+	Actor_Says(kActorIzo, 120, 3);
+	Actor_Set_Goal_Number(kActorIzo, 2);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/hc02.cpp b/engines/bladerunner/script/scene/hc02.cpp
index e4e2ee388d..a7fe69440b 100644
--- a/engines/bladerunner/script/scene/hc02.cpp
+++ b/engines/bladerunner/script/scene/hc02.cpp
@@ -87,47 +87,47 @@ bool SceneScriptHC02::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptHC02::ClickedOnActor(int actorId) {
 	if (actorId == 32) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -150.51f, 0.14f, 62.74f, 0, 1, false, 0)) {
-			Actor_Face_Actor(0, 32, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -150.51f, 0.14f, 62.74f, 0, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorHawkersBarkeep, true);
 			if (!Game_Flag_Query(404)) {
-				Actor_Says(0, 1225, 13);
-				Actor_Says_With_Pause(32, 0, 0.0f, 13);
-				Actor_Says(32, 10, 16);
-				Actor_Set_Goal_Number(32, 1);
-				Actor_Change_Animation_Mode(0, 23);
+				Actor_Says(kActorMcCoy, 1225, 13);
+				Actor_Says_With_Pause(kActorHawkersBarkeep, 0, 0.0f, 13);
+				Actor_Says(kActorHawkersBarkeep, 10, 16);
+				Actor_Set_Goal_Number(kActorHawkersBarkeep, 1);
+				Actor_Change_Animation_Mode(kActorMcCoy, 23);
 				Delay(1500);
-				Actor_Change_Animation_Mode(0, 75);
+				Actor_Change_Animation_Mode(kActorMcCoy, 75);
 				Delay(1500);
 				Global_Variable_Increment(42, 1);
 				Game_Flag_Set(404);
-			} else if (Actor_Clue_Query(0, 254) && !Actor_Clue_Query(0, 257)) {
-				Actor_Says(0, 4545, 11);
-				Actor_Says(32, 120, 12);
-				Actor_Says(32, 180, 13);
-				Actor_Clue_Acquire(0, 257, 1, 32);
+			} else if (Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityCamera) && !Actor_Clue_Query(kActorMcCoy, kClueChinaBarSecurityDisc)) {
+				Actor_Says(kActorMcCoy, 4545, 11);
+				Actor_Says(kActorHawkersBarkeep, 120, 12);
+				Actor_Says(kActorHawkersBarkeep, 180, 13);
+				Actor_Clue_Acquire(kActorMcCoy, kClueChinaBarSecurityDisc, 1, kActorHawkersBarkeep);
 				Item_Pickup_Spin_Effect(975, 229, 215);
-			} else if (Actor_Clue_Query(0, 122) && !Actor_Clue_Query(0, 131) && (Global_Variable_Query(2) > 20 || Query_Difficulty_Level() == 0)) {
-				Actor_Clue_Acquire(0, 131, 1, 32);
-				Actor_Says(0, 1230, 13);
-				Actor_Says(32, 20, 12);
-				Actor_Says(0, 1235, 13);
-				Actor_Says(32, 30, 15);
-				Actor_Says(0, 1240, 13);
-				Actor_Says(32, 40, 14);
+			} else if (Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview1) && !Actor_Clue_Query(kActorMcCoy, kClueFlaskOfAbsinthe) && (Global_Variable_Query(2) > 20 || Query_Difficulty_Level() == 0)) {
+				Actor_Clue_Acquire(kActorMcCoy, kClueFlaskOfAbsinthe, 1, kActorHawkersBarkeep);
+				Actor_Says(kActorMcCoy, 1230, 13);
+				Actor_Says(kActorHawkersBarkeep, 20, 12);
+				Actor_Says(kActorMcCoy, 1235, 13);
+				Actor_Says(kActorHawkersBarkeep, 30, 15);
+				Actor_Says(kActorMcCoy, 1240, 13);
+				Actor_Says(kActorHawkersBarkeep, 40, 14);
 				Item_Pickup_Spin_Effect(945, 229, 215);
-				Actor_Set_Goal_Number(32, 2);
-				Actor_Change_Animation_Mode(0, 23);
+				Actor_Set_Goal_Number(kActorHawkersBarkeep, 2);
+				Actor_Change_Animation_Mode(kActorMcCoy, 23);
 				Delay(1500);
-				Actor_Says_With_Pause(32, 50, 1.6f, 17);
+				Actor_Says_With_Pause(kActorHawkersBarkeep, 50, 1.6f, 17);
 				if (Query_Difficulty_Level() != 0) {
 					Global_Variable_Decrement(2, 20);
 				}
-				Actor_Says(0, 1245, 13);
+				Actor_Says(kActorMcCoy, 1245, 13);
 			} else {
-				if (Actor_Clue_Query(0, 75)  && !Game_Flag_Query(405)) {
-					Actor_Says(32, 80, 16);
-					Actor_Says(0, 1265, 13);
-					Actor_Says(32, 90, 13);
+				if (Actor_Clue_Query(kActorMcCoy, kClueMaggieBracelet)  && !Game_Flag_Query(405)) {
+					Actor_Says(kActorHawkersBarkeep, 80, 16);
+					Actor_Says(kActorMcCoy, 1265, 13);
+					Actor_Says(kActorHawkersBarkeep, 90, 13);
 					Game_Flag_Set(405);
 				}
 				if (Global_Variable_Query(2) > 5 || Query_Difficulty_Level() == 0) {
@@ -135,17 +135,17 @@ bool SceneScriptHC02::ClickedOnActor(int actorId) {
 						Global_Variable_Decrement(2, 5);
 					}
 					Global_Variable_Increment(42, 1);
-					Actor_Says(0, 1250, 13);
-					Actor_Says_With_Pause(32, 60, 0.8f, 14);
-					Actor_Says(0, 1255, 13);
-					Actor_Set_Goal_Number(32, 1);
-					Actor_Change_Animation_Mode(0, 23);
+					Actor_Says(kActorMcCoy, 1250, 13);
+					Actor_Says_With_Pause(kActorHawkersBarkeep, 60, 0.8f, 14);
+					Actor_Says(kActorMcCoy, 1255, 13);
+					Actor_Set_Goal_Number(kActorHawkersBarkeep, 1);
+					Actor_Change_Animation_Mode(kActorMcCoy, 23);
 					Delay(1500);
-					Actor_Change_Animation_Mode(0, 75);
+					Actor_Change_Animation_Mode(kActorMcCoy, 75);
 					Delay(1500);
 				} else {
-					Actor_Says_With_Pause(0, 1260, 0.3f, 13);
-					Actor_Says(32, 70, 14);
+					Actor_Says_With_Pause(kActorMcCoy, 1260, 0.3f, 13);
+					Actor_Says(kActorHawkersBarkeep, 70, 14);
 				}
 			}
 		}
@@ -160,7 +160,7 @@ bool SceneScriptHC02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHC02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 7.0f, 0.14f, 79.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 7.0f, 0.14f, 79.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(385);
@@ -169,11 +169,11 @@ bool SceneScriptHC02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -76.0f, 0.14f, -339.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.0f, 0.14f, -339.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(110);
-			Async_Actor_Walk_To_XYZ(0, -88.0f, 0.14f, -463.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -88.0f, 0.14f, -463.0f, 0, false);
 			Set_Enter(8, 106);
 		}
 		return true;
@@ -202,7 +202,7 @@ void SceneScriptHC02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptHC02::PlayerWalkedIn() {
 	if (Game_Flag_Query(109)) {
-		Loop_Actor_Walk_To_XYZ(0, -76.0f, 0.14f, -339.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.0f, 0.14f, -339.0f, 0, 0, false, 0);
 		Game_Flag_Reset(109);
 	}
 }
diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp
index 8758e3eff4..81007ce8b6 100644
--- a/engines/bladerunner/script/scene/hc03.cpp
+++ b/engines/bladerunner/script/scene/hc03.cpp
@@ -105,7 +105,7 @@ bool SceneScriptHC03::ClickedOnItem(int itemId, bool a2) {
 			Item_Remove_From_World(121);
 			Unobstacle_Object("GPscisGate", true);
 		} else {
-			Actor_Says(0, 8522, 12);
+			Actor_Says(kActorMcCoy, 8522, 12);
 		}
 		return true;
 	}
@@ -117,11 +117,11 @@ bool SceneScriptHC03::ClickedOnItem(int itemId, bool a2) {
 		Delay(1500);
 		Item_Pickup_Spin_Effect(984, 58, 435);
 		if (Game_Flag_Query(374)) {
-			Actor_Clue_Acquire(0, 246, 1, 7);
+			Actor_Clue_Acquire(kActorMcCoy, kCluePhotoOfMcCoy1, 1, kActorIzo);
 		} else {
-			Actor_Clue_Acquire(0, 247, 1, 7);
+			Actor_Clue_Acquire(kActorMcCoy, kCluePhotoOfMcCoy2, 1, kActorIzo);
 		}
-		Actor_Clue_Acquire(0, 260, 1, 7);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChinaBar, 1, kActorIzo);
 		return true;
 	}
 	return false;
@@ -129,14 +129,14 @@ bool SceneScriptHC03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHC03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 607.0f, 0.14f, 9.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 607.0f, 0.14f, 9.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(387);
 			Set_Enter(8, 31);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 628.0f, 2.04f, -123.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 628.0f, 2.04f, -123.0f, 0, 1, false, 0)) {
 			if (Game_Flag_Query(388)) {
 				Game_Flag_Set(319);
 				Game_Flag_Reset(479);
diff --git a/engines/bladerunner/script/scene/hc04.cpp b/engines/bladerunner/script/scene/hc04.cpp
index 5f22cdd40c..126d5c3c4f 100644
--- a/engines/bladerunner/script/scene/hc04.cpp
+++ b/engines/bladerunner/script/scene/hc04.cpp
@@ -32,8 +32,8 @@ void SceneScriptHC04::InitializeScene() {
 		Setup_Scene_Information(-88.0f, 0.14f, -463.0f, 1013);
 	}
 	Music_Play(4, 14, -90, 1, -1, 1, 2);
-	Actor_Put_In_Set(59, 8);
-	Actor_Set_At_XYZ(59, -210.0f, 0.0f, -445.0f, 250);
+	Actor_Put_In_Set(kActorIsabella, 8);
+	Actor_Set_At_XYZ(kActorIsabella, -210.0f, 0.0f, -445.0f, 250);
 	Scene_Exit_Add_2D_Exit(0, 539, 51, 639, 309, 0);
 	Scene_Exit_Add_2D_Exit(1, 0, 456, 639, 479, 2);
 	Ambient_Sounds_Add_Looping_Sound(103, 50, 50, 0);
@@ -83,17 +83,17 @@ bool SceneScriptHC04::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptHC04::ClickedOnActor(int actorId) {
-	if (actorId == 59) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -155.0f, 0.0f, -475.0f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 59, true);
-			Actor_Face_Actor(59, 0, true);
+	if (actorId == kActorIsabella) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -155.0f, 0.0f, -475.0f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorIsabella, true);
+			Actor_Face_Actor(kActorIsabella, kActorMcCoy, true);
 			if (Game_Flag_Query(106)) {
 				sub_401B90();
 				return true;
 			} else {
-				Actor_Says(59, 0, 3);
-				Actor_Says(0, 1280, 3);
-				Actor_Says(59, 20, 3);
+				Actor_Says(kActorIsabella, 0, 3);
+				Actor_Says(kActorMcCoy, 1280, 3);
+				Actor_Says(kActorIsabella, 20, 3);
 				Game_Flag_Set(106);
 				return true;
 			}
@@ -108,7 +108,7 @@ bool SceneScriptHC04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHC04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -108.0f, 0.14f, -639.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -108.0f, 0.14f, -639.0f, 0, 1, false, 0)) {
 			Music_Stop(2);
 			Game_Flag_Set(107);
 			Game_Flag_Reset(479);
@@ -118,7 +118,7 @@ bool SceneScriptHC04::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -72.0f, 0.14f, -399.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -72.0f, 0.14f, -399.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(109);
 			Set_Enter(8, 32);
 		}
@@ -150,18 +150,18 @@ void SceneScriptHC04::DialogueQueueFlushed(int a1) {
 
 void SceneScriptHC04::sub_401B90() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 263) || Actor_Clue_Query(0, 53)) {
-		if (Actor_Clue_Query(0, 47)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueKingstonKitchenBox2) || Actor_Clue_Query(kActorMcCoy, kClueKingstonKitchenBox1)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueBombingSuspect)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(340, 5, 6, 5);
-		} else if (Actor_Clue_Query(0, 259)) {
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueTyrellSecurityPhoto)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(350, 5, 6, 5);
 		}
 		DM_Add_To_List_Never_Repeat_Once_Selected(360, 6, 4, 3);
 	}
-	if (Actor_Clue_Query(0, 87) && !Actor_Clue_Query(0, 101)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueCheese) && !Actor_Clue_Query(kActorMcCoy, kClueSpecialIngredient)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(370, 3, 4, 7);
 	}
-	if (Actor_Clue_Query(0, 101)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueSpecialIngredient)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(380, -1, 5, 8);
 	}
 	DM_Add_To_List_Never_Repeat_Once_Selected(390, 7, 5, -1);
@@ -171,70 +171,70 @@ void SceneScriptHC04::sub_401B90() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 340:
-		Actor_Says(0, 1285, 3);
-		Actor_Says(59, 50, 3);
-		Actor_Says(0, 1330, 3);
-		Actor_Says(59, 60, 3);
+		Actor_Says(kActorMcCoy, 1285, 3);
+		Actor_Says(kActorIsabella, 50, 3);
+		Actor_Says(kActorMcCoy, 1330, 3);
+		Actor_Says(kActorIsabella, 60, 3);
 		break;
 	case 350:
-		Actor_Says(0, 1290, 3);
-		Actor_Says(59, 70, 3);
-		Actor_Says(0, 1335, 3);
-		Actor_Says(59, 80, 3);
-		Actor_Says(0, 1340, 3);
-		Actor_Says(59, 90, 3);
-		Actor_Says(0, 1345, 3);
+		Actor_Says(kActorMcCoy, 1290, 3);
+		Actor_Says(kActorIsabella, 70, 3);
+		Actor_Says(kActorMcCoy, 1335, 3);
+		Actor_Says(kActorIsabella, 80, 3);
+		Actor_Says(kActorMcCoy, 1340, 3);
+		Actor_Says(kActorIsabella, 90, 3);
+		Actor_Says(kActorMcCoy, 1345, 3);
 		break;
 	case 360:
-		Actor_Says(0, 1295, 3);
-		Actor_Says(59, 100, 3);
-		Actor_Says(0, 1350, 3);
-		Actor_Says(59, 110, 3);
-		Actor_Says(0, 1355, 3);
-		Actor_Says(59, 130, 3);
-		Actor_Says(0, 1360, 3);
+		Actor_Says(kActorMcCoy, 1295, 3);
+		Actor_Says(kActorIsabella, 100, 3);
+		Actor_Says(kActorMcCoy, 1350, 3);
+		Actor_Says(kActorIsabella, 110, 3);
+		Actor_Says(kActorMcCoy, 1355, 3);
+		Actor_Says(kActorIsabella, 130, 3);
+		Actor_Says(kActorMcCoy, 1360, 3);
 		break;
 	case 370:
-		Actor_Says(0, 1300, 3);
-		Actor_Says(59, 140, 3);
-		Actor_Says(0, 1365, 3);
-		Actor_Says(59, 150, 3);
+		Actor_Says(kActorMcCoy, 1300, 3);
+		Actor_Says(kActorIsabella, 140, 3);
+		Actor_Says(kActorMcCoy, 1365, 3);
+		Actor_Says(kActorIsabella, 150, 3);
 		break;
 	case 380:
-		Actor_Says(0, 1305, 3);
-		Actor_Modify_Friendliness_To_Other(59, 0, -2);
-		Actor_Says(59, 160, 3);
-		Actor_Says(0, 1370, 3);
-		Actor_Says(59, 170, 3);
-		Actor_Says(0, 1375, 3);
-		Actor_Says(59, 180, 3);
-		Actor_Says(0, 1380, 3);
-		Actor_Says(59, 190, 3);
-		Actor_Says(59, 210, 3);
-		Actor_Says(59, 240, 3);
-		Actor_Says(0, 1385, 3);
-		Actor_Says(59, 260, 3);
-		Actor_Says(0, 1390, 3);
-		Actor_Says(59, 300, 3);
-		Actor_Says(59, 310, 3);
-		Actor_Says(59, 320, 3);
-		Actor_Says(0, 1395, 3);
-		Actor_Says(59, 330, 3);
-		Actor_Clue_Acquire(0, 102, 0, 59);
+		Actor_Says(kActorMcCoy, 1305, 3);
+		Actor_Modify_Friendliness_To_Other(kActorIsabella, kActorMcCoy, -2);
+		Actor_Says(kActorIsabella, 160, 3);
+		Actor_Says(kActorMcCoy, 1370, 3);
+		Actor_Says(kActorIsabella, 170, 3);
+		Actor_Says(kActorMcCoy, 1375, 3);
+		Actor_Says(kActorIsabella, 180, 3);
+		Actor_Says(kActorMcCoy, 1380, 3);
+		Actor_Says(kActorIsabella, 190, 3);
+		Actor_Says(kActorIsabella, 210, 3);
+		Actor_Says(kActorIsabella, 240, 3);
+		Actor_Says(kActorMcCoy, 1385, 3);
+		Actor_Says(kActorIsabella, 260, 3);
+		Actor_Says(kActorMcCoy, 1390, 3);
+		Actor_Says(kActorIsabella, 300, 3);
+		Actor_Says(kActorIsabella, 310, 3);
+		Actor_Says(kActorIsabella, 320, 3);
+		Actor_Says(kActorMcCoy, 1395, 3);
+		Actor_Says(kActorIsabella, 330, 3);
+		Actor_Clue_Acquire(kActorMcCoy, kClueStolenCheese, 0, kActorIsabella);
 		break;
 	case 390:
-		Actor_Says(0, 1310, 3);
-		Actor_Modify_Friendliness_To_Other(59, 0, 2);
-		Actor_Says(59, 340, 3);
+		Actor_Says(kActorMcCoy, 1310, 3);
+		Actor_Modify_Friendliness_To_Other(kActorIsabella, kActorMcCoy, 2);
+		Actor_Says(kActorIsabella, 340, 3);
 		break;
 	case 400:
-		Actor_Says(0, 1315, 3);
+		Actor_Says(kActorMcCoy, 1315, 3);
 		break;
 	default:
-		Actor_Says(0, 1320, 3);
-		Actor_Says(59, 30, 3);
-		Actor_Says(0, 1325, 3);
-		Actor_Says(0, 1345, 3);
+		Actor_Says(kActorMcCoy, 1320, 3);
+		Actor_Says(kActorIsabella, 30, 3);
+		Actor_Says(kActorMcCoy, 1325, 3);
+		Actor_Says(kActorMcCoy, 1345, 3);
 		break;
 	}
 }
diff --git a/engines/bladerunner/script/scene/hf01.cpp b/engines/bladerunner/script/scene/hf01.cpp
index 9e5220ff82..a1560f1944 100644
--- a/engines/bladerunner/script/scene/hf01.cpp
+++ b/engines/bladerunner/script/scene/hf01.cpp
@@ -91,34 +91,34 @@ bool SceneScriptHF01::ClickedOn3DObject(const char *objectName, bool a2) {
 bool SceneScriptHF01::ClickedOnActor(int actorId) {
 	int v1;
 	if (Global_Variable_Query(45) == 2) {
-		v1 = 3;
+		v1 = kActorDektora;
 	} else if (Global_Variable_Query(45) == 3) {
-		v1 = 6;
+		v1 = kActorLucy;
 	} else {
 		v1 = -1;
 	}
-	if (actorId == 22 || actorId == 31) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 504.04f, 8.0f, -242.17f, 12, 1, false, 0)) {
+	if (actorId == kActorMia || actorId == kActorMurray) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 504.04f, 8.0f, -242.17f, 12, 1, false, 0)) {
 			ADQ_Flush();
-			Actor_Face_Actor(0, 31, true);
+			Actor_Face_Actor(kActorMcCoy, kActorMurray, true);
 			if (Game_Flag_Query(382)) {
 				sub_4026B4();
 			} else {
-				Actor_Says(0, 1455, 15);
-				Actor_Says(31, 40, 13);
-				Actor_Says(0, 1460, 13);
-				Actor_Says(31, 50, 12);
+				Actor_Says(kActorMcCoy, 1455, 15);
+				Actor_Says(kActorMurray, 40, 13);
+				Actor_Says(kActorMcCoy, 1460, 13);
+				Actor_Says(kActorMurray, 50, 12);
 				Item_Pickup_Spin_Effect(951, 396, 359);
-				Actor_Face_Heading(31, 271, false);
-				Actor_Says(31, 60, 12);
-				Actor_Says(0, 1465, 15);
-				Actor_Face_Actor(31, 0, true);
-				Actor_Says(31, 70, 13);
-				Actor_Says(0, 1470, 14);
-				Actor_Says(22, 30, 3);
-				Actor_Says(31, 80, 15);
-				Actor_Says(22, 50, 3);
-				Actor_Says(31, 110, 14);
+				Actor_Face_Heading(kActorMurray, 271, false);
+				Actor_Says(kActorMurray, 60, 12);
+				Actor_Says(kActorMcCoy, 1465, 15);
+				Actor_Face_Actor(kActorMurray, kActorMcCoy, true);
+				Actor_Says(kActorMurray, 70, 13);
+				Actor_Says(kActorMcCoy, 1470, 14);
+				Actor_Says(kActorMia, 30, 3);
+				Actor_Says(kActorMurray, 80, 15);
+				Actor_Says(kActorMia, 50, 3);
+				Actor_Says(kActorMurray, 110, 14);
 				Game_Flag_Set(382);
 			}
 			return true;
@@ -126,22 +126,22 @@ bool SceneScriptHF01::ClickedOnActor(int actorId) {
 		return false;
 	}
 	if (actorId == v1) {
-		if (!Loop_Actor_Walk_To_Actor(0, actorId, 28, 1, false)) {
+		if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, actorId, 28, 1, false)) {
 			if (Actor_Query_Goal_Number(v1) == 599) {
-				Actor_Says(0, 8630, 13);
+				Actor_Says(kActorMcCoy, 8630, 13);
 				return true;
 			}
-			if (Global_Variable_Query(1) == 5 && (Actor_Clue_Query(0, 139) || Actor_Clue_Query(0, 141)) && !Game_Flag_Query(165) && Actor_Query_Goal_Number(9) != 2 && Game_Flag_Query(653) && !Game_Flag_Query(662)) {
+			if (Global_Variable_Query(1) == 5 && (Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora1) || Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy1)) && !Game_Flag_Query(165) && Actor_Query_Goal_Number(kActorCrazylegs) != 2 && Game_Flag_Query(653) && !Game_Flag_Query(662)) {
 				Game_Flag_Set(662);
-				Actor_Face_Actor(0, v1, true);
-				Actor_Face_Actor(v1, 0, true);
-				if (v1 == 3) {
+				Actor_Face_Actor(kActorMcCoy, v1, true);
+				Actor_Face_Actor(v1, kActorMcCoy, true);
+				if (v1 == kActorDektora) {
 					sub_4032DC();
-				} else if (v1 == 6) {
+				} else if (v1 == kActorLucy) {
 					sub_403484();
 				}
 				Async_Actor_Walk_To_XYZ(v1, -175.0f, 8.0f, -617.0f, 0, false);
-				Loop_Actor_Walk_To_XYZ(0, -137.0f, 8.0f, -577.0f, 0, 0, false, 1);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -137.0f, 8.0f, -577.0f, 0, 0, false, 1);
 				Game_Flag_Set(312);
 				Set_Enter(41, 38);
 			}
@@ -156,30 +156,30 @@ bool SceneScriptHF01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHF01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -202.0f, 8.0f, -619.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -202.0f, 8.0f, -619.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(312);
 			Set_Enter(41, 38);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 124.0f, 8.0f, -724.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 124.0f, 8.0f, -880.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 8.0f, -724.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 8.0f, -880.0f, 0, 0, false, 0);
 			Game_Flag_Set(310);
 			Set_Enter(39, 36);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 406.0f, 8.0f, -717.0f, 0, 1, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, 406.0f, 8.0f, -813.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 406.0f, 8.0f, -717.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 406.0f, 8.0f, -813.0f, 0, 0, false, 0);
 			Game_Flag_Set(308);
 			Set_Enter(38, 35);
 		}
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 100.0f, 0.0f, -260.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 100.0f, 0.0f, -260.0f, 0, 1, false, 0)) {
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
 			Game_Flag_Reset(179);
@@ -253,7 +253,7 @@ bool SceneScriptHF01::ClickedOnExit(int exitId) {
 				break;
 			default:
 				Game_Flag_Set(257);
-				Loop_Actor_Walk_To_XYZ(0, 100.0f, 0.0f, -300.0f, 0, 1, false, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, 100.0f, 0.0f, -300.0f, 0, 1, false, 0);
 				break;
 			}
 		}
@@ -279,8 +279,8 @@ void SceneScriptHF01::SceneFrameAdvanced(int frame) {
 	if (frame == 242) {
 		Sound_Play(117, 40, -50, 80, 50);
 	}
-	if (Actor_Query_Goal_Number(31) == 1) {
-		Actor_Set_Goal_Number(31, 0);
+	if (Actor_Query_Goal_Number(kActorMurray) == 1) {
+		Actor_Set_Goal_Number(kActorMurray, 0);
 	}
 }
 
@@ -290,56 +290,56 @@ void SceneScriptHF01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptHF01::PlayerWalkedIn() {
 	if (Game_Flag_Query(663)) {
 		ADQ_Flush();
-		ADQ_Add(24, 280, 3);
-		Actor_Put_In_Set(23, 37);
-		Actor_Set_At_XYZ(23, 8.2f, 8.0f, -346.67f, 1021);
-		Actor_Put_In_Set(24, 37);
-		Actor_Set_At_XYZ(24, 51.21f, 8.0f, -540.78f, 796);
-		Non_Player_Actor_Combat_Mode_On(23, 3, 1, 0, 4, 4, 7, 8, 0, 0, 0, 100, 300, 0);
-		Non_Player_Actor_Combat_Mode_On(24, 3, 1, 0, 4, 4, 7, 8, 0, 0, 0, 100, 300, 0);
+		ADQ_Add(kActorOfficerGrayford, 280, 3);
+		Actor_Put_In_Set(kActorOfficerLeary, 37);
+		Actor_Set_At_XYZ(kActorOfficerLeary, 8.2f, 8.0f, -346.67f, 1021);
+		Actor_Put_In_Set(kActorOfficerGrayford, 37);
+		Actor_Set_At_XYZ(kActorOfficerGrayford, 51.21f, 8.0f, -540.78f, 796);
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 3, 1, kActorMcCoy, 4, 4, 7, 8, 0, 0, 0, 100, 300, 0);
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, 3, 1, kActorMcCoy, 4, 4, 7, 8, 0, 0, 0, 100, 300, 0);
 	}
-	if (!Game_Flag_Query(165) && Actor_Query_Goal_Number(9) != 2) {
-		if (Actor_Clue_Query(0, 141) && Global_Variable_Query(45) == 3 && Actor_Query_Goal_Number(6) != 599) {
-			Actor_Put_In_Set(6, 37);
-			Actor_Set_At_XYZ(6, -5.0f, 8.0f, -622.0f, 419);
-			Actor_Set_Targetable(6, true);
-		} else if (Actor_Clue_Query(0, 139) && Global_Variable_Query(45) == 2 && Actor_Query_Goal_Number(3) != 599) {
-			Actor_Put_In_Set(3, 37);
-			Actor_Set_At_XYZ(3, -5.0f, 8.0f, -622.0f, 419);
-			Actor_Set_Targetable(3, true);
+	if (!Game_Flag_Query(165) && Actor_Query_Goal_Number(kActorCrazylegs) != 2) {
+		if (Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy1) && Global_Variable_Query(45) == 3 && Actor_Query_Goal_Number(kActorLucy) != 599) {
+			Actor_Put_In_Set(kActorLucy, 37);
+			Actor_Set_At_XYZ(kActorLucy, -5.0f, 8.0f, -622.0f, 419);
+			Actor_Set_Targetable(kActorLucy, true);
+		} else if (Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora1) && Global_Variable_Query(45) == 2 && Actor_Query_Goal_Number(kActorDektora) != 599) {
+			Actor_Put_In_Set(kActorDektora, 37);
+			Actor_Set_At_XYZ(kActorDektora, -5.0f, 8.0f, -622.0f, 419);
+			Actor_Set_Targetable(kActorDektora, true);
 		}
 	}
 	if (Game_Flag_Query(617)) {
-		Actor_Set_Goal_Number(1, 280);
+		Actor_Set_Goal_Number(kActorSteele, 280);
 		Game_Flag_Reset(617);
 		//return true;
 		return;
 	}
 	if (Game_Flag_Query(652)) {
 		Game_Flag_Reset(652);
-		Actor_Voice_Over(950, 99);
-		Actor_Voice_Over(960, 99);
-		Actor_Voice_Over(970, 99);
-		Actor_Voice_Over(980, 99);
+		Actor_Voice_Over(950, kActorVoiceOver);
+		Actor_Voice_Over(960, kActorVoiceOver);
+		Actor_Voice_Over(970, kActorVoiceOver);
+		Actor_Voice_Over(980, kActorVoiceOver);
 	} else if (!Game_Flag_Query(377) && Global_Variable_Query(1) < 4) {
 		ADQ_Flush();
-		ADQ_Add(31, 0, 14);
-		ADQ_Add(31, 10, 3);
-		ADQ_Add(22, 0, 3);
-		Actor_Face_Actor(31, 22, true);
-		ADQ_Add(31, 20, 13);
-		ADQ_Add(22, 10, 3);
-		ADQ_Add(31, 30, 3);
-		ADQ_Add(22, 20, 3);
-		Actor_Face_Heading(31, 271, false);
+		ADQ_Add(kActorMurray, 0, 14);
+		ADQ_Add(kActorMurray, 10, 3);
+		ADQ_Add(kActorMia, 0, 3);
+		Actor_Face_Actor(kActorMurray, kActorMia, true);
+		ADQ_Add(kActorMurray, 20, 13);
+		ADQ_Add(kActorMia, 10, 3);
+		ADQ_Add(kActorMurray, 30, 3);
+		ADQ_Add(kActorMia, 20, 3);
+		Actor_Face_Heading(kActorMurray, 271, false);
 		Game_Flag_Set(377);
 	}
 	if (Game_Flag_Query(311)) {
-		Loop_Actor_Walk_To_XYZ(0, 124.0f, 8.0f, -724.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 124.0f, 8.0f, -724.0f, 0, 1, false, 0);
 	} else if (Game_Flag_Query(309)) {
-		Loop_Actor_Walk_To_XYZ(0, 406.0f, 8.0f, -717.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 406.0f, 8.0f, -717.0f, 0, 1, false, 0);
 	} else if (!Game_Flag_Query(313)) {
-		Loop_Actor_Walk_To_XYZ(0, 100.0f, 0.0f, -300.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 100.0f, 0.0f, -300.0f, 0, 1, false, 0);
 	}
 	Game_Flag_Reset(311);
 	Game_Flag_Reset(309);
@@ -357,15 +357,15 @@ void SceneScriptHF01::PlayerWalkedOut() {
 		Outtake_Play(38, 1, -1);
 	}
 	Game_Flag_Reset(722);
-	if (Actor_Query_Goal_Number(6) == 450) {
-		Actor_Put_In_Set(6, 97);
-		Actor_Set_At_Waypoint(6, 39, 0);
-		Actor_Set_Goal_Number(6, 599);
+	if (Actor_Query_Goal_Number(kActorLucy) == 450) {
+		Actor_Put_In_Set(kActorLucy, 97);
+		Actor_Set_At_Waypoint(kActorLucy, 39, 0);
+		Actor_Set_Goal_Number(kActorLucy, 599);
 	}
-	if (Actor_Query_Goal_Number(3) == 450) {
-		Actor_Put_In_Set(3, 97);
-		Actor_Set_At_Waypoint(3, 39, 0);
-		Actor_Set_Goal_Number(3, 599);
+	if (Actor_Query_Goal_Number(kActorDektora) == 450) {
+		Actor_Put_In_Set(kActorDektora, 97);
+		Actor_Set_At_Waypoint(kActorDektora, 39, 0);
+		Actor_Set_Goal_Number(kActorDektora, 599);
 	}
 }
 
@@ -374,16 +374,16 @@ void SceneScriptHF01::DialogueQueueFlushed(int a1) {
 
 void SceneScriptHF01::sub_4026B4() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 13) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueLucy) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(440, 8, 6, 3);
 	}
-	if (!Actor_Clue_Query(0, 13) && Actor_Clue_Query(0, 22) == 1) {
+	if (!Actor_Clue_Query(kActorMcCoy, kClueLucy) && Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(450, 7, 6, 3);
 	}
-	if (Actor_Clue_Query(0, 87) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueCheese) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(460, 3, 5, 6);
 	}
-	if (Actor_Clue_Query(0, 118) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueLichenDogWrapper) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(470, -1, 3, 8);
 	}
 	Dialogue_Menu_Add_DONE_To_List(480);
@@ -392,84 +392,84 @@ void SceneScriptHF01::sub_4026B4() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 440:
-		Actor_Says(0, 1480, 15);
-		Actor_Says(22, 70, 3);
-		Actor_Says(31, 120, 3);
-		Actor_Says(0, 1505, 14);
-		Actor_Says(22, 80, 3);
-		Actor_Says(31, 130, 3);
-		Actor_Says(22, 90, 3);
-		Actor_Says(0, 1510, 12);
+		Actor_Says(kActorMcCoy, 1480, 15);
+		Actor_Says(kActorMia, 70, 3);
+		Actor_Says(kActorMurray, 120, 3);
+		Actor_Says(kActorMcCoy, 1505, 14);
+		Actor_Says(kActorMia, 80, 3);
+		Actor_Says(kActorMurray, 130, 3);
+		Actor_Says(kActorMia, 90, 3);
+		Actor_Says(kActorMcCoy, 1510, 12);
 		break;
 	case 450:
-		Actor_Says(0, 1485, 16);
-		Actor_Says(22, 100, 3);
-		Actor_Says(31, 140, 12);
-		Actor_Says(22, 110, 3);
-		Actor_Says(22, 120, 3);
-		Actor_Says(31, 150, 14);
+		Actor_Says(kActorMcCoy, 1485, 16);
+		Actor_Says(kActorMia, 100, 3);
+		Actor_Says(kActorMurray, 140, 12);
+		Actor_Says(kActorMia, 110, 3);
+		Actor_Says(kActorMia, 120, 3);
+		Actor_Says(kActorMurray, 150, 14);
 		break;
 	case 460:
-		Actor_Says(0, 1490, 13);
-		Actor_Says(31, 160, 15);
-		Actor_Says(22, 130, 13);
-		Actor_Says(31, 170, 12);
-		Actor_Says(31, 180, 13);
-		Actor_Says(31, 190, 14);
-		Actor_Says(0, 1515, 15);
-		Actor_Says(31, 200, 3);
-		Actor_Says(0, 1520, 15);
-		Actor_Says(31, 210, 13);
-		Actor_Says(31, 220, 13);
-		Actor_Says(22, 140, 12);
-		Actor_Says(31, 230, 13);
-		Actor_Clue_Acquire(0, 101, 0, 31);
+		Actor_Says(kActorMcCoy, 1490, 13);
+		Actor_Says(kActorMurray, 160, 15);
+		Actor_Says(kActorMia, 130, 13);
+		Actor_Says(kActorMurray, 170, 12);
+		Actor_Says(kActorMurray, 180, 13);
+		Actor_Says(kActorMurray, 190, 14);
+		Actor_Says(kActorMcCoy, 1515, 15);
+		Actor_Says(kActorMurray, 200, 3);
+		Actor_Says(kActorMcCoy, 1520, 15);
+		Actor_Says(kActorMurray, 210, 13);
+		Actor_Says(kActorMurray, 220, 13);
+		Actor_Says(kActorMia, 140, 12);
+		Actor_Says(kActorMurray, 230, 13);
+		Actor_Clue_Acquire(kActorMcCoy, kClueSpecialIngredient, 0, kActorMurray);
 		break;
 	case 470:
-		Actor_Says(0, 1495, 14);
-		Actor_Face_Actor(31, 0, true);
-		Actor_Says(31, 240, 13);
-		Actor_Face_Actor(31, 22, true);
+		Actor_Says(kActorMcCoy, 1495, 14);
+		Actor_Face_Actor(kActorMurray, kActorMcCoy, true);
+		Actor_Says(kActorMurray, 240, 13);
+		Actor_Face_Actor(kActorMurray, kActorMia, true);
 		break;
 	case 480:
-		Actor_Says(0, 1500, 16);
+		Actor_Says(kActorMcCoy, 1500, 16);
 		break;
 	}
 }
 
 void SceneScriptHF01::sub_4032DC() {
-	Actor_Says(3, 0, 3);
-	Actor_Says(0, 1400, 3);
-	Actor_Says(3, 10, 3);
-	Actor_Says(0, 1405, 3);
-	Actor_Says(3, 20, 3);
-	Actor_Says(0, 1410, 3);
-	Actor_Says(3, 30, 3);
-	Actor_Says(0, 1415, 3);
-	Actor_Says(3, 40, 3);
-	Actor_Says(3, 50, 3);
-	Actor_Says(3, 60, 3);
-	Actor_Says(3, 70, 3);
-	Actor_Says(0, 1420, 3);
-	Actor_Says(3, 80, 3);
+	Actor_Says(kActorDektora, 0, 3);
+	Actor_Says(kActorMcCoy, 1400, 3);
+	Actor_Says(kActorDektora, 10, 3);
+	Actor_Says(kActorMcCoy, 1405, 3);
+	Actor_Says(kActorDektora, 20, 3);
+	Actor_Says(kActorMcCoy, 1410, 3);
+	Actor_Says(kActorDektora, 30, 3);
+	Actor_Says(kActorMcCoy, 1415, 3);
+	Actor_Says(kActorDektora, 40, 3);
+	Actor_Says(kActorDektora, 50, 3);
+	Actor_Says(kActorDektora, 60, 3);
+	Actor_Says(kActorDektora, 70, 3);
+	Actor_Says(kActorMcCoy, 1420, 3);
+	Actor_Says(kActorDektora, 80, 3);
 }
 
 void SceneScriptHF01::sub_403484() {
-	Actor_Says(6, 0, 3);
-	Actor_Says(0, 1425, 3);
-	Actor_Says(6, 10, 3);
-	Actor_Says(6, 20, 3);
-	Actor_Says(0, 1430, 3);
-	Actor_Says(6, 30, 3);
-	Actor_Says(0, 1435, 3);
-	Actor_Says(6, 40, 3);
-	Actor_Says(6, 50, 3);
-	Actor_Says(0, 1440, 3);
-	Actor_Says(6, 60, 3);
-	Actor_Says(6, 70, 3);
-	Actor_Says(0, 1445, 3);
-	Actor_Says(6, 80, 3);
-	Actor_Says(6, 3030, 3);
+	Actor_Says(kActorLucy, 0, 3);
+	Actor_Says(kActorMcCoy, 1425, 3);
+	Actor_Says(kActorLucy, 10, 3);
+	Actor_Says(kActorLucy, 20, 3);
+	Actor_Says(kActorMcCoy, 1430, 3);
+	Actor_Says(kActorLucy, 30, 3);
+	Actor_Says(kActorMcCoy, 1435, 3);
+	Actor_Says(kActorLucy, 40, 3);
+	Actor_Says(kActorLucy, 50, 3);
+	Actor_Says(kActorMcCoy, 1440, 3);
+	Actor_Says(kActorLucy, 60, 3);
+	Actor_Says(kActorLucy, 70, 3);
+	Actor_Says(kActorMcCoy, 1445, 3);
+	Actor_Says(kActorLucy, 80, 3);
+	Actor_Says(kActorLucy, 3030, 3);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/hf02.cpp b/engines/bladerunner/script/scene/hf02.cpp
index a301f1f6dd..ffa32a8ca4 100644
--- a/engines/bladerunner/script/scene/hf02.cpp
+++ b/engines/bladerunner/script/scene/hf02.cpp
@@ -56,11 +56,11 @@ void SceneScriptHF02::InitializeScene() {
 void SceneScriptHF02::SceneLoaded() {
 	Obstacle_Object("BARD_NEON", true);
 	Unclickable_Object("BARD_NEON");
-	if (Actor_Query_Goal_Number(1) == 234) {
+	if (Actor_Query_Goal_Number(kActorSteele) == 234) {
 		if (Game_Flag_Query(593)) {
-			Actor_Set_Goal_Number(1, 243);
+			Actor_Set_Goal_Number(kActorSteele, 243);
 		} else {
-			Actor_Set_Goal_Number(1, 240);
+			Actor_Set_Goal_Number(kActorSteele, 240);
 		}
 	}
 }
@@ -84,7 +84,7 @@ bool SceneScriptHF02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHF02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 42.0f, 47.76f, -296.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 42.0f, 47.76f, -296.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(309);
@@ -93,7 +93,7 @@ bool SceneScriptHF02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 470.0f, 47.76f, -444.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 470.0f, 47.76f, -444.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(527);
@@ -116,21 +116,21 @@ void SceneScriptHF02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptHF02::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(1) == 240) {
-		Actor_Set_Goal_Number(1, 241);
+	if (Actor_Query_Goal_Number(kActorSteele) == 240) {
+		Actor_Set_Goal_Number(kActorSteele, 241);
 	}
 	if (Game_Flag_Query(528)) {
-		Loop_Actor_Walk_To_XYZ(0, 470.0f, 47.76f, -444.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 470.0f, 47.76f, -444.0f, 0, 0, false, 0);
 		Game_Flag_Reset(528);
 	} else if (Game_Flag_Query(308)) {
-		Loop_Actor_Walk_To_XYZ(0, 42.0f, 47.76f, -296.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 42.0f, 47.76f, -296.0f, 0, 0, false, 0);
 		Game_Flag_Reset(308);
 	}
-	if (Actor_Query_Goal_Number(1) == 243) {
-		if (Actor_Query_Goal_Number(6) == 599) {
-			Actor_Set_Goal_Number(1, 244);
+	if (Actor_Query_Goal_Number(kActorSteele) == 243) {
+		if (Actor_Query_Goal_Number(kActorLucy) == 599) {
+			Actor_Set_Goal_Number(kActorSteele, 244);
 		} else {
-			Actor_Set_Goal_Number(1, 245);
+			Actor_Set_Goal_Number(kActorSteele, 245);
 		}
 	}
 }
diff --git a/engines/bladerunner/script/scene/hf03.cpp b/engines/bladerunner/script/scene/hf03.cpp
index b95d8a6bab..f957a29daa 100644
--- a/engines/bladerunner/script/scene/hf03.cpp
+++ b/engines/bladerunner/script/scene/hf03.cpp
@@ -56,7 +56,7 @@ bool SceneScriptHF03::MouseClick(int x, int y) {
 
 bool SceneScriptHF03::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click(objectName, "MAIN")) {
-		Actor_Says(0, Random_Query(0, 3) + 8525, 18);
+		Actor_Says(kActorMcCoy, Random_Query(0, 3) + 8525, 18);
 	}
 	return false;
 }
@@ -73,107 +73,107 @@ void SceneScriptHF03::sub_401C80() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 840:
-		Actor_Says(0, 1630, 15);
+		Actor_Says(kActorMcCoy, 1630, 15);
 		if (Global_Variable_Query(40) == 3) {
-			Actor_Set_Goal_Number(6, 214);
+			Actor_Set_Goal_Number(kActorLucy, 214);
 		} else if (Game_Flag_Query(46)) {
-			Actor_Set_Goal_Number(6, 212);
+			Actor_Set_Goal_Number(kActorLucy, 212);
 		} else {
-			Actor_Set_Goal_Number(6, 210);
+			Actor_Set_Goal_Number(kActorLucy, 210);
 			Game_Flag_Set(593);
 		}
 		break;
 	case 850:
-		Actor_Says(0, 1635, 15);
-		Actor_Says(6, 200, 13);
-		Actor_Modify_Friendliness_To_Other(6, 0, 3);
+		Actor_Says(kActorMcCoy, 1635, 15);
+		Actor_Says(kActorLucy, 200, 13);
+		Actor_Modify_Friendliness_To_Other(kActorLucy, kActorMcCoy, 3);
 		break;
 	case 860:
-		Actor_Says(0, 1640, 12);
+		Actor_Says(kActorMcCoy, 1640, 12);
 		if (Global_Variable_Query(40) == 3) {
-			Actor_Set_Goal_Number(6, 214);
+			Actor_Set_Goal_Number(kActorLucy, 214);
 		} else {
-			Actor_Says(6, 210, 13);
-			Actor_Says(0, 1655, 15);
-			Actor_Modify_Friendliness_To_Other(6, 0, Random_Query(9, 10));
-			if (Actor_Query_Friendliness_To_Other(6, 0) > 59 && !Global_Variable_Query(45)) {
+			Actor_Says(kActorLucy, 210, 13);
+			Actor_Says(kActorMcCoy, 1655, 15);
+			Actor_Modify_Friendliness_To_Other(kActorLucy, kActorMcCoy, Random_Query(9, 10));
+			if (Actor_Query_Friendliness_To_Other(kActorLucy, kActorMcCoy) > 59 && !Global_Variable_Query(45)) {
 				Global_Variable_Set(45, 3);
-				Actor_Says(6, 940, 14);
-				Actor_Says(0, 6780, 11);
-				Actor_Says(6, 950, 12);
-				Actor_Says(6, 960, 13);
-				Actor_Says(0, 6785, 15);
-				Actor_Says(6, 970, 16);
-				Actor_Says(6, 980, 17);
+				Actor_Says(kActorLucy, 940, 14);
+				Actor_Says(kActorMcCoy, 6780, 11);
+				Actor_Says(kActorLucy, 950, 12);
+				Actor_Says(kActorLucy, 960, 13);
+				Actor_Says(kActorMcCoy, 6785, 15);
+				Actor_Says(kActorLucy, 970, 16);
+				Actor_Says(kActorLucy, 980, 17);
 				if (Game_Flag_Query(47)) {
-					Actor_Says(6, 990, 17);
+					Actor_Says(kActorLucy, 990, 17);
 				}
-				Actor_Says(0, 6790, 15);
-				Actor_Says(6, 1000, 13);
-				Actor_Says(6, 1010, 17);
-				Actor_Says(6, 1020, 18);
-				Actor_Says(0, 6795, 14);
-				Actor_Says(6, 1030, 17);
-				Actor_Says(0, 6800, 14);
+				Actor_Says(kActorMcCoy, 6790, 15);
+				Actor_Says(kActorLucy, 1000, 13);
+				Actor_Says(kActorLucy, 1010, 17);
+				Actor_Says(kActorLucy, 1020, 18);
+				Actor_Says(kActorMcCoy, 6795, 14);
+				Actor_Says(kActorLucy, 1030, 17);
+				Actor_Says(kActorMcCoy, 6800, 14);
 			}
-			Actor_Says(6, 220, 13);
-			Actor_Says(0, 1660, 15);
-			Actor_Says(6, 230, 14);
-			Actor_Clue_Acquire(6, 219, 1, 0);
+			Actor_Says(kActorLucy, 220, 13);
+			Actor_Says(kActorMcCoy, 1660, 15);
+			Actor_Says(kActorLucy, 230, 14);
+			Actor_Clue_Acquire(kActorLucy, kClueMcCoyHelpedLucy, 1, kActorMcCoy);
 			if (Game_Flag_Query(46)) {
-				Actor_Set_Goal_Number(6, 212);
+				Actor_Set_Goal_Number(kActorLucy, 212);
 			} else {
-				Actor_Set_Goal_Number(6, 210);
+				Actor_Set_Goal_Number(kActorLucy, 210);
 			}
 		}
 		break;
 	case 870:
-		Actor_Says(0, 1645, 18);
-		Actor_Says(6, 240, 14);
-		Actor_Says(6, 250, 12);
-		Actor_Says(6, 260, 13);
-		Actor_Says(6, 270, 19);
-		Actor_Says(0, 1665, 18);
-		Actor_Says(6, 280, 13);
-		Actor_Says(0, 1670, 12);
-		Actor_Says(6, 290, 14);
-		Actor_Says(6, 300, 16);
-		Actor_Says(0, 1675, 12);
-		Actor_Says(6, 310, 13);
-		Actor_Clue_Acquire(0, 273, 0, 6);
+		Actor_Says(kActorMcCoy, 1645, 18);
+		Actor_Says(kActorLucy, 240, 14);
+		Actor_Says(kActorLucy, 250, 12);
+		Actor_Says(kActorLucy, 260, 13);
+		Actor_Says(kActorLucy, 270, 19);
+		Actor_Says(kActorMcCoy, 1665, 18);
+		Actor_Says(kActorLucy, 280, 13);
+		Actor_Says(kActorMcCoy, 1670, 12);
+		Actor_Says(kActorLucy, 290, 14);
+		Actor_Says(kActorLucy, 300, 16);
+		Actor_Says(kActorMcCoy, 1675, 12);
+		Actor_Says(kActorLucy, 310, 13);
+		Actor_Clue_Acquire(kActorMcCoy, kClueLucyInterview, 0, kActorLucy);
 		break;
 	case 880:
-		Actor_Says(0, 1650, 14);
+		Actor_Says(kActorMcCoy, 1650, 14);
 		break;
 	}
 }
 
 bool SceneScriptHF03::ClickedOnActor(int actorId) {
-	if (actorId == 6 && Actor_Query_Goal_Number(6) == 205) {
-		if (Game_Flag_Query(46) ? !Loop_Actor_Walk_To_Waypoint(0, 377, 0, 1, false) : !Loop_Actor_Walk_To_Waypoint(0, 378, 0, 1, false)) {
-			Actor_Face_Actor(0, 6, true);
+	if (actorId == 6 && Actor_Query_Goal_Number(kActorLucy) == 205) {
+		if (Game_Flag_Query(46) ? !Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 377, 0, 1, false) : !Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 378, 0, 1, false)) {
+			Actor_Face_Actor(kActorMcCoy, kActorLucy, true);
 			if (!Game_Flag_Query(613)) {
 				Game_Flag_Set(613);
 				if (Game_Flag_Query(46)) {
-					Actor_Says(0, 1605, 15);
-					Actor_Says(6, 100, 12);
-					Actor_Says(0, 1610, 14);
+					Actor_Says(kActorMcCoy, 1605, 15);
+					Actor_Says(kActorLucy, 100, 12);
+					Actor_Says(kActorMcCoy, 1610, 14);
 				} else {
-					Actor_Says(0, 1615, 16);
-					Actor_Says(6, 110, 13);
+					Actor_Says(kActorMcCoy, 1615, 16);
+					Actor_Says(kActorLucy, 110, 13);
 				}
-				Actor_Says(6, 120, 13);
-				Actor_Says(0, 1620, 14);
-				Actor_Says(6, 130, 17);
-				Actor_Says(0, 1625, 15);
+				Actor_Says(kActorLucy, 120, 13);
+				Actor_Says(kActorMcCoy, 1620, 14);
+				Actor_Says(kActorLucy, 130, 17);
+				Actor_Says(kActorMcCoy, 1625, 15);
 				if (Game_Flag_Query(46)) {
-					Actor_Says(6, 140, 12);
-					Actor_Says(6, 150, 13);
-					Actor_Says(6, 160, 15);
+					Actor_Says(kActorLucy, 140, 12);
+					Actor_Says(kActorLucy, 150, 13);
+					Actor_Says(kActorLucy, 160, 15);
 				} else {
-					Actor_Says(6, 170, 12);
-					Actor_Says(6, 180, 13);
-					Actor_Says(6, 190, 15);
+					Actor_Says(kActorLucy, 170, 12);
+					Actor_Says(kActorLucy, 180, 13);
+					Actor_Says(kActorLucy, 190, 15);
 				}
 			}
 			sub_401C80();
@@ -188,21 +188,21 @@ bool SceneScriptHF03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHF03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 179.0f, 46.76f, -824.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 179.0f, 46.76f, -824.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(311);
 			Set_Enter(37, 34);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 479.0f, 47.76f, -524.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 479.0f, 47.76f, -524.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(528);
 			Set_Enter(38, 35);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 942.0f, 47.76f, -847.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 942.0f, 47.76f, -847.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(566);
 			Set_Enter(40, 37);
 		}
@@ -223,23 +223,23 @@ void SceneScriptHF03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptHF03::PlayerWalkedIn() {
 	if (Game_Flag_Query(527)) {
-		Loop_Actor_Walk_To_XYZ(0, 479.0f, 47.76f, -524.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 479.0f, 47.76f, -524.0f, 0, 0, false, 0);
 		Game_Flag_Reset(527);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, 179.0f, 47.76f, -824.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 179.0f, 47.76f, -824.0f, 0, 0, false, 0);
 		Game_Flag_Reset(310);
 	}
-	if (Actor_Query_Goal_Number(6) == 250) {
-		Actor_Set_Goal_Number(6, 212);
-		Actor_Says(1, 210, 13);
-		Actor_Face_Actor(0, 1, true);
-		Actor_Says(0, 1680, 15);
-		Actor_Says(1, 220, 14);
-		Actor_Says(0, 1685, 13);
-		Actor_Says(1, 230, 16);
-		Actor_Says(0, 1690, 12);
-		Actor_Says(1, 240, 13);
-		Actor_Set_Goal_Number(1, 234);
+	if (Actor_Query_Goal_Number(kActorLucy) == 250) {
+		Actor_Set_Goal_Number(kActorLucy, 212);
+		Actor_Says(kActorSteele, 210, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
+		Actor_Says(kActorMcCoy, 1680, 15);
+		Actor_Says(kActorSteele, 220, 14);
+		Actor_Says(kActorMcCoy, 1685, 13);
+		Actor_Says(kActorSteele, 230, 16);
+		Actor_Says(kActorMcCoy, 1690, 12);
+		Actor_Says(kActorSteele, 240, 13);
+		Actor_Set_Goal_Number(kActorSteele, 234);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/hf04.cpp b/engines/bladerunner/script/scene/hf04.cpp
index 3e699b7f05..7389810a6a 100644
--- a/engines/bladerunner/script/scene/hf04.cpp
+++ b/engines/bladerunner/script/scene/hf04.cpp
@@ -52,11 +52,11 @@ void SceneScriptHF04::SceneLoaded() {
 		Unobstacle_Object("HIDE_WALL_A", true);
 		Unobstacle_Object("HIDE_WALL_B", true);
 	}
-	if (Actor_Query_Goal_Number(6) == 213) {
-		if (Actor_Clue_Query(6, 219) && Global_Variable_Query(40) != 3) {
+	if (Actor_Query_Goal_Number(kActorLucy) == 213) {
+		if (Actor_Clue_Query(kActorLucy, kClueMcCoyHelpedLucy) && Global_Variable_Query(40) != 3) {
 			Game_Flag_Set(593);
 		} else {
-			Actor_Set_Goal_Number(6, 230);
+			Actor_Set_Goal_Number(kActorLucy, 230);
 			Game_Flag_Reset(584);
 		}
 	}
@@ -80,7 +80,7 @@ bool SceneScriptHF04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHF04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 1132.27f, -0.31f, -113.46f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1132.27f, -0.31f, -113.46f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(567);
@@ -102,8 +102,8 @@ void SceneScriptHF04::SceneFrameAdvanced(int frame) {
 	if (frame == 154) {
 		Sound_Play(360, Random_Query(43, 43), 0, 0, 50);
 	}
-	if (frame == 179 && Actor_Query_Goal_Number(6) == 235) {
-		Actor_Set_Goal_Number(6, 236);
+	if (frame == 179 && Actor_Query_Goal_Number(kActorLucy) == 235) {
+		Actor_Set_Goal_Number(kActorLucy, 236);
 	}
 	if (Game_Flag_Query(585)) {
 		Game_Flag_Reset(585);
@@ -136,8 +136,8 @@ void SceneScriptHF04::SceneFrameAdvanced(int frame) {
 		Obstacle_Object("PIVOT_WALL#02", false);
 		Obstacle_Object("PIVOT_WALL#03", true);
 		Game_Flag_Reset(584);
-		if (Actor_Query_Goal_Number(6) == 234) {
-			Actor_Set_Goal_Number(6, 235);
+		if (Actor_Query_Goal_Number(kActorLucy) == 234) {
+			Actor_Set_Goal_Number(kActorLucy, 235);
 		}
 		//return true;
 		return;
@@ -149,11 +149,11 @@ void SceneScriptHF04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptHF04::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(6) == 230 || Actor_Query_Goal_Number(6) == 233) {
+	if (Actor_Query_Goal_Number(kActorLucy) == 230 || Actor_Query_Goal_Number(kActorLucy) == 233) {
 		Player_Set_Combat_Mode(true);
 		Music_Play(1, 60, 0, 2, -1, 0, 0);
 	}
-	Loop_Actor_Walk_To_XYZ(0, -45.0f, -0.31f, 307.0f, 0, 0, true, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -45.0f, -0.31f, 307.0f, 0, 0, true, 0);
 	Delay(2500);
 }
 
diff --git a/engines/bladerunner/script/scene/hf05.cpp b/engines/bladerunner/script/scene/hf05.cpp
index 5370cb9d56..b451b76ba2 100644
--- a/engines/bladerunner/script/scene/hf05.cpp
+++ b/engines/bladerunner/script/scene/hf05.cpp
@@ -67,57 +67,57 @@ bool SceneScriptHF05::MouseClick(int x, int y) {
 
 bool SceneScriptHF05::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("TOP CON", objectName) == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 95.0f, 40.63f, 308.0f, 0, 1, false, 0)) {
-			Actor_Face_Object(0, "TOP CON", true);
-			if (Actor_Query_In_Set(9, 41) && Actor_Query_Goal_Number(9) != 1 && Actor_Query_Goal_Number(9) != 2) {
-				Actor_Face_Actor(9, 0, true);
-				Actor_Says(9, 480, 13);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 95.0f, 40.63f, 308.0f, 0, 1, false, 0)) {
+			Actor_Face_Object(kActorMcCoy, "TOP CON", true);
+			if (Actor_Query_In_Set(kActorCrazylegs, 41) && Actor_Query_Goal_Number(kActorCrazylegs) != 1 && Actor_Query_Goal_Number(kActorCrazylegs) != 2) {
+				Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
+				Actor_Says(kActorCrazylegs, 480, 13);
 			} else if (!Game_Flag_Query(662) || Game_Flag_Query(369)) {
-				Actor_Change_Animation_Mode(0, 23);
+				Actor_Change_Animation_Mode(kActorMcCoy, 23);
 				Sound_Play(412, 100, 0, 0, 50);
 			} else {
 				Player_Loses_Control();
-				Actor_Set_Goal_Number(23, 425);
+				Actor_Set_Goal_Number(kActorOfficerLeary, 425);
 				Game_Flag_Set(369);
 				Game_Flag_Set(368);
 				Obstacle_Object("OBSTACLE_HOLE", true);
 				Unobstacle_Object("MONTE CARLO DRY", true);
 				if (sub_4048C0()) {
 					Loop_Actor_Walk_To_XYZ(sub_4048C0(), 181.54f, 40.63f, 388.09f, 0, 0, true, 0);
-					Actor_Face_Actor(0, sub_4048C0(), true);
-					Actor_Face_Actor(sub_4048C0(), 0, true);
-					Actor_Says(0, 1785, 3);
-					Actor_Says(0, 1790, 3);
+					Actor_Face_Actor(kActorMcCoy, sub_4048C0(), true);
+					Actor_Face_Actor(sub_4048C0(), kActorMcCoy, true);
+					Actor_Says(kActorMcCoy, 1785, 3);
+					Actor_Says(kActorMcCoy, 1790, 3);
 				}
-				Actor_Face_Heading(0, 0, false);
-				Actor_Change_Animation_Mode(0, 23);
+				Actor_Face_Heading(kActorMcCoy, 0, false);
+				Actor_Change_Animation_Mode(kActorMcCoy, 23);
 				Scene_Loop_Set_Default(5);
 				Scene_Loop_Start_Special(2, 4, 1);
 				if (sub_4048C0()) {
 					if (sub_4048C0() == 3) {
-						Actor_Face_Heading(3, 0, false);
+						Actor_Face_Heading(kActorDektora, 0, false);
 						Ambient_Sounds_Play_Sound(147, 50, 99, 0, 0);
 						Delay(3000);
-						Actor_Face_Heading(3, 0, false);
-						Actor_Change_Animation_Mode(3, 23);
+						Actor_Face_Heading(kActorDektora, 0, false);
+						Actor_Change_Animation_Mode(kActorDektora, 23);
 					} else {
-						Actor_Face_Heading(6, 0, false);
+						Actor_Face_Heading(kActorLucy, 0, false);
 						Ambient_Sounds_Play_Sound(147, 50, 99, 0, 0);
 						Delay(3000);
-						Actor_Face_Heading(6, 0, false);
-						Actor_Change_Animation_Mode(6, 13);
+						Actor_Face_Heading(kActorLucy, 0, false);
+						Actor_Change_Animation_Mode(kActorLucy, 13);
 					}
-					Actor_Face_Actor(0, sub_4048C0(), true);
-					Actor_Says(0, 1805, 3);
+					Actor_Face_Actor(kActorMcCoy, sub_4048C0(), true);
+					Actor_Says(kActorMcCoy, 1805, 3);
 				} else {
 					ADQ_Flush();
-					ADQ_Add(99, 940, -1);
+					ADQ_Add(kActorVoiceOver, 940, -1);
 					Ambient_Sounds_Play_Sound(147, 50, 99, 0, 0);
 					Delay(1500);
-					Loop_Actor_Walk_To_XYZ(0, 181.53999f, 40.630001f, 388.09f, 0, 0, true, 0);
-					Actor_Face_Heading(0, 0, false);
-					Actor_Change_Animation_Mode(0, 23);
-					Actor_Clue_Lose(0, 146);
+					Loop_Actor_Walk_To_XYZ(kActorMcCoy, 181.53999f, 40.630001f, 388.09f, 0, 0, true, 0);
+					Actor_Face_Heading(kActorMcCoy, 0, false);
+					Actor_Change_Animation_Mode(kActorMcCoy, 23);
+					Actor_Clue_Lose(kActorMcCoy, kClueBomb);
 				}
 				Player_Gains_Control();
 			}
@@ -129,9 +129,9 @@ bool SceneScriptHF05::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptHF05::ClickedOnActor(int actorId) {
 	if (actorId == 9) {
-		if (!Loop_Actor_Walk_To_Actor(0, 9, 60, 1, false)) {
-			Actor_Face_Actor(0, 9, true);
-			Actor_Face_Actor(9, 0, true);
+		if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorCrazylegs, 60, 1, false)) {
+			Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
+			Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
 			sub_402AE4();
 		}
 	}
@@ -144,18 +144,18 @@ bool SceneScriptHF05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHF05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 483.0f, 40.63f, -189.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 483.0f, 40.63f, -189.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) {
 			Game_Flag_Set(313);
 			Set_Enter(37, 34);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 330.0f, 40.63f, -85.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 330.0f, 40.63f, -85.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) {
 			int v2 = sub_404858();
 			if (Game_Flag_Query(663) && Game_Flag_Query(368) && v2 != -1) {
-				Actor_Face_Actor(0, v2, true);
-				Actor_Says(0, 1810, 16);
+				Actor_Face_Actor(kActorMcCoy, v2, true);
+				Actor_Says(kActorMcCoy, 1810, 16);
 			}
 			Game_Flag_Set(359);
 			Set_Enter(43, 40);
@@ -163,7 +163,7 @@ bool SceneScriptHF05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 277.0f, 40.631f, 410.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 277.0f, 40.631f, 410.0f, 0, 1, false, 0) && !Game_Flag_Query(684)) {
 			Game_Flag_Set(529);
 			Set_Enter(42, 39);
 		}
@@ -249,13 +249,13 @@ void SceneScriptHF05::PlayerWalkedIn() {
 		}
 		if (Game_Flag_Query(684)) {
 			sub_4042E4();
-		} else if (Actor_Clue_Query(0, 265) || Game_Flag_Query(559)) {
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueSpinnerKeys) || Game_Flag_Query(559)) {
 			if (Game_Flag_Query(559) && !Game_Flag_Query(663)) {
 				Game_Flag_Set(663);
 				Music_Play(1, 40, 0, 2, -1, 0, 0);
-				Actor_Says(24, 200, 3);
-				Actor_Says(24, 210, 3);
-				Actor_Set_Goal_Number(23, 420);
+				Actor_Says(kActorOfficerGrayford, 200, 3);
+				Actor_Says(kActorOfficerGrayford, 210, 3);
+				Actor_Set_Goal_Number(kActorOfficerLeary, 420);
 				if (sub_4048C0() == 3) {
 					sub_403F0C();
 				} else if (sub_4048C0() == 6) {
@@ -266,12 +266,12 @@ void SceneScriptHF05::PlayerWalkedIn() {
 			sub_403A34(v0);
 		}
 	} else if (Game_Flag_Query(312) == 1) {
-		Loop_Actor_Walk_To_XYZ(0, 399.0f, 40.63f, -85.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 399.0f, 40.63f, -85.0f, 0, 0, false, 0);
 	} else if (Game_Flag_Query(358)) {
-		Actor_Set_At_XYZ(0, 346.0f, 4.63f, -151.0f, 603);
-		Loop_Actor_Travel_Stairs(0, 4, 1, 0);
+		Actor_Set_At_XYZ(kActorMcCoy, 346.0f, 4.63f, -151.0f, 603);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 1, 0);
 	}
-	if (Actor_Query_In_Set(9, 41)) {
+	if (Actor_Query_In_Set(kActorCrazylegs, 41)) {
 		if (Game_Flag_Query(562)) {
 			if (!Game_Flag_Query(563) && Global_Variable_Query(1) == 3) {
 				sub_402970();
@@ -290,8 +290,8 @@ void SceneScriptHF05::PlayerWalkedIn() {
 }
 
 void SceneScriptHF05::PlayerWalkedOut() {
-	if (Actor_Query_Goal_Number(9) == 210) {
-		Actor_Set_Goal_Number(9, 2);
+	if (Actor_Query_Goal_Number(kActorCrazylegs) == 210) {
+		Actor_Set_Goal_Number(kActorCrazylegs, 2);
 	}
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -301,45 +301,45 @@ void SceneScriptHF05::DialogueQueueFlushed(int a1) {
 }
 
 void SceneScriptHF05::sub_402970() {
-	Loop_Actor_Walk_To_Actor(9, 0, 72, 0, false);
-	Actor_Face_Actor(9, 0, true);
-	Actor_Face_Actor(0, 9, true);
-	Actor_Says(9, 370, 3);
-	Actor_Says(0, 1855, 3);
-	Actor_Says(9, 380, 12);
-	Actor_Says(9, 390, 14);
-	Actor_Says(9, 400, 15);
-	Actor_Says(9, 410, 16);
-	Actor_Says(0, 1860, 3);
-	Actor_Says(9, 420, 3);
-	Actor_Says(0, 1865, 3);
+	Loop_Actor_Walk_To_Actor(kActorCrazylegs, kActorMcCoy, 72, 0, false);
+	Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
+	Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
+	Actor_Says(kActorCrazylegs, 370, 3);
+	Actor_Says(kActorMcCoy, 1855, 3);
+	Actor_Says(kActorCrazylegs, 380, 12);
+	Actor_Says(kActorCrazylegs, 390, 14);
+	Actor_Says(kActorCrazylegs, 400, 15);
+	Actor_Says(kActorCrazylegs, 410, 16);
+	Actor_Says(kActorMcCoy, 1860, 3);
+	Actor_Says(kActorCrazylegs, 420, 3);
+	Actor_Says(kActorMcCoy, 1865, 3);
 }
 
 void SceneScriptHF05::sub_402AE4() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 99) == 1 && Global_Variable_Query(1) == 3) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) == 1 && Global_Variable_Query(1) == 3) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1180, 3, 6, 7);
 	}
-	if (Actor_Clue_Query(0, 116) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueCrazylegsInterview1) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1190, 2, 7, 4);
 	}
-	if (Actor_Clue_Query(0, 88) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDektorasDressingRoom) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1200, 5, 5, 3);
 	}
-	if (Actor_Clue_Query(0, 13) == 1 && Actor_Query_Goal_Number(6) != 599) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueLucy) == 1 && Actor_Query_Goal_Number(kActorLucy) != 599) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1210, 4, 6, 2);
 	}
-	if (Actor_Clue_Query(0, 237) == 1 || (Actor_Clue_Query(0, 99) == 1 && Global_Variable_Query(1) == 3)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansResources) == 1 || (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) == 1 && Global_Variable_Query(1) == 3)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1220, -1, 2, 8);
 	}
-	if (Actor_Clue_Query(0, 113) == 1 || Actor_Clue_Query(0, 115) == 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueCarRegistration1) == 1 || Actor_Clue_Query(kActorMcCoy, kClueCarRegistration3) == 1) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1230, 4, 7, -1);
 	}
 	if (!Dialogue_Menu_Query_List_Size()) {
-		Actor_Says(0, 1880, 15);
-		Actor_Says(9, 490, 3);
-		Actor_Says(0, 1885, 3);
-		Actor_Says(9, 500, 16);
+		Actor_Says(kActorMcCoy, 1880, 15);
+		Actor_Says(kActorCrazylegs, 490, 3);
+		Actor_Says(kActorMcCoy, 1885, 3);
+		Actor_Says(kActorCrazylegs, 500, 16);
 		return;
 	}
 	Dialogue_Menu_Add_DONE_To_List(1240);
@@ -348,97 +348,97 @@ void SceneScriptHF05::sub_402AE4() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 1180:
-		Actor_Says(0, 1890, 23);
-		Actor_Says(9, 510, 3);
-		Actor_Says(0, 1920, 23);
-		Actor_Says(0, 1925, 3);
-		Actor_Says(9, 530, 12);
-		Actor_Says(0, 1930, 18);
-		Actor_Says(9, 540, 14);
-		Actor_Says(0, 1935, 14);
-		Actor_Says(9, 550, 16);
-		Actor_Says(0, 1940, 15);
-		Actor_Says(0, 1945, -1);
-		Actor_Says(9, 560, 15);
-		Actor_Says(9, 570, 16);
-		Actor_Says(0, 1950, 17);
+		Actor_Says(kActorMcCoy, 1890, 23);
+		Actor_Says(kActorCrazylegs, 510, 3);
+		Actor_Says(kActorMcCoy, 1920, 23);
+		Actor_Says(kActorMcCoy, 1925, 3);
+		Actor_Says(kActorCrazylegs, 530, 12);
+		Actor_Says(kActorMcCoy, 1930, 18);
+		Actor_Says(kActorCrazylegs, 540, 14);
+		Actor_Says(kActorMcCoy, 1935, 14);
+		Actor_Says(kActorCrazylegs, 550, 16);
+		Actor_Says(kActorMcCoy, 1940, 15);
+		Actor_Says(kActorMcCoy, 1945, -1);
+		Actor_Says(kActorCrazylegs, 560, 15);
+		Actor_Says(kActorCrazylegs, 570, 16);
+		Actor_Says(kActorMcCoy, 1950, 17);
 		sub_403738();
 		break;
 	case 1190:
-		Actor_Says(0, 1895, 0);
-		Actor_Says(9, 620, 3);
-		Actor_Says(9, 630, 12);
-		Actor_Says(0, 2000, 13);
-		Actor_Says(9, 640, 14);
-		Actor_Says(9, 650, 15);
-		Actor_Says(9, 660, 16);
-		Actor_Says(0, 2005, 0);
-		Actor_Says(0, 2010, 3);
-		Actor_Says(9, 670, 3);
-		Actor_Says(9, 680, 12);
-		Actor_Says(9, 690, 14);
-		Actor_Says(0, 2015, 14);
-		Actor_Says(9, 700, 15);
-		Actor_Says(0, 2020, 18);
+		Actor_Says(kActorMcCoy, 1895, 0);
+		Actor_Says(kActorCrazylegs, 620, 3);
+		Actor_Says(kActorCrazylegs, 630, 12);
+		Actor_Says(kActorMcCoy, 2000, 13);
+		Actor_Says(kActorCrazylegs, 640, 14);
+		Actor_Says(kActorCrazylegs, 650, 15);
+		Actor_Says(kActorCrazylegs, 660, 16);
+		Actor_Says(kActorMcCoy, 2005, 0);
+		Actor_Says(kActorMcCoy, 2010, 3);
+		Actor_Says(kActorCrazylegs, 670, 3);
+		Actor_Says(kActorCrazylegs, 680, 12);
+		Actor_Says(kActorCrazylegs, 690, 14);
+		Actor_Says(kActorMcCoy, 2015, 14);
+		Actor_Says(kActorCrazylegs, 700, 15);
+		Actor_Says(kActorMcCoy, 2020, 18);
 		break;
 	case 1200:
-		Actor_Says(0, 1900, 23);
-		Actor_Says(9, 710, 16);
-		Actor_Says(0, 2025, 0);
-		Actor_Says(9, 720, 3);
-		Actor_Says(9, 730, 12);
+		Actor_Says(kActorMcCoy, 1900, 23);
+		Actor_Says(kActorCrazylegs, 710, 16);
+		Actor_Says(kActorMcCoy, 2025, 0);
+		Actor_Says(kActorCrazylegs, 720, 3);
+		Actor_Says(kActorCrazylegs, 730, 12);
 		break;
 	case 1210:
-		Actor_Says(0, 1905, 23);
-		Actor_Says(9, 740, 14);
-		Actor_Says(0, 2030, 13);
-		Actor_Says(9, 750, 15);
-		Actor_Says(0, 2035, 18);
-		Actor_Says(9, 760, 16);
-		Actor_Says(9, 770, 3);
-		Actor_Says(0, 2040, 0);
+		Actor_Says(kActorMcCoy, 1905, 23);
+		Actor_Says(kActorCrazylegs, 740, 14);
+		Actor_Says(kActorMcCoy, 2030, 13);
+		Actor_Says(kActorCrazylegs, 750, 15);
+		Actor_Says(kActorMcCoy, 2035, 18);
+		Actor_Says(kActorCrazylegs, 760, 16);
+		Actor_Says(kActorCrazylegs, 770, 3);
+		Actor_Says(kActorMcCoy, 2040, 0);
 		break;
 	case 1220:
-		Actor_Says(0, 1910, 3);
-		Actor_Says(9, 780, 12);
-		Actor_Says(0, 2045, 17);
-		Actor_Says(0, 2050, 3);
-		Actor_Says(9, 790, 14);
-		Actor_Says(0, 2055, 19);
-		Actor_Says(0, 2060, -1);
-		Actor_Says(9, 800, 15);
-		Actor_Says(0, 2065, 18);
-		Actor_Says(0, 2070, 14);
-		Actor_Says(9, 810, 16);
+		Actor_Says(kActorMcCoy, 1910, 3);
+		Actor_Says(kActorCrazylegs, 780, 12);
+		Actor_Says(kActorMcCoy, 2045, 17);
+		Actor_Says(kActorMcCoy, 2050, 3);
+		Actor_Says(kActorCrazylegs, 790, 14);
+		Actor_Says(kActorMcCoy, 2055, 19);
+		Actor_Says(kActorMcCoy, 2060, -1);
+		Actor_Says(kActorCrazylegs, 800, 15);
+		Actor_Says(kActorMcCoy, 2065, 18);
+		Actor_Says(kActorMcCoy, 2070, 14);
+		Actor_Says(kActorCrazylegs, 810, 16);
 		sub_403738();
 		break;
 	case 1230:
-		Actor_Says(0, 1915, 12);
-		if (Actor_Clue_Query(0, 113)) {
-			Actor_Says(9, 820, 3);
-			Actor_Says(0, 2075, 13);
-			Actor_Says(9, 830, 12);
-			Actor_Says(9, 840, 14);
-			Actor_Says(9, 850, 15);
-			Actor_Says(0, 2080, 3);
-			Actor_Says(9, 860, 16);
-			Actor_Says(9, 870, 3);
-		} else if (Actor_Clue_Query(0, 115)) {
-			Actor_Says(9, 880, 12);
-			Actor_Says(9, 890, 14);
-			Actor_Says(0, 2085, 3);
-			Actor_Says(9, 900, 15);
-			Actor_Says(0, 2090, 19);
-			Actor_Says(9, 910, 16);
-			Actor_Says(0, 2095, 14);
-			Actor_Says(9, 920, 3);
-			Actor_Says(0, 2100, 15);
-			Actor_Says(9, 930, 12);
-			Actor_Says(9, 940, 14);
-			Actor_Says(0, 2105, 3);
-			Actor_Says(9, 950, 15);
-			Actor_Says(0, 2110, 0);
-			Actor_Says(9, 960, 16);
+		Actor_Says(kActorMcCoy, 1915, 12);
+		if (Actor_Clue_Query(kActorMcCoy, kClueCarRegistration1)) {
+			Actor_Says(kActorCrazylegs, 820, 3);
+			Actor_Says(kActorMcCoy, 2075, 13);
+			Actor_Says(kActorCrazylegs, 830, 12);
+			Actor_Says(kActorCrazylegs, 840, 14);
+			Actor_Says(kActorCrazylegs, 850, 15);
+			Actor_Says(kActorMcCoy, 2080, 3);
+			Actor_Says(kActorCrazylegs, 860, 16);
+			Actor_Says(kActorCrazylegs, 870, 3);
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueCarRegistration3)) {
+			Actor_Says(kActorCrazylegs, 880, 12);
+			Actor_Says(kActorCrazylegs, 890, 14);
+			Actor_Says(kActorMcCoy, 2085, 3);
+			Actor_Says(kActorCrazylegs, 900, 15);
+			Actor_Says(kActorMcCoy, 2090, 19);
+			Actor_Says(kActorCrazylegs, 910, 16);
+			Actor_Says(kActorMcCoy, 2095, 14);
+			Actor_Says(kActorCrazylegs, 920, 3);
+			Actor_Says(kActorMcCoy, 2100, 15);
+			Actor_Says(kActorCrazylegs, 930, 12);
+			Actor_Says(kActorCrazylegs, 940, 14);
+			Actor_Says(kActorMcCoy, 2105, 3);
+			Actor_Says(kActorCrazylegs, 950, 15);
+			Actor_Says(kActorMcCoy, 2110, 0);
+			Actor_Says(kActorCrazylegs, 960, 16);
 		}
 		break;
 	}
@@ -452,21 +452,21 @@ void SceneScriptHF05::sub_403738() {
 	int answer = Dialogue_Menu_Query_Input();
 	Dialogue_Menu_Disappear();
 	if (answer == 1250) {
-		Actor_Says(0, 1955, 17);
-		Actor_Says(0, 1960, 23);
+		Actor_Says(kActorMcCoy, 1955, 17);
+		Actor_Says(kActorMcCoy, 1960, 23);
 		Item_Pickup_Spin_Effect(986, 315, 327);
 		Delay(2000);
-		Actor_Says(0, 1980, 23);
-		Actor_Says(0, 1985, 3);
-		Actor_Says(9, 580, 3);
-		Actor_Says(9, 590, 15);
-		Actor_Says(0, 1990, 17);
-		Actor_Says(9, 600, 16);
-		Actor_Says(0, 1995, 3);
+		Actor_Says(kActorMcCoy, 1980, 23);
+		Actor_Says(kActorMcCoy, 1985, 3);
+		Actor_Says(kActorCrazylegs, 580, 3);
+		Actor_Says(kActorCrazylegs, 590, 15);
+		Actor_Says(kActorMcCoy, 1990, 17);
+		Actor_Says(kActorCrazylegs, 600, 16);
+		Actor_Says(kActorMcCoy, 1995, 3);
 		Game_Flag_Set(165);
-		Actor_Put_In_Set(9, 67);
-		Actor_Set_At_XYZ(9, -315.15f, 0.0f, 241.06f, 583);
-		Actor_Set_Goal_Number(9, 699);
+		Actor_Put_In_Set(kActorCrazylegs, 67);
+		Actor_Set_At_XYZ(kActorCrazylegs, -315.15f, 0.0f, 241.06f, 583);
+		Actor_Set_Goal_Number(kActorCrazylegs, 699);
 		Game_Flag_Set(652);
 		if (Game_Flag_Query(255)) {
 			Set_Enter(54, 54);
@@ -475,118 +475,118 @@ void SceneScriptHF05::sub_403738() {
 			Set_Enter(37, 34);
 		}
 	} else if (answer == 1260) {
-		Actor_Says(0, 1965, 12);
-		Actor_Says(0, 1970, 3);
-		Actor_Says(0, 1975, 3);
-		Actor_Says(9, 610, 16);
+		Actor_Says(kActorMcCoy, 1965, 12);
+		Actor_Says(kActorMcCoy, 1970, 3);
+		Actor_Says(kActorMcCoy, 1975, 3);
+		Actor_Says(kActorCrazylegs, 610, 16);
 	}
 }
 
 int SceneScriptHF05::sub_404858() {
-	if (Global_Variable_Query(45) == 2 && Actor_Query_Goal_Number(3) != 599) {
-		return 3;
+	if (Global_Variable_Query(45) == 2 && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		return kActorDektora;
 	}
-	if (Global_Variable_Query(45) == 3 && Actor_Query_Goal_Number(6) != 599) {
-		return 6;
+	if (Global_Variable_Query(45) == 3 && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		return kActorLucy;
 	}
 	return -1;
 }
 
 void SceneScriptHF05::sub_4042E4() {
-	Actor_Force_Stop_Walking(0);
-	Actor_Put_In_Set(23, 41);
-	Actor_Set_At_XYZ(23, 430.39999f, 40.630001f, -258.17999f, 300);
-	Actor_Put_In_Set(24, 41);
-	Actor_Set_At_XYZ(24, 526.40002f, 37.18f, -138.17999f, 300);
+	Actor_Force_Stop_Walking(kActorMcCoy);
+	Actor_Put_In_Set(kActorOfficerLeary, 41);
+	Actor_Set_At_XYZ(kActorOfficerLeary, 430.39999f, 40.630001f, -258.17999f, 300);
+	Actor_Put_In_Set(kActorOfficerGrayford, 41);
+	Actor_Set_At_XYZ(kActorOfficerGrayford, 526.40002f, 37.18f, -138.17999f, 300);
 	ADQ_Flush();
-	ADQ_Add(24, 260, -1);
+	ADQ_Add(kActorOfficerGrayford, 260, -1);
 	Player_Loses_Control();
-	Non_Player_Actor_Combat_Mode_On(23, 3, 1, 0, 4, 4, 7, 8, 0, 0, 100, 100, 1200, 1);
-	return Non_Player_Actor_Combat_Mode_On(24, 3, 1, 0, 4, 4, 7, 8, 0, 0, 100, 100, 300, 1);
+	Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 3, 1, kActorMcCoy, 4, 4, 7, 8, 0, 0, 100, 100, 1200, 1);
+	return Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, 3, 1, kActorMcCoy, 4, 4, 7, 8, 0, 0, 100, 100, 300, 1);
 }
 
 void SceneScriptHF05::sub_403F0C() {
-	Actor_Face_Actor(0, 3, true);
-	Actor_Face_Actor(3, 0, true);
-	Actor_Says(3, 2660, 12);
-	Actor_Says(0, 8990, 3);
-	Actor_Says(3, 2670, 13);
-	Actor_Says(3, 2680, 17);
-	Actor_Says(0, 8995, 14);
-	Actor_Says(3, 2690, 15);
-	Actor_Says_With_Pause(0, 9000, 1.0f, 16);
-	Actor_Says_With_Pause(0, 9005, 1.0f, 19);
-	Actor_Says(0, 1765, 17);
-	Actor_Says(3, 160, 12);
-	Actor_Says(0, 1770, 15);
-	Actor_Says(0, 1775, 3);
-	Actor_Says(3, 170, 3);
-	Actor_Says_With_Pause(0, 1780, 1.0f, 18);
+	Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
+	Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
+	Actor_Says(kActorDektora, 2660, 12);
+	Actor_Says(kActorMcCoy, 8990, 3);
+	Actor_Says(kActorDektora, 2670, 13);
+	Actor_Says(kActorDektora, 2680, 17);
+	Actor_Says(kActorMcCoy, 8995, 14);
+	Actor_Says(kActorDektora, 2690, 15);
+	Actor_Says_With_Pause(kActorMcCoy, 9000, 1.0f, 16);
+	Actor_Says_With_Pause(kActorMcCoy, 9005, 1.0f, 19);
+	Actor_Says(kActorMcCoy, 1765, 17);
+	Actor_Says(kActorDektora, 160, 12);
+	Actor_Says(kActorMcCoy, 1770, 15);
+	Actor_Says(kActorMcCoy, 1775, 3);
+	Actor_Says(kActorDektora, 170, 3);
+	Actor_Says_With_Pause(kActorMcCoy, 1780, 1.0f, 18);
 }
 
 void SceneScriptHF05::sub_40410C() {
-	Actor_Face_Actor(0, 6, true);
-	Actor_Face_Actor(6, 0, true);
-	Actor_Says(6, 400, 16);
-	Actor_Says(0, 1750, 14);
-	Actor_Says(6, 410, 12);
-	Actor_Says(6, 420, 14);
-	Actor_Says(0, 1755, 16);
-	Actor_Says(6, 430, 18);
-	Actor_Says_With_Pause(0, 1760, 1.0f, 15);
-	Actor_Says(0, 1765, 17);
-	Actor_Says(6, 440, 3);
-	Actor_Says(0, 1770, 15);
-	Actor_Says(0, 1775, 3);
-	Actor_Says(6, 450, 17);
-	Actor_Says_With_Pause(0, 1780, 1.0f, 18);
+	Actor_Face_Actor(kActorMcCoy, kActorLucy, true);
+	Actor_Face_Actor(kActorLucy, kActorMcCoy, true);
+	Actor_Says(kActorLucy, 400, 16);
+	Actor_Says(kActorMcCoy, 1750, 14);
+	Actor_Says(kActorLucy, 410, 12);
+	Actor_Says(kActorLucy, 420, 14);
+	Actor_Says(kActorMcCoy, 1755, 16);
+	Actor_Says(kActorLucy, 430, 18);
+	Actor_Says_With_Pause(kActorMcCoy, 1760, 1.0f, 15);
+	Actor_Says(kActorMcCoy, 1765, 17);
+	Actor_Says(kActorLucy, 440, 3);
+	Actor_Says(kActorMcCoy, 1770, 15);
+	Actor_Says(kActorMcCoy, 1775, 3);
+	Actor_Says(kActorLucy, 450, 17);
+	Actor_Says_With_Pause(kActorMcCoy, 1780, 1.0f, 18);
 }
 
 void SceneScriptHF05::sub_403A34(int actorId) {
-	if (actorId != -1 && Actor_Query_In_Set(9, 41)) {
+	if (actorId != -1 && Actor_Query_In_Set(kActorCrazylegs, 41)) {
 		Async_Actor_Walk_To_Waypoint(actorId, 437, 36, 0);
-		Loop_Actor_Walk_To_Waypoint(0, 437, 0, 0, false);
-		Actor_Face_Actor(9, 0, true);
-		Actor_Face_Actor(0, 9, true);
-		Actor_Face_Actor(actorId, 9, true);
-		Actor_Says(9, 0, 3);
-		Actor_Says(9, 10, 12);
-		Actor_Says(0, 1715, 19);
-		Actor_Says(0, 1720, -1);
-		Actor_Says(9, 20, 14);
-		Actor_Says(9, 30, 15);
-		Actor_Says(0, 1725, 3);
-		Actor_Says(9, 40, 16);
-		Actor_Says(9, 50, 3);
-		Actor_Says(9, 60, 12);
-		Actor_Says(9, 70, 13);
-		Actor_Says(0, 1730, 3);
-		Loop_Actor_Walk_To_Actor(9, 0, 28, 0, false);
+		Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 437, 0, 0, false);
+		Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
+		Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
+		Actor_Face_Actor(actorId, kActorCrazylegs, true);
+		Actor_Says(kActorCrazylegs, 0, 3);
+		Actor_Says(kActorCrazylegs, 10, 12);
+		Actor_Says(kActorMcCoy, 1715, 19);
+		Actor_Says(kActorMcCoy, 1720, -1);
+		Actor_Says(kActorCrazylegs, 20, 14);
+		Actor_Says(kActorCrazylegs, 30, 15);
+		Actor_Says(kActorMcCoy, 1725, 3);
+		Actor_Says(kActorCrazylegs, 40, 16);
+		Actor_Says(kActorCrazylegs, 50, 3);
+		Actor_Says(kActorCrazylegs, 60, 12);
+		Actor_Says(kActorCrazylegs, 70, 13);
+		Actor_Says(kActorMcCoy, 1730, 3);
+		Loop_Actor_Walk_To_Actor(kActorCrazylegs, kActorMcCoy, 28, 0, false);
 		Item_Pickup_Spin_Effect(986, 315, 327);
-		Actor_Says(9, 80, 23);
-		Actor_Clue_Acquire(0, 265, 1, 9);
-		Actor_Says(9, 90, 15);
-		Actor_Says(0, 1735, 17);
-		Actor_Says(9, 100, 16);
-		Actor_Says(9, 110, 3);
-		Actor_Face_Actor(actorId, 0, true);
-		if (actorId == 3) {
-			Actor_Says(3, 90, 3);
+		Actor_Says(kActorCrazylegs, 80, 23);
+		Actor_Clue_Acquire(kActorMcCoy, kClueSpinnerKeys, 1, kActorCrazylegs);
+		Actor_Says(kActorCrazylegs, 90, 15);
+		Actor_Says(kActorMcCoy, 1735, 17);
+		Actor_Says(kActorCrazylegs, 100, 16);
+		Actor_Says(kActorCrazylegs, 110, 3);
+		Actor_Face_Actor(actorId, kActorMcCoy, true);
+		if (actorId == kActorDektora) {
+			Actor_Says(kActorDektora, 90, 3);
 		} else {
-			Actor_Says(6, 380, 3);
+			Actor_Says(kActorLucy, 380, 3);
 		}
-		Actor_Says(0, 1740, 14);
-		Actor_Says(9, 120, 12);
-		Actor_Set_Goal_Number(9, 2);
-		if (actorId == 3) {
-			Actor_Says(3, 100, 3);
+		Actor_Says(kActorMcCoy, 1740, 14);
+		Actor_Says(kActorCrazylegs, 120, 12);
+		Actor_Set_Goal_Number(kActorCrazylegs, 2);
+		if (actorId == kActorDektora) {
+			Actor_Says(kActorDektora, 100, 3);
 		} else {
-			Actor_Says(6, 390, 3);
+			Actor_Says(kActorLucy, 390, 3);
 		}
-		Actor_Face_Actor(0, actorId, true);
-		Actor_Says(0, 1745, 3);
+		Actor_Face_Actor(kActorMcCoy, actorId, true);
+		Actor_Says(kActorMcCoy, 1745, 3);
 		Async_Actor_Walk_To_XYZ(actorId, 309.0f, 40.63f, 402.0f, 0, false);
-		Loop_Actor_Walk_To_XYZ(0, 277.0f, 40.63f, 410.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 277.0f, 40.63f, 410.0f, 0, 0, false, 0);
 		Game_Flag_Set(529);
 		Set_Enter(42, 39);
 	}
@@ -596,54 +596,54 @@ void SceneScriptHF05::sub_402370() {
 	Player_Loses_Control();
 	if (Global_Variable_Query(1) == 3) {
 		ADQ_Flush();
-		ADQ_Add(9, 130, 18);
-		ADQ_Add(9, 140, 18);
-		ADQ_Add(9, 150, 18);
-		ADQ_Add(9, 160, 17);
+		ADQ_Add(kActorCrazylegs, 130, 18);
+		ADQ_Add(kActorCrazylegs, 140, 18);
+		ADQ_Add(kActorCrazylegs, 150, 18);
+		ADQ_Add(kActorCrazylegs, 160, 17);
 	}
-	Loop_Actor_Walk_To_XYZ(0, 307.0f, 40.63f, 184.0f, 0, 0, false, 0);
-	Loop_Actor_Walk_To_Actor(9, 0, 72, 0, false);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 307.0f, 40.63f, 184.0f, 0, 0, false, 0);
+	Loop_Actor_Walk_To_Actor(kActorCrazylegs, kActorMcCoy, 72, 0, false);
 	Ambient_Sounds_Play_Sound(149, 99, 99, 0, 0);
-	Actor_Face_Actor(9, 0, true);
-	Actor_Face_Actor(0, 9, true);
-	Actor_Says(9, 170, 3);
-	Actor_Says(9, 180, 12);
-	Actor_Says(9, 190, 14);
-	Actor_Says(9, 200, 15);
-	Actor_Says(0, 1815, 12);
-	Actor_Says(9, 210, 16);
-	Actor_Says(0, 1820, -1);
-	Actor_Says(9, 220, 3);
-	Actor_Says(9, 230, 12);
-	Actor_Says(9, 240, 14);
-	Actor_Says(0, 1825, 0);
-	Actor_Says(9, 250, 15);
-	Actor_Face_Object(9, "MONTE CARLO DRY", true);
-	Actor_Says(9, 260, 16);
-	Actor_Face_Object(0, "MONTE CARLO DRY", true);
-	Actor_Says(0, 1830, 0);
-	Actor_Face_Actor(9, 0, true);
-	Actor_Face_Actor(0, 9, true);
-	Actor_Says(9, 270, 3);
-	Actor_Says(9, 280, 12);
-	Async_Actor_Walk_To_XYZ(9, 276.0f, 40.63f, 182.0f, 12, false);
-	Loop_Actor_Walk_To_XYZ(0, 335.0f, 40.63f, 131.0f, 12, 0, false, 0);
-	Actor_Face_Object(9, "MONTE CARLO DRY", true);
-	Actor_Face_Object(0, "MONTE CARLO DRY", true);
-	Actor_Says(9, 290, 14);
-	Actor_Says(9, 300, 15);
-	Actor_Says(9, 310, 16);
-	Actor_Says(0, 1835, 12);
-	Actor_Face_Actor(9, 0, true);
-	Actor_Says(9, 320, 3);
-	Actor_Face_Actor(0, 9, true);
-	Actor_Says(9, 330, 12);
-	Actor_Says(0, 1840, 3);
-	Actor_Says(9, 340, 14);
-	Actor_Says(0, 1845, 3);
-	Actor_Says(9, 350, 15);
-	Actor_Says(9, 360, 16);
-	Actor_Says(0, 1850, 3);
+	Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
+	Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
+	Actor_Says(kActorCrazylegs, 170, 3);
+	Actor_Says(kActorCrazylegs, 180, 12);
+	Actor_Says(kActorCrazylegs, 190, 14);
+	Actor_Says(kActorCrazylegs, 200, 15);
+	Actor_Says(kActorMcCoy, 1815, 12);
+	Actor_Says(kActorCrazylegs, 210, 16);
+	Actor_Says(kActorMcCoy, 1820, -1);
+	Actor_Says(kActorCrazylegs, 220, 3);
+	Actor_Says(kActorCrazylegs, 230, 12);
+	Actor_Says(kActorCrazylegs, 240, 14);
+	Actor_Says(kActorMcCoy, 1825, 0);
+	Actor_Says(kActorCrazylegs, 250, 15);
+	Actor_Face_Object(kActorCrazylegs, "MONTE CARLO DRY", true);
+	Actor_Says(kActorCrazylegs, 260, 16);
+	Actor_Face_Object(kActorMcCoy, "MONTE CARLO DRY", true);
+	Actor_Says(kActorMcCoy, 1830, 0);
+	Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
+	Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
+	Actor_Says(kActorCrazylegs, 270, 3);
+	Actor_Says(kActorCrazylegs, 280, 12);
+	Async_Actor_Walk_To_XYZ(kActorCrazylegs, 276.0f, 40.63f, 182.0f, 12, false);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 335.0f, 40.63f, 131.0f, 12, 0, false, 0);
+	Actor_Face_Object(kActorCrazylegs, "MONTE CARLO DRY", true);
+	Actor_Face_Object(kActorMcCoy, "MONTE CARLO DRY", true);
+	Actor_Says(kActorCrazylegs, 290, 14);
+	Actor_Says(kActorCrazylegs, 300, 15);
+	Actor_Says(kActorCrazylegs, 310, 16);
+	Actor_Says(kActorMcCoy, 1835, 12);
+	Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
+	Actor_Says(kActorCrazylegs, 320, 3);
+	Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
+	Actor_Says(kActorCrazylegs, 330, 12);
+	Actor_Says(kActorMcCoy, 1840, 3);
+	Actor_Says(kActorCrazylegs, 340, 14);
+	Actor_Says(kActorMcCoy, 1845, 3);
+	Actor_Says(kActorCrazylegs, 350, 15);
+	Actor_Says(kActorCrazylegs, 360, 16);
+	Actor_Says(kActorMcCoy, 1850, 3);
 	Player_Gains_Control();
 }
 
@@ -661,13 +661,13 @@ void SceneScriptHF05::sub_404474() {
 }
 
 int SceneScriptHF05::sub_4048C0() {
-	if (Actor_Query_In_Set(3, 41) == 1 && Actor_Query_Goal_Number(3) != 599) {
-		return 3;
+	if (Actor_Query_In_Set(kActorDektora, 41) == 1 && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		return kActorDektora;
 	}
-	if (Actor_Query_In_Set(6, 41) == 1 && Actor_Query_Goal_Number(6) != 599) {
-		return 6;
+	if (Actor_Query_In_Set(kActorLucy, 41) == 1 && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		return kActorLucy;
 	}
-	return 0;
+	return kActorMcCoy;
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/hf06.cpp b/engines/bladerunner/script/scene/hf06.cpp
index 2be8565551..926967a2df 100644
--- a/engines/bladerunner/script/scene/hf06.cpp
+++ b/engines/bladerunner/script/scene/hf06.cpp
@@ -62,33 +62,33 @@ bool SceneScriptHF06::MouseClick(int x, int y) {
 
 bool SceneScriptHF06::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BOX28", objectName) || Object_Query_Click("BOX29", objectName) || Object_Query_Click("BOX30", objectName) || Object_Query_Click("HOOD BOX", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 14.33f, 367.93f, 399.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 486, true);
-			if (Actor_Query_In_Set(3, 42) && Actor_Query_Goal_Number(3) != 599) {
-				Actor_Face_Actor(3, 0, true);
-				Actor_Says(3, 210, 12);
-				Actor_Says(0, 2125, 12);
-			} else if (Actor_Query_In_Set(6, 42) && Actor_Query_Goal_Number(6) != 599) {
-				Actor_Face_Actor(6, 0, true);
-				Actor_Says(6, 490, 18);
-				Actor_Says(0, 2125, 12);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 14.33f, 367.93f, 399.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 486, true);
+			if (Actor_Query_In_Set(kActorDektora, 42) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+				Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
+				Actor_Says(kActorDektora, 210, 12);
+				Actor_Says(kActorMcCoy, 2125, 12);
+			} else if (Actor_Query_In_Set(kActorLucy, 42) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+				Actor_Face_Actor(kActorLucy, kActorMcCoy, true);
+				Actor_Says(kActorLucy, 490, 18);
+				Actor_Says(kActorMcCoy, 2125, 12);
 			} else {
-				Actor_Says(0, 8635, 12);
+				Actor_Says(kActorMcCoy, 8635, 12);
 			}
 		}
 		return false;
 	}
 	if (Object_Query_Click("BOX19", objectName) || Object_Query_Click("BOX21", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 290.0f, 367.93f, 318.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 85, true);
-			Actor_Says(0, 8522, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 290.0f, 367.93f, 318.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 85, true);
+			Actor_Says(kActorMcCoy, 8522, 0);
 		}
 		return false;
 	}
 	if (Object_Query_Click("BOX13", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 63.0f, 367.93f, 120.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 568, true);
-			Actor_Says(0, 8522, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 63.0f, 367.93f, 120.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 568, true);
+			Actor_Says(kActorMcCoy, 8522, 0);
 		}
 		return false;
 	}
@@ -96,19 +96,19 @@ bool SceneScriptHF06::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptHF06::ClickedOnActor(int actorId) {
-	if (actorId == 6 && Actor_Query_Goal_Number(6) != 599) {
-		Actor_Face_Actor(6, 0, true);
-		Actor_Face_Actor(0, 6, true);
+	if (actorId == 6 && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		Actor_Face_Actor(kActorLucy, kActorMcCoy, true);
+		Actor_Face_Actor(kActorMcCoy, kActorLucy, true);
 		if (Game_Flag_Query(559)) {
-			Actor_Says(6, 390, 18);
-			Actor_Says(0, 2115, 17);
+			Actor_Says(kActorLucy, 390, 18);
+			Actor_Says(kActorMcCoy, 2115, 17);
 		}
-	} else if (actorId == 3 && Actor_Query_Goal_Number(3) != 599) {
-		Actor_Face_Actor(3, 0, true);
-		Actor_Face_Actor(0, 3, true);
+	} else if (actorId == 3 && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
+		Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
 		if (Game_Flag_Query(559)) {
-			Actor_Says(3, 100, 3);
-			Actor_Says(0, 2115, 17);
+			Actor_Says(kActorDektora, 100, 3);
+			Actor_Says(kActorMcCoy, 2115, 17);
 		}
 	}
 	return false;
@@ -120,9 +120,9 @@ bool SceneScriptHF06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptHF06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 170.0f, 367.93f, 497.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 730, false);
-			Loop_Actor_Travel_Stairs(0, 2, 0, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 170.0f, 367.93f, 497.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 730, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 2, 0, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(530);
@@ -141,38 +141,38 @@ void SceneScriptHF06::SceneFrameAdvanced(int frame) {
 }
 
 void SceneScriptHF06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bool currentSet) {
-	if (actorId == 1 && oldGoal != 599 && newGoal == 599) {
-		Loop_Actor_Walk_To_Actor(0, 1, 24, 0, false);
-		Actor_Says(1, 250, -1);
-		Actor_Says(0, 2120, 4);
-		Actor_Says(1, 260, -1);
-		Actor_Says(1, 270, -1);
+	if (actorId == kActorSteele && oldGoal != 599 && newGoal == 599) {
+		Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorSteele, 24, 0, false);
+		Actor_Says(kActorSteele, 250, -1);
+		Actor_Says(kActorMcCoy, 2120, 4);
+		Actor_Says(kActorSteele, 260, -1);
+		Actor_Says(kActorSteele, 270, -1);
 		int otherActorId = -1;
-		if (Actor_Query_In_Set(3, 42) && Actor_Query_Goal_Number(3) == 599) {
-			otherActorId = 3;
-		} else if (Actor_Query_In_Set(6, 42) && Actor_Query_Goal_Number(6) == 599) {
-			otherActorId = 6;
+		if (Actor_Query_In_Set(kActorDektora, 42) && Actor_Query_Goal_Number(kActorDektora) == 599) {
+			otherActorId = kActorDektora;
+		} else if (Actor_Query_In_Set(kActorLucy, 42) && Actor_Query_Goal_Number(kActorLucy) == 599) {
+			otherActorId = kActorLucy;
 		}
 		if (otherActorId != -1) {
 			Music_Play(21, 35, 0, 3, -1, 0, 0);
 			Player_Set_Combat_Mode(false);
 			Delay(1000);
-			Actor_Voice_Over(990, 99);
-			Actor_Voice_Over(1000, 99);
-			Actor_Voice_Over(1010, 99);
-			Loop_Actor_Walk_To_Actor(0, otherActorId, 24, 0, false);
+			Actor_Voice_Over(990, kActorVoiceOver);
+			Actor_Voice_Over(1000, kActorVoiceOver);
+			Actor_Voice_Over(1010, kActorVoiceOver);
+			Loop_Actor_Walk_To_Actor(kActorMcCoy, otherActorId, 24, 0, false);
 			Item_Pickup_Spin_Effect(932, 355, 200);
-			Actor_Voice_Over(1020, 99);
-			Actor_Voice_Over(1030, 99);
-			Actor_Voice_Over(1040, 99);
-			Actor_Voice_Over(1050, 99);
-			Actor_Clue_Acquire(0, 146, 1, -1);
+			Actor_Voice_Over(1020, kActorVoiceOver);
+			Actor_Voice_Over(1030, kActorVoiceOver);
+			Actor_Voice_Over(1040, kActorVoiceOver);
+			Actor_Voice_Over(1050, kActorVoiceOver);
+			Actor_Clue_Acquire(kActorMcCoy, kClueBomb, 1, -1);
 		}
-		if (Actor_Query_In_Set(3, 42)) {
-			Actor_Set_Targetable(3, false);
+		if (Actor_Query_In_Set(kActorDektora, 42)) {
+			Actor_Set_Targetable(kActorDektora, false);
 		}
-		if (Actor_Query_In_Set(6, 42)) {
-			Actor_Set_Targetable(6, false);
+		if (Actor_Query_In_Set(kActorLucy, 42)) {
+			Actor_Set_Targetable(kActorLucy, false);
 		}
 		Scene_Exits_Enable();
 	}
@@ -180,25 +180,25 @@ void SceneScriptHF06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptHF06::PlayerWalkedIn() {
 	if (Game_Flag_Query(662)) {
-		int actor_id;
-		if (Global_Variable_Query(45) == 3 && Actor_Query_Goal_Number(6) != 599) {
-			actor_id = 6;
+		int actorId;
+		if (Global_Variable_Query(45) == 3 && Actor_Query_Goal_Number(kActorLucy) != 599) {
+			actorId = kActorLucy;
 		} else {
-			actor_id = Global_Variable_Query(45) == 2 && Actor_Query_Goal_Number(3) != 599 ? 3 : -1;
+			actorId = Global_Variable_Query(45) == 2 && Actor_Query_Goal_Number(kActorDektora) != 599 ? kActorDektora : -1;
 		}
-		if (actor_id != -1) {
-			Actor_Put_In_Set(actor_id, 42);
+		if (actorId != -1) {
+			Actor_Put_In_Set(actorId, 42);
 			if (Game_Flag_Query(559)) {
-				Actor_Set_At_XYZ(actor_id, 173.67f, 367.93f, 446.04001f, 229);
-				Async_Actor_Walk_To_XYZ(actor_id, 173.67f, 367.93f, 394.04001f, 0, false);
+				Actor_Set_At_XYZ(actorId, 173.67f, 367.93f, 446.04f, 229);
+				Async_Actor_Walk_To_XYZ(actorId, 173.67f, 367.93f, 394.04f, 0, false);
 			} else {
-				Actor_Set_At_XYZ(actor_id, 97.67f, 367.93f, 534.04f, 725);
-				Async_Actor_Walk_To_XYZ(actor_id, 24.2f, 367.93f, 537.71f, 0, false);
+				Actor_Set_At_XYZ(actorId, 97.67f, 367.93f, 534.04f, 725);
+				Async_Actor_Walk_To_XYZ(actorId, 24.2f, 367.93f, 537.71f, 0, false);
 			}
 		}
 	}
 	Footstep_Sound_Override_On(3);
-	Loop_Actor_Travel_Stairs(0, 2, 1, 0);
+	Loop_Actor_Travel_Stairs(kActorMcCoy, 2, 1, 0);
 	Footstep_Sound_Override_Off();
 	if (Game_Flag_Query(662) && !Game_Flag_Query(559)) {
 		sub_401EF4();
@@ -215,59 +215,59 @@ void SceneScriptHF06::DialogueQueueFlushed(int a1) {
 void SceneScriptHF06::sub_401EF4() {
 	int actorId;
 
-	if (Actor_Query_In_Set(3, 42)) {
-		actorId = 3;
+	if (Actor_Query_In_Set(kActorDektora, 42)) {
+		actorId = kActorDektora;
 	} else {
-		if (!Actor_Query_In_Set(6, 42)) {
+		if (!Actor_Query_In_Set(kActorLucy, 42)) {
 			return;
 		}
-		actorId = 6;
+		actorId = kActorLucy;
 	}
 	Actor_Set_Targetable(actorId, true);
-	Loop_Actor_Walk_To_XYZ(0, 14.33f, 367.93f, 399.0f, 0, 0, true, 0);
-	Actor_Face_Heading(0, 486, true);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 14.33f, 367.93f, 399.0f, 0, 0, true, 0);
+	Actor_Face_Heading(kActorMcCoy, 486, true);
 	sub_4023E0();
-	Actor_Put_In_Set(1, 42);
-	Actor_Set_At_XYZ(1, 92.0f, 367.93f, 19.0f, 0);
-	Actor_Set_Targetable(1, true);
-	Actor_Face_Actor(actorId, 1, true);
+	Actor_Put_In_Set(kActorSteele, 42);
+	Actor_Set_At_XYZ(kActorSteele, 92.0f, 367.93f, 19.0f, 0);
+	Actor_Set_Targetable(kActorSteele, true);
+	Actor_Face_Actor(actorId, kActorSteele, true);
 	if (actorId == 3) {
-		Actor_Says(3, 90, 13);
+		Actor_Says(kActorDektora, 90, 13);
 	} else if (actorId == 6) {
-		Actor_Says(6, 380, 13);
+		Actor_Says(kActorLucy, 380, 13);
 	}
-	Actor_Says(0, 6230, 0);
-	Actor_Says(1, 280, 58);
-	Actor_Face_Actor(0, 1, true);
+	Actor_Says(kActorMcCoy, 6230, 0);
+	Actor_Says(kActorSteele, 280, 58);
+	Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
 	Player_Set_Combat_Mode(true);
-	Actor_Change_Animation_Mode(0, 5);
-	Actor_Change_Animation_Mode(1, 7);
-	Loop_Actor_Walk_To_XYZ(1, 92.0f, 367.93f, 107.0f, 0, 0, false, 0);
-	Actor_Face_Actor(1, 0, true);
-	Actor_Change_Animation_Mode(1, 4);
-	Actor_Says(1, 290, 58);
-	Actor_Says(0, 2130, -1);
-	Actor_Says(1, 300, 59);
-	Actor_Says(0, 2135, -1);
-	Actor_Says(1, 310, 60);
-	Actor_Says(0, 2140, -1);
-	Actor_Says(1, 320, 59);
-	Actor_Says(0, 2145, -1);
-	Actor_Says(1, 330, 58);
-	Actor_Says(1, 340, 58);
-	Actor_Says(1, 350, 58);
-	Actor_Change_Animation_Mode(1, 4);
+	Actor_Change_Animation_Mode(kActorMcCoy, 5);
+	Actor_Change_Animation_Mode(kActorSteele, 7);
+	Loop_Actor_Walk_To_XYZ(kActorSteele, 92.0f, 367.93f, 107.0f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
+	Actor_Change_Animation_Mode(kActorSteele, 4);
+	Actor_Says(kActorSteele, 290, 58);
+	Actor_Says(kActorMcCoy, 2130, -1);
+	Actor_Says(kActorSteele, 300, 59);
+	Actor_Says(kActorMcCoy, 2135, -1);
+	Actor_Says(kActorSteele, 310, 60);
+	Actor_Says(kActorMcCoy, 2140, -1);
+	Actor_Says(kActorSteele, 320, 59);
+	Actor_Says(kActorMcCoy, 2145, -1);
+	Actor_Says(kActorSteele, 330, 58);
+	Actor_Says(kActorSteele, 340, 58);
+	Actor_Says(kActorSteele, 350, 58);
+	Actor_Change_Animation_Mode(kActorSteele, 4);
 	Game_Flag_Set(644);
-	Actor_Set_Goal_Number(1, 402);
-	Actor_Face_Actor(1, actorId, true);
-	Actor_Change_Animation_Mode(1, 6);
+	Actor_Set_Goal_Number(kActorSteele, 402);
+	Actor_Face_Actor(kActorSteele, actorId, true);
+	Actor_Change_Animation_Mode(kActorSteele, 6);
 	Delay(500);
 	Scene_Loop_Set_Default(3);
 	Scene_Loop_Start_Special(2, 2, 1);
 	Sound_Play(562, 50, 0, 0, 50);
 	Game_Flag_Set(559);
 	Scene_Exits_Disable();
-	Non_Player_Actor_Combat_Mode_On(1, 3, 1, actorId, 15, 4, 7, 8, 0, 0, 100, 10, 300, 0);
+	Non_Player_Actor_Combat_Mode_On(kActorSteele, 3, 1, actorId, 15, 4, 7, 8, 0, 0, 100, 10, 300, 0);
 }
 
 void SceneScriptHF06::sub_4023E0() {
diff --git a/engines/bladerunner/script/scene/kp01.cpp b/engines/bladerunner/script/scene/kp01.cpp
index cdaffe91be..0a5dd24cd0 100644
--- a/engines/bladerunner/script/scene/kp01.cpp
+++ b/engines/bladerunner/script/scene/kp01.cpp
@@ -34,7 +34,7 @@ void SceneScriptKP01::InitializeScene() {
 		Game_Flag_Reset(413);
 		if (!Game_Flag_Query(674) && !Game_Flag_Query(653)) {
 			Game_Flag_Set(674);
-			Actor_Set_Goal_Number(1, 420);
+			Actor_Set_Goal_Number(kActorSteele, 420);
 		}
 	}
 	Scene_Exit_Add_2D_Exit(0, 0, 0, 30, 479, 3);
@@ -79,7 +79,7 @@ bool SceneScriptKP01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptKP01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -125.0f, -12.2f, -61.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -125.0f, -12.2f, -61.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(415);
@@ -88,7 +88,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -284.0f, -12.2f, -789.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -284.0f, -12.2f, -789.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(417);
@@ -97,7 +97,7 @@ bool SceneScriptKP01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 239.0f, 12.2f, -146.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 239.0f, 12.2f, -146.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(414);
@@ -121,18 +121,18 @@ void SceneScriptKP01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 		if (newGoal == 422) {
 			if (Game_Flag_Query(378) == 1) {
 				Delay(500);
-				Actor_Change_Animation_Mode(0, 75);
+				Actor_Change_Animation_Mode(kActorMcCoy, 75);
 				Delay(4500);
-				Actor_Face_Current_Camera(0, true);
-				Actor_Says(0, 510, 3);
+				Actor_Face_Current_Camera(kActorMcCoy, true);
+				Actor_Says(kActorMcCoy, 510, 3);
 			} else {
 				Delay(3000);
 			}
-			Async_Actor_Walk_To_XYZ(0, 76.56f, -12.2f, -405.48f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, 76.56f, -12.2f, -405.48f, 0, false);
 			//return true;
 		} else if (newGoal == 423) {
 			Player_Gains_Control();
-			Actor_Force_Stop_Walking(0);
+			Actor_Force_Stop_Walking(kActorMcCoy);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(417);
@@ -145,19 +145,19 @@ void SceneScriptKP01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptKP01::PlayerWalkedIn() {
 	if (Game_Flag_Query(416)) {
-		Loop_Actor_Walk_To_XYZ(0, -93.0f, -12.2f, -61.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -93.0f, -12.2f, -61.0f, 0, 0, false, 0);
 		Game_Flag_Reset(416);
 	} else if (Game_Flag_Query(418)) {
-		Loop_Actor_Walk_To_XYZ(0, -240.0f, -12.2f, -789.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -240.0f, -12.2f, -789.0f, 0, 0, false, 0);
 		Game_Flag_Reset(418);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, 211.0f, -12.2f, -146.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 211.0f, -12.2f, -146.0f, 0, 0, false, 0);
 		if (!Game_Flag_Query(653)
 			&& !Game_Flag_Query(714)
-			&& Actor_Query_Goal_Number(1) == 420
-			&& Actor_Query_Goal_Number(1) != 599) {
+			&& Actor_Query_Goal_Number(kActorSteele) == 420
+			&& Actor_Query_Goal_Number(kActorSteele) != 599) {
 			Player_Loses_Control();
-			Actor_Set_Goal_Number(1, 421);
+			Actor_Set_Goal_Number(kActorSteele, 421);
 		}
 	}
 }
diff --git a/engines/bladerunner/script/scene/kp02.cpp b/engines/bladerunner/script/scene/kp02.cpp
index 906f80da28..e4e47da83a 100644
--- a/engines/bladerunner/script/scene/kp02.cpp
+++ b/engines/bladerunner/script/scene/kp02.cpp
@@ -75,12 +75,12 @@ bool SceneScriptKP02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptKP02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -1040.0f, -615.49f, 2903.0f, 0, 1, false, 0)) {
-			if (Actor_Query_Goal_Number(65) == 406 || Actor_Query_Goal_Number(64) == 406) {
-				Non_Player_Actor_Combat_Mode_Off(65);
-				Non_Player_Actor_Combat_Mode_Off(64);
-				Actor_Set_Goal_Number(65, 400);
-				Actor_Set_Goal_Number(64, 400);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1040.0f, -615.49f, 2903.0f, 0, 1, false, 0)) {
+			if (Actor_Query_Goal_Number(kActorFreeSlotB) == 406 || Actor_Query_Goal_Number(kActorFreeSlotA) == 406) {
+				Non_Player_Actor_Combat_Mode_Off(kActorFreeSlotB);
+				Non_Player_Actor_Combat_Mode_Off(kActorFreeSlotA);
+				Actor_Set_Goal_Number(kActorFreeSlotB, 400);
+				Actor_Set_Goal_Number(kActorFreeSlotA, 400);
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Game_Flag_Set(411);
@@ -95,12 +95,12 @@ bool SceneScriptKP02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -884.0f, -615.49f, 3065.0f, 0, 1, false, 0)) {
-			if (Actor_Query_Goal_Number(65) == 406 || Actor_Query_Goal_Number(64) == 406) {
-				Non_Player_Actor_Combat_Mode_Off(65);
-				Non_Player_Actor_Combat_Mode_Off(64);
-				Actor_Set_Goal_Number(65, 400);
-				Actor_Set_Goal_Number(64, 400);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -884.0f, -615.49f, 3065.0f, 0, 1, false, 0)) {
+			if (Actor_Query_Goal_Number(kActorFreeSlotB) == 406 || Actor_Query_Goal_Number(kActorFreeSlotA) == 406) {
+				Non_Player_Actor_Combat_Mode_Off(kActorFreeSlotB);
+				Non_Player_Actor_Combat_Mode_Off(kActorFreeSlotA);
+				Actor_Set_Goal_Number(kActorFreeSlotB, 400);
+				Actor_Set_Goal_Number(kActorFreeSlotA, 400);
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Game_Flag_Set(413);
@@ -129,11 +129,11 @@ void SceneScriptKP02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptKP02::PlayerWalkedIn() {
 	if (Game_Flag_Query(414)) {
-		Loop_Actor_Walk_To_XYZ(0, -884.0f, -615.49f, 3035.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -884.0f, -615.49f, 3035.0f, 0, 0, false, 0);
 		Game_Flag_Reset(414);
 	}
-	if (Game_Flag_Query(653) && Actor_Query_Goal_Number(1) != 599) {
-		Actor_Set_Goal_Number(1, 450);
+	if (Game_Flag_Query(653) && Actor_Query_Goal_Number(kActorSteele) != 599) {
+		Actor_Set_Goal_Number(kActorSteele, 450);
 	}
 	//return false;
 }
diff --git a/engines/bladerunner/script/scene/kp03.cpp b/engines/bladerunner/script/scene/kp03.cpp
index 49fc01c1ec..59766c0553 100644
--- a/engines/bladerunner/script/scene/kp03.cpp
+++ b/engines/bladerunner/script/scene/kp03.cpp
@@ -46,9 +46,9 @@ void SceneScriptKP03::InitializeScene() {
 		Scene_Loop_Set_Default(2);
 		Game_Flag_Set(421);
 	}
-	if ((Actor_Query_Goal_Number(1) != 599 && !Game_Flag_Query(422) && !Game_Flag_Query(484)) && ((Game_Flag_Query(653) && Game_Flag_Query(420)) || (!Game_Flag_Query(653) && Game_Flag_Query(417)))) {
-		Actor_Put_In_Set(1, 46);
-		Actor_Set_At_XYZ(1, -300.0f, -36.55f, 26.0f, 350);
+	if ((Actor_Query_Goal_Number(kActorSteele) != 599 && !Game_Flag_Query(422) && !Game_Flag_Query(484)) && ((Game_Flag_Query(653) && Game_Flag_Query(420)) || (!Game_Flag_Query(653) && Game_Flag_Query(417)))) {
+		Actor_Put_In_Set(kActorSteele, 46);
+		Actor_Set_At_XYZ(kActorSteele, -300.0f, -36.55f, 26.0f, 350);
 	}
 }
 
@@ -65,37 +65,37 @@ bool SceneScriptKP03::MouseClick(int x, int y) {
 }
 
 bool SceneScriptKP03::ClickedOn3DObject(const char *objectName, bool a2) {
-	Actor_Face_Object(1, "BRACK MID", true);
+	Actor_Face_Object(kActorSteele, "BRACK MID", true);
 	if (Object_Query_Click("BRACK MID", objectName) && !Game_Flag_Query(422)) {
 		if (a2) {
 			Scene_Loop_Set_Default(5);
 			Scene_Loop_Start_Special(2, 4, 1);
-			Actor_Change_Animation_Mode(0, 39);
-			Actor_Retired_Here(0, 72, 18, 1, -1);
+			Actor_Change_Animation_Mode(kActorMcCoy, 39);
+			Actor_Retired_Here(kActorMcCoy, 72, 18, 1, -1);
 			Game_Flag_Set(422);
 			Game_Flag_Reset(421);
 			return false;
 		}
-		if (Actor_Query_Goal_Number(1) == 411) {
+		if (Actor_Query_Goal_Number(kActorSteele) == 411) {
 			Scene_Exits_Enable();
 			sub_401E54();
 		} else {
 			if (Game_Flag_Query(417)) {
-				Loop_Actor_Walk_To_XYZ(0, -137.0f, -36.55f, 26.0f, 0, 0, true, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -137.0f, -36.55f, 26.0f, 0, 0, true, 0);
 			} else if (Game_Flag_Query(420)) {
-				Loop_Actor_Walk_To_XYZ(0, -50.0f, -36.55f, 78.0f, 0, 0, true, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -50.0f, -36.55f, 78.0f, 0, 0, true, 0);
 			}
 			if (Game_Flag_Query(421)) {
-				Actor_Face_Object(0, "BRACK MID", true);
+				Actor_Face_Object(kActorMcCoy, "BRACK MID", true);
 				Game_Flag_Set(484);
 				Game_Flag_Reset(421);
 				Scene_Loop_Set_Default(7);
 				Scene_Loop_Start_Special(2, 0, 0);
-				Actor_Voice_Over(1110, 99);
-				Actor_Voice_Over(1120, 99);
+				Actor_Voice_Over(1110, kActorVoiceOver);
+				Actor_Voice_Over(1120, kActorVoiceOver);
 			} else {
-				Actor_Face_Object(0, "BRACK MID", true);
-				Actor_Says(0, 8580, 13);
+				Actor_Face_Object(kActorMcCoy, "BRACK MID", true);
+				Actor_Says(kActorMcCoy, 8580, 13);
 			}
 		}
 		return true;
@@ -104,8 +104,8 @@ bool SceneScriptKP03::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptKP03::ClickedOnActor(int actorId) {
-	if (actorId == 1 && Actor_Query_Goal_Number(1) == 411) {
-		Actor_Face_Object(1, "BRACK MID", true);
+	if (actorId == 1 && Actor_Query_Goal_Number(kActorSteele) == 411) {
+		Actor_Face_Object(kActorSteele, "BRACK MID", true);
 		sub_401E54();
 	}
 	return false;
@@ -116,11 +116,11 @@ bool SceneScriptKP03::ClickedOnItem(int itemId, bool a2) {
 }
 
 bool SceneScriptKP03::ClickedOnExit(int exitId) {
-	if (Actor_Query_Goal_Number(1) == 410) {
-		Actor_Set_Goal_Number(1, 418);
+	if (Actor_Query_Goal_Number(kActorSteele) == 410) {
+		Actor_Set_Goal_Number(kActorSteele, 418);
 	} else {
 		if (exitId == 0) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 1.0f, -36.55f, 111.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1.0f, -36.55f, 111.0f, 0, 1, false, 0)) {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Music_Stop(2);
@@ -132,7 +132,7 @@ bool SceneScriptKP03::ClickedOnExit(int exitId) {
 			return true;
 		}
 		if (exitId == 1) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -321.0f, -36.55f, 26.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -321.0f, -36.55f, 26.0f, 0, 1, false, 0)) {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Music_Stop(2);
@@ -161,14 +161,14 @@ void SceneScriptKP03::SceneFrameAdvanced(int frame) {
 	if (Game_Flag_Query(421) && !Game_Flag_Query(484)) {
 		v1 = -1;
 		if (!Game_Flag_Query(422)) {
-			Actor_Query_XYZ(0, &x, &y, &z);
+			Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 			if ((Game_Flag_Query(417) && -130.0f < x) || (Game_Flag_Query(420) && -130.0f > x)) {
 				v1 = 0;
 			}
 		}
 		if (!Game_Flag_Query(422)) { //todo ? same condition as before
-			Actor_Query_XYZ(1, &x, &y, &z);
-			if (Game_Flag_Query(653) && Actor_Query_Which_Set_In(1) == 46) {
+			Actor_Query_XYZ(kActorSteele, &x, &y, &z);
+			if (Game_Flag_Query(653) && Actor_Query_Which_Set_In(kActorSteele) == 46) {
 				if ((Game_Flag_Query(417) && -130.0f > x) || (Game_Flag_Query(420) && -130.0f < x)) {
 					v1 = 1;
 				}
@@ -184,18 +184,18 @@ void SceneScriptKP03::SceneFrameAdvanced(int frame) {
 			Unclickable_Object("BRACK MID");
 			Scene_Exits_Enable();
 			if (v1 == 1) {
-				Actor_Set_Goal_Number(1, 415);
+				Actor_Set_Goal_Number(kActorSteele, 415);
 				Music_Play(12, 25, 0, 1, -1, 0, 0);
-				if (Actor_Query_Inch_Distance_From_Actor(0, 1) <= 120) {
+				if (Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorSteele) <= 120) {
 					v1 = 0;
 				}
 			}
 			if (v1) {
-				Actor_Change_Animation_Mode(0, 21);
+				Actor_Change_Animation_Mode(kActorMcCoy, 21);
 			} else {
-				Actor_Force_Stop_Walking(0);
-				Actor_Change_Animation_Mode(0, 48);
-				Actor_Retired_Here(0, 72, 18, 1, -1);
+				Actor_Force_Stop_Walking(kActorMcCoy);
+				Actor_Change_Animation_Mode(kActorMcCoy, 48);
+				Actor_Retired_Here(kActorMcCoy, 72, 18, 1, -1);
 			}
 		}
 	}
@@ -206,17 +206,17 @@ void SceneScriptKP03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptKP03::PlayerWalkedIn() {
 	if (Game_Flag_Query(420)) {
-		Loop_Actor_Walk_To_XYZ(0, 1.0f, -36.55f, 87.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1.0f, -36.55f, 87.0f, 0, 0, false, 0);
 	}
-	if (Actor_Query_Is_In_Current_Set(1) && Actor_Query_Goal_Number(1) != 419) {
+	if (Actor_Query_Is_In_Current_Set(kActorSteele) && Actor_Query_Goal_Number(kActorSteele) != 419) {
 		if (Game_Flag_Query(653)) {
 			if (Game_Flag_Query(420)) {
-				Actor_Set_Goal_Number(1, 410);
+				Actor_Set_Goal_Number(kActorSteele, 410);
 			}
 		} else if (!Game_Flag_Query(422) && !Game_Flag_Query(484) && Game_Flag_Query(417)) {
 			Scene_Exits_Disable();
 			Delay(1000);
-			Actor_Set_Goal_Number(1, 411);
+			Actor_Set_Goal_Number(kActorSteele, 411);
 		}
 	}
 }
@@ -229,27 +229,27 @@ void SceneScriptKP03::DialogueQueueFlushed(int a1) {
 
 void SceneScriptKP03::sub_401E54() {
 	Player_Loses_Control();
-	Actor_Says(0, 2180, 14);
-	Actor_Set_Goal_Number(1, 412);
-	Actor_Says(1, 480, 60);
-	Actor_Face_Object(0, "BRACK MID", true);
-	Actor_Says(0, 2185, 14);
-	Loop_Actor_Walk_To_XYZ(1, -137.0f, -36.55f, 26.0f, 0, 0, false, 0);
-	Actor_Face_Object(1, "BRACK MID", true);
-	Actor_Says(1, 490, 58);
-	Actor_Says(0, 2190, 14);
-	Actor_Says(1, 500, 58);
-	Actor_Says(1, 510, 59);
-	Actor_Says(1, 520, 60);
+	Actor_Says(kActorMcCoy, 2180, 14);
+	Actor_Set_Goal_Number(kActorSteele, 412);
+	Actor_Says(kActorSteele, 480, 60);
+	Actor_Face_Object(kActorMcCoy, "BRACK MID", true);
+	Actor_Says(kActorMcCoy, 2185, 14);
+	Loop_Actor_Walk_To_XYZ(kActorSteele, -137.0f, -36.55f, 26.0f, 0, 0, false, 0);
+	Actor_Face_Object(kActorSteele, "BRACK MID", true);
+	Actor_Says(kActorSteele, 490, 58);
+	Actor_Says(kActorMcCoy, 2190, 14);
+	Actor_Says(kActorSteele, 500, 58);
+	Actor_Says(kActorSteele, 510, 59);
+	Actor_Says(kActorSteele, 520, 60);
 	Game_Flag_Set(484);
 	Game_Flag_Reset(421);
 	Scene_Loop_Set_Default(7);
 	Scene_Loop_Start_Special(2, 7, 0);
-	Actor_Set_Goal_Number(1, 413);
-	Actor_Says(0, 2195, 14);
+	Actor_Set_Goal_Number(kActorSteele, 413);
+	Actor_Says(kActorMcCoy, 2195, 14);
 	Ambient_Sounds_Play_Sound(151, 40, -60, -60, 0);
-	Loop_Actor_Walk_To_XYZ(0, 1.0f, -36.55f, 111.0f, 0, 0, false, 0);
-	Actor_Set_Goal_Number(1, 430);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1.0f, -36.55f, 111.0f, 0, 0, false, 0);
+	Actor_Set_Goal_Number(kActorSteele, 430);
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	Game_Flag_Reset(417);
diff --git a/engines/bladerunner/script/scene/kp04.cpp b/engines/bladerunner/script/scene/kp04.cpp
index 0ace6d23f8..5da5050dd3 100644
--- a/engines/bladerunner/script/scene/kp04.cpp
+++ b/engines/bladerunner/script/scene/kp04.cpp
@@ -70,7 +70,7 @@ bool SceneScriptKP04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptKP04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -905.0f, 94.89f, 1357.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -905.0f, 94.89f, 1357.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(416);
@@ -79,7 +79,7 @@ bool SceneScriptKP04::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -544.0f, 94.89f, 288.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -544.0f, 94.89f, 288.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(574);
@@ -102,7 +102,7 @@ void SceneScriptKP04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptKP04::PlayerWalkedIn() {
 	if (Game_Flag_Query(575)) {
-		Loop_Actor_Walk_To_XYZ(0, -584.0f, 94.89f, 288.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -584.0f, 94.89f, 288.0f, 0, 0, false, 0);
 		Game_Flag_Reset(575);
 	} else {
 		Game_Flag_Reset(415);
diff --git a/engines/bladerunner/script/scene/kp05.cpp b/engines/bladerunner/script/scene/kp05.cpp
index 3fb963534d..d957c70693 100644
--- a/engines/bladerunner/script/scene/kp05.cpp
+++ b/engines/bladerunner/script/scene/kp05.cpp
@@ -53,7 +53,7 @@ void SceneScriptKP05::SceneLoaded() {
 	Unobstacle_Object("OBSTACLEBOX20", true);
 	Clickable_Object("BRIDGE02");
 	Unclickable_Object("BRIDGE02");
-	if (!Actor_Clue_Query(0, 145) && Game_Flag_Query(653)) {
+	if (!Actor_Clue_Query(kActorMcCoy, kCluePowerSource) && Game_Flag_Query(653)) {
 		Item_Add_To_World(118, 960, 9, -1095.0f, 0.0f, 770.0f, 256, 24, 24, false, true, false, true);
 	}
 }
@@ -72,9 +72,9 @@ bool SceneScriptKP05::ClickedOnActor(int actorId) {
 
 bool SceneScriptKP05::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 118) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -1058.0f, 0.0f, 852.0f, 0, 1, false, 0)) {
-			Actor_Face_Item(0, 118, true);
-			Actor_Clue_Acquire(0, 145, 1, -1);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1058.0f, 0.0f, 852.0f, 0, 1, false, 0)) {
+			Actor_Face_Item(kActorMcCoy, 118, true);
+			Actor_Clue_Acquire(kActorMcCoy, kCluePowerSource, 1, -1);
 			Item_Remove_From_World(118);
 			Item_Pickup_Spin_Effect(960, 58, 321);
 		}
@@ -84,7 +84,7 @@ bool SceneScriptKP05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptKP05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -802.0f, 0.0f, 972.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -802.0f, 0.0f, 972.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(420);
@@ -93,7 +93,7 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -1142.0f, 0.0f, 932.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1142.0f, 0.0f, 932.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(575);
@@ -102,11 +102,11 @@ bool SceneScriptKP05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -868.0f, 0.0f, -68.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -68.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(576);
-			Async_Actor_Walk_To_XYZ(0, -868.0f, 0.0f, -216.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 0.0f, -216.0f, 0, false);
 			Set_Enter(9, 46);
 		}
 		return true;
@@ -128,37 +128,37 @@ void SceneScriptKP05::PlayerWalkedIn() {
 	if (Game_Flag_Query(577)) {
 		Game_Flag_Reset(577);
 	} else if (Game_Flag_Query(574)) {
-		Loop_Actor_Walk_To_XYZ(0, -1110.0f, 0.0f, 932.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1110.0f, 0.0f, 932.0f, 0, 0, false, 0);
 		Game_Flag_Reset(574);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, -846.0f, 0.0f, 972.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -846.0f, 0.0f, 972.0f, 0, 0, false, 0);
 		Game_Flag_Query(419);
 	}
-	if (Actor_Query_Goal_Number(66) == 411) {
-		Actor_Set_Goal_Number(66, 412);
+	if (Actor_Query_Goal_Number(kActorMaggie) == 411) {
+		Actor_Set_Goal_Number(kActorMaggie, 412);
 	}
-	if (Actor_Query_Goal_Number(1) == 450) {
+	if (Actor_Query_Goal_Number(kActorSteele) == 450) {
 		Scene_Exits_Disable();
-		Actor_Face_Actor(1, 0, true);
-		Actor_Says(1, 530, 15);
-		Actor_Says(1, 540, 16);
-		Actor_Face_Actor(0, 1, true);
+		Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
+		Actor_Says(kActorSteele, 530, 15);
+		Actor_Says(kActorSteele, 540, 16);
+		Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
 		Player_Set_Combat_Mode(true);
-		Actor_Says(0, 2200, 3);
-		Actor_Says(1, 550, 17);
-		Actor_Says(0, 2205, 3);
-		Actor_Says(1, 560, 15);
-		Actor_Says(1, 570, 16);
-		Actor_Says(1, 580, 13);
-		Actor_Says(0, 2210, 3);
-		Actor_Says(1, 590, 13);
-		Actor_Says(0, 2215, 3);
-		Actor_Says(1, 600, 16);
-		Actor_Says(1, 610, 15);
-		Actor_Says(0, 2220, 3);
-		Actor_Says(1, 620, 15);
-		Actor_Says(1, 630, 17);
-		Non_Player_Actor_Combat_Mode_On(1, 0, 1, 0, 9, 4, 7, 8, 0, -1, -1, 20, 240, 0);
+		Actor_Says(kActorMcCoy, 2200, 3);
+		Actor_Says(kActorSteele, 550, 17);
+		Actor_Says(kActorMcCoy, 2205, 3);
+		Actor_Says(kActorSteele, 560, 15);
+		Actor_Says(kActorSteele, 570, 16);
+		Actor_Says(kActorSteele, 580, 13);
+		Actor_Says(kActorMcCoy, 2210, 3);
+		Actor_Says(kActorSteele, 590, 13);
+		Actor_Says(kActorMcCoy, 2215, 3);
+		Actor_Says(kActorSteele, 600, 16);
+		Actor_Says(kActorSteele, 610, 15);
+		Actor_Says(kActorMcCoy, 2220, 3);
+		Actor_Says(kActorSteele, 620, 15);
+		Actor_Says(kActorSteele, 630, 17);
+		Non_Player_Actor_Combat_Mode_On(kActorSteele, 0, 1, kActorMcCoy, 9, 4, 7, 8, 0, -1, -1, 20, 240, 0);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/kp06.cpp b/engines/bladerunner/script/scene/kp06.cpp
index a56080af23..e9fab6dae9 100644
--- a/engines/bladerunner/script/scene/kp06.cpp
+++ b/engines/bladerunner/script/scene/kp06.cpp
@@ -73,19 +73,19 @@ bool SceneScriptKP06::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptKP06::ClickedOnActor(int actorId) {
 	if (actorId == 8 && !Game_Flag_Query(714)) {
-		if (Actor_Clue_Query(8, 145)) {
-			Actor_Face_Actor(0, 8, true);
-			Actor_Says(0, 8610, 15);
-			Actor_Says(8, 290, 3);
-		} else if (Actor_Clue_Query(0, 145) ) {
-			Actor_Says(8, 280, 3);
-			Actor_Says(8, 290, 3);
-			Actor_Clue_Acquire(8, 145, 1, 0);
+		if (Actor_Clue_Query(kActorSadik, kCluePowerSource)) {
+			Actor_Face_Actor(kActorMcCoy, kActorSadik, true);
+			Actor_Says(kActorMcCoy, 8610, 15);
+			Actor_Says(kActorSadik, 290, 3);
+		} else if (Actor_Clue_Query(kActorMcCoy, kCluePowerSource) ) {
+			Actor_Says(kActorSadik, 280, 3);
+			Actor_Says(kActorSadik, 290, 3);
+			Actor_Clue_Acquire(kActorSadik, kCluePowerSource, 1, kActorMcCoy);
 		} else {
-			Actor_Says(0, 2320, 3);
-			Actor_Says(0, 2325, 3);
-			Actor_Says(8, 300, 3);
-			Actor_Says(8, 310, 3);
+			Actor_Says(kActorMcCoy, 2320, 3);
+			Actor_Says(kActorMcCoy, 2325, 3);
+			Actor_Says(kActorSadik, 300, 3);
+			Actor_Says(kActorSadik, 310, 3);
 		}
 	}
 	return false;
@@ -97,7 +97,7 @@ bool SceneScriptKP06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptKP06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -868.0f, 8.26f, -68.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -868.0f, 8.26f, -68.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(577);
@@ -106,34 +106,34 @@ bool SceneScriptKP06::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (Actor_Clue_Query(8, 145) || Actor_Query_Goal_Number(8) != 416) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -731.0f, 8.26f, -657.0f, 0, 1, false, 0)) {
+		if (Actor_Clue_Query(kActorSadik, kCluePowerSource) || Actor_Query_Goal_Number(kActorSadik) != 416) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -731.0f, 8.26f, -657.0f, 0, 1, false, 0)) {
 				if (Game_Flag_Query(653)) {
 					if (!Game_Flag_Query(714)) {
 						Player_Set_Combat_Mode(false);
 					}
-				} else if (Actor_Query_Goal_Number(1) == 433) {
-					Actor_Set_Goal_Number(1, 499);
+				} else if (Actor_Query_Goal_Number(kActorSteele) == 433) {
+					Actor_Set_Goal_Number(kActorSteele, 499);
 				} else {
-					Actor_Set_Goal_Number(53, 499);
+					Actor_Set_Goal_Number(kActorGaff, 499);
 				}
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Game_Flag_Set(578);
 				Set_Enter(48, 47);
 			}
-		} else if (Actor_Clue_Query(0, 145) ) {
-			Actor_Says(8, 280, 3);
-			Actor_Says(8, 290, 3);
-			Actor_Clue_Acquire(8, 145, 1, 0);
-			Loop_Actor_Walk_To_XYZ(0, -731.0f, 8.26f, -657.0f, 0, 0, true, 0);
+		} else if (Actor_Clue_Query(kActorMcCoy, kCluePowerSource) ) {
+			Actor_Says(kActorSadik, 280, 3);
+			Actor_Says(kActorSadik, 290, 3);
+			Actor_Clue_Acquire(kActorSadik, kCluePowerSource, 1, kActorMcCoy);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -731.0f, 8.26f, -657.0f, 0, 0, true, 0);
 			Player_Set_Combat_Mode(false);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(578);
 			Set_Enter(48, 47);
 		} else {
-			Actor_Set_Goal_Number(8, 417);
+			Actor_Set_Goal_Number(kActorSadik, 417);
 		}
 		return true;
 	}
@@ -153,25 +153,25 @@ void SceneScriptKP06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptKP06::PlayerWalkedIn() {
 	if (!Game_Flag_Query(653) && Game_Flag_Query(579)) {
 		Game_Flag_Reset(579);
-		if (Actor_Query_Goal_Number(1) == 499) {
-			Actor_Face_Actor(1, 0, true);
-			Actor_Says(1, 2530, 13);
-			Actor_Face_Actor(0, 1, true);
-			Actor_Says(0, 6200, 11);
-			Actor_Says(1, 2540, 15);
-			Actor_Says(1, 2550, 12);
-			Actor_Says(0, 6205, 14);
-			if (Actor_Query_Friendliness_To_Other(1, 0) < 50) {
-				Actor_Says(1, 2560, 12);
-				Actor_Says(0, 6210, 14);
-				Actor_Says(1, 2570, 13);
-				Actor_Says(0, 6215, 14);
-				Actor_Says(1, 2580, 15);
-				Actor_Says(1, 2590, 12);
+		if (Actor_Query_Goal_Number(kActorSteele) == 499) {
+			Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
+			Actor_Says(kActorSteele, 2530, 13);
+			Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
+			Actor_Says(kActorMcCoy, 6200, 11);
+			Actor_Says(kActorSteele, 2540, 15);
+			Actor_Says(kActorSteele, 2550, 12);
+			Actor_Says(kActorMcCoy, 6205, 14);
+			if (Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy) < 50) {
+				Actor_Says(kActorSteele, 2560, 12);
+				Actor_Says(kActorMcCoy, 6210, 14);
+				Actor_Says(kActorSteele, 2570, 13);
+				Actor_Says(kActorMcCoy, 6215, 14);
+				Actor_Says(kActorSteele, 2580, 15);
+				Actor_Says(kActorSteele, 2590, 12);
 			}
-			Async_Actor_Walk_To_Waypoint(0, 551, 0, 0);
+			Async_Actor_Walk_To_Waypoint(kActorMcCoy, 551, 0, 0);
 			Delay(1000);
-			Actor_Says(0, 6220, -1);
+			Actor_Says(kActorMcCoy, 6220, -1);
 			Delay(3000);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -180,31 +180,31 @@ void SceneScriptKP06::PlayerWalkedIn() {
 			//return true;
 			return;
 		} else {
-			Actor_Set_Goal_Number(53, 499);
-			Actor_Face_Actor(53, 0, true);
-			Actor_Says(53, 220, 13);
-			Actor_Face_Actor(0, 53, true);
-			Actor_Says(0, 6245, 11);
-			Actor_Says(53, 230, 14);
+			Actor_Set_Goal_Number(kActorGaff, 499);
+			Actor_Face_Actor(kActorGaff, kActorMcCoy, true);
+			Actor_Says(kActorGaff, 220, 13);
+			Actor_Face_Actor(kActorMcCoy, kActorGaff, true);
+			Actor_Says(kActorMcCoy, 6245, 11);
+			Actor_Says(kActorGaff, 230, 14);
 			if (Game_Flag_Query(714)) {
-				Actor_Says(0, 6250, 15);
-				Actor_Says(53, 240, 13);
+				Actor_Says(kActorMcCoy, 6250, 15);
+				Actor_Says(kActorGaff, 240, 13);
 				Delay(1000);
-				Actor_Says(0, 6255, 17);
-				Actor_Says(53, 250, 14);
+				Actor_Says(kActorMcCoy, 6255, 17);
+				Actor_Says(kActorGaff, 250, 14);
 				Delay(1000);
 			}
-			Actor_Says(53, 260, 12);
-			Actor_Says(0, 6260, 15);
-			Actor_Says(53, 270, 13);
-			Actor_Says(53, 280, 15);
-			Actor_Says(0, 6265, 14);
-			Actor_Says(53, 290, 14);
-			Actor_Says(53, 300, 15);
-			Actor_Says(0, 6270, 11);
-			Async_Actor_Walk_To_Waypoint(0, 550, 0, 0);
-			Async_Actor_Walk_To_Waypoint(53, 551, 0, 0);
-			Actor_Says(53, 310, -1);
+			Actor_Says(kActorGaff, 260, 12);
+			Actor_Says(kActorMcCoy, 6260, 15);
+			Actor_Says(kActorGaff, 270, 13);
+			Actor_Says(kActorGaff, 280, 15);
+			Actor_Says(kActorMcCoy, 6265, 14);
+			Actor_Says(kActorGaff, 290, 14);
+			Actor_Says(kActorGaff, 300, 15);
+			Actor_Says(kActorMcCoy, 6270, 11);
+			Async_Actor_Walk_To_Waypoint(kActorMcCoy, 550, 0, 0);
+			Async_Actor_Walk_To_Waypoint(kActorGaff, 551, 0, 0);
+			Actor_Says(kActorGaff, 310, -1);
 			Delay(3000);
 			Outtake_Play(26, 0, -1);
 			Game_Over();
@@ -212,13 +212,13 @@ void SceneScriptKP06::PlayerWalkedIn() {
 			return;
 		}
 	} else {
-		if (Actor_Query_Goal_Number(8) == 414) {
-			Loop_Actor_Walk_To_XYZ(0, -809.0f, 8.26f, -619.0f, 0, 0, false, 0);
-			Actor_Face_Actor(0, 8, true);
-			Actor_Set_Goal_Number(8, 415);
+		if (Actor_Query_Goal_Number(kActorSadik) == 414) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -809.0f, 8.26f, -619.0f, 0, 0, false, 0);
+			Actor_Face_Actor(kActorMcCoy, kActorSadik, true);
+			Actor_Set_Goal_Number(kActorSadik, 415);
 		}
-		if (Actor_Query_Goal_Number(1) == 431) {
-			Actor_Set_Goal_Number(1, 432);
+		if (Actor_Query_Goal_Number(kActorSteele) == 431) {
+			Actor_Set_Goal_Number(kActorSteele, 432);
 		}
 		//return false;
 		return;
@@ -226,8 +226,8 @@ void SceneScriptKP06::PlayerWalkedIn() {
 }
 
 void SceneScriptKP06::PlayerWalkedOut() {
-	if (Game_Flag_Query(578) && Actor_Query_Goal_Number(1) == 433) {
-		Actor_Set_Goal_Number(1, 499);
+	if (Game_Flag_Query(578) && Actor_Query_Goal_Number(kActorSteele) == 433) {
+		Actor_Set_Goal_Number(kActorSteele, 499);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/kp07.cpp b/engines/bladerunner/script/scene/kp07.cpp
index 8fe4bfbc04..9ebb9967df 100644
--- a/engines/bladerunner/script/scene/kp07.cpp
+++ b/engines/bladerunner/script/scene/kp07.cpp
@@ -29,39 +29,39 @@ void SceneScriptKP07::InitializeScene() {
 	Game_Flag_Reset(578);
 	Scene_Exit_Add_2D_Exit(0, 315, 185, 381, 285, 0);
 	if (Game_Flag_Query(653)) {
-		if (Game_Flag_Query(47) && Actor_Query_Goal_Number(3) < 599) {
-			Actor_Set_Targetable(3, true);
+		if (Game_Flag_Query(47) && Actor_Query_Goal_Number(kActorDektora) < 599) {
+			Actor_Set_Targetable(kActorDektora, true);
 			Global_Variable_Increment(51, 1);
-			Actor_Put_In_Set(3, 48);
-			Actor_Set_At_XYZ(3, -52.0f, -41.52f, -5.0f, 289);
+			Actor_Put_In_Set(kActorDektora, 48);
+			Actor_Set_At_XYZ(kActorDektora, -52.0f, -41.52f, -5.0f, 289);
 		}
-		if (Actor_Query_Goal_Number(19) < 599) {
+		if (Actor_Query_Goal_Number(kActorZuben) < 599) {
 			Global_Variable_Increment(51, 1);
-			Actor_Set_Targetable(19, true);
-			Actor_Put_In_Set(19, 48);
-			Actor_Set_At_XYZ(19, -26.0f, -41.52f, -135.0f, 0);
+			Actor_Set_Targetable(kActorZuben, true);
+			Actor_Put_In_Set(kActorZuben, 48);
+			Actor_Set_At_XYZ(kActorZuben, -26.0f, -41.52f, -135.0f, 0);
 		}
-		if (Game_Flag_Query(44) && Actor_Query_Goal_Number(7) < 599) {
+		if (Game_Flag_Query(44) && Actor_Query_Goal_Number(kActorIzo) < 599) {
 			Global_Variable_Increment(51, 1);
-			Actor_Set_Targetable(7, true);
-			Actor_Put_In_Set(7, 48);
-			Actor_Set_At_XYZ(7, -38.0f, -41.52f, -175.0f, 500);
+			Actor_Set_Targetable(kActorIzo, true);
+			Actor_Put_In_Set(kActorIzo, 48);
+			Actor_Set_At_XYZ(kActorIzo, -38.0f, -41.52f, -175.0f, 500);
 		}
-		if (Game_Flag_Query(45) && Actor_Query_Goal_Number(2) < 599) {
+		if (Game_Flag_Query(45) && Actor_Query_Goal_Number(kActorGordo) < 599) {
 			Global_Variable_Increment(51, 1);
-			Actor_Set_Targetable(2, true);
-			Actor_Put_In_Set(2, 48);
-			Actor_Set_At_XYZ(2, 61.0f, -41.52f, -3.0f, 921);
+			Actor_Set_Targetable(kActorGordo, true);
+			Actor_Put_In_Set(kActorGordo, 48);
+			Actor_Set_At_XYZ(kActorGordo, 61.0f, -41.52f, -3.0f, 921);
 		}
-		if (Game_Flag_Query(46) && Actor_Query_Goal_Number(6) < 599) {
+		if (Game_Flag_Query(46) && Actor_Query_Goal_Number(kActorLucy) < 599) {
 			Global_Variable_Increment(51, 1);
-			Actor_Put_In_Set(6, 48);
-			Actor_Set_At_XYZ(6, 78.0f, -41.52f, -119.0f, 659);
+			Actor_Put_In_Set(kActorLucy, 48);
+			Actor_Set_At_XYZ(kActorLucy, 78.0f, -41.52f, -119.0f, 659);
 		}
-		if (Actor_Query_Goal_Number(10) < 599) {
+		if (Actor_Query_Goal_Number(kActorLuther) < 599) {
 			Global_Variable_Increment(51, 1);
-			Actor_Put_In_Set(10, 48);
-			Actor_Set_At_XYZ(10, -47.0f, 0.0f, 151.0f, 531);
+			Actor_Put_In_Set(kActorLuther, 48);
+			Actor_Set_At_XYZ(kActorLuther, -47.0f, 0.0f, 151.0f, 531);
 		}
 	}
 	Ambient_Sounds_Add_Looping_Sound(585, 7, 1, 1);
@@ -95,19 +95,19 @@ bool SceneScriptKP07::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptKP07::ClickedOnActor(int actorId) {
-	if (actorId == 5) {
-		if (Game_Flag_Query(697) || actorId != 5 || Actor_Query_Goal_Number(5) == 599 || Actor_Query_Goal_Number(5) == 515) {
+	if (actorId == kActorClovis) {
+		if (Game_Flag_Query(697) || actorId != kActorClovis || Actor_Query_Goal_Number(kActorClovis) == 599 || Actor_Query_Goal_Number(kActorClovis) == 515) {
 			return false;
 		}
 		if (Game_Flag_Query(653)) {
-			Actor_Set_Goal_Number(5, 516);
+			Actor_Set_Goal_Number(kActorClovis, 516);
 		} else {
 			Music_Play(20, 31, 0, 0, -1, 1, 0);
-			Actor_Set_Goal_Number(5, 514);
+			Actor_Set_Goal_Number(kActorClovis, 514);
 		}
 	} else {
-		Actor_Face_Actor(0, actorId, true);
-		Actor_Says(0, 8590, 14);
+		Actor_Face_Actor(kActorMcCoy, actorId, true);
+		Actor_Says(kActorMcCoy, 8590, 14);
 	}
 	return true;
 }
@@ -118,7 +118,7 @@ bool SceneScriptKP07::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptKP07::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -12.0f, -41.58f, 72.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, -41.58f, 72.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(579);
@@ -140,23 +140,23 @@ void SceneScriptKP07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptKP07::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_XYZ(0, 9.0f, -41.88f, -81.0f, 0, 0, false, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 9.0f, -41.88f, -81.0f, 0, 0, false, 0);
 	if (!Game_Flag_Query(658)) {
 		if (Game_Flag_Query(653)) {
-			Actor_Face_Actor(0, 5, true);
-			Actor_Says(5, 1240, 3);
-			Actor_Says(0, 8500, 3);
-			Actor_Says(5, 1250, 3);
-			if (Actor_Query_Goal_Number(8) == 416) {
-				Actor_Put_In_Set(8, 48);
+			Actor_Face_Actor(kActorMcCoy, kActorClovis, true);
+			Actor_Says(kActorClovis, 1240, 3);
+			Actor_Says(kActorMcCoy, 8500, 3);
+			Actor_Says(kActorClovis, 1250, 3);
+			if (Actor_Query_Goal_Number(kActorSadik) == 416) {
+				Actor_Put_In_Set(kActorSadik, 48);
 				Global_Variable_Increment(51, 1);
-				Actor_Set_At_XYZ(8, -12.0f, -41.58f, 72.0f, 0);
-				Actor_Face_Actor(8, 5, true);
+				Actor_Set_At_XYZ(kActorSadik, -12.0f, -41.58f, 72.0f, 0);
+				Actor_Face_Actor(kActorSadik, kActorClovis, true);
 			}
 		} else {
-			Actor_Face_Actor(0, 5, true);
-			Actor_Says(5, 160, 3);
-			Actor_Retired_Here(5, 72, 60, 0, -1);
+			Actor_Face_Actor(kActorMcCoy, kActorClovis, true);
+			Actor_Says(kActorClovis, 160, 3);
+			Actor_Retired_Here(kActorClovis, 72, 60, 0, -1);
 		}
 		Game_Flag_Set(658);
 	}
@@ -167,11 +167,11 @@ void SceneScriptKP07::PlayerWalkedOut() {
 }
 
 void SceneScriptKP07::DialogueQueueFlushed(int a1) {
-	if (Actor_Query_Goal_Number(5) == 515) {
-		Actor_Set_Targetable(5, false);
-		Actor_Change_Animation_Mode(5, 21);
-		Actor_Retired_Here(5, 12, 48, 1, -1);
-		Actor_Set_Goal_Number(5, 599);
+	if (Actor_Query_Goal_Number(kActorClovis) == 515) {
+		Actor_Set_Targetable(kActorClovis, false);
+		Actor_Change_Animation_Mode(kActorClovis, 21);
+		Actor_Retired_Here(kActorClovis, 12, 48, 1, -1);
+		Actor_Set_Goal_Number(kActorClovis, 599);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ma01.cpp b/engines/bladerunner/script/scene/ma01.cpp
index 094abc586e..55fe935d74 100644
--- a/engines/bladerunner/script/scene/ma01.cpp
+++ b/engines/bladerunner/script/scene/ma01.cpp
@@ -48,13 +48,13 @@ void SceneScriptMA01::InitializeScene() {
 		Scene_Loop_Set_Default(1);
 		Game_Flag_Reset(38);
 	} else {
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 		Game_Flag_Set(273);
 		Scene_Loop_Start_Special(0, 0, 0);
 		Scene_Loop_Set_Default(1);
 	}
 	if (Game_Flag_Query(409)) {
-		Actor_Set_Goal_Number(53, 3);
+		Actor_Set_Goal_Number(kActorGaff, 3);
 		Game_Flag_Reset(409);
 	}
 }
@@ -85,16 +85,16 @@ bool SceneScriptMA01::ClickedOnItem(int itemId, bool a2) {
 }
 
 bool SceneScriptMA01::ClickedOnExit(int exitId) {
-	if (Actor_Query_Goal_Number(19) == 21) {
+	if (Actor_Query_Goal_Number(kActorZuben) == 21) {
 		return true;
 	}
 	if (exitId == 0) {
-		if (Actor_Query_Goal_Number(19) == 20) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 1446.0f, 0.0f, -725.0f, 72, 1, false, 0)) {
-				Actor_Set_Goal_Number(19, 21);
+		if (Actor_Query_Goal_Number(kActorZuben) == 20) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1446.0f, 0.0f, -725.0f, 72, 1, false, 0)) {
+				Actor_Set_Goal_Number(kActorZuben, 21);
 				Scene_Exits_Disable();
 			}
-		} else if (!Loop_Actor_Walk_To_XYZ(0, 1446.0f, 0.0f, -725.0f, 12, 1, false, 0)) {
+		} else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1446.0f, 0.0f, -725.0f, 12, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(37);
@@ -103,9 +103,9 @@ bool SceneScriptMA01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 381.0f, 0.0f, 54.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 381.0f, 0.0f, 54.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
-			Actor_Face_Heading(0, 736, false);
+			Actor_Face_Heading(kActorMcCoy, 736, false);
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
 			Game_Flag_Reset(179);
@@ -181,8 +181,8 @@ bool SceneScriptMA01::ClickedOnExit(int exitId) {
 				Scene_Loop_Start_Special(1, 4, 1);
 				break;
 			default:
-				Actor_Set_Invisible(0, false);
-				Actor_Face_Heading(0, 736, false);
+				Actor_Set_Invisible(kActorMcCoy, false);
+				Actor_Face_Heading(kActorMcCoy, 736, false);
 				Game_Flag_Set(179);
 				break;
 			}
@@ -216,12 +216,12 @@ void SceneScriptMA01::SceneFrameAdvanced(int frame) {
 		Sound_Play(122, 17, 20, 20, 50);
 	}
 	if ((frame == 75 || frame == 196) && Game_Flag_Query(273)) {
-		Actor_Face_Heading(0, 736, false);
-		Actor_Change_Animation_Mode(0, 42);
+		Actor_Face_Heading(kActorMcCoy, 736, false);
+		Actor_Change_Animation_Mode(kActorMcCoy, 42);
 		Game_Flag_Reset(273);
 	} else {
 		if (frame == 196 && !Game_Flag_Query(273)) {
-			Actor_Change_Animation_Mode(0, 41);
+			Actor_Change_Animation_Mode(kActorMcCoy, 41);
 			//return true;
 			return;
 		}
@@ -239,7 +239,7 @@ void SceneScriptMA01::PlayerWalkedIn() {
 }
 
 void SceneScriptMA01::PlayerWalkedOut() {
-	Actor_Set_Invisible(0, false);
+	Actor_Set_Invisible(kActorMcCoy, false);
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	if (!Game_Flag_Query(37) && Global_Variable_Query(1) == 1) {
diff --git a/engines/bladerunner/script/scene/ma02.cpp b/engines/bladerunner/script/scene/ma02.cpp
index 063fddc90b..65f88b85eb 100644
--- a/engines/bladerunner/script/scene/ma02.cpp
+++ b/engines/bladerunner/script/scene/ma02.cpp
@@ -30,18 +30,18 @@ void SceneScriptMA02::InitializeScene() {
 	} else {
 		Setup_Scene_Information(23.19f, -144.12f, 378.27f, 750);
 		if (Global_Variable_Query(1) == 4) {
-			Actor_Set_Goal_Number(40, 300);
+			Actor_Set_Goal_Number(kActorRajif, 300);
 		}
 		Game_Flag_Reset(711);
 	}
 	Scene_Exit_Add_2D_Exit(0, 538, 84, 639, 327, 1);
 	Scene_Exit_Add_2D_Exit(1, 56, 98, 150, 260, 0);
 	if (Global_Variable_Query(1) >= 4 && Global_Variable_Query(1) == 5 && Game_Flag_Query(653)) {
-		Actor_Set_Goal_Number(66, 599);
-		Actor_Change_Animation_Mode(66, 88);
-		Actor_Put_In_Set(66, 10);
-		Actor_Set_At_XYZ(66, -35.51f, -144.12f, 428.0f, 0);
-		Actor_Retired_Here(66, 24, 24, 1, -1);
+		Actor_Set_Goal_Number(kActorMaggie, 599);
+		Actor_Change_Animation_Mode(kActorMaggie, 88);
+		Actor_Put_In_Set(kActorMaggie, 10);
+		Actor_Set_At_XYZ(kActorMaggie, -35.51f, -144.12f, 428.0f, 0);
+		Actor_Retired_Here(kActorMaggie, 24, 24, 1, -1);
 	}
 	Ambient_Sounds_Add_Looping_Sound(104, 12, 0, 1);
 	Ambient_Sounds_Add_Looping_Sound(71, 25, 0, 1);
@@ -56,7 +56,7 @@ void SceneScriptMA02::InitializeScene() {
 	if (sub_401F7C()) {
 		Ambient_Sounds_Add_Sound(403, 3, 3, 27, 27, -100, -100, -100, -100, 99, 0);
 	}
-	if (Global_Variable_Query(1) == 5 && Game_Flag_Query(653) && !Actor_Clue_Query(0, 264)) {
+	if (Global_Variable_Query(1) == 5 && Game_Flag_Query(653) && !Actor_Clue_Query(kActorMcCoy, kClueCrystalsCigarette)) {
 		Overlay_Play("MA02OVER", 0, 1, 0, 0);
 	}
 }
@@ -74,27 +74,27 @@ bool SceneScriptMA02::MouseClick(int x, int y) {
 
 bool SceneScriptMA02::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("E-ESPER", objectName)) {
-		Actor_Face_Object(0, "E-ESPER", true);
+		Actor_Face_Object(kActorMcCoy, "E-ESPER", true);
 		Delay(1000);
 		ESPER_Flag_To_Activate();
 		return true;
 	}
-	if (Object_Query_Click("BAR-MAIN", objectName) && !Loop_Actor_Walk_To_XYZ(0, -29.0f, -140.4f, 298.0f, 36, 1, false, 0)) {
-		Actor_Face_Object(0, "BAR-MAIN", true);
+	if (Object_Query_Click("BAR-MAIN", objectName) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -29.0f, -140.4f, 298.0f, 36, 1, false, 0)) {
+		Actor_Face_Object(kActorMcCoy, "BAR-MAIN", true);
 		if (Global_Variable_Query(1) < 4) {
-			Actor_Set_Goal_Number(66, 3);
-		} else if (Global_Variable_Query(1) == 5 && Game_Flag_Query(653) && !Actor_Clue_Query(0, 264)) {
+			Actor_Set_Goal_Number(kActorMaggie, 3);
+		} else if (Global_Variable_Query(1) == 5 && Game_Flag_Query(653) && !Actor_Clue_Query(kActorMcCoy, kClueCrystalsCigarette)) {
 			Overlay_Remove("MA02OVER");
 			Item_Pickup_Spin_Effect(985, 480, 240);
-			Actor_Voice_Over(1150, 99);
-			Actor_Voice_Over(1160, 99);
-			Actor_Voice_Over(1170, 99);
-			Actor_Voice_Over(1180, 99);
-			Actor_Voice_Over(1190, 99);
-			Actor_Voice_Over(1200, 99);
-			Actor_Clue_Acquire(0, 264, 1, -1);
+			Actor_Voice_Over(1150, kActorVoiceOver);
+			Actor_Voice_Over(1160, kActorVoiceOver);
+			Actor_Voice_Over(1170, kActorVoiceOver);
+			Actor_Voice_Over(1180, kActorVoiceOver);
+			Actor_Voice_Over(1190, kActorVoiceOver);
+			Actor_Voice_Over(1200, kActorVoiceOver);
+			Actor_Clue_Acquire(kActorMcCoy, kClueCrystalsCigarette, 1, -1);
 		} else {
-			Actor_Says(0, 8526, 0);
+			Actor_Says(kActorMcCoy, 8526, 0);
 		}
 		return true;
 	}
@@ -102,10 +102,10 @@ bool SceneScriptMA02::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptMA02::ClickedOnActor(int actorId) {
-	if (actorId == 66 && Actor_Query_Goal_Number(66) == 599) {
-		if (!Loop_Actor_Walk_To_Actor(0, 66, 30, 1, false)) {
-			Actor_Face_Actor(0, 66, true);
-			Actor_Voice_Over(1140, 99);
+	if (actorId == 66 && Actor_Query_Goal_Number(kActorMaggie) == 599) {
+		if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorMaggie, 30, 1, false)) {
+			Actor_Face_Actor(kActorMcCoy, kActorMaggie, true);
+			Actor_Voice_Over(1140, kActorVoiceOver);
 		}
 	}
 	return false;
@@ -117,7 +117,7 @@ bool SceneScriptMA02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptMA02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 23.19f, -144.12f, 378.27f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.19f, -144.12f, 378.27f, 0, 1, false, 0)) {
 			Music_Stop(10);
 			Game_Flag_Set(33);
 			Set_Enter(52, 52);
@@ -125,7 +125,7 @@ bool SceneScriptMA02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -168.0f, -144.13f, 10.27f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -168.0f, -144.13f, 10.27f, 0, 1, false, 0)) {
 			Game_Flag_Set(35);
 			Set_Enter(50, 50);
 		}
@@ -149,13 +149,13 @@ void SceneScriptMA02::PlayerWalkedIn() {
 		sub_402044();
 	}
 	if (Game_Flag_Query(36)) {
-		Loop_Actor_Walk_To_XYZ(0, -148.12f, -144.13f, 34.27f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -148.12f, -144.13f, 34.27f, 0, 1, false, 0);
 	}
 	if (Global_Variable_Query(1) == 4 && !Game_Flag_Query(655)) {
 		Game_Flag_Set(623);
 		Game_Flag_Set(655);
 		sub_401E4C();
-		Loop_Actor_Walk_To_XYZ(0, 23.19f, -144.12f, 378.27f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.19f, -144.12f, 378.27f, 0, 0, false, 0);
 		Game_Flag_Set(33);
 		Set_Enter(52, 52);
 		//	return true;
@@ -163,27 +163,27 @@ void SceneScriptMA02::PlayerWalkedIn() {
 	}
 	if (Global_Variable_Query(1) == 5 && !Game_Flag_Query(654)) {
 		if (Game_Flag_Query(653)) {
-			Actor_Says(0, 2390, 0);
+			Actor_Says(kActorMcCoy, 2390, 0);
 			Music_Play(2, 25, 0, 3, -1, 0, 0);
 		} else {
-			Actor_Says(0, 2385, 3);
+			Actor_Says(kActorMcCoy, 2385, 3);
 		}
 		Game_Flag_Set(654);
 		Autosave_Game(3);
 	}
-	if (Global_Variable_Query(1) < 4 && !Game_Flag_Query(36) && Actor_Query_Goal_Number(66) != 2) {
-		Actor_Set_Goal_Number(66, 1);
+	if (Global_Variable_Query(1) < 4 && !Game_Flag_Query(36) && Actor_Query_Goal_Number(kActorMaggie) != 2) {
+		Actor_Set_Goal_Number(kActorMaggie, 1);
 		if (!Game_Flag_Query(60)) {
 			Game_Flag_Set(60);
-			Actor_Face_Actor(0, 66, true);
-			Actor_Voice_Over(1210, 99);
+			Actor_Face_Actor(kActorMcCoy, kActorMaggie, true);
+			Actor_Voice_Over(1210, kActorVoiceOver);
 			if (!Game_Flag_Query(378)) {
-				Actor_Voice_Over(1220, 99);
+				Actor_Voice_Over(1220, kActorVoiceOver);
 			}
-			Actor_Voice_Over(1230, 99);
+			Actor_Voice_Over(1230, kActorVoiceOver);
 			if (!Game_Flag_Query(378)) {
-				Actor_Voice_Over(1240, 99);
-				Actor_Voice_Over(1250, 99);
+				Actor_Voice_Over(1240, kActorVoiceOver);
+				Actor_Voice_Over(1250, kActorVoiceOver);
 			}
 		}
 	}
@@ -202,26 +202,26 @@ void SceneScriptMA02::DialogueQueueFlushed(int a1) {
 }
 
 void SceneScriptMA02::sub_401E4C() {
-	Actor_Says(0, 2365, 13);
-	Actor_Says(40, 0, 13);
-	Actor_Says(0, 2370, 13);
-	Actor_Says(40, 10, 13);
-	Actor_Says(0, 2375, 13);
-	Actor_Says(40, 20, 13);
-	Actor_Says(0, 2380, 13);
+	Actor_Says(kActorMcCoy, 2365, 13);
+	Actor_Says(kActorRajif, 0, 13);
+	Actor_Says(kActorMcCoy, 2370, 13);
+	Actor_Says(kActorRajif, 10, 13);
+	Actor_Says(kActorMcCoy, 2375, 13);
+	Actor_Says(kActorRajif, 20, 13);
+	Actor_Says(kActorMcCoy, 2380, 13);
 	Sound_Play(492, 100, 0, 100, 50);
-	Actor_Says(40, 40, 13);
+	Actor_Says(kActorRajif, 40, 13);
 	Delay(3000);
 }
 
 bool SceneScriptMA02::sub_401F7C() {
 	return Global_Variable_Query(1) == 5
-		&& !Actor_Clue_Query(0, 143)
-		&& !Actor_Clue_Query(0, 144)
-		&& !Actor_Clue_Query(0, 139)
-		&& !Actor_Clue_Query(0, 140)
-		&& !Actor_Clue_Query(0, 141)
-		&& !Actor_Clue_Query(0, 142);
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallClovis)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallCrystal)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora1)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora2)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy1)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy2);
 }
 
 void SceneScriptMA02::sub_402044() {
diff --git a/engines/bladerunner/script/scene/ma04.cpp b/engines/bladerunner/script/scene/ma04.cpp
index 7025319c71..b0b6735d17 100644
--- a/engines/bladerunner/script/scene/ma04.cpp
+++ b/engines/bladerunner/script/scene/ma04.cpp
@@ -84,7 +84,7 @@ bool SceneScriptMA04::ClickedOn3DObject(const char *objectName, bool a2) {
 		return false;
 	}
 	if (Object_Query_Click("BED-TV-1", objectName) || Object_Query_Click("BED-TV-2", objectName)) {
-		if (!Loop_Actor_Walk_To_Scene_Object(0, "BED-TV-2", 24, 1, false)) {
+		if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BED-TV-2", 24, true, false)) {
 			Game_Flag_Set(711);
 			Unclickable_Object("BED-TV-1");
 			Unclickable_Object("BED-TV-2");
@@ -107,7 +107,7 @@ bool SceneScriptMA04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptMA04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -7099.0f, 954.0f, 1866.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7099.0f, 954.0f, 1866.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(36);
 			Set_Enter(10, 49);
 		}
@@ -115,26 +115,26 @@ bool SceneScriptMA04::ClickedOnExit(int exitId) {
 	}
 	if (exitId == 1) {
 		float x, y, z;
-		Actor_Query_XYZ(0, &x, &y, &z);
-		if (z <= 1677.0f || !Loop_Actor_Walk_To_XYZ(0, -7199.0f, 955.0f, 1675.0f, 0, 1, false, 0)) {
+		Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
+		if (z <= 1677.0f || !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1675.0f, 0, 1, false, 0)) {
 			if (sub_402888()) {
 				Overlay_Remove("MA04OVER");
 			}
-			Loop_Actor_Walk_To_XYZ(0, -7199.0f, 955.0f, 1675.0f, 0, 0, false, 1);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1675.0f, 0, 0, false, 1);
 			Game_Flag_Set(62);
 			if (Global_Variable_Query(1) != 2 && Global_Variable_Query(1) != 3) {
-				Async_Actor_Walk_To_XYZ(0, -7199.0f, 956.17f, 1568.0f, 0, false);
+				Async_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 956.17f, 1568.0f, 0, false);
 			}
 			Set_Enter(51, 51);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -7115.0f, 954.0f, 1742.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7115.0f, 954.0f, 1742.0f, 0, 1, false, 0)) {
 			int sounds[] = {252, 405, 404, 407, 406};
 			Ambient_Sounds_Play_Sound(sounds[Random_Query(0, 4)], 50, 0, 0, 0);
 			Delay(3000);
-			Loop_Actor_Walk_To_XYZ(0, -7139.0f, 954.0f, 1746.0f, 0, 1, false, 1);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7139.0f, 954.0f, 1746.0f, 0, 1, false, 1);
 		}
 	}
 	return false;
@@ -149,10 +149,10 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
 		return true;
 	}
 	if (region == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -7176.0f, 954.0f, 1806.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 256, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7176.0f, 954.0f, 1806.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 256, false);
 			if (sub_402758()) {
-				Actor_Says(0, 2680, 0);
+				Actor_Says(kActorMcCoy, 2680, 0);
 				Ambient_Sounds_Remove_Sound(403, true);
 				Sound_Play(123, 100, 0, 0, 50);
 				Overlay_Remove("MA04OVER");
@@ -171,41 +171,41 @@ bool SceneScriptMA04::ClickedOn2DRegion(int region) {
 				Music_Play(2, 52, 0, 3, -1, 0, 0);
 				return false;
 			}
-			if (Actor_Clue_Query(5, 222) && !Game_Flag_Query(649)) {
+			if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredZuben) && !Game_Flag_Query(649)) {
 				Sound_Play(123, 100, 0, 0, 50);
 				Overlay_Remove("MA04OVER");
 				Delay(500);
-				Actor_Says(5, 310, 3);
-				Actor_Says(5, 320, 3);
+				Actor_Says(kActorClovis, 310, 3);
+				Actor_Says(kActorClovis, 320, 3);
 				if (!Game_Flag_Query(378) && Global_Variable_Query(1) < 3) {
-					Actor_Voice_Over(1300, 99);
-					Actor_Voice_Over(1310, 99);
-					Actor_Voice_Over(1320, 99);
+					Actor_Voice_Over(1300, kActorVoiceOver);
+					Actor_Voice_Over(1310, kActorVoiceOver);
+					Actor_Voice_Over(1320, kActorVoiceOver);
 				}
-				Actor_Says(0, 2445, 13);
+				Actor_Says(kActorMcCoy, 2445, 13);
 				Sound_Play(123, 100, 0, 0, 50);
 				Game_Flag_Set(649);
 				return true;
 			}
-			if (Actor_Clue_Query(6, 215) && !Game_Flag_Query(650)) {
+			if (Actor_Clue_Query(kActorLucy, kClueMcCoyLetZubenEscape) && !Game_Flag_Query(650)) {
 				Sound_Play(123, 100, 0, 0, 50);
 				Overlay_Remove("MA04OVER");
 				Delay(500);
-				Actor_Says(6, 500, 3);
-				Actor_Says(6, 510, 3);
+				Actor_Says(kActorLucy, 500, 3);
+				Actor_Says(kActorLucy, 510, 3);
 				if (!Game_Flag_Query(378) && Global_Variable_Query(1) < 3) {
-					Actor_Voice_Over(1330, 99);
-					Actor_Voice_Over(1340, 99);
-					Actor_Voice_Over(1350, 99);
+					Actor_Voice_Over(1330, kActorVoiceOver);
+					Actor_Voice_Over(1340, kActorVoiceOver);
+					Actor_Voice_Over(1350, kActorVoiceOver);
 				}
-				Actor_Says(0, 2445, 13);
+				Actor_Says(kActorMcCoy, 2445, 13);
 				Sound_Play(123, 100, 0, 0, 50);
 				Game_Flag_Set(650);
 				return true;
 			}
-			Actor_Says(0, 2670, 13);
+			Actor_Says(kActorMcCoy, 2670, 13);
 			if (!Game_Flag_Query(378)) {
-				Actor_Says(0, 2675, 17);
+				Actor_Says(kActorMcCoy, 2675, 17);
 			}
 		}
 		return true;
@@ -238,43 +238,43 @@ void SceneScriptMA04::PlayerWalkedIn() {
 		Overlay_Play("MA04OVER", 0, 1, 0, 0);
 	}
 	if (Game_Flag_Query(647)) {
-		Loop_Actor_Walk_To_XYZ(0, -7139.0f, 954.0f, 1746.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7139.0f, 954.0f, 1746.0f, 0, 1, false, 0);
 	} else if (Game_Flag_Query(35)) {
-		Loop_Actor_Walk_To_XYZ(0, -7143.0f, 954.0f, 1868.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7143.0f, 954.0f, 1868.0f, 0, 1, false, 0);
 	}
 	Game_Flag_Reset(35);
 	Game_Flag_Reset(63);
 	Game_Flag_Reset(647);
 	if (Game_Flag_Query(61)) {
-		if (Global_Variable_Query(1) == 2 && !Actor_Clue_Query(0, 43)) {
+		if (Global_Variable_Query(1) == 2 && !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallGuzza)) {
 			Sound_Play(403, 100, 0, 0, 50);
-			Loop_Actor_Walk_To_XYZ(0, -7176.0f, 954.0f, 1806.0f, 0, 0, false, 0);
-			Actor_Face_Heading(0, 256, true);
-			Actor_Says(0, 2680, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7176.0f, 954.0f, 1806.0f, 0, 0, false, 0);
+			Actor_Face_Heading(kActorMcCoy, 256, true);
+			Actor_Says(kActorMcCoy, 2680, 0);
 			Sound_Play(123, 100, 0, 0, 50);
 			Delay(500);
-			Actor_Says(4, 0, 3);
-			Actor_Says(0, 2685, 13);
-			Actor_Says(4, 10, 3);
-			Actor_Says(0, 2690, 17);
-			Actor_Says(4, 30, 3);
-			Actor_Says(0, 2695, 12);
-			Actor_Says(4, 40, 3);
-			Actor_Says(4, 50, 3);
-			Actor_Says(0, 2700, 3);
-			Actor_Says(4, 60, 3);
-			Actor_Says(4, 70, 3);
+			Actor_Says(kActorGuzza, 0, 3);
+			Actor_Says(kActorMcCoy, 2685, 13);
+			Actor_Says(kActorGuzza, 10, 3);
+			Actor_Says(kActorMcCoy, 2690, 17);
+			Actor_Says(kActorGuzza, 30, 3);
+			Actor_Says(kActorMcCoy, 2695, 12);
+			Actor_Says(kActorGuzza, 40, 3);
+			Actor_Says(kActorGuzza, 50, 3);
+			Actor_Says(kActorMcCoy, 2700, 3);
+			Actor_Says(kActorGuzza, 60, 3);
+			Actor_Says(kActorGuzza, 70, 3);
 			Sound_Play(123, 100, 0, 0, 50);
-			Actor_Clue_Acquire(0, 43, 1, 4);
+			Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallGuzza, 1, kActorGuzza);
 			Spinner_Set_Selectable_Destination_Flag(5, 1);
 			Game_Flag_Set(186);
 			if (!Game_Flag_Query(163)) {
 				Game_Flag_Set(163);
 				Item_Remove_From_World(66);
 			}
-			Actor_Set_Goal_Number(23, 99);
-			Actor_Put_In_Set(23, 93);
-			Actor_Set_At_Waypoint(23, 35, 0);
+			Actor_Set_Goal_Number(kActorOfficerLeary, 99);
+			Actor_Put_In_Set(kActorOfficerLeary, 93);
+			Actor_Set_At_Waypoint(kActorOfficerLeary, 35, 0);
 			Autosave_Game(0);
 		}
 		//return false;
@@ -283,13 +283,13 @@ void SceneScriptMA04::PlayerWalkedIn() {
 	if ((Game_Flag_Query(40) || Game_Flag_Query(41)) && !Game_Flag_Query(146)) {
 		Music_Play(2, 52, 0, 2, -1, 0, 0);
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(0, -7199.0f, 955.0f, 1677.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1677.0f, 0, 1, false, 0);
 		if (sub_402820() || sub_402758()) {
 			Overlay_Remove("MA04OVER");
 		}
-		Loop_Actor_Walk_To_XYZ(0, -7199.0f, 955.0f, 1675.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 955.0f, 1675.0f, 0, 1, false, 0);
 		Game_Flag_Set(146);
-		Async_Actor_Walk_To_XYZ(0, -7204.0f, 956.17f, 1568.0f, 0, false);
+		Async_Actor_Walk_To_XYZ(kActorMcCoy, -7204.0f, 956.17f, 1568.0f, 0, false);
 		Set_Enter(51, 51);
 	}
 }
@@ -310,11 +310,11 @@ void SceneScriptMA04::DialogueQueueFlushed(int a1) {
 }
 
 bool SceneScriptMA04::sub_402758() {
-	return Global_Variable_Query(1) == 5 && !Actor_Clue_Query(0, 143) && !Actor_Clue_Query(0, 144) && !Actor_Clue_Query(0, 139) && !Actor_Clue_Query(0, 140) && !Actor_Clue_Query(0, 141) && !Actor_Clue_Query(0, 142);
+	return Global_Variable_Query(1) == 5 && !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallClovis) && !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallCrystal) && !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora1) && !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora2) && !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy1) && !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy2);
 }
 
 bool SceneScriptMA04::sub_402820() {
-	return (Actor_Clue_Query(5, 222) && !Game_Flag_Query(649)) || (Actor_Clue_Query(6, 215) && !Game_Flag_Query(650));
+	return (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredZuben) && !Game_Flag_Query(649)) || (Actor_Clue_Query(kActorLucy, kClueMcCoyLetZubenEscape) && !Game_Flag_Query(650));
 }
 
 bool SceneScriptMA04::sub_402888() {
@@ -323,28 +323,28 @@ bool SceneScriptMA04::sub_402888() {
 
 void SceneScriptMA04::sub_4028A8() {
 	int answer;
-	Actor_Says(3, 220, 3);
-	Actor_Says(0, 2460, 0);
-	Actor_Says(3, 230, 3);
-	Actor_Says(3, 240, 3);
-	Actor_Says(0, 2465, 0);
-	Actor_Says(3, 250, 3);
-	Actor_Says_With_Pause(0, 2470, 1.5f, 17);
-	Actor_Says(3, 260, 3);
-	Actor_Says(0, 2475, 15);
-	Actor_Says(3, 270, 3);
-	Actor_Says(0, 2480, 0);
-	Actor_Says(3, 280, 3);
-	Actor_Says(3, 290, 3);
-	Actor_Says(0, 2485, 19);
-	Actor_Says(3, 300, 3);
-	Actor_Says(3, 310, 3);
-	Actor_Says(0, 2490, 0);
-	Actor_Says(3, 330, 3);
-	Actor_Says(0, 2495, 0);
-	Actor_Says(3, 340, 3);
-	Actor_Says(3, 350, 3);
-	if (Game_Flag_Query(165) || Actor_Query_Goal_Number(9) == 2) {
+	Actor_Says(kActorDektora, 220, 3);
+	Actor_Says(kActorMcCoy, 2460, 0);
+	Actor_Says(kActorDektora, 230, 3);
+	Actor_Says(kActorDektora, 240, 3);
+	Actor_Says(kActorMcCoy, 2465, 0);
+	Actor_Says(kActorDektora, 250, 3);
+	Actor_Says_With_Pause(kActorMcCoy, 2470, 1.5f, 17);
+	Actor_Says(kActorDektora, 260, 3);
+	Actor_Says(kActorMcCoy, 2475, 15);
+	Actor_Says(kActorDektora, 270, 3);
+	Actor_Says(kActorMcCoy, 2480, 0);
+	Actor_Says(kActorDektora, 280, 3);
+	Actor_Says(kActorDektora, 290, 3);
+	Actor_Says(kActorMcCoy, 2485, 19);
+	Actor_Says(kActorDektora, 300, 3);
+	Actor_Says(kActorDektora, 310, 3);
+	Actor_Says(kActorMcCoy, 2490, 0);
+	Actor_Says(kActorDektora, 330, 3);
+	Actor_Says(kActorMcCoy, 2495, 0);
+	Actor_Says(kActorDektora, 340, 3);
+	Actor_Says(kActorDektora, 350, 3);
+	if (Game_Flag_Query(165) || Actor_Query_Goal_Number(kActorCrazylegs) == 2) {
 		answer = 1170;
 	} else {
 		Dialogue_Menu_Clear_List();
@@ -355,187 +355,187 @@ void SceneScriptMA04::sub_4028A8() {
 		Dialogue_Menu_Disappear();
 	}
 	if (answer == 1160) {
-		Actor_Says(0, 2500, 19);
-		Actor_Says(3, 360, 3);
-		Actor_Says(0, 2510, 0);
-		Actor_Says(3, 370, 3);
-		Actor_Says(3, 380, 3);
-		Actor_Says(0, 2515, 12);
-		Actor_Says(3, 390, 3);
-		Actor_Says(0, 2520, 13);
-		Actor_Says(3, 400, 3);
-		Actor_Says(3, 410, 3);
-		Actor_Says(0, 2525, 15);
-		Actor_Says(3, 420, 3);
+		Actor_Says(kActorMcCoy, 2500, 19);
+		Actor_Says(kActorDektora, 360, 3);
+		Actor_Says(kActorMcCoy, 2510, 0);
+		Actor_Says(kActorDektora, 370, 3);
+		Actor_Says(kActorDektora, 380, 3);
+		Actor_Says(kActorMcCoy, 2515, 12);
+		Actor_Says(kActorDektora, 390, 3);
+		Actor_Says(kActorMcCoy, 2520, 13);
+		Actor_Says(kActorDektora, 400, 3);
+		Actor_Says(kActorDektora, 410, 3);
+		Actor_Says(kActorMcCoy, 2525, 15);
+		Actor_Says(kActorDektora, 420, 3);
 		Sound_Play(123, 100, 0, 0, 50);
-		Actor_Clue_Acquire(0, 139, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallDektora1, 1, -1);
 	} else {
-		Actor_Says_With_Pause(0, 2505, 0.5f, 19);
-		Actor_Says(3, 430, 3);
-		Actor_Says(3, 440, 3);
-		Actor_Says(0, 2530, 0);
-		Actor_Says(3, 450, 3);
-		Actor_Says(0, 2535, 12);
-		Actor_Says(3, 460, 3);
-		Actor_Says_With_Pause(3, 470, 1.0f, 3);
-		Actor_Says(3, 480, 3);
-		Actor_Says(3, 490, 3);
+		Actor_Says_With_Pause(kActorMcCoy, 2505, 0.5f, 19);
+		Actor_Says(kActorDektora, 430, 3);
+		Actor_Says(kActorDektora, 440, 3);
+		Actor_Says(kActorMcCoy, 2530, 0);
+		Actor_Says(kActorDektora, 450, 3);
+		Actor_Says(kActorMcCoy, 2535, 12);
+		Actor_Says(kActorDektora, 460, 3);
+		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);
-		Actor_Says(0, 2540, 15);
-		Actor_Clue_Acquire(0, 140, 1, -1);
+		Actor_Says(kActorMcCoy, 2540, 15);
+		Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallDektora2, 1, -1);
 	}
 }
 
 void SceneScriptMA04::sub_402F2C() {
-	Actor_Says(6, 530, 3);
-	Actor_Says(0, 2545, 19);
-	Actor_Says(6, 540, 3);
-	Actor_Says(6, 550, 3);
-	Actor_Says(0, 2550, 13);
-	Actor_Says(6, 560, 3);
-	Actor_Says(0, 2555, 19);
-	Actor_Says(6, 570, 3);
-	Actor_Says(0, 2560, 17);
-	Actor_Says(6, 580, 3);
-	if (Game_Flag_Query(165) || Actor_Query_Goal_Number(9) == 2) {
-		Actor_Says(6, 630, 3);
-		Actor_Says_With_Pause(0, 2575, 0.0f, 15);
+	Actor_Says(kActorLucy, 530, 3);
+	Actor_Says(kActorMcCoy, 2545, 19);
+	Actor_Says(kActorLucy, 540, 3);
+	Actor_Says(kActorLucy, 550, 3);
+	Actor_Says(kActorMcCoy, 2550, 13);
+	Actor_Says(kActorLucy, 560, 3);
+	Actor_Says(kActorMcCoy, 2555, 19);
+	Actor_Says(kActorLucy, 570, 3);
+	Actor_Says(kActorMcCoy, 2560, 17);
+	Actor_Says(kActorLucy, 580, 3);
+	if (Game_Flag_Query(165) || Actor_Query_Goal_Number(kActorCrazylegs) == 2) {
+		Actor_Says(kActorLucy, 630, 3);
+		Actor_Says_With_Pause(kActorMcCoy, 2575, 0.0f, 15);
 		if (!Game_Flag_Query(378)) {
-			Actor_Says(6, 640, 3);
+			Actor_Says(kActorLucy, 640, 3);
 		}
-		Actor_Clue_Acquire(0, 142, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallLucy2, 1, -1);
 	} else {
-		Actor_Says(6, 590, 3);
-		Actor_Says(0, 2565, 12);
-		Actor_Says(6, 600, 3);
-		Actor_Says(6, 610, 3);
-		Actor_Says(6, 620, 3);
-		Actor_Says(0, 2570, 13);
-		Actor_Says_With_Pause(6, 630, 0.0f, 3);
-		Actor_Says_With_Pause(0, 2575, 0.0f, 15);
+		Actor_Says(kActorLucy, 590, 3);
+		Actor_Says(kActorMcCoy, 2565, 12);
+		Actor_Says(kActorLucy, 600, 3);
+		Actor_Says(kActorLucy, 610, 3);
+		Actor_Says(kActorLucy, 620, 3);
+		Actor_Says(kActorMcCoy, 2570, 13);
+		Actor_Says_With_Pause(kActorLucy, 630, 0.0f, 3);
+		Actor_Says_With_Pause(kActorMcCoy, 2575, 0.0f, 15);
 		if (!Game_Flag_Query(378)) {
-			Actor_Says(6, 640, 3);
+			Actor_Says(kActorLucy, 640, 3);
 		}
-		Actor_Clue_Acquire(0, 141, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallLucy1, 1, -1);
 	}
 	Sound_Play(123, 100, 0, 0, 50);
 }
 
 void SceneScriptMA04::sub_4032A0() {
-	Actor_Says(1, 680, 3);
-	Actor_Says(0, 2630, 17);
-	Actor_Says(1, 690, 3);
-	Actor_Says(0, 2635, 18);
-	Actor_Says(1, 700, 3);
-	Actor_Says(0, 2640, 14);
-	Actor_Says(1, 710, 3);
-	Actor_Says(1, 720, 3);
-	Actor_Says(0, 2645, 13);
-	Actor_Says(1, 740, 3);
-	Actor_Says(1, 750, 3);
-	Actor_Says(0, 2650, 12);
-	Actor_Says(1, 760, 3);
-	Actor_Says(0, 2665, 13);
-	Actor_Says(1, 810, 3);
-	Actor_Says(1, 820, 3);
+	Actor_Says(kActorSteele, 680, 3);
+	Actor_Says(kActorMcCoy, 2630, 17);
+	Actor_Says(kActorSteele, 690, 3);
+	Actor_Says(kActorMcCoy, 2635, 18);
+	Actor_Says(kActorSteele, 700, 3);
+	Actor_Says(kActorMcCoy, 2640, 14);
+	Actor_Says(kActorSteele, 710, 3);
+	Actor_Says(kActorSteele, 720, 3);
+	Actor_Says(kActorMcCoy, 2645, 13);
+	Actor_Says(kActorSteele, 740, 3);
+	Actor_Says(kActorSteele, 750, 3);
+	Actor_Says(kActorMcCoy, 2650, 12);
+	Actor_Says(kActorSteele, 760, 3);
+	Actor_Says(kActorMcCoy, 2665, 13);
+	Actor_Says(kActorSteele, 810, 3);
+	Actor_Says(kActorSteele, 820, 3);
 	Sound_Play(123, 100, 0, 0, 50);
-	Actor_Clue_Acquire(0, 144, 1, -1);
+	Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallCrystal, 1, -1);
 }
 
 void SceneScriptMA04::sub_4034D8() {
-	Actor_Says(5, 330, 3);
-	Actor_Says(0, 2580, 14);
-	Actor_Says(5, 340, 3);
-	Actor_Says(0, 2585, 19);
-	Actor_Says(5, 350, 3);
-	Actor_Says(5, 360, 3);
-	Actor_Says(0, 2590, 18);
-	Actor_Says(5, 370, 3);
-	Actor_Says(0, 2595, 15);
-	Actor_Says(5, 390, 3);
-	Actor_Says(5, 400, 3);
-	Actor_Says(5, 410, 3);
-	Actor_Says(0, 2600, 15);
-	Actor_Says_With_Pause(5, 420, 1.5f, 3);
-	Actor_Says(0, 2605, 17);
-	Actor_Says(5, 430, 3);
-	Actor_Says(5, 440, 3);
-	Actor_Says(0, 2610, 3);
-	Actor_Says(5, 450, 3);
-	Actor_Says(5, 460, 3);
-	Actor_Says(5, 470, 3);
-	Actor_Says(5, 480, 3);
-	Actor_Says(5, 490, 3);
-	Actor_Says(0, 2615, 17);
-	Actor_Says(5, 500, 3);
-	Actor_Says(5, 530, 3);
-	Actor_Says(5, 540, 3);
+	Actor_Says(kActorClovis, 330, 3);
+	Actor_Says(kActorMcCoy, 2580, 14);
+	Actor_Says(kActorClovis, 340, 3);
+	Actor_Says(kActorMcCoy, 2585, 19);
+	Actor_Says(kActorClovis, 350, 3);
+	Actor_Says(kActorClovis, 360, 3);
+	Actor_Says(kActorMcCoy, 2590, 18);
+	Actor_Says(kActorClovis, 370, 3);
+	Actor_Says(kActorMcCoy, 2595, 15);
+	Actor_Says(kActorClovis, 390, 3);
+	Actor_Says(kActorClovis, 400, 3);
+	Actor_Says(kActorClovis, 410, 3);
+	Actor_Says(kActorMcCoy, 2600, 15);
+	Actor_Says_With_Pause(kActorClovis, 420, 1.5f, 3);
+	Actor_Says(kActorMcCoy, 2605, 17);
+	Actor_Says(kActorClovis, 430, 3);
+	Actor_Says(kActorClovis, 440, 3);
+	Actor_Says(kActorMcCoy, 2610, 3);
+	Actor_Says(kActorClovis, 450, 3);
+	Actor_Says(kActorClovis, 460, 3);
+	Actor_Says(kActorClovis, 470, 3);
+	Actor_Says(kActorClovis, 480, 3);
+	Actor_Says(kActorClovis, 490, 3);
+	Actor_Says(kActorMcCoy, 2615, 17);
+	Actor_Says(kActorClovis, 500, 3);
+	Actor_Says(kActorClovis, 530, 3);
+	Actor_Says(kActorClovis, 540, 3);
 	Sound_Play(123, 100, 0, 0, 50);
-	Actor_Clue_Acquire(0, 143, 1, -1);
+	Actor_Clue_Acquire(kActorMcCoy, kCluePhoneCallClovis, 1, -1);
 }
 
 void SceneScriptMA04::sub_403864() {
 	Overlay_Play("MA04OVR2", 0, 1, 0, 0);
 	switch (Global_Variable_Query(52)) {
 	case 4:
-		ADQ_Add(61, 230, 3);
-		ADQ_Add(61, 240, 3);
+		ADQ_Add(kActorNewscaster, 230, 3);
+		ADQ_Add(kActorNewscaster, 240, 3);
 		break;
 	case 3:
-		ADQ_Add(61, 170, 3);
-		ADQ_Add(61, 180, 3);
-		ADQ_Add(61, 190, 3);
-		ADQ_Add(61, 200, 3);
-		ADQ_Add(61, 210, 3);
-		ADQ_Add(61, 220, 3);
-		ADQ_Add(41, 80, 3);
-		ADQ_Add(41, 90, 3);
-		ADQ_Add(41, 100, 3);
-		ADQ_Add(41, 110, 3);
-		ADQ_Add(41, 120, 3);
-		ADQ_Add(41, 130, 3);
+		ADQ_Add(kActorNewscaster, 170, 3);
+		ADQ_Add(kActorNewscaster, 180, 3);
+		ADQ_Add(kActorNewscaster, 190, 3);
+		ADQ_Add(kActorNewscaster, 200, 3);
+		ADQ_Add(kActorNewscaster, 210, 3);
+		ADQ_Add(kActorNewscaster, 220, 3);
+		ADQ_Add(kActorGovernorKolvig, 80, 3);
+		ADQ_Add(kActorGovernorKolvig, 90, 3);
+		ADQ_Add(kActorGovernorKolvig, 100, 3);
+		ADQ_Add(kActorGovernorKolvig, 110, 3);
+		ADQ_Add(kActorGovernorKolvig, 120, 3);
+		ADQ_Add(kActorGovernorKolvig, 130, 3);
 		break;
 	case 2:
-		if (Actor_Query_Friendliness_To_Other(5, 0) <= Actor_Query_Friendliness_To_Other(1, 0)) {
-			ADQ_Add(61, 90, 3);
-			ADQ_Add(61, 100, 3);
-			ADQ_Add(61, 110, 3);
-			ADQ_Add(4, 1540, 3);
-			ADQ_Add(4, 1550, 3);
-			ADQ_Add(4, 1560, 3);
+		if (Actor_Query_Friendliness_To_Other(kActorClovis, kActorMcCoy) <= Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy)) {
+			ADQ_Add(kActorNewscaster, 90, 3);
+			ADQ_Add(kActorNewscaster, 100, 3);
+			ADQ_Add(kActorNewscaster, 110, 3);
+			ADQ_Add(kActorGuzza, 1540, 3);
+			ADQ_Add(kActorGuzza, 1550, 3);
+			ADQ_Add(kActorGuzza, 1560, 3);
 		} else {
-			ADQ_Add(61, 120, 3);
-			ADQ_Add(61, 130, 3);
-			ADQ_Add(61, 140, 3);
-			ADQ_Add(61, 150, 3);
-			ADQ_Add(4, 1570, 3);
-			ADQ_Add(4, 1580, 3);
-			ADQ_Add(4, 1590, 3);
+			ADQ_Add(kActorNewscaster, 120, 3);
+			ADQ_Add(kActorNewscaster, 130, 3);
+			ADQ_Add(kActorNewscaster, 140, 3);
+			ADQ_Add(kActorNewscaster, 150, 3);
+			ADQ_Add(kActorGuzza, 1570, 3);
+			ADQ_Add(kActorGuzza, 1580, 3);
+			ADQ_Add(kActorGuzza, 1590, 3);
 		}
 		break;
 	case 1:
-		ADQ_Add(61, 40, 3);
-		ADQ_Add(61, 50, 3);
-		ADQ_Add(61, 60, 3);
-		ADQ_Add(61, 70, 3);
-		ADQ_Add(61, 80, 3);
+		ADQ_Add(kActorNewscaster, 40, 3);
+		ADQ_Add(kActorNewscaster, 50, 3);
+		ADQ_Add(kActorNewscaster, 60, 3);
+		ADQ_Add(kActorNewscaster, 70, 3);
+		ADQ_Add(kActorNewscaster, 80, 3);
 		break;
 	case 0:
-		ADQ_Add(61, 0, 3);
-		ADQ_Add(61, 10, 3);
-		ADQ_Add(61, 20, 3);
-		ADQ_Add(61, 30, 3);
-		ADQ_Add(51, 430, 3);
-		ADQ_Add(51, 440, 3);
-		ADQ_Add(51, 450, 3);
-		ADQ_Add(51, 460, 3);
+		ADQ_Add(kActorNewscaster, 0, 3);
+		ADQ_Add(kActorNewscaster, 10, 3);
+		ADQ_Add(kActorNewscaster, 20, 3);
+		ADQ_Add(kActorNewscaster, 30, 3);
+		ADQ_Add(kActorTyrell, 430, 3);
+		ADQ_Add(kActorTyrell, 440, 3);
+		ADQ_Add(kActorTyrell, 450, 3);
+		ADQ_Add(kActorTyrell, 460, 3);
 		break;
 	}
 }
 
 void SceneScriptMA04::sub_403DA8() {
-	if (!Loop_Actor_Walk_To_Scene_Object(0, "BED-SHEETS", 12, 1, false)) {
-		Actor_Says(0, 8530, 12);
+	if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BED-SHEETS", 12, true, false)) {
+		Actor_Says(kActorMcCoy, 8530, 12);
 		Music_Stop(4);
 		if (sub_402820() || sub_402758()) {
 			Overlay_Remove("MA04OVER");
@@ -543,9 +543,9 @@ void SceneScriptMA04::sub_403DA8() {
 		Player_Loses_Control();
 		Game_Flag_Set(647);
 		if ((Game_Flag_Query(40) || Game_Flag_Query(41)) && Global_Variable_Query(1) == 1) {
-			if (Actor_Query_Goal_Number(19) == 599) {
-				Actor_Put_In_Set(19, 91);
-				Actor_Set_At_Waypoint(19, 33, 0);
+			if (Actor_Query_Goal_Number(kActorZuben) == 599) {
+				Actor_Put_In_Set(kActorZuben, 91);
+				Actor_Set_At_Waypoint(kActorZuben, 33, 0);
 			}
 			Game_Flag_Set(678);
 			Global_Variable_Set(1, 2);
diff --git a/engines/bladerunner/script/scene/ma05.cpp b/engines/bladerunner/script/scene/ma05.cpp
index 39295f956a..fabe053bd4 100644
--- a/engines/bladerunner/script/scene/ma05.cpp
+++ b/engines/bladerunner/script/scene/ma05.cpp
@@ -76,12 +76,12 @@ bool SceneScriptMA05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptMA05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -7199.0f, 956.17f, 1579.0f, 0, 0, false, 0)) {
-			Loop_Actor_Walk_To_XYZ(0, -7199.0f, 956.17f, 1579.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 956.17f, 1579.0f, 0, 0, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 956.17f, 1579.0f, 0, 0, false, 0);
 			Game_Flag_Set(63);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
-			Async_Actor_Walk_To_XYZ(0, -7199.0f, 953.97f, 1685.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -7199.0f, 953.97f, 1685.0f, 0, false);
 			Set_Enter(50, 50);
 		}
 		return true;
@@ -112,10 +112,10 @@ void SceneScriptMA05::PlayerWalkedIn() {
 	}
 	if (Game_Flag_Query(146) && !Game_Flag_Query(61)) {
 		if (!Game_Flag_Query(378)) {
-			Actor_Voice_Over(1260, 99);
-			Actor_Voice_Over(1270, 99);
-			Actor_Voice_Over(1280, 99);
-			Actor_Voice_Over(1290, 99);
+			Actor_Voice_Over(1260, kActorVoiceOver);
+			Actor_Voice_Over(1270, kActorVoiceOver);
+			Actor_Voice_Over(1280, kActorVoiceOver);
+			Actor_Voice_Over(1290, kActorVoiceOver);
 		}
 		Game_Flag_Set(61);
 		Player_Gains_Control();
@@ -131,12 +131,12 @@ void SceneScriptMA05::DialogueQueueFlushed(int a1) {
 
 bool SceneScriptMA05::sub_401990() {
 	return Global_Variable_Query(1) == 5
-		&& !Actor_Clue_Query(0, 143)
-		&& !Actor_Clue_Query(0, 144)
-		&& !Actor_Clue_Query(0, 139)
-		&& !Actor_Clue_Query(0, 140)
-		&& !Actor_Clue_Query(0, 141)
-		&& !Actor_Clue_Query(0, 142);
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallClovis)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallCrystal)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora1)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallDektora2)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy1)
+		&& !Actor_Clue_Query(kActorMcCoy, kCluePhoneCallLucy2);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp
index 09c8637769..42845ecd8f 100644
--- a/engines/bladerunner/script/scene/ma06.cpp
+++ b/engines/bladerunner/script/scene/ma06.cpp
@@ -70,8 +70,8 @@ void SceneScriptMA06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptMA06::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_XYZ(0, 40.0f, 1.35f, 0.0f, 0, 0, false, 0);
-	Actor_Face_Object(0, "panel", true);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 40.0f, 1.35f, 0.0f, 0, 0, false, 0);
+	Actor_Face_Object(kActorMcCoy, "panel", true);
 	Delay(500);
 	sub_4014E4();
 	if (sub_4012C0()) {
@@ -120,7 +120,7 @@ void SceneScriptMA06::sub_4014E4() {
 		if (Game_Flag_Query(58)) {
 			break;
 		}
-		Actor_Says(39, 80, 3);
+		Actor_Says(kActorAnsweringMachine, 80, 3);
 		Player_Gains_Control();
 		int v1 = Elevator_Activate(1);
 		Player_Loses_Control();
@@ -133,19 +133,19 @@ void SceneScriptMA06::sub_4014E4() {
 			} else {
 				Sound_Play(412, 100, 0, 0, 50);
 				Delay(500);
-				Actor_Says(39, 610, 3);
+				Actor_Says(kActorAnsweringMachine, 610, 3);
 			}
 		} else {
-			Actor_Says(0, 2940, 18);
+			Actor_Says(kActorMcCoy, 2940, 18);
 			if (Global_Variable_Query(1) == 4 && Game_Flag_Query(655)) {
 				Sound_Play(412, 100, 0, 0, 50);
 				Delay(500);
-				Actor_Says(39, 610, 3);
+				Actor_Says(kActorAnsweringMachine, 610, 3);
 				Delay(500);
-				Actor_Says(0, 8527, 3);
+				Actor_Says(kActorMcCoy, 8527, 3);
 			} else {
 				Game_Flag_Set(34);
-				Actor_Says(39, 90, 3);
+				Actor_Says(kActorAnsweringMachine, 90, 3);
 			}
 		}
 	}
diff --git a/engines/bladerunner/script/scene/ma07.cpp b/engines/bladerunner/script/scene/ma07.cpp
index 2fc19c0660..59d1593012 100644
--- a/engines/bladerunner/script/scene/ma07.cpp
+++ b/engines/bladerunner/script/scene/ma07.cpp
@@ -72,9 +72,9 @@ bool SceneScriptMA07::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptMA07::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 104.0f, -162.0f, 56.0f, 12, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 104.0f, -162.0f, 56.0f, 12, 1, false, 0)) {
 			if (Global_Variable_Query(1) == 4 && Game_Flag_Query(671)) {
-				Actor_Set_Goal_Number(0, 400);
+				Actor_Set_Goal_Number(kActorMcCoy, 400);
 			} else {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -85,7 +85,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -400.0f, -162.8f, 185.08f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -400.0f, -162.8f, 185.08f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(672);
@@ -96,7 +96,7 @@ bool SceneScriptMA07::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 8.0f, -172.43f, 356.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 8.0f, -172.43f, 356.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(357);
@@ -122,25 +122,25 @@ void SceneScriptMA07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptMA07::PlayerWalkedIn() {
 	if (Game_Flag_Query(673)) {
-		Loop_Actor_Walk_To_XYZ(0, -268.0f, -162.8f, 188.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -268.0f, -162.8f, 188.0f, 0, 0, false, 0);
 		Game_Flag_Reset(673);
 	}
-	if (Actor_Query_Goal_Number(57) == 300) {
-		Actor_Set_Goal_Number(57, 305);
+	if (Actor_Query_Goal_Number(kActorRachael) == 300) {
+		Actor_Set_Goal_Number(kActorRachael, 305);
 	}
 	if (Game_Flag_Query(58)) {
 		Game_Flag_Reset(58);
 	}
 	if (!Game_Flag_Query(648) && Game_Flag_Query(671) && Global_Variable_Query(1) == 4) {
 		Scene_Exits_Disable();
-		Actor_Set_Goal_Number(53, 300);
+		Actor_Set_Goal_Number(kActorGaff, 300);
 	}
 	if (Game_Flag_Query(666)) {
-		Actor_Voice_Over(1360, 99);
-		Actor_Voice_Over(1370, 99);
-		Actor_Voice_Over(1380, 99);
-		Actor_Voice_Over(1390, 99);
-		Actor_Voice_Over(1400, 99);
+		Actor_Voice_Over(1360, kActorVoiceOver);
+		Actor_Voice_Over(1370, kActorVoiceOver);
+		Actor_Voice_Over(1380, kActorVoiceOver);
+		Actor_Voice_Over(1390, kActorVoiceOver);
+		Actor_Voice_Over(1400, kActorVoiceOver);
 		Delay(1000);
 		Game_Flag_Reset(666);
 		Game_Flag_Set(34);
diff --git a/engines/bladerunner/script/scene/nr01.cpp b/engines/bladerunner/script/scene/nr01.cpp
index f4ebbd01a4..3a5ef197d6 100644
--- a/engines/bladerunner/script/scene/nr01.cpp
+++ b/engines/bladerunner/script/scene/nr01.cpp
@@ -29,7 +29,7 @@ void SceneScriptNR01::InitializeScene() {
 		Setup_Scene_Information(-153.86f, 23.88f, -570.21f, 402);
 	} else if (Game_Flag_Query(632)) {
 		Setup_Scene_Information(-416.0f, 31.93f, -841.0f, 200);
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 		Preload(167);
 	} else if (Game_Flag_Query(534)) {
 		Setup_Scene_Information(-416.0f, 31.93f, -841.0f, 200);
@@ -67,7 +67,7 @@ void SceneScriptNR01::InitializeScene() {
 	Ambient_Sounds_Add_Sound(375, 10, 80, 33, 33, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(376, 10, 80, 33, 33, 0, 0, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(377, 10, 80, 33, 33, 0, 0, -101, -101, 0, 0);
-	if (Game_Flag_Query(643) && Actor_Query_Goal_Number(1) == 230) {
+	if (Game_Flag_Query(643) && Actor_Query_Goal_Number(kActorSteele) == 230) {
 		Game_Flag_Reset(255);
 		Game_Flag_Reset(256);
 	}
@@ -88,7 +88,7 @@ void SceneScriptNR01::SceneLoaded() {
 }
 
 bool SceneScriptNR01::MouseClick(int x, int y) {
-	if (Actor_Query_Goal_Number(0) == 212) {
+	if (Actor_Query_Goal_Number(kActorMcCoy) == 212) {
 		Global_Variable_Increment(47, 4);
 		return true;
 	}
@@ -109,9 +109,9 @@ bool SceneScriptNR01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -380.0f, 31.93f, -841.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -380.0f, 31.93f, -841.0f, 0, 1, false, 0)) {
 			if (Global_Variable_Query(1) > 3) {
-				Actor_Says(0, 8522, 12);
+				Actor_Says(kActorMcCoy, 8522, 12);
 			} else {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -122,9 +122,9 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -281.0f, 31.93f, -1061.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 45, false);
-			Loop_Actor_Travel_Stairs(0, 3, 0, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -281.0f, 31.93f, -1061.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 45, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 0, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(343);
@@ -133,7 +133,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 312.0f, 31.66f, -901.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 312.0f, 31.66f, -901.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(532);
@@ -142,7 +142,7 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 108.0f, 23.88f, -93.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 108.0f, 23.88f, -93.0f, 0, 1, false, 0)) {
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
 			Game_Flag_Reset(179);
@@ -239,13 +239,13 @@ bool SceneScriptNR01::ClickedOnExit(int exitId) {
 bool SceneScriptNR01::ClickedOn2DRegion(int region) {
 	if (region == 0 && Player_Query_Combat_Mode()) {
 		Sound_Play(517, 100, 0, 0, 50);
-		Actor_Set_Goal_Number(1, 260);
+		Actor_Set_Goal_Number(kActorSteele, 260);
 		Scene_2D_Region_Remove(0);
 	}
 	if (region == 1 && Player_Query_Combat_Mode()) {
 		Sound_Play(517, 100, 0, 0, 50);
-		Actor_Set_Goal_Number(2, 299);
-		Actor_Set_Goal_Number(1, 258);
+		Actor_Set_Goal_Number(kActorGordo, 299);
+		Actor_Set_Goal_Number(kActorSteele, 258);
 		Scene_2D_Region_Remove(1);
 		return true;
 	}
@@ -268,32 +268,32 @@ void SceneScriptNR01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptNR01::PlayerWalkedIn() {
 	if (Game_Flag_Query(617)) {
-		Actor_Set_Goal_Number(1, 280);
+		Actor_Set_Goal_Number(kActorSteele, 280);
 		Game_Flag_Reset(617);
 		//return true;
 		return;
 	}
-	if (Actor_Query_Goal_Number(1) == 250) {
+	if (Actor_Query_Goal_Number(kActorSteele) == 250) {
 		Scene_Exits_Disable();
 		ADQ_Flush();
-		Actor_Set_Goal_Number(1, 251);
+		Actor_Set_Goal_Number(kActorSteele, 251);
 		Scene_2D_Region_Add(0, 450, 316, 464, 333);
 		Scene_2D_Region_Add(1, 233, 321, 240, 362);
-		ADQ_Add(2, 70, 81);
-		ADQ_Add(1, 990, 3);
-		ADQ_Add(2, 80, 82);
-		ADQ_Add(2, 90, 81);
-		ADQ_Add(1, 1010, 3);
-		ADQ_Add(2, 100, 81);
-		ADQ_Add(1, 1020, 3);
-		ADQ_Add(2, 110, 82);
-		ADQ_Add(1, 1030, 3);
-		ADQ_Add(1, 1040, 3);
-		ADQ_Add(2, 120, 82);
+		ADQ_Add(kActorGordo, 70, 81);
+		ADQ_Add(kActorSteele, 990, 3);
+		ADQ_Add(kActorGordo, 80, 82);
+		ADQ_Add(kActorGordo, 90, 81);
+		ADQ_Add(kActorSteele, 1010, 3);
+		ADQ_Add(kActorGordo, 100, 81);
+		ADQ_Add(kActorSteele, 1020, 3);
+		ADQ_Add(kActorGordo, 110, 82);
+		ADQ_Add(kActorSteele, 1030, 3);
+		ADQ_Add(kActorSteele, 1040, 3);
+		ADQ_Add(kActorGordo, 120, 82);
 	}
 	if (Game_Flag_Query(604)) {
 		if (Game_Flag_Query(622)) {
-			ADQ_Add(25, 150, 3);
+			ADQ_Add(kActorHanoi, 150, 3);
 			Game_Flag_Reset(622);
 		}
 		Game_Flag_Reset(604);
@@ -308,105 +308,105 @@ void SceneScriptNR01::PlayerWalkedIn() {
 		return;
 	}
 	if (Game_Flag_Query(534)) {
-		Loop_Actor_Walk_To_XYZ(0, -380.0f, 31.73f, -841.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -380.0f, 31.73f, -841.0f, 0, 0, false, 0);
 		Game_Flag_Reset(534);
 	} else {
 		if (Game_Flag_Query(342)) {
-			Loop_Actor_Travel_Stairs(0, 3, 1, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 1, 0);
 			Game_Flag_Reset(342);
-			if (Actor_Query_Goal_Number(1) == 230) {
-				Actor_Face_Actor(1, 0, true);
-				Actor_Says(1, 1440, 13);
-				Loop_Actor_Walk_To_Actor(0, 1, 48, 0, true);
-				Actor_Says(0, 3145, 13);
+			if (Actor_Query_Goal_Number(kActorSteele) == 230) {
+				Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
+				Actor_Says(kActorSteele, 1440, 13);
+				Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorSteele, 48, 0, true);
+				Actor_Says(kActorMcCoy, 3145, 13);
 				if (Global_Variable_Query(40) != 3) {
-					Actor_Says(1, 1450, 12);
-					Actor_Says(1, 1460, 13);
+					Actor_Says(kActorSteele, 1450, 12);
+					Actor_Says(kActorSteele, 1460, 13);
 				}
-				Actor_Says(0, 3150, 14);
-				Actor_Says(1, 1470, 12);
-				Actor_Says(1, 1480, 13);
-				Actor_Says(0, 3155, 15);
-				Actor_Says(1, 1500, 16);
-				Actor_Says(0, 3160, 12);
+				Actor_Says(kActorMcCoy, 3150, 14);
+				Actor_Says(kActorSteele, 1470, 12);
+				Actor_Says(kActorSteele, 1480, 13);
+				Actor_Says(kActorMcCoy, 3155, 15);
+				Actor_Says(kActorSteele, 1500, 16);
+				Actor_Says(kActorMcCoy, 3160, 12);
 				if (Game_Flag_Query(643)) {
-					Actor_Says(1, 1330, 12);
-					Actor_Says(1, 1340, 12);
-					Actor_Says(1, 1350, 12);
-					Actor_Says(0, 3120, 15);
-					Actor_Says(1, 1360, 12);
-					Actor_Says(1, 1370, 12);
-					Actor_Says(0, 3125, 15);
-					Actor_Says(1, 1380, 12);
-					Actor_Says(0, 3130, 15);
-					Actor_Says(1, 1390, 12);
-					Actor_Says(1, 1400, 12);
-					Actor_Says(1, 1410, 12);
-					Actor_Says(0, 3135, 15);
-					Actor_Says(1, 1420, 12);
-					Actor_Says(0, 3140, 15);
-					Actor_Says(1, 1430, 12);
-					Actor_Set_Goal_Number(1, 285);
+					Actor_Says(kActorSteele, 1330, 12);
+					Actor_Says(kActorSteele, 1340, 12);
+					Actor_Says(kActorSteele, 1350, 12);
+					Actor_Says(kActorMcCoy, 3120, 15);
+					Actor_Says(kActorSteele, 1360, 12);
+					Actor_Says(kActorSteele, 1370, 12);
+					Actor_Says(kActorMcCoy, 3125, 15);
+					Actor_Says(kActorSteele, 1380, 12);
+					Actor_Says(kActorMcCoy, 3130, 15);
+					Actor_Says(kActorSteele, 1390, 12);
+					Actor_Says(kActorSteele, 1400, 12);
+					Actor_Says(kActorSteele, 1410, 12);
+					Actor_Says(kActorMcCoy, 3135, 15);
+					Actor_Says(kActorSteele, 1420, 12);
+					Actor_Says(kActorMcCoy, 3140, 15);
+					Actor_Says(kActorSteele, 1430, 12);
+					Actor_Set_Goal_Number(kActorSteele, 285);
 				} else {
 					int v0 = Global_Variable_Query(40) - 1;
 					if (!v0) {
-						Actor_Says(1, 1510, 15);
-						Actor_Says(1, 1520, 14);
-						Actor_Says(1, 1530, 13);
-						Actor_Says(0, 3170, 13);
-						Actor_Set_Goal_Number(1, 231);
+						Actor_Says(kActorSteele, 1510, 15);
+						Actor_Says(kActorSteele, 1520, 14);
+						Actor_Says(kActorSteele, 1530, 13);
+						Actor_Says(kActorMcCoy, 3170, 13);
+						Actor_Set_Goal_Number(kActorSteele, 231);
 					} else if (v0 == 1) {
-						Actor_Says(1, 1590, 15);
-						Actor_Says(0, 3195, 14);
-						Actor_Says(1, 1600, 16);
-						Actor_Says(0, 3200, 13);
-						Actor_Says(1, 1610, 17);
-						Actor_Says(1, 1620, 15);
-						Actor_Says(1, 1630, 14);
-						Actor_Says(0, 3205, 12);
-						Actor_Set_Goal_Number(1, 232);
+						Actor_Says(kActorSteele, 1590, 15);
+						Actor_Says(kActorMcCoy, 3195, 14);
+						Actor_Says(kActorSteele, 1600, 16);
+						Actor_Says(kActorMcCoy, 3200, 13);
+						Actor_Says(kActorSteele, 1610, 17);
+						Actor_Says(kActorSteele, 1620, 15);
+						Actor_Says(kActorSteele, 1630, 14);
+						Actor_Says(kActorMcCoy, 3205, 12);
+						Actor_Set_Goal_Number(kActorSteele, 232);
 					} else if (v0 == 2) {
-						Actor_Says(1, 1540, 15);
-						Actor_Says(0, 3175, 13);
-						Actor_Says(1, 1550, 13);
-						Actor_Says(1, 1560, 16);
-						Actor_Says(0, 3180, 15);
-						Actor_Says(1, 1570, 12);
-						Actor_Says(1, 1580, 14);
-						Actor_Says(0, 3190, 12);
-						Actor_Set_Goal_Number(1, 233);
+						Actor_Says(kActorSteele, 1540, 15);
+						Actor_Says(kActorMcCoy, 3175, 13);
+						Actor_Says(kActorSteele, 1550, 13);
+						Actor_Says(kActorSteele, 1560, 16);
+						Actor_Says(kActorMcCoy, 3180, 15);
+						Actor_Says(kActorSteele, 1570, 12);
+						Actor_Says(kActorSteele, 1580, 14);
+						Actor_Says(kActorMcCoy, 3190, 12);
+						Actor_Set_Goal_Number(kActorSteele, 233);
 					}
 				}
 			}
 		} else if (Game_Flag_Query(533)) {
-			Loop_Actor_Walk_To_XYZ(0, 239.0f, 31.66f, -901.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 239.0f, 31.66f, -901.0f, 0, 0, false, 0);
 			Game_Flag_Reset(533);
-			if (Actor_Query_Goal_Number(2) == 230) {
+			if (Actor_Query_Goal_Number(kActorGordo) == 230) {
 				Scene_Exits_Disable();
-				Actor_Set_Goal_Number(2, 231);
-				Non_Player_Actor_Combat_Mode_On(2, 0, 1, 0, 3, 4, 7, 8, -1, -1, -1, 20, 300, 0);
+				Actor_Set_Goal_Number(kActorGordo, 231);
+				Non_Player_Actor_Combat_Mode_On(kActorGordo, 0, 1, kActorMcCoy, 3, 4, 7, 8, -1, -1, -1, 20, 300, 0);
 			}
 		} else if (Game_Flag_Query(545)) {
 			Game_Flag_Reset(545);
-			Actor_Put_In_Set(25, 54);
-			Actor_Set_At_XYZ(25, -202.0f, 24.0f, -574.0f, 0);
-			Actor_Face_Heading(25, 256, false);
-			Actor_Set_Goal_Number(25, 204);
+			Actor_Put_In_Set(kActorHanoi, 54);
+			Actor_Set_At_XYZ(kActorHanoi, -202.0f, 24.0f, -574.0f, 0);
+			Actor_Face_Heading(kActorHanoi, 256, false);
+			Actor_Set_Goal_Number(kActorHanoi, 204);
 			Player_Gains_Control();
 		} else {
-			Loop_Actor_Walk_To_XYZ(0, 48.0f, 23.88f, -189.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 48.0f, 23.88f, -189.0f, 0, 0, false, 0);
 		}
 	}
 	if (Game_Flag_Query(652)) {
 		Game_Flag_Reset(652);
-		Actor_Voice_Over(950, 99);
-		Actor_Voice_Over(960, 99);
-		Actor_Voice_Over(970, 99);
-		Actor_Voice_Over(980, 99);
+		Actor_Voice_Over(950, kActorVoiceOver);
+		Actor_Voice_Over(960, kActorVoiceOver);
+		Actor_Voice_Over(970, kActorVoiceOver);
+		Actor_Voice_Over(980, kActorVoiceOver);
 	}
-	if (Actor_Query_Goal_Number(2) == 240) {
+	if (Actor_Query_Goal_Number(kActorGordo) == 240) {
 		Scene_Exits_Disable();
-		Actor_Set_Goal_Number(2, 241);
+		Actor_Set_Goal_Number(kActorGordo, 241);
 		if (!Player_Query_Combat_Mode()) {
 			Player_Set_Combat_Mode(true);
 		}
@@ -428,8 +428,8 @@ void SceneScriptNR01::PlayerWalkedOut() {
 }
 
 void SceneScriptNR01::DialogueQueueFlushed(int a1) {
-	if (Actor_Query_Goal_Number(1) == 251 && Actor_Query_Goal_Number(2) != 299 && Actor_Query_Goal_Number(2) != 254 && Actor_Query_Goal_Number(2) != 255) {
-		Actor_Set_Goal_Number(1, 252);
+	if (Actor_Query_Goal_Number(kActorSteele) == 251 && Actor_Query_Goal_Number(kActorGordo) != 299 && Actor_Query_Goal_Number(kActorGordo) != 254 && Actor_Query_Goal_Number(kActorGordo) != 255) {
+		Actor_Set_Goal_Number(kActorSteele, 252);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/nr02.cpp b/engines/bladerunner/script/scene/nr02.cpp
index 1af8387a4b..a6ccb5c40b 100644
--- a/engines/bladerunner/script/scene/nr02.cpp
+++ b/engines/bladerunner/script/scene/nr02.cpp
@@ -73,10 +73,10 @@ bool SceneScriptNR02::MouseClick(int x, int y) {
 
 bool SceneScriptNR02::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("VID PHONE 01", objectName) || Object_Query_Click("VID PHONE 02", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -191.9f, -24.0f, 62.15f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 13, false);
-			if (Actor_Clue_Query(0, 125) && Actor_Clue_Query(0, 126) && !Game_Flag_Query(670)) {
-				Actor_Set_Goal_Number(0, 350);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -191.9f, -24.0f, 62.15f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 13, false);
+			if (Actor_Clue_Query(kActorMcCoy, kClueFolder) && Actor_Clue_Query(kActorMcCoy, kClueGuzzaFramedMcCoy) && !Game_Flag_Query(670)) {
+				Actor_Set_Goal_Number(kActorMcCoy, 350);
 				Game_Flag_Set(670);
 			} else {
 				Sound_Play(123, 50, 0, 0, 50);
@@ -89,7 +89,7 @@ bool SceneScriptNR02::ClickedOn3DObject(const char *objectName, bool a2) {
 				Delay(1500);
 				Sound_Play(123, 50, 0, 0, 50);
 				Delay(1000);
-				Actor_Says(0, 170, 14);
+				Actor_Says(kActorMcCoy, 170, 14);
 			}
 		}
 	}
@@ -97,24 +97,24 @@ bool SceneScriptNR02::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptNR02::ClickedOnActor(int actorId) {
-	if (actorId == 2 && Actor_Query_Goal_Number(2) == 201 && !Loop_Actor_Walk_To_XYZ(0, 67.37f, -24.0f, 389.32f, 0, 1, false, 0)) {
-		Actor_Set_Goal_Number(2, 215);
+	if (actorId == 2 && Actor_Query_Goal_Number(kActorGordo) == 201 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 67.37f, -24.0f, 389.32f, 0, 1, false, 0)) {
+		Actor_Set_Goal_Number(kActorGordo, 215);
 	}
 	return false;
 }
 
 bool SceneScriptNR02::ClickedOnItem(int itemId, bool a2) {
-	if ((itemId == 89 || itemId == 90) && !Loop_Actor_Walk_To_XYZ(0, 109.38f, -24.0f, 420.5f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 423, false);
+	if ((itemId == 89 || itemId == 90) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 109.38f, -24.0f, 420.5f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 423, false);
 		if (itemId == 89) {
 			Item_Remove_From_World(89);
 			Item_Pickup_Spin_Effect(953, 214, 380);
-			Actor_Clue_Acquire(0, 105, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighter1, 1, -1);
 		}
 		if (itemId == 90) {
 			Item_Remove_From_World(90);
 			Item_Pickup_Spin_Effect(954, 214, 380);
-			Actor_Clue_Acquire(0, 106, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueGordosLighter2, 1, -1);
 		}
 	}
 	return false;
@@ -122,8 +122,8 @@ bool SceneScriptNR02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -283.0f, -24.0f, 326.0f, 0, 1, false, 0)) {
-			if (Actor_Query_Goal_Number(2) < 230 || Actor_Query_Goal_Number(2) > 250) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -283.0f, -24.0f, 326.0f, 0, 1, false, 0)) {
+			if (Actor_Query_Goal_Number(kActorGordo) < 230 || Actor_Query_Goal_Number(kActorGordo) > 250) {
 				Music_Stop(2);
 			}
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
@@ -141,7 +141,7 @@ bool SceneScriptNR02::ClickedOn2DRegion(int region) {
 }
 
 void SceneScriptNR02::SceneFrameAdvanced(int frame) {
-	if (!Music_Is_Playing() && (Actor_Query_Goal_Number(2) < 210 || Actor_Query_Goal_Number(2) > 222)) {
+	if (!Music_Is_Playing() && (Actor_Query_Goal_Number(kActorGordo) < 210 || Actor_Query_Goal_Number(kActorGordo) > 222)) {
 		sub_402134();
 	}
 	//return false;
@@ -151,45 +151,45 @@ void SceneScriptNR02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptNR02::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(2) == 211) {
-		Actor_Set_Goal_Number(2, 220);
+	if (Actor_Query_Goal_Number(kActorGordo) == 211) {
+		Actor_Set_Goal_Number(kActorGordo, 220);
 	}
-	if (Actor_Query_Goal_Number(2) == 204) {
-		Actor_Set_Goal_Number(2, 205);
+	if (Actor_Query_Goal_Number(kActorGordo) == 204) {
+		Actor_Set_Goal_Number(kActorGordo, 205);
 	}
-	if (Actor_Query_Goal_Number(2) == 206) {
-		Actor_Set_Goal_Number(2, 205);
+	if (Actor_Query_Goal_Number(kActorGordo) == 206) {
+		Actor_Set_Goal_Number(kActorGordo, 205);
 	}
-	Loop_Actor_Walk_To_XYZ(0, -203.0f, -24.0f, 334.0f, 0, 0, false, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -203.0f, -24.0f, 334.0f, 0, 0, false, 0);
 	//return false;
 }
 
 void SceneScriptNR02::PlayerWalkedOut() {
 	Music_Stop(2);
-	if (Actor_Query_Goal_Number(2) < 210 && Actor_Query_Goal_Number(2) >= 205) {
-		Actor_Set_Goal_Number(2, 204);
+	if (Actor_Query_Goal_Number(kActorGordo) < 210 && Actor_Query_Goal_Number(kActorGordo) >= 205) {
+		Actor_Set_Goal_Number(kActorGordo, 204);
 	}
 }
 
 void SceneScriptNR02::DialogueQueueFlushed(int a1) {
-	if (Player_Query_Current_Scene() == 55 && Actor_Query_Goal_Number(2) == 206) {
+	if (Player_Query_Current_Scene() == 55 && Actor_Query_Goal_Number(kActorGordo) == 206) {
 		Sound_Play(575, 50, 0, 0, 50);
 		Sound_Play(321, 50, 0, 0, 50);
 	}
-	if (Player_Query_Current_Scene() == 55 && Actor_Query_Goal_Number(2) == 207) {
+	if (Player_Query_Current_Scene() == 55 && Actor_Query_Goal_Number(kActorGordo) == 207) {
 		Sound_Play(576, 50, 0, 0, 50);
 		Sound_Play(323, 50, 0, 0, 50);
 	}
-	if (Player_Query_Current_Scene() == 55 && Actor_Query_Goal_Number(2) == 208) {
+	if (Player_Query_Current_Scene() == 55 && Actor_Query_Goal_Number(kActorGordo) == 208) {
 		Sound_Play(579, 50, 0, 0, 50);
 		Sound_Play(324, 50, 0, 0, 50);
 	}
-	if (Player_Query_Current_Scene() == 55 && Actor_Query_Goal_Number(2) > 205 && Actor_Query_Goal_Number(2) < 210) {
-		Actor_Set_Goal_Number(2, 205);
+	if (Player_Query_Current_Scene() == 55 && Actor_Query_Goal_Number(kActorGordo) > 205 && Actor_Query_Goal_Number(kActorGordo) < 210) {
+		Actor_Set_Goal_Number(kActorGordo, 205);
 		//return true;
 		return;
-	} else if (Actor_Query_Goal_Number(2) > 205 && Actor_Query_Goal_Number(2) < 210) {
-		Actor_Set_Goal_Number(2, 204);
+	} else if (Actor_Query_Goal_Number(kActorGordo) > 205 && Actor_Query_Goal_Number(kActorGordo) < 210) {
+		Actor_Set_Goal_Number(kActorGordo, 204);
 		//return true;
 		return;
 	}
diff --git a/engines/bladerunner/script/scene/nr03.cpp b/engines/bladerunner/script/scene/nr03.cpp
index 6052f6bb55..0ceb8e548e 100644
--- a/engines/bladerunner/script/scene/nr03.cpp
+++ b/engines/bladerunner/script/scene/nr03.cpp
@@ -66,12 +66,12 @@ void SceneScriptNR03::InitializeScene() {
 			Scene_Loop_Set_Default(0);
 		}
 	} else {
-		Actor_Set_Goal_Number(4, 201);
+		Actor_Set_Goal_Number(kActorGuzza, 201);
 		Scene_Loop_Start_Special(0, 2, 0);
 		Scene_Loop_Set_Default(0);
 	}
-	if (Actor_Query_Goal_Number(25) > 209 && Actor_Query_Goal_Number(25) < 215) {
-		Actor_Set_Goal_Number(25, 215);
+	if (Actor_Query_Goal_Number(kActorHanoi) > 209 && Actor_Query_Goal_Number(kActorHanoi) < 215) {
+		Actor_Set_Goal_Number(kActorHanoi, 215);
 	}
 }
 
@@ -93,29 +93,29 @@ bool SceneScriptNR03::MouseClick(int x, int y) {
 
 bool SceneScriptNR03::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("PG3", objectName)) {
-		Actor_Face_Object(0, "PG3", true);
-		Actor_Voice_Over(3770, 99);
+		Actor_Face_Object(kActorMcCoy, "PG3", true);
+		Actor_Voice_Over(3770, kActorVoiceOver);
 		return true;
 	}
 	return false;
 }
 
 bool SceneScriptNR03::ClickedOnActor(int actorId) {
-	if (actorId == 25 && !Loop_Actor_Walk_To_Actor(0, 25, 48, 1, false)) {
-		AI_Movement_Track_Pause(25);
-		Actor_Face_Actor(0, 25, true);
+	if (actorId == 25 && !Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorHanoi, 48, 1, false)) {
+		AI_Movement_Track_Pause(kActorHanoi);
+		Actor_Face_Actor(kActorMcCoy, kActorHanoi, true);
 		if (Game_Flag_Query(611)) {
-			Actor_Says(0, 3350, 16);
-			Actor_Says(25, 50, 17);
+			Actor_Says(kActorMcCoy, 3350, 16);
+			Actor_Says(kActorHanoi, 50, 17);
 		} else {
 			Game_Flag_Set(611);
-			Actor_Says(0, 3340, 3);
-			Actor_Face_Actor(25, 0, true);
-			Actor_Says(25, 30, 13);
-			Actor_Says(0, 3345, 14);
-			Actor_Says(25, 40, 14);
+			Actor_Says(kActorMcCoy, 3340, 3);
+			Actor_Face_Actor(kActorHanoi, kActorMcCoy, true);
+			Actor_Says(kActorHanoi, 30, 13);
+			Actor_Says(kActorMcCoy, 3345, 14);
+			Actor_Says(kActorHanoi, 40, 14);
 		}
-		AI_Movement_Track_Unpause(25);
+		AI_Movement_Track_Unpause(kActorHanoi);
 		return true;
 	}
 	return false;
@@ -127,7 +127,7 @@ bool SceneScriptNR03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 410.0f, -70.19f, -715.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 410.0f, -70.19f, -715.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(534);
@@ -136,20 +136,20 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -161.0f, -70.19f, -1139.0f, 0, 1, false, 0)) {
-			if (Actor_Query_Which_Set_In(25) == 55) {
-				AI_Movement_Track_Pause(25);
-				Actor_Face_Actor(25, 0, true);
-				Actor_Face_Actor(0, 25, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -161.0f, -70.19f, -1139.0f, 0, 1, false, 0)) {
+			if (Actor_Query_Which_Set_In(kActorHanoi) == 55) {
+				AI_Movement_Track_Pause(kActorHanoi);
+				Actor_Face_Actor(kActorHanoi, kActorMcCoy, true);
+				Actor_Face_Actor(kActorMcCoy, kActorHanoi, true);
 				int v3 = Global_Variable_Query(44);
 				if (v3 == 0) {
-					Actor_Says(25, 50, 13);
-					AI_Movement_Track_Unpause(25);
+					Actor_Says(kActorHanoi, 50, 13);
+					AI_Movement_Track_Unpause(kActorHanoi);
 				} else if (v3 == 1) {
-					Actor_Says(25, 210, 15);
-					AI_Movement_Track_Unpause(25);
+					Actor_Says(kActorHanoi, 210, 15);
+					AI_Movement_Track_Unpause(kActorHanoi);
 				} else if (v3 == 2) {
-					Actor_Set_Goal_Number(25, 220);
+					Actor_Set_Goal_Number(kActorHanoi, 220);
 				}
 			}
 			Global_Variable_Increment(44, 1);
@@ -163,13 +163,13 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -151.0f, -70.19f, -476.0f, 12, 1, false, 0)) {
-			if (Actor_Query_Goal_Number(25) == 213 || Actor_Query_Which_Set_In(25) != 55) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -151.0f, -70.19f, -476.0f, 12, 1, false, 0)) {
+			if (Actor_Query_Goal_Number(kActorHanoi) == 213 || Actor_Query_Which_Set_In(kActorHanoi) != 55) {
 				Player_Loses_Control();
 				Player_Set_Combat_Mode(false);
-				Loop_Actor_Walk_To_XYZ(0, -229.0f, -70.19f, -469.0f, 0, 0, false, 1);
-				Actor_Face_Heading(0, 656, false);
-				Actor_Change_Animation_Mode(0, 53);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -229.0f, -70.19f, -469.0f, 0, 0, false, 1);
+				Actor_Face_Heading(kActorMcCoy, 656, false);
+				Actor_Change_Animation_Mode(kActorMcCoy, 53);
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Game_Flag_Set(536);
@@ -177,26 +177,26 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
 				Scene_Loop_Start_Special(1, 2, 0);
 				return true;
 			}
-			Actor_Face_Heading(0, 680, false);
-			Actor_Change_Animation_Mode(0, 12);
+			Actor_Face_Heading(kActorMcCoy, 680, false);
+			Actor_Change_Animation_Mode(kActorMcCoy, 12);
 			Delay(150);
-			Actor_Change_Animation_Mode(0, 0);
-			AI_Movement_Track_Pause(25);
-			Actor_Face_Actor(25, 0, true);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
+			AI_Movement_Track_Pause(kActorHanoi);
+			Actor_Face_Actor(kActorHanoi, kActorMcCoy, true);
 
 			int v1 = Global_Variable_Query(43);
 			if (v1 == 0) {
-				Actor_Says(25, 0, 15);
-				Actor_Face_Actor(0, 25, true);
-				Actor_Says(0, 3335, 13);
-				Actor_Says(25, 10, 16);
-				AI_Movement_Track_Unpause(25);
+				Actor_Says(kActorHanoi, 0, 15);
+				Actor_Face_Actor(kActorMcCoy, kActorHanoi, true);
+				Actor_Says(kActorMcCoy, 3335, 13);
+				Actor_Says(kActorHanoi, 10, 16);
+				AI_Movement_Track_Unpause(kActorHanoi);
 			} else if (v1 == 1) {
-				Actor_Face_Actor(0, 25, true);
-				Actor_Says(25, 210, 12);
-				AI_Movement_Track_Unpause(25);
+				Actor_Face_Actor(kActorMcCoy, kActorHanoi, true);
+				Actor_Says(kActorHanoi, 210, 12);
+				AI_Movement_Track_Unpause(kActorHanoi);
 			} else if (v1 == 2) {
-				Actor_Set_Goal_Number(25, 220);
+				Actor_Set_Goal_Number(kActorHanoi, 220);
 			}
 			Global_Variable_Increment(43, 1);
 		}
@@ -207,17 +207,17 @@ bool SceneScriptNR03::ClickedOnExit(int exitId) {
 
 bool SceneScriptNR03::ClickedOn2DRegion(int region) {
 	if (region == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 79.2f, -70.19f, -984.0f, 12, 1, false, 0)) {
-			Actor_Face_Actor(0, 47, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 79.2f, -70.19f, -984.0f, 12, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorHysteriaPatron1, true);
 			int v1 = Random_Query(0, 4);
 			if (v1 == 0) {
-				Actor_Says(0, 1055, 3);
+				Actor_Says(kActorMcCoy, 1055, 3);
 			} else if (v1 == 1) {
-				Actor_Says(0, 8590, 3);
+				Actor_Says(kActorMcCoy, 8590, 3);
 			} else if (v1 == 2) {
-				Actor_Says(0, 8930, 3);
+				Actor_Says(kActorMcCoy, 8930, 3);
 			} else if (v1 == 3) {
-				Actor_Says(0, 7465, 3);
+				Actor_Says(kActorMcCoy, 7465, 3);
 			}
 		}
 		return true;
@@ -242,10 +242,10 @@ void SceneScriptNR03::SceneFrameAdvanced(int frame) {
 			//return false;
 			return;
 		}
-		if (Actor_Query_Goal_Number(4) == 201) {
-			Actor_Set_Goal_Number(4, 200);
+		if (Actor_Query_Goal_Number(kActorGuzza) == 201) {
+			Actor_Set_Goal_Number(kActorGuzza, 200);
 		} else if (!Game_Flag_Query(536)) {
-			Actor_Set_Goal_Number(0, 200);
+			Actor_Set_Goal_Number(kActorMcCoy, 200);
 			Player_Gains_Control();
 		}
 	}
@@ -260,19 +260,19 @@ void SceneScriptNR03::PlayerWalkedIn() {
 	Player_Set_Combat_Mode(false);
 	if (Game_Flag_Query(573)) {
 		if (Game_Flag_Query(535) ) {
-			Loop_Actor_Walk_To_XYZ(0, 302.0f, -70.19f, -715.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 302.0f, -70.19f, -715.0f, 0, 0, false, 0);
 			Game_Flag_Reset(535);
 		}
 	} else {
 		Game_Flag_Set(573);
-		Async_Actor_Walk_To_XYZ(0, 206.0f, -70.19f, -643.0f, 0, false);
+		Async_Actor_Walk_To_XYZ(kActorMcCoy, 206.0f, -70.19f, -643.0f, 0, false);
 		Game_Flag_Reset(535);
-		Actor_Voice_Over(1490, 99);
-		Actor_Voice_Over(1510, 99);
-		Actor_Voice_Over(1520, 99);
+		Actor_Voice_Over(1490, kActorVoiceOver);
+		Actor_Voice_Over(1510, kActorVoiceOver);
+		Actor_Voice_Over(1520, kActorVoiceOver);
 	}
 	if (Player_Query_Combat_Mode()) {
-		Actor_Set_Goal_Number(25, 220);
+		Actor_Set_Goal_Number(kActorHanoi, 220);
 	}
 	//return false;
 }
@@ -295,7 +295,7 @@ void SceneScriptNR03::sub_40259C(int frame) {
 
 	angle = cos((frame - 70) * (M_PI / 40.0f)) * M_PI_2;
 	invertedAngle = M_PI - angle;
-	if (!Game_Flag_Query(536) && Actor_Query_Goal_Number(4) != 201) {
+	if (!Game_Flag_Query(536) && Actor_Query_Goal_Number(kActorGuzza) != 201) {
 		angle = angle + M_PI;
 		invertedAngle = invertedAngle + M_PI;
 	}
@@ -304,7 +304,7 @@ void SceneScriptNR03::sub_40259C(int frame) {
 	float x = 36.49f * s - -60.21f * c + -265.49f;
 	float z = -60.21f * s + 36.49f * c + -408.79f;
 
-	if (Actor_Query_Goal_Number(4) == 201) {
+	if (Actor_Query_Goal_Number(kActorGuzza) == 201) {
 		facing = angle * (512.0f / M_PI);
 		facing = facing + 144;
 		if (facing < 0) {
@@ -313,7 +313,7 @@ void SceneScriptNR03::sub_40259C(int frame) {
 		if (facing > 1023) {
 			facing -= 1024;
 		}
-		Actor_Set_At_XYZ(4, x, -70.19f, z, facing);
+		Actor_Set_At_XYZ(kActorGuzza, x, -70.19f, z, facing);
 	} else {
 		facing = angle * (512.0f / M_PI);
 		facing = facing + 400;
@@ -324,7 +324,7 @@ void SceneScriptNR03::sub_40259C(int frame) {
 			facing -= 1024;
 		}
 
-		Actor_Set_At_XYZ(0, x, -70.19f, z, facing);
+		Actor_Set_At_XYZ(kActorMcCoy, x, -70.19f, z, facing);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/nr04.cpp b/engines/bladerunner/script/scene/nr04.cpp
index 6fdf18efbe..1d8446f41f 100644
--- a/engines/bladerunner/script/scene/nr04.cpp
+++ b/engines/bladerunner/script/scene/nr04.cpp
@@ -62,11 +62,11 @@ void SceneScriptNR04::SceneLoaded() {
 }
 
 bool SceneScriptNR04::MouseClick(int x, int y) {
-	if (Actor_Query_Animation_Mode(0) == 85 || Actor_Query_Animation_Mode(0) == 29) {
+	if (Actor_Query_Animation_Mode(kActorMcCoy) == 85 || Actor_Query_Animation_Mode(kActorMcCoy) == 29) {
 		return true;
 	}
-	if (Actor_Query_Animation_Mode(0) == 53) {
-		Actor_Change_Animation_Mode(0, 29);
+	if (Actor_Query_Animation_Mode(kActorMcCoy) == 53) {
+		Actor_Change_Animation_Mode(kActorMcCoy, 29);
 		return true;
 	}
 	return false;
@@ -74,54 +74,54 @@ bool SceneScriptNR04::MouseClick(int x, int y) {
 
 bool SceneScriptNR04::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("B.TV01", objectName) || Object_Query_Click("B.TV02", objectName) || Object_Query_Click("B.TV03", objectName) || Object_Query_Click("B.TV05", objectName) || Object_Query_Click("DESK", objectName)) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 546, 0, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 546, 0, 1, false)) {
 			if (!Object_Query_Click("DESK", objectName)) {
-				Actor_Face_Object(0, "B.TV01", true);
-				Actor_Voice_Over(1530, 99);
-				Actor_Voice_Over(1540, 99);
-				Actor_Voice_Over(1550, 99);
+				Actor_Face_Object(kActorMcCoy, "B.TV01", true);
+				Actor_Voice_Over(1530, kActorVoiceOver);
+				Actor_Voice_Over(1540, kActorVoiceOver);
+				Actor_Voice_Over(1550, kActorVoiceOver);
 			} else {
-				Actor_Face_Object(0, "DESK", true);
-				if (!Actor_Clue_Query(0, 56)) {
-					Actor_Voice_Over(1600, 99);
-					Actor_Voice_Over(1610, 99);
-				} else if (Actor_Clue_Query(0, 100)) {
-					Actor_Says(0, 8580, 3);
+				Actor_Face_Object(kActorMcCoy, "DESK", true);
+				if (!Actor_Clue_Query(kActorMcCoy, kCluePeruvianLadyInterview)) {
+					Actor_Voice_Over(1600, kActorVoiceOver);
+					Actor_Voice_Over(1610, kActorVoiceOver);
+				} else if (Actor_Clue_Query(kActorMcCoy, kClueCollectionReceipt)) {
+					Actor_Says(kActorMcCoy, 8580, 3);
 				} else {
-					Actor_Clue_Acquire(0, 100, 0, -1);
+					Actor_Clue_Acquire(kActorMcCoy, kClueCollectionReceipt, 0, -1);
 					Item_Pickup_Spin_Effect(961, 247, 141);
-					Actor_Voice_Over(1560, 99);
-					Actor_Voice_Over(1570, 99);
-					Actor_Voice_Over(1580, 99);
-					Actor_Voice_Over(1590, 99);
+					Actor_Voice_Over(1560, kActorVoiceOver);
+					Actor_Voice_Over(1570, kActorVoiceOver);
+					Actor_Voice_Over(1580, kActorVoiceOver);
+					Actor_Voice_Over(1590, kActorVoiceOver);
 				}
 
 			}
 		}
 	} else if (Object_Query_Click("TORUS01", objectName)
-		&& !Loop_Actor_Walk_To_XYZ(0, 18.56f, 0.0f, 38.86f, 0, 1, false, 0)
+		&& !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 18.56f, 0.0f, 38.86f, 0, 1, false, 0)
 		&& !Game_Flag_Query(605)) {
 		Unclickable_Object("TORUS01");
 		Scene_Exits_Disable();
 		Player_Loses_Control();
 		Game_Flag_Set(605);
-		Actor_Face_Object(0, "TORUS01", true);
+		Actor_Face_Object(kActorMcCoy, "TORUS01", true);
 		Item_Pickup_Spin_Effect(975, 358, 160);
-		Actor_Voice_Over(1620, 99);
-		Actor_Voice_Over(1630, 99);
-		Actor_Clue_Acquire(0, 89, 0, -1);
-		Actor_Set_Goal_Number(18, 201);
+		Actor_Voice_Over(1620, kActorVoiceOver);
+		Actor_Voice_Over(1630, kActorVoiceOver);
+		Actor_Clue_Acquire(kActorMcCoy, kClueEarlyQsClub, 0, -1);
+		Actor_Set_Goal_Number(kActorEarlyQ, 201);
 	}
 	return false;
 }
 
 bool SceneScriptNR04::ClickedOnActor(int actorId) {
 	if (actorId == 18 && Game_Flag_Query(606)) {
-		Actor_Voice_Over(1640, 99);
-		Actor_Voice_Over(1650, 99);
-		Actor_Voice_Over(1660, 99);
-		Actor_Voice_Over(1670, 99);
-		Actor_Voice_Over(1680, 99);
+		Actor_Voice_Over(1640, kActorVoiceOver);
+		Actor_Voice_Over(1650, kActorVoiceOver);
+		Actor_Voice_Over(1660, kActorVoiceOver);
+		Actor_Voice_Over(1670, kActorVoiceOver);
+		Actor_Voice_Over(1680, kActorVoiceOver);
 		return true;
 	}
 	return false;
@@ -133,7 +133,7 @@ bool SceneScriptNR04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 45.0f, 0.0f, -106.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 45.0f, 0.0f, -106.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(437);
@@ -145,21 +145,21 @@ bool SceneScriptNR04::ClickedOnExit(int exitId) {
 }
 
 bool SceneScriptNR04::ClickedOn2DRegion(int region) {
-	if ((region == 0 || region == 1 || region == 2) && Actor_Query_Which_Set_In(18) != 12 && Actor_Query_Animation_Mode(0) != 53 && !Loop_Actor_Walk_To_Waypoint(0, 445, 0, 1, false)) {
-		Actor_Face_Heading(0, 49, false);
-		Actor_Change_Animation_Mode(0, 85);
+	if ((region == 0 || region == 1 || region == 2) && Actor_Query_Which_Set_In(kActorEarlyQ) != 12 && Actor_Query_Animation_Mode(kActorMcCoy) != 53 && !Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 445, 0, 1, false)) {
+		Actor_Face_Heading(kActorMcCoy, 49, false);
+		Actor_Change_Animation_Mode(kActorMcCoy, 85);
 		Delay(2500);
 		if (Game_Flag_Query(606) == 1) {
 			return true;
 		}
 		if (Game_Flag_Query(374)) {
 			Player_Loses_Control();
-			Actor_Voice_Over(4180, 99);
-			Actor_Change_Animation_Mode(0, 48);
+			Actor_Voice_Over(4180, kActorVoiceOver);
+			Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			Ambient_Sounds_Play_Sound(555, 90, 99, 0, 0);
 			Delay(350);
-			Actor_Set_At_XYZ(0, 109.0f, 0.0f, 374.0f, 0);
-			Actor_Retired_Here(0, 12, 12, 1, -1);
+			Actor_Set_At_XYZ(kActorMcCoy, 109.0f, 0.0f, 374.0f, 0);
+			Actor_Retired_Here(kActorMcCoy, 12, 12, 1, -1);
 		}
 		return true;
 	}
@@ -183,74 +183,74 @@ void SceneScriptNR04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 	if (actorId == 18) {
 		switch (newGoal) {
 		case 214:
-			Actor_Change_Animation_Mode(18, 29);
+			Actor_Change_Animation_Mode(kActorEarlyQ, 29);
 			Delay(2500);
-			Actor_Says(18, 290, 3);
+			Actor_Says(kActorEarlyQ, 290, 3);
 			sub_401DB0();
 			//return true;			
 			break;
 		case 213:
-			Actor_Clue_Acquire(0, 88, 0, 18);
+			Actor_Clue_Acquire(kActorMcCoy, kClueDektorasDressingRoom, 0, kActorEarlyQ);
 			Item_Pickup_Spin_Effect(984, 200, 160);
-			Actor_Says(18, 200, 30);
-			Actor_Says(18, 210, 30);
-			Actor_Says(18, 220, 30);
-			Actor_Says_With_Pause(0, 3425, 1.5f, 23);
-			Actor_Says(0, 3430, 3);
-			Actor_Says(18, 240, 30);
-			Actor_Says(0, 3435, 3);
-			Actor_Says(18, 250, 30);
-			Actor_Says(0, 3440, 3);
-			Actor_Says(18, 280, 30);
-			Actor_Says(0, 3445, 3);
-			Actor_Set_Goal_Number(18, 214);
+			Actor_Says(kActorEarlyQ, 200, 30);
+			Actor_Says(kActorEarlyQ, 210, 30);
+			Actor_Says(kActorEarlyQ, 220, 30);
+			Actor_Says_With_Pause(kActorMcCoy, 3425, 1.5f, 23);
+			Actor_Says(kActorMcCoy, 3430, 3);
+			Actor_Says(kActorEarlyQ, 240, 30);
+			Actor_Says(kActorMcCoy, 3435, 3);
+			Actor_Says(kActorEarlyQ, 250, 30);
+			Actor_Says(kActorMcCoy, 3440, 3);
+			Actor_Says(kActorEarlyQ, 280, 30);
+			Actor_Says(kActorMcCoy, 3445, 3);
+			Actor_Set_Goal_Number(kActorEarlyQ, 214);
 			//return true;
 			break;
 		case 209:
-			Actor_Face_Actor(0, 18, true);
+			Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true);
 			Delay(3000);
-			Actor_Says(18, 170, 30);
-			Actor_Says(0, 3415, 3);
-			Actor_Says(18, 180, 30);
-			Actor_Says_With_Pause(0, 3420, 1.5f, 3);
-			Actor_Says(18, 190, 30);
-			Actor_Set_Goal_Number(18, 211);
+			Actor_Says(kActorEarlyQ, 170, 30);
+			Actor_Says(kActorMcCoy, 3415, 3);
+			Actor_Says(kActorEarlyQ, 180, 30);
+			Actor_Says_With_Pause(kActorMcCoy, 3420, 1.5f, 3);
+			Actor_Says(kActorEarlyQ, 190, 30);
+			Actor_Set_Goal_Number(kActorEarlyQ, 211);
 			//return true;
 			break;
 		case 207:
-			Loop_Actor_Walk_To_Waypoint(18, 445, 0, 1, false);
-			Actor_Face_Heading(18, 49, false);
-			Actor_Change_Animation_Mode(18, 85);
-			Actor_Face_Actor(0, 18, true);
-			Actor_Set_Goal_Number(18, 208);
-			Actor_Clue_Acquire(0, 92, 0, 18);
+			Loop_Actor_Walk_To_Waypoint(kActorEarlyQ, 445, 0, 1, false);
+			Actor_Face_Heading(kActorEarlyQ, 49, false);
+			Actor_Change_Animation_Mode(kActorEarlyQ, 85);
+			Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true);
+			Actor_Set_Goal_Number(kActorEarlyQ, 208);
+			Actor_Clue_Acquire(kActorMcCoy, kClueEarlyQInterview, 0, kActorEarlyQ);
 			//return true;
 			break;
 		case 204:
-			Actor_Face_Actor(0, 18, true);
-			Actor_Says(18, 90, 73);
-			Actor_Says(0, 3390, 3);
-			Actor_Face_Actor(18, 0, true);
-			Actor_Says(18, 110, 74);
-			Actor_Says(0, 3385, 3);
-			Actor_Says(18, 120, 74);
-			Actor_Face_Actor(18, 0, true);
-			Actor_Set_Goal_Number(18, 205);
+			Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true);
+			Actor_Says(kActorEarlyQ, 90, 73);
+			Actor_Says(kActorMcCoy, 3390, 3);
+			Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true);
+			Actor_Says(kActorEarlyQ, 110, 74);
+			Actor_Says(kActorMcCoy, 3385, 3);
+			Actor_Says(kActorEarlyQ, 120, 74);
+			Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true);
+			Actor_Set_Goal_Number(kActorEarlyQ, 205);
 			//return true;
 			break;
 		case 202:
-			Actor_Face_Actor(18, 0, true);
-			Actor_Face_Actor(0, 18, true);
-			Actor_Says(18, 30, 3);
-			Actor_Says(0, 3375, 3);
-			Actor_Says_With_Pause(18, 50, 1.5f, 3);
-			Actor_Says(18, 60, 3);
-			Actor_Says_With_Pause(0, 3380, 1.0f, 3);
-			Actor_Says(18, 70, 3);
-			Actor_Says(0, 3415, 3);
-			Actor_Says(18, 80, 3);
+			Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true);
+			Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true);
+			Actor_Says(kActorEarlyQ, 30, 3);
+			Actor_Says(kActorMcCoy, 3375, 3);
+			Actor_Says_With_Pause(kActorEarlyQ, 50, 1.5f, 3);
+			Actor_Says(kActorEarlyQ, 60, 3);
+			Actor_Says_With_Pause(kActorMcCoy, 3380, 1.0f, 3);
+			Actor_Says(kActorEarlyQ, 70, 3);
+			Actor_Says(kActorMcCoy, 3415, 3);
+			Actor_Says(kActorEarlyQ, 80, 3);
 			Player_Gains_Control();
-			Actor_Set_Goal_Number(18, 203);
+			Actor_Set_Goal_Number(kActorEarlyQ, 203);
 			//return true;
 			break;
 		}
@@ -259,7 +259,7 @@ void SceneScriptNR04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptNR04::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_XYZ(0, 53.0f, 0.0f, -26.0f, 0, 0, false, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 53.0f, 0.0f, -26.0f, 0, 0, false, 0);
 	if (Game_Flag_Query(374)) {
 		Overlay_Play("nr04over", 0, 1, 0, 0);
 		Delay(4000);
@@ -282,30 +282,30 @@ void SceneScriptNR04::sub_401DB0() {
 	int answer = Dialogue_Menu_Query_Input();
 	Dialogue_Menu_Disappear();
 	if (answer == 1530) {
-		Loop_Actor_Walk_To_Actor(18, 0, 36, 0, false);
-		Actor_Change_Animation_Mode(0, 23);
-		Actor_Change_Animation_Mode(18, 23);
+		Loop_Actor_Walk_To_Actor(kActorEarlyQ, kActorMcCoy, 36, 0, false);
+		Actor_Change_Animation_Mode(kActorMcCoy, 23);
+		Actor_Change_Animation_Mode(kActorEarlyQ, 23);
 		Delay(1500);
-		Actor_Says(18, 300, 3);
-		Actor_Change_Animation_Mode(0, 0);
-		Actor_Change_Animation_Mode(18, 0);
-		Actor_Says(18, 310, 3);
-		ADQ_Add(0, 3450, 3);
-		Actor_Set_Targetable(18, false);
-		Actor_Set_Goal_Number(18, 217);
-		Actor_Clue_Lose(0, 89);
+		Actor_Says(kActorEarlyQ, 300, 3);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
+		Actor_Change_Animation_Mode(kActorEarlyQ, 0);
+		Actor_Says(kActorEarlyQ, 310, 3);
+		ADQ_Add(kActorMcCoy, 3450, 3);
+		Actor_Set_Targetable(kActorEarlyQ, false);
+		Actor_Set_Goal_Number(kActorEarlyQ, 217);
+		Actor_Clue_Lose(kActorMcCoy, kClueEarlyQsClub);
 		Scene_Exits_Enable();
 	} else if (answer == 1540) {
-		Actor_Says(0, 8512, 15);
-		Actor_Says(18, 320, 12);
-		Actor_Says(0, 3455, 13);
-		Actor_Says(18, 330, 15);
-		Actor_Says(0, 3460, 12);
-		Actor_Says(18, 340, 12);
-		Actor_Says(0, 3465, 12);
-		Actor_Says(18, 350, 16);
-		Actor_Set_Targetable(18, false);
-		Actor_Set_Goal_Number(18, 217);
+		Actor_Says(kActorMcCoy, 8512, 15);
+		Actor_Says(kActorEarlyQ, 320, 12);
+		Actor_Says(kActorMcCoy, 3455, 13);
+		Actor_Says(kActorEarlyQ, 330, 15);
+		Actor_Says(kActorMcCoy, 3460, 12);
+		Actor_Says(kActorEarlyQ, 340, 12);
+		Actor_Says(kActorMcCoy, 3465, 12);
+		Actor_Says(kActorEarlyQ, 350, 16);
+		Actor_Set_Targetable(kActorEarlyQ, false);
+		Actor_Set_Goal_Number(kActorEarlyQ, 217);
 		Scene_Exits_Enable();
 	}
 }
diff --git a/engines/bladerunner/script/scene/nr05.cpp b/engines/bladerunner/script/scene/nr05.cpp
index 1459077258..2fa72c2fcd 100644
--- a/engines/bladerunner/script/scene/nr05.cpp
+++ b/engines/bladerunner/script/scene/nr05.cpp
@@ -89,18 +89,18 @@ bool SceneScriptNR05::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptNR05::ClickedOnActor(int actorId) {
-	if (actorId == 42) {
-		if (!Loop_Actor_Walk_To_Actor(0, 42, 120, 1, false)) {
+	if (actorId == kActorEarlyQBartender) {
+		if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorEarlyQBartender, 120, 1, false)) {
 			sub_4020B4();
 		}
 		return true;
 	}
-	if (actorId == 18) {
-		Actor_Set_Goal_Number(18, 229);
-		if (!Loop_Actor_Walk_To_Actor(0, 18, 36, 1, false)) {
+	if (actorId == kActorEarlyQ) {
+		Actor_Set_Goal_Number(kActorEarlyQ, 229);
+		if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorEarlyQ, 36, 1, false)) {
 			sub_4022DC();
 		}
-		Actor_Set_Goal_Number(18, 221);
+		Actor_Set_Goal_Number(kActorEarlyQ, 221);
 		return true;
 	}
 	return false;
@@ -112,12 +112,12 @@ bool SceneScriptNR05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -444.0f, 0.0f, -451.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -444.0f, 0.0f, -451.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
 			Music_Stop(2);
 			Player_Set_Combat_Mode(false);
-			Actor_Face_Heading(0, 1021, false);
-			Actor_Change_Animation_Mode(0, 53);
+			Actor_Face_Heading(kActorMcCoy, 1021, false);
+			Actor_Change_Animation_Mode(kActorMcCoy, 53);
 			Game_Flag_Set(537);
 			Set_Enter(55, 56);
 			Scene_Loop_Start_Special(1, 3, 0);
@@ -125,7 +125,7 @@ bool SceneScriptNR05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -777.56f, 0.0f, -166.86f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -777.56f, 0.0f, -166.86f, 0, 1, false, 0)) {
 			Game_Flag_Set(546);
 			Set_Enter(13, 61);
 		}
@@ -150,8 +150,8 @@ void SceneScriptNR05::SceneFrameAdvanced(int frame) {
 	}
 	sub_402A48(48);
 	sub_402A48(0);
-	if (Actor_Query_Goal_Number(18) == 224) {
-		Actor_Set_Goal_Number(18, 225);
+	if (Actor_Query_Goal_Number(kActorEarlyQ) == 224) {
+		Actor_Set_Goal_Number(kActorEarlyQ, 225);
 		if (Player_Query_Current_Scene() == 58) {
 			Scene_Exit_Add_2D_Exit(1, 0, 0, 30, 479, 3);
 		}
@@ -159,7 +159,7 @@ void SceneScriptNR05::SceneFrameAdvanced(int frame) {
 	if (frame > 77 && frame <= 134) {
 		sub_401F74(frame - 13);
 		if (frame == 134 && !Game_Flag_Query(537)) {
-			Actor_Set_Goal_Number(0, 200);
+			Actor_Set_Goal_Number(kActorMcCoy, 200);
 		}
 		//return true;
 		return;
@@ -176,7 +176,7 @@ void SceneScriptNR05::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptNR05::PlayerWalkedIn() {
 	if (Game_Flag_Query(547)) {
 		Music_Stop(2);
-		Loop_Actor_Walk_To_XYZ(0, -697.56f, 0.0f, -174.86f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -697.56f, 0.0f, -174.86f, 0, 1, false, 0);
 		Game_Flag_Reset(547);
 	}
 	//	return false;
@@ -213,70 +213,70 @@ void SceneScriptNR05::sub_401F74(int frame) {
 	if (facing > 1023) {
 		facing -= 1024;
 	}
-	Actor_Set_At_XYZ(0, x, 0.0f, z, facing);
+	Actor_Set_At_XYZ(kActorMcCoy, x, 0.0f, z, facing);
 }
 
 void SceneScriptNR05::sub_4020B4() {
-	Actor_Face_Actor(0, 42, true);
-	Actor_Face_Actor(42, 0, true);
+	Actor_Face_Actor(kActorMcCoy, kActorEarlyQBartender, true);
+	Actor_Face_Actor(kActorEarlyQBartender, kActorMcCoy, true);
 	if (Game_Flag_Query(588)) {
 		if (Game_Flag_Query(589)) {
-			Actor_Says(0, 3480, 19);
-			Actor_Says(42, 30, 12);
-			Actor_Says(0, 3485, 3);
-			Actor_Says(42, 40, 13);
-			Actor_Change_Animation_Mode(42, 23);
-			Actor_Change_Animation_Mode(0, 75);
+			Actor_Says(kActorMcCoy, 3480, 19);
+			Actor_Says(kActorEarlyQBartender, 30, 12);
+			Actor_Says(kActorMcCoy, 3485, 3);
+			Actor_Says(kActorEarlyQBartender, 40, 13);
+			Actor_Change_Animation_Mode(kActorEarlyQBartender, 23);
+			Actor_Change_Animation_Mode(kActorMcCoy, 75);
 			Global_Variable_Increment(42, 1);
 		} else {
-			Actor_Says(0, 3475, 17);
-			Actor_Says(42, 20, 23);
+			Actor_Says(kActorMcCoy, 3475, 17);
+			Actor_Says(kActorEarlyQBartender, 20, 23);
 			Game_Flag_Set(589);
-			Actor_Change_Animation_Mode(0, 75);
+			Actor_Change_Animation_Mode(kActorMcCoy, 75);
 			Global_Variable_Increment(42, 1);
 		}
 	} else {
-		Actor_Says(42, 0, 13);
-		Actor_Says(0, 3470, 3);
-		Actor_Says(42, 10, 23);
+		Actor_Says(kActorEarlyQBartender, 0, 13);
+		Actor_Says(kActorMcCoy, 3470, 3);
+		Actor_Says(kActorEarlyQBartender, 10, 23);
 		Game_Flag_Set(588);
-		Actor_Change_Animation_Mode(0, 75);
+		Actor_Change_Animation_Mode(kActorMcCoy, 75);
 		Global_Variable_Increment(42, 1);
 	}
 }
 
 void SceneScriptNR05::sub_4022DC() {
-	if (Actor_Query_Goal_Number(18) == 220) {
-		Actor_Set_Goal_Number(18, 221);
+	if (Actor_Query_Goal_Number(kActorEarlyQ) == 220) {
+		Actor_Set_Goal_Number(kActorEarlyQ, 221);
 	}
-	Actor_Face_Actor(0, 18, true);
-	Actor_Face_Actor(18, 0, true);
+	Actor_Face_Actor(kActorMcCoy, kActorEarlyQ, true);
+	Actor_Face_Actor(kActorEarlyQ, kActorMcCoy, true);
 	if (!Game_Flag_Query(590)) {
-		Actor_Says(0, 8513, 3);
-		Actor_Says(18, 360, 3);
-		Actor_Says(0, 3495, 11);
-		Actor_Says(18, 370, 15);
-		Actor_Says(0, 3500, 17);
-		Actor_Says(18, 380, 13);
+		Actor_Says(kActorMcCoy, 8513, 3);
+		Actor_Says(kActorEarlyQ, 360, 3);
+		Actor_Says(kActorMcCoy, 3495, 11);
+		Actor_Says(kActorEarlyQ, 370, 15);
+		Actor_Says(kActorMcCoy, 3500, 17);
+		Actor_Says(kActorEarlyQ, 380, 13);
 		Game_Flag_Set(590);
 		return;
 	}
 	Dialogue_Menu_Clear_List();
-	if (Actor_Query_Friendliness_To_Other(18, 0) >= 48) {
-		if (Actor_Clue_Query(0, 90) || Actor_Clue_Query(0, 100)) {
+	if (Actor_Query_Friendliness_To_Other(kActorEarlyQ, kActorMcCoy) >= 48) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyCollection) || Actor_Clue_Query(kActorMcCoy, kClueCollectionReceipt)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(890, -1, 4, 8);
 		}
-		if (Actor_Clue_Query(0, 13)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueLucy)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(900, 5, 6, 5);
 		}
-		if (Actor_Clue_Query(0, 88)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueDektorasDressingRoom)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(910, 5, 5, 5);
 		}
 	}
 	if (!Dialogue_Menu_Query_List_Size()) {
-		Actor_Says(0, 3520, 3);
-		Actor_Says(18, 730, 3);
-		Actor_Face_Heading(18, 849, false);
+		Actor_Says(kActorMcCoy, 3520, 3);
+		Actor_Says(kActorEarlyQ, 730, 3);
+		Actor_Face_Heading(kActorEarlyQ, 849, false);
 		return;
 	}
 	Dialogue_Menu_Add_DONE_To_List(100);
@@ -284,48 +284,48 @@ void SceneScriptNR05::sub_4022DC() {
 	int answer = Dialogue_Menu_Query_Input();
 	Dialogue_Menu_Disappear();
 	if (answer == 890) {
-		Actor_Says(0, 3505, 3);
-		Actor_Modify_Friendliness_To_Other(18, 0, -1);
-		Actor_Says(18, 420, 12);
-		Actor_Says(18, 430, 13);
-		Actor_Says(0, 3530, 15);
-		Actor_Says(18, 440, 15);
-		Actor_Says(0, 3535, 13);
-		Actor_Says(18, 460, 16);
-		Actor_Says(0, 3540, 15);
-		Actor_Says(18, 490, 16);
-		Actor_Says(18, 500, 13);
-		Actor_Says(0, 3545, 15);
-		Actor_Says(18, 520, 12);
-		Actor_Face_Heading(18, 849, false);
+		Actor_Says(kActorMcCoy, 3505, 3);
+		Actor_Modify_Friendliness_To_Other(kActorEarlyQ, kActorMcCoy, -1);
+		Actor_Says(kActorEarlyQ, 420, 12);
+		Actor_Says(kActorEarlyQ, 430, 13);
+		Actor_Says(kActorMcCoy, 3530, 15);
+		Actor_Says(kActorEarlyQ, 440, 15);
+		Actor_Says(kActorMcCoy, 3535, 13);
+		Actor_Says(kActorEarlyQ, 460, 16);
+		Actor_Says(kActorMcCoy, 3540, 15);
+		Actor_Says(kActorEarlyQ, 490, 16);
+		Actor_Says(kActorEarlyQ, 500, 13);
+		Actor_Says(kActorMcCoy, 3545, 15);
+		Actor_Says(kActorEarlyQ, 520, 12);
+		Actor_Face_Heading(kActorEarlyQ, 849, false);
 	} else if (answer == 900) {
-		Actor_Says(0, 3510, 15);
-		Actor_Modify_Friendliness_To_Other(18, 0, -1);
-		Actor_Says_With_Pause(18, 530, 1.2f, 3);
-		Actor_Says(18, 540, 15);
-		Actor_Says(0, 3550, 13);
-		Actor_Says(18, 560, 14);
-		Actor_Says(18, 570, 13);
-		Actor_Says(0, 3555, 12);
-		Actor_Face_Heading(18, 849, false);
+		Actor_Says(kActorMcCoy, 3510, 15);
+		Actor_Modify_Friendliness_To_Other(kActorEarlyQ, kActorMcCoy, -1);
+		Actor_Says_With_Pause(kActorEarlyQ, 530, 1.2f, 3);
+		Actor_Says(kActorEarlyQ, 540, 15);
+		Actor_Says(kActorMcCoy, 3550, 13);
+		Actor_Says(kActorEarlyQ, 560, 14);
+		Actor_Says(kActorEarlyQ, 570, 13);
+		Actor_Says(kActorMcCoy, 3555, 12);
+		Actor_Face_Heading(kActorEarlyQ, 849, false);
 	} else if (answer == 910) {
-		Actor_Says(0, 3515, 14);
-		Actor_Modify_Friendliness_To_Other(18, 0, -1);
-		if (Actor_Clue_Query(0, 99)) {
-			Actor_Says(18, 580, 12);
-			Actor_Says(0, 3560, 13);
-			Actor_Says(18, 590, 16);
-			Actor_Says(0, 3565, 16);
-			Actor_Says(18, 600, 13);
-			Actor_Says(0, 3570, 14);
-			Actor_Says(18, 620, 15);
-			Actor_Says(0, 3575, 13);
+		Actor_Says(kActorMcCoy, 3515, 14);
+		Actor_Modify_Friendliness_To_Other(kActorEarlyQ, kActorMcCoy, -1);
+		if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote)) {
+			Actor_Says(kActorEarlyQ, 580, 12);
+			Actor_Says(kActorMcCoy, 3560, 13);
+			Actor_Says(kActorEarlyQ, 590, 16);
+			Actor_Says(kActorMcCoy, 3565, 16);
+			Actor_Says(kActorEarlyQ, 600, 13);
+			Actor_Says(kActorMcCoy, 3570, 14);
+			Actor_Says(kActorEarlyQ, 620, 15);
+			Actor_Says(kActorMcCoy, 3575, 13);
 		} else {
-			Actor_Says(18, 640, 13);
-			Actor_Says(0, 3580, 15);
-			Actor_Says(18, 660, 12);
+			Actor_Says(kActorEarlyQ, 640, 13);
+			Actor_Says(kActorMcCoy, 3580, 15);
+			Actor_Says(kActorEarlyQ, 660, 12);
 		}
-		Actor_Face_Heading(18, 849, false);
+		Actor_Face_Heading(kActorEarlyQ, 849, false);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/nr06.cpp b/engines/bladerunner/script/scene/nr06.cpp
index ba93ace7c3..6e3dc354d1 100644
--- a/engines/bladerunner/script/scene/nr06.cpp
+++ b/engines/bladerunner/script/scene/nr06.cpp
@@ -81,7 +81,7 @@ bool SceneScriptNR06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 48.0f, -71.88f, -26.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 48.0f, -71.88f, -26.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Game_Flag_Set(441);
 			Set_Enter(57, 60);
@@ -89,10 +89,10 @@ bool SceneScriptNR06::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -137.0f, -71.88f, -243.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 95, false);
-			Loop_Actor_Travel_Stairs(0, 8, 1, 0);
-			Loop_Actor_Walk_To_XYZ(0, -36.0f, 0.37f, -373.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -137.0f, -71.88f, -243.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 95, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 8, 1, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -36.0f, 0.37f, -373.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(439);
@@ -119,12 +119,12 @@ void SceneScriptNR06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptNR06::PlayerWalkedIn() {
 	if (Game_Flag_Query(442)) {
-		Loop_Actor_Walk_To_XYZ(0, -3.0f, -71.88f, -26.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -3.0f, -71.88f, -26.0f, 0, 0, false, 0);
 		Game_Flag_Reset(442);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, -81.72f, 0.12f, -323.49f, 0, 0, false, 0);
-		Actor_Face_Heading(0, 600, false);
-		Loop_Actor_Travel_Stairs(0, 8, 0, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -81.72f, 0.12f, -323.49f, 0, 0, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 600, false);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 8, 0, 0);
 		Game_Flag_Reset(440);
 	}
 	//return false;
diff --git a/engines/bladerunner/script/scene/nr07.cpp b/engines/bladerunner/script/scene/nr07.cpp
index c1e2e2d6ff..92c1d6d109 100644
--- a/engines/bladerunner/script/scene/nr07.cpp
+++ b/engines/bladerunner/script/scene/nr07.cpp
@@ -40,27 +40,27 @@ bool SceneScriptNR07::MouseClick(int x, int y) {
 }
 
 bool SceneScriptNR07::ClickedOn3DObject(const char *objectName, bool a2) {
-	Actor_Set_Goal_Number(25, 201);
+	Actor_Set_Goal_Number(kActorHanoi, 201);
 	if (Object_Query_Click("VASE", objectName)) {
 		sub_401C60();
 	}
-	Actor_Set_Goal_Number(25, 200);
+	Actor_Set_Goal_Number(kActorHanoi, 200);
 	return false;
 }
 
 bool SceneScriptNR07::ClickedOnActor(int actorId) {
-	if (actorId == 3) {
-		if (Actor_Query_Goal_Number(33) <= 239) {
-			Actor_Set_Goal_Number(25, 201);
-			Actor_Face_Actor(0, 3, true);
+	if (actorId == kActorDektora) {
+		if (Actor_Query_Goal_Number(kActorHolloway) <= 239) {
+			Actor_Set_Goal_Number(kActorHanoi, 201);
+			Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
 			Dialogue_Menu_Clear_List();
 			if (Game_Flag_Query(638)) {
 				DM_Add_To_List_Never_Repeat_Once_Selected(1100, -1, 3, 8);
 				DM_Add_To_List_Never_Repeat_Once_Selected(1110, 8, -1, -1);
-				if (Actor_Clue_Query(0, 95)) {
+				if (Actor_Clue_Query(kActorMcCoy, kClueSuspectDektora)) {
 					DM_Add_To_List_Never_Repeat_Once_Selected(1120, 3, 6, 7);
 				}
-				if (Actor_Clue_Query(0, 113)) {
+				if (Actor_Clue_Query(kActorMcCoy, kClueCarRegistration1)) {
 					DM_Add_To_List_Never_Repeat_Once_Selected(1130, 3, 5, 7);
 				}
 				if (Game_Flag_Query(510)) {
@@ -91,10 +91,10 @@ bool SceneScriptNR07::ClickedOnActor(int actorId) {
 				sub_402284();
 				break;
 			case 1090:
-				Actor_Says(0, 3650, 13);
-				Actor_Says(3, 630, 30);
-				Actor_Says(0, 3655, 16);
-				Actor_Says(3, 640, 31);
+				Actor_Says(kActorMcCoy, 3650, 13);
+				Actor_Says(kActorDektora, 630, 30);
+				Actor_Says(kActorMcCoy, 3655, 16);
+				Actor_Says(kActorDektora, 640, 31);
 				break;
 			case 1080:
 				sub_401EF4();
@@ -102,7 +102,7 @@ bool SceneScriptNR07::ClickedOnActor(int actorId) {
 			default:
 				break;
 			}
-			Actor_Set_Goal_Number(25, 200);
+			Actor_Set_Goal_Number(kActorHanoi, 200);
 			return false;;
 		}
 		return true;
@@ -116,8 +116,8 @@ bool SceneScriptNR07::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR07::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -102.0f, -73.5f, -233.0f, 0, 1, false, 0)) {
-			Actor_Set_Goal_Number(25, 201);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -102.0f, -73.5f, -233.0f, 0, 1, false, 0)) {
+			Actor_Set_Goal_Number(kActorHanoi, 201);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(442);
@@ -139,26 +139,26 @@ void SceneScriptNR07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptNR07::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_XYZ(0, -110.0f, -73.5f, -169.0f, 0, 0, false, 0);
-	if (Actor_Query_In_Set(3, 57)) {
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -110.0f, -73.5f, -169.0f, 0, 0, false, 0);
+	if (Actor_Query_In_Set(kActorDektora, 57)) {
 		if (Game_Flag_Query(508)) {
-			Actor_Modify_Friendliness_To_Other(3, 0, -2);
-			Actor_Says(3, 530, 31);
+			Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, -2);
+			Actor_Says(kActorDektora, 530, 31);
 		} else {
 			Game_Flag_Set(508);
-			if (!Actor_Clue_Query(3, 214)) {
-				Actor_Modify_Friendliness_To_Other(3, 0, 5);
-			} else if (Actor_Clue_Query(0, 216) || Actor_Clue_Query(0, 217)) {
-				Actor_Modify_Friendliness_To_Other(3, 0, 10);
+			if (!Actor_Clue_Query(kActorDektora, kClueMcCoyIsABladeRunner)) {
+				Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, 5);
+			} else if (Actor_Clue_Query(kActorMcCoy, kClueMcCoyWarnedIzo) || Actor_Clue_Query(kActorMcCoy, kClueMcCoyHelpedIzoIzoIsAReplicant)) {
+				Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, 10);
 			}
-			Actor_Says(3, 500, 30);
-			Actor_Says(0, 3585, 14);
-			Actor_Says(3, 510, 30);
-			Actor_Start_Speech_Sample(0, 3590);
-			Loop_Actor_Walk_To_XYZ(0, -112.0f, -73.0f, -89.0f, 525, 0, false, 0);
-			Actor_Says(3, 520, 53);
+			Actor_Says(kActorDektora, 500, 30);
+			Actor_Says(kActorMcCoy, 3585, 14);
+			Actor_Says(kActorDektora, 510, 30);
+			Actor_Start_Speech_Sample(kActorMcCoy, 3590);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -112.0f, -73.0f, -89.0f, 525, 0, false, 0);
+			Actor_Says(kActorDektora, 520, 53);
 		}
-		Actor_Set_Goal_Number(25, 200);
+		Actor_Set_Goal_Number(kActorHanoi, 200);
 	}
 	//return false;
 }
@@ -171,92 +171,92 @@ void SceneScriptNR07::DialogueQueueFlushed(int a1) {
 }
 
 void SceneScriptNR07::sub_4018D4() {
-	Actor_Set_Goal_Number(25, 201);
+	Actor_Set_Goal_Number(kActorHanoi, 201);
 	Player_Loses_Control();
-	Actor_Set_At_XYZ(3, -136.0f, -73.0f, -18.0f, 300);
-	Actor_Change_Animation_Mode(3, 71);
-	Actor_Change_Animation_Mode(0, 21);
-	Loop_Actor_Walk_To_XYZ(3, -102.0f, -73.5f, -233.0f, 0, 0, true, 0);
+	Actor_Set_At_XYZ(kActorDektora, -136.0f, -73.0f, -18.0f, 300);
+	Actor_Change_Animation_Mode(kActorDektora, 71);
+	Actor_Change_Animation_Mode(kActorMcCoy, 21);
+	Loop_Actor_Walk_To_XYZ(kActorDektora, -102.0f, -73.5f, -233.0f, 0, 0, true, 0);
 	if (Game_Flag_Query(47)) {
-		Actor_Set_Goal_Number(3, 245);
+		Actor_Set_Goal_Number(kActorDektora, 245);
 	} else {
-		Actor_Set_Goal_Number(3, 295);
+		Actor_Set_Goal_Number(kActorDektora, 295);
 		Game_Flag_Set(591);
-		Actor_Put_In_Set(3, 91);
-		Actor_Set_At_Waypoint(3, 33, 0);
+		Actor_Put_In_Set(kActorDektora, 91);
+		Actor_Set_At_Waypoint(kActorDektora, 33, 0);
 	}
 	Player_Gains_Control();
 }
 
 void SceneScriptNR07::sub_401A10() {
 	Scene_Exits_Disable();
-	Actor_Set_Goal_Number(25, 201);
-	Actor_Says_With_Pause(3, 930, 1.0f, 30);
-	Actor_Says_With_Pause(3, 910, 1.0f, 30);
-	Actor_Face_Object(3, "VANITY", true);
-	Actor_Says(3, 940, 31);
-	Actor_Says(0, 3770, 19);
-	Async_Actor_Walk_To_XYZ(0, -193.0f, -73.5f, -13.0f, 0, false);
-	Actor_Says(3, 950, 31);
-	Actor_Face_Actor(3, 0, true);
-	Actor_Change_Animation_Mode(3, 4);
-	Actor_Face_Actor(0, 3, true);
-	Actor_Says(0, 3760, 19);
-	Actor_Says(3, 960, 53);
-	Actor_Says(3, 920, 53);
-	Actor_Says(0, 3780, 0);
-	Actor_Says(3, 970, 53);
-	Actor_Voice_Over(1710, 99);
-	Actor_Voice_Over(1720, 99);
-	Actor_Voice_Over(1730, 99);
-	Actor_Set_Goal_Number(33, 240);
+	Actor_Set_Goal_Number(kActorHanoi, 201);
+	Actor_Says_With_Pause(kActorDektora, 930, 1.0f, 30);
+	Actor_Says_With_Pause(kActorDektora, 910, 1.0f, 30);
+	Actor_Face_Object(kActorDektora, "VANITY", true);
+	Actor_Says(kActorDektora, 940, 31);
+	Actor_Says(kActorMcCoy, 3770, 19);
+	Async_Actor_Walk_To_XYZ(kActorMcCoy, -193.0f, -73.5f, -13.0f, 0, false);
+	Actor_Says(kActorDektora, 950, 31);
+	Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
+	Actor_Change_Animation_Mode(kActorDektora, 4);
+	Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
+	Actor_Says(kActorMcCoy, 3760, 19);
+	Actor_Says(kActorDektora, 960, 53);
+	Actor_Says(kActorDektora, 920, 53);
+	Actor_Says(kActorMcCoy, 3780, 0);
+	Actor_Says(kActorDektora, 970, 53);
+	Actor_Voice_Over(1710, kActorVoiceOver);
+	Actor_Voice_Over(1720, kActorVoiceOver);
+	Actor_Voice_Over(1730, kActorVoiceOver);
+	Actor_Set_Goal_Number(kActorHolloway, 240);
 }
 
 void SceneScriptNR07::sub_401C60() {
-	Loop_Actor_Walk_To_XYZ(0, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
-	Actor_Face_Object(0, "VASE", true);
-	if (Actor_Query_Is_In_Current_Set(3)) {
-		if (!Actor_Clue_Query(0, 97)) {
-			Actor_Clue_Acquire(0, 97, 1, -1);
-			int v0 = Actor_Query_Friendliness_To_Other(3, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
+	Actor_Face_Object(kActorMcCoy, "VASE", true);
+	if (Actor_Query_Is_In_Current_Set(kActorDektora)) {
+		if (!Actor_Clue_Query(kActorMcCoy, kClueDektoraInterview3)) {
+			Actor_Clue_Acquire(kActorMcCoy, kClueDektoraInterview3, 1, -1);
+			int v0 = Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy);
 			if (v0 > 50) {
-				Actor_Modify_Friendliness_To_Other(3, 0, 2);
+				Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, 2);
 			} else if (v0 <= 50) {
-				Actor_Modify_Friendliness_To_Other(3, 0, -2);
+				Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, -2);
 			}
-			Actor_Says(0, 3600, 19);
-			Actor_Says(3, 550, 30);
-			Actor_Says(0, 3605, 19);
-			Actor_Says(3, 560, 31);
-			Actor_Says(0, 3610, 19);
+			Actor_Says(kActorMcCoy, 3600, 19);
+			Actor_Says(kActorDektora, 550, 30);
+			Actor_Says(kActorMcCoy, 3605, 19);
+			Actor_Says(kActorDektora, 560, 31);
+			Actor_Says(kActorMcCoy, 3610, 19);
 		}
-	} else if (Actor_Clue_Query(0, 98)) {
-		Actor_Says(0, 8585, 14);
+	} else if (Actor_Clue_Query(kActorMcCoy, kClueDektorasCard)) {
+		Actor_Says(kActorMcCoy, 8585, 14);
 	} else {
-		Actor_Clue_Acquire(0, 98, 1, -1);
-		Loop_Actor_Walk_To_Scene_Object(0, "VASE", 100, 1, false);
-		Actor_Change_Animation_Mode(0, 23);
+		Actor_Clue_Acquire(kActorMcCoy, kClueDektorasCard, 1, -1);
+		Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "VASE", 100, true, false);
+		Actor_Change_Animation_Mode(kActorMcCoy, 23);
 		Item_Pickup_Spin_Effect(935, 526, 268);
-		Actor_Voice_Over(1690, 99);
-		Actor_Voice_Over(1700, 99);
+		Actor_Voice_Over(1690, kActorVoiceOver);
+		Actor_Voice_Over(1700, kActorVoiceOver);
 	}
 }
 
 void SceneScriptNR07::sub_401EF4() {
-	Actor_Clue_Acquire(0, 96, 1, -1);
-	Actor_Says(0, 3625, 19);
-	Actor_Says(3, 570, 30);
-	Actor_Says_With_Pause(3, 580, 1.0f, 31);
-	Actor_Says(0, 3630, 13);
-	Actor_Says_With_Pause(3, 590, 1.0f, 30);
-	Actor_Says(3, 600, 30);
-	Actor_Start_Speech_Sample(0, 3640);
-	Loop_Actor_Walk_To_XYZ(0, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
-	Actor_Face_Actor(0, 3, true);
-	Actor_Face_Actor(3, 0, true);
+	Actor_Clue_Acquire(kActorMcCoy, kClueDektoraInterview2, 1, -1);
+	Actor_Says(kActorMcCoy, 3625, 19);
+	Actor_Says(kActorDektora, 570, 30);
+	Actor_Says_With_Pause(kActorDektora, 580, 1.0f, 31);
+	Actor_Says(kActorMcCoy, 3630, 13);
+	Actor_Says_With_Pause(kActorDektora, 590, 1.0f, 30);
+	Actor_Says(kActorDektora, 600, 30);
+	Actor_Start_Speech_Sample(kActorMcCoy, 3640);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
+	Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
 	Game_Flag_Set(638);
-	Actor_Clue_Acquire(0, 91, 1, 3);
-	int v0 = Actor_Query_Friendliness_To_Other(3, 0);
+	Actor_Clue_Acquire(kActorMcCoy, kClueDragonflyBelt, 1, kActorDektora);
+	int v0 = Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy);
 	if (!Game_Flag_Query(47) && v0 < 40) {
 		sub_4018D4();
 		return;
@@ -269,13 +269,13 @@ void SceneScriptNR07::sub_401EF4() {
 }
 
 void SceneScriptNR07::sub_4020F0() {
-	if (Actor_Clue_Query(3, 213) && Actor_Clue_Query(3, 214)) {
-		Actor_Modify_Friendliness_To_Other(3, 0, -1);
+	if (Actor_Clue_Query(kActorDektora, kClueMcCoysDescription) && Actor_Clue_Query(kActorDektora, kClueMcCoyIsABladeRunner)) {
+		Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, -1);
 	}
-	Actor_Says(3, 610, 31);
-	Actor_Says(0, 3645, 12);
-	Actor_Says(3, 620, 30);
-	int v0 = Actor_Query_Friendliness_To_Other(3, 0);
+	Actor_Says(kActorDektora, 610, 31);
+	Actor_Says(kActorMcCoy, 3645, 12);
+	Actor_Says(kActorDektora, 620, 30);
+	int v0 = Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy);
 	if (!Game_Flag_Query(47) && v0 < 40) {
 		sub_4018D4();
 		return;
@@ -284,29 +284,29 @@ void SceneScriptNR07::sub_4020F0() {
 		sub_401A10();
 		return;
 	}
-	Actor_Face_Object(3, "VANITY", true);
+	Actor_Face_Object(kActorDektora, "VANITY", true);
 }
 
 void SceneScriptNR07::sub_402284() {
-	Actor_Clue_Acquire(0, 94, 1, -1);
-	Actor_Start_Speech_Sample(0, 3660);
-	Loop_Actor_Walk_To_XYZ(0, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
-	Actor_Face_Actor(0, 3, true);
-	Actor_Says(3, 650, 30);
-	Actor_Says(3, 660, 31);
-	Actor_Says(0, 3665, 18);
-	Actor_Face_Actor(3, 0, true);
-	Actor_Says(3, 670, 31);
-	Actor_Says(3, 680, 30);
-	Actor_Says(3, 690, 31);
-	Actor_Says(0, 3670, 17);
-	Actor_Says(3, 700, 30);
-	Actor_Says(0, 3675, 19);
-	Actor_Says(3, 710, 30);
-	Actor_Says(0, 3680, 19);
-	Actor_Says(3, 720, 30);
-	Actor_Says(3, 730, 30);
-	Actor_Says(0, 3685, 13);
+	Actor_Clue_Acquire(kActorMcCoy, kClueDektoraInterview1, 1, -1);
+	Actor_Start_Speech_Sample(kActorMcCoy, 3660);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
+	Actor_Says(kActorDektora, 650, 30);
+	Actor_Says(kActorDektora, 660, 31);
+	Actor_Says(kActorMcCoy, 3665, 18);
+	Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
+	Actor_Says(kActorDektora, 670, 31);
+	Actor_Says(kActorDektora, 680, 30);
+	Actor_Says(kActorDektora, 690, 31);
+	Actor_Says(kActorMcCoy, 3670, 17);
+	Actor_Says(kActorDektora, 700, 30);
+	Actor_Says(kActorMcCoy, 3675, 19);
+	Actor_Says(kActorDektora, 710, 30);
+	Actor_Says(kActorMcCoy, 3680, 19);
+	Actor_Says(kActorDektora, 720, 30);
+	Actor_Says(kActorDektora, 730, 30);
+	Actor_Says(kActorMcCoy, 3685, 13);
 	Voight_Kampff_Activate(3, 40);
 	if (Game_Flag_Query(47)) {
 		sub_401A10();
@@ -316,13 +316,13 @@ void SceneScriptNR07::sub_402284() {
 }
 
 void SceneScriptNR07::sub_402510() {
-	Actor_Says(0, 3690, 14);
-	Actor_Start_Speech_Sample(3, 750);
-	Loop_Actor_Walk_To_XYZ(0, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
-	Actor_Face_Actor(0, 3, true);
-	Actor_Face_Actor(3, 0, true);
-	Actor_Says(0, 3695, 15);
-	Actor_Modify_Friendliness_To_Other(3, 0, 5);
+	Actor_Says(kActorMcCoy, 3690, 14);
+	Actor_Start_Speech_Sample(kActorDektora, 750);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
+	Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
+	Actor_Says(kActorMcCoy, 3695, 15);
+	Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, 5);
 	if (Game_Flag_Query(47)) {
 		sub_401A10();
 	} else {
@@ -331,49 +331,49 @@ void SceneScriptNR07::sub_402510() {
 }
 
 void SceneScriptNR07::sub_402614() {
-	Actor_Says(0, 3705, 19);
-	Actor_Says(3, 760, 53);
+	Actor_Says(kActorMcCoy, 3705, 19);
+	Actor_Says(kActorDektora, 760, 53);
 	if (Game_Flag_Query(47)) {
-		Actor_Modify_Friendliness_To_Other(3, 0, -5);
-		Actor_Says(0, 3710, 18);
+		Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, -5);
+		Actor_Says(kActorMcCoy, 3710, 18);
 		sub_401A10();
 	} else {
-		Actor_Modify_Friendliness_To_Other(3, 0, -3);
-		Actor_Start_Speech_Sample(0, 3710);
-		Loop_Actor_Walk_To_XYZ(0, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
-		Actor_Face_Actor(0, 3, true);
+		Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, -3);
+		Actor_Start_Speech_Sample(kActorMcCoy, 3710);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -109.0f, -73.0f, -89.0f, 0, 0, false, 0);
+		Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
 		sub_4018D4();
 	}
 }
 
 void SceneScriptNR07::sub_402738() {
-	Actor_Modify_Friendliness_To_Other(3, 0, -3);
-	Actor_Says(0, 3615, 16);
-	Actor_Says(3, 770, 30);
-	Actor_Says(0, 3720, 15);
-	Actor_Says_With_Pause(3, 780, 2.0f, 30);
-	Actor_Says(3, 790, 31);
-	Actor_Says(0, 3725, 18);
-	Actor_Says(3, 800, 30);
-	Actor_Says_With_Pause(0, 3730, 2.0f, 13);
-	Actor_Says_With_Pause(3, 810, 1.0f, 53);
-	Actor_Says(3, 820, 30);
-	Actor_Says(0, 3735, 14);
-	Actor_Says(3, 830, 31);
-	Actor_Says(0, 3740, 19);
+	Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, -3);
+	Actor_Says(kActorMcCoy, 3615, 16);
+	Actor_Says(kActorDektora, 770, 30);
+	Actor_Says(kActorMcCoy, 3720, 15);
+	Actor_Says_With_Pause(kActorDektora, 780, 2.0f, 30);
+	Actor_Says(kActorDektora, 790, 31);
+	Actor_Says(kActorMcCoy, 3725, 18);
+	Actor_Says(kActorDektora, 800, 30);
+	Actor_Says_With_Pause(kActorMcCoy, 3730, 2.0f, 13);
+	Actor_Says_With_Pause(kActorDektora, 810, 1.0f, 53);
+	Actor_Says(kActorDektora, 820, 30);
+	Actor_Says(kActorMcCoy, 3735, 14);
+	Actor_Says(kActorDektora, 830, 31);
+	Actor_Says(kActorMcCoy, 3740, 19);
 }
 
 void SceneScriptNR07::sub_4028FC() {
-	Actor_Says(0, 3620, 19);
-	Actor_Says(3, 840, 30);
-	Actor_Says(0, 3745, 9);
-	Actor_Says_With_Pause(3, 850, 1.0f, 30);
-	Actor_Says(3, 860, 30);
-	Actor_Says(3, 870, 53);
-	Actor_Says(0, 3750, 11);
-	Actor_Says(3, 880, 30);
-	Actor_Says(0, 3755, 16);
-	Actor_Says(3, 890, 31);
+	Actor_Says(kActorMcCoy, 3620, 19);
+	Actor_Says(kActorDektora, 840, 30);
+	Actor_Says(kActorMcCoy, 3745, 9);
+	Actor_Says_With_Pause(kActorDektora, 850, 1.0f, 30);
+	Actor_Says(kActorDektora, 860, 30);
+	Actor_Says(kActorDektora, 870, 53);
+	Actor_Says(kActorMcCoy, 3750, 11);
+	Actor_Says(kActorDektora, 880, 30);
+	Actor_Says(kActorMcCoy, 3755, 16);
+	Actor_Says(kActorDektora, 890, 31);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/nr08.cpp b/engines/bladerunner/script/scene/nr08.cpp
index 3d1058901e..15d5be7451 100644
--- a/engines/bladerunner/script/scene/nr08.cpp
+++ b/engines/bladerunner/script/scene/nr08.cpp
@@ -25,13 +25,13 @@
 namespace BladeRunner {
 
 void SceneScriptNR08::InitializeScene() {
-	if (Actor_Query_Goal_Number(1) == 231) {
+	if (Actor_Query_Goal_Number(kActorSteele) == 231) {
 		Setup_Scene_Information(-1174.1f, 0.32f, 303.9f, 435);
 	} else if (Game_Flag_Query(546)) {
 		Scene_Loop_Start_Special(0, 0, 0);
 		Scene_Loop_Set_Default(1);
 		Setup_Scene_Information(-1102.88f, 0.0f, 107.43f, 0);
-		if (Actor_Query_Goal_Number(3) == 210) {
+		if (Actor_Query_Goal_Number(kActorDektora) == 210) {
 			Music_Stop(1);
 		}
 	} else if (Game_Flag_Query(439)) {
@@ -42,7 +42,7 @@ void SceneScriptNR08::InitializeScene() {
 		Game_Flag_Reset(615);
 	}
 	Scene_Exit_Add_2D_Exit(0, 610, 0, 639, 479, 1);
-	if (Actor_Query_Goal_Number(3) != 210) {
+	if (Actor_Query_Goal_Number(kActorDektora) != 210) {
 		Scene_Exit_Add_2D_Exit(1, 0, 309, 30, 398, 3);
 		Scene_Exit_Add_2D_Exit(2, 520, 330, 556, 386, 0);
 	}
@@ -72,8 +72,8 @@ void SceneScriptNR08::InitializeScene() {
 void SceneScriptNR08::SceneLoaded() {
 	Obstacle_Object("BOX283", true);
 	Unobstacle_Object("BOX283", true);
-	if (Actor_Query_Goal_Number(3) == 210) {
-		Actor_Change_Animation_Mode(3, 79);
+	if (Actor_Query_Goal_Number(kActorDektora) == 210) {
+		Actor_Change_Animation_Mode(kActorDektora, 79);
 	}
 }
 
@@ -95,26 +95,26 @@ bool SceneScriptNR08::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR08::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -1102.88f, 0.0f, 107.43f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1102.88f, 0.0f, 107.43f, 0, 1, false, 0)) {
 			Game_Flag_Set(547);
 			Set_Enter(13, 58);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -724.7f, 0.0f, 384.24f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 505, false);
-			Loop_Actor_Travel_Stairs(0, 4, 1, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -724.7f, 0.0f, 384.24f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 505, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 1, 0);
 			Game_Flag_Set(440);
 			Set_Enter(56, 59);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -1663.33f, 0.65f, 342.84f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 831, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1663.33f, 0.65f, 342.84f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 831, false);
 			Footstep_Sound_Override_On(2);
-			Loop_Actor_Travel_Stairs(0, 6, 1, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 6, 1, 0);
 			Footstep_Sound_Override_Off();
 			Game_Flag_Set(614);
 			Set_Enter(58, 62);
@@ -137,13 +137,13 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
 		Music_Stop(3);
 		Ambient_Sounds_Play_Sound(566, 27, 0, 99, 0);
 	} else if (frame >= 91 && frame < 120) {
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 		Set_Fade_Density(1.0f);
 	} else if (frame >= 120 && frame < 135) {
 		Set_Fade_Density((134 - frame) / 14.0f);
 		Music_Play(7, 61, 0, 1, -1, 0, 0);
 	} else {
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		Set_Fade_Density(0.0f);
 	}
 	if (Game_Flag_Query(651) && !Game_Flag_Query(636)) {
@@ -153,10 +153,10 @@ void SceneScriptNR08::SceneFrameAdvanced(int frame) {
 		Scene_Loop_Start_Special(2, 3, 1);
 	}
 	if (frame == 95) {
-		Actor_Put_In_Set(3, 91);
-		Actor_Set_At_Waypoint(3, 33, 0);
-		Actor_Change_Animation_Mode(3, 0);
-		Actor_Set_Goal_Number(3, 200);
+		Actor_Put_In_Set(kActorDektora, 91);
+		Actor_Set_At_Waypoint(kActorDektora, 33, 0);
+		Actor_Change_Animation_Mode(kActorDektora, 0);
+		Actor_Set_Goal_Number(kActorDektora, 200);
 		Scene_Exit_Add_2D_Exit(1, 0, 309, 30, 398, 3);
 		Scene_Exit_Add_2D_Exit(2, 520, 330, 556, 386, 0);
 	}
@@ -170,35 +170,35 @@ void SceneScriptNR08::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptNR08::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(3) != 210 || Game_Flag_Query(729)) {
+	if (Actor_Query_Goal_Number(kActorDektora) != 210 || Game_Flag_Query(729)) {
 		Music_Adjust(51, 0, 2);
 	} else {
 		Game_Flag_Set(729);
 		Ambient_Sounds_Play_Sound(566, 27, 0, 99, 0);
 		Outtake_Play(40, 1, -1);
 	}
-	if (Actor_Query_Goal_Number(3) == 245) {
-		Actor_Face_Heading(3, 790, false);
-		Loop_Actor_Travel_Stairs(3, 8, 1, 0);
-		Actor_Set_Goal_Number(3, 246);
+	if (Actor_Query_Goal_Number(kActorDektora) == 245) {
+		Actor_Face_Heading(kActorDektora, 790, false);
+		Loop_Actor_Travel_Stairs(kActorDektora, 8, 1, 0);
+		Actor_Set_Goal_Number(kActorDektora, 246);
 	}
-	if (Actor_Query_Goal_Number(1) == 231) {
-		Actor_Says(1, 1640, 12);
+	if (Actor_Query_Goal_Number(kActorSteele) == 231) {
+		Actor_Says(kActorSteele, 1640, 12);
 		if (!Game_Flag_Query(378)) {
-			Actor_Says(0, 3790, 13);
-			Actor_Says(1, 1650, 14);
+			Actor_Says(kActorMcCoy, 3790, 13);
+			Actor_Says(kActorSteele, 1650, 14);
 		}
-		Actor_Says(1, 1660, 12);
-		Actor_Says(0, 3795, 16);
-		Actor_Says(1, 1670, 13);
-		Actor_Says(1, 1680, 14);
-		Actor_Says(1, 1690, 15);
-		Actor_Set_Goal_Number(1, 235);
+		Actor_Says(kActorSteele, 1660, 12);
+		Actor_Says(kActorMcCoy, 3795, 16);
+		Actor_Says(kActorSteele, 1670, 13);
+		Actor_Says(kActorSteele, 1680, 14);
+		Actor_Says(kActorSteele, 1690, 15);
+		Actor_Set_Goal_Number(kActorSteele, 235);
 		//return true;
 		return;
 	} else {
 		if (Game_Flag_Query(546)) {
-			Loop_Actor_Walk_To_XYZ(0, -1090.88f, 0.0f, 147.43f, 0, 1, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1090.88f, 0.0f, 147.43f, 0, 1, false, 0);
 			Game_Flag_Reset(546);
 		}
 		//return false;
@@ -220,7 +220,7 @@ void SceneScriptNR08::DialogueQueueFlushed(int a1) {
 void SceneScriptNR08::sub_4021B4() {
 	if (Music_Is_Playing()) {
 		Music_Adjust(51, 0, 2);
-	} else if (Actor_Query_Goal_Number(3) == 210) {
+	} else if (Actor_Query_Goal_Number(kActorDektora) == 210) {
 		Music_Play(6, 61, 0, 1, -1, 0, 0);
 	} else {
 		int v0 = Global_Variable_Query(54);
diff --git a/engines/bladerunner/script/scene/nr09.cpp b/engines/bladerunner/script/scene/nr09.cpp
index 19a95e30e2..a10f252492 100644
--- a/engines/bladerunner/script/scene/nr09.cpp
+++ b/engines/bladerunner/script/scene/nr09.cpp
@@ -73,14 +73,14 @@ bool SceneScriptNR09::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR09::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -564.07f, 0.35f, 399.04f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -564.07f, 0.35f, 399.04f, 0, 1, false, 0)) {
 			Game_Flag_Set(475);
 			Set_Enter(59, 63);
 			return true;
 		}
 	}
 	if (exitId == 1) {
-		int v1 = Loop_Actor_Walk_To_XYZ(0, -704.07f, 0.35f, 663.04f, 0, 1, false, 0);
+		int v1 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, -704.07f, 0.35f, 663.04f, 0, 1, false, 0);
 		Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 		Ambient_Sounds_Remove_All_Looping_Sounds(1);
 		if (!v1) {
@@ -107,7 +107,7 @@ void SceneScriptNR09::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptNR09::PlayerWalkedIn() {
 	if (Game_Flag_Query(614)) {
-		Loop_Actor_Walk_To_XYZ(0, -704.07001f, 0.35f, 623.04f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -704.07001f, 0.35f, 623.04f, 0, 0, false, 0);
 		Game_Flag_Reset(614);
 	}
 	//return false;
diff --git a/engines/bladerunner/script/scene/nr10.cpp b/engines/bladerunner/script/scene/nr10.cpp
index 708e1ccb9a..77f3cab3f6 100644
--- a/engines/bladerunner/script/scene/nr10.cpp
+++ b/engines/bladerunner/script/scene/nr10.cpp
@@ -63,11 +63,11 @@ bool SceneScriptNR10::MouseClick(int x, int y) {
 
 bool SceneScriptNR10::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("BOX18", objectName) && a2 && Game_Flag_Query(642)) {
-		Actor_Set_Goal_Number(3, 250);
+		Actor_Set_Goal_Number(kActorDektora, 250);
 		Game_Flag_Set(640);
 		Game_Flag_Reset(642);
-		Actor_Set_Invisible(0, false);
-		Actor_Set_Invisible(3, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
+		Actor_Set_Invisible(kActorDektora, false);
 		Ambient_Sounds_Remove_Looping_Sound(452, true);
 		Sound_Play(453, 52, 0, 0, 50);
 		Scene_Loop_Set_Default(0);
@@ -89,16 +89,16 @@ bool SceneScriptNR10::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR10::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -152.78f, 2.84f, -238.43f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.78f, 2.84f, -238.43f, 0, 1, false, 0)) {
 			Game_Flag_Set(476);
 			Set_Enter(58, 62);
 			return true;
 		}
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 11.5f, 2.84f, -304.46f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 55, false);
-			Loop_Actor_Travel_Ladder(0, 8, 1, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 11.5f, 2.84f, -304.46f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 55, false);
+			Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 1, 0);
 			Game_Flag_Set(641);
 			Set_Enter(60, 64);
 			return true;
@@ -114,8 +114,8 @@ bool SceneScriptNR10::ClickedOn2DRegion(int region) {
 void SceneScriptNR10::SceneFrameAdvanced(int frame) {
 	if (frame == 122) {
 		Game_Flag_Set(642);
-		Actor_Set_Invisible(0, true);
-		Actor_Set_Invisible(3, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
+		Actor_Set_Invisible(kActorDektora, true);
 		Combat_Target_Object("BOX18");
 		//return true;
 		return;
@@ -123,8 +123,8 @@ void SceneScriptNR10::SceneFrameAdvanced(int frame) {
 	if (frame == 61 && Game_Flag_Query(642)) {
 		Game_Flag_Reset(642);
 		Player_Set_Combat_Mode(false);
-		Actor_Set_Invisible(0, false);
-		Actor_Set_Goal_Number(3, 247);
+		Actor_Set_Invisible(kActorMcCoy, false);
+		Actor_Set_Goal_Number(kActorDektora, 247);
 		//return true;
 		return;
 	}
@@ -135,22 +135,22 @@ void SceneScriptNR10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptNR10::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(3) == 246) {
+	if (Actor_Query_Goal_Number(kActorDektora) == 246) {
 		Player_Set_Combat_Mode(true);
 		//return true;
 		return;
 	}
-	if (Actor_Query_Goal_Number(1) == 236) {
-		Actor_Face_Actor(1, 0, true);
-		Actor_Says(1, 150, 13);
-		Actor_Face_Actor(0, 1, true);
-		Actor_Says(0, 1580, 14);
-		Actor_Says(1, 160, 15);
-		Actor_Says(0, 1585, 16);
-		Actor_Says(1, 1160, 16);
+	if (Actor_Query_Goal_Number(kActorSteele) == 236) {
+		Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
+		Actor_Says(kActorSteele, 150, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
+		Actor_Says(kActorMcCoy, 1580, 14);
+		Actor_Says(kActorSteele, 160, 15);
+		Actor_Says(kActorMcCoy, 1585, 16);
+		Actor_Says(kActorSteele, 1160, 16);
 		Delay(1000);
-		Actor_Says(1, 1290, 14);
-		Actor_Set_Goal_Number(1, 275);
+		Actor_Says(kActorSteele, 1290, 14);
+		Actor_Set_Goal_Number(kActorSteele, 275);
 	}
 	//		return false;
 }
diff --git a/engines/bladerunner/script/scene/nr11.cpp b/engines/bladerunner/script/scene/nr11.cpp
index 171b6fcd5d..c194f5a17a 100644
--- a/engines/bladerunner/script/scene/nr11.cpp
+++ b/engines/bladerunner/script/scene/nr11.cpp
@@ -55,7 +55,7 @@ void SceneScriptNR11::SceneLoaded() {
 	Unobstacle_Object("BOX13", true);
 	Clickable_Object("LOFT04");
 	Unclickable_Object("LOFT04");
-	if (Actor_Query_Goal_Number(3) == 250) {
+	if (Actor_Query_Goal_Number(kActorDektora) == 250) {
 		Clickable_Object("CLOTHING02");
 		Clickable_Object("BOX27");
 		Clickable_Object("BOX39");
@@ -113,81 +113,81 @@ bool SceneScriptNR11::ClickedOn3DObject(const char *objectName, bool a2) {
 
 	if (Object_Query_Click("CLOTHING02", objectName) || Object_Query_Click("BOX27", objectName) || Object_Query_Click("BOX39", objectName) || Object_Query_Click("BOX44", objectName) || Object_Query_Click("DRESS", objectName) || Object_Query_Click("COATRACK", objectName) || Object_Query_Click("COLUMN3 DETS", objectName) || Object_Query_Click("COLUMN PIPE01", objectName) || Object_Query_Click("RECTANGLE02", objectName) || Object_Query_Click("COLUMN04", objectName) || Object_Query_Click("COATRACK01", objectName) || Object_Query_Click("SHIRT", objectName) || Object_Query_Click("SKIRT 02", objectName) || Object_Query_Click("CLOTHING B 03", objectName) || Object_Query_Click("BUST BUST", objectName)) {
 		if (a2) {
-			Actor_Set_Goal_Number(1, 211);
+			Actor_Set_Goal_Number(kActorSteele, 211);
 			Scene_Exits_Disable();
 			sub_4028EC();
 			Player_Loses_Control();
 			if (!Player_Query_Combat_Mode()) {
 				Player_Set_Combat_Mode(true);
 			}
-			Actor_Set_Goal_Number(0, 230);
+			Actor_Set_Goal_Number(kActorMcCoy, 230);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
-		} else if (Actor_Query_Goal_Number(3) == 250) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 24.0f, 0.33f, 0.0f, 0, 1, false, 0)) {
-				Actor_Face_XYZ(0, -180.0f, 0.0f, -170.0f, true);
+		} else if (Actor_Query_Goal_Number(kActorDektora) == 250) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 24.0f, 0.33f, 0.0f, 0, 1, false, 0)) {
+				Actor_Face_XYZ(kActorMcCoy, -180.0f, 0.0f, -170.0f, true);
 				sub_4028EC();
-				Actor_Set_Goal_Number(1, 211);
-				if (Actor_Query_Friendliness_To_Other(3, 0) < 30) {
-					Actor_Set_At_XYZ(3, 0.5f, 0.33f, -162.0f, 0);
-					Loop_Actor_Walk_To_XYZ(3, -24.0f, 0.33f, -35.4f, 0, 0, true, 0);
-					Actor_Face_Actor(0, 3, true);
-					Actor_Change_Animation_Mode(3, 71);
+				Actor_Set_Goal_Number(kActorSteele, 211);
+				if (Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy) < 30) {
+					Actor_Set_At_XYZ(kActorDektora, 0.5f, 0.33f, -162.0f, 0);
+					Loop_Actor_Walk_To_XYZ(kActorDektora, -24.0f, 0.33f, -35.4f, 0, 0, true, 0);
+					Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
+					Actor_Change_Animation_Mode(kActorDektora, 71);
 					Delay(500);
-					Actor_Change_Animation_Mode(0, 48);
+					Actor_Change_Animation_Mode(kActorMcCoy, 48);
 					Delay(2000);
-					Actor_Set_Goal_Number(0, 231);
+					Actor_Set_Goal_Number(kActorMcCoy, 231);
 				} else {
-					Actor_Says(0, 3840, 18);
+					Actor_Says(kActorMcCoy, 3840, 18);
 					Delay(1000);
-					if (Actor_Query_Friendliness_To_Other(3, 0) > 59 && !Global_Variable_Query(45)) {
+					if (Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy) > 59 && !Global_Variable_Query(45)) {
 						Music_Play(21, 35, 0, 3, -1, 0, 0);
 					}
-					Loop_Actor_Walk_To_XYZ(3, -135.0f, 0.33000001f, -267.0f, 0, 0, false, 0);
-					Actor_Face_Actor(3, 0, true);
-					Actor_Face_Actor(0, 3, true);
-					Actor_Clue_Acquire(0, 107, 1, 3);
-					Actor_Says(3, 990, 13);
-					Actor_Says(3, 1000, 14);
-					Loop_Actor_Walk_To_Actor(3, 0, 108, 0, false);
-					Actor_Says(0, 3845, 13);
-					Actor_Says(0, 3850, 15);
-					Actor_Says(3, 1010, 14);
-					Actor_Says(0, 3855, 13);
-					Actor_Says(3, 1020, 12);
-					Actor_Says(0, 3860, 12);
-					Actor_Says_With_Pause(3, 1030, 1.0f, 14);
-					Actor_Says(3, 1040, 13);
-					Actor_Says(0, 3865, 15);
-					Actor_Says_With_Pause(3, 1050, 0.80000001f, 14);
-					Actor_Says(3, 1060, 13);
-					Actor_Says(0, 3870, 3);
-					Actor_Says(3, 1070, 14);
-					Actor_Modify_Friendliness_To_Other(3, 0, 5);
-					if (Actor_Query_Friendliness_To_Other(3, 0) > 55 && !Global_Variable_Query(45)) {
+					Loop_Actor_Walk_To_XYZ(kActorDektora, -135.0f, 0.33f, -267.0f, 0, 0, false, 0);
+					Actor_Face_Actor(kActorDektora, kActorMcCoy, true);
+					Actor_Face_Actor(kActorMcCoy, kActorDektora, true);
+					Actor_Clue_Acquire(kActorMcCoy, kClueDektoraInterview4, 1, kActorDektora);
+					Actor_Says(kActorDektora, 990, 13);
+					Actor_Says(kActorDektora, 1000, 14);
+					Loop_Actor_Walk_To_Actor(kActorDektora, kActorMcCoy, 108, 0, false);
+					Actor_Says(kActorMcCoy, 3845, 13);
+					Actor_Says(kActorMcCoy, 3850, 15);
+					Actor_Says(kActorDektora, 1010, 14);
+					Actor_Says(kActorMcCoy, 3855, 13);
+					Actor_Says(kActorDektora, 1020, 12);
+					Actor_Says(kActorMcCoy, 3860, 12);
+					Actor_Says_With_Pause(kActorDektora, 1030, 1.0f, 14);
+					Actor_Says(kActorDektora, 1040, 13);
+					Actor_Says(kActorMcCoy, 3865, 15);
+					Actor_Says_With_Pause(kActorDektora, 1050, 0.8f, 14);
+					Actor_Says(kActorDektora, 1060, 13);
+					Actor_Says(kActorMcCoy, 3870, 3);
+					Actor_Says(kActorDektora, 1070, 14);
+					Actor_Modify_Friendliness_To_Other(kActorDektora, kActorMcCoy, 5);
+					if (Actor_Query_Friendliness_To_Other(kActorDektora, kActorMcCoy) > 55 && !Global_Variable_Query(45)) {
 						Global_Variable_Set(45, 2);
-						Actor_Says(3, 1130, 17);
-						Actor_Says(0, 6365, 12);
-						Actor_Says(3, 1140, 14);
-						Actor_Says(0, 6370, 14);
-						Actor_Says(3, 1150, 12);
-						Actor_Says(3, 1160, 16);
+						Actor_Says(kActorDektora, 1130, 17);
+						Actor_Says(kActorMcCoy, 6365, 12);
+						Actor_Says(kActorDektora, 1140, 14);
+						Actor_Says(kActorMcCoy, 6370, 14);
+						Actor_Says(kActorDektora, 1150, 12);
+						Actor_Says(kActorDektora, 1160, 16);
 					}
-					Actor_Says(3, 1080, 13);
-					Actor_Says(0, 3875, 14);
-					Actor_Says(3, 1090, 17);
+					Actor_Says(kActorDektora, 1080, 13);
+					Actor_Says(kActorMcCoy, 3875, 14);
+					Actor_Says(kActorDektora, 1090, 17);
 					Music_Stop(4);
-					Actor_Set_Goal_Number(3, 260);
+					Actor_Set_Goal_Number(kActorDektora, 260);
 					if (Global_Variable_Query(40) == 1) {
-						Actor_Set_Goal_Number(1, 236);
+						Actor_Set_Goal_Number(kActorSteele, 236);
 					}
 					Game_Flag_Set(591);
 				}
 			} else {
 				if (Random_Query(1, 2) == 1) {
-					Actor_Says(0, 8575, 14);
+					Actor_Says(kActorMcCoy, 8575, 14);
 				} else {
-					Actor_Says(0, 8580, 14);
+					Actor_Says(kActorMcCoy, 8580, 14);
 				}
 			}
 		}
@@ -206,7 +206,7 @@ bool SceneScriptNR11::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptNR11::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 100.0f, 1.75f, -8.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 100.0f, 1.75f, -8.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(477);
 			Set_Enter(59, 63);
 			return true;
@@ -258,7 +258,7 @@ void SceneScriptNR11::SceneFrameAdvanced(int frame) {
 		if (!Player_Query_Combat_Mode()) {
 			Player_Set_Combat_Mode(true);
 		}
-		Actor_Set_Goal_Number(0, 230);
+		Actor_Set_Goal_Number(kActorMcCoy, 230);
 		Scene_Loop_Set_Default(3);
 		Scene_Loop_Start_Special(2, 2, 1);
 		Game_Flag_Reset(635);
@@ -268,16 +268,16 @@ void SceneScriptNR11::SceneFrameAdvanced(int frame) {
 			return;
 		}
 		sub_4027D0(0, frame);
-		if (Actor_Query_Goal_Number(1) == 215) {
+		if (Actor_Query_Goal_Number(kActorSteele) == 215) {
 			sub_4027D0(1, frame);
 		}
 		if (frame == 120) {
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 			Player_Gains_Control();
-			if (Actor_Query_Goal_Number(1) == 215) {
-				Actor_Set_Goal_Number(1, 216);
+			if (Actor_Query_Goal_Number(kActorSteele) == 215) {
+				Actor_Set_Goal_Number(kActorSteele, 216);
 			}
-			Actor_Set_Goal_Number(3, 269);
+			Actor_Set_Goal_Number(kActorDektora, 269);
 		}
 	}
 	//return true;
@@ -287,48 +287,48 @@ void SceneScriptNR11::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptNR11::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(3) == 250) {
+	if (Actor_Query_Goal_Number(kActorDektora) == 250) {
 		Player_Set_Combat_Mode(true);
 		if (Game_Flag_Query(47)) {
-			Actor_Set_Goal_Number(1, 210);
+			Actor_Set_Goal_Number(kActorSteele, 210);
 		}
 	}
 	if (Game_Flag_Query(632)) {
 		Game_Flag_Reset(632);
 		Game_Flag_Set(634);
-		Actor_Put_In_Set(3, 99);
-		Actor_Set_At_Waypoint(3, 41, 0);
-		Actor_Set_Invisible(0, false);
+		Actor_Put_In_Set(kActorDektora, 99);
+		Actor_Set_At_Waypoint(kActorDektora, 41, 0);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		Player_Set_Combat_Mode(false);
 		Player_Gains_Control();
 		if (Game_Flag_Query(47)) {
-			if (Actor_Query_Goal_Number(1) == 211) {
-				Actor_Set_At_XYZ(0, -37.41f, 0.33f, -86.0f, 26);
+			if (Actor_Query_Goal_Number(kActorSteele) == 211) {
+				Actor_Set_At_XYZ(kActorMcCoy, -37.41f, 0.33f, -86.0f, 26);
 				Delay(500);
-				Actor_Face_Current_Camera(0, true);
+				Actor_Face_Current_Camera(kActorMcCoy, true);
 				Delay(750);
-				Actor_Says(0, 5290, 12);
+				Actor_Says(kActorMcCoy, 5290, 12);
 				Delay(1000);
-				Actor_Set_Goal_Number(1, 212);
-				Actor_Face_Actor(0, 1, true);
+				Actor_Set_Goal_Number(kActorSteele, 212);
+				Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
 			} else {
-				Actor_Set_At_XYZ(0, -15.53f, 0.33f, 73.49f, 954);
-				Actor_Modify_Friendliness_To_Other(1, 0, 3);
+				Actor_Set_At_XYZ(kActorMcCoy, -15.53f, 0.33f, 73.49f, 954);
+				Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
 				Delay(1500);
-				Actor_Says(0, 3805, 12);
-				Actor_Face_Actor(0, 1, true);
-				Actor_Face_Actor(1, 0, true);
-				Actor_Says_With_Pause(1, 1720, 0.3f, 16);
-				Actor_Says(0, 3810, 16);
-				Actor_Says_With_Pause(1, 1730, 0.2f, 14);
-				Actor_Says(1, 1740, 15);
-				Actor_Set_Goal_Number(3, 599);
-				Actor_Put_In_Set(3, 99);
-				Actor_Set_At_Waypoint(3, 41, 0);
-				Actor_Set_Goal_Number(1, 275);
+				Actor_Says(kActorMcCoy, 3805, 12);
+				Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
+				Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
+				Actor_Says_With_Pause(kActorSteele, 1720, 0.3f, 16);
+				Actor_Says(kActorMcCoy, 3810, 16);
+				Actor_Says_With_Pause(kActorSteele, 1730, 0.2f, 14);
+				Actor_Says(kActorSteele, 1740, 15);
+				Actor_Set_Goal_Number(kActorDektora, 599);
+				Actor_Put_In_Set(kActorDektora, 99);
+				Actor_Set_At_Waypoint(kActorDektora, 41, 0);
+				Actor_Set_Goal_Number(kActorSteele, 275);
 			}
 		} else {
-			Actor_Set_Goal_Number(0, 500);
+			Actor_Set_Goal_Number(kActorMcCoy, 500);
 		}
 	}
 	// return true;
diff --git a/engines/bladerunner/script/scene/ps01.cpp b/engines/bladerunner/script/scene/ps01.cpp
index e3c9e4d62f..ba9015823d 100644
--- a/engines/bladerunner/script/scene/ps01.cpp
+++ b/engines/bladerunner/script/scene/ps01.cpp
@@ -43,7 +43,7 @@ void SceneScriptPS01::InitializeScene() {
 			Scene_Loop_Set_Default(5);
 		}
 	} else {
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 		Game_Flag_Set(273);
 		Scene_Loop_Start_Special(0, 0, 0);
 		Scene_Loop_Set_Default(1);
@@ -78,15 +78,15 @@ bool SceneScriptPS01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 1920.0f, 16581.0f, -2653.0f, 12, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1920.0f, 16581.0f, -2653.0f, 12, 1, false, 0)) {
 			Game_Flag_Set(718);
 			Set_Enter(62, 66);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 1877.9f, 16592.0f, -2975.0f, 0, 1, false, 0)) {
-			Actor_Set_At_XYZ(0, 1872.0f, 16592.0f, -2975.0f, 870);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1877.9f, 16592.0f, -2975.0f, 0, 1, false, 0)) {
+			Actor_Set_At_XYZ(kActorMcCoy, 1872.0f, 16592.0f, -2975.0f, 870);
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
 			Game_Flag_Reset(179);
@@ -161,7 +161,7 @@ bool SceneScriptPS01::ClickedOnExit(int exitId) {
 				Scene_Loop_Start_Special(1, 4, 1);
 				break;
 			default:
-				Actor_Face_Heading(0, 870, false);
+				Actor_Face_Heading(kActorMcCoy, 870, false);
 				Game_Flag_Set(178);
 				Game_Flag_Set(273);
 				Player_Loses_Control();
@@ -203,23 +203,23 @@ void SceneScriptPS01::SceneFrameAdvanced(int frame) {
 	if (!Game_Flag_Query(273)) {
 		switch (frame) {
 		case 196:
-			Actor_Face_Heading(0, 870, false);
-			Actor_Set_Frame_Rate_FPS(0, -1);
-			Actor_Change_Animation_Mode(0, 41);
+			Actor_Face_Heading(kActorMcCoy, 870, false);
+			Actor_Set_Frame_Rate_FPS(kActorMcCoy, -1);
+			Actor_Change_Animation_Mode(kActorMcCoy, 41);
 			break;
 		case 220:
-			Actor_Set_Frame_Rate_FPS(0, 0);
+			Actor_Set_Frame_Rate_FPS(kActorMcCoy, 0);
 			break;
 		case 240:
-			Actor_Set_Frame_Rate_FPS(0, -2);
+			Actor_Set_Frame_Rate_FPS(kActorMcCoy, -2);
 			break;
 		}
 		//return true;
 		return;
 	}
 	if (frame == 75) {
-		Actor_Face_Heading(0, 870, false);
-		Actor_Change_Animation_Mode(0, 42);
+		Actor_Face_Heading(kActorMcCoy, 870, false);
+		Actor_Change_Animation_Mode(kActorMcCoy, 42);
 		//return true;
 		return;
 	}
@@ -238,12 +238,12 @@ void SceneScriptPS01::SceneFrameAdvanced(int frame) {
 		return;
 	}
 	if (frame == 181) {
-		Actor_Face_Heading(0, 870, false);
-		Actor_Change_Animation_Mode(0, 42);
+		Actor_Face_Heading(kActorMcCoy, 870, false);
+		Actor_Change_Animation_Mode(kActorMcCoy, 42);
 	} else if (frame == 182) {
-		Actor_Set_Frame_Rate_FPS(0, 0);
+		Actor_Set_Frame_Rate_FPS(kActorMcCoy, 0);
 	} else if (frame == 195) {
-		Actor_Set_Frame_Rate_FPS(0, -2);
+		Actor_Set_Frame_Rate_FPS(kActorMcCoy, -2);
 	}
 	//return true;
 	return;
@@ -254,14 +254,14 @@ void SceneScriptPS01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptPS01::PlayerWalkedIn() {
 	if (Game_Flag_Query(130)) {
-		Actor_Set_At_XYZ(0, 1920.0f, 16581.0f, -2653.0f, 150);
+		Actor_Set_At_XYZ(kActorMcCoy, 1920.0f, 16581.0f, -2653.0f, 150);
 		Game_Flag_Reset(130);
 	}
 	//return false;
 }
 
 void SceneScriptPS01::PlayerWalkedOut() {
-	Actor_Set_Invisible(0, false);
+	Actor_Set_Invisible(kActorMcCoy, false);
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	if (!Game_Flag_Query(718) && Global_Variable_Query(1) == 1) {
diff --git a/engines/bladerunner/script/scene/ps02.cpp b/engines/bladerunner/script/scene/ps02.cpp
index 84ae31d82c..0fe062b099 100644
--- a/engines/bladerunner/script/scene/ps02.cpp
+++ b/engines/bladerunner/script/scene/ps02.cpp
@@ -50,34 +50,34 @@ bool SceneScriptPS02::MouseClick(int x, int y) {
 bool SceneScriptPS02::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("E.DOOR01", objectName) || Object_Query_Click("E.D00R02", objectName)) {
 		if (Game_Flag_Query(130) ) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Set_Enter(61, 65);
 				Scene_Loop_Start_Special(1, 3, 1);
 			}
 		} else if (Game_Flag_Query(22) ) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Set_Enter(15, 69);
 				Scene_Loop_Start_Special(1, 3, 1);
 			}
 		} else if (Game_Flag_Query(131) ) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Set_Enter(66, 71);
 				Scene_Loop_Start_Special(1, 3, 1);
 			}
 		} else if (Game_Flag_Query(132) ) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Set_Enter(63, 67);
 				Scene_Loop_Start_Special(1, 3, 1);
 			}
-		} else if (Game_Flag_Query(133)  && !Loop_Actor_Walk_To_XYZ(0, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
+		} else if (Game_Flag_Query(133)  && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -5.0f, -40.0f, -15.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Set_Enter(67, 72);
@@ -118,7 +118,7 @@ void SceneScriptPS02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptPS02::PlayerWalkedIn() {
 	Game_Flag_Reset(718);
-	Actor_Face_XYZ(0, 0, 0, 450.0f, true);
+	Actor_Face_XYZ(kActorMcCoy, 0, 0, 450.0f, true);
 	Player_Gains_Control();
 	sub_4018BC();
 	Player_Loses_Control();
diff --git a/engines/bladerunner/script/scene/ps03.cpp b/engines/bladerunner/script/scene/ps03.cpp
index 347c52305b..d56e0aa943 100644
--- a/engines/bladerunner/script/scene/ps03.cpp
+++ b/engines/bladerunner/script/scene/ps03.cpp
@@ -26,7 +26,7 @@ namespace BladeRunner {
 
 void SceneScriptPS03::InitializeScene() {
 	if (Game_Flag_Query(39)) {
-		Actor_Set_At_XYZ(0, -674.0f, -354.0f, 550.0f, 900);
+		Actor_Set_At_XYZ(kActorMcCoy, -674.0f, -354.0f, 550.0f, 900);
 		Setup_Scene_Information(-674.0f, -354.62f, 550.0f, 900);
 		Game_Flag_Reset(39);
 	} else if (Game_Flag_Query(135)) {
@@ -75,7 +75,7 @@ bool SceneScriptPS03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -674.0f, -354.0f, 550.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -674.0f, -354.0f, 550.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(42);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -84,19 +84,19 @@ bool SceneScriptPS03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -569.54f, -354.62f, -1076.15f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -569.54f, -354.62f, -1076.15f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Set_Enter(62, 66);
 			Game_Flag_Reset(478);
 			if (Global_Variable_Query(1) < 4) {
-				Actor_Set_Goal_Number(4, 100);
+				Actor_Set_Goal_Number(kActorGuzza, 100);
 			}
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -875.0f, -354.0f, -1241.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -875.0f, -354.0f, -1241.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(134);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
diff --git a/engines/bladerunner/script/scene/ps04.cpp b/engines/bladerunner/script/scene/ps04.cpp
index 65dea816b9..a6b855ed2f 100644
--- a/engines/bladerunner/script/scene/ps04.cpp
+++ b/engines/bladerunner/script/scene/ps04.cpp
@@ -25,15 +25,15 @@
 namespace BladeRunner {
 
 void SceneScriptPS04::InitializeScene() {
-	AI_Movement_Track_Pause(4);
+	AI_Movement_Track_Pause(kActorGuzza);
 	if (Game_Flag_Query(42)) {
 		Game_Flag_Reset(42);
 	}
 	Setup_Scene_Information(-668.0f, -354.0f, 974.0f, 475);
 	if (Global_Variable_Query(1) == 1) {
-		Actor_Put_In_Set(4, 64);
-		Actor_Set_At_XYZ(4, -728.0f, -354.0f, 1090.0f, 150);
-		Actor_Change_Animation_Mode(4, 53);
+		Actor_Put_In_Set(kActorGuzza, 64);
+		Actor_Set_At_XYZ(kActorGuzza, -728.0f, -354.0f, 1090.0f, 150);
+		Actor_Change_Animation_Mode(kActorGuzza, 53);
 	}
 	Scene_Exit_Add_2D_Exit(0, 347, 113, 469, 302, 0);
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(0);
@@ -56,12 +56,12 @@ void SceneScriptPS04::SceneLoaded() {
 	Unobstacle_Object("B.DOOR", true);
 	Unobstacle_Object("B.CHAIR01", true);
 	Unclickable_Object("CHAIR07");
-	if (Global_Variable_Query(1) == 2 && !Actor_Clue_Query(0, 80) && !Game_Flag_Query(727)) {
+	if (Global_Variable_Query(1) == 2 && !Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm) && !Game_Flag_Query(727)) {
 		Item_Add_To_World(111, 958, 64, -643.5f, -318.82f, 1148.87f, 525, 16, 12, false, true, false, true);
 		Game_Flag_Set(727);
 	}
-	if (Actor_Query_Is_In_Current_Set(4)) {
-		Actor_Change_Animation_Mode(4, 53);
+	if (Actor_Query_Is_In_Current_Set(kActorGuzza)) {
+		Actor_Change_Animation_Mode(kActorGuzza, 53);
 	}
 }
 
@@ -75,9 +75,9 @@ bool SceneScriptPS04::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptPS04::ClickedOnActor(int actorId) {
 	if (actorId == 4) {
-		if (!Loop_Actor_Walk_To_Actor(0, 4, 36, 1, false)) {
-			Actor_Face_Actor(0, 4, true);
-			Actor_Face_Actor(4, 0, true);
+		if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorGuzza, 36, 1, false)) {
+			Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+			Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
 			sub_4017E4();
 			return true;
 		}
@@ -86,20 +86,20 @@ bool SceneScriptPS04::ClickedOnActor(int actorId) {
 }
 
 bool SceneScriptPS04::ClickedOnItem(int itemId, bool a2) {
-	if (itemId == 111 && Actor_Query_Is_In_Current_Set(4)) {
-		Actor_Says(4, 560, 30);
-	} else if (!Actor_Clue_Query(0, 80)) {
+	if (itemId == 111 && Actor_Query_Is_In_Current_Set(kActorGuzza)) {
+		Actor_Says(kActorGuzza, 560, 30);
+	} else if (!Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm)) {
 		Item_Remove_From_World(111);
 		Item_Pickup_Spin_Effect(958, 464, 362);
-		Actor_Says(0, 4485, 3);
-		Actor_Clue_Acquire(0, 80, 1, 0);
+		Actor_Says(kActorMcCoy, 4485, 3);
+		Actor_Clue_Acquire(kActorMcCoy, kClueWeaponsOrderForm, 1, kActorMcCoy);
 	}
 	return false;
 }
 
 bool SceneScriptPS04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -668.0f, -350.85f, 962.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -668.0f, -350.85f, 962.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(39);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -121,14 +121,14 @@ void SceneScriptPS04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptPS04::PlayerWalkedIn() {
-	if (Actor_Query_Which_Set_In(4) == 64) {
-		Actor_Face_Actor(0, 4, true);
+	if (Actor_Query_Which_Set_In(kActorGuzza) == 64) {
+		Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
 	}
 	//return false;
 }
 
 void SceneScriptPS04::PlayerWalkedOut() {
-	AI_Movement_Track_Unpause(4);
+	AI_Movement_Track_Unpause(kActorGuzza);
 }
 
 void SceneScriptPS04::DialogueQueueFlushed(int a1) {
@@ -137,11 +137,11 @@ void SceneScriptPS04::DialogueQueueFlushed(int a1) {
 void SceneScriptPS04::sub_4017E4() {
 	Dialogue_Menu_Clear_List();
 	if (Global_Variable_Query(1) > 1) {
-		if (Actor_Clue_Query(0, 51)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueAttemptedFileAccess)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(110, 5, 7, 4);
 		}
 		DM_Add_To_List_Never_Repeat_Once_Selected(120, 1, -1, -1);
-		if (Actor_Clue_Query(0, 110)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueHoldensBadge)) {
 			DM_Add_To_List_Never_Repeat_Once_Selected(150, 7, 6, 5);
 		}
 	}
@@ -156,143 +156,143 @@ void SceneScriptPS04::sub_4017E4() {
 	switch (answer) {
 	case 130:
 		if (Game_Flag_Query(40) && !Game_Flag_Query(159)) {
-			Actor_Says(0, 3920, 13);
-			Actor_Says(4, 140, 30);
-			Actor_Face_Current_Camera(4, true);
-			Actor_Says(4, 150, 31);
-			Actor_Says(4, 160, 32);
-			Actor_Says(0, 3925, 18);
-			Actor_Face_Actor(4, 0, true);
-			Actor_Says(4, 170, 33);
-			Loop_Actor_Walk_To_XYZ(0, -716.0f, -354.85f, 1042.0f, 0, 0, false, 0);
-			Actor_Face_Actor(0, 4, true);
-			Actor_Says(0, 3930, 13);
-			Actor_Face_Actor(4, 0, true);
-			Actor_Says(4, 180, 34);
-			Actor_Says(0, 3935, 13);
-			Actor_Says(4, 190, 30);
-			Actor_Says(0, 3940, 16);
-			Actor_Says(4, 200, 31);
-			Actor_Says(4, 210, 33);
-			Actor_Says(4, 220, 34);
-			Actor_Says(0, 3945, 17);
-			Actor_Says(4, 230, 32);
-			Actor_Says(4, 240, 31);
-			Actor_Says(0, 3950, 13);
-			Actor_Says(4, 250, 34);
-			Actor_Says(4, 260, 33);
-			Actor_Says(4, 270, 32);
+			Actor_Says(kActorMcCoy, 3920, 13);
+			Actor_Says(kActorGuzza, 140, 30);
+			Actor_Face_Current_Camera(kActorGuzza, true);
+			Actor_Says(kActorGuzza, 150, 31);
+			Actor_Says(kActorGuzza, 160, 32);
+			Actor_Says(kActorMcCoy, 3925, 18);
+			Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
+			Actor_Says(kActorGuzza, 170, 33);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -716.0f, -354.85f, 1042.0f, 0, 0, false, 0);
+			Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+			Actor_Says(kActorMcCoy, 3930, 13);
+			Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
+			Actor_Says(kActorGuzza, 180, 34);
+			Actor_Says(kActorMcCoy, 3935, 13);
+			Actor_Says(kActorGuzza, 190, 30);
+			Actor_Says(kActorMcCoy, 3940, 16);
+			Actor_Says(kActorGuzza, 200, 31);
+			Actor_Says(kActorGuzza, 210, 33);
+			Actor_Says(kActorGuzza, 220, 34);
+			Actor_Says(kActorMcCoy, 3945, 17);
+			Actor_Says(kActorGuzza, 230, 32);
+			Actor_Says(kActorGuzza, 240, 31);
+			Actor_Says(kActorMcCoy, 3950, 13);
+			Actor_Says(kActorGuzza, 250, 34);
+			Actor_Says(kActorGuzza, 260, 33);
+			Actor_Says(kActorGuzza, 270, 32);
 			Game_Flag_Set(159);
 			if (Query_Difficulty_Level() != 0) {
 				Global_Variable_Increment(2, 200);
 			}
 			Game_Flag_Set(723);
 		} else if (Game_Flag_Query(41) && !Game_Flag_Query(160)) {
-			Actor_Says(0, 3955, 13);
-			Actor_Says(4, 280, 30);
-			Actor_Says(0, 3960, 18);
-			Actor_Says(4, 290, 32);
-			Actor_Says(4, 300, 31);
-			Actor_Says(0, 3965, 13);
-			Actor_Says(4, 310, 33);
-			Actor_Says(4, 320, 34);
+			Actor_Says(kActorMcCoy, 3955, 13);
+			Actor_Says(kActorGuzza, 280, 30);
+			Actor_Says(kActorMcCoy, 3960, 18);
+			Actor_Says(kActorGuzza, 290, 32);
+			Actor_Says(kActorGuzza, 300, 31);
+			Actor_Says(kActorMcCoy, 3965, 13);
+			Actor_Says(kActorGuzza, 310, 33);
+			Actor_Says(kActorGuzza, 320, 34);
 			Game_Flag_Set(160);
-		} else if ((Actor_Clue_Query(0, 8) || Actor_Clue_Query(0, 9)) && Actor_Clue_Query(0, 22) && Actor_Query_Friendliness_To_Other(4, 0) < 50 && !Game_Flag_Query(161)) {
-			Actor_Says(0, 3970, 18);
-			Actor_Says(4, 330, 30);
-			Actor_Says(4, 340, 32);
-			Actor_Says(0, 3975, 13);
-			Actor_Says(4, 350, 31);
-			Actor_Says(4, 360, 34);
-			Actor_Says(0, 3980, 13);
-			Actor_Says(4, 370, 33);
-			Actor_Says(4, 380, 32);
-			Actor_Says(4, 390, 31);
-			Actor_Says(0, 3985, 18);
-			Actor_Says(4, 400, 34);
-			Actor_Says(4, 410, 31);
+		} else if ((Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu)) && Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) && Actor_Query_Friendliness_To_Other(kActorGuzza, kActorMcCoy) < 50 && !Game_Flag_Query(161)) {
+			Actor_Says(kActorMcCoy, 3970, 18);
+			Actor_Says(kActorGuzza, 330, 30);
+			Actor_Says(kActorGuzza, 340, 32);
+			Actor_Says(kActorMcCoy, 3975, 13);
+			Actor_Says(kActorGuzza, 350, 31);
+			Actor_Says(kActorGuzza, 360, 34);
+			Actor_Says(kActorMcCoy, 3980, 13);
+			Actor_Says(kActorGuzza, 370, 33);
+			Actor_Says(kActorGuzza, 380, 32);
+			Actor_Says(kActorGuzza, 390, 31);
+			Actor_Says(kActorMcCoy, 3985, 18);
+			Actor_Says(kActorGuzza, 400, 34);
+			Actor_Says(kActorGuzza, 410, 31);
 			Game_Flag_Set(161);
-		} else if ((Actor_Clue_Query(0, 8) || Actor_Clue_Query(0, 9))
-			&& Actor_Clue_Query(0, 22)
+		} else if ((Actor_Clue_Query(kActorMcCoy, kClueChopstickWrapper) || Actor_Clue_Query(kActorMcCoy, kClueSushiMenu))
+			&& Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA)
 			&& !Game_Flag_Query(162)) {
-			Actor_Says(0, 3920, 13);
-			Actor_Says(4, 570, 32);
-			Actor_Says(0, 4070, 13);
+			Actor_Says(kActorMcCoy, 3920, 13);
+			Actor_Says(kActorGuzza, 570, 32);
+			Actor_Says(kActorMcCoy, 4070, 13);
 			Game_Flag_Set(162);
-		} else if (Actor_Query_Friendliness_To_Other(4, 0) >= 50) {
-			Actor_Says(0, 4020, 13);
-			Actor_Says(4, 580, 34);
-			Actor_Says(0, 4075, 16);
-			Actor_Says(4, 590, 33);
+		} else if (Actor_Query_Friendliness_To_Other(kActorGuzza, kActorMcCoy) >= 50) {
+			Actor_Says(kActorMcCoy, 4020, 13);
+			Actor_Says(kActorGuzza, 580, 34);
+			Actor_Says(kActorMcCoy, 4075, 16);
+			Actor_Says(kActorGuzza, 590, 33);
 		} else {
-			Actor_Says(0, 4020, 18);
-			Actor_Says(4, 130, 30);
-			Actor_Face_Current_Camera(4, true);
-			Actor_Says(0, 3915, 13);
+			Actor_Says(kActorMcCoy, 4020, 18);
+			Actor_Says(kActorGuzza, 130, 30);
+			Actor_Face_Current_Camera(kActorGuzza, true);
+			Actor_Says(kActorMcCoy, 3915, 13);
 		}
 		break;
 	case 110:
-		Actor_Says(0, 3990, 19);
-		Actor_Says(0, 3995, 17);
-		Actor_Says(4, 440, 31);
-		Actor_Says(0, 4035, 13);
-		Actor_Says(4, 450, 34);
-		Actor_Says(4, 460, 33);
-		Actor_Says(0, 4040, 17);
+		Actor_Says(kActorMcCoy, 3990, 19);
+		Actor_Says(kActorMcCoy, 3995, 17);
+		Actor_Says(kActorGuzza, 440, 31);
+		Actor_Says(kActorMcCoy, 4035, 13);
+		Actor_Says(kActorGuzza, 450, 34);
+		Actor_Says(kActorGuzza, 460, 33);
+		Actor_Says(kActorMcCoy, 4040, 17);
 		Game_Flag_Set(625);
 		break;
 	case 120:
-		Actor_Says(0, 4000, 18);
-		Actor_Clue_Acquire(0, 82, 1, 4);
-		Actor_Says(4, 520, 33);
-		Actor_Says(0, 4055, 13);
-		Actor_Says(4, 530, 31);
-		Actor_Says(0, 4060, 13);
-		Actor_Says(4, 540, 31);
-		Actor_Says(4, 550, 32);
-		Actor_Says(0, 4065, 18);
-		Actor_Says(4, 560, 34);
+		Actor_Says(kActorMcCoy, 4000, 18);
+		Actor_Clue_Acquire(kActorMcCoy, kClueGuzzasCash, 1, kActorGuzza);
+		Actor_Says(kActorGuzza, 520, 33);
+		Actor_Says(kActorMcCoy, 4055, 13);
+		Actor_Says(kActorGuzza, 530, 31);
+		Actor_Says(kActorMcCoy, 4060, 13);
+		Actor_Says(kActorGuzza, 540, 31);
+		Actor_Says(kActorGuzza, 550, 32);
+		Actor_Says(kActorMcCoy, 4065, 18);
+		Actor_Says(kActorGuzza, 560, 34);
 		if (Query_Difficulty_Level() != 0) {
 			Global_Variable_Increment(2, 100);
 		}
 		break;
 	case 140:
-		Actor_Says(0, 4010, 12);
-		Actor_Says(4, 600, 31);
-		Actor_Says(0, 4080, 18);
-		Actor_Says(4, 610, 33);
-		Actor_Face_Heading(4, 400, false);
-		Actor_Says(4, 620, 32);
-		Actor_Face_Actor(4, 0, true);
-		Actor_Says(4, 700, 34);
-		Actor_Says(0, 4100, 13);
-		Actor_Says(4, 710, 31);
-		Actor_Says(4, 720, 34);
-		Actor_Says(0, 4105, 18);
-		Loop_Actor_Walk_To_XYZ(0, -668.0f, -350.85f, 962.0f, 0, 0, false, 0);
-		Actor_Says(4, 730, 32);
-		Actor_Face_Actor(0, 4, true);
-		Loop_Actor_Walk_To_XYZ(0, -716.0f, -354.85f, 1042.0f, 0, 0, false, 0);
-		Actor_Face_Actor(4, 0, true);
-		Actor_Says(4, 740, 31);
-		Actor_Says(4, 750, 32);
-		Actor_Says(4, 760, 33);
-		Actor_Face_Actor(0, 4, true);
-		Actor_Says(0, 4110, 13);
-		Actor_Says(4, 770, 32);
-		Actor_Says(4, 780, 31);
+		Actor_Says(kActorMcCoy, 4010, 12);
+		Actor_Says(kActorGuzza, 600, 31);
+		Actor_Says(kActorMcCoy, 4080, 18);
+		Actor_Says(kActorGuzza, 610, 33);
+		Actor_Face_Heading(kActorGuzza, 400, false);
+		Actor_Says(kActorGuzza, 620, 32);
+		Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
+		Actor_Says(kActorGuzza, 700, 34);
+		Actor_Says(kActorMcCoy, 4100, 13);
+		Actor_Says(kActorGuzza, 710, 31);
+		Actor_Says(kActorGuzza, 720, 34);
+		Actor_Says(kActorMcCoy, 4105, 18);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -668.0f, -350.85f, 962.0f, 0, 0, false, 0);
+		Actor_Says(kActorGuzza, 730, 32);
+		Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -716.0f, -354.85f, 1042.0f, 0, 0, false, 0);
+		Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
+		Actor_Says(kActorGuzza, 740, 31);
+		Actor_Says(kActorGuzza, 750, 32);
+		Actor_Says(kActorGuzza, 760, 33);
+		Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+		Actor_Says(kActorMcCoy, 4110, 13);
+		Actor_Says(kActorGuzza, 770, 32);
+		Actor_Says(kActorGuzza, 780, 31);
 		break;
 	case 150:
-		Actor_Says(0, 4015, 16);
-		Actor_Says(4, 630, 34);
-		Actor_Says(0, 4085, 19);
-		Actor_Says(0, 4090, 18);
-		Actor_Says(4, 640, 31);
-		Actor_Says(4, 650, 32);
-		Actor_Says(4, 670, 34);
-		Actor_Says(0, 4095, 17);
-		Actor_Says(4, 680, 32);
-		Actor_Says(4, 690, 31);
+		Actor_Says(kActorMcCoy, 4015, 16);
+		Actor_Says(kActorGuzza, 630, 34);
+		Actor_Says(kActorMcCoy, 4085, 19);
+		Actor_Says(kActorMcCoy, 4090, 18);
+		Actor_Says(kActorGuzza, 640, 31);
+		Actor_Says(kActorGuzza, 650, 32);
+		Actor_Says(kActorGuzza, 670, 34);
+		Actor_Says(kActorMcCoy, 4095, 17);
+		Actor_Says(kActorGuzza, 680, 32);
+		Actor_Says(kActorGuzza, 690, 31);
 		break;
 	default:
 		//TODO: what is this for?
diff --git a/engines/bladerunner/script/scene/ps05.cpp b/engines/bladerunner/script/scene/ps05.cpp
index 97778f6f5f..59e8bbcbbb 100644
--- a/engines/bladerunner/script/scene/ps05.cpp
+++ b/engines/bladerunner/script/scene/ps05.cpp
@@ -64,24 +64,24 @@ bool SceneScriptPS05::MouseClick(int x, int y) {
 }
 
 bool SceneScriptPS05::ClickedOn3DObject(const char *objectName, bool a2) {
-	if (Object_Query_Click("WATER FOUNTAIN", objectName) && !Loop_Actor_Walk_To_Scene_Object(0, "WATER FOUNTAIN", 12, 1, false)) {
-		Actor_Face_Object(0, "WATER FOUNTAIN", true);
-		Actor_Says(0, 3490, 18);
+	if (Object_Query_Click("WATER FOUNTAIN", objectName) && !Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "WATER FOUNTAIN", 12, true, false)) {
+		Actor_Face_Object(kActorMcCoy, "WATER FOUNTAIN", true);
+		Actor_Says(kActorMcCoy, 3490, 18);
 	}
-	if (Object_Query_Click("ASHTRAY", objectName) && !Loop_Actor_Walk_To_XYZ(0, 662.0f, 0.37f, -180.0f, 0, 1, false, 0)) {
-		Actor_Face_Object(0, "ASHTRAY", true);
-		Actor_Voice_Over(1770, 99);
-		Actor_Voice_Over(1780, 99);
-		Actor_Voice_Over(1790, 99);
+	if (Object_Query_Click("ASHTRAY", objectName) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 662.0f, 0.37f, -180.0f, 0, 1, false, 0)) {
+		Actor_Face_Object(kActorMcCoy, "ASHTRAY", true);
+		Actor_Voice_Over(1770, kActorVoiceOver);
+		Actor_Voice_Over(1780, kActorVoiceOver);
+		Actor_Voice_Over(1790, kActorVoiceOver);
 	}
-	if (Object_Query_Click("WIRE BASKET", objectName) && !Loop_Actor_Walk_To_Scene_Object(0, "WIRE BASKET", 12, 1, false)) {
-		Actor_Face_Object(0, "WIRE BASKET", true);
-		Actor_Voice_Over(1810, 99);
-		Actor_Voice_Over(1820, 99);
+	if (Object_Query_Click("WIRE BASKET", objectName) && !Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "WIRE BASKET", 12, true, false)) {
+		Actor_Face_Object(kActorMcCoy, "WIRE BASKET", true);
+		Actor_Voice_Over(1810, kActorVoiceOver);
+		Actor_Voice_Over(1820, kActorVoiceOver);
 	}
-	if (Object_Query_Click("WANTED POSTERS", objectName) && !Loop_Actor_Walk_To_Scene_Object(0, "WANTED POSTERS", 12, 1, false)) {
-		Actor_Face_Object(0, "WANTED POSTERS", true);
-		Actor_Voice_Over(1800, 99);
+	if (Object_Query_Click("WANTED POSTERS", objectName) && !Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "WANTED POSTERS", 12, true, false)) {
+		Actor_Face_Object(kActorMcCoy, "WANTED POSTERS", true);
+		Actor_Voice_Over(1800, kActorVoiceOver);
 	}
 	return false;
 }
@@ -92,7 +92,7 @@ bool SceneScriptPS05::ClickedOnActor(int actorId) {
 
 bool SceneScriptPS05::ClickedOnItem(int itemId, bool a2) {
 	if (Game_Flag_Query(23)) {
-		Actor_Set_At_XYZ(0, 718.72f, 0.37f, -461.26f, 600);
+		Actor_Set_At_XYZ(kActorMcCoy, 718.72f, 0.37f, -461.26f, 600);
 	} else if (Game_Flag_Query(22)) {
 		sub_401B34();
 		sub_401C30();
@@ -106,7 +106,7 @@ bool SceneScriptPS05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 2, 24, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 2, 24, 1, false)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Set_Enter(101, 119);
@@ -114,7 +114,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 635.0f, 0.0f, -598.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 635.0f, 0.0f, -598.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Set_Enter(62, 66);
@@ -122,7 +122,7 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 742.52002f, 0.37f, -457.69f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 742.52002f, 0.37f, -457.69f, 0, 1, false, 0)) {
 			Game_Flag_Set(136);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -134,8 +134,8 @@ bool SceneScriptPS05::ClickedOnExit(int exitId) {
 }
 
 bool SceneScriptPS05::ClickedOn2DRegion(int region) {
-	if (region == 0 && !Loop_Actor_Walk_To_XYZ(0, 694.78f, 0.37f, -321.05f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 130, false);
+	if (region == 0 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 694.78f, 0.37f, -321.05f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 130, false);
 		View_Score_Board();
 	}
 	return false;
@@ -195,47 +195,47 @@ void SceneScriptPS05::sub_401C30() {
 	case 4:
 		if (!Game_Flag_Query(692)) {
 			Overlay_Play("PS05OVER", 0, 1, 0, 0);
-			ADQ_Add(61, 230, 3);
-			ADQ_Add(61, 240, 3);
+			ADQ_Add(kActorNewscaster, 230, 3);
+			ADQ_Add(kActorNewscaster, 240, 3);
 			Game_Flag_Set(692);
 		}
 		break;
 	case 3:
 		if (!Game_Flag_Query(691)) {
 			Overlay_Play("PS05OVER", 0, 1, 0, 0);
-			ADQ_Add(61, 170, 3);
-			ADQ_Add(61, 180, 3);
-			ADQ_Add(61, 190, 3);
-			ADQ_Add(61, 200, 3);
-			ADQ_Add(61, 210, 3);
-			ADQ_Add(61, 220, 3);
-			ADQ_Add(41, 80, 3);
-			ADQ_Add(41, 90, 3);
-			ADQ_Add(41, 100, 3);
-			ADQ_Add(41, 110, 3);
-			ADQ_Add(41, 120, 3);
-			ADQ_Add(41, 130, 3);
+			ADQ_Add(kActorNewscaster, 170, 3);
+			ADQ_Add(kActorNewscaster, 180, 3);
+			ADQ_Add(kActorNewscaster, 190, 3);
+			ADQ_Add(kActorNewscaster, 200, 3);
+			ADQ_Add(kActorNewscaster, 210, 3);
+			ADQ_Add(kActorNewscaster, 220, 3);
+			ADQ_Add(kActorGovernorKolvig, 80, 3);
+			ADQ_Add(kActorGovernorKolvig, 90, 3);
+			ADQ_Add(kActorGovernorKolvig, 100, 3);
+			ADQ_Add(kActorGovernorKolvig, 110, 3);
+			ADQ_Add(kActorGovernorKolvig, 120, 3);
+			ADQ_Add(kActorGovernorKolvig, 130, 3);
 			Game_Flag_Set(691);
 		}
 		break;
 	case 2:
 		if (!Game_Flag_Query(690)) {
 			Overlay_Play("PS05OVER", 0, 1, 0, 0);
-			if (Actor_Query_Friendliness_To_Other(5, 0) > Actor_Query_Friendliness_To_Other(1, 0)) {
-				ADQ_Add(61, 120, 3);
-				ADQ_Add(61, 130, 3);
-				ADQ_Add(61, 140, 3);
-				ADQ_Add(61, 150, 3);
-				ADQ_Add(4, 1570, 3);
-				ADQ_Add(4, 1580, 3);
-				ADQ_Add(4, 1590, 3);
+			if (Actor_Query_Friendliness_To_Other(kActorClovis, kActorMcCoy) > Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy)) {
+				ADQ_Add(kActorNewscaster, 120, 3);
+				ADQ_Add(kActorNewscaster, 130, 3);
+				ADQ_Add(kActorNewscaster, 140, 3);
+				ADQ_Add(kActorNewscaster, 150, 3);
+				ADQ_Add(kActorGuzza, 1570, 3);
+				ADQ_Add(kActorGuzza, 1580, 3);
+				ADQ_Add(kActorGuzza, 1590, 3);
 			} else {
-				ADQ_Add(61, 90, 3);
-				ADQ_Add(61, 100, 3);
-				ADQ_Add(61, 110, 3);
-				ADQ_Add(4, 1540, 3);
-				ADQ_Add(4, 1550, 3);
-				ADQ_Add(4, 1560, 3);
+				ADQ_Add(kActorNewscaster, 90, 3);
+				ADQ_Add(kActorNewscaster, 100, 3);
+				ADQ_Add(kActorNewscaster, 110, 3);
+				ADQ_Add(kActorGuzza, 1540, 3);
+				ADQ_Add(kActorGuzza, 1550, 3);
+				ADQ_Add(kActorGuzza, 1560, 3);
 			}
 			Game_Flag_Set(690);
 		}
@@ -243,25 +243,25 @@ void SceneScriptPS05::sub_401C30() {
 	case 1:
 		if (!Game_Flag_Query(689)) {
 			Overlay_Play("PS05OVER", 0, 1, 0, 0);
-			ADQ_Add(61, 40, 3);
-			ADQ_Add(61, 50, 3);
-			ADQ_Add(61, 60, 3);
-			ADQ_Add(61, 70, 3);
-			ADQ_Add(61, 80, 3);
+			ADQ_Add(kActorNewscaster, 40, 3);
+			ADQ_Add(kActorNewscaster, 50, 3);
+			ADQ_Add(kActorNewscaster, 60, 3);
+			ADQ_Add(kActorNewscaster, 70, 3);
+			ADQ_Add(kActorNewscaster, 80, 3);
 			Game_Flag_Set(689);
 		}
 		break;
 	case 0:
 		if (!Game_Flag_Query(688)) {
 			Overlay_Play("PS05OVER", 0, 1, 0, 0);
-			ADQ_Add(61, 0, 3);
-			ADQ_Add(61, 10, 3);
-			ADQ_Add(61, 20, 3);
-			ADQ_Add(61, 30, 3);
-			ADQ_Add(51, 430, 3);
-			ADQ_Add(51, 440, 3);
-			ADQ_Add(51, 450, 3);
-			ADQ_Add(51, 460, 3);
+			ADQ_Add(kActorNewscaster, 0, 3);
+			ADQ_Add(kActorNewscaster, 10, 3);
+			ADQ_Add(kActorNewscaster, 20, 3);
+			ADQ_Add(kActorNewscaster, 30, 3);
+			ADQ_Add(kActorTyrell, 430, 3);
+			ADQ_Add(kActorTyrell, 440, 3);
+			ADQ_Add(kActorTyrell, 450, 3);
+			ADQ_Add(kActorTyrell, 460, 3);
 			Game_Flag_Set(688);
 		}
 		break;
diff --git a/engines/bladerunner/script/scene/ps06.cpp b/engines/bladerunner/script/scene/ps06.cpp
index fdb5e9b109..f51ee7cf01 100644
--- a/engines/bladerunner/script/scene/ps06.cpp
+++ b/engines/bladerunner/script/scene/ps06.cpp
@@ -50,43 +50,43 @@ bool SceneScriptPS06::ClickedOn3DObject(const char *objectName, bool a2) {
 		return true;
 	}
 	if (Object_Query_Click("E.SCREEN03", objectName) || Object_Query_Click("E.MONITOR3", objectName)) {
-		Actor_Says(39, 330, 3);
-		if (!Actor_Clue_Query(0, 111) || Actor_Clue_Query(0, 113) || Actor_Clue_Query(0, 114) || Actor_Clue_Query(0, 115)) {
-			Actor_Clues_Transfer_New_To_Mainframe(0);
+		Actor_Says(kActorAnsweringMachine, 330, 3);
+		if (!Actor_Clue_Query(kActorMcCoy, kClueCar) || Actor_Clue_Query(kActorMcCoy, kClueCarRegistration1) || Actor_Clue_Query(kActorMcCoy, kClueCarRegistration2) || Actor_Clue_Query(kActorMcCoy, kClueCarRegistration3)) {
+			Actor_Clues_Transfer_New_To_Mainframe(kActorMcCoy);
 			Ambient_Sounds_Play_Sound(587, 50, 0, 0, 99);
 			Delay(2000);
-			Actor_Says(39, 340, 3);
-			Actor_Clues_Transfer_New_From_Mainframe(0);
+			Actor_Says(kActorAnsweringMachine, 340, 3);
+			Actor_Clues_Transfer_New_From_Mainframe(kActorMcCoy);
 			Ambient_Sounds_Play_Sound(587, 50, 0, 0, 99);
 			Delay(2000);
 			Ambient_Sounds_Play_Sound(588, 80, 0, 0, 99);
-			Actor_Says(39, 350, 3);
+			Actor_Says(kActorAnsweringMachine, 350, 3);
 			return true;
 		} else {
 			Delay(2000);
-			Actor_Voice_Over(3780, 99);
-			Actor_Voice_Over(3790, 99);
+			Actor_Voice_Over(3780, kActorVoiceOver);
+			Actor_Voice_Over(3790, kActorVoiceOver);
 			if (Game_Flag_Query(47)) {
-				Actor_Voice_Over(3800, 99);
-				Actor_Voice_Over(3810, 99);
-				Actor_Voice_Over(3820, 99);
-				Actor_Voice_Over(3830, 99);
-				Actor_Clue_Acquire(0, 113, 1, -1);
+				Actor_Voice_Over(3800, kActorVoiceOver);
+				Actor_Voice_Over(3810, kActorVoiceOver);
+				Actor_Voice_Over(3820, kActorVoiceOver);
+				Actor_Voice_Over(3830, kActorVoiceOver);
+				Actor_Clue_Acquire(kActorMcCoy, kClueCarRegistration1, 1, -1);
 			} else if (Game_Flag_Query(45)) {
-				Actor_Voice_Over(3840, 99);
-				Actor_Voice_Over(3850, 99);
-				Actor_Voice_Over(3860, 99);
-				Actor_Voice_Over(3870, 99);
-				Actor_Clue_Acquire(0, 114, 1, -1);
+				Actor_Voice_Over(3840, kActorVoiceOver);
+				Actor_Voice_Over(3850, kActorVoiceOver);
+				Actor_Voice_Over(3860, kActorVoiceOver);
+				Actor_Voice_Over(3870, kActorVoiceOver);
+				Actor_Clue_Acquire(kActorMcCoy, kClueCarRegistration2, 1, -1);
 			} else {
-				Actor_Voice_Over(3880, 99);
-				Actor_Voice_Over(3890, 99);
-				Actor_Voice_Over(3900, 99);
-				Actor_Voice_Over(3910, 99);
-				Actor_Clue_Acquire(0, 115, 1, -1);
+				Actor_Voice_Over(3880, kActorVoiceOver);
+				Actor_Voice_Over(3890, kActorVoiceOver);
+				Actor_Voice_Over(3900, kActorVoiceOver);
+				Actor_Voice_Over(3910, kActorVoiceOver);
+				Actor_Clue_Acquire(kActorMcCoy, kClueCarRegistration3, 1, -1);
 			}
-			Actor_Clues_Transfer_New_To_Mainframe(0);
-			Actor_Clues_Transfer_New_From_Mainframe(0);
+			Actor_Clues_Transfer_New_To_Mainframe(kActorMcCoy);
+			Actor_Clues_Transfer_New_From_Mainframe(kActorMcCoy);
 			return true;
 		}
 	}
diff --git a/engines/bladerunner/script/scene/ps07.cpp b/engines/bladerunner/script/scene/ps07.cpp
index c67ccaf658..ffe51c2f63 100644
--- a/engines/bladerunner/script/scene/ps07.cpp
+++ b/engines/bladerunner/script/scene/ps07.cpp
@@ -54,10 +54,10 @@ 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 (Actor_Query_Goal_Number(30) < 4 && Actor_Query_Goal_Number(30) > 0) {
-			Actor_Face_Actor(0, 30, true);
-			Actor_Set_Goal_Number(30, 3);
-			Actor_Modify_Friendliness_To_Other(30, 0, -3);
+		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);
+			Actor_Modify_Friendliness_To_Other(kActorKlein, kActorMcCoy, -3);
 		}
 		return true;
 	}
@@ -66,64 +66,64 @@ bool SceneScriptPS07::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptPS07::ClickedOnActor(int actorId) {
 	if (actorId == 30) {
-		Actor_Face_Actor(0, 30, true);
-		Actor_Set_Goal_Number(30, 3);
+		Actor_Face_Actor(kActorMcCoy, kActorKlein, true);
+		Actor_Set_Goal_Number(kActorKlein, 3);
 		if (!Game_Flag_Query(111)) {
-			Actor_Says(0, 4115, 13);
+			Actor_Says(kActorMcCoy, 4115, 13);
 		}
 		if (!Game_Flag_Query(111) && (Game_Flag_Query(125) || Game_Flag_Query(126) || Game_Flag_Query(127) || Game_Flag_Query(128))) {
-			Actor_Face_Actor(30, 0, true);
-			Actor_Says(30, 30, 12);
+			Actor_Face_Actor(kActorKlein, kActorMcCoy, true);
+			Actor_Says(kActorKlein, 30, 12);
 			Game_Flag_Set(111);
 		} else {
 			if (Game_Flag_Query(111)) {
-				Actor_Says(0, 4130, 18);
+				Actor_Says(kActorMcCoy, 4130, 18);
 			}
 		}
 		if (Game_Flag_Query(125) && !Game_Flag_Query(12)) {
 			Game_Flag_Set(12);
-			Actor_Clue_Acquire(0, 11, 0, 30);
-			Actor_Says(30, 50, 16);
-			Actor_Says(0, 4135, 13);
-			Actor_Says(30, 60, 15);
-			Actor_Says(30, 70, 12);
-			Actor_Says(0, 4140, 18);
-			Actor_Says(30, 80, 14);
-			Actor_Says(30, 90, 14);
-			Actor_Set_Goal_Number(30, 1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueLabShellCasings, 0, kActorKlein);
+			Actor_Says(kActorKlein, 50, 16);
+			Actor_Says(kActorMcCoy, 4135, 13);
+			Actor_Says(kActorKlein, 60, 15);
+			Actor_Says(kActorKlein, 70, 12);
+			Actor_Says(kActorMcCoy, 4140, 18);
+			Actor_Says(kActorKlein, 80, 14);
+			Actor_Says(kActorKlein, 90, 14);
+			Actor_Set_Goal_Number(kActorKlein, 1);
 			return true;
 		}
 		if (Game_Flag_Query(126) && !Game_Flag_Query(13)) {
 			Game_Flag_Set(13);
-			Actor_Clue_Acquire(0, 10, 0, 30);
+			Actor_Clue_Acquire(kActorMcCoy, kClueLabCorpses, 0, kActorKlein);
 			sub_401D60();
-			Actor_Set_Goal_Number(30, 1);
+			Actor_Set_Goal_Number(kActorKlein, 1);
 			return true;
 		}
 		if (Game_Flag_Query(127) && !Game_Flag_Query(104)) {
 			Game_Flag_Set(104);
-			Actor_Clue_Acquire(0, 39, 0, 30);
-			Actor_Says(30, 170, 14);
-			Actor_Says(0, 4180, 13);
-			Actor_Says(30, 180, 12);
-			Actor_Says(30, 190, 13);
-			Actor_Says(30, 200, 16);
-			Actor_Says(0, 4185, 18);
-			Actor_Says(30, 210, 12);
-			Actor_Modify_Friendliness_To_Other(30, 0, -12);
-			Actor_Set_Goal_Number(30, 1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueLabPaintTransfer, 0, kActorKlein);
+			Actor_Says(kActorKlein, 170, 14);
+			Actor_Says(kActorMcCoy, 4180, 13);
+			Actor_Says(kActorKlein, 180, 12);
+			Actor_Says(kActorKlein, 190, 13);
+			Actor_Says(kActorKlein, 200, 16);
+			Actor_Says(kActorMcCoy, 4185, 18);
+			Actor_Says(kActorKlein, 210, 12);
+			Actor_Modify_Friendliness_To_Other(kActorKlein, kActorMcCoy, -12);
+			Actor_Set_Goal_Number(kActorKlein, 1);
 			return true;
 		}
 		if (Game_Flag_Query(128) && !Game_Flag_Query(105)) {
 			Game_Flag_Set(105);
-			Actor_Says(30, 220, 12);
-			Actor_Says(0, 4190, 13);
-			Actor_Says(30, 230, 14);
-			Actor_Set_Goal_Number(30, 1);
+			Actor_Says(kActorKlein, 220, 12);
+			Actor_Says(kActorMcCoy, 4190, 13);
+			Actor_Says(kActorKlein, 230, 14);
+			Actor_Set_Goal_Number(kActorKlein, 1);
 			return true;
 		}
-		Actor_Says(30, 0, 13);
-		Actor_Set_Goal_Number(30, 1);
+		Actor_Says(kActorKlein, 0, 13);
+		Actor_Set_Goal_Number(kActorKlein, 1);
 		return true;
 	}
 	return false;
@@ -136,7 +136,7 @@ bool SceneScriptPS07::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS07::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 609.07f, 0.22f, -598.67f, 0, 0, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 609.07f, 0.22f, -598.67f, 0, 0, false, 0)) {
 			Set_Enter(62, 66);
 		}
 		return true;
@@ -155,14 +155,14 @@ void SceneScriptPS07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptPS07::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_XYZ(0, 561.07f, 0.34f, -606.67f, 6, 0, false, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 561.07f, 0.34f, -606.67f, 6, 0, false, 0);
 	Game_Flag_Reset(131);
 	//return false;
 }
 
 void SceneScriptPS07::PlayerWalkedOut() {
 	if (!Game_Flag_Query(138) && Global_Variable_Query(1) == 1) {
-		Actor_Set_Goal_Number(30, 0);
+		Actor_Set_Goal_Number(kActorKlein, 0);
 	}
 }
 
@@ -170,20 +170,20 @@ void SceneScriptPS07::DialogueQueueFlushed(int a1) {
 }
 
 void SceneScriptPS07::sub_401D60() {
-	Actor_Says(30, 100, 13);
-	Actor_Says(0, 4145, 13);
-	Actor_Says(30, 110, 12);
-	Actor_Says(0, 4150, 13);
-	Actor_Says(30, 120, 14);
-	Actor_Says(0, 4155, 17);
-	Actor_Says(30, 130, 15);
-	Actor_Says(0, 4160, 13);
-	Actor_Says(30, 140, 16);
-	Actor_Says(0, 4165, 18);
-	Actor_Says(30, 160, 13);
-	Actor_Says(0, 4170, 19);
-	Actor_Says(0, 4175, 19);
-	Actor_Modify_Friendliness_To_Other(30, 0, 3);
+	Actor_Says(kActorKlein, 100, 13);
+	Actor_Says(kActorMcCoy, 4145, 13);
+	Actor_Says(kActorKlein, 110, 12);
+	Actor_Says(kActorMcCoy, 4150, 13);
+	Actor_Says(kActorKlein, 120, 14);
+	Actor_Says(kActorMcCoy, 4155, 17);
+	Actor_Says(kActorKlein, 130, 15);
+	Actor_Says(kActorMcCoy, 4160, 13);
+	Actor_Says(kActorKlein, 140, 16);
+	Actor_Says(kActorMcCoy, 4165, 18);
+	Actor_Says(kActorKlein, 160, 13);
+	Actor_Says(kActorMcCoy, 4170, 19);
+	Actor_Says(kActorMcCoy, 4175, 19);
+	Actor_Modify_Friendliness_To_Other(kActorKlein, kActorMcCoy, 3);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/ps09.cpp b/engines/bladerunner/script/scene/ps09.cpp
index fa28841a47..848999063e 100644
--- a/engines/bladerunner/script/scene/ps09.cpp
+++ b/engines/bladerunner/script/scene/ps09.cpp
@@ -39,21 +39,21 @@ void SceneScriptPS09::InitializeScene() {
 	Ambient_Sounds_Add_Sound(126, 25, 60, 7, 10, 100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(127, 25, 60, 7, 10, 100, 100, -101, -101, 0, 0);
 	if (!Game_Flag_Query(55)) {
-		Actor_Put_In_Set(11, 67);
-		Actor_Set_At_XYZ(11, -417.88f, 0.0f, -200.74f, 512);
+		Actor_Put_In_Set(kActorGrigorian, 67);
+		Actor_Set_At_XYZ(kActorGrigorian, -417.88f, 0.0f, -200.74f, 512);
 		Game_Flag_Set(55);
 	}
 	if (Game_Flag_Query(465)) {
-		Actor_Put_In_Set(11, 94);
-		Actor_Set_At_XYZ(11, 0.0f, 0.0f, 0.0f, 512);
+		Actor_Put_In_Set(kActorGrigorian, 94);
+		Actor_Set_At_XYZ(kActorGrigorian, 0.0f, 0.0f, 0.0f, 512);
 	}
-	if (Game_Flag_Query(164) ) {
-		Actor_Put_In_Set(7, 67);
-		Actor_Set_At_XYZ(7, -476.0f, 0.2f, -225.0f, 518);
+	if (Game_Flag_Query(164)) {
+		Actor_Put_In_Set(kActorIzo, 67);
+		Actor_Set_At_XYZ(kActorIzo, -476.0f, 0.2f, -225.0f, 518);
 	}
-	if (Game_Flag_Query(165) ) {
-		Actor_Put_In_Set(9, 67);
-		Actor_Set_At_XYZ(9, -290.0f, 0.33f, -235.0f, 207);
+	if (Game_Flag_Query(165)) {
+		Actor_Put_In_Set(kActorCrazylegs, 67);
+		Actor_Set_At_XYZ(kActorCrazylegs, -290.0f, 0.33f, -235.0f, 207);
 	}
 }
 
@@ -72,97 +72,97 @@ bool SceneScriptPS09::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptPS09::ClickedOnActor(int actorId) {
-	if (actorId == 11 && !Loop_Actor_Walk_To_XYZ(0, -381.11f, 0.0f, -135.55f, 0, 1, false, 0)) {
-		Actor_Face_Actor(0, 11, true);
-		Actor_Face_Actor(11, 0, true);
+	if (actorId == 11 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -381.11f, 0.0f, -135.55f, 0, 1, false, 0)) {
+		Actor_Face_Actor(kActorMcCoy, kActorGrigorian, true);
+		Actor_Face_Actor(kActorGrigorian, kActorMcCoy, true);
 		if (!Game_Flag_Query(49)) {
-			Actor_Says(11, 0, 12);
-			Actor_Says(0, 4235, 18);
-			Actor_Says(11, 10, 13);
+			Actor_Says(kActorGrigorian, 0, 12);
+			Actor_Says(kActorMcCoy, 4235, 18);
+			Actor_Says(kActorGrigorian, 10, 13);
 			Game_Flag_Set(49);
 			return true;
 		}
-		if (Game_Flag_Query(49)  && !Game_Flag_Query(54) && !Actor_Clue_Query(0, 179) && !Actor_Clue_Query(0, 180) && !Actor_Clue_Query(0, 181)) {
-			Actor_Says(0, 4245, 14);
-			Actor_Says(11, 20, 14);
+		if (Game_Flag_Query(49) && !Game_Flag_Query(54) && !Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewA) && !Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1) && !Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2)) {
+			Actor_Says(kActorMcCoy, 4245, 14);
+			Actor_Says(kActorGrigorian, 20, 14);
 			Game_Flag_Set(54);
 			return true;
 		}
-		if ((!Game_Flag_Query(53) && Game_Flag_Query(49)  && Actor_Clue_Query(0, 179) ) || Actor_Clue_Query(0, 180)  || Actor_Clue_Query(0, 181)  || Actor_Clue_Query(0, 99) ) {
+		if ((!Game_Flag_Query(53) && Game_Flag_Query(49) && Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewA)) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2) || Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote)) {
 			Game_Flag_Set(53);
-			Actor_Says(0, 4240, 13);
-			Actor_Says(11, 550, 15);
-			Actor_Says(11, 480, 16);
+			Actor_Says(kActorMcCoy, 4240, 13);
+			Actor_Says(kActorGrigorian, 550, 15);
+			Actor_Says(kActorGrigorian, 480, 16);
 			sub_402090();
 			return true;
 		}
-		if (Game_Flag_Query(51) ) {
-			Actor_Says(0, 4270, 18);
-			Actor_Says(11, 30, 14);
-			Actor_Says(11, 40, 13);
+		if (Game_Flag_Query(51)) {
+			Actor_Says(kActorMcCoy, 4270, 18);
+			Actor_Says(kActorGrigorian, 30, 14);
+			Actor_Says(kActorGrigorian, 40, 13);
 			return true;
 		}
-		if (Game_Flag_Query(53)  && Game_Flag_Query(49)  && (Actor_Clue_Query(0, 179)  || Actor_Clue_Query(0, 180)  || Actor_Clue_Query(0, 99) )) {
+		if (Game_Flag_Query(53) && Game_Flag_Query(49) && (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewA) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1) || Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote))) {
 			sub_402090();
 			return true;
 		}
-		Actor_Says(0, 4270, 18);
-		Actor_Says(11, 30, 14);
-		Actor_Says(11, 40, 13);
+		Actor_Says(kActorMcCoy, 4270, 18);
+		Actor_Says(kActorGrigorian, 30, 14);
+		Actor_Says(kActorGrigorian, 40, 13);
 		return true;
 	}
-	if (actorId == 7 && !Loop_Actor_Walk_To_XYZ(0, -473.0f, 0.2f, -133.0f, 12, 1, false, 0)) {
-		Actor_Face_Actor(0, 7, true);
-		Actor_Face_Actor(7, 0, true);
+	if (actorId == 7 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -473.0f, 0.2f, -133.0f, 12, 1, false, 0)) {
+		Actor_Face_Actor(kActorMcCoy, kActorIzo, true);
+		Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
 		if (!Game_Flag_Query(167)) {
-			Actor_Says(0, 4200, 14);
-			Actor_Says(7, 570, 3);
-			Actor_Says(0, 4205, 18);
+			Actor_Says(kActorMcCoy, 4200, 14);
+			Actor_Says(kActorIzo, 570, 3);
+			Actor_Says(kActorMcCoy, 4205, 18);
 			Game_Flag_Set(167);
 			return true;
 		}
-		if (Game_Flag_Query(167)  && !Game_Flag_Query(168)) {
-			Actor_Says(0, 4210, 18);
-			Actor_Says(7, 580, 3);
-			Actor_Says(0, 4215, 14);
-			Actor_Says(7, 590, 3);
-			Actor_Says(7, 600, 3);
-			Actor_Says(0, 4220, 18);
-			Actor_Says(7, 610, 3);
-			Actor_Says(0, 4225, 19);
-			Actor_Says(7, 620, 3);
-			Actor_Says(0, 4230, 14);
+		if (Game_Flag_Query(167) && !Game_Flag_Query(168)) {
+			Actor_Says(kActorMcCoy, 4210, 18);
+			Actor_Says(kActorIzo, 580, 3);
+			Actor_Says(kActorMcCoy, 4215, 14);
+			Actor_Says(kActorIzo, 590, 3);
+			Actor_Says(kActorIzo, 600, 3);
+			Actor_Says(kActorMcCoy, 4220, 18);
+			Actor_Says(kActorIzo, 610, 3);
+			Actor_Says(kActorMcCoy, 4225, 19);
+			Actor_Says(kActorIzo, 620, 3);
+			Actor_Says(kActorMcCoy, 4230, 14);
 			Game_Flag_Set(168);
 			return true;
 		}
-		Actor_Says(0, 4200, 13);
+		Actor_Says(kActorMcCoy, 4200, 13);
 	}
-	if (actorId == 9 && !Loop_Actor_Walk_To_XYZ(0, -295.0f, 0.34f, -193.0f, 12, 1, false, 0)) {
-		Actor_Face_Actor(0, 9, true);
-		Actor_Face_Actor(9, 0, true);
+	if (actorId == 9 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -295.0f, 0.34f, -193.0f, 12, 1, false, 0)) {
+		Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
+		Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
 		//TODO: cleanup
-		if (Game_Flag_Query(166) || (Actor_Says(0, 4415, 18) , Actor_Says(9, 1090, 3) , Actor_Says(0, 4420, 18) , Game_Flag_Set(166) , Game_Flag_Query(166) != 1) || Game_Flag_Query(55) != 1 || Game_Flag_Query(56)) {
+		if (Game_Flag_Query(166) || (Actor_Says(kActorMcCoy, 4415, 18) , Actor_Says(kActorCrazylegs, 1090, 3) , Actor_Says(kActorMcCoy, 4420, 18) , Game_Flag_Set(166) , Game_Flag_Query(166) != 1) || Game_Flag_Query(55) != 1 || Game_Flag_Query(56)) {
 			if (!Game_Flag_Query(166) || Game_Flag_Query(55) || Game_Flag_Query(175)) {
-				Actor_Says(0, 4425, 18);
-				Actor_Says(9, 1160, 3);
+				Actor_Says(kActorMcCoy, 4425, 18);
+				Actor_Says(kActorCrazylegs, 1160, 3);
 				return true;
 			} else {
-				Actor_Says(0, 4425, 18);
-				Actor_Says(9, 1100, 3);
-				Actor_Says(0, 4430, 19);
-				Actor_Says(9, 1110, 3);
+				Actor_Says(kActorMcCoy, 4425, 18);
+				Actor_Says(kActorCrazylegs, 1100, 3);
+				Actor_Says(kActorMcCoy, 4430, 19);
+				Actor_Says(kActorCrazylegs, 1110, 3);
 				Game_Flag_Set(175);
 				return true;
 			}
 		} else {
-			Actor_Face_Actor(11, 9, true);
-			Actor_Says(11, 420, 14);
-			Actor_Face_Actor(9, 11, true);
-			Actor_Says(9, 1120, 3);
-			Actor_Face_Actor(0, 11, true);
-			Actor_Says(0, 4435, 14);
-			Actor_Says(11, 430, 16);
-			Actor_Says(9, 1130, 3);
+			Actor_Face_Actor(kActorGrigorian, kActorCrazylegs, true);
+			Actor_Says(kActorGrigorian, 420, 14);
+			Actor_Face_Actor(kActorCrazylegs, kActorGrigorian, true);
+			Actor_Says(kActorCrazylegs, 1120, 3);
+			Actor_Face_Actor(kActorMcCoy, kActorGrigorian, true);
+			Actor_Says(kActorMcCoy, 4435, 14);
+			Actor_Says(kActorGrigorian, 430, 16);
+			Actor_Says(kActorCrazylegs, 1130, 3);
 			Game_Flag_Set(56);
 			return true;
 		}
@@ -176,7 +176,7 @@ bool SceneScriptPS09::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS09::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -559.15f, 0.0f, -85.06f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -559.15f, 0.0f, -85.06f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Set_Enter(62, 66);
@@ -205,17 +205,17 @@ void SceneScriptPS09::PlayerWalkedIn() {
 	if (Game_Flag_Query(465)) {
 		Player_Loses_Control();
 		Delay(2000);
-		Actor_Retired_Here(0, 6, 6, 1, -1);
+		Actor_Retired_Here(kActorMcCoy, 6, 6, 1, -1);
 		//return true;
 		return;
 	}
 	if (!Game_Flag_Query(211)) {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(0, -491.15f, 0.0f, -73.06f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -491.15f, 0.0f, -73.06f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Set(211);
 	}
-	if (Game_Flag_Query(133) ) {
+	if (Game_Flag_Query(133)) {
 		Game_Flag_Reset(133);
 		//return true;
 		return;
@@ -231,12 +231,12 @@ void SceneScriptPS09::DialogueQueueFlushed(int a1) {
 
 void SceneScriptPS09::sub_402090() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 179)  || Actor_Clue_Query(0, 180)  || Actor_Clue_Query(0, 181) ) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewA) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(170, 5, 5, 3);
 		DM_Add_To_List_Never_Repeat_Once_Selected(180, -1, 5, 5);
 		DM_Add_To_List_Never_Repeat_Once_Selected(200, -1, 3, 6);
 	}
-	if (Actor_Clue_Query(0, 99) 		&& (Actor_Clue_Query(0, 179)  || Actor_Clue_Query(0, 180)  || Actor_Clue_Query(0, 181) )) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueGrigoriansNote) && (Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewA) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB1) || Actor_Clue_Query(kActorMcCoy, kClueGrigorianInterviewB2))) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(190, 5, 6, -1);
 	}
 	Dialogue_Menu_Add_To_List(210);
@@ -245,108 +245,107 @@ void SceneScriptPS09::sub_402090() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 170:
-		Actor_Says(0, 4270, 13);
-		Actor_Says(0, 4250, 18);
-		Actor_Says(11, 50, 13);
-		Actor_Says(0, 4275, 18);
-		Actor_Says(0, 4280, 19);
-		if (Game_Flag_Query(44) ) {
-			Actor_Says(11, 60, 14);
-			Actor_Says(0, 4285, 13);
-			Actor_Says(11, 70, 12);
-			Actor_Says(0, 4290, 13);
-			Actor_Says(11, 80, 13);
-			Actor_Says(11, 90, 13);
-			Actor_Says(0, 4295, 18);
-			Actor_Says(11, 110, 14);
-			Actor_Says(0, 4300, 17);
+		Actor_Says(kActorMcCoy, 4270, 13);
+		Actor_Says(kActorMcCoy, 4250, 18);
+		Actor_Says(kActorGrigorian, 50, 13);
+		Actor_Says(kActorMcCoy, 4275, 18);
+		Actor_Says(kActorMcCoy, 4280, 19);
+		if (Game_Flag_Query(44)) {
+			Actor_Says(kActorGrigorian, 60, 14);
+			Actor_Says(kActorMcCoy, 4285, 13);
+			Actor_Says(kActorGrigorian, 70, 12);
+			Actor_Says(kActorMcCoy, 4290, 13);
+			Actor_Says(kActorGrigorian, 80, 13);
+			Actor_Says(kActorGrigorian, 90, 13);
+			Actor_Says(kActorMcCoy, 4295, 18);
+			Actor_Says(kActorGrigorian, 110, 14);
+			Actor_Says(kActorMcCoy, 4300, 17);
 			return;
 		}
 		if (!Game_Flag_Query(44)) {
-			Actor_Says(11, 130, 15);
-			Actor_Says(11, 140, 13);
-			Actor_Says(0, 4305, 13);
-			Actor_Says(11, 150, 14);
-			Actor_Says(11, 160, 12);
-			Actor_Says(0, 4310, 13);
-			Actor_Says(11, 170, 15);
-			Actor_Says(11, 180, 16);
-			Actor_Says(0, 4315, 18);
-			Actor_Says(11, 200, 13);
+			Actor_Says(kActorGrigorian, 130, 15);
+			Actor_Says(kActorGrigorian, 140, 13);
+			Actor_Says(kActorMcCoy, 4305, 13);
+			Actor_Says(kActorGrigorian, 150, 14);
+			Actor_Says(kActorGrigorian, 160, 12);
+			Actor_Says(kActorMcCoy, 4310, 13);
+			Actor_Says(kActorGrigorian, 170, 15);
+			Actor_Says(kActorGrigorian, 180, 16);
+			Actor_Says(kActorMcCoy, 4315, 18);
+			Actor_Says(kActorGrigorian, 200, 13);
 			return;
 		}
 		break;
 	case 180:
-		Actor_Says(0, 4270, 18);
-		Actor_Says(0, 4255, 3);
-		Actor_Says(11, 210, 12);
-		Actor_Says(11, 220, 13);
-		Actor_Says(11, 230, 14);
-		Actor_Says(0, 4320, 14);
-		Actor_Says(11, 240, 16);
-		Actor_Says(11, 250, 15);
-		Actor_Says(0, 4330, 13);
-		Actor_Says(11, 260, 13);
-		Actor_Says(11, 270, 12);
-		Actor_Says(0, 4335, 18);
-		Actor_Says(11, 290, 15);
-		Actor_Says(0, 4340, 13);
-		Actor_Modify_Friendliness_To_Other(11, 0, -5);
+		Actor_Says(kActorMcCoy, 4270, 18);
+		Actor_Says(kActorMcCoy, 4255, 3);
+		Actor_Says(kActorGrigorian, 210, 12);
+		Actor_Says(kActorGrigorian, 220, 13);
+		Actor_Says(kActorGrigorian, 230, 14);
+		Actor_Says(kActorMcCoy, 4320, 14);
+		Actor_Says(kActorGrigorian, 240, 16);
+		Actor_Says(kActorGrigorian, 250, 15);
+		Actor_Says(kActorMcCoy, 4330, 13);
+		Actor_Says(kActorGrigorian, 260, 13);
+		Actor_Says(kActorGrigorian, 270, 12);
+		Actor_Says(kActorMcCoy, 4335, 18);
+		Actor_Says(kActorGrigorian, 290, 15);
+		Actor_Says(kActorMcCoy, 4340, 13);
+		Actor_Modify_Friendliness_To_Other(kActorGrigorian, kActorMcCoy, -5);
 		if (Game_Flag_Query(165)) {
-			Actor_Says(11, 300, 12);
-			Actor_Face_Actor(9, 11, true);
-			Actor_Says(9, 1010, 3);
-			Actor_Face_Actor(11, 9, true);
-			Actor_Says(11, 310, 16);
-			Actor_Face_Actor(0, 9, true);
-			Actor_Says(0, 4345, 14);
-			Actor_Face_Actor(9, 0, true);
-			Actor_Says(9, 1020, 3);
-			Actor_Says(0, 4350, 18);
-			Actor_Says(9, 1030, 3);
-			Actor_Says(0, 4355, 19);
-			Actor_Says(9, 1040, 3);
-			Actor_Says(0, 4360, 16);
-			Actor_Says(0, 4365, 14);
-			Actor_Says(9, 1050, 3);
-			Actor_Says(9, 1060, 3);
-			Actor_Says(0, 4370, 14);
-			Actor_Says(9, 1070, 3);
-			Actor_Says(9, 1080, 3);
-		}
-		else {
-			Actor_Says(11, 320, 13);
-			Actor_Says(11, 340, 14);
-			Actor_Says(11, 350, 12);
-			Actor_Says(0, 4375, 18);
+			Actor_Says(kActorGrigorian, 300, 12);
+			Actor_Face_Actor(kActorCrazylegs, kActorGrigorian, true);
+			Actor_Says(kActorCrazylegs, 1010, 3);
+			Actor_Face_Actor(kActorGrigorian, kActorCrazylegs, true);
+			Actor_Says(kActorGrigorian, 310, 16);
+			Actor_Face_Actor(kActorMcCoy, kActorCrazylegs, true);
+			Actor_Says(kActorMcCoy, 4345, 14);
+			Actor_Face_Actor(kActorCrazylegs, kActorMcCoy, true);
+			Actor_Says(kActorCrazylegs, 1020, 3);
+			Actor_Says(kActorMcCoy, 4350, 18);
+			Actor_Says(kActorCrazylegs, 1030, 3);
+			Actor_Says(kActorMcCoy, 4355, 19);
+			Actor_Says(kActorCrazylegs, 1040, 3);
+			Actor_Says(kActorMcCoy, 4360, 16);
+			Actor_Says(kActorMcCoy, 4365, 14);
+			Actor_Says(kActorCrazylegs, 1050, 3);
+			Actor_Says(kActorCrazylegs, 1060, 3);
+			Actor_Says(kActorMcCoy, 4370, 14);
+			Actor_Says(kActorCrazylegs, 1070, 3);
+			Actor_Says(kActorCrazylegs, 1080, 3);
+		} else {
+			Actor_Says(kActorGrigorian, 320, 13);
+			Actor_Says(kActorGrigorian, 340, 14);
+			Actor_Says(kActorGrigorian, 350, 12);
+			Actor_Says(kActorMcCoy, 4375, 18);
 		}
 		break;
 	case 190:
-		Actor_Says(0, 4270, 18);
-		Actor_Says(0, 4260, 3);
-		Actor_Says(11, 360, 16);
-		Actor_Says(0, 4380, 19);
-		Actor_Says(0, 4385, 19);
-		Actor_Says(11, 370, 13);
-		Actor_Says(0, 4390, 19);
-		Actor_Says(0, 4395, 18);
-		Actor_Says(11, 380, 14);
-		Actor_Says(11, 390, 12);
-		Actor_Modify_Friendliness_To_Other(11, 0, -5);
+		Actor_Says(kActorMcCoy, 4270, 18);
+		Actor_Says(kActorMcCoy, 4260, 3);
+		Actor_Says(kActorGrigorian, 360, 16);
+		Actor_Says(kActorMcCoy, 4380, 19);
+		Actor_Says(kActorMcCoy, 4385, 19);
+		Actor_Says(kActorGrigorian, 370, 13);
+		Actor_Says(kActorMcCoy, 4390, 19);
+		Actor_Says(kActorMcCoy, 4395, 18);
+		Actor_Says(kActorGrigorian, 380, 14);
+		Actor_Says(kActorGrigorian, 390, 12);
+		Actor_Modify_Friendliness_To_Other(kActorGrigorian, kActorMcCoy, -5);
 		break;
 	case 200:
-		Actor_Says(0, 4265, 14);
-		Actor_Says(11, 400, 13);
-		Actor_Says(0, 4400, 13);
-		Actor_Says(11, 410, 16);
-		Actor_Says(0, 4405, 14);
-		Actor_Says(0, 4410, 15);
+		Actor_Says(kActorMcCoy, 4265, 14);
+		Actor_Says(kActorGrigorian, 400, 13);
+		Actor_Says(kActorMcCoy, 4400, 13);
+		Actor_Says(kActorGrigorian, 410, 16);
+		Actor_Says(kActorMcCoy, 4405, 14);
+		Actor_Says(kActorMcCoy, 4410, 15);
 		Voight_Kampff_Activate(11, 20);
-		Actor_Modify_Friendliness_To_Other(11, 0, -10);
+		Actor_Modify_Friendliness_To_Other(kActorGrigorian, kActorMcCoy, -10);
 		break;
 	case 210:
-		Actor_Says(0, 8600, 18);
-		Actor_Says(11, 20, 15);
+		Actor_Says(kActorMcCoy, 8600, 18);
+		Actor_Says(kActorGrigorian, 20, 15);
 		break;
 	}
 }
diff --git a/engines/bladerunner/script/scene/ps10.cpp b/engines/bladerunner/script/scene/ps10.cpp
index a00868cb6a..5811bdcc7a 100644
--- a/engines/bladerunner/script/scene/ps10.cpp
+++ b/engines/bladerunner/script/scene/ps10.cpp
@@ -185,7 +185,7 @@ bool SceneScriptPS10::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS10::ClickedOnExit(int exitId) {
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 6, 12, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 6, 12, 1, false)) {
 			Game_Flag_Set(14);
 			sub_402238();
 			Global_Variable_Decrement(9, 20 - Global_Variable_Query(10));
@@ -210,17 +210,17 @@ void SceneScriptPS10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptPS10::PlayerWalkedIn() {
 	if (Game_Flag_Query(15)) {
-		Loop_Actor_Walk_To_XYZ(0, -352.09f, -9.23f, 267.95f, 0, 0, true, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -352.09f, -9.23f, 267.95f, 0, 0, true, 0);
 		Police_Maze_Set_Pause_State(0);
 		Game_Flag_Reset(15);
 		//return true;
 		return;
 	} else {
 		Player_Set_Combat_Mode(true);
-		Loop_Actor_Walk_To_Waypoint(0, 5, 0, 0, true);
-		Actor_Says(39, 280, 3);
-		Actor_Says(39, 290, 3);
-		Actor_Says(39, 300, 3);
+		Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 5, 0, 0, true);
+		Actor_Says(kActorAnsweringMachine, 280, 3);
+		Actor_Says(kActorAnsweringMachine, 290, 3);
+		Actor_Says(kActorAnsweringMachine, 300, 3);
 		Police_Maze_Set_Pause_State(0);
 		//return true;
 		return;
diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp
index 1b20781451..dba7f1abd5 100644
--- a/engines/bladerunner/script/scene/ps11.cpp
+++ b/engines/bladerunner/script/scene/ps11.cpp
@@ -223,7 +223,7 @@ bool SceneScriptPS11::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS11::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 6, 12, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 6, 12, 1, false)) {
 			Game_Flag_Set(15);
 			sub_402744();
 			Set_Enter(14, 73);
@@ -231,7 +231,7 @@ bool SceneScriptPS11::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 8, 12, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 8, 12, 1, false)) {
 			Game_Flag_Set(16);
 			sub_402744();
 			Global_Variable_Decrement(9, 20 - Global_Variable_Query(11));
diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp
index c13fd3c535..f93af346b7 100644
--- a/engines/bladerunner/script/scene/ps12.cpp
+++ b/engines/bladerunner/script/scene/ps12.cpp
@@ -232,7 +232,7 @@ bool SceneScriptPS12::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS12::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 8, 12, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 8, 12, 1, false)) {
 			Game_Flag_Set(17);
 			sub_4028C4();
 			Set_Enter(14, 74);
@@ -240,9 +240,9 @@ bool SceneScriptPS12::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 9, 12, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 9, 12, 1, false)) {
 			Player_Loses_Control();
-			Loop_Actor_Walk_To_Waypoint(0, 10, 12, 0, false);
+			Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 10, 12, 0, false);
 			Player_Gains_Control();
 			Game_Flag_Set(18);
 			sub_4028C4();
@@ -267,7 +267,7 @@ void SceneScriptPS12::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptPS12::PlayerWalkedIn() {
 	if (Game_Flag_Query(16)) {
-		Loop_Actor_Walk_To_XYZ(0, -546.0f, -9.06f, 570.0f, 0, 1, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -546.0f, -9.06f, 570.0f, 0, 1, false, 0);
 		Game_Flag_Reset(16);
 	}
 	Police_Maze_Set_Pause_State(0);
diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp
index 134376c0cb..c2c46335a3 100644
--- a/engines/bladerunner/script/scene/ps13.cpp
+++ b/engines/bladerunner/script/scene/ps13.cpp
@@ -216,7 +216,7 @@ bool SceneScriptPS13::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS13::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 10, 12, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 10, 12, 1, false)) {
 			Game_Flag_Set(19);
 			sub_40267C();
 			Set_Enter(14, 75);
@@ -224,7 +224,7 @@ bool SceneScriptPS13::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_Waypoint(0, 11, 12, 1, false)) {
+		if (!Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 11, 12, 1, false)) {
 			Game_Flag_Set(21);
 			Player_Set_Combat_Mode(false);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
diff --git a/engines/bladerunner/script/scene/ps14.cpp b/engines/bladerunner/script/scene/ps14.cpp
index 54b5d19498..f7e538ebd1 100644
--- a/engines/bladerunner/script/scene/ps14.cpp
+++ b/engines/bladerunner/script/scene/ps14.cpp
@@ -67,20 +67,20 @@ bool SceneScriptPS14::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS14::ClickedOnExit(int exitId) {
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -2101.0f, 508.14f, -1361.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 819, false);
-			Loop_Actor_Travel_Stairs(0, 3, 1, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -2101.0f, 508.14f, -1361.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 819, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 1, 0);
 			if (Global_Variable_Query(1) == 4 && Game_Flag_Query(671)) {
-				if (Actor_Clue_Query(0, 32)) {
+				if (Actor_Clue_Query(kActorMcCoy, kClueBriefcase)) {
 					Game_Flag_Set(666);
-					Actor_Set_Goal_Number(0, 400);
+					Actor_Set_Goal_Number(kActorMcCoy, 400);
 				} else {
-					Actor_Set_Goal_Number(0, 500);
+					Actor_Set_Goal_Number(kActorMcCoy, 500);
 				}
 			} else if (Global_Variable_Query(1) > 3) {
-				Actor_Says(0, 8522, 12);
-				Actor_Face_Heading(0, 307, false);
-				Loop_Actor_Travel_Stairs(0, 3, 0, 0);
+				Actor_Says(kActorMcCoy, 8522, 12);
+				Actor_Face_Heading(kActorMcCoy, 307, false);
+				Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 0, 0);
 			} else {
 				Game_Flag_Set(135);
 				Set_Enter(63, 67);
@@ -89,7 +89,7 @@ bool SceneScriptPS14::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -785.45f, 508.14f, -1652.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -785.45f, 508.14f, -1652.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(673);
 			Game_Flag_Reset(178);
 			Game_Flag_Set(179);
@@ -112,7 +112,7 @@ void SceneScriptPS14::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptPS14::PlayerWalkedIn() {
 	if (Game_Flag_Query(672)) {
-		Loop_Actor_Walk_To_XYZ(0, -801.45f, 508.14f, -1596.68f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -801.45f, 508.14f, -1596.68f, 0, 0, false, 0);
 		Game_Flag_Reset(672);
 	}
 	//return false;
diff --git a/engines/bladerunner/script/scene/ps15.cpp b/engines/bladerunner/script/scene/ps15.cpp
index a9a058d599..bb1c451223 100644
--- a/engines/bladerunner/script/scene/ps15.cpp
+++ b/engines/bladerunner/script/scene/ps15.cpp
@@ -36,8 +36,8 @@ void SceneScriptPS15::InitializeScene() {
 	Ambient_Sounds_Add_Sound(158, 5, 20, 30, 30, -70, 70, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(73, 5, 20, 5, 9, -70, 70, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(74, 5, 20, 5, 9, -70, 70, -101, -101, 0, 0);
-	Actor_Put_In_Set(34, 101);
-	Actor_Set_At_XYZ(34, -265.4f, -113.43f, -31.29f, 623);
+	Actor_Put_In_Set(kActorSergeantWalls, 101);
+	Actor_Set_At_XYZ(kActorSergeantWalls, -265.4f, -113.43f, -31.29f, 623);
 }
 
 void SceneScriptPS15::SceneLoaded() {
@@ -57,26 +57,26 @@ bool SceneScriptPS15::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptPS15::ClickedOnActor(int actorId) {
 	if (actorId == 34) {
-		if ((Actor_Clue_Query(0, 80) || Actor_Clue_Query(0, 83)) && !Actor_Clue_Query(0, 81)) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -256.0f, -113.43f, 43.51f, 0, 1, false, 0)) {
-				Actor_Face_Actor(0, 34, true);
-				Actor_Face_Actor(34, 0, true);
-				Actor_Says(0, 4470, 17);
-				Actor_Says(34, 130, 12);
-				Actor_Says(0, 4475, 18);
-				Actor_Says(0, 4480, 13);
-				Actor_Says(34, 140, 16);
+		if ((Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm) || Actor_Clue_Query(kActorMcCoy, kCluePoliceIssueWeapons)) && !Actor_Clue_Query(kActorMcCoy, kClueShippingForm)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -256.0f, -113.43f, 43.51f, 0, 1, false, 0)) {
+				Actor_Face_Actor(kActorMcCoy, kActorSergeantWalls, true);
+				Actor_Face_Actor(kActorSergeantWalls, kActorMcCoy, true);
+				Actor_Says(kActorMcCoy, 4470, 17);
+				Actor_Says(kActorSergeantWalls, 130, 12);
+				Actor_Says(kActorMcCoy, 4475, 18);
+				Actor_Says(kActorMcCoy, 4480, 13);
+				Actor_Says(kActorSergeantWalls, 140, 16);
 				Item_Pickup_Spin_Effect(965, 211, 239);
-				Actor_Says(34, 150, 14);
-				Actor_Clue_Acquire(0, 81, 1, 34);
+				Actor_Says(kActorSergeantWalls, 150, 14);
+				Actor_Clue_Acquire(kActorMcCoy, kClueShippingForm, 1, kActorSergeantWalls);
 				if (!Game_Flag_Query(727)) {
 					Item_Remove_From_World(111);
 				}
 			}
 		} else {
-			Actor_Face_Actor(0, 34, true);
-			Actor_Says(0, 8600, 15);
-			Actor_Says(34, 190, 12);
+			Actor_Face_Actor(kActorMcCoy, kActorSergeantWalls, true);
+			Actor_Says(kActorMcCoy, 8600, 15);
+			Actor_Says(kActorSergeantWalls, 190, 12);
 		}
 		return true;
 	}
@@ -85,17 +85,17 @@ bool SceneScriptPS15::ClickedOnActor(int actorId) {
 
 bool SceneScriptPS15::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 110) {
-		if (Actor_Clue_Query(0, 80) && Actor_Clue_Query(0, 83)) {
-			Actor_Says(0, 8570, 14);
+		if (Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm) && Actor_Clue_Query(kActorMcCoy, kCluePoliceIssueWeapons)) {
+			Actor_Says(kActorMcCoy, 8570, 14);
 		} else {
-			Actor_Face_Actor(0, 34, true);
-			Actor_Face_Actor(34, 0, true);
-			Actor_Says(0, 4485, 17);
-			Actor_Says(34, 160, 14);
-			Actor_Says(0, 4490, 12);
-			Actor_Says(34, 170, 13);
-			Actor_Clue_Acquire(0, 80, 1, 0);
-			Actor_Clue_Acquire(0, 83, 1, 0);
+			Actor_Face_Actor(kActorMcCoy, kActorSergeantWalls, true);
+			Actor_Face_Actor(kActorSergeantWalls, kActorMcCoy, true);
+			Actor_Says(kActorMcCoy, 4485, 17);
+			Actor_Says(kActorSergeantWalls, 160, 14);
+			Actor_Says(kActorMcCoy, 4490, 12);
+			Actor_Says(kActorSergeantWalls, 170, 13);
+			Actor_Clue_Acquire(kActorMcCoy, kClueWeaponsOrderForm, 1, kActorMcCoy);
+			Actor_Clue_Acquire(kActorMcCoy, kCluePoliceIssueWeapons, 1, kActorMcCoy);
 		}
 		return true;
 	}
@@ -104,7 +104,7 @@ bool SceneScriptPS15::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptPS15::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -360.0f, -113.43f, 50.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -360.0f, -113.43f, 50.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(204);
@@ -113,9 +113,9 @@ bool SceneScriptPS15::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -183.58f, -113.43f, 91.7f, 0, 1, false, 0)) {
-			Actor_Says(0, 4440, 18);
-			Actor_Says(34, 150, 17);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -183.58f, -113.43f, 91.7f, 0, 1, false, 0)) {
+			Actor_Says(kActorMcCoy, 4440, 18);
+			Actor_Says(kActorSergeantWalls, 150, 17);
 			Sound_Play(155, 90, 0, 0, 50);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -137,24 +137,24 @@ void SceneScriptPS15::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptPS15::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_XYZ(0, -326.93f, -113.43f, 101.42f, 0, 0, false, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -326.93f, -113.43f, 101.42f, 0, 0, false, 0);
 	if (!Game_Flag_Query(43)) {
-		Actor_Face_Actor(0, 34, true);
-		Actor_Face_Actor(34, 0, true);
-		Actor_Says(34, 0, 12);
-		Actor_Says(0, 4445, 18);
-		Actor_Says(34, 10, 12);
-		Actor_Says(0, 4450, 18);
-		Actor_Says(34, 60, 13);
-		Actor_Says(34, 70, 12);
-		Actor_Says(0, 4460, 15);
-		Actor_Says(34, 80, 13);
-		Actor_Says(0, 4465, 16);
-		Actor_Says(34, 90, 13);
-		Actor_Says(34, 100, 14);
-		Actor_Says(34, 110, 15);
-		Actor_Says(34, 120, 15);
-		Actor_Says(0, 4555, 14);
+		Actor_Face_Actor(kActorMcCoy, kActorSergeantWalls, true);
+		Actor_Face_Actor(kActorSergeantWalls, kActorMcCoy, true);
+		Actor_Says(kActorSergeantWalls, 0, 12);
+		Actor_Says(kActorMcCoy, 4445, 18);
+		Actor_Says(kActorSergeantWalls, 10, 12);
+		Actor_Says(kActorMcCoy, 4450, 18);
+		Actor_Says(kActorSergeantWalls, 60, 13);
+		Actor_Says(kActorSergeantWalls, 70, 12);
+		Actor_Says(kActorMcCoy, 4460, 15);
+		Actor_Says(kActorSergeantWalls, 80, 13);
+		Actor_Says(kActorMcCoy, 4465, 16);
+		Actor_Says(kActorSergeantWalls, 90, 13);
+		Actor_Says(kActorSergeantWalls, 100, 14);
+		Actor_Says(kActorSergeantWalls, 110, 15);
+		Actor_Says(kActorSergeantWalls, 120, 15);
+		Actor_Says(kActorMcCoy, 4555, 14);
 		Game_Flag_Set(43);
 		//return true;
 		return;
diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp
index 3a26cd2fdd..3df422563c 100644
--- a/engines/bladerunner/script/scene/rc01.cpp
+++ b/engines/bladerunner/script/scene/rc01.cpp
@@ -27,7 +27,7 @@ namespace BladeRunner {
 void SceneScriptRC01::InitializeScene() {
 #if _DEBUG
 	//TODO: not part of game, remove
-//	Game_Flag_Set(24); // force skip intro
+	Game_Flag_Set(24); // force skip intro
 #endif
 
 	if (!Game_Flag_Query(24)) {
@@ -183,10 +183,10 @@ void SceneScriptRC01::SceneLoaded() {
 
 	if (!Game_Flag_Query(24)) {
 		ADQ_Flush();
-		Actor_Voice_Over(1830, 99);
-		Actor_Voice_Over(1850, 99);
+		Actor_Voice_Over(1830, kActorVoiceOver);
+		Actor_Voice_Over(1850, kActorVoiceOver);
 		if (!Game_Flag_Query(378)) {
-			Actor_Voice_Over(1860, 99);
+			Actor_Voice_Over(1860, kActorVoiceOver);
 			I_Sez("MG: Is David Leary a self-respecting human or is he powered by rechargeable");
 			I_Sez("batteries?\n");
 		}
@@ -212,42 +212,42 @@ bool SceneScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) {
 	}
 
 	if (Object_Query_Click("HYDRANT02", objectName)) {
-		if (!Loop_Actor_Walk_To_Scene_Object(0, "HYDRANT02", 60, true, false)) {
-			if (Actor_Clue_Query(0, 26)) {
-				Actor_Says(0, 6975, 3);
+		if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "HYDRANT02", 60, true, false)) {
+			if (Actor_Clue_Query(kActorMcCoy, kCluePaintTransfer)) {
+				Actor_Says(kActorMcCoy, 6975, 3);
 			} else {
-				Actor_Face_Object(0, "HYDRANT02", true);
-				Actor_Voice_Over(1880, 99);
-				Actor_Voice_Over(1890, 99);
+				Actor_Face_Object(kActorMcCoy, "HYDRANT02", true);
+				Actor_Voice_Over(1880, kActorVoiceOver);
+				Actor_Voice_Over(1890, kActorVoiceOver);
 				I_Sez("JM: That McCoy--he's one funny guy! Jet-black fire truck, hehehehe...");
-				Actor_Clue_Acquire(0, 26, 1, -1);
+				Actor_Clue_Acquire(kActorMcCoy, kCluePaintTransfer, 1, -1);
 			}
 		}
 		return true;
 	}
 
 	if (Object_Query_Click("DOOR LEFT", objectName)) {
-		if (!Loop_Actor_Walk_To_Scene_Object(0, "DOOR LEFT", 48, true, false)) {
-			Actor_Face_Object(0, "DOOR LEFT", true);
-			if (!Actor_Clue_Query(0, 2) && Actor_Query_In_Set(23, 69) && Global_Variable_Query(1)) {
-				Actor_Set_Goal_Number(23, 0);
-				Actor_Face_Actor(23, 0, true);
-				Actor_Says(23, 0, 12);
-				Actor_Says(0, 4495, 13);
-				Actor_Clue_Acquire(0, 2, 1, 23);
+		if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "DOOR LEFT", 48, true, false)) {
+			Actor_Face_Object(kActorMcCoy, "DOOR LEFT", true);
+			if (!Actor_Clue_Query(kActorMcCoy, kClueDoorForced2) && Actor_Query_In_Set(kActorOfficerLeary, 69) && Global_Variable_Query(1)) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 0);
+				Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+				Actor_Says(kActorOfficerLeary, 0, 12);
+				Actor_Says(kActorMcCoy, 4495, 13);
+				Actor_Clue_Acquire(kActorMcCoy, kClueDoorForced2, 1, kActorOfficerLeary);
 			} else {
-				Actor_Says(0, 8570, 14);
+				Actor_Says(kActorMcCoy, 8570, 14);
 			}
-			Actor_Clue_Acquire(0, 1, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueDoorForced1, 1, -1);
 		}
 		return true;
 	}
 
 	if (Object_Query_Click("T-CAN01", objectName)) {
-		if (!Loop_Actor_Walk_To_Scene_Object(0, "T-CAN01", 24, true, false)) {
-			Actor_Face_Object(0, "T-CAN01", true);
-			Actor_Voice_Over(1810, 99);
-			Actor_Voice_Over(1820, 99);
+		if (!Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "T-CAN01", 24, true, false)) {
+			Actor_Face_Object(kActorMcCoy, "T-CAN01", true);
+			Actor_Voice_Over(1810, kActorVoiceOver);
+			Actor_Voice_Over(1820, kActorVoiceOver);
 		}
 		return true;
 	}
@@ -256,57 +256,57 @@ bool SceneScriptRC01::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptRC01::ClickedOnActor(int actorId) {
-	if (actorId == 23 && Global_Variable_Query(1) == 1) {
-		if (!Loop_Actor_Walk_To_Actor(0, 23, 36, 1, false)) {
-			Actor_Face_Actor(0, 23, true);
-			Actor_Face_Actor(23, 0, true);
-			if (Actor_Query_Goal_Number(23) == 1) {
-				Actor_Set_Goal_Number(23, 0);
+	if (actorId == kActorOfficerLeary && Global_Variable_Query(1) == 1) {
+		if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorOfficerLeary, 36, 1, false)) {
+			Actor_Face_Actor(kActorMcCoy, kActorOfficerLeary, true);
+			Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+			if (Actor_Query_Goal_Number(kActorOfficerLeary) == 1) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 0);
 			}
 			if (Game_Flag_Query(3)) {
-				Actor_Says(0, 4535, 13);
+				Actor_Says(kActorMcCoy, 4535, 13);
 				Game_Flag_Set(392);
-				if (Actor_Clue_Query(23, 16) && !Actor_Clue_Query(0, 16)) {
-					Actor_Face_Object(23, "70_1", true);
-					Actor_Says(23, 100, 15);
-					Actor_Face_Actor(23, 0, true);
-					Actor_Clue_Acquire(0, 16, 1, 23);
+				if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA) && !Actor_Clue_Query(kActorMcCoy, kClueCrowdInterviewA)) {
+					Actor_Face_Object(kActorOfficerLeary, "70_1", true);
+					Actor_Says(kActorOfficerLeary, 100, 15);
+					Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+					Actor_Clue_Acquire(kActorMcCoy, kClueCrowdInterviewA, 1, kActorOfficerLeary);
 					Game_Flag_Reset(392);
-				} else if (Actor_Clue_Query(23, 17) && !Actor_Clue_Query(0, 17)) {
-					Actor_Face_Object(23, "70_5", true);
-					Actor_Says(23, 120, 19);
-					Actor_Face_Actor(23, 0, true);
-					Actor_Says(23, 130, 14);
+				} else if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB) && !Actor_Clue_Query(kActorMcCoy, kClueCrowdInterviewB)) {
+					Actor_Face_Object(kActorOfficerLeary, "70_5", true);
+					Actor_Says(kActorOfficerLeary, 120, 19);
+					Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+					Actor_Says(kActorOfficerLeary, 130, 14);
 					I_Sez("JM: Did it have a huge, ugly piece of chrome on it?");
-					Actor_Clue_Acquire(0, 17, 1, 23);
+					Actor_Clue_Acquire(kActorMcCoy, kClueCrowdInterviewB, 1, kActorOfficerLeary);
 					Game_Flag_Reset(392);
 				} else {
-					Actor_Says(23, 90, 16);
+					Actor_Says(kActorOfficerLeary, 90, 16);
 					I_Sez("JM: This officer has a talent for vivid metaphors.");
 					if (!Game_Flag_Query(397)) {
 						I_Sez("DL: What is that supposed to mean?  I didn't write this line...");
-						Actor_Says(0, 4540, 16);
+						Actor_Says(kActorMcCoy, 4540, 16);
 						Game_Flag_Set(397);
 					}
 					Game_Flag_Reset(392);
 				}
 			} else {
-				I_Sez("MG: Hey, leave that officer alone.  Can't you see he's busy?");
+				I_Sez("MG: Hey, leave that officer alone. Can't you see he's busy?");
 				I_Sez("JM: (...mmm, donuts...)");
 				Game_Flag_Set(3);
-				Actor_Clue_Acquire(0, 0, 1, 23);
-				Actor_Says(0, 4515, 13);
+				Actor_Clue_Acquire(kActorMcCoy, kClueOfficersStatement, 1, kActorOfficerLeary);
+				Actor_Says(kActorMcCoy, 4515, 13);
 				Game_Flag_Set(392);
-				Actor_Says(23, 40, 13);
+				Actor_Says(kActorOfficerLeary, 40, 13);
 				if (!Game_Flag_Query(1)) {
-					Actor_Says(23, 50, 14);
-					Actor_Says(23, 60, 15);
+					Actor_Says(kActorOfficerLeary, 50, 14);
+					Actor_Says(kActorOfficerLeary, 60, 15);
 					I_Sez("MG: It's all fun and games until someone loses a tiger cub.");
-					Actor_Says(0, 4520, 18);
-					Actor_Says(23, 70, 16);
-					Actor_Says(0, 4525, 14);
-					Actor_Says(23, 80, 18);
-					Actor_Says(0, 4530, 15);
+					Actor_Says(kActorMcCoy, 4520, 18);
+					Actor_Says(kActorOfficerLeary, 70, 16);
+					Actor_Says(kActorMcCoy, 4525, 14);
+					Actor_Says(kActorOfficerLeary, 80, 18);
+					Actor_Says(kActorMcCoy, 4530, 15);
 				}
 				Game_Flag_Reset(392);
 			}
@@ -318,24 +318,24 @@ bool SceneScriptRC01::ClickedOnActor(int actorId) {
 
 bool SceneScriptRC01::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 66) {
-		Actor_Set_Goal_Number(23, 0);
-		if (!Loop_Actor_Walk_To_Item(0, 66, 36, 1, false)) {
-			Actor_Face_Item(0, 66, true);
-			Actor_Clue_Acquire(0, 27, 1, -1);
-			Actor_Face_Actor(23, 0, true);
-			Actor_Says(23, 20, 12);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 0);
+		if (!Loop_Actor_Walk_To_Item(kActorMcCoy, 66, 36, 1, false)) {
+			Actor_Face_Item(kActorMcCoy, 66, true);
+			Actor_Clue_Acquire(kActorMcCoy, kClueChromeDebris, 1, -1);
+			Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+			Actor_Says(kActorOfficerLeary, 20, 12);
 			Game_Flag_Set(163);
 			Item_Remove_From_World(66);
 			Item_Pickup_Spin_Effect(938, 426, 316);
 			I_Sez("JM: Chrome...is that what that is?");
-			Actor_Says(0, 4505, 13);
+			Actor_Says(kActorMcCoy, 4505, 13);
 			ADQ_Flush();
-			ADQ_Add(23, 30, -1);
-			ADQ_Add(0, 4510, 13);
+			ADQ_Add(kActorOfficerLeary, 30, -1);
+			ADQ_Add(kActorMcCoy, 4510, 13);
 			I_Sez("JM: It's hard to imagine that thing on either a car or a horse.");
 			I_Sez("MG: McCoy! What a witty chap...");
 			I_Sez("JM: He keeps me chuckling non-stop!\n");
-			Loop_Actor_Walk_To_Actor(23, 0, 36, 0, false);
+			Loop_Actor_Walk_To_Actor(kActorOfficerLeary, kActorMcCoy, 36, 0, false);
 		}
 		return true;
 	}
@@ -346,18 +346,17 @@ bool SceneScriptRC01::ClickedOnItem(int itemId, bool a2) {
 void SceneScriptRC01::sub_4037AC() {
 	Player_Loses_Control();
 	Game_Flag_Set(182);
-	Actor_Set_Immunity_To_Obstacles(0, true);
-	Loop_Actor_Walk_To_XYZ(0, -151.98f, -0.3f, 318.15f, 0, 0, false, 0);
-	Actor_Set_Immunity_To_Obstacles(0, false);
+	Actor_Set_Immunity_To_Obstacles(kActorMcCoy, true);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -151.98f, -0.3f, 318.15f, 0, 0, false, 0);
+	Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false);
 	Player_Gains_Control();
 }
 
 bool SceneScriptRC01::ClickedOnExit(int exitId) {
-
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -174.77f, 5.55f, 25.95f, 12, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -174.77f, 5.55f, 25.95f, 12, 1, false, 0)) {
 			if (Game_Flag_Query(705)) {
-				Actor_Says(0, 8522, 14);
+				Actor_Says(kActorMcCoy, 8522, 14);
 			} else {
 				switch (Global_Variable_Query(1)) {
 				case 1:
@@ -368,7 +367,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) {
 				case 2:
 				case 3:
 				case 5:
-					Actor_Says(0, 8522, 12);
+					Actor_Says(kActorMcCoy, 8522, 12);
 					break;
 				default:
 					return true;
@@ -382,19 +381,19 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) {
 			Spinner_Set_Selectable_Destination_Flag(6, 1);
 		}
 		I_Sez("MG: Leaving already?  The fun is just beginning!");
-		if (!Loop_Actor_Walk_To_XYZ(0, -151.98f, -0.3f, 318.15f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -151.98f, -0.3f, 318.15f, 0, 1, false, 0)) {
 			Player_Loses_Control();
-			Actor_Set_Immunity_To_Obstacles(0, true);
-			Loop_Actor_Walk_To_XYZ(0, -10.98f, -0.3f, 318.15f, 0, 0, false, 0);
+			Actor_Set_Immunity_To_Obstacles(kActorMcCoy, true);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -10.98f, -0.3f, 318.15f, 0, 0, false, 0);
 			if (Game_Flag_Query(486) && !Game_Flag_Query(660)) {
-				Actor_Voice_Over(4310, 99);
-				Actor_Voice_Over(4320, 99);
-				Actor_Voice_Over(4330, 99);
-				Actor_Voice_Over(4340, 99);
-				Actor_Voice_Over(4350, 99);
+				Actor_Voice_Over(4310, kActorVoiceOver);
+				Actor_Voice_Over(4320, kActorVoiceOver);
+				Actor_Voice_Over(4330, kActorVoiceOver);
+				Actor_Voice_Over(4340, kActorVoiceOver);
+				Actor_Voice_Over(4350, kActorVoiceOver);
 				Game_Flag_Set(660);
 			}
-			Actor_Set_Immunity_To_Obstacles(0, false);
+			Actor_Set_Immunity_To_Obstacles(kActorMcCoy, false);
 			Player_Gains_Control();
 			Game_Flag_Reset(176);
 			Game_Flag_Reset(182);
@@ -515,7 +514,7 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -471.98f, -0.3f, 258.15f, 4, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -471.98f, -0.3f, 258.15f, 4, 1, false, 0)) {
 			Game_Flag_Set(115);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -527,15 +526,15 @@ bool SceneScriptRC01::ClickedOnExit(int exitId) {
 }
 
 void SceneScriptRC01::sub_403850() {
-	if (!Game_Flag_Query(186) && !Loop_Actor_Walk_To_Scene_Object(0, "BARICADE03", 36, true, false)) {
-		Actor_Set_Goal_Number(23, 0);
-		Actor_Face_Object(0, "BARICADE03", true);
-		Loop_Actor_Walk_To_Actor(23, 0, 36, 1, false);
-		Actor_Face_Actor(23, 0, true);
-		Actor_Says(0, 4500, 14);
+	if (!Game_Flag_Query(186) && !Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "BARICADE03", 36, true, false)) {
+		Actor_Set_Goal_Number(kActorOfficerLeary, 0);
+		Actor_Face_Object(kActorMcCoy, "BARICADE03", true);
+		Loop_Actor_Walk_To_Actor(kActorOfficerLeary, kActorMcCoy, 36, 1, false);
+		Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+		Actor_Says(kActorMcCoy, 4500, 14);
 		I_Sez("MG: We don't want any of that abstract art oozing out onto the street.");
-		Actor_Says(23, 10, 14);
-		Actor_Set_Goal_Number(23, 1);
+		Actor_Says(kActorOfficerLeary, 10, 14);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 1);
 	}
 }
 
@@ -581,21 +580,21 @@ void SceneScriptRC01::PlayerWalkedIn() {
 
 	if (Game_Flag_Query(114)) {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(0, -415.98f, -0.30f, 262.15f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -415.98f, -0.30f, 262.15f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(114);
 	}
 
 	if (Game_Flag_Query(9)) {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(0, -203.45f, 5.55f, 85.05f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -203.45f, 5.55f, 85.05f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(9);
 
 		if (Game_Flag_Query(1) && !Game_Flag_Query(4)) {
-			Actor_Voice_Over(1910, 99);
-			Actor_Voice_Over(1920, 99);
-			Actor_Voice_Over(1930, 99);
+			Actor_Voice_Over(1910, kActorVoiceOver);
+			Actor_Voice_Over(1920, kActorVoiceOver);
+			Actor_Voice_Over(1930, kActorVoiceOver);
 			Game_Flag_Set(4);
 		}
 		//return true;
diff --git a/engines/bladerunner/script/scene/rc02.cpp b/engines/bladerunner/script/scene/rc02.cpp
index 6e6000dfa3..a518a489cd 100644
--- a/engines/bladerunner/script/scene/rc02.cpp
+++ b/engines/bladerunner/script/scene/rc02.cpp
@@ -76,7 +76,7 @@ void SceneScriptRC02::SceneLoaded() {
 	Unclickable_Object("DRAPE05");
 	Unclickable_Object("DRAPE06");
 	Unclickable_Object("DRAPE07");
-	if (Actor_Clue_Query(0, 12) || Global_Variable_Query(1) > 1) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo) || Global_Variable_Query(1) > 1) {
 		Unclickable_Object("SCRTY CA03");
 	}
 	if (!Game_Flag_Query(190)) {
@@ -91,36 +91,36 @@ bool SceneScriptRC02::MouseClick(int x, int y) {
 }
 
 bool SceneScriptRC02::ClickedOn3DObject(const char *objectName, bool a2) {
-	if (Object_Query_Click("SCRTY CA03", objectName) && !Actor_Clue_Query(0, 12)) {
-		if (Actor_Clue_Query(0, 22) && Actor_Query_Is_In_Current_Set(15)) {
-			AI_Movement_Track_Pause(15);
-			Actor_Face_Actor(0, 15, true);
-			Actor_Says(0, 4545, 14);
-			Actor_Face_Actor(15, 0, true);
-			Actor_Says(15, 0, 14);
-			Actor_Says(15, 10, 16);
-			Actor_Says(0, 4550, 13);
-			Actor_Says(15, 20, 13);
-			Loop_Actor_Walk_To_Waypoint(15, 89, 0, 0, false);
-			Actor_Face_Actor(0, 15, true);
-			Loop_Actor_Walk_To_Waypoint(15, 102, 0, 0, false);
-			Actor_Face_Actor(0, 15, true);
-			Actor_Face_Heading(15, 539, false);
+	if (Object_Query_Click("SCRTY CA03", objectName) && !Actor_Clue_Query(kActorMcCoy, kClueRuncitersVideo)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewA) && Actor_Query_Is_In_Current_Set(kActorRunciter)) {
+			AI_Movement_Track_Pause(kActorRunciter);
+			Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+			Actor_Says(kActorMcCoy, 4545, 14);
+			Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+			Actor_Says(kActorRunciter, 0, 14);
+			Actor_Says(kActorRunciter, 10, 16);
+			Actor_Says(kActorMcCoy, 4550, 13);
+			Actor_Says(kActorRunciter, 20, 13);
+			Loop_Actor_Walk_To_Waypoint(kActorRunciter, 89, 0, 0, false);
+			Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+			Loop_Actor_Walk_To_Waypoint(kActorRunciter, 102, 0, 0, false);
+			Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+			Actor_Face_Heading(kActorRunciter, 539, false);
 			Delay(2000);
-			Loop_Actor_Walk_To_Waypoint(15, 89, 0, 0, false);
-			Loop_Actor_Walk_To_Actor(15, 0, 24, 0, false);
+			Loop_Actor_Walk_To_Waypoint(kActorRunciter, 89, 0, 0, false);
+			Loop_Actor_Walk_To_Actor(kActorRunciter, kActorMcCoy, 24, 0, false);
 			Item_Pickup_Spin_Effect(975, 357, 228);
-			Actor_Face_Actor(0, 15, true);
-			Actor_Face_Actor(15, 0, true);
-			Actor_Says(15, 30, 23);
-			Actor_Says(0, 4555, 18);
-			Actor_Clue_Acquire(0, 12, 1, 15);
+			Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+			Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+			Actor_Says(kActorRunciter, 30, 23);
+			Actor_Says(kActorMcCoy, 4555, 18);
+			Actor_Clue_Acquire(kActorMcCoy, kClueRuncitersVideo, 1, kActorRunciter);
 			Unclickable_Object("SCRTY CA03");
-			AI_Movement_Track_Unpause(15);
+			AI_Movement_Track_Unpause(kActorRunciter);
 			return true;
 		} else {
-			Actor_Face_Object(0, "SCRTY CA03", true);
-			Actor_Voice_Over(2000, 99);
+			Actor_Face_Object(kActorMcCoy, "SCRTY CA03", true);
+			Actor_Voice_Over(2000, kActorVoiceOver);
 			return true;
 		}
 	}
@@ -131,181 +131,180 @@ void SceneScriptRC02::sub_402A7C() {
 	Dialogue_Menu_Clear_List();
 	DM_Add_To_List_Never_Repeat_Once_Selected(0, 5, 6, 2);
 	DM_Add_To_List_Never_Repeat_Once_Selected(10, 5, 4, 8);
-	if (Actor_Clue_Query(0, 23) || (Actor_Clue_Query(0, 24))) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB1) || (Actor_Clue_Query(kActorMcCoy, kClueRunciterInterviewB2))) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(20, 6, 4, 5);
 	}
 	Dialogue_Menu_Add_DONE_To_List(30);
 	Dialogue_Menu_Appear(320, 240);
 	int answer = Dialogue_Menu_Query_Input();
 	Dialogue_Menu_Disappear();
-	if (answer) {
-		switch (answer) {
-		case 10:
-			Actor_Says(0, 4585, 13);
-			Actor_Face_Actor(15, 0, true);
-			if (Game_Flag_Query(46)) {
-				Actor_Says(15, 250, 13);
-				Actor_Says(15, 270, 13);
-				Actor_Clue_Acquire(0, 23, 1, 15);
-			} else {
-				Actor_Says(15, 260, 14);
-				Actor_Says(15, 270, 13);
-				Actor_Clue_Acquire(0, 24, 1, 15);
-			}
-			Actor_Says(0, 4645, 13);
-			Actor_Says(15, 280, 13);
-			Actor_Says(15, 290, 13);
-			Actor_Says(0, 4650, 18);
-			Actor_Says(15, 320, 13);
-			Actor_Says(0, 4665, 13);
-			Actor_Face_Object(15, "CURTAIN", true);
-			Actor_Says(15, 350, 13);
-			Actor_Face_Actor(15, 0, true);
-			Scene_Exit_Add_2D_Exit(1, 265, 58, 346, 154, 0);
-			Game_Flag_Set(141);
-			break;
-		case 20:
-			Actor_Says(0, 4590, 19);
-			Actor_Face_Actor(15, 0, true);
-			Actor_Says(15, 360, 13);
-			Loop_Actor_Walk_To_Waypoint(15, 89, 0, 0, false);
-			Loop_Actor_Walk_To_Waypoint(15, 102, 0, 0, false);
-			Actor_Face_Actor(0, 15, true);
-			Actor_Face_Heading(15, 539, false);
-			Delay(2000);
-			Loop_Actor_Walk_To_Waypoint(15, 89, 0, 0, false);
-			Actor_Face_Actor(0, 15, true);
-			Loop_Actor_Walk_To_Actor(15, 0, 24, 0, false);
-			Actor_Face_Actor(15, 0, true);
-			Actor_Face_Actor(0, 15, true);
-			Item_Pickup_Spin_Effect(964, 357, 228);
-			Actor_Says(15, 1700, 13);
-			Actor_Clue_Acquire(0, 15, 1, 15);
-			break;
-		case 30:
-			Actor_Says(0, 4595, 14);
-			break;
-		}
-	} else {
-		Actor_Says(0, 4580, 13);
-		Actor_Face_Actor(15, 0, true);
-		Actor_Says(15, 110, 18);
-		Actor_Says(15, 120, 17);
-		Actor_Says(15, 130, 19);
-		Actor_Says(0, 4605, 13);
-		Actor_Says(15, 140, 16);
+	switch (answer) {
+	case 0:
+		Actor_Says(kActorMcCoy, 4580, 13);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Actor_Says(kActorRunciter, 110, 18);
+		Actor_Says(kActorRunciter, 120, 17);
+		Actor_Says(kActorRunciter, 130, 19);
+		Actor_Says(kActorMcCoy, 4605, 13);
+		Actor_Says(kActorRunciter, 140, 16);
 		Game_Flag_Set(187);
+		break;
+	case 10:
+		Actor_Says(kActorMcCoy, 4585, 13);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		if (Game_Flag_Query(46)) {
+			Actor_Says(kActorRunciter, 250, 13);
+			Actor_Says(kActorRunciter, 270, 13);
+			Actor_Clue_Acquire(kActorMcCoy, kClueRunciterInterviewB1, 1, kActorRunciter);
+		} else {
+			Actor_Says(kActorRunciter, 260, 14);
+			Actor_Says(kActorRunciter, 270, 13);
+			Actor_Clue_Acquire(kActorMcCoy, kClueRunciterInterviewB2, 1, kActorRunciter);
+		}
+		Actor_Says(kActorMcCoy, 4645, 13);
+		Actor_Says(kActorRunciter, 280, 13);
+		Actor_Says(kActorRunciter, 290, 13);
+		Actor_Says(kActorMcCoy, 4650, 18);
+		Actor_Says(kActorRunciter, 320, 13);
+		Actor_Says(kActorMcCoy, 4665, 13);
+		Actor_Face_Object(kActorRunciter, "CURTAIN", true);
+		Actor_Says(kActorRunciter, 350, 13);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Scene_Exit_Add_2D_Exit(1, 265, 58, 346, 154, 0);
+		Game_Flag_Set(141);
+		break;
+	case 20:
+		Actor_Says(kActorMcCoy, 4590, 19);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Actor_Says(kActorRunciter, 360, 13);
+		Loop_Actor_Walk_To_Waypoint(kActorRunciter, 89, 0, 0, false);
+		Loop_Actor_Walk_To_Waypoint(kActorRunciter, 102, 0, 0, false);
+		Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+		Actor_Face_Heading(kActorRunciter, 539, false);
+		Delay(2000);
+		Loop_Actor_Walk_To_Waypoint(kActorRunciter, 89, 0, 0, false);
+		Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+		Loop_Actor_Walk_To_Actor(kActorRunciter, kActorMcCoy, 24, 0, false);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+		Item_Pickup_Spin_Effect(964, 357, 228);
+		Actor_Says(kActorRunciter, 1700, 13);
+		Actor_Clue_Acquire(kActorMcCoy, kClueReferenceLetter, 1, kActorRunciter);
+		break;
+	case 30:
+		Actor_Says(kActorMcCoy, 4595, 14);
+		break;
 	}
 }
 
 bool SceneScriptRC02::ClickedOnActor(int actorId) {
-	if (actorId != 15) {
+	if (actorId != kActorRunciter) {
 		return false;
 	}
 
 	if (Global_Variable_Query(1) == 4) {
-		Actor_Face_Actor(0, 15, true);
-		if (Actor_Query_Goal_Number(15) == 599) {
+		Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+		if (Actor_Query_Goal_Number(kActorRunciter) == 599) {
 			if (Random_Query(1, 2) == 1) {
-				Actor_Says(0, 8715, 17);
+				Actor_Says(kActorMcCoy, 8715, 17);
 			} else {
-				Actor_Says(0, 8720, 17);
+				Actor_Says(kActorMcCoy, 8720, 17);
 			}
 		} else if (Game_Flag_Query(705) || Game_Flag_Query(706)) {
-			Actor_Says(0, 4805, 11);
-			Actor_Face_Actor(15, 0, true);
+			Actor_Says(kActorMcCoy, 4805, 11);
+			Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
 			if (Game_Flag_Query(706)) {
-				Actor_Says(15, 720, 15);
+				Actor_Says(kActorRunciter, 720, 15);
 			} else {
-				Actor_Says(15, 730, 14);
+				Actor_Says(kActorRunciter, 730, 14);
 			}
-			Actor_Face_Heading(15, 1007, false);
+			Actor_Face_Heading(kActorRunciter, 1007, false);
 		} else {
-			Actor_Says(0, 4690, 11);
-			Actor_Says(0, 4695, 13);
-			Actor_Face_Actor(15, 0, true);
-			Actor_Says(15, 1610, 14);
-			if (Actor_Clue_Query(0, 76)) {
-				Actor_Says(0, 4700, 12);
-				Actor_Says(0, 4705, 13);
-				Actor_Says(15, 1620, 12);
-				Actor_Says(0, 4710, 15);
-				Actor_Says(0, 4715, 11);
+			Actor_Says(kActorMcCoy, 4690, 11);
+			Actor_Says(kActorMcCoy, 4695, 13);
+			Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+			Actor_Says(kActorRunciter, 1610, 14);
+			if (Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
+				Actor_Says(kActorMcCoy, 4700, 12);
+				Actor_Says(kActorMcCoy, 4705, 13);
+				Actor_Says(kActorRunciter, 1620, 12);
+				Actor_Says(kActorMcCoy, 4710, 15);
+				Actor_Says(kActorMcCoy, 4715, 11);
 				Delay(2000);
-				Actor_Says(0, 4720, 16);
-				Actor_Says(0, 4725, 17);
-				Actor_Says(15, 430, 16);
-				Actor_Face_Heading(15, 1007, false);
+				Actor_Says(kActorMcCoy, 4720, 16);
+				Actor_Says(kActorMcCoy, 4725, 17);
+				Actor_Says(kActorRunciter, 430, 16);
+				Actor_Face_Heading(kActorRunciter, 1007, false);
 			}
 			Game_Flag_Set(706);
 		}
 		return true;
 	}
-	AI_Movement_Track_Pause(15);
-	Loop_Actor_Walk_To_Actor(0, 15, 48, 1, false);
-	Actor_Face_Actor(0, 15, true);
+	AI_Movement_Track_Pause(kActorRunciter);
+	Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorRunciter, 48, 1, false);
+	Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
 	if (!Game_Flag_Query(6)) {
-		Actor_Says(0, 4560, 13);
-		Actor_Face_Actor(15, 0, true);
-		Actor_Says(15, 40, 16);
-		Actor_Says(15, 50, 15);
-		Actor_Says(0, 4565, 13);
-		Actor_Says(15, 60, 14);
-		Actor_Says(0, 4570, 18);
-		Actor_Says(15, 70, 13);
+		Actor_Says(kActorMcCoy, 4560, 13);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Actor_Says(kActorRunciter, 40, 16);
+		Actor_Says(kActorRunciter, 50, 15);
+		Actor_Says(kActorMcCoy, 4565, 13);
+		Actor_Says(kActorRunciter, 60, 14);
+		Actor_Says(kActorMcCoy, 4570, 18);
+		Actor_Says(kActorRunciter, 70, 13);
 		Game_Flag_Set(6);
-		Actor_Clue_Acquire(0, 22, 1, 15);
-		AI_Movement_Track_Unpause(15);
+		Actor_Clue_Acquire(kActorMcCoy, kClueRunciterInterviewA, 1, kActorRunciter);
+		AI_Movement_Track_Unpause(kActorRunciter);
 		return true;
 	}
 	if (Game_Flag_Query(187)) {
 		if (Player_Query_Agenda() == 0) {
 			Game_Flag_Reset(0);
 			sub_402A7C();
-			AI_Movement_Track_Unpause(15);
+			AI_Movement_Track_Unpause(kActorRunciter);
 			return true;
 		}
 
-		Actor_Says(0, 4610, 19);
-		Actor_Face_Actor(15, 0, true);
-		Actor_Says(15, 150, 15);
-		Actor_Says(0, 4615, 13);
-		Actor_Says(15, 160, 14);
-		Actor_Says(15, 170, 15);
-		Actor_Says(15, 180, 13);
+		Actor_Says(kActorMcCoy, 4610, 19);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Actor_Says(kActorRunciter, 150, 15);
+		Actor_Says(kActorMcCoy, 4615, 13);
+		Actor_Says(kActorRunciter, 160, 14);
+		Actor_Says(kActorRunciter, 170, 15);
+		Actor_Says(kActorRunciter, 180, 13);
 
 		if (Player_Query_Agenda() == 2) {
-			Actor_Says(0, 4620, 19);
-			Actor_Says(15, 190, 14);
-			Actor_Says(0, 4625, 13);
-			Actor_Says(15, 210, 13);
-			Actor_Says(0, 4630, 18);
-			Actor_Says(15, 220, 14);
-			Actor_Says(15, 230, 13);
-			Actor_Says(0, 4635, 19);
-			Actor_Says(15, 240, 16);
-			Actor_Says(0, 4640, 17);
+			Actor_Says(kActorMcCoy, 4620, 19);
+			Actor_Says(kActorRunciter, 190, 14);
+			Actor_Says(kActorMcCoy, 4625, 13);
+			Actor_Says(kActorRunciter, 210, 13);
+			Actor_Says(kActorMcCoy, 4630, 18);
+			Actor_Says(kActorRunciter, 220, 14);
+			Actor_Says(kActorRunciter, 230, 13);
+			Actor_Says(kActorMcCoy, 4635, 19);
+			Actor_Says(kActorRunciter, 240, 16);
+			Actor_Says(kActorMcCoy, 4640, 17);
 		}
 		Game_Flag_Reset(187);
-		AI_Movement_Track_Unpause(15);
+		AI_Movement_Track_Unpause(kActorRunciter);
 		return true;
 	}
 	sub_402A7C();
-	AI_Movement_Track_Unpause(15);
+	AI_Movement_Track_Unpause(kActorRunciter);
 	return true;
 }
 
 bool SceneScriptRC02::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 100 || itemId == 101 || itemId == 102) {
-		if (!Loop_Actor_Walk_To_Item(0, 100, 24, 1, false)) {
-			Actor_Face_Item(0, 100, true);
-			Actor_Clue_Acquire(0, 5, 1, -1);
+		if (!Loop_Actor_Walk_To_Item(kActorMcCoy, 100, 24, 1, false)) {
+			Actor_Face_Item(kActorMcCoy, 100, true);
+			Actor_Clue_Acquire(kActorMcCoy, kClueShellCasings, 1, -1);
 			Game_Flag_Set(190);
 			Item_Remove_From_World(100);
 			Item_Remove_From_World(101);
 			Item_Remove_From_World(102);
 			Item_Pickup_Spin_Effect(966, 395, 352);
-			Actor_Voice_Over(1960, 99);
+			Actor_Voice_Over(1960, kActorVoiceOver);
 		}
 		return true;
 	}
@@ -314,20 +313,20 @@ bool SceneScriptRC02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptRC02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -71.51f, -1238.89f, 108587.15f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -71.51f, -1238.89f, 108587.15f, 0, 1, false, 0)) {
 			Game_Flag_Set(9);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_Looping_Sound(71, true);
 			Ambient_Sounds_Remove_Looping_Sound(75, true);
 			Ambient_Sounds_Adjust_Looping_Sound(85, 100, -101, 1);
-			Actor_Set_Goal_Number(15, 0);
+			Actor_Set_Goal_Number(kActorRunciter, 0);
 			Set_Enter(69, 78);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -20.2f, -1238.73f, 108152.73f, 0, 1, false, 0)) {
-			Async_Actor_Walk_To_XYZ(0, -8.87f, -1238.89f, 108076.27f, 0, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -20.2f, -1238.73f, 108152.73f, 0, 1, false, 0)) {
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108076.27f, 0, false);
 			Set_Enter(16, 107);
 		}
 		return true;
@@ -349,36 +348,36 @@ void SceneScriptRC02::PlayerWalkedIn() {
 	Player_Set_Combat_Mode(false);
 	if (Game_Flag_Query(8)) {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(0, -72.2f, -1238.89f, 108496.73f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -72.2f, -1238.89f, 108496.73f, 0, 0, false, 0);
 		Player_Gains_Control();
 		Game_Flag_Reset(8);
 		if (!Game_Flag_Query(1)) {
-			Actor_Voice_Over(1970, 99);
-			Actor_Voice_Over(1980, 99);
-			Actor_Voice_Over(1990, 99);
-			Actor_Clue_Acquire(0, 3, 1, -1);
-			Actor_Clue_Acquire(0, 4, 1, -1);
+			Actor_Voice_Over(1970, kActorVoiceOver);
+			Actor_Voice_Over(1980, kActorVoiceOver);
+			Actor_Voice_Over(1990, kActorVoiceOver);
+			Actor_Clue_Acquire(kActorMcCoy, kClueLimpingFootprints, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueGracefulFootprints, 1, -1);
 			Game_Flag_Set(1);
 		}
-		if (Actor_Query_Which_Set_In(15) == 16 && Actor_Query_Goal_Number(15) < 300) {
-			Actor_Set_Goal_Number(15, 1);
+		if (Actor_Query_Which_Set_In(kActorRunciter) == 16 && Actor_Query_Goal_Number(kActorRunciter) < 300) {
+			Actor_Set_Goal_Number(kActorRunciter, 1);
 		}
-		if (Actor_Query_Goal_Number(15) == 300 && !Game_Flag_Query(704)) {
-			Actor_Face_Actor(15, 0, true);
-			Actor_Says(15, 370, 12);
-			Actor_Says(15, 380, 14);
-			Actor_Face_Actor(0, 15, true);
-			Actor_Says(0, 4670, 15);
-			Actor_Says(15, 390, 13);
-			Actor_Says(0, 4675, 14);
-			Actor_Face_Heading(15, 1007, false);
-			Actor_Says(15, 400, 13);
-			Actor_Says(15, 410, 12);
+		if (Actor_Query_Goal_Number(kActorRunciter) == 300 && !Game_Flag_Query(704)) {
+			Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+			Actor_Says(kActorRunciter, 370, 12);
+			Actor_Says(kActorRunciter, 380, 14);
+			Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+			Actor_Says(kActorMcCoy, 4670, 15);
+			Actor_Says(kActorRunciter, 390, 13);
+			Actor_Says(kActorMcCoy, 4675, 14);
+			Actor_Face_Heading(kActorRunciter, 1007, false);
+			Actor_Says(kActorRunciter, 400, 13);
+			Actor_Says(kActorRunciter, 410, 12);
 			Game_Flag_Set(704);
 		}
 	} else {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(0, -20.2f, -1238.89f, 108152.73f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -20.2f, -1238.89f, 108152.73f, 0, 0, false, 0);
 		Player_Gains_Control();
 	}
 }
diff --git a/engines/bladerunner/script/scene/rc03.cpp b/engines/bladerunner/script/scene/rc03.cpp
index 17e96f3895..efdc54449e 100644
--- a/engines/bladerunner/script/scene/rc03.cpp
+++ b/engines/bladerunner/script/scene/rc03.cpp
@@ -76,7 +76,7 @@ void SceneScriptRC03::InitializeScene() {
 	Ambient_Sounds_Add_Sound(193, 5, 70, 12, 12, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(194, 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);
-	if (Game_Flag_Query(107)  && Actor_Query_Goal_Number(7) != 102) {
+	if (Game_Flag_Query(107)  && Actor_Query_Goal_Number(kActorIzo) != 102) {
 		Scene_Loop_Start_Special(0, 0, 0);
 	}
 	Scene_Loop_Set_Default(1);
@@ -136,18 +136,18 @@ bool SceneScriptRC03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptRC03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 298.0f, -4.0f, 405.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 298.0f, -4.0f, 405.0f, 0, 1, false, 0)) {
 			if (Game_Flag_Query(289)) {
 				Game_Flag_Set(702);
 			}
 			Game_Flag_Set(114);
 			Set_Enter(69, 78);
-			Actor_Set_Goal_Number(3, 100);
+			Actor_Set_Goal_Number(kActorDektora, 100);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -469.0f, -4.0f, 279.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -469.0f, -4.0f, 279.0f, 0, 1, false, 0)) {
 			if (Game_Flag_Query(289)) {
 				Game_Flag_Set(702);
 			}
@@ -159,7 +159,7 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 147.51f, -4.0f, 166.48f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 147.51f, -4.0f, 166.48f, 0, 1, false, 0)) {
 			Game_Flag_Set(118);
 			Game_Flag_Reset(182);
 			Game_Flag_Set(259);
@@ -167,12 +167,12 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) {
 				Game_Flag_Set(702);
 			}
 			Set_Enter(74, 86);
-			Actor_Set_Goal_Number(3, 100);
+			Actor_Set_Goal_Number(kActorDektora, 100);
 		}
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -487.0f, 1.0f, 116.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -487.0f, 1.0f, 116.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(108);
 			Game_Flag_Reset(182);
 			Game_Flag_Set(479);
@@ -180,14 +180,14 @@ bool SceneScriptRC03::ClickedOnExit(int exitId) {
 				Game_Flag_Set(702);
 			}
 			Set_Enter(8, 106);
-			Actor_Set_Goal_Number(3, 100);
+			Actor_Set_Goal_Number(kActorDektora, 100);
 		}
 		return true;
 	}
 	if (exitId == 4) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -22.0f, 1.0f, -63.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -22.0f, 1.0f, -63.0f, 0, 1, false, 0)) {
 			if (Global_Variable_Query(1) == 3 || Global_Variable_Query(1) == 5 || Game_Flag_Query(702)) {
-				Actor_Says(0, 8522, 14);
+				Actor_Says(kActorMcCoy, 8522, 14);
 			} else {
 				Game_Flag_Set(120);
 				Set_Enter(71, 81);
@@ -215,67 +215,67 @@ void SceneScriptRC03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptRC03::sub_402834() {
-	Actor_Face_Actor(1, 0, true);
-	Actor_Says(1, 1820, 3);
-	Actor_Face_Actor(0, 1, true);
-	Actor_Says(0, 4815, 14);
-	Actor_Says(1, 1830, 3);
-	Actor_Says(1, 1840, 3);
-	Actor_Says(0, 4820, 12);
-	Actor_Says(1, 1850, 3);
-	Actor_Says(1, 1950, 3);
-	Actor_Says(0, 4835, 14);
-	Actor_Says(1, 1960, 3);
-	Actor_Says(1, 1980, 3);
-	Actor_Says(0, 4840, 15);
-	Actor_Says(1, 1990, 3);
-	Actor_Says(1, 2000, 3);
+	Actor_Face_Actor(kActorSteele, kActorMcCoy, true);
+	Actor_Says(kActorSteele, 1820, 3);
+	Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
+	Actor_Says(kActorMcCoy, 4815, 14);
+	Actor_Says(kActorSteele, 1830, 3);
+	Actor_Says(kActorSteele, 1840, 3);
+	Actor_Says(kActorMcCoy, 4820, 12);
+	Actor_Says(kActorSteele, 1850, 3);
+	Actor_Says(kActorSteele, 1950, 3);
+	Actor_Says(kActorMcCoy, 4835, 14);
+	Actor_Says(kActorSteele, 1960, 3);
+	Actor_Says(kActorSteele, 1980, 3);
+	Actor_Says(kActorMcCoy, 4840, 15);
+	Actor_Says(kActorSteele, 1990, 3);
+	Actor_Says(kActorSteele, 2000, 3);
 }
 
 void SceneScriptRC03::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(7) == 102) {
+	if (Actor_Query_Goal_Number(kActorIzo) == 102) {
 		Scene_Exits_Disable();
 		if (Game_Flag_Query(119) ) {
 			Player_Set_Combat_Mode(false);
 			Player_Loses_Control();
-			Actor_Set_At_XYZ(0, 147.51f, -4.0f, 166.48f, 500);
-			Actor_Put_In_Set(7, 70);
-			Actor_Set_At_XYZ(7, 196.0f, -4.0f, 184.0f, 775);
-			Actor_Face_Actor(7, 0, true);
-			Actor_Face_Actor(0, 7, true);
-			Actor_Change_Animation_Mode(7, 4);
-			Actor_Says_With_Pause(7, 630, 0, -1);
-			Actor_Says_With_Pause(7, 640, 0, -1);
-			Actor_Says_With_Pause(7, 650, 0, -1);
+			Actor_Set_At_XYZ(kActorMcCoy, 147.51f, -4.0f, 166.48f, 500);
+			Actor_Put_In_Set(kActorIzo, 70);
+			Actor_Set_At_XYZ(kActorIzo, 196.0f, -4.0f, 184.0f, 775);
+			Actor_Face_Actor(kActorIzo, kActorMcCoy, true);
+			Actor_Face_Actor(kActorMcCoy, kActorIzo, true);
+			Actor_Change_Animation_Mode(kActorIzo, 4);
+			Actor_Says_With_Pause(kActorIzo, 630, 0, -1);
+			Actor_Says_With_Pause(kActorIzo, 640, 0, -1);
+			Actor_Says_With_Pause(kActorIzo, 650, 0, -1);
 			if (Game_Flag_Query(44) ) {
-				Actor_Set_Goal_Number(1, 100);
+				Actor_Set_Goal_Number(kActorSteele, 100);
 			}
-			Actor_Change_Animation_Mode(0, 20);
-			Loop_Actor_Walk_To_XYZ(7, 180.0f, -4.0f, 184.0f, 0, 0, false, 0);
-			Actor_Change_Animation_Mode(7, 6);
+			Actor_Change_Animation_Mode(kActorMcCoy, 20);
+			Loop_Actor_Walk_To_XYZ(kActorIzo, 180.0f, -4.0f, 184.0f, 0, 0, false, 0);
+			Actor_Change_Animation_Mode(kActorIzo, 6);
 			if (!Game_Flag_Query(44)) {
-				Actor_Set_Goal_Number(1, 100);
+				Actor_Set_Goal_Number(kActorSteele, 100);
 			}
 			Player_Gains_Control();
 		} else {
-			Actor_Put_In_Set(7, 70);
-			Actor_Set_At_XYZ(7, -226.0f, 1.72f, 86.0f, 0);
-			Actor_Set_Targetable(7, true);
-			Actor_Set_Goal_Number(7, 110);
+			Actor_Put_In_Set(kActorIzo, 70);
+			Actor_Set_At_XYZ(kActorIzo, -226.0f, 1.72f, 86.0f, 0);
+			Actor_Set_Targetable(kActorIzo, true);
+			Actor_Set_Goal_Number(kActorIzo, 110);
 		}
 	}
-	if (Actor_Query_Goal_Number(7) == 103) {
+	if (Actor_Query_Goal_Number(kActorIzo) == 103) {
 		Player_Loses_Control();
-		Actor_Set_Goal_Number(1, 200);
-		Actor_Put_In_Set(1, 70);
+		Actor_Set_Goal_Number(kActorSteele, 200);
+		Actor_Put_In_Set(kActorSteele, 70);
 		if (Game_Flag_Query(119)  || Game_Flag_Query(121) ) {
-			Actor_Set_At_Waypoint(1, 175, 0);
+			Actor_Set_At_Waypoint(kActorSteele, 175, 0);
 		} else {
-			Actor_Set_At_Waypoint(1, 203, 0);
+			Actor_Set_At_Waypoint(kActorSteele, 203, 0);
 		}
 		sub_402834();
-		Async_Actor_Walk_To_Waypoint(1, 174, 0, 0);
-		Actor_Set_Goal_Number(7, 200);
+		Async_Actor_Walk_To_Waypoint(kActorSteele, 174, 0, 0);
+		Actor_Set_Goal_Number(kActorIzo, 200);
 		Player_Gains_Control();
 	}
 	Game_Flag_Reset(119);
@@ -283,13 +283,13 @@ void SceneScriptRC03::PlayerWalkedIn() {
 	Game_Flag_Reset(107);
 	Game_Flag_Reset(121);
 	if (Global_Variable_Query(1) == 1 || Global_Variable_Query(1) == 2) {
-		Actor_Set_Goal_Number(3, 103);
+		Actor_Set_Goal_Number(kActorDektora, 103);
 	}
 }
 
 void SceneScriptRC03::PlayerWalkedOut() {
-	if (Actor_Query_Goal_Number(7) == 199) {
-		Actor_Set_Goal_Number(7, 198);
+	if (Actor_Query_Goal_Number(kActorIzo) == 199) {
+		Actor_Set_Goal_Number(kActorIzo, 198);
 	}
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
diff --git a/engines/bladerunner/script/scene/rc04.cpp b/engines/bladerunner/script/scene/rc04.cpp
index e28653058f..fdd30cb4c1 100644
--- a/engines/bladerunner/script/scene/rc04.cpp
+++ b/engines/bladerunner/script/scene/rc04.cpp
@@ -29,11 +29,11 @@ void SceneScriptRC04::InitializeScene() {
 	Game_Flag_Reset(120);
 	Scene_Exit_Add_2D_Exit(0, 225, 47, 359, 248, 0);
 	if (!Game_Flag_Query(289)) {
-		Actor_Put_In_Set(14, 71);
-		Actor_Set_At_XYZ(14, -60.0f, -11.0f, 62.0f, 12);
+		Actor_Put_In_Set(kActorBulletBob, 71);
+		Actor_Set_At_XYZ(kActorBulletBob, -60.0f, -11.0f, 62.0f, 12);
 	}
 	if (Game_Flag_Query(289)) {
-		Actor_Change_Animation_Mode(14, 88);
+		Actor_Change_Animation_Mode(kActorBulletBob, 88);
 	}
 	Ambient_Sounds_Add_Looping_Sound(381, 100, 1, 1);
 	Ambient_Sounds_Add_Sound(82, 5, 30, 10, 20, -100, 100, -101, -101, 0, 0);
@@ -48,7 +48,7 @@ void SceneScriptRC04::SceneLoaded() {
 	Obstacle_Object("GRNDNEON07", true);
 	Unobstacle_Object("DisplayTrim", true);
 	Unobstacle_Object("Display01", true);
-	Actor_Set_Goal_Number(67, 200);
+	Actor_Set_Goal_Number(kActorGenwalkerA, 200);
 }
 
 bool SceneScriptRC04::MouseClick(int x, int y) {
@@ -61,23 +61,23 @@ bool SceneScriptRC04::ClickedOn3DObject(const char *objectName, bool a2) {
 
 void SceneScriptRC04::sub_401DF4() {
 	Dialogue_Menu_Clear_List();
-	if (Actor_Clue_Query(0, 11) && !Actor_Clue_Query(0, 62)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueLabShellCasings) && !Actor_Clue_Query(kActorMcCoy, kClueRadiationGoggles)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(580, -1, 4, 9);
 	}
-	if (Actor_Clue_Query(0, 5) && !Actor_Clue_Query(0, 11) && !Actor_Clue_Query(0, 62)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueShellCasings) && !Actor_Clue_Query(kActorMcCoy, kClueLabShellCasings) && !Actor_Clue_Query(kActorMcCoy, kClueRadiationGoggles)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(590, 6, 5, 3);
 	}
-	if (Actor_Clue_Query(0, 57)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueHasanInterview)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(600, -1, 3, 7);
 		DM_Add_To_List_Never_Repeat_Once_Selected(1310, -1, 2, 8);
 	}
-	if (Actor_Clue_Query(0, 62) && !Actor_Clue_Query(0, 63)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueRadiationGoggles) && !Actor_Clue_Query(kActorMcCoy, kClueGogglesReplicantIssue)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(610, 4, 5, 6);
 	}
 	if (!Game_Flag_Query(305)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1280, 1, 2, 3);
 	}
-	if (Actor_Clue_Query(0, 110) && !Actor_Clue_Query(14, 110)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueHoldensBadge) && !Actor_Clue_Query(kActorBulletBob, kClueHoldensBadge)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(620, 1, -1, -1);
 	}
 	Dialogue_Menu_Add_DONE_To_List(630);
@@ -87,199 +87,199 @@ void SceneScriptRC04::sub_401DF4() {
 
 	switch (answer) {
 	case 580:
-		Actor_Says(0, 4955, 30);
-		Actor_Says(14, 210, 37);
-		Actor_Says(14, 220, 37);
-		Actor_Says(14, 230, 37);
-		Actor_Says(14, 240, 37);
-		Actor_Says(0, 4990, 16);
-		Actor_Says(0, 4995, 11);
-		Actor_Says(14, 270, 31);
-		Actor_Says(0, 5005, 16);
-		Actor_Says(14, 280, 32);
-		Actor_Says(14, 290, 30);
-		Actor_Says(14, 300, 33);
-		Actor_Says(14, 310, 31);
-		Actor_Says(0, 5010, 11);
-		Actor_Says(14, 320, 30);
-		Actor_Says(14, 330, 33);
-		Actor_Says(14, 340, 37);
-		Actor_Says(0, 5015, 11);
+		Actor_Says(kActorMcCoy, 4955, 30);
+		Actor_Says(kActorBulletBob, 210, 37);
+		Actor_Says(kActorBulletBob, 220, 37);
+		Actor_Says(kActorBulletBob, 230, 37);
+		Actor_Says(kActorBulletBob, 240, 37);
+		Actor_Says(kActorMcCoy, 4990, 16);
+		Actor_Says(kActorMcCoy, 4995, 11);
+		Actor_Says(kActorBulletBob, 270, 31);
+		Actor_Says(kActorMcCoy, 5005, 16);
+		Actor_Says(kActorBulletBob, 280, 32);
+		Actor_Says(kActorBulletBob, 290, 30);
+		Actor_Says(kActorBulletBob, 300, 33);
+		Actor_Says(kActorBulletBob, 310, 31);
+		Actor_Says(kActorMcCoy, 5010, 11);
+		Actor_Says(kActorBulletBob, 320, 30);
+		Actor_Says(kActorBulletBob, 330, 33);
+		Actor_Says(kActorBulletBob, 340, 37);
+		Actor_Says(kActorMcCoy, 5015, 11);
 		if (Game_Flag_Query(44)) {
-			Actor_Says(14, 350, 32);
-			Actor_Says(14, 360, 33);
-			Actor_Says(14, 370, 30);
-			Actor_Says(0, 5020, 16);
-			Actor_Says(14, 380, 37);
-			Actor_Says(14, 390, 11);
-			Actor_Says(14, 400, 37);
-			Actor_Clue_Acquire(0, 58, 1, 0);
+			Actor_Says(kActorBulletBob, 350, 32);
+			Actor_Says(kActorBulletBob, 360, 33);
+			Actor_Says(kActorBulletBob, 370, 30);
+			Actor_Says(kActorMcCoy, 5020, 16);
+			Actor_Says(kActorBulletBob, 380, 37);
+			Actor_Says(kActorBulletBob, 390, 11);
+			Actor_Says(kActorBulletBob, 400, 37);
+			Actor_Clue_Acquire(kActorMcCoy, kClueBobInterview1, 1, kActorMcCoy);
 		} else {
-			Actor_Says(14, 410, 11);
-			Actor_Says(14, 420, 37);
-			Actor_Says(0, 5025, 16);
-			Actor_Says(14, 430, 30);
-			Actor_Says(14, 440, 31);
-			Actor_Says(14, 450, 32);
-			Actor_Says(0, 5030, 16);
-			Actor_Says(14, 460, 37);
-			Actor_Clue_Acquire(0, 59, 1, 0);
+			Actor_Says(kActorBulletBob, 410, 11);
+			Actor_Says(kActorBulletBob, 420, 37);
+			Actor_Says(kActorMcCoy, 5025, 16);
+			Actor_Says(kActorBulletBob, 430, 30);
+			Actor_Says(kActorBulletBob, 440, 31);
+			Actor_Says(kActorBulletBob, 450, 32);
+			Actor_Says(kActorMcCoy, 5030, 16);
+			Actor_Says(kActorBulletBob, 460, 37);
+			Actor_Clue_Acquire(kActorMcCoy, kClueBobInterview2, 1, kActorMcCoy);
 		}
 		return;
 	case 590:
-		Actor_Says(0, 4960, 13);
-		Actor_Says(14, 250, 30);
-		Actor_Says(14, 260, 33);
-		Actor_Says(0, 4995, 15);
-		Actor_Says(14, 270, 32);
-		Actor_Says(0, 5005, 11);
-		Actor_Says(14, 280, 33);
-		Actor_Says(14, 290, 30);
-		Actor_Says(14, 300, 32);
-		Actor_Says(14, 310, 37);
-		Actor_Says(0, 5010, 13);
-		Actor_Says(14, 320, 37);
-		Actor_Says(14, 330, 33);
-		Actor_Says(14, 340, 11);
-		Actor_Says(0, 5015, 16);
-		Actor_Modify_Friendliness_To_Other(14, 0, 3);
+		Actor_Says(kActorMcCoy, 4960, 13);
+		Actor_Says(kActorBulletBob, 250, 30);
+		Actor_Says(kActorBulletBob, 260, 33);
+		Actor_Says(kActorMcCoy, 4995, 15);
+		Actor_Says(kActorBulletBob, 270, 32);
+		Actor_Says(kActorMcCoy, 5005, 11);
+		Actor_Says(kActorBulletBob, 280, 33);
+		Actor_Says(kActorBulletBob, 290, 30);
+		Actor_Says(kActorBulletBob, 300, 32);
+		Actor_Says(kActorBulletBob, 310, 37);
+		Actor_Says(kActorMcCoy, 5010, 13);
+		Actor_Says(kActorBulletBob, 320, 37);
+		Actor_Says(kActorBulletBob, 330, 33);
+		Actor_Says(kActorBulletBob, 340, 11);
+		Actor_Says(kActorMcCoy, 5015, 16);
+		Actor_Modify_Friendliness_To_Other(kActorBulletBob, kActorMcCoy, 3);
 		if (Game_Flag_Query(44)) {
-			Actor_Says(14, 350, 32);
-			Actor_Says(14, 360, 30);
-			Actor_Says(14, 370, 33);
-			Actor_Says(0, 5020, 15);
-			Actor_Says(14, 380, 33);
-			Actor_Says(14, 390, 37);
-			Actor_Says(14, 400, 32);
-			Actor_Clue_Acquire(0, 58, 1, 0);
+			Actor_Says(kActorBulletBob, 350, 32);
+			Actor_Says(kActorBulletBob, 360, 30);
+			Actor_Says(kActorBulletBob, 370, 33);
+			Actor_Says(kActorMcCoy, 5020, 15);
+			Actor_Says(kActorBulletBob, 380, 33);
+			Actor_Says(kActorBulletBob, 390, 37);
+			Actor_Says(kActorBulletBob, 400, 32);
+			Actor_Clue_Acquire(kActorMcCoy, kClueBobInterview1, 1, kActorMcCoy);
 		} else {
-			Actor_Says(14, 410, 32);
-			Actor_Says(14, 420, 30);
-			Actor_Says(0, 5025, 13);
-			Actor_Says(14, 430, 33);
-			Actor_Says(14, 440, 32);
-			Actor_Says(14, 450, 37);
-			Actor_Says(0, 5030, 16);
-			Actor_Says(14, 460, 30);
-			Actor_Clue_Acquire(0, 59, 1, 0);
+			Actor_Says(kActorBulletBob, 410, 32);
+			Actor_Says(kActorBulletBob, 420, 30);
+			Actor_Says(kActorMcCoy, 5025, 13);
+			Actor_Says(kActorBulletBob, 430, 33);
+			Actor_Says(kActorBulletBob, 440, 32);
+			Actor_Says(kActorBulletBob, 450, 37);
+			Actor_Says(kActorMcCoy, 5030, 16);
+			Actor_Says(kActorBulletBob, 460, 30);
+			Actor_Clue_Acquire(kActorMcCoy, kClueBobInterview2, 1, kActorMcCoy);
 		}
 		break;
 	case 600:
-		Actor_Says(0, 4965, 11);
-		Actor_Says(14, 470, 11);
-		Actor_Says(0, 5035, 15);
-		Actor_Says(14, 480, 30);
-		Actor_Says(14, 490, 31);
-		Actor_Says(14, 500, 32);
-		Actor_Says(14, 510, 33);
-		Actor_Says(14, 520, 34);
-		Actor_Says(14, 530, 35);
-		Actor_Says(14, 540, 36);
-		Actor_Says(0, 5040, 16);
-		Actor_Says(14, 550, 11);
-		Actor_Modify_Friendliness_To_Other(14, 0, -6);
+		Actor_Says(kActorMcCoy, 4965, 11);
+		Actor_Says(kActorBulletBob, 470, 11);
+		Actor_Says(kActorMcCoy, 5035, 15);
+		Actor_Says(kActorBulletBob, 480, 30);
+		Actor_Says(kActorBulletBob, 490, 31);
+		Actor_Says(kActorBulletBob, 500, 32);
+		Actor_Says(kActorBulletBob, 510, 33);
+		Actor_Says(kActorBulletBob, 520, 34);
+		Actor_Says(kActorBulletBob, 530, 35);
+		Actor_Says(kActorBulletBob, 540, 36);
+		Actor_Says(kActorMcCoy, 5040, 16);
+		Actor_Says(kActorBulletBob, 550, 11);
+		Actor_Modify_Friendliness_To_Other(kActorBulletBob, kActorMcCoy, -6);
 		break;
 	case 610:
-		Actor_Says(0, 4970, 16);
-		if (Actor_Query_Friendliness_To_Other(14, 0) < 50) {
-			Actor_Says(14, 700, 11);
-			Actor_Says(0, 5070, 11);
-			Actor_Says(14, 710, 11);
-			Actor_Says(0, 5075, 15);
-			Actor_Says(14, 720, 30);
-			Actor_Says(0, 5080, 11);
-			Actor_Says(14, 730, 37);
-			Actor_Clue_Acquire(0, 58, 1, 0);
+		Actor_Says(kActorMcCoy, 4970, 16);
+		if (Actor_Query_Friendliness_To_Other(kActorBulletBob, kActorMcCoy) < 50) {
+			Actor_Says(kActorBulletBob, 700, 11);
+			Actor_Says(kActorMcCoy, 5070, 11);
+			Actor_Says(kActorBulletBob, 710, 11);
+			Actor_Says(kActorMcCoy, 5075, 15);
+			Actor_Says(kActorBulletBob, 720, 30);
+			Actor_Says(kActorMcCoy, 5080, 11);
+			Actor_Says(kActorBulletBob, 730, 37);
+			Actor_Clue_Acquire(kActorMcCoy, kClueBobInterview1, 1, kActorMcCoy);
 		} else {
-			Actor_Says(14, 560, 37);
-			Actor_Says(0, 5070, 13);
-			Actor_Says(14, 570, 36);
-			Actor_Says(14, 580, 37);
-			Actor_Says(14, 590, 31);
-			Actor_Says(14, 600, 32);
-			Actor_Says(14, 610, 30);
-			Actor_Says(0, 5050, 16);
-			Actor_Says(14, 620, 35);
-			Actor_Says(14, 630, 35);
-			Actor_Says(0, 5055, 11);
-			Actor_Says(14, 640, 36);
-			Actor_Says(14, 650, 35);
-			Actor_Says(14, 660, 30);
-			Actor_Says(0, 5060, 13);
-			Actor_Clue_Acquire(0, 63, 1, 0);
+			Actor_Says(kActorBulletBob, 560, 37);
+			Actor_Says(kActorMcCoy, 5070, 13);
+			Actor_Says(kActorBulletBob, 570, 36);
+			Actor_Says(kActorBulletBob, 580, 37);
+			Actor_Says(kActorBulletBob, 590, 31);
+			Actor_Says(kActorBulletBob, 600, 32);
+			Actor_Says(kActorBulletBob, 610, 30);
+			Actor_Says(kActorMcCoy, 5050, 16);
+			Actor_Says(kActorBulletBob, 620, 35);
+			Actor_Says(kActorBulletBob, 630, 35);
+			Actor_Says(kActorMcCoy, 5055, 11);
+			Actor_Says(kActorBulletBob, 640, 36);
+			Actor_Says(kActorBulletBob, 650, 35);
+			Actor_Says(kActorBulletBob, 660, 30);
+			Actor_Says(kActorMcCoy, 5060, 13);
+			Actor_Clue_Acquire(kActorMcCoy, kClueGogglesReplicantIssue, 1, kActorMcCoy);
 		}
 		break;
 	case 1280:
-		Actor_Says(0, 9040, 16);
+		Actor_Says(kActorMcCoy, 9040, 16);
 		if (!Game_Flag_Query(305)) {
-			Actor_Says(14, 2080, 30);
-			Actor_Says(14, 2090, 37);
-			Actor_Says(0, 9045, 14);
-			Actor_Says(14, 2100, 32);
-			Actor_Says(14, 2110, 37);
+			Actor_Says(kActorBulletBob, 2080, 30);
+			Actor_Says(kActorBulletBob, 2090, 37);
+			Actor_Says(kActorMcCoy, 9045, 14);
+			Actor_Says(kActorBulletBob, 2100, 32);
+			Actor_Says(kActorBulletBob, 2110, 37);
 			Game_Flag_Set(305);
 		}
-		Actor_Says(14, 2120, 31);
+		Actor_Says(kActorBulletBob, 2120, 31);
 		if (Global_Variable_Query(2) > 40 || Query_Difficulty_Level() == 0) {
-			Actor_Says(0, 4940, 13);
+			Actor_Says(kActorMcCoy, 4940, 13);
 			if (Query_Difficulty_Level() != 0) {
 				Global_Variable_Decrement(2, 40);
 			}
 			Item_Pickup_Spin_Effect(995, 405, 192);
 			Give_McCoy_Ammo(1, 24);
 		} else {
-			Actor_Says(0, 125, 13);
-			Actor_Modify_Friendliness_To_Other(14, 0, -2);
+			Actor_Says(kActorMcCoy, 125, 13);
+			Actor_Modify_Friendliness_To_Other(kActorBulletBob, kActorMcCoy, -2);
 		}
 		break;
 	case 1310:
-		Actor_Says(0, 4980, 11);
-		if (Actor_Query_Friendliness_To_Other(14, 0) > 49) {
-			Actor_Says(14, 740, 37);
-			Actor_Says(0, 5085, 16);
-			Actor_Says(14, 750, 37);
-			Actor_Says(14, 760, 37);
-			Voight_Kampff_Activate(14, 50);
-			Actor_Modify_Friendliness_To_Other(14, 0, 3);
-			Actor_Says(14, 810, 37);
-			Actor_Says(0, 5025, 13);
-			Actor_Says(14, 820, 32);
-			Actor_Says(0, 5100, 11);
-			Actor_Says(14, 830, 31);
-			Actor_Says(14, 840, 35);
+		Actor_Says(kActorMcCoy, 4980, 11);
+		if (Actor_Query_Friendliness_To_Other(kActorBulletBob, kActorMcCoy) > 49) {
+			Actor_Says(kActorBulletBob, 740, 37);
+			Actor_Says(kActorMcCoy, 5085, 16);
+			Actor_Says(kActorBulletBob, 750, 37);
+			Actor_Says(kActorBulletBob, 760, 37);
+			Voight_Kampff_Activate(kActorBulletBob, 50);
+			Actor_Modify_Friendliness_To_Other(kActorBulletBob, kActorMcCoy, 3);
+			Actor_Says(kActorBulletBob, 810, 37);
+			Actor_Says(kActorMcCoy, 5025, 13);
+			Actor_Says(kActorBulletBob, 820, 32);
+			Actor_Says(kActorMcCoy, 5100, 11);
+			Actor_Says(kActorBulletBob, 830, 31);
+			Actor_Says(kActorBulletBob, 840, 35);
 		} else {
-			Actor_Says(14, 770, 36);
-			Actor_Says(14, 780, 36);
-			Actor_Says(0, 5090, 16);
-			Actor_Says(14, 790, 36);
-			Actor_Says(14, 800, 35);
-			Voight_Kampff_Activate(14, 50);
-			Actor_Says(14, 810, 30);
-			Actor_Says(0, 5025, 13);
-			Actor_Says(14, 820, 31);
-			Actor_Says(0, 5100, 15);
-			Actor_Says(14, 830, 34);
-			Actor_Says(14, 840, 34);
+			Actor_Says(kActorBulletBob, 770, 36);
+			Actor_Says(kActorBulletBob, 780, 36);
+			Actor_Says(kActorMcCoy, 5090, 16);
+			Actor_Says(kActorBulletBob, 790, 36);
+			Actor_Says(kActorBulletBob, 800, 35);
+			Voight_Kampff_Activate(kActorBulletBob, 50);
+			Actor_Says(kActorBulletBob, 810, 30);
+			Actor_Says(kActorMcCoy, 5025, 13);
+			Actor_Says(kActorBulletBob, 820, 31);
+			Actor_Says(kActorMcCoy, 5100, 15);
+			Actor_Says(kActorBulletBob, 830, 34);
+			Actor_Says(kActorBulletBob, 840, 34);
 		}
 		break;
 	case 620:
-		Actor_Says(0, 4985, 11);
-		Actor_Says(14, 850, 35);
-		Actor_Says(0, 5105, 13);
-		Actor_Says(0, 5110, 11);
-		Actor_Says(14, 860, 30);
-		Actor_Says(0, 5115, 16);
-		Actor_Says(14, 870, 31);
-		Actor_Says(0, 5120, 15);
-		Actor_Says(14, 880, 34);
-		Actor_Clue_Acquire(14, 110, 1, 0);
-		Actor_Modify_Friendliness_To_Other(14, 0, 8);
+		Actor_Says(kActorMcCoy, 4985, 11);
+		Actor_Says(kActorBulletBob, 850, 35);
+		Actor_Says(kActorMcCoy, 5105, 13);
+		Actor_Says(kActorMcCoy, 5110, 11);
+		Actor_Says(kActorBulletBob, 860, 30);
+		Actor_Says(kActorMcCoy, 5115, 16);
+		Actor_Says(kActorBulletBob, 870, 31);
+		Actor_Says(kActorMcCoy, 5120, 15);
+		Actor_Says(kActorBulletBob, 880, 34);
+		Actor_Clue_Acquire(kActorBulletBob, kClueHoldensBadge, 1, kActorMcCoy);
+		Actor_Modify_Friendliness_To_Other(kActorBulletBob, kActorMcCoy, 8);
 		if (Query_Difficulty_Level() != 0) {
 			Global_Variable_Increment(2, 60);
 		}
 		break;
 	case 630:
-		Actor_Says(0, 1315, 12);
+		Actor_Says(kActorMcCoy, 1315, 12);
 		break;
 	}
 }
@@ -289,75 +289,75 @@ bool SceneScriptRC04::ClickedOnActor(int actorId) {
 		return false;
 	}
 	if (actorId == 14 && Global_Variable_Query(1) == 2 && !Game_Flag_Query(289)) {
-		Loop_Actor_Walk_To_Waypoint(0, 104, 0, 0, false);
-		Actor_Face_Actor(0, 14, true);
-		if (Game_Flag_Query(287) && !Game_Flag_Query(292) && Actor_Query_Friendliness_To_Other(14, 0) > 45) {
-			Actor_Says(14, 30, 30);
-			Actor_Says(0, 4875, 13);
-			Actor_Says(14, 80, 31);
-			Actor_Says(0, 4900, 15);
-			Actor_Says(14, 90, 33);
-			Actor_Says(14, 100, 34);
-			Actor_Says(0, 4905, 15);
+		Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 104, 0, 0, false);
+		Actor_Face_Actor(kActorMcCoy, kActorBulletBob, true);
+		if (Game_Flag_Query(287) && !Game_Flag_Query(292) && Actor_Query_Friendliness_To_Other(kActorBulletBob, kActorMcCoy) > 45) {
+			Actor_Says(kActorBulletBob, 30, 30);
+			Actor_Says(kActorMcCoy, 4875, 13);
+			Actor_Says(kActorBulletBob, 80, 31);
+			Actor_Says(kActorMcCoy, 4900, 15);
+			Actor_Says(kActorBulletBob, 90, 33);
+			Actor_Says(kActorBulletBob, 100, 34);
+			Actor_Says(kActorMcCoy, 4905, 15);
 			Game_Flag_Set(292);
-		} else if (Game_Flag_Query(287) && !Game_Flag_Query(290) && Actor_Query_Friendliness_To_Other(14, 0) < 45) {
-			Actor_Says(14, 40, 30);
-			Actor_Says(0, 4880, 13);
-			Actor_Says(14, 50, 35);
-			Actor_Says(0, 4875, 16);
-			Actor_Says(14, 60, 36);
-			Actor_Says(0, 4890, 13);
-			Actor_Says(14, 70, 33);
-			Actor_Says(0, 4895, 16);
-			Actor_Modify_Friendliness_To_Other(14, 0, -5);
+		} else if (Game_Flag_Query(287) && !Game_Flag_Query(290) && Actor_Query_Friendliness_To_Other(kActorBulletBob, kActorMcCoy) < 45) {
+			Actor_Says(kActorBulletBob, 40, 30);
+			Actor_Says(kActorMcCoy, 4880, 13);
+			Actor_Says(kActorBulletBob, 50, 35);
+			Actor_Says(kActorMcCoy, 4875, 16);
+			Actor_Says(kActorBulletBob, 60, 36);
+			Actor_Says(kActorMcCoy, 4890, 13);
+			Actor_Says(kActorBulletBob, 70, 33);
+			Actor_Says(kActorMcCoy, 4895, 16);
+			Actor_Modify_Friendliness_To_Other(kActorBulletBob, kActorMcCoy, -5);
 			Game_Flag_Set(290);
-		} else if (Actor_Query_Friendliness_To_Other(14, 0) > 51 && !Game_Flag_Query(717)) {
-			Actor_Says(14, 1870, 30);
-			Actor_Says(14, 1880, 30);
-			Actor_Says(0, 8960, 13);
-			Actor_Says(14, 1890, 36);
-			Actor_Says(14, 1900, 35);
-			Actor_Says(0, 8965, 16);
-			Actor_Says(14, 1920, 36);
-			Actor_Says(14, 1930, 33);
-			Actor_Says(14, 1940, 36);
-			Actor_Says(14, 1950, 30);
-			Actor_Says(0, 8970, 13);
-			Actor_Says(14, 1960, 33);
-			Actor_Says(14, 1970, 30);
-			Actor_Says(14, 1980, 36);
+		} else if (Actor_Query_Friendliness_To_Other(kActorBulletBob, kActorMcCoy) > 51 && !Game_Flag_Query(717)) {
+			Actor_Says(kActorBulletBob, 1870, 30);
+			Actor_Says(kActorBulletBob, 1880, 30);
+			Actor_Says(kActorMcCoy, 8960, 13);
+			Actor_Says(kActorBulletBob, 1890, 36);
+			Actor_Says(kActorBulletBob, 1900, 35);
+			Actor_Says(kActorMcCoy, 8965, 16);
+			Actor_Says(kActorBulletBob, 1920, 36);
+			Actor_Says(kActorBulletBob, 1930, 33);
+			Actor_Says(kActorBulletBob, 1940, 36);
+			Actor_Says(kActorBulletBob, 1950, 30);
+			Actor_Says(kActorMcCoy, 8970, 13);
+			Actor_Says(kActorBulletBob, 1960, 33);
+			Actor_Says(kActorBulletBob, 1970, 30);
+			Actor_Says(kActorBulletBob, 1980, 36);
 			Delay(1000);
-			Actor_Says(14, 2010, 35);
+			Actor_Says(kActorBulletBob, 2010, 35);
 			if (Global_Variable_Query(2) > 50 || Query_Difficulty_Level() == 0) {
-				Actor_Says(0, 8975, 16);
+				Actor_Says(kActorMcCoy, 8975, 16);
 				if (Query_Difficulty_Level() != 0) {
 					Global_Variable_Decrement(2, 50);
 				}
 				Delay(3000);
 				Item_Pickup_Spin_Effect(941, 405, 192);
-				Actor_Says(14, 2030, 30);
+				Actor_Says(kActorBulletBob, 2030, 30);
 				Game_Flag_Set(487);
 			} else {
-				Actor_Says(0, 8980, 16);
-				Actor_Says(14, 2040, 30);
-				Actor_Says(0, 8985, 15);
-				Actor_Says(14, 2050, 33);
+				Actor_Says(kActorMcCoy, 8980, 16);
+				Actor_Says(kActorBulletBob, 2040, 30);
+				Actor_Says(kActorMcCoy, 8985, 15);
+				Actor_Says(kActorBulletBob, 2050, 33);
 			}
 			Game_Flag_Set(717);
-		} else if (Actor_Clue_Query(0, 11) || Actor_Clue_Query(0, 5) || Actor_Clue_Query(0, 62) || Actor_Clue_Query(0, 110) || Actor_Clue_Query(0, 57) || !Game_Flag_Query(305)) {
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueLabShellCasings) || Actor_Clue_Query(kActorMcCoy, kClueShellCasings) || Actor_Clue_Query(kActorMcCoy, kClueRadiationGoggles) || Actor_Clue_Query(kActorMcCoy, kClueHoldensBadge) || Actor_Clue_Query(kActorMcCoy, kClueHasanInterview) || !Game_Flag_Query(305)) {
 			sub_401DF4();
 		} else {
-			Actor_Says(14, 1820, 30);
+			Actor_Says(kActorBulletBob, 1820, 30);
 		}
 		return true;
 	}
 	if (actorId == 14 && Game_Flag_Query(289)) {
-		Actor_Face_Actor(0, 14, true);
-		if (Actor_Clue_Query(0, 164)) {
-			Actor_Says(0, 8590, -1);
+		Actor_Face_Actor(kActorMcCoy, kActorBulletBob, true);
+		if (Actor_Clue_Query(kActorMcCoy, kClueVKBobGorskyReplicant)) {
+			Actor_Says(kActorMcCoy, 8590, -1);
 		} else {
-			Actor_Voice_Over(2100, 99);
-			Actor_Voice_Over(2110, 99);
+			Actor_Voice_Over(2100, kActorVoiceOver);
+			Actor_Voice_Over(2110, kActorVoiceOver);
 		}
 		return true;
 	}
@@ -370,7 +370,7 @@ bool SceneScriptRC04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptRC04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 45.0f, 0.15f, 68.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 45.0f, 0.15f, 68.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(121);
 			Set_Enter(70, 80);
 		}
@@ -390,22 +390,22 @@ void SceneScriptRC04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptRC04::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_Waypoint(0, 103, 0, 0, false);
+	Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 103, 0, 0, false);
 	if (Global_Variable_Query(1) != 2 || Game_Flag_Query(287) || Player_Query_Combat_Mode()) {
 		if (Global_Variable_Query(1) == 4 && !Game_Flag_Query(289) && !Game_Flag_Query(306)) {
-			Actor_Says(38, 40, 3);
-			Actor_Says(14, 890, 37);
-			Actor_Set_Goal_Number(14, 2);
+			Actor_Says(kActorDispatcher, 40, 3);
+			Actor_Says(kActorBulletBob, 890, 37);
+			Actor_Set_Goal_Number(kActorBulletBob, 2);
 		}
 		Game_Flag_Set(287);
 	} else {
-		Actor_Says(14, 0, 31);
-		Loop_Actor_Walk_To_Waypoint(0, 104, 0, 0, false);
-		Actor_Face_Actor(0, 14, true);
-		Actor_Says(0, 4865, 13);
-		Actor_Says(14, 10, 32);
-		Actor_Says(0, 4870, 16);
-		Actor_Says(14, 20, 31);
+		Actor_Says(kActorBulletBob, 0, 31);
+		Loop_Actor_Walk_To_Waypoint(kActorMcCoy, 104, 0, 0, false);
+		Actor_Face_Actor(kActorMcCoy, kActorBulletBob, true);
+		Actor_Says(kActorMcCoy, 4865, 13);
+		Actor_Says(kActorBulletBob, 10, 32);
+		Actor_Says(kActorMcCoy, 4870, 16);
+		Actor_Says(kActorBulletBob, 20, 31);
 		Game_Flag_Set(287);
 	}
 }
diff --git a/engines/bladerunner/script/scene/rc51.cpp b/engines/bladerunner/script/scene/rc51.cpp
index dd62c53aba..c19a0ff7ce 100644
--- a/engines/bladerunner/script/scene/rc51.cpp
+++ b/engines/bladerunner/script/scene/rc51.cpp
@@ -55,8 +55,8 @@ bool SceneScriptRC51::MouseClick(int x, int y) {
 
 bool SceneScriptRC51::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("POSTER_2", objectName)) {
-		Actor_Face_Object(0, "POSTER_2", true);
-		Actor_Says(0, 8620, 3);
+		Actor_Face_Object(kActorMcCoy, "POSTER_2", true);
+		Actor_Says(kActorMcCoy, 8620, 3);
 		return true;
 	}
 	return false;
@@ -67,32 +67,32 @@ bool SceneScriptRC51::ClickedOnActor(int actorId) {
 }
 
 bool SceneScriptRC51::ClickedOnItem(int itemId, bool a2) {
-	if (itemId == 82 && !Loop_Actor_Walk_To_XYZ(0, 17.97f, -1238.89f, 108053.5f, 0, 1, false, 0)) {
-		Actor_Face_Item(0, 82, true);
-		Actor_Clue_Acquire(0, 8, 1, -1);
+	if (itemId == 82 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 17.97f, -1238.89f, 108053.5f, 0, 1, false, 0)) {
+		Actor_Face_Item(kActorMcCoy, 82, true);
+		Actor_Clue_Acquire(kActorMcCoy, kClueChopstickWrapper, 1, -1);
 		Item_Remove_From_World(82);
 		Item_Pickup_Spin_Effect(937, 437, 407);
-		Actor_Voice_Over(2010, 99);
+		Actor_Voice_Over(2010, kActorVoiceOver);
 		Game_Flag_Set(147);
 		return true;
 	}
-	if (itemId == 79 && !Loop_Actor_Walk_To_Item(0, 79, 36, 1, false)) {
-		Actor_Face_Item(0, 79, true);
-		Actor_Clue_Acquire(0, 6, 1, -1);
+	if (itemId == 79 && !Loop_Actor_Walk_To_Item(kActorMcCoy, 79, 36, 1, false)) {
+		Actor_Face_Item(kActorMcCoy, 79, true);
+		Actor_Clue_Acquire(kActorMcCoy, kClueCandy, 1, -1);
 		Item_Remove_From_World(79);
 		Item_Pickup_Spin_Effect(933, 445, 230);
-		Actor_Says(0, 8735, 3);
-		Actor_Says(0, 8529, 3);
+		Actor_Says(kActorMcCoy, 8735, 3);
+		Actor_Says(kActorMcCoy, 8529, 3);
 		Game_Flag_Set(148);
 		return true;
 	}
-	if (itemId == 98 && !Loop_Actor_Walk_To_Item(0, 98, 36, 1, false)) {
-		Actor_Face_Item(0, 98, true);
-		Actor_Clue_Acquire(0, 7, 1, -1);
+	if (itemId == 98 && !Loop_Actor_Walk_To_Item(kActorMcCoy, 98, 36, 1, false)) {
+		Actor_Face_Item(kActorMcCoy, 98, true);
+		Actor_Clue_Acquire(kActorMcCoy, kClueToyDog, 1, -1);
 		Item_Remove_From_World(98);
 		Item_Pickup_Spin_Effect(971, 55, 376);
-		Actor_Says(0, 8525, 3);
-		Actor_Says(0, 8740, 3);
+		Actor_Says(kActorMcCoy, 8525, 3);
+		Actor_Says(kActorMcCoy, 8740, 3);
 		Game_Flag_Set(149);
 		return true;
 	}
@@ -100,7 +100,7 @@ bool SceneScriptRC51::ClickedOnItem(int itemId, bool a2) {
 }
 
 bool SceneScriptRC51::ClickedOnExit(int exitId) {
-	if (exitId == 0 && !Loop_Actor_Walk_To_XYZ(0, -8.87f, -1238.89f, 108173.27f, 0, 1, false, 0)) {
+	if (exitId == 0 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -8.87f, -1238.89f, 108173.27f, 0, 1, false, 0)) {
 		Set_Enter(16, 79);
 		return true;
 	}
diff --git a/engines/bladerunner/script/scene/tb02.cpp b/engines/bladerunner/script/scene/tb02.cpp
index c3aa0c207d..801481f4c4 100644
--- a/engines/bladerunner/script/scene/tb02.cpp
+++ b/engines/bladerunner/script/scene/tb02.cpp
@@ -72,11 +72,11 @@ void SceneScriptTB02::InitializeScene() {
 	} else {
 		Scene_Loop_Set_Default(1);
 	}
-	Actor_Put_In_Set(17, 17);
-	Actor_Set_At_XYZ(17, -38.53f, 2.93f, 1475.97f, 673);
+	Actor_Put_In_Set(kActorTyrellGuard, 17);
+	Actor_Set_At_XYZ(kActorTyrellGuard, -38.53f, 2.93f, 1475.97f, 673);
 	if (Global_Variable_Query(1) == 4) {
-		if (Actor_Query_Goal_Number(17) < 300) {
-			Actor_Set_Goal_Number(17, 300);
+		if (Actor_Query_Goal_Number(kActorTyrellGuard) < 300) {
+			Actor_Set_Goal_Number(kActorTyrellGuard, 300);
 		}
 		Scene_Exit_Add_2D_Exit(1, 430, 235, 487, 396, 0);
 	}
@@ -97,49 +97,49 @@ bool SceneScriptTB02::ClickedOn3DObject(const char *objectName, bool a2) {
 
 bool SceneScriptTB02::ClickedOnActor(int actorId) {
 	if (actorId == 17) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -76.35f, 0.15f, 1564.2f, 0, 1, false, 0)) {
-			Actor_Face_Actor(0, 17, true);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -76.35f, 0.15f, 1564.2f, 0, 1, false, 0)) {
+			Actor_Face_Actor(kActorMcCoy, kActorTyrellGuard, true);
 			int v1 = Global_Variable_Query(1);
 			if (v1 == 2) {
 				if (Game_Flag_Query(450) && !Game_Flag_Query(451)) {
-					Actor_Says(0, 5150, 18);
-					Actor_Says(17, 60, 12);
-					Actor_Says(17, 70, 13);
-					Actor_Says(0, 5155, 13);
-					Actor_Modify_Friendliness_To_Other(17, 0, -1);
+					Actor_Says(kActorMcCoy, 5150, 18);
+					Actor_Says(kActorTyrellGuard, 60, 12);
+					Actor_Says(kActorTyrellGuard, 70, 13);
+					Actor_Says(kActorMcCoy, 5155, 13);
+					Actor_Modify_Friendliness_To_Other(kActorTyrellGuard, kActorMcCoy, -1);
 					return true;
 				}
 				if (!Game_Flag_Query(450) && !Game_Flag_Query(451)) {
 					Game_Flag_Set(450);
-					Actor_Says(0, 5160, 18);
-					Actor_Says(17, 80, 14);
+					Actor_Says(kActorMcCoy, 5160, 18);
+					Actor_Says(kActorTyrellGuard, 80, 14);
 					Scene_Exit_Add_2D_Exit(1, 430, 235, 487, 396, 0);
 					return true;
 				}
 				if (Game_Flag_Query(451)) {
 					sub_402644();
 				} else {
-					Actor_Face_Actor(17, 0, true);
-					Actor_Says(0, 5150, 18);
-					Actor_Says(17, 60, 13);
-					Actor_Says(17, 70, 12);
-					Actor_Says(0, 5155, 13);
-					Actor_Modify_Friendliness_To_Other(17, 0, -1);
-					Actor_Face_Heading(17, 788, false);
+					Actor_Face_Actor(kActorTyrellGuard, kActorMcCoy, true);
+					Actor_Says(kActorMcCoy, 5150, 18);
+					Actor_Says(kActorTyrellGuard, 60, 13);
+					Actor_Says(kActorTyrellGuard, 70, 12);
+					Actor_Says(kActorMcCoy, 5155, 13);
+					Actor_Modify_Friendliness_To_Other(kActorTyrellGuard, kActorMcCoy, -1);
+					Actor_Face_Heading(kActorTyrellGuard, 788, false);
 				}
 				return true;
 			}
 			if (v1 == 3) {
-				Actor_Says(0, 5235, 18);
-				Actor_Says(17, 280, 13);
-				Actor_Says(17, 290, 12);
-				Actor_Says(0, 5240, 18);
-				Actor_Says(17, 300, 12);
+				Actor_Says(kActorMcCoy, 5235, 18);
+				Actor_Says(kActorTyrellGuard, 280, 13);
+				Actor_Says(kActorTyrellGuard, 290, 12);
+				Actor_Says(kActorMcCoy, 5240, 18);
+				Actor_Says(kActorTyrellGuard, 300, 12);
 				return false;
 			}
 			if (v1 == 4) {
-				if (Actor_Query_Goal_Number(17) == 300) {
-					Actor_Set_Goal_Number(17, 301);
+				if (Actor_Query_Goal_Number(kActorTyrellGuard) == 300) {
+					Actor_Set_Goal_Number(kActorTyrellGuard, 301);
 				}
 			}
 		}
@@ -153,18 +153,18 @@ bool SceneScriptTB02::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptTB02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -152.0f, 0.0f, 1774.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1774.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(154);
 			Game_Flag_Reset(450);
 			Set_Enter(17, 83);
-			Async_Actor_Walk_To_XYZ(0, -152.0f, 0.0f, 1890.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1890.0f, 0, false);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -32.0f, 0.0f, 1578.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, 0.0f, 1578.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			if (Global_Variable_Query(1) < 4) {
@@ -178,11 +178,11 @@ bool SceneScriptTB02::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -192.0f, 0.0f, 1430.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 800, false);
-			Loop_Actor_Travel_Stairs(0, 9, 0, 0);
-			if (Actor_Query_Goal_Number(17) == 300) {
-				Actor_Set_Goal_Number(17, 301);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -192.0f, 0.0f, 1430.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 800, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 0, 0);
+			if (Actor_Query_Goal_Number(kActorTyrellGuard) == 300) {
+				Actor_Set_Goal_Number(kActorTyrellGuard, 301);
 			} else {
 				Game_Flag_Reset(176);
 				Game_Flag_Reset(182);
@@ -275,19 +275,19 @@ void SceneScriptTB02::PlayerWalkedIn() {
 		return;
 	}
 	if (Game_Flag_Query(155)) {
-		Async_Actor_Walk_To_XYZ(0, -152.0f, 0.0f, 1702.0f, 0, false);
+		Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1702.0f, 0, false);
 		Game_Flag_Reset(155);
 	} else if (Game_Flag_Query(95)) {
 		Game_Flag_Reset(95);
 	} else if (Game_Flag_Query(608)) {
 		Game_Flag_Reset(608);
-		if (Actor_Query_Goal_Number(17) == 300) {
-			Actor_Set_Goal_Number(17, 302);
+		if (Actor_Query_Goal_Number(kActorTyrellGuard) == 300) {
+			Actor_Set_Goal_Number(kActorTyrellGuard, 302);
 		}
 		Music_Play(1, 50, 0, 2, -1, 0, 0);
 	} else {
-		Loop_Actor_Travel_Stairs(0, 9, 1, 0);
-		Loop_Actor_Walk_To_XYZ(0, -140.0f, 0.79f, 1470.0f, 0, 0, false, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 1, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -140.0f, 0.79f, 1470.0f, 0, 0, false, 0);
 	}
 	int v0 = Global_Variable_Query(1);
 	if (v0 > 4) {
@@ -297,42 +297,42 @@ void SceneScriptTB02::PlayerWalkedIn() {
 	if (v0 == 2) {
 		if (!Game_Flag_Query(453)) {
 			Player_Loses_Control();
-			Actor_Says(0, 5125, 18);
-			Actor_Says(17, 0, 50);
-			Actor_Says(0, 5130, 13);
-			Actor_Says(17, 10, 15);
+			Actor_Says(kActorMcCoy, 5125, 18);
+			Actor_Says(kActorTyrellGuard, 0, 50);
+			Actor_Says(kActorMcCoy, 5130, 13);
+			Actor_Says(kActorTyrellGuard, 10, 15);
 			Item_Pickup_Spin_Effect(975, 351, 315);
-			Actor_Says(17, 20, 23);
-			Actor_Says(0, 5140, 17);
-			Actor_Says(17, 30, 14);
-			Actor_Says(17, 40, 13);
-			Loop_Actor_Walk_To_XYZ(0, -140.0f, 0.0f, 1586.0f, 12, 0, false, 0);
-			Loop_Actor_Walk_To_XYZ(0, -112.0f, 0.0f, 1586.0f, 12, 0, false, 0);
-			Actor_Face_Actor(0, 17, true);
-			Actor_Face_Actor(17, 0, true);
-			Actor_Says(0, 5145, 13);
-			Actor_Says(17, 50, 15);
-			Actor_Face_Heading(17, 788, false);
-			Actor_Clue_Acquire(0, 45, 1, -1);
+			Actor_Says(kActorTyrellGuard, 20, 23);
+			Actor_Says(kActorMcCoy, 5140, 17);
+			Actor_Says(kActorTyrellGuard, 30, 14);
+			Actor_Says(kActorTyrellGuard, 40, 13);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -140.0f, 0.0f, 1586.0f, 12, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -112.0f, 0.0f, 1586.0f, 12, 0, false, 0);
+			Actor_Face_Actor(kActorMcCoy, kActorTyrellGuard, true);
+			Actor_Face_Actor(kActorTyrellGuard, kActorMcCoy, true);
+			Actor_Says(kActorMcCoy, 5145, 13);
+			Actor_Says(kActorTyrellGuard, 50, 15);
+			Actor_Face_Heading(kActorTyrellGuard, 788, false);
+			Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSecurity, 1, -1);
 			Game_Flag_Set(453);
 			Game_Flag_Set(450);
 			Player_Gains_Control();
-			Loop_Actor_Walk_To_XYZ(0, -138.17f, 0.15f, 1578.32f, 0, 1, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -138.17f, 0.15f, 1578.32f, 0, 1, false, 0);
 		}
 		if (Game_Flag_Query(450)) {
 			Scene_Exit_Add_2D_Exit(1, 430, 235, 487, 396, 0);
 		}
 		if (Game_Flag_Query(451) && !Game_Flag_Query(450)) {
-			Actor_Says(17, 90, 18);
+			Actor_Says(kActorTyrellGuard, 90, 18);
 			Game_Flag_Set(450);
 			Scene_Exit_Add_2D_Exit(1, 430, 235, 487, 396, 0);
 		}
 		if (Game_Flag_Query(451) && !Game_Flag_Query(456)) {
-			Loop_Actor_Walk_To_Actor(1, 0, 36, 1, false);
-			Actor_Says(1, 2220, 14);
-			Actor_Says(0, 5245, 13);
-			Actor_Says(1, 2230, 12);
-			Actor_Says(1, 2240, 13);
+			Loop_Actor_Walk_To_Actor(kActorSteele, kActorMcCoy, 36, 1, false);
+			Actor_Says(kActorSteele, 2220, 14);
+			Actor_Says(kActorMcCoy, 5245, 13);
+			Actor_Says(kActorSteele, 2230, 12);
+			Actor_Says(kActorSteele, 2240, 13);
 			sub_402B50();
 			//return true;
 		}
@@ -340,12 +340,12 @@ void SceneScriptTB02::PlayerWalkedIn() {
 		return;
 	}
 	if (v0 == 3 && !Game_Flag_Query(455)) {
-		Loop_Actor_Walk_To_XYZ(0, -131.28f, 0.79f, 1448.25f, 12, 1, false, 0);
-		Actor_Says(17, 260, 15);
-		Actor_Says(0, 5225, 16);
-		Actor_Says(17, 270, 14);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -131.28f, 0.79f, 1448.25f, 12, 1, false, 0);
+		Actor_Says(kActorTyrellGuard, 260, 15);
+		Actor_Says(kActorMcCoy, 5225, 16);
+		Actor_Says(kActorTyrellGuard, 270, 14);
 		Game_Flag_Set(455);
-		Actor_Modify_Friendliness_To_Other(17, 0, -1);
+		Actor_Modify_Friendliness_To_Other(kActorTyrellGuard, kActorMcCoy, -1);
 	}
 	//return false;
 }
@@ -361,13 +361,13 @@ void SceneScriptTB02::DialogueQueueFlushed(int a1) {
 void SceneScriptTB02::sub_402644() {
 	Dialogue_Menu_Clear_List();
 	DM_Add_To_List_Never_Repeat_Once_Selected(700, 4, 5, 6);
-	if (Actor_Clue_Query(0, 44)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(710, 5, 5, 4);
 	}
-	if (Actor_Clue_Query(0, 50) || Actor_Clue_Query(0, 51)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueVictimInformation) || Actor_Clue_Query(kActorMcCoy, kClueAttemptedFileAccess)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(720, 3, 5, 5);
 	}
-	if (Actor_Clue_Query(0, 51)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueAttemptedFileAccess)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(730, 3, 4, 8);
 	}
 	Dialogue_Menu_Add_DONE_To_List(100);
@@ -376,46 +376,46 @@ void SceneScriptTB02::sub_402644() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 100:
-		Actor_Says(0, 5145, 13);
-		Actor_Says(17, 50, 15);
+		Actor_Says(kActorMcCoy, 5145, 13);
+		Actor_Says(kActorTyrellGuard, 50, 15);
 		break;
 	case 730:
-		Actor_Says(0, 5180, 16);
-		Actor_Says(17, 240, 12);
-		Actor_Says(0, 5215, 18);
-		Actor_Says(17, 250, 13);
-		Actor_Says(0, 5220, 16);
+		Actor_Says(kActorMcCoy, 5180, 16);
+		Actor_Says(kActorTyrellGuard, 240, 12);
+		Actor_Says(kActorMcCoy, 5215, 18);
+		Actor_Says(kActorTyrellGuard, 250, 13);
+		Actor_Says(kActorMcCoy, 5220, 16);
 		break;
 	case 720:
-		Actor_Says(0, 5175, 12);
-		Actor_Says(17, 210, 14);
-		Actor_Says(0, 5200, 13);
-		Actor_Says(17, 220, 13);
-		Actor_Says(0, 5205, 15);
-		Actor_Says(17, 230, 12);
-		Actor_Says(0, 5210, 12);
+		Actor_Says(kActorMcCoy, 5175, 12);
+		Actor_Says(kActorTyrellGuard, 210, 14);
+		Actor_Says(kActorMcCoy, 5200, 13);
+		Actor_Says(kActorTyrellGuard, 220, 13);
+		Actor_Says(kActorMcCoy, 5205, 15);
+		Actor_Says(kActorTyrellGuard, 230, 12);
+		Actor_Says(kActorMcCoy, 5210, 12);
 		break;
 	case 710:
-		Actor_Says(0, 5170, 12);
-		Actor_Says(17, 180, 12);
-		Actor_Says(17, 190, 14);
+		Actor_Says(kActorMcCoy, 5170, 12);
+		Actor_Says(kActorTyrellGuard, 180, 12);
+		Actor_Says(kActorTyrellGuard, 190, 14);
 		if (Game_Flag_Query(102)) {
-			Actor_Says(0, 5195, 13);
-			Actor_Says(17, 200, 13);
+			Actor_Says(kActorMcCoy, 5195, 13);
+			Actor_Says(kActorTyrellGuard, 200, 13);
 		}
 		break;
 	case 700:
-		Actor_Says(0, 5165, 11);
-		Actor_Says(17, 100, 13);
-		Actor_Says(17, 110, 12);
-		Actor_Says(0, 5185, 15);
-		Actor_Says(17, 120, 12);
-		Actor_Says(17, 130, 14);
-		Actor_Says(0, 5190, 16);
-		Actor_Says(17, 140, 13);
-		Actor_Says(17, 150, 14);
-		Actor_Says(17, 170, 12);
-		Actor_Clue_Acquire(0, 50, 1, 17);
+		Actor_Says(kActorMcCoy, 5165, 11);
+		Actor_Says(kActorTyrellGuard, 100, 13);
+		Actor_Says(kActorTyrellGuard, 110, 12);
+		Actor_Says(kActorMcCoy, 5185, 15);
+		Actor_Says(kActorTyrellGuard, 120, 12);
+		Actor_Says(kActorTyrellGuard, 130, 14);
+		Actor_Says(kActorMcCoy, 5190, 16);
+		Actor_Says(kActorTyrellGuard, 140, 13);
+		Actor_Says(kActorTyrellGuard, 150, 14);
+		Actor_Says(kActorTyrellGuard, 170, 12);
+		Actor_Clue_Acquire(kActorMcCoy, kClueVictimInformation, 1, kActorTyrellGuard);
 		break;
 	}
 }
@@ -430,37 +430,37 @@ void SceneScriptTB02::sub_402B50() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 740:
-		Actor_Says(0, 5250, 15);
+		Actor_Says(kActorMcCoy, 5250, 15);
 		if (Game_Flag_Query(48)) {
-			Actor_Says(1, 2250, 12);
-			Actor_Says(1, 2260, 13);
-			Actor_Says(0, 5265, 12);
-			Actor_Says(1, 2270, 16);
-			Actor_Says(1, 2280, 13);
-			Actor_Says(0, 5270, 16);
-			Actor_Says(1, 2290, 14);
-			Actor_Clue_Acquire(0, 52, 1, 1);
-			Actor_Modify_Friendliness_To_Other(1, 0, 1);
+			Actor_Says(kActorSteele, 2250, 12);
+			Actor_Says(kActorSteele, 2260, 13);
+			Actor_Says(kActorMcCoy, 5265, 12);
+			Actor_Says(kActorSteele, 2270, 16);
+			Actor_Says(kActorSteele, 2280, 13);
+			Actor_Says(kActorMcCoy, 5270, 16);
+			Actor_Says(kActorSteele, 2290, 14);
+			Actor_Clue_Acquire(kActorMcCoy, kClueCrystalsCase, 1, kActorSteele);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 1);
 			Game_Flag_Set(456);
 		} else {
-			Actor_Says(1, 2300, 12);
-			Actor_Says(1, 2310, 15);
-			Actor_Says(0, 5275, 14);
-			Actor_Says(1, 2320, 12);
-			Actor_Says(0, 5280, 13);
-			Actor_Modify_Friendliness_To_Other(1, 0, 1);
+			Actor_Says(kActorSteele, 2300, 12);
+			Actor_Says(kActorSteele, 2310, 15);
+			Actor_Says(kActorMcCoy, 5275, 14);
+			Actor_Says(kActorSteele, 2320, 12);
+			Actor_Says(kActorMcCoy, 5280, 13);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 1);
 			Game_Flag_Set(456);
 		}
 		break;
 	case 750:
-		Actor_Says(0, 5255, 11);
-		Actor_Says(1, 2330, 13);
-		Actor_Says(1, 2340, 14);
+		Actor_Says(kActorMcCoy, 5255, 11);
+		Actor_Says(kActorSteele, 2330, 13);
+		Actor_Says(kActorSteele, 2340, 14);
 		Game_Flag_Set(456);
 		break;
 	case 100:
-		Actor_Says(1, 2350, 13);
-		Actor_Modify_Friendliness_To_Other(1, 0, -5);
+		Actor_Says(kActorSteele, 2350, 13);
+		Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
 		Game_Flag_Set(456);
 		break;
 	}
diff --git a/engines/bladerunner/script/scene/tb03.cpp b/engines/bladerunner/script/scene/tb03.cpp
index ec5128346f..0c05c5599e 100644
--- a/engines/bladerunner/script/scene/tb03.cpp
+++ b/engines/bladerunner/script/scene/tb03.cpp
@@ -55,15 +55,15 @@ void SceneScriptTB03::InitializeScene() {
 		Ambient_Sounds_Add_Sound(194, 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);
 	}
-	Actor_Put_In_Set(17, 17);
-	Actor_Set_At_XYZ(17, -38.53f, 2.93f, 1475.97f, 673);
+	Actor_Put_In_Set(kActorTyrellGuard, 17);
+	Actor_Set_At_XYZ(kActorTyrellGuard, -38.53f, 2.93f, 1475.97f, 673);
 	if (Global_Variable_Query(1) == 4) {
-		int goal = Actor_Query_Goal_Number(17);
+		int goal = Actor_Query_Goal_Number(kActorTyrellGuard);
 		if (goal == 304) {
-			Actor_Change_Animation_Mode(17, 0);
-			Actor_Set_Goal_Number(24, 399);
+			Actor_Change_Animation_Mode(kActorTyrellGuard, 0);
+			Actor_Set_Goal_Number(kActorOfficerGrayford, 399);
 		} else if (goal != 302) {
-			Actor_Set_Goal_Number(17, 300);
+			Actor_Set_Goal_Number(kActorTyrellGuard, 300);
 		}
 	}
 	if (Game_Flag_Query(448)) {
@@ -103,8 +103,8 @@ bool SceneScriptTB03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptTB03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -260.0f, 0.15f, 2014.0f, 0, 1, false, 0)) {
-			Actor_Set_Goal_Number(17, 304);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -260.0f, 0.15f, 2014.0f, 0, 1, false, 0)) {
+			Actor_Set_Goal_Number(kActorTyrellGuard, 304);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(447);
@@ -113,12 +113,12 @@ bool SceneScriptTB03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -152.0f, 0.0f, 1774.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1774.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(155);
 			Set_Enter(17, 82);
-			Async_Actor_Walk_To_XYZ(0, -152.0f, 0.0f, 1702.0f, 0, false);
+			Async_Actor_Walk_To_XYZ(kActorMcCoy, -152.0f, 0.0f, 1702.0f, 0, false);
 		}
 		return true;
 	}
@@ -136,12 +136,12 @@ void SceneScriptTB03::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 }
 
 void SceneScriptTB03::PlayerWalkedIn() {
-	if (Actor_Query_Goal_Number(17) == 304) {
+	if (Actor_Query_Goal_Number(kActorTyrellGuard) == 304) {
 		Player_Set_Combat_Mode(false);
-		Actor_Says(24, 260, -1);
-		Actor_Says(0, 170, 14);
+		Actor_Says(kActorOfficerGrayford, 260, -1);
+		Actor_Says(kActorMcCoy, 170, 14);
 		Delay(1000);
-		Actor_Set_Goal_Number(0, 500);
+		Actor_Set_Goal_Number(kActorMcCoy, 500);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/tb05.cpp b/engines/bladerunner/script/scene/tb05.cpp
index 4bd417a7ae..8971fdf46b 100644
--- a/engines/bladerunner/script/scene/tb05.cpp
+++ b/engines/bladerunner/script/scene/tb05.cpp
@@ -51,10 +51,10 @@ void SceneScriptTB05::InitializeScene() {
 void SceneScriptTB05::SceneLoaded() {
 	Clickable_Object("MONITOR05");
 	Unclickable_Object("SMUDGE_GLASS01");
-	if (!Actor_Clue_Query(0, 44)) {
+	if (!Actor_Clue_Query(kActorMcCoy, kClueDragonflyEarring)) {
 		Item_Add_To_World(76, 940, 72, 76.160004f, 147.36f, -235.14999f, 0, 6, 6, false, true, false, true);
 	}
-	if (!Actor_Clue_Query(0, 54) && !Actor_Clue_Query(0, 55) && (Game_Flag_Query(45) || Game_Flag_Query(46))) {
+	if (!Actor_Clue_Query(kActorMcCoy, kClueTyrellSalesPamphlet1) && !Actor_Clue_Query(kActorMcCoy, kClueTyrellSalesPamphlet2) && (Game_Flag_Query(45) || Game_Flag_Query(46))) {
 		Item_Add_To_World(119, 972, 72, 129.00999f, 147.12f, -162.98f, 0, 8, 8, false, true, false, true);
 	}
 }
@@ -64,51 +64,51 @@ bool SceneScriptTB05::MouseClick(int x, int y) {
 }
 
 bool SceneScriptTB05::ClickedOn3DObject(const char *objectName, bool a2) {
-	if (Object_Query_Click("MONITOR05", objectName) && !Loop_Actor_Walk_To_XYZ(0, 122.54f, 147.12f, -197.17f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 38, false);
-		if (!Actor_Clue_Query(0, 152) && !Game_Flag_Query(99)) {
-			Actor_Clue_Acquire(0, 51, 1, -1);
-			Actor_Voice_Over(2170, 99);
-			Actor_Voice_Over(2180, 99);
-			Actor_Voice_Over(2190, 99);
-			Actor_Voice_Over(2200, 99);
+	if (Object_Query_Click("MONITOR05", objectName) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 122.54f, 147.12f, -197.17f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 38, false);
+		if (!Actor_Clue_Query(kActorMcCoy, kClueDNAMarcus) && !Game_Flag_Query(99)) {
+			Actor_Clue_Acquire(kActorMcCoy, kClueAttemptedFileAccess, 1, -1);
+			Actor_Voice_Over(2170, kActorVoiceOver);
+			Actor_Voice_Over(2180, kActorVoiceOver);
+			Actor_Voice_Over(2190, kActorVoiceOver);
+			Actor_Voice_Over(2200, kActorVoiceOver);
 			Game_Flag_Set(99);
 			return true;
 		}
-		if (Game_Flag_Query(99) && !Game_Flag_Query(100) && !Actor_Clue_Query(0, 152)) {
-			if (Actor_Clue_Query(0, 65) || Actor_Clue_Query(0, 262)) {
-				Actor_Clue_Acquire(0, 152, 1, -1);
-				Actor_Voice_Over(2230, 99);
+		if (Game_Flag_Query(99) && !Game_Flag_Query(100) && !Actor_Clue_Query(kActorMcCoy, kClueDNAMarcus)) {
+			if (Actor_Clue_Query(kActorMcCoy, kClueDogCollar1) || Actor_Clue_Query(kActorMcCoy, kClueDogCollar2)) {
+				Actor_Clue_Acquire(kActorMcCoy, kClueDNAMarcus, 1, -1);
+				Actor_Voice_Over(2230, kActorVoiceOver);
 				Item_Pickup_Spin_Effect(941, 352, 333);
-				Actor_Voice_Over(2240, 99);
-				Actor_Voice_Over(2250, 99);
-				Actor_Voice_Over(2260, 99);
+				Actor_Voice_Over(2240, kActorVoiceOver);
+				Actor_Voice_Over(2250, kActorVoiceOver);
+				Actor_Voice_Over(2260, kActorVoiceOver);
 				Game_Flag_Set(100);
 				Game_Flag_Set(101);
 			} else {
-				Actor_Voice_Over(2270, 99);
+				Actor_Voice_Over(2270, kActorVoiceOver);
 				Game_Flag_Set(100);
 			}
 			return true;
 		}
 		if (Game_Flag_Query(100) && !Game_Flag_Query(101)) {
-			if (Actor_Clue_Query(0, 65) || Actor_Clue_Query(0, 262)) {
-				Actor_Clue_Acquire(0, 152, 1, -1);
-				Actor_Voice_Over(2230, 99);
+			if (Actor_Clue_Query(kActorMcCoy, kClueDogCollar1) || Actor_Clue_Query(kActorMcCoy, kClueDogCollar2)) {
+				Actor_Clue_Acquire(kActorMcCoy, kClueDNAMarcus, 1, -1);
+				Actor_Voice_Over(2230, kActorVoiceOver);
 				Item_Pickup_Spin_Effect(941, 352, 333);
-				Actor_Voice_Over(2240, 99);
-				Actor_Voice_Over(2250, 99);
-				Actor_Voice_Over(2260, 99);
+				Actor_Voice_Over(2240, kActorVoiceOver);
+				Actor_Voice_Over(2250, kActorVoiceOver);
+				Actor_Voice_Over(2260, kActorVoiceOver);
 				Game_Flag_Set(101);
 			} else {
-				Actor_Voice_Over(2280, 99);
-				Actor_Voice_Over(2290, 99);
+				Actor_Voice_Over(2280, kActorVoiceOver);
+				Actor_Voice_Over(2290, kActorVoiceOver);
 				Game_Flag_Set(101);
 			}
 			return true;
 		}
 		if (Game_Flag_Query(101)) {
-			Actor_Voice_Over(3700, 99);
+			Actor_Voice_Over(3700, kActorVoiceOver);
 			return true;
 		}
 		return false;
@@ -121,27 +121,27 @@ bool SceneScriptTB05::ClickedOnActor(int actorId) {
 }
 
 bool SceneScriptTB05::ClickedOnItem(int itemId, bool a2) {
-	if (itemId == 76 && !Loop_Actor_Walk_To_XYZ(0, 54.0f, 147.12f, -209.0f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 126, false);
+	if (itemId == 76 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 54.0f, 147.12f, -209.0f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 126, false);
 		Item_Remove_From_World(76);
 		Item_Pickup_Spin_Effect(940, 295, 408);
-		Actor_Voice_Over(2140, 99);
-		Actor_Voice_Over(2150, 99);
-		Actor_Voice_Over(2160, 99);
-		Actor_Clue_Acquire(0, 44, 1, -1);
+		Actor_Voice_Over(2140, kActorVoiceOver);
+		Actor_Voice_Over(2150, kActorVoiceOver);
+		Actor_Voice_Over(2160, kActorVoiceOver);
+		Actor_Clue_Acquire(kActorMcCoy, kClueDragonflyEarring, 1, -1);
 		return true;
 	}
-	if (itemId == 119 && !Loop_Actor_Walk_To_XYZ(0, 107.89f, 147.12f, -156.26f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 126, false);
+	if (itemId == 119 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 107.89f, 147.12f, -156.26f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 126, false);
 		Item_Remove_From_World(119);
 		Item_Pickup_Spin_Effect(972, 449, 431);
-		Actor_Voice_Over(4280, 99);
+		Actor_Voice_Over(4280, kActorVoiceOver);
 		if (Game_Flag_Query(45)) {
-			Actor_Voice_Over(4290, 99);
-			Actor_Clue_Acquire(0, 54, 1, -1);
+			Actor_Voice_Over(4290, kActorVoiceOver);
+			Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSalesPamphlet1, 1, -1);
 		} else {
-			Actor_Voice_Over(4300, 99);
-			Actor_Clue_Acquire(0, 55, 1, -1);
+			Actor_Voice_Over(4300, kActorVoiceOver);
+			Actor_Clue_Acquire(kActorMcCoy, kClueTyrellSalesPamphlet2, 1, -1);
 		}
 	}
 	return false;
@@ -149,7 +149,7 @@ bool SceneScriptTB05::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptTB05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 23.0f, 151.53f, -205.0f, 12, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.0f, 151.53f, -205.0f, 12, 1, false, 0)) {
 			Game_Flag_Set(97);
 			Set_Enter(73, 85);
 			Scene_Loop_Start_Special(1, 2, 1);
@@ -157,7 +157,7 @@ bool SceneScriptTB05::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 14.0f, 147.12f, 123.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 14.0f, 147.12f, 123.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(95);
 			Set_Enter(17, 82);
 		}
diff --git a/engines/bladerunner/script/scene/tb06.cpp b/engines/bladerunner/script/scene/tb06.cpp
index 08975274a8..6a28d760c7 100644
--- a/engines/bladerunner/script/scene/tb06.cpp
+++ b/engines/bladerunner/script/scene/tb06.cpp
@@ -35,9 +35,9 @@ void SceneScriptTB06::InitializeScene() {
 		//return false;
 		return;
 	} else {
-		Actor_Put_In_Set(21, 73);
-		Actor_Set_At_XYZ(21, 135.0f, 151.0f, -671.0f, 800);
-		Actor_Retired_Here(21, 60, 32, 1, -1);
+		Actor_Put_In_Set(kActorMarcus, 73);
+		Actor_Set_At_XYZ(kActorMarcus, 135.0f, 151.0f, -671.0f, 800);
+		Actor_Retired_Here(kActorMarcus, 60, 32, 1, -1);
 		//return true;
 		return;
 	}
@@ -48,13 +48,13 @@ void SceneScriptTB06::SceneLoaded() {
 	Unobstacle_Object("GLASS01", true);
 	Clickable_Object("DOOR");
 	Unclickable_Object("SMUDGE_GLASS01");
-	if (!Game_Flag_Query(519) && Actor_Query_Goal_Number(37) != 199) {
+	if (!Game_Flag_Query(519) && Actor_Query_Goal_Number(kActorPhotographer) != 199) {
 		Item_Add_To_World(84, 942, 73, 36.54f, 149.48f, -565.67f, 0, 6, 6, false, true, false, true);
 	}
 	if (!Game_Flag_Query(520)) {
 		Item_Add_To_World(108, 955, 73, 18.0f, 149.65f, -599.0f, 0, 6, 6, false, true, false, true);
 	}
-	if (Actor_Query_Goal_Number(37) != 199) {
+	if (Actor_Query_Goal_Number(kActorPhotographer) != 199) {
 		Item_Add_To_World(103, 978, 73, -46.82f, 149.6f, -666.88f, 0, 12, 12, false, true, false, true);
 		Item_Add_To_World(104, 979, 73, -30.27f, 149.6f, -610.7f, 0, 15, 45, false, true, false, true);
 		Item_Add_To_World(105, 980, 73, 9.87f, 149.6f, -683.5f, 0, 12, 12, false, true, false, true);
@@ -70,55 +70,55 @@ bool SceneScriptTB06::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptTB06::ClickedOnActor(int actorId) {
-	if (actorId == 21 && !Loop_Actor_Walk_To_Actor(0, 21, 24, 1, false)) {
-		if (Actor_Clue_Query(0, 49)) {
-			Actor_Says(0, 8665, 13);
+	if (actorId == 21 && !Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorMarcus, 24, 1, false)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueDetonatorWire)) {
+			Actor_Says(kActorMcCoy, 8665, 13);
 			return false;
 		}
-		Actor_Voice_Over(2300, 99);
-		Actor_Voice_Over(2310, 99);
+		Actor_Voice_Over(2300, kActorVoiceOver);
+		Actor_Voice_Over(2310, kActorVoiceOver);
 		Item_Pickup_Spin_Effect(974, 66, 397);
-		Actor_Voice_Over(2320, 99);
+		Actor_Voice_Over(2320, kActorVoiceOver);
 		if (Game_Flag_Query(48)) {
-			Actor_Voice_Over(2330, 99);
-			Actor_Voice_Over(2340, 99);
+			Actor_Voice_Over(2330, kActorVoiceOver);
+			Actor_Voice_Over(2340, kActorVoiceOver);
 		}
-		Actor_Voice_Over(2350, 99);
-		Actor_Clue_Acquire(0, 49, 1, -1);
+		Actor_Voice_Over(2350, kActorVoiceOver);
+		Actor_Clue_Acquire(kActorMcCoy, kClueDetonatorWire, 1, -1);
 		return true;
 	}
 	return false;
 }
 
 bool SceneScriptTB06::ClickedOnItem(int itemId, bool a2) {
-	if (itemId == 84 && !Loop_Actor_Walk_To_Item(0, 84, 12, 1, false)) {
-		Actor_Face_Item(0, 84, true);
-		Actor_Clue_Acquire(0, 65, 1, -1);
+	if (itemId == 84 && !Loop_Actor_Walk_To_Item(kActorMcCoy, 84, 12, 1, false)) {
+		Actor_Face_Item(kActorMcCoy, 84, true);
+		Actor_Clue_Acquire(kActorMcCoy, kClueDogCollar1, 1, -1);
 		Item_Pickup_Spin_Effect(942, 341, 368);
 		Item_Remove_From_World(84);
-		Actor_Voice_Over(4160, 99);
+		Actor_Voice_Over(4160, kActorVoiceOver);
 		Game_Flag_Set(519);
 		return true;
 	}
-	if (itemId == 108 && !Loop_Actor_Walk_To_Item(0, 108, 12, 1, false)) {
-		Actor_Face_Item(0, 108, true);
-		Actor_Clue_Acquire(0, 53, 1, -1);
+	if (itemId == 108 && !Loop_Actor_Walk_To_Item(kActorMcCoy, 108, 12, 1, false)) {
+		Actor_Face_Item(kActorMcCoy, 108, true);
+		Actor_Clue_Acquire(kActorMcCoy, kClueKingstonKitchenBox1, 1, -1);
 		Item_Remove_From_World(108);
 		Item_Pickup_Spin_Effect(955, 390, 368);
-		Actor_Says(0, 8775, 3);
+		Actor_Says(kActorMcCoy, 8775, 3);
 		Game_Flag_Set(520);
 		return true;
 	}
-	if (itemId == 82 && !Loop_Actor_Walk_To_Item(0, 82, 12, 1, false)) {
-		Actor_Face_Item(0, 82, true);
-		Actor_Says(0, 5285, 3);
+	if (itemId == 82 && !Loop_Actor_Walk_To_Item(kActorMcCoy, 82, 12, 1, false)) {
+		Actor_Face_Item(kActorMcCoy, 82, true);
+		Actor_Says(kActorMcCoy, 5285, 3);
 		return true;
 	}
-	if ((itemId == 103 || itemId == 104 || itemId == 105) && !Loop_Actor_Walk_To_Item(0, 103, 24, 1, false)) {
-		Actor_Face_Item(0, 103, true);
-		Actor_Voice_Over(2380, 99);
-		Actor_Voice_Over(2390, 99);
-		Actor_Voice_Over(2400, 99);
+	if ((itemId == 103 || itemId == 104 || itemId == 105) && !Loop_Actor_Walk_To_Item(kActorMcCoy, 103, 24, 1, false)) {
+		Actor_Face_Item(kActorMcCoy, 103, true);
+		Actor_Voice_Over(2380, kActorVoiceOver);
+		Actor_Voice_Over(2390, kActorVoiceOver);
+		Actor_Voice_Over(2400, kActorVoiceOver);
 		return true;
 	}
 	return false;
@@ -126,7 +126,7 @@ bool SceneScriptTB06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptTB06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -16.0f, 149.0f, -427.0f, 12, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -16.0f, 149.0f, -427.0f, 12, 1, false, 0)) {
 			Game_Flag_Set(98);
 			Set_Enter(72, 84);
 			Scene_Loop_Start_Special(1, 2, 1);
@@ -155,17 +155,17 @@ void SceneScriptTB06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptTB06::PlayerWalkedIn() {
 	if (!Game_Flag_Query(102) && !Game_Flag_Query(483)) {
-		Actor_Face_Actor(0, 21, true);
-		Actor_Says(0, 5290, 3);
-		Loop_Actor_Walk_To_XYZ(0, -10.0f, 149.0f, -631.0f, 0, 0, false, 0);
-		AI_Movement_Track_Pause(37);
-		Actor_Face_Actor(0, 37, true);
-		Actor_Face_Actor(37, 0, true);
-		Actor_Says(37, 0, 3);
-		Actor_Says(0, 5295, 3);
-		Actor_Face_Actor(37, 21, true);
-		Actor_Says(37, 10, 3);
-		AI_Movement_Track_Unpause(37);
+		Actor_Face_Actor(kActorMcCoy, kActorMarcus, true);
+		Actor_Says(kActorMcCoy, 5290, 3);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -10.0f, 149.0f, -631.0f, 0, 0, false, 0);
+		AI_Movement_Track_Pause(kActorPhotographer);
+		Actor_Face_Actor(kActorMcCoy, kActorPhotographer, true);
+		Actor_Face_Actor(kActorPhotographer, kActorMcCoy, true);
+		Actor_Says(kActorPhotographer, 0, 3);
+		Actor_Says(kActorMcCoy, 5295, 3);
+		Actor_Face_Actor(kActorPhotographer, kActorMarcus, true);
+		Actor_Says(kActorPhotographer, 10, 3);
+		AI_Movement_Track_Unpause(kActorPhotographer);
 		Game_Flag_Set(483);
 		//return true;
 		return;
diff --git a/engines/bladerunner/script/scene/tb07.cpp b/engines/bladerunner/script/scene/tb07.cpp
index 31c19423e9..d296e90467 100644
--- a/engines/bladerunner/script/scene/tb07.cpp
+++ b/engines/bladerunner/script/scene/tb07.cpp
@@ -37,7 +37,7 @@ void SceneScriptTB07::InitializeScene() {
 	Ambient_Sounds_Add_Sound(214, 1, 20, 20, 25, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(215, 1, 15, 20, 25, -100, 100, -101, -101, 0, 0);
 	Ambient_Sounds_Add_Sound(216, 1, 15, 20, 25, -100, 100, -101, -101, 0, 0);
-	if (Global_Variable_Query(1) == 4 && !Actor_Clue_Query(0, 147)) {
+	if (Global_Variable_Query(1) == 4 && !Actor_Clue_Query(kActorMcCoy, kClueDNATyrell)) {
 		Item_Add_To_World(83, 941, 18, 9.7f, 48.7f, -174.22f, 0, 12, 12, false, true, false, true);
 	}
 	if (Game_Flag_Query(661)) {
@@ -65,11 +65,11 @@ bool SceneScriptTB07::ClickedOnActor(int actorId) {
 }
 
 bool SceneScriptTB07::ClickedOnItem(int itemId, bool a2) {
-	if (!Loop_Actor_Walk_To_Item(0, itemId, 36, 1, false)) {
-		Actor_Face_Item(0, itemId, true);
+	if (!Loop_Actor_Walk_To_Item(kActorMcCoy, itemId, 36, 1, false)) {
+		Actor_Face_Item(kActorMcCoy, itemId, true);
 		if (itemId == 83) {
 			Item_Pickup_Spin_Effect(941, 331, 296);
-			Actor_Clue_Acquire(0, 147, 0, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueDNATyrell, 0, -1);
 		}
 		Item_Remove_From_World(itemId);
 	}
@@ -78,7 +78,7 @@ bool SceneScriptTB07::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptTB07::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 68.0f, 12.0f, 288.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 68.0f, 12.0f, 288.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			if (Global_Variable_Query(1) == 4) {
@@ -150,7 +150,7 @@ bool SceneScriptTB07::ClickedOnExit(int exitId) {
 					break;
 				default:
 					Game_Flag_Set(261);
-					Loop_Actor_Walk_To_XYZ(0, 44.0f, 12.0f, 176.0f, 0, 0, false, 0);
+					Loop_Actor_Walk_To_XYZ(kActorMcCoy, 44.0f, 12.0f, 176.0f, 0, 0, false, 0);
 					break;
 				}
 			}
@@ -176,7 +176,7 @@ void SceneScriptTB07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptTB07::PlayerWalkedIn() {
 	int v0 = Global_Variable_Query(1);
-	Loop_Actor_Walk_To_XYZ(0, 44.0f, 12.0f, 176.0f, 0, 0, false, 0);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 44.0f, 12.0f, 176.0f, 0, 0, false, 0);
 	if ((v0 == 2 || v0 == 3) && !Game_Flag_Query(612)) {
 		Player_Set_Combat_Mode(false);
 		sub_401B0C();
@@ -192,99 +192,99 @@ void SceneScriptTB07::DialogueQueueFlushed(int a1) {
 void SceneScriptTB07::sub_401B0C() {
 	Game_Flag_Set(612);
 	Delay(1500);
-	Loop_Actor_Walk_To_XYZ(0, 44.98f, 12.0f, 49.79f, 0, 0, false, 0);
-	Actor_Face_Heading(0, 178, true);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, 44.98f, 12.0f, 49.79f, 0, 0, false, 0);
+	Actor_Face_Heading(kActorMcCoy, 178, true);
 	Delay(3000);
-	Actor_Put_In_Set(57, 18);
-	Actor_Set_At_XYZ(57, -260.15f, 12.0f, -19.16f, 256);
-	Actor_Change_Animation_Mode(57, 0);
+	Actor_Put_In_Set(kActorRachael, 18);
+	Actor_Set_At_XYZ(kActorRachael, -260.15f, 12.0f, -19.16f, 256);
+	Actor_Change_Animation_Mode(kActorRachael, 0);
 	Outtake_Play(39, 1, -1);
-	Loop_Actor_Walk_To_XYZ(57, -146.15f, 12.0f, -5.84f, 0, 0, false, 0);
-	Actor_Face_Actor(57, 0, true);
-	Actor_Says(57, 480, 14);
-	Actor_Face_Actor(0, 57, true);
-	Actor_Says(0, 5315, 9);
-	Actor_Says(57, 490, 3);
-	Actor_Face_Heading(0, 178, true);
-	Actor_Says(0, 5320, 15);
-	Actor_Says_With_Pause(0, 5325, 1.0f, 19);
-	Actor_Start_Speech_Sample(57, 500);
-	Loop_Actor_Walk_To_XYZ(57, -60.15f, 12.0f, 60.84f, 0, 0, false, 0);
-	Actor_Face_Actor(57, 0, true);
-	Actor_Face_Actor(0, 57, true);
-	Actor_Says(0, 5330, 14);
-	Actor_Says(57, 510, 12);
-	Actor_Says(0, 5335, 16);
-	Actor_Says(57, 520, 17);
-	Actor_Says(0, 5340, 3);
-	Actor_Start_Speech_Sample(57, 530);
-	Loop_Actor_Walk_To_XYZ(57, -4.15f, 12.0f, 54.73f, 0, 0, false, 0);
-	Actor_Says(57, 540, 16);
-	Actor_Says(0, 5345, 18);
-	Actor_Says(57, 550, 13);
-	Actor_Says(57, 570, 18);
-	Actor_Says_With_Pause(0, 5350, 0.0f, 18);
-	Actor_Says(57, 580, 16);
-	Actor_Says(0, 5355, 16);
-	Actor_Says(57, 590, 17);
-	Actor_Says(0, 5360, 17);
-	Actor_Says(0, 5365, 13);
-	Actor_Says_With_Pause(57, 600, 1.0f, 12);
-	Actor_Says(0, 5370, 3);
-	Loop_Actor_Walk_To_XYZ(57, -24.15f, 12.0f, -10.84f, 0, 0, false, 0);
-	Actor_Says(57, 610, 13);
-	Actor_Face_Actor(0, 57, true);
-	Actor_Says(0, 5375, 18);
-	Actor_Says(0, 5380, 19);
-	Actor_Face_Actor(57, 0, true);
-	Actor_Says(57, 620, 18);
-	Actor_Says_With_Pause(0, 5385, 2.0f, 12);
-	Actor_Says_With_Pause(0, 5390, 2.0f, 14);
-	Actor_Says(0, 5395, 15);
-	Actor_Says_With_Pause(57, 630, 0.0f, 14);
-	Actor_Says(0, 5400, 18);
-	Actor_Says(0, 5405, 3);
-	Actor_Says(57, 640, 12);
-	Actor_Says(0, 5410, 16);
-	Actor_Says(57, 650, 15);
-	Actor_Says_With_Pause(0, 5415, 1.0f, 17);
-	Actor_Says(0, 5420, 14);
-	Actor_Says(57, 660, 15);
-	Actor_Put_In_Set(51, 18);
-	Actor_Set_At_XYZ(51, 68.0f, 12.0f, 288.0f, 0);
-	Actor_Change_Animation_Mode(51, 0);
+	Loop_Actor_Walk_To_XYZ(kActorRachael, -146.15f, 12.0f, -5.84f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorRachael, kActorMcCoy, true);
+	Actor_Says(kActorRachael, 480, 14);
+	Actor_Face_Actor(kActorMcCoy, kActorRachael, true);
+	Actor_Says(kActorMcCoy, 5315, 9);
+	Actor_Says(kActorRachael, 490, 3);
+	Actor_Face_Heading(kActorMcCoy, 178, true);
+	Actor_Says(kActorMcCoy, 5320, 15);
+	Actor_Says_With_Pause(kActorMcCoy, 5325, 1.0f, 19);
+	Actor_Start_Speech_Sample(kActorRachael, 500);
+	Loop_Actor_Walk_To_XYZ(kActorRachael, -60.15f, 12.0f, 60.84f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorRachael, kActorMcCoy, true);
+	Actor_Face_Actor(kActorMcCoy, kActorRachael, true);
+	Actor_Says(kActorMcCoy, 5330, 14);
+	Actor_Says(kActorRachael, 510, 12);
+	Actor_Says(kActorMcCoy, 5335, 16);
+	Actor_Says(kActorRachael, 520, 17);
+	Actor_Says(kActorMcCoy, 5340, 3);
+	Actor_Start_Speech_Sample(kActorRachael, 530);
+	Loop_Actor_Walk_To_XYZ(kActorRachael, -4.15f, 12.0f, 54.73f, 0, 0, false, 0);
+	Actor_Says(kActorRachael, 540, 16);
+	Actor_Says(kActorMcCoy, 5345, 18);
+	Actor_Says(kActorRachael, 550, 13);
+	Actor_Says(kActorRachael, 570, 18);
+	Actor_Says_With_Pause(kActorMcCoy, 5350, 0.0f, 18);
+	Actor_Says(kActorRachael, 580, 16);
+	Actor_Says(kActorMcCoy, 5355, 16);
+	Actor_Says(kActorRachael, 590, 17);
+	Actor_Says(kActorMcCoy, 5360, 17);
+	Actor_Says(kActorMcCoy, 5365, 13);
+	Actor_Says_With_Pause(kActorRachael, 600, 1.0f, 12);
+	Actor_Says(kActorMcCoy, 5370, 3);
+	Loop_Actor_Walk_To_XYZ(kActorRachael, -24.15f, 12.0f, -10.84f, 0, 0, false, 0);
+	Actor_Says(kActorRachael, 610, 13);
+	Actor_Face_Actor(kActorMcCoy, kActorRachael, true);
+	Actor_Says(kActorMcCoy, 5375, 18);
+	Actor_Says(kActorMcCoy, 5380, 19);
+	Actor_Face_Actor(kActorRachael, kActorMcCoy, true);
+	Actor_Says(kActorRachael, 620, 18);
+	Actor_Says_With_Pause(kActorMcCoy, 5385, 2.0f, 12);
+	Actor_Says_With_Pause(kActorMcCoy, 5390, 2.0f, 14);
+	Actor_Says(kActorMcCoy, 5395, 15);
+	Actor_Says_With_Pause(kActorRachael, 630, 0.0f, 14);
+	Actor_Says(kActorMcCoy, 5400, 18);
+	Actor_Says(kActorMcCoy, 5405, 3);
+	Actor_Says(kActorRachael, 640, 12);
+	Actor_Says(kActorMcCoy, 5410, 16);
+	Actor_Says(kActorRachael, 650, 15);
+	Actor_Says_With_Pause(kActorMcCoy, 5415, 1.0f, 17);
+	Actor_Says(kActorMcCoy, 5420, 14);
+	Actor_Says(kActorRachael, 660, 15);
+	Actor_Put_In_Set(kActorTyrell, 18);
+	Actor_Set_At_XYZ(kActorTyrell, 68.0f, 12.0f, 288.0f, 0);
+	Actor_Change_Animation_Mode(kActorTyrell, 0);
 	Scene_Loop_Set_Default(3);
 	Scene_Loop_Start_Special(2, 2, 0);
-	Actor_Start_Speech_Sample(51, 0);
-	Loop_Actor_Walk_To_XYZ(51, 44.0f, 12.0f, 176.0f, 0, 0, false, 0);
-	Actor_Face_Actor(51, 0, true);
-	Actor_Face_Actor(0, 51, true);
-	Actor_Face_Actor(57, 51, true);
-	Actor_Says(51, 10, 12);
-	Actor_Says(51, 20, 3);
-	Actor_Says(51, 30, 12);
-	Actor_Says(0, 5425, 18);
-	Actor_Set_Goal_Number(57, 200);
-	Actor_Says(51, 40, 15);
-	Actor_Start_Speech_Sample(51, 50);
-	Loop_Actor_Walk_To_XYZ(51, -10.0f, 12.0f, 100.0f, 0, 0, false, 0);
-	Actor_Face_Actor(51, 0, true);
-	Actor_Face_Actor(0, 51, true);
-	Actor_Says(0, 5430, 17);
-	Actor_Says(0, 5435, 16);
-	Actor_Says(51, 60, 14);
-	Actor_Face_Actor(0, 51, true);
-	Actor_Says(0, 5440, 14);
-	Actor_Says(51, 70, 13);
-	Actor_Says(0, 5445, 15);
-	Actor_Says_With_Pause(51, 80, 1.0f, 12);
-	Actor_Says(51, 90, 15);
-	Actor_Says_With_Pause(0, 5450, 1.0f, 15);
-	Actor_Says(0, 5455, 12);
-	Actor_Says(51, 100, 14);
-	Actor_Clue_Acquire(0, 278, 0, 57);
-	Actor_Clue_Acquire(0, 279, 0, 51);
-	Loop_Actor_Walk_To_XYZ(51, -260.15f, 12.0f, -19.16f, 0, 0, false, 0);
+	Actor_Start_Speech_Sample(kActorTyrell, 0);
+	Loop_Actor_Walk_To_XYZ(kActorTyrell, 44.0f, 12.0f, 176.0f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorTyrell, kActorMcCoy, true);
+	Actor_Face_Actor(kActorMcCoy, kActorTyrell, true);
+	Actor_Face_Actor(kActorRachael, kActorTyrell, true);
+	Actor_Says(kActorTyrell, 10, 12);
+	Actor_Says(kActorTyrell, 20, 3);
+	Actor_Says(kActorTyrell, 30, 12);
+	Actor_Says(kActorMcCoy, 5425, 18);
+	Actor_Set_Goal_Number(kActorRachael, 200);
+	Actor_Says(kActorTyrell, 40, 15);
+	Actor_Start_Speech_Sample(kActorTyrell, 50);
+	Loop_Actor_Walk_To_XYZ(kActorTyrell, -10.0f, 12.0f, 100.0f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorTyrell, kActorMcCoy, true);
+	Actor_Face_Actor(kActorMcCoy, kActorTyrell, true);
+	Actor_Says(kActorMcCoy, 5430, 17);
+	Actor_Says(kActorMcCoy, 5435, 16);
+	Actor_Says(kActorTyrell, 60, 14);
+	Actor_Face_Actor(kActorMcCoy, kActorTyrell, true);
+	Actor_Says(kActorMcCoy, 5440, 14);
+	Actor_Says(kActorTyrell, 70, 13);
+	Actor_Says(kActorMcCoy, 5445, 15);
+	Actor_Says_With_Pause(kActorTyrell, 80, 1.0f, 12);
+	Actor_Says(kActorTyrell, 90, 15);
+	Actor_Says_With_Pause(kActorMcCoy, 5450, 1.0f, 15);
+	Actor_Says(kActorMcCoy, 5455, 12);
+	Actor_Says(kActorTyrell, 100, 14);
+	Actor_Clue_Acquire(kActorMcCoy, kClueRachaelInterview, 0, kActorRachael);
+	Actor_Clue_Acquire(kActorMcCoy, kClueTyrellInterview, 0, kActorTyrell);
+	Loop_Actor_Walk_To_XYZ(kActorTyrell, -260.15f, 12.0f, -19.16f, 0, 0, false, 0);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/ug01.cpp b/engines/bladerunner/script/scene/ug01.cpp
index 6be3fe67ef..96e3cf1533 100644
--- a/engines/bladerunner/script/scene/ug01.cpp
+++ b/engines/bladerunner/script/scene/ug01.cpp
@@ -77,13 +77,13 @@ bool SceneScriptUG01::MouseClick(int x, int y) {
 
 bool SceneScriptUG01::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("PIPES_FG_LFT", objectName)) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -9.0f, -50.13f, -148.0f, 0, 1, false, 0) && !Game_Flag_Query(324)) {
-			Actor_Says(0, 8525, 13);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -9.0f, -50.13f, -148.0f, 0, 1, false, 0) && !Game_Flag_Query(324)) {
+			Actor_Says(kActorMcCoy, 8525, 13);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
 			Game_Flag_Set(324);
 		} else {
-			Actor_Says(0, 8525, 13);
+			Actor_Says(kActorMcCoy, 8525, 13);
 		}
 	}
 	return false;
@@ -99,16 +99,16 @@ bool SceneScriptUG01::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG01::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -32.0f, -50.13f, -1350.0f, 12, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, -50.13f, -1350.0f, 12, 1, false, 0)) {
 			Game_Flag_Set(316);
 			Set_Enter(83, 95);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -70.0f, -50.13f, -500.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 768, false);
-			Loop_Actor_Travel_Ladder(0, 12, 1, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -70.0f, -50.13f, -500.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 768, false);
+			Loop_Actor_Travel_Ladder(kActorMcCoy, 12, 1, 0);
 			Game_Flag_Set(119);
 			Game_Flag_Reset(259);
 			Game_Flag_Set(182);
@@ -117,7 +117,7 @@ bool SceneScriptUG01::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -126.0f, -50.13f, -286.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -126.0f, -50.13f, -286.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(314);
 			Set_Enter(75, 87);
 		}
@@ -151,18 +151,18 @@ void SceneScriptUG01::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG01::PlayerWalkedIn() {
 	if (Game_Flag_Query(315)) {
-		Loop_Actor_Walk_To_XYZ(0, -55.0f, -50.13f, -288.0f, 12, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -55.0f, -50.13f, -288.0f, 12, 0, false, 0);
 		Game_Flag_Reset(315);
 	}
 	if (Game_Flag_Query(118)) {
-		Actor_Set_At_XYZ(0, -70.0f, 93.87f, -500.0f, 768);
-		Loop_Actor_Travel_Ladder(0, 12, 0, 0);
-		Loop_Actor_Walk_To_XYZ(0, -58.0f, -50.13f, -488.0f, 0, 0, false, 0);
+		Actor_Set_At_XYZ(kActorMcCoy, -70.0f, 93.87f, -500.0f, 768);
+		Loop_Actor_Travel_Ladder(kActorMcCoy, 12, 0, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -58.0f, -50.13f, -488.0f, 0, 0, false, 0);
 		Game_Flag_Reset(118);
 	}
-	if (Actor_Query_Goal_Number(6) == 310) {
+	if (Actor_Query_Goal_Number(kActorLucy) == 310) {
 		Music_Play(21, 35, 0, 3, -1, 0, 0);
-		Actor_Set_Goal_Number(6, 311);
+		Actor_Set_Goal_Number(kActorLucy, 311);
 	}
 	//return false;
 }
diff --git a/engines/bladerunner/script/scene/ug02.cpp b/engines/bladerunner/script/scene/ug02.cpp
index ce09c871b6..ed2cef490e 100644
--- a/engines/bladerunner/script/scene/ug02.cpp
+++ b/engines/bladerunner/script/scene/ug02.cpp
@@ -90,35 +90,35 @@ bool SceneScriptUG02::MouseClick(int x, int y) {
 
 bool SceneScriptUG02::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("GUN_1", objectName) || Object_Query_Click("GUN_2", objectName) || Object_Query_Click("CRATE_3", objectName)) {
-		Actor_Face_Object(0, "GUN_1", true);
+		Actor_Face_Object(kActorMcCoy, "GUN_1", true);
 		if (!Game_Flag_Query(449) && Global_Variable_Query(1) < 4) {
-			Actor_Voice_Over(2430, 99);
-			Actor_Voice_Over(2440, 99);
-			Actor_Voice_Over(2450, 99);
-			Actor_Voice_Over(2460, 99);
+			Actor_Voice_Over(2430, kActorVoiceOver);
+			Actor_Voice_Over(2440, kActorVoiceOver);
+			Actor_Voice_Over(2450, kActorVoiceOver);
+			Actor_Voice_Over(2460, kActorVoiceOver);
 			Game_Flag_Set(449);
-			Actor_Clue_Acquire(0, 66, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueWeaponsCache, 1, -1);
 			return true;
 		}
 		if (Global_Variable_Query(1) <= 3) {
-			Actor_Says(0, 8580, 14);
+			Actor_Says(kActorMcCoy, 8580, 14);
 			return false;
 		}
-		if (Actor_Clue_Query(0, 66) && !Actor_Clue_Query(0, 121)) {
-			Actor_Voice_Over(2470, 99);
-			Actor_Voice_Over(2480, 99);
-			Actor_Voice_Over(2490, 99);
-			Actor_Voice_Over(2500, 99);
-			Actor_Clue_Acquire(0, 121, 1, -1);
-		} else if (!Actor_Clue_Query(0, 66)) {
-			Actor_Voice_Over(2510, 99);
-			Actor_Voice_Over(2520, 99);
-			Actor_Voice_Over(2530, 99);
+		if (Actor_Clue_Query(kActorMcCoy, kClueWeaponsCache) && !Actor_Clue_Query(kActorMcCoy, kClueIzosStashRaided)) {
+			Actor_Voice_Over(2470, kActorVoiceOver);
+			Actor_Voice_Over(2480, kActorVoiceOver);
+			Actor_Voice_Over(2490, kActorVoiceOver);
+			Actor_Voice_Over(2500, kActorVoiceOver);
+			Actor_Clue_Acquire(kActorMcCoy, kClueIzosStashRaided, 1, -1);
+		} else if (!Actor_Clue_Query(kActorMcCoy, kClueWeaponsCache)) {
+			Actor_Voice_Over(2510, kActorVoiceOver);
+			Actor_Voice_Over(2520, kActorVoiceOver);
+			Actor_Voice_Over(2530, kActorVoiceOver);
 		} else if (Game_Flag_Query(708)) {
-			Actor_Says(0, 8580, 14);
+			Actor_Says(kActorMcCoy, 8580, 14);
 		} else {
 			Item_Pickup_Spin_Effect(996, 360, 440);
-			Actor_Says(0, 8525, 14);
+			Actor_Says(kActorMcCoy, 8525, 14);
 			Give_McCoy_Ammo(2, 18);
 			Game_Flag_Set(708);
 		}
@@ -133,8 +133,8 @@ bool SceneScriptUG02::ClickedOnActor(int actorId) {
 
 bool SceneScriptUG02::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 88) {
-		Actor_Face_Item(0, 88, true);
-		Actor_Clue_Acquire(0, 62, 1, -1);
+		Actor_Face_Item(kActorMcCoy, 88, true);
+		Actor_Clue_Acquire(kActorMcCoy, kClueRadiationGoggles, 1, -1);
 		Game_Flag_Set(656);
 		Item_Remove_From_World(88);
 		Item_Pickup_Spin_Effect(963, 426, 316);
@@ -147,15 +147,15 @@ bool SceneScriptUG02::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
 		if (Game_Flag_Query(498) || !sub_402354()) {
 			int v2 = Player_Query_Combat_Mode();
-			if (!Loop_Actor_Walk_To_XYZ(0, -202.0f, 120.16f, -74.0f, 0, 1, v2, 0)) {
-				Actor_Face_Heading(0, 270, false);
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -202.0f, 120.16f, -74.0f, 0, 1, v2, 0)) {
+				Actor_Face_Heading(kActorMcCoy, 270, false);
 				Footstep_Sound_Override_On(2);
-				Loop_Actor_Travel_Stairs(0, 4, 0, 0);
+				Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 0, 0);
 				Footstep_Sound_Override_Off();
 				int v3 = Player_Query_Combat_Mode();
-				Loop_Actor_Walk_To_XYZ(0, -96.57f, 74.870003f, -271.28f, 0, 0, v3, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -96.57f, 74.870003f, -271.28f, 0, 0, v3, 0);
 				int v4 = Player_Query_Combat_Mode();
-				Loop_Actor_Walk_To_XYZ(0, -95.0f, 74.870003f, -503.0f, 0, 0, v4, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -95.0f, 74.870003f, -503.0f, 0, 0, v4, 0);
 				Game_Flag_Set(315);
 				Set_Enter(74, 86);
 			}
@@ -167,12 +167,12 @@ bool SceneScriptUG02::ClickedOnExit(int exitId) {
 			if (sub_402354()) {
 				return true;
 			}
-			Loop_Actor_Walk_To_XYZ(0, -368.75f, 155.75f, -63.0f, 0, 0, false, 0);
-			Loop_Actor_Walk_To_XYZ(0, -340.75f, 155.75f, -119.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -368.75f, 155.75f, -63.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -340.75f, 155.75f, -119.0f, 0, 0, false, 0);
 		}
-		Loop_Actor_Walk_To_XYZ(0, -304.75f, 155.75f, -171.0f, 0, 0, false, 0);
-		Actor_Face_Heading(0, 14, false);
-		Loop_Actor_Travel_Ladder(0, 9, 1, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -304.75f, 155.75f, -171.0f, 0, 0, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 14, false);
+		Loop_Actor_Travel_Ladder(kActorMcCoy, 9, 1, 0);
 		Game_Flag_Set(318);
 		Game_Flag_Reset(259);
 		Game_Flag_Set(479);
@@ -200,21 +200,21 @@ void SceneScriptUG02::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG02::PlayerWalkedIn() {
 	if (Game_Flag_Query(314)) {
-		Actor_Set_At_XYZ(0, -106.01f, 84.13f, -228.62f, 575);
-		Loop_Actor_Walk_To_XYZ(0, -148.0f, 84.13f, -67.0f, 0, 0, false, 0);
-		Actor_Face_Heading(0, 761, false);
+		Actor_Set_At_XYZ(kActorMcCoy, -106.01f, 84.13f, -228.62f, 575);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -148.0f, 84.13f, -67.0f, 0, 0, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 761, false);
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Stairs(0, 4, 1, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 1, 0);
 		Footstep_Sound_Override_Off();
 		Game_Flag_Reset(314);
 		Game_Flag_Set(498);
 	} else if (Game_Flag_Query(319)) {
-		Actor_Set_At_XYZ(0, -304.75f, 265.0f, -171.0f, 0);
-		Loop_Actor_Travel_Ladder(0, 9, 0, 0);
+		Actor_Set_At_XYZ(kActorMcCoy, -304.75f, 265.0f, -171.0f, 0);
+		Loop_Actor_Travel_Ladder(kActorMcCoy, 9, 0, 0);
 		Game_Flag_Reset(319);
 		Game_Flag_Reset(498);
 	} else {
-		Actor_Set_At_XYZ(0, -269.24f, 120.16f, -9.94f, 477);
+		Actor_Set_At_XYZ(kActorMcCoy, -269.24f, 120.16f, -9.94f, 477);
 		Game_Flag_Set(498);
 	}
 	Game_Flag_Reset(499);
@@ -232,20 +232,20 @@ void SceneScriptUG02::DialogueQueueFlushed(int a1) {
 bool SceneScriptUG02::sub_402354() {
 	if (!Game_Flag_Query(498)) {
 		int v0 = Player_Query_Combat_Mode();
-		Loop_Actor_Walk_To_XYZ(0, -340.75f, 155.75f, -119.0f, 0, 0, v0, 0);
-		Loop_Actor_Walk_To_XYZ(0, -368.75f, 155.75f, -63.0f, 0, 0, v0, 0);
-		Loop_Actor_Walk_To_XYZ(0, -365.0f, 155.65f, -19.0f, 0, 0, v0, 0);
-		Actor_Face_Heading(0, 318, false);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -340.75f, 155.75f, -119.0f, 0, 0, v0, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -368.75f, 155.75f, -63.0f, 0, 0, v0, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -365.0f, 155.65f, -19.0f, 0, 0, v0, 0);
+		Actor_Face_Heading(kActorMcCoy, 318, false);
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Stairs(0, 4, 0, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 0, 0);
 		Footstep_Sound_Override_Off();
 		Game_Flag_Set(498);
 		return false;
 	}
-	if (!Loop_Actor_Walk_To_XYZ(0, -312.75f, 120.16f, 1.01f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 830, false);
+	if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -312.75f, 120.16f, 1.01f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 830, false);
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Stairs(0, 4, 1, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 4, 1, 0);
 		Footstep_Sound_Override_Off();
 		Game_Flag_Reset(498);
 		return false;
diff --git a/engines/bladerunner/script/scene/ug03.cpp b/engines/bladerunner/script/scene/ug03.cpp
index aae97e34e6..64a56dc342 100644
--- a/engines/bladerunner/script/scene/ug03.cpp
+++ b/engines/bladerunner/script/scene/ug03.cpp
@@ -75,15 +75,15 @@ bool SceneScriptUG03::MouseClick(int x, int y) {
 }
 
 bool SceneScriptUG03::ClickedOn3DObject(const char *objectName, bool a2) {
-	if ((Object_Query_Click("CHAIR_BACK", objectName) || Object_Query_Click("CHAIR_SEAT", objectName) || Object_Query_Click("CHAIR_HEADZAPPER", objectName)) && !Loop_Actor_Walk_To_Scene_Object(0, "CHAIR_BACK", 36, 1, false)) {
-		Actor_Face_Object(0, "CHAIR_BACK", true);
-		if (!Actor_Clue_Query(0, 120)) {
-			Actor_Voice_Over(2550, 99);
-			Actor_Voice_Over(2560, 99);
-			Actor_Voice_Over(2570, 99);
-			Actor_Voice_Over(2580, 99);
-			Actor_Voice_Over(2590, 99);
-			Actor_Clue_Acquire(0, 120, 1, -1);
+	if ((Object_Query_Click("CHAIR_BACK", objectName) || Object_Query_Click("CHAIR_SEAT", objectName) || Object_Query_Click("CHAIR_HEADZAPPER", objectName)) && !Loop_Actor_Walk_To_Scene_Object(kActorMcCoy, "CHAIR_BACK", 36, true, false)) {
+		Actor_Face_Object(kActorMcCoy, "CHAIR_BACK", true);
+		if (!Actor_Clue_Query(kActorMcCoy, kClueScaryChair)) {
+			Actor_Voice_Over(2550, kActorVoiceOver);
+			Actor_Voice_Over(2560, kActorVoiceOver);
+			Actor_Voice_Over(2570, kActorVoiceOver);
+			Actor_Voice_Over(2580, kActorVoiceOver);
+			Actor_Voice_Over(2590, kActorVoiceOver);
+			Actor_Clue_Acquire(kActorMcCoy, kClueScaryChair, 1, -1);
 		}
 	}
 	return false;
@@ -99,9 +99,9 @@ bool SceneScriptUG03::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG03::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -139.0f, 0.0f, -13.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -139.0f, 0.0f, -13.0f, 0, 1, false, 0)) {
 			if (Global_Variable_Query(1) < 4) {
-				Actor_Says(0, 8522, 14);
+				Actor_Says(kActorMcCoy, 8522, 14);
 			} else {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -112,7 +112,7 @@ bool SceneScriptUG03::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -51.0f, 0.0f, 255.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -51.0f, 0.0f, 255.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(334);
diff --git a/engines/bladerunner/script/scene/ug04.cpp b/engines/bladerunner/script/scene/ug04.cpp
index 3a1370fec6..1166b84e1e 100644
--- a/engines/bladerunner/script/scene/ug04.cpp
+++ b/engines/bladerunner/script/scene/ug04.cpp
@@ -86,21 +86,21 @@ bool SceneScriptUG04::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG04::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -172.0f, 16.29f, -735.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -172.0f, 16.29f, -735.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(335);
 			Set_Enter(76, 88);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 0.0f, -1.74f, -2400.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, -1.74f, -2400.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(338);
 			Set_Enter(78, 90);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 164.0f, 11.87f, -1013.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 164.0f, 11.87f, -1013.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(340);
 			Set_Enter(79, 91);
 		}
@@ -124,7 +124,7 @@ void SceneScriptUG04::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG04::PlayerWalkedIn() {
 	if (Game_Flag_Query(341)) {
-		Loop_Actor_Walk_To_XYZ(0, 60.0f, -1.74f, -976.0f, 6, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 60.0f, -1.74f, -976.0f, 6, 0, false, 0);
 		Game_Flag_Reset(341);
 	}
 }
diff --git a/engines/bladerunner/script/scene/ug05.cpp b/engines/bladerunner/script/scene/ug05.cpp
index fed485906d..c1f25be009 100644
--- a/engines/bladerunner/script/scene/ug05.cpp
+++ b/engines/bladerunner/script/scene/ug05.cpp
@@ -85,16 +85,16 @@ bool SceneScriptUG05::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptUG05::ClickedOnActor(int actorId) {
-	if (!Loop_Actor_Walk_To_Actor(0, actorId, 30, 1, false)) {
-		Actor_Face_Actor(0, actorId, true);
+	if (!Loop_Actor_Walk_To_Actor(kActorMcCoy, actorId, 30, 1, false)) {
+		Actor_Face_Actor(kActorMcCoy, actorId, true);
 		int v1 = sub_4021B0();
-		if (actorId == 24 && Game_Flag_Query(368) && !Game_Flag_Query(683)) {
-			Actor_Says(24, 220, -1);
-			Actor_Says(0, 5540, 14);
-			Actor_Says(24, 230, -1);
-			Actor_Says(0, 5545, 17);
-			Actor_Says(24, 240, -1);
-			Actor_Says(0, 5550, 3);
+		if (actorId == kActorOfficerGrayford && Game_Flag_Query(368) && !Game_Flag_Query(683)) {
+			Actor_Says(kActorOfficerGrayford, 220, -1);
+			Actor_Says(kActorMcCoy, 5540, 14);
+			Actor_Says(kActorOfficerGrayford, 230, -1);
+			Actor_Says(kActorMcCoy, 5545, 17);
+			Actor_Says(kActorOfficerGrayford, 240, -1);
+			Actor_Says(kActorMcCoy, 5550, 3);
 			Game_Flag_Set(683);
 			return false;
 		}
@@ -114,19 +114,19 @@ bool SceneScriptUG05::ClickedOnItem(int itemId, bool a2) {
 bool SceneScriptUG05::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
 		if (Game_Flag_Query(663) && !Game_Flag_Query(368)) {
-			Loop_Actor_Walk_To_XYZ(0, -356.35f, 132.77f, -1092.36f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -356.35f, 132.77f, -1092.36f, 0, 0, false, 0);
 			Game_Flag_Set(361);
 			Set_Enter(43, 40);
-		} else if (!Loop_Actor_Walk_To_XYZ(0, -156.72f, 3.03f, -1118.17f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 760, false);
-			Loop_Actor_Travel_Stairs(0, 3, 1, 0);
+		} else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -156.72f, 3.03f, -1118.17f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 760, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 3, 1, 0);
 			Game_Flag_Set(361);
 			Set_Enter(43, 40);
 		}
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 4.0f, -11.67f, -4.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 4.0f, -11.67f, -4.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(339);
 			Set_Enter(77, 89);
 		}
@@ -134,10 +134,10 @@ bool SceneScriptUG05::ClickedOnExit(int exitId) {
 	}
 	if (exitId == 2) {
 		if (!Game_Flag_Query(662)) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 0.0f, -1.37f, -1500.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, -1.37f, -1500.0f, 0, 1, false, 0)) {
 				if (!Game_Flag_Query(522)) {
-					Actor_Voice_Over(2600, 99);
-					Actor_Voice_Over(2610, 99);
+					Actor_Voice_Over(2600, kActorVoiceOver);
+					Actor_Voice_Over(2610, kActorVoiceOver);
 					Game_Flag_Set(522);
 				}
 				return true;
@@ -146,9 +146,9 @@ bool SceneScriptUG05::ClickedOnExit(int exitId) {
 			int v1 = sub_4021B0();
 			bool v2;
 			if (v1 == -1) {
-				v2 = Loop_Actor_Walk_To_XYZ(0, 0.0f, -1.37f, -1500.0f, 0, 1, false, 0) != 0;
+				v2 = Loop_Actor_Walk_To_XYZ(kActorMcCoy, 0.0f, -1.37f, -1500.0f, 0, 1, false, 0) != 0;
 			} else {
-				v2 = Loop_Actor_Walk_To_Actor(0, v1, 30, 1, false) != 0;
+				v2 = Loop_Actor_Walk_To_Actor(kActorMcCoy, v1, 30, 1, false) != 0;
 			}
 			if (!v2) {
 				sub_402218();
@@ -173,38 +173,38 @@ void SceneScriptUG05::PlayerWalkedIn() {
 	if (Game_Flag_Query(663)) {
 		if (Game_Flag_Query(368)) {
 			Music_Stop(2);
-			Actor_Put_In_Set(24, 78);
-			Actor_Set_At_XYZ(24, 4.22f, -1.37f, -925.0f, 750);
-			Actor_Set_Goal_Number(24, 599);
-			Actor_Retired_Here(24, 70, 36, 1, -1);
+			Actor_Put_In_Set(kActorOfficerGrayford, 78);
+			Actor_Set_At_XYZ(kActorOfficerGrayford, 4.22f, -1.37f, -925.0f, 750);
+			Actor_Set_Goal_Number(kActorOfficerGrayford, 599);
+			Actor_Retired_Here(kActorOfficerGrayford, 70, 36, 1, -1);
 			int v0 = sub_4021B0();
-			if (v0 == 3) {
-				Actor_Put_In_Set(3, 78);
-				Actor_Set_At_XYZ(3, -100.0f, -10.31f, -906.0f, 866);
-				Actor_Force_Stop_Walking(3);
-			} else if (v0 == 6) {
-				Actor_Put_In_Set(6, 78);
-				Actor_Set_At_XYZ(6, -100.0f, -10.31f, -906.0f, 866);
-				Actor_Force_Stop_Walking(6);
+			if (v0 == kActorDektora) {
+				Actor_Put_In_Set(kActorDektora, 78);
+				Actor_Set_At_XYZ(kActorDektora, -100.0f, -10.31f, -906.0f, 866);
+				Actor_Force_Stop_Walking(kActorDektora);
+			} else if (v0 == kActorLucy){
+				Actor_Put_In_Set(kActorLucy, 78);
+				Actor_Set_At_XYZ(kActorLucy, -100.0f, -10.31f, -906.0f, 866);
+				Actor_Force_Stop_Walking(kActorLucy);
 			}
 		} else {
-			if (!Actor_Query_In_Set(23, 78)) {
-				Actor_Put_In_Set(23, 78);
-				Actor_Set_At_XYZ(23, 0.0f, -1.37f, -1400.0f, 768);
+			if (!Actor_Query_In_Set(kActorOfficerLeary, 78)) {
+				Actor_Put_In_Set(kActorOfficerLeary, 78);
+				Actor_Set_At_XYZ(kActorOfficerLeary, 0.0f, -1.37f, -1400.0f, 768);
 			}
-			if (!Actor_Query_In_Set(24, 78)) {
+			if (!Actor_Query_In_Set(kActorOfficerGrayford, 78)) {
 				ADQ_Flush();
-				ADQ_Add(24, 280, 3);
-				Actor_Put_In_Set(24, 78);
-				Actor_Set_At_XYZ(24, -16.0f, -1.37f, -960.0f, 768);
+				ADQ_Add(kActorOfficerGrayford, 280, 3);
+				Actor_Put_In_Set(kActorOfficerGrayford, 78);
+				Actor_Set_At_XYZ(kActorOfficerGrayford, -16.0f, -1.37f, -960.0f, 768);
 			}
 		}
 	}
 	if (Game_Flag_Query(360)) {
 		if (Game_Flag_Query(663) && !Game_Flag_Query(368)) {
-			Loop_Actor_Walk_To_XYZ(0, -288.35f, 132.77f, -1092.36f, 0, 1, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -288.35f, 132.77f, -1092.36f, 0, 1, false, 0);
 		} else {
-			Loop_Actor_Travel_Stairs(0, 2, 0, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 2, 0, 0);
 		}
 	}
 	if (Game_Flag_Query(663)) {
@@ -222,11 +222,11 @@ void SceneScriptUG05::DialogueQueueFlushed(int a1) {
 }
 
 int SceneScriptUG05::sub_4021B0() {
-	if (Global_Variable_Query(45) == 2 && Actor_Query_Goal_Number(3) != 599) {
-		return 3;
+	if (Global_Variable_Query(45) == 2 && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		return kActorDektora;
 	}
-	if (Global_Variable_Query(45) == 3 && Actor_Query_Goal_Number(6) != 599) {
-		return 6;
+	if (Global_Variable_Query(45) == 3 && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		return kActorLucy;
 	}
 	return -1;
 }
@@ -234,18 +234,18 @@ int SceneScriptUG05::sub_4021B0() {
 void SceneScriptUG05::sub_402218() {
 	int v0 = sub_4021B0();
 	if (v0 != -1) {
-		Actor_Face_Actor(0, v0, true);
-		Actor_Face_Actor(v0, 0, true);
-		Actor_Says(0, 5535, 13);
+		Actor_Face_Actor(kActorMcCoy, v0, true);
+		Actor_Face_Actor(v0, kActorMcCoy, true);
+		Actor_Says(kActorMcCoy, 5535, 13);
 		if (v0 == 3) {
-			Actor_Says(3, 1110, 15);
+			Actor_Says(kActorDektora, 1110, 15);
 		} else {
-			Actor_Says(6, 670, 17);
+			Actor_Says(kActorLucy, 670, 17);
 		}
 	}
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
-	if (v0 == 6) {
+	if (v0 == kActorLucy) {
 		if (Game_Flag_Query(46)) {
 			if (Global_Variable_Query(48) > 3) {
 				Outtake_Play(13, 0, -1);
@@ -255,7 +255,7 @@ void SceneScriptUG05::sub_402218() {
 		} else {
 			Outtake_Play(12, 0, -1);
 		}
-	} else if (v0 == 3) {
+	} else if (v0 == kActorDektora) {
 		if (Game_Flag_Query(47)) {
 			if (Global_Variable_Query(48) > 3) {
 				Outtake_Play(16, 0, -1);
diff --git a/engines/bladerunner/script/scene/ug06.cpp b/engines/bladerunner/script/scene/ug06.cpp
index 7765a6089a..ca3501f9a0 100644
--- a/engines/bladerunner/script/scene/ug06.cpp
+++ b/engines/bladerunner/script/scene/ug06.cpp
@@ -91,7 +91,7 @@ bool SceneScriptUG06::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG06::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 23.0f, 0.0f, 321.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.0f, 0.0f, 321.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(341);
@@ -100,10 +100,10 @@ bool SceneScriptUG06::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 66.0f, 0.0f, -90.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 0, false);
-			Loop_Actor_Travel_Stairs(0, 17, 1, 0);
-			Loop_Actor_Walk_To_XYZ(0, 66.0f, 153.0f, -446.0f, 0, 0, false, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 66.0f, 0.0f, -90.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 0, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 17, 1, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 66.0f, 153.0f, -446.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(342);
@@ -126,25 +126,25 @@ void SceneScriptUG06::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG06::PlayerWalkedIn() {
 	if (Game_Flag_Query(340)) {
-		Loop_Actor_Walk_To_XYZ(0, 23.0f, 0.0f, 273.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 23.0f, 0.0f, 273.0f, 0, 0, false, 0);
 		Game_Flag_Reset(340);
 	}
 	if (Game_Flag_Query(343)) {
-		Loop_Actor_Travel_Stairs(0, 17, 0, 0);
-		Loop_Actor_Walk_To_XYZ(0, 66.0f, 0.0f, -36.91f, 0, 0, false, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 17, 0, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 66.0f, 0.0f, -36.91f, 0, 0, false, 0);
 		Game_Flag_Reset(343);
 	}
 	if (Global_Variable_Query(1) == 4 && !Game_Flag_Query(524)) {
 		Player_Loses_Control();
-		Actor_Voice_Over(2620, 99);
-		Actor_Voice_Over(2630, 99);
-		Actor_Voice_Over(2640, 99);
-		Actor_Voice_Over(2650, 99);
-		Actor_Voice_Over(2660, 99);
-		Actor_Voice_Over(2670, 99);
-		Actor_Voice_Over(2680, 99);
-		Actor_Voice_Over(2690, 99);
-		Actor_Voice_Over(2700, 99);
+		Actor_Voice_Over(2620, kActorVoiceOver);
+		Actor_Voice_Over(2630, kActorVoiceOver);
+		Actor_Voice_Over(2640, kActorVoiceOver);
+		Actor_Voice_Over(2650, kActorVoiceOver);
+		Actor_Voice_Over(2660, kActorVoiceOver);
+		Actor_Voice_Over(2670, kActorVoiceOver);
+		Actor_Voice_Over(2680, kActorVoiceOver);
+		Actor_Voice_Over(2690, kActorVoiceOver);
+		Actor_Voice_Over(2700, kActorVoiceOver);
 		Player_Gains_Control();
 		Game_Flag_Set(524);
 		Autosave_Game(2);
diff --git a/engines/bladerunner/script/scene/ug07.cpp b/engines/bladerunner/script/scene/ug07.cpp
index e276c8e8e0..ff7dc7b06a 100644
--- a/engines/bladerunner/script/scene/ug07.cpp
+++ b/engines/bladerunner/script/scene/ug07.cpp
@@ -94,7 +94,7 @@ bool SceneScriptUG07::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG07::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -94.0f, -12.21f, -710.0f, 0, 1, false, 0) && Actor_Query_Goal_Number(5) != 402) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -94.0f, -12.21f, -710.0f, 0, 1, false, 0) && Actor_Query_Goal_Number(kActorClovis) != 402) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(427);
@@ -103,7 +103,7 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) {
 		}
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 110.0f, -12.21f, -274.0f, 0, 1, false, 0) && Actor_Query_Goal_Number(5) != 402) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 110.0f, -12.21f, -274.0f, 0, 1, false, 0) && Actor_Query_Goal_Number(kActorClovis) != 402) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(425);
@@ -113,36 +113,36 @@ bool SceneScriptUG07::ClickedOnExit(int exitId) {
 	}
 	if (exitId == 2) {
 		if (!Game_Flag_Query(607) && Game_Flag_Query(671) && Global_Variable_Query(1) == 4 && !Game_Flag_Query(598)) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 49.0f, -12.21f, -130.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 49.0f, -12.21f, -130.0f, 0, 1, false, 0)) {
 				Game_Flag_Set(598);
-				Actor_Put_In_Set(5, 80);
-				Actor_Set_At_XYZ(5, 118.02f, -12.21f, -154.0f, 768);
+				Actor_Put_In_Set(kActorClovis, 80);
+				Actor_Set_At_XYZ(kActorClovis, 118.02f, -12.21f, -154.0f, 768);
 				Player_Set_Combat_Mode(true);
-				Actor_Face_Actor(0, 5, true);
-				Loop_Actor_Walk_To_XYZ(5, 98.019997f, -12.21f, -154.0f, 0, 0, false, 0);
-				Actor_Face_Actor(5, 0, true);
-				Actor_Set_Goal_Number(0, 301);
-				Actor_Face_Heading(0, 0, true);
+				Actor_Face_Actor(kActorMcCoy, kActorClovis, true);
+				Loop_Actor_Walk_To_XYZ(kActorClovis, 98.019997f, -12.21f, -154.0f, 0, 0, false, 0);
+				Actor_Face_Actor(kActorClovis, kActorMcCoy, true);
+				Actor_Set_Goal_Number(kActorMcCoy, 301);
+				Actor_Face_Heading(kActorMcCoy, 0, true);
 				Delay(1500);
-				Actor_Says_With_Pause(5, 550, 1.0f, 3);
-				if (Actor_Clue_Query(5, 224)) {
-					Actor_Says(5, 560, 3);
-					Actor_Set_Goal_Number(0, 302);
+				Actor_Says_With_Pause(kActorClovis, 550, 1.0f, 3);
+				if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredDektora)) {
+					Actor_Says(kActorClovis, 560, 3);
+					Actor_Set_Goal_Number(kActorMcCoy, 302);
 					Sound_Play(561, 100, 0, 0, 50);
 					Delay(2000);
 				}
-				if (Actor_Clue_Query(5, 223)) {
-					Actor_Says(5, 570, 3);
-					Actor_Set_Goal_Number(0, 302);
+				if (Actor_Clue_Query(kActorClovis, kClueMcCoyRetiredLucy)) {
+					Actor_Says(kActorClovis, 570, 3);
+					Actor_Set_Goal_Number(kActorMcCoy, 302);
 					Sound_Play(561, 100, 0, 0, 50);
 					Delay(2000);
 				}
-				Actor_Set_Goal_Number(0, 303);
+				Actor_Set_Goal_Number(kActorMcCoy, 303);
 				Delay(1000);
-				Actor_Set_Goal_Number(5, 401);
+				Actor_Set_Goal_Number(kActorClovis, 401);
 			}
 		} else {
-			if (!Loop_Actor_Walk_To_XYZ(0, -10.0f, -21.47f, -58.0f, 0, 1, false, 0) && Actor_Query_Goal_Number(5) != 402) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -10.0f, -21.47f, -58.0f, 0, 1, false, 0) && Actor_Query_Goal_Number(kActorClovis) != 402) {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Game_Flag_Set(423);
@@ -166,24 +166,24 @@ void SceneScriptUG07::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG07::PlayerWalkedIn() {
 	if (Global_Variable_Query(1) == 4 && !Game_Flag_Query(623)) {
-		Actor_Set_Goal_Number(23, 307);
-		Actor_Set_Goal_Number(24, 307);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 307);
+		Actor_Set_Goal_Number(kActorOfficerGrayford, 307);
 	}
 	if (Game_Flag_Query(426)) {
-		Loop_Actor_Walk_To_XYZ(0, 62.0f, -12.21f, -274.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 62.0f, -12.21f, -274.0f, 0, 0, false, 0);
 		Game_Flag_Reset(426);
 	}
 }
 
 void SceneScriptUG07::PlayerWalkedOut() {
-	if (Global_Variable_Query(1) == 4 && (Actor_Query_Goal_Number(23) == 307 || Actor_Query_Goal_Number(24) == 307)) {
-		Non_Player_Actor_Combat_Mode_Off(23);
-		Non_Player_Actor_Combat_Mode_Off(24);
-		Actor_Set_Goal_Number(23, 306);
-		Actor_Set_Goal_Number(24, 306);
+	if (Global_Variable_Query(1) == 4 && (Actor_Query_Goal_Number(kActorOfficerLeary) == 307 || Actor_Query_Goal_Number(kActorOfficerGrayford) == 307)) {
+		Non_Player_Actor_Combat_Mode_Off(kActorOfficerLeary);
+		Non_Player_Actor_Combat_Mode_Off(kActorOfficerGrayford);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 306);
+		Actor_Set_Goal_Number(kActorOfficerGrayford, 306);
 	}
-	if (Actor_Query_In_Set(5, 80)) {
-		Actor_Set_Goal_Number(5, 400);
+	if (Actor_Query_In_Set(kActorClovis, 80)) {
+		Actor_Set_Goal_Number(kActorClovis, 400);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ug08.cpp b/engines/bladerunner/script/scene/ug08.cpp
index 5681926725..0d68ec983b 100644
--- a/engines/bladerunner/script/scene/ug08.cpp
+++ b/engines/bladerunner/script/scene/ug08.cpp
@@ -85,21 +85,21 @@ bool SceneScriptUG08::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG08::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -432.0f, 0.0f, -152.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -432.0f, 0.0f, -152.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(426);
 			Set_Enter(80, 92);
 		}
 	} else if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -312.0f, -2.0f, 152.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 240, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -312.0f, -2.0f, 152.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 240, false);
 			Footstep_Sound_Override_On(2);
-			Loop_Actor_Travel_Stairs(0, 11, 1, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 11, 1, 0);
 			Footstep_Sound_Override_Off();
-			Loop_Actor_Walk_To_XYZ(0, -118.02f, 93.02f, 52.76f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -118.02f, 93.02f, 52.76f, 0, 0, false, 0);
 			Player_Loses_Control();
-			Actor_Set_Invisible(0, true);
+			Actor_Set_Invisible(kActorMcCoy, true);
 			Game_Flag_Set(429);
 			Game_Flag_Reset(431);
 			Set_Enter(85, 97);
@@ -124,11 +124,11 @@ void SceneScriptUG08::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG08::PlayerWalkedIn() {
 	if (Game_Flag_Query(430)) {
-		Loop_Actor_Walk_To_XYZ(0, -167.0f, 93.18f, 71.0f, 0, 0, false, 0);
-		Loop_Actor_Walk_To_XYZ(0, -180.0f, 93.18f, 134.0f, 0, 0, false, 0);
-		Actor_Face_Heading(0, 745, false);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -167.0f, 93.18f, 71.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -180.0f, 93.18f, 134.0f, 0, 0, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 745, false);
 		Footstep_Sound_Override_On(2);
-		Loop_Actor_Travel_Stairs(0, 11, 0, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 11, 0, 0);
 		Footstep_Sound_Override_Off();
 		Player_Gains_Control();
 	}
diff --git a/engines/bladerunner/script/scene/ug09.cpp b/engines/bladerunner/script/scene/ug09.cpp
index 92476fbe3d..8ff3b7f74b 100644
--- a/engines/bladerunner/script/scene/ug09.cpp
+++ b/engines/bladerunner/script/scene/ug09.cpp
@@ -100,7 +100,7 @@ bool SceneScriptUG09::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG09::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -67.0f, 156.94f, -425.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -67.0f, 156.94f, -425.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(432);
@@ -109,7 +109,7 @@ bool SceneScriptUG09::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -53.0f, 156.94f, 206.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -53.0f, 156.94f, 206.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(428);
diff --git a/engines/bladerunner/script/scene/ug10.cpp b/engines/bladerunner/script/scene/ug10.cpp
index ba153ff36f..dfb616471f 100644
--- a/engines/bladerunner/script/scene/ug10.cpp
+++ b/engines/bladerunner/script/scene/ug10.cpp
@@ -99,51 +99,51 @@ bool SceneScriptUG10::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG10::ClickedOnExit(int exitId) {
 	float x, y, z;
-	Actor_Query_XYZ(0, &x, &y, &z);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	if (exitId == 0) {
 		if ((!Game_Flag_Query(474) && x > 125.0f) || Game_Flag_Query(474)) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 235.0f, 1.15f, 29.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 235.0f, 1.15f, 29.0f, 0, 1, false, 0)) {
 				Game_Flag_Set(317);
 				Set_Enter(74, 86);
 				return true;
 			}
 		} else if (!Game_Flag_Query(474)) {
-			Actor_Says(0, 8521, 3);
+			Actor_Says(kActorMcCoy, 8521, 3);
 		}
 	} else if (exitId == 1) {
 		if ((!Game_Flag_Query(474) && x < 120.0f) || Game_Flag_Query(474)) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -1.83f, 1.15f, -410.8f, 0, 1, false, 0)) {
-				Actor_Face_Heading(0, 0, false);
-				Loop_Actor_Travel_Stairs(0, 9, 1, 0);
-				Loop_Actor_Walk_To_XYZ(0, -92.0f, 81.83f, -652.0f, 0, 0, false, 0);
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1.83f, 1.15f, -410.8f, 0, 1, false, 0)) {
+				Actor_Face_Heading(kActorMcCoy, 0, false);
+				Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 1, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -92.0f, 81.83f, -652.0f, 0, 0, false, 0);
 				Game_Flag_Set(337);
 				Set_Enter(76, 88);
 				return true;
 			}
 		} else if (!Game_Flag_Query(474)) {
-			Actor_Says(0, 6165, 3);
+			Actor_Says(kActorMcCoy, 6165, 3);
 		}
 	} else if (exitId == 2) {
 		if ((!Game_Flag_Query(474) && x < 120.0f) || Game_Flag_Query(474)) {
-			if (!Loop_Actor_Walk_To_XYZ(0, -385.0f, 1.15f, 57.44f, 0, 1, false, 0)) {
-				Actor_Face_Heading(0, 1001, false);
-				Loop_Actor_Travel_Ladder(0, 1, 1, 0);
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -385.0f, 1.15f, 57.44f, 0, 1, false, 0)) {
+				Actor_Face_Heading(kActorMcCoy, 1001, false);
+				Loop_Actor_Travel_Ladder(kActorMcCoy, 1, 1, 0);
 				Game_Flag_Set(424);
 				Set_Enter(80, 92);
 				return true;
 			}
 		} else if (!Game_Flag_Query(474)) {
-			Actor_Says(0, 6165, 3);
+			Actor_Says(kActorMcCoy, 6165, 3);
 		}
 	} else if (exitId == 3) {
 		if ((!Game_Flag_Query(474) && x < 120.0f) || Game_Flag_Query(474)) {
-			if (!Loop_Actor_Walk_To_XYZ(0, 2.5f, 1.15f, 405.0f, 0, 1, false, 0)) {
+			if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 2.5f, 1.15f, 405.0f, 0, 1, false, 0)) {
 				Game_Flag_Set(347);
 				Set_Enter(86, 98);
 				return true;
 			}
 		} else if (!Game_Flag_Query(474)) {
-			Actor_Says(0, 6165, 3);
+			Actor_Says(kActorMcCoy, 6165, 3);
 		}
 	}
 	return false;
@@ -151,11 +151,11 @@ bool SceneScriptUG10::ClickedOnExit(int exitId) {
 
 bool SceneScriptUG10::ClickedOn2DRegion(int region) {
 	float x, y, z;
-	Actor_Query_XYZ(0, &x, &y, &z);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	if (region == 0 && !Player_Query_Combat_Mode()) {
 		if (x >= 120.0f) {
-			Actor_Says(0, 8525, 3);
-		} else if (!Loop_Actor_Walk_To_XYZ(0, 4.98f, 0.38f, 83.15f, 0, 1, false, 0)) {
+			Actor_Says(kActorMcCoy, 8525, 3);
+		} else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 4.98f, 0.38f, 83.15f, 0, 1, false, 0)) {
 			if (Game_Flag_Query(474)) {
 				Scene_Loop_Set_Default(1);
 				Scene_Loop_Start_Special(2, 0, 0);
@@ -206,15 +206,15 @@ void SceneScriptUG10::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptUG10::PlayerWalkedIn() {
 	if (Game_Flag_Query(346)) {
 		Game_Flag_Reset(346);
-		Loop_Actor_Walk_To_XYZ(0, 2.5f, 1.15f, 377.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 2.5f, 1.15f, 377.0f, 0, 0, false, 0);
 	} else if (Game_Flag_Query(316)) {
 		Game_Flag_Reset(316);
-		Loop_Actor_Walk_To_XYZ(0, 207.0f, 1.15f, 29.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 207.0f, 1.15f, 29.0f, 0, 0, false, 0);
 	} else if (Game_Flag_Query(336)) {
 		Game_Flag_Reset(336);
-		Loop_Actor_Walk_To_XYZ(0, -1.83f, 81.33f, -518.8f, 0, 0, false, 0);
-		Actor_Face_Heading(0, 506, false);
-		Loop_Actor_Travel_Stairs(0, 9, 0, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -1.83f, 81.33f, -518.8f, 0, 0, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 506, false);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 9, 0, 0);
 	}
 	if (Game_Flag_Query(474)) {
 		Unobstacle_Object("BOX01 BRIDGE", true);
diff --git a/engines/bladerunner/script/scene/ug12.cpp b/engines/bladerunner/script/scene/ug12.cpp
index 948d05604f..311b350588 100644
--- a/engines/bladerunner/script/scene/ug12.cpp
+++ b/engines/bladerunner/script/scene/ug12.cpp
@@ -80,7 +80,7 @@ bool SceneScriptUG12::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG12::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 375.0f, -126.21f, 180.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 375.0f, -126.21f, 180.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(344);
@@ -89,7 +89,7 @@ bool SceneScriptUG12::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 207.0f, -126.21f, -364.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 207.0f, -126.21f, -364.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(412);
diff --git a/engines/bladerunner/script/scene/ug13.cpp b/engines/bladerunner/script/scene/ug13.cpp
index bd5614275a..0188782316 100644
--- a/engines/bladerunner/script/scene/ug13.cpp
+++ b/engines/bladerunner/script/scene/ug13.cpp
@@ -31,7 +31,7 @@ void SceneScriptUG13::InitializeScene() {
 		Setup_Scene_Information(39.0f, 52.94f, -528.0f, 600);
 	} else {
 		Setup_Scene_Information(-22.0f, 54.63f, -883.0f, 578);
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 	}
 	if (!Game_Flag_Query(431)) {
 		Scene_Exit_Add_2D_Exit(0, 394, 205, 464, 281, 0);
@@ -47,10 +47,10 @@ void SceneScriptUG13::InitializeScene() {
 	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);
 	if (Global_Variable_Query(1) == 4 && !Game_Flag_Query(169)) {
-		Actor_Set_Goal_Number(12, 390);
+		Actor_Set_Goal_Number(kActorTransient, 390);
 	}
-	if (Actor_Query_Goal_Number(12) == 599) {
-		Actor_Change_Animation_Mode(12, 89);
+	if (Actor_Query_Goal_Number(kActorTransient) == 599) {
+		Actor_Change_Animation_Mode(kActorTransient, 89);
 	}
 	if (Game_Flag_Query(429)) {
 		Scene_Loop_Start_Special(0, 0, 0);
@@ -72,7 +72,7 @@ void SceneScriptUG13::SceneLoaded() {
 	Clickable_Object("BASKET");
 	Clickable_Object("BOLLARD");
 	Unclickable_Object("BASKET");
-	if (Global_Variable_Query(1) >= 3 && !Actor_Clue_Query(0, 128) && Game_Flag_Query(169) && (Actor_Clue_Query(0, 81) || Actor_Clue_Query(0, 80))) {
+	if (Global_Variable_Query(1) >= 3 && !Actor_Clue_Query(kActorMcCoy, kClueOriginalRequisitionForm) && Game_Flag_Query(169) && (Actor_Clue_Query(kActorMcCoy, kClueShippingForm) || Actor_Clue_Query(kActorMcCoy, kClueWeaponsOrderForm))) {
 		Item_Add_To_World(111, 958, 85, -209.01f, 70.76f, -351.79f, 0, 16, 12, false, true, false, true);
 	}
 }
@@ -83,8 +83,8 @@ bool SceneScriptUG13::MouseClick(int x, int y) {
 
 bool SceneScriptUG13::ClickedOn3DObject(const char *objectName, bool a2) {
 
-	if (Object_Query_Click("BOLLARD", objectName) && !Loop_Actor_Walk_To_XYZ(0, 7.0f, 44.0f, -695.0f, 0, 1, false, 0)) {
-		Actor_Face_Object(0, "BOLLARD", true);
+	if (Object_Query_Click("BOLLARD", objectName) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 7.0f, 44.0f, -695.0f, 0, 1, false, 0)) {
+		Actor_Face_Object(kActorMcCoy, "BOLLARD", true);
 		if (Game_Flag_Query(431)) {
 			Scene_Loop_Set_Default(1);
 			Scene_Loop_Start_Special(2, 0, 0);
@@ -103,47 +103,47 @@ bool SceneScriptUG13::ClickedOn3DObject(const char *objectName, bool a2) {
 }
 
 bool SceneScriptUG13::ClickedOnActor(int actorId) {
-	if (actorId == 12 && Global_Variable_Query(1) == 4 && !Loop_Actor_Walk_To_XYZ(0, -248.0f, 44.0f, -390.0f, 12, 1, false, 0)) {
-		Actor_Face_Actor(0, 12, true);
-		if (Actor_Query_Goal_Number(12) != 6 && Actor_Query_Goal_Number(12) != 599) {
+	if (actorId == 12 && Global_Variable_Query(1) == 4 && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, -248.0f, 44.0f, -390.0f, 12, 1, false, 0)) {
+		Actor_Face_Actor(kActorMcCoy, kActorTransient, true);
+		if (Actor_Query_Goal_Number(kActorTransient) != 6 && Actor_Query_Goal_Number(kActorTransient) != 599) {
 			if (!Game_Flag_Query(554)) {
 				sub_40223C();
-			} else if (!Actor_Clue_Query(0, 122) || !Actor_Clue_Query(0, 123)) {
+			} else if (!Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview1) || !Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview2)) {
 				sub_402AD4();
 			} else {
-				Actor_Set_Goal_Number(12, 391);
-				if (Actor_Clue_Query(0, 131)) {
+				Actor_Set_Goal_Number(kActorTransient, 391);
+				if (Actor_Clue_Query(kActorMcCoy, kClueFlaskOfAbsinthe)) {
 					sub_402AD4();
 				} else {
-					Actor_Face_Actor(0, 12, true);
-					Actor_Says(0, 5600, 14);
-					Actor_Says(12, 100, 53);
-					Actor_Says(0, 5605, 18);
-					Actor_Start_Speech_Sample(12, 110);
-					Actor_Set_Goal_Number(12, 395);
+					Actor_Face_Actor(kActorMcCoy, kActorTransient, true);
+					Actor_Says(kActorMcCoy, 5600, 14);
+					Actor_Says(kActorTransient, 100, 53);
+					Actor_Says(kActorMcCoy, 5605, 18);
+					Actor_Start_Speech_Sample(kActorTransient, 110);
+					Actor_Set_Goal_Number(kActorTransient, 395);
 				}
 			}
 		} else if (Random_Query(0, 1) == 1) {
-			Actor_Says(0, 8590, 16);
+			Actor_Says(kActorMcCoy, 8590, 16);
 		} else {
-			Actor_Says(0, 8655, 15);
+			Actor_Says(kActorMcCoy, 8655, 15);
 		}
 	}
 	return false;
 }
 
 bool SceneScriptUG13::ClickedOnItem(int itemId, bool a2) {
-	if (itemId == 111 && !Loop_Actor_Walk_To_Item(0, 111, 36, 1, false)) {
-		Actor_Face_Item(0, 111, true);
-		Actor_Clue_Acquire(0, 128, 1, -1);
+	if (itemId == 111 && !Loop_Actor_Walk_To_Item(kActorMcCoy, 111, 36, 1, false)) {
+		Actor_Face_Item(kActorMcCoy, 111, true);
+		Actor_Clue_Acquire(kActorMcCoy, kClueOriginalRequisitionForm, 1, -1);
 		Item_Remove_From_World(111);
 		Item_Pickup_Spin_Effect(958, 426, 316);
-		Actor_Voice_Over(3950, 99);
-		Actor_Voice_Over(3960, 99);
-		Actor_Voice_Over(3970, 99);
-		Actor_Voice_Over(3980, 99);
-		Actor_Voice_Over(3990, 99);
-		Actor_Voice_Over(4000, 99);
+		Actor_Voice_Over(3950, kActorVoiceOver);
+		Actor_Voice_Over(3960, kActorVoiceOver);
+		Actor_Voice_Over(3970, kActorVoiceOver);
+		Actor_Voice_Over(3980, kActorVoiceOver);
+		Actor_Voice_Over(3990, kActorVoiceOver);
+		Actor_Voice_Over(4000, kActorVoiceOver);
 		return true;
 	}
 	return false;
@@ -152,7 +152,7 @@ bool SceneScriptUG13::ClickedOnItem(int itemId, bool a2) {
 bool SceneScriptUG13::ClickedOnExit(int exitId) {
 
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -32.0f, 54.63f, -883.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -32.0f, 54.63f, -883.0f, 0, 1, false, 0)) {
 			Player_Loses_Control();
 			Game_Flag_Set(430);
 			Game_Flag_Set(431);
@@ -162,26 +162,26 @@ bool SceneScriptUG13::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 39.0f, 52.94f, -528.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 39.0f, 52.94f, -528.0f, 0, 1, false, 0)) {
 			Game_Flag_Set(351);
 			Set_Enter(87, 99);
 		}
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -267.0f, 44.0f, -795.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 830, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -267.0f, 44.0f, -795.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 830, false);
 			Footstep_Sound_Override_On(3);
-			Loop_Actor_Travel_Stairs(0, 11, 1, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 11, 1, 0);
 			Footstep_Sound_Override_Off();
 			if (!sub_402AD0()) {
-				Loop_Actor_Walk_To_XYZ(0, -477.0f, 141.9f, -870.0f, 0, 0, false, 0);
+				Loop_Actor_Walk_To_XYZ(kActorMcCoy, -477.0f, 141.9f, -870.0f, 0, 0, false, 0);
 				Game_Flag_Set(434);
 				Set_Enter(89, 102);
 				return true;
 			}
-			Actor_Face_Heading(0, 325, false);
-			Loop_Actor_Travel_Stairs(0, 11, 0, 0);
+			Actor_Face_Heading(kActorMcCoy, 325, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 11, 0, 0);
 		} else {
 			return true;
 		}
@@ -205,11 +205,11 @@ void SceneScriptUG13::SceneFrameAdvanced(int frame) {
 		return;
 	}
 	if (Game_Flag_Query(429) && frame < 25) {
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 	} else if (Game_Flag_Query(430) && frame >= 94 && frame <= 120) {
-		Actor_Set_Invisible(0, true);
+		Actor_Set_Invisible(kActorMcCoy, true);
 	} else {
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 	}
 	//return false;
 	return;
@@ -220,35 +220,35 @@ void SceneScriptUG13::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG13::PlayerWalkedIn() {
 	if (Game_Flag_Query(435)) {
-		Loop_Actor_Walk_To_XYZ(0, -389.0f, 143.0f, -844.0f, 0, 0, false, 0);
-		Actor_Face_Heading(0, 325, false);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -389.0f, 143.0f, -844.0f, 0, 0, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 325, false);
 		Footstep_Sound_Override_On(3);
-		Loop_Actor_Travel_Stairs(0, 11, 0, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 11, 0, 0);
 		Footstep_Sound_Override_Off();
 		Game_Flag_Reset(435);
 	} else if (Game_Flag_Query(350)) {
-		Loop_Actor_Walk_To_XYZ(0, -12.0f, 44.0f, -528.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -12.0f, 44.0f, -528.0f, 0, 0, false, 0);
 		Game_Flag_Reset(350);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, -60.0f, 55.24f, -816.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -60.0f, 55.24f, -816.0f, 0, 0, false, 0);
 		Game_Flag_Reset(429);
 		Player_Gains_Control();
 	}
-	if (Actor_Query_Goal_Number(12) >= 390 && !Game_Flag_Query(169)) {
+	if (Actor_Query_Goal_Number(kActorTransient) >= 390 && !Game_Flag_Query(169)) {
 		if (Game_Flag_Query(553)) {
 			if (Random_Query(1, 3) == 1) {
-				Actor_Set_Goal_Number(12, 395);
+				Actor_Set_Goal_Number(kActorTransient, 395);
 			}
 		} else {
 			Game_Flag_Set(553);
-			Actor_Says(12, 50, 3);
+			Actor_Says(kActorTransient, 50, 3);
 		}
 	}
 	//return false;
 }
 
 void SceneScriptUG13::PlayerWalkedOut() {
-	Actor_Set_Invisible(0, false);
+	Actor_Set_Invisible(kActorMcCoy, false);
 	Ambient_Sounds_Remove_All_Looping_Sounds(1);
 	if (Game_Flag_Query(430)) {
 		Ambient_Sounds_Remove_Sound(401, false);
@@ -265,59 +265,59 @@ void SceneScriptUG13::DialogueQueueFlushed(int a1) {
 }
 
 void SceneScriptUG13::sub_40223C() {
-	Actor_Face_Actor(0, 12, true);
+	Actor_Face_Actor(kActorMcCoy, kActorTransient, true);
 	Game_Flag_Set(554);
-	Actor_Says(0, 5560, 13);
-	Actor_Says_With_Pause(0, 5565, 3.0f, 18);
-	Actor_Says(12, 70, 31);
-	Actor_Says(12, 80, 32);
-	Actor_Says(0, 5570, 3);
-	Actor_Says(12, 90, 32);
+	Actor_Says(kActorMcCoy, 5560, 13);
+	Actor_Says_With_Pause(kActorMcCoy, 5565, 3.0f, 18);
+	Actor_Says(kActorTransient, 70, 31);
+	Actor_Says(kActorTransient, 80, 32);
+	Actor_Says(kActorMcCoy, 5570, 3);
+	Actor_Says(kActorTransient, 90, 32);
 }
 
 void SceneScriptUG13::sub_4023D8() {
-	Actor_Face_Actor(0, 12, true);
-	Actor_Clue_Acquire(0, 122, 0, 12);
-	Actor_Modify_Friendliness_To_Other(12, 0, -5);
-	Actor_Says(0, 5575, 16);
-	Actor_Says(12, 120, 31);
-	Actor_Says(0, 5610, 15);
-	Actor_Says(12, 140, 32);
-	Actor_Says(0, 5615, 18);
-	Actor_Says(12, 160, 33);
-	Actor_Says(0, 5620, 9);
-	Actor_Says(12, 170, 30);
-	Actor_Says(0, 5625, 12);
-	Actor_Says(12, 180, 32);
-	Actor_Says(0, 5630, 18);
-	Actor_Says(12, 190, 32);
-	Actor_Says(0, 5635, 15);
-	Actor_Says(12, 200, 31);
+	Actor_Face_Actor(kActorMcCoy, kActorTransient, true);
+	Actor_Clue_Acquire(kActorMcCoy, kClueHomelessManInterview1, 0, kActorTransient);
+	Actor_Modify_Friendliness_To_Other(kActorTransient, kActorMcCoy, -5);
+	Actor_Says(kActorMcCoy, 5575, 16);
+	Actor_Says(kActorTransient, 120, 31);
+	Actor_Says(kActorMcCoy, 5610, 15);
+	Actor_Says(kActorTransient, 140, 32);
+	Actor_Says(kActorMcCoy, 5615, 18);
+	Actor_Says(kActorTransient, 160, 33);
+	Actor_Says(kActorMcCoy, 5620, 9);
+	Actor_Says(kActorTransient, 170, 30);
+	Actor_Says(kActorMcCoy, 5625, 12);
+	Actor_Says(kActorTransient, 180, 32);
+	Actor_Says(kActorMcCoy, 5630, 18);
+	Actor_Says(kActorTransient, 190, 32);
+	Actor_Says(kActorMcCoy, 5635, 15);
+	Actor_Says(kActorTransient, 200, 31);
 }
 
 void SceneScriptUG13::sub_4025E0() {
-	Actor_Clue_Acquire(0, 123, 0, 12);
-	Actor_Modify_Friendliness_To_Other(12, 0, -10);
-	Actor_Says(12, 220, 30);
-	Actor_Says(0, 5640, 19);
-	Actor_Says(12, 230, 33);
-	Actor_Says(0, 5645, 16);
-	Actor_Says(12, 240, 30);
-	Actor_Says(12, 250, 33);
-	Actor_Says(0, 5650, 14);
-	Actor_Says(12, 260, 32);
+	Actor_Clue_Acquire(kActorMcCoy, kClueHomelessManInterview2, 0, kActorTransient);
+	Actor_Modify_Friendliness_To_Other(kActorTransient, kActorMcCoy, -10);
+	Actor_Says(kActorTransient, 220, 30);
+	Actor_Says(kActorMcCoy, 5640, 19);
+	Actor_Says(kActorTransient, 230, 33);
+	Actor_Says(kActorMcCoy, 5645, 16);
+	Actor_Says(kActorTransient, 240, 30);
+	Actor_Says(kActorTransient, 250, 33);
+	Actor_Says(kActorMcCoy, 5650, 14);
+	Actor_Says(kActorTransient, 260, 32);
 }
 
 void SceneScriptUG13::sub_402960() {
-	Actor_Says(0, 5670, 9);
-	Actor_Says(12, 340, 31);
-	Actor_Says(0, 5690, 19);
-	Actor_Says(12, 350, 32);
-	Actor_Says(0, 5695, 14);
-	Actor_Says(12, 360, 33);
-	Actor_Voice_Over(2710, 99);
-	Actor_Voice_Over(2730, 99);
-	Actor_Clue_Acquire(0, 124, 0, 12);
+	Actor_Says(kActorMcCoy, 5670, 9);
+	Actor_Says(kActorTransient, 340, 31);
+	Actor_Says(kActorMcCoy, 5690, 19);
+	Actor_Says(kActorTransient, 350, 32);
+	Actor_Says(kActorMcCoy, 5695, 14);
+	Actor_Says(kActorTransient, 360, 33);
+	Actor_Voice_Over(2710, kActorVoiceOver);
+	Actor_Voice_Over(2730, kActorVoiceOver);
+	Actor_Clue_Acquire(kActorMcCoy, kClueHomelessManKid, 0, kActorTransient);
 }
 
 int SceneScriptUG13::sub_402AD0() {
@@ -327,11 +327,11 @@ int SceneScriptUG13::sub_402AD0() {
 void SceneScriptUG13::sub_402AD4() {
 	Dialogue_Menu_Clear_List();
 	DM_Add_To_List_Never_Repeat_Once_Selected(1320, 6, 3, 1);
-	if (Actor_Clue_Query(0, 122)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview1)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1330, 5, 8, 5);
 	}
 	DM_Add_To_List_Never_Repeat_Once_Selected(1340, 2, 4, 6);
-	if (Actor_Clue_Query(0, 131)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueFlaskOfAbsinthe)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1350, 1, 3, 7);
 	}
 	Dialogue_Menu_Add_DONE_To_List(1360);
@@ -342,41 +342,41 @@ void SceneScriptUG13::sub_402AD4() {
 	case 1360:
 		return;
 	case 1350:
-		Actor_Clue_Acquire(12, 131, 0, 0);
-		Actor_Says_With_Pause(0, 5595, 1.0f, 23);
+		Actor_Clue_Acquire(kActorTransient, kClueFlaskOfAbsinthe, 0, kActorMcCoy);
+		Actor_Says_With_Pause(kActorMcCoy, 5595, 1.0f, 23);
 		Item_Pickup_Spin_Effect(945, 193, 325);
-		Actor_Says(12, 290, 33);
-		Actor_Says(0, 5660, 13);
-		Actor_Clue_Lose(0, 131);
+		Actor_Says(kActorTransient, 290, 33);
+		Actor_Says(kActorMcCoy, 5660, 13);
+		Actor_Clue_Lose(kActorMcCoy, kClueFlaskOfAbsinthe);
 		sub_402E24();
 		break;
 	case 1340:
-		Actor_Modify_Friendliness_To_Other(12, 0, -10);
-		Actor_Says(0, 5590, 15);
-		Actor_Says(12, 270, 31);
-		Actor_Says(0, 5655, 16);
-		Actor_Says(12, 280, 32);
+		Actor_Modify_Friendliness_To_Other(kActorTransient, kActorMcCoy, -10);
+		Actor_Says(kActorMcCoy, 5590, 15);
+		Actor_Says(kActorTransient, 270, 31);
+		Actor_Says(kActorMcCoy, 5655, 16);
+		Actor_Says(kActorTransient, 280, 32);
 		break;
 	case 1330:
-		Actor_Says(0, 5585, 16);
+		Actor_Says(kActorMcCoy, 5585, 16);
 		sub_4025E0();
 		break;
 	case 1320:
 		sub_4023D8();
 		break;
 	default:
-		Actor_Face_Actor(0, 12, true);
-		Actor_Says(0, 5600, 14);
-		Actor_Says(12, 100, 53);
-		Actor_Says(0, 5605, 18);
-		Actor_Start_Speech_Sample(12, 110);
-		Actor_Set_Goal_Number(12, 395);
+		Actor_Face_Actor(kActorMcCoy, kActorTransient, true);
+		Actor_Says(kActorMcCoy, 5600, 14);
+		Actor_Says(kActorTransient, 100, 53);
+		Actor_Says(kActorMcCoy, 5605, 18);
+		Actor_Start_Speech_Sample(kActorTransient, 110);
+		Actor_Set_Goal_Number(kActorTransient, 395);
 		break;
 	}
 }
 
 void SceneScriptUG13::sub_402E24() {
-	Actor_Set_Friendliness_To_Other(12, 0, 40);
+	Actor_Set_Friendliness_To_Other(kActorTransient, kActorMcCoy, 40);
 	Dialogue_Menu_Clear_List();
 	DM_Add_To_List_Never_Repeat_Once_Selected(1370, 1, 1, 8);
 	DM_Add_To_List_Never_Repeat_Once_Selected(1380, 1, 8, 1);
@@ -385,25 +385,25 @@ void SceneScriptUG13::sub_402E24() {
 	int answer = Dialogue_Menu_Query_Input();
 	Dialogue_Menu_Disappear();
 	if (answer == 1370) {
-		Actor_Says(0, 5665, 16);
-		Actor_Says(12, 300, 32);
-		Actor_Says(0, 5680, 19);
-		Actor_Says(12, 310, 33);
-		Actor_Says(12, 330, 30);
-		Actor_Start_Speech_Sample(12, 110);
-		Actor_Set_Goal_Number(12, 395);
-		Actor_Says(0, 5685, 18);
+		Actor_Says(kActorMcCoy, 5665, 16);
+		Actor_Says(kActorTransient, 300, 32);
+		Actor_Says(kActorMcCoy, 5680, 19);
+		Actor_Says(kActorTransient, 310, 33);
+		Actor_Says(kActorTransient, 330, 30);
+		Actor_Start_Speech_Sample(kActorTransient, 110);
+		Actor_Set_Goal_Number(kActorTransient, 395);
+		Actor_Says(kActorMcCoy, 5685, 18);
 	} else if (answer == 1380) {
-		if (Actor_Clue_Query(0, 123)) {
+		if (Actor_Clue_Query(kActorMcCoy, kClueHomelessManInterview2)) {
 			sub_402960();
 		} else {
-			Actor_Says(0, 5700, 15);
+			Actor_Says(kActorMcCoy, 5700, 15);
 			sub_4025E0();
 		}
 	} else if (answer == 1390) {
-		Actor_Says(0, 5675, 9);
-		Actor_Says(12, 370, 32);
-		Actor_Says(0, 5705, 10);
+		Actor_Says(kActorMcCoy, 5675, 9);
+		Actor_Says(kActorTransient, 370, 32);
+		Actor_Says(kActorMcCoy, 5705, 10);
 	}
 }
 
diff --git a/engines/bladerunner/script/scene/ug14.cpp b/engines/bladerunner/script/scene/ug14.cpp
index 26d0060476..926862da4d 100644
--- a/engines/bladerunner/script/scene/ug14.cpp
+++ b/engines/bladerunner/script/scene/ug14.cpp
@@ -77,22 +77,22 @@ bool SceneScriptUG14::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG14::ClickedOnExit(int exitId) {
 	float x, y, z;
-	Actor_Query_XYZ(0, &x, &y, &z);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	bool v1 = y > 57.0f;
 	if (exitId > 2) {
 		return false;
 	}
 	if (!exitId) {
 		if (v1) {
-			if (Loop_Actor_Walk_To_XYZ(0, 141.47f, 128.92f, -150.16f, 0, 1, false, 0)) {
+			if (Loop_Actor_Walk_To_XYZ(kActorMcCoy, 141.47f, 128.92f, -150.16f, 0, 1, false, 0)) {
 				return false;
 			}
-			Actor_Face_XYZ(0, -14.53f, 12.12f, -150.16f, true);
+			Actor_Face_XYZ(kActorMcCoy, -14.53f, 12.12f, -150.16f, true);
 			Footstep_Sound_Override_On(3);
-			Loop_Actor_Travel_Stairs(0, 13, 0, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 13, 0, 0);
 			Footstep_Sound_Override_Off();
 		}
-		if (!Loop_Actor_Walk_To_XYZ(0, -278.0f, 12.97f, -152.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -278.0f, 12.97f, -152.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(348);
@@ -102,15 +102,15 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) {
 	}
 	if (exitId == 1) {
 		if (!v1) {
-			if (Loop_Actor_Walk_To_XYZ(0, -14.53f, 12.12f, -150.16f, 0, 1, false, 0)) {
+			if (Loop_Actor_Walk_To_XYZ(kActorMcCoy, -14.53f, 12.12f, -150.16f, 0, 1, false, 0)) {
 				return false;
 			}
-			Actor_Face_XYZ(0, 141.47f, 128.92f, -150.16f, true);
+			Actor_Face_XYZ(kActorMcCoy, 141.47f, 128.92f, -150.16f, true);
 			Footstep_Sound_Override_On(3);
-			Loop_Actor_Travel_Stairs(0, 13, 1, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 13, 1, 0);
 			Footstep_Sound_Override_Off();
 		}
-		if (!Loop_Actor_Walk_To_XYZ(0, -50.0f, 129.0f, -814.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -50.0f, 129.0f, -814.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(345);
@@ -121,19 +121,19 @@ bool SceneScriptUG14::ClickedOnExit(int exitId) {
 
 	if (exitId == 2) {
 		if (!v1) {
-			if (Loop_Actor_Walk_To_XYZ(0, -14.53f, 12.12f, -150.16f, 0, 1, false, 0)) {
+			if (Loop_Actor_Walk_To_XYZ(kActorMcCoy, -14.53f, 12.12f, -150.16f, 0, 1, false, 0)) {
 				return false;
 			}
-			Actor_Face_XYZ(0, 141.47f, 128.92f, -150.16f, true);
+			Actor_Face_XYZ(kActorMcCoy, 141.47f, 128.92f, -150.16f, true);
 			Footstep_Sound_Override_On(3);
-			Loop_Actor_Travel_Stairs(0, 13, 1, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 13, 1, 0);
 			Footstep_Sound_Override_Off();
 		}
-		if (!Loop_Actor_Walk_To_XYZ(0, 157.0f, 128.92f, -108.01f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 157.0f, 128.92f, -108.01f, 0, 1, false, 0)) {
 			Footstep_Sound_Override_On(3);
-			Loop_Actor_Travel_Stairs(0, 6, 1, 0);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 6, 1, 0);
 			Footstep_Sound_Override_Off();
-			Loop_Actor_Walk_To_XYZ(0, 233.0f, 186.04f, -32.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, 233.0f, 186.04f, -32.0f, 0, 0, false, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(346);
@@ -156,29 +156,29 @@ void SceneScriptUG14::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG14::PlayerWalkedIn() {
 	if (Game_Flag_Query(349)) {
-		Loop_Actor_Walk_To_XYZ(0, -250.0f, 12.97f, -152.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -250.0f, 12.97f, -152.0f, 0, 0, false, 0);
 		Game_Flag_Reset(349);
 	} else if (Game_Flag_Query(344)) {
-		Loop_Actor_Walk_To_XYZ(0, -50.0f, 129.0f, -604.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -50.0f, 129.0f, -604.0f, 0, 0, false, 0);
 		Game_Flag_Reset(344);
 	} else {
-		Loop_Actor_Walk_To_XYZ(0, 157.0f, 186.04f, -44.01f, 0, 0, false, 0);
-		Actor_Face_Heading(0, 10, false);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 157.0f, 186.04f, -44.01f, 0, 0, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 10, false);
 		Footstep_Sound_Override_On(3);
-		Loop_Actor_Travel_Stairs(0, 6, 0, 0);
+		Loop_Actor_Travel_Stairs(kActorMcCoy, 6, 0, 0);
 		Footstep_Sound_Override_Off();
-		Loop_Actor_Walk_To_XYZ(0, 157.0f, 128.92f, -148.01f, 0, 0, false, 0);
-		Actor_Face_Heading(0, 807, false);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 157.0f, 128.92f, -148.01f, 0, 0, false, 0);
+		Actor_Face_Heading(kActorMcCoy, 807, false);
 		Game_Flag_Reset(347);
 	}
 	if (Global_Variable_Query(1) == 4 && Game_Flag_Query(172) && !Game_Flag_Query(694)) {
 		Overlay_Play("UG14OVER", 0, 0, 1, 0);
 		Delay(1000);
-		Actor_Face_Heading(0, 609, false);
+		Actor_Face_Heading(kActorMcCoy, 609, false);
 		Delay(3000);
-		Actor_Voice_Over(270, 99);
+		Actor_Voice_Over(270, kActorVoiceOver);
 		Delay(2150);
-		Actor_Voice_Over(300, 99);
+		Actor_Voice_Over(300, kActorVoiceOver);
 		Game_Flag_Set(694);
 	}
 	//return false;
diff --git a/engines/bladerunner/script/scene/ug15.cpp b/engines/bladerunner/script/scene/ug15.cpp
index 5403cbac40..b866561367 100644
--- a/engines/bladerunner/script/scene/ug15.cpp
+++ b/engines/bladerunner/script/scene/ug15.cpp
@@ -104,7 +104,7 @@ bool SceneScriptUG15::ClickedOnItem(int itemId, bool a2) {
 bool SceneScriptUG15::ClickedOnExit(int exitId) {
 
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -25.0f, 26.31f, -434.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -25.0f, 26.31f, -434.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(352);
@@ -113,7 +113,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -17.0f, 26.31f, -346.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -17.0f, 26.31f, -346.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(152);
@@ -122,10 +122,10 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		int v1 = Actor_Query_Goal_Number(64);
+		int v1 = Actor_Query_Goal_Number(kActorFreeSlotA);
 		if (v1 >= 300 && v1 <= 303) {
-			Loop_Actor_Walk_To_XYZ(0, -137.61f, 48.07f, 147.12f, 0, 1, false, 0);
-		} else if (!Loop_Actor_Walk_To_XYZ(0, 18.0f, 52.28f, 46.0f, 0, 1, false, 0)) {
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -137.61f, 48.07f, 147.12f, 0, 1, false, 0);
+		} else if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 18.0f, 52.28f, 46.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(354);
@@ -134,7 +134,7 @@ bool SceneScriptUG15::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 3) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -238.0f, 52.46f, 222.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -238.0f, 52.46f, 222.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(350);
@@ -151,11 +151,11 @@ bool SceneScriptUG15::ClickedOn2DRegion(int region) {
 }
 
 void SceneScriptUG15::SceneFrameAdvanced(int frame) {
-	if (Actor_Query_Goal_Number(64) == 300) {
+	if (Actor_Query_Goal_Number(kActorFreeSlotA) == 300) {
 		float x, y, z;
-		Actor_Query_XYZ(0, &x, &y, &z);
+		Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 		if (-160.0f <= x && z < 220.0f) {
-			Actor_Set_Goal_Number(64, 301);
+			Actor_Set_Goal_Number(kActorFreeSlotA, 301);
 		}
 	}
 	if (frame == 61) {
@@ -163,16 +163,16 @@ void SceneScriptUG15::SceneFrameAdvanced(int frame) {
 	}
 	if (Game_Flag_Query(677) && !Game_Flag_Query(682)) {
 		float x, y, z;
-		Actor_Query_XYZ(0, &x, &y, &z);
+		Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 		if (-180.0f <= x && (z < 220.0f && !Game_Flag_Query(724))) {
 			Game_Flag_Set(724);
 			Game_Flag_Set(682);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
-			Actor_Set_Goal_Number(0, 390);
-			Actor_Query_XYZ(64, &x, &y, &z);
+			Actor_Set_Goal_Number(kActorMcCoy, 390);
+			Actor_Query_XYZ(kActorFreeSlotA, &x, &y, &z);
 			if (-200.0f < x && -62.0f > x) {
-				Actor_Set_Goal_Number(64, 309);
+				Actor_Set_Goal_Number(kActorFreeSlotA, 309);
 			}
 		}
 	}
@@ -184,12 +184,12 @@ void SceneScriptUG15::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG15::PlayerWalkedIn() {
 	if (Game_Flag_Query(355)) {
-		Loop_Actor_Walk_To_XYZ(0, -62.0f, 48.07f, 102.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -62.0f, 48.07f, 102.0f, 0, 0, false, 0);
 		Game_Flag_Reset(355);
 	} else if (Game_Flag_Query(351)) {
 		Game_Flag_Reset(351);
 		if (!Game_Flag_Query(676)) {
-			Actor_Set_Goal_Number(64, 310);
+			Actor_Set_Goal_Number(kActorFreeSlotA, 310);
 		}
 	}
 }
diff --git a/engines/bladerunner/script/scene/ug16.cpp b/engines/bladerunner/script/scene/ug16.cpp
index 422647473c..eb1f5a0251 100644
--- a/engines/bladerunner/script/scene/ug16.cpp
+++ b/engines/bladerunner/script/scene/ug16.cpp
@@ -75,48 +75,48 @@ bool SceneScriptUG16::MouseClick(int x, int y) {
 }
 
 bool SceneScriptUG16::ClickedOn3DObject(const char *objectName, bool a2) {
-	if (Object_Query_Click("QUADPATCH05", objectName) && !Loop_Actor_Walk_To_XYZ(0, 194.0f, -35.0f, 160.8f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 870, false);
+	if (Object_Query_Click("QUADPATCH05", objectName) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 194.0f, -35.0f, 160.8f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 870, false);
 		if (!Game_Flag_Query(597) && Game_Flag_Query(595)) {
 			Game_Flag_Set(597);
 			Delay(1000);
-			Actor_Voice_Over(3480, 99);
-			Actor_Change_Animation_Mode(0, 38);
+			Actor_Voice_Over(3480, kActorVoiceOver);
+			Actor_Change_Animation_Mode(kActorMcCoy, 38);
 			Sound_Play(339, 100, 0, 0, 50);
 			Delay(1000);
 			Item_Pickup_Spin_Effect(948, 460, 287);
-			Actor_Voice_Over(2740, 99);
-			Actor_Voice_Over(2750, 99);
-			Actor_Voice_Over(2760, 99);
-			Actor_Voice_Over(2770, 99);
-			Actor_Clue_Acquire(0, 125, 1, -1);
+			Actor_Voice_Over(2740, kActorVoiceOver);
+			Actor_Voice_Over(2750, kActorVoiceOver);
+			Actor_Voice_Over(2760, kActorVoiceOver);
+			Actor_Voice_Over(2770, kActorVoiceOver);
+			Actor_Clue_Acquire(kActorMcCoy, kClueFolder, 1, -1);
 		} else {
-			Actor_Says(0, 8523, 12);
-			Actor_Says(0, 8635, 12);
+			Actor_Says(kActorMcCoy, 8523, 12);
+			Actor_Says(kActorMcCoy, 8635, 12);
 		}
 		return true;
 	}
-	if (Object_Query_Click("SCREEN 01", objectName) && !Loop_Actor_Walk_To_XYZ(0, 194.0f, -35.0f, 160.8f, 0, 1, false, 0)) {
-		Actor_Face_Heading(0, 870, false);
-		if ((!Game_Flag_Query(595) && Actor_Query_Is_In_Current_Set(10)) || Actor_Clue_Query(0, 151) || Game_Flag_Query(568)) {
-			Actor_Says(0, 8525, 12);
-			Actor_Says(0, 8526, 12);
+	if (Object_Query_Click("SCREEN 01", objectName) && !Loop_Actor_Walk_To_XYZ(kActorMcCoy, 194.0f, -35.0f, 160.8f, 0, 1, false, 0)) {
+		Actor_Face_Heading(kActorMcCoy, 870, false);
+		if ((!Game_Flag_Query(595) && Actor_Query_Is_In_Current_Set(kActorLuther)) || Actor_Clue_Query(kActorMcCoy, kClueDNALutherLance) || Game_Flag_Query(568)) {
+			Actor_Says(kActorMcCoy, 8525, 12);
+			Actor_Says(kActorMcCoy, 8526, 12);
 			return false;
 		}
 		Delay(2000);
-		Actor_Face_Heading(0, 1016, false);
+		Actor_Face_Heading(kActorMcCoy, 1016, false);
 		Delay(2000);
-		Actor_Says(0, 5725, 14);
+		Actor_Says(kActorMcCoy, 5725, 14);
 		Delay(1000);
 		Item_Pickup_Spin_Effect(941, 418, 305);
-		Actor_Clue_Acquire(0, 151, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kClueDNALutherLance, 1, -1);
 		return true;
 	}
 	return false;
 }
 
 bool SceneScriptUG16::ClickedOnActor(int actorId) {
-	if (Actor_Query_Goal_Number(10) < 490) {
+	if (Actor_Query_Goal_Number(kActorLuther) < 490) {
 		sub_401D78();
 		return true;
 	}
@@ -129,7 +129,7 @@ bool SceneScriptUG16::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG16::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -322.0f, -34.0f, -216.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -322.0f, -34.0f, -216.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(355);
@@ -138,7 +138,7 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -322.0f, -34.0f, -404.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -322.0f, -34.0f, -404.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(153);
@@ -147,9 +147,9 @@ bool SceneScriptUG16::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 2) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -316.78f, -34.88f, -533.27f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 0, false);
-			Loop_Actor_Travel_Stairs(0, 13, 1, 0);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -316.78f, -34.88f, -533.27f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 0, false);
+			Loop_Actor_Travel_Stairs(kActorMcCoy, 13, 1, 0);
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(551);
@@ -176,24 +176,24 @@ void SceneScriptUG16::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptUG16::PlayerWalkedIn() {
 	Game_Flag_Set(715);
 	if (!Game_Flag_Query(595)) {
-		Actor_Set_Goal_Number(10, 403);
+		Actor_Set_Goal_Number(kActorLuther, 403);
 	}
-	if (!Game_Flag_Query(556) && Actor_Query_Is_In_Current_Set(10)) {
+	if (!Game_Flag_Query(556) && Actor_Query_Is_In_Current_Set(kActorLuther)) {
 		Player_Loses_Control();
-		Loop_Actor_Walk_To_XYZ(0, 120.29f, -35.67f, 214.8f, 310, 0, false, 0);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(10, 0, 6);
-		Actor_Says(10, 30, 13);
-		Actor_Change_Animation_Mode(10, 17);
-		Actor_Says(13, 0, 17);
-		Actor_Says(0, 5710, 14);
-		Actor_Says(10, 40, 13);
-		Actor_Says(10, 50, 15);
-		Actor_Says(13, 20, 12);
-		Actor_Says(10, 60, 23);
-		Actor_Says(0, 5715, 14);
-		Actor_Says(13, 30, 16);
-		Actor_Says(10, 70, 6);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 120.29f, -35.67f, 214.8f, 310, 0, false, 0);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLuther, 0, 6);
+		Actor_Says(kActorLuther, 30, 13);
+		Actor_Change_Animation_Mode(kActorLuther, 17);
+		Actor_Says(kActorLance, 0, 17);
+		Actor_Says(kActorMcCoy, 5710, 14);
+		Actor_Says(kActorLuther, 40, 13);
+		Actor_Says(kActorLuther, 50, 15);
+		Actor_Says(kActorLance, 20, 12);
+		Actor_Says(kActorLuther, 60, 23);
+		Actor_Says(kActorMcCoy, 5715, 14);
+		Actor_Says(kActorLance, 30, 16);
+		Actor_Says(kActorLuther, 70, 6);
 		Player_Gains_Control();
 		Game_Flag_Set(556);
 	}
@@ -201,7 +201,7 @@ void SceneScriptUG16::PlayerWalkedIn() {
 
 void SceneScriptUG16::PlayerWalkedOut() {
 	if (!Game_Flag_Query(595)) {
-		Actor_Set_Goal_Number(10, 401);
+		Actor_Set_Goal_Number(kActorLuther, 401);
 		//return true;
 	}
 	//return false;
@@ -219,13 +219,13 @@ void SceneScriptUG16::sub_401D78() {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1430, 6, 4, 5);
 		DM_Add_To_List_Never_Repeat_Once_Selected(1440, 6, 4, 5);
 	}
-	if (Global_Variable_Query(49) > 1 && !Actor_Clue_Query(0, 125)) {
+	if (Global_Variable_Query(49) > 1 && !Actor_Clue_Query(kActorMcCoy, kClueFolder)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1450, 6, 4, 5);
 	}
-	if (Actor_Clue_Query(0, 76)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1460, 6, 4, 5);
 	}
-	if (Actor_Clue_Query(0, 147) && !Actor_Clue_Query(0, 125) && Game_Flag_Query(698)) {
+	if (Actor_Clue_Query(kActorMcCoy, kClueDNATyrell) && !Actor_Clue_Query(kActorMcCoy, kClueFolder) && Game_Flag_Query(698)) {
 		DM_Add_To_List_Never_Repeat_Once_Selected(1470, 6, 4, 5);
 	}
 	Dialogue_Menu_Add_DONE_To_List(1480);
@@ -234,134 +234,134 @@ void SceneScriptUG16::sub_401D78() {
 	Dialogue_Menu_Disappear();
 	switch (answer) {
 	case 1400:
-		Actor_Says(0, 5730, 13);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(10, 100, 18);
-		Actor_Says(0, 5775, 13);
-		Actor_Says(13, 70, 17);
-		Actor_Says(10, 110, 16);
-		Actor_Says(13, 80, 6);
-		Actor_Says(0, 5780, 13);
-		Actor_Says(10, 120, 16);
-		Actor_Says(13, 120, 13);
-		Actor_Says(0, 5785, 13);
-		Actor_Says(10, 130, 6);
-		Actor_Says(0, 5825, 13);
-		Actor_Modify_Friendliness_To_Other(10, 0, -5);
+		Actor_Says(kActorMcCoy, 5730, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLuther, 100, 18);
+		Actor_Says(kActorMcCoy, 5775, 13);
+		Actor_Says(kActorLance, 70, 17);
+		Actor_Says(kActorLuther, 110, 16);
+		Actor_Says(kActorLance, 80, 6);
+		Actor_Says(kActorMcCoy, 5780, 13);
+		Actor_Says(kActorLuther, 120, 16);
+		Actor_Says(kActorLance, 120, 13);
+		Actor_Says(kActorMcCoy, 5785, 13);
+		Actor_Says(kActorLuther, 130, 6);
+		Actor_Says(kActorMcCoy, 5825, 13);
+		Actor_Modify_Friendliness_To_Other(kActorLuther, kActorMcCoy, -5);
 		if (Game_Flag_Query(560)) {
-			Actor_Says(10, 140, 13);
-			Actor_Says(10, 150, 14);
-			Actor_Says(10, 160, 13);
-			Actor_Says(13, 140, 16);
-			Actor_Says(0, 5790, 13);
-			Actor_Says(10, 170, 14);
+			Actor_Says(kActorLuther, 140, 13);
+			Actor_Says(kActorLuther, 150, 14);
+			Actor_Says(kActorLuther, 160, 13);
+			Actor_Says(kActorLance, 140, 16);
+			Actor_Says(kActorMcCoy, 5790, 13);
+			Actor_Says(kActorLuther, 170, 14);
 			Game_Flag_Set(600);
-			Actor_Modify_Friendliness_To_Other(10, 0, 5);
+			Actor_Modify_Friendliness_To_Other(kActorLuther, kActorMcCoy, 5);
 		} else {
-			Actor_Says(10, 180, 14);
-			Actor_Says(0, 5795, 13);
-			Actor_Says(13, 150, 17);
-			Actor_Says(0, 5800, 13);
-			Actor_Says(10, 190, 15);
+			Actor_Says(kActorLuther, 180, 14);
+			Actor_Says(kActorMcCoy, 5795, 13);
+			Actor_Says(kActorLance, 150, 17);
+			Actor_Says(kActorMcCoy, 5800, 13);
+			Actor_Says(kActorLuther, 190, 15);
 			Game_Flag_Set(601);
-			Actor_Modify_Friendliness_To_Other(10, 0, -10);
+			Actor_Modify_Friendliness_To_Other(kActorLuther, kActorMcCoy, -10);
 		}
 		break;
 	case 1410:
-		Actor_Says(0, 5735, 13);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(13, 160, 17);
-		Actor_Says(10, 200, 14);
+		Actor_Says(kActorMcCoy, 5735, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLance, 160, 17);
+		Actor_Says(kActorLuther, 200, 14);
 		break;
 	case 1420:
-		Actor_Says(0, 5740, 13);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(13, 180, 15);
-		Actor_Says(10, 220, 13);
-		Actor_Says(13, 190, 17);
-		Actor_Says(0, 5805, 13);
-		Actor_Says(10, 230, 14);
-		Actor_Says(10, 240, 13);
-		Actor_Says(13, 200, 17);
-		Actor_Says(10, 260, 13);
-		Actor_Says(10, 270, 15);
-		Actor_Says(13, 210, 14);
-		Actor_Says(0, 5810, 13);
-		Actor_Says(13, 220, 14);
-		Actor_Says(13, 230, 17);
-		Actor_Clue_Acquire(0, 136, 1, 10);
+		Actor_Says(kActorMcCoy, 5740, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLance, 180, 15);
+		Actor_Says(kActorLuther, 220, 13);
+		Actor_Says(kActorLance, 190, 17);
+		Actor_Says(kActorMcCoy, 5805, 13);
+		Actor_Says(kActorLuther, 230, 14);
+		Actor_Says(kActorLuther, 240, 13);
+		Actor_Says(kActorLance, 200, 17);
+		Actor_Says(kActorLuther, 260, 13);
+		Actor_Says(kActorLuther, 270, 15);
+		Actor_Says(kActorLance, 210, 14);
+		Actor_Says(kActorMcCoy, 5810, 13);
+		Actor_Says(kActorLance, 220, 14);
+		Actor_Says(kActorLance, 230, 17);
+		Actor_Clue_Acquire(kActorMcCoy, kClueLutherLanceInterview, 1, kActorLuther);
 		break;
 	case 1430:
-		Actor_Says(0, 5745, 13);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(13, 240, 15);
-		Actor_Says(0, 5815, 13);
-		Actor_Says(13, 250, 16);
-		Actor_Says(10, 290, 15);
-		Actor_Says(13, 260, 15);
+		Actor_Says(kActorMcCoy, 5745, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLance, 240, 15);
+		Actor_Says(kActorMcCoy, 5815, 13);
+		Actor_Says(kActorLance, 250, 16);
+		Actor_Says(kActorLuther, 290, 15);
+		Actor_Says(kActorLance, 260, 15);
 		break;
 	case 1440:
-		Actor_Says(0, 5750, 13);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(13, 280, 6);
-		Actor_Says(10, 300, 14);
-		Actor_Says(10, 310, 15);
-		Actor_Modify_Friendliness_To_Other(10, 0, -5);
+		Actor_Says(kActorMcCoy, 5750, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLance, 280, 6);
+		Actor_Says(kActorLuther, 300, 14);
+		Actor_Says(kActorLuther, 310, 15);
+		Actor_Modify_Friendliness_To_Other(kActorLuther, kActorMcCoy, -5);
 		break;
 	case 1450:
-		Actor_Says(0, 5755, 13);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(13, 290, 17);
-		Actor_Says(10, 320, 16);
-		Actor_Says(0, 5820, 13);
-		Actor_Says(13, 300, 17);
-		Actor_Says(10, 330, 14);
-		Actor_Says(0, 5825, 13);
-		Actor_Says(10, 340, 13);
-		Actor_Says(13, 310, 13);
-		Actor_Says(10, 350, 13);
-		Actor_Says(10, 360, 15);
-		Actor_Says(0, 5830, 13);
-		Actor_Says(13, 320, 16);
-		Actor_Says(13, 330, 15);
+		Actor_Says(kActorMcCoy, 5755, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLance, 290, 17);
+		Actor_Says(kActorLuther, 320, 16);
+		Actor_Says(kActorMcCoy, 5820, 13);
+		Actor_Says(kActorLance, 300, 17);
+		Actor_Says(kActorLuther, 330, 14);
+		Actor_Says(kActorMcCoy, 5825, 13);
+		Actor_Says(kActorLuther, 340, 13);
+		Actor_Says(kActorLance, 310, 13);
+		Actor_Says(kActorLuther, 350, 13);
+		Actor_Says(kActorLuther, 360, 15);
+		Actor_Says(kActorMcCoy, 5830, 13);
+		Actor_Says(kActorLance, 320, 16);
+		Actor_Says(kActorLance, 330, 15);
 		Game_Flag_Set(698);
 		break;
 	case 1460:
-		Actor_Says(0, 5760, 13);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(10, 370, 15);
-		Actor_Says(13, 340, 14);
-		Actor_Says(0, 5835, 13);
-		Actor_Says(10, 380, 15);
-		Actor_Says(13, 370, 6);
-		Actor_Says(0, 5840, 13);
-		Actor_Says(13, 380, 13);
+		Actor_Says(kActorMcCoy, 5760, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLuther, 370, 15);
+		Actor_Says(kActorLance, 340, 14);
+		Actor_Says(kActorMcCoy, 5835, 13);
+		Actor_Says(kActorLuther, 380, 15);
+		Actor_Says(kActorLance, 370, 6);
+		Actor_Says(kActorMcCoy, 5840, 13);
+		Actor_Says(kActorLance, 380, 13);
 		break;
 	case 1470:
-		Actor_Says(0, 5765, 13);
-		Actor_Face_Actor(0, 10, true);
-		Actor_Says(13, 400, 15);
-		Actor_Says(0, 5845, 13);
-		Actor_Says(10, 390, 23);
-		Actor_Says(13, 410, 14);
-		Actor_Says(13, 420, 17);
-		Actor_Says(0, 5835, 13);
+		Actor_Says(kActorMcCoy, 5765, 13);
+		Actor_Face_Actor(kActorMcCoy, kActorLuther, true);
+		Actor_Says(kActorLance, 400, 15);
+		Actor_Says(kActorMcCoy, 5845, 13);
+		Actor_Says(kActorLuther, 390, 23);
+		Actor_Says(kActorLance, 410, 14);
+		Actor_Says(kActorLance, 420, 17);
+		Actor_Says(kActorMcCoy, 5835, 13);
 		Delay(1000);
 		Item_Pickup_Spin_Effect(948, 239, 454);
-		Actor_Voice_Over(2740, 99);
-		Actor_Voice_Over(2750, 99);
-		Actor_Voice_Over(2760, 99);
-		Actor_Voice_Over(2770, 99);
-		Actor_Says(0, 5850, 13);
-		Actor_Says(10, 400, 15);
-		Actor_Says(13, 430, 6);
-		Actor_Says(0, 5855, 13);
-		Actor_Says(10, 410, 14);
+		Actor_Voice_Over(2740, kActorVoiceOver);
+		Actor_Voice_Over(2750, kActorVoiceOver);
+		Actor_Voice_Over(2760, kActorVoiceOver);
+		Actor_Voice_Over(2770, kActorVoiceOver);
+		Actor_Says(kActorMcCoy, 5850, 13);
+		Actor_Says(kActorLuther, 400, 15);
+		Actor_Says(kActorLance, 430, 6);
+		Actor_Says(kActorMcCoy, 5855, 13);
+		Actor_Says(kActorLuther, 410, 14);
 		Game_Flag_Set(597);
-		Actor_Clue_Acquire(0, 125, 1, 10);
+		Actor_Clue_Acquire(kActorMcCoy, kClueFolder, 1, kActorLuther);
 		break;
 	case 1480:
-		Actor_Says(0, 4595, 14);
+		Actor_Says(kActorMcCoy, 4595, 14);
 		break;
 	}
 }
diff --git a/engines/bladerunner/script/scene/ug17.cpp b/engines/bladerunner/script/scene/ug17.cpp
index b8eca81b3c..f0fc32d2a6 100644
--- a/engines/bladerunner/script/scene/ug17.cpp
+++ b/engines/bladerunner/script/scene/ug17.cpp
@@ -64,7 +64,7 @@ bool SceneScriptUG17::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG17::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 1000.0f, 67.96f, -1539.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1000.0f, 67.96f, -1539.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(353);
@@ -73,12 +73,12 @@ bool SceneScriptUG17::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 1013.0f, 67.96f, -1892.0f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 89, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 1013.0f, 67.96f, -1892.0f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 89, false);
 			if (Global_Variable_Query(1) == 5) {
-				Actor_Says(0, 8522, 14);
+				Actor_Says(kActorMcCoy, 8522, 14);
 			} else {
-				Loop_Actor_Travel_Ladder(0, 10, 1, 0);
+				Loop_Actor_Travel_Ladder(kActorMcCoy, 10, 1, 0);
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Game_Flag_Set(448);
@@ -102,7 +102,7 @@ void SceneScriptUG17::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 
 void SceneScriptUG17::PlayerWalkedIn() {
 	if (Game_Flag_Query(352)) {
-		Loop_Actor_Walk_To_XYZ(0, 961.0f, 67.96f, -1539.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 961.0f, 67.96f, -1539.0f, 0, 0, false, 0);
 		Game_Flag_Reset(352);
 	}
 	//return false;
diff --git a/engines/bladerunner/script/scene/ug18.cpp b/engines/bladerunner/script/scene/ug18.cpp
index 74c81bd518..939404dcc5 100644
--- a/engines/bladerunner/script/scene/ug18.cpp
+++ b/engines/bladerunner/script/scene/ug18.cpp
@@ -56,9 +56,9 @@ void SceneScriptUG18::InitializeScene() {
 	Ambient_Sounds_Add_Sound(199, 5, 50, 27, 37, -100, 100, -101, -101, 0, 0);
 	Scene_Loop_Set_Default(4);
 	if (Game_Flag_Query(670) && !Game_Flag_Query(671) && Global_Variable_Query(1) == 4) {
-		Actor_Set_Goal_Number(4, 300);
-		Actor_Set_Goal_Number(5, 300);
-		Actor_Set_Goal_Number(8, 300);
+		Actor_Set_Goal_Number(kActorGuzza, 300);
+		Actor_Set_Goal_Number(kActorClovis, 300);
+		Actor_Set_Goal_Number(kActorSadik, 300);
 	}
 }
 
@@ -70,17 +70,16 @@ void SceneScriptUG18::SceneLoaded() {
 	Clickable_Object("MACHINE_01");
 	Unclickable_Object("MACHINE_01");
 	if (Game_Flag_Query(671)) {
-		Actor_Put_In_Set(4, 99);
-		Actor_Set_At_Waypoint(4, 41, 0);
-		if (Actor_Query_Which_Set_In(8) == 89) {
-			Actor_Put_In_Set(8, 91);
-			Actor_Set_At_Waypoint(8, 33, 0);
+		Actor_Put_In_Set(kActorGuzza, 99);
+		Actor_Set_At_Waypoint(kActorGuzza, 41, 0);
+		if (Actor_Query_Which_Set_In(kActorSadik) == 89) {
+			Actor_Put_In_Set(kActorSadik, 91);
+			Actor_Set_At_Waypoint(kActorSadik, 33, 0);
 		}
 	}
 	if (Game_Flag_Query(670) && !Game_Flag_Query(671) && Global_Variable_Query(1) == 4) {
 		Item_Add_To_World(91, 987, 89, -55.21f, 0.0f, -302.17f, 0, 12, 12, false, true, false, true);
 	}
-
 }
 
 bool SceneScriptUG18::MouseClick(int x, int y) {
@@ -99,11 +98,11 @@ bool SceneScriptUG18::ClickedOnItem(int itemId, bool a2) {
 	if (itemId == 91) {
 		if (a2) {
 			Item_Remove_From_World(91);
-		} else if (!Loop_Actor_Walk_To_Item(0, 91, 12, 1, false)) {
+		} else if (!Loop_Actor_Walk_To_Item(kActorMcCoy, 91, 12, 1, false)) {
 			Item_Pickup_Spin_Effect(987, 368, 243);
 			Item_Remove_From_World(itemId);
 			Game_Flag_Set(703);
-			Actor_Clue_Acquire(0, 32, 1, 4);
+			Actor_Clue_Acquire(kActorMcCoy, kClueBriefcase, 1, kActorGuzza);
 		}
 	}
 	return false;
@@ -111,7 +110,7 @@ bool SceneScriptUG18::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG18::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, -684.712f, 0.0f, 171.59f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -684.712f, 0.0f, 171.59f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(435);
@@ -134,49 +133,49 @@ void SceneScriptUG18::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 		if (newGoal == 303) {
 			Game_Flag_Set(607);
 			ADQ_Flush();
-			Actor_Modify_Friendliness_To_Other(5, 0, 7);
-			Actor_Modify_Friendliness_To_Other(8, 0, 10);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 7);
+			Actor_Modify_Friendliness_To_Other(kActorSadik, kActorMcCoy, 10);
 			Player_Loses_Control();
-			Actor_Face_Actor(4, 0, true);
-			ADQ_Add(4, 1220, 58);
+			Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
+			ADQ_Add(kActorGuzza, 1220, 58);
 			Scene_Exits_Enable();
-			Actor_Set_Goal_Number(4, 305);
+			Actor_Set_Goal_Number(kActorGuzza, 305);
 		} else if (newGoal == 304) {
 			ADQ_Flush();
-			Actor_Modify_Friendliness_To_Other(5, 0, 7);
-			Actor_Modify_Friendliness_To_Other(8, 0, 10);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 7);
+			Actor_Modify_Friendliness_To_Other(kActorSadik, kActorMcCoy, 10);
 			Player_Loses_Control();
-			Actor_Face_Actor(4, 0, true);
-			ADQ_Add(4, 1220, 58);
+			Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
+			ADQ_Add(kActorGuzza, 1220, 58);
 			Scene_Exits_Enable();
-			Actor_Set_Goal_Number(4, 306);
+			Actor_Set_Goal_Number(kActorGuzza, 306);
 		}
 	} else if (actorId == 8) {
 		if (newGoal == 302) {
-			if (Actor_Query_Friendliness_To_Other(5, 0) > 55 && Game_Flag_Query(607)) {
+			if (Actor_Query_Friendliness_To_Other(kActorClovis, kActorMcCoy) > 55 && Game_Flag_Query(607)) {
 				sub_403588();
 			} else {
-				Actor_Set_Goal_Number(8, 307);
-				Actor_Set_Goal_Number(5, 310);
+				Actor_Set_Goal_Number(kActorSadik, 307);
+				Actor_Set_Goal_Number(kActorClovis, 310);
 			}
 		} else if (newGoal == 304) {
-			Actor_Modify_Friendliness_To_Other(5, 0, -3);
-			ADQ_Add(8, 380, -1);
-			Actor_Set_Goal_Number(8, 306);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, -3);
+			ADQ_Add(kActorSadik, 380, -1);
+			Actor_Set_Goal_Number(kActorSadik, 306);
 		} else if (newGoal == 305) {
-			Actor_Change_Animation_Mode(8, 6);
+			Actor_Change_Animation_Mode(kActorSadik, 6);
 			Sound_Play(12, 100, 0, 0, 50);
-			Actor_Force_Stop_Walking(0);
-			Actor_Change_Animation_Mode(0, 48);
+			Actor_Force_Stop_Walking(kActorMcCoy);
+			Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			Player_Loses_Control();
-			Actor_Retired_Here(0, 6, 6, 1, 8);
+			Actor_Retired_Here(kActorMcCoy, 6, 6, 1, kActorSadik);
 		}
 	}
 }
 
 void SceneScriptUG18::PlayerWalkedIn() {
-	Loop_Actor_Walk_To_XYZ(0, -488.71f, 0.0f, 123.59f, 0, 0, false, 0);
-	if (Game_Flag_Query(670) && !Game_Flag_Query(671) && Actor_Query_Is_In_Current_Set(4)) {
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -488.71f, 0.0f, 123.59f, 0, 0, false, 0);
+	if (Game_Flag_Query(670) && !Game_Flag_Query(671) && Actor_Query_Is_In_Current_Set(kActorGuzza)) {
 		Scene_Exits_Disable();
 		sub_402734();
 		sub_403278();
@@ -188,136 +187,136 @@ void SceneScriptUG18::PlayerWalkedOut() {
 }
 
 void SceneScriptUG18::DialogueQueueFlushed(int a1) {
-	int v0 = Actor_Query_Goal_Number(4);
+	int v0 = Actor_Query_Goal_Number(kActorGuzza);
 	if (v0 == 301) {
-		Actor_Set_Goal_Number(4, 302);
-		Actor_Change_Animation_Mode(8, 6);
+		Actor_Set_Goal_Number(kActorGuzza, 302);
+		Actor_Change_Animation_Mode(kActorSadik, 6);
 		Sound_Play(14, 100, 0, 0, 50);
-		Actor_Change_Animation_Mode(4, 22);
-		ADQ_Add(5, 630, 13);
-		Actor_Set_Goal_Number(5, 301);
+		Actor_Change_Animation_Mode(kActorGuzza, 22);
+		ADQ_Add(kActorClovis, 630, 13);
+		Actor_Set_Goal_Number(kActorClovis, 301);
 	} else if (v0 == 305) {
-		Actor_Change_Animation_Mode(0, 6);
+		Actor_Change_Animation_Mode(kActorMcCoy, 6);
 		Sound_Play(13, 100, 0, 0, 50);
-		Actor_Change_Animation_Mode(4, 22);
+		Actor_Change_Animation_Mode(kActorGuzza, 22);
 		Delay(900);
-		Actor_Change_Animation_Mode(0, 6);
+		Actor_Change_Animation_Mode(kActorMcCoy, 6);
 		Sound_Play(14, 100, 0, 0, 50);
-		Actor_Change_Animation_Mode(4, 22);
+		Actor_Change_Animation_Mode(kActorGuzza, 22);
 		Delay(1100);
-		Actor_Change_Animation_Mode(0, 6);
+		Actor_Change_Animation_Mode(kActorMcCoy, 6);
 		Sound_Play(12, 100, 0, 0, 50);
-		Actor_Change_Animation_Mode(4, 22);
+		Actor_Change_Animation_Mode(kActorGuzza, 22);
 		Delay(900);
-		Actor_Change_Animation_Mode(0, 6);
+		Actor_Change_Animation_Mode(kActorMcCoy, 6);
 		Sound_Play(14, 100, 0, 0, 50);
-		Actor_Change_Animation_Mode(4, 61);
+		Actor_Change_Animation_Mode(kActorGuzza, 61);
 		Overlay_Play("UG18over", 1, 0, 1, 0);
-		Actor_Set_Goal_Number(4, 307);
+		Actor_Set_Goal_Number(kActorGuzza, 307);
 		Player_Gains_Control();
 		ADQ_Add_Pause(2000);
-		ADQ_Add(8, 360, -1);
+		ADQ_Add(kActorSadik, 360, -1);
 		ADQ_Add_Pause(2000);
-		ADQ_Add(5, 650, 14);
-		ADQ_Add(8, 370, 14);
-		ADQ_Add(5, 1320, 14);
-		Actor_Set_Goal_Number(5, 303);
+		ADQ_Add(kActorClovis, 650, 14);
+		ADQ_Add(kActorSadik, 370, 14);
+		ADQ_Add(kActorClovis, 1320, 14);
+		Actor_Set_Goal_Number(kActorClovis, 303);
 	} else if (v0 == 306) {
-		Actor_Change_Animation_Mode(4, 6);
+		Actor_Change_Animation_Mode(kActorGuzza, 6);
 		Sound_Play(13, 100, 0, 0, 50);
-		Actor_Force_Stop_Walking(0);
-		Actor_Change_Animation_Mode(0, 48);
+		Actor_Force_Stop_Walking(kActorMcCoy);
+		Actor_Change_Animation_Mode(kActorMcCoy, 48);
 		Player_Loses_Control();
-		Actor_Retired_Here(0, 6, 6, 1, 4);
-		Actor_Set_Goal_Number(4, 307);
+		Actor_Retired_Here(kActorMcCoy, 6, 6, 1, kActorGuzza);
+		Actor_Set_Goal_Number(kActorGuzza, 307);
 	}
 
-	int v1 = Actor_Query_Goal_Number(5);
+	int v1 = Actor_Query_Goal_Number(kActorClovis);
 	if (v1 == 301) {
-		Actor_Change_Animation_Mode(8, 6);
+		Actor_Change_Animation_Mode(kActorSadik, 6);
 		Sound_Play(14, 100, 0, 0, 50);
-		Actor_Change_Animation_Mode(4, 22);
-		ADQ_Add(5, 640, 13);
-		ADQ_Add(4, 1210, 13);
-		Actor_Set_Goal_Number(5, 302);
+		Actor_Change_Animation_Mode(kActorGuzza, 22);
+		ADQ_Add(kActorClovis, 640, 13);
+		ADQ_Add(kActorGuzza, 1210, 13);
+		Actor_Set_Goal_Number(kActorClovis, 302);
 	} else if (v1 == 302) {
-		Actor_Change_Animation_Mode(8, 6);
+		Actor_Change_Animation_Mode(kActorSadik, 6);
 		Sound_Play(14, 100, 0, 0, 50);
-		Actor_Change_Animation_Mode(4, 61);
+		Actor_Change_Animation_Mode(kActorGuzza, 61);
 		ADQ_Add_Pause(2000);
-		ADQ_Add(5, 650, 14);
-		ADQ_Add(8, 370, 14);
-		ADQ_Add(5, 1320, 14);
-		Actor_Set_Goal_Number(4, 390);
-		Actor_Retired_Here(4, 72, 32, 1, 8);
-		Actor_Set_Goal_Number(5, 303);
+		ADQ_Add(kActorClovis, 650, 14);
+		ADQ_Add(kActorSadik, 370, 14);
+		ADQ_Add(kActorClovis, 1320, 14);
+		Actor_Set_Goal_Number(kActorGuzza, 390);
+		Actor_Retired_Here(kActorGuzza, 72, 32, 1, kActorSadik);
+		Actor_Set_Goal_Number(kActorClovis, 303);
 		Scene_Exits_Enable();
 	} else if (v1 == 303) {
-		Actor_Set_Goal_Number(8, 301);
+		Actor_Set_Goal_Number(kActorSadik, 301);
 	}
-	if (Actor_Query_Goal_Number(8) == 306) {
-		Actor_Change_Animation_Mode(8, 48);
-		Actor_Set_Goal_Number(8, 307);
-		Actor_Set_Goal_Number(5, 310);
+	if (Actor_Query_Goal_Number(kActorSadik) == 306) {
+		Actor_Change_Animation_Mode(kActorSadik, 48);
+		Actor_Set_Goal_Number(kActorSadik, 307);
+		Actor_Set_Goal_Number(kActorClovis, 310);
 	}
 }
 
 void SceneScriptUG18::sub_402734() {
-	Actor_Face_Actor(0, 4, true);
-	Actor_Says(0, 5860, 9);
+	Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+	Actor_Says(kActorMcCoy, 5860, 9);
 	Delay(500);
-	Actor_Face_Actor(4, 0, true);
+	Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
 	Delay(500);
-	Actor_Says(4, 790, 3);
-	Actor_Says(0, 5865, 12);
-	Actor_Says(4, 800, 3);
-	Loop_Actor_Walk_To_XYZ(0, -357.13f, 0.0f, -44.47f, 0, 0, false, 0);
-	Actor_Face_Actor(0, 4, true);
-	Actor_Says(0, 5870, 14);
-	Actor_Face_Actor(4, 0, true);
-	Actor_Start_Speech_Sample(4, 810);
-	Loop_Actor_Walk_To_XYZ(4, -57.21f, 0.0f, -334.17f, 0, 0, false, 0);
-	Actor_Says(0, 5875, 13);
-	Actor_Says(4, 830, 3);
-	Actor_Says(4, 840, 12);
-	Actor_Says(4, 850, 14);
-	Actor_Says(4, 860, 13);
-	Actor_Says(0, 5880, 15);
-	Actor_Says(0, 5885, 9);
-	Actor_Says(0, 5890, 13);
-	Actor_Says(4, 870, 15);
-	Loop_Actor_Walk_To_XYZ(0, -205.13f, 0.0f, -184.47f, 0, 0, false, 0);
-	Actor_Face_Actor(0, 4, true);
-	Actor_Says(0, 5900, 15);
-	Actor_Says(4, 880, 13);
-	Actor_Says(0, 5905, 9);
-	Actor_Says(0, 5910, 12);
-	Actor_Says(0, 5915, 13);
-	Actor_Says(4, 890, 16);
-	Actor_Says(0, 5920, 14);
-	Loop_Actor_Walk_To_XYZ(4, -57.21f, 0.0f, -334.17f, 0, 0, false, 0);
-	Actor_Face_Actor(4, 0, true);
-	Actor_Says(4, 900, 15);
-	Actor_Says(4, 910, 12);
-	Actor_Says(4, 920, 16);
-	Actor_Says(0, 5925, 14);
-	Actor_Says(4, 940, 14);
-	Actor_Says(0, 5930, 18);
-	Actor_Says(4, 950, 14);
-	Actor_Says(4, 960, 13);
-	Actor_Says(4, 970, 3);
+	Actor_Says(kActorGuzza, 790, 3);
+	Actor_Says(kActorMcCoy, 5865, 12);
+	Actor_Says(kActorGuzza, 800, 3);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -357.13f, 0.0f, -44.47f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+	Actor_Says(kActorMcCoy, 5870, 14);
+	Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
+	Actor_Start_Speech_Sample(kActorGuzza, 810);
+	Loop_Actor_Walk_To_XYZ(kActorGuzza, -57.21f, 0.0f, -334.17f, 0, 0, false, 0);
+	Actor_Says(kActorMcCoy, 5875, 13);
+	Actor_Says(kActorGuzza, 830, 3);
+	Actor_Says(kActorGuzza, 840, 12);
+	Actor_Says(kActorGuzza, 850, 14);
+	Actor_Says(kActorGuzza, 860, 13);
+	Actor_Says(kActorMcCoy, 5880, 15);
+	Actor_Says(kActorMcCoy, 5885, 9);
+	Actor_Says(kActorMcCoy, 5890, 13);
+	Actor_Says(kActorGuzza, 870, 15);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -205.13f, 0.0f, -184.47f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+	Actor_Says(kActorMcCoy, 5900, 15);
+	Actor_Says(kActorGuzza, 880, 13);
+	Actor_Says(kActorMcCoy, 5905, 9);
+	Actor_Says(kActorMcCoy, 5910, 12);
+	Actor_Says(kActorMcCoy, 5915, 13);
+	Actor_Says(kActorGuzza, 890, 16);
+	Actor_Says(kActorMcCoy, 5920, 14);
+	Loop_Actor_Walk_To_XYZ(kActorGuzza, -57.21f, 0.0f, -334.17f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorGuzza, kActorMcCoy, true);
+	Actor_Says(kActorGuzza, 900, 15);
+	Actor_Says(kActorGuzza, 910, 12);
+	Actor_Says(kActorGuzza, 920, 16);
+	Actor_Says(kActorMcCoy, 5925, 14);
+	Actor_Says(kActorGuzza, 940, 14);
+	Actor_Says(kActorMcCoy, 5930, 18);
+	Actor_Says(kActorGuzza, 950, 14);
+	Actor_Says(kActorGuzza, 960, 13);
+	Actor_Says(kActorGuzza, 970, 3);
 	if (Game_Flag_Query(607)) {
-		Actor_Modify_Friendliness_To_Other(5, 0, 3);
-		Actor_Modify_Friendliness_To_Other(8, 0, 5);
-		Loop_Actor_Walk_To_XYZ(0, -117.13f, 0.0f, -284.47f, 0, 0, false, 0);
-		Actor_Face_Actor(0, 4, true);
-		Actor_Says(0, 5960, 9);
-		Actor_Says(0, 5965, 14);
-		Actor_Says(4, 980, 15);
-		Actor_Says(4, 990, 13);
-		Actor_Says(0, 5970, 14);
-		Actor_Says(4, 1000, 3);
-		Actor_Says(0, 5975, 15);
+		Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 3);
+		Actor_Modify_Friendliness_To_Other(kActorSadik, kActorMcCoy, 5);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, -117.13f, 0.0f, -284.47f, 0, 0, false, 0);
+		Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+		Actor_Says(kActorMcCoy, 5960, 9);
+		Actor_Says(kActorMcCoy, 5965, 14);
+		Actor_Says(kActorGuzza, 980, 15);
+		Actor_Says(kActorGuzza, 990, 13);
+		Actor_Says(kActorMcCoy, 5970, 14);
+		Actor_Says(kActorGuzza, 1000, 3);
+		Actor_Says(kActorMcCoy, 5975, 15);
 	} else {
 		sub_402DE8();
 	}
@@ -332,76 +331,76 @@ void SceneScriptUG18::sub_402DE8() {
 			sub_402F8C();
 		}
 	} else {
-		Actor_Modify_Friendliness_To_Other(5, 0, -1);
-		Actor_Modify_Friendliness_To_Other(8, 0, -1);
-		Actor_Says(0, 5935, 14);
-		Actor_Says(0, 5940, 18);
-		Actor_Says(4, 1020, 13);
-		Actor_Says(4, 1030, 14);
+		Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, -1);
+		Actor_Modify_Friendliness_To_Other(kActorSadik, kActorMcCoy, -1);
+		Actor_Says(kActorMcCoy, 5935, 14);
+		Actor_Says(kActorMcCoy, 5940, 18);
+		Actor_Says(kActorGuzza, 1020, 13);
+		Actor_Says(kActorGuzza, 1030, 14);
 	}
 }
 
 void SceneScriptUG18::sub_402F8C() {
-	Loop_Actor_Walk_To_XYZ(0, -117.13f, 0.0f, -284.47f, 0, 0, false, 0);
-	Actor_Face_Actor(0, 4, true);
-	Actor_Says(0, 5945, 12);
-	Actor_Says(4, 1040, 15);
-	Actor_Says(0, 5980, 15);
-	Actor_Says(4, 1050, 12);
-	Actor_Says(4, 1060, 13);
-	Actor_Says(4, 1070, 14);
-	Actor_Says(0, 5985, 18);
-	Actor_Says(4, 1080, 3);
-	Actor_Says(4, 1090, 14);
-	Actor_Says(4, 1100, 13);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -117.13f, 0.0f, -284.47f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+	Actor_Says(kActorMcCoy, 5945, 12);
+	Actor_Says(kActorGuzza, 1040, 15);
+	Actor_Says(kActorMcCoy, 5980, 15);
+	Actor_Says(kActorGuzza, 1050, 12);
+	Actor_Says(kActorGuzza, 1060, 13);
+	Actor_Says(kActorGuzza, 1070, 14);
+	Actor_Says(kActorMcCoy, 5985, 18);
+	Actor_Says(kActorGuzza, 1080, 3);
+	Actor_Says(kActorGuzza, 1090, 14);
+	Actor_Says(kActorGuzza, 1100, 13);
 }
 
 void SceneScriptUG18::sub_403114() {
-	Actor_Modify_Friendliness_To_Other(5, 0, 20);
-	Actor_Modify_Friendliness_To_Other(8, 0, 10);
-	Loop_Actor_Walk_To_XYZ(0, -117.13f, 0.0f, -284.47f, 0, 0, false, 0);
-	Actor_Face_Actor(0, 4, true);
-	Actor_Says(0, 5950, 16);
-	Actor_Says(0, 5955, 14);
-	Actor_Says(4, 1110, 13);
-	Actor_Says(4, 1120, 15);
-	Actor_Says(0, 5990, 3);
-	Actor_Says(4, 1130, 15);
-	Actor_Says(4, 1140, 16);
+	Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 20);
+	Actor_Modify_Friendliness_To_Other(kActorSadik, kActorMcCoy, 10);
+	Loop_Actor_Walk_To_XYZ(kActorMcCoy, -117.13f, 0.0f, -284.47f, 0, 0, false, 0);
+	Actor_Face_Actor(kActorMcCoy, kActorGuzza, true);
+	Actor_Says(kActorMcCoy, 5950, 16);
+	Actor_Says(kActorMcCoy, 5955, 14);
+	Actor_Says(kActorGuzza, 1110, 13);
+	Actor_Says(kActorGuzza, 1120, 15);
+	Actor_Says(kActorMcCoy, 5990, 3);
+	Actor_Says(kActorGuzza, 1130, 15);
+	Actor_Says(kActorGuzza, 1140, 16);
 }
 
 void SceneScriptUG18::sub_403278() {
 	ADQ_Flush();
-	Actor_Start_Speech_Sample(5, 590);
+	Actor_Start_Speech_Sample(kActorClovis, 590);
 	Delay(500);
-	Loop_Actor_Walk_To_XYZ(4, 126.79f, 0.0f, -362.17f, 0, 0, false, 0);
-	Actor_Face_Heading(4, 729, false);
-	Actor_Set_Goal_Number(4, 301);
-	ADQ_Add(8, 350, 13);
+	Loop_Actor_Walk_To_XYZ(kActorGuzza, 126.79f, 0.0f, -362.17f, 0, 0, false, 0);
+	Actor_Face_Heading(kActorGuzza, 729, false);
+	Actor_Set_Goal_Number(kActorGuzza, 301);
+	ADQ_Add(kActorSadik, 350, 13);
 	ADQ_Add_Pause(1500);
-	ADQ_Add(4, 1150, 58);
-	ADQ_Add(5, 600, 13);
+	ADQ_Add(kActorGuzza, 1150, 58);
+	ADQ_Add(kActorClovis, 600, 13);
 	ADQ_Add_Pause(1000);
-	ADQ_Add(4, 1160, 60);
+	ADQ_Add(kActorGuzza, 1160, 60);
 	ADQ_Add_Pause(500);
-	ADQ_Add(4, 1170, 59);
-	ADQ_Add(4, 1180, 58);
-	ADQ_Add(5, 610, 13);
-	ADQ_Add(4, 1190, 60);
-	ADQ_Add(5, 620, 13);
-	ADQ_Add(4, 1200, 59);
+	ADQ_Add(kActorGuzza, 1170, 59);
+	ADQ_Add(kActorGuzza, 1180, 58);
+	ADQ_Add(kActorClovis, 610, 13);
+	ADQ_Add(kActorGuzza, 1190, 60);
+	ADQ_Add(kActorClovis, 620, 13);
+	ADQ_Add(kActorGuzza, 1200, 59);
 }
 
 void SceneScriptUG18::sub_403588() {
-	Actor_Says(5, 660, 13);
-	Actor_Says(0, 5995, 13);
-	Actor_Says(5, 670, 13);
-	Actor_Says(0, 6000, 13);
-	Actor_Says_With_Pause(5, 680, 2.0f, 13);
-	Actor_Says(5, 690, 13);
-	Actor_Says(5, 700, 13);
-	Actor_Set_Goal_Number(8, 310);
-	Actor_Set_Goal_Number(5, 310);
+	Actor_Says(kActorClovis, 660, 13);
+	Actor_Says(kActorMcCoy, 5995, 13);
+	Actor_Says(kActorClovis, 670, 13);
+	Actor_Says(kActorMcCoy, 6000, 13);
+	Actor_Says_With_Pause(kActorClovis, 680, 2.0f, 13);
+	Actor_Says(kActorClovis, 690, 13);
+	Actor_Says(kActorClovis, 700, 13);
+	Actor_Set_Goal_Number(kActorSadik, 310);
+	Actor_Set_Goal_Number(kActorClovis, 310);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/scene/ug19.cpp b/engines/bladerunner/script/scene/ug19.cpp
index e7e963d520..01ca0d18da 100644
--- a/engines/bladerunner/script/scene/ug19.cpp
+++ b/engines/bladerunner/script/scene/ug19.cpp
@@ -84,10 +84,10 @@ bool SceneScriptUG19::ClickedOnItem(int itemId, bool a2) {
 
 bool SceneScriptUG19::ClickedOnExit(int exitId) {
 	if (exitId == 0) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 67.03f, 7.29f, -74.97f, 0, 1, false, 0)) {
-			Actor_Face_Heading(0, 256, false);
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 67.03f, 7.29f, -74.97f, 0, 1, false, 0)) {
+			Actor_Face_Heading(kActorMcCoy, 256, false);
 			Footstep_Sound_Override_On(3);
-			Loop_Actor_Travel_Ladder(0, 8, 1, 0);
+			Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 1, 0);
 			Footstep_Sound_Override_Off();
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
@@ -97,7 +97,7 @@ bool SceneScriptUG19::ClickedOnExit(int exitId) {
 		return true;
 	}
 	if (exitId == 1) {
-		if (!Loop_Actor_Walk_To_XYZ(0, 181.0f, 11.52f, -18.0f, 0, 1, false, 0)) {
+		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, 181.0f, 11.52f, -18.0f, 0, 1, false, 0)) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(1);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(349);
@@ -121,11 +121,11 @@ void SceneScriptUG19::ActorChangedGoal(int actorId, int newGoal, int oldGoal, bo
 void SceneScriptUG19::PlayerWalkedIn() {
 	if (Game_Flag_Query(348)) {
 		Game_Flag_Reset(348);
-		Loop_Actor_Walk_To_XYZ(0, 129.0f, 11.52f, -18.0f, 0, 0, false, 0);
+		Loop_Actor_Walk_To_XYZ(kActorMcCoy, 129.0f, 11.52f, -18.0f, 0, 0, false, 0);
 	} else {
 		Game_Flag_Reset(357);
 		Footstep_Sound_Override_On(3);
-		Loop_Actor_Travel_Ladder(0, 8, 0, 0);
+		Loop_Actor_Travel_Ladder(kActorMcCoy, 8, 0, 0);
 		Footstep_Sound_Override_Off();
 	}
 }
diff --git a/engines/bladerunner/script/script.cpp b/engines/bladerunner/script/script.cpp
index 846d33617b..18d99273c8 100644
--- a/engines/bladerunner/script/script.cpp
+++ b/engines/bladerunner/script/script.cpp
@@ -204,8 +204,8 @@ void ScriptBase::Actor_Combat_AI_Hit_Attempt(int actorId) {
 		_vm->_actors[actorId]->_combatInfo->hitAttempt();
 }
 
-void ScriptBase::Non_Player_Actor_Combat_Mode_On(int actorId, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9, int a10, int a11, int a12, int a13, int a14) {
-	_vm->_actors[actorId]->combatModeOn(a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14);
+void ScriptBase::Non_Player_Actor_Combat_Mode_On(int actorId, int a2, int a3, int otherActorId, int a5, int animationModeCombatIdle, int animationModeCombatWalk, int animationModeCombatRun, int a9, int a10, int a11, int a12, int a13, int a14) {
+	_vm->_actors[actorId]->combatModeOn(a2, a3, otherActorId, a5, animationModeCombatIdle, animationModeCombatWalk, animationModeCombatRun, a9, a10, a11, a12, a13, a14);
 }
 
 void ScriptBase::Non_Player_Actor_Combat_Mode_Off(int actorId) {
@@ -259,7 +259,7 @@ void ScriptBase::Actor_Says_With_Pause(int actorId, int sentenceId, float pause,
 		}
 	}
 	if (animationModeChanged) {
-		actor->changeAnimationMode(0, false);
+		actor->changeAnimationMode(kAnimationModeIdle, false);
 	}
 
 	//TODO: sitcom
@@ -406,14 +406,14 @@ int ScriptBase::Slice_Animation_Query_Number_Of_Frames(int animation) {
 }
 
 void ScriptBase::Actor_Change_Animation_Mode(int actorId, int animationMode) {
-	_vm->_actors[actorId]->changeAnimationMode(animationMode, 0);
+	_vm->_actors[actorId]->changeAnimationMode(animationMode, false);
 }
 
 int ScriptBase::Actor_Query_Animation_Mode(int actorId) {
 	return _vm->_actors[actorId]->getAnimationMode();
 }
 
-bool ScriptBase::Loop_Actor_Walk_To_Actor(int actorId, int otherActorId, int a3, int a4, bool run) {
+bool ScriptBase::Loop_Actor_Walk_To_Actor(int actorId, int otherActorId, int distance, int a4, bool run) {
 	_vm->gameWaitForActive();
 
 	if (actorId == _vm->_walkingActorId) {
@@ -421,7 +421,7 @@ bool ScriptBase::Loop_Actor_Walk_To_Actor(int actorId, int otherActorId, int a3,
 	}
 	_vm->_playerActorIdle = false;
 	bool isRunning;
-	bool result = _vm->_actors[actorId]->loopWalkToActor(otherActorId, a3, a4, run, true, &isRunning);
+	bool result = _vm->_actors[actorId]->loopWalkToActor(otherActorId, distance, a4, run, true, &isRunning);
 	if (_vm->_playerActorIdle) {
 		result = true;
 		_vm->_playerActorIdle = false;
@@ -1021,20 +1021,20 @@ void ScriptBase::Police_Maze_Set_Pause_State(int a1) {
 	warning("Police_Maze_Set_Pause_State(%d)", a1);
 }
 
-void ScriptBase::CDB_Set_Crime(int crimeId, int value) {
-	_vm->_crimesDatabase->setCrime(crimeId, value);
+void ScriptBase::CDB_Set_Crime(int clueId, int crimeId) {
+	_vm->_crimesDatabase->setCrime(clueId, crimeId);
 }
 
-void ScriptBase::CDB_Set_Clue_Asset_Type(int assetId, int type) {
-	_vm->_crimesDatabase->setAssetType(assetId, type);
+void ScriptBase::CDB_Set_Clue_Asset_Type(int clueId, int assetType) {
+	_vm->_crimesDatabase->setAssetType(clueId, assetType);
 }
 
 void ScriptBase::SDB_Set_Actor(int suspectId, int actorId) {
 	_vm->_suspectsDatabase->get(suspectId)->setActor(actorId);
 }
 
-bool ScriptBase::SDB_Add_Photo_Clue(int suspectId, int a2, int a3) {
-	return _vm->_suspectsDatabase->get(suspectId)->addPhotoClue(a2, a3);
+bool ScriptBase::SDB_Add_Photo_Clue(int suspectId, int clueId, int shapeId) {
+	return _vm->_suspectsDatabase->get(suspectId)->addPhotoClue(shapeId, clueId);
 }
 
 void ScriptBase::SDB_Set_Name(int actorId) {
diff --git a/engines/bladerunner/script/script.h b/engines/bladerunner/script/script.h
index f90fbc92de..eab683038d 100644
--- a/engines/bladerunner/script/script.h
+++ b/engines/bladerunner/script/script.h
@@ -25,8 +25,410 @@
 
 #include "common/str.h"
 
+#include "bladerunner/bladerunner.h"
+
 namespace BladeRunner {
 
+enum Actors : int {
+	kActorMcCoy = 0,
+	kActorSteele = 1,
+	kActorGordo = 2,
+	kActorDektora = 3,
+	kActorGuzza = 4,
+	kActorClovis = 5,
+	kActorLucy = 6,
+	kActorIzo = 7,
+	kActorSadik = 8,
+	kActorCrazylegs = 9,
+	kActorLuther = 10,
+	kActorGrigorian = 11,
+	kActorTransient = 12,
+	kActorLance = 13,
+	kActorBulletBob = 14,
+	kActorRunciter = 15,
+	kActorInsectDealer = 16,
+	kActorTyrellGuard = 17,
+	kActorEarlyQ = 18,
+	kActorZuben = 19,
+	kActorHasan = 20,
+	kActorMarcus = 21,
+	kActorMia = 22,
+	kActorOfficerLeary = 23,
+	kActorOfficerGrayford = 24,
+	kActorHanoi = 25,
+	kActorBaker = 26,
+	kActorDeskClerk = 27,
+	kActorHowieLee = 28,
+	kActorFishDealer = 29,
+	kActorKlein = 30,
+	kActorMurray = 31,
+	kActorHawkersBarkeep = 32,
+	kActorHolloway = 33,
+	kActorSergeantWalls = 34,
+	kActorMoraji = 35,
+	kActorTheBard = 36,
+	kActorPhotographer = 37,
+	kActorDispatcher = 38,
+	kActorAnsweringMachine = 39,
+	kActorRajif = 40,
+	kActorGovernorKolvig = 41,
+	kActorEarlyQBartender = 42,
+	kActorHawkersParrot = 43,
+	kActorTaffyPatron = 44,
+	kActorLockupGuard = 45,
+	kActorTeenager = 46,
+	kActorHysteriaPatron1 = 47,
+	kActorHysteriaPatron2 = 48,
+	kActorHysteriaPatron3 = 49,
+	kActorShoeshineMan = 50,
+	kActorTyrell = 51,
+	kActorChew = 52,
+	kActorGaff = 53,
+	kActorBryant = 54,
+	kActorTaffy = 55,
+	kActorSebastian = 56,
+	kActorRachael = 57,
+	kActorGeneralDoll = 58,
+	kActorIsabella = 59,
+	kActorBlimpGuy = 60,
+	kActorNewscaster = 61,
+	kActorLeon = 62,
+	kActorMaleAnnouncer = 63,
+	kActorFreeSlotA = 64,
+	kActorFreeSlotB = 65,
+	kActorMaggie = 66,
+	kActorGenwalkerA = 67,
+	kActorGenwalkerB = 68,
+	kActorGenwalkerC = 69,
+	kActorMutant1 = 70,
+	kActorMutant2 = 71,
+	kActorMutant3 = 72,
+	kActorVoiceOver = 99
+};
+
+enum Clues : int {
+	kClueOfficersStatement = 0,
+	kClueDoorForced1 = 1,
+	kClueDoorForced2 = 2,
+	kClueLimpingFootprints = 3,
+	kClueGracefulFootprints = 4,
+	kClueShellCasings = 5,
+	kClueCandy = 6,
+	kClueToyDog = 7,
+	kClueChopstickWrapper = 8,
+	kClueSushiMenu = 9,
+	kClueLabCorpses = 10,
+	kClueLabShellCasings = 11,
+	kClueRuncitersVideo = 12,
+	kClueLucy = 13,
+	kClueDragonflyAnklet = 14,
+	kClueReferenceLetter = 15,
+	kClueCrowdInterviewA = 16,
+	kClueCrowdInterviewB = 17,
+	kClueZubenRunsAway = 18,
+	kClueZubenInterview = 19,
+	kClueZuben = 20,
+	kClueBigManLimping = 21,
+	kClueRunciterInterviewA = 22,
+	kClueRunciterInterviewB1 = 23,
+	kClueRunciterInterviewB2 = 24,
+	kClueHowieLeeInterview = 25,
+	kCluePaintTransfer = 26,
+	kClueChromeDebris = 27,
+	kClueRuncitersViewA = 28,
+	kClueRuncitersViewB = 29,
+	kClueCarColorAndMake = 30,
+	kCluePartialLicenseNumber = 31,
+	kClueBriefcase = 32,
+	kClueGaffsInformation = 33,
+	kClueCrystalVisitedRunciters = 34,
+	kClueCrystalVisitedChinatown = 35,
+	kClueWantedPoster = 36,
+	kClueLicensePlate = 37,
+	kClueLicensePlateMatch = 38,
+	kClueLabPaintTransfer = 39,
+	kClueDispatchHitAndRun = 40,
+	kClueInceptShotRoy = 41,
+	kClueInceptShotsLeon = 42,
+	kCluePhoneCallGuzza = 43,
+	kClueDragonflyEarring = 44,
+	kClueTyrellSecurity = 45,
+	kClueTyrellGuardInterview = 46,
+	kClueBombingSuspect = 47,
+	kClueSadiksGun = 48,
+	kClueDetonatorWire = 49,
+	kClueVictimInformation = 50,
+	kClueAttemptedFileAccess = 51,
+	kClueCrystalsCase = 52,
+	kClueKingstonKitchenBox1 = 53,
+	kClueTyrellSalesPamphlet1 = 54,
+	kClueTyrellSalesPamphlet2 = 55,
+	kCluePeruvianLadyInterview = 56,
+	kClueHasanInterview = 57,
+	kClueBobInterview1 = 58,
+	kClueBobInterview2 = 59,
+	kClueIzoInterview = 60,
+	kClueIzosWarning = 61,
+	kClueRadiationGoggles = 62,
+	kClueGogglesReplicantIssue = 63,
+	kClueFishLadyInterview = 64,
+	kClueDogCollar1 = 65,
+	kClueWeaponsCache = 66,
+	kClueChewInterview = 67,
+	kClueMorajiInterview = 68,
+	kClueGordoInterview1 = 69,
+	kClueGordoInterview2 = 70,
+	kClueAnsweringMachineMessage = 71,
+	kClueChessTable = 72,
+	kClueSightingSadikBradbury = 73,
+	kClueStaggeredbyPunches = 74,
+	kClueMaggieBracelet = 75,
+	kClueEnvelope = 76,
+	kClueIzosFriend = 77,
+	kClueChinaBarSecurityPhoto = 78,
+	kCluePurchasedScorpions = 79,
+	kClueWeaponsOrderForm = 80,
+	kClueShippingForm = 81,
+	kClueGuzzasCash = 82,
+	kCluePoliceIssueWeapons = 83,
+	kClueHysteriaToken = 84,
+	kClueRagDoll = 85,
+	kClueMoonbus1 = 86,
+	kClueCheese = 87,
+	kClueDektorasDressingRoom = 88,
+	kClueEarlyQsClub = 89,
+	kClueDragonflyCollection = 90,
+	kClueDragonflyBelt = 91,
+	kClueEarlyQInterview = 92,
+	kClueStrangeScale1 = 93,
+	kClueDektoraInterview1 = 94,
+	kClueSuspectDektora = 95,
+	kClueDektoraInterview2 = 96,
+	kClueDektoraInterview3 = 97,
+	kClueDektorasCard = 98,
+	kClueGrigoriansNote = 99,
+	kClueCollectionReceipt = 100,
+	kClueSpecialIngredient = 101,
+	kClueStolenCheese = 102,
+	kClueGordoInterview3 = 103,
+	kClueGordoConfession = 104,
+	kClueGordosLighter1 = 105,
+	kClueGordosLighter2 = 106,
+	kClueDektoraInterview4 = 107,
+	kClueHollowayInterview = 108,
+	kClueBakersBadge = 109,
+	kClueHoldensBadge = 110,
+	kClueCar = 111,
+	kClueCarIdentified = 112,
+	kClueCarRegistration1 = 113,
+	kClueCarRegistration2 = 114,
+	kClueCarRegistration3 = 115,
+	kClueCrazylegsInterview1 = 116,
+	kClueCrazylegsInterview2 = 117,
+	kClueLichenDogWrapper = 118,
+	kClueRequisitionForm = 119,
+	kClueScaryChair = 120,
+	kClueIzosStashRaided = 121,
+	kClueHomelessManInterview1 = 122,
+	kClueHomelessManInterview2 = 123,
+	kClueHomelessManKid = 124,
+	kClueFolder = 125,
+	kClueGuzzaFramedMcCoy = 126,
+	kClueOriginalShippingForm = 127,
+	kClueOriginalRequisitionForm = 128,
+	kClueCandyWrapper = 129,
+	kClueGordoBlabs = 130,
+	kClueFlaskOfAbsinthe = 131,
+	kClueGuzzaAgreesToMeet = 132,
+	kClueDektoraConfession = 133,
+	kClueRunciterConfession1 = 134,
+	kClueRunciterConfession2 = 135,
+	kClueLutherLanceInterview = 136,
+	kClueMoonbus2 = 137,
+	kClueMoonbusCloseup = 138,
+	kCluePhoneCallDektora1 = 139,
+	kCluePhoneCallDektora2 = 140,
+	kCluePhoneCallLucy1 = 141,
+	kCluePhoneCallLucy2 = 142,
+	kCluePhoneCallClovis = 143,
+	kCluePhoneCallCrystal = 144,
+	kCluePowerSource = 145,
+	kClueBomb = 146,
+	kClueDNATyrell = 147,
+	kClueDNASebastian = 148,
+	kClueDNAChew = 149,
+	kClueDNAMoraji = 150,
+	kClueDNALutherLance = 151,
+	kClueDNAMarcus = 152,
+	kClueGarterSnake = 153,
+	kClueSlug = 154,
+	kClueGoldfish = 155,
+	kClueZubenTalksAboutLucy1 = 156,
+	kClueZubenTalksAboutLucy2 = 157,
+	kClueZubensMotive = 158,
+	kClueSightingBulletBob = 159,
+	kClueSightingClovis = 160,
+	kClueSightingDektora = 161,
+	kClueVKDektoraReplicant = 162,
+	kClueVKDektoraHuman = 163,
+	kClueVKBobGorskyReplicant = 164,
+	kClueVKBobGorskyHuman = 165,
+	kClueVKLutherLanceReplicant = 166,
+	kClueVKLutherLanceHuman = 167,
+	kClueVKGrigorianReplicant = 168,
+	kClueVKGrigorianHuman = 169,
+	kClueVKIzoReplicant = 170,
+	kClueVKIzoHuman = 171,
+	kClueVKCrazylegsReplicant = 172,
+	kClueVKCrazylegsHuman = 173,
+	kClueVKRunciterReplicant = 174,
+	kClueVKRunciterHuman = 175,
+	kClueVKEarlyQReplicant = 176,
+	kClueVKEarlyQHuman = 177,
+	kClueCrimeSceneNotes = 178,
+	kClueGrigorianInterviewA = 179,
+	kClueGrigorianInterviewB1 = 180,
+	kClueGrigorianInterviewB2 = 181,
+	kClueLabAnalysisGoldChain = 182,
+	kClueSightingZuben = 183,
+	kClueCrystalRetiredZuben = 184,
+	kClueCrystalRetiredGordo = 185,
+	kClueSightingGordo = 186,
+	kClueCrystalRetiredIzo = 187,
+	kClueClovisIncept = 188,
+	kClueDektoraIncept = 189,
+	kClueLucyIncept = 190,
+	kClueGordoIncept = 191,
+	kClueIzoIncept = 192,
+	kClueSadikIncept = 193,
+	kClueZubenIncept = 194,
+	kClueMcCoyIncept = 195,
+	kClueWarRecordsGordoFrizz = 196,
+	kCluePoliceWeaponUsed = 197,
+	kClueMcCoysWeaponUsedonBob = 198,
+	kClueBobRobbed = 199,
+	kClueBobShotInSelfDefense = 200,
+	kClueBobShotInColdBlood = 201,
+	kClueMcCoyRecoveredHoldensBadge = 202,
+	kClueCrystalTestedBulletBob = 203,
+	kClueCrystalRetiredBob = 204,
+	kClueCrystalTestedCrazylegs = 205,
+	kClueCrystalRetiredCrazylegs = 206,
+	kClueCrystalArrestedCrazylegs = 207,
+	kClueCrystalTestedRunciter = 208,
+	kClueCrystalRetiredRunciter1 = 209,
+	kClueCrystalRetiredRunciter2 = 210,
+	kClueSightingMcCoyRuncitersShop = 211,
+	kClueMcCoyKilledRunciter1 = 212,
+	kClueMcCoysDescription = 213,
+	kClueMcCoyIsABladeRunner = 214,
+	kClueMcCoyLetZubenEscape = 215,
+	kClueMcCoyWarnedIzo = 216,
+	kClueMcCoyHelpedIzoIzoIsAReplicant = 217,
+	kClueMcCoyHelpedDektora = 218,
+	kClueMcCoyHelpedLucy = 219,
+	kClueMcCoyHelpedGordo = 220,
+	kClueMcCoyShotGuzza = 221,
+	kClueMcCoyRetiredZuben = 222,
+	kClueMcCoyRetiredLucy = 223,
+	kClueMcCoyRetiredDektora = 224,
+	kClueMcCoyRetiredGordo = 225,
+	kClueMcCoyRetiredSadik = 226,
+	kClueMcCoyShotZubenintheback = 227,
+	kClueMcCoyRetiredLutherLance = 228,
+	kClueMcCoyBetrayal = 229,
+	kClueMcCoyKilledRunciter2 = 230,
+	kClueClovisOrdersMcCoysDeath = 231,
+	kClueEarlyAttemptedToSeduceLucy = 232,
+	kClueCarWasStolen = 233,
+	kClueGrigoriansResponse1 = 234,
+	kClueGrigoriansResponse2 = 235,
+	kClueCrazysInvolvement = 236,
+	kClueGrigoriansResources = 237,
+	kClueMcCoyPulledAGun = 238,
+	kClueMcCoyIsStupid = 239,
+	kClueMcCoyIsAnnoying = 240,
+	kClueMcCoyIsKind = 241,
+	kClueMcCoyIsInsane = 242,
+	kClueAnimalMurderSuspect = 243,
+	kClueMilitaryBoots = 244,
+	kClueOuterDressingRoom = 245,
+	kCluePhotoOfMcCoy1 = 246,
+	kCluePhotoOfMcCoy2 = 247,
+	kClueEarlyQAndLucy = 248,
+	kClueClovisflowers = 249,
+	kClueLucyWithDektora = 250,
+	kClueWomanInAnimoidRow = 251,
+	kClueScorpions = 252,
+	kClueStrangeScale2 = 253,
+	kClueChinaBarSecurityCamera = 254,
+	kClueIzo = 255,
+	kClueGuzza = 256,
+	kClueChinaBarSecurityDisc = 257,
+	kClueScorpionbox = 258,
+	kClueTyrellSecurityPhoto = 259,
+	kClueChinaBar = 260,
+	kCluePlasticExplosive = 261,
+	kClueDogCollar2 = 262,
+	kClueKingstonKitchenBox2 = 263,
+	kClueCrystalsCigarette = 264,
+	kClueSpinnerKeys = 265,
+	kClueAct2Ended = 266,
+	kClueAct3Ended = 267,
+	kClueAct4Ended = 268,
+	kClueExpertBomber = 269,
+	kClueAmateurBomber = 270,
+	kClueVKLucyReplicant = 271,
+	kClueVKLucyHuman = 272,
+	kClueLucyInterview = 273,
+	kClueMoonbusReflection = 274,
+	kClueMcCoyAtMoonbus = 275,
+	kClueClovisAtMoonbus = 276,
+	kClueSadikAtMoonbus = 277,
+	kClueRachaelInterview = 278,
+	kClueTyrellInterview = 279,
+	kClueRuncitersConfession1 = 280,
+	kClueRuncitersConfession2 = 281,
+	kClueRuncitersConfession3 = 282,
+	kClueEarlyInterviewA = 283,
+	kClueEarlyInterviewB1 = 284,
+	kClueEarlyInterviewB2 = 285,
+	kClueCrazylegsInterview3 = 286,
+	kClueCrazylegGgrovels = 287,
+};
+
+enum ClueTypes: int{
+	kClueTypePhotograph  = 0,
+	kClueTypeVideoClip = 1,
+	kClueTypeAudioRecording = 2,
+	kClueTypeObject = 3
+};
+
+enum Crimes : int {
+	kCrimeAnimalMurder = 0,
+	kCrimeEisendullerMurder = 1,
+	kCrimeArmsDealing = 2,
+	kCrimeMorajiMurder = 3,
+	kCrimeBradburyAssault = 4,
+	kCrimeFactoryBombing = 5,
+	kCrimeBobMurder = 6,
+	kCrimeRunciterMurder = 7,
+	kCrimeMoonbusHijacking = 8
+};
+
+enum SpinnerDestinations : int {
+	kSpinnerDestinationPoliceStation = 0,
+	kSpinnerDestinationMcCoysApartment = 1,
+	kSpinnerDestinationRuncitersAnimals = 2,
+	kSpinnerDestinationChinatown = 3,
+	kSpinnerDestinationAnimoidRow = 4,
+	kSpinnerDestinationTyrellBuilding = 5,
+	kSpinnerDestinationDNARow = 6,
+	kSpinnerDestinationBradburyBuilding = 7,
+	kSpinnerDestinationNightclubRow = 8,
+	kSpinnerDestinationHysteriaHall = 9,
+};
+
 class BladeRunnerEngine;
 
 class ScriptBase {
@@ -75,10 +477,10 @@ protected:
 	void Actor_Set_Flag_Damage_Anim_If_Moving(int actorId, bool value);
 	bool Actor_Query_Flag_Damage_Anim_If_Moving(int actorId);
 	void Actor_Combat_AI_Hit_Attempt(int actorId);
-	void Non_Player_Actor_Combat_Mode_On(int actorId, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9, int a10, int a11, int a12, int a13, int a14);
+	void Non_Player_Actor_Combat_Mode_On(int actorId, int a2, int a3, int otherActorId, int a5, int animationModeCombatIdle, int animationModeCombatWalk, int animationModeCombatRun, int a9, int a10, int a11, int a12, int a13, int a14);
 	void Non_Player_Actor_Combat_Mode_Off(int actorId);
-	void Actor_Set_Health(int actor, int hp, int maxHp);
-	void Actor_Set_Targetable(int actor, bool targetable);
+	void Actor_Set_Health(int actorId, int hp, int maxHp);
+	void Actor_Set_Targetable(int actorId, bool targetable);
 	void Actor_Says(int actorId, int sentenceId, int animationMode);
 	void Actor_Says_With_Pause(int actorId, int sentenceId, float pause, int animationMode);
 	void Actor_Voice_Over(int sentenceId, int actorId);
@@ -98,7 +500,7 @@ protected:
 	int Slice_Animation_Query_Number_Of_Frames(int animationId);
 	void Actor_Change_Animation_Mode(int actorId, int animationMode);
 	int Actor_Query_Animation_Mode(int actorId);
-	bool Loop_Actor_Walk_To_Actor(int actorId, int otherActorId, int a3, int a4, bool running);
+	bool Loop_Actor_Walk_To_Actor(int actorId, int otherActorId, int distance, int a4, bool running);
 	bool Loop_Actor_Walk_To_Item(int actorId, int itemId, int a3, int a4, bool run);
 	bool Loop_Actor_Walk_To_Scene_Object(int actorId, const char *objectName, int distance, bool a4, bool run);
 	bool Loop_Actor_Walk_To_Waypoint(int actorId, int waypointId, int a3, int a4, bool run);
@@ -108,7 +510,7 @@ protected:
 	void Actor_Force_Stop_Walking(int actorId);
 	bool Loop_Actor_Travel_Stairs(int actorId, int a2, int a3, int a4);
 	bool Loop_Actor_Travel_Ladder(int actorId, int a2, int a3, int a4);
-	void Actor_Clue_Add_To_Database(int actorId, int clueId, int unknown, bool clueAcquired, bool unknownFlag, int fromActorId);
+	void Actor_Clue_Add_To_Database(int actorId, int clueId, int weight, bool clueAcquired, bool unknownFlag, int fromActorId);
 	void Actor_Clue_Acquire(int actorId, int clueId, byte unknownFlag, int fromActorId);
 	void Actor_Clue_Lose(int actorId, int clueId);
 	bool Actor_Clue_Query(int actorId, int clueId);
@@ -211,10 +613,10 @@ protected:
 	// Police_Maze_Decrement_Score
 	// Police_Maze_Set_Score
 	void Police_Maze_Set_Pause_State(int a1);
-	void CDB_Set_Crime(int crimeId, int value);
-	void CDB_Set_Clue_Asset_Type(int assetId, int type);
+	void CDB_Set_Crime(int clueId, int crimeId);
+	void CDB_Set_Clue_Asset_Type(int clueId, int assetType);
 	void SDB_Set_Actor(int suspectId, int actorId);
-	bool SDB_Add_Photo_Clue(int suspectId, int a2, int a3);
+	bool SDB_Add_Photo_Clue(int suspectId, int clueId, int shapeId);
 	void SDB_Set_Name(int suspectId);
 	void SDB_Set_Sex(int suspectId, int sex);
 	bool SDB_Add_Identity_Clue(int suspectId, int clueId);
diff --git a/engines/bladerunner/script/vk.cpp b/engines/bladerunner/script/vk.cpp
index 5dfbbd7ae4..0650cb4987 100644
--- a/engines/bladerunner/script/vk.cpp
+++ b/engines/bladerunner/script/vk.cpp
@@ -83,20 +83,16 @@ bool ScriptVK::SCRIPT_VK_DLL_Initialize(int a1) {
 }
 
 void ScriptVK::SCRIPT_VK_DLL_Calibrate(int a1) {
-
-	if (unknown1 <= 2) {
-		if (unknown1 == 0) {
-			VK_Play_Speech_Line(0, 7370, 0.5f);
-			VK_Play_Speech_Line(0, 7385, 0.5f);
-			sub_40A300(a1, 7385);
-
-		} else if (unknown1 == 1) {
-			VK_Play_Speech_Line(0, 7390, 0.5f);
-			sub_40A350(a1, 7390);
-		} else {
-			VK_Play_Speech_Line(0, 7395, 0.5f);
-			sub_40A3A0(a1, 7395);
-		}
+	if (unknown1 == 0) {
+		VK_Play_Speech_Line(0, 7370, 0.5f);
+		VK_Play_Speech_Line(0, 7385, 0.5f);
+		sub_40A300(a1, 7385);
+	} else if (unknown1 == 1) {
+		VK_Play_Speech_Line(0, 7390, 0.5f);
+		sub_40A350(a1, 7390);
+	} else if (unknown1 == 2) {
+		VK_Play_Speech_Line(0, 7395, 0.5f);
+		sub_40A3A0(a1, 7395);
 	}
 	unknown1++;
 	if (unknown1 > 3) //bug?
@@ -112,427 +108,192 @@ bool ScriptVK::SCRIPT_VK_DLL_Begin_Test() {
 
 void ScriptVK::SCRIPT_VK_DLL_McCoy_Asks_Question(int a1, int a2) {
 	switch (a2) {
-	case 7495:
-		VK_Play_Speech_Line(0, 7495, 0.5f);
-		VK_Play_Speech_Line(0, 7500, 0.5f);
-		VK_Play_Speech_Line(0, 7505, 0.5f);
-		VK_Play_Speech_Line(0, 7510, 0.5f);
+	case 7400:
+		VK_Play_Speech_Line(0, 7400, 0.5f);
 		break;
-	case 7490:
-		VK_Play_Speech_Line(0, 7490, 0.5f);
+	case 7405:
+		VK_Play_Speech_Line(0, 7405, 0.5f);
 		break;
-	case 7485:
-		VK_Play_Speech_Line(0, 7485, 0.5f);
+	case 7410:
+		VK_Play_Speech_Line(0, 7410, 0.5f);
 		break;
-	case 7480:
-		VK_Play_Speech_Line(0, 7480, 0.5f);
+	case 7415:
+		VK_Play_Speech_Line(0, 7415, 0.5f);
 		break;
-	case 7475:
-		VK_Play_Speech_Line(0, 7475, 0.5f);
+	case 7420:
+		VK_Play_Speech_Line(0, 7420, 0.5f);
 		break;
-	case 7470:
-		VK_Play_Speech_Line(0, 7470, 0.5f);
+	case 7425:
+		VK_Play_Speech_Line(0, 7425, 0.5f);
 		break;
-	case 7465:
-		VK_Play_Speech_Line(0, 7465, 0.5f);
+	case 7430:
+		VK_Play_Speech_Line(0, 7430, 0.5f);
 		break;
-	case 7460:
-		VK_Play_Speech_Line(0, 7460, 0.5f);
+	case 7435:
+		VK_Play_Speech_Line(0, 7435, 0.5f);
 		break;
-	case 7455:
-		VK_Play_Speech_Line(0, 7455, 0.5f);
+	case 7440:
+		VK_Play_Speech_Line(0, 7440, 0.5f);
+		break;
+	case 7445:
+		VK_Play_Speech_Line(0, 7445, 0.5f);
 		break;
 	case 7450:
 		VK_Play_Speech_Line(0, 7450, 0.5f);
 		break;
-	case 7445:
-		VK_Play_Speech_Line(0, 7445, 0.5f);
+	case 7455:
+		VK_Play_Speech_Line(0, 7455, 0.5f);
 		break;
-	case 7440:
-		VK_Play_Speech_Line(0, 7440, 0.5f);
+	case 7460:
+		VK_Play_Speech_Line(0, 7460, 0.5f);
 		break;
-	case 7435:
-		VK_Play_Speech_Line(0, 7435, 0.5f);
+	case 7465:
+		VK_Play_Speech_Line(0, 7465, 0.5f);
 		break;
-	case 7430:
-		VK_Play_Speech_Line(0, 7430, 0.5f);
+	case 7470:
+		VK_Play_Speech_Line(0, 7470, 0.5f);
 		break;
-	case 7425:
-		VK_Play_Speech_Line(0, 7425, 0.5f);
+	case 7475:
+		VK_Play_Speech_Line(0, 7475, 0.5f);
 		break;
-	case 7420:
-		VK_Play_Speech_Line(0, 7420, 0.5f);
+	case 7480:
+		VK_Play_Speech_Line(0, 7480, 0.5f);
 		break;
-	case 7415:
-		VK_Play_Speech_Line(0, 7415, 0.5f);
+	case 7485:
+		VK_Play_Speech_Line(0, 7485, 0.5f);
 		break;
-	case 7410:
-		VK_Play_Speech_Line(0, 7410, 0.5f);
+	case 7490:
+		VK_Play_Speech_Line(0, 7490, 0.5f);
 		break;
-	case 7405:
-		VK_Play_Speech_Line(0, 7405, 0.5f);
+	case 7495:
+		VK_Play_Speech_Line(0, 7495, 0.5f);
+		VK_Play_Speech_Line(0, 7500, 0.5f);
+		VK_Play_Speech_Line(0, 7505, 0.5f);
+		VK_Play_Speech_Line(0, 7510, 0.5f);
 		break;
-	case 7400:
-		VK_Play_Speech_Line(0, 7400, 0.5f);
+	case 7515:
+		VK_Play_Speech_Line(0, 7515, 0.5f);
+		VK_Play_Speech_Line(0, 7520, 0.5f);
 		break;
-	case 7401:
-	case 7402:
-	case 7403:
-	case 7404:
-	case 7406:
-	case 7407:
-	case 7408:
-	case 7409:
-	case 7411:
-	case 7412:
-	case 7413:
-	case 7414:
-	case 7416:
-	case 7417:
-	case 7418:
-	case 7419:
-	case 7421:
-	case 7422:
-	case 7423:
-	case 7424:
-	case 7426:
-	case 7427:
-	case 7428:
-	case 7429:
-	case 7431:
-	case 7432:
-	case 7433:
-	case 7434:
-	case 7436:
-	case 7437:
-	case 7438:
-	case 7439:
-	case 7441:
-	case 7442:
-	case 7443:
-	case 7444:
-	case 7446:
-	case 7447:
-	case 7448:
-	case 7449:
-	case 7451:
-	case 7452:
-	case 7453:
-	case 7454:
-	case 7456:
-	case 7457:
-	case 7458:
-	case 7459:
-	case 7461:
-	case 7462:
-	case 7463:
-	case 7464:
-	case 7466:
-	case 7467:
-	case 7468:
-	case 7469:
-	case 7471:
-	case 7472:
-	case 7473:
-	case 7474:
-	case 7476:
-	case 7477:
-	case 7478:
-	case 7479:
-	case 7481:
-	case 7482:
-	case 7483:
-	case 7484:
-	case 7486:
-	case 7487:
-	case 7488:
-	case 7489:
-	case 7491:
-	case 7492:
-	case 7493:
-	case 7494:
+	case 7525:
+		VK_Play_Speech_Line(0, 7525, 0.5f);
+		VK_Play_Speech_Line(0, 7530, 0.5f);
 		break;
-	default:
-		switch (a2) {
-		case 7635:
-			VK_Play_Speech_Line(0, 7635, 0.5f);
-			VK_Play_Speech_Line(0, 7640, 0.5f);
-			if (a1 != 11 && a1 != 14) {
-				VK_Play_Speech_Line(0, 7645, 0.5f);
-				VK_Play_Speech_Line(0, 7650, 0.5f);
-				if (a1 != 6) {
-					VK_Play_Speech_Line(0, 7655, 0.5f);
-					VK_Play_Speech_Line(0, 7660, 0.5f);
-					VK_Play_Speech_Line(0, 7665, 0.5f);
-				}
-			}
-			break;
-		case 7620:
-			VK_Play_Speech_Line(0, 7620, 0.5f);
-			VK_Play_Speech_Line(0, 7625, 0.5f);
-			if (a1 != 14) {
-				if (a1 == 3 && Game_Flag_Query(47)) {
-					VK_Play_Speech_Line(3, 2330, 0.5f);
-					VK_Play_Speech_Line(0, 7880, 0.5f);
-				}
-				VK_Play_Speech_Line(0, 7630, 0.5f);
-			}
-			break;
-		case 7605:
-			VK_Play_Speech_Line(0, 7605, 0.5f);
-			VK_Play_Speech_Line(0, 7610, 0.5f);
-			VK_Play_Speech_Line(0, 7615, 0.5f);
-			break;
-		case 7600:
-			VK_Play_Speech_Line(0, 7600, 0.5f);
-			break;
-		case 7595:
-			VK_Play_Speech_Line(0, 7595, 0.5f);
-			break;
-		case 7585:
-			VK_Play_Speech_Line(0, 7585, 0.5f);
-			if (a1 != 6 && a1 != 14) {
-				VK_Play_Speech_Line(0, 7590, 0.5f);
-			}
-			break;
-		case 7580:
-			VK_Play_Speech_Line(0, 7580, 0.5f);
-			break;
-		case 7565:
-			VK_Play_Speech_Line(0, 7565, 0.5f);
-			if (a1 != 14) {
-				VK_Play_Speech_Line(0, 7570, 0.5f);
-				VK_Play_Speech_Line(0, 7575, 0.5f);
+	case 7535:
+		VK_Play_Speech_Line(0, 7535, 0.5f);
+		break;
+	case 7540:
+		VK_Play_Speech_Line(0, 7540, 0.5f);
+		VK_Play_Speech_Line(0, 7545, 0.5f);
+		break;
+	case 7550:
+		VK_Play_Speech_Line(0, 7550, 0.5f);
+		VK_Play_Speech_Line(0, 7555, 0.5f);
+		VK_Play_Speech_Line(0, 7560, 0.5f);
+		break;
+	case 7565:
+		VK_Play_Speech_Line(0, 7565, 0.5f);
+		if (a1 != 14) {
+			VK_Play_Speech_Line(0, 7570, 0.5f);
+			VK_Play_Speech_Line(0, 7575, 0.5f);
+		}
+		break;
+	case 7580:
+		VK_Play_Speech_Line(0, 7580, 0.5f);
+		break;
+	case 7585:
+		VK_Play_Speech_Line(0, 7585, 0.5f);
+		if (a1 != 6 && a1 != 14) {
+			VK_Play_Speech_Line(0, 7590, 0.5f);
+		}
+		break;
+	case 7595:
+		VK_Play_Speech_Line(0, 7595, 0.5f);
+		break;
+	case 7600:
+		VK_Play_Speech_Line(0, 7600, 0.5f);
+		break;
+	case 7605:
+		VK_Play_Speech_Line(0, 7605, 0.5f);
+		VK_Play_Speech_Line(0, 7610, 0.5f);
+		VK_Play_Speech_Line(0, 7615, 0.5f);
+		break;
+	case 7620:
+		VK_Play_Speech_Line(0, 7620, 0.5f);
+		VK_Play_Speech_Line(0, 7625, 0.5f);
+		if (a1 != 14) {
+			if (a1 == 3 && Game_Flag_Query(47)) {
+				VK_Play_Speech_Line(3, 2330, 0.5f);
+				VK_Play_Speech_Line(0, 7880, 0.5f);
 			}
-			break;
-		case 7550:
-			VK_Play_Speech_Line(0, 7550, 0.5f);
-			VK_Play_Speech_Line(0, 7555, 0.5f);
-			VK_Play_Speech_Line(0, 7560, 0.5f);
-			break;
-		case 7540:
-			VK_Play_Speech_Line(0, 7540, 0.5f);
-			VK_Play_Speech_Line(0, 7545, 0.5f);
-			break;
-		case 7535:
-			VK_Play_Speech_Line(0, 7535, 0.5f);
-			break;
-		case 7525:
-			VK_Play_Speech_Line(0, 7525, 0.5f);
-			VK_Play_Speech_Line(0, 7530, 0.5f);
-			break;
-		case 7515:
-			VK_Play_Speech_Line(0, 7515, 0.5f);
-			VK_Play_Speech_Line(0, 7520, 0.5f);
-			break;
-		case 7516:
-		case 7517:
-		case 7518:
-		case 7519:
-		case 7520:
-		case 7521:
-		case 7522:
-		case 7523:
-		case 7524:
-		case 7526:
-		case 7527:
-		case 7528:
-		case 7529:
-		case 7530:
-		case 7531:
-		case 7532:
-		case 7533:
-		case 7534:
-		case 7536:
-		case 7537:
-		case 7538:
-		case 7539:
-		case 7541:
-		case 7542:
-		case 7543:
-		case 7544:
-		case 7545:
-		case 7546:
-		case 7547:
-		case 7548:
-		case 7549:
-		case 7551:
-		case 7552:
-		case 7553:
-		case 7554:
-		case 7555:
-		case 7556:
-		case 7557:
-		case 7558:
-		case 7559:
-		case 7560:
-		case 7561:
-		case 7562:
-		case 7563:
-		case 7564:
-		case 7566:
-		case 7567:
-		case 7568:
-		case 7569:
-		case 7570:
-		case 7571:
-		case 7572:
-		case 7573:
-		case 7574:
-		case 7575:
-		case 7576:
-		case 7577:
-		case 7578:
-		case 7579:
-		case 7581:
-		case 7582:
-		case 7583:
-		case 7584:
-		case 7586:
-		case 7587:
-		case 7588:
-		case 7589:
-		case 7590:
-		case 7591:
-		case 7592:
-		case 7593:
-		case 7594:
-		case 7596:
-		case 7597:
-		case 7598:
-		case 7599:
-		case 7601:
-		case 7602:
-		case 7603:
-		case 7604:
-		case 7606:
-		case 7607:
-		case 7608:
-		case 7609:
-		case 7610:
-		case 7611:
-		case 7612:
-		case 7613:
-		case 7614:
-		case 7615:
-		case 7616:
-		case 7617:
-		case 7618:
-		case 7619:
-		case 7621:
-		case 7622:
-		case 7623:
-		case 7624:
-		case 7625:
-		case 7626:
-		case 7627:
-		case 7628:
-		case 7629:
-		case 7630:
-		case 7631:
-		case 7632:
-		case 7633:
-		case 7634:
-			if (++unknown2 >= 10) {
-				VK_Subject_Reacts(5, 0, 0, 100);
+			VK_Play_Speech_Line(0, 7630, 0.5f);
+		}
+		break;
+	case 7635:
+		VK_Play_Speech_Line(0, 7635, 0.5f);
+		VK_Play_Speech_Line(0, 7640, 0.5f);
+		if (a1 != 11 && a1 != 14) {
+			VK_Play_Speech_Line(0, 7645, 0.5f);
+			VK_Play_Speech_Line(0, 7650, 0.5f);
+			if (a1 != 6) {
+				VK_Play_Speech_Line(0, 7655, 0.5f);
+				VK_Play_Speech_Line(0, 7660, 0.5f);
+				VK_Play_Speech_Line(0, 7665, 0.5f);
 			}
-			return;
-		default:
-			switch (a2) {
-			case 7705:
-				VK_Play_Speech_Line(0, 7705, 0.5f);
-				VK_Play_Speech_Line(0, 7710, 0.5f);
-				VK_Play_Speech_Line(0, 7715, 0.5f);
-				if (a1 != 11 && a1 != 14) {
-					VK_Play_Speech_Line(0, 7720, 0.5f);
-					VK_Play_Speech_Line(0, 7725, 0.5f);
-					if (a1 != 6) {
-						if (a1 == 3) {
-							VK_Play_Speech_Line(3, 2490, 0.5f);
-						}
-						VK_Play_Speech_Line(0, 7730, 0.5f);
-						VK_Play_Speech_Line(0, 7735, 0.5f);
-					}
-				}
-				break;
-			case 7690:
-				VK_Play_Speech_Line(0, 7690, 0.5f);
-				if (a1 != 11) {
-					VK_Play_Speech_Line(0, 7695, 0.5f);
-					VK_Play_Speech_Line(0, 7700, 0.5f);
-				}
-				break;
-			case 7680:
-				VK_Play_Speech_Line(0, 7680, 0.5f);
-				VK_Play_Speech_Line(0, 7685, 0.5f);
-				break;
-			case 7670:
-				VK_Play_Speech_Line(0, 7670, 0.5f);
-				VK_Play_Speech_Line(0, 7675, 0.5f);
-				break;
-			case 7671:
-			case 7672:
-			case 7673:
-			case 7674:
-			case 7675:
-			case 7676:
-			case 7677:
-			case 7678:
-			case 7679:
-			case 7681:
-			case 7682:
-			case 7683:
-			case 7684:
-			case 7685:
-			case 7686:
-			case 7687:
-			case 7688:
-			case 7689:
-			case 7691:
-			case 7692:
-			case 7693:
-			case 7694:
-			case 7695:
-			case 7696:
-			case 7697:
-			case 7698:
-			case 7699:
-			case 7700:
-			case 7701:
-			case 7702:
-			case 7703:
-			case 7704:
-				if (++unknown2 >= 10) {
-					VK_Subject_Reacts(5, 0, 0, 100);
-				}
-				return;
-			default:
-				if ((unsigned int)(a2 - 7740) > 10) {
-					if (a2 == 7770) {
-						VK_Play_Speech_Line(0, 7770, 0.5f);
-						if (a1 == 3) {
-							VK_Play_Speech_Line(3, 2620, 0.5f);
-						}
-						VK_Play_Speech_Line(0, 7775, 0.5f);
-						VK_Play_Speech_Line(0, 7780, 0.5f);
-					}
-				} else if (a2 == 7740) {
-					VK_Play_Speech_Line(0, 7740, 0.5f);
-					VK_Play_Speech_Line(0, 7745, 0.5f);
-				} else if (a2 == 7750) {
-					VK_Play_Speech_Line(0, 7750, 0.5f);
-					VK_Play_Speech_Line(0, 7755, 0.5f);
-					if (a1 == 3) {
-						VK_Play_Speech_Line(3, 2570, 0.5f);
-					}
-					VK_Play_Speech_Line(0, 7760, 0.5f);
-					VK_Play_Speech_Line(0, 7765, 0.5f);
+		}
+		break;
+	case 7670:
+		VK_Play_Speech_Line(0, 7670, 0.5f);
+		VK_Play_Speech_Line(0, 7675, 0.5f);
+		break;
+	case 7680:
+		VK_Play_Speech_Line(0, 7680, 0.5f);
+		VK_Play_Speech_Line(0, 7685, 0.5f);
+		break;
+	case 7690:
+		VK_Play_Speech_Line(0, 7690, 0.5f);
+		if (a1 != 11) {
+			VK_Play_Speech_Line(0, 7695, 0.5f);
+			VK_Play_Speech_Line(0, 7700, 0.5f);
+		}
+		break;
+	case 7705:
+		VK_Play_Speech_Line(0, 7705, 0.5f);
+		VK_Play_Speech_Line(0, 7710, 0.5f);
+		VK_Play_Speech_Line(0, 7715, 0.5f);
+		if (a1 != 11 && a1 != 14) {
+			VK_Play_Speech_Line(0, 7720, 0.5f);
+			VK_Play_Speech_Line(0, 7725, 0.5f);
+			if (a1 != 6) {
+				if (a1 == 3) {
+					VK_Play_Speech_Line(3, 2490, 0.5f);
 				}
-				break;
+				VK_Play_Speech_Line(0, 7730, 0.5f);
+				VK_Play_Speech_Line(0, 7735, 0.5f);
 			}
-			break;
 		}
 		break;
+	case 7740:
+		VK_Play_Speech_Line(0, 7740, 0.5f);
+		VK_Play_Speech_Line(0, 7745, 0.5f);
+		break;
+	case 7750:
+		VK_Play_Speech_Line(0, 7750, 0.5f);
+		VK_Play_Speech_Line(0, 7755, 0.5f);
+		if (a1 == 3) {
+			VK_Play_Speech_Line(3, 2570, 0.5f);
+		}
+		VK_Play_Speech_Line(0, 7760, 0.5f);
+		VK_Play_Speech_Line(0, 7765, 0.5f);
+		break;
+	case 7770:
+		VK_Play_Speech_Line(0, 7770, 0.5f);
+		if (a1 == 3) {
+			VK_Play_Speech_Line(3, 2620, 0.5f);
+		}
+		VK_Play_Speech_Line(0, 7775, 0.5f);
+		VK_Play_Speech_Line(0, 7780, 0.5f);
+		break;
 	}
 	if (++unknown2 >= 10) {
 		VK_Subject_Reacts(5, 0, 0, 100);
@@ -567,21 +328,19 @@ void ScriptVK::SCRIPT_VK_DLL_Shutdown(int a1, signed int a2, signed int a3) {
 		VK_Play_Speech_Line(39, 430, 0.5f);
 		switch (a1) {
 		case 15:
-			Actor_Clue_Acquire(0, 174, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKRunciterReplicant, 1, -1);
 			break;
 		case 14:
-			Actor_Clue_Acquire(0, 164, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKBobGorskyReplicant, 1, -1);
 			break;
 		case 11:
-			Actor_Clue_Acquire(0, 168, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKGrigorianReplicant, 1, -1);
 			break;
 		case 6:
-			Actor_Clue_Acquire(0, 271, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKLucyReplicant, 1, -1);
 			break;
 		case 3:
-			Actor_Clue_Acquire(0, 162, 1, -1);
-			break;
-		default:
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKDektoraReplicant, 1, -1);
 			break;
 		}
 	} else if (a2 > 79) {
@@ -589,28 +348,19 @@ void ScriptVK::SCRIPT_VK_DLL_Shutdown(int a1, signed int a2, signed int a3) {
 		VK_Play_Speech_Line(39, 440, 0.5f);
 		switch (a1) {
 		case 15:
-			Actor_Clue_Acquire(0, 175, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKRunciterHuman, 1, -1);
 			break;
 		case 14:
-			Actor_Clue_Acquire(0, 165, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKBobGorskyHuman, 1, -1);
 			break;
 		case 11:
-			Actor_Clue_Acquire(0, 169, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKGrigorianHuman, 1, -1);
 			break;
 		case 6:
-			Actor_Clue_Acquire(0, 272, 1, -1);
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKLucyHuman, 1, -1);
 			break;
 		case 3:
-			Actor_Clue_Acquire(0, 163, 1, -1);
-			break;
-		case 4:
-		case 5:
-		case 7:
-		case 8:
-		case 9:
-		case 10:
-		case 12:
-		case 13:
+			Actor_Clue_Acquire(kActorMcCoy, kClueVKDektoraHuman, 1, -1);
 			break;
 		}
 	}
@@ -619,46 +369,185 @@ void ScriptVK::SCRIPT_VK_DLL_Shutdown(int a1, signed int a2, signed int a3) {
 
 void ScriptVK::sub_402604(int a1) {
 	switch (a1) {
-	case 7495:
+	case 7385:
+		VK_Subject_Reacts(40, 0, 0, 0);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(6, 1240, 0.5f);
+		break;
+	case 7390:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(10, 2, 8, 5);
+			VK_Play_Speech_Line(6, 1250, 0.5f);
+			VK_Subject_Reacts(40, 0, 2, 5);
+			VK_Play_Speech_Line(6, 1260, 0.5f);
+			VK_Eye_Animates(3);
 		} else {
-			VK_Subject_Reacts(30, 10, -1, 5);
+			VK_Play_Speech_Line(6, 1270, 0.5f);
+			VK_Subject_Reacts(40, 3, 0, 2);
 		}
-		VK_Play_Speech_Line(6, 1770, 0.5f);
+		break;
+	case 7395:
+		if (Game_Flag_Query(46)) {
+			VK_Play_Speech_Line(6, 1280, 0.5f);
+			VK_Subject_Reacts(40, 0, 0, 0);
+		} else {
+			VK_Subject_Reacts(40, 0, 0, 0);
+			VK_Play_Speech_Line(6, 1280, 0.5f);
+		}
+		break;
+	case 7400:
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(20, 0, 8, -5);
+		} else {
+			VK_Subject_Reacts(30, 9, 0, -10);
+		}
+		VK_Play_Speech_Line(6, 1300, 0.5f);
+		VK_Eye_Animates(3);
+		break;
+	case 7405:
+		VK_Play_Speech_Line(6, 1310, 0.5f);
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(50, 1, 11, 5);
+		} else {
+			VK_Subject_Reacts(60, 11, 1, 5);
+		}
+		VK_Play_Speech_Line(6, 1320, 0.5f);
+		break;
+	case 7410:
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(40, 1, 10, -5);
+			VK_Eye_Animates(2);
+		} else {
+			VK_Subject_Reacts(40, 10, -2, -5);
+		}
+		VK_Play_Speech_Line(6, 1330, 0.5f);
+		break;
+	case 7415:
+		if (Game_Flag_Query(46)) {
+			VK_Play_Speech_Line(6, 1340, 0.5f);
+			VK_Subject_Reacts(50, 1, 11, -5);
+			VK_Play_Speech_Line(0, 7935, 0.5f);
+			VK_Play_Speech_Line(6, 1350, 0.5f);
+		} else {
+			VK_Play_Speech_Line(6, 1360, 0.5f);
+			VK_Subject_Reacts(20, 9, -2, -5);
+		}
+		break;
+	case 7420:
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(6, 1370, 0.5f);
+		VK_Play_Speech_Line(0, 8000, 0.5f);
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(50, 1, 11, -8);
+		} else {
+			VK_Subject_Reacts(60, 11, -2, -8);
+		}
+		VK_Play_Speech_Line(6, 1390, 0.5f);
+		break;
+	case 7425:
+		VK_Play_Speech_Line(6, 1400, 0.5f);
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(20, -2, 9, -2);
+		} else {
+			VK_Subject_Reacts(20, 9, -2, -2);
+		}
+		VK_Play_Speech_Line(6, 1410, 0.5f);
+		break;
+	case 7430:
+		VK_Play_Speech_Line(6, 1420, 0.5f);
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(20, -1, 9, -3);
+		} else {
+			VK_Subject_Reacts(30, 9, -1, -3);
+		}
+		VK_Play_Speech_Line(6, 1430, 0.5f);
+		VK_Play_Speech_Line(0, 7940, 0.5f);
 		VK_Eye_Animates(2);
-		VK_Play_Speech_Line(6, 1780, 0.5f);
 		break;
-	case 7490:
+	case 7435:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(30, 3, 11, 9);
+			VK_Play_Speech_Line(6, 1440, 0.5f);
+			VK_Subject_Reacts(30, 5, 10, 2);
 		} else {
-			VK_Subject_Reacts(40, 11, 1, 8);
+			VK_Subject_Reacts(30, 9, 3, 2);
+			VK_Play_Speech_Line(6, 1450, 0.5f);
 		}
-		VK_Play_Speech_Line(6, 1750, 0.5f);
-		VK_Play_Speech_Line(0, 7985, 0.5f);
-		VK_Play_Speech_Line(0, 7990, 0.5f);
-		VK_Play_Speech_Line(6, 1760, 0.5f);
 		break;
-	case 7485:
+	case 7440:
+		VK_Play_Speech_Line(6, 1460, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(20, -2, 10, 6);
+			VK_Subject_Reacts(40, 5, 10, 2);
+			VK_Eye_Animates(3);
 		} else {
-			VK_Subject_Reacts(30, 10, -2, 6);
+			VK_Subject_Reacts(20, 9, -3, 2);
+		}
+		VK_Play_Speech_Line(6, 1470, 0.5f);
+		break;
+	case 7445:
+		if (Game_Flag_Query(46)) {
+			VK_Play_Speech_Line(6, 1480, 0.5f);
+			VK_Play_Speech_Line(0, 7940, 0.5f);
+			VK_Subject_Reacts(50, 4, 11, 10);
+			VK_Play_Speech_Line(6, 1500, 0.5f);
+		} else {
+			VK_Subject_Reacts(30, 9, -1, -2);
+			VK_Play_Speech_Line(6, 1510, 0.5f);
+			VK_Play_Speech_Line(0, 7945, 0.5f);
+			VK_Play_Speech_Line(6, 1520, 0.5f);
+		}
+		break;
+	case 7450:
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(20, 3, 9, -6);
+		} else {
+			VK_Subject_Reacts(30, 9, 4, -6);
 			VK_Eye_Animates(2);
 		}
-		VK_Play_Speech_Line(6, 1740, 0.5f);
+		VK_Play_Speech_Line(6, 1530, 0.5f);
 		break;
-	case 7480:
-		VK_Play_Speech_Line(6, 1720, 0.5f);
-		VK_Play_Speech_Line(0, 7975, 0.5f);
+	case 7455:
+		VK_Play_Speech_Line(6, 1540, 0.5f);
+		VK_Play_Speech_Line(0, 7950, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(20, 2, 10, 7);
+			VK_Subject_Reacts(10, 1, 8, -5);
 		} else {
-			VK_Subject_Reacts(50, 12, 3, 7);
+			VK_Subject_Reacts(10, 9, -1, -2);
+		}
+		VK_Play_Speech_Line(6, 1550, 0.5f);
+		break;
+	case 7460:
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(30, 1, 10, -5);
+		} else {
+			VK_Subject_Reacts(30, 9, 2, -5);
+		}
+		VK_Play_Speech_Line(6, 1560, 0.5f);
+		VK_Play_Speech_Line(0, 7955, 0.5f);
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(6, 1570, 0.5f);
+		VK_Play_Speech_Line(6, 1580, 0.5f);
+		break;
+	case 7465:
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(40, -1, 11, 2);
+			VK_Play_Speech_Line(6, 1590, 0.5f);
+		} else {
+			VK_Eye_Animates(2);
+			VK_Play_Speech_Line(6, 1590, 0.5f);
+			VK_Subject_Reacts(20, 9, 2, -8);
+		}
+		break;
+	case 7470:
+		if (Game_Flag_Query(46)) {
+			VK_Play_Speech_Line(6, 1610, 0.5f);
+			VK_Subject_Reacts(20, 3, 9, -5);
+			VK_Play_Speech_Line(6, 1620, 0.5f);
+		} else {
+			VK_Subject_Reacts(30, 9, 0, -5);
+			VK_Play_Speech_Line(6, 1630, 0.5f);
+			VK_Play_Speech_Line(6, 1640, 0.5f);
+			VK_Play_Speech_Line(0, 7960, 0.5f);
+			VK_Play_Speech_Line(6, 1650, 0.5f);
 		}
-		VK_Play_Speech_Line(6, 1730, 0.5f);
-		VK_Play_Speech_Line(0, 7980, 0.5f);
 		break;
 	case 7475:
 		if (Game_Flag_Query(46)) {
@@ -677,738 +566,350 @@ void ScriptVK::sub_402604(int a1) {
 			VK_Play_Speech_Line(6, 1710, 0.5f);
 		}
 		break;
-	case 7470:
+	case 7480:
+		VK_Play_Speech_Line(6, 1720, 0.5f);
+		VK_Play_Speech_Line(0, 7975, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Play_Speech_Line(6, 1610, 0.5f);
-			VK_Subject_Reacts(20, 3, 9, -5);
-			VK_Play_Speech_Line(6, 1620, 0.5f);
+			VK_Subject_Reacts(20, 2, 10, 7);
 		} else {
-			VK_Subject_Reacts(30, 9, 0, -5);
-			VK_Play_Speech_Line(6, 1630, 0.5f);
-			VK_Play_Speech_Line(6, 1640, 0.5f);
-			VK_Play_Speech_Line(0, 7960, 0.5f);
-			VK_Play_Speech_Line(6, 1650, 0.5f);
+			VK_Subject_Reacts(50, 12, 3, 7);
 		}
+		VK_Play_Speech_Line(6, 1730, 0.5f);
+		VK_Play_Speech_Line(0, 7980, 0.5f);
 		break;
-	case 7465:
+	case 7485:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(40, -1, 11, 2);
-			VK_Play_Speech_Line(6, 1590, 0.5f);
+			VK_Subject_Reacts(20, -2, 10, 6);
 		} else {
+			VK_Subject_Reacts(30, 10, -2, 6);
 			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(6, 1590, 0.5f);
-			VK_Subject_Reacts(20, 9, 2, -8);
 		}
+		VK_Play_Speech_Line(6, 1740, 0.5f);
 		break;
-	case 7460:
+	case 7490:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(30, 1, 10, -5);
+			VK_Subject_Reacts(30, 3, 11, 9);
 		} else {
-			VK_Subject_Reacts(30, 9, 2, -5);
+			VK_Subject_Reacts(40, 11, 1, 8);
 		}
-		VK_Play_Speech_Line(6, 1560, 0.5f);
-		VK_Play_Speech_Line(0, 7955, 0.5f);
-		VK_Eye_Animates(3);
-		VK_Play_Speech_Line(6, 1570, 0.5f);
-		VK_Play_Speech_Line(6, 1580, 0.5f);
+		VK_Play_Speech_Line(6, 1750, 0.5f);
+		VK_Play_Speech_Line(0, 7985, 0.5f);
+		VK_Play_Speech_Line(0, 7990, 0.5f);
+		VK_Play_Speech_Line(6, 1760, 0.5f);
 		break;
-	case 7455:
-		VK_Play_Speech_Line(6, 1540, 0.5f);
-		VK_Play_Speech_Line(0, 7950, 0.5f);
+	case 7495:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(10, 1, 8, -5);
+			VK_Subject_Reacts(10, 2, 8, 5);
 		} else {
-			VK_Subject_Reacts(10, 9, -1, -2);
+			VK_Subject_Reacts(30, 10, -1, 5);
 		}
-		VK_Play_Speech_Line(6, 1550, 0.5f);
+		VK_Play_Speech_Line(6, 1770, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(6, 1780, 0.5f);
 		break;
-	case 7450:
+	case 7515:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(20, 3, 9, -6);
+			VK_Subject_Reacts(50, -1, 12, 5);
+			VK_Play_Speech_Line(6, 1790, 0.5f);
+			VK_Play_Speech_Line(0, 7995, 0.5f);
+			VK_Play_Speech_Line(6, 1800, 0.5f);
 		} else {
-			VK_Subject_Reacts(30, 9, 4, -6);
+			VK_Subject_Reacts(30, 10, 0, 3);
+			VK_Play_Speech_Line(6, 1810, 0.5f);
+		}
+		break;
+	case 7525:
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(20, -4, 9, 5);
+			VK_Eye_Animates(3);
+		} else {
+			VK_Subject_Reacts(40, 11, -3, 7);
 			VK_Eye_Animates(2);
 		}
-		VK_Play_Speech_Line(6, 1530, 0.5f);
+		VK_Play_Speech_Line(6, 1820, 0.5f);
 		break;
-	case 7445:
+	case 7535:
+		VK_Play_Speech_Line(6, 1830, 0.5f);
+		VK_Play_Speech_Line(0, 8000, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Play_Speech_Line(6, 1480, 0.5f);
-			VK_Play_Speech_Line(0, 7940, 0.5f);
-			VK_Subject_Reacts(50, 4, 11, 10);
-			VK_Play_Speech_Line(6, 1500, 0.5f);
+			VK_Subject_Reacts(10, 1, 8, 0);
 		} else {
-			VK_Subject_Reacts(30, 9, -1, -2);
-			VK_Play_Speech_Line(6, 1510, 0.5f);
-			VK_Play_Speech_Line(0, 7945, 0.5f);
-			VK_Play_Speech_Line(6, 1520, 0.5f);
+			VK_Subject_Reacts(20, 9, -1, 0);
 		}
+		VK_Play_Speech_Line(6, 1840, 0.5f);
+		VK_Play_Speech_Line(6, 1850, 0.5f);
+		VK_Play_Speech_Line(0, 8005, 0.5f);
 		break;
-	case 7440:
-		VK_Play_Speech_Line(6, 1460, 0.5f);
+	case 7540:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(40, 5, 10, 2);
 			VK_Eye_Animates(3);
+			VK_Play_Speech_Line(6, 1860, 0.5f);
+			VK_Play_Speech_Line(0, 8010, 0.5f);
+			VK_Subject_Reacts(50, -2, 12, 5);
+			VK_Play_Speech_Line(6, 1870, 0.5f);
 		} else {
-			VK_Subject_Reacts(20, 9, -3, 2);
+			VK_Subject_Reacts(60, 12, -2, 5);
+			VK_Play_Speech_Line(6, 1880, 0.5f);
 		}
-		VK_Play_Speech_Line(6, 1470, 0.5f);
 		break;
-	case 7435:
+	case 7550:
+		VK_Play_Speech_Line(6, 1890, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Play_Speech_Line(6, 1440, 0.5f);
-			VK_Subject_Reacts(30, 5, 10, 2);
+			VK_Subject_Reacts(20, 2, 9, -1);
 		} else {
-			VK_Subject_Reacts(30, 9, 3, 2);
-			VK_Play_Speech_Line(6, 1450, 0.5f);
+			VK_Subject_Reacts(10, 8, -1, -2);
 		}
+		VK_Play_Speech_Line(6, 1900, 0.5f);
+		VK_Play_Speech_Line(0, 8015, 0.5f);
 		break;
-	case 7430:
-		VK_Play_Speech_Line(6, 1420, 0.5f);
+	case 7565:
+		VK_Play_Speech_Line(6, 1910, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(20, -1, 9, -3);
+			VK_Subject_Reacts(30, -2, 10, 8);
 		} else {
-			VK_Subject_Reacts(30, 9, -1, -3);
+			VK_Subject_Reacts(20, 9, -3, 6);
 		}
-		VK_Play_Speech_Line(6, 1430, 0.5f);
-		VK_Play_Speech_Line(0, 7940, 0.5f);
+		VK_Play_Speech_Line(6, 1920, 0.5f);
+		VK_Play_Speech_Line(0, 8020, 0.5f);
 		VK_Eye_Animates(2);
 		break;
-	case 7425:
-		VK_Play_Speech_Line(6, 1400, 0.5f);
+	case 7580:
+		VK_Play_Speech_Line(6, 1930, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(20, -2, 9, -2);
+			VK_Subject_Reacts(20, 5, 10, -1);
 		} else {
-			VK_Subject_Reacts(20, 9, -2, -2);
+			VK_Subject_Reacts(30, 10, 3, 0);
 		}
-		VK_Play_Speech_Line(6, 1410, 0.5f);
-		break;
-	case 7420:
+		VK_Play_Speech_Line(0, 8025, 0.5f);
+		VK_Play_Speech_Line(6, 1940, 0.5f);
+		break;
+	case 7585:
+		VK_Play_Speech_Line(6, 1950, 0.5f);
+		VK_Play_Speech_Line(0, 8030, 0.5f);
+		VK_Play_Speech_Line(6, 1960, 0.5f);
+		VK_Play_Speech_Line(0, 8035, 0.5f);
 		VK_Eye_Animates(3);
-		VK_Play_Speech_Line(6, 1370, 0.5f);
-		VK_Play_Speech_Line(0, 8000, 0.5f);
+		VK_Play_Speech_Line(6, 1970, 0.5f);
+		VK_Play_Speech_Line(0, 7590, 0.5f);
+		VK_Play_Speech_Line(6, 1980, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(50, 1, 11, -8);
+			VK_Subject_Reacts(40, 1, 11, 5);
 		} else {
-			VK_Subject_Reacts(60, 11, -2, -8);
+			VK_Subject_Reacts(50, 12, -3, 5);
 		}
-		VK_Play_Speech_Line(6, 1390, 0.5f);
+		VK_Play_Speech_Line(6, 1990, 0.5f);
+		VK_Play_Speech_Line(0, 8040, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(6, 2000, 0.5f);
 		break;
-	case 7415:
+	case 7595:
 		if (Game_Flag_Query(46)) {
-			VK_Play_Speech_Line(6, 1340, 0.5f);
-			VK_Subject_Reacts(50, 1, 11, -5);
-			VK_Play_Speech_Line(0, 7935, 0.5f);
-			VK_Play_Speech_Line(6, 1350, 0.5f);
+			VK_Play_Speech_Line(6, 2010, 0.5f);
+			VK_Subject_Reacts(30, -2, 10, 5);
+			VK_Play_Speech_Line(6, 2020, 0.5f);
+			VK_Play_Speech_Line(0, 8045, 0.5f);
+			VK_Play_Speech_Line(6, 2030, 0.5f);
 		} else {
-			VK_Play_Speech_Line(6, 1360, 0.5f);
-			VK_Subject_Reacts(20, 9, -2, -5);
+			VK_Subject_Reacts(60, 12, -3, 7);
+			VK_Play_Speech_Line(6, 2040, 0.5f);
 		}
 		break;
-	case 7410:
+	case 7600:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(40, 1, 10, -5);
-			VK_Eye_Animates(2);
+			VK_Subject_Reacts(75, 4, 13, 15);
 		} else {
-			VK_Subject_Reacts(40, 10, -2, -5);
+			VK_Subject_Reacts(60, 12, -2, 10);
 		}
-		VK_Play_Speech_Line(6, 1330, 0.5f);
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(6, 2050, 0.5f);
+		VK_Play_Speech_Line(0, 8050, 0.5f);
+		VK_Subject_Reacts(90, 0, 0, 0);
+		VK_Play_Speech_Line(6, 2060, 0.5f);
 		break;
-	case 7405:
-		VK_Play_Speech_Line(6, 1310, 0.5f);
+	case 7605:
+		VK_Play_Speech_Line(6, 2070, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(50, 1, 11, 5);
+			VK_Subject_Reacts(30, 0, 11, 12);
 		} else {
-			VK_Subject_Reacts(60, 11, 1, 5);
+			VK_Subject_Reacts(50, 10, -3, 15);
 		}
-		VK_Play_Speech_Line(6, 1320, 0.5f);
+		VK_Play_Speech_Line(6, 2080, 0.5f);
 		break;
-	case 7400:
+	case 7620:
 		if (Game_Flag_Query(46)) {
-			VK_Subject_Reacts(20, 0, 8, -5);
+			VK_Subject_Reacts(60, -2, 14, 12);
 		} else {
-			VK_Subject_Reacts(30, 9, 0, -10);
+			VK_Subject_Reacts(70, 9, -1, 10);
 		}
-		VK_Play_Speech_Line(6, 1300, 0.5f);
-		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(6, 2090, 0.5f);
+		VK_Play_Speech_Line(0, 8055, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(6, 2100, 0.5f);
 		break;
-	case 7395:
+	case 7635:
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(6, 2110, 0.5f);
+		VK_Play_Speech_Line(0, 7655, 0.5f);
+		VK_Play_Speech_Line(0, 7660, 0.5f);
+		VK_Play_Speech_Line(0, 7665, 0.5f);
 		if (Game_Flag_Query(46)) {
-			VK_Play_Speech_Line(6, 1280, 0.5f);
-			VK_Subject_Reacts(40, 0, 0, 0);
+			VK_Subject_Reacts(80, 5, 14, 25);
 		} else {
-			VK_Subject_Reacts(40, 0, 0, 0);
-			VK_Play_Speech_Line(6, 1280, 0.5f);
+			VK_Subject_Reacts(70, 9, -2, 20);
 		}
+		VK_Play_Speech_Line(6, 2120, 0.5f);
 		break;
-	case 7390:
+	case 7670:
 		if (Game_Flag_Query(46)) {
-			VK_Play_Speech_Line(6, 1250, 0.5f);
-			VK_Subject_Reacts(40, 0, 2, 5);
-			VK_Play_Speech_Line(6, 1260, 0.5f);
-			VK_Eye_Animates(3);
+			VK_Play_Speech_Line(6, 2130, 0.5f);
+			VK_Subject_Reacts(30, -3, 11, 8);
+			VK_Play_Speech_Line(6, 2140, 0.5f);
 		} else {
-			VK_Play_Speech_Line(6, 1270, 0.5f);
-			VK_Subject_Reacts(40, 3, 0, 2);
+			VK_Subject_Reacts(20, 10, 0, 5);
+			VK_Play_Speech_Line(6, 2150, 0.5f);
+			VK_Play_Speech_Line(6, 2160, 0.5f);
 		}
 		break;
-	case 7385:
-		VK_Subject_Reacts(40, 0, 0, 0);
+	case 7680:
 		VK_Eye_Animates(2);
-		VK_Play_Speech_Line(6, 1240, 0.5f);
+		VK_Play_Speech_Line(6, 2170, 0.5f);
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(65, 1, 6, 5);
+		} else {
+			VK_Subject_Reacts(50, 10, 3, 4);
+		}
+		VK_Play_Speech_Line(6, 2180, 0.5f);
 		break;
-	case 7386:
-	case 7387:
-	case 7388:
-	case 7389:
-	case 7391:
-	case 7392:
-	case 7393:
-	case 7394:
-	case 7396:
-	case 7397:
-	case 7398:
-	case 7399:
-	case 7401:
-	case 7402:
-	case 7403:
-	case 7404:
-	case 7406:
-	case 7407:
-	case 7408:
-	case 7409:
-	case 7411:
-	case 7412:
-	case 7413:
-	case 7414:
-	case 7416:
-	case 7417:
-	case 7418:
-	case 7419:
-	case 7421:
-	case 7422:
-	case 7423:
-	case 7424:
-	case 7426:
-	case 7427:
-	case 7428:
-	case 7429:
-	case 7431:
-	case 7432:
-	case 7433:
-	case 7434:
-	case 7436:
-	case 7437:
-	case 7438:
-	case 7439:
-	case 7441:
-	case 7442:
-	case 7443:
-	case 7444:
-	case 7446:
-	case 7447:
-	case 7448:
-	case 7449:
-	case 7451:
-	case 7452:
-	case 7453:
-	case 7454:
-	case 7456:
-	case 7457:
-	case 7458:
-	case 7459:
-	case 7461:
-	case 7462:
-	case 7463:
-	case 7464:
-	case 7466:
-	case 7467:
-	case 7468:
-	case 7469:
-	case 7471:
-	case 7472:
-	case 7473:
-	case 7474:
-	case 7476:
-	case 7477:
-	case 7478:
-	case 7479:
-	case 7481:
-	case 7482:
-	case 7483:
-	case 7484:
-	case 7486:
-	case 7487:
-	case 7488:
-	case 7489:
-	case 7491:
-	case 7492:
-	case 7493:
-	case 7494:
-		return;
-	default:
-		switch (a1) {
-		case 7635:
+	case 7690:
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(40, 0, 12, 0);
+		} else {
+			VK_Subject_Reacts(50, 13, 0, 0);
+		}
+		VK_Play_Speech_Line(6, 2190, 0.5f);
+		VK_Play_Speech_Line(0, 8060, 0.5f);
+		VK_Play_Speech_Line(6, 2200, 0.5f);
+		VK_Subject_Reacts(30, -4, -4, -5);
+		VK_Play_Speech_Line(6, 2210, 0.5f);
+		break;
+	case 7705:
+		if (Game_Flag_Query(46)) {
 			VK_Eye_Animates(3);
-			VK_Play_Speech_Line(6, 2110, 0.5f);
-			VK_Play_Speech_Line(0, 7655, 0.5f);
-			VK_Play_Speech_Line(0, 7660, 0.5f);
-			VK_Play_Speech_Line(0, 7665, 0.5f);
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(80, 5, 14, 25);
-			} else {
-				VK_Subject_Reacts(70, 9, -2, 20);
-			}
-			VK_Play_Speech_Line(6, 2120, 0.5f);
-			break;
-		case 7620:
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(60, -2, 14, 12);
-			} else {
-				VK_Subject_Reacts(70, 9, -1, 10);
-			}
-			VK_Play_Speech_Line(6, 2090, 0.5f);
-			VK_Play_Speech_Line(0, 8055, 0.5f);
+			VK_Subject_Reacts(30, 0, 0, 0);
+			VK_Play_Speech_Line(6, 2220, 0.5f);
+			VK_Play_Speech_Line(0, 7730, 0.5f);
+			VK_Play_Speech_Line(0, 7735, 0.5f);
+			VK_Subject_Reacts(50, 2, 10, 12);
+			VK_Play_Speech_Line(6, 2230, 0.5f);
+			VK_Play_Speech_Line(0, 8065, 0.5f);
 			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(6, 2100, 0.5f);
-			break;
-		case 7605:
-			VK_Play_Speech_Line(6, 2070, 0.5f);
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(30, 0, 11, 12);
-			} else {
-				VK_Subject_Reacts(50, 10, -3, 15);
-			}
-			VK_Play_Speech_Line(6, 2080, 0.5f);
-			break;
-		case 7600:
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(75, 4, 13, 15);
-			} else {
-				VK_Subject_Reacts(60, 12, -2, 10);
-			}
-			VK_Eye_Animates(3);
-			VK_Play_Speech_Line(6, 2050, 0.5f);
-			VK_Play_Speech_Line(0, 8050, 0.5f);
-			VK_Subject_Reacts(90, 0, 0, 0);
-			VK_Play_Speech_Line(6, 2060, 0.5f);
-			break;
-		case 7595:
-			if (Game_Flag_Query(46)) {
-				VK_Play_Speech_Line(6, 2010, 0.5f);
-				VK_Subject_Reacts(30, -2, 10, 5);
-				VK_Play_Speech_Line(6, 2020, 0.5f);
-				VK_Play_Speech_Line(0, 8045, 0.5f);
-				VK_Play_Speech_Line(6, 2030, 0.5f);
-			} else {
-				VK_Subject_Reacts(60, 12, -3, 7);
-				VK_Play_Speech_Line(6, 2040, 0.5f);
-			}
-			break;
-		case 7585:
-			VK_Play_Speech_Line(6, 1950, 0.5f);
-			VK_Play_Speech_Line(0, 8030, 0.5f);
-			VK_Play_Speech_Line(6, 1960, 0.5f);
-			VK_Play_Speech_Line(0, 8035, 0.5f);
-			VK_Eye_Animates(3);
-			VK_Play_Speech_Line(6, 1970, 0.5f);
-			VK_Play_Speech_Line(0, 7590, 0.5f);
-			VK_Play_Speech_Line(6, 1980, 0.5f);
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(40, 1, 11, 5);
-			} else {
-				VK_Subject_Reacts(50, 12, -3, 5);
-			}
-			VK_Play_Speech_Line(6, 1990, 0.5f);
-			VK_Play_Speech_Line(0, 8040, 0.5f);
+			VK_Play_Speech_Line(6, 2240, 0.5f);
+			VK_Play_Speech_Line(0, 8070, 0.5f);
+			VK_Play_Speech_Line(0, 8075, 0.5f);
+		} else {
 			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(6, 2000, 0.5f);
-			break;
-		case 7580:
-			VK_Play_Speech_Line(6, 1930, 0.5f);
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(20, 5, 10, -1);
-			} else {
-				VK_Subject_Reacts(30, 10, 3, 0);
-			}
-			VK_Play_Speech_Line(0, 8025, 0.5f);
-			VK_Play_Speech_Line(6, 1940, 0.5f);
-			break;
-		case 7565:
-			VK_Play_Speech_Line(6, 1910, 0.5f);
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(30, -2, 10, 8);
-			} else {
-				VK_Subject_Reacts(20, 9, -3, 6);
-			}
-			VK_Play_Speech_Line(6, 1920, 0.5f);
-			VK_Play_Speech_Line(0, 8020, 0.5f);
+			VK_Subject_Reacts(50, 0, 0, 0);
+			VK_Play_Speech_Line(6, 2250, 0.5f);
+			VK_Play_Speech_Line(0, 7730, 0.5f);
+			VK_Play_Speech_Line(0, 7735, 0.5f);
+			VK_Eye_Animates(3);
+			VK_Subject_Reacts(60, 12, 2, 12);
+			VK_Play_Speech_Line(6, 2230, 0.5f);
+			VK_Play_Speech_Line(6, 2270, 0.5f);
+			VK_Play_Speech_Line(0, 8080, 0.5f);
+			VK_Play_Speech_Line(6, 2280, 0.5f);
+		}
+		break;
+	case 7740:
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(40, -3, -1, 3);
+		} else {
+			VK_Subject_Reacts(50, -1, -3, 3);
+		}
+		VK_Play_Speech_Line(6, 2290, 0.5f);
+		VK_Play_Speech_Line(0, 8085, 0.5f);
+		VK_Play_Speech_Line(6, 2300, 0.5f);
+		VK_Play_Speech_Line(0, 8090, 0.5f);
+		VK_Subject_Reacts(20, 2, 2, 0);
+		VK_Play_Speech_Line(6, 2310, 0.5f);
+		VK_Play_Speech_Line(6, 2320, 0.5f);
+		break;
+	case 7750:
+		VK_Eye_Animates(3);
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(60, 4, 10, 15);
+		} else {
+			VK_Subject_Reacts(80, 12, -3, 18);
+		}
+		VK_Play_Speech_Line(6, 2330, 0.5f);
+		VK_Play_Speech_Line(0, 8095, 0.5f);
+		VK_Play_Speech_Line(6, 2340, 0.5f);
+		break;
+	case 7770:
+		VK_Play_Speech_Line(6, 2350, 0.5f);
+		if (Game_Flag_Query(46)) {
+			VK_Subject_Reacts(90, -3, -1, 12);
+		} else {
 			VK_Eye_Animates(2);
-			break;
-		case 7550:
-			VK_Play_Speech_Line(6, 1890, 0.5f);
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(20, 2, 9, -1);
-			} else {
-				VK_Subject_Reacts(10, 8, -1, -2);
-			}
-			VK_Play_Speech_Line(6, 1900, 0.5f);
-			VK_Play_Speech_Line(0, 8015, 0.5f);
-			break;
-		case 7540:
-			if (Game_Flag_Query(46)) {
-				VK_Eye_Animates(3);
-				VK_Play_Speech_Line(6, 1860, 0.5f);
-				VK_Play_Speech_Line(0, 8010, 0.5f);
-				VK_Subject_Reacts(50, -2, 12, 5);
-				VK_Play_Speech_Line(6, 1870, 0.5f);
-			} else {
-				VK_Subject_Reacts(60, 12, -2, 5);
-				VK_Play_Speech_Line(6, 1880, 0.5f);
-			}
-			break;
-		case 7535:
-			VK_Play_Speech_Line(6, 1830, 0.5f);
-			VK_Play_Speech_Line(0, 8000, 0.5f);
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(10, 1, 8, 0);
-			} else {
-				VK_Subject_Reacts(20, 9, -1, 0);
-			}
-			VK_Play_Speech_Line(6, 1840, 0.5f);
-			VK_Play_Speech_Line(6, 1850, 0.5f);
-			VK_Play_Speech_Line(0, 8005, 0.5f);
-			break;
-		case 7525:
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(20, -4, 9, 5);
-				VK_Eye_Animates(3);
-			} else {
-				VK_Subject_Reacts(40, 11, -3, 7);
-				VK_Eye_Animates(2);
-			}
-			VK_Play_Speech_Line(6, 1820, 0.5f);
-			break;
-		case 7515:
-			if (Game_Flag_Query(46)) {
-				VK_Subject_Reacts(50, -1, 12, 5);
-				VK_Play_Speech_Line(6, 1790, 0.5f);
-				VK_Play_Speech_Line(0, 7995, 0.5f);
-				VK_Play_Speech_Line(6, 1800, 0.5f);
-			} else {
-				VK_Subject_Reacts(30, 10, 0, 3);
-				VK_Play_Speech_Line(6, 1810, 0.5f);
-			}
-			break;
-		case 7516:
-		case 7517:
-		case 7518:
-		case 7519:
-		case 7520:
-		case 7521:
-		case 7522:
-		case 7523:
-		case 7524:
-		case 7526:
-		case 7527:
-		case 7528:
-		case 7529:
-		case 7530:
-		case 7531:
-		case 7532:
-		case 7533:
-		case 7534:
-		case 7536:
-		case 7537:
-		case 7538:
-		case 7539:
-		case 7541:
-		case 7542:
-		case 7543:
-		case 7544:
-		case 7545:
-		case 7546:
-		case 7547:
-		case 7548:
-		case 7549:
-		case 7551:
-		case 7552:
-		case 7553:
-		case 7554:
-		case 7555:
-		case 7556:
-		case 7557:
-		case 7558:
-		case 7559:
-		case 7560:
-		case 7561:
-		case 7562:
-		case 7563:
-		case 7564:
-		case 7566:
-		case 7567:
-		case 7568:
-		case 7569:
-		case 7570:
-		case 7571:
-		case 7572:
-		case 7573:
-		case 7574:
-		case 7575:
-		case 7576:
-		case 7577:
-		case 7578:
-		case 7579:
-		case 7581:
-		case 7582:
-		case 7583:
-		case 7584:
-		case 7586:
-		case 7587:
-		case 7588:
-		case 7589:
-		case 7590:
-		case 7591:
-		case 7592:
-		case 7593:
-		case 7594:
-		case 7596:
-		case 7597:
-		case 7598:
-		case 7599:
-		case 7601:
-		case 7602:
-		case 7603:
-		case 7604:
-		case 7606:
-		case 7607:
-		case 7608:
-		case 7609:
-		case 7610:
-		case 7611:
-		case 7612:
-		case 7613:
-		case 7614:
-		case 7615:
-		case 7616:
-		case 7617:
-		case 7618:
-		case 7619:
-		case 7621:
-		case 7622:
-		case 7623:
-		case 7624:
-		case 7625:
-		case 7626:
-		case 7627:
-		case 7628:
-		case 7629:
-		case 7630:
-		case 7631:
-		case 7632:
-		case 7633:
-		case 7634:
-			return;
-		default:
-			switch (a1) {
-			case 7705:
-				if (Game_Flag_Query(46)) {
-					VK_Eye_Animates(3);
-					VK_Subject_Reacts(30, 0, 0, 0);
-					VK_Play_Speech_Line(6, 2220, 0.5f);
-					VK_Play_Speech_Line(0, 7730, 0.5f);
-					VK_Play_Speech_Line(0, 7735, 0.5f);
-					VK_Subject_Reacts(50, 2, 10, 12);
-					VK_Play_Speech_Line(6, 2230, 0.5f);
-					VK_Play_Speech_Line(0, 8065, 0.5f);
-					VK_Eye_Animates(2);
-					VK_Play_Speech_Line(6, 2240, 0.5f);
-					VK_Play_Speech_Line(0, 8070, 0.5f);
-					VK_Play_Speech_Line(0, 8075, 0.5f);
-				} else {
-					VK_Eye_Animates(2);
-					VK_Subject_Reacts(50, 0, 0, 0);
-					VK_Play_Speech_Line(6, 2250, 0.5f);
-					VK_Play_Speech_Line(0, 7730, 0.5f);
-					VK_Play_Speech_Line(0, 7735, 0.5f);
-					VK_Eye_Animates(3);
-					VK_Subject_Reacts(60, 12, 2, 12);
-					VK_Play_Speech_Line(6, 2230, 0.5f);
-					VK_Play_Speech_Line(6, 2270, 0.5f);
-					VK_Play_Speech_Line(0, 8080, 0.5f);
-					VK_Play_Speech_Line(6, 2280, 0.5f);
-				}
-				break;
-			case 7690:
-				if (Game_Flag_Query(46)) {
-					VK_Subject_Reacts(40, 0, 12, 0);
-				} else {
-					VK_Subject_Reacts(50, 13, 0, 0);
-				}
-				VK_Play_Speech_Line(6, 2190, 0.5f);
-				VK_Play_Speech_Line(0, 8060, 0.5f);
-				VK_Play_Speech_Line(6, 2200, 0.5f);
-				VK_Subject_Reacts(30, -4, -4, -5);
-				VK_Play_Speech_Line(6, 2210, 0.5f);
-				break;
-			case 7680:
-				VK_Eye_Animates(2);
-				VK_Play_Speech_Line(6, 2170, 0.5f);
-				if (Game_Flag_Query(46)) {
-					VK_Subject_Reacts(65, 1, 6, 5);
-				} else {
-					VK_Subject_Reacts(50, 10, 3, 4);
-				}
-				VK_Play_Speech_Line(6, 2180, 0.5f);
-				break;
-			case 7670:
-				if (Game_Flag_Query(46)) {
-					VK_Play_Speech_Line(6, 2130, 0.5f);
-					VK_Subject_Reacts(30, -3, 11, 8);
-					VK_Play_Speech_Line(6, 2140, 0.5f);
-				} else {
-					VK_Subject_Reacts(20, 10, 0, 5);
-					VK_Play_Speech_Line(6, 2150, 0.5f);
-					VK_Play_Speech_Line(6, 2160, 0.5f);
-				}
-				break;
-			case 7671:
-			case 7672:
-			case 7673:
-			case 7674:
-			case 7675:
-			case 7676:
-			case 7677:
-			case 7678:
-			case 7679:
-			case 7681:
-			case 7682:
-			case 7683:
-			case 7684:
-			case 7685:
-			case 7686:
-			case 7687:
-			case 7688:
-			case 7689:
-			case 7691:
-			case 7692:
-			case 7693:
-			case 7694:
-			case 7695:
-			case 7696:
-			case 7697:
-			case 7698:
-			case 7699:
-			case 7700:
-			case 7701:
-			case 7702:
-			case 7703:
-			case 7704:
-				return;
-			default:
-				if ((unsigned int)(a1 - 7740) > 10) {
-					if (a1 == 7770) {
-						VK_Play_Speech_Line(6, 2350, 0.5f);
-						if (Game_Flag_Query(46)) {
-							VK_Subject_Reacts(90, -3, -1, 12);
-						} else {
-							VK_Eye_Animates(2);
-							VK_Subject_Reacts(90, 13, -4, 12);
-						}
-						VK_Play_Speech_Line(6, 2360, 0.5f);
-					}
-				} else if (a1 == 7740) {
-					if (Game_Flag_Query(46)) {
-						VK_Subject_Reacts(40, -3, -1, 3);
-					} else {
-						VK_Subject_Reacts(50, -1, -3, 3);
-					}
-					VK_Play_Speech_Line(6, 2290, 0.5f);
-					VK_Play_Speech_Line(0, 8085, 0.5f);
-					VK_Play_Speech_Line(6, 2300, 0.5f);
-					VK_Play_Speech_Line(0, 8090, 0.5f);
-					VK_Subject_Reacts(20, 2, 2, 0);
-					VK_Play_Speech_Line(6, 2310, 0.5f);
-					VK_Play_Speech_Line(6, 2320, 0.5f);
-				} else if (a1 == 7750) {
-					VK_Eye_Animates(3);
-					if (Game_Flag_Query(46)) {
-						VK_Subject_Reacts(60, 4, 10, 15);
-					} else {
-						VK_Subject_Reacts(80, 12, -3, 18);
-					}
-					VK_Play_Speech_Line(6, 2330, 0.5f);
-					VK_Play_Speech_Line(0, 8095, 0.5f);
-					VK_Play_Speech_Line(6, 2340, 0.5f);
-				}
-				break;
-			}
-			break;
+			VK_Subject_Reacts(90, 13, -4, 12);
 		}
+		VK_Play_Speech_Line(6, 2360, 0.5f);
 		break;
 	}
 }
 
 void ScriptVK::sub_404B44(int a1) {
 	switch (a1) {
-	case 7495:
-		VK_Play_Speech_Line(11, 780, 0.5f);
-		VK_Subject_Reacts(30, 9, 6, 5);
-		VK_Play_Speech_Line(11, 790, 0.5f);
-		break;
-	case 7490:
-		VK_Eye_Animates(3);
-		VK_Subject_Reacts(30, 7, -4, 12);
-		VK_Play_Speech_Line(11, 770, 0.5f);
-		break;
-	case 7485:
-		VK_Subject_Reacts(15, 8, 8, 5);
-		VK_Play_Speech_Line(11, 760, 0.5f);
-		break;
-	case 7480:
-		VK_Subject_Reacts(20, 9, 4, 8);
-		VK_Play_Speech_Line(11, 740, 0.5f);
-		VK_Play_Speech_Line(11, 750, 0.5f);
-		break;
-	case 7475:
-		VK_Subject_Reacts(15, 8, 2, 5);
-		VK_Play_Speech_Line(11, 730, 0.5f);
+	case 7385:
+		VK_Subject_Reacts(20, 0, 0, 5);
+		VK_Play_Speech_Line(11, 440, 0.5f);
+		VK_Play_Speech_Line(0, 8100, 0.5f);
+		VK_Play_Speech_Line(11, 450, 0.5f);
+		VK_Play_Speech_Line(0, 8105, 0.5f);
 		break;
-	case 7470:
-		VK_Subject_Reacts(30, 4, 8, -2);
-		VK_Play_Speech_Line(11, 720, 0.5f);
+	case 7390:
+		VK_Subject_Reacts(20, 0, 0, 3);
+		VK_Play_Speech_Line(11, 460, 0.5f);
 		break;
-	case 7465:
-		VK_Subject_Reacts(5, 7, -4, -7);
-		VK_Play_Speech_Line(11, 710, 0.5f);
+	case 7395:
+		VK_Subject_Reacts(20, 0, 0, 7);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(11, 470, 0.5f);
+		VK_Play_Speech_Line(11, 480, 0.5f);
+		VK_Play_Speech_Line(0, 8105, 0.5f);
 		break;
-	case 7460:
-		VK_Subject_Reacts(15, 4, 8, 0);
-		VK_Play_Speech_Line(11, 700, 0.5f);
+	case 7400:
+		VK_Subject_Reacts(10, 8, 0, -5);
+		VK_Play_Speech_Line(11, 490, 0.5f);
+		VK_Play_Speech_Line(11, 500, 0.5f);
 		break;
-	case 7455:
-		VK_Play_Speech_Line(11, 680, 0.5f);
-		VK_Subject_Reacts(20, 7, -3, -5);
-		VK_Play_Speech_Line(11, 690, 0.5f);
+	case 7405:
+		VK_Play_Speech_Line(11, 510, 0.5f);
+		VK_Subject_Reacts(30, 10, 7, 0);
+		VK_Play_Speech_Line(11, 520, 0.5f);
+		VK_Play_Speech_Line(0, 8115, 0.5f);
 		break;
-	case 7450:
-		VK_Play_Speech_Line(11, 660, 0.5f);
-		VK_Subject_Reacts(35, 4, 8, 3);
-		VK_Play_Speech_Line(0, 8145, 0.5f);
-		VK_Play_Speech_Line(11, 670, 0.5f);
+	case 7410:
+		VK_Subject_Reacts(20, 12, -3, -3);
+		VK_Play_Speech_Line(11, 530, 0.5f);
+		VK_Play_Speech_Line(11, 540, 0.5f);
 		break;
-	case 7445:
-		VK_Subject_Reacts(30, 8, 3, 5);
-		VK_Play_Speech_Line(11, 650, 0.5f);
+	case 7415:
+		VK_Play_Speech_Line(11, 550, 0.5f);
+		VK_Subject_Reacts(25, 7, 8, 8);
+		VK_Play_Speech_Line(11, 560, 0.5f);
+		VK_Play_Speech_Line(0, 8120, 0.5f);
+		VK_Play_Speech_Line(0, 8125, 0.5f);
+		VK_Subject_Reacts(75, 8, 0, 0);
+		VK_Play_Speech_Line(11, 570, 0.5f);
 		break;
-	case 7440:
-		VK_Subject_Reacts(25, 4, 7, -3);
-		VK_Play_Speech_Line(11, 640, 0.5f);
+	case 7420:
+		VK_Subject_Reacts(10, 6, 8, -5);
+		VK_Play_Speech_Line(11, 580, 0.5f);
 		break;
-	case 7435:
-		VK_Play_Speech_Line(11, 620, 0.5f);
-		VK_Subject_Reacts(15, 8, -3, -5);
-		VK_Play_Speech_Line(11, 630, 0.5f);
+	case 7425:
+		VK_Subject_Reacts(30, 8, -2, 5);
+		VK_Play_Speech_Line(11, 590, 0.5f);
 		break;
 	case 7430:
 		VK_Eye_Animates(2);
@@ -1420,506 +921,295 @@ void ScriptVK::sub_404B44(int a1) {
 		VK_Play_Speech_Line(0, 8135, 0.5f);
 		VK_Play_Speech_Line(0, 8140, 0.5f);
 		break;
-	case 7425:
-		VK_Subject_Reacts(30, 8, -2, 5);
-		VK_Play_Speech_Line(11, 590, 0.5f);
+	case 7435:
+		VK_Play_Speech_Line(11, 620, 0.5f);
+		VK_Subject_Reacts(15, 8, -3, -5);
+		VK_Play_Speech_Line(11, 630, 0.5f);
 		break;
-	case 7420:
-		VK_Subject_Reacts(10, 6, 8, -5);
-		VK_Play_Speech_Line(11, 580, 0.5f);
+	case 7440:
+		VK_Subject_Reacts(25, 4, 7, -3);
+		VK_Play_Speech_Line(11, 640, 0.5f);
 		break;
-	case 7415:
-		VK_Play_Speech_Line(11, 550, 0.5f);
-		VK_Subject_Reacts(25, 7, 8, 8);
-		VK_Play_Speech_Line(11, 560, 0.5f);
-		VK_Play_Speech_Line(0, 8120, 0.5f);
-		VK_Play_Speech_Line(0, 8125, 0.5f);
-		VK_Subject_Reacts(75, 8, 0, 0);
-		VK_Play_Speech_Line(11, 570, 0.5f);
+	case 7445:
+		VK_Subject_Reacts(30, 8, 3, 5);
+		VK_Play_Speech_Line(11, 650, 0.5f);
 		break;
-	case 7410:
-		VK_Subject_Reacts(20, 12, -3, -3);
-		VK_Play_Speech_Line(11, 530, 0.5f);
-		VK_Play_Speech_Line(11, 540, 0.5f);
+	case 7450:
+		VK_Play_Speech_Line(11, 660, 0.5f);
+		VK_Subject_Reacts(35, 4, 8, 3);
+		VK_Play_Speech_Line(0, 8145, 0.5f);
+		VK_Play_Speech_Line(11, 670, 0.5f);
 		break;
-	case 7405:
-		VK_Play_Speech_Line(11, 510, 0.5f);
-		VK_Subject_Reacts(30, 10, 7, 0);
-		VK_Play_Speech_Line(11, 520, 0.5f);
-		VK_Play_Speech_Line(0, 8115, 0.5f);
+	case 7455:
+		VK_Play_Speech_Line(11, 680, 0.5f);
+		VK_Subject_Reacts(20, 7, -3, -5);
+		VK_Play_Speech_Line(11, 690, 0.5f);
 		break;
-	case 7400:
-		VK_Subject_Reacts(10, 8, 0, -5);
-		VK_Play_Speech_Line(11, 490, 0.5f);
-		VK_Play_Speech_Line(11, 500, 0.5f);
+	case 7460:
+		VK_Subject_Reacts(15, 4, 8, 0);
+		VK_Play_Speech_Line(11, 700, 0.5f);
 		break;
-	case 7395:
-		VK_Subject_Reacts(20, 0, 0, 7);
+	case 7465:
+		VK_Subject_Reacts(5, 7, -4, -7);
+		VK_Play_Speech_Line(11, 710, 0.5f);
+		break;
+	case 7470:
+		VK_Subject_Reacts(30, 4, 8, -2);
+		VK_Play_Speech_Line(11, 720, 0.5f);
+		break;
+	case 7475:
+		VK_Subject_Reacts(15, 8, 2, 5);
+		VK_Play_Speech_Line(11, 730, 0.5f);
+		break;
+	case 7480:
+		VK_Subject_Reacts(20, 9, 4, 8);
+		VK_Play_Speech_Line(11, 740, 0.5f);
+		VK_Play_Speech_Line(11, 750, 0.5f);
+		break;
+	case 7485:
+		VK_Subject_Reacts(15, 8, 8, 5);
+		VK_Play_Speech_Line(11, 760, 0.5f);
+		break;
+	case 7490:
+		VK_Eye_Animates(3);
+		VK_Subject_Reacts(30, 7, -4, 12);
+		VK_Play_Speech_Line(11, 770, 0.5f);
+		break;
+	case 7495:
+		VK_Play_Speech_Line(11, 780, 0.5f);
+		VK_Subject_Reacts(30, 9, 6, 5);
+		VK_Play_Speech_Line(11, 790, 0.5f);
+		break;
+	case 7515:
 		VK_Eye_Animates(2);
-		VK_Play_Speech_Line(11, 470, 0.5f);
-		VK_Play_Speech_Line(11, 480, 0.5f);
-		VK_Play_Speech_Line(0, 8105, 0.5f);
+		VK_Play_Speech_Line(11, 800, 0.5f);
+		VK_Play_Speech_Line(0, 8150, 0.5f);
+		VK_Play_Speech_Line(0, 8155, 0.5f);
+		VK_Subject_Reacts(30, 9, -5, 12);
+		VK_Play_Speech_Line(11, 810, 0.5f);
+		VK_Play_Speech_Line(0, 8160, 0.5f);
+		break;
+	case 7525:
+		VK_Subject_Reacts(30, 8, 5, 8);
+		VK_Play_Speech_Line(11, 820, 0.5f);
+		break;
+	case 7535:
+		VK_Subject_Reacts(20, 9, 2, 4);
+		VK_Play_Speech_Line(11, 830, 0.5f);
+		break;
+	case 7540:
+		VK_Play_Speech_Line(11, 840, 0.5f);
+		VK_Subject_Reacts(20, 5, 1, 8);
+		break;
+	case 7550:
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(11, 850, 0.5f);
+		VK_Play_Speech_Line(0, 8165, 0.5f);
+		VK_Subject_Reacts(60, 6, 2, 15);
+		VK_Play_Speech_Line(11, 860, 0.5f);
+		VK_Play_Speech_Line(0, 8170, 0.5f);
+		VK_Eye_Animates(3);
 		break;
-	case 7390:
-		VK_Subject_Reacts(20, 0, 0, 3);
-		VK_Play_Speech_Line(11, 460, 0.5f);
+	case 7565:
+		VK_Subject_Reacts(40, 8, 8, 12);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(11, 870, 0.5f);
+		VK_Play_Speech_Line(0, 8175, 0.5f);
+		VK_Play_Speech_Line(11, 880, 0.5f);
+		VK_Play_Speech_Line(11, 890, 0.5f);
+		break;
+	case 7580:
+		VK_Play_Speech_Line(11, 900, 0.5f);
+		VK_Play_Speech_Line(0, 8180, 0.5f);
+		VK_Subject_Reacts(20, 8, 3, 6);
+		VK_Play_Speech_Line(11, 910, 0.5f);
+		break;
+	case 7585:
+		VK_Subject_Reacts(50, 9, 3, 8);
+		VK_Play_Speech_Line(11, 1250, 0.5f);
+		break;
+	case 7595:
+		VK_Subject_Reacts(25, 8, -3, 5);
+		VK_Play_Speech_Line(11, 920, 0.5f);
+		VK_Play_Speech_Line(0, 8185, 0.5f);
+		VK_Play_Speech_Line(11, 930, 0.5f);
+		break;
+	case 7600:
+		VK_Subject_Reacts(20, 5, 9, 2);
+		VK_Play_Speech_Line(11, 940, 0.5f);
+		break;
+	case 7605:
+		VK_Eye_Animates(3);
+		VK_Subject_Reacts(40, 10, -3, 15);
+		VK_Play_Speech_Line(11, 950, 0.5f);
 		break;
-	case 7385:
-		VK_Subject_Reacts(20, 0, 0, 5);
-		VK_Play_Speech_Line(11, 440, 0.5f);
-		VK_Play_Speech_Line(0, 8100, 0.5f);
-		VK_Play_Speech_Line(11, 450, 0.5f);
-		VK_Play_Speech_Line(0, 8105, 0.5f);
+	case 7620:
+		VK_Subject_Reacts(30, 9, 10, 10);
+		VK_Play_Speech_Line(11, 960, 0.5f);
 		break;
-	case 7386:
-	case 7387:
-	case 7388:
-	case 7389:
-	case 7391:
-	case 7392:
-	case 7393:
-	case 7394:
-	case 7396:
-	case 7397:
-	case 7398:
-	case 7399:
-	case 7401:
-	case 7402:
-	case 7403:
-	case 7404:
-	case 7406:
-	case 7407:
-	case 7408:
-	case 7409:
-	case 7411:
-	case 7412:
-	case 7413:
-	case 7414:
-	case 7416:
-	case 7417:
-	case 7418:
-	case 7419:
-	case 7421:
-	case 7422:
-	case 7423:
-	case 7424:
-	case 7426:
-	case 7427:
-	case 7428:
-	case 7429:
-	case 7431:
-	case 7432:
-	case 7433:
-	case 7434:
-	case 7436:
-	case 7437:
-	case 7438:
-	case 7439:
-	case 7441:
-	case 7442:
-	case 7443:
-	case 7444:
-	case 7446:
-	case 7447:
-	case 7448:
-	case 7449:
-	case 7451:
-	case 7452:
-	case 7453:
-	case 7454:
-	case 7456:
-	case 7457:
-	case 7458:
-	case 7459:
-	case 7461:
-	case 7462:
-	case 7463:
-	case 7464:
-	case 7466:
-	case 7467:
-	case 7468:
-	case 7469:
-	case 7471:
-	case 7472:
-	case 7473:
-	case 7474:
-	case 7476:
-	case 7477:
-	case 7478:
-	case 7479:
-	case 7481:
-	case 7482:
-	case 7483:
-	case 7484:
-	case 7486:
-	case 7487:
-	case 7488:
-	case 7489:
-	case 7491:
-	case 7492:
-	case 7493:
-	case 7494:
-		return;
-	default:
-		switch (a1) {
-		case 7635:
-			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(11, 970, 0.5f);
-			VK_Play_Speech_Line(0, 7645, 0.5f);
-			VK_Play_Speech_Line(0, 7650, 0.5f);
-			VK_Play_Speech_Line(0, 7655, 0.5f);
-			VK_Play_Speech_Line(0, 7660, 0.5f);
-			VK_Play_Speech_Line(0, 7665, 0.5f);
-			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(11, 980, 0.5f);
-			VK_Subject_Reacts(20, 10, 5, 12);
-			break;
-		case 7620:
-			VK_Subject_Reacts(30, 9, 10, 10);
-			VK_Play_Speech_Line(11, 960, 0.5f);
-			break;
-		case 7605:
-			VK_Eye_Animates(3);
-			VK_Subject_Reacts(40, 10, -3, 15);
-			VK_Play_Speech_Line(11, 950, 0.5f);
-			break;
-		case 7600:
-			VK_Subject_Reacts(20, 5, 9, 2);
-			VK_Play_Speech_Line(11, 940, 0.5f);
-			break;
-		case 7595:
-			VK_Subject_Reacts(25, 8, -3, 5);
-			VK_Play_Speech_Line(11, 920, 0.5f);
-			VK_Play_Speech_Line(0, 8185, 0.5f);
-			VK_Play_Speech_Line(11, 930, 0.5f);
-			break;
-		case 7585:
-			VK_Subject_Reacts(50, 9, 3, 8);
-			VK_Play_Speech_Line(11, 1250, 0.5f);
-			break;
-		case 7580:
-			VK_Play_Speech_Line(11, 900, 0.5f);
-			VK_Play_Speech_Line(0, 8180, 0.5f);
-			VK_Subject_Reacts(20, 8, 3, 6);
-			VK_Play_Speech_Line(11, 910, 0.5f);
-			break;
-		case 7565:
-			VK_Subject_Reacts(40, 8, 8, 12);
-			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(11, 870, 0.5f);
-			VK_Play_Speech_Line(0, 8175, 0.5f);
-			VK_Play_Speech_Line(11, 880, 0.5f);
-			VK_Play_Speech_Line(11, 890, 0.5f);
-			break;
-		case 7550:
-			VK_Eye_Animates(3);
-			VK_Play_Speech_Line(11, 850, 0.5f);
-			VK_Play_Speech_Line(0, 8165, 0.5f);
-			VK_Subject_Reacts(60, 6, 2, 15);
-			VK_Play_Speech_Line(11, 860, 0.5f);
-			VK_Play_Speech_Line(0, 8170, 0.5f);
-			VK_Eye_Animates(3);
-			break;
-		case 7540:
-			VK_Play_Speech_Line(11, 840, 0.5f);
-			VK_Subject_Reacts(20, 5, 1, 8);
-			break;
-		case 7535:
-			VK_Subject_Reacts(20, 9, 2, 4);
-			VK_Play_Speech_Line(11, 830, 0.5f);
-			break;
-		case 7525:
-			VK_Subject_Reacts(30, 8, 5, 8);
-			VK_Play_Speech_Line(11, 820, 0.5f);
-			break;
-		case 7515:
-			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(11, 800, 0.5f);
-			VK_Play_Speech_Line(0, 8150, 0.5f);
-			VK_Play_Speech_Line(0, 8155, 0.5f);
-			VK_Subject_Reacts(30, 9, -5, 12);
-			VK_Play_Speech_Line(11, 810, 0.5f);
-			VK_Play_Speech_Line(0, 8160, 0.5f);
-			break;
-		case 7516:
-		case 7517:
-		case 7518:
-		case 7519:
-		case 7520:
-		case 7521:
-		case 7522:
-		case 7523:
-		case 7524:
-		case 7526:
-		case 7527:
-		case 7528:
-		case 7529:
-		case 7530:
-		case 7531:
-		case 7532:
-		case 7533:
-		case 7534:
-		case 7536:
-		case 7537:
-		case 7538:
-		case 7539:
-		case 7541:
-		case 7542:
-		case 7543:
-		case 7544:
-		case 7545:
-		case 7546:
-		case 7547:
-		case 7548:
-		case 7549:
-		case 7551:
-		case 7552:
-		case 7553:
-		case 7554:
-		case 7555:
-		case 7556:
-		case 7557:
-		case 7558:
-		case 7559:
-		case 7560:
-		case 7561:
-		case 7562:
-		case 7563:
-		case 7564:
-		case 7566:
-		case 7567:
-		case 7568:
-		case 7569:
-		case 7570:
-		case 7571:
-		case 7572:
-		case 7573:
-		case 7574:
-		case 7575:
-		case 7576:
-		case 7577:
-		case 7578:
-		case 7579:
-		case 7581:
-		case 7582:
-		case 7583:
-		case 7584:
-		case 7586:
-		case 7587:
-		case 7588:
-		case 7589:
-		case 7590:
-		case 7591:
-		case 7592:
-		case 7593:
-		case 7594:
-		case 7596:
-		case 7597:
-		case 7598:
-		case 7599:
-		case 7601:
-		case 7602:
-		case 7603:
-		case 7604:
-		case 7606:
-		case 7607:
-		case 7608:
-		case 7609:
-		case 7610:
-		case 7611:
-		case 7612:
-		case 7613:
-		case 7614:
-		case 7615:
-		case 7616:
-		case 7617:
-		case 7618:
-		case 7619:
-		case 7621:
-		case 7622:
-		case 7623:
-		case 7624:
-		case 7625:
-		case 7626:
-		case 7627:
-		case 7628:
-		case 7629:
-		case 7630:
-		case 7631:
-		case 7632:
-		case 7633:
-		case 7634:
-			return;
-		default:
-			switch (a1) {
-			case 7705:
-				VK_Eye_Animates(3);
-				VK_Play_Speech_Line(11, 1070, 0.5f);
-				VK_Play_Speech_Line(0, 7720, 0.5f);
-				VK_Play_Speech_Line(0, 7725, 0.5f);
-				VK_Play_Speech_Line(0, 7730, 0.5f);
-				VK_Play_Speech_Line(0, 7735, 0.5f);
-				VK_Subject_Reacts(60, 14, 3, 20);
-				VK_Play_Speech_Line(11, 1080, 0.5f);
-				VK_Play_Speech_Line(0, 8195, 0.5f);
-				VK_Eye_Animates(3);
-				VK_Play_Speech_Line(11, 1090, 0.5f);
-				VK_Play_Speech_Line(0, 8200, 0.5f);
-				break;
-			case 7690:
-				VK_Play_Speech_Line(11, 1050, 0.5f);
-				VK_Play_Speech_Line(0, 7695, 0.5f);
-				VK_Play_Speech_Line(0, 7700, 0.5f);
-				VK_Subject_Reacts(60, 11, 9, 100);
-				VK_Play_Speech_Line(11, 1060, 0.5f);
-				break;
-			case 7680:
-				VK_Play_Speech_Line(11, 1000, 0.5f);
-				VK_Subject_Reacts(30, 9, 3, 10);
-				VK_Play_Speech_Line(11, 1010, 0.5f);
-				VK_Play_Speech_Line(0, 8190, 0.5f);
-				VK_Play_Speech_Line(11, 1020, 0.5f);
-				VK_Play_Speech_Line(11, 1030, 0.5f);
-				VK_Play_Speech_Line(11, 1040, 0.5f);
-				break;
-			case 7670:
-				VK_Subject_Reacts(30, 4, 1, 10);
-				VK_Play_Speech_Line(11, 990, 0.5f);
-				break;
-			case 7671:
-			case 7672:
-			case 7673:
-			case 7674:
-			case 7675:
-			case 7676:
-			case 7677:
-			case 7678:
-			case 7679:
-			case 7681:
-			case 7682:
-			case 7683:
-			case 7684:
-			case 7685:
-			case 7686:
-			case 7687:
-			case 7688:
-			case 7689:
-			case 7691:
-			case 7692:
-			case 7693:
-			case 7694:
-			case 7695:
-			case 7696:
-			case 7697:
-			case 7698:
-			case 7699:
-			case 7700:
-			case 7701:
-			case 7702:
-			case 7703:
-			case 7704:
-				return;
-			default:
-				if ((unsigned int)(a1 - 7740) > 10) {
-					if (a1 == 7770) {
-						VK_Play_Speech_Line(11, 1160, 0.5f);
-						VK_Subject_Reacts(5, -8, 7, 10);
-					}
-				} else if (a1 == 7740) {
-					VK_Subject_Reacts(40, 10, 1, 15);
-					VK_Play_Speech_Line(11, 1100, 0.5f);
-					VK_Play_Speech_Line(0, 8205, 0.5f);
-					VK_Eye_Animates(2);
-					VK_Play_Speech_Line(11, 1110, 0.5f);
-					VK_Play_Speech_Line(0, 8210, 0.5f);
-				} else if (a1 == 7750) {
-					VK_Eye_Animates(2);
-					VK_Subject_Reacts(50, 9, -4, 20);
-					VK_Play_Speech_Line(11, 1120, 0.5f);
-					VK_Play_Speech_Line(11, 1130, 0.5f);
-					VK_Play_Speech_Line(11, 1140, 0.5f);
-					VK_Play_Speech_Line(0, 8220, 0.5f);
-					VK_Play_Speech_Line(11, 1150, 0.5f);
-				}
-				break;
-			}
-			break;
-		}
+	case 7635:
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(11, 970, 0.5f);
+		VK_Play_Speech_Line(0, 7645, 0.5f);
+		VK_Play_Speech_Line(0, 7650, 0.5f);
+		VK_Play_Speech_Line(0, 7655, 0.5f);
+		VK_Play_Speech_Line(0, 7660, 0.5f);
+		VK_Play_Speech_Line(0, 7665, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(11, 980, 0.5f);
+		VK_Subject_Reacts(20, 10, 5, 12);
+		break;
+	case 7670:
+		VK_Subject_Reacts(30, 4, 1, 10);
+		VK_Play_Speech_Line(11, 990, 0.5f);
+		break;
+	case 7680:
+		VK_Play_Speech_Line(11, 1000, 0.5f);
+		VK_Subject_Reacts(30, 9, 3, 10);
+		VK_Play_Speech_Line(11, 1010, 0.5f);
+		VK_Play_Speech_Line(0, 8190, 0.5f);
+		VK_Play_Speech_Line(11, 1020, 0.5f);
+		VK_Play_Speech_Line(11, 1030, 0.5f);
+		VK_Play_Speech_Line(11, 1040, 0.5f);
+		break;
+	case 7690:
+		VK_Play_Speech_Line(11, 1050, 0.5f);
+		VK_Play_Speech_Line(0, 7695, 0.5f);
+		VK_Play_Speech_Line(0, 7700, 0.5f);
+		VK_Subject_Reacts(60, 11, 9, 100);
+		VK_Play_Speech_Line(11, 1060, 0.5f);
+		break;
+	case 7705:
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(11, 1070, 0.5f);
+		VK_Play_Speech_Line(0, 7720, 0.5f);
+		VK_Play_Speech_Line(0, 7725, 0.5f);
+		VK_Play_Speech_Line(0, 7730, 0.5f);
+		VK_Play_Speech_Line(0, 7735, 0.5f);
+		VK_Subject_Reacts(60, 14, 3, 20);
+		VK_Play_Speech_Line(11, 1080, 0.5f);
+		VK_Play_Speech_Line(0, 8195, 0.5f);
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(11, 1090, 0.5f);
+		VK_Play_Speech_Line(0, 8200, 0.5f);
+		break;
+	case 7740:
+		VK_Subject_Reacts(40, 10, 1, 15);
+		VK_Play_Speech_Line(11, 1100, 0.5f);
+		VK_Play_Speech_Line(0, 8205, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(11, 1110, 0.5f);
+		VK_Play_Speech_Line(0, 8210, 0.5f);
+		break;
+	case 7750:
+		VK_Eye_Animates(2);
+		VK_Subject_Reacts(50, 9, -4, 20);
+		VK_Play_Speech_Line(11, 1120, 0.5f);
+		VK_Play_Speech_Line(11, 1130, 0.5f);
+		VK_Play_Speech_Line(11, 1140, 0.5f);
+		VK_Play_Speech_Line(0, 8220, 0.5f);
+		VK_Play_Speech_Line(11, 1150, 0.5f);
+		break;
+	case 7770:
+		VK_Play_Speech_Line(11, 1160, 0.5f);
+		VK_Subject_Reacts(5, -8, 7, 10);
 		break;
 	}
 }
 
 void ScriptVK::sub_406088(int a1) {
 	switch (a1) {
-	case 7495:
-		VK_Play_Speech_Line(3, 1970, 0.5f);
-		VK_Play_Speech_Line(0, 7830, 0.5f);
-		VK_Play_Speech_Line(3, 1980, 0.5f);
-		VK_Subject_Reacts(65, 4, 4, 5);
-		VK_Play_Speech_Line(3, 1990, 0.5f);
+	case 7385:
+		VK_Subject_Reacts(36, 0, 0, 0);
+		VK_Play_Speech_Line(3, 1440, 0.5f);
 		break;
-	case 7490:
-		VK_Subject_Reacts(43, 8, 8, 5);
-		VK_Play_Speech_Line(3, 1950, 0.5f);
-		VK_Play_Speech_Line(0, 7820, 0.5f);
-		VK_Play_Speech_Line(3, 1960, 0.5f);
-		VK_Play_Speech_Line(0, 7825, 0.5f);
+	case 7390:
+		VK_Subject_Reacts(40, 2, 2, 0);
+		VK_Play_Speech_Line(3, 1450, 0.5f);
+		VK_Play_Speech_Line(0, 7785, 0.5f);
+		VK_Play_Speech_Line(3, 1460, 0.5f);
+		VK_Play_Speech_Line(0, 7790, 0.5f);
 		break;
-	case 7485:
-		VK_Play_Speech_Line(3, 1940, 0.5f);
-		VK_Subject_Reacts(38, 4, 9, 0);
+	case 7395:
+		VK_Play_Speech_Line(3, 1470, 0.5f);
+		VK_Subject_Reacts(40, 4, 4, 0);
+		VK_Play_Speech_Line(0, 7795, 0.5f);
+		VK_Play_Speech_Line(3, 1480, 0.5f);
 		break;
-	case 7480:
+	case 7400:
 		if (Game_Flag_Query(47)) {
-			VK_Subject_Reacts(55, -3, 12, 5);
-			VK_Play_Speech_Line(3, 1910, 0.5f);
+			VK_Play_Speech_Line(3, 1490, 0.5f);
+			VK_Subject_Reacts(15, -1, 9, 0);
+			VK_Play_Speech_Line(3, 1500, 0.5f);
 		} else {
-			VK_Play_Speech_Line(3, 1920, 0.5f);
-			VK_Subject_Reacts(55, 17, -3, 5);
-			VK_Play_Speech_Line(3, 1930, 0.5f);
+			VK_Subject_Reacts(15, 13, -1, 0);
+			VK_Play_Speech_Line(3, 1510, 0.5f);
 		}
 		break;
-	case 7475:
-		VK_Subject_Reacts(28, 0, 0, 0);
-		VK_Play_Speech_Line(3, 1900, 0.5f);
-		break;
-	case 7470:
+	case 7405:
+		VK_Eye_Animates(3);
 		if (Game_Flag_Query(47)) {
-			VK_Play_Speech_Line(3, 1850, 0.5f);
-			VK_Subject_Reacts(50, -2, 11, 0);
-			VK_Play_Speech_Line(3, 1860, 0.5f);
+			VK_Play_Speech_Line(3, 1520, 0.5f);
+			VK_Play_Speech_Line(0, 7840, 0.5f);
+			VK_Subject_Reacts(20, -1, 9, 10);
+			VK_Play_Speech_Line(3, 1540, 0.80000001f);
+			VK_Play_Speech_Line(3, 1550, 0.5f);
 		} else {
-			VK_Subject_Reacts(90, 15, -5, 10);
-			VK_Play_Speech_Line(3, 1870, 0.5f);
-			VK_Play_Speech_Line(0, 8532, 0.5f);
-			VK_Play_Speech_Line(3, 1890, 0.5f);
+			VK_Play_Speech_Line(3, 1560, 0.5f);
+			VK_Subject_Reacts(25, 13, -3, 0);
+			VK_Play_Speech_Line(3, 1570, 0.80000001f);
+			VK_Play_Speech_Line(3, 1580, 0.5f);
 		}
 		break;
-	case 7465:
+	case 7410:
+		VK_Play_Speech_Line(3, 1590, 0.5f);
+		VK_Subject_Reacts(50, 10, 10, 10);
+		VK_Play_Speech_Line(3, 1600, 0.5f);
+		break;
+	case 7415:
+		VK_Eye_Animates(3);
+		VK_Subject_Reacts(80, 6, 4, 10);
+		VK_Play_Speech_Line(3, 1610, 0.5f);
+		break;
+	case 7420:
 		if (Game_Flag_Query(47)) {
-			VK_Subject_Reacts(60, -3, 10, 5);
-			VK_Play_Speech_Line(3, 1830, 0.5f);
+			VK_Play_Speech_Line(3, 1620, 0.5f);
+			VK_Subject_Reacts(25, -1, 9, 0);
 		} else {
-			VK_Play_Speech_Line(3, 1840, 0.5f);
-			VK_Subject_Reacts(60, 13, 2, 5);
+			VK_Subject_Reacts(25, 14, -2, 0);
+			VK_Play_Speech_Line(3, 1630, 0.89999998f);
+			VK_Play_Speech_Line(3, 1640, 0.5f);
 		}
 		break;
-	case 7460:
+	case 7425:
+		VK_Subject_Reacts(40, -1, -1, 0);
+		VK_Play_Speech_Line(3, 1650, 0.5f);
+		break;
+	case 7430:
+		VK_Subject_Reacts(65, 4, 6, 10);
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(3, 1660, 0.5f);
+		break;
+	case 7435:
 		if (Game_Flag_Query(47)) {
-			VK_Subject_Reacts(40, -2, 10, 10);
-			VK_Play_Speech_Line(3, 1810, 0.5f);
+			VK_Play_Speech_Line(3, 1670, 0.5f);
+			VK_Subject_Reacts(60, -2, 9, 0);
+			VK_Play_Speech_Line(3, 1680, 0.5f);
 		} else {
-			VK_Subject_Reacts(35, 14, 3, 0);
-			VK_Play_Speech_Line(3, 1820, 0.5f);
+			VK_Subject_Reacts(60, 14, 2, 0);
+			VK_Play_Speech_Line(3, 1690, 0.5f);
 		}
 		break;
-	case 7455:
-		VK_Play_Speech_Line(3, 1780, 0.5f);
-		VK_Subject_Reacts(35, 3, 5, 0);
-		VK_Play_Speech_Line(3, 1790, 0.5f);
-		VK_Play_Speech_Line(0, 7810, 0.5f);
-		VK_Play_Speech_Line(3, 1800, 0.5f);
-		VK_Play_Speech_Line(0, 7815, 0.5f);
+	case 7440:
+		VK_Subject_Reacts(30, 3, 5, 0);
+		VK_Play_Speech_Line(3, 1700, 0.5f);
+		break;
+	case 7445:
+		VK_Play_Speech_Line(3, 1710, 0.5f);
+		VK_Play_Speech_Line(0, 7800, 0.5f);
+		VK_Play_Speech_Line(3, 1720, 0.5f);
+		VK_Subject_Reacts(45, 4, 6, 0);
+		VK_Play_Speech_Line(3, 1730, 0.5f);
 		break;
 	case 7450:
 		VK_Eye_Animates(2);
@@ -1930,516 +1220,253 @@ void ScriptVK::sub_406088(int a1) {
 		VK_Play_Speech_Line(3, 1750, 0.89999998f);
 		VK_Play_Speech_Line(3, 1760, 0.5f);
 		break;
-	case 7445:
-		VK_Play_Speech_Line(3, 1710, 0.5f);
-		VK_Play_Speech_Line(0, 7800, 0.5f);
-		VK_Play_Speech_Line(3, 1720, 0.5f);
-		VK_Subject_Reacts(45, 4, 6, 0);
-		VK_Play_Speech_Line(3, 1730, 0.5f);
+	case 7455:
+		VK_Play_Speech_Line(3, 1780, 0.5f);
+		VK_Subject_Reacts(35, 3, 5, 0);
+		VK_Play_Speech_Line(3, 1790, 0.5f);
+		VK_Play_Speech_Line(0, 7810, 0.5f);
+		VK_Play_Speech_Line(3, 1800, 0.5f);
+		VK_Play_Speech_Line(0, 7815, 0.5f);
 		break;
-	case 7440:
-		VK_Subject_Reacts(30, 3, 5, 0);
-		VK_Play_Speech_Line(3, 1700, 0.5f);
+	case 7460:
+		if (Game_Flag_Query(47)) {
+			VK_Subject_Reacts(40, -2, 10, 10);
+			VK_Play_Speech_Line(3, 1810, 0.5f);
+		} else {
+			VK_Subject_Reacts(35, 14, 3, 0);
+			VK_Play_Speech_Line(3, 1820, 0.5f);
+		}
 		break;
-	case 7435:
+	case 7465:
 		if (Game_Flag_Query(47)) {
-			VK_Play_Speech_Line(3, 1670, 0.5f);
-			VK_Subject_Reacts(60, -2, 9, 0);
-			VK_Play_Speech_Line(3, 1680, 0.5f);
+			VK_Subject_Reacts(60, -3, 10, 5);
+			VK_Play_Speech_Line(3, 1830, 0.5f);
 		} else {
-			VK_Subject_Reacts(60, 14, 2, 0);
-			VK_Play_Speech_Line(3, 1690, 0.5f);
+			VK_Play_Speech_Line(3, 1840, 0.5f);
+			VK_Subject_Reacts(60, 13, 2, 5);
 		}
 		break;
-	case 7430:
-		VK_Subject_Reacts(65, 4, 6, 10);
-		VK_Eye_Animates(3);
-		VK_Play_Speech_Line(3, 1660, 0.5f);
+	case 7470:
+		if (Game_Flag_Query(47)) {
+			VK_Play_Speech_Line(3, 1850, 0.5f);
+			VK_Subject_Reacts(50, -2, 11, 0);
+			VK_Play_Speech_Line(3, 1860, 0.5f);
+		} else {
+			VK_Subject_Reacts(90, 15, -5, 10);
+			VK_Play_Speech_Line(3, 1870, 0.5f);
+			VK_Play_Speech_Line(0, 8532, 0.5f);
+			VK_Play_Speech_Line(3, 1890, 0.5f);
+		}
 		break;
-	case 7425:
-		VK_Subject_Reacts(40, -1, -1, 0);
-		VK_Play_Speech_Line(3, 1650, 0.5f);
+	case 7475:
+		VK_Subject_Reacts(28, 0, 0, 0);
+		VK_Play_Speech_Line(3, 1900, 0.5f);
 		break;
-	case 7420:
+	case 7480:
 		if (Game_Flag_Query(47)) {
-			VK_Play_Speech_Line(3, 1620, 0.5f);
-			VK_Subject_Reacts(25, -1, 9, 0);
+			VK_Subject_Reacts(55, -3, 12, 5);
+			VK_Play_Speech_Line(3, 1910, 0.5f);
 		} else {
-			VK_Subject_Reacts(25, 14, -2, 0);
-			VK_Play_Speech_Line(3, 1630, 0.89999998f);
-			VK_Play_Speech_Line(3, 1640, 0.5f);
+			VK_Play_Speech_Line(3, 1920, 0.5f);
+			VK_Subject_Reacts(55, 17, -3, 5);
+			VK_Play_Speech_Line(3, 1930, 0.5f);
 		}
 		break;
-	case 7415:
+	case 7485:
+		VK_Play_Speech_Line(3, 1940, 0.5f);
+		VK_Subject_Reacts(38, 4, 9, 0);
+		break;
+	case 7490:
+		VK_Subject_Reacts(43, 8, 8, 5);
+		VK_Play_Speech_Line(3, 1950, 0.5f);
+		VK_Play_Speech_Line(0, 7820, 0.5f);
+		VK_Play_Speech_Line(3, 1960, 0.5f);
+		VK_Play_Speech_Line(0, 7825, 0.5f);
+		break;
+	case 7495:
+		VK_Play_Speech_Line(3, 1970, 0.5f);
+		VK_Play_Speech_Line(0, 7830, 0.5f);
+		VK_Play_Speech_Line(3, 1980, 0.5f);
+		VK_Subject_Reacts(65, 4, 4, 5);
+		VK_Play_Speech_Line(3, 1990, 0.5f);
+		break;
+	case 7515:
+		if (Game_Flag_Query(47)) {
+			VK_Play_Speech_Line(3, 2000, 0.5f);
+			VK_Subject_Reacts(72, -3, 12, 2);
+			VK_Play_Speech_Line(3, 2010, 0.5f);
+			VK_Play_Speech_Line(0, 7835, 0.5f);
+			VK_Play_Speech_Line(3, 2020, 0.5f);
+		} else {
+			VK_Subject_Reacts(60, 16, -1, 2);
+			VK_Play_Speech_Line(3, 2030, 0.5f);
+			VK_Play_Speech_Line(0, 7840, 0.5f);
+		}
+		break;
+	case 7525:
+		VK_Subject_Reacts(40, 6, 6, 0);
+		VK_Play_Speech_Line(3, 2040, 0.5f);
+		VK_Play_Speech_Line(0, 8533, 0.5f);
+		VK_Play_Speech_Line(3, 2060, 0.5f);
+		VK_Play_Speech_Line(3, 2070, 0.5f);
+		break;
+	case 7535:
+		if (Game_Flag_Query(47)) {
+			VK_Play_Speech_Line(3, 2080, 0.5f);
+			VK_Play_Speech_Line(0, 7845, 0.5f);
+			VK_Play_Speech_Line(3, 2090, 0.5f);
+			VK_Subject_Reacts(60, -6, 11, 0);
+			VK_Play_Speech_Line(3, 2100, 0.5f);
+		} else {
+			VK_Subject_Reacts(60, 17, -7, 0);
+			VK_Play_Speech_Line(3, 2110, 0.5f);
+			VK_Play_Speech_Line(0, 7850, 0.5f);
+			VK_Play_Speech_Line(3, 2120, 0.5f);
+			VK_Play_Speech_Line(0, 7855, 0.5f);
+			VK_Play_Speech_Line(3, 2130, 0.5f);
+		}
+		break;
+	case 7540:
+		VK_Eye_Animates(2);
+		if (Game_Flag_Query(47)) {
+			VK_Subject_Reacts(70, -5, 12, 80);
+			VK_Play_Speech_Line(3, 2140, 0.5f);
+		} else {
+			VK_Subject_Reacts(80, 17, -1, 80);
+			VK_Play_Speech_Line(3, 2150, 1.0f);
+			VK_Play_Speech_Line(3, 2160, 0.5f);
+			VK_Play_Speech_Line(0, 7860, 0.5f);
+		}
+		break;
+	case 7550:
+		VK_Play_Speech_Line(3, 2170, 0.5f);
+		VK_Play_Speech_Line(0, 7865, 0.5f);
+		VK_Play_Speech_Line(3, 2180, 0.5f);
+		VK_Subject_Reacts(55, 6, 5, 0);
+		VK_Play_Speech_Line(3, 2190, 0.5f);
+		break;
+	case 7565:
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(3, 2210, 0.5f);
+		VK_Play_Speech_Line(0, 7870, 0.5f);
+		VK_Play_Speech_Line(3, 2220, 0.5f);
+		VK_Subject_Reacts(70, 8, 7, 10);
+		VK_Play_Speech_Line(3, 2230, 0.5f);
+		VK_Play_Speech_Line(0, 7875, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(3, 2240, 0.5f);
+		VK_Play_Speech_Line(3, 2250, 0.5f);
+		break;
+	case 7580:
+		VK_Play_Speech_Line(3, 2260, 0.5f);
+		VK_Subject_Reacts(40, 5, 5, 10);
+		VK_Play_Speech_Line(3, 2270, 0.5f);
+		break;
+	case 7585:
+		VK_Subject_Reacts(50, 8, 8, 7);
+		VK_Play_Speech_Line(3, 2280, 0.5f);
+		break;
+	case 7595:
 		VK_Eye_Animates(3);
-		VK_Subject_Reacts(80, 6, 4, 10);
-		VK_Play_Speech_Line(3, 1610, 0.5f);
+		VK_Play_Speech_Line(3, 2290, 0.5f);
+		VK_Subject_Reacts(30, 5, 5, 8);
+		break;
+	case 7600:
+		VK_Play_Speech_Line(3, 2300, 0.5f);
+		VK_Subject_Reacts(30, 4, 4, 5);
+		if (!Game_Flag_Query(47)) {
+			VK_Play_Speech_Line(3, 2310, 0.5f);
+		}
 		break;
-	case 7410:
-		VK_Play_Speech_Line(3, 1590, 0.5f);
-		VK_Subject_Reacts(50, 10, 10, 10);
-		VK_Play_Speech_Line(3, 1600, 0.5f);
+	case 7605:
+		VK_Subject_Reacts(60, -1, -1, 5);
+		VK_Play_Speech_Line(3, 2320, 0.5f);
 		break;
-	case 7405:
+	case 7620:
+		VK_Play_Speech_Line(3, 2340, 0.5f);
+		VK_Subject_Reacts(72, 9, 9, 5);
+		VK_Play_Speech_Line(3, 2350, 0.5f);
+		VK_Play_Speech_Line(0, 7885, 0.5f);
+		VK_Play_Speech_Line(3, 2360, 0.5f);
+		break;
+	case 7635:
+		VK_Subject_Reacts(60, 6, 7, 0);
+		VK_Play_Speech_Line(3, 2370, 0.5f);
+		break;
+	case 7670:
 		VK_Eye_Animates(3);
 		if (Game_Flag_Query(47)) {
-			VK_Play_Speech_Line(3, 1520, 0.5f);
-			VK_Play_Speech_Line(0, 7840, 0.5f);
-			VK_Subject_Reacts(20, -1, 9, 10);
-			VK_Play_Speech_Line(3, 1540, 0.80000001f);
-			VK_Play_Speech_Line(3, 1550, 0.5f);
+			VK_Play_Speech_Line(3, 2380, 0.5f);
+			VK_Play_Speech_Line(0, 7890, 0.5f);
+			VK_Play_Speech_Line(3, 2390, 0.5f);
+			VK_Subject_Reacts(90, -3, 14, 50);
+			VK_Play_Speech_Line(0, 7895, 0.5f);
 		} else {
-			VK_Play_Speech_Line(3, 1560, 0.5f);
-			VK_Subject_Reacts(25, 13, -3, 0);
-			VK_Play_Speech_Line(3, 1570, 0.80000001f);
-			VK_Play_Speech_Line(3, 1580, 0.5f);
+			VK_Subject_Reacts(80, 18, -3, 10);
+			VK_Play_Speech_Line(3, 2410, 0.5f);
+			VK_Play_Speech_Line(0, 8534, 0.5f);
+			VK_Play_Speech_Line(3, 2430, 0.5f);
 		}
 		break;
-	case 7400:
+	case 7680:
+		VK_Eye_Animates(3);
 		if (Game_Flag_Query(47)) {
-			VK_Play_Speech_Line(3, 1490, 0.5f);
-			VK_Subject_Reacts(15, -1, 9, 0);
-			VK_Play_Speech_Line(3, 1500, 0.5f);
+			VK_Subject_Reacts(70, -4, 14, 15);
+			VK_Play_Speech_Line(3, 2440, 0.5f);
 		} else {
-			VK_Subject_Reacts(15, 13, -1, 0);
-			VK_Play_Speech_Line(3, 1510, 0.5f);
+			VK_Play_Speech_Line(3, 2450, 0.5f);
+			VK_Subject_Reacts(70, 18, -4, 15);
+			VK_Play_Speech_Line(3, 2460, 0.5f);
 		}
 		break;
-	case 7395:
-		VK_Play_Speech_Line(3, 1470, 0.5f);
-		VK_Subject_Reacts(40, 4, 4, 0);
-		VK_Play_Speech_Line(0, 7795, 0.5f);
-		VK_Play_Speech_Line(3, 1480, 0.5f);
+	case 7690:
+		VK_Play_Speech_Line(3, 2470, 0.5f);
+		VK_Subject_Reacts(20, 9, 8, 5);
+		VK_Play_Speech_Line(3, 2480, 0.5f);
+		VK_Play_Speech_Line(0, 7900, 0.5f);
 		break;
-	case 7390:
-		VK_Subject_Reacts(40, 2, 2, 0);
-		VK_Play_Speech_Line(3, 1450, 0.5f);
-		VK_Play_Speech_Line(0, 7785, 0.5f);
-		VK_Play_Speech_Line(3, 1460, 0.5f);
-		VK_Play_Speech_Line(0, 7790, 0.5f);
+	case 7705:
+		VK_Eye_Animates(3);
+		if (Game_Flag_Query(47)) {
+			VK_Play_Speech_Line(3, 2500, 0.5f);
+			VK_Subject_Reacts(85, 7, 14, 20);
+			VK_Play_Speech_Line(3, 2510, 0.5f);
+		} else {
+			VK_Subject_Reacts(99, 18, 7, 20);
+			VK_Play_Speech_Line(3, 2530, 0.5f);
+			VK_Play_Speech_Line(0, 7910, 0.5f);
+			VK_Play_Speech_Line(3, 2550, 0.5f);
+			VK_Eye_Animates(3);
+			VK_Play_Speech_Line(0, 7915, 0.5f);
+		}
 		break;
-	case 7385:
-		VK_Subject_Reacts(36, 0, 0, 0);
-		VK_Play_Speech_Line(3, 1440, 0.5f);
+	case 7740:
+		VK_Subject_Reacts(60, 5, 6, 0);
+		VK_Play_Speech_Line(3, 2560, 0.5f);
 		break;
-	case 7386:
-	case 7387:
-	case 7388:
-	case 7389:
-	case 7391:
-	case 7392:
-	case 7393:
-	case 7394:
-	case 7396:
-	case 7397:
-	case 7398:
-	case 7399:
-	case 7401:
-	case 7402:
-	case 7403:
-	case 7404:
-	case 7406:
-	case 7407:
-	case 7408:
-	case 7409:
-	case 7411:
-	case 7412:
-	case 7413:
-	case 7414:
-	case 7416:
-	case 7417:
-	case 7418:
-	case 7419:
-	case 7421:
-	case 7422:
-	case 7423:
-	case 7424:
-	case 7426:
-	case 7427:
-	case 7428:
-	case 7429:
-	case 7431:
-	case 7432:
-	case 7433:
-	case 7434:
-	case 7436:
-	case 7437:
-	case 7438:
-	case 7439:
-	case 7441:
-	case 7442:
-	case 7443:
-	case 7444:
-	case 7446:
-	case 7447:
-	case 7448:
-	case 7449:
-	case 7451:
-	case 7452:
-	case 7453:
-	case 7454:
-	case 7456:
-	case 7457:
-	case 7458:
-	case 7459:
-	case 7461:
-	case 7462:
-	case 7463:
-	case 7464:
-	case 7466:
-	case 7467:
-	case 7468:
-	case 7469:
-	case 7471:
-	case 7472:
-	case 7473:
-	case 7474:
-	case 7476:
-	case 7477:
-	case 7478:
-	case 7479:
-	case 7481:
-	case 7482:
-	case 7483:
-	case 7484:
-	case 7486:
-	case 7487:
-	case 7488:
-	case 7489:
-	case 7491:
-	case 7492:
-	case 7493:
-	case 7494:
-		return;
-	default:
-		switch (a1) {
-		case 7635:
-			VK_Subject_Reacts(60, 6, 7, 0);
-			VK_Play_Speech_Line(3, 2370, 0.5f);
-			break;
-		case 7620:
-			VK_Play_Speech_Line(3, 2340, 0.5f);
-			VK_Subject_Reacts(72, 9, 9, 5);
-			VK_Play_Speech_Line(3, 2350, 0.5f);
-			VK_Play_Speech_Line(0, 7885, 0.5f);
-			VK_Play_Speech_Line(3, 2360, 0.5f);
-			break;
-		case 7605:
-			VK_Subject_Reacts(60, -1, -1, 5);
-			VK_Play_Speech_Line(3, 2320, 0.5f);
-			break;
-		case 7600:
-			VK_Play_Speech_Line(3, 2300, 0.5f);
-			VK_Subject_Reacts(30, 4, 4, 5);
-			if (!Game_Flag_Query(47)) {
-				VK_Play_Speech_Line(3, 2310, 0.5f);
-			}
-			break;
-		case 7595:
+	case 7750:
+		if (Game_Flag_Query(47)) {
+			VK_Play_Speech_Line(3, 2580, 0.5f);
+			VK_Subject_Reacts(90, -5, 14, 20);
+			VK_Play_Speech_Line(3, 2590, 0.5f);
+			VK_Play_Speech_Line(0, 7920, 0.5f);
+		} else {
+			VK_Subject_Reacts(90, 17, 3, 20);
+			VK_Play_Speech_Line(3, 2600, 0.5f);
+			VK_Play_Speech_Line(0, 7925, 0.5f);
 			VK_Eye_Animates(3);
-			VK_Play_Speech_Line(3, 2290, 0.5f);
-			VK_Subject_Reacts(30, 5, 5, 8);
-			break;
-		case 7585:
-			VK_Subject_Reacts(50, 8, 8, 7);
-			VK_Play_Speech_Line(3, 2280, 0.5f);
-			break;
-		case 7580:
-			VK_Play_Speech_Line(3, 2260, 0.5f);
-			VK_Subject_Reacts(40, 5, 5, 10);
-			VK_Play_Speech_Line(3, 2270, 0.5f);
-			break;
-		case 7565:
-			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(3, 2210, 0.5f);
-			VK_Play_Speech_Line(0, 7870, 0.5f);
-			VK_Play_Speech_Line(3, 2220, 0.5f);
-			VK_Subject_Reacts(70, 8, 7, 10);
-			VK_Play_Speech_Line(3, 2230, 0.5f);
-			VK_Play_Speech_Line(0, 7875, 0.5f);
-			VK_Eye_Animates(2);
-			VK_Play_Speech_Line(3, 2240, 0.5f);
-			VK_Play_Speech_Line(3, 2250, 0.5f);
-			break;
-		case 7550:
-			VK_Play_Speech_Line(3, 2170, 0.5f);
-			VK_Play_Speech_Line(0, 7865, 0.5f);
-			VK_Play_Speech_Line(3, 2180, 0.5f);
-			VK_Subject_Reacts(55, 6, 5, 0);
-			VK_Play_Speech_Line(3, 2190, 0.5f);
-			break;
-		case 7540:
-			VK_Eye_Animates(2);
-			if (Game_Flag_Query(47)) {
-				VK_Subject_Reacts(70, -5, 12, 80);
-				VK_Play_Speech_Line(3, 2140, 0.5f);
-			} else {
-				VK_Subject_Reacts(80, 17, -1, 80);
-				VK_Play_Speech_Line(3, 2150, 1.0f);
-				VK_Play_Speech_Line(3, 2160, 0.5f);
-				VK_Play_Speech_Line(0, 7860, 0.5f);
-			}
-			break;
-		case 7535:
-			if (Game_Flag_Query(47)) {
-				VK_Play_Speech_Line(3, 2080, 0.5f);
-				VK_Play_Speech_Line(0, 7845, 0.5f);
-				VK_Play_Speech_Line(3, 2090, 0.5f);
-				VK_Subject_Reacts(60, -6, 11, 0);
-				VK_Play_Speech_Line(3, 2100, 0.5f);
-			} else {
-				VK_Subject_Reacts(60, 17, -7, 0);
-				VK_Play_Speech_Line(3, 2110, 0.5f);
-				VK_Play_Speech_Line(0, 7850, 0.5f);
-				VK_Play_Speech_Line(3, 2120, 0.5f);
-				VK_Play_Speech_Line(0, 7855, 0.5f);
-				VK_Play_Speech_Line(3, 2130, 0.5f);
-			}
-			break;
-		case 7525:
-			VK_Subject_Reacts(40, 6, 6, 0);
-			VK_Play_Speech_Line(3, 2040, 0.5f);
-			VK_Play_Speech_Line(0, 8533, 0.5f);
-			VK_Play_Speech_Line(3, 2060, 0.5f);
-			VK_Play_Speech_Line(3, 2070, 0.5f);
-			break;
-		case 7515:
-			if (Game_Flag_Query(47)) {
-				VK_Play_Speech_Line(3, 2000, 0.5f);
-				VK_Subject_Reacts(72, -3, 12, 2);
-				VK_Play_Speech_Line(3, 2010, 0.5f);
-				VK_Play_Speech_Line(0, 7835, 0.5f);
-				VK_Play_Speech_Line(3, 2020, 0.5f);
-			} else {
-				VK_Subject_Reacts(60, 16, -1, 2);
-				VK_Play_Speech_Line(3, 2030, 0.5f);
-				VK_Play_Speech_Line(0, 7840, 0.5f);
-			}
-			break;
-		case 7516:
-		case 7517:
-		case 7518:
-		case 7519:
-		case 7520:
-		case 7521:
-		case 7522:
-		case 7523:
-		case 7524:
-		case 7526:
-		case 7527:
-		case 7528:
-		case 7529:
-		case 7530:
-		case 7531:
-		case 7532:
-		case 7533:
-		case 7534:
-		case 7536:
-		case 7537:
-		case 7538:
-		case 7539:
-		case 7541:
-		case 7542:
-		case 7543:
-		case 7544:
-		case 7545:
-		case 7546:
-		case 7547:
-		case 7548:
-		case 7549:
-		case 7551:
-		case 7552:
-		case 7553:
-		case 7554:
-		case 7555:
-		case 7556:
-		case 7557:
-		case 7558:
-		case 7559:
-		case 7560:
-		case 7561:
-		case 7562:
-		case 7563:
-		case 7564:
-		case 7566:
-		case 7567:
-		case 7568:
-		case 7569:
-		case 7570:
-		case 7571:
-		case 7572:
-		case 7573:
-		case 7574:
-		case 7575:
-		case 7576:
-		case 7577:
-		case 7578:
-		case 7579:
-		case 7581:
-		case 7582:
-		case 7583:
-		case 7584:
-		case 7586:
-		case 7587:
-		case 7588:
-		case 7589:
-		case 7590:
-		case 7591:
-		case 7592:
-		case 7593:
-		case 7594:
-		case 7596:
-		case 7597:
-		case 7598:
-		case 7599:
-		case 7601:
-		case 7602:
-		case 7603:
-		case 7604:
-		case 7606:
-		case 7607:
-		case 7608:
-		case 7609:
-		case 7610:
-		case 7611:
-		case 7612:
-		case 7613:
-		case 7614:
-		case 7615:
-		case 7616:
-		case 7617:
-		case 7618:
-		case 7619:
-		case 7621:
-		case 7622:
-		case 7623:
-		case 7624:
-		case 7625:
-		case 7626:
-		case 7627:
-		case 7628:
-		case 7629:
-		case 7630:
-		case 7631:
-		case 7632:
-		case 7633:
-		case 7634:
-			return;
-		default:
-			switch (a1) {
-			case 7705:
-				VK_Eye_Animates(3);
-				if (Game_Flag_Query(47)) {
-					VK_Play_Speech_Line(3, 2500, 0.5f);
-					VK_Subject_Reacts(85, 7, 14, 20);
-					VK_Play_Speech_Line(3, 2510, 0.5f);
-				} else {
-					VK_Subject_Reacts(99, 18, 7, 20);
-					VK_Play_Speech_Line(3, 2530, 0.5f);
-					VK_Play_Speech_Line(0, 7910, 0.5f);
-					VK_Play_Speech_Line(3, 2550, 0.5f);
-					VK_Eye_Animates(3);
-					VK_Play_Speech_Line(0, 7915, 0.5f);
-				}
-				break;
-			case 7690:
-				VK_Play_Speech_Line(3, 2470, 0.5f);
-				VK_Subject_Reacts(20, 9, 8, 5);
-				VK_Play_Speech_Line(3, 2480, 0.5f);
-				VK_Play_Speech_Line(0, 7900, 0.5f);
-				break;
-			case 7680:
-				VK_Eye_Animates(3);
-				if (Game_Flag_Query(47)) {
-					VK_Subject_Reacts(70, -4, 14, 15);
-					VK_Play_Speech_Line(3, 2440, 0.5f);
-				} else {
-					VK_Play_Speech_Line(3, 2450, 0.5f);
-					VK_Subject_Reacts(70, 18, -4, 15);
-					VK_Play_Speech_Line(3, 2460, 0.5f);
-				}
-				break;
-			case 7670:
-				VK_Eye_Animates(3);
-				if (Game_Flag_Query(47)) {
-					VK_Play_Speech_Line(3, 2380, 0.5f);
-					VK_Play_Speech_Line(0, 7890, 0.5f);
-					VK_Play_Speech_Line(3, 2390, 0.5f);
-					VK_Subject_Reacts(90, -3, 14, 50);
-					VK_Play_Speech_Line(0, 7895, 0.5f);
-				} else {
-					VK_Subject_Reacts(80, 18, -3, 10);
-					VK_Play_Speech_Line(3, 2410, 0.5f);
-					VK_Play_Speech_Line(0, 8534, 0.5f);
-					VK_Play_Speech_Line(3, 2430, 0.5f);
-				}
-				break;
-			case 7671:
-			case 7672:
-			case 7673:
-			case 7674:
-			case 7675:
-			case 7676:
-			case 7677:
-			case 7678:
-			case 7679:
-			case 7681:
-			case 7682:
-			case 7683:
-			case 7684:
-			case 7685:
-			case 7686:
-			case 7687:
-			case 7688:
-			case 7689:
-			case 7691:
-			case 7692:
-			case 7693:
-			case 7694:
-			case 7695:
-			case 7696:
-			case 7697:
-			case 7698:
-			case 7699:
-			case 7700:
-			case 7701:
-			case 7702:
-			case 7703:
-			case 7704:
-				return;
-			default:
-				if ((unsigned int)(a1 - 7740) > 10) {
-					if (a1 == 7770) {
-						VK_Eye_Animates(2);
-						if (Game_Flag_Query(47)) {
-							VK_Play_Speech_Line(3, 2630, 0.5f);
-							VK_Subject_Reacts(99, 6, 15, 30);
-						} else {
-							VK_Play_Speech_Line(3, 2640, 0.5f);
-							VK_Subject_Reacts(99, 15, -4, 30);
-						}
-					}
-				} else if (a1 == 7740) {
-					VK_Subject_Reacts(60, 5, 6, 0);
-					VK_Play_Speech_Line(3, 2560, 0.5f);
-				} else if (a1 == 7750) {
-					if (Game_Flag_Query(47)) {
-						VK_Play_Speech_Line(3, 2580, 0.5f);
-						VK_Subject_Reacts(90, -5, 14, 20);
-						VK_Play_Speech_Line(3, 2590, 0.5f);
-						VK_Play_Speech_Line(0, 7920, 0.5f);
-					} else {
-						VK_Subject_Reacts(90, 17, 3, 20);
-						VK_Play_Speech_Line(3, 2600, 0.5f);
-						VK_Play_Speech_Line(0, 7925, 0.5f);
-						VK_Eye_Animates(3);
-						VK_Play_Speech_Line(3, 2610, 0.5f);
-						VK_Play_Speech_Line(0, 7930, 0.5f);
-					}
-				}
-				break;
-			}
-			break;
+			VK_Play_Speech_Line(3, 2610, 0.5f);
+			VK_Play_Speech_Line(0, 7930, 0.5f);
+		}
+		break;
+	case 7770:
+		VK_Eye_Animates(2);
+		if (Game_Flag_Query(47)) {
+			VK_Play_Speech_Line(3, 2630, 0.5f);
+			VK_Subject_Reacts(99, 6, 15, 30);
+		} else {
+			VK_Play_Speech_Line(3, 2640, 0.5f);
+			VK_Subject_Reacts(99, 15, -4, 30);
 		}
 		break;
 	}
@@ -2447,39 +1474,57 @@ void ScriptVK::sub_406088(int a1) {
 
 void ScriptVK::sub_407CF8(int a1) {
 	switch (a1) {
-	case 7495:
+	case 7385:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7490:
+	case 7390:
+		VK_Eye_Animates(3);
+		VK_Subject_Reacts(60, 15, -30, 2);
+		VK_Play_Speech_Line(15, 1260, 0.5f);
+		break;
+	case 7395:
+		VK_Eye_Animates(2);
+		VK_Subject_Reacts(90, -40, -10, 6);
+		VK_Play_Speech_Line(15, 1280, 0.5f);
+		break;
+	case 7400:
+		VK_Subject_Reacts(70, -10, -10, 0);
+		VK_Play_Speech_Line(15, 1300, 0.5f);
+		break;
+	case 7405:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7485:
+	case 7410:
+		VK_Subject_Reacts(100, 10, 10, 0);
+		VK_Play_Speech_Line(15, 1330, 0.5f);
+		break;
+	case 7415:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7480:
+	case 7420:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7475:
+	case 7425:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7470:
+	case 7430:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7465:
+	case 7435:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7460:
+	case 7440:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7455:
+	case 7445:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
@@ -2487,414 +1532,225 @@ void ScriptVK::sub_407CF8(int a1) {
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7445:
+	case 7455:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7440:
+	case 7460:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7435:
+	case 7465:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7430:
+	case 7470:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7425:
+	case 7475:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7420:
+	case 7480:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7415:
+	case 7485:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7410:
-		VK_Subject_Reacts(100, 10, 10, 0);
-		VK_Play_Speech_Line(15, 1330, 0.5f);
+	case 7490:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7405:
+	case 7495:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7400:
-		VK_Subject_Reacts(70, -10, -10, 0);
-		VK_Play_Speech_Line(15, 1300, 0.5f);
+	case 7515:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7395:
-		VK_Eye_Animates(2);
-		VK_Subject_Reacts(90, -40, -10, 6);
-		VK_Play_Speech_Line(15, 1280, 0.5f);
+	case 7525:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7390:
-		VK_Eye_Animates(3);
-		VK_Subject_Reacts(60, 15, -30, 2);
-		VK_Play_Speech_Line(15, 1260, 0.5f);
+	case 7535:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7385:
+	case 7540:
 		VK_Subject_Reacts(20, 10, 20, 0);
 		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
-	case 7386:
-	case 7387:
-	case 7388:
-	case 7389:
-	case 7391:
-	case 7392:
-	case 7393:
-	case 7394:
-	case 7396:
-	case 7397:
-	case 7398:
-	case 7399:
-	case 7401:
-	case 7402:
-	case 7403:
-	case 7404:
-	case 7406:
-	case 7407:
-	case 7408:
-	case 7409:
-	case 7411:
-	case 7412:
-	case 7413:
-	case 7414:
-	case 7416:
-	case 7417:
-	case 7418:
-	case 7419:
-	case 7421:
-	case 7422:
-	case 7423:
-	case 7424:
-	case 7426:
-	case 7427:
-	case 7428:
-	case 7429:
-	case 7431:
-	case 7432:
-	case 7433:
-	case 7434:
-	case 7436:
-	case 7437:
-	case 7438:
-	case 7439:
-	case 7441:
-	case 7442:
-	case 7443:
-	case 7444:
-	case 7446:
-	case 7447:
-	case 7448:
-	case 7449:
-	case 7451:
-	case 7452:
-	case 7453:
-	case 7454:
-	case 7456:
-	case 7457:
-	case 7458:
-	case 7459:
-	case 7461:
-	case 7462:
-	case 7463:
-	case 7464:
-	case 7466:
-	case 7467:
-	case 7468:
-	case 7469:
-	case 7471:
-	case 7472:
-	case 7473:
-	case 7474:
-	case 7476:
-	case 7477:
-	case 7478:
-	case 7479:
-	case 7481:
-	case 7482:
-	case 7483:
-	case 7484:
-	case 7486:
-	case 7487:
-	case 7488:
-	case 7489:
-	case 7491:
-	case 7492:
-	case 7493:
-	case 7494:
-		return;
-	default:
-		switch (a1) {
-		case 7635:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7620:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7605:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7600:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7595:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7585:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7580:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7565:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7550:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7540:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7535:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7525:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7515:
-			VK_Subject_Reacts(20, 10, 20, 0);
-			VK_Play_Speech_Line(15, 1240, 0.5f);
-			break;
-		case 7516:
-		case 7517:
-		case 7518:
-		case 7519:
-		case 7520:
-		case 7521:
-		case 7522:
-		case 7523:
-		case 7524:
-		case 7526:
-		case 7527:
-		case 7528:
-		case 7529:
-		case 7530:
-		case 7531:
-		case 7532:
-		case 7533:
-		case 7534:
-		case 7536:
-		case 7537:
-		case 7538:
-		case 7539:
-		case 7541:
-		case 7542:
-		case 7543:
-		case 7544:
-		case 7545:
-		case 7546:
-		case 7547:
-		case 7548:
-		case 7549:
-		case 7551:
-		case 7552:
-		case 7553:
-		case 7554:
-		case 7555:
-		case 7556:
-		case 7557:
-		case 7558:
-		case 7559:
-		case 7560:
-		case 7561:
-		case 7562:
-		case 7563:
-		case 7564:
-		case 7566:
-		case 7567:
-		case 7568:
-		case 7569:
-		case 7570:
-		case 7571:
-		case 7572:
-		case 7573:
-		case 7574:
-		case 7575:
-		case 7576:
-		case 7577:
-		case 7578:
-		case 7579:
-		case 7581:
-		case 7582:
-		case 7583:
-		case 7584:
-		case 7586:
-		case 7587:
-		case 7588:
-		case 7589:
-		case 7590:
-		case 7591:
-		case 7592:
-		case 7593:
-		case 7594:
-		case 7596:
-		case 7597:
-		case 7598:
-		case 7599:
-		case 7601:
-		case 7602:
-		case 7603:
-		case 7604:
-		case 7606:
-		case 7607:
-		case 7608:
-		case 7609:
-		case 7610:
-		case 7611:
-		case 7612:
-		case 7613:
-		case 7614:
-		case 7615:
-		case 7616:
-		case 7617:
-		case 7618:
-		case 7619:
-		case 7621:
-		case 7622:
-		case 7623:
-		case 7624:
-		case 7625:
-		case 7626:
-		case 7627:
-		case 7628:
-		case 7629:
-		case 7630:
-		case 7631:
-		case 7632:
-		case 7633:
-		case 7634:
-			return;
-		default:
-			switch (a1) {
-			case 7705:
-				VK_Subject_Reacts(20, 10, 20, 0);
-				VK_Play_Speech_Line(15, 1240, 0.5f);
-				break;
-			case 7690:
-				VK_Subject_Reacts(20, 10, 20, 0);
-				VK_Play_Speech_Line(15, 1240, 0.5f);
-				break;
-			case 7680:
-				VK_Subject_Reacts(20, 10, 20, 0);
-				VK_Play_Speech_Line(15, 1240, 0.5f);
-				break;
-			case 7670:
-				VK_Subject_Reacts(20, 10, 20, 0);
-				VK_Play_Speech_Line(15, 1240, 0.5f);
-				break;
-			case 7671:
-			case 7672:
-			case 7673:
-			case 7674:
-			case 7675:
-			case 7676:
-			case 7677:
-			case 7678:
-			case 7679:
-			case 7681:
-			case 7682:
-			case 7683:
-			case 7684:
-			case 7685:
-			case 7686:
-			case 7687:
-			case 7688:
-			case 7689:
-			case 7691:
-			case 7692:
-			case 7693:
-			case 7694:
-			case 7695:
-			case 7696:
-			case 7697:
-			case 7698:
-			case 7699:
-			case 7700:
-			case 7701:
-			case 7702:
-			case 7703:
-			case 7704:
-				return;
-			default:
-				if ((unsigned int)(a1 - 7740) > 10) {
-					if (a1 == 7770) {
-						VK_Subject_Reacts(20, 10, 20, 0);
-						VK_Play_Speech_Line(15, 1240, 0.5f);
-					}
-				} else if (a1 == 7740) {
-					VK_Subject_Reacts(20, 10, 20, 0);
-					VK_Play_Speech_Line(15, 1240, 0.5f);
-				} else if (a1 == 7750) {
-					VK_Subject_Reacts(20, 10, 20, 0);
-					VK_Play_Speech_Line(15, 1240, 0.5f);
-				}
-				break;
-			}
-			break;
-		}
+	case 7550:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7565:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7580:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7585:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7595:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7600:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7605:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7620:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7635:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7670:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7680:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7690:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7705:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7740:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7750:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
+		break;
+	case 7770:
+		VK_Subject_Reacts(20, 10, 20, 0);
+		VK_Play_Speech_Line(15, 1240, 0.5f);
 		break;
 	}
 }
 
 void ScriptVK::sub_40897C(int a1) {
 	switch (a1) {
-	case 7495:
-		VK_Eye_Animates(2);
-		VK_Play_Speech_Line(14, 1320, 0.5f);
-		VK_Subject_Reacts(10, 8, 7, 7);
+	case 7385:
+		VK_Eye_Animates(1);
+		VK_Subject_Reacts(54, 0, 0, 0);
+		VK_Play_Speech_Line(14, 900, 0.5f);
+		VK_Play_Speech_Line(14, 910, 0.5f);
+		VK_Play_Speech_Line(0, 8225, 0.5f);
 		break;
-	case 7490:
-		VK_Play_Speech_Line(14, 1290, 0.5f);
-		VK_Play_Speech_Line(14, 1300, 0.5f);
-		VK_Subject_Reacts(10, 11, 10, 0);
-		VK_Play_Speech_Line(14, 1310, 0.5f);
+	case 7390:
+		VK_Subject_Reacts(48, 0, 0, 3);
+		VK_Play_Speech_Line(14, 920, 0.5f);
+		VK_Play_Speech_Line(0, 8230, 0.5f);
 		break;
-	case 7485:
-		VK_Subject_Reacts(70, 8, 9, 10);
+	case 7395:
+		VK_Play_Speech_Line(14, 930, 0.5f);
 		VK_Eye_Animates(1);
-		VK_Play_Speech_Line(14, 1280, 0.5f);
+		VK_Subject_Reacts(50, 0, 0, 8);
+		VK_Play_Speech_Line(14, 940, 0.5f);
+		VK_Play_Speech_Line(0, 8235, 0.5f);
 		break;
-	case 7480:
-		VK_Subject_Reacts(60, 10, 8, -6);
-		VK_Play_Speech_Line(14, 1270, 0.5f);
+	case 7400:
+		VK_Play_Speech_Line(14, 950, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Subject_Reacts(10, -5, -6, 2);
+		VK_Play_Speech_Line(14, 960, 0.5f);
 		break;
-	case 7475:
-		VK_Play_Speech_Line(14, 1250, 0.5f);
-		VK_Subject_Reacts(30, 9, 7, -5);
-		VK_Play_Speech_Line(14, 1260, 0.5f);
+	case 7405:
+		VK_Subject_Reacts(25, 8, 7, 4);
+		VK_Play_Speech_Line(14, 970, 0.5f);
+		VK_Play_Speech_Line(0, 8240, 0.5f);
+		VK_Play_Speech_Line(14, 980, 0.5f);
 		break;
-	case 7470:
-		VK_Subject_Reacts(50, -4, 0, -5);
-		VK_Play_Speech_Line(14, 1240, 0.5f);
+	case 7410:
+		VK_Subject_Reacts(40, -6, -5, 5);
+		VK_Play_Speech_Line(14, 990, 0.5f);
+		VK_Play_Speech_Line(0, 8245, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(14, 1000, 0.5f);
+		VK_Play_Speech_Line(0, 8250, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Subject_Reacts(70, 8, 6, 0);
+		VK_Play_Speech_Line(14, 1010, 0.5f);
+		break;
+	case 7415:
+		VK_Subject_Reacts(25, 9, 6, 5);
+		VK_Play_Speech_Line(14, 1020, 0.5f);
+		break;
+	case 7420:
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(14, 1030, 0.5f);
+		VK_Play_Speech_Line(0, 8255, 0.5f);
+		VK_Subject_Reacts(30, 7, 5, 3);
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(14, 1040, 0.5f);
+		break;
+	case 7425:
+		VK_Play_Speech_Line(14, 1050, 0.5f);
+		VK_Play_Speech_Line(14, 1060, 0.5f);
+		VK_Play_Speech_Line(0, 8260, 0.5f);
+		VK_Subject_Reacts(5, 5, 6, -5);
+		VK_Play_Speech_Line(14, 1070, 0.5f);
+		break;
+	case 7430:
+		VK_Subject_Reacts(15, 7, 6, -6);
+		VK_Play_Speech_Line(14, 1080, 0.5f);
+		break;
+	case 7435:
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(14, 1100, 0.5f);
+		VK_Subject_Reacts(25, 8, 5, -7);
+		VK_Play_Speech_Line(0, 8265, 0.5f);
+		VK_Play_Speech_Line(14, 1110, 0.5f);
+		VK_Play_Speech_Line(14, 1120, 0.5f);
+		break;
+	case 7440:
+		VK_Subject_Reacts(30, 8, 6, 0);
+		VK_Play_Speech_Line(14, 1130, 0.5f);
+		break;
+	case 7445:
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(14, 1140, 0.5f);
+		VK_Subject_Reacts(80, 8, 8, -10);
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(14, 1150, 0.5f);
+		break;
+	case 7450:
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(14, 1160, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Subject_Reacts(60, 8, 8, -5);
+		VK_Play_Speech_Line(14, 1170, 0.5f);
+		break;
+	case 7455:
+		VK_Subject_Reacts(30, 7, 6, 3);
+		VK_Play_Speech_Line(14, 1180, 0.5f);
+		break;
+	case 7460:
+		VK_Subject_Reacts(10, 4, 4, 2);
+		VK_Play_Speech_Line(14, 1190, 0.5f);
 		break;
 	case 7465:
 		VK_Subject_Reacts(15, 5, 3, -5);
@@ -2905,532 +1761,221 @@ void ScriptVK::sub_40897C(int a1) {
 			VK_Eye_Animates(1);
 		}
 		break;
-	case 7460:
-		VK_Subject_Reacts(10, 4, 4, 2);
-		VK_Play_Speech_Line(14, 1190, 0.5f);
+	case 7470:
+		VK_Subject_Reacts(50, -4, 0, -5);
+		VK_Play_Speech_Line(14, 1240, 0.5f);
 		break;
-	case 7455:
-		VK_Subject_Reacts(30, 7, 6, 3);
-		VK_Play_Speech_Line(14, 1180, 0.5f);
+	case 7475:
+		VK_Play_Speech_Line(14, 1250, 0.5f);
+		VK_Subject_Reacts(30, 9, 7, -5);
+		VK_Play_Speech_Line(14, 1260, 0.5f);
 		break;
-	case 7450:
-		VK_Eye_Animates(2);
-		VK_Play_Speech_Line(14, 1160, 0.5f);
+	case 7480:
+		VK_Subject_Reacts(60, 10, 8, -6);
+		VK_Play_Speech_Line(14, 1270, 0.5f);
+		break;
+	case 7485:
+		VK_Subject_Reacts(70, 8, 9, 10);
 		VK_Eye_Animates(1);
-		VK_Subject_Reacts(60, 8, 8, -5);
-		VK_Play_Speech_Line(14, 1170, 0.5f);
+		VK_Play_Speech_Line(14, 1280, 0.5f);
 		break;
-	case 7445:
+	case 7490:
+		VK_Play_Speech_Line(14, 1290, 0.5f);
+		VK_Play_Speech_Line(14, 1300, 0.5f);
+		VK_Subject_Reacts(10, 11, 10, 0);
+		VK_Play_Speech_Line(14, 1310, 0.5f);
+		break;
+	case 7495:
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(14, 1320, 0.5f);
+		VK_Subject_Reacts(10, 8, 7, 7);
+		break;
+	case 7515:
+		VK_Subject_Reacts(25, 7, 7, 0);
 		VK_Eye_Animates(1);
-		VK_Play_Speech_Line(14, 1140, 0.5f);
-		VK_Subject_Reacts(80, 8, 8, -10);
-		VK_Eye_Animates(3);
-		VK_Play_Speech_Line(14, 1150, 0.5f);
+		VK_Play_Speech_Line(14, 1330, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(14, 1340, 0.5f);
 		break;
-	case 7440:
-		VK_Subject_Reacts(30, 8, 6, 0);
-		VK_Play_Speech_Line(14, 1130, 0.5f);
+	case 7525:
+		VK_Play_Speech_Line(14, 1350, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Subject_Reacts(10, 7, 6, 6);
 		break;
-	case 7435:
+	case 7535:
 		VK_Eye_Animates(1);
-		VK_Play_Speech_Line(14, 1100, 0.5f);
-		VK_Subject_Reacts(25, 8, 5, -7);
-		VK_Play_Speech_Line(0, 8265, 0.5f);
-		VK_Play_Speech_Line(14, 1110, 0.5f);
-		VK_Play_Speech_Line(14, 1120, 0.5f);
+		VK_Play_Speech_Line(14, 1360, 0.5f);
+		VK_Play_Speech_Line(0, 8275, 0.5f);
+		VK_Subject_Reacts(10, 9, 7, -4);
+		VK_Play_Speech_Line(0, 8280, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(14, 1380, 0.5f);
+		VK_Play_Speech_Line(14, 1390, 0.5f);
+		VK_Play_Speech_Line(0, 8285, 0.5f);
 		break;
-	case 7430:
-		VK_Subject_Reacts(15, 7, 6, -6);
-		VK_Play_Speech_Line(14, 1080, 0.5f);
+	case 7540:
+		VK_Play_Speech_Line(14, 1400, 0.5f);
+		VK_Subject_Reacts(30, 10, 9, 10);
+		VK_Play_Speech_Line(14, 1410, 0.5f);
 		break;
-	case 7425:
-		VK_Play_Speech_Line(14, 1050, 0.5f);
-		VK_Play_Speech_Line(14, 1060, 0.5f);
-		VK_Play_Speech_Line(0, 8260, 0.5f);
-		VK_Subject_Reacts(5, 5, 6, -5);
-		VK_Play_Speech_Line(14, 1070, 0.5f);
+	case 7550:
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(14, 1420, 0.5f);
+		VK_Subject_Reacts(20, 7, 7, -5);
+		VK_Play_Speech_Line(14, 1430, 0.5f);
+		if (Random_Query(0, 1) == 1) {
+			VK_Eye_Animates(1);
+		}
 		break;
-	case 7420:
+	case 7565:
+		VK_Play_Speech_Line(14, 1440, 0.5f);
+		VK_Play_Speech_Line(0, 8295, 0.5f);
 		VK_Eye_Animates(1);
-		VK_Play_Speech_Line(14, 1030, 0.5f);
-		VK_Play_Speech_Line(0, 8255, 0.5f);
-		VK_Subject_Reacts(30, 7, 5, 3);
+		VK_Play_Speech_Line(14, 1450, 0.5f);
+		VK_Play_Speech_Line(0, 7570, 0.5f);
+		VK_Play_Speech_Line(0, 7575, 0.5f);
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(14, 1460, 0.5f);
+		VK_Play_Speech_Line(0, 8300, 0.5f);
+		VK_Subject_Reacts(90, 8, 9, 18);
+		VK_Play_Speech_Line(14, 1470, 0.5f);
 		VK_Eye_Animates(3);
-		VK_Play_Speech_Line(14, 1040, 0.5f);
 		break;
-	case 7415:
-		VK_Subject_Reacts(25, 9, 6, 5);
-		VK_Play_Speech_Line(14, 1020, 0.5f);
+	case 7580:
+		VK_Subject_Reacts(20, 9, 7, 0);
+		VK_Play_Speech_Line(14, 1480, 0.5f);
+		VK_Play_Speech_Line(0, 8305, 0.5f);
+		VK_Play_Speech_Line(14, 1490, 0.5f);
 		break;
-	case 7410:
-		VK_Subject_Reacts(40, -6, -5, 5);
-		VK_Play_Speech_Line(14, 990, 0.5f);
-		VK_Play_Speech_Line(0, 8245, 0.5f);
+	case 7585:
+		VK_Play_Speech_Line(14, 1500, 0.5f);
+		VK_Play_Speech_Line(0, 7590, 0.5f);
 		VK_Eye_Animates(1);
-		VK_Play_Speech_Line(14, 1000, 0.5f);
-		VK_Play_Speech_Line(0, 8250, 0.5f);
+		VK_Subject_Reacts(10, 8, 7, 5);
+		VK_Play_Speech_Line(14, 1510, 0.5f);
+		VK_Play_Speech_Line(14, 1520, 0.5f);
+		break;
+	case 7595:
 		VK_Eye_Animates(1);
-		VK_Subject_Reacts(70, 8, 6, 0);
-		VK_Play_Speech_Line(14, 1010, 0.5f);
+		VK_Subject_Reacts(40, 10, 9, 15);
+		VK_Play_Speech_Line(14, 1530, 0.5f);
+		VK_Eye_Animates(2);
 		break;
-	case 7405:
-		VK_Subject_Reacts(25, 8, 7, 4);
-		VK_Play_Speech_Line(14, 970, 0.5f);
-		VK_Play_Speech_Line(0, 8240, 0.5f);
-		VK_Play_Speech_Line(14, 980, 0.5f);
+	case 7600:
+		VK_Subject_Reacts(20, 8, 8, 5);
+		VK_Play_Speech_Line(14, 1540, 0.5f);
 		break;
-	case 7400:
-		VK_Play_Speech_Line(14, 950, 0.5f);
+	case 7605:
 		VK_Eye_Animates(1);
-		VK_Subject_Reacts(10, -5, -6, 2);
-		VK_Play_Speech_Line(14, 960, 0.5f);
+		VK_Subject_Reacts(40, 9, 8, 10);
+		VK_Play_Speech_Line(14, 1550, 0.5f);
 		break;
-	case 7395:
-		VK_Play_Speech_Line(14, 930, 0.5f);
+	case 7620:
+		VK_Play_Speech_Line(14, 1560, 0.5f);
 		VK_Eye_Animates(1);
-		VK_Subject_Reacts(50, 0, 0, 8);
-		VK_Play_Speech_Line(14, 940, 0.5f);
-		VK_Play_Speech_Line(0, 8235, 0.5f);
+		VK_Play_Speech_Line(0, 7630, 0.5f);
+		VK_Eye_Animates(3);
+		VK_Play_Speech_Line(14, 1570, 0.5f);
+		VK_Subject_Reacts(10, 10, 9, 10);
 		break;
-	case 7390:
-		VK_Subject_Reacts(48, 0, 0, 3);
-		VK_Play_Speech_Line(14, 920, 0.5f);
-		VK_Play_Speech_Line(0, 8230, 0.5f);
+	case 7635:
+		VK_Play_Speech_Line(14, 1580, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(0, 8310, 0.5f);
+		VK_Play_Speech_Line(0, 7645, 0.5f);
+		VK_Play_Speech_Line(0, 7650, 0.5f);
+		VK_Play_Speech_Line(0, 7655, 0.5f);
+		VK_Play_Speech_Line(0, 7660, 0.5f);
+		VK_Play_Speech_Line(0, 7665, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Subject_Reacts(60, 8, 8, 40);
+		VK_Play_Speech_Line(14, 1590, 0.5f);
+		VK_Play_Speech_Line(0, 8315, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Subject_Reacts(85, 10, 11, 0);
+		VK_Play_Speech_Line(14, 1600, 0.5f);
+		VK_Eye_Animates(3);
 		break;
-	case 7385:
+	case 7670:
+		VK_Subject_Reacts(50, 12, 7, 10);
+		VK_Play_Speech_Line(14, 1620, 0.5f);
 		VK_Eye_Animates(1);
-		VK_Subject_Reacts(54, 0, 0, 0);
-		VK_Play_Speech_Line(14, 900, 0.5f);
-		VK_Play_Speech_Line(14, 910, 0.5f);
-		VK_Play_Speech_Line(0, 8225, 0.5f);
+		VK_Play_Speech_Line(14, 1630, 0.5f);
 		break;
-	case 7386:
-	case 7387:
-	case 7388:
-	case 7389:
-	case 7391:
-	case 7392:
-	case 7393:
-	case 7394:
-	case 7396:
-	case 7397:
-	case 7398:
-	case 7399:
-	case 7401:
-	case 7402:
-	case 7403:
-	case 7404:
-	case 7406:
-	case 7407:
-	case 7408:
-	case 7409:
-	case 7411:
-	case 7412:
-	case 7413:
-	case 7414:
-	case 7416:
-	case 7417:
-	case 7418:
-	case 7419:
-	case 7421:
-	case 7422:
-	case 7423:
-	case 7424:
-	case 7426:
-	case 7427:
-	case 7428:
-	case 7429:
-	case 7431:
-	case 7432:
-	case 7433:
-	case 7434:
-	case 7436:
-	case 7437:
-	case 7438:
-	case 7439:
-	case 7441:
-	case 7442:
-	case 7443:
-	case 7444:
-	case 7446:
-	case 7447:
-	case 7448:
-	case 7449:
-	case 7451:
-	case 7452:
-	case 7453:
-	case 7454:
-	case 7456:
-	case 7457:
-	case 7458:
-	case 7459:
-	case 7461:
-	case 7462:
-	case 7463:
-	case 7464:
-	case 7466:
-	case 7467:
-	case 7468:
-	case 7469:
-	case 7471:
-	case 7472:
-	case 7473:
-	case 7474:
-	case 7476:
-	case 7477:
-	case 7478:
-	case 7479:
-	case 7481:
-	case 7482:
-	case 7483:
-	case 7484:
-	case 7486:
-	case 7487:
-	case 7488:
-	case 7489:
-	case 7491:
-	case 7492:
-	case 7493:
-	case 7494:
-		return;
-	default:
-		switch (a1) {
-		case 7635:
-			VK_Play_Speech_Line(14, 1580, 0.5f);
-			VK_Eye_Animates(1);
-			VK_Play_Speech_Line(0, 8310, 0.5f);
-			VK_Play_Speech_Line(0, 7645, 0.5f);
-			VK_Play_Speech_Line(0, 7650, 0.5f);
-			VK_Play_Speech_Line(0, 7655, 0.5f);
-			VK_Play_Speech_Line(0, 7660, 0.5f);
-			VK_Play_Speech_Line(0, 7665, 0.5f);
-			VK_Eye_Animates(2);
-			VK_Subject_Reacts(60, 8, 8, 40);
-			VK_Play_Speech_Line(14, 1590, 0.5f);
-			VK_Play_Speech_Line(0, 8315, 0.5f);
-			VK_Eye_Animates(1);
-			VK_Subject_Reacts(85, 10, 11, 0);
-			VK_Play_Speech_Line(14, 1600, 0.5f);
-			VK_Eye_Animates(3);
-			break;
-		case 7620:
-			VK_Play_Speech_Line(14, 1560, 0.5f);
-			VK_Eye_Animates(1);
-			VK_Play_Speech_Line(0, 7630, 0.5f);
-			VK_Eye_Animates(3);
-			VK_Play_Speech_Line(14, 1570, 0.5f);
-			VK_Subject_Reacts(10, 10, 9, 10);
-			break;
-		case 7605:
-			VK_Eye_Animates(1);
-			VK_Subject_Reacts(40, 9, 8, 10);
-			VK_Play_Speech_Line(14, 1550, 0.5f);
-			break;
-		case 7600:
-			VK_Subject_Reacts(20, 8, 8, 5);
-			VK_Play_Speech_Line(14, 1540, 0.5f);
-			break;
-		case 7595:
+	case 7680:
+		VK_Play_Speech_Line(14, 1640, 0.5f);
+		VK_Subject_Reacts(15, 5, 6, 5);
+		if (Random_Query(0, 1) == 1) {
 			VK_Eye_Animates(1);
-			VK_Subject_Reacts(40, 10, 9, 15);
-			VK_Play_Speech_Line(14, 1530, 0.5f);
-			VK_Eye_Animates(2);
-			break;
-		case 7585:
-			VK_Play_Speech_Line(14, 1500, 0.5f);
-			VK_Play_Speech_Line(0, 7590, 0.5f);
-			VK_Eye_Animates(1);
-			VK_Subject_Reacts(10, 8, 7, 5);
-			VK_Play_Speech_Line(14, 1510, 0.5f);
-			VK_Play_Speech_Line(14, 1520, 0.5f);
-			break;
-		case 7580:
-			VK_Subject_Reacts(20, 9, 7, 0);
-			VK_Play_Speech_Line(14, 1480, 0.5f);
-			VK_Play_Speech_Line(0, 8305, 0.5f);
-			VK_Play_Speech_Line(14, 1490, 0.5f);
-			break;
-		case 7565:
-			VK_Play_Speech_Line(14, 1440, 0.5f);
-			VK_Play_Speech_Line(0, 8295, 0.5f);
-			VK_Eye_Animates(1);
-			VK_Play_Speech_Line(14, 1450, 0.5f);
-			VK_Play_Speech_Line(0, 7570, 0.5f);
-			VK_Play_Speech_Line(0, 7575, 0.5f);
-			VK_Eye_Animates(3);
-			VK_Play_Speech_Line(14, 1460, 0.5f);
-			VK_Play_Speech_Line(0, 8300, 0.5f);
-			VK_Subject_Reacts(90, 8, 9, 18);
-			VK_Play_Speech_Line(14, 1470, 0.5f);
-			VK_Eye_Animates(3);
-			break;
-		case 7550:
+		}
+		VK_Play_Speech_Line(0, 8320, 0.5f);
+		VK_Play_Speech_Line(14, 1650, 0.5f);
+		break;
+	case 7690:
+		VK_Eye_Animates(2);
+		VK_Subject_Reacts(50, 14, 13, 15);
+		VK_Play_Speech_Line(14, 1660, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(0, 8325, 0.5f);
+		VK_Play_Speech_Line(14, 1670, 0.5f);
+		break;
+	case 7705:
+		VK_Play_Speech_Line(14, 1680, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(0, 7720, 0.5f);
+		VK_Eye_Animates(1);
+		VK_Subject_Reacts(40, 12, 10, 0);
+		VK_Play_Speech_Line(0, 7725, 0.5f);
+		VK_Play_Speech_Line(0, 7730, 0.5f);
+		VK_Subject_Reacts(55, 6, 6, 0);
+		VK_Eye_Animates(1);
+		VK_Play_Speech_Line(0, 7735, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Subject_Reacts(70, 11, 9, 100);
+		VK_Play_Speech_Line(14, 1690, 0.5f);
+		VK_Eye_Animates(2);
+		break;
+	case 7740:
+		VK_Subject_Reacts(30, 4, 3, 3);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(14, 1700, 0.5f);
+		if (Random_Query(0, 1) == 1) {
 			VK_Eye_Animates(1);
-			VK_Play_Speech_Line(14, 1420, 0.5f);
-			VK_Subject_Reacts(20, 7, 7, -5);
-			VK_Play_Speech_Line(14, 1430, 0.5f);
-			if (Random_Query(0, 1) == 1) {
-				VK_Eye_Animates(1);
-			}
-			break;
-		case 7540:
-			VK_Play_Speech_Line(14, 1400, 0.5f);
-			VK_Subject_Reacts(30, 10, 9, 10);
-			VK_Play_Speech_Line(14, 1410, 0.5f);
-			break;
-		case 7535:
+		}
+		VK_Play_Speech_Line(14, 1710, 0.5f);
+		VK_Play_Speech_Line(14, 1720, 0.5f);
+		if (Random_Query(0, 1) == 1) {
 			VK_Eye_Animates(1);
-			VK_Play_Speech_Line(14, 1360, 0.5f);
-			VK_Play_Speech_Line(0, 8275, 0.5f);
-			VK_Subject_Reacts(10, 9, 7, -4);
-			VK_Play_Speech_Line(0, 8280, 0.5f);
+		}
+		VK_Play_Speech_Line(14, 1730, 0.5f);
+		break;
+	case 7750:
+		if (Random_Query(0, 1) == 1) {
 			VK_Eye_Animates(1);
-			VK_Play_Speech_Line(14, 1380, 0.5f);
-			VK_Play_Speech_Line(14, 1390, 0.5f);
-			VK_Play_Speech_Line(0, 8285, 0.5f);
-			break;
-		case 7525:
-			VK_Play_Speech_Line(14, 1350, 0.5f);
+		}
+		VK_Subject_Reacts(10, 8, 5, 0);
+		VK_Play_Speech_Line(14, 1740, 0.5f);
+		VK_Play_Speech_Line(0, 8330, 0.5f);
+		if (Random_Query(0, 1) == 1) {
 			VK_Eye_Animates(1);
-			VK_Subject_Reacts(10, 7, 6, 6);
-			break;
-		case 7515:
-			VK_Subject_Reacts(25, 7, 7, 0);
+		}
+		VK_Play_Speech_Line(14, 1750, 0.5f);
+		VK_Subject_Reacts(25, 7, 5, 8);
+		VK_Play_Speech_Line(14, 1760, 0.5f);
+		VK_Play_Speech_Line(14, 1770, 0.5f);
+		break;
+	case 7770:
+		VK_Play_Speech_Line(14, 1780, 0.5f);
+		if (Random_Query(0, 1) == 1) {
 			VK_Eye_Animates(1);
-			VK_Play_Speech_Line(14, 1330, 0.5f);
+		}
+		VK_Play_Speech_Line(0, 8335, 0.5f);
+		VK_Eye_Animates(2);
+		VK_Play_Speech_Line(14, 1790, 0.5f);
+		if (Random_Query(0, 1) == 1) {
 			VK_Eye_Animates(1);
-			VK_Play_Speech_Line(14, 1340, 0.5f);
-			break;
-		case 7516:
-		case 7517:
-		case 7518:
-		case 7519:
-		case 7520:
-		case 7521:
-		case 7522:
-		case 7523:
-		case 7524:
-		case 7526:
-		case 7527:
-		case 7528:
-		case 7529:
-		case 7530:
-		case 7531:
-		case 7532:
-		case 7533:
-		case 7534:
-		case 7536:
-		case 7537:
-		case 7538:
-		case 7539:
-		case 7541:
-		case 7542:
-		case 7543:
-		case 7544:
-		case 7545:
-		case 7546:
-		case 7547:
-		case 7548:
-		case 7549:
-		case 7551:
-		case 7552:
-		case 7553:
-		case 7554:
-		case 7555:
-		case 7556:
-		case 7557:
-		case 7558:
-		case 7559:
-		case 7560:
-		case 7561:
-		case 7562:
-		case 7563:
-		case 7564:
-		case 7566:
-		case 7567:
-		case 7568:
-		case 7569:
-		case 7570:
-		case 7571:
-		case 7572:
-		case 7573:
-		case 7574:
-		case 7575:
-		case 7576:
-		case 7577:
-		case 7578:
-		case 7579:
-		case 7581:
-		case 7582:
-		case 7583:
-		case 7584:
-		case 7586:
-		case 7587:
-		case 7588:
-		case 7589:
-		case 7590:
-		case 7591:
-		case 7592:
-		case 7593:
-		case 7594:
-		case 7596:
-		case 7597:
-		case 7598:
-		case 7599:
-		case 7601:
-		case 7602:
-		case 7603:
-		case 7604:
-		case 7606:
-		case 7607:
-		case 7608:
-		case 7609:
-		case 7610:
-		case 7611:
-		case 7612:
-		case 7613:
-		case 7614:
-		case 7615:
-		case 7616:
-		case 7617:
-		case 7618:
-		case 7619:
-		case 7621:
-		case 7622:
-		case 7623:
-		case 7624:
-		case 7625:
-		case 7626:
-		case 7627:
-		case 7628:
-		case 7629:
-		case 7630:
-		case 7631:
-		case 7632:
-		case 7633:
-		case 7634:
-			return;
-		default:
-			switch (a1) {
-			case 7705:
-				VK_Play_Speech_Line(14, 1680, 0.5f);
-				VK_Eye_Animates(1);
-				VK_Play_Speech_Line(0, 7720, 0.5f);
-				VK_Eye_Animates(1);
-				VK_Subject_Reacts(40, 12, 10, 0);
-				VK_Play_Speech_Line(0, 7725, 0.5f);
-				VK_Play_Speech_Line(0, 7730, 0.5f);
-				VK_Subject_Reacts(55, 6, 6, 0);
-				VK_Eye_Animates(1);
-				VK_Play_Speech_Line(0, 7735, 0.5f);
-				VK_Eye_Animates(2);
-				VK_Subject_Reacts(70, 11, 9, 100);
-				VK_Play_Speech_Line(14, 1690, 0.5f);
-				VK_Eye_Animates(2);
-				break;
-			case 7690:
-				VK_Eye_Animates(2);
-				VK_Subject_Reacts(50, 14, 13, 15);
-				VK_Play_Speech_Line(14, 1660, 0.5f);
-				VK_Eye_Animates(1);
-				VK_Play_Speech_Line(0, 8325, 0.5f);
-				VK_Play_Speech_Line(14, 1670, 0.5f);
-				break;
-			case 7680:
-				VK_Play_Speech_Line(14, 1640, 0.5f);
-				VK_Subject_Reacts(15, 5, 6, 5);
-				if (Random_Query(0, 1) == 1) {
-					VK_Eye_Animates(1);
-				}
-				VK_Play_Speech_Line(0, 8320, 0.5f);
-				VK_Play_Speech_Line(14, 1650, 0.5f);
-				break;
-			case 7670:
-				VK_Subject_Reacts(50, 12, 7, 10);
-				VK_Play_Speech_Line(14, 1620, 0.5f);
-				VK_Eye_Animates(1);
-				VK_Play_Speech_Line(14, 1630, 0.5f);
-				break;
-			case 7671:
-			case 7672:
-			case 7673:
-			case 7674:
-			case 7675:
-			case 7676:
-			case 7677:
-			case 7678:
-			case 7679:
-			case 7681:
-			case 7682:
-			case 7683:
-			case 7684:
-			case 7685:
-			case 7686:
-			case 7687:
-			case 7688:
-			case 7689:
-			case 7691:
-			case 7692:
-			case 7693:
-			case 7694:
-			case 7695:
-			case 7696:
-			case 7697:
-			case 7698:
-			case 7699:
-			case 7700:
-			case 7701:
-			case 7702:
-			case 7703:
-			case 7704:
-				return;
-			default:
-				if ((unsigned int)(a1 - 7740) > 10) {
-					if (a1 == 7770) {
-						VK_Play_Speech_Line(14, 1780, 0.5f);
-						if (Random_Query(0, 1) == 1) {
-							VK_Eye_Animates(1);
-						}
-						VK_Play_Speech_Line(0, 8335, 0.5f);
-						VK_Eye_Animates(2);
-						VK_Play_Speech_Line(14, 1790, 0.5f);
-						if (Random_Query(0, 1) == 1) {
-							VK_Eye_Animates(1);
-						}
-						VK_Subject_Reacts(30, 7, 7, 10);
-					}
-				} else if (a1 == 7740) {
-					VK_Subject_Reacts(30, 4, 3, 3);
-					VK_Eye_Animates(2);
-					VK_Play_Speech_Line(14, 1700, 0.5f);
-					if (Random_Query(0, 1) == 1) {
-						VK_Eye_Animates(1);
-					}
-					VK_Play_Speech_Line(14, 1710, 0.5f);
-					VK_Play_Speech_Line(14, 1720, 0.5f);
-					if (Random_Query(0, 1) == 1) {
-						VK_Eye_Animates(1);
-					}
-					VK_Play_Speech_Line(14, 1730, 0.5f);
-				} else if (a1 == 7750) {
-					if (Random_Query(0, 1) == 1) {
-						VK_Eye_Animates(1);
-					}
-					VK_Subject_Reacts(10, 8, 5, 0);
-					VK_Play_Speech_Line(14, 1740, 0.5f);
-					VK_Play_Speech_Line(0, 8330, 0.5f);
-					if (Random_Query(0, 1) == 1) {
-						VK_Eye_Animates(1);
-					}
-					VK_Play_Speech_Line(14, 1750, 0.5f);
-					VK_Subject_Reacts(25, 7, 5, 8);
-					VK_Play_Speech_Line(14, 1760, 0.5f);
-					VK_Play_Speech_Line(14, 1770, 0.5f);
-				}
-				break;
-			}
-			break;
 		}
+		VK_Subject_Reacts(30, 7, 7, 10);
 		break;
 	}
 }
@@ -3452,8 +1997,6 @@ void ScriptVK::sub_40A300(int a1, int a2) {
 	case 3:
 		sub_40A510(7385);
 		break;
-	default:
-		return;
 	}
 }
 
@@ -3474,8 +2017,6 @@ void ScriptVK::sub_40A350(int a1, int a2) {
 	case 3:
 		sub_40A470(7390);
 		break;
-	default:
-		return;
 	}
 }
 
@@ -3496,8 +2037,6 @@ void ScriptVK::sub_40A3A0(int a1, int a2) {
 	case 3:
 		sub_40A3F0(7395);
 		break;
-	default:
-		return;
 	}
 }
 
diff --git a/engines/bladerunner/suspects_database.cpp b/engines/bladerunner/suspects_database.cpp
index 9c447841e9..5c77356d1c 100644
--- a/engines/bladerunner/suspects_database.cpp
+++ b/engines/bladerunner/suspects_database.cpp
@@ -92,12 +92,12 @@ bool SuspectDatabaseEntry::addIdentityClue(int clueId) {
 	return true;
 }
 
-bool SuspectDatabaseEntry::addPhotoClue(int a1, int a2) {
+bool SuspectDatabaseEntry::addPhotoClue(int shapeId, int clueId) {
 	if (_photoCluesCount >= PHOTO_CLUES_COUNT) {
 		return false;
 	}
-	_photoClues[_photoCluesCount][0] = a2;
-	_photoClues[_photoCluesCount][1] = a1;
+	_photoClues[_photoCluesCount][0] = clueId;
+	_photoClues[_photoCluesCount][1] = shapeId;
 	_photoClues[_photoCluesCount][2] = -1;
 
 	_photoCluesCount++;
diff --git a/engines/bladerunner/suspects_database.h b/engines/bladerunner/suspects_database.h
index 472e340474..2b087909bd 100644
--- a/engines/bladerunner/suspects_database.h
+++ b/engines/bladerunner/suspects_database.h
@@ -69,7 +69,7 @@ public:
 	bool addNonReplicantClue(int clueId);
 	bool addOtherClue(int clueId);
 	bool addIdentityClue(int clueId);
-	bool addPhotoClue(int a1, int a2);
+	bool addPhotoClue(int shapeId, int clueIndex);
 
 	const char *getName();
 	bool hasMOClue(int clueId);
diff --git a/engines/bladerunner/text_resource.cpp b/engines/bladerunner/text_resource.cpp
index 03460d039f..bf82721872 100644
--- a/engines/bladerunner/text_resource.cpp
+++ b/engines/bladerunner/text_resource.cpp
@@ -78,7 +78,7 @@ bool TextResource::open(const char *name) {
 
 	s->read(_strings, remain);
 
-#if 0
+#if _DEBUG
 	debug("\n%s\n----------------", resName);
 	for (uint32 i = 0; i != (uint32)_count; ++i) {
 		debug("%3d: %s", i, getText(i));