[Scummvm-git-logs] scummvm master -> 9a76434d400cb89c2b63d7f8d598b3e3bd28923a

antoniou79 antoniou at cti.gr
Thu Aug 15 23:55:39 CEST 2019


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a2df43bd91 BLADERUNNER: Cleaner format in constants and init_script(partial)
9a76434d40 BLADERUNNER: Early restoration for Dino Klein


Commit: a2df43bd91329a166a129fd128447ca7218b2ed2
    https://github.com/scummvm/scummvm/commit/a2df43bd91329a166a129fd128447ca7218b2ed2
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2019-08-16T00:50:49+03:00

Commit Message:
BLADERUNNER: Cleaner format in constants and init_script(partial)

Changed paths:
    engines/bladerunner/game_constants.h
    engines/bladerunner/script/init_script.cpp


diff --git a/engines/bladerunner/game_constants.h b/engines/bladerunner/game_constants.h
index c947b2d..94e437e 100644
--- a/engines/bladerunner/game_constants.h
+++ b/engines/bladerunner/game_constants.h
@@ -26,659 +26,659 @@
 namespace BladeRunner {
 
 enum Actors {
-	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, // Homeless
-	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,
+	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, // Homeless
+	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, // Rat
-	kActorFreeSlotB = 65,
-	kActorMaggie = 66,
-	kActorGenwalkerA = 67,
-	kActorGenwalkerB = 68,
-	kActorGenwalkerC = 69,
-	kActorMutant1 = 70,
-	kActorMutant2 = 71,
-	kActorMutant3 = 72,
-	kActorVoiceOver = 99
+	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, // Rat
+	kActorFreeSlotB        = 65,
+	kActorMaggie           = 66,
+	kActorGenwalkerA       = 67,
+	kActorGenwalkerB       = 68,
+	kActorGenwalkerC       = 69,
+	kActorMutant1          = 70,
+	kActorMutant2          = 71,
+	kActorMutant3          = 72,
+	kActorVoiceOver        = 99
 };
 
 enum Clues {
-	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,
-	kClueZubenSquadPhoto = 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, // is now acquired in restored Cut Content
-	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,
-	kClueTyrellSalesPamphletEntertainModel = 54,
-	kClueTyrellSalesPamphletLolita = 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,
-	kClueGordosLighterReplicant = 105,
-	kClueGordosLighterHuman = 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, // ESPER hard-copy
-	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
+	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,
+	kClueZubenSquadPhoto                   =  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, // is now acquired in restored Cut Content
+	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,
+	kClueTyrellSalesPamphletEntertainModel =  54,
+	kClueTyrellSalesPamphletLolita         =  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,
+	kClueGordosLighterReplicant            = 105,
+	kClueGordosLighterHuman                = 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, // ESPER hard-copy
+	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 {
-	kClueTypeIntangible = -1,
-	kClueTypePhotograph = 0,
-	kClueTypeVideoClip = 1,
-	kClueTypeAudioRecording = 2,
-	kClueTypeObject = 3
+	kClueTypeIntangible     = -1,
+	kClueTypePhotograph     =  0,
+	kClueTypeVideoClip      =  1,
+	kClueTypeAudioRecording =  2,
+	kClueTypeObject         =  3
 };
 
 enum Suspects {
-	kSuspectSadik = 0,
-	kSuspectClovis = 1,
-	kSuspectZuben = 2,
-	kSuspectLucy = 3,
-	kSuspectDekora = 4,
-	kSuspectGordo = 5,
-	kSuspectIzo = 6,
-	kSuspectMcCoy = 7,
-	kSuspectGuzza = 8
+	kSuspectSadik           = 0,
+	kSuspectClovis          = 1,
+	kSuspectZuben           = 2,
+	kSuspectLucy            = 3,
+	kSuspectDekora          = 4,
+	kSuspectGordo           = 5,
+	kSuspectIzo             = 6,
+	kSuspectMcCoy           = 7,
+	kSuspectGuzza           = 8
 };
 
 enum Crimes {
-	kCrimeAnimalMurder = 0,
+	kCrimeAnimalMurder      = 0,
 	kCrimeEisendullerMurder = 1,
-	kCrimeArmsDealing = 2,
-	kCrimeMorajiMurder = 3,
-	kCrimeBradburyAssault = 4,
-	kCrimeFactoryBombing = 5,
-	kCrimeBobMurder = 6,
-	kCrimeRunciterMurder = 7,
-	kCrimeMoonbusHijacking = 8
+	kCrimeArmsDealing       = 2,
+	kCrimeMorajiMurder      = 3,
+	kCrimeBradburyAssault   = 4,
+	kCrimeFactoryBombing    = 5,
+	kCrimeBobMurder         = 6,
+	kCrimeRunciterMurder    = 7,
+	kCrimeMoonbusHijacking  = 8
 };
 
 enum SpinnerDestinations {
-	kSpinnerDestinationPoliceStation = 0,
-	kSpinnerDestinationMcCoysApartment = 1,
+	kSpinnerDestinationPoliceStation    = 0,
+	kSpinnerDestinationMcCoysApartment  = 1,
 	kSpinnerDestinationRuncitersAnimals = 2,
-	kSpinnerDestinationChinatown = 3,
-	kSpinnerDestinationAnimoidRow = 4,
-	kSpinnerDestinationTyrellBuilding = 5,
-	kSpinnerDestinationDNARow = 6,
+	kSpinnerDestinationChinatown        = 3,
+	kSpinnerDestinationAnimoidRow       = 4,
+	kSpinnerDestinationTyrellBuilding   = 5,
+	kSpinnerDestinationDNARow           = 6,
 	kSpinnerDestinationBradburyBuilding = 7,
-	kSpinnerDestinationNightclubRow = 8,
-	kSpinnerDestinationHysteriaHall = 9
+	kSpinnerDestinationNightclubRow     = 8,
+	kSpinnerDestinationHysteriaHall     = 9
 };
 
 enum Flags {
-	kFlagNotUsed0 = 0, // is never checked
-	kFlagRC02Entered = 1,
-	kFlagGamePlayedInRestoredContentMode = 2, // Re-purposed. Original: 2 is never used
-	kFlagRC01GotOfficersStatement = 3,
-	kFlagRC02Left = 4,
-	kFlagMcCoyCommentsOnMurderedAnimals = 5, // Re-purposed. Original: 5 is never used
-	kFlagRC02RunciterInterview = 6,
-	kFlagCT01TalkToHowieAboutDeadZuben = 7, // Re-purposed. Original: 7 is never used
-	kFlagRC01toRC02 = 8,
-	kFlagRC02toRC01 = 9,
-	kFlagDR01toDR04 = 10,
-	kFlagDR04toDR01 = 11,
-	kFlagPS07KleinTalkShellCasings = 12,
-	kFlagPS07KleinTalkOfficersStatement = 13,
-	kFlagPS10toPS11 = 14,
-	kFlagPS11toPS10 = 15,
-	kFlagPS11toPS12 = 16,
-	kFlagPS12toPS11 = 17, // is never checked
-	kFlagPS12toPS13 = 18,
-	kFlagPS13toPS12 = 19,
-	kFlagRC02RunciterVKChosen = 20, // re-purposed - original: 20 is never used
-	kFlagPS13toPS05 = 21,
-	kFlagPS02toPS05 = 22,
-	kFlagPS06toPS05 = 23,
-	kFlagIntroPlayed = 24,
-	kFlagCT01Visited = 25,
-	kFlagCT01McCoyTalkedToHowieLee = 26,
-	kFlagCT01Evidence1Linked = 27,
-	kFlagCT01Evidence2Linked = 28,
-	kFlagCT01ZubenLeft = 29,
-	kFlagCT01TalkToHowieAfterZubenMissing = 30,  // New, it is now set/unset to restore cut content there. Original: is never set
-	kFlagCT01ZubenGone = 31,
-	kFlagCT01GordoTalk = 32,
-	kFlagMA02toMA06 = 33,
-	kFlagMA06ToMA02 = 34,
-	kFlagMA02ToMA04 = 35,
-	kFlagMA04ToMA02 = 36,
-	kFlagMA01toMA06 = 37,
-	kFlagMA06toMA01 = 38,
-	kFlagPS04toPS03 = 39,
-	kFlagZubenRetired = 40,
-	kFlagZubenSpared = 41,
-	kFlagPS03toPS04 = 42,
-	kFlagPS15Entered = 43,
-	kFlagIzoIsReplicant = 44,
-	kFlagGordoIsReplicant = 45,
-	kFlagLucyIsReplicant = 46,
-	kFlagDektoraIsReplicant = 47,
-	kFlagSadikIsReplicant = 48,
-	kFlagPS09GrigorianTalk1 = 49,
-	kFlagPS09GrigorianVKChosen = 50, // re-purposed, original is never used
-	kFlagGrigorianDislikeMcCoy = 51,
-	kFlagRC02McCoyCommentsOnVideoScreens = 52, // re-purposed, original is never used
-	kFlagPS09GrigorianDialogue = 53,
-	kFlagPS09GrigorianTalk2 = 54,
-	kFlagGrigorianArrested = 55,
-	kFlagPS09CrazylegsGrigorianTalk = 56,
-	kFlagMA07toMA06 = 57,
-	kFlagMA06toMA07 = 58,
-	kFlagCT02ZubenTalk = 59,
-	kFlagMA02MaggieIntroduced = 60,
-	kFlagChapter1Ended = 61,
-	kFlagMA04toMA05 = 62,
-	kFlagMA05toMA04 = 63,
-	kFlagGaffApproachedMcCoyAboutZuben = 64,
+	kFlagNotUsed0                             =   0, // is never checked
+	kFlagRC02Entered                          =   1,
+	kFlagGamePlayedInRestoredContentMode      =   2, // Re-purposed. Original: 2 is never used
+	kFlagRC01GotOfficersStatement             =   3,
+	kFlagRC02Left                             =   4,
+	kFlagMcCoyCommentsOnMurderedAnimals       =   5, // Re-purposed. Original: 5 is never used
+	kFlagRC02RunciterInterview                =   6,
+	kFlagCT01TalkToHowieAboutDeadZuben        =   7, // Re-purposed. Original: 7 is never used
+	kFlagRC01toRC02                           =   8,
+	kFlagRC02toRC01                           =   9,
+	kFlagDR01toDR04                           =  10,
+	kFlagDR04toDR01                           =  11,
+	kFlagPS07KleinTalkShellCasings            =  12,
+	kFlagPS07KleinTalkOfficersStatement       =  13,
+	kFlagPS10toPS11                           =  14,
+	kFlagPS11toPS10                           =  15,
+	kFlagPS11toPS12                           =  16,
+	kFlagPS12toPS11                           =  17, // is never checked
+	kFlagPS12toPS13                           =  18,
+	kFlagPS13toPS12                           =  19,
+	kFlagRC02RunciterVKChosen                 =  20, // Re-purposed. Original: 20 is never used
+	kFlagPS13toPS05                           =  21,
+	kFlagPS02toPS05                           =  22,
+	kFlagPS06toPS05                           =  23,
+	kFlagIntroPlayed                          =  24,
+	kFlagCT01Visited                          =  25,
+	kFlagCT01McCoyTalkedToHowieLee            =  26,
+	kFlagCT01Evidence1Linked                  =  27,
+	kFlagCT01Evidence2Linked                  =  28,
+	kFlagCT01ZubenLeft                        =  29,
+	kFlagCT01TalkToHowieAfterZubenMissing     =  30, // New, it is now set/unset to restore cut content there. Original: is never set
+	kFlagCT01ZubenGone                        =  31,
+	kFlagCT01GordoTalk                        =  32,
+	kFlagMA02toMA06                           =  33,
+	kFlagMA06ToMA02                           =  34,
+	kFlagMA02ToMA04                           =  35,
+	kFlagMA04ToMA02                           =  36,
+	kFlagMA01toMA06                           =  37,
+	kFlagMA06toMA01                           =  38,
+	kFlagPS04toPS03                           =  39,
+	kFlagZubenRetired                         =  40,
+	kFlagZubenSpared                          =  41,
+	kFlagPS03toPS04                           =  42,
+	kFlagPS15Entered                          =  43,
+	kFlagIzoIsReplicant                       =  44,
+	kFlagGordoIsReplicant                     =  45,
+	kFlagLucyIsReplicant                      =  46,
+	kFlagDektoraIsReplicant                   =  47,
+	kFlagSadikIsReplicant                     =  48,
+	kFlagPS09GrigorianTalk1                   =  49,
+	kFlagPS09GrigorianVKChosen                =  50, // Re-purposed. Original: 50 is never used
+	kFlagGrigorianDislikeMcCoy                =  51,
+	kFlagRC02McCoyCommentsOnVideoScreens      =  52, // Re-purposed. Original: 52 is never used
+	kFlagPS09GrigorianDialogue                =  53,
+	kFlagPS09GrigorianTalk2                   =  54,
+	kFlagGrigorianArrested                    =  55,
+	kFlagPS09CrazylegsGrigorianTalk           =  56,
+	kFlagMA07toMA06                           =  57,
+	kFlagMA06toMA07                           =  58,
+	kFlagCT02ZubenTalk                        =  59,
+	kFlagMA02MaggieIntroduced                 =  60,
+	kFlagChapter1Ended                        =  61,
+	kFlagMA04toMA05                           =  62,
+	kFlagMA05toMA04                           =  63,
+	kFlagGaffApproachedMcCoyAboutZuben        =  64,
 	// 65 is never used
 	// 66 is never used
 	// 67 is never used
-	kFlagCT02toCT01 = 68,
-	kFlagCT02toCT03 = 69,
-	kFlagCT03toCT02 = 70,
-	kFlagCT03toCT01 = 71,
-	kFlagCT03toCT04 = 72,
-	kFlagCT04toCT03 = 73,
-	kFlagCT04toCT05 = 74,
-	kFlagCT05toCT04 = 75,
-	kFlagCT05toCT12 = 76,
-	kFlagCT05toCT06 = 77,
-	kFlagCT06toCT05 = 78,
-	kFlagCT06toCT08 = 79,
-	kFlagCT08toCT06 = 80, // is never checked
-	kFlagCT08toCT09 = 81,
-	kFlagCT09toCT10 = 82, // is never checked
-	kFlagCT09toCT11 = 83, // is never checked
-	kFlagCT09toCT08 = 84, // is never checked
-	kFlagCT10toCT09 = 85,
-	kFlagCT11toCT12 = 86,
+	kFlagCT02toCT01                           =  68,
+	kFlagCT02toCT03                           =  69,
+	kFlagCT03toCT02                           =  70,
+	kFlagCT03toCT01                           =  71,
+	kFlagCT03toCT04                           =  72,
+	kFlagCT04toCT03                           =  73,
+	kFlagCT04toCT05                           =  74,
+	kFlagCT05toCT04                           =  75,
+	kFlagCT05toCT12                           =  76,
+	kFlagCT05toCT06                           =  77,
+	kFlagCT06toCT05                           =  78,
+	kFlagCT06toCT08                           =  79,
+	kFlagCT08toCT06                           =  80, // is never checked
+	kFlagCT08toCT09                           =  81,
+	kFlagCT09toCT10                           =  82, // is never checked
+	kFlagCT09toCT11                           =  83, // is never checked
+	kFlagCT09toCT08                           =  84, // is never checked
+	kFlagCT10toCT09                           =  85,
+	kFlagCT11toCT12                           =  86,
 	// 87 is never used
-	kFlagCT12toCT01 = 88,
-	kFlagCT12toCT03 = 89,
-	kFlagCT12toCT05 = 90,
-	kFlagCT12toCT11 = 91,
+	kFlagCT12toCT01                           =  88,
+	kFlagCT12toCT03                           =  89,
+	kFlagCT12toCT05                           =  90,
+	kFlagCT12toCT11                           =  91,
 	// 92 is never used
 	// 93 is never used
-	kFlagCT05WarehouseOpen = 94,
-	kFlagTB05toTB02 = 95,
-	kFlagTB02toTB05 = 96, // is never checked
-	kFlagTB05toTB06 = 97, // is never checked
-	kFlagTB06toTB05 = 98,
-	kFlagTB05MonitorIntro = 99,
-	kFlagTB05MonitorUnlockAttempt = 100,
-	kFlagTB05MonitorDone = 101,
-	kFlagTB06Visited = 102,
-	kFlagNotUsed103 = 103, // is never set
-	kFlagPS07KleinTalkPaintTransfer = 104,
-	kFlagPS07KleinTalkChromeDebris = 105,
-	kFlagHC04IsabellaTalk = 106,
-	kFlagHC04toRC03 = 107,
-	kFlagRC03toHC04 = 108,
-	kFlagHC04toHC02 = 109,
-	kFlagHC02toHC04 = 110,
-	kFlagPS07KleinTalkClues = 111,
-	kFlagMcCoyCommentsOnAnimoids = 112,  // Re-purposed. Original: 112 is never used
-	kFlagScorpionsInAR02 = 113,   // Re-purposed. Original: 113 is never used
-	kFlagRC03toRC01 = 114,
-	kFlagRC01toRC03 = 115,
-	kFlagRC03toAR02 = 116,
-	kFlagAR02toRC03 = 117,
-	kFlagRC03toUG01 = 118,
-	kFlagUG01toRC03 = 119,
-	kFlagRC03toRC04 = 120, // is never checked
-	kFlagRC04toRC03 = 121,
+	kFlagCT05WarehouseOpen                    =  94,
+	kFlagTB05toTB02                           =  95,
+	kFlagTB02toTB05                           =  96, // is never checked
+	kFlagTB05toTB06                           =  97, // is never checked
+	kFlagTB06toTB05                           =  98,
+	kFlagTB05MonitorIntro                     =  99,
+	kFlagTB05MonitorUnlockAttempt             = 100,
+	kFlagTB05MonitorDone                      = 101,
+	kFlagTB06Visited                          = 102,
+	kFlagNotUsed103                           = 103, // is never set
+	kFlagPS07KleinTalkPaintTransfer           = 104,
+	kFlagPS07KleinTalkChromeDebris            = 105,
+	kFlagHC04IsabellaTalk                     = 106,
+	kFlagHC04toRC03                           = 107,
+	kFlagRC03toHC04                           = 108,
+	kFlagHC04toHC02                           = 109,
+	kFlagHC02toHC04                           = 110,
+	kFlagPS07KleinTalkClues                   = 111,
+	kFlagMcCoyCommentsOnAnimoids              = 112, // Re-purposed. Original: 112 is never used
+	kFlagScorpionsInAR02                      = 113, // Re-purposed. Original: 113 is never used
+	kFlagRC03toRC01                           = 114,
+	kFlagRC01toRC03                           = 115,
+	kFlagRC03toAR02                           = 116,
+	kFlagAR02toRC03                           = 117,
+	kFlagRC03toUG01                           = 118,
+	kFlagUG01toRC03                           = 119,
+	kFlagRC03toRC04                           = 120, // is never checked
+	kFlagRC04toRC03                           = 121,
 	// 122 is never used
-	kFlagCT01toCT12 = 123,
+	kFlagCT01toCT12                           = 123,
 	// 122 is never used
-	kFlagMcCoyHasShellCasings = 125,
-	kFlagMcCoyHasOfficersStatement = 126,
-	kFlagMcCoyHasPaintTransfer = 127,
-	kFlagMcCoyHasChromeDebris = 128,
-	kFlagCT01ZubenMcCoyCheck = 129,
-	kFlagPS02toPS01 = 130,
-	kFlagPS02toPS07 = 131,
-	kFlagPS02toPS03 = 132,
-	kFlagPS02toPS09 = 133,
-	kFlagPS03toPS14 = 134,
-	kFlagPS14toPS03 = 135,
-	kFlagPS05toPS06 = 136,
-	kFlagCT04HomelessTalk = 137,
-	kFlagPS07KleinInsulted = 138,
+	kFlagMcCoyHasShellCasings                 = 125,
+	kFlagMcCoyHasOfficersStatement            = 126,
+	kFlagMcCoyHasPaintTransfer                = 127,
+	kFlagMcCoyHasChromeDebris                 = 128,
+	kFlagCT01ZubenMcCoyCheck                  = 129,
+	kFlagPS02toPS01                           = 130,
+	kFlagPS02toPS07                           = 131,
+	kFlagPS02toPS03                           = 132,
+	kFlagPS02toPS09                           = 133,
+	kFlagPS03toPS14                           = 134,
+	kFlagPS14toPS03                           = 135,
+	kFlagPS05toPS06                           = 136,
+	kFlagCT04HomelessTalk                     = 137,
+	kFlagPS07KleinInsulted                    = 138,
 	// 139 is never used
 	// 140 is never used
-	kFlagRC51Available = 141,
-	kFlagNotUsed142 = 142, // is never checked
+	kFlagRC51Available                        = 141,
+	kFlagNotUsed142                           = 142, // is never checked
 	// 143 is never used
-	kFlagCT07toCT06 = 144,
-	kFlagCT06ZubenPhoto = 145,
-	kFlagChapter1Ending = 146,
-	kFlagRC51ChopstickWrapperTaken = 147,
-	kFlagRC51CandyTaken = 148,
-	kFlagRC51ToyDogTaken = 149,
-	kFlagNotUsed150 = 150, // has no use
-	kFlagRC03UnlockedToUG01 = 151,
-	kFlagUG15toUG16a = 152,
-	kFlagUG16toUG15a = 153,
-	kFlagTB02toTB03 = 154, // is never checked
-	kFlagTB03toTB02 = 155,
-	kFlagPS07KleinInsultedTalk = 156,
+	kFlagCT07toCT06                           = 144,
+	kFlagCT06ZubenPhoto                       = 145,
+	kFlagChapter1Ending                       = 146,
+	kFlagRC51ChopstickWrapperTaken            = 147,
+	kFlagRC51CandyTaken                       = 148,
+	kFlagRC51ToyDogTaken                      = 149,
+	kFlagNotUsed150                           = 150, // has no use
+	kFlagRC03UnlockedToUG01                   = 151,
+	kFlagUG15toUG16a                          = 152,
+	kFlagUG16toUG15a                          = 153,
+	kFlagTB02toTB03                           = 154, // is never checked
+	kFlagTB03toTB02                           = 155,
+	kFlagPS07KleinInsultedTalk                = 156,
 	// 157 is never used
-	kFlagSergeantWallsBuzzInDone = 158,
-	kFlagPS04GuzzaTalkZubenRetired = 159,
-	kFlagPS04GuzzaTalkZubenEscaped = 160,
-	kFlagPS04GuzzaTalk1 = 161,
-	kFlagPS04GuzzaTalk2 = 162,
-	kFlagRC01ChromeDebrisTaken = 163,
-	kFlagIzoArrested = 164,
-	kFlagCrazylegsArrested = 165,
-	kFlagPS09CrazylegsTalk1 = 166,
-	kFlagPS09IzoTalk1 = 167,
-	kFlagPS09IzoTalk2 = 168,
-	kFlagCT04HomelessKilledByMcCoy = 169,
-	kFlagCT04HomelessBodyInDumpster = 170,
-	kFlagCT04HomelessBodyFound = 171,
-	kFlagCT04HomelessBodyThrownAway = 172,
+	kFlagSergeantWallsBuzzInDone              = 158,
+	kFlagPS04GuzzaTalkZubenRetired            = 159,
+	kFlagPS04GuzzaTalkZubenEscaped            = 160,
+	kFlagPS04GuzzaTalk1                       = 161,
+	kFlagPS04GuzzaTalk2                       = 162,
+	kFlagRC01ChromeDebrisTaken                = 163,
+	kFlagIzoArrested                          = 164,
+	kFlagCrazylegsArrested                    = 165,
+	kFlagPS09CrazylegsTalk1                   = 166,
+	kFlagPS09IzoTalk1                         = 167,
+	kFlagPS09IzoTalk2                         = 168,
+	kFlagCT04HomelessKilledByMcCoy            = 169,
+	kFlagCT04HomelessBodyInDumpster           = 170,
+	kFlagCT04HomelessBodyFound                = 171,
+	kFlagCT04HomelessBodyThrownAway           = 172,
 	kFlagCT04HomelessBodyInDumpsterNotChecked = 173, // is never checked
-	kFlagCT04LicensePlaceFound = 174,
-	kFlagPS09CrazylegsTalk2 = 175,
-	kFlagMcCoyInChinaTown = 176,
-	kFlagMcCoyInDNARow = 177,
-	kFlagMcCoyInPoliceStation = 178,
-	kFlagMcCoyInMcCoyApartment = 179,
-	kFlagMcCoyInAnimoidRow = 180,
-	kFlagMcCoyInNightclubRow = 181,
-	kFlagMcCoyInRunciters = 182,
-	kFlagSteeleInRunciters = 183,
-	kFlagSteeleInChinaTown = 184,
-	kFlagSteeleInPoliceStation = 185,
-	kFlagRC01PoliceDone = 186,
-	kFlagRC02RunciterTalk1 = 187,
+	kFlagCT04LicensePlaceFound                = 174,
+	kFlagPS09CrazylegsTalk2                   = 175,
+	kFlagMcCoyInChinaTown                     = 176,
+	kFlagMcCoyInDNARow                        = 177,
+	kFlagMcCoyInPoliceStation                 = 178,
+	kFlagMcCoyInMcCoyApartment                = 179,
+	kFlagMcCoyInAnimoidRow                    = 180,
+	kFlagMcCoyInNightclubRow                  = 181,
+	kFlagMcCoyInRunciters                     = 182,
+	kFlagSteeleInRunciters                    = 183,
+	kFlagSteeleInChinaTown                    = 184,
+	kFlagSteeleInPoliceStation                = 185,
+	kFlagRC01PoliceDone                       = 186,
+	kFlagRC02RunciterTalk1                    = 187,
 	// 188 is never used
 	// 189 is never used
-	kFlagRC02ShellCasingsTaken = 190,
+	kFlagRC02ShellCasingsTaken                = 190,
 	// 191 is never used
-	kFlagCT01BoughtHowieLeeFood = 192,
+	kFlagCT01BoughtHowieLeeFood               = 192,
 	// 193 is never used
 	// 194 is never used
 	// 195 is never used
-	kFlagKleinAnimation1 = 196,
-	kFlagKleinAnimation2 = 197,
-	kFlagKleinAnimation3 = 198,
-	kFlagOfficerLearyTakingNotes = 199,
+	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,
+	kFlagPS15toPS05                           = 204,
 	// 205 is never used
-	kFlagSergeantWallsBuzzInRequest = 206, // is never set
+	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
+	kFlagCT02ZubenFled                        = 210,
+	kFlagPS09Entered                          = 211,
+	kFlagNotUsed212                           = 212, // is never checked
 	// 213 is never used
 	// 214 is never used
 	// 215 is never used
-	kFlagBB09toBB10a = 216,
+	kFlagBB09toBB10a                          = 216,
 	// 217 is never used
-	kFlagBB08toBB09 = 218,
-	kFlagBB09toBB08 = 219,
-	kFlagBB09toBB10b = 220,
-	kFlagBB10toBB09 = 221,
-	kFlagBB10toBB11 = 222, // is never checked
-	kFlagBB11toBB10 = 223,
-	kFlagDR01toDR02 = 224,
-	kFlagDR02toDR01 = 225,
-	kFlagDR02toDR03 = 226,
-	kFlagDR03toDR02 = 227,
-	kFlagDR04toDR05 = 228, // is never checked
-	kFlagDR05toDR04 = 229,
-	kFlagDR04toDR06 = 230,
-	kFlagDR06toDR04 = 231,
-	kFlagNotUsed232 = 232,
+	kFlagBB08toBB09                           = 218,
+	kFlagBB09toBB08                           = 219,
+	kFlagBB09toBB10b                          = 220,
+	kFlagBB10toBB09                           = 221,
+	kFlagBB10toBB11                           = 222, // is never checked
+	kFlagBB11toBB10                           = 223,
+	kFlagDR01toDR02                           = 224,
+	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,
+	kFlagCT02toCT01walk                       = 234,
 	// 235 is never used
-	kFlagMcCoyAnimation1 = 236,
+	kFlagMcCoyAnimation1                      = 236,
 	// 237 is never used
 	// 238 is never used
-	kFlagHowieLeeAnimation1 = 239,
+	kFlagHowieLeeAnimation1                   = 239,
 	// 240 is never used
 	// 241 is never used
 	// 242 is never used
@@ -686,598 +686,598 @@ enum Flags {
 	// 244 is never used
 	// 245 is never used
 	// 246 is never used
-	kFlagArrivedFromSpinner1 = 247,
-	kFlagSpinnerAtCT01 = 248,
-	kFlagSpinnerAtRC01 = 249,
-	kFlagSpinnerAtMA01 = 250,
-	kFlagSpinnerAtPS01 = 251,
-	kFlagSpinnerAtAR01 = 252,
-	kFlagSpinnerAtDR01 = 253,
-	kFlagSpinnerAtBB01 = 254,
-	kFlagSpinnerAtNR01 = 255,
-	kFlagSpinnerAtHF01 = 256,
-	kFlagMcCoyInHysteriaHall = 257,
-	kFlagMcCoyInBradburyBuilding = 258,
-	kFlagMcCoyInUnderground = 259,
+	kFlagArrivedFromSpinner1                  = 247,
+	kFlagSpinnerAtCT01                        = 248,
+	kFlagSpinnerAtRC01                        = 249,
+	kFlagSpinnerAtMA01                        = 250,
+	kFlagSpinnerAtPS01                        = 251,
+	kFlagSpinnerAtAR01                        = 252,
+	kFlagSpinnerAtDR01                        = 253,
+	kFlagSpinnerAtBB01                        = 254,
+	kFlagSpinnerAtNR01                        = 255,
+	kFlagSpinnerAtHF01                        = 256,
+	kFlagMcCoyInHysteriaHall                  = 257,
+	kFlagMcCoyInBradburyBuilding              = 258,
+	kFlagMcCoyInUnderground                   = 259,
 	// 260 is never used
-	kFlagMcCoyInTyrellBuilding = 261,
-	kFlagBB01toBB02 = 262,
-	kFlagBB02toBB01 = 263,
-	kFlagBB01toDR02 = 264,
-	kFlagDR02toBB01 = 265,
-	kFlagDR05JustExploded = 266,
-	kFlagDR03ChewTalk1 = 267,
-	kFlagDR06JesterActive = 268,
-	kFlagDR05BombActivated = 269,
-	kFlagDR05ChainShot = 270,
-	kFlagDR05BombWillExplode = 271,
-	kFlagDR05BombExploded = 272,
-	kFlagArrivedFromSpinner2 = 273,
-	kFlagDR05MorajiTalk = 274,
+	kFlagMcCoyInTyrellBuilding                = 261,
+	kFlagBB01toBB02                           = 262,
+	kFlagBB02toBB01                           = 263,
+	kFlagBB01toDR02                           = 264,
+	kFlagDR02toBB01                           = 265,
+	kFlagDR05JustExploded                     = 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
+	kFlagNotUsed276                           = 276, // is never set
 	// 277 is never used
-	kFlagDR06KeyboardChecked = 278,
+	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,
+	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,
+	kFlagRC04McCoyShotBob                     = 289,
+	kFlagRC04BobTalk1                         = 290,
 	// 291 is never used
-	kFlagRC04BobTalk2 = 292,
-	kFlagCT02PotTipped = 293,
-	kFlagCT12GaffSpinner = 294,
-	kFlagRC04BobShootMcCoy = 295,
-	kFlagRC04McCoyCombatMode = 296,
-	kFlagBB05toBB06 = 297,
-	kFlagBB06toBB05 = 298,
-	kFlagBB05toBB07 = 299,
-	kFlagBB07toBB05 = 300,
-	kFlagBB05toBB12 = 301, // is never checked
-	kFlagBB12toBB05 = 302,
-	kFlagRC04McCoyWarned =  303,
-	kFlagCT11toCT09 = 304, // is never checked
-	kFlagRC04BobTalkAmmo = 305,
-	kFlagNotUsed306 = 306, // is never set
-	kFlagSpinnerAtTB02 = 307,
-	kFlagHF01toHF02 = 308,
-	kFlagHF02toHF01 = 309,
-	kFlagHF01toHF03 = 310,
-	kFlagHF03toHF01 = 311,
-	kFlagHF01toHF05 = 312,
-	kFlagHF05toHF01 = 313,
-	kFlagUG01toUG02 = 314,
-	kFlagUG02toUG01 = 315,
-	kFlagUG01toUG10 = 316,
-	kFlagUG10toUG01 = 317,
-	kFlagUG02toHC03 = 318,
-	kFlagHC03toUG02 = 319,
-	kFlagAR01toAR02 = 320,
-	kFlagAR02toAR01 = 321,
-	kFlagAR01toHC01 = 322,
-	kFlagHC01toAR01 = 323,
-	kFlagUG01SteamOff = 324,
-	kFlagCT04BodyDumped = 325,
-	kFlagBB01Available = 326,
+	kFlagRC04BobTalk2                         = 292,
+	kFlagCT02PotTipped                        = 293,
+	kFlagCT12GaffSpinner                      = 294,
+	kFlagRC04BobShootMcCoy                    = 295,
+	kFlagRC04McCoyCombatMode                  = 296,
+	kFlagBB05toBB06                           = 297,
+	kFlagBB06toBB05                           = 298,
+	kFlagBB05toBB07                           = 299,
+	kFlagBB07toBB05                           = 300,
+	kFlagBB05toBB12                           = 301, // is never checked
+	kFlagBB12toBB05                           = 302,
+	kFlagRC04McCoyWarned                      = 303,
+	kFlagCT11toCT09                           = 304, // is never checked
+	kFlagRC04BobTalkAmmo                      = 305,
+	kFlagNotUsed306                           = 306, // is never set
+	kFlagSpinnerAtTB02                        = 307,
+	kFlagHF01toHF02                           = 308,
+	kFlagHF02toHF01                           = 309,
+	kFlagHF01toHF03                           = 310,
+	kFlagHF03toHF01                           = 311,
+	kFlagHF01toHF05                           = 312,
+	kFlagHF05toHF01                           = 313,
+	kFlagUG01toUG02                           = 314,
+	kFlagUG02toUG01                           = 315,
+	kFlagUG01toUG10                           = 316,
+	kFlagUG10toUG01                           = 317,
+	kFlagUG02toHC03                           = 318,
+	kFlagHC03toUG02                           = 319,
+	kFlagAR01toAR02                           = 320,
+	kFlagAR02toAR01                           = 321,
+	kFlagAR01toHC01                           = 322,
+	kFlagHC01toAR01                           = 323,
+	kFlagUG01SteamOff                         = 324,
+	kFlagCT04BodyDumped                       = 325,
+	kFlagBB01Available                        = 326,
 	// 327 is never used
-	kFlagAR01FishDealerTalk = 328,
-	kFlagAR02InsectDealerInterviewed = 329,
-	kFlagAR02HassanTalk = 330,
-	kFlagAR02ScorpionsChecked = 331,
-	kFlagBB02toBB04 = 332,
-	kFlagBB04toBB02 = 333,
-	kFlagUG03toUG04 = 334, // is never checked
-	kFlagUG04toUG03 = 335,
-	kFlagUG03toUG10 = 336,
-	kFlagUG10toUG03 = 337,
-	kFlagUG04toUG05 = 338, // is never checked
-	kFlagUG05toUG04 = 339,
-	kFlagUG04toUG06 = 340,
-	kFlagUG06toUG04 = 341,
-	kFlagUG06toNR01 = 342,
-	kFlagNR01toUG06 = 343,
-	kFlagUG12toUG14 = 344,
-	kFlagUG14toUG12 = 345, // is never checked
-	kFlagUG14toUG10 = 346,
-	kFlagUG10toUG14 = 347, // is never checked
-	kFlagUG14toUG19 = 348,
-	kFlagUG19toUG14 = 349,
-	kFlagUG15toUG13 = 350,
-	kFlagUG13toUG15 = 351,
-	kFlagUG15toUG17 = 352,
-	kFlagUG17toUG15 = 353,
-	kFlagUG15toUG16b = 354, // is never checked
-	kFlagUG16toUG15b = 355,
-	kFlagUG19toMA07 = 356,
-	kFlagMA07toUG19 = 357,
-	kFlagHF07toHF05 = 358,
-	kFlagHF05toHF07 = 359,
-	kFlagHF07toUG06 = 360,
-	kFlagUG06toHF07 = 361,
-	kFlagBB07toBB06 = 362,
-	kFlagBB06toBB07 = 363,
-	kFlagBB07toBB12 = 364,
-	kFlagBB12toBB07 = 365,
-	kFlagAR02InsectDealerTalk = 366,
-	kFlagAR02StungByScorpion = 367,
-	kFlagHF07Hole = 368,
-	kFlagHF05Hole = 369,
-	kFlagNotUsed370 = 370, // is never checked
+	kFlagAR01FishDealerTalk                   = 328,
+	kFlagAR02InsectDealerInterviewed          = 329,
+	kFlagAR02HassanTalk                       = 330,
+	kFlagAR02ScorpionsChecked                 = 331,
+	kFlagBB02toBB04                           = 332,
+	kFlagBB04toBB02                           = 333,
+	kFlagUG03toUG04                           = 334, // is never checked
+	kFlagUG04toUG03                           = 335,
+	kFlagUG03toUG10                           = 336,
+	kFlagUG10toUG03                           = 337,
+	kFlagUG04toUG05                           = 338, // is never checked
+	kFlagUG05toUG04                           = 339,
+	kFlagUG04toUG06                           = 340,
+	kFlagUG06toUG04                           = 341,
+	kFlagUG06toNR01                           = 342,
+	kFlagNR01toUG06                           = 343,
+	kFlagUG12toUG14                           = 344,
+	kFlagUG14toUG12                           = 345, // is never checked
+	kFlagUG14toUG10                           = 346,
+	kFlagUG10toUG14                           = 347, // is never checked
+	kFlagUG14toUG19                           = 348,
+	kFlagUG19toUG14                           = 349,
+	kFlagUG15toUG13                           = 350,
+	kFlagUG13toUG15                           = 351,
+	kFlagUG15toUG17                           = 352,
+	kFlagUG17toUG15                           = 353,
+	kFlagUG15toUG16b                          = 354, // is never checked
+	kFlagUG16toUG15b                          = 355,
+	kFlagUG19toMA07                           = 356,
+	kFlagMA07toUG19                           = 357,
+	kFlagHF07toHF05                           = 358,
+	kFlagHF05toHF07                           = 359,
+	kFlagHF07toUG06                           = 360,
+	kFlagUG06toHF07                           = 361,
+	kFlagBB07toBB06                           = 362,
+	kFlagBB06toBB07                           = 363,
+	kFlagBB07toBB12                           = 364,
+	kFlagBB12toBB07                           = 365,
+	kFlagAR02InsectDealerTalk                 = 366,
+	kFlagAR02StungByScorpion                  = 367,
+	kFlagHF07Hole                             = 368,
+	kFlagHF05Hole                             = 369,
+	kFlagNotUsed370                           = 370, // is never checked
 	// 371 is never used
 	// 372 is never used
-	kFlagKP02Available = 373,
-	kFlagAR02DektoraBoughtScorpions = 374,
-	kFlagBB11SadikPunchedMcCoy = 375,
+	kFlagKP02Available                        = 373,
+	kFlagAR02DektoraBoughtScorpions           = 374,
+	kFlagBB11SadikPunchedMcCoy                = 375,
 	// 376 is never used
-	kFlagHF01MurrayMiaIntro = 377,
-	kFlagDirectorsCut = 378,
-	kFlagCT08toCT51 = 379, // is never checked
-	kFlagCT51toCT08 = 380,
+	kFlagHF01MurrayMiaIntro                   = 377,
+	kFlagDirectorsCut                         = 378, // Designer's Cut (KIA options) flag!
+	kFlagCT08toCT51                           = 379, // is never checked
+	kFlagCT51toCT08                           = 380,
 	// 381 is never used
-	kFlagHF01MurrayMiaTalk = 382,
-	kFlagNotUsed383 = 383,
-	kFlagHC01toHC02 = 384,
-	kFlagHC02toHC01 = 385,
-	kFlagHC01toHC03 = 386, // is never checked
-	kFlagHC03toHC01 = 387,
-	kFlagHC03TrapDoorOpen = 388,
+	kFlagHF01MurrayMiaTalk                    = 382,
+	kFlagNotUsed383                           = 383,
+	kFlagHC01toHC02                           = 384,
+	kFlagHC02toHC01                           = 385,
+	kFlagHC01toHC03                           = 386, // is never checked
+	kFlagHC03toHC01                           = 387,
+	kFlagHC03TrapDoorOpen                     = 388,
 	// 389 is never used
 	// 390 is never used
-	kFlagBB09SadikRun = 391,
-	kFlagRC01McCoyAndOfficerLearyTalking = 392,
-	kFlagBB06toBB51 = 393, // is never checked
-	kFlagBB51toBB06a = 394,
-	kFlagBB51toBB06b = 395,
-	kFlagBB07ElectricityOn = 396,
-	kFlagRC01McCoyAndOfficerLearyArtMetaphor = 397,
-	kFlagBB07PrinterChecked = 398,
-	kFlagGeneralDollShot = 399,
-	kFlagHC01IzoTalk1 = 400,
-	kFlagHC01IzoTalk2 = 401,
-	kFlagHC03Available = 402,
-	kFlagHC03CageOpen = 403,
-	kFlagHC02HawkersBarkeepIntroduction = 404,
-	kFlagHC02HawkersBarkeepBraceletTalk = 405,
-	kFlagUnused406 = 406, // is never checked
-	kFlagUnused407 = 407, // is never checked
-	kFlagMcCoyCommentsOnStatues = 408, // re-purposed. Original: 408 is never used
-	kFlagMA01GaffApproachMcCoy = 409,
-	kFlagBB06AndroidDestroyed = 410,
-	kFlagKP02toUG12 = 411,
-	kFlagUG12toKP02 = 412, // is never checked
-	kFlagKP02toKP01 = 413, // is never checked
-	kFlagKP01toKP02 = 414,
-	kFlagKP01toKP04 = 415, // is never checked
-	kFlagKP04toKP01 = 416,
-	kFlagKP01toKP03 = 417,
-	kFlagKP03toKP01 = 418,
-	kFlagKP03toKP05 = 419,
-	kFlagKP05toKP03 = 420,
-	kFlagKP03BombActive = 421,
-	kFlagKP03BombExploded = 422,
-	kFlagUG07toUG10 = 423,
-	kFlagUG10toUG07 = 424, // is never checked
-	kFlagUG07toUG08 = 425, // is never checked
-	kFlagUG08toUG07 = 426,
-	kFlagUG07toUG09 = 427, // is never checked
-	kFlagUG09ToUG07 = 428,
-	kFlagUG08toUG13 = 429,
-	kFlagUG13toUG08 = 430,
-	kFlagUG08ElevatorUp = 431,
-	kFlagUG09toCT12 = 432,
-	kFlagCT12ToUG09 = 433,
-	kFlagUG13toUG18 = 434, // is never checked
-	kFlagUG18toUG13 = 435,
-	kFlagUG13CallElevator = 436,
-	kFlagNR04toNR03 = 437,
-	kFlagNR03toNR04 = 438,
-	kFlagNR06toNR08 = 439,
-	kFlagNR08toNR06 = 440, // is never checked
-	kFlagNR06toNR07 = 441,
-	kFlagNR07toNR06 = 442,
-	kFlagGenericWalkerWaiting = 443,
-	kFlagIzoShot = 444,
+	kFlagBB09SadikRun                         = 391,
+	kFlagRC01McCoyAndOfficerLearyTalking      = 392,
+	kFlagBB06toBB51                           = 393, // is never checked
+	kFlagBB51toBB06a                          = 394,
+	kFlagBB51toBB06b                          = 395,
+	kFlagBB07ElectricityOn                    = 396,
+	kFlagRC01McCoyAndOfficerLearyArtMetaphor  = 397,
+	kFlagBB07PrinterChecked                   = 398,
+	kFlagGeneralDollShot                      = 399,
+	kFlagHC01IzoTalk1                         = 400,
+	kFlagHC01IzoTalk2                         = 401,
+	kFlagHC03Available                        = 402,
+	kFlagHC03CageOpen                         = 403,
+	kFlagHC02HawkersBarkeepIntroduction       = 404,
+	kFlagHC02HawkersBarkeepBraceletTalk       = 405,
+	kFlagUnused406                            = 406, // is never checked
+	kFlagUnused407                            = 407, // is never checked
+	kFlagMcCoyCommentsOnStatues               = 408, // Re-purposed. Original: 408 is never used
+	kFlagMA01GaffApproachMcCoy                = 409,
+	kFlagBB06AndroidDestroyed                 = 410,
+	kFlagKP02toUG12                           = 411,
+	kFlagUG12toKP02                           = 412, // is never checked
+	kFlagKP02toKP01                           = 413, // is never checked
+	kFlagKP01toKP02                           = 414,
+	kFlagKP01toKP04                           = 415, // is never checked
+	kFlagKP04toKP01                           = 416,
+	kFlagKP01toKP03                           = 417,
+	kFlagKP03toKP01                           = 418,
+	kFlagKP03toKP05                           = 419,
+	kFlagKP05toKP03                           = 420,
+	kFlagKP03BombActive                       = 421,
+	kFlagKP03BombExploded                     = 422,
+	kFlagUG07toUG10                           = 423,
+	kFlagUG10toUG07                           = 424, // is never checked
+	kFlagUG07toUG08                           = 425, // is never checked
+	kFlagUG08toUG07                           = 426,
+	kFlagUG07toUG09                           = 427, // is never checked
+	kFlagUG09ToUG07                           = 428,
+	kFlagUG08toUG13                           = 429,
+	kFlagUG13toUG08                           = 430,
+	kFlagUG08ElevatorUp                       = 431,
+	kFlagUG09toCT12                           = 432,
+	kFlagCT12ToUG09                           = 433,
+	kFlagUG13toUG18                           = 434, // is never checked
+	kFlagUG18toUG13                           = 435,
+	kFlagUG13CallElevator                     = 436,
+	kFlagNR04toNR03                           = 437,
+	kFlagNR03toNR04                           = 438,
+	kFlagNR06toNR08                           = 439,
+	kFlagNR08toNR06                           = 440, // is never checked
+	kFlagNR06toNR07                           = 441,
+	kFlagNR07toNR06                           = 442,
+	kFlagGenericWalkerWaiting                 = 443,
+	kFlagIzoShot                              = 444,
 	// 445 is never used
 	// 446 is never used
-	kFlagTB03toUG17 = 447,
-	kFlagUG17toTB03 = 448,
-	kFlagUG02WeaponsChecked = 449,
-	kFlagTB02ElevatorToTB05 = 450,
-	kFlagTB05Entered = 451,
+	kFlagTB03toUG17                           = 447,
+	kFlagUG17toTB03                           = 448,
+	kFlagUG02WeaponsChecked                   = 449,
+	kFlagTB02ElevatorToTB05                   = 450,
+	kFlagTB05Entered                          = 451,
 	// 452 is never used
-	kFlagTB02GuardTalk1 = 453,
+	kFlagTB02GuardTalk1                       = 453,
 	// 454 is never used
-	kFlagTB02GuardTalk2 = 455,
-	kFlagTB02SteeleTalk = 456,
-	kFlagTB02SteeleEnter = 457,
+	kFlagTB02GuardTalk2                       = 455,
+	kFlagTB02SteeleTalk                       = 456,
+	kFlagTB02SteeleEnter                      = 457,
 	// 458 is never used
 	// 459 is never used
-	kFlagSteeleWalkingAround = 460,
-	kFlagMaggieHasBomb = 461,
-	kFlagGuzzaIsMovingAround = 462,
-	kFlagHC01GuzzaWalk = 463,
-	kFlagHC01GuzzaPrepare = 464,
-	kFlagMcCoyArrested = 465,
-	kFlagBB10Shelf1Available = 466,
-	kFlagBB10Shelf2Available = 467,
-	kFlagBB10Shelf3Available = 468,
-	kFlagBB10Shelf4Available = 469,
-	kFlagBB10Shelf5Available = 470,
-	kFlagGaffChapter2Started = 471,
+	kFlagSteeleWalkingAround                  = 460,
+	kFlagMaggieHasBomb                        = 461,
+	kFlagGuzzaIsMovingAround                  = 462,
+	kFlagHC01GuzzaWalk                        = 463,
+	kFlagHC01GuzzaPrepare                     = 464,
+	kFlagMcCoyArrested                        = 465,
+	kFlagBB10Shelf1Available                  = 466,
+	kFlagBB10Shelf2Available                  = 467,
+	kFlagBB10Shelf3Available                  = 468,
+	kFlagBB10Shelf4Available                  = 469,
+	kFlagBB10Shelf5Available                  = 470,
+	kFlagGaffChapter2Started                  = 471,
 	// 472 is never used
 	// 473 is never used
-	kFlagUG10GateOpen = 474,
-	kFlagNR09toNR10 = 475,
-	kFlagNR10toNR09 = 476,
-	kFlagNR11toNR10 = 477, // is never checked
-	kFlagMcCoyAtPS03 = 478, // has no use
-	kFlagMcCoyInHawkersCircle = 479,
+	kFlagUG10GateOpen                         = 474,
+	kFlagNR09toNR10                           = 475,
+	kFlagNR10toNR09                           = 476,
+	kFlagNR11toNR10                           = 477, // is never checked
+	kFlagMcCoyAtPS03                          = 478, // has no use
+	kFlagMcCoyInHawkersCircle                 = 479,
 	// 480 is never used
 	// 481 is never used
-	kFlagSteeleSmoking = 482,
-	kFlagTB06Introduction = 483,
-	kFlagKP03BombDisarmed = 484,
-	kFlagTB06Photographer = 485,
-	kFlagDNARowAvailable = 486,
-	kFlagKIAPrivacyAddon = 487,
+	kFlagSteeleSmoking                        = 482,
+	kFlagTB06Introduction                     = 483,
+	kFlagKP03BombDisarmed                     = 484,
+	kFlagTB06Photographer                     = 485,
+	kFlagDNARowAvailable                      = 486,
+	kFlagKIAPrivacyAddon                      = 487,
 	// 488 is never used
-	kFlagDektoraChapter2Started = 489,
-	kFlagEarlyQStartedChapter1 = 490,
-	kFlagEarlyQStartedChapter2 = 491,
-	kFlagCT04HomelessTrashFinish = 492,
-	kFlagBB02ElevatorDown = 493,
-	kFlagBB02Entered = 494,
-	kFlagBB05Entered = 495,
-	kFlagBB08Entered = 496,
-	kFlagBB12Entered = 497,
-	kFlagUG02FromUG01 = 498,
-	kFlagUG02Interactive = 499,
+	kFlagDektoraChapter2Started               = 489,
+	kFlagEarlyQStartedChapter1                = 490,
+	kFlagEarlyQStartedChapter2                = 491,
+	kFlagCT04HomelessTrashFinish              = 492,
+	kFlagBB02ElevatorDown                     = 493,
+	kFlagBB02Entered                          = 494,
+	kFlagBB05Entered                          = 495,
+	kFlagBB08Entered                          = 496,
+	kFlagBB12Entered                          = 497,
+	kFlagUG02FromUG01                         = 498,
+	kFlagUG02Interactive                      = 499,
 	// 500 is never used
 	// 501 is never used
 	// 502 is never used
 	// 503 is never used
-	kFlagAR02DektoraWillBuyScorpions = 504,
-	kFlagDR03ChewTalkExplosion = 505,
-	kFlagBB08toBB12 = 506,
-	kFlagBB12toBB08 = 507, // is never checked
-	kFlagNR07Entered = 508,
-	kFlagBB11SadikFight = 509,
-	kFlagNotUsed510 = 510, // is never set
-	kFlagDR05ExplodedEntered = 511,
+	kFlagAR02DektoraWillBuyScorpions          = 504,
+	kFlagDR03ChewTalkExplosion                = 505,
+	kFlagBB08toBB12                           = 506,
+	kFlagBB12toBB08                           = 507, // is never checked
+	kFlagNR07Entered                          = 508,
+	kFlagBB11SadikFight                       = 509,
+	kFlagNotUsed510                           = 510, // is never set
+	kFlagDR05ExplodedEntered                  = 511,
 	// 512 is never used
 	// 513 is never used
 	// 514 is never used
-	kFlagDR05ViewExplosion = 515,
-	kFlagCT07ZubenAttack = 516,
+	kFlagDR05ViewExplosion                    = 515,
+	kFlagCT07ZubenAttack                      = 516,
 	// 517 is never used
 	// 518 is never used
-	kFlagTB06DogCollarTaken = 519,
-	kFlagTB06KitchenBoxTaken = 520,
-	kFlagHC03TrapDoorOpened = 521,
-	kFlagUG05TalkAboutTunnel = 522,
-	kFlagMutantsActive = 523,
-	kFlagUG06Chapter4Started = 524,
-	kFlagCT10Entered = 525,
+	kFlagTB06DogCollarTaken                   = 519,
+	kFlagTB06KitchenBoxTaken                  = 520,
+	kFlagHC03TrapDoorOpened                   = 521,
+	kFlagUG05TalkAboutTunnel                  = 522,
+	kFlagMutantsActive                        = 523,
+	kFlagUG06Chapter4Started                  = 524,
+	kFlagCT10Entered                          = 525,
 	// 526 is never used
-	kFlagHF02toHF03 = 527,
-	kFlagHF03toHF02 = 528,
-	kFlagHF05toHF06 = 529, // is never checked
-	kFlagHF06toHF05 = 530,
-	kFlagCT11toDR01 = 531,
-	kFlagNR01toNR02 = 532,
-	kFlagNR02toNR01 = 533,
-	kFlagNR03toNR01 = 534,
-	kFlagNR01toNR03 = 535,
-	kFlagNR03toNR05 = 536,
-	kFlagNR05toNR03 = 537,
-	kFlagCT09Entered = 538,
-	kFlagCT09LeonInterrupted = 539,
-	kFlagCT09DeskClerkTalk = 540,
+	kFlagHF02toHF03                           = 527,
+	kFlagHF03toHF02                           = 528,
+	kFlagHF05toHF06                           = 529, // is never checked
+	kFlagHF06toHF05                           = 530,
+	kFlagCT11toDR01                           = 531,
+	kFlagNR01toNR02                           = 532,
+	kFlagNR02toNR01                           = 533,
+	kFlagNR03toNR01                           = 534,
+	kFlagNR01toNR03                           = 535,
+	kFlagNR03toNR05                           = 536,
+	kFlagNR05toNR03                           = 537,
+	kFlagCT09Entered                          = 538,
+	kFlagCT09LeonInterrupted                  = 539,
+	kFlagCT09DeskClerkTalk                    = 540,
 	// 541 is never used
-	kFlagClovisChapter4Started = 542,
-	kFlagGordoTalk1 = 543,
-	kFlagGordoTalk2 = 544,
-	kFlagNotUsed545 = 545, // is never set
-	kFlagNR05toNR08 = 546,
-	kFlagNR08toNR05 = 547,
-	kFlagDR06MannequinHeadOpen = 548,
-	kFlagTB03Entered = 549,
-	kFlagMcCoyTiedDown = 550,
-	kFlagUG16toDR06 = 551, // is never checked
-	kFlagDR06toUG16 = 552,
-	kFlagUG13Entered = 553,
-	kFlagUG13HomelessTalk1 = 554,
+	kFlagClovisChapter4Started                = 542,
+	kFlagGordoTalk1                           = 543,
+	kFlagGordoTalk2                           = 544,
+	kFlagNotUsed545                           = 545, // is never set
+	kFlagNR05toNR08                           = 546,
+	kFlagNR08toNR05                           = 547,
+	kFlagDR06MannequinHeadOpen                = 548,
+	kFlagTB03Entered                          = 549,
+	kFlagMcCoyTiedDown                        = 550,
+	kFlagUG16toDR06                           = 551, // is never checked
+	kFlagDR06toUG16                           = 552,
+	kFlagUG13Entered                          = 553,
+	kFlagUG13HomelessTalk1                    = 554,
 	// 555 is never used
-	kFlagUG16LutherLanceTalk1 = 556,
-	kFlagNotUsed557, // is never checked
-	kFlagDR01toCT11 = 558,
-	kFlagHF06SteelInterruption = 559,
-	kFlagLutherLanceIsReplicant = 560,
-	kFlagNR02GordoLeaveLighter = 561,
-	kFlagHF05CrazyLegsTalk1 = 562,
-	kFlagHF05CrazyLegsTalk2 = 563,
-	kFlagEarlyQStartedChapter3 = 564,
-	kFlagNotUsed565 = 565, // has no use
-	kFlagHF03toHF04 = 566, // is never checked
-	kFlagHF04toHF03 = 567,
-	kFlagUG16ComputerOff = 568,
-	kFlagNR04EarlyQWalkedIn = 569,
+	kFlagUG16LutherLanceTalk1                 = 556,
+	kFlagNotUsed557                           = 557, // is never checked
+	kFlagDR01toCT11                           = 558,
+	kFlagHF06SteelInterruption                = 559,
+	kFlagLutherLanceIsReplicant               = 560,
+	kFlagNR02GordoLeaveLighter                = 561,
+	kFlagHF05CrazyLegsTalk1                   = 562,
+	kFlagHF05CrazyLegsTalk2                   = 563,
+	kFlagEarlyQStartedChapter3                = 564,
+	kFlagNotUsed565                           = 565, // has no use
+	kFlagHF03toHF04                           = 566, // is never checked
+	kFlagHF04toHF03                           = 567,
+	kFlagUG16ComputerOff                      = 568,
+	kFlagNR04EarlyQWalkedIn                   = 569,
 	// 570 is never used
 	// 571 is never used
 	// 572 is never used
-	kFlagNR03Entered = 573,
-	kFlagKP04toKP05 = 574,
-	kFlagKP05toKP04 = 575,
-	kFlagKP05toKP06 = 576,
-	kFlagKP06toKP05 = 577, // has no use
-	kFlagKP06toKP07 = 578,
-	kFlagKP07toKP06 = 579,
+	kFlagNR03Entered                          = 573,
+	kFlagKP04toKP05                           = 574,
+	kFlagKP05toKP04                           = 575,
+	kFlagKP05toKP06                           = 576,
+	kFlagKP06toKP05                           = 577, // has no use
+	kFlagKP06toKP07                           = 578,
+	kFlagKP07toKP06                           = 579,
 	// 580 is never used
 	// 581 is never used
-	kFlagKP07BusActive = 582, // is never set
+	kFlagKP07BusActive                        = 582, // is never set
 	// 583 is never used
-	kFlagHF04DoorsClosed = 584,
-	kFlagHF04CloseDoors = 585,
-	kFlagHF04OpenDoors = 586,
-	kFlagUG15LutherLanceStartedDying = 587,
-	kFlagNR05BartenderTalk1 = 588,
-	kFlagNR05BartenderTalk2 = 589,
-	kFlagNR05EarlyQTalk = 590,
-	kFlagDektoraRanAway = 591,
-	kFlagGordoRanAway = 592,
-	kFlagLucyRanAway = 593,
-	kFlagNR02GordoJumpDown = 594,
-	kFlagLutherLanceAreDead = 595,
-	kFlagUG16PulledGun = 596,
-	kFlagUG16FolderFound = 597,
-	kFlagUG07ClovisCaughtMcCoy = 598,
-	kFlagKIAPrivacyAddonIntro = 599,
-	kFlagUG16LutherLanceTalkReplicants1 = 600,
-	kFlagUG16LutherLanceTalkReplicants2 = 601,
+	kFlagHF04DoorsClosed                      = 584,
+	kFlagHF04CloseDoors                       = 585,
+	kFlagHF04OpenDoors                        = 586,
+	kFlagUG15LutherLanceStartedDying          = 587,
+	kFlagNR05BartenderTalk1                   = 588,
+	kFlagNR05BartenderTalk2                   = 589,
+	kFlagNR05EarlyQTalk                       = 590,
+	kFlagDektoraRanAway                       = 591,
+	kFlagGordoRanAway                         = 592,
+	kFlagLucyRanAway                          = 593,
+	kFlagNR02GordoJumpDown                    = 594,
+	kFlagLutherLanceAreDead                   = 595,
+	kFlagUG16PulledGun                        = 596,
+	kFlagUG16FolderFound                      = 597,
+	kFlagUG07ClovisCaughtMcCoy                = 598,
+	kFlagKIAPrivacyAddonIntro                 = 599,
+	kFlagUG16LutherLanceTalkReplicants1       = 600,
+	kFlagUG16LutherLanceTalkReplicants2       = 601,
 	// 602 is never used
-	kFlagSteeleAimingAtGordo = 603,
-	kFlagNR03McCoyThrownOut = 604,
-	kFlagNR04DiscFound = 605,
-	kFlagNR04EarlyQStungByScorpions = 606,
-	kFlagMcCoyRetiredHuman = 607,
-	kFlagTB07toTB02 = 608,
-	kFlagNR04McCoyAimedAtEarlyQ = 609,
-	kFlagUG08Entered = 610,
-	kFlagNR03HanoiTalk = 611,
-	kFlagTB07RachaelTalk = 612,
-	kFlagHF03LucyTalk = 613,
-	kFlagNR08toNR09 = 614,
-	kFlagNR09toNR08 = 615,
-	kFlagMcCoyCapturedByHolloway = 616,
-	kFlagSpinnerMissing = 617,
+	kFlagSteeleAimingAtGordo                  = 603,
+	kFlagNR03McCoyThrownOut                   = 604,
+	kFlagNR04DiscFound                        = 605,
+	kFlagNR04EarlyQStungByScorpions           = 606,
+	kFlagMcCoyRetiredHuman                    = 607,
+	kFlagTB07toTB02                           = 608,
+	kFlagNR04McCoyAimedAtEarlyQ               = 609,
+	kFlagUG08Entered                          = 610,
+	kFlagNR03HanoiTalk                        = 611,
+	kFlagTB07RachaelTalk                      = 612,
+	kFlagHF03LucyTalk                         = 613,
+	kFlagNR08toNR09                           = 614,
+	kFlagNR09toNR08                           = 615,
+	kFlagMcCoyCapturedByHolloway              = 616,
+	kFlagSpinnerMissing                       = 617,
 	// 618 is never used
 	// 619 is never used
-	kFlagNR08Available = 620,
+	kFlagNR08Available                        = 620,
 	// 621 is never used
-	kFlagNR08TouchedDektora = 622,
-	kFlagUG07Empty = 623,
+	kFlagNR08TouchedDektora                   = 622,
+	kFlagUG07Empty                            = 623,
 	// 624 is never used
-	kFlagTB07TyrellMeeting = 625,
+	kFlagTB07TyrellMeeting                    = 625,
 	// 626 is never used
-	kFlagNR01McCoyIsDrugged = 627,
+	kFlagNR01McCoyIsDrugged                   = 627,
 	// 628 is never used
-	kFlagUnpauseGenWalkers = 629,
-	kFlagMutantsPaused = 630,
-	kFlagRatWalkingAround = 631,
-	kFlagNR01DektoraFall = 632,
-	kFlagNR11DektoraBurning = 633,
-	kFlagNR11BurnedUp = 634,
-	kFlagNR11SteeleShoot = 635,
-	kFlagNR08Faded = 636,
-	kFlagMcCoyCommentsOnOldProjector = 637, // Re-purposed. Original: 637 is never used
-	kFlagNR07McCoyIsCop = 638,
-	kFlagMcCoyCommentsOnEyeOfEyeworks = 639, // Re-purposed. Original: 639 is never used
-	kFlagNR10CameraDestroyed = 640,
-	kFlagNR10toNR11 = 641, // is never checked
-	kFlagNR10McCoyBlinded = 642,
-	kFlagSteeleKnowsBulletBobIsDead = 643,
-	kFlagNotUsed644 = 644, // is never checked
-	kFlagCT11DogWrapperTaken = 645,
-	kFlagSteeleDead = 646, // is never checked
-	kFlagMA04McCoySleeping = 647,
-	kFlagMA07GaffTalk = 648,
-	kFlagMA04PhoneMessageFromClovis = 649,
-	kFlagMA04PhoneMessageFromLucy = 650,
-	kFlagNR08McCoyWatchingShow = 651,
-	kFlagCrazylegsArrestedTalk = 652,
-	kFlagMcCoyIsHelpingReplicants = 653,
-	kFlagMA02Chapter5Started = 654,
-	kFlagMA02RajifTalk = 655,
-	kFlagUG02RagiationGooglesTaken = 656,
-	kFlagNotUsed657 = 657, // is never set
-	kFlagKP07Entered = 658,
-	kFlagNR11BreakWindow = 659,
-	kFlagDNARowAvailableTalk = 660,
-	kFlagTB07ShadeDown = 661, // is never set
-	kFlagHF01TalkToLovedOne = 662,
-	kFlagHF05PoliceArrived = 663,
-	kFlagUG07PoliceLeave = 664,
-	kFlagUG19Available = 665,
-	kFlagMcCoyFreedOfAccusations = 666,
+	kFlagUnpauseGenWalkers                    = 629,
+	kFlagMutantsPaused                        = 630,
+	kFlagRatWalkingAround                     = 631,
+	kFlagNR01DektoraFall                      = 632,
+	kFlagNR11DektoraBurning                   = 633,
+	kFlagNR11BurnedUp                         = 634,
+	kFlagNR11SteeleShoot                      = 635,
+	kFlagNR08Faded                            = 636,
+	kFlagMcCoyCommentsOnOldProjector          = 637, // Re-purposed. Original: 637 is never used
+	kFlagNR07McCoyIsCop                       = 638,
+	kFlagMcCoyCommentsOnEyeOfEyeworks         = 639, // Re-purposed. Original: 639 is never used
+	kFlagNR10CameraDestroyed                  = 640,
+	kFlagNR10toNR11                           = 641, // is never checked
+	kFlagNR10McCoyBlinded                     = 642,
+	kFlagSteeleKnowsBulletBobIsDead           = 643,
+	kFlagNotUsed644                           = 644, // is never checked
+	kFlagCT11DogWrapperTaken                  = 645,
+	kFlagSteeleDead                           = 646, // is never checked
+	kFlagMA04McCoySleeping                    = 647,
+	kFlagMA07GaffTalk                         = 648,
+	kFlagMA04PhoneMessageFromClovis           = 649,
+	kFlagMA04PhoneMessageFromLucy             = 650,
+	kFlagNR08McCoyWatchingShow                = 651,
+	kFlagCrazylegsArrestedTalk                = 652,
+	kFlagMcCoyIsHelpingReplicants             = 653,
+	kFlagMA02Chapter5Started                  = 654,
+	kFlagMA02RajifTalk                        = 655,
+	kFlagUG02RagiationGooglesTaken            = 656,
+	kFlagNotUsed657                           = 657, // is never set
+	kFlagKP07Entered                          = 658,
+	kFlagNR11BreakWindow                      = 659,
+	kFlagDNARowAvailableTalk                  = 660,
+	kFlagTB07ShadeDown                        = 661, // is never set
+	kFlagHF01TalkToLovedOne                   = 662,
+	kFlagHF05PoliceArrived                    = 663,
+	kFlagUG07PoliceLeave                      = 664,
+	kFlagUG19Available                        = 665,
+	kFlagMcCoyFreedOfAccusations              = 666,
 	// 667 is never used
 	// 668 is never used
-	kFlagKP02DispatchOnToxicKipple = 669, // Re-purposed. Original: 669 is never used
-	kFlagCallWithGuzza = 670,
-	kFlagUG18GuzzaScene = 671,
-	kFlagMA07toPS14 = 672,
-	kFlagPS14toMA07 = 673,
-	kFlagKP01Entered = 674,
-	kFlagUG04DispatchOnHoodooRats = 675, // Re-purposed. Original: 675 is never used
-	kFlagUG15RatShot = 676,
-	kFlagUG15BridgeWillBreak = 677,
-	kFlagChapter2Intro = 678,
-	kFlagChapter3Intro = 679,
-	kFlagChapter4Intro = 680,
-	kFlagMcCoyCommentsOnHoodooRats = 681, // Re-purposed. Original: 681 is never used
-	kFlagUG15BridgeBroken = 682,
-	kFlagUG05TalkToPolice = 683,
-	kFlagHF05PoliceAttacked = 684,
-	kFlagClovisLyingDown = 685,
-	kFlagNotUsed686 = 686,
-	kFlagMcCoyCommentsOnFans = 687, // Re-purposed. Original: 687 is never used
-	kFlagPS05TV0 = 688,
-	kFlagPS05TV1 = 689,
-	kFlagPS05TV2 = 690,
-	kFlagPS05TV3 = 691,
-	kFlagPS05TV4 = 692,
-	kFlagUG03DeadHomeless = 693,
-	kFlagUG14DeadHomeless = 694,
-	kFlagNR01VisitedFirstTimeWithSpinner = 695, // Re-purposed. Original: 695 is never used
-	kFlagKP07ReplicantsAttackMcCoy = 696,
-	kFlagKP07McCoyPulledGun = 697,
-	kFlagUG15LanceLuthorTrade = 698,
-	kFlagTalkToZuben = 699,
-	kFlagBB01VisitedFirstTimeWithSpinner = 700, // Re-purposed. Original: 700 is never used
-	kFlagMcCoyAttackedLucy = 701,
-	kFlagBulletBobDead = 702,
-	kFlagUG18BriefcaseTaken = 703,
-	kFlagRC02EnteredChapter4 = 704,
-	kFlagRC02RunciterTalkWithGun = 705,
-	kFlagRC02RunciterTalk2 = 706,
-	kFlagTB06PhotographTalk1 = 707,
-	kFlagUG02AmmoTaken = 708,
-	kFlagRC51Discovered = 709,
-	kFlagAR01Entered = 710,
-	kFlagMA04WatchedTV = 711,
-	kFlagMcCoyShotAtZuben = 712,
-	kFlagDR04McCoyShotMoraji = 713,
-	kFlagMcCoyAttackedReplicants = 714,
-	kFlagDR06UnlockedToUG16 = 715,
-	kFlagUG13HomelessLayingdown = 716,
-	kFlagRC04BobTalk3 = 717,
-	kflagPS01toPS02 = 718,
-	kFlagCT02McCoyFell = 719,
-	kFlagCT02McCoyCombatReady = 720,
-	kFlagCT02McCoyShouldCommentOnDumpedSoup = 721,	// Now: used for cut content for McCoy's monologue if he fails to dodge the soup, Original: was set but not used
-	kFlagChapter4Starting = 722,
-	kFlagZubenBountyPaid = 723,
-	kFlagUG15BridgeBreaks = 724,
-	kFlagCT11DogWrapperAvailable = 725,
-	kFlagAR02Entered = 726,  // Now: never checked (superseded by new kFlagScorpionsInAR02). Original: used to track if McCoy visited AR02 in order to remove scorpion's cage item if Dektora buys it
-	kFlagPS04WeaponsOrderForm = 727,
-	kFlagDR01Visited = 728,                     // Re-purposed. Original: 728 is never used
-	kFlagNR08DektoraShow = 729
+	kFlagKP02DispatchOnToxicKipple            = 669, // Re-purposed. Original: 669 is never used
+	kFlagCallWithGuzza                        = 670,
+	kFlagUG18GuzzaScene                       = 671,
+	kFlagMA07toPS14                           = 672,
+	kFlagPS14toMA07                           = 673,
+	kFlagKP01Entered                          = 674,
+	kFlagUG04DispatchOnHoodooRats             = 675, // Re-purposed. Original: 675 is never used
+	kFlagUG15RatShot                          = 676,
+	kFlagUG15BridgeWillBreak                  = 677,
+	kFlagChapter2Intro                        = 678,
+	kFlagChapter3Intro                        = 679,
+	kFlagChapter4Intro                        = 680,
+	kFlagMcCoyCommentsOnHoodooRats            = 681, // Re-purposed. Original: 681 is never used
+	kFlagUG15BridgeBroken                     = 682,
+	kFlagUG05TalkToPolice                     = 683,
+	kFlagHF05PoliceAttacked                   = 684,
+	kFlagClovisLyingDown                      = 685,
+	kFlagNotUsed686                           = 686,
+	kFlagMcCoyCommentsOnFans                  = 687, // Re-purposed. Original: 687 is never used
+	kFlagPS05TV0                              = 688,
+	kFlagPS05TV1                              = 689,
+	kFlagPS05TV2                              = 690,
+	kFlagPS05TV3                              = 691,
+	kFlagPS05TV4                              = 692,
+	kFlagUG03DeadHomeless                     = 693,
+	kFlagUG14DeadHomeless                     = 694,
+	kFlagNR01VisitedFirstTimeWithSpinner      = 695, // Re-purposed. Original: 695 is never used
+	kFlagKP07ReplicantsAttackMcCoy            = 696,
+	kFlagKP07McCoyPulledGun                   = 697,
+	kFlagUG15LanceLuthorTrade                 = 698,
+	kFlagTalkToZuben                          = 699,
+	kFlagBB01VisitedFirstTimeWithSpinner      = 700, // Re-purposed. Original: 700 is never used
+	kFlagMcCoyAttackedLucy                    = 701,
+	kFlagBulletBobDead                        = 702,
+	kFlagUG18BriefcaseTaken                   = 703,
+	kFlagRC02EnteredChapter4                  = 704,
+	kFlagRC02RunciterTalkWithGun              = 705,
+	kFlagRC02RunciterTalk2                    = 706,
+	kFlagTB06PhotographTalk1                  = 707,
+	kFlagUG02AmmoTaken                        = 708,
+	kFlagRC51Discovered                       = 709,
+	kFlagAR01Entered                          = 710,
+	kFlagMA04WatchedTV                        = 711,
+	kFlagMcCoyShotAtZuben                     = 712,
+	kFlagDR04McCoyShotMoraji                  = 713,
+	kFlagMcCoyAttackedReplicants              = 714,
+	kFlagDR06UnlockedToUG16                   = 715,
+	kFlagUG13HomelessLayingdown               = 716,
+	kFlagRC04BobTalk3                         = 717,
+	kflagPS01toPS02                           = 718,
+	kFlagCT02McCoyFell                        = 719,
+	kFlagCT02McCoyCombatReady                 = 720,
+	kFlagCT02McCoyShouldCommentOnDumpedSoup   = 721, // Now: used for cut content for McCoy's monologue if he fails to dodge the soup, Original: was set but not used
+	kFlagChapter4Starting                     = 722,
+	kFlagZubenBountyPaid                      = 723,
+	kFlagUG15BridgeBreaks                     = 724,
+	kFlagCT11DogWrapperAvailable              = 725,
+	kFlagAR02Entered                          = 726, // Now: never checked (superseded by new kFlagScorpionsInAR02). Original: used to track if McCoy visited AR02 in order to remove scorpion's cage item if Dektora buys it
+	kFlagPS04WeaponsOrderForm                 = 727,
+	kFlagDR01Visited                          = 728, // Re-purposed. Original: 728 is never used
+	kFlagNR08DektoraShow                      = 729
 };
 
 enum Variables {
-	kVariableChapter = 1,
-	kVariableChinyen = 2,
-	kVariableGameVersion = 3, // re-purposed, original: not used, so it would have value of 0 in the classic version
-	kVariableUG18CountUpForNextTrainAction = 4, // re-purposed, original: not used
-	kVariableUG18StateOfTrains = 5,             // re-purposed, original: not used
-	kVariableUG18StateOfGuzzaCorpse = 6,        // re-purposed, original: not used
+	kVariableChapter                       =  1,
+	kVariableChinyen                       =  2,
+	kVariableGameVersion                   =  3, // Re-purposed. Original: not used, so it would have value of 0 in the classic version
+	kVariableUG18CountUpForNextTrainAction =  4, // Re-purposed. Original: not used
+	kVariableUG18StateOfTrains             =  5, // Re-purposed. Original: not used
+	kVariableUG18StateOfGuzzaCorpse        =  6, // Re-purposed. Original: not used
 	// variables 7 - 8 are not used
-	kVariablePoliceMazeScore = 9,
-	kVariablePoliceMazePS10TargetCounter = 10,
-	kVariablePoliceMazePS11TargetCounter = 11,
-	kVariablePoliceMazePS12TargetCounter = 12,
-	kVariablePoliceMazePS13TargetCounter = 13,
-	kVariableMcCoyEvidenceMissed = 14,
+	kVariablePoliceMazeScore               =  9,
+	kVariablePoliceMazePS10TargetCounter   = 10,
+	kVariablePoliceMazePS11TargetCounter   = 11,
+	kVariablePoliceMazePS12TargetCounter   = 12,
+	kVariablePoliceMazePS13TargetCounter   = 13,
+	kVariableMcCoyEvidenceMissed           = 14,
 	// variable 15 has no use
 	// variables 16 - 18 are not used
-	kVariableIzoShot = 19, // has no use
+	kVariableIzoShot                       = 19, // has no use
 	// variables 20 - 23 are not used
-	kVariableBobShot = 24, // has no use
-	kVariableGeneralDollShot = 25, // has no use
+	kVariableBobShot                       = 24, // has no use
+	kVariableGeneralDollShot               = 25, // has no use
 	// variables 26 - 28 are not used
-	kVariableLutherLanceShot = 29,
+	kVariableLutherLanceShot               = 29,
 	// variables 30 - 31 are not used
-	kVariableGenericWalkerAModel = 32,
-	kVariableGenericWalkerBModel = 33,
-	kVariableGenericWalkerCModel = 34,
-	kVariableGenericWalkerConfig = 35, // Re-purposed in ScummVM version - original: has no real use
-	kVariableBB10ShelvesAvailable = 36,
-	kVariableWalkLoopActor = 37,
-	kVariableWalkLoopRun = 38,
-	kVariableDR06MannequinHeadOpened = 39,
-	kVariableHollowayArrest = 40, // 1 dektora, 2 gordo, 3 lucy
-	kVariableGordosJoke = 41,
-	kVariableMcCoyDrinks = 42, // is never checked
-	kVariableHanoiNR05Warnings = 43,
-	kVariableHanoiNR04Warnings = 44,
-	kVariableAffectionTowards = 45, // 0 none, 1 steele, 2 dektora, 3 lucy
-	kVariableGunPulledInFrontOfSebastian = 46,
-	kVariableNR01GetUpCounter = 47,
-	kVariableDNAEvidence = 48,
-	kVariableCorruptedGuzzaEvidence = 49,
-	kVariableTaffyLewisMusic = 50,
-	kVariableReplicantsSurvivorsAtMoonbus = 51,
-	kVariableNextTvNews = 52,
-	kVariableEarlyQFrontMusic = 53,
-	kVariableEarlyQBackMusic = 54
+	kVariableGenericWalkerAModel           = 32,
+	kVariableGenericWalkerBModel           = 33,
+	kVariableGenericWalkerCModel           = 34,
+	kVariableGenericWalkerConfig           = 35, // Re-purposed. Original: has no real use
+	kVariableBB10ShelvesAvailable          = 36,
+	kVariableWalkLoopActor                 = 37,
+	kVariableWalkLoopRun                   = 38,
+	kVariableDR06MannequinHeadOpened       = 39,
+	kVariableHollowayArrest                = 40, // 1 dektora, 2 gordo, 3 lucy
+	kVariableGordosJoke                    = 41,
+	kVariableMcCoyDrinks                   = 42, // is never checked
+	kVariableHanoiNR05Warnings             = 43,
+	kVariableHanoiNR04Warnings             = 44,
+	kVariableAffectionTowards              = 45, // 0 none, 1 steele, 2 dektora, 3 lucy
+	kVariableGunPulledInFrontOfSebastian   = 46,
+	kVariableNR01GetUpCounter              = 47,
+	kVariableDNAEvidence                   = 48,
+	kVariableCorruptedGuzzaEvidence        = 49,
+	kVariableTaffyLewisMusic               = 50,
+	kVariableReplicantsSurvivorsAtMoonbus  = 51,
+	kVariableNextTvNews                    = 52,
+	kVariableEarlyQFrontMusic              = 53,
+	kVariableEarlyQBackMusic               = 54
 };
 
 enum Outtakes {
-	kOuttakeIntro = 0,
-	kOuttakeMovieA = 1,
-	kOuttakeMovieB1 = 2,
-	kOuttakeMovieB2 = 3,
-	kOuttakeMovieB3 = 4,
-	kOuttakeMovieB4 = 5,
-	kOuttakeMovieB5 = 6,
-	kOuttakeMovieC1 = 7,
-	kOuttakeMovieC2 = 8,
-	kOuttakeMovieC3 = 9,
-	kOuttakeMovieD = 10,
-	kOuttakeInterrogation = 11,
-	kOuttakeEnd1A = 12,
-	kOuttakeEnd1B = 13,
-	kOuttakeEnd1C = 14,
-	kOuttakeEnd1D = 15,
-	kOuttakeEnd1E = 16,
-	kOuttakeEnd1F = 17,
-	kOuttakeEnd2 = 18,
-	kOuttakeEnd3 = 19,
-	kOuttakeEnd4A = 20,
-	kOuttakeEnd4B = 21,
-	kOuttakeEnd4C = 22,
-	kOuttakeEnd4D = 23,
-	kOuttakeEnd5 = 24,
-	kOuttakeEnd6 = 25,
-	kOuttakeEnd7 = 26,
+	kOuttakeIntro             =  0,
+	kOuttakeMovieA            =  1,
+	kOuttakeMovieB1           =  2,
+	kOuttakeMovieB2           =  3,
+	kOuttakeMovieB3           =  4,
+	kOuttakeMovieB4           =  5,
+	kOuttakeMovieB5           =  6,
+	kOuttakeMovieC1           =  7,
+	kOuttakeMovieC2           =  8,
+	kOuttakeMovieC3           =  9,
+	kOuttakeMovieD            = 10,
+	kOuttakeInterrogation     = 11,
+	kOuttakeEnd1A             = 12,
+	kOuttakeEnd1B             = 13,
+	kOuttakeEnd1C             = 14,
+	kOuttakeEnd1D             = 15,
+	kOuttakeEnd1E             = 16,
+	kOuttakeEnd1F             = 17,
+	kOuttakeEnd2              = 18,
+	kOuttakeEnd3              = 19,
+	kOuttakeEnd4A             = 20,
+	kOuttakeEnd4B             = 21,
+	kOuttakeEnd4C             = 22,
+	kOuttakeEnd4D             = 23,
+	kOuttakeEnd5              = 24,
+	kOuttakeEnd6              = 25,
+	kOuttakeEnd7              = 26,
 	kOuttakeTyrellBuildingFly = 27,
-	kOuttakeWestwood = 28,
-	kOuttakeFlyThrough = 29,        // Act 1 - Original: unused - has no sound
-	kOuttakeAway1 = 30,             // Act 2, 3
-	kOuttakeAway2 = 31,             // Act 1
-	kOuttakeAscent = 32,            // Act 1, 4, 5 - Original: unused
-	kOuttakeDescent = 33,           // Act 1, 4, 5
-	kOuttakeInside1 = 34,           // Act 1
-	kOuttakeInside2 = 35,           // Act 1, 2, 3
-	kOuttakeTowards1 = 36,          // Act 1
-	kOuttakeTowards2 = 37,          // Act 1
-	kOuttakeTowards3 = 38,          // Act 1, 2, 3
-	kOuttakeRachel = 39,
-	kOuttakeDektora = 40,
-	kOuttakeBladeRunner = 41
+	kOuttakeWestwood          = 28,
+	kOuttakeFlyThrough        = 29, // Act 1 - Original: unused - has no sound
+	kOuttakeAway1             = 30, // Act 2, 3
+	kOuttakeAway2             = 31, // Act 1
+	kOuttakeAscent            = 32, // Act 1, 4, 5 - Original: unused
+	kOuttakeDescent           = 33, // Act 1, 4, 5
+	kOuttakeInside1           = 34, // Act 1
+	kOuttakeInside2           = 35, // Act 1, 2, 3
+	kOuttakeTowards1          = 36, // Act 1
+	kOuttakeTowards2          = 37, // Act 1
+	kOuttakeTowards3          = 38, // Act 1, 2, 3
+	kOuttakeRachel            = 39,
+	kOuttakeDektora           = 40,
+	kOuttakeBladeRunner       = 41
 };
 
 enum AnimationModes {
-	kAnimationModeIdle = 0,
-	kAnimationModeWalk = 1,
-	kAnimationModeRun = 2,
-	kAnimationModeTalk = 3,
-	kAnimationModeCombatIdle = 4,
-	kAnimationModeCombatAim = 5,
-	kAnimationModeCombatAttack = 6,
-	kAnimationModeCombatWalk = 7,
-	kAnimationModeCombatRun = 8,
+	kAnimationModeIdle            =  0,
+	kAnimationModeWalk            =  1,
+	kAnimationModeRun             =  2,
+	kAnimationModeTalk            =  3,
+	kAnimationModeCombatIdle      =  4,
+	kAnimationModeCombatAim       =  5,
+	kAnimationModeCombatAttack    =  6,
+	kAnimationModeCombatWalk      =  7,
+	kAnimationModeCombatRun       =  8,
 	// 9 - 19 various talk modes
-	kAnimationModeDodge = 20,
-	kAnimationModeHit = 21,
-	kAnimationModeCombatHit = 22,
+	kAnimationModeDodge           = 20,
+	kAnimationModeHit             = 21,
+	kAnimationModeCombatHit       = 22,
 	// 23 give / take away
 	// 24 - 25 not used
 	// 26 ???
@@ -1286,163 +1286,163 @@ enum AnimationModes {
 	// 30 - 37 not used
 	// 38 ???
 	// 39 not used
-	// 40 mccoy throws body
-	kAnimationModeSpinnerGetIn = 41,
-	kAnimationModeSpinnerGetOut = 42,
+	// 40 McCoy throws body
+	kAnimationModeSpinnerGetIn    = 41,
+	kAnimationModeSpinnerGetOut   = 42,
 	// 43 - taking photo/using cellphone
-	kAnimationModeWalkUp = 44,
-	kAnimationModeWalkDown = 45,
-	kAnimationModeCombatWalkUp = 46,
-	kAnimationModeCombatWalkDown = 47,
-	kAnimationModeDie = 48,
-	kAnimationModeCombatDie = 49,
-	// 50 luther, tyrellguard ???
-	// 51 steele, maggie ???
-	kAnimationModeFeeding = 52,
-	kAnimationModeSit = 53, // more like sitting than sitting down
-	// 54 clovis, maggie ???
-	// 55 transient, tyrellguard, maggie
-	// 56 maggie ???
-	// 57 maggie ???
+	kAnimationModeWalkUp          = 44,
+	kAnimationModeWalkDown        = 45,
+	kAnimationModeCombatWalkUp    = 46,
+	kAnimationModeCombatWalkDown  = 47,
+	kAnimationModeDie             = 48,
+	kAnimationModeCombatDie       = 49,
+	// 50 Luther, Tyrell Guard ???
+	// 51 Steele, Maggie ???
+	kAnimationModeFeeding         = 52,
+	kAnimationModeSit             = 53, // more like sitting than sitting down
+	// 54 Clovis, Maggie ???
+	// 55 transient, Tyrell Guard, Maggie
+	// 56 Maggie ???
+	// 57 Maggie ???
 	// 58 - 60 not used
-	// 61 guzza ???
-	// 62 sadik ???
-	// 63 sadik ???
-	kAnimationModeClimbUp = 64,
-	kAnimationModeClimbDown = 65,
-	kAnimationModeCombatClimbUp = 66,
+	// 61 Guzza ???
+	// 62 Sadik ???
+	// 63 Sadik ???
+	kAnimationModeClimbUp         = 64,
+	kAnimationModeClimbDown       = 65,
+	kAnimationModeCombatClimbUp   = 66,
 	kAnimationModeCombatClimbDown = 67
-	// 68 mccoy getting kicked
+	// 68 McCoy getting kicked
 	// 69 not used
-	// 70 dektora ???
-	// 71 dektora ???
-	// 72 desk clerk, leon ???
-	// 73 earlyq ???
-	// 74 earlyq ???
-	// 75 mccoy drinking ???
-	// 76 earlyq ???
+	// 70 Dektora ???
+	// 71 Dektora ???
+	// 72 Desk Clerk, Leon ???
+	// 73 EarlyQ ???
+	// 74 EarlyQ ???
+	// 75 McCoy drinking ???
+	// 76 EarlyQ ???
 	// 77 not used
-	// 78 hanoi ???
-	// 79 dektora ???
-	// 80 gordo ???
+	// 78 Hanoi ???
+	// 79 Dektora ???
+	// 80 Gordo ???
 	// 81 - 82 not used
-	// 83 gordo ???
-	// 84 gordo ???
-	// 85 mccoy, earlyq - sitdown
+	// 83 Gordo ???
+	// 84 Gordo ???
+	// 85 McCoy, EarlyQ - sitdown
 	// 86 - 87 not used
 	// 88 ???
-	// 89 homeless ???
+	// 89 Homeless ???
 };
 
 enum SceneLoopMode {
-	kSceneLoopModeNone = -1,
-	kSceneLoopModeLoseControl = 0,
-	kSceneLoopModeChangeSet = 1,
-	kSceneLoopModeOnce = 2,
-	kSceneLoopModeSpinner = 3
+	kSceneLoopModeNone        = -1,
+	kSceneLoopModeLoseControl =  0,
+	kSceneLoopModeChangeSet   =  1,
+	kSceneLoopModeOnce        =  2,
+	kSceneLoopModeSpinner     =  3
 };
 
 enum Scenes {
-	kSceneAR01 = 0, // Animoid Row - Fish dealer
-	kSceneAR02 = 1, // Animoid Row - Insect dealer
-	kSceneBB01 = 2, // Bradbury building - Outside
-	kSceneBB02 = 3, // Bradbury building - Inside
-	kSceneBB03 = 4, // Bradbury building - Entrance
-	kSceneBB04 = 5, // Bradbury building - Elevator
-	kSceneBB05 = 6, // Bradbury building - Entry hall
-	kSceneBB06 = 7, // Bradbury building - Billiard room - front
-	kSceneBB07 = 8, // Bradbury building - Sebastian's office
-	kSceneBB08 = 9, // Bradbury Building - Bathroom
-	kSceneBB09 = 10, // Bradbury Building - Above bathroom
-	kSceneBB10 = 11, // Bradbury Building - Bookcase
-	kSceneBB11 = 12, // Bradbury Building - Roof
-	kSceneCT01 = 13, // Chinatown - Howie Lee's Restaurant
-	kSceneCT02 = 14, // Chinatown - Restaurant - Kitchen
-	kSceneCT03 = 15, // Chinatown - Back alley - Restaurant
-	kSceneCT04 = 16, // Chinatown - Back alley - Dumpster
-	kSceneCT05 = 17, // Chinatown - Warehouse - Inside
-	kSceneCT06 = 18, // Chinatown - Passage - front
-	kSceneCT07 = 19, // Chinatown - Passage - back
-	kSceneCT08 = 20, // Chinatown - Yukon Hotel - Backroom
-	kSceneCT09 = 21, // Chinatown - Yukon Hotel - Lobby
-	kSceneCT10 = 22, // Chinatown - Yukon Hotel - Room
-	kSceneCT11 = 23, // Chinatown - Yukon Hotel - Outside
-	kSceneCT12 = 24, // Chinatown - Warehouse - Outside
-	kSceneDR01 = 25, // DNA Row - Street
-	kSceneDR02 = 26, // DNA Row - Eyeworld - Outside
-	kSceneDR03 = 27, // DNA Row - Eyeworld - Inside
-	kSceneDR04 = 28, // DNA Row - Dermo design - Outside
-	kSceneDR05 = 29, // DNA Row - Dermo design - Inside
-	kSceneDR06 = 30, // DNA Row - Twin's office
-	kSceneHC01 = 31, // Hawker's Circle - Green pawn - Outside
-	kSceneHC02 = 32, // Hawker's Circle - China bar
-	kSceneHC03 = 33, // Hawker's Circle - Green pawn - Inside
-	kSceneHF01 = 34, // Hysteria Hall - Outside
-	kSceneHF02 = 35, // Hysteria Hall - Hall of Mirrors - Exit
-	kSceneHF03 = 36, // Hysteria Hall - Hysteria Arcade
-	kSceneHF04 = 37, // Hysteria Hall - Hall of Mirrors
-	kSceneHF05 = 38, // Hysteria Hall - Crazy Legs Larry Autos - Inside
-	kSceneHF06 = 39, // Hysteria Hall - Crazy Legs Larry Autos - Root
-	kSceneHF07 = 40, // Hysteria Hall - Crazy Legs Larry Autos - Underground
-	kSceneKP01 = 41, // Kipple - Rubble
-	kSceneKP02 = 42, // Kipple - Entry / Gate
-	kSceneKP03 = 43, // Kipple - Bomb
-	kSceneKP04 = 44, // Kipple - Huge pillar
-	kSceneKP05 = 45, // Kipple - Moonbus - Far
-	kSceneKP06 = 46, // Kipple - Moonbus - Near
-	kSceneKP07 = 47, // Kipple - Moonbus - Inside
-	kSceneMA01 = 48, // McCoy's Apartment - Roof
-	kSceneMA02 = 49, // McCoy's Apartment - Living room
-	kSceneMA04 = 50, // McCoy's Apartment - Sleeping room
-	kSceneMA05 = 51, // McCoy's Apartment - Balcony
-	kSceneMA06 = 52, // McCoy's Apartment - Elevator
-	kSceneMA07 = 53, // McCoy's Apartment - Ground floor
-	kSceneNR01 = 54, // Nightclub Row - Outside
-	kSceneNR02 = 55, // Nightclub Row - Taffy Lewis'
-	kSceneNR03 = 56, // Nightclub Row - Early Q's - Main area
-	kSceneNR04 = 57, // Nightclub Row - Early Q's - Office
-	kSceneNR05 = 58, // Nightclub Row - Early Q's - VIP area
-	kSceneNR06 = 59, // Nightclub Row - Early Q's - Empty dressing room
-	kSceneNR07 = 60, // Nightclub Row - Early Q's - Dektora's dressing room
-	kSceneNR08 = 61, // Nightclub Row - Early Q's - Stage
-	kSceneNR09 = 62, // Nightclub Row - Early Q's - Balcony
-	kSceneNR10 = 63, // Nightclub Row - Early Q's - Projector room
-	kSceneNR11 = 64, // Nightclub Row - Early Q's - Loft
-	kScenePS01 = 65, // Police Station - Roof
-	kScenePS02 = 66, // Police Station - Elevator
-	kScenePS03 = 67, // Police Station - Ground floor
-	kScenePS04 = 68, // Police Station - Guzza's Office
-	kScenePS05 = 69, // Police Station - Mainframe & Shooting range hallway
-	kScenePS06 = 70, // Police Station - ESPER room
-	kScenePS07 = 71, // Police Station - Laboratory
-	kScenePS09 = 72, // Police Station - Lockup
-	kScenePS10 = 73, // Police Station - Shooting range 1
-	kScenePS11 = 74, // Police Station - Shooting range 2
-	kScenePS12 = 75, // Police Station - Shooting range 3
-	kScenePS13 = 76, // Police Station - Shooting range 4
-	kScenePS14 = 77, // Police Station - Outside
-	kSceneRC01 = 78, // Runciter - Outside
-	kSceneRC02 = 79, // Runciter - Inside
-	kSceneRC03 = 80, // Bullet Bob's Runner Surplus - Outside
-	kSceneRC04 = 81, // Bullet Bob's Runner Surplus - Inside
-	kSceneTB02 = 82, // Tyrell Building - Reception
-	kSceneTB03 = 83, // Tyrell Building - Reception back
-	kSceneTB05 = 84, // Tyrell Building - Grav Test Lab - Outside
-	kSceneTB06 = 85, // Tyrell Building - Grav Test Lab - Inside
-	kSceneUG01 = 86, // Underground - Under RC03
-	kSceneUG02 = 87, // Underground - Under HC03
-	kSceneUG03 = 88, // Underground - Chair
-	kSceneUG04 = 89, // Underground - Rails with crash - start
-	kSceneUG05 = 90, // Underground - Under HF07 - Rails with cars
-	kSceneUG06 = 91, // Underground - Under NR01 - Metro entrance
-	kSceneUG07 = 92, // Underground - Pipe
-	kSceneUG08 = 93, // Underground - Elevator
-	kSceneUG09 = 94, // Underground - Behind CT12
-	kSceneUG10 = 95, // Underground - Moving bridge
-	kSceneUG12 = 96, // Underground - Gate
-	kSceneUG13 = 97, // Underground - Homeless' living room
-	kSceneUG14 = 98, // Underground - Crossroad
-	kSceneUG15 = 99, // Underground - Bridge with rat
+	kSceneAR01 =   0, // Animoid Row - Fish dealer
+	kSceneAR02 =   1, // Animoid Row - Insect dealer
+	kSceneBB01 =   2, // Bradbury building - Outside
+	kSceneBB02 =   3, // Bradbury building - Inside
+	kSceneBB03 =   4, // Bradbury building - Entrance
+	kSceneBB04 =   5, // Bradbury building - Elevator
+	kSceneBB05 =   6, // Bradbury building - Entry hall
+	kSceneBB06 =   7, // Bradbury building - Billiard room - front
+	kSceneBB07 =   8, // Bradbury building - Sebastian's office
+	kSceneBB08 =   9, // Bradbury Building - Bathroom
+	kSceneBB09 =  10, // Bradbury Building - Above bathroom
+	kSceneBB10 =  11, // Bradbury Building - Bookcase
+	kSceneBB11 =  12, // Bradbury Building - Roof
+	kSceneCT01 =  13, // Chinatown - Howie Lee's Restaurant
+	kSceneCT02 =  14, // Chinatown - Restaurant - Kitchen
+	kSceneCT03 =  15, // Chinatown - Back alley - Restaurant
+	kSceneCT04 =  16, // Chinatown - Back alley - Dumpster
+	kSceneCT05 =  17, // Chinatown - Warehouse - Inside
+	kSceneCT06 =  18, // Chinatown - Passage - front
+	kSceneCT07 =  19, // Chinatown - Passage - back
+	kSceneCT08 =  20, // Chinatown - Yukon Hotel - Backroom
+	kSceneCT09 =  21, // Chinatown - Yukon Hotel - Lobby
+	kSceneCT10 =  22, // Chinatown - Yukon Hotel - Room
+	kSceneCT11 =  23, // Chinatown - Yukon Hotel - Outside
+	kSceneCT12 =  24, // Chinatown - Warehouse - Outside
+	kSceneDR01 =  25, // DNA Row - Street
+	kSceneDR02 =  26, // DNA Row - Eyeworld - Outside
+	kSceneDR03 =  27, // DNA Row - Eyeworld - Inside
+	kSceneDR04 =  28, // DNA Row - Dermo design - Outside
+	kSceneDR05 =  29, // DNA Row - Dermo design - Inside
+	kSceneDR06 =  30, // DNA Row - Twin's office
+	kSceneHC01 =  31, // Hawker's Circle - Green pawn - Outside
+	kSceneHC02 =  32, // Hawker's Circle - China bar
+	kSceneHC03 =  33, // Hawker's Circle - Green pawn - Inside
+	kSceneHF01 =  34, // Hysteria Hall - Outside
+	kSceneHF02 =  35, // Hysteria Hall - Hall of Mirrors - Exit
+	kSceneHF03 =  36, // Hysteria Hall - Hysteria Arcade
+	kSceneHF04 =  37, // Hysteria Hall - Hall of Mirrors
+	kSceneHF05 =  38, // Hysteria Hall - Crazy Legs Larry Autos - Inside
+	kSceneHF06 =  39, // Hysteria Hall - Crazy Legs Larry Autos - Root
+	kSceneHF07 =  40, // Hysteria Hall - Crazy Legs Larry Autos - Underground
+	kSceneKP01 =  41, // Kipple - Rubble
+	kSceneKP02 =  42, // Kipple - Entry / Gate
+	kSceneKP03 =  43, // Kipple - Bomb
+	kSceneKP04 =  44, // Kipple - Huge pillar
+	kSceneKP05 =  45, // Kipple - Moonbus - Far
+	kSceneKP06 =  46, // Kipple - Moonbus - Near
+	kSceneKP07 =  47, // Kipple - Moonbus - Inside
+	kSceneMA01 =  48, // McCoy's Apartment - Roof
+	kSceneMA02 =  49, // McCoy's Apartment - Living room
+	kSceneMA04 =  50, // McCoy's Apartment - Sleeping room
+	kSceneMA05 =  51, // McCoy's Apartment - Balcony
+	kSceneMA06 =  52, // McCoy's Apartment - Elevator
+	kSceneMA07 =  53, // McCoy's Apartment - Ground floor
+	kSceneNR01 =  54, // Nightclub Row - Outside
+	kSceneNR02 =  55, // Nightclub Row - Taffy Lewis'
+	kSceneNR03 =  56, // Nightclub Row - Early Q's - Main area
+	kSceneNR04 =  57, // Nightclub Row - Early Q's - Office
+	kSceneNR05 =  58, // Nightclub Row - Early Q's - VIP area
+	kSceneNR06 =  59, // Nightclub Row - Early Q's - Empty dressing room
+	kSceneNR07 =  60, // Nightclub Row - Early Q's - Dektora's dressing room
+	kSceneNR08 =  61, // Nightclub Row - Early Q's - Stage
+	kSceneNR09 =  62, // Nightclub Row - Early Q's - Balcony
+	kSceneNR10 =  63, // Nightclub Row - Early Q's - Projector room
+	kSceneNR11 =  64, // Nightclub Row - Early Q's - Loft
+	kScenePS01 =  65, // Police Station - Roof
+	kScenePS02 =  66, // Police Station - Elevator
+	kScenePS03 =  67, // Police Station - Ground floor
+	kScenePS04 =  68, // Police Station - Guzza's Office
+	kScenePS05 =  69, // Police Station - Mainframe & Shooting range hallway
+	kScenePS06 =  70, // Police Station - ESPER room
+	kScenePS07 =  71, // Police Station - Laboratory
+	kScenePS09 =  72, // Police Station - Lockup
+	kScenePS10 =  73, // Police Station - Shooting range 1
+	kScenePS11 =  74, // Police Station - Shooting range 2
+	kScenePS12 =  75, // Police Station - Shooting range 3
+	kScenePS13 =  76, // Police Station - Shooting range 4
+	kScenePS14 =  77, // Police Station - Outside
+	kSceneRC01 =  78, // Runciter - Outside
+	kSceneRC02 =  79, // Runciter - Inside
+	kSceneRC03 =  80, // Bullet Bob's Runner Surplus - Outside
+	kSceneRC04 =  81, // Bullet Bob's Runner Surplus - Inside
+	kSceneTB02 =  82, // Tyrell Building - Reception
+	kSceneTB03 =  83, // Tyrell Building - Reception back
+	kSceneTB05 =  84, // Tyrell Building - Grav Test Lab - Outside
+	kSceneTB06 =  85, // Tyrell Building - Grav Test Lab - Inside
+	kSceneUG01 =  86, // Underground - Under RC03
+	kSceneUG02 =  87, // Underground - Under HC03
+	kSceneUG03 =  88, // Underground - Chair
+	kSceneUG04 =  89, // Underground - Rails with crash - start
+	kSceneUG05 =  90, // Underground - Under HF07 - Rails with cars
+	kSceneUG06 =  91, // Underground - Under NR01 - Metro entrance
+	kSceneUG07 =  92, // Underground - Pipe
+	kSceneUG08 =  93, // Underground - Elevator
+	kSceneUG09 =  94, // Underground - Behind CT12
+	kSceneUG10 =  95, // Underground - Moving bridge
+	kSceneUG12 =  96, // Underground - Gate
+	kSceneUG13 =  97, // Underground - Homeless' living room
+	kSceneUG14 =  98, // Underground - Crossroad
+	kSceneUG15 =  99, // Underground - Bridge with rat
 	kSceneUG16 = 100, // Underground - Under DR06
 	kSceneUG17 = 101, // Underground - Under TB03
 	kSceneUG18 = 102, // Underground - Pit
@@ -1457,179 +1457,179 @@ enum Scenes {
 };
 
 enum Sets {
-	kSetAR01_AR02 = 0,
-	kSetBB02_BB04_BB06_BB51 = 1,
-	kSetBB06_BB07 = 2, //BB06
-	kSetBB07 = 3,
-	kSetCT01_CT12 = 4,
-	kSetCT03_CT04 = 5,
-	kSetCT08_CT51_UG12 = 6, //UG12
-	kSetDR01_DR02_DR04 = 7,
-	kSetHC01_HC02_HC03_HC04 = 8,
-	kSetKP05_KP06 = 9,
-	kSetMA02_MA04 = 10, //MA04
-	kSetNR02 = 11,
-	kSetNR04 = 12,
-	kSetNR05_NR08 = 13,
-	kSetPS10_PS11_PS12_PS13 = 14,
-	kSetPS05 = 15,
-	kSetRC02_RC51 = 16,
-	kSetTB02_TB03 = 17,
-	kSetTB07 = 18,
-	kSetUG16 = 19,
-	kSetBB01 = 20,
-	kSetBB03 = 21,
-	kSetBB05 = 22,
-	kSetBB08 = 23,
-	kSetBB09 = 24,
-	kSetBB10 = 25,
-	kSetBB11 = 26,
-	kSetCT02 = 27,
-	kSetCT05 = 28,
-	kSetCT06 = 29,
-	kSetCT07 = 30,
-	kSetCT09 = 31,
-	kSetCT10 = 32,
-	kSetCT11 = 33,
-	kSetDR03 = 34,
-	kSetDR05 = 35,
-	kSetDR06 = 36,
-	kSetHF01 = 37,
-	kSetHF02 = 38,
-	kSetHF03 = 39,
-	kSetHF04 = 40,
-	kSetHF05 = 41,
-	kSetHF06 = 42,
-	kSetHF07 = 43,
-	kSetKP01 = 44,
-	kSetKP02 = 45,
-	kSetKP03 = 46,
-	kSetKP04 = 47,
-	kSetKP07 = 48,
-	kSetMA01 = 49,
-	kSetMA04 = 50,
-	kSetMA05 = 51,
-	kSetMA06 = 52,
-	kSetMA07 = 53,
-	kSetNR01 = 54,
-	kSetNR03 = 55,
-	kSetNR06 = 56,
-	kSetNR07 = 57,
-	kSetNR09 = 58,
-	kSetNR10 = 59,
-	kSetNR11 = 60,
-	kSetPS01 = 61,
-	kSetPS02 = 62,
-	kSetPS03 = 63,
-	kSetPS04 = 64,
-	kSetPS06 = 65,
-	kSetPS07 = 66,
-	kSetPS09 = 67,
-	kSetPS14 = 68,
-	kSetRC01 = 69,
-	kSetRC03 = 70,
-	kSetRC04 = 71,
-	kSetTB05 = 72,
-	kSetTB06 = 73,
-	kSetUG01 = 74,
-	kSetUG02 = 75,
-	kSetUG03 = 76,
-	kSetUG04 = 77,
-	kSetUG05 = 78,
-	kSetUG06 = 79,
-	kSetUG07 = 80,
-	kSetUG08 = 81,
-	kSetUG09 = 82,
-	kSetUG10 = 83,
-	kSetUG12 = 84,
-	kSetUG13 = 85,
-	kSetUG14 = 86,
-	kSetUG15 = 87,
-	kSetUG17 = 88,
-	kSetUG18 = 89,
-	kSetUG19 = 90,
-	kSetFreeSlotA = 91,
-	kSetFreeSlotB = 92,
-	kSetFreeSlotC = 93,
-	kSetFreeSlotD = 94,
-	kSetFreeSlotE = 95,
-	kSetFreeSlotF = 96,
-	kSetFreeSlotG = 97,
-	kSetFreeSlotH = 98,
-	kSetFreeSlotI = 99,
-	kSetFreeSlotJ = 100,
-	kSetPS15 = 101,
-	kSetBB12 = 102
+	kSetAR01_AR02           =   0,
+	kSetBB02_BB04_BB06_BB51 =   1,
+	kSetBB06_BB07           =   2, //BB06
+	kSetBB07                =   3,
+	kSetCT01_CT12           =   4,
+	kSetCT03_CT04           =   5,
+	kSetCT08_CT51_UG12      =   6, //UG12
+	kSetDR01_DR02_DR04      =   7,
+	kSetHC01_HC02_HC03_HC04 =   8,
+	kSetKP05_KP06           =   9,
+	kSetMA02_MA04           =  10, //MA04
+	kSetNR02                =  11,
+	kSetNR04                =  12,
+	kSetNR05_NR08           =  13,
+	kSetPS10_PS11_PS12_PS13 =  14,
+	kSetPS05                =  15,
+	kSetRC02_RC51           =  16,
+	kSetTB02_TB03           =  17,
+	kSetTB07                =  18,
+	kSetUG16                =  19,
+	kSetBB01                =  20,
+	kSetBB03                =  21,
+	kSetBB05                =  22,
+	kSetBB08                =  23,
+	kSetBB09                =  24,
+	kSetBB10                =  25,
+	kSetBB11                =  26,
+	kSetCT02                =  27,
+	kSetCT05                =  28,
+	kSetCT06                =  29,
+	kSetCT07                =  30,
+	kSetCT09                =  31,
+	kSetCT10                =  32,
+	kSetCT11                =  33,
+	kSetDR03                =  34,
+	kSetDR05                =  35,
+	kSetDR06                =  36,
+	kSetHF01                =  37,
+	kSetHF02                =  38,
+	kSetHF03                =  39,
+	kSetHF04                =  40,
+	kSetHF05                =  41,
+	kSetHF06                =  42,
+	kSetHF07                =  43,
+	kSetKP01                =  44,
+	kSetKP02                =  45,
+	kSetKP03                =  46,
+	kSetKP04                =  47,
+	kSetKP07                =  48,
+	kSetMA01                =  49,
+	kSetMA04                =  50,
+	kSetMA05                =  51,
+	kSetMA06                =  52,
+	kSetMA07                =  53,
+	kSetNR01                =  54,
+	kSetNR03                =  55,
+	kSetNR06                =  56,
+	kSetNR07                =  57,
+	kSetNR09                =  58,
+	kSetNR10                =  59,
+	kSetNR11                =  60,
+	kSetPS01                =  61,
+	kSetPS02                =  62,
+	kSetPS03                =  63,
+	kSetPS04                =  64,
+	kSetPS06                =  65,
+	kSetPS07                =  66,
+	kSetPS09                =  67,
+	kSetPS14                =  68,
+	kSetRC01                =  69,
+	kSetRC03                =  70,
+	kSetRC04                =  71,
+	kSetTB05                =  72,
+	kSetTB06                =  73,
+	kSetUG01                =  74,
+	kSetUG02                =  75,
+	kSetUG03                =  76,
+	kSetUG04                =  77,
+	kSetUG05                =  78,
+	kSetUG06                =  79,
+	kSetUG07                =  80,
+	kSetUG08                =  81,
+	kSetUG09                =  82,
+	kSetUG10                =  83,
+	kSetUG12                =  84,
+	kSetUG13                =  85,
+	kSetUG14                =  86,
+	kSetUG15                =  87,
+	kSetUG17                =  88,
+	kSetUG18                =  89,
+	kSetUG19                =  90,
+	kSetFreeSlotA           =  91,
+	kSetFreeSlotB           =  92,
+	kSetFreeSlotC           =  93,
+	kSetFreeSlotD           =  94,
+	kSetFreeSlotE           =  95,
+	kSetFreeSlotF           =  96,
+	kSetFreeSlotG           =  97,
+	kSetFreeSlotH           =  98,
+	kSetFreeSlotI           =  99,
+	kSetFreeSlotJ           = 100,
+	kSetPS15                = 101,
+	kSetBB12                = 102
 };
 
 enum GameItems {
-	kItemPS10Target1 = 0,
-	kItemPS10Target2 = 1,
-	kItemPS10Target3 = 2,
-	kItemPS10Target4 = 3,
-	kItemPS10Target5 = 4,
-	kItemPS10Target6 = 5,
-	kItemPS10Target7 = 6,
-	kItemPS10Target8 = 7,
-	kItemPS10Target9 = 8,
-	kItemPS11Target1 = 9,
-	kItemPS11Target2 = 10,
-	kItemPS11Target3 = 11,
-	kItemPS11Target4 = 12,
-	kItemPS11Target5 = 13,
-	kItemPS11Target6 = 14,
-	kItemPS11Target7 = 15,
-	kItemPS11Target8 = 16,
-	kItemPS11Target9 = 17,
-	kItemPS11Target10 = 18,
-	kItemPS11Target11 = 19,
-	kItemPS11Target12 = 20,
-	kItemPS11Target13 = 21,
-	kItemPS11Target14 = 22,
-	kItemPS11Target15 = 23,
+	kItemPS10Target1            =   0,
+	kItemPS10Target2            =   1,
+	kItemPS10Target3            =   2,
+	kItemPS10Target4            =   3,
+	kItemPS10Target5            =   4,
+	kItemPS10Target6            =   5,
+	kItemPS10Target7            =   6,
+	kItemPS10Target8            =   7,
+	kItemPS10Target9            =   8,
+	kItemPS11Target1            =   9,
+	kItemPS11Target2            =  10,
+	kItemPS11Target3            =  11,
+	kItemPS11Target4            =  12,
+	kItemPS11Target5            =  13,
+	kItemPS11Target6            =  14,
+	kItemPS11Target7            =  15,
+	kItemPS11Target8            =  16,
+	kItemPS11Target9            =  17,
+	kItemPS11Target10           =  18,
+	kItemPS11Target11           =  19,
+	kItemPS11Target12           =  20,
+	kItemPS11Target13           =  21,
+	kItemPS11Target14           =  22,
+	kItemPS11Target15           =  23,
 	// 24 is never used
 	// 25 is never used
 	// 26 is never used
-	kItemPS11Target16 = 27,
+	kItemPS11Target16           =  27,
 	// 28 is never used
-	kItemPS12Target1 = 29,
-	kItemPS12Target2 = 30,
-	kItemPS12Target3 = 31,
-	kItemPS12Target4 = 32,
-	kItemPS12Target5 = 33,
-	kItemPS12Target6 = 34,
-	kItemPS12Target7 = 35,
-	kItemPS12Target8 = 36,
-	kItemPS12Target9 = 37,
-	kItemPS12Target10 = 38,
-	kItemPS12Target11 = 39,
-	kItemPS12Target12 = 40,
-	kItemPS12Target13 = 41,
-	kItemPS12Target14 = 42,
-	kItemPS12Target15 = 43,
-	kItemPS12Target16 = 44,
-	kItemPS12Target17 = 45,
-	kItemPS13Target1 = 46,
-	kItemPS13Target2 = 47,
-	kItemPS13Target3 = 48,
-	kItemPS13Target4 = 49,
-	kItemPS13Target5 = 50,
-	kItemPS13Target6 = 51,
-	kItemPS13Target7 = 52,
-	kItemPS13Target8 = 53,
-	kItemPS13Target9 = 54,
-	kItemPS13Target10 = 55,
-	kItemPS13Target11 = 56,
-	kItemPS13Target12 = 57,
-	kItemPS13Target13 = 58,
+	kItemPS12Target1            =  29,
+	kItemPS12Target2            =  30,
+	kItemPS12Target3            =  31,
+	kItemPS12Target4            =  32,
+	kItemPS12Target5            =  33,
+	kItemPS12Target6            =  34,
+	kItemPS12Target7            =  35,
+	kItemPS12Target8            =  36,
+	kItemPS12Target9            =  37,
+	kItemPS12Target10           =  38,
+	kItemPS12Target11           =  39,
+	kItemPS12Target12           =  40,
+	kItemPS12Target13           =  41,
+	kItemPS12Target14           =  42,
+	kItemPS12Target15           =  43,
+	kItemPS12Target16           =  44,
+	kItemPS12Target17           =  45,
+	kItemPS13Target1            =  46,
+	kItemPS13Target2            =  47,
+	kItemPS13Target3            =  48,
+	kItemPS13Target4            =  49,
+	kItemPS13Target5            =  50,
+	kItemPS13Target6            =  51,
+	kItemPS13Target7            =  52,
+	kItemPS13Target8            =  53,
+	kItemPS13Target9            =  54,
+	kItemPS13Target10           =  55,
+	kItemPS13Target11           =  56,
+	kItemPS13Target12           =  57,
+	kItemPS13Target13           =  58,
 	// 59 is never used
 	// 60 is never used
 	// 61 is never used
-	kItemPS13Target14 = 62,
-	kItemPS13Target15 = 63,
+	kItemPS13Target14           =  62,
+	kItemPS13Target15           =  63,
 	// 64 is never used
 	// 65 is never used
-	kItemChromeDebris = 66,
+	kItemChromeDebris           =  66,
 	// 67 is never used
 	// 68 is never used
 	// 69 is never used
@@ -1640,52 +1640,52 @@ enum GameItems {
 	// 74 is never used
 	// 75 is never used
 	// 76 is never used
-	kItemDragonflyEarring = 76,
-	kItemBB06ControlBox = 77,
-	kItemBomb = 78,
-	kItemCandy = 79,
-	kItemCheese = 81,
-	kItemChopstickWrapper = 82,
-	kItemDNATyrell = 83,
-	kItemDogCollar = 84,
-	kItemRagDoll = 85,
+	kItemDragonflyEarring       =  76,
+	kItemBB06ControlBox         =  77,
+	kItemBomb                   =  78,
+	kItemCandy                  =  79,
+	kItemCheese                 =  81,
+	kItemChopstickWrapper       =  82,
+	kItemDNATyrell              =  83,
+	kItemDogCollar              =  84,
+	kItemRagDoll                =  85,
 	// 86 is never used
 	// 87 is never used
-	kItemRadiationGoogles = 88,
-	kItemGordosLighterReplicant = 89,
-	kItemGordosLighterHuman = 90,
-	kItemBriefcase = 91,
+	kItemRadiationGoogles       =  88,
+	kItemGordosLighterReplicant =  89,
+	kItemGordosLighterHuman     =  90,
+	kItemBriefcase              =  91,
 	// 92 is never used
 	// 93 is never used
 	// 94 is never used
 	// 95 is never used
 	// 96 is never used
 	// 97 is never used
-	kItemToyDog = 98,
+	kItemToyDog                 =  98,
 	// 99 is never used
-	kItemShellCasingA = 100,
-	kItemShellCasingB = 101,
-	kItemShellCasingC = 102,
-	kItemDeadDogA = 103,
-	kItemDeadDogB = 104,
-	kItemDeadDogC = 105,
-	kItemScorpions = 106,
-	kItemCamera = 107,
-	kItemKitchenBox = 108,
-	kItemChair = 109,
-	kItemWeaponsCrate = 110,
-	kItemWeaponsOrderForm = 111,
+	kItemShellCasingA           = 100,
+	kItemShellCasingB           = 101,
+	kItemShellCasingC           = 102,
+	kItemDeadDogA               = 103,
+	kItemDeadDogB               = 104,
+	kItemDeadDogC               = 105,
+	kItemScorpions              = 106,
+	kItemCamera                 = 107,
+	kItemKitchenBox             = 108,
+	kItemChair                  = 109,
+	kItemWeaponsCrate           = 110,
+	kItemWeaponsOrderForm       = 111,
 	// 112 is never used
 	// 113 is never used
 	// 114 is never used
-	kItemDogWrapper = 115,
+	kItemDogWrapper             = 115,
 	// 116 is never used
 	// 117 is never used
-	kItemPowerSource = 118,
-	kItemTyrellSalesPamphlet = 119,
-	kItemMoonbusPhoto = 120,
-	kItemGreenPawnLock = 121,
-	kItemChain = 122
+	kItemPowerSource            = 118,
+	kItemTyrellSalesPamphlet    = 119,
+	kItemMoonbusPhoto           = 120,
+	kItemGreenPawnLock          = 121,
+	kItemChain                  = 122
 };
 
 enum GameModelAnimations {
@@ -1784,17 +1784,17 @@ enum GameModelAnimations {
 	kModelAnimationDektoraDancingC               = 170,
 	kModelAnimationDektoraDancingFinale          = 171,
 	//
-	kModelAnimationBulletBobsTrackingGun       = 440,
-	kModelAnimationMaleTargetEmptyHandsActive  = 441,
-	kModelAnimationMaleTargetEmptyHandsDead    = 442, // 441+1
-	kModelAnimationMaleTargetWithGunActive     = 443,
-	kModelAnimationMaleTargetWithGunDead       = 444, // 443+1
-	kModelAnimationMaleTargetWithShotgunActive = 445,
-	kModelAnimationMaleTargetWithShotgunDead   = 446, // 445+1
-	kModelAnimationFemaleTargetWithBabyActive  = 447,
-	kModelAnimationFemaleTargetWithBabyDead    = 448, // 447+1
-	kModelAnimationFemaleTargetWithGunActive   = 449,
-	kModelAnimationFemaleTargetWithGunDead     = 450, // 449+1
+	kModelAnimationBulletBobsTrackingGun         = 440,
+	kModelAnimationMaleTargetEmptyHandsActive    = 441,
+	kModelAnimationMaleTargetEmptyHandsDead      = 442, // 441+1
+	kModelAnimationMaleTargetWithGunActive       = 443,
+	kModelAnimationMaleTargetWithGunDead         = 444, // 443+1
+	kModelAnimationMaleTargetWithShotgunActive   = 445,
+	kModelAnimationMaleTargetWithShotgunDead     = 446, // 445+1
+	kModelAnimationFemaleTargetWithBabyActive    = 447,
+	kModelAnimationFemaleTargetWithBabyDead      = 448, // 447+1
+	kModelAnimationFemaleTargetWithGunActive     = 449,
+	kModelAnimationFemaleTargetWithGunDead       = 450, // 449+1
 	// Rachael Animations
 	kModelAnimationRachaelWalking                  = 822,
 	kModelAnimationRachaelIdle                     = 823,
@@ -1908,20 +1908,20 @@ enum Elevators {
 // };
 
 enum SceneObjectOffset {
-	kSceneObjectOffsetActors  = 0,
-	kSceneObjectOffsetItems   = 74,
+	kSceneObjectOffsetActors  =   0,
+	kSceneObjectOffsetItems   =  74,
 	kSceneObjectOffsetObjects = 198
 };
 
 enum ActorCombatStates {
-	kActorCombatStateIdle = 0,
-	kActorCombatStateCover = 1,
-	kActorCombatStateApproachCloseAttack = 2,
-	kActorCombatStateUncover = 3,
-	kActorCombatStateAim = 4,
-	kActorCombatStateRangedAttack = 5,
-	kActorCombatStateCloseAttack = 6,
-	kActorCombatStateFlee = 7,
+	kActorCombatStateIdle                 = 0,
+	kActorCombatStateCover                = 1,
+	kActorCombatStateApproachCloseAttack  = 2,
+	kActorCombatStateUncover              = 3,
+	kActorCombatStateAim                  = 4,
+	kActorCombatStateRangedAttack         = 5,
+	kActorCombatStateCloseAttack          = 6,
+	kActorCombatStateFlee                 = 7,
 	kActorCombatStateApproachRangedAttack = 8
 };
 
@@ -1943,31 +1943,31 @@ enum PoliceMazeTrackInstruction {
 	kPMTIPausedSet       = -12, // args: otherItemId
 	kPMTIPausedReset     = -11, // args: otherItemId
 	kPMTIPlaySound       = -10, // args: soundId, volume
-	kPMTIObstacleReset   = -9,  // args: otherItemId
-	kPMTIObstacleSet     = -8,  // args: otherItemId
-	kPMTIWaitRandom      = -7,  // args: min, max
-	kPMTIRotate          = -6,  // args: target, delta
-	kPMTIFacing          = -5,  // args: angle
-	kPMTIRestart         = -4,  // args: -
-	kPMTIWait            = -3,  // args: time
-	kPMTIMove            = -2,  // args: target
-	kPMTIPosition        = -1,  // args: index
-	kPMTI26 = 0
+	kPMTIObstacleReset   =  -9, // args: otherItemId
+	kPMTIObstacleSet     =  -8, // args: otherItemId
+	kPMTIWaitRandom      =  -7, // args: min, max
+	kPMTIRotate          =  -6, // args: target, delta
+	kPMTIFacing          =  -5, // args: angle
+	kPMTIRestart         =  -4, // args: -
+	kPMTIWait            =  -3, // args: time
+	kPMTIMove            =  -2, // args: target
+	kPMTIPosition        =  -1, // args: index
+	kPMTI26              =   0
 };
 
 enum PlayerAgenda {
-	kPlayerAgendaPolite = 0,
-	kPlayerAgendaNormal = 1,
-	kPlayerAgendaSurly = 2,
-	kPlayerAgendaErratic = 3,
+	kPlayerAgendaPolite     = 0,
+	kPlayerAgendaNormal     = 1,
+	kPlayerAgendaSurly      = 2,
+	kPlayerAgendaErratic    = 3,
 	kPlayerAgendaUserChoice = 4
 };
 
 enum AffectionTowards {
-	kAffectionTowardsNone = 0,
-	kAffectionTowardsSteele = 1,
+	kAffectionTowardsNone    = 0,
+	kAffectionTowardsSteele  = 1,
 	kAffectionTowardsDektora = 2,
-	kAffectionTowardsLucy = 3
+	kAffectionTowardsLucy    = 3
 };
 
 /*
@@ -1981,199 +1981,199 @@ enum AffectionTowards {
  */
 
 enum GoalMcCoy {
-	kGoalMcCoyDefault = 0,
-	kGoalMcCoyDodge = 1,
-	kGoalMcCoyBB11GetUp = 100,
+	kGoalMcCoyDefault              =   0,
+	kGoalMcCoyDodge                =   1,
+	kGoalMcCoyBB11GetUp            = 100,
 	kGoalMcCoyBB11PrepareToRunAway = 101,
-	kGoalMcCoyBB11RunAway = 102,
-	kGoalMcCoyBB11GetCaught = 103,
-	kGoalMcCoyNRxxSitAtTable = 200,
-	kGoalMcCoyNRxxStandUp = 201,
-	kGoalMcCoyNR01ThrownOut = 210,
-	kGoalMcCoyNR01GetUp = 211,
-	kGoalMcCoyNR01LayDrugged = 212,
-	kGoalMcCoyNR04Drink = 220,
-	kGoalMcCoyNR04PassOut = 221,
-	kGoalMcCoyNR11Shoot = 230,
-	kGoalMcCoyNR10Fall = 231,
-	kGoalMcCoyUG07Caught = 301,
-	kGoalMcCoyUG07BrokenFinger = 302,
-	kGoalMcCoyUG07Released = 303,
-	kGoalMcCoyCallWithGuzza = 350,
-	kGoalMcCoyUG15Fall = 390,
-	kGoalMcCoyUG15Die = 391,
-	kGoalMcCoyStartChapter5 = 400,
-	kGoalMcCoyArrested = 500,
-	kGoalMcCoyGone = 599
+	kGoalMcCoyBB11RunAway          = 102,
+	kGoalMcCoyBB11GetCaught        = 103,
+	kGoalMcCoyNRxxSitAtTable       = 200,
+	kGoalMcCoyNRxxStandUp          = 201,
+	kGoalMcCoyNR01ThrownOut        = 210,
+	kGoalMcCoyNR01GetUp            = 211,
+	kGoalMcCoyNR01LayDrugged       = 212,
+	kGoalMcCoyNR04Drink            = 220,
+	kGoalMcCoyNR04PassOut          = 221,
+	kGoalMcCoyNR11Shoot            = 230,
+	kGoalMcCoyNR10Fall             = 231,
+	kGoalMcCoyUG07Caught           = 301,
+	kGoalMcCoyUG07BrokenFinger     = 302,
+	kGoalMcCoyUG07Released         = 303,
+	kGoalMcCoyCallWithGuzza        = 350,
+	kGoalMcCoyUG15Fall             = 390,
+	kGoalMcCoyUG15Die              = 391,
+	kGoalMcCoyStartChapter5        = 400,
+	kGoalMcCoyArrested             = 500,
+	kGoalMcCoyGone                 = 599
 };
 
 enum GoalSteele {
 	// chapter 1
-	kGoalSteeleDefault = 0,
-	kGoalSteeleGoToRC01 = 1,
-	kGoalSteeleGoToRC02 = 2,
-	kGoalSteeleGoToFreeSlotC1 = 3,
-	kGoalSteeleGoToFreeSlotG1 = 4,
-	kGoalSteeleGoToCT01 = 5,
-	kGoalSteeleGoToFreeSlotC2 = 6,
-	kGoalSteeleGoToFreeSlotG2 = 7,
-	kGoalSteeleGoToPoliceShootingRange = 8,
-	kGoalSteeleGoToPS02 = 9,
-	kGoalSteeleGoToFreeSlotG3 = 10,
-	kGoalSteeleInterviewGrigorian = 11,
+	kGoalSteeleDefault                     =   0,
+	kGoalSteeleGoToRC01                    =   1,
+	kGoalSteeleGoToRC02                    =   2,
+	kGoalSteeleGoToFreeSlotC1              =   3,
+	kGoalSteeleGoToFreeSlotG1              =   4,
+	kGoalSteeleGoToCT01                    =   5,
+	kGoalSteeleGoToFreeSlotC2              =   6,
+	kGoalSteeleGoToFreeSlotG2              =   7,
+	kGoalSteeleGoToPoliceShootingRange     =   8,
+	kGoalSteeleGoToPS02                    =   9,
+	kGoalSteeleGoToFreeSlotG3              =  10,
+	kGoalSteeleInterviewGrigorian          =  11,
 	// chapter 2
-	kGoalSteeleApprehendIzo = 100,
-	kGoalSteeleGoToTB02 = 110,
-	kGoalSteeleLeaveTB02 = 111,
-	kGoalSteeleGoToPoliceStation = 112,
-	kGoalSteeleWalkAround = 113,
-	kGoalSteeleShootIzo = 120,
-	kGoalSteeleArrestIzo = 121,
-	kGoalSteeleIzoBlockedByMcCoy = 125,
-	kGoalSteeleLeaveRC03 = 130,
-	kGoalSteeleWalkAroundRestart = 190,
+	kGoalSteeleApprehendIzo                = 100,
+	kGoalSteeleGoToTB02                    = 110,
+	kGoalSteeleLeaveTB02                   = 111,
+	kGoalSteeleGoToPoliceStation           = 112,
+	kGoalSteeleWalkAround                  = 113,
+	kGoalSteeleShootIzo                    = 120,
+	kGoalSteeleArrestIzo                   = 121,
+	kGoalSteeleIzoBlockedByMcCoy           = 125,
+	kGoalSteeleLeaveRC03                   = 130,
+	kGoalSteeleWalkAroundRestart           = 190,
 	// chapter 3
-	kGoalSteeleStartChapter3 = 205,
-	kGoalSteeleNR11StartWaiting = 210,
-	kGoalSteeleNR11StopWaiting = 211,
-	kGoalSteeleNR11Enter = 212,
-	kGoalSteeleNR11Entered = 213,
-	kGoalSteeleNR11Decide = 214,
-	kGoalSteeleNR11Shoot = 215,
-	kGoalSteeleNR11StopShooting = 216,
-	kGoalSteeleNR01WaitForMcCoy = 230,
-	kGoalSteeleNR01GoToNR08 = 231,
-	kGoalSteeleNR01GoToNR02 = 232,
-	kGoalSteeleNR01GoToHF03 = 233,
-	kGoalSteeleHF03McCoyChasingLucy = 234,
-	kGoalSteeleNR08WalkOut = 235,
-	kGoalSteeleNR10Wait = 236,
-	kGoalSteeleHF02ConfrontLucy = 240,
-	kGoalSteeleHF02ShootLucy = 241,
-	kGoalSteeleHF02LucyShotBySteele = 242,
-	kGoalSteeleHF02LucyRanAway = 243,
-	kGoalSteeleHF02LucyShotByMcCoy = 244,
-	kGoalSteeleHF02LucyLostByMcCoy = 245,
-	kGoalSteeleHFxxGoToSpinner = 246,
-	kGoalSteeleNR01ConfrontGordo = 250,
-	kGoalSteeleNR01TalkToGordo = 251,
-	kGoalSteeleNR01ShootGordo = 252,
-	kGoalSteeleNR01ShootMcCoy = 255,
-	kGoalSteeleNR01McCoyShotGordo = 258,
-	kGoalSteeleNR01McCoyShotGun = 260,
+	kGoalSteeleStartChapter3               = 205,
+	kGoalSteeleNR11StartWaiting            = 210,
+	kGoalSteeleNR11StopWaiting             = 211,
+	kGoalSteeleNR11Enter                   = 212,
+	kGoalSteeleNR11Entered                 = 213,
+	kGoalSteeleNR11Decide                  = 214,
+	kGoalSteeleNR11Shoot                   = 215,
+	kGoalSteeleNR11StopShooting            = 216,
+	kGoalSteeleNR01WaitForMcCoy            = 230,
+	kGoalSteeleNR01GoToNR08                = 231,
+	kGoalSteeleNR01GoToNR02                = 232,
+	kGoalSteeleNR01GoToHF03                = 233,
+	kGoalSteeleHF03McCoyChasingLucy        = 234,
+	kGoalSteeleNR08WalkOut                 = 235,
+	kGoalSteeleNR10Wait                    = 236,
+	kGoalSteeleHF02ConfrontLucy            = 240,
+	kGoalSteeleHF02ShootLucy               = 241,
+	kGoalSteeleHF02LucyShotBySteele        = 242,
+	kGoalSteeleHF02LucyRanAway             = 243,
+	kGoalSteeleHF02LucyShotByMcCoy         = 244,
+	kGoalSteeleHF02LucyLostByMcCoy         = 245,
+	kGoalSteeleHFxxGoToSpinner             = 246,
+	kGoalSteeleNR01ConfrontGordo           = 250,
+	kGoalSteeleNR01TalkToGordo             = 251,
+	kGoalSteeleNR01ShootGordo              = 252,
+	kGoalSteeleNR01ShootMcCoy              = 255,
+	kGoalSteeleNR01McCoyShotGordo          = 258,
+	kGoalSteeleNR01McCoyShotGun            = 260,
 	kGoalSteeleNR01PrepareTalkAboutShotGun = 261,
-	kGoalSteeleNR01TalkAboutShotGun = 262,
-	kGoalSteeleNR01ShotByMcCoy = 270,
-	kGoalSteeleNR01PrepareShotByMcCoy = 271,
-	kGoalSteeleNRxxGoToSpinner = 275,
-	kGoalSteeleTalkAboutMissingSpinner = 280,
-	kGoalSteeleImmediatelyStartChapter4 = 285,
-	kGoalSteeleNR01StartChapter4 = 290,
-	kGoalSteeleHF01StartChapter4 = 291,
+	kGoalSteeleNR01TalkAboutShotGun        = 262,
+	kGoalSteeleNR01ShotByMcCoy             = 270,
+	kGoalSteeleNR01PrepareShotByMcCoy      = 271,
+	kGoalSteeleNRxxGoToSpinner             = 275,
+	kGoalSteeleTalkAboutMissingSpinner     = 280,
+	kGoalSteeleImmediatelyStartChapter4    = 285,
+	kGoalSteeleNR01StartChapter4           = 290,
+	kGoalSteeleHF01StartChapter4           = 291,
 	// chapter 4
-	kGoalSteeleStartChapter4 = 300,
+	kGoalSteeleStartChapter4               = 300,
 	// chapter 5
-	kGoalSteeleStartChapter5 = 400,
-	kGoalSteeleHF06Attack = 402, // has no use
+	kGoalSteeleStartChapter5               = 400,
+	kGoalSteeleHF06Attack                  = 402, // has no use
 	// kGoalSteeleKP03WillShootMcCoy = 410,
-	kGoalSteeleKP03Walk = 411,
-	kGoalSteeleKP03StopWalking = 412,
-	kGoalSteeleKP03Leave = 413,
-	kGoalSteeleKP03Exploded = 415,
-	kGoalSteeleKP03Dying = 416,
-	kGoalSteeleKP03ShootMcCoy = 418,
-	kGoalSteeleKP03Dead = 419,
-	kGoalSteeleKP01Wait = 420,
-	kGoalSteeleKP01TalkToMcCoy = 421,
-	kGoalSteeleKP01Leave = 422,
-	kGoalSteeleKP01Left = 423,
-	kGoalSteeleKP05Enter = 430,
-	kGoalSteeleKP05Leave = 431,
-	kGoalSteeleKP06Enter = 432,
-	kGoalSteeleKP06Leave = 433,
-	kGoalSteeleWaitingForEnd = 499,
-	kGoalSteeleGone = 599
+	kGoalSteeleKP03Walk                    = 411,
+	kGoalSteeleKP03StopWalking             = 412,
+	kGoalSteeleKP03Leave                   = 413,
+	kGoalSteeleKP03Exploded                = 415,
+	kGoalSteeleKP03Dying                   = 416,
+	kGoalSteeleKP03ShootMcCoy              = 418,
+	kGoalSteeleKP03Dead                    = 419,
+	kGoalSteeleKP01Wait                    = 420,
+	kGoalSteeleKP01TalkToMcCoy             = 421,
+	kGoalSteeleKP01Leave                   = 422,
+	kGoalSteeleKP01Left                    = 423,
+	kGoalSteeleKP05Enter                   = 430,
+	kGoalSteeleKP05Leave                   = 431,
+	kGoalSteeleKP06Enter                   = 432,
+	kGoalSteeleKP06Leave                   = 433,
+	kGoalSteeleWaitingForEnd               = 499,
+	kGoalSteeleGone                        = 599
 };
 
 enum GoalDektora {
-	kGoalDektoraDefault = 0,
+	kGoalDektoraDefault                      =   0,
 	// chapter 1
-	kGoalDektoraStartWalkingAround = 100,
-	kGoalDektoraWalkAroundAsReplicant = 101,
-	kGoalDektoraWalkAroundAsHuman = 102,
-	kGoalDektoraStopWalkingAround = 103,
+	kGoalDektoraStartWalkingAround           = 100,
+	kGoalDektoraWalkAroundAsReplicant        = 101,
+	kGoalDektoraWalkAroundAsHuman            = 102,
+	kGoalDektoraStopWalkingAround            = 103,
 	// chapter 2
-	kGoalDektoraStartChapter3 = 199,
-	kGoalDektoraNR07Sit = 200,
-	kGoalDektoraNR08Dance = 210,
-	kGoalDektoraNR08Leave = 211,
-	kGoalDektoraNR08ReadyToRun = 245,
-	kGoalDektoraNR08GoToNR10 = 246,
-	kGoalDektoraNR10AttackMcCoy = 247,
-	kGoalDektoraNR11Hiding = 250,
-	kGoalDektoraNR11WalkAway = 260,
-	kGoalDektoraNR11PrepareBurning = 269,
-	kGoalDektoraNR11Burning = 270,
-	kGoalDektoraNR11BurningGoToMcCoy = 271,
-	kGoalDektoraNR11BurningGoToWindow = 272,
+	kGoalDektoraStartChapter3                = 199,
+	kGoalDektoraNR07Sit                      = 200,
+	kGoalDektoraNR08Dance                    = 210,
+	kGoalDektoraNR08Leave                    = 211,
+	kGoalDektoraNR08ReadyToRun               = 245,
+	kGoalDektoraNR08GoToNR10                 = 246,
+	kGoalDektoraNR10AttackMcCoy              = 247,
+	kGoalDektoraNR11Hiding                   = 250,
+	kGoalDektoraNR11WalkAway                 = 260,
+	kGoalDektoraNR11PrepareBurning           = 269,
+	kGoalDektoraNR11Burning                  = 270,
+	kGoalDektoraNR11BurningGoToMcCoy         = 271,
+	kGoalDektoraNR11BurningGoToWindow        = 272,
 	kGoalDektoraNR11PrepareFallThroughWindow = 273,
-	kGoalDektoraNR11FallThroughWindow = 274,
-	kGoalDektoraNR11BurningFallToNR10 = 279,
-	kGoalDektoraNR11RanAway = 290,
-	kGoalDektoraNR07RanAway = 295,
-	kGoalDektoraKP07Wait = 513, // new goal when in moonbus, Act 5
-	kGoalDektoraGone = 599
+	kGoalDektoraNR11FallThroughWindow        = 274,
+	kGoalDektoraNR11BurningFallToNR10        = 279,
+	kGoalDektoraNR11RanAway                  = 290,
+	kGoalDektoraNR07RanAway                  = 295,
+	kGoalDektoraKP07Wait                     = 513, // new goal when in moonbus, Act 5
+	kGoalDektoraGone                         = 599
 };
 
 enum GoalGordo {
 	// chapter 1
-	kGoalGordoDefault = 0,
-	kGoalGordoCT01Leave = 1,
-	kGoalGordoCT01Left = 2,
-	kGoalGordoCT05WalkThrough = 3,
-	kGoalGordoCT05Leave = 4,
-	kGoalGordoCT05Left = 5,
-	kGoalGordoCT01StandUp = 90,
-	kGoalGordoCT01WalkAway = 91,
-	kGoalGordoCT01BidFarewellToHowieLee = 92,
-	kGoalGordoCT01WalkToHowieLee = 93,
+	kGoalGordoDefault                   =   0,
+	kGoalGordoCT01Leave                 =   1,
+	kGoalGordoCT01Left                  =   2,
+	kGoalGordoCT05WalkThrough           =   3,
+	kGoalGordoCT05Leave                 =   4,
+	kGoalGordoCT05Left                  =   5,
+	kGoalGordoCT01StandUp               =  90,
+	kGoalGordoCT01WalkAway              =  91,
+	kGoalGordoCT01BidFarewellToHowieLee =  92,
+	kGoalGordoCT01WalkToHowieLee        =  93,
 	// chapter 2
-	kGoalGordoWalkAround = 100,
-	kGoalGordoGoToDNARow = 101,
-	kGoalGordoGoToChinaTown = 102,
-	kGoalGordoGoToFreeSlotHAGJ = 103,
-	kGoalGordoGoToFreeSlotAH = 104,
+	kGoalGordoWalkAround                = 100,
+	kGoalGordoGoToDNARow                = 101,
+	kGoalGordoGoToChinaTown             = 102,
+	kGoalGordoGoToFreeSlotHAGJ          = 103,
+	kGoalGordoGoToFreeSlotAH            = 104,
 	// chapter 3
-	kGoalGordoStartChapter3 = 200,
-	kGoalGordoNR02WaitAtBar = 201,
-	kGoalGordoNR02GoToPodium = 202,
-	kGoalGordoNR02WaitForMcCoy = 204,
-	kGoalGordoNR02NextAct = 205,
-	kGoalGordoNR02TellJoke1 = 206,
-	kGoalGordoNR02TellJoke2 = 207,
-	kGoalGordoNR02TellJoke3 = 208,
-	kGoalGordoNR02TalkAboutMcCoy = 210,
-	kGoalGordoNR02WaitAtPodium = 211,
-	kGoalGordoNR02TalkToMcCoy = 215,
-	kGoalGordoNR02RunAway1 = 220,
-	kGoalGordoNR02RunAway2 = 221,
-	kGoalGordoNR02RunAway3 = 222,
-	kGoalGordoGoToFreeSlotGAG = 225,
-	kGoalGordoNR01WaitAndAttack = 230,
-	kGoalGordoNR01Attack = 231,
-	kGoalGordoNR01WaitAndGiveUp = 240,
-	kGoalGordoNR01GiveUp = 241,
-	kGoalGordoNR01TalkToMcCoy = 242,
-	kGoalGordoNR01RunAway = 243,
-	kGoalGordoNR01WaitAndTakeHostage = 250,
-	kGoalGordoNR01ReleaseHostage = 251,
-	kGoalGordoNR01HostageShot = 254,
-	kGoalGordoNR01HostageDie = 255,
-	kGoalGordoNR01Arrested = 260,
-	kGoalGordoNR01RanAway = 280,
-	kGoalGordoNR01Die = 299,
-	kGoalGordoKP07Wait = 513, // new goal when in moonbus, Act 5
-	kGoalGordoGone = 599
+	kGoalGordoStartChapter3             = 200,
+	kGoalGordoNR02WaitAtBar             = 201,
+	kGoalGordoNR02GoToPodium            = 202,
+	kGoalGordoNR02WaitForMcCoy          = 204,
+	kGoalGordoNR02NextAct               = 205,
+	kGoalGordoNR02TellJoke1             = 206,
+	kGoalGordoNR02TellJoke2             = 207,
+	kGoalGordoNR02TellJoke3             = 208,
+	kGoalGordoNR02TalkAboutMcCoy        = 210,
+	kGoalGordoNR02WaitAtPodium          = 211,
+	kGoalGordoNR02TalkToMcCoy           = 215,
+	kGoalGordoNR02RunAway1              = 220,
+	kGoalGordoNR02RunAway2              = 221,
+	kGoalGordoNR02RunAway3              = 222,
+	kGoalGordoGoToFreeSlotGAG           = 225,
+	kGoalGordoNR01WaitAndAttack         = 230,
+	kGoalGordoNR01Attack                = 231,
+	kGoalGordoNR01WaitAndGiveUp         = 240,
+	kGoalGordoNR01GiveUp                = 241,
+	kGoalGordoNR01TalkToMcCoy           = 242,
+	kGoalGordoNR01RunAway               = 243,
+	kGoalGordoNR01WaitAndTakeHostage    = 250,
+	kGoalGordoNR01ReleaseHostage        = 251,
+	kGoalGordoNR01HostageShot           = 254,
+	kGoalGordoNR01HostageDie            = 255,
+	kGoalGordoNR01Arrested              = 260,
+	kGoalGordoNR01RanAway               = 280,
+	kGoalGordoNR01Die                   = 299,
+	kGoalGordoKP07Wait                  = 513, // new goal when in moonbus, Act 5
+	kGoalGordoGone                      = 599
 };
 
 enum GoalGuzza {
@@ -2200,127 +2200,127 @@ enum GoalGuzza {
 };
 
 enum GoalClovis {
-	kGoalClovisDefault = 100,
-	kGoalClovisBB11WalkToMcCoy = 101,
-	kGoalClovisBB11StopSadik = 102,
-	kGoalClovisBB11TalkWithSadik = 103,
-	kGoalClovisBB11PrepareTalkToMcCoy = 104, // bug? this is not triggered when player skips dialogue too fast
-	kGoalClovisBB11TalkToMcCoy = 105, // ends Chapter 2
+	kGoalClovisDefault                   = 100,
+	kGoalClovisBB11WalkToMcCoy           = 101,
+	kGoalClovisBB11StopSadik             = 102,
+	kGoalClovisBB11TalkWithSadik         = 103,
+	kGoalClovisBB11PrepareTalkToMcCoy    = 104, // bug? this is not triggered when player skips dialogue too fast
+	kGoalClovisBB11TalkToMcCoy           = 105, // ends Chapter 2
 	// chapter 4
-	kGoalClovisUG18Wait = 300,
-	kGoalClovisUG18SadikWillShootGuzza = 301,
-	kGoalClovisUG18SadikIsShootingGuzza = 302,
-	kGoalClovisUG18GuzzaDied = 303,
-	kGoalClovisUG18Leave = 310,
-	kGoalClovisStartChapter3 = 350,
-	kGoalClovisStartChapter4 = 400,
-	kGoalClovisUG07ChaseMcCoy = 401,
-	kGoalClovisUG07KillMcCoy = 402,
+	kGoalClovisUG18Wait                  = 300,
+	kGoalClovisUG18SadikWillShootGuzza   = 301,
+	kGoalClovisUG18SadikIsShootingGuzza  = 302,
+	kGoalClovisUG18GuzzaDied             = 303,
+	kGoalClovisUG18Leave                 = 310,
+	kGoalClovisStartChapter3             = 350,
+	kGoalClovisStartChapter4             = 400,
+	kGoalClovisUG07ChaseMcCoy            = 401,
+	kGoalClovisUG07KillMcCoy             = 402,
 	// chapter 5
-	kGoalClovisStartChapter5 = 500,
-	kGoalClovisDecide = 510,
-	kGoalClovisKP06Wait = 511, // this immediately reset to kGoalClovisKP07Wait by Sadik at start of chapter 5
-	kGoalClovisKP06TalkToMcCoy = 512, // never triggered
-	kGoalClovisKP07Wait = 513,
-	kGoalClovisKP07TalkToMcCoy = 514,
-	kGoalClovisKP07SayFinalWords = 515,
-	kGoalClovisKP07FlyAway = 516, // and game over
+	kGoalClovisStartChapter5             = 500,
+	kGoalClovisDecide                    = 510,
+	kGoalClovisKP06Wait                  = 511, // this immediately reset to kGoalClovisKP07Wait by Sadik at start of chapter 5
+	kGoalClovisKP06TalkToMcCoy           = 512, // never triggered
+	kGoalClovisKP07Wait                  = 513,
+	kGoalClovisKP07TalkToMcCoy           = 514,
+	kGoalClovisKP07SayFinalWords         = 515,
+	kGoalClovisKP07FlyAway               = 516, // and game over
 	kGoalClovisKP07ReplicantsAttackMcCoy = 517,
-	kGoalClovisKP07LayDown = 518,
-	kGoalClovisGone = 599
+	kGoalClovisKP07LayDown               = 518,
+	kGoalClovisGone                      = 599
 };
 
 enum GoalLucy {
-	kGoalLucyDefault = 0,
+	kGoalLucyDefault              =   0,
 	// chapter 3
-	kGoalLucyMoveAround = 200,
-	kGoalLucyWillReturnToHF03 = 201,
-	kGoalLucyGoToHF03 = 205,
-	kGoalLucyHF03RunOutPhase1 = 210,
-	kGoalLucyHF03RunOutPhase2 = 211,
-	kGoalLucyHF03RunToHF041 = 212,
-	kGoalLucyHF03RunToHF042 = 213,
+	kGoalLucyMoveAround           = 200,
+	kGoalLucyWillReturnToHF03     = 201,
+	kGoalLucyGoToHF03             = 205,
+	kGoalLucyHF03RunOutPhase1     = 210,
+	kGoalLucyHF03RunOutPhase2     = 211,
+	kGoalLucyHF03RunToHF041       = 212,
+	kGoalLucyHF03RunToHF042       = 213,
 	kGoalLucyHF03RunAwayWithHelp1 = 214,
 	kGoalLucyHF03RunAwayWithHelp2 = 215,
-	kGoalLucyGoToFreeSlotGAG = 220,
-	kGoalLucyGoToFreeSlotGAHJ = 225,
-	kGoalLucyHF04Start = 230,
-	kGoalLucyHF04TalkToMcCoy = 232,
-	kGoalLucyHF04Run1 = 233,
-	kGoalLucyHF04Run2 = 234,
-	kGoalLucyHF04WaitForMcCoy1 = 235,
-	kGoalLucyHF04Run3 = 236,
-	kGoalLucyHF04WaitForMcCoy2 = 237,
-	kGoalLucyHF04Run4 = 238,
-	kGoalLucyHF04WalkAway = 239,
-	kGoalLucyReturnToHF03 = 250,
-	kGoalLucyHF03RanAway = 299,
+	kGoalLucyGoToFreeSlotGAG      = 220,
+	kGoalLucyGoToFreeSlotGAHJ     = 225,
+	kGoalLucyHF04Start            = 230,
+	kGoalLucyHF04TalkToMcCoy      = 232,
+	kGoalLucyHF04Run1             = 233,
+	kGoalLucyHF04Run2             = 234,
+	kGoalLucyHF04WaitForMcCoy1    = 235,
+	kGoalLucyHF04Run3             = 236,
+	kGoalLucyHF04WaitForMcCoy2    = 237,
+	kGoalLucyHF04Run4             = 238,
+	kGoalLucyHF04WalkAway         = 239,
+	kGoalLucyReturnToHF03         = 250,
+	kGoalLucyHF03RanAway          = 299,
 	// chapter 4
-	kGoalLucyStartChapter4 = 300,
-	kGoalLucyUG01Wait =	310,
-	kGoalLucyUG01VoightKampff = 311,
-	kGoalLucyUG01RunAway = 312,
-	kGoalLucyKP07Wait = 513, // new goal when in moonbus, Act 5
-	kGoalLucyGone = 599
+	kGoalLucyStartChapter4        = 300,
+	kGoalLucyUG01Wait             = 310,
+	kGoalLucyUG01VoightKampff     = 311,
+	kGoalLucyUG01RunAway          = 312,
+	kGoalLucyKP07Wait             = 513, // new goal when in moonbus, Act 5
+	kGoalLucyGone                 = 599
 };
 
 enum GoalIzo {
-	kGoalIzoDefault = 0,
-	kGoalIzoPrepareCamera = 1,
-	kGoalIzoTakePhoto = 2,
-	kGoalIzoRunToUG02 = 3,
-	kGoalIzoStopRunning = 100,
-	kGoalIzoRunToRC03 = 101,
-	kGoalIzoWaitingAtRC03 = 102,
-	kGoalIzoEscape = 103, // how can this happen? can mccoy catch izo in ug02?
-	kGoalIzoRC03Walk = 110,
-	kGoalIzoRC03Run = 111,
-	kGoalIzoRC03RunAway = 114,
-	kGoalIzoGetArrested = 120,
-	kGoalIzoGotArrested = 180,
+	kGoalIzoDefault         =   0,
+	kGoalIzoPrepareCamera   =   1,
+	kGoalIzoTakePhoto       =   2,
+	kGoalIzoRunToUG02       =   3,
+	kGoalIzoStopRunning     = 100,
+	kGoalIzoRunToRC03       = 101,
+	kGoalIzoWaitingAtRC03   = 102,
+	kGoalIzoEscape          = 103, // how can this happen? can mccoy catch izo in ug02?
+	kGoalIzoRC03Walk        = 110,
+	kGoalIzoRC03Run         = 111,
+	kGoalIzoRC03RunAway     = 114,
+	kGoalIzoGetArrested     = 120,
+	kGoalIzoGotArrested     = 180,
 	kGoalIzoRC03RanAwayDone = 181, // new - added for bug fix of Izo getting stuck at RC03
-	kGoalIzoGoToHC01 = 150,
-	kGoalIzoGoToHC03 = 155,
-	kGoalIzoDieHidden = 198,
-	kGoalIzoDie = 199,
-	kGoalIzoKP07Wait = 513, // new goal when in moonbus, Act 5
-	kGoalIzoGone = 599
+	kGoalIzoGoToHC01        = 150,
+	kGoalIzoGoToHC03        = 155,
+	kGoalIzoDieHidden       = 198,
+	kGoalIzoDie             = 199,
+	kGoalIzoKP07Wait        = 513, // new goal when in moonbus, Act 5
+	kGoalIzoGone            = 599
 };
 
 enum GoalSadik {
-	kGoalSadikDefault = 100,
-	kGoalSadikRunFromBB09 = 101,
-	kGoalSadikBB11Wait = 102,
-	kGoalSadikBB11ThrowMcCoy = 103,
-	kGoalSadikBB11CatchMcCoy = 104,
-	kGoalSadikBB11KnockOutMcCoy = 105,
-	kGoalSadikBB11KickMcCoy = 106,
-	kGoalSadikBB11TalkWithClovis = 107,
-	kGoalSadikUG18Wait = 300,
-	kGoalSadikUG18Move = 301,
-	kGoalSadikUG18Decide = 302,
+	kGoalSadikDefault                       = 100,
+	kGoalSadikRunFromBB09                   = 101,
+	kGoalSadikBB11Wait                      = 102,
+	kGoalSadikBB11ThrowMcCoy                = 103,
+	kGoalSadikBB11CatchMcCoy                = 104,
+	kGoalSadikBB11KnockOutMcCoy             = 105,
+	kGoalSadikBB11KickMcCoy                 = 106,
+	kGoalSadikBB11TalkWithClovis            = 107,
+	kGoalSadikUG18Wait                      = 300,
+	kGoalSadikUG18Move                      = 301,
+	kGoalSadikUG18Decide                    = 302,
 	// 303, 304 and 305 are never set or used
-	kGoalSadikUG18WillShootMcCoy = 306,
-	kGoalSadikUG18PrepareShootMcCoy = 307,
-	kGoalSadikUG18ShootMcCoy = 308,
-	kGoalSadikUG18Leave = 310,
+	kGoalSadikUG18WillShootMcCoy            = 306,
+	kGoalSadikUG18PrepareShootMcCoy         = 307,
+	kGoalSadikUG18ShootMcCoy                = 308,
+	kGoalSadikUG18Leave                     = 310,
 	kGoalSadikKP06NeedsReactorCoreFromMcCoy = 416,
-	kGoalSadikGone = 599
+	kGoalSadikGone                          = 599
 };
 
 enum GoalLuther {
-	kGoalLutherDefault = 400,
-	kGoalLutherMoveAround = 401,
+	kGoalLutherDefault           = 400,
+	kGoalLutherMoveAround        = 401,
 	kGoalLutherMoveAroundRestart = 402,
-	kGoalLutherStop = 403,
-	kGoalLutherShot = 494,
-	kGoalLutherDyingStarted = 495,
-	kGoalLutherDyingWait = 496,
-	kGoalLutherDyingCheck = 497,
-	kGoalLutherDie = 498,
-	kGoalLutherDead = 499,
-	kGoalLutherKP07Wait = 513, // new goal when in moonbus, Act 5
-	kGoalLutherGone = 599
+	kGoalLutherStop              = 403,
+	kGoalLutherShot              = 494,
+	kGoalLutherDyingStarted      = 495,
+	kGoalLutherDyingWait         = 496,
+	kGoalLutherDyingCheck        = 497,
+	kGoalLutherDie               = 498,
+	kGoalLutherDead              = 499,
+	kGoalLutherKP07Wait          = 513, // new goal when in moonbus, Act 5
+	kGoalLutherGone              = 599
 };
 
 enum GoalHowieLee {
@@ -2336,24 +2336,24 @@ enum GoalHowieLee {
 };
 
 enum GoalTransient {
-	kGoalTransientDefault = 0,
+	kGoalTransientDefault   = 0,
 	kGoalTransientCT04Leave = 2
 };
 
 enum GoalBulletBob {
-	kGoalBulletBobDefault = 0,
-	kGoalBulletBobWarningMcCoy = 1,
-	kGoalBulletBobShootMcCoy = 2,
-	kGoalBulletBobWillShotMcCoy = 3, // has no use
-	kGoalBulletBobDead = 4,
-	kGoalBulletBobShotMcCoy = 6,
-	kGoalBulletBobGone = 99
+	kGoalBulletBobDefault       =  0,
+	kGoalBulletBobWarningMcCoy  =  1,
+	kGoalBulletBobShootMcCoy    =  2,
+	kGoalBulletBobWillShotMcCoy =  3, // has no use
+	kGoalBulletBobDead          =  4,
+	kGoalBulletBobShotMcCoy     =  6,
+	kGoalBulletBobGone          = 99
 };
 
 // applies to all generic walkers
 enum GoalGenericWalker {
-	kGoalGenwalkerDefault = 0, // setup walker model and path
-	kGoalGenwalkerMoving = 1,
+	kGoalGenwalkerDefault             =   0, // setup walker model and path
+	kGoalGenwalkerMoving              =   1,
 	kGoalGenwalkerABulletBobsTrackGun = 200  // only kActorGenWalkerA will change goal to this
 };
 
@@ -2378,270 +2378,282 @@ enum GoalRachael {
 };
 
 enum GoalRunciter {
-	kGoalRunciterDefault = 0,
-	kGoalRunciterRC02WalkAround = 1,
-	kGoalRunciterGoToFreeSlotGH = 2,
-	kGoalRunciterRC02Wait = 300,
-	kGoalRunciterDead = 599
+	kGoalRunciterDefault        =   0,
+	kGoalRunciterRC02WalkAround =   1,
+	kGoalRunciterGoToFreeSlotGH =   2,
+	kGoalRunciterRC02Wait       = 300,
+	kGoalRunciterDead           = 599
 };
 
 enum GoalTyrellGuard {
-	kGoalTyrellGuardSleeping = 300,
+	kGoalTyrellGuardSleeping             = 300,
 	kGoalTyrellGuardWakeUpAndArrestMcCoy = 301,
-	kGoalTyrellGuardWakeUp = 302,
-	kGoalTyrellGuardArrestMcCoy = 303,
-	kGoalTyrellGuardWait = 304
+	kGoalTyrellGuardWakeUp               = 302,
+	kGoalTyrellGuardArrestMcCoy          = 303,
+	kGoalTyrellGuardWait                 = 304
 };
 
 enum GoalEarlyQ {
 	// cut feature? goals 0 - 200 has no use as EarlyQ is walking around NR which is not accessible
-	kGoalEarlyQWalkAround = 200,
-	kGoalEarlyQNR04Enter = 201,
-	kGoalEarlyQNR04Talk1 = 202,
-	kGoalEarlyQNR04GoToBar = 203,
-	kGoalEarlyQNR04PourDrink = 204,
-	kGoalEarlyQNR04GoToMcCoy = 205,
-	kGoalEarlyQNR04McCoyPulledGun = 206,
-	kGoalEarlyQNR04SitDown = 207,
-	kGoalEarlyQNR04ScorpionsCheck = 208,
-	kGoalEarlyQNR04Talk2 = 209,
+	kGoalEarlyQWalkAround           = 200,
+	kGoalEarlyQNR04Enter            = 201,
+	kGoalEarlyQNR04Talk1            = 202,
+	kGoalEarlyQNR04GoToBar          = 203,
+	kGoalEarlyQNR04PourDrink        = 204,
+	kGoalEarlyQNR04GoToMcCoy        = 205,
+	kGoalEarlyQNR04McCoyPulledGun   = 206,
+	kGoalEarlyQNR04SitDown          = 207,
+	kGoalEarlyQNR04ScorpionsCheck   = 208,
+	kGoalEarlyQNR04Talk2            = 209,
 	kGoalEarlyQNR04StungByScorpions = 210,
 	kGoalEarlyQNR04WaitForPulledGun = 211,
-	kGoalEarlyQNR04TakeDisk = 212,
-	kGoalEarlyQNR04Talk3 = 213,
-	kGoalEarlyQNR04AskForDisk = 214,
-	kGoalEarlyQNR04HandDrink = 215,
-	kGoalEarlyQNR04GetShot = 216,
-	kGoalEarlyQNR04Leave = 217,
-	kGoalEarlyQNR05Wait = 220,
-	kGoalEarlyQNR05WillLeave = 221,
-	kGoalEarlyQNR05Leave = 222,
-	kGoalEarlyQNR05AnnouceDektora = 223,
-	kGoalEarlyQNR05UnlockNR08 = 224,
-	kGoalEarlyQNR05UnlockedNR08 = 225,
-	kGoalEarlyQNR05TalkingToMcCoy = 229,
-	kGoalEarlyQNR04Wait = 230
+	kGoalEarlyQNR04TakeDisk         = 212,
+	kGoalEarlyQNR04Talk3            = 213,
+	kGoalEarlyQNR04AskForDisk       = 214,
+	kGoalEarlyQNR04HandDrink        = 215,
+	kGoalEarlyQNR04GetShot          = 216,
+	kGoalEarlyQNR04Leave            = 217,
+	kGoalEarlyQNR05Wait             = 220,
+	kGoalEarlyQNR05WillLeave        = 221,
+	kGoalEarlyQNR05Leave            = 222,
+	kGoalEarlyQNR05AnnouceDektora   = 223,
+	kGoalEarlyQNR05UnlockNR08       = 224,
+	kGoalEarlyQNR05UnlockedNR08     = 225,
+	kGoalEarlyQNR05TalkingToMcCoy   = 229,
+	kGoalEarlyQNR04Wait             = 230
 };
 
 enum GoalZuben {
-	kGoalZubenDefault = 0,
-	kGoalZubenCT01WalkToCT02 = 1,
-	kGoalZubenCT02RunToFreeSlotG = 2,
-	kGoalZubenCT07Spared = 4,
-	kGoalZubenCT07RunToFreeSlotA = 5,
-	kGoalZubenDie = 6,
-	kGoalZubenSpared = 7,
-	kGoalZubenCT02PushPot = 8,
-	kGoalZubenCT02RunToDoor = 9,
-	kGoalZubenCT02OpenDoor = 10,
-	kGoalZubenCT06JumpDown = 11,
-	kGoalZubenCT06AttackMcCoy = 12,
-	kGoalZubenCT06HideAtFreeSlotA = 13,
-	kGoalZubenCT02PotDodgeCheck = 14,
-	kGoalZubenFled = 20,
-	kGoalZubenMA01AttackMcCoy = 21,
-	kGoalZubenDiesInChapter1 = 99,
-	kGoalZubenKP07Wait = 513, // new goal when in moonbus, Act 5
-	kGoalZubenGone = 599
+	kGoalZubenDefault             =   0,
+	kGoalZubenCT01WalkToCT02      =   1,
+	kGoalZubenCT02RunToFreeSlotG  =   2,
+	kGoalZubenCT07Spared          =   4,
+	kGoalZubenCT07RunToFreeSlotA  =   5,
+	kGoalZubenDie                 =   6,
+	kGoalZubenSpared              =   7,
+	kGoalZubenCT02PushPot         =   8,
+	kGoalZubenCT02RunToDoor       =   9,
+	kGoalZubenCT02OpenDoor        =  10,
+	kGoalZubenCT06JumpDown        =  11,
+	kGoalZubenCT06AttackMcCoy     =  12,
+	kGoalZubenCT06HideAtFreeSlotA =  13,
+	kGoalZubenCT02PotDodgeCheck   =  14,
+	kGoalZubenFled                =  20,
+	kGoalZubenMA01AttackMcCoy     =  21,
+	kGoalZubenDiesInChapter1      =  99,
+	kGoalZubenKP07Wait            = 513, // new goal when in moonbus, Act 5
+	kGoalZubenGone                = 599
 };
 
 enum GoalOfficerLeary {
-	kGoalOfficerLearyDefault = 0,
-	kGoalOfficerLearyRC01WalkToCrowd = 1,
+	kGoalOfficerLearyDefault                          =   0,
+	kGoalOfficerLearyRC01WalkToCrowd                  =   1,
 #if BLADERUNNER_ORIGINAL_BUGS
-	kGoalOfficerLearyRC01CrowdInterrogation = 2,
+	kGoalOfficerLearyRC01CrowdInterrogation           =   2,
 #else
-	kGoalOfficerLearyRC01CrowdInterrogation = 2,
-	kGoalOfficerLearyRC01ResumeWalkToCrowd = 4, // added OfficerLeary goal
+	kGoalOfficerLearyRC01CrowdInterrogation           =   2,
+	kGoalOfficerLearyRC01ResumeWalkToCrowd            =   4, // added OfficerLeary goal
 #endif // BLADERUNNER_ORIGINAL_BUGS
-	kGoalOfficerLearyPoliceDoneFromRC01 = 3,
-	kGoalOfficerLearyEndOfAct1 = 99,
-	kGoalOfficerLearyVisitsBulletBob = 102, // un-triggered
-	kGoalOfficerLearyStartOfAct4 = 300,
-	kGoalOfficerLearyHuntingAroundAct4 = 305,
-	kGoalOfficerLearyPrepareToHuntAroundAct4 = 306,
-	kGoalOfficerLearyBlockingUG07 = 307,
+	kGoalOfficerLearyPoliceDoneFromRC01               =   3,
+	kGoalOfficerLearyEndOfAct1                        =  99,
+	kGoalOfficerLearyVisitsBulletBob                  = 102, // un-triggered
+	kGoalOfficerLearyStartOfAct4                      = 300,
+	kGoalOfficerLearyHuntingAroundAct4                = 305,
+	kGoalOfficerLearyPrepareToHuntAroundAct4          = 306,
+	kGoalOfficerLearyBlockingUG07                     = 307,
 	// 308 - 309 un-triggered?
-	kGoalOfficerLearyAttackMcCoyAct4 = 310,
-	kGoalOfficerLearyStartOfAct5 = 400,
-	kGoalOfficerLearyDummyGoalAct5 = 410,
+	kGoalOfficerLearyAttackMcCoyAct4                  = 310,
+	kGoalOfficerLearyStartOfAct5                      = 400,
+	kGoalOfficerLearyDummyGoalAct5                    = 410,
 	kGoalOfficerLearyPoliceWait120SecondsToAttackHF05 = 420,
-	kGoalOfficerLearyPoliceWait60SecondsToAttackHF05 = 425,
-	kGoalOfficerLearyPoliceAboutToAttackHF05 = 430,
-	kGoalOfficerLearyDead = 599
+	kGoalOfficerLearyPoliceWait60SecondsToAttackHF05  = 425,
+	kGoalOfficerLearyPoliceAboutToAttackHF05          = 430,
+	kGoalOfficerLearyDead                             = 599
 };
 
 
 enum GoalOfficerGrayford {
-	kGoalOfficerGrayfordDefault = 0,
-	kGoalOfficerGrayfordWalksInPS03a = 1,
-	kGoalOfficerGrayfordWalksInPS03b = 2,
-	kGoalOfficerGrayfordWalksInPS03c = 3,
-	kGoalOfficerGrayfordWalksInPS03d = 4,
-	kGoalOfficerGrayfordWalksInFreeSlotC = 5,
-	kGoalOfficerGrayfordWalksInPS09a = 6,
-	kGoalOfficerGrayfordWalksInPS09b = 7,
-	kGoalOfficerGrayfordWalksInPS09c = 8,
-	kGoalOfficerGrayfordWalksInPS03e = 9,
-	kGoalOfficerGrayfordPrepareToRestartWalkAround = 10,
-	kGoalOfficerGrayfordStopAndTalk1 = 99, // this is used temporarily to make him stop and talk
-	kGoalOfficerGrayfordArrivesToDR04 = 101,
-	kGoalOfficerGrayfordArrivedAtDR04 = 102,
-	kGoalOfficerGrayfordTalkToMcCoyAndReportAtDR04 = 103,
-	kGoalOfficerGrayfordPatrolsAtDR04a = 104,
-	kGoalOfficerGrayfordPatrolsAtDR04b = 105,
+	kGoalOfficerGrayfordDefault                       =   0,
+	kGoalOfficerGrayfordWalksInPS03a                  =   1,
+	kGoalOfficerGrayfordWalksInPS03b                  =   2,
+	kGoalOfficerGrayfordWalksInPS03c                  =   3,
+	kGoalOfficerGrayfordWalksInPS03d                  =   4,
+	kGoalOfficerGrayfordWalksInFreeSlotC              =   5,
+	kGoalOfficerGrayfordWalksInPS09a                  =   6,
+	kGoalOfficerGrayfordWalksInPS09b                  =   7,
+	kGoalOfficerGrayfordWalksInPS09c                  =   8,
+	kGoalOfficerGrayfordWalksInPS03e                  =   9,
+	kGoalOfficerGrayfordPrepareToRestartWalkAround    =  10,
+	kGoalOfficerGrayfordStopAndTalk1                  =  99, // this is used temporarily to make him stop and talk
+	kGoalOfficerGrayfordArrivesToDR04                 = 101,
+	kGoalOfficerGrayfordArrivedAtDR04                 = 102,
+	kGoalOfficerGrayfordTalkToMcCoyAndReportAtDR04    = 103,
+	kGoalOfficerGrayfordPatrolsAtDR04a                = 104,
+	kGoalOfficerGrayfordPatrolsAtDR04b                = 105,
 	kGoalOfficerGrayfordStopPatrolToTalkToMcCoyAtDR04 = 106,
-	kGoalOfficerGrayfordLeavesWithMorajiCorpseDR04 = 110,
-	kGoalOfficerGrayfordArrestMcCoyInTB03Act4 = 399, // TB02_TB03
-	kGoalOfficerGrayfordStopAndTalkDR04 = 199, // this is used temporarily to make him stop and talk while at DR04 (Moraji's death scene)
-	kGoalOfficerGrayfordStartOfAct4 = 300,
-	kGoalOfficerGrayfordHuntingAroundAct4 = 305,
-	kGoalOfficerGrayfordPrepareToHuntAroundAct4 = 306,
-	kGoalOfficerGrayfordBlockingUG07 = 307,
-	kGoalOfficerGrayfordArrestsMcCoyAct4CT12 = 308,
-	kGoalOfficerGrayfordAttackMcCoyAct4 = 310,
-	kGoalOfficerGrayfordStartOfAct5 = 400,
-	kGoalOfficerGrayfordDummyGoalAct5 = 410,
-	kGoalOfficerGrayfordPoliceAboutToAttackHF05 = 430,
-	kGoalOfficerGrayfordDead = 599
+	kGoalOfficerGrayfordLeavesWithMorajiCorpseDR04    = 110,
+	kGoalOfficerGrayfordStopAndTalkDR04               = 199, // this is used temporarily to make him stop and talk while at DR04 (Moraji's death scene)
+	kGoalOfficerGrayfordStartOfAct4                   = 300,
+	kGoalOfficerGrayfordHuntingAroundAct4             = 305,
+	kGoalOfficerGrayfordPrepareToHuntAroundAct4       = 306,
+	kGoalOfficerGrayfordBlockingUG07                  = 307,
+	kGoalOfficerGrayfordArrestsMcCoyAct4CT12          = 308,
+	kGoalOfficerGrayfordAttackMcCoyAct4               = 310,
+	kGoalOfficerGrayfordArrestMcCoyInTB03Act4         = 399, // TB02_TB03
+	kGoalOfficerGrayfordStartOfAct5                   = 400,
+	kGoalOfficerGrayfordDummyGoalAct5                 = 410,
+	kGoalOfficerGrayfordPoliceAboutToAttackHF05       = 430,
+	kGoalOfficerGrayfordDead                          = 599
 };
 
 enum GoalHanoi {
-	kGoalHanoiDefault = 200,
-	kGoalHanoiResetTimer = 201,
-	kGoalHanoiNR07TalkToMcCoy = 202,
-	kGoalHanoiNR07GrabMcCoy = 203,
+	kGoalHanoiDefault                 = 200,
+	kGoalHanoiResetTimer              = 201,
+	kGoalHanoiNR07TalkToMcCoy         = 202,
+	kGoalHanoiNR07GrabMcCoy           = 203,
 	kGoalHanoiNR03GoToDefaultPosition = 210,
-	kGoalHanoiNR03GoToSwivelTable = 211,
-	kGoalHanoiNR03GoToOfficeDoor = 212,
-	kGoalHanoiNR03GoToDancer = 213,
-	kGoalHanoiNR03StartGuarding = 215,
-	kGoalHanoiThrowOutMcCoy = 220,
-	kGoalHanoiNR08WatchShow = 230,
-	kGoalHanoiNR08Leave = 235,
-	kGoalHanoiNR08Left = 236,
-	kGoalHanoiNR04Enter = 240,
-	kGoalHanoiNR04ShootMcCoy = 241
+	kGoalHanoiNR03GoToSwivelTable     = 211,
+	kGoalHanoiNR03GoToOfficeDoor      = 212,
+	kGoalHanoiNR03GoToDancer          = 213,
+	kGoalHanoiNR03StartGuarding       = 215,
+	kGoalHanoiThrowOutMcCoy           = 220,
+	kGoalHanoiNR08WatchShow           = 230,
+	kGoalHanoiNR08Leave               = 235,
+	kGoalHanoiNR08Left                = 236,
+	kGoalHanoiNR04Enter               = 240,
+	kGoalHanoiNR04ShootMcCoy          = 241
 };
 
 enum GoalDeskClerk {
-	kGoalDeskClerkDefault = 0,
-	kGoalDeskClerkKnockedOut = 1,
-	kGoalDeskClerkRecovered = 2,
-	kGoalDeskClerkGone = 400
+	kGoalDeskClerkDefault           =   0,
+	kGoalDeskClerkKnockedOut        =   1,
+	kGoalDeskClerkRecovered         =   2,
+	kGoalDeskClerkGone              = 400
+};
+
+enum GoalKlein {
+	kGoalKleinDefault               =   0,
+	kGoalKleinMovingInLab01         =   1,
+	kGoalKleinMovingInLab02         =   2,
+	kGoalKleinGotoLabSpeaker        =   3,
+	kGoalKleinIsAnnoyedByMcCoyInit  =   4,
+	kGoalKleinIsAnnoyedByMcCoy01    =   5,
+	kGoalKleinIsAnnoyedByMcCoy02    =   6,
+	kGoalKleinIsAnnoyedByMcCoyFinal =   7,
+	kGoalKleinAwayAtEndOfActOne     = 100
 };
 
 enum GoalHolloway {
-	kGoalHollowayDefault = 0,
-	kGoalHollowayGoToNR07 = 240,
-	kGoalHollowayGoToNR02 = 241,
-	kGoalHollowayGoToHF03 = 242,
-	kGoalHollowayApproachMcCoy = 250,
-	kGoalHollowayTalkToMcCoy = 251,
-	kGoalHollowayKnockOutMcCoy = 255,
+	kGoalHollowayDefault             =   0,
+	kGoalHollowayGoToNR07            = 240,
+	kGoalHollowayGoToNR02            = 241,
+	kGoalHollowayGoToHF03            = 242,
+	kGoalHollowayApproachMcCoy       = 250,
+	kGoalHollowayTalkToMcCoy         = 251,
+	kGoalHollowayKnockOutMcCoy       = 255,
 	kGoalHollowayPrepareCaptureMcCoy = 256,
-	kGoalHollowayCaptureMcCoy = 257
+	kGoalHollowayCaptureMcCoy        = 257
 };
 
 enum GoalMoraji {
-	kGoalMorajiDefault = 0,
-	kGoalMorajiShot = 5,
-	kGoalMorajiFreed = 10,
-	kGoalMorajiRunOut = 11,
-	kGoalMorajiGetUp = 18,
-	kGoalMorajiScream = 19,
-	kGoalMorajiJump = 20,
-	kGoalMorajiLayDown = 21,
-	kGoalMorajiDie = 22,
-	kGoalMorajiDead = 23,
+	kGoalMorajiDefault    =  0,
+	kGoalMorajiShot       =  5,
+	kGoalMorajiFreed      = 10,
+	kGoalMorajiRunOut     = 11,
+	kGoalMorajiGetUp      = 18,
+	kGoalMorajiScream     = 19,
+	kGoalMorajiJump       = 20,
+	kGoalMorajiLayDown    = 21,
+	kGoalMorajiDie        = 22,
+	kGoalMorajiDead       = 23,
 	kGoalMorajiChooseFate = 30,
-	kGoalMorajiPerished = 99
+	kGoalMorajiPerished   = 99
 };
 
 enum GoalGaff {
-	kGoalGaffDefault = 0,
-	kGoalGaffCT12WaitForMcCoy = 1,
-	kGoalGaffCT12GoToSpinner = 2,
-	kGoalGaffMA01ApproachMcCoy = 3,
-	kGoalGaffMA01Leave = 4,
-	kGoalGaffCT12Leave = 5,
-	kGoalGaffCT12FlyAway = 10,
-	kGoalGaffStartWalkingAround = 100,
-	kGoalGaffWalkAround = 101,
+	kGoalGaffDefault             =   0,
+	kGoalGaffCT12WaitForMcCoy    =   1,
+	kGoalGaffCT12GoToSpinner     =   2,
+	kGoalGaffMA01ApproachMcCoy   =   3,
+	kGoalGaffMA01Leave           =   4,
+	kGoalGaffCT12Leave           =   5,
+	kGoalGaffCT12FlyAway         =  10,
+	kGoalGaffStartWalkingAround  = 100,
+	kGoalGaffWalkAround          = 101,
 	kGoalGaffRepeatWalkingAround = 102,
-	kGoalGaffStartChapter4 = 299,
-	kGoalGaffMA07Wait = 300,
-	kGoalGaffMA07TalkToMcCoy = 301,
-	kGoalGaffMA07Left = 302,
-	kGoalGaffMA07ShootMcCoy = 303, // cannot be triggered
-	kGoalGaffGone = 499
+	kGoalGaffStartChapter4       = 299,
+	kGoalGaffMA07Wait            = 300,
+	kGoalGaffMA07TalkToMcCoy     = 301,
+	kGoalGaffMA07Left            = 302,
+	kGoalGaffMA07ShootMcCoy      = 303, // cannot be triggered
+	kGoalGaffGone                = 499
 };
 
 enum GoalLeon {
-	kGoalLeonDefault = 0,
-	kGoalLeonHoldingDeskClerk = 1,
-	kGoalLeonReleaseDeskClerk = 2,
+	kGoalLeonDefault            = 0,
+	kGoalLeonHoldingDeskClerk   = 1,
+	kGoalLeonReleaseDeskClerk   = 2,
 	kGoalLeonPrepareTalkToMcCoy = 3,
-	kGoalLeonTalkToMcCoy = 4,
-	kGoalLeonApproachMcCoy = 5, // there is no way how to trigger this path in the game
-	kGoalLeonPunchMcCoy = 6, // there is no way how to trigger this path in the game
-	kGoalLeonLeave = 7,
-	kGoalLeonGone = 8
+	kGoalLeonTalkToMcCoy        = 4,
+	kGoalLeonApproachMcCoy      = 5, // there is no way how to trigger this path in the game
+	kGoalLeonPunchMcCoy         = 6, // there is no way how to trigger this path in the game
+	kGoalLeonLeave              = 7,
+	kGoalLeonGone               = 8
 };
 
 enum GoalCrazyLegs {
-	kGoalCrazyLegsDefault = 0,
-	kGoalCrazyLegsShotAndHit = 1,
-	kGoalCrazyLegsLeavesShowroom = 2, // set either after McCoy re-holsters his gun, or if McCoy tells him to lie to Steele
+	kGoalCrazyLegsDefault         =   0,
+	kGoalCrazyLegsShotAndHit      =   1,
+	kGoalCrazyLegsLeavesShowroom  =   2, // set either after McCoy re-holsters his gun, or if McCoy tells him to lie to Steele
 	// goal 10 seems unused
 	// goal 10 updates to 11 (also unused)
 	kGoalCrazyLegsMcCoyDrewHisGun = 210, // When McCoy draws gun and Ch < 5
-	kGoalCrazyLegsIsArrested = 699
+	kGoalCrazyLegsIsArrested      = 699
 };
 
 enum GoalFreeSlotA { // Rat A
-	kGoalFreeSlotADefault = 0,
-	kGoalFreeSlotAUG15Wait = 300,
-	kGoalFreeSlotAUG15WalkOut = 301,
+	kGoalFreeSlotADefault            =   0,
+	kGoalFreeSlotAUG15Wait           = 300,
+	kGoalFreeSlotAUG15WalkOut        = 301,
 	kGoalFreeSlotAUG15RunToOtherSide = 302,
-	kGoalFreeSlotAUG15RunBack = 303,
-	kGoalFreeSlotAUG15Attack = 304,
-	kGoalFreeSlotAWalkAround = 306,
-	kGoalFreeSlotAWalkAroundRestart = 307,
-	kGoalFreeSlotAAttackMcCoy = 308,
-	kGoalFreeSlotAUG15Die = 305,
-	kGoalFreeSlotAUG15Fall = 309,
-	kGoalFreeSlotAUG15Prepare = 310,
-	kGoalFreeSlotAAct5Default = 400,
-	kGoalFreeSlotAAct5Prepare = 405,
-	kGoalFreeSlotAAct5KP02Attack = 406,
-	kGoalFreeSlotAGone = 599
+	kGoalFreeSlotAUG15RunBack        = 303,
+	kGoalFreeSlotAUG15Attack         = 304,
+	kGoalFreeSlotAWalkAround         = 306,
+	kGoalFreeSlotAWalkAroundRestart  = 307,
+	kGoalFreeSlotAAttackMcCoy        = 308,
+	kGoalFreeSlotAUG15Die            = 305,
+	kGoalFreeSlotAUG15Fall           = 309,
+	kGoalFreeSlotAUG15Prepare        = 310,
+	kGoalFreeSlotAAct5Default        = 400,
+	kGoalFreeSlotAAct5Prepare        = 405,
+	kGoalFreeSlotAAct5KP02Attack     = 406,
+	kGoalFreeSlotAGone               = 599
 };
 
 enum GoalFreeSlotB { // Rat B
-	kGoalFreeSlotBAct4Default = 300,
-	kGoalFreeSlotBAct4WalkAround = 301,
+	kGoalFreeSlotBAct4Default     = 300,
+	kGoalFreeSlotBAct4WalkAround  = 301,
 	kGoalFreeSlotBAct4AttackMcCoy = 302,
-	kGoalFreeSlotBAct5Default = 400,
-	kGoalFreeSlotBAct5Prepare = 405,
-	kGoalFreeSlotBAct5KP02Attack = 406,
-	kGoalFreeSlotBGone = 599
+	kGoalFreeSlotBAct5Default     = 400,
+	kGoalFreeSlotBAct5Prepare     = 405,
+	kGoalFreeSlotBAct5KP02Attack  = 406,
+	kGoalFreeSlotBGone            = 599
 };
 
 enum GoalMaggie {
-	kGoalMaggieMA02Default = 0,
-	kGoalMaggieMA02WalkToEntrance = 1,
-	kGoalMaggieMA02GetFed = 3,
-	kGoalMaggieMA02WalkToMcCoy = 7,
-	kGoalMaggieMA02Wait = 8,
-	kGoalMaggieMA02SitDown = 10, // not used
-	kGoalMaggieMA02Sleep = 11, // not used
-	kGoalMaggieKP05Wait = 411,
-	kGoalMaggieKP05McCoyEntred = 412,
-	kGoalMaggieKP05WalkToMcCoy = 413,
-	kGoalMaggieKP05WillExplode = 414,
-	kGoalMaggieKP05Explode = 415,
-	kGoalMaggieDead = 599
+	kGoalMaggieMA02Default        =   0,
+	kGoalMaggieMA02WalkToEntrance =   1,
+	kGoalMaggieMA02GetFed         =   3,
+	kGoalMaggieMA02WalkToMcCoy    =   7,
+	kGoalMaggieMA02Wait           =   8,
+	kGoalMaggieMA02SitDown        =  10, // not used
+	kGoalMaggieMA02Sleep          =  11, // not used
+	kGoalMaggieKP05Wait           = 411,
+	kGoalMaggieKP05McCoyEntred    = 412,
+	kGoalMaggieKP05WalkToMcCoy    = 413,
+	kGoalMaggieKP05WillExplode    = 414,
+	kGoalMaggieKP05Explode        = 415,
+	kGoalMaggieDead               = 599
 };
 
 enum ActorTimers {
@@ -2658,16 +2670,16 @@ enum ActorTimers {
 // Those are noted with their "official" name in a side-comment here, as they appear at the website
 // A few may not match the incremental number given in-game (eg kMusicGothic3 is "Gothic Club 2")
 enum MusicTracks {
-	kMusicArabLoop = 0,  // Animoid Row track     (Not available at Frank Klepacki's website/portfolio for Blade Runner)
-	kMusicBatl226M = 1,  // "Battle Theme"
-	kMusicBRBlues  = 2,  // "Blade Runner Blues"
-	kMusicKyoto    = 3,  // "Etsuko Theme"
-	kMusicOneTime  = 4,  // "One More Time, Love" (Not available at Frank Klepacki's website/portfolio for Blade Runner)
-	kMusicGothic3  = 5,  // "Gothic Club 2"
-	kMusicArkdFly1 = 6,
-	kMusicArkDnce1 = 7,
-	kMusicTaffy2   = 8,  // "Taffy's Club 2"
-	kMusicTaffy3   = 9,
+	kMusicArabLoop =  0, // Animoid Row track     (Not available at Frank Klepacki's website/portfolio for Blade Runner)
+	kMusicBatl226M =  1, // "Battle Theme"
+	kMusicBRBlues  =  2, // "Blade Runner Blues"
+	kMusicKyoto    =  3, // "Etsuko Theme"
+	kMusicOneTime  =  4, // "One More Time, Love" (Not available at Frank Klepacki's website/portfolio for Blade Runner)
+	kMusicGothic3  =  5, // "Gothic Club 2"
+	kMusicArkdFly1 =  6,
+	kMusicArkDnce1 =  7,
+	kMusicTaffy2   =  8, // "Taffy's Club 2"
+	kMusicTaffy3   =  9,
 	kMusicTaffy4   = 10,
 	kMusicBeating1 = 11,
 	kMusicCrysDie1 = 12,
@@ -2683,106 +2695,106 @@ enum MusicTracks {
 };
 
 enum SFXSounds {
-	kSfxCROSLOCK = 0,
-	kSfxSTEAM1   = 1,
-	kSfxSPINNY1  = 2,
-	kSfxFEMHURT1 = 3,    // used only 3 times; 2 of them are bugs
-	kSfxFEMHURT2 = 4,
-	kSfxGUNMISS1 = 5,    // unused
-	kSfxGUNMISS2 = 6,    // unused
-	kSfxGUNMISS3 = 7,    // unused
-	kSfxGUNMISS4 = 8,    // unused
-	kSfxHITTARG1 = 9,    // unused
-	kSfxHITTARG2 = 10,   // unused
-	kSfxHITTARG3 = 11,   // unused
-	kSfxLGCAL1   = 12,
-	kSfxLGCAL2   = 13,   // used only twice
-	kSfxLGCAL3   = 14,
-	kSfxMDCAL1   = 15,   // unused
-	kSfxMDCAL2   = 16,   // unused
-	kSfxRICO1    = 17,   // unused
-	kSfxRICO2    = 18,   // unused
-	kSfxRICO3    = 19,   // used only once
-	kSfxRICOCHT1 = 20,   // unused
-	kSfxRICOCHT2 = 21,   // unused
-	kSfxRICOCHT3 = 22,   // unused
-	kSfxRICOCHT4 = 23,   // unused
-	kSfxRICOCHT5 = 24,   // unused
-	kSfxSMCAL1   = 25,   // unused
-	kSfxSMCAL2   = 26,   // unused
-	kSfxSMCAL3   = 27,
-	kSfxSMCAL4   = 28,   // unused
-	kSfxTARGUP1  = 29,
-	kSfxTARGUP2  = 30,   // unused
-	kSfxTARGUP3  = 31,   // used only once
-	kSfxTARGUP4  = 32,
-	kSfxTARGUP5  = 33,
-	kSfxTARGUP6  = 34,
-	kSfxTARGUP7  = 35,   // unused
-	kSfxTRGSPIN1 = 36,   // unused
-	kSfxTRGSPIN2 = 37,   // unused
-	kSfxTRGSPIN3 = 38,   // unused
-	kSfxDRIPPY4  = 39,   // unused
-	kSfxDRIPPY10 = 40,
-	kSfxDRIPPY1  = 41,
-	kSfxDRIPPY2  = 42,
-	kSfxDRIPPY6  = 43,
-	kSfxDRIPPY7  = 44,
-	kSfxPSAMB6   = 45,   //           - Looping
-	kSfxRTONE3   = 46,   //           - Looping
-	kSfxSCANNER1 = 47,
-	kSfxSCANNER2 = 48,
-	kSfxSCANNER3 = 49,
-	kSfxSCANNER4 = 50,
-	kSfxSCANNER5 = 51,
-	kSfxSCANNER6 = 52,
-	kSfxSCANNER7 = 53,
-	kSfxCTRAIN1  = 54,   //           - Looping
-	kSfxCTAMBL1  = 55,   //           - Looping
-	kSfxCTAMBR1  = 56,   //           - Looping
-	kSfxSTEAM3   = 57,
-	kSfxSTEAM6A  = 58,
-	kSfxNEON5    = 59,
-	kSfxNEON6    = 60,
-	kSfxDISH1    = 61,
-	kSfxDISH2    = 62,
-	kSfxDISH3    = 63,
-	kSfxDISH4    = 64,
-	kSfxDISH5    = 65,   // unused
-	kSfxSPIN1A   = 66,
-	kSfxSPIN2A   = 67,
-	kSfxSPIN2B   = 68,
-	kSfxSPIN3A   = 69,
-	kSfxBOOLOOP2 = 70,   //           - Looping
-	kSfxBRBED5   = 71,   //           - Looping
-	kSfxSWEEP2   = 72,
-	kSfxSWEEP3   = 73,
-	kSfxSWEEP4   = 74,
-	kSfxWINDLOP8 = 75,   //           - Looping
-	kSfxPETDEAD1 = 76,
-	kSfxPETDEAD3 = 77,
-	kSfxPETDEAD4 = 78,
-	kSfxPETDEAD5 = 79,
-	kSfxRCAMB1   = 80,   // unused    - Looping
-	kSfxRCAMBR1  = 81,   //           - Looping
-	kSfxRCCARBY1 = 82,
-	kSfxRCCARBY2 = 83,
-	kSfxRCCARBY3 = 84,
-	kSfxRCRAIN1  = 85,   //           - Looping
-	kSfxRCTALK1  = 86,   // unused    - Looping?
-	kSfxSIREN2   = 87,
-	kSfxRCTALK2  = 88,   // unused    - Looping?
-	kSfxRCTALK3  = 89,   // unused    - Looping?
-	kSfxPSDOOR1  = 90,
-	kSfxPSDOOR2  = 91,
-	kSfxPSPA6    = 92,
-	kSfxPSPA7    = 93,
-	kSfxPSPA8    = 94,
-	kSfxBOILPOT2 = 95,   //           - Looping
-	kSfxKTCHRAIN = 96,   //           - Looping
-	kSfxNEON7    = 97,
-	kSfxBIGFAN2  = 98,   //           - Looping
-	kSfxROOFAIR1 = 99,   //           - Looping
+	kSfxCROSLOCK =   0,
+	kSfxSTEAM1   =   1,
+	kSfxSPINNY1  =   2,
+	kSfxFEMHURT1 =   3,  // used only 3 times; 2 of them are bugs
+	kSfxFEMHURT2 =   4,
+	kSfxGUNMISS1 =   5,  // unused
+	kSfxGUNMISS2 =   6,  // unused
+	kSfxGUNMISS3 =   7,  // unused
+	kSfxGUNMISS4 =   8,  // unused
+	kSfxHITTARG1 =   9,  // unused
+	kSfxHITTARG2 =  10,  // unused
+	kSfxHITTARG3 =  11,  // unused
+	kSfxLGCAL1   =  12,
+	kSfxLGCAL2   =  13,  // used only twice
+	kSfxLGCAL3   =  14,
+	kSfxMDCAL1   =  15,  // unused
+	kSfxMDCAL2   =  16,  // unused
+	kSfxRICO1    =  17,  // unused
+	kSfxRICO2    =  18,  // unused
+	kSfxRICO3    =  19,  // used only once
+	kSfxRICOCHT1 =  20,  // unused
+	kSfxRICOCHT2 =  21,  // unused
+	kSfxRICOCHT3 =  22,  // unused
+	kSfxRICOCHT4 =  23,  // unused
+	kSfxRICOCHT5 =  24,  // unused
+	kSfxSMCAL1   =  25,  // unused
+	kSfxSMCAL2   =  26,  // unused
+	kSfxSMCAL3   =  27,
+	kSfxSMCAL4   =  28,  // unused
+	kSfxTARGUP1  =  29,
+	kSfxTARGUP2  =  30,  // unused
+	kSfxTARGUP3  =  31,  // used only once
+	kSfxTARGUP4  =  32,
+	kSfxTARGUP5  =  33,
+	kSfxTARGUP6  =  34,
+	kSfxTARGUP7  =  35,  // unused
+	kSfxTRGSPIN1 =  36,  // unused
+	kSfxTRGSPIN2 =  37,  // unused
+	kSfxTRGSPIN3 =  38,  // unused
+	kSfxDRIPPY4  =  39,  // unused
+	kSfxDRIPPY10 =  40,
+	kSfxDRIPPY1  =  41,
+	kSfxDRIPPY2  =  42,
+	kSfxDRIPPY6  =  43,
+	kSfxDRIPPY7  =  44,
+	kSfxPSAMB6   =  45,  //           - Looping
+	kSfxRTONE3   =  46,  //           - Looping
+	kSfxSCANNER1 =  47,
+	kSfxSCANNER2 =  48,
+	kSfxSCANNER3 =  49,
+	kSfxSCANNER4 =  50,
+	kSfxSCANNER5 =  51,
+	kSfxSCANNER6 =  52,
+	kSfxSCANNER7 =  53,
+	kSfxCTRAIN1  =  54,  //           - Looping
+	kSfxCTAMBL1  =  55,  //           - Looping
+	kSfxCTAMBR1  =  56,  //           - Looping
+	kSfxSTEAM3   =  57,
+	kSfxSTEAM6A  =  58,
+	kSfxNEON5    =  59,
+	kSfxNEON6    =  60,
+	kSfxDISH1    =  61,
+	kSfxDISH2    =  62,
+	kSfxDISH3    =  63,
+	kSfxDISH4    =  64,
+	kSfxDISH5    =  65,  // unused
+	kSfxSPIN1A   =  66,
+	kSfxSPIN2A   =  67,
+	kSfxSPIN2B   =  68,
+	kSfxSPIN3A   =  69,
+	kSfxBOOLOOP2 =  70,  //           - Looping
+	kSfxBRBED5   =  71,  //           - Looping
+	kSfxSWEEP2   =  72,
+	kSfxSWEEP3   =  73,
+	kSfxSWEEP4   =  74,
+	kSfxWINDLOP8 =  75,  //           - Looping
+	kSfxPETDEAD1 =  76,
+	kSfxPETDEAD3 =  77,
+	kSfxPETDEAD4 =  78,
+	kSfxPETDEAD5 =  79,
+	kSfxRCAMB1   =  80,  // unused    - Looping
+	kSfxRCAMBR1  =  81,  //           - Looping
+	kSfxRCCARBY1 =  82,
+	kSfxRCCARBY2 =  83,
+	kSfxRCCARBY3 =  84,
+	kSfxRCRAIN1  =  85,  //           - Looping
+	kSfxRCTALK1  =  86,  // unused    - Looping?
+	kSfxSIREN2   =  87,
+	kSfxRCTALK2  =  88,  // unused    - Looping?
+	kSfxRCTALK3  =  89,  // unused    - Looping?
+	kSfxPSDOOR1  =  90,
+	kSfxPSDOOR2  =  91,
+	kSfxPSPA6    =  92,
+	kSfxPSPA7    =  93,
+	kSfxPSPA8    =  94,
+	kSfxBOILPOT2 =  95,  //           - Looping
+	kSfxKTCHRAIN =  96,  //           - Looping
+	kSfxNEON7    =  97,
+	kSfxBIGFAN2  =  98,  //           - Looping
+	kSfxROOFAIR1 =  99,  //           - Looping
 	kSfxROOFRMB1 = 100,  //           - Looping
 	kSfxROOFRAN1 = 101,  //           - Looping
 	kSfxROOFLIT1 = 102,
diff --git a/engines/bladerunner/script/init_script.cpp b/engines/bladerunner/script/init_script.cpp
index db31ef6..12cbe93 100644
--- a/engines/bladerunner/script/init_script.cpp
+++ b/engines/bladerunner/script/init_script.cpp
@@ -1678,105 +1678,106 @@ void InitScript::Init_Clues2() {
 }
 
 void InitScript::Init_World_Waypoints() {
-	World_Waypoint_Set(0, kSetDR01_DR02_DR04, -676.0f, -0.04f, -94.0f);
-	World_Waypoint_Set(1, kSetDR01_DR02_DR04, -807.0f, -0.04f, 109.0f);
-	World_Waypoint_Set(2, kSetPS05, 541.8f, 0.38f, -435.68f);
-	World_Waypoint_Set(3, kSetPS07, 561.01f, 0.34f, -606.67f);
-	World_Waypoint_Set(4, kSetPS10_PS11_PS12_PS13, -404.09f, -9.23f, 251.95f);
-	World_Waypoint_Set(5, kSetPS10_PS11_PS12_PS13, -99.0f, -9.23f, 690.0f);
-	World_Waypoint_Set(6, kSetPS10_PS11_PS12_PS13, -374.14f, -8.97f, 240.18f);
-	World_Waypoint_Set(7, kSetPS10_PS11_PS12_PS13, -766.02f, -8.82f, 271.44f);
-	World_Waypoint_Set(8, kSetPS10_PS11_PS12_PS13, -546.19f, -9.06f, 351.38f);
-	World_Waypoint_Set(9, kSetPS10_PS11_PS12_PS13, -522.66f, -8.6f, 1409.29f);
-	World_Waypoint_Set(10, kSetPS10_PS11_PS12_PS13, -324.21f, -9.01f, 1428.74f);
-	World_Waypoint_Set(11, kSetPS10_PS11_PS12_PS13, 23.72f, -8.87f, 1335.19f);
-	World_Waypoint_Set(12, kSetRC01, -132.0f, 6.09f, 91.0f);
-	World_Waypoint_Set(13, kSetDR01_DR02_DR04, 21.4f, 0.22f, -201.68f);
-	World_Waypoint_Set(14, kSetDR01_DR02_DR04, 164.44f, 0.29f, -265.69f);
-	World_Waypoint_Set(15, kSetDR01_DR02_DR04, 279.7f, 7.23f, -888.43f);
-	World_Waypoint_Set(16, kSetPS10_PS11_PS12_PS13, 41.35f, -8.98f, 556.2f);
-	World_Waypoint_Set(17, kSetPS10_PS11_PS12_PS13, -697.86f, -0.73f, 21.89f);
-	World_Waypoint_Set(18, kSetPS10_PS11_PS12_PS13, -678.17f, -0.77f, 1043.62f);
-	World_Waypoint_Set(19, kSetPS10_PS11_PS12_PS13, 116.89f, -0.74f, 1581.12f);
-	World_Waypoint_Set(20, kSetDR01_DR02_DR04, -312.92f, 0.17f, -345.2f);
-	World_Waypoint_Set(21, kSetDR01_DR02_DR04, -290.04f, 0.23f, -513.79f);
-	World_Waypoint_Set(22, kSetDR01_DR02_DR04, 6.97f, 0.54f, -759.56f);
-	World_Waypoint_Set(23, kSetDR01_DR02_DR04, 280.48f, 11.58f, -941.15f);
-	World_Waypoint_Set(24, kSetDR01_DR02_DR04, 231.14f, 7.14f, -688.96f);
-	World_Waypoint_Set(25, kSetDR01_DR02_DR04, 54.92f, 0.2f, -171.75f);
-	World_Waypoint_Set(26, kSetDR01_DR02_DR04, -56.77f, 0.18f, -166.99f);
-	World_Waypoint_Set(27, kSetDR01_DR02_DR04, -78.12f, 0.34f, -449.92f);
-	World_Waypoint_Set(28, kSetRC01, -30.0f, -625.51f, 366.15f);
-	World_Waypoint_Set(29, kSetRC01, -51.81f, -622.47f, 286.93f);
-	World_Waypoint_Set(30, kSetRC01, -320.58f, -625.53f, 301.58f);
-	World_Waypoint_Set(31, kSetPS07, 421.01f, 0.22f, -566.67f);
-	World_Waypoint_Set(32, kSetPS07, 336.0f, 0.22f, -520.0f);
-	World_Waypoint_Set(33, kSetFreeSlotA, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(34, kSetFreeSlotB, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(35, kSetFreeSlotC, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(36, kSetFreeSlotD, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(37, kSetFreeSlotE, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(38, kSetFreeSlotF, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(39, kSetFreeSlotG, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(40, kSetFreeSlotH, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(41, kSetFreeSlotI, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(42, kSetFreeSlotJ, 0.0f, 0.0f, 0.0f);
-	World_Waypoint_Set(43, kSetCT01_CT12, -427.0f, -6.5f, 1188.0f);
-	World_Waypoint_Set(44, kSetCT01_CT12, -255.2f, -6.5f, 455.2f);
-	World_Waypoint_Set(45, kSetCT02, -247.02f, -145.11f, 32.99f);
-	World_Waypoint_Set(46, kSetCT02, -154.83f, -145.11f, 9.39f);
-	World_Waypoint_Set(47, kSetCT03_CT04, -619.36f, -616.15f, 220.91f);
-	World_Waypoint_Set(48, kSetCT03_CT04, -82.86f, -621.3f, 769.03f);
-	World_Waypoint_Set(49, kSetCT06, -7.31f, -58.23f, 22.44f);
-	World_Waypoint_Set(50, kSetCT06, 132.16f, -58.23f, 767.0f);
-	World_Waypoint_Set(51, kSetCT03_CT04, -335.05f, -618.82f, 312.9f);
-	World_Waypoint_Set(52, kSetCT07, 189.7f, -58.23f, -4.72f);
-	World_Waypoint_Set(53, kSetCT01_CT12, -450.32f, -6.5f, 230.39f);
-	World_Waypoint_Set(54, kSetCT01_CT12, -70.04f, -6.5f, 150.17f);
-	World_Waypoint_Set(55, kSetPS07, 491.0f, 0.0f, -571.0f);
-	World_Waypoint_Set(56, kSetCT01_CT12, -221.68f, -6.5f, 150.15f);
-	World_Waypoint_Set(57, kSetRC01, -291.43f, -0.3f, 277.92f);
-	World_Waypoint_Set(58, kSetRC01, -272.91f, -0.3f, 369.1f);
-	World_Waypoint_Set(59, kSetDR01_DR02_DR04, -118.65f, 0.15f, -130.15f);
-	World_Waypoint_Set(60, kSetDR01_DR02_DR04, 22.27f, 0.15f, -69.81f);
-	World_Waypoint_Set(61, kSetRC02_RC51, -39.0f, -1238.0f, 108284.0f);
-	World_Waypoint_Set(62, kSetPS02, -11.0f, -40.0f, -45.0f);
-	World_Waypoint_Set(63, kSetCT03_CT04, -133.0f, -621.0f, 686.0f);
-	World_Waypoint_Set(64, kSetCT01_CT12, -360.0f, -6.13f, 380.0f);
-	World_Waypoint_Set(65, kSetPS05, 688.0f, 0.37f, -518.0f);
-	World_Waypoint_Set(66, kSetCT03_CT04, -83.0f, -621.0f, 627.0f);
-	World_Waypoint_Set(67, kSetCT01_CT12, -212.65f, -2.08f, 513.47f);
-	World_Waypoint_Set(68, kSetCT01_CT12, -219.43f, -2.08f, 584.8f);
-	World_Waypoint_Set(69, kSetCT01_CT12, -215.0f, -2.08f, 548.0f);
-	World_Waypoint_Set(71, kSetRC01, 210.0f, 5.55f, 146.19f);
-	World_Waypoint_Set(72, kSetRC01, -55.27f, 5.55f, 108.34f);
-	World_Waypoint_Set(73, kSetPS07, 338.75f, 0.22f, -612.0f);
-	World_Waypoint_Set(74, kSetPS07, 338.75f, 0.22f, -560.0f);
-	World_Waypoint_Set(75, kSetCT03_CT04, -138.45f, -621.3f, 778.52f);
-	World_Waypoint_Set(76, kSetPS03, -499.23f, -354.62f, -51.3f);
-	World_Waypoint_Set(77, kSetPS03, -903.0f, -354.62f, 676.0f);
-	World_Waypoint_Set(78, kSetPS03, -723.0f, -354.62f, -1272.0f);
-	World_Waypoint_Set(79, kSetPS09, 207.36f, 0.67f, -96.42f);
-	World_Waypoint_Set(80, kSetPS09, -134.43f, 0.43f, -180.46f);
-	World_Waypoint_Set(81, kSetPS09, -559.0f, 0.15f, -100.0f);
-	World_Waypoint_Set(82, kSetPS03, -1250.07f, -354.0f, -1186.9f);
-	World_Waypoint_Set(83, kSetRC02_RC51, -55.11f, -1238.89f, 107995.87f);
-	World_Waypoint_Set(84, kSetCT02, -161.62f, -145.11f, -53.73f);
-	World_Waypoint_Set(85, kSetCT02, -201.62f, -145.11f, -85.73f);
-	World_Waypoint_Set(86, kSetCT01_CT12, -171.55f, -2.08f, 361.01f);
-	World_Waypoint_Set(87, kSetCT01_CT12, -523.51f, -9.23f, 1384.76f);
-	World_Waypoint_Set(88, kSetCT01_CT12, -102.01f, -9.23f, 1375.38f);
-	World_Waypoint_Set(89, kSetRC02_RC51, 14.54f, -1238.89f, 108280.85f);
-	World_Waypoint_Set(91, kSetRC02_RC51, 9.68f, -1238.89f, 108427.73f);
-	World_Waypoint_Set(92, kSetRC02_RC51, -153.29f, -1238.89f, 108473.52f);
-	World_Waypoint_Set(93, kSetRC02_RC51, -104.0f, -1238.89f, 108413.0f);
-	World_Waypoint_Set(90, kSetRC02_RC51, 37.59f, -1238.89f, 108449.29f);
-	World_Waypoint_Set(94, kSetCT07, 302.32f, -58.23f, 35.14f);
-	World_Waypoint_Set(95, kSetDR05, 62.0f, 0.3f, 129.0f);
-	World_Waypoint_Set(96, kSetDR05, -134.63f, -0.3f, 171.41f);
-	World_Waypoint_Set(97, kSetDR01_DR02_DR04, -1135.0f, 6.98f, 441.0f);
-	World_Waypoint_Set(98, kSetDR01_DR02_DR04, -1015.0f, 7.18f, 354.75f);
-	World_Waypoint_Set(99, kSetDR01_DR02_DR04, -975.0f, -0.04f, 316.0f);
+	World_Waypoint_Set(  0, kSetDR01_DR02_DR04, -676.0f, -0.04f, -94.0f);
+	World_Waypoint_Set(  1, kSetDR01_DR02_DR04, -807.0f, -0.04f, 109.0f);
+	World_Waypoint_Set(  2, kSetPS05, 541.8f, 0.38f, -435.68f);
+	World_Waypoint_Set(  3, kSetPS07, 561.01f, 0.34f, -606.67f);
+	World_Waypoint_Set(  4, kSetPS10_PS11_PS12_PS13, -404.09f, -9.23f, 251.95f);
+	World_Waypoint_Set(  5, kSetPS10_PS11_PS12_PS13, -99.0f, -9.23f, 690.0f);
+	World_Waypoint_Set(  6, kSetPS10_PS11_PS12_PS13, -374.14f, -8.97f, 240.18f);
+	World_Waypoint_Set(  7, kSetPS10_PS11_PS12_PS13, -766.02f, -8.82f, 271.44f);
+	World_Waypoint_Set(  8, kSetPS10_PS11_PS12_PS13, -546.19f, -9.06f, 351.38f);
+	World_Waypoint_Set(  9, kSetPS10_PS11_PS12_PS13, -522.66f, -8.6f, 1409.29f);
+	World_Waypoint_Set( 10, kSetPS10_PS11_PS12_PS13, -324.21f, -9.01f, 1428.74f);
+	World_Waypoint_Set( 11, kSetPS10_PS11_PS12_PS13, 23.72f, -8.87f, 1335.19f);
+	World_Waypoint_Set( 12, kSetRC01, -132.0f, 6.09f, 91.0f);
+	World_Waypoint_Set( 13, kSetDR01_DR02_DR04, 21.4f, 0.22f, -201.68f);
+	World_Waypoint_Set( 14, kSetDR01_DR02_DR04, 164.44f, 0.29f, -265.69f);
+	World_Waypoint_Set( 15, kSetDR01_DR02_DR04, 279.7f, 7.23f, -888.43f);
+	World_Waypoint_Set( 16, kSetPS10_PS11_PS12_PS13, 41.35f, -8.98f, 556.2f);
+	World_Waypoint_Set( 17, kSetPS10_PS11_PS12_PS13, -697.86f, -0.73f, 21.89f);
+	World_Waypoint_Set( 18, kSetPS10_PS11_PS12_PS13, -678.17f, -0.77f, 1043.62f);
+	World_Waypoint_Set( 19, kSetPS10_PS11_PS12_PS13, 116.89f, -0.74f, 1581.12f);
+	World_Waypoint_Set( 20, kSetDR01_DR02_DR04, -312.92f, 0.17f, -345.2f);
+	World_Waypoint_Set( 21, kSetDR01_DR02_DR04, -290.04f, 0.23f, -513.79f);
+	World_Waypoint_Set( 22, kSetDR01_DR02_DR04, 6.97f, 0.54f, -759.56f);
+	World_Waypoint_Set( 23, kSetDR01_DR02_DR04, 280.48f, 11.58f, -941.15f);
+	World_Waypoint_Set( 24, kSetDR01_DR02_DR04, 231.14f, 7.14f, -688.96f);
+	World_Waypoint_Set( 25, kSetDR01_DR02_DR04, 54.92f, 0.2f, -171.75f);
+	World_Waypoint_Set( 26, kSetDR01_DR02_DR04, -56.77f, 0.18f, -166.99f);
+	World_Waypoint_Set( 27, kSetDR01_DR02_DR04, -78.12f, 0.34f, -449.92f);
+	World_Waypoint_Set( 28, kSetRC01, -30.0f, -625.51f, 366.15f);
+	World_Waypoint_Set( 29, kSetRC01, -51.81f, -622.47f, 286.93f);
+	World_Waypoint_Set( 30, kSetRC01, -320.58f, -625.53f, 301.58f);
+	World_Waypoint_Set( 31, kSetPS07, 421.01f, 0.22f, -566.67f);
+	World_Waypoint_Set( 32, kSetPS07, 336.0f, 0.22f, -520.0f);
+	World_Waypoint_Set( 33, kSetFreeSlotA, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 34, kSetFreeSlotB, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 35, kSetFreeSlotC, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 36, kSetFreeSlotD, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 37, kSetFreeSlotE, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 38, kSetFreeSlotF, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 39, kSetFreeSlotG, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 40, kSetFreeSlotH, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 41, kSetFreeSlotI, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 42, kSetFreeSlotJ, 0.0f, 0.0f, 0.0f);
+	World_Waypoint_Set( 43, kSetCT01_CT12, -427.0f, -6.5f, 1188.0f);
+	World_Waypoint_Set( 44, kSetCT01_CT12, -255.2f, -6.5f, 455.2f);
+	World_Waypoint_Set( 45, kSetCT02, -247.02f, -145.11f, 32.99f);
+	World_Waypoint_Set( 46, kSetCT02, -154.83f, -145.11f, 9.39f);
+	World_Waypoint_Set( 47, kSetCT03_CT04, -619.36f, -616.15f, 220.91f);
+	World_Waypoint_Set( 48, kSetCT03_CT04, -82.86f, -621.3f, 769.03f);
+	World_Waypoint_Set( 49, kSetCT06, -7.31f, -58.23f, 22.44f);
+	World_Waypoint_Set( 50, kSetCT06, 132.16f, -58.23f, 767.0f);
+	World_Waypoint_Set( 51, kSetCT03_CT04, -335.05f, -618.82f, 312.9f);
+	World_Waypoint_Set( 52, kSetCT07, 189.7f, -58.23f, -4.72f);
+	World_Waypoint_Set( 53, kSetCT01_CT12, -450.32f, -6.5f, 230.39f);
+	World_Waypoint_Set( 54, kSetCT01_CT12, -70.04f, -6.5f, 150.17f);
+	World_Waypoint_Set( 55, kSetPS07, 491.0f, 0.0f, -571.0f);
+	World_Waypoint_Set( 56, kSetCT01_CT12, -221.68f, -6.5f, 150.15f);
+	World_Waypoint_Set( 57, kSetRC01, -291.43f, -0.3f, 277.92f);
+	World_Waypoint_Set( 58, kSetRC01, -272.91f, -0.3f, 369.1f);
+	World_Waypoint_Set( 59, kSetDR01_DR02_DR04, -118.65f, 0.15f, -130.15f);
+	World_Waypoint_Set( 60, kSetDR01_DR02_DR04, 22.27f, 0.15f, -69.81f);
+	World_Waypoint_Set( 61, kSetRC02_RC51, -39.0f, -1238.0f, 108284.0f);
+	World_Waypoint_Set( 62, kSetPS02, -11.0f, -40.0f, -45.0f);
+	World_Waypoint_Set( 63, kSetCT03_CT04, -133.0f, -621.0f, 686.0f);
+	World_Waypoint_Set( 64, kSetCT01_CT12, -360.0f, -6.13f, 380.0f);
+	World_Waypoint_Set( 65, kSetPS05, 688.0f, 0.37f, -518.0f);
+	World_Waypoint_Set( 66, kSetCT03_CT04, -83.0f, -621.0f, 627.0f);
+	World_Waypoint_Set( 67, kSetCT01_CT12, -212.65f, -2.08f, 513.47f);
+	World_Waypoint_Set( 68, kSetCT01_CT12, -219.43f, -2.08f, 584.8f);
+	World_Waypoint_Set( 69, kSetCT01_CT12, -215.0f, -2.08f, 548.0f);
+	// 70 - UNUSED
+	World_Waypoint_Set( 71, kSetRC01, 210.0f, 5.55f, 146.19f);
+	World_Waypoint_Set( 72, kSetRC01, -55.27f, 5.55f, 108.34f);
+	World_Waypoint_Set( 73, kSetPS07, 338.75f, 0.22f, -612.0f);
+	World_Waypoint_Set( 74, kSetPS07, 338.75f, 0.22f, -560.0f);
+	World_Waypoint_Set( 75, kSetCT03_CT04, -138.45f, -621.3f, 778.52f);
+	World_Waypoint_Set( 76, kSetPS03, -499.23f, -354.62f, -51.3f);
+	World_Waypoint_Set( 77, kSetPS03, -903.0f, -354.62f, 676.0f);
+	World_Waypoint_Set( 78, kSetPS03, -723.0f, -354.62f, -1272.0f);
+	World_Waypoint_Set( 79, kSetPS09, 207.36f, 0.67f, -96.42f);
+	World_Waypoint_Set( 80, kSetPS09, -134.43f, 0.43f, -180.46f);
+	World_Waypoint_Set( 81, kSetPS09, -559.0f, 0.15f, -100.0f);
+	World_Waypoint_Set( 82, kSetPS03, -1250.07f, -354.0f, -1186.9f);
+	World_Waypoint_Set( 83, kSetRC02_RC51, -55.11f, -1238.89f, 107995.87f);
+	World_Waypoint_Set( 84, kSetCT02, -161.62f, -145.11f, -53.73f);
+	World_Waypoint_Set( 85, kSetCT02, -201.62f, -145.11f, -85.73f);
+	World_Waypoint_Set( 86, kSetCT01_CT12, -171.55f, -2.08f, 361.01f);
+	World_Waypoint_Set( 87, kSetCT01_CT12, -523.51f, -9.23f, 1384.76f);
+	World_Waypoint_Set( 88, kSetCT01_CT12, -102.01f, -9.23f, 1375.38f);
+	World_Waypoint_Set( 89, kSetRC02_RC51, 14.54f, -1238.89f, 108280.85f);
+	World_Waypoint_Set( 90, kSetRC02_RC51, 37.59f, -1238.89f, 108449.29f);
+	World_Waypoint_Set( 91, kSetRC02_RC51, 9.68f, -1238.89f, 108427.73f);
+	World_Waypoint_Set( 92, kSetRC02_RC51, -153.29f, -1238.89f, 108473.52f);
+	World_Waypoint_Set( 93, kSetRC02_RC51, -104.0f, -1238.89f, 108413.0f);
+	World_Waypoint_Set( 94, kSetCT07, 302.32f, -58.23f, 35.14f);
+	World_Waypoint_Set( 95, kSetDR05, 62.0f, 0.3f, 129.0f);
+	World_Waypoint_Set( 96, kSetDR05, -134.63f, -0.3f, 171.41f);
+	World_Waypoint_Set( 97, kSetDR01_DR02_DR04, -1135.0f, 6.98f, 441.0f);
+	World_Waypoint_Set( 98, kSetDR01_DR02_DR04, -1015.0f, 7.18f, 354.75f);
+	World_Waypoint_Set( 99, kSetDR01_DR02_DR04, -975.0f, -0.04f, 316.0f);
 	World_Waypoint_Set(100, kSetCT01_CT12, -334.46f, -6.5f, 500.64f);
 	World_Waypoint_Set(101, kSetDR01_DR02_DR04, -334.46f, -6.5f, 500.64f);
 	World_Waypoint_Set(102, kSetRC02_RC51, 27.89f, -1238.89f, 108288.73f);
@@ -1806,6 +1807,8 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(126, kSetMA01, 477.18f, 0.0f, -287.21f);
 	World_Waypoint_Set(127, kSetBB11, 31.39f, -10.27f, -64.52f);
 	World_Waypoint_Set(128, kSetBB11, 7.39f, -10.27f, -136.52f);
+	World_Waypoint_Set(127, kSetBB11, 102.98f, -30.89f, -121.02f); // a bug? Overwrites previous co-ordinates (this is the final value). Note: The 127 waypoint is UNUSED!
+	World_Waypoint_Set(128, kSetBB11, -20.0f, -30.89f, -121.02f);  // a bug? Overwrites previous co-ordinates (this is the final value). Note: The 128 waypoint is UNUSED!
 	World_Waypoint_Set(129, kSetBB11, -136.61f, -10.27f, -136.52f);
 	World_Waypoint_Set(130, kSetBB11, -36.61f, -10.27f, -136.52f);
 	World_Waypoint_Set(131, kSetBB09, 435.45f, -9.0f, 166.0f);
@@ -1817,15 +1820,15 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(137, kSetBB05, 99.41f, -60.31f, 4.35f);
 	World_Waypoint_Set(138, kSetBB05, 99.41f, -60.34f, -115.65f);
 	World_Waypoint_Set(139, kSetBB05, 147.41f, -60.34f, -115.65f);
+	World_Waypoint_Set(140, kSetBB06_BB07, -43.88f, -0.04f, 172.95f);
+	World_Waypoint_Set(141, kSetBB06_BB07, 78.36f, -0.04f, 80.79f);
+	World_Waypoint_Set(142, kSetBB06_BB07, 81.74f, -0.04f, -94.0f);
+	World_Waypoint_Set(143, kSetBB06_BB07, -118.26f, -0.04f, -94.04f);
 	World_Waypoint_Set(144, kSetBB07, -654.56f, 252.59f, -1110.88f);
 	World_Waypoint_Set(145, kSetBB07, -578.56f, 252.59f, -1010.88f);
 	World_Waypoint_Set(146, kSetBB07, -470.56f, 252.59f, -1070.88f);
 	World_Waypoint_Set(147, kSetBB07, -510.56f, 252.59f, -1006.88f);
 	World_Waypoint_Set(148, kSetBB07, -646.56f, 252.59f, -1006.88f);
-	World_Waypoint_Set(140, kSetBB06_BB07, -43.88f, -0.04f, 172.95f);
-	World_Waypoint_Set(141, kSetBB06_BB07, 78.36f, -0.04f, 80.79f);
-	World_Waypoint_Set(142, kSetBB06_BB07, 81.74f, -0.04f, -94.0f);
-	World_Waypoint_Set(143, kSetBB06_BB07, -118.26f, -0.04f, -94.04f);
 	World_Waypoint_Set(149, kSetHC01_HC02_HC03_HC04, 647.0f, 1.6f, -81.87f);
 	World_Waypoint_Set(150, kSetUG02, -269.0f, 120.16f, -88.0f);
 	World_Waypoint_Set(151, kSetUG02, -181.0f, 120.16f, -96.0f);
@@ -1850,25 +1853,26 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(170, kSetRC03, 265.0f, 1.72f, 36.0f);
 	World_Waypoint_Set(171, kSetRC03, -639.0f, 1.72f, -124.0f);
 	World_Waypoint_Set(172, kSetHC01_HC02_HC03_HC04, -225.0f, 1.0f, 39.0f);
-	World_Waypoint_Set(172, kSetHC01_HC02_HC03_HC04, -217.0f, 1.0f, 127.0f);
+	World_Waypoint_Set(172, kSetHC01_HC02_HC03_HC04, -217.0f, 1.0f, 127.0f); // a bug? Overwrites previous co-ordinates (this is the final value). Note: The 172 waypoint is UNUSED!
+	// 173 - UNUSED
 	World_Waypoint_Set(174, kSetRC03, 326.96f, -4.01f, 383.16f);
 	World_Waypoint_Set(175, kSetRC03, 264.43f, -4.01f, 313.73f);
 	World_Waypoint_Set(176, kSetUG06, -78.43f, 0.0f, 269.98f);
 	World_Waypoint_Set(177, kSetUG06, 19.0f, 0.0f, 269.98f);
 	World_Waypoint_Set(178, kSetUG06, 91.0f, 0.0f, 137.6f);
-	World_Waypoint_Set(185, kSetUG09, 115.0f, 156.94f, -310.0f);
-	World_Waypoint_Set(186, kSetUG09, 153.0f, 156.94f, -294.0f);
 	World_Waypoint_Set(179, kSetUG06, 40.14f, 0.0f, 276.62f);
 	World_Waypoint_Set(180, kSetUG06, -71.86f, 0.0f, 276.62f);
 	World_Waypoint_Set(181, kSetUG06, -112.56f, 0.0f, 228.03f);
-	World_Waypoint_Set(189, kSetUG14, 229.0f, 186.04f, -24.0f);
-	World_Waypoint_Set(190, kSetUG14, 157.0f, 186.04f, -24.0f);
-	World_Waypoint_Set(191, kSetUG14, 157.0f, 128.92f, -148.0f);
 	World_Waypoint_Set(182, kSetUG01, 143.45f, -50.13f, -12.22f);
 	World_Waypoint_Set(183, kSetUG01, 199.45f, -50.13f, -1400.22f);
 	World_Waypoint_Set(184, kSetUG01, -112.55f, -50.13f, -2360.22f);
+	World_Waypoint_Set(185, kSetUG09, 115.0f, 156.94f, -310.0f);
+	World_Waypoint_Set(186, kSetUG09, 153.0f, 156.94f, -294.0f);
 	World_Waypoint_Set(187, kSetUG14, -295.0f, 12.97f, -148.0f);
 	World_Waypoint_Set(188, kSetUG14, 157.0f, 129.0f, -504.0f);
+	World_Waypoint_Set(189, kSetUG14, 229.0f, 186.04f, -24.0f);
+	World_Waypoint_Set(190, kSetUG14, 157.0f, 186.04f, -24.0f);
+	World_Waypoint_Set(191, kSetUG14, 157.0f, 128.92f, -148.0f);
 	World_Waypoint_Set(192, kSetTB02_TB03, -136.19f, 0.0f, 1580.03f);
 	World_Waypoint_Set(193, kSetTB02_TB03, -308.0f, -81.46f, 1466.0f);
 	World_Waypoint_Set(194, kSetBB03, 82.26f, 60.16f, -124.35f);
@@ -1876,6 +1880,7 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(196, kSetBB05, 39.41f, -60.31f, 308.35f);
 	World_Waypoint_Set(197, kSetBB05, 99.41f, -60.31f, 220.35f);
 	World_Waypoint_Set(198, kSetBB05, 267.41f, -60.31f, 180.35f);
+	// 199 - UNUSED?
 	World_Waypoint_Set(200, kSetBB06_BB07, -44.46f, -0.04f, 177.4f);
 	World_Waypoint_Set(201, kSetBB06_BB07, 137.0f, -0.04f, 17.0f);
 	World_Waypoint_Set(202, kSetRC03, -610.0f, -4.01f, 237.11f);
@@ -1972,13 +1977,6 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(293, kSetNR04, 5.0f, 0.0f, 342.0f);
 	World_Waypoint_Set(294, kSetNR04, 173.0f, 0.0f, 226.0f);
 	World_Waypoint_Set(295, kSetNR04, 13.0f, 0.0f, -50.0f);
-	World_Waypoint_Set(354, kSetNR04, 57.0f, 0.0f, 18.0f);
-	World_Waypoint_Set(355, kSetNR04, 161.0f, 0.0f, 410.0f);
-	World_Waypoint_Set(358, kSetNR04, 33.0f, 0.0f, 198.0f);
-	World_Waypoint_Set(359, kSetNR04, 62.92f, 0.16f, 309.72f);
-	World_Waypoint_Set(549, kSetNR04, -15.0f, 0.0f, 338.0f);
-	World_Waypoint_Set(445, kSetNR04, 129.0f, 0.0f, 418.0f);
-	World_Waypoint_Set(546, kSetNR04, 13.0f, 0.0f, 206.0f);
 	World_Waypoint_Set(296, kSetUG04, 168.0f, 11.87f, -987.0f);
 	World_Waypoint_Set(297, kSetUG04, -178.5f, 23.73f, -2176.05f);
 	World_Waypoint_Set(298, kSetUG09, -145.0f, 156.94f, -370.0f);
@@ -1996,10 +1994,6 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(310, kSetUG12, 459.0f, -126.21f, 152.0f);
 	World_Waypoint_Set(311, kSetUG12, -29.0f, -126.21f, 556.0f);
 	World_Waypoint_Set(312, kSetUG14, -311.0f, 129.0f, -488.0f);
-	World_Waypoint_Set(322, kSetNR04, 121.0f, 0.0f, -82.0f);
-	World_Waypoint_Set(323, kSetHC01_HC02_HC03_HC04, 600.58f, 0.14f, 32.82f);
-	World_Waypoint_Set(127, kSetBB11, 102.98f, -30.89f, -121.02f);
-	World_Waypoint_Set(128, kSetBB11, -20.0f, -30.89f, -121.02f);
 	World_Waypoint_Set(313, kSetBB11, 102.98f, -31.0f, -149.0f);
 	World_Waypoint_Set(314, kSetBB11, 20.0f, -31.0f, -109.0f);
 	World_Waypoint_Set(315, kSetBB11, -60.6f, -31.0f, -109.0f);
@@ -2009,10 +2003,24 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(319, kSetBB11, 115.35f, -31.0f, 302.36f);
 	World_Waypoint_Set(320, kSetBB11, 104.38f, -31.0f, 260.0f);
 	World_Waypoint_Set(321, kSetBB11, 120.0f, -31.0f, 115.0f);
+	World_Waypoint_Set(322, kSetNR04, 121.0f, 0.0f, -82.0f);
+	World_Waypoint_Set(323, kSetHC01_HC02_HC03_HC04, 600.58f, 0.14f, 32.82f);
+	// 324 - 335 are also set in Bryant (Sebastian's bear) AI script, same co-ordinates
+	World_Waypoint_Set(324, kSetBB05, 267.0f, -60.3f, 203.0f);
+	World_Waypoint_Set(325, kSetBB05, 84.0f, -60.3f, 337.0f);
+	World_Waypoint_Set(326, kSetBB06_BB07, -36.0f, 0.0f, 185.0f);
+	World_Waypoint_Set(327, kSetBB06_BB07, -166.0f, 0.0f, -103.0f);
+	World_Waypoint_Set(328, kSetBB07, -556.0f, 252.59f, -1018.11f);
+	World_Waypoint_Set(329, kSetBB07, -655.0f, 252.6f, -1012.0f);
+	World_Waypoint_Set(330, kSetBB07, -657.0f, 253.0f, -1127.0f);
+	World_Waypoint_Set(331, kSetBB12, 163.8f, 0.0f, 67.0f);
+	World_Waypoint_Set(332, kSetBB06_BB07, -39.0f, 0.0f, 11.5f);
+	World_Waypoint_Set(333, kSetBB12, -34.0f, 0.0f, 33.0f);
+	World_Waypoint_Set(334, kSetBB05, 3.0f, -60.3f, -144.0f);
+	World_Waypoint_Set(335, kSetBB12, -50.0f, 0.0f, 212.0f);
 	World_Waypoint_Set(336, kSetNR07, -110.0f, -73.5f, -169.0f);
 	World_Waypoint_Set(337, kSetNR07, -161.0f, -73.5f, -105.0f);
 	World_Waypoint_Set(338, kSetNR07, -193.0f, -73.5f, -105.0f);
-	World_Waypoint_Set(350, kSetNR01, -416.0f, -31.93f, -841.0f);
 	World_Waypoint_Set(339, kSetUG07, 106.0f, -12.21f, -94.0f);
 	World_Waypoint_Set(340, kSetUG07, 98.02f, -12.21f, -126.0f);
 	World_Waypoint_Set(341, kSetUG07, 106.0f, -21.47f, -278.0f);
@@ -2023,11 +2031,23 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(346, kSetDR01_DR02_DR04, -667.0f, -0.04f, -125.0f);
 	World_Waypoint_Set(347, kSetDR01_DR02_DR04, -471.0f, -0.04f, -110.0f);
 	World_Waypoint_Set(348, kSetDR01_DR02_DR04, -403.0f, -0.04f, -110.0f);
+	// 349 - kSetRC03 - Izo AI script
+	World_Waypoint_Set(350, kSetNR01, -416.0f, -31.93f, -841.0f);
 	World_Waypoint_Set(351, kSetCT09, 105.0f, 348.52f, 948.0f);
 	World_Waypoint_Set(352, kSetCT11, -426.0f, 9.68f, -33.0f);
 	World_Waypoint_Set(353, kSetCT11, -439.0f, 9.68f, -101.0f);
+	World_Waypoint_Set(354, kSetNR04, 57.0f, 0.0f, 18.0f);
+	World_Waypoint_Set(355, kSetNR04, 161.0f, 0.0f, 410.0f);
 	World_Waypoint_Set(356, kSetNR02, 19.01f, -24.0f, 20.21f);
 	World_Waypoint_Set(357, kSetNR02, 22.26f, 12.0f, -31.01f);
+	World_Waypoint_Set(358, kSetNR04, 33.0f, 0.0f, 198.0f);
+	World_Waypoint_Set(359, kSetNR04, 62.92f, 0.16f, 309.72f);
+	// 360 - kSetHF05 - CrazyLegs AI script
+	World_Waypoint_Set(361, kSetNR03, -185.0f, -70.19f, -1046.0f);
+	World_Waypoint_Set(362, kSetNR03, -121.0f, -70.19f, -778.0f);
+	World_Waypoint_Set(363, kSetNR03, -166.0f, -70.19f, -579.0f);
+	World_Waypoint_Set(364, kSetNR03, -160.0f, -70.19f, -164.0f);
+	World_Waypoint_Set(365, kSetNR03, 3.0f, -70.19f, -986.0f);
 	World_Waypoint_Set(366, kSetNR02, -94.21f, 12.0f, -26.15f);
 	World_Waypoint_Set(367, kSetNR02, -286.21f, -24.0f, 37.85f);
 	World_Waypoint_Set(368, kSetUG16, 176.91f, -40.67f, 225.92f);
@@ -2042,11 +2062,6 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(377, kSetHF03, 397.6f, 47.76f, -823.23f);
 	World_Waypoint_Set(378, kSetHF03, 461.56f, 47.76f, -757.78f);
 	World_Waypoint_Set(379, kSetTB07, -260.15f, 12.0f, -19.16f);
-	World_Waypoint_Set(361, kSetNR03, -185.0f, -70.19f, -1046.0f);
-	World_Waypoint_Set(362, kSetNR03, -121.0f, -70.19f, -778.0f);
-	World_Waypoint_Set(363, kSetNR03, -166.0f, -70.19f, -579.0f);
-	World_Waypoint_Set(364, kSetNR03, -160.0f, -70.19f, -164.0f);
-	World_Waypoint_Set(365, kSetNR03, 3.0f, -70.19f, -986.0f);
 	World_Waypoint_Set(380, kSetHF02, 456.43f, 47.76f, -276.05f);
 	World_Waypoint_Set(381, kSetRC03, -160.0f, -4.01f, 496.0f);
 	World_Waypoint_Set(382, kSetRC03, 0.0f, 1.72f, 60.0f);
@@ -2077,6 +2092,7 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(407, kSetUG10, 0.0f, 81.02f, -512.0f);
 	World_Waypoint_Set(408, kSetUG10, 0.0f, 1.15f, 400.0f);
 	World_Waypoint_Set(409, kSetUG04, -48.0f, -1.74f, -983.0f);
+	// 410 - UNUSED?
 	World_Waypoint_Set(411, kSetUG05, 80.0f, -16.72f, -4.0f);
 	World_Waypoint_Set(412, kSetUG05, -48.0f, -11.0f, -352.0f);
 	World_Waypoint_Set(413, kSetUG06, -109.0f, 0.0f, 285.0f);
@@ -2102,15 +2118,16 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(433, kSetUG09, 115.0f, 156.0f, -310.0f);
 	World_Waypoint_Set(434, kSetUG09, -57.0f, 156.0f, -306.0f);
 	World_Waypoint_Set(435, kSetUG09, -121.0f, 156.0f, -426.0f);
-	World_Waypoint_Set(436, kSetUG18, -274.74f, 0.0f, 464.75f);
+	World_Waypoint_Set(436, kSetUG18, -274.74f, 0.0f, 464.75f); // A bug? redundant? 436 is also set as a kSetUG18 waypoin in Sadik's AI script. Different co-ordinates
 	World_Waypoint_Set(437, kSetHF05, 271.97f, 40.63f, 18.4f);
 	World_Waypoint_Set(438, kSetHF05, 203.97f, 40.63f, 18.4f);
-	World_Waypoint_Set(516, kSetHF05, -79.01f, 40.63f, 91.01f);
 	World_Waypoint_Set(439, kSetNR05_NR08, -1273.27f, 0.32f, 126.92f);
 	World_Waypoint_Set(440, kSetCT01_CT12, -453.0f, -6.5f, 1176.0f);
 	World_Waypoint_Set(441, kSetCT01_CT12, -497.0f, -6.5f, 1080.0f);
 	World_Waypoint_Set(442, kSetCT01_CT12, -623.0f, -6.5f, 787.0f);
 	World_Waypoint_Set(443, kSetCT01_CT12, -436.0f, -6.5f, 765.0f);
+	// 444 - kSetUG15 - Free Slot A (Rat) AI script
+	World_Waypoint_Set(445, kSetNR04, 129.0f, 0.0f, 418.0f);
 	World_Waypoint_Set(446, kSetUG04, 176.0f, 19.31f, -283.0f);
 	World_Waypoint_Set(447, kSetUG04, 40.0f, -1.74f, -247.0f);
 	World_Waypoint_Set(448, kSetUG04, 24.0f, -6.71f, -179.0f);
@@ -2122,12 +2139,16 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(454, kSetHF06, 216.5f, 367.93f, 265.84f);
 	World_Waypoint_Set(455, kSetHF06, 216.5f, 367.93f, 389.84f);
 	World_Waypoint_Set(456, kSetNR11, -100.0f, 0.33f, -272.0f);
-	World_Waypoint_Set(462, kSetNR11, -119.0f, 0.33f, 77.0f);
 	World_Waypoint_Set(457, kSetUG05, 129.65f, 16.72f, -78.36f);
 	World_Waypoint_Set(458, kSetUG05, 44.2f, -11.64f, -390.86f);
 	World_Waypoint_Set(459, kSetUG05, 103.36f, -16.72f, -484.49f);
 	World_Waypoint_Set(460, kSetUG06, 103.0f, 0.0f, 413.0f);
 	World_Waypoint_Set(461, kSetUG06, 103.0f, 0.0f, 349.0f);
+	World_Waypoint_Set(462, kSetNR11, -119.0f, 0.33f, 77.0f);
+	// 463 - kSetUG01 or kSetUG04 or kSetUG07 or kSetUG09 or kSetUG12 - Free Slot A (Rat) AI script
+	// 464 - kSetUG01 or kSetUG04 or kSetUG07 or kSetUG09 or kSetUG12 - Free Slot A (Rat) AI script
+	// 465 - kSetUG01 or kSetUG04 or kSetUG07             or kSetUG12 - Free Slot A (Rat) AI script
+	// 466 - kSetUG01 or kSetUG04 or kSetUG07 or kSetUG09 or kSetUG12 - Free Slot B (Rat) AI script
 	World_Waypoint_Set(467, kSetNR05_NR08, -585.67f, 0.0f, 380.58f);
 	World_Waypoint_Set(468, kSetMA07, -312.0f, -162.8f, 156.0f);
 	World_Waypoint_Set(469, kSetMA07, 68.0f, -162.8f, 144.0f);
@@ -2145,6 +2166,10 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(481, kSetUG10, -193.5f, 1.15f, 29.0f);
 	World_Waypoint_Set(482, kSetUG10, -329.5f, 1.15f, 29.0f);
 	World_Waypoint_Set(483, kSetUG10, -329.5f, 1.15f, -379.0f);
+	// 484 - kSetNR01 or kSetNR05_NR08 or kSetHF01 or kSetHF03 - Izo AI script
+	// 485 - kSetNR01 or kSetNR05_NR08 or kSetHF01 or kSetHF03 - Izo AI script
+	// 486 - kSetNR02                              or kSetHF02 - Izo AI script
+	// 487 - kSetNR02                              or kSetHF02 - Izo AI script
 	World_Waypoint_Set(488, kSetUG01, 22.0f, -50.13f, -650.0f);
 	World_Waypoint_Set(489, kSetUG01, -14.0f, -50.13f, -2354.0f);
 	World_Waypoint_Set(490, kSetNR01, -360.0f, 31.55f, -1457.0f);
@@ -2173,6 +2198,7 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(513, kSetHF02, 446.46f, 47.76f, -509.98f);
 	World_Waypoint_Set(514, kSetHF03, 567.0f, 47.76f, -884.0f);
 	World_Waypoint_Set(515, kSetHF03, 203.0f, 47.76f, -880.0f);
+	World_Waypoint_Set(516, kSetHF05, -79.01f, 40.63f, 91.01f);
 	World_Waypoint_Set(517, kSetHF04, 1246.62f, -0.31f, -171.02f);
 	World_Waypoint_Set(518, kSetHF04, -72.89f, -0.31f, -154.77f);
 	World_Waypoint_Set(519, kSetHF04, 285.88f, -0.31f, -134.49f);
@@ -2180,6 +2206,12 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(521, kSetHF04, 482.02f, -0.31f, -661.24f);
 	World_Waypoint_Set(522, kSetHF04, 1183.98f, -0.31f, -176.25f);
 	World_Waypoint_Set(523, kSetHF04, -45.0f, -0.34f, -351.0f);
+	// 524 - UNUSED?
+	// 525 - kSetKP02 - Free Slot A (Rat) AI script
+	// 526 - kSetKP02 - Free Slot A (Rat) AI script
+	// 527 - kSetKP02 - Free Slot B (Rat) AI script
+	// 528 - kSetKP02 - Free Slot B (Rat) AI script
+	// 529 - kSetKP02 - Free Slot B (Rat) AI script
 	World_Waypoint_Set(530, kSetKP01, 36.79f, -12.2f, -534.54f);
 	World_Waypoint_Set(531, kSetKP01, -279.21f, -12.2f, -594.54f);
 	World_Waypoint_Set(532, kSetUG14, -76.51f, 129.0f, -748.49f);
@@ -2196,20 +2228,14 @@ void InitScript::Init_World_Waypoints() {
 	World_Waypoint_Set(543, kSetKP05_KP06, -1046.4f, 8.26f, -312.12f);
 	World_Waypoint_Set(544, kSetUG01, 111.72f, -50.13f, -490.46f);
 	World_Waypoint_Set(545, kSetUG01, -143.86f, 490.46f, -300.38f);
+	World_Waypoint_Set(546, kSetNR04, 13.0f, 0.0f, 206.0f);
+	// 547 - kSetUG01 or kSetUG04 or kSetUG07 or kSetUG09 or kSetUG12 - Free Slot B (Rat) AI script
+	// 548 - kSetUG01 or kSetUG04 or kSetUG07             or kSetUG12 - Free Slot B (Rat) AI script
+	World_Waypoint_Set(549, kSetNR04, -15.0f, 0.0f, 338.0f);
 	World_Waypoint_Set(550, kSetKP05_KP06, -785.31f, 0.0f, -237.05f);
 	World_Waypoint_Set(551, kSetKP05_KP06, -737.31f, 0.0f, -145.05f);
-	World_Waypoint_Set(324, kSetBB05, 267.0f, -60.3f, 203.0f);
-	World_Waypoint_Set(325, kSetBB05, 84.0f, -60.3f, 337.0f);
-	World_Waypoint_Set(326, kSetBB06_BB07, -36.0f, 0.0f, 185.0f);
-	World_Waypoint_Set(327, kSetBB06_BB07, -166.0f, 0.0f, -103.0f);
-	World_Waypoint_Set(328, kSetBB07, -556.0f, 252.59f, -1018.11f);
-	World_Waypoint_Set(329, kSetBB07, -655.0f, 252.6f, -1012.0f);
-	World_Waypoint_Set(330, kSetBB07, -657.0f, 253.0f, -1127.0f);
-	World_Waypoint_Set(331, kSetBB12, 163.8f, 0.0f, 67.0f);
-	World_Waypoint_Set(332, kSetBB06_BB07, -39.0f, 0.0f, 11.5f);
-	World_Waypoint_Set(333, kSetBB12, -34.0f, 0.0f, 33.0f);
-	World_Waypoint_Set(334, kSetBB05, 3.0f, -60.3f, -144.0f);
-	World_Waypoint_Set(335, kSetBB12, -50.0f, 0.0f, 212.0f);
+	// 552 - UNUSED?
+	// 553 - kSetRC03 - Izo AI script
 }
 
 void InitScript::Init_SDB() {
@@ -2489,7 +2515,7 @@ void InitScript::Init_CDB() {
 	CDB_Set_Crime(kClueStaggeredbyPunches, kCrimeBradburyAssault);
 	CDB_Set_Crime(kClueAct2Ended, kCrimeBradburyAssault);
 
-	for(int i = 0; i != 288; ++i) {
+	for (int i = 0; i != 288; ++i) {
 		CDB_Set_Clue_Asset_Type(i, kClueTypeIntangible);
 	}
 
@@ -2693,16 +2719,16 @@ void InitScript::Init_CDB() {
 }
 
 void InitScript::Init_Spinner() {
-	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationPoliceStation, true);
-	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationMcCoysApartment, true);
+	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationPoliceStation,    true);
+	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationMcCoysApartment,  true);
 	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationRuncitersAnimals, true);
-	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationChinatown, false);
-	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationAnimoidRow, false);
-	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationTyrellBuilding, false);
-	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationDNARow, false);
+	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationChinatown,        false);
+	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationAnimoidRow,       false);
+	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationTyrellBuilding,   false);
+	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationDNARow,           false);
 	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationBradburyBuilding, false);
-	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationNightclubRow, false);
-	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationHysteriaHall, false);
+	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationNightclubRow,     false);
+	Spinner_Set_Selectable_Destination_Flag(kSpinnerDestinationHysteriaHall,     false);
 }
 
 void InitScript::Init_Actor_Friendliness() {


Commit: 9a76434d400cb89c2b63d7f8d598b3e3bd28923a
    https://github.com/scummvm/scummvm/commit/9a76434d400cb89c2b63d7f8d598b3e3bd28923a
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2019-08-16T00:50:49+03:00

Commit Message:
BLADERUNNER: Early restoration for Dino Klein

Changed paths:
    engines/bladerunner/script/ai/klein.cpp
    engines/bladerunner/script/scene/ps07.cpp


diff --git a/engines/bladerunner/script/ai/klein.cpp b/engines/bladerunner/script/ai/klein.cpp
index 8091fee..066bbad 100644
--- a/engines/bladerunner/script/ai/klein.cpp
+++ b/engines/bladerunner/script/ai/klein.cpp
@@ -33,58 +33,66 @@ void AIScriptKlein::Initialize() {
 	_animationStateNext = 0;
 	Actor_Put_In_Set(kActorKlein, kSetPS07);
 	Actor_Set_At_XYZ(kActorKlein, 338.0f, 0.22f, -612.0f, 768);
-	Actor_Set_Goal_Number(kActorKlein, 0);
+	Actor_Set_Goal_Number(kActorKlein, kGoalKleinDefault);
 }
 
 bool AIScriptKlein::Update() {
-	if (Global_Variable_Query(kVariableChapter) > 1 && Actor_Query_Goal_Number(kActorKlein) < 100) {
-		Actor_Set_Goal_Number(kActorKlein, 100);
+	if (Global_Variable_Query(kVariableChapter) > 1 && Actor_Query_Goal_Number(kActorKlein) < kGoalKleinAwayAtEndOfActOne) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinAwayAtEndOfActOne);
 		return true;
 	}
-	if (Actor_Query_Goal_Number(kActorKlein) < 4 && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 40) {
-		Actor_Set_Goal_Number(kActorKlein, 4);
+	if (Actor_Query_Goal_Number(kActorKlein) < kGoalKleinIsAnnoyedByMcCoyInit
+	    && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 40
+	) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinIsAnnoyedByMcCoyInit);
 	}
-	if (Player_Query_Current_Scene() == kScenePS07 && Actor_Query_Goal_Number(kActorKlein) == 0) {
-		Actor_Set_Goal_Number(kActorKlein, 1);
+	if (Player_Query_Current_Scene() == kScenePS07 && Actor_Query_Goal_Number(kActorKlein) == kGoalKleinDefault) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinMovingInLab01);
 		return true;
 	}
-	if ( Actor_Clue_Query(kActorMcCoy, kClueOfficersStatement)
-	 && !Game_Flag_Query(kFlagMcCoyHasOfficersStatement)
+
+	// The following if-clauses and flags circumvent the manual's explicit instruction that McCoy should upload his clues
+	// on the Mainframe, so that Dino Klein can acquire them.
+	if (Actor_Clue_Query(kActorMcCoy, kClueOfficersStatement)
+	    && !Game_Flag_Query(kFlagMcCoyHasOfficersStatement)
 	) {
 		Game_Flag_Set(kFlagMcCoyHasOfficersStatement);
 	}
-	if ( Actor_Clue_Query(kActorMcCoy, kCluePaintTransfer)
-	 && !Game_Flag_Query(kFlagMcCoyHasPaintTransfer)
+	if (Actor_Clue_Query(kActorMcCoy, kCluePaintTransfer)
+	    && !Game_Flag_Query(kFlagMcCoyHasPaintTransfer)
 	) {
 		Game_Flag_Set(kFlagMcCoyHasPaintTransfer);
 	}
-	if ( Actor_Clue_Query(kActorMcCoy, kClueShellCasings)
-	 && !Game_Flag_Query(kFlagMcCoyHasShellCasings)
+	if (Actor_Clue_Query(kActorMcCoy, kClueShellCasings)
+	    && !Game_Flag_Query(kFlagMcCoyHasShellCasings)
 	) {
 		Game_Flag_Set(kFlagMcCoyHasShellCasings);
 	}
-	if ( Actor_Clue_Query(kActorMcCoy, kClueChromeDebris)
-	 && !Game_Flag_Query(kFlagMcCoyHasChromeDebris)
+	if (Actor_Clue_Query(kActorMcCoy, kClueChromeDebris)
+	    && !Game_Flag_Query(kFlagMcCoyHasChromeDebris)
 	) {
 		Game_Flag_Set(kFlagMcCoyHasChromeDebris);
 	}
-	if ( Player_Query_Current_Scene() == kScenePS07
-	 &&  Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 35
-	 && !Game_Flag_Query(kFlagPS07KleinInsulted)
+
+	// The following deals with the case that Klein gets annoyed by McCoy and how he recovers from that
+	if (Player_Query_Current_Scene() == kScenePS07
+	    && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 35
+	    && !Game_Flag_Query(kFlagPS07KleinInsulted)
 	) {
 		AI_Countdown_Timer_Reset(kActorKlein, kActorTimerAIScriptCustomTask2);
 		AI_Countdown_Timer_Start(kActorKlein, kActorTimerAIScriptCustomTask2, 5);
 		Game_Flag_Set(kFlagPS07KleinInsulted);
 		return true;
 	}
-	if (Actor_Query_Goal_Number(kActorKlein) == 7) {
+	if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinIsAnnoyedByMcCoyFinal) {
 		if (Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) > 20
-		 && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 40
+		    && Actor_Query_Friendliness_To_Other(kActorKlein, kActorMcCoy) < 40
 		) {
+			// when insulted, slowly increase friendliness again, until it's at 40 or greater
 			Actor_Modify_Friendliness_To_Other(kActorKlein, kActorMcCoy, 2);
 		}
 		AI_Movement_Track_Flush(kActorKlein);
-		Actor_Set_Goal_Number(kActorKlein, 0);
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinDefault);
 		return true;
 	}
 	return false;
@@ -92,20 +100,22 @@ bool AIScriptKlein::Update() {
 
 void AIScriptKlein::TimerExpired(int timer) {
 	if (timer == kActorTimerAIScriptCustomTask2) {
-		if ( Game_Flag_Query(kFlagPS07KleinInsulted)
-		 && !Game_Flag_Query(kFlagPS07KleinInsultedTalk)
-		 &&  Actor_Query_Is_In_Current_Set(kActorKlein)
+		if (Game_Flag_Query(kFlagPS07KleinInsulted)
+		    && !Game_Flag_Query(kFlagPS07KleinInsultedTalk)
+		    && Actor_Query_Is_In_Current_Set(kActorKlein)
 		) {
+			// Klein is annoyed - full dialogue
 			Actor_Face_Actor(kActorKlein, kActorMcCoy, true);
 			Actor_Says(kActorKlein, 10, kAnimationModeTalk);
 			Actor_Says(kActorMcCoy, 4120, kAnimationModeTalk);
 			Actor_Says(kActorKlein, 20, kAnimationModeTalk);
 			Actor_Says(kActorMcCoy, 4125, kAnimationModeTalk);
 			Game_Flag_Set(kFlagPS07KleinInsultedTalk);
-			Actor_Set_Goal_Number(kActorKlein, 4);
+			Actor_Set_Goal_Number(kActorKlein, kGoalKleinIsAnnoyedByMcCoyInit);
 		} else {
+			// Klein is annoyed - short dialogue
 			Actor_Says(kActorKlein, 10, kAnimationModeTalk);
-			Actor_Set_Goal_Number(kActorKlein, 4);
+			Actor_Set_Goal_Number(kActorKlein, kGoalKleinIsAnnoyedByMcCoyInit);
 		}
 		// return true;
 	}
@@ -113,28 +123,38 @@ void AIScriptKlein::TimerExpired(int timer) {
 }
 
 void AIScriptKlein::CompletedMovementTrack() {
-	if (Actor_Query_Goal_Number(kActorKlein) == 1) {
-		Actor_Set_Goal_Number(kActorKlein, 2);
+	// Normal behavior
+	if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinMovingInLab01) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinMovingInLab02);
 		return; // true;
 	}
-	if (Actor_Query_Goal_Number(kActorKlein) == 2) {
-		Actor_Set_Goal_Number(kActorKlein, 1);
+	if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinMovingInLab02) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinMovingInLab01);
 		return; // true;
 	}
-	if (Actor_Query_Goal_Number(kActorKlein) == 4) {
-		Actor_Set_Goal_Number(kActorKlein, 5);
-		// missing return?
+
+	// Annoyed behavior
+	if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinIsAnnoyedByMcCoyInit) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinIsAnnoyedByMcCoy01);
+		if (_vm->_cutContent) {
+			return;
+		}
+		// NOTE: original was missing return here
 	}
-	if (Actor_Query_Goal_Number(kActorKlein) == 5) {
-		Actor_Set_Goal_Number(kActorKlein, 6);
-		// missing return?
+	if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinIsAnnoyedByMcCoy01) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinIsAnnoyedByMcCoy02);
+		if (_vm->_cutContent) {
+			return;
+		}
+		// NOTE: original was missing return here
 	}
-	if (Actor_Query_Goal_Number(kActorKlein) == 6) {
-		Actor_Set_Goal_Number(kActorKlein, 7);
+	if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinIsAnnoyedByMcCoy02) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinIsAnnoyedByMcCoyFinal);
 		return; // true;
 	}
-	if (Actor_Query_Goal_Number(kActorKlein) == 7) {
-		Actor_Set_Goal_Number(kActorKlein, 0);
+	if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinIsAnnoyedByMcCoyFinal) {
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinDefault);
+		// On the next Update() the goal will be set to kGoalKleinIsAnnoyedByMcCoyInit, if friendliness still < 40
 		return; // true;
 	}
 	// return false;
@@ -182,40 +202,41 @@ int AIScriptKlein::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueI
 
 bool AIScriptKlein::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	switch (newGoalNumber) {
-	case 1:
+	case kGoalKleinMovingInLab01:
 		AI_Movement_Track_Flush(kActorKlein);
-		AI_Movement_Track_Append(kActorKlein, 73, Random_Query(3, 20));
+		AI_Movement_Track_Append(kActorKlein, 73, Random_Query(3, 20));  // kSetPS07
 		AI_Movement_Track_Repeat(kActorKlein);
 		break;
-	case 2:
+	case kGoalKleinMovingInLab02:
 		AI_Movement_Track_Flush(kActorKlein);
-		AI_Movement_Track_Append(kActorKlein, 74, Random_Query(10, 20));
+		AI_Movement_Track_Append(kActorKlein, 74, Random_Query(10, 20)); // kSetPS07
 		AI_Movement_Track_Repeat(kActorKlein);
 		break;
-	case 3:
+	case kGoalKleinGotoLabSpeaker:
 		AI_Movement_Track_Flush(kActorKlein);
-		AI_Movement_Track_Append(kActorKlein, 31, 3);
+		AI_Movement_Track_Append(kActorKlein, 31, 3);  // kSetPS07
 		AI_Movement_Track_Repeat(kActorKlein);
 		break;
-	case 4:
+	case kGoalKleinIsAnnoyedByMcCoyInit:
 		AI_Movement_Track_Flush(kActorKlein);
-		AI_Movement_Track_Append(kActorKlein, 32, 5);
+		AI_Movement_Track_Append(kActorKlein, 32, 5);  // kSetPS07
 		AI_Movement_Track_Repeat(kActorKlein);
 		break;
-	case 5:
+	case kGoalKleinIsAnnoyedByMcCoy01:
 		AI_Movement_Track_Flush(kActorKlein);
-		AI_Movement_Track_Append(kActorKlein, 35, 60);
+		AI_Movement_Track_Append(kActorKlein, 35, 60); // kSetFreeSlotC
 		AI_Movement_Track_Repeat(kActorKlein);
 		break;
-	case 6:
+	case kGoalKleinIsAnnoyedByMcCoy02:
 		AI_Movement_Track_Flush(kActorKlein);
-		AI_Movement_Track_Append(kActorKlein, 32, 5);
+		AI_Movement_Track_Append(kActorKlein, 32, 5);  // kSetPS07
 		AI_Movement_Track_Repeat(kActorKlein);
 		break;
-	case 100:
+	// TODO: missing kGoalKleinIsAnnoyedByMcCoyFinal case
+	case kGoalKleinAwayAtEndOfActOne:
 		AI_Movement_Track_Flush(kActorKlein);
 		Actor_Put_In_Set(kActorKlein, kSetFreeSlotC);
-		Actor_Set_At_Waypoint(kActorKlein, 35, 0);
+		Actor_Set_At_Waypoint(kActorKlein, 35, 0);    //  kSetPS07
 		break;
 	}
 	return false;
@@ -224,8 +245,8 @@ bool AIScriptKlein::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 	switch (_animationState) {
 	case 0:
-		if (Actor_Query_Goal_Number(kActorKlein) == 1
-		 || Actor_Query_Goal_Number(kActorKlein) == 2
+		if (Actor_Query_Goal_Number(kActorKlein) == kGoalKleinMovingInLab01
+		    || Actor_Query_Goal_Number(kActorKlein) == kGoalKleinMovingInLab02
 		) {
 			*animation = 691;
 			_animationFrame++;
@@ -233,7 +254,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 				_animationFrame = 0;
 			}
 		} else if (!Game_Flag_Query(kFlagKleinAnimation1)
-		        &&  Actor_Query_Goal_Number(kActorKlein) == 3
+		           && Actor_Query_Goal_Number(kActorKlein) == kGoalKleinGotoLabSpeaker
 		) {
 			*animation = 689;
 			_animationFrame++;
@@ -245,7 +266,7 @@ bool AIScriptKlein::UpdateAnimation(int *animation, int *frame) {
 			}
 		} else {
 			if (Game_Flag_Query(kFlagKleinAnimation3)
-			 && Actor_Query_Goal_Number(kActorKlein) == 3
+			    && Actor_Query_Goal_Number(kActorKlein) == kGoalKleinGotoLabSpeaker
 			) {
 				_animationFrame--;
 				if (_animationFrame < 0) {
diff --git a/engines/bladerunner/script/scene/ps07.cpp b/engines/bladerunner/script/scene/ps07.cpp
index 4ff00c2..6ded562 100644
--- a/engines/bladerunner/script/scene/ps07.cpp
+++ b/engines/bladerunner/script/scene/ps07.cpp
@@ -54,9 +54,10 @@ bool SceneScriptPS07::MouseClick(int x, int y) {
 bool SceneScriptPS07::ClickedOn3DObject(const char *objectName, bool a2) {
 	if (Object_Query_Click("L.MOUSE", objectName)) { // a bug? Which object is this?
 		Sound_Play(kSfxLABBUZZ1, 70, 0, 0, 50);
-		if (Actor_Query_Goal_Number(kActorKlein) < 4 && Actor_Query_Goal_Number(kActorKlein) > 0) {
+		if (Actor_Query_Goal_Number(kActorKlein) < kGoalKleinIsAnnoyedByMcCoyInit
+		    && Actor_Query_Goal_Number(kActorKlein) > kGoalKleinDefault) {
 			Actor_Face_Actor(kActorMcCoy, kActorKlein, true);
-			Actor_Set_Goal_Number(kActorKlein, 3);
+			Actor_Set_Goal_Number(kActorKlein, kGoalKleinGotoLabSpeaker);
 			Actor_Modify_Friendliness_To_Other(kActorKlein, kActorMcCoy, -3);
 		}
 		return true;
@@ -67,18 +68,17 @@ bool SceneScriptPS07::ClickedOn3DObject(const char *objectName, bool a2) {
 bool SceneScriptPS07::ClickedOnActor(int actorId) {
 	if (actorId == kActorKlein) {
 		Actor_Face_Actor(kActorMcCoy, kActorKlein, true);
-		Actor_Set_Goal_Number(kActorKlein, 3);
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinGotoLabSpeaker);
 
 		if (!Game_Flag_Query(kFlagPS07KleinTalkClues)) {
 			Actor_Says(kActorMcCoy, 4115, 13);
 		}
 
 		if (!Game_Flag_Query(kFlagPS07KleinTalkClues)
-		 && (Game_Flag_Query(kFlagMcCoyHasShellCasings)
-		  || Game_Flag_Query(kFlagMcCoyHasOfficersStatement)
-		  || Game_Flag_Query(kFlagMcCoyHasPaintTransfer)
-		  || Game_Flag_Query(kFlagMcCoyHasChromeDebris)
-		 )
+		    && (Game_Flag_Query(kFlagMcCoyHasShellCasings)
+		        || Game_Flag_Query(kFlagMcCoyHasOfficersStatement)
+		        || Game_Flag_Query(kFlagMcCoyHasPaintTransfer)
+		        || Game_Flag_Query(kFlagMcCoyHasChromeDebris))
 		) {
 			Actor_Face_Actor(kActorKlein, kActorMcCoy, true);
 			Actor_Says(kActorKlein, 30, 12);
@@ -89,8 +89,8 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) {
 			}
 		}
 
-		if ( Game_Flag_Query(kFlagMcCoyHasShellCasings)
-		 && !Game_Flag_Query(kFlagPS07KleinTalkShellCasings)
+		if (Game_Flag_Query(kFlagMcCoyHasShellCasings)
+		    && !Game_Flag_Query(kFlagPS07KleinTalkShellCasings)
 		) {
 			Game_Flag_Set(kFlagPS07KleinTalkShellCasings);
 			Actor_Clue_Acquire(kActorMcCoy, kClueLabShellCasings, false, kActorKlein);
@@ -101,12 +101,12 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) {
 			Actor_Says(kActorMcCoy, 4140, 18);
 			Actor_Says(kActorKlein, 80, 14);
 			Actor_Says(kActorKlein, 90, 14);
-			Actor_Set_Goal_Number(kActorKlein, 1);
+			Actor_Set_Goal_Number(kActorKlein, kGoalKleinMovingInLab01);
 			return true;
 		}
 
-		if ( Game_Flag_Query(kFlagMcCoyHasOfficersStatement)
-		 && !Game_Flag_Query(kFlagPS07KleinTalkOfficersStatement)
+		if (Game_Flag_Query(kFlagMcCoyHasOfficersStatement)
+		    && !Game_Flag_Query(kFlagPS07KleinTalkOfficersStatement)
 		) {
 			Game_Flag_Set(kFlagPS07KleinTalkOfficersStatement);
 			Actor_Clue_Acquire(kActorMcCoy, kClueLabCorpses, false, kActorKlein);
@@ -124,12 +124,12 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) {
 			Actor_Says(kActorMcCoy, 4170, 19);
 			Actor_Says(kActorMcCoy, 4175, 19);
 			Actor_Modify_Friendliness_To_Other(kActorKlein, kActorMcCoy, 3);
-			Actor_Set_Goal_Number(kActorKlein, 1);
+			Actor_Set_Goal_Number(kActorKlein, kGoalKleinMovingInLab01);
 			return true;
 		}
 
-		if ( Game_Flag_Query(kFlagMcCoyHasPaintTransfer)
-		 && !Game_Flag_Query(kFlagPS07KleinTalkPaintTransfer)
+		if (Game_Flag_Query(kFlagMcCoyHasPaintTransfer)
+		    && !Game_Flag_Query(kFlagPS07KleinTalkPaintTransfer)
 		) {
 			Game_Flag_Set(kFlagPS07KleinTalkPaintTransfer);
 			Actor_Clue_Acquire(kActorMcCoy, kClueLabPaintTransfer, false, kActorKlein);
@@ -141,22 +141,26 @@ bool SceneScriptPS07::ClickedOnActor(int actorId) {
 			Actor_Says(kActorMcCoy, 4185, 18);
 			Actor_Says(kActorKlein, 210, 12);
 			Actor_Modify_Friendliness_To_Other(kActorKlein, kActorMcCoy, -12);
-			Actor_Set_Goal_Number(kActorKlein, 1);
+			Actor_Set_Goal_Number(kActorKlein, kGoalKleinMovingInLab01);
 			return true;
 		}
 
-		if ( Game_Flag_Query(kFlagMcCoyHasChromeDebris)
-		 && !Game_Flag_Query(kFlagPS07KleinTalkChromeDebris)
+		if (Game_Flag_Query(kFlagMcCoyHasChromeDebris)
+		    && !Game_Flag_Query(kFlagPS07KleinTalkChromeDebris)
 		) {
 			Game_Flag_Set(kFlagPS07KleinTalkChromeDebris);
 			Actor_Says(kActorKlein, 220, 12);
 			Actor_Says(kActorMcCoy, 4190, 13);
 			Actor_Says(kActorKlein, 230, 14);
-			Actor_Set_Goal_Number(kActorKlein, 1);
+			if (_vm->_cutContent) {
+				Actor_Says(kActorMcCoy, 4195, 13);
+				Actor_Says(kActorKlein, 240, 16); // Car VIN
+			}
+			Actor_Set_Goal_Number(kActorKlein, kGoalKleinMovingInLab01);
 			return true;
 		}
 		Actor_Says(kActorKlein, 0, 13);
-		Actor_Set_Goal_Number(kActorKlein, 1);
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinMovingInLab01);
 		return true;
 	}
 	return false;
@@ -195,7 +199,7 @@ void SceneScriptPS07::PlayerWalkedIn() {
 
 void SceneScriptPS07::PlayerWalkedOut() {
 	if (!Game_Flag_Query(kFlagPS07KleinInsulted) && Global_Variable_Query(kVariableChapter) == 1) {
-		Actor_Set_Goal_Number(kActorKlein, 0);
+		Actor_Set_Goal_Number(kActorKlein, kGoalKleinDefault);
 	}
 }
 





More information about the Scummvm-git-logs mailing list