BLADERUNNER: More variable names in the game scripts

Fixed some errors as well

1 files changed, 153 insertions, 26 deletions

diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index 98dc5fa78f..31851c91f3 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -143,7 +143,7 @@ enum Clues {
 	kClueLicensePlate = 37,
 	kClueLicensePlateMatch = 38,
 	kClueLabPaintTransfer = 39,
-	kClueDispatchHitAndRun = 40,
+	kClueDispatchHitAndRun = 40, // is never acquired
 	kClueInceptShotRoy = 41,
 	kClueInceptShotsLeon = 42,
 	kCluePhoneCallGuzza = 43,
@@ -501,7 +501,6 @@ enum Flags {
 	kFlagCT02ZubenTalk = 59,
 	kFlagMA02MaggieIntroduced = 60,
 	kFlagChapter1Ended = 61,
-	// 61 is never used
 	kFlagMA04toMA05 = 62,
 	kFlagMA05toMA04 = 63,
 	kFlagGaffApproachedMcCoyAboutZuben = 64,
@@ -539,8 +538,11 @@ enum Flags {
 	kFlagTB02toTB05 = 96, // is never checked
 	kFlagTB05toTB06 = 97, // is never checked
 	kFlagTB06toTB05 = 98,
-
-	// 103 is never set
+	kFlagTB05MonitorIntro = 99,
+	kFlagTB05MonitorUnlockAttempt = 100,
+	kFlagTB05MonitorDone = 101,
+	kFlagTB06Visited = 102,
+	kFlagNotUsed103 = 103, // is never set
 	kFlagKleinTalkPaintTransfer = 104,
 	kFlagKleinTalkChromeDebris = 105,
 	kFlagIsabellaIntroduced = 105,
@@ -571,9 +573,12 @@ enum Flags {
 	kFlagPS02toPS07 = 131,
 	kFlagPS02toPS03 = 132,
 	kFlagPS02toPS09 = 133,
+	kFlagPS03toPS14 = 134,
+	kFlagPS14toPS03 = 135,
 	kFlagPS05toPS06 = 136,
 	kFlagHomelessTalkedTo = 137,
 	kFlagKleinInsulted = 138,
+	// 139 is never used
 	// 140 is never used
 	kFlagRC02LucyDeskAvailable = 141,
 	kFlagNotUsed142 = 142, // is never checked
@@ -583,7 +588,7 @@ enum Flags {
 	kFlagChapter1Ending = 146,
 	kFlagChopstickWrapperTaken = 147,
 	kFlagCandyTaken = 148,
-	kFlagDogTaken = 149,
+	kFlagToyDogTaken = 149,
 	kFlagNotUsed150 = 150, // has no use
 	kFlagRC03UnlockedToUG01 = 151,
 	kFlagUG15toUG16 = 152,
@@ -592,7 +597,7 @@ enum Flags {
 	kFlagTB03toTB02 = 155,
 	kFlagKleinInsultedTalk = 156,
 	// 157 is never used
-
+	kFlagSergeantWallsBuzzInDone = 158,
 	kFlagGuzzaTalkZubenRetired = 159,
 	kFlagGuzzaTalkZubenEscaped = 160,
 	kFlagGuzzaTalk1 = 161,
@@ -618,15 +623,32 @@ enum Flags {
 	kFlagMcCoyAtNRxx = 181,
 	kFlagMcCoyAtRCxx = 182,
 
+
+
 	kFlagRC01PoliceDone = 186,
 	kFlagRC02TalkedToRunciter = 187,
-
+	// 188 is never used
+	// 189 is never used
 	kFlagShellCasingsTaken = 190,
 	// 191 is never used
 	kFlagBoughtHowieLeeFood = 192,
-
+	// 193 is never used
+	// 194 is never used
+	// 195 is never used
+	kFlagKleinAnimation1 = 196,
+	kFlagKleinAnimation2 = 197,
+	kFlagKleinAnimation3 = 198,
+	kFlagOfficerLearyTakingNotes = 199,
+	// 200 is never used
+	// 201 is never used
+	// 202 is never used
+	// 203 is never used
 	kFlagPS15toPS05 = 204,
-
+	// 205 is never used
+	kFlagSergeantWallsBuzzInRequest = 206, // is never set
+	// 207 is never used
+	// 208 is never used
+	// 209 is never used
 	kFlagCT02ZubenFled = 210,
 	kFlagPS09Entered = 211,
 	kFlagNotUsed212 = 212, // is never checked
@@ -645,10 +667,26 @@ enum Flags {
 	kFlagDR02toDR01 = 225,
 	kFlagDR02toDR03 = 226,
 	kFlagDR03toDR02 = 227,
-
+	kFlagDR04toDR05 = 228, // is never checked
+	kFlagDR05toDR04 = 229,
+	kFlagDR04toDR06 = 230,
+	kFlagDR06toDR04 = 231,
+	kFlagNotUsed232 = 232,
+	// 233 is never used
 	kFlagCT02toCT01walk = 234,
-
-	kFlagArrivedFromSpinner = 247,
+	// 235 is never used
+	kFlagMcCoyAnimation1 = 236,
+	// 237 is never used
+	// 238 is never used
+	kFlagHowieLeeAnimation1 = 239,
+	// 240 is never used
+	// 241 is never used
+	// 242 is never used
+	// 243 is never used
+	// 244 is never used
+	// 245 is never used
+	// 246 is never used
+	kFlagArrivedFromSpinner1 = 247,
 	kFlagSpinnerAtCT01 = 248,
 	kFlagSpinnerAtRC01 = 249,
 	kFlagSpinnerAtMA01 = 250,
@@ -667,9 +705,41 @@ enum Flags {
 	kFlagBB02toBB01 = 263,
 	kFlagBB01toDR02 = 264,
 	kFlagDR02toBB01 = 265,
-
+	kFlagMorajiExploded = 266,
+	kFlagDR03ChewTalk1 = 267,
+	kFlagDR06JesterActive = 268,
+	kFlagDR05BombActivated = 269,
+	kFlagDR05ChainShot = 270,
+	kFlagDR05BombWillExplode = 271,
+	kFlagDR05BombExploded = 272,
+	kFlagArrivedFromSpinner2 = 273,
+	kFlagDR05MorajiTalk = 274,
+	// 275 is never used
+	kFlagNotUsed276 = 276, // is never set
+	// 277 is never used
+	kFlagDR06KeyboardChecked = 278,
+	// 279 is never used
+	kFlagDR06VidphoneChecked = 280,
+	kFlagBB03toBB02 = 281,
+	kFlagBB02toBB03 = 282, // is never checked
+	kFlagBB03toBB04 = 283,
+	kFlagBB04toBB03 = 284,
+	kFlagBB03toBB05 = 285, // is never checked
+	kFlagBB05toBB03 = 286,
+	kFlagRC04Entered = 287,
+	// 288 is never used
+	kFlagRC04McCoyShotBob = 289,
+	kFlagRC04BobTalk1 = 290,
+	// 291 is never used
+	kFlagRC04BobTalk2 = 292,
 	kFlagCT02PotTipped = 293,
 	kFlagGaffSpinnerCT12 = 294,
+	kFlagRC04BobShootMcCoy = 295,
+	kFlagRC04McCoyCombatMode = 296,
+
+	kFlagRC04McCoyWarned =  303,
+	kFlagRC04BobTalkAmmo = 305,
+	kFlagNotUsed306 = 306, // is never set
 	kFlagSpinnerAtTB02 = 307,
 	kFlagHF01toHF02 = 308,
 	kFlagHF02toHF01 = 309,
@@ -693,11 +763,27 @@ enum Flags {
 	kFlagUG09toCT12 = 432,
 	kFlagCT12ToUG09 = 433,
 	kFlagGenericWalkerWaiting = 443,
+	kFlagTB02ElevatorToTB05 = 450,
+	kFlagTB05Entered = 451,
+	kFlagTB02GuardTalk1 = 453,
+	kFlagTB02GuardTalk2 = 455,
+	kFlagTB02SteeleTalk = 456,
+	kFlagTB02SteeleEnter = 457,
+	kFlagSteeleWalkingAround = 460,
 	kFlagMaggieIsHurt = 461,
+	kFlagPS04GuzzaLeft = 462,
 	kFlagMcCoyArrested = 465,
+	kFlagMcCoyAtPS03 = 478, // has no use
+	kFlagMcCoyAtHCxx = 479,
+	kFlagTB06Introduction = 483,
+	kFlagPhotographerToTB06 = 485,
 	kFlagKIAPrivacyAddon = 487,
 	kFlagCT04HomelessTrashFinish = 492,
+	kFlagDR05ExplodedEntered = 511,
+	kFlagDR05BombExplosionView = 515,
 	kFlagCT07ZubenAttack = 516,
+	kFlagTB06DogCollarTaken = 519,
+	kFlagTB06KitchenBoxTaken = 520,
 	kFlagKIAPrivacyAddonIntro = 599,
 	kFlagTB07toTB02 = 608,
 	kFlagMcCoySleeping = 647,
@@ -709,12 +795,16 @@ enum Flags {
 	kFlagPS05TV2 = 690,
 	kFlagPS05TV3 = 691,
 	kFlagPS05TV4 = 692,
+	kFlagRC04Locked = 702,
+	kFlagTB06PhotographTalk1 = 707,
 	kFlagRC51Discovered = 709,
 	kFlagMA04WatchedTV = 711,
 	kFlagMcCoyShotAtZuben = 712,
+	kFlagRC04BobTalk3 = 717,
 	kFlagCT02McCoyFell = 719,
 	kFlagCT02McCoyCombatReady = 720,
-	kFlagZubenBountyPaid = 723
+	kFlagZubenBountyPaid = 723,
+	kFlagPS04WeaponsOrderForm = 727
 };
 
 enum Variables {
@@ -722,6 +812,8 @@ enum Variables {
 	kVariableChinyen = 2,
 	kVariablePoliceMazeScore = 9,
 	kVariablePoliceMazePS10TargetCounter = 10,
+	kVariableMcCoyEvidenceMissed = 14,
+	kVariableBobShot = 24, // has no use
 	kVariableGenericWalkerAModel = 32,
 	kVariableGenericWalkerBModel = 33,
 	kVariableGenericWalkerCModel = 34,
@@ -790,6 +882,9 @@ enum AnimationModes {
 	kAnimationModeCombatRun = 8,
 	kAnimationModeHit = 21,
 	kAnimationModeCombatHit = 22,
+	kAnimationModeSpinnerGetIn = 41,
+	kAnimationModeSpinnerGetOut = 42,
+	// 43 - taking photo/using cellphone
 	kAnimationModeWalkUp = 44,
 	kAnimationModeWalkDown = 45,
 	kAnimationModeCombatWalkUp = 46,
@@ -844,9 +939,9 @@ enum Scenes {
 	kSceneDR04 = 28,
 	kSceneDR05 = 29,
 	kSceneDR06 = 30,
-	kSceneHC01 = 31,
-	kSceneHC02 = 32,
-	kSceneHC03 = 33,
+	kSceneHC01 = 31, // Hawker's circle - Green pawn
+	kSceneHC02 = 32, // Hawker's circle - China bar
+	kSceneHC03 = 33, // Hawker's circle -
 	kSceneHF01 = 34,
 	kSceneHF02 = 35,
 	kSceneHF03 = 36,
@@ -893,12 +988,12 @@ enum Scenes {
 	kScenePS14 = 77,
 	kSceneRC01 = 78, // Runciter - Outside
 	kSceneRC02 = 79, // Runciter - Inside
-	kSceneRC03 = 80,
-	kSceneRC04 = 81,
-	kSceneTB02 = 82,
+	kSceneRC03 = 80, // Bullet Bob - outside
+	kSceneRC04 = 81, // Bullet Bob - inside
+	kSceneTB02 = 82, // Tyrell Building - reception
 	kSceneTB03 = 83,
-	kSceneTB05 = 84,
-	kSceneTB06 = 85,
+	kSceneTB05 = 84, // Tyrell Building - Grav Test Lab - outside
+	kSceneTB06 = 85, // Tyrell Building - Grav Test Lab - inside
 	kSceneUG01 = 86,
 	kSceneUG02 = 87,
 	kSceneUG03 = 88,
@@ -919,10 +1014,10 @@ enum Scenes {
 	kSceneUG19 = 103,
 	kSceneBB51 = 104,
 	kSceneCT51 = 105,
-	kSceneHC04 = 106,
+	kSceneHC04 = 106, // Hawker's circle - Kingston kitchen
 	kSceneRC51 = 107, // Runciter - Lucy's desk
 	kSceneTB07 = 108,
-	kScenePS15 = 119,
+	kScenePS15 = 119, // Police Station - Armory
 	kSceneBB12 = 120
 };
 
@@ -1044,12 +1139,21 @@ enum GameItems {
 	kItemPoliceMazeTarget8 = 7,
 	kItemPoliceMazeTarget9 = 8,
 	kItemChromeDebris = 66,
+	kItemDragonflyEarring = 76,
 	kItemCandy = 79,
 	kItemChopstickWrapper = 82,
+	kItemDogCollar = 84,
 	kItemToyDog = 98,
 	kItemShellCasingA = 100,
 	kItemShellCasingB = 101,
-	kItemShellCasingC = 102
+	kItemShellCasingC = 102,
+	kItemDeadDogA = 103,
+	kItemDeadDogB = 104,
+	kItemDeadDogC = 105,
+	kItemKitchenBox = 108,
+	kItemWeaponsCrate = 110,
+	kItemWeaponsOrderForm = 111,
+	kItemTyrellSalesPamphlet = 119
 };
 
 enum Elevators {
@@ -1127,11 +1231,33 @@ enum GoalMcCoy {
 	kGoalMcCoyDodge = 1
 };
 
+enum GoalSteele {
+	kGoalSteeleGoToTB02 = 110,
+	kGoalSteeleLeaveTB02 = 111,
+	kGoalSteeleGoToPoliceStation = 112,
+	kGoalSteeleWalkAround = 113,
+	kGoalSteeleWalkAroundRestart = 190
+};
+
+enum GoalGuzza {
+	kGoalGuzzaLeaveOffice = 100,
+	kGoalGuzzaGoToHawkersCircle = 101,
+	kGoalGuzzaGoToOffice = 102
+};
+
 enum GoalTransient {
 	kGoalTransientDefault = 0,
 	kGoalTransientCT04Leave = 2
 };
 
+enum GoalBulletBob {
+	kGoalBulletBobDefault = 0,
+	kGoalBulletBobWarningMcCoy = 1,
+	kGoalBulletBobShootMcCoy = 2,
+	kGoalBulletBobShotMcCoy = 3, // has no use
+	kGoalBulletBobDead = 4
+};
+
 enum GoalZuben {
 	kGoalZubenDefault = 0,
 	kGoalZubenCT01Leave = 1,
@@ -1154,7 +1280,8 @@ enum GoalZuben {
 
 enum GoalOfficerLeary {
 	kGoalOfficerLearyDefault = 0,
-	kGoalOfficerLearyCrowdInterrogation = 1
+	kGoalOfficerLearyRC01WalkToCrowd = 1,
+	kGoalOfficerLearyRC01CrowdInterrogation = 2
 };
 
 } // End of namespace BladeRunner