BLADERUNNER: Cleanup of scripts at start of chapter 5

11 files changed, 105 insertions, 63 deletions

diff --git a/engines/bladerunner/script/ai/clovis.cpp b/engines/bladerunner/script/ai/clovis.cpp
index 653dd3ee3c..a2d8cf3e16 100644
--- a/engines/bladerunner/script/ai/clovis.cpp
+++ b/engines/bladerunner/script/ai/clovis.cpp
@@ -63,10 +63,10 @@ bool AIScriptClovis::Update() {
 	}
 
 	if ( Global_Variable_Query(kVariableChapter) == 4
-	 && !Game_Flag_Query(542)
+	 && !Game_Flag_Query(kFlagClovisChapter4Started)
 	) {
-		Game_Flag_Set(542);
-		Actor_Set_Goal_Number(kActorClovis, 400);
+		Game_Flag_Set(kFlagClovisChapter4Started);
+		Actor_Set_Goal_Number(kActorClovis, kGoalClovisStartChapter4);
 		return true;
 	}
 
@@ -82,7 +82,7 @@ bool AIScriptClovis::Update() {
 		Actor_Set_Goal_Number(kActorClovis, 512);
 	}
 
-	if ( Game_Flag_Query(653)
+	if ( Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants)
 	 && !Game_Flag_Query(696)
 	 &&  Game_Flag_Query(697)
 	) {
@@ -108,13 +108,13 @@ void AIScriptClovis::CompletedMovementTrack() {
 		Actor_Set_Goal_Number(kActorClovis, kGoalClovisBB11TalkWithSadik);
 		break;
 
-	case 401:
+	case kGoalClovisUG07ChaseMcCoy:
 		AI_Movement_Track_Flush(kActorClovis);
 
-		if (Player_Query_Current_Scene() == 92) {
-			Actor_Set_Goal_Number(kActorClovis, 402);
+		if (Player_Query_Current_Scene() == kSceneUG07) {
+			Actor_Set_Goal_Number(kActorClovis, kGoalClovisUG07KillMcCoy);
 		} else {
-			Actor_Set_Goal_Number(kActorClovis, 400);
+			Actor_Set_Goal_Number(kActorClovis, kGoalClovisStartChapter4);
 		}
 		break;
 
@@ -149,7 +149,7 @@ void AIScriptClovis::OtherAgentExitedThisScene(int otherActorId) {
 }
 
 void AIScriptClovis::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
-	if (Game_Flag_Query(653) && Actor_Query_In_Set(kActorMcCoy, kSetKP07)) {
+	if (Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants) && Actor_Query_In_Set(kActorMcCoy, kSetKP07)) {
 		Game_Flag_Set(697);
 		Game_Flag_Set(714);
 		// return true;
@@ -182,7 +182,7 @@ bool AIScriptClovis::ShotAtAndHit() {
 }
 
 void AIScriptClovis::Retired(int byActorId) {
-	if (Game_Flag_Query(653)) {
+	if (Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants)) {
 		if (Actor_Query_In_Set(kActorClovis, kSetKP07)) {
 			Global_Variable_Decrement(kVariableReplicants, 1);
 			Actor_Set_Goal_Number(kActorClovis, 599);
@@ -195,7 +195,7 @@ void AIScriptClovis::Retired(int byActorId) {
 				Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 				Ambient_Sounds_Remove_All_Looping_Sounds(1);
 				Game_Flag_Set(579);
-				Game_Flag_Reset(653);
+				Game_Flag_Reset(kFlagMcCoyIsNotHelpingReplicants);
 				Set_Enter(kSetKP05_KP06, kSceneKP06);
 			}
 		}
@@ -313,7 +313,7 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 
 	case kGoalClovisUG18SadikWillShootGuzza:
 	case kGoalClovisUG18SadikIsShootingGuzza:
-	case 303:
+	case kGoalClovisUG18GuzzaDied:
 	case kGoalClovisUG18Leave:
 		return true;
 
@@ -322,33 +322,33 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Set_At_Waypoint(kActorClovis, 33, 0);
 		return true;
 
-	case 400:
+	case kGoalClovisStartChapter4:
 		AI_Movement_Track_Flush(kActorClovis);
 		Actor_Put_In_Set(kActorClovis, kSetFreeSlotA);
 		Actor_Set_At_Waypoint(kActorClovis, 33, 0);
 		return true;
 
-	case 401:
+	case kGoalClovisUG07ChaseMcCoy:
 		AI_Movement_Track_Flush(kActorClovis);
 		AI_Movement_Track_Append(kActorClovis, 341, 0);
 		AI_Movement_Track_Append(kActorClovis, 342, 0);
 		AI_Movement_Track_Repeat(kActorClovis);
 		return true;
 
-	case 402:
+	case kGoalClovisUG07KillMcCoy:
 		Player_Loses_Control();
 		Actor_Force_Stop_Walking(kActorMcCoy);
-		Actor_Face_Actor(kActorMcCoy, kActorClovis, 1);
-		Loop_Actor_Walk_To_Actor(kActorClovis, kActorMcCoy, 48, 0, 1);
-		Actor_Face_Actor(kActorClovis, kActorMcCoy, 1);
-		Actor_Change_Animation_Mode(kActorClovis, 6);
+		Actor_Face_Actor(kActorMcCoy, kActorClovis, true);
+		Loop_Actor_Walk_To_Actor(kActorClovis, kActorMcCoy, 48, false, true);
+		Actor_Face_Actor(kActorClovis, kActorMcCoy, true);
+		Actor_Change_Animation_Mode(kActorClovis, kAnimationModeCombatAttack);
 		if (Player_Query_Combat_Mode()) {
-			Actor_Change_Animation_Mode(kActorMcCoy, 49);
+			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeCombatDie);
 		} else {
-			Actor_Change_Animation_Mode(kActorMcCoy, 48);
+			Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
 		}
 		Delay(3000);
-		Actor_Retired_Here(kActorMcCoy, 12, 48, 1, kActorClovis);
+		Actor_Retired_Here(kActorMcCoy, 12, 48, true, kActorClovis);
 		return true;
 
 	case 500:
@@ -356,7 +356,7 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 
 	case 510:
-		if (Game_Flag_Query(653)) {
+		if (Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants)) {
 			Actor_Set_Goal_Number(kActorClovis, 513);
 		} else {
 			Actor_Set_Goal_Number(kActorClovis, 511);
@@ -383,7 +383,7 @@ bool AIScriptClovis::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 513:
 		Actor_Put_In_Set(kActorClovis, kSetKP07);
 		Actor_Set_Targetable(kActorClovis, true);
-		if (Game_Flag_Query(653)) {
+		if (Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants)) {
 			Global_Variable_Set(kVariableReplicants, 0);
 			Global_Variable_Increment(kVariableReplicants, 1);
 			Actor_Set_At_XYZ(kActorClovis, 45.0f, -41.52f, -85.0f, 750);
diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp
index 8ec974082a..3f58af389f 100644
--- a/engines/bladerunner/script/ai/dektora.cpp
+++ b/engines/bladerunner/script/ai/dektora.cpp
@@ -305,7 +305,7 @@ void AIScriptDektora::Retired(int byActorId) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(579);
-			Game_Flag_Reset(653);
+			Game_Flag_Reset(kFlagMcCoyIsNotHelpingReplicants);
 			Set_Enter(kSetKP05_KP06, kSceneKP06);
 
 			return; //true;
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index 742e818dbd..0aab3d2665 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -299,7 +299,7 @@ void AIScriptGordo::Retired(int byActorId) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(579);
-			Game_Flag_Reset(653);
+			Game_Flag_Reset(kFlagMcCoyIsNotHelpingReplicants);
 			Set_Enter(kSetKP05_KP06, kSceneKP06);
 			return;// true;
 		}
diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp
index f7bbfce855..2717db6ad7 100644
--- a/engines/bladerunner/script/ai/izo.cpp
+++ b/engines/bladerunner/script/ai/izo.cpp
@@ -249,7 +249,7 @@ void AIScriptIzo::Retired(int byActorId) {
 		Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 		Ambient_Sounds_Remove_All_Looping_Sounds(1);
 		Game_Flag_Set(579);
-		Game_Flag_Reset(653);
+		Game_Flag_Reset(kFlagMcCoyIsNotHelpingReplicants);
 		Set_Enter(kSetKP05_KP06, kSceneKP06);
 		return; //true;
 	}
diff --git a/engines/bladerunner/script/ai/maggie.cpp b/engines/bladerunner/script/ai/maggie.cpp
index 7d56e12a2e..5b045d526b 100644
--- a/engines/bladerunner/script/ai/maggie.cpp
+++ b/engines/bladerunner/script/ai/maggie.cpp
@@ -142,7 +142,7 @@ void AIScriptMaggie::ReceivedClue(int clueId, int fromActorId) {
 }
 
 void AIScriptMaggie::ClickedByPlayer() {
-	if (!Game_Flag_Query(653) && Global_Variable_Query(kVariableChapter) == 5) {
+	if (!Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants) && Global_Variable_Query(kVariableChapter) == 5) {
 		if (Actor_Query_Goal_Number(kActorMaggie) == 413) {
 			Actor_Set_Targetable(kActorMaggie, true);
 			AI_Movement_Track_Flush(kActorMaggie);
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index d5fb581cf5..866ee654ea 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -413,17 +413,17 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		_fallSpeed = -6.0f;
 		return true;
 
-	case 301:
+	case kGoalMcCoyUG07Caught:
 		_animationState = 62;
 		_animationFrame = 0;
 		return true;
 
-	case 302:
+	case kGoalMcCoyUG07BrokenFinger:
 		_animationState = 64;
 		_animationFrame = 0;
 		return true;
 
-	case 303:
+	case kGoalMcCoyUG07Released:
 		_animationState = 65;
 		_animationFrame = 0;
 		return true;
@@ -482,7 +482,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 
 	case 400:
 		Actor_Set_Health(kActorMcCoy, 50, 50);
-		Game_Flag_Set(373);
+		Game_Flag_Set(kFlagKP02Available);
 		affectionTowards = Global_Variable_Query(kVariableAffectionTowards);
 		if (affectionTowards == kAffectionTowardsSteele) {
 			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
@@ -493,32 +493,38 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
 			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 5);
 		}
-		if (Game_Flag_Query(666)) {
+
+		if (Game_Flag_Query(kFlagMcCoyFreedOfAccusations)) {
 			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
 		}
+
 		if (Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy) < Actor_Query_Friendliness_To_Other(kActorClovis, kActorMcCoy)) {
-			Game_Flag_Set(653);
+			Game_Flag_Set(kFlagMcCoyIsNotHelpingReplicants);
 		}
+
 		affectionTowards = Global_Variable_Query(kVariableAffectionTowards);
 		if (affectionTowards == kAffectionTowardsSteele) {
-			if (Game_Flag_Query(653)) {
+			if (Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants)) {
 				Global_Variable_Set(kVariableAffectionTowards, kAffectionTowardsNone);
 			}
 		} else if (affectionTowards == kAffectionTowardsDektora
 		        || affectionTowards == kAffectionTowardsLucy
 		) {
-			if (!Game_Flag_Query(653)) {
+			if (!Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants)) {
 				Global_Variable_Set(kVariableAffectionTowards, kAffectionTowardsNone);
 			}
 		}
-		if (!Game_Flag_Query(653)) {
+
+		if (!Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants)) {
 			Game_Flag_Set(kFlagMaggieIsHurt);
 		}
+
 		Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 		Ambient_Sounds_Remove_All_Looping_Sounds(1);
 		Global_Variable_Set(kVariableChapter, 5);
 		Outtake_Play(kOuttakeMovieD, false, -1);
-		if (Game_Flag_Query(666)) {
+
+		if (Game_Flag_Query(kFlagMcCoyFreedOfAccusations)) {
 			Chapter_Enter(5, kSetMA07, kSceneMA07);
 		} else {
 			Game_Flag_Set(kFlagMA06ToMA02);
@@ -1804,7 +1810,7 @@ void AIScriptMcCoy::UG15fall() {
 		 && -210.0f < x
 		 &&  -70.0f > x
 		) {
-			Game_Flag_Set(kFlagUG15BridgeBroken); 
+			Game_Flag_Set(kFlagUG15BridgeBroken);
 			Scene_Loop_Set_Default(3); // kUG15LoopMainLoopBridgeBroken
 			Scene_Loop_Start_Special(kSceneLoopModeOnce, 2, true); // kUG15LoopBridgeBreaks
 			Actor_Set_Goal_Number(kActorMcCoy, kGoalMcCoyUG15Fall);
diff --git a/engines/bladerunner/script/ai/officer_grayford.cpp b/engines/bladerunner/script/ai/officer_grayford.cpp
index a4680c4389..1e7484cb92 100644
--- a/engines/bladerunner/script/ai/officer_grayford.cpp
+++ b/engines/bladerunner/script/ai/officer_grayford.cpp
@@ -46,36 +46,69 @@ void AIScriptOfficerGrayford::Initialize() {
 }
 
 bool AIScriptOfficerGrayford::Update() {
-	if (Global_Variable_Query(kVariableChapter) == 4 && Actor_Query_Goal_Number(kActorOfficerGrayford) < 300) {
+	if (Global_Variable_Query(kVariableChapter) == 4
+	 && Actor_Query_Goal_Number(kActorOfficerGrayford) < 300) {
 		AI_Movement_Track_Flush(kActorOfficerGrayford);
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 300);
-	} else if (Global_Variable_Query(kVariableChapter) == 5 && Actor_Query_Goal_Number(kActorOfficerGrayford) < 400) {
+		return false;
+	}
+
+	if (Global_Variable_Query(kVariableChapter) == 5
+	 && Actor_Query_Goal_Number(kActorOfficerGrayford) < 400
+	) {
 		AI_Movement_Track_Flush(kActorOfficerGrayford);
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 400);
-	} else if (!Game_Flag_Query(kFlagMcCoyInDNARow)
-			&& Actor_Query_Goal_Number(kActorOfficerGrayford) > 102
-			&& Actor_Query_Goal_Number(kActorOfficerGrayford) < 110) {
+		return false;
+	}
+
+	if (!Game_Flag_Query(kFlagMcCoyInDNARow)
+	 &&  Actor_Query_Goal_Number(kActorOfficerGrayford) > 102
+	 &&  Actor_Query_Goal_Number(kActorOfficerGrayford) < 110
+	) {
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 110);
-	} else if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 0) {
+		return false;
+	}
+
+	if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 0) {
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 1);
-	} else 	if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 10) {
+		return false;
+	}
+
+	if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 10) {
 		AI_Movement_Track_Flush(kActorOfficerGrayford);
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 0);
-	} else if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 102) {
+		return false;
+	}
+
+	if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 102) {
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 103);
-	} else if (Game_Flag_Query(629)) {
+		return false;
+	}
+
+	if (Game_Flag_Query(kFlagUnpaseGenWalkers)) {
 		AI_Movement_Track_Unpause(kActorGenwalkerA);
 		AI_Movement_Track_Unpause(kActorGenwalkerB);
 		AI_Movement_Track_Unpause(kActorGenwalkerC);
-	} else if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 310
-				&& Actor_Query_Which_Set_In(kActorOfficerGrayford) != Player_Query_Current_Set()) {
+		return false;
+	}
+
+	if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 310
+	 && Actor_Query_Which_Set_In(kActorOfficerGrayford) != Player_Query_Current_Set()
+	) {
 		Non_Player_Actor_Combat_Mode_Off(kActorOfficerGrayford);
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 305);
-	} else if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 599
-				&& Actor_Query_Which_Set_In(kActorOfficerGrayford) != Player_Query_Current_Set()) {
+		return false;
+	}
+
+	if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 599
+	 && Actor_Query_Which_Set_In(kActorOfficerGrayford) != Player_Query_Current_Set()
+	) {
 		Actor_Set_Health(kActorOfficerGrayford, 50, 50);
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 305);
-	} else if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 305) {
+		return false;
+	}
+
+	if (Actor_Query_Goal_Number(kActorOfficerGrayford) == 305) {
 		switch (Actor_Query_Which_Set_In(kActorOfficerGrayford)) {
 		case kSetRC03:
 			if (Actor_Query_Which_Set_In(kActorOfficerGrayford) == Player_Query_Current_Set()) {
@@ -164,6 +197,7 @@ bool AIScriptOfficerGrayford::Update() {
 			break;
 
 		}
+		return false;
 	}
 	return false;
 }
@@ -534,7 +568,9 @@ bool AIScriptOfficerGrayford::GoalChanged(int currentGoalNumber, int newGoalNumb
 		AI_Movement_Track_Flush(kActorOfficerGrayford);
 		AI_Countdown_Timer_Reset(kActorOfficerGrayford, 2);
 
-		if (_animationState == 35 || _animationState == 34) {
+		if (_animationState == 35
+		 || _animationState == 34
+		) {
 			_animationState = 37;
 			_animationFrame = 0;
 		}
diff --git a/engines/bladerunner/script/ai/officer_leary.cpp b/engines/bladerunner/script/ai/officer_leary.cpp
index 2aa3fecd77..ad94d2eeda 100644
--- a/engines/bladerunner/script/ai/officer_leary.cpp
+++ b/engines/bladerunner/script/ai/officer_leary.cpp
@@ -86,8 +86,8 @@ bool AIScriptOfficerLeary::Update() {
 		return false;
 	}
 
-	if (Game_Flag_Query(629)) {
-		Game_Flag_Reset(629);
+	if (Game_Flag_Query(kFlagUnpaseGenWalkers)) {
+		Game_Flag_Reset(kFlagUnpaseGenWalkers);
 		return false;
 	}
 
diff --git a/engines/bladerunner/script/ai/sadik.cpp b/engines/bladerunner/script/ai/sadik.cpp
index 109f8d05c7..4747d79dc3 100644
--- a/engines/bladerunner/script/ai/sadik.cpp
+++ b/engines/bladerunner/script/ai/sadik.cpp
@@ -214,7 +214,7 @@ void AIScriptSadik::Retired(int byActorId) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(579);
-			Game_Flag_Reset(653);
+			Game_Flag_Reset(kFlagMcCoyIsNotHelpingReplicants);
 			Set_Enter(kSetKP05_KP06, kSceneKP06);
 			return; //true;
 		}
@@ -347,7 +347,7 @@ bool AIScriptSadik::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 
 	case 410:
-		if (Game_Flag_Query(653) == 1) {
+		if (Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants) == 1) {
 			Actor_Set_Goal_Number(kActorSadik, 414);
 		} else {
 			Actor_Set_Goal_Number(kActorSadik, 411);
@@ -430,7 +430,7 @@ bool AIScriptSadik::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 
 	case 418:
-		Game_Flag_Reset(653);
+		Game_Flag_Reset(kFlagMcCoyIsNotHelpingReplicants);
 		Actor_Set_Goal_Number(kActorClovis, 518);
 		Non_Player_Actor_Combat_Mode_On(kActorSadik, kActorCombatStateIdle, true, kActorMcCoy, 9, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, 0, -1, -1, 15, 300, false);
 		return true;
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index b07a0397c5..2d6ce66fd5 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -165,7 +165,7 @@ bool AIScriptSteele::Update() {
 		break;
 
 	case 5:
-		if (Game_Flag_Query(653)
+		if (Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants)
 		 && Actor_Query_Goal_Number(kActorSteele) < 400
 		) {
 			Actor_Set_Goal_Number(kActorSteele, 400);
@@ -1363,7 +1363,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Set_At_XYZ(kActorSteele, -48.83f, -36.55f, 69.98f, 280);
 		Loop_Actor_Walk_To_Actor(kActorMcCoy, kActorSteele, 36, false, true);
 		Actor_Face_Actor(kActorMcCoy, kActorSteele, true);
-		if (Game_Flag_Query(653) == 1) {
+		if (Game_Flag_Query(kFlagMcCoyIsNotHelpingReplicants) == 1) {
 			Actor_Says(kActorSteele, 400, 3);
 			Actor_Says(kActorMcCoy, 2165, 14);
 			Actor_Says(kActorSteele, 410, 3);
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index 1cc2a541d2..5e7ca2d549 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -161,7 +161,7 @@ void AIScriptZuben::CompletedMovementTrack() {
 		AI_Countdown_Timer_Reset(kActorZuben, 0);
 		Game_Flag_Reset(kFlagCT02McCoyFell);
 		Game_Flag_Set(kFlagCT02McCoyCombatReady);
-		Game_Flag_Set(721); // not used anywhere
+		Game_Flag_Set(kFlagNotUsed721);
 		Music_Stop(2);
 		Actor_Set_Goal_Number(kActorZuben, kGoalZubenFled);
 		Set_Enter(kSetCT02, kSceneCT02);
@@ -298,7 +298,7 @@ void AIScriptZuben::Retired(int byActorId) {
 		Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 		Ambient_Sounds_Remove_All_Looping_Sounds(1);
 		Game_Flag_Set(579);
-		Game_Flag_Reset(653);
+		Game_Flag_Reset(kFlagMcCoyIsNotHelpingReplicants);
 		Set_Enter(kSetKP05_KP06, kSceneKP06);
 		// return true;
 		return;