BLADERUNNER: More variable names in the game scripts

21 files changed, 71 insertions, 62 deletions

diff --git a/engines/bladerunner/script/ai/dektora.cpp b/engines/bladerunner/script/ai/dektora.cpp
index f32dce8433..f2de729f7e 100644
--- a/engines/bladerunner/script/ai/dektora.cpp
+++ b/engines/bladerunner/script/ai/dektora.cpp
@@ -1091,9 +1091,10 @@ double AIScriptDektora::comp_distance(int actorId, float x1, float y1, float z1)
 }
 
 void AIScriptDektora::checkCombat() {
-	if (Actor_Query_In_Set(kActorDektora, kSetHF01) == 1
-			&& Global_Variable_Query(kVariableChapter) == 5
-			&& Actor_Query_Goal_Number(kActorDektora) != 450) {
+	if (Actor_Query_In_Set(kActorDektora, kSetHF01)
+	 && Global_Variable_Query(kVariableChapter) == 5
+	 && Actor_Query_Goal_Number(kActorDektora) != 450
+	) {
 		if (Global_Variable_Query(kVariableAffectionTowards) == 2) {
 			Global_Variable_Set(kVariableAffectionTowards, 0);
 		}
diff --git a/engines/bladerunner/script/ai/early_q.cpp b/engines/bladerunner/script/ai/early_q.cpp
index 180493fb6e..104ebdaf49 100644
--- a/engines/bladerunner/script/ai/early_q.cpp
+++ b/engines/bladerunner/script/ai/early_q.cpp
@@ -395,7 +395,7 @@ bool AIScriptEarlyQ::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		break;
 
 	case 220:
-		if (Player_Query_Current_Set() == 13) {
+		if (Player_Query_Current_Set() == kSetNR05_NR08) {
 			Actor_Set_Goal_Number(kActorEarlyQ, 230);
 		} else {
 			Actor_Put_In_Set(kActorEarlyQ, kSetNR05_NR08);
diff --git a/engines/bladerunner/script/ai/fish_dealer.cpp b/engines/bladerunner/script/ai/fish_dealer.cpp
index 95f56d3171..5297ae43dd 100644
--- a/engines/bladerunner/script/ai/fish_dealer.cpp
+++ b/engines/bladerunner/script/ai/fish_dealer.cpp
@@ -35,7 +35,7 @@ void AIScriptFishDealer::Initialize() {
 	_animationNext = 0;
 
 	_flag = false;
-	Actor_Put_In_Set(kActorFishDealer, 0);
+	Actor_Put_In_Set(kActorFishDealer, kSetAR01_AR02);
 	Actor_Set_At_Waypoint(kActorFishDealer, 120, 424);
 	Actor_Set_Goal_Number(kActorFishDealer, 0);
 }
diff --git a/engines/bladerunner/script/ai/free_slot_a.cpp b/engines/bladerunner/script/ai/free_slot_a.cpp
index b017a9e3f2..f673860119 100644
--- a/engines/bladerunner/script/ai/free_slot_a.cpp
+++ b/engines/bladerunner/script/ai/free_slot_a.cpp
@@ -191,12 +191,12 @@ void AIScriptFreeSlotA::OtherAgentEnteredCombatMode(int otherActorId, int combat
 }
 
 void AIScriptFreeSlotA::ShotAtAndMissed() {
-	if (Actor_Query_In_Set(kActorFreeSlotA, kSetUG15) == 1)
+	if (Actor_Query_In_Set(kActorFreeSlotA, kSetUG15))
 		calcHit();
 }
 
 bool AIScriptFreeSlotA::ShotAtAndHit() {
-	if (Actor_Query_In_Set(kActorFreeSlotA, kSetUG15) == 1) {
+	if (Actor_Query_In_Set(kActorFreeSlotA, kSetUG15)) {
 		calcHit();
 		Actor_Set_Goal_Number(kActorFreeSlotA, 305);
 		return true;
diff --git a/engines/bladerunner/script/ai/gaff.cpp b/engines/bladerunner/script/ai/gaff.cpp
index c5e629cab0..0db6539ccf 100644
--- a/engines/bladerunner/script/ai/gaff.cpp
+++ b/engines/bladerunner/script/ai/gaff.cpp
@@ -90,7 +90,7 @@ void AIScriptGaff::CompletedMovementTrack() {
 		Actor_Clue_Acquire(kActorMcCoy, kClueGaffsInformation, 1, kActorGaff);
 		CDB_Set_Crime(kClueZuben, kCrimeMoonbusHijacking);
 		Actor_Clue_Acquire(kActorGaff, kClueMcCoyRetiredZuben, 1, -1);
-		Game_Flag_Set(64);
+		Game_Flag_Set(kFlagGaffApproachedMcCoyAboutZuben);
 		Player_Gains_Control();
 		Actor_Set_Goal_Number(kActorGaff, 4);
 	}
@@ -117,7 +117,11 @@ void AIScriptGaff::ReceivedClue(int clueId, int fromActorId) {
 }
 
 void AIScriptGaff::ClickedByPlayer() {
-	if ((Global_Variable_Query(kVariableChapter) == 2 || Global_Variable_Query(kVariableChapter) == 3) && Game_Flag_Query(471)){
+	if ((Global_Variable_Query(kVariableChapter) == 2
+	  || Global_Variable_Query(kVariableChapter) == 3
+	 )
+	 && Game_Flag_Query(471)
+	) {
 		AI_Movement_Track_Pause(kActorGaff);
 		Actor_Face_Actor(kActorMcCoy, kActorGaff, true);
 		Actor_Face_Actor(kActorGaff, kActorMcCoy, true);
@@ -286,10 +290,10 @@ bool AIScriptGaff::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 302:
 		return true;
 	case 303:
-		Actor_Face_Actor(kActorGaff, kActorMcCoy, 1);
+		Actor_Face_Actor(kActorGaff, kActorMcCoy, true);
 		Actor_Change_Animation_Mode(kActorGaff, kAnimationModeCombatAttack);
 		Sound_Play(27, 100, 0, 0, 50);
-		Actor_Change_Animation_Mode(kActorMcCoy, 48);
+		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeDie);
 		Actor_Retired_Here(kActorMcCoy, 12, 12, 1, -1);
 		return true;
 	case 499:
diff --git a/engines/bladerunner/script/ai/gordo.cpp b/engines/bladerunner/script/ai/gordo.cpp
index 3c78254160..3cf685009e 100644
--- a/engines/bladerunner/script/ai/gordo.cpp
+++ b/engines/bladerunner/script/ai/gordo.cpp
@@ -1530,8 +1530,8 @@ void AIScriptGordo::sub_410590() {
 		Game_Flag_Set(251);
 		Game_Flag_Set(592);
 		Scene_Exits_Enable();
-		Game_Flag_Reset(181);
-		Game_Flag_Set(178);
+		Game_Flag_Reset(kFlagMcCoyAtNRxx);
+		Game_Flag_Set(kFlagMcCoyAtPSxx);
 		Set_Enter(kSetPS09, kScenePS09);
 	} else if (answer == 830) {
 		Actor_Says(kActorMcCoy, 3100, 16);
diff --git a/engines/bladerunner/script/ai/grigorian.cpp b/engines/bladerunner/script/ai/grigorian.cpp
index daebdcfe60..7e27f326f2 100644
--- a/engines/bladerunner/script/ai/grigorian.cpp
+++ b/engines/bladerunner/script/ai/grigorian.cpp
@@ -38,8 +38,10 @@ void AIScriptGrigorian::Initialize() {
 }
 
 bool AIScriptGrigorian::Update() {
-	if (Actor_Query_Friendliness_To_Other(kActorGrigorian, kActorMcCoy) < 30 && !Game_Flag_Query(51)) {
-		Game_Flag_Set(51);
+	if ( Actor_Query_Friendliness_To_Other(kActorGrigorian, kActorMcCoy) < 30
+	 && !Game_Flag_Query(kFlagGrigorianDislikeMcCoy)
+	) {
+		Game_Flag_Set(kFlagGrigorianDislikeMcCoy);
 		return true;
 	}
 	return false;
diff --git a/engines/bladerunner/script/ai/hanoi.cpp b/engines/bladerunner/script/ai/hanoi.cpp
index 4b88be7c5f..aba139a2d7 100644
--- a/engines/bladerunner/script/ai/hanoi.cpp
+++ b/engines/bladerunner/script/ai/hanoi.cpp
@@ -424,7 +424,7 @@ bool AIScriptHanoi::UpdateAnimation(int *animation, int *frame) {
 			Actor_Face_Actor(kActorMcCoy, kActorHanoi, 1);
 			Actor_Set_Invisible(kActorMcCoy, 0);
 
-			if (Actor_Query_In_Set(kActorHanoi, kSetNR01) == 1) {
+			if (Actor_Query_In_Set(kActorHanoi, kSetNR01)) {
 				AI_Movement_Track_Flush(kActorHanoi);
 				AI_Movement_Track_Append(kActorHanoi, 350, 0);
 				AI_Movement_Track_Append(kActorHanoi, 39, 0);
diff --git a/engines/bladerunner/script/ai/hasan.cpp b/engines/bladerunner/script/ai/hasan.cpp
index ed2ebc717f..b2386a2fcc 100644
--- a/engines/bladerunner/script/ai/hasan.cpp
+++ b/engines/bladerunner/script/ai/hasan.cpp
@@ -46,7 +46,7 @@ void AIScriptHasan::Initialize() {
 	_var5 = 0;
 	_var6 = 0;
 
-	Actor_Put_In_Set(kActorHasan, 0);
+	Actor_Put_In_Set(kActorHasan, kSetAR01_AR02);
 	Actor_Set_At_XYZ(kActorHasan, -214.0f, 0.0f, -1379.0f, 371);
 	Actor_Set_Goal_Number(kActorHasan, 0);
 }
diff --git a/engines/bladerunner/script/ai/howie_lee.cpp b/engines/bladerunner/script/ai/howie_lee.cpp
index edd131ccb2..a321ce1032 100644
--- a/engines/bladerunner/script/ai/howie_lee.cpp
+++ b/engines/bladerunner/script/ai/howie_lee.cpp
@@ -50,12 +50,12 @@ bool AIScriptHowieLee::Update() {
 	if (Actor_Query_Goal_Number(kActorHowieLee) == 0) {
 		Actor_Set_Goal_Number(kActorHowieLee, 1);
 	}
-	if (Game_Flag_Query(176) && !Actor_Query_In_Set(kActorHowieLee, kSetCT01_CT12)) {
+	if (Game_Flag_Query(kFlagMcCoyAtCTxx) && !Actor_Query_In_Set(kActorHowieLee, kSetCT01_CT12)) {
 		AI_Movement_Track_Flush(kActorHowieLee);
 		AI_Movement_Track_Append(kActorHowieLee, 67, 0);
 		Actor_Set_Goal_Number(kActorHowieLee, 0);
 	}
-	if (Actor_Query_Goal_Number(kActorHowieLee) == 1 && Game_Flag_Query(kFlagBoughtHowieLeeFood) && !Game_Flag_Query(176)) {
+	if (Actor_Query_Goal_Number(kActorHowieLee) == 1 && Game_Flag_Query(kFlagBoughtHowieLeeFood) && !Game_Flag_Query(kFlagMcCoyAtCTxx)) {
 		Actor_Set_Goal_Number(kActorHowieLee, 4);
 		return true;
 	}
diff --git a/engines/bladerunner/script/ai/izo.cpp b/engines/bladerunner/script/ai/izo.cpp
index d897d1af85..eb0342f7ca 100644
--- a/engines/bladerunner/script/ai/izo.cpp
+++ b/engines/bladerunner/script/ai/izo.cpp
@@ -106,7 +106,7 @@ void AIScriptIzo::CompletedMovementTrack() {
 		return; //true;
 
 	case 120:
-		Game_Flag_Set(164);
+		Game_Flag_Set(kFlagIzoArrested);
 		Actor_Set_Goal_Number(kActorIzo, 180);
 		Scene_Exits_Enable();
 		return; //true;
@@ -142,7 +142,7 @@ void AIScriptIzo::ClickedByPlayer() {
 		return; //true;
 	}
 
-	if (Actor_Query_Goal_Number(kActorIzo) == 101 && Player_Query_Current_Set() == 75) {
+	if (Actor_Query_Goal_Number(kActorIzo) == 101 && Player_Query_Current_Set() == kSetUG02) {
 		Player_Loses_Control();
 		Actor_Set_Goal_Number(kActorIzo, 100);
 		Actor_Face_Actor(kActorMcCoy, kActorIzo, 1);
@@ -179,7 +179,7 @@ void AIScriptIzo::OtherAgentExitedThisScene(int otherActorId) {
 
 void AIScriptIzo::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
 	if (Actor_Query_Goal_Number(kActorIzo) == 110) {
-		Game_Flag_Query(44);
+		Game_Flag_Query(kFlagIzoIsReplicant);
 	}
 	return; //false;
 }
@@ -252,7 +252,7 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		|| newGoalNumber == 198
 		|| newGoalNumber == 180
 		|| newGoalNumber == 103) {
-			Spinner_Set_Selectable_Destination_Flag(6, 1);
+			Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationDNARow, true);
 		}
 
 	switch (newGoalNumber) {
@@ -328,7 +328,7 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 115:
 		AI_Movement_Track_Flush(kActorIzo);
 		AI_Movement_Track_Append(kActorIzo, 39, 60);
-		if (Game_Flag_Query(44)) {
+		if (Game_Flag_Query(kFlagIzoIsReplicant)) {
 			AI_Movement_Track_Append(kActorIzo, 33, 0);
 		} else {
 			AI_Movement_Track_Append(kActorIzo, 34, 0);
@@ -356,7 +356,7 @@ bool AIScriptIzo::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 155:
 		AI_Movement_Track_Flush(kActorIzo);
 		AI_Movement_Track_Append(kActorIzo, 149, 0);
-		if (Game_Flag_Query(44)) {
+		if (Game_Flag_Query(kFlagIzoIsReplicant)) {
 			AI_Movement_Track_Append(kActorIzo, 39, 5);
 			AI_Movement_Track_Append(kActorIzo, 34, Random_Query(10, 20));
 			AI_Movement_Track_Append(kActorIzo, 39, 5);
@@ -1012,7 +1012,7 @@ void AIScriptIzo::someDialog() {
 		break;
 
 	case 10:
-		if (Game_Flag_Query(44) == 1) {
+		if (Game_Flag_Query(kFlagIzoIsReplicant)) {
 			Actor_Says(kActorMcCoy, 5475, 18);
 			Actor_Says(kActorIzo, 720, 12);
 			Actor_Says(kActorMcCoy, 5485, 13);
diff --git a/engines/bladerunner/script/ai/klein.cpp b/engines/bladerunner/script/ai/klein.cpp
index 3f116d30b3..8e633527e5 100644
--- a/engines/bladerunner/script/ai/klein.cpp
+++ b/engines/bladerunner/script/ai/klein.cpp
@@ -31,7 +31,7 @@ void AIScriptKlein::Initialize() {
 	_animationState = 0;
 	_animationFrame = 0;
 	_animationStateNext = 0;
-	Actor_Put_In_Set(kActorKlein, 66);
+	Actor_Put_In_Set(kActorKlein, kSetPS07);
 	Actor_Set_At_XYZ(kActorKlein, 338.0f, 0.22f, -612.0f, 768);
 	Actor_Set_Goal_Number(kActorKlein, 0);
 }
@@ -49,24 +49,24 @@ bool AIScriptKlein::Update() {
 		return true;
 	}
 	if ( Actor_Clue_Query(kActorMcCoy, kClueOfficersStatement)
-	 && !Game_Flag_Query(kFlagPlayerHasOfficersStatement)
+	 && !Game_Flag_Query(kFlagMcCoyHasOfficersStatement)
 	) {
-		Game_Flag_Set(kFlagPlayerHasOfficersStatement);
+		Game_Flag_Set(kFlagMcCoyHasOfficersStatement);
 	}
 	if ( Actor_Clue_Query(kActorMcCoy, kCluePaintTransfer)
-	 && !Game_Flag_Query(kFlagPlayerHasPaintTransfer)
+	 && !Game_Flag_Query(kFlagMcCoyHasPaintTransfer)
 	) {
-		Game_Flag_Set(kFlagPlayerHasPaintTransfer);
+		Game_Flag_Set(kFlagMcCoyHasPaintTransfer);
 	}
 	if ( Actor_Clue_Query(kActorMcCoy, kClueShellCasings)
-	 && !Game_Flag_Query(kFlagPlayerHasShellCasings)
+	 && !Game_Flag_Query(kFlagMcCoyHasShellCasings)
 	) {
-		Game_Flag_Set(kFlagPlayerHasShellCasings);
+		Game_Flag_Set(kFlagMcCoyHasShellCasings);
 	}
 	if ( Actor_Clue_Query(kActorMcCoy, kClueChromeDebris)
-	 && !Game_Flag_Query(kFlagPlayerHasChromeDebris)
+	 && !Game_Flag_Query(kFlagMcCoyHasChromeDebris)
 	) {
-		Game_Flag_Set(kFlagPlayerHasChromeDebris);
+		Game_Flag_Set(kFlagMcCoyHasChromeDebris);
 	}
 	if ( Player_Query_Current_Scene() == kScenePS07
 	 &&  Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 35
diff --git a/engines/bladerunner/script/ai/leon.cpp b/engines/bladerunner/script/ai/leon.cpp
index 1a421239ee..bbb940eea9 100644
--- a/engines/bladerunner/script/ai/leon.cpp
+++ b/engines/bladerunner/script/ai/leon.cpp
@@ -151,7 +151,7 @@ int AIScriptLeon::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId
 bool AIScriptLeon::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	switch (newGoalNumber) {
 	case 8:
-		Actor_Put_In_Set(kActorLeon, 91);
+		Actor_Put_In_Set(kActorLeon, kSetFreeSlotA);
 		AI_Movement_Track_Flush(kActorLeon);
 		return true;
 	case 7:
@@ -226,7 +226,7 @@ bool AIScriptLeon::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 1:
 		Actor_Change_Animation_Mode(kActorDeskClerk, 72);
 		Actor_Change_Animation_Mode(kActorLeon, 72);
-		Actor_Put_In_Set(kActorLeon, 31);
+		Actor_Put_In_Set(kActorLeon, kSetCT09);
 		Actor_Set_At_XYZ(kActorLeon, 264.0f, 348.52f, 827.0f, 0);
 		Actor_Face_Actor(kActorDeskClerk, kActorLeon, true);
 		ADQ_Add(kActorLeon, 0, 16);
@@ -236,7 +236,7 @@ bool AIScriptLeon::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		ADQ_Add(kActorLeon, 20, 16);
 		return true;
 	case 0:
-		Actor_Put_In_Set(kActorLeon, 91);
+		Actor_Put_In_Set(kActorLeon, kSetFreeSlotA);
 		Actor_Change_Animation_Mode(kActorLeon, 0);
 		return true;
 	}
diff --git a/engines/bladerunner/script/ai/lucy.cpp b/engines/bladerunner/script/ai/lucy.cpp
index 464f228179..72cb959a53 100644
--- a/engines/bladerunner/script/ai/lucy.cpp
+++ b/engines/bladerunner/script/ai/lucy.cpp
@@ -857,9 +857,10 @@ void AIScriptLucy::voightKempTest() {
 
 void AIScriptLucy::checkCombat() {
 	Game_Flag_Set(701);
-	if (Actor_Query_In_Set(kActorLucy, kSetHF01) == 1
-			&& Global_Variable_Query(kVariableChapter) == 5
-			&& Actor_Query_Goal_Number(kActorLucy) != 450) {
+	if (Actor_Query_In_Set(kActorLucy, kSetHF01)
+	 && Global_Variable_Query(kVariableChapter) == 5
+	 && Actor_Query_Goal_Number(kActorLucy) != 450
+	) {
 		if (Global_Variable_Query(kVariableAffectionTowards) == 3) {
 			Global_Variable_Set(kVariableAffectionTowards, 0);
 		}
diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index 98b75504f0..96cb04ac58 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -458,7 +458,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Actor_Change_Animation_Mode(kActorMcCoy, kAnimationModeIdle);
 		_animationState = 0;
 		_animationFrame = 0;
-		Game_Flag_Set(465);
+		Game_Flag_Set(kFlagMcCoyArrested);
 		Set_Enter(kSetPS09, kScenePS09);
 		return true;
 	}
diff --git a/engines/bladerunner/script/ai/murray.cpp b/engines/bladerunner/script/ai/murray.cpp
index 36bae4981c..f187cad373 100644
--- a/engines/bladerunner/script/ai/murray.cpp
+++ b/engines/bladerunner/script/ai/murray.cpp
@@ -44,7 +44,7 @@ bool AIScriptMurray::Update() {
 	if (Global_Variable_Query(kVariableChapter) == 4 && Actor_Query_Goal_Number(kActorMurray) != 300)
 		Actor_Set_Goal_Number(kActorMurray, 300);
 
-	if (Player_Query_Current_Set() == 37) {
+	if (Player_Query_Current_Set() == kSetHF01) {
 		if (!Actor_Query_In_Set(kActorMcCoy, kSetHF01)
 				|| !Actor_Query_In_Set(kActorMurray, kSetHF01)
 				|| Actor_Query_Inch_Distance_From_Actor(kActorMcCoy, kActorMurray) >= 48
diff --git a/engines/bladerunner/script/ai/officer_grayford.cpp b/engines/bladerunner/script/ai/officer_grayford.cpp
index a1f9b11f9b..2ed286e5a9 100644
--- a/engines/bladerunner/script/ai/officer_grayford.cpp
+++ b/engines/bladerunner/script/ai/officer_grayford.cpp
@@ -52,7 +52,7 @@ bool AIScriptOfficerGrayford::Update() {
 	} else 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(177)
+	} else if (!Game_Flag_Query(kFlagMcCoyAtDRxx)
 			&& Actor_Query_Goal_Number(kActorOfficerGrayford) > 102
 			&& Actor_Query_Goal_Number(kActorOfficerGrayford) < 110) {
 		Actor_Set_Goal_Number(kActorOfficerGrayford, 110);
diff --git a/engines/bladerunner/script/ai/officer_leary.cpp b/engines/bladerunner/script/ai/officer_leary.cpp
index dbfe6ceddd..ccc2851725 100644
--- a/engines/bladerunner/script/ai/officer_leary.cpp
+++ b/engines/bladerunner/script/ai/officer_leary.cpp
@@ -54,8 +54,8 @@ bool AIScriptOfficerLeary::Update() {
 	) {
 		AI_Movement_Track_Flush(kActorOfficerLeary);
 		Actor_Set_Goal_Number(kActorOfficerLeary, 400);
-	} else if (!Game_Flag_Query(182)
-	        &&  Game_Flag_Query(147)
+	} else if (!Game_Flag_Query(kFlagMcCoyAtRCxx)
+	        &&  Game_Flag_Query(kFlagChopstickWrapperTaken)
 	        &&  Game_Flag_Query(kFlagChromeDebrisTaken)
 	        &&  Player_Query_Current_Scene() != kSceneRC01
 	        &&  Global_Variable_Query(kVariableChapter) < 3
@@ -172,7 +172,7 @@ bool AIScriptOfficerLeary::Update() {
 void AIScriptOfficerLeary::TimerExpired(int timer) {
 	if (timer == 1) {
 		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
-		if (Actor_Query_In_Set(kActorMcCoy, 41)) {
+		if (Actor_Query_In_Set(kActorMcCoy, kSetHF05)) {
 			Actor_Set_Goal_Number(kActorOfficerLeary, 430);
 			Actor_Set_Goal_Number(kActorOfficerGrayford, 430);
 		} else {
@@ -298,7 +298,7 @@ bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber)
 				Actor_Clue_Acquire(kActorOfficerLeary, kClueCrowdInterviewB, 0, -1);
 			}
 		}
-		if (Game_Flag_Query(182)) {
+		if (Game_Flag_Query(kFlagMcCoyAtRCxx)) {
 			if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA) && Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB)) {
 				Actor_Set_Goal_Number(kActorOfficerLeary, kGoalOfficerLearyDefault);
 			} else {
diff --git a/engines/bladerunner/script/ai/runciter.cpp b/engines/bladerunner/script/ai/runciter.cpp
index afefa43c60..8c52a9c197 100644
--- a/engines/bladerunner/script/ai/runciter.cpp
+++ b/engines/bladerunner/script/ai/runciter.cpp
@@ -172,7 +172,7 @@ int AIScriptRunciter::GetFriendlinessModifierIfGetsClue(int otherActorId, int cl
 
 bool AIScriptRunciter::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	if (newGoalNumber == 0) {
-		Actor_Put_In_Set(kActorRunciter, 16);
+		Actor_Put_In_Set(kActorRunciter, kSetRC02_RC51);
 		Actor_Set_At_Waypoint(kActorRunciter, 92, 567);
 		return false;
 	}
@@ -202,7 +202,7 @@ bool AIScriptRunciter::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return false;
 	}
 	if (newGoalNumber == 300) {
-		Actor_Put_In_Set(kActorRunciter, 16);
+		Actor_Put_In_Set(kActorRunciter, kSetRC02_RC51);
 		Actor_Set_At_Waypoint(kActorRunciter, 93, 1007);
 		return false;
 	}
diff --git a/engines/bladerunner/script/ai/steele.cpp b/engines/bladerunner/script/ai/steele.cpp
index 5420abd1b1..348443fdc9 100644
--- a/engines/bladerunner/script/ai/steele.cpp
+++ b/engines/bladerunner/script/ai/steele.cpp
@@ -50,18 +50,19 @@ bool AIScriptSteele::Update() {
 	if (Global_Variable_Query(14) <= 5 || Actor_Clue_Query(kActorSteele, 239)) {
 		switch (Global_Variable_Query(kVariableChapter)) {
 		case 1:
-			if (Game_Flag_Query(182) == 1 && Game_Flag_Query(183) == 1) {
+			if (Game_Flag_Query(kFlagMcCoyAtRCxx) && Game_Flag_Query(kFlagMcCoyAtRCxx)) {
 				Actor_Set_Goal_Number(kActorSteele, 3);
 				return true;
-			} else if (Game_Flag_Query(176) == 1 && Game_Flag_Query(184) == 1) {
+			} else if (Game_Flag_Query(kFlagMcCoyAtCTxx) && Game_Flag_Query(184)) {
 				Actor_Set_Goal_Number(kActorSteele, 6);
 				return true;
-			} else if (Game_Flag_Query(178) == 1 && Game_Flag_Query(185) == 1) {
+			} else if (Game_Flag_Query(kFlagMcCoyAtPSxx) && Game_Flag_Query(185)) {
 				Actor_Set_Goal_Number(kActorSteele, 10);
 				return true;
 			} else if (Actor_Query_Goal_Number(kActorSteele)
-						|| Game_Flag_Query(182)
-						|| Player_Query_Current_Scene() == kSceneRC01) {
+			        || Game_Flag_Query(kFlagMcCoyAtRCxx)
+			        || Player_Query_Current_Scene() == kSceneRC01
+			) {
 				if (Actor_Query_Goal_Number(kActorSteele) != 11) {
 					break; // go to after switch
 				}
@@ -243,7 +244,7 @@ void AIScriptSteele::CompletedMovementTrack() {
 			if (Actor_Query_Goal_Number(kActorIzo) != 199) {
 				if (Actor_Query_In_Between_Two_Actors(kActorMcCoy, kActorSteele, kActorIzo)) {
 					Actor_Set_Goal_Number(kActorSteele, 125);
-				} else if (Game_Flag_Query(44)) {
+				} else if (Game_Flag_Query(kFlagIzoIsReplicant)) {
 					Actor_Set_Goal_Number(kActorSteele, 120);
 				} else {
 					Actor_Set_Goal_Number(kActorSteele, 121);
@@ -560,7 +561,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 	case 11:
 		Actor_Clue_Acquire(kActorSteele, kClueGrigorianInterviewA, 1, kActorGrigorian);
-		if (Game_Flag_Query(44)) {
+		if (Game_Flag_Query(kFlagIzoIsReplicant)) {
 			Actor_Clue_Acquire(kActorSteele, kClueGrigorianInterviewB1, 1, kActorGrigorian);
 		} else {
 			Actor_Clue_Acquire(kActorSteele, kClueGrigorianInterviewB2, 1, kActorGrigorian);
@@ -569,7 +570,7 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		return true;
 	case 100:
 		AI_Movement_Track_Flush(kActorSteele);
-		if (Game_Flag_Query(44)) {
+		if (Game_Flag_Query(kFlagIzoIsReplicant)) {
 			AI_Movement_Track_Append_Run(kActorSteele, 202, 0);
 			AI_Movement_Track_Append_Run(kActorSteele, 203, 0);
 		} else {
@@ -838,9 +839,9 @@ bool AIScriptSteele::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Set_Enter(kSetNR02, kSetNR03);
 		return true;
 	case 233:
-		Game_Flag_Set(310);
-		Game_Flag_Reset(181);
-		Game_Flag_Set(257);
+		Game_Flag_Set(kFlagHF01toHF03);
+		Game_Flag_Reset(kFlagMcCoyAtNRxx);
+		Game_Flag_Set(kFlagMcCoyAtHFxx);
 		Actor_Put_In_Set(kActorSteele, kSetHF03);
 		Actor_Set_At_XYZ(kActorSteele, 291.0f, 47.76f, -892.0f, 453);
 		Set_Enter(kSetHF03, kSetDR06);
diff --git a/engines/bladerunner/script/ai/zuben.cpp b/engines/bladerunner/script/ai/zuben.cpp
index 8215c4c983..a016bfd87e 100644
--- a/engines/bladerunner/script/ai/zuben.cpp
+++ b/engines/bladerunner/script/ai/zuben.cpp
@@ -391,7 +391,7 @@ bool AIScriptZuben::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 			Player_Set_Combat_Mode(true);
 		}
 		Player_Gains_Control();
-		Game_Flag_Set(142);
+		Game_Flag_Set(kFlagNotUsed142);
 		Set_Enter(kSetCT07, kSceneCT07);
 		return false;
 	case kGoalZubenCT06Hide: