BLADERUNNER: Added KIA interfaces

Crimes interface done
Suspects interface done
Added some game constants
Fixed font rendering for other languages
Fixed anoying clang warning

2 files changed, 389 insertions, 373 deletions

diff --git a/engines/bladerunner/script/init.cpp b/engines/bladerunner/script/init.cpp
index ed1140582d..76ade879ad 100644
--- a/engines/bladerunner/script/init.cpp
+++ b/engines/bladerunner/script/init.cpp
@@ -72,8 +72,9 @@ void ScriptInit::Init_Globals() {
 }
 
 void ScriptInit::Init_Game_Flags() {
-	for (int i = 0; i != 730; ++i)
+	for (int i = 0; i != 730; ++i) {
 		Game_Flag_Reset(i);
+	}
 
 	if (Random_Query(1, 2) == 1) {
 		Game_Flag_Set(44);
@@ -2186,176 +2187,184 @@ void ScriptInit::Init_World_Waypoints() {
 }
 
 void ScriptInit::Init_SDB() {
-	SDB_Set_Actor(0, kActorSadik);
-	SDB_Set_Sex(0, 1);
-	SDB_Add_MO_Clue(0, kClueCrystalsCase);
-	SDB_Add_MO_Clue(0, kClueDetonatorWire);
-	SDB_Add_MO_Clue(0, kClueSadiksGun);
-	SDB_Add_MO_Clue(0, kCluePlasticExplosive);
-	SDB_Add_Whereabouts_Clue(0, kClueTyrellSecurity);
-	SDB_Add_Whereabouts_Clue(0, kClueKingstonKitchenBox1);
-	SDB_Add_Whereabouts_Clue(0, kClueDragonflyEarring);
-	SDB_Add_Whereabouts_Clue(0, kClueChewInterview);
-	SDB_Add_Whereabouts_Clue(0, kClueHomelessManInterview1);
-	SDB_Add_Replicant_Clue(0, kClueDetonatorWire);
-	SDB_Add_Replicant_Clue(0, kClueCrystalsCase);
-	SDB_Add_Replicant_Clue(0, kClueMorajiInterview);
-	SDB_Add_Replicant_Clue(0, kClueAttemptedFileAccess);
-	SDB_Add_Replicant_Clue(0, kClueExpertBomber);
-	SDB_Add_Replicant_Clue(0, kClueRachaelInterview);
-	SDB_Add_Replicant_Clue(0, kClueCrystalsCase);
-	SDB_Add_Non_Replicant_Clue(0, kClueStaggeredbyPunches);
-	SDB_Add_Non_Replicant_Clue(0, kClueIzosWarning);
-	SDB_Add_Non_Replicant_Clue(0, kClueAmateurBomber);
-	SDB_Add_Other_Clue(0, kClueGrigorianInterviewB1);
-	SDB_Add_Other_Clue(0, kClueGrigorianInterviewB2);
-	SDB_Add_Other_Clue(0, kClueAct2Ended);
-	SDB_Add_Other_Clue(0, kClueBombingSuspect);
-	SDB_Add_Other_Clue(0, kClueSadikAtMoonbus);
-	SDB_Add_Identity_Clue(0, kClueAct2Ended);
-	SDB_Add_Photo_Clue(0, kClueBombingSuspect, 31);
-	SDB_Add_Photo_Clue(0, kClueSadikAtMoonbus, 38);
-	SDB_Set_Actor(1, kActorClovis);
-	SDB_Set_Sex(1, 1);
-	SDB_Add_MO_Clue(1, kClueShellCasings);
-	SDB_Add_MO_Clue(1, kClueLabShellCasings);
-	SDB_Add_Whereabouts_Clue(1, kClueDispatchHitAndRun);
-	SDB_Add_Whereabouts_Clue(1, kClueRuncitersViewB);
-	SDB_Add_Whereabouts_Clue(1, kClueChewInterview);
-	SDB_Add_Replicant_Clue(1, kClueOfficersStatement);
-	SDB_Add_Replicant_Clue(1, kClueDoorForced2);
-	SDB_Add_Replicant_Clue(1, kClueMorajiInterview);
-	SDB_Add_Replicant_Clue(1, kClueZubenTalksAboutLucy1);
-	SDB_Add_Replicant_Clue(1, kClueZubenTalksAboutLucy2);
-	SDB_Add_Replicant_Clue(1, kClueDektoraInterview4);
-	SDB_Add_Other_Clue(1, kClueAnimalMurderSuspect);
-	SDB_Add_Other_Clue(1, kClueGracefulFootprints);
-	SDB_Add_Other_Clue(1, kClueIzosWarning);
-	SDB_Add_Other_Clue(1, kClueAct2Ended);
-	SDB_Add_Other_Clue(1, kClueClovisAtMoonbus);
-	SDB_Add_Other_Clue(1, kClueAnimalMurderSuspect);
-	SDB_Add_Other_Clue(1, kClueIzosFriend);
-	SDB_Add_Other_Clue(1, kClueMilitaryBoots);
-	SDB_Add_Identity_Clue(1, kClueIzosWarning);
-	SDB_Add_Identity_Clue(1, kClueAct2Ended);
-	SDB_Add_Identity_Clue(1, kClueDektoraInterview4);
-	SDB_Add_Photo_Clue(1, kClueClovisAtMoonbus, 37);
-	SDB_Add_Photo_Clue(1, kClueAnimalMurderSuspect, 7);
-	SDB_Add_Photo_Clue(1, kClueIzosFriend, 25);
-	SDB_Add_Photo_Clue(1, kClueMilitaryBoots, 8);
-	SDB_Set_Actor(2, kActorZuben);
-	SDB_Set_Sex(2, 1);
-	SDB_Add_MO_Clue(2, kClueOfficersStatement);
-	SDB_Add_MO_Clue(2, kClueLabCorpses);
-	SDB_Add_Whereabouts_Clue(2, kClueDispatchHitAndRun);
-	SDB_Add_Whereabouts_Clue(2, kClueRuncitersViewB);
-	SDB_Add_Replicant_Clue(2, kClueOfficersStatement);
-	SDB_Add_Replicant_Clue(2, kClueDoorForced2);
-	SDB_Add_Replicant_Clue(2, kClueHowieLeeInterview);
-	SDB_Add_Replicant_Clue(2, kClueZubenRunsAway);
-	SDB_Add_Replicant_Clue(2, kClueZuben);
-	SDB_Add_Replicant_Clue(2, kClueZubenTalksAboutLucy1);
-	SDB_Add_Replicant_Clue(2, kClueZubenTalksAboutLucy2);
-	SDB_Add_Non_Replicant_Clue(2, kClueLimpingFootprints);
-	SDB_Add_Non_Replicant_Clue(2, kClueBigManLimping);
-	SDB_Add_Non_Replicant_Clue(2, kClueZubensMotive);
-	SDB_Add_Other_Clue(2, kClueCrowdInterviewA);
-	SDB_Add_Other_Clue(2, kClueZubenInterview);
-	SDB_Add_Other_Clue(2, kClueLucyInterview);
-	SDB_Add_Identity_Clue(2, kClueHowieLeeInterview);
-	SDB_Add_Identity_Clue(2, kClueZubenRunsAway);
-	SDB_Add_Identity_Clue(2, kClueZubenInterview);
-	SDB_Add_Identity_Clue(2, kClueLucyInterview);
-	SDB_Add_Photo_Clue(2, kClueZuben, 33);
-	SDB_Set_Actor(3, kActorLucy);
-	SDB_Set_Sex(3, 0);
-	SDB_Add_Whereabouts_Clue(3, kClueChopstickWrapper);
-	SDB_Add_Whereabouts_Clue(3, kClueSushiMenu);
-	SDB_Add_Whereabouts_Clue(3, kClueReferenceLetter);
-	SDB_Add_Whereabouts_Clue(3, kClueRuncitersViewA);
-	SDB_Add_Whereabouts_Clue(3, kClueHysteriaToken);
-	SDB_Add_Whereabouts_Clue(3, kClueZubenInterview);
-	SDB_Add_Replicant_Clue(3, kClueRunciterInterviewA);
-	SDB_Add_Replicant_Clue(3, kClueRunciterInterviewB1);
-	SDB_Add_Replicant_Clue(3, kClueVKLucyReplicant);
-	SDB_Add_Replicant_Clue(3, kClueZubenTalksAboutLucy1);
-	SDB_Add_Replicant_Clue(3, kClueDektoraInterview4);
-	SDB_Add_Replicant_Clue(3, kClueRuncitersConfession1);
-	SDB_Add_Non_Replicant_Clue(3, kClueToyDog);
-	SDB_Add_Non_Replicant_Clue(3, kClueRagDoll);
-	SDB_Add_Non_Replicant_Clue(3, kClueCandy);
-	SDB_Add_Non_Replicant_Clue(3, kClueVKLucyHuman);
-	SDB_Add_Non_Replicant_Clue(3, kClueZubenTalksAboutLucy2);
-	SDB_Add_Other_Clue(3, kClueLucy);
-	SDB_Add_Other_Clue(3, kClueCrowdInterviewA);
-	SDB_Add_Identity_Clue(3, kClueRunciterInterviewA);
-	SDB_Add_Identity_Clue(3, kClueDektoraInterview4);
-	SDB_Add_Photo_Clue(3, kClueLucy, 5);
-	SDB_Set_Actor(4, kActorDektora);
-	SDB_Add_MO_Clue(4, kClueScorpions);
-	SDB_Add_Replicant_Clue(4, kClueVKDektoraReplicant);
-	SDB_Add_Replicant_Clue(4, kClueEarlyQInterview);
-	SDB_Add_Replicant_Clue(4, kClueDragonflyBelt);
-	SDB_Add_Replicant_Clue(4, kClueDektoraInterview4);
-	SDB_Add_Non_Replicant_Clue(4, kClueVKDektoraHuman);
-	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview2);
-	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview3);
-	SDB_Add_Non_Replicant_Clue(4, kClueDektorasCard);
-	SDB_Add_Non_Replicant_Clue(4, kClueDektoraInterview1);
-	SDB_Add_Other_Clue(4, kClueDragonflyBelt);
-	SDB_Add_Other_Clue(4, kClueWomanInAnimoidRow);
-	SDB_Add_Other_Clue(4, kClueChinaBar);
-	SDB_Add_Other_Clue(4, kClueCarRegistration1);
-	SDB_Add_Identity_Clue(4, kClueDektoraInterview2);
-	SDB_Add_Identity_Clue(4, kClueDektoraInterview3);
-	SDB_Add_Identity_Clue(4, kClueEarlyQInterview);
-	SDB_Add_Photo_Clue(4, kClueWomanInAnimoidRow, 21);
-	SDB_Add_Photo_Clue(4, kClueChinaBar, 19);
-	SDB_Set_Actor(5, kActorGordo);
-	SDB_Set_Sex(5, 1);
-	SDB_Add_Whereabouts_Clue(5, kClueStolenCheese);
-	SDB_Add_Identity_Clue(5, kClueGordoInterview1);
-	SDB_Add_Identity_Clue(5, kClueGordoInterview2);
-	SDB_Set_Actor(6, kActorIzo);
-	SDB_Set_Sex(6, 1);
-	SDB_Add_Whereabouts_Clue(6, kClueBobInterview1);
-	SDB_Add_Whereabouts_Clue(6, kClueBobInterview2);
-	SDB_Add_Whereabouts_Clue(6, kClueGrigorianInterviewB2);
-	SDB_Add_Whereabouts_Clue(6, kClueHomelessManInterview1);
-	SDB_Add_Replicant_Clue(6, kClueGogglesReplicantIssue);
-	SDB_Add_Other_Clue(6, kClueGrigorianInterviewB1);
-	SDB_Add_Other_Clue(6, kClueWeaponsCache);
-	SDB_Add_Other_Clue(6, kClueFolder);
-	SDB_Add_Other_Clue(6, kClueIzosStashRaided);
-	SDB_Add_Other_Clue(6, kClueIzo);
-	SDB_Add_Other_Clue(6, kCluePhotoOfMcCoy1);
-	SDB_Add_Other_Clue(6, kCluePhotoOfMcCoy2);
-	SDB_Add_Other_Clue(6, kClueRadiationGoggles);
-	SDB_Add_Other_Clue(6, kClueIzoInterview);
-	SDB_Add_Identity_Clue(6, kClueGrigorianInterviewB2);
-	SDB_Add_Identity_Clue(6, kClueBobInterview1);
-	SDB_Add_Identity_Clue(6, kClueBobInterview2);
-	SDB_Add_Identity_Clue(6, kCluePhotoOfMcCoy1);
-	SDB_Add_Identity_Clue(6, kCluePhotoOfMcCoy2);
-	SDB_Add_Identity_Clue(6, kClueRadiationGoggles);
-	SDB_Add_Identity_Clue(6, kClueIzoInterview);
-	SDB_Add_Photo_Clue(6, kClueIzo, 26);
-	SDB_Set_Actor(7, kActorMcCoy);
-	SDB_Add_Replicant_Clue(7, kClueMcCoyAtMoonbus);
-	SDB_Add_Other_Clue(7, kCluePhotoOfMcCoy1);
-	SDB_Add_Other_Clue(7, kCluePhotoOfMcCoy2);
-	SDB_Add_Identity_Clue(7, kClueMcCoyAtMoonbus);
-	SDB_Add_Photo_Clue(7, kClueMcCoyAtMoonbus, 36);
-	SDB_Add_Photo_Clue(7, kCluePhotoOfMcCoy1, 17);
-	SDB_Add_Photo_Clue(7, kCluePhotoOfMcCoy2, 18);
-	SDB_Set_Actor(8, kActorGuzza);
-	SDB_Add_Other_Clue(8, kClueGuzza);
-	SDB_Add_Other_Clue(8, kClueFolder);
-	SDB_Add_Other_Clue(8, kClueGuzzaFramedMcCoy);
-	SDB_Add_Identity_Clue(8, kClueGuzza);
-	SDB_Add_Identity_Clue(8, kClueGuzzaFramedMcCoy);
-	SDB_Add_Identity_Clue(8, kClueFolder);
-	SDB_Add_Photo_Clue(8, kClueGuzza, 27);
+	SDB_Set_Actor(kSuspectSadik, kActorSadik);
+	SDB_Set_Sex(kSuspectSadik, 1);
+	SDB_Add_MO_Clue(kSuspectSadik, kClueCrystalsCase);
+	SDB_Add_MO_Clue(kSuspectSadik, kClueDetonatorWire);
+	SDB_Add_MO_Clue(kSuspectSadik, kClueSadiksGun);
+	SDB_Add_MO_Clue(kSuspectSadik, kCluePlasticExplosive);
+	SDB_Add_Whereabouts_Clue(kSuspectSadik, kClueTyrellSecurity);
+	SDB_Add_Whereabouts_Clue(kSuspectSadik, kClueKingstonKitchenBox1);
+	SDB_Add_Whereabouts_Clue(kSuspectSadik, kClueDragonflyEarring);
+	SDB_Add_Whereabouts_Clue(kSuspectSadik, kClueChewInterview);
+	SDB_Add_Whereabouts_Clue(kSuspectSadik, kClueHomelessManInterview1);
+	SDB_Add_Replicant_Clue(kSuspectSadik, kClueDetonatorWire);
+	SDB_Add_Replicant_Clue(kSuspectSadik, kClueCrystalsCase);
+	SDB_Add_Replicant_Clue(kSuspectSadik, kClueMorajiInterview);
+	SDB_Add_Replicant_Clue(kSuspectSadik, kClueAttemptedFileAccess);
+	SDB_Add_Replicant_Clue(kSuspectSadik, kClueExpertBomber);
+	SDB_Add_Replicant_Clue(kSuspectSadik, kClueRachaelInterview);
+	SDB_Add_Replicant_Clue(kSuspectSadik, kClueCrystalsCase);
+	SDB_Add_Non_Replicant_Clue(kSuspectSadik, kClueStaggeredbyPunches);
+	SDB_Add_Non_Replicant_Clue(kSuspectSadik, kClueIzosWarning);
+	SDB_Add_Non_Replicant_Clue(kSuspectSadik, kClueAmateurBomber);
+	SDB_Add_Other_Clue(kSuspectSadik, kClueGrigorianInterviewB1);
+	SDB_Add_Other_Clue(kSuspectSadik, kClueGrigorianInterviewB2);
+	SDB_Add_Other_Clue(kSuspectSadik, kClueAct2Ended);
+	SDB_Add_Other_Clue(kSuspectSadik, kClueBombingSuspect);
+	SDB_Add_Other_Clue(kSuspectSadik, kClueSadikAtMoonbus);
+	SDB_Add_Identity_Clue(kSuspectSadik, kClueAct2Ended);
+	SDB_Add_Photo_Clue(kSuspectSadik, kClueBombingSuspect, 31);
+	SDB_Add_Photo_Clue(kSuspectSadik, kClueSadikAtMoonbus, 38);
+
+	SDB_Set_Actor(kSuspectClovis, kActorClovis);
+	SDB_Set_Sex(kSuspectClovis, 1);
+	SDB_Add_MO_Clue(kSuspectClovis, kClueShellCasings);
+	SDB_Add_MO_Clue(kSuspectClovis, kClueLabShellCasings);
+	SDB_Add_Whereabouts_Clue(kSuspectClovis, kClueDispatchHitAndRun);
+	SDB_Add_Whereabouts_Clue(kSuspectClovis, kClueRuncitersViewB);
+	SDB_Add_Whereabouts_Clue(kSuspectClovis, kClueChewInterview);
+	SDB_Add_Replicant_Clue(kSuspectClovis, kClueOfficersStatement);
+	SDB_Add_Replicant_Clue(kSuspectClovis, kClueDoorForced2);
+	SDB_Add_Replicant_Clue(kSuspectClovis, kClueMorajiInterview);
+	SDB_Add_Replicant_Clue(kSuspectClovis, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(kSuspectClovis, kClueZubenTalksAboutLucy2);
+	SDB_Add_Replicant_Clue(kSuspectClovis, kClueDektoraInterview4);
+	SDB_Add_Other_Clue(kSuspectClovis, kClueAnimalMurderSuspect);
+	SDB_Add_Other_Clue(kSuspectClovis, kClueGracefulFootprints);
+	SDB_Add_Other_Clue(kSuspectClovis, kClueIzosWarning);
+	SDB_Add_Other_Clue(kSuspectClovis, kClueAct2Ended);
+	SDB_Add_Other_Clue(kSuspectClovis, kClueClovisAtMoonbus);
+	SDB_Add_Other_Clue(kSuspectClovis, kClueAnimalMurderSuspect);
+	SDB_Add_Other_Clue(kSuspectClovis, kClueIzosFriend);
+	SDB_Add_Other_Clue(kSuspectClovis, kClueMilitaryBoots);
+	SDB_Add_Identity_Clue(kSuspectClovis, kClueIzosWarning);
+	SDB_Add_Identity_Clue(kSuspectClovis, kClueAct2Ended);
+	SDB_Add_Identity_Clue(kSuspectClovis, kClueDektoraInterview4);
+	SDB_Add_Photo_Clue(kSuspectClovis, kClueClovisAtMoonbus, 37);
+	SDB_Add_Photo_Clue(kSuspectClovis, kClueAnimalMurderSuspect, 7);
+	SDB_Add_Photo_Clue(kSuspectClovis, kClueIzosFriend, 25);
+	SDB_Add_Photo_Clue(kSuspectClovis, kClueMilitaryBoots, 8);
+
+	SDB_Set_Actor(kSuspectZuben, kActorZuben);
+	SDB_Set_Sex(kSuspectZuben, 1);
+	SDB_Add_MO_Clue(kSuspectZuben, kClueOfficersStatement);
+	SDB_Add_MO_Clue(kSuspectZuben, kClueLabCorpses);
+	SDB_Add_Whereabouts_Clue(kSuspectZuben, kClueDispatchHitAndRun);
+	SDB_Add_Whereabouts_Clue(kSuspectZuben, kClueRuncitersViewB);
+	SDB_Add_Replicant_Clue(kSuspectZuben, kClueOfficersStatement);
+	SDB_Add_Replicant_Clue(kSuspectZuben, kClueDoorForced2);
+	SDB_Add_Replicant_Clue(kSuspectZuben, kClueHowieLeeInterview);
+	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZubenRunsAway);
+	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZuben);
+	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(kSuspectZuben, kClueZubenTalksAboutLucy2);
+	SDB_Add_Non_Replicant_Clue(kSuspectZuben, kClueLimpingFootprints);
+	SDB_Add_Non_Replicant_Clue(kSuspectZuben, kClueBigManLimping);
+	SDB_Add_Non_Replicant_Clue(kSuspectZuben, kClueZubensMotive);
+	SDB_Add_Other_Clue(kSuspectZuben, kClueCrowdInterviewA);
+	SDB_Add_Other_Clue(kSuspectZuben, kClueZubenInterview);
+	SDB_Add_Other_Clue(kSuspectZuben, kClueLucyInterview);
+	SDB_Add_Identity_Clue(kSuspectZuben, kClueHowieLeeInterview);
+	SDB_Add_Identity_Clue(kSuspectZuben, kClueZubenRunsAway);
+	SDB_Add_Identity_Clue(kSuspectZuben, kClueZubenInterview);
+	SDB_Add_Identity_Clue(kSuspectZuben, kClueLucyInterview);
+	SDB_Add_Photo_Clue(kSuspectZuben, kClueZuben, 33);
+
+	SDB_Set_Actor(kSuspectLucy, kActorLucy);
+	SDB_Set_Sex(kSuspectLucy, 0);
+	SDB_Add_Whereabouts_Clue(kSuspectLucy, kClueChopstickWrapper);
+	SDB_Add_Whereabouts_Clue(kSuspectLucy, kClueSushiMenu);
+	SDB_Add_Whereabouts_Clue(kSuspectLucy, kClueReferenceLetter);
+	SDB_Add_Whereabouts_Clue(kSuspectLucy, kClueRuncitersViewA);
+	SDB_Add_Whereabouts_Clue(kSuspectLucy, kClueHysteriaToken);
+	SDB_Add_Whereabouts_Clue(kSuspectLucy, kClueZubenInterview);
+	SDB_Add_Replicant_Clue(kSuspectLucy, kClueRunciterInterviewA);
+	SDB_Add_Replicant_Clue(kSuspectLucy, kClueRunciterInterviewB1);
+	SDB_Add_Replicant_Clue(kSuspectLucy, kClueVKLucyReplicant);
+	SDB_Add_Replicant_Clue(kSuspectLucy, kClueZubenTalksAboutLucy1);
+	SDB_Add_Replicant_Clue(kSuspectLucy, kClueDektoraInterview4);
+	SDB_Add_Replicant_Clue(kSuspectLucy, kClueRuncitersConfession1);
+	SDB_Add_Non_Replicant_Clue(kSuspectLucy, kClueToyDog);
+	SDB_Add_Non_Replicant_Clue(kSuspectLucy, kClueRagDoll);
+	SDB_Add_Non_Replicant_Clue(kSuspectLucy, kClueCandy);
+	SDB_Add_Non_Replicant_Clue(kSuspectLucy, kClueVKLucyHuman);
+	SDB_Add_Non_Replicant_Clue(kSuspectLucy, kClueZubenTalksAboutLucy2);
+	SDB_Add_Other_Clue(kSuspectLucy, kClueLucy);
+	SDB_Add_Other_Clue(kSuspectLucy, kClueCrowdInterviewA);
+	SDB_Add_Identity_Clue(kSuspectLucy, kClueRunciterInterviewA);
+	SDB_Add_Identity_Clue(kSuspectLucy, kClueDektoraInterview4);
+	SDB_Add_Photo_Clue(kSuspectLucy, kClueLucy, 5);
+
+	SDB_Set_Actor(kSuspectDekora, kActorDektora);
+	SDB_Add_MO_Clue(kSuspectDekora, kClueScorpions);
+	SDB_Add_Replicant_Clue(kSuspectDekora, kClueVKDektoraReplicant);
+	SDB_Add_Replicant_Clue(kSuspectDekora, kClueEarlyQInterview);
+	SDB_Add_Replicant_Clue(kSuspectDekora, kClueDragonflyBelt);
+	SDB_Add_Replicant_Clue(kSuspectDekora, kClueDektoraInterview4);
+	SDB_Add_Non_Replicant_Clue(kSuspectDekora, kClueVKDektoraHuman);
+	SDB_Add_Non_Replicant_Clue(kSuspectDekora, kClueDektoraInterview2);
+	SDB_Add_Non_Replicant_Clue(kSuspectDekora, kClueDektoraInterview3);
+	SDB_Add_Non_Replicant_Clue(kSuspectDekora, kClueDektorasCard);
+	SDB_Add_Non_Replicant_Clue(kSuspectDekora, kClueDektoraInterview1);
+	SDB_Add_Other_Clue(kSuspectDekora, kClueDragonflyBelt);
+	SDB_Add_Other_Clue(kSuspectDekora, kClueWomanInAnimoidRow);
+	SDB_Add_Other_Clue(kSuspectDekora, kClueChinaBar);
+	SDB_Add_Other_Clue(kSuspectDekora, kClueCarRegistration1);
+	SDB_Add_Identity_Clue(kSuspectDekora, kClueDektoraInterview2);
+	SDB_Add_Identity_Clue(kSuspectDekora, kClueDektoraInterview3);
+	SDB_Add_Identity_Clue(kSuspectDekora, kClueEarlyQInterview);
+	SDB_Add_Photo_Clue(kSuspectDekora, kClueWomanInAnimoidRow, 21);
+	SDB_Add_Photo_Clue(kSuspectDekora, kClueChinaBar, 19);
+
+	SDB_Set_Actor(kSuspectGordo, kActorGordo);
+	SDB_Set_Sex(kSuspectGordo, 1);
+	SDB_Add_Whereabouts_Clue(kSuspectGordo, kClueStolenCheese);
+	SDB_Add_Identity_Clue(kSuspectGordo, kClueGordoInterview1);
+	SDB_Add_Identity_Clue(kSuspectGordo, kClueGordoInterview2);
+
+	SDB_Set_Actor(kSuspectIzo, kActorIzo);
+	SDB_Set_Sex(kSuspectIzo, 1);
+	SDB_Add_Whereabouts_Clue(kSuspectIzo, kClueBobInterview1);
+	SDB_Add_Whereabouts_Clue(kSuspectIzo, kClueBobInterview2);
+	SDB_Add_Whereabouts_Clue(kSuspectIzo, kClueGrigorianInterviewB2);
+	SDB_Add_Whereabouts_Clue(kSuspectIzo, kClueHomelessManInterview1);
+	SDB_Add_Replicant_Clue(kSuspectIzo, kClueGogglesReplicantIssue);
+	SDB_Add_Other_Clue(kSuspectIzo, kClueGrigorianInterviewB1);
+	SDB_Add_Other_Clue(kSuspectIzo, kClueWeaponsCache);
+	SDB_Add_Other_Clue(kSuspectIzo, kClueFolder);
+	SDB_Add_Other_Clue(kSuspectIzo, kClueIzosStashRaided);
+	SDB_Add_Other_Clue(kSuspectIzo, kClueIzo);
+	SDB_Add_Other_Clue(kSuspectIzo, kCluePhotoOfMcCoy1);
+	SDB_Add_Other_Clue(kSuspectIzo, kCluePhotoOfMcCoy2);
+	SDB_Add_Other_Clue(kSuspectIzo, kClueRadiationGoggles);
+	SDB_Add_Other_Clue(kSuspectIzo, kClueIzoInterview);
+	SDB_Add_Identity_Clue(kSuspectIzo, kClueGrigorianInterviewB2);
+	SDB_Add_Identity_Clue(kSuspectIzo, kClueBobInterview1);
+	SDB_Add_Identity_Clue(kSuspectIzo, kClueBobInterview2);
+	SDB_Add_Identity_Clue(kSuspectIzo, kCluePhotoOfMcCoy1);
+	SDB_Add_Identity_Clue(kSuspectIzo, kCluePhotoOfMcCoy2);
+	SDB_Add_Identity_Clue(kSuspectIzo, kClueRadiationGoggles);
+	SDB_Add_Identity_Clue(kSuspectIzo, kClueIzoInterview);
+	SDB_Add_Photo_Clue(kSuspectIzo, kClueIzo, 26);
+
+	SDB_Set_Actor(kSuspectMcCoy, kActorMcCoy);
+	SDB_Add_Replicant_Clue(kSuspectMcCoy, kClueMcCoyAtMoonbus);
+	SDB_Add_Other_Clue(kSuspectMcCoy, kCluePhotoOfMcCoy1);
+	SDB_Add_Other_Clue(kSuspectMcCoy, kCluePhotoOfMcCoy2);
+	SDB_Add_Identity_Clue(kSuspectMcCoy, kClueMcCoyAtMoonbus);
+	SDB_Add_Photo_Clue(kSuspectMcCoy, kClueMcCoyAtMoonbus, 36);
+	SDB_Add_Photo_Clue(kSuspectMcCoy, kCluePhotoOfMcCoy1, 17);
+	SDB_Add_Photo_Clue(kSuspectMcCoy, kCluePhotoOfMcCoy2, 18);
+
+	SDB_Set_Actor(kSuspectGuzza, kActorGuzza);
+	SDB_Add_Other_Clue(kSuspectGuzza, kClueGuzza);
+	SDB_Add_Other_Clue(kSuspectGuzza, kClueFolder);
+	SDB_Add_Other_Clue(kSuspectGuzza, kClueGuzzaFramedMcCoy);
+	SDB_Add_Identity_Clue(kSuspectGuzza, kClueGuzza);
+	SDB_Add_Identity_Clue(kSuspectGuzza, kClueGuzzaFramedMcCoy);
+	SDB_Add_Identity_Clue(kSuspectGuzza, kClueFolder);
+	SDB_Add_Photo_Clue(kSuspectGuzza, kClueGuzza, 27);
 }
 
 void ScriptInit::Init_CDB() {
@@ -2396,6 +2405,7 @@ void ScriptInit::Init_CDB() {
 	CDB_Set_Crime(kClueLucy, kCrimeAnimalMurder);
 	CDB_Set_Crime(kClueDragonflyAnklet, kCrimeAnimalMurder);
 	CDB_Set_Crime(kClueZuben, kCrimeAnimalMurder);
+
 	CDB_Set_Crime(kCluePhoneCallGuzza, kCrimeEisendullerMurder);
 	CDB_Set_Crime(kClueDragonflyEarring, kCrimeEisendullerMurder);
 	CDB_Set_Crime(kClueTyrellSecurity, kCrimeEisendullerMurder);
@@ -2414,6 +2424,7 @@ void ScriptInit::Init_CDB() {
 	CDB_Set_Crime(kClueKingstonKitchenBox2, kCrimeEisendullerMurder);
 	CDB_Set_Crime(kCluePlasticExplosive, kCrimeEisendullerMurder);
 	CDB_Set_Crime(kClueTyrellSecurityPhoto, kCrimeEisendullerMurder);
+
 	CDB_Set_Crime(kClueGaffsInformation, kCrimeMoonbusHijacking);
 	CDB_Set_Crime(kClueMoonbus1, kCrimeMoonbusHijacking);
 	CDB_Set_Crime(kClueMcCoyAtMoonbus, kCrimeMoonbusHijacking);
@@ -2422,13 +2433,16 @@ void ScriptInit::Init_CDB() {
 	CDB_Set_Crime(kClueVKLucyReplicant, kCrimeMoonbusHijacking);
 	CDB_Set_Crime(kClueCrystalsCase, kCrimeMoonbusHijacking);
 	CDB_Set_Crime(kCluePhoneCallCrystal, kCrimeMoonbusHijacking);
+
 	CDB_Set_Crime(kClueCrimeSceneNotes, kCrimeFactoryBombing);
 	CDB_Set_Crime(kClueGrigorianInterviewA, kCrimeFactoryBombing);
 	CDB_Set_Crime(kClueGrigorianInterviewB1, kCrimeFactoryBombing);
 	CDB_Set_Crime(kClueGrigorianInterviewB2, kCrimeFactoryBombing);
+
 	CDB_Set_Crime(kClueMorajiInterview, kCrimeMorajiMurder);
 	CDB_Set_Crime(kClueExpertBomber, kCrimeMorajiMurder);
 	CDB_Set_Crime(kClueAmateurBomber, kCrimeMorajiMurder);
+
 	CDB_Set_Crime(kClueWeaponsCache, kCrimeArmsDealing);
 	CDB_Set_Crime(kClueFolder, kCrimeArmsDealing);
 	CDB_Set_Crime(kClueIzosStashRaided, kCrimeArmsDealing);
@@ -2439,206 +2453,208 @@ void ScriptInit::Init_CDB() {
 	CDB_Set_Crime(kCluePoliceIssueWeapons, kCrimeArmsDealing);
 	CDB_Set_Crime(kClueFolder, kCrimeArmsDealing);
 	CDB_Set_Crime(kClueGuzzaFramedMcCoy, kCrimeArmsDealing);
+
 	CDB_Set_Crime(kClueStaggeredbyPunches, kCrimeBradburyAssault);
 	CDB_Set_Crime(kClueAct2Ended, kCrimeBradburyAssault);
-	int i = 0;
-	do {
-		CDB_Set_Clue_Asset_Type(i++, -1);
-	} while (i < 288);
-	CDB_Set_Clue_Asset_Type(kClueOfficersStatement, 2);
-	CDB_Set_Clue_Asset_Type(kClueDoorForced2, 2);
-	CDB_Set_Clue_Asset_Type(kClueLimpingFootprints, 2);
-	CDB_Set_Clue_Asset_Type(kClueGracefulFootprints, 2);
-	CDB_Set_Clue_Asset_Type(kClueShellCasings, 3);
-	CDB_Set_Clue_Asset_Type(kClueCandy, 3);
-	CDB_Set_Clue_Asset_Type(kClueToyDog, 3);
-	CDB_Set_Clue_Asset_Type(kClueChopstickWrapper, 3);
-	CDB_Set_Clue_Asset_Type(kClueSushiMenu, 0);
-	CDB_Set_Clue_Asset_Type(kClueLabCorpses, 2);
-	CDB_Set_Clue_Asset_Type(kClueLabShellCasings, 2);
-	CDB_Set_Clue_Asset_Type(kClueRuncitersVideo, 1);
-	CDB_Set_Clue_Asset_Type(kClueLucy, 0);
-	CDB_Set_Clue_Asset_Type(kClueDragonflyAnklet, 0);
-	CDB_Set_Clue_Asset_Type(kClueReferenceLetter, 3);
-	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewA, 2);
-	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewB, 2);
-	CDB_Set_Clue_Asset_Type(kClueZubenInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueZuben, 0);
-	CDB_Set_Clue_Asset_Type(kClueBigManLimping, 2);
-	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewA, 2);
-	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB1, 2);
-	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB2, 2);
-	CDB_Set_Clue_Asset_Type(kClueHowieLeeInterview, 2);
-	CDB_Set_Clue_Asset_Type(kCluePaintTransfer, 2);
-	CDB_Set_Clue_Asset_Type(kClueChromeDebris, 3);
-	CDB_Set_Clue_Asset_Type(kClueRuncitersViewA, 0);
-	CDB_Set_Clue_Asset_Type(kClueRuncitersViewB, 0);
-	CDB_Set_Clue_Asset_Type(kClueCarColorAndMake, 0);
-	CDB_Set_Clue_Asset_Type(kCluePartialLicenseNumber, 0);
-	CDB_Set_Clue_Asset_Type(kClueBriefcase, 3);
-	CDB_Set_Clue_Asset_Type(kClueGaffsInformation, 2);
-	CDB_Set_Clue_Asset_Type(kClueCrystalVisitedRunciters, -1);
-	CDB_Set_Clue_Asset_Type(kClueCrystalVisitedChinatown, -1);
-	CDB_Set_Clue_Asset_Type(kClueWantedPoster, 0);
-	CDB_Set_Clue_Asset_Type(kClueLicensePlate, 3);
-	CDB_Set_Clue_Asset_Type(kClueLabPaintTransfer, 2);
-	CDB_Set_Clue_Asset_Type(kClueDispatchHitAndRun, 2);
-	CDB_Set_Clue_Asset_Type(kClueInceptShotRoy, 0);
-	CDB_Set_Clue_Asset_Type(kCluePhoneCallGuzza, 2);
-	CDB_Set_Clue_Asset_Type(kClueDragonflyEarring, 3);
-	CDB_Set_Clue_Asset_Type(kClueTyrellSecurity, 1);
-	CDB_Set_Clue_Asset_Type(kClueTyrellGuardInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueBombingSuspect, 0);
-	CDB_Set_Clue_Asset_Type(kClueSadiksGun, 0);
-	CDB_Set_Clue_Asset_Type(kClueDetonatorWire, 3);
-	CDB_Set_Clue_Asset_Type(kClueVictimInformation, 2);
-	CDB_Set_Clue_Asset_Type(kClueAttemptedFileAccess, 2);
-	CDB_Set_Clue_Asset_Type(kClueCrystalsCase, 2);
-	CDB_Set_Clue_Asset_Type(kClueKingstonKitchenBox1, 3);
-	CDB_Set_Clue_Asset_Type(kClueTyrellSalesPamphlet1, 3);
-	CDB_Set_Clue_Asset_Type(kClueTyrellSalesPamphlet2, 3);
-	CDB_Set_Clue_Asset_Type(kCluePeruvianLadyInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueHasanInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueBobInterview1, 2);
-	CDB_Set_Clue_Asset_Type(kClueBobInterview2, 2);
-	CDB_Set_Clue_Asset_Type(kClueIzoInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueIzosWarning, 2);
-	CDB_Set_Clue_Asset_Type(kClueRadiationGoggles, 3);
-	CDB_Set_Clue_Asset_Type(kClueGogglesReplicantIssue, 2);
-	CDB_Set_Clue_Asset_Type(kClueFishLadyInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueDogCollar1, 3);
-	CDB_Set_Clue_Asset_Type(kClueWeaponsCache, 2);
-	CDB_Set_Clue_Asset_Type(kClueChewInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueMorajiInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueGordoInterview1, 2);
-	CDB_Set_Clue_Asset_Type(kClueGordoInterview2, 2);
-	CDB_Set_Clue_Asset_Type(kClueAnsweringMachineMessage, 2);
-	CDB_Set_Clue_Asset_Type(kClueChessTable, 2);
-	CDB_Set_Clue_Asset_Type(kClueStaggeredbyPunches, 2);
-	CDB_Set_Clue_Asset_Type(kClueMaggieBracelet, 3);
-	CDB_Set_Clue_Asset_Type(kClueEnvelope, 3);
-	CDB_Set_Clue_Asset_Type(kClueIzosFriend, 0);
-	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityPhoto, 0);
-	CDB_Set_Clue_Asset_Type(kCluePurchasedScorpions, 2);
-	CDB_Set_Clue_Asset_Type(kClueWeaponsOrderForm, 3);
-	CDB_Set_Clue_Asset_Type(kClueShippingForm, 3);
-	CDB_Set_Clue_Asset_Type(kClueHysteriaToken, 3);
-	CDB_Set_Clue_Asset_Type(kClueRagDoll, 3);
-	CDB_Set_Clue_Asset_Type(kClueMoonbus1, 0);
-	CDB_Set_Clue_Asset_Type(kClueCheese, 3);
-	CDB_Set_Clue_Asset_Type(kClueDektorasDressingRoom, 0);
-	CDB_Set_Clue_Asset_Type(kClueEarlyQsClub, 1);
-	CDB_Set_Clue_Asset_Type(kClueStrangeScale1, 3);
-	CDB_Set_Clue_Asset_Type(kClueDektoraInterview1, 2);
-	CDB_Set_Clue_Asset_Type(kClueDektoraInterview2, 2);
-	CDB_Set_Clue_Asset_Type(kClueDektoraInterview3, 2);
-	CDB_Set_Clue_Asset_Type(kClueDektorasCard, 3);
-	CDB_Set_Clue_Asset_Type(kClueGrigoriansNote, 3);
-	CDB_Set_Clue_Asset_Type(kClueCollectionReceipt, 3);
-	CDB_Set_Clue_Asset_Type(kClueSpecialIngredient, 2);
-	CDB_Set_Clue_Asset_Type(kClueStolenCheese, 2);
-	CDB_Set_Clue_Asset_Type(kClueGordoInterview3, 2);
-	CDB_Set_Clue_Asset_Type(kClueGordoConfession, 2);
-	CDB_Set_Clue_Asset_Type(kClueGordosLighter1, 3);
-	CDB_Set_Clue_Asset_Type(kClueGordosLighter2, 3);
-	CDB_Set_Clue_Asset_Type(kClueDektoraInterview4, 2);
-	CDB_Set_Clue_Asset_Type(kClueHollowayInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueBakersBadge, 3);
-	CDB_Set_Clue_Asset_Type(kClueHoldensBadge, 3);
-	CDB_Set_Clue_Asset_Type(kClueCarIdentified, 2);
-	CDB_Set_Clue_Asset_Type(kClueCarRegistration1, 2);
-	CDB_Set_Clue_Asset_Type(kClueCarRegistration2, 2);
-	CDB_Set_Clue_Asset_Type(kClueCarRegistration3, 2);
-	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview1, 2);
-	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview2, 2);
-	CDB_Set_Clue_Asset_Type(kClueLichenDogWrapper, 3);
-	CDB_Set_Clue_Asset_Type(kClueRequisitionForm, 3);
-	CDB_Set_Clue_Asset_Type(kClueScaryChair, 2);
-	CDB_Set_Clue_Asset_Type(kClueIzosStashRaided, 2);
-	CDB_Set_Clue_Asset_Type(kClueHomelessManInterview1, 2);
-	CDB_Set_Clue_Asset_Type(kClueHomelessManInterview2, 2);
-	CDB_Set_Clue_Asset_Type(kClueHomelessManKid, 2);
-	CDB_Set_Clue_Asset_Type(kClueGuzzaFramedMcCoy, 2);
-	CDB_Set_Clue_Asset_Type(kClueOriginalShippingForm, 3);
-	CDB_Set_Clue_Asset_Type(kClueOriginalRequisitionForm, 3);
-	CDB_Set_Clue_Asset_Type(kClueCandyWrapper, 3);
-	CDB_Set_Clue_Asset_Type(kClueFlaskOfAbsinthe, 3);
-	CDB_Set_Clue_Asset_Type(kClueDektoraConfession, 2);
-	CDB_Set_Clue_Asset_Type(kClueRunciterConfession1, 2);
-	CDB_Set_Clue_Asset_Type(kClueRunciterConfession2, 2);
-	CDB_Set_Clue_Asset_Type(kClueLutherLanceInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueMoonbus2, 0);
-	CDB_Set_Clue_Asset_Type(kClueMoonbusCloseup, 0);
-	CDB_Set_Clue_Asset_Type(kCluePhoneCallDektora1, 2);
-	CDB_Set_Clue_Asset_Type(kCluePhoneCallDektora2, 2);
-	CDB_Set_Clue_Asset_Type(kCluePhoneCallLucy1, 2);
-	CDB_Set_Clue_Asset_Type(kCluePhoneCallLucy2, 2);
-	CDB_Set_Clue_Asset_Type(kCluePhoneCallClovis, 2);
-	CDB_Set_Clue_Asset_Type(kCluePhoneCallCrystal, 2);
-	CDB_Set_Clue_Asset_Type(kCluePowerSource, 3);
-	CDB_Set_Clue_Asset_Type(kClueBomb, 3);
-	CDB_Set_Clue_Asset_Type(kClueCrimeSceneNotes, 2);
-	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewA, 2);
-	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewB1, 2);
-	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewB2, 2);
-	CDB_Set_Clue_Asset_Type(kClueDNATyrell, 3);
-	CDB_Set_Clue_Asset_Type(kClueDNASebastian, 3);
-	CDB_Set_Clue_Asset_Type(kClueDNAChew, 3);
-	CDB_Set_Clue_Asset_Type(kClueDNAMoraji, 3);
-	CDB_Set_Clue_Asset_Type(kClueDNALutherLance, 3);
-	CDB_Set_Clue_Asset_Type(kClueDNAMarcus, 3);
-	CDB_Set_Clue_Asset_Type(kClueAnimalMurderSuspect, 0);
-	CDB_Set_Clue_Asset_Type(kClueMilitaryBoots, 0);
-	CDB_Set_Clue_Asset_Type(kClueOuterDressingRoom, 0);
-	CDB_Set_Clue_Asset_Type(kCluePhotoOfMcCoy1, 0);
-	CDB_Set_Clue_Asset_Type(kCluePhotoOfMcCoy2, 0);
-	CDB_Set_Clue_Asset_Type(kClueEarlyQAndLucy, 0);
-	CDB_Set_Clue_Asset_Type(kClueClovisflowers, 0);
-	CDB_Set_Clue_Asset_Type(kClueLucyWithDektora, 0);
-	CDB_Set_Clue_Asset_Type(kClueWomanInAnimoidRow, 0);
-	CDB_Set_Clue_Asset_Type(kClueScorpions, 0);
-	CDB_Set_Clue_Asset_Type(kClueStrangeScale2, 0);
-	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityCamera, 0);
-	CDB_Set_Clue_Asset_Type(kClueIzo, 0);
-	CDB_Set_Clue_Asset_Type(kClueGuzza, 0);
-	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityDisc, 1);
-	CDB_Set_Clue_Asset_Type(kClueScorpionbox, 0);
-	CDB_Set_Clue_Asset_Type(kClueTyrellSecurityPhoto, 0);
-	CDB_Set_Clue_Asset_Type(kClueChinaBar, 0);
-	CDB_Set_Clue_Asset_Type(kCluePlasticExplosive, 0);
-	CDB_Set_Clue_Asset_Type(kClueDogCollar2, 0);
-	CDB_Set_Clue_Asset_Type(kClueKingstonKitchenBox2, 0);
-	CDB_Set_Clue_Asset_Type(kClueCrystalsCigarette, 3);
-	CDB_Set_Clue_Asset_Type(kClueSpinnerKeys, 3);
-	CDB_Set_Clue_Asset_Type(kClueExpertBomber, 2);
-	CDB_Set_Clue_Asset_Type(kClueAmateurBomber, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKLucyReplicant, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKLucyHuman, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKDektoraReplicant, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKDektoraHuman, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKBobGorskyReplicant, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKBobGorskyHuman, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKGrigorianReplicant, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKGrigorianHuman, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKRunciterReplicant, 2);
-	CDB_Set_Clue_Asset_Type(kClueVKRunciterHuman, 2);
-	CDB_Set_Clue_Asset_Type(kClueLucyInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueMoonbusReflection, 0);
-	CDB_Set_Clue_Asset_Type(kClueMcCoyAtMoonbus, 0);
-	CDB_Set_Clue_Asset_Type(kClueClovisAtMoonbus, 0);
-	CDB_Set_Clue_Asset_Type(kClueSadikAtMoonbus, 0);
-	CDB_Set_Clue_Asset_Type(kClueZubenTalksAboutLucy1, 2);
-	CDB_Set_Clue_Asset_Type(kClueZubenTalksAboutLucy2, 2);
-	CDB_Set_Clue_Asset_Type(kClueZubensMotive, 2);
-	CDB_Set_Clue_Asset_Type(kClueRachaelInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueTyrellInterview, 2);
-	CDB_Set_Clue_Asset_Type(kClueRuncitersConfession1, 2);
-	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewA, 2);
-	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewB1, 2);
-	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewB2, 2);
-	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview3, 2);
-	CDB_Set_Clue_Asset_Type(kClueCrazylegGgrovels, 2);
-	CDB_Set_Clue_Asset_Type(kClueFolder, 3);
+
+	for(int i = 0; i != 288; ++i) {
+		CDB_Set_Clue_Asset_Type(i, kClueTypeIntangible);
+	}
+
+	CDB_Set_Clue_Asset_Type(kClueOfficersStatement, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueDoorForced2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueLimpingFootprints, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGracefulFootprints, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueShellCasings, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueCandy, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueToyDog, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueChopstickWrapper, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueSushiMenu, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueLabCorpses, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueLabShellCasings, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersVideo, kClueTypeVideoClip);
+	CDB_Set_Clue_Asset_Type(kClueLucy, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueDragonflyAnklet, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueReferenceLetter, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewA, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCrowdInterviewB, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueZubenInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueZuben, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueBigManLimping, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewA, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRunciterInterviewB2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueHowieLeeInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kCluePaintTransfer, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueChromeDebris, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersViewA, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersViewB, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueCarColorAndMake, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kCluePartialLicenseNumber, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueBriefcase, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueGaffsInformation, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCrystalVisitedRunciters, kClueTypeIntangible);
+	CDB_Set_Clue_Asset_Type(kClueCrystalVisitedChinatown, kClueTypeIntangible);
+	CDB_Set_Clue_Asset_Type(kClueWantedPoster, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueLicensePlate, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueLabPaintTransfer, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueDispatchHitAndRun, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueInceptShotRoy, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallGuzza, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueDragonflyEarring, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSecurity, kClueTypeVideoClip);
+	CDB_Set_Clue_Asset_Type(kClueTyrellGuardInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueBombingSuspect, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueSadiksGun, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueDetonatorWire, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueVictimInformation, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueAttemptedFileAccess, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCrystalsCase, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueKingstonKitchenBox1, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSalesPamphlet1, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSalesPamphlet2, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kCluePeruvianLadyInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueHasanInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueBobInterview1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueBobInterview2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueIzoInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueIzosWarning, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRadiationGoggles, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueGogglesReplicantIssue, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueFishLadyInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueDogCollar1, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueWeaponsCache, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueChewInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueMorajiInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueAnsweringMachineMessage, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueChessTable, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueStaggeredbyPunches, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueMaggieBracelet, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueEnvelope, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueIzosFriend, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityPhoto, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kCluePurchasedScorpions, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueWeaponsOrderForm, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueShippingForm, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueHysteriaToken, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueRagDoll, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueMoonbus1, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueCheese, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDektorasDressingRoom, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueEarlyQsClub, kClueTypeVideoClip);
+	CDB_Set_Clue_Asset_Type(kClueStrangeScale1, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview3, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueDektorasCard, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueGrigoriansNote, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueCollectionReceipt, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueSpecialIngredient, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueStolenCheese, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGordoInterview3, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGordoConfession, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGordosLighter1, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueGordosLighter2, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDektoraInterview4, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueHollowayInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueBakersBadge, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueHoldensBadge, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueCarIdentified, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCarRegistration3, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueLichenDogWrapper, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueRequisitionForm, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueScaryChair, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueIzosStashRaided, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManInterview1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManInterview2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueHomelessManKid, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGuzzaFramedMcCoy, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueOriginalShippingForm, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueOriginalRequisitionForm, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueCandyWrapper, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueFlaskOfAbsinthe, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDektoraConfession, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRunciterConfession1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRunciterConfession2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueLutherLanceInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueMoonbus2, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueMoonbusCloseup, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallDektora1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallDektora2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallLucy1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallLucy2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallClovis, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kCluePhoneCallCrystal, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kCluePowerSource, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueBomb, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueCrimeSceneNotes, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewA, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewB1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueGrigorianInterviewB2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueDNATyrell, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDNASebastian, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDNAChew, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDNAMoraji, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDNALutherLance, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueDNAMarcus, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueAnimalMurderSuspect, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueMilitaryBoots, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueOuterDressingRoom, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kCluePhotoOfMcCoy1, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kCluePhotoOfMcCoy2, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueEarlyQAndLucy, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueClovisflowers, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueLucyWithDektora, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueWomanInAnimoidRow, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueScorpions, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueStrangeScale2, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityCamera, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueIzo, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueGuzza, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueChinaBarSecurityDisc, kClueTypeVideoClip);
+	CDB_Set_Clue_Asset_Type(kClueScorpionbox, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueTyrellSecurityPhoto, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueChinaBar, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kCluePlasticExplosive, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueDogCollar2, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueKingstonKitchenBox2, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueCrystalsCigarette, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueSpinnerKeys, kClueTypeObject);
+	CDB_Set_Clue_Asset_Type(kClueExpertBomber, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueAmateurBomber, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKLucyReplicant, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKLucyHuman, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKDektoraReplicant, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKDektoraHuman, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKBobGorskyReplicant, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKBobGorskyHuman, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKGrigorianReplicant, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKGrigorianHuman, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKRunciterReplicant, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueVKRunciterHuman, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueLucyInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueMoonbusReflection, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueMcCoyAtMoonbus, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueClovisAtMoonbus, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueSadikAtMoonbus, kClueTypePhotograph);
+	CDB_Set_Clue_Asset_Type(kClueZubenTalksAboutLucy1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueZubenTalksAboutLucy2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueZubensMotive, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRachaelInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueTyrellInterview, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueRuncitersConfession1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewA, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewB1, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueEarlyInterviewB2, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegsInterview3, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueCrazylegGgrovels, kClueTypeAudioRecording);
+	CDB_Set_Clue_Asset_Type(kClueFolder, kClueTypeObject);
 }
 
 void ScriptInit::Init_Spinner() {
diff --git a/engines/bladerunner/script/scene/rc01.cpp b/engines/bladerunner/script/scene/rc01.cpp
index 79bf1045ce..dd793ad440 100644
--- a/engines/bladerunner/script/scene/rc01.cpp
+++ b/engines/bladerunner/script/scene/rc01.cpp
@@ -25,13 +25,13 @@
 namespace BladeRunner {
 
 void SceneScriptRC01::InitializeScene() {
-#if _DEBUG
+#if BLADERUNNER_DEBUG_GAME
 	//TODO: not part of game, remove
-	// Game_Flag_Set(kFlagIntroPlayed); // force skip intro
-	// Game_Flag_Set(kFlagRC02toRC01); // no landing
+	Game_Flag_Set(kFlagIntroPlayed); // force skip intro
+	Game_Flag_Set(kFlagRC02toRC01); // no landing
 	// Game_Flag_Set(kFlagRC01PoliceDone);
 	// Game_Flag_Set(249);
-	// Game_Flag_Set(kFlagKIAPrivacyAddon);
+	Game_Flag_Set(kFlagKIAPrivacyAddon);
 #endif
 
 	if (!Game_Flag_Query(kFlagIntroPlayed)) {