5 files changed, 10 insertions, 7 deletions
diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 55c5e44eb9..3a518cdf24 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -861,6 +861,8 @@ enum Flags {
 	kFlagSteeleWalkingAround = 460,
 	kFlagMaggieIsHurt = 461,
 	kFlagPS04GuzzaLeft = 462,
+	kFlagHC01GuzzaWalk = 463,
+	kFlagHC01GuzzaPrepare= 464,
 	kFlagMcCoyArrested = 465,
 	kFlagBB10Shelf1Available = 466,
 	kFlagBB10Shelf2Available = 467,
@@ -894,6 +896,7 @@ enum Flags {
 	kFlagCT07ZubenAttack = 516,
 	kFlagTB06DogCollarTaken = 519,
 	kFlagTB06KitchenBoxTaken = 520,
+	kFlagHC03TrapDoorOpened = 521,
 	kFlagCT10Entered = 525,
 	kFlagCT11toDR01 = 531,
 	kFlagCT09Entered = 538,
diff --git a/engines/bladerunner/script/ai/guzza.cpp b/engines/bladerunner/script/ai/guzza.cpp
index 62267be715..9d41d3a4cc 100644
--- a/engines/bladerunner/script/ai/guzza.cpp
+++ b/engines/bladerunner/script/ai/guzza.cpp
@@ -53,10 +53,10 @@ bool AIScriptGuzza::Update() {
 		}
 
 		if ( Actor_Query_Goal_Number(kActorGuzza) != kGoalGuzzaGoToHawkersCircle
-		 && !Game_Flag_Query(463)
-		 &&  Game_Flag_Query(464)
+		 && !Game_Flag_Query(kFlagHC01GuzzaWalk)
+		 &&  Game_Flag_Query(kFlagHC01GuzzaPrepare)
 		) {
-			Game_Flag_Set(463);
+			Game_Flag_Set(kFlagHC01GuzzaWalk);
 			Actor_Set_Goal_Number(kActorGuzza, 103);
 			return true;
 		}
diff --git a/engines/bladerunner/script/scene/ar01.cpp b/engines/bladerunner/script/scene/ar01.cpp
index 9cd104c850..1213f47814 100644
--- a/engines/bladerunner/script/scene/ar01.cpp
+++ b/engines/bladerunner/script/scene/ar01.cpp
@@ -201,7 +201,7 @@ bool SceneScriptAR01::ClickedOnExit(int exitId) {
 		if (!Loop_Actor_Walk_To_XYZ(kActorMcCoy, -358.0, 0.0, -149.0, 0, true, false, 0)) {
 			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -477.0, 0.0, -149.0, 0, false, false, 0);
 			Game_Flag_Set(kFlagAR01toHC01);
-			Game_Flag_Set(464);
+			Game_Flag_Set(kFlagHC01GuzzaPrepare);
 			Game_Flag_Reset(kFlagMcCoyInAnimoidRow);
 			Game_Flag_Set(kFlagMcCoyInHawkersCircle);
 			Set_Enter(kSetHC01_HC02_HC03_HC04, kSceneHC01);
diff --git a/engines/bladerunner/script/scene/bb04.cpp b/engines/bladerunner/script/scene/bb04.cpp
index 6ac7a7e5bf..55445c1a0d 100644
--- a/engines/bladerunner/script/scene/bb04.cpp
+++ b/engines/bladerunner/script/scene/bb04.cpp
@@ -88,7 +88,7 @@ bool SceneScriptBB04::ClickedOnExit(int exitId) {
 			Ambient_Sounds_Remove_All_Non_Looping_Sounds(true);
 			Ambient_Sounds_Remove_All_Looping_Sounds(1);
 			Game_Flag_Set(kFlagBB04toBB02);
-			Game_Flag_Set(493);
+			Game_Flag_Set(kFlagBB02ElevatorDown);
 			Set_Enter(kSetBB02_BB04_BB06_BB51, kSceneBB02);
 		}
 		return true;
diff --git a/engines/bladerunner/script/scene/hc03.cpp b/engines/bladerunner/script/scene/hc03.cpp
index c0d08c5a69..3d93906df9 100644
--- a/engines/bladerunner/script/scene/hc03.cpp
+++ b/engines/bladerunner/script/scene/hc03.cpp
@@ -197,13 +197,13 @@ void SceneScriptHC03::SceneFrameAdvanced(int frame) {
 		Sound_Play(281, Random_Query(33, 50), 50, 50, 50);
 	}
 
-	if (!Game_Flag_Query(521)
+	if (!Game_Flag_Query(kFlagHC03TrapDoorOpened)
 	 &&  frame == 66
 	) {
 		Ambient_Sounds_Play_Sound(328, 90, 0, -40, 99);
 		Sound_Play(201, Random_Query(47, 47), 0, -40, 50);
 		Scene_Exit_Add_2D_Exit(1, 400, 275, 515, 375, 2);
-		Game_Flag_Set(521);
+		Game_Flag_Set(kFlagHC03TrapDoorOpened);
 	}
 }