BLADERUNNER: Better formatting for police targets instructions

3 files changed, 911 insertions, 912 deletions

diff --git a/engines/bladerunner/script/scene/ps10.cpp b/engines/bladerunner/script/scene/ps10.cpp
index e4fad70802..f3ab121d39 100644
--- a/engines/bladerunner/script/scene/ps10.cpp
+++ b/engines/bladerunner/script/scene/ps10.cpp
@@ -28,33 +28,33 @@ static int kPoliceMazePS10TargetCount = 20;
 
 static const int *getPoliceMazePS10TrackData1() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIObstacleReset,	kItemPS10Target1,
-		kPMTIObstacleReset,	kItemPS10Target2,
-		kPMTIFacing,		989,
-		kPMTIPosition,		0,
-		kPMTITargetSet,		kItemPS10Target1, 1,
-		kPMTITargetSet,		kItemPS10Target2, 1,
-		kPMTIEnemyReset,	kItemPS10Target1,
-		kPMTIWaitRandom,	3000, 5000,
-		kPMTIObstacleSet,	kItemPS10Target1,
-		kPMTIPlaySound,		159, 100,
-		kPMTIMove,			14,
-		kPMTIWait,			1000,
-		kPMTIRotate,		740, 80,
-		kPMTIEnemySet,		kItemPS10Target1,
-		kPMTIWait,			0,
-		kPMTIRotate,		488, 80,
-		kPMTIWait,			1000,
-		kPMTIShoot,			27, 33,
-		kPMTIWait,			0,
-		kPMTIRotate,		740, 80,
-		kPMTIPausedReset,	kItemPS10Target2,
-		kPMTIObstacleReset,	kItemPS10Target1,
-		kPMTIObstacleSet,	kItemPS10Target2,
-		kPMTIPausedSet,		kItemPS10Target1,
-		kPMTIPosition,		0,
+		kPMTIActivate,      kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIObstacleReset, kItemPS10Target1,
+		kPMTIObstacleReset, kItemPS10Target2,
+		kPMTIFacing,        989,
+		kPMTIPosition,      0,
+		kPMTITargetSet,     kItemPS10Target1, 1,
+		kPMTITargetSet,     kItemPS10Target2, 1,
+		kPMTIEnemyReset,    kItemPS10Target1,
+		kPMTIWaitRandom,    3000, 5000,
+		kPMTIObstacleSet,   kItemPS10Target1,
+		kPMTIPlaySound,     159, 100,
+		kPMTIMove,          14,
+		kPMTIWait,          1000,
+		kPMTIRotate,        740, 80,
+		kPMTIEnemySet,      kItemPS10Target1,
+		kPMTIWait,          0,
+		kPMTIRotate,        488, 80,
+		kPMTIWait,          1000,
+		kPMTIShoot,         27, 33,
+		kPMTIWait,          0,
+		kPMTIRotate,        740, 80,
+		kPMTIPausedReset,   kItemPS10Target2,
+		kPMTIObstacleReset, kItemPS10Target1,
+		kPMTIObstacleSet,   kItemPS10Target2,
+		kPMTIPausedSet,     kItemPS10Target1,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -62,15 +62,15 @@ static const int *getPoliceMazePS10TrackData1() {
 
 static const int *getPoliceMazePS10TrackData2() {
 	static int trackData[] = {
-		kPMTIFacing,		740,
-		kPMTIPosition,		0,
-		kPMTIEnemySet,		kItemPS10Target2,
-		kPMTIMove,			69,
-		kPMTIWait,			500,
-		kPMTIObstacleReset,	kItemPS10Target2,
-		kPMTIPausedReset,	kItemPS10Target5,
-		kPMTIPausedSet,		kItemPS10Target2,
-		kPMTIPosition,		0,
+		kPMTIFacing,        740,
+		kPMTIPosition,      0,
+		kPMTIEnemySet,      kItemPS10Target2,
+		kPMTIMove,          69,
+		kPMTIWait,          500,
+		kPMTIObstacleReset, kItemPS10Target2,
+		kPMTIPausedReset,   kItemPS10Target5,
+		kPMTIPausedSet,     kItemPS10Target2,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -78,31 +78,31 @@ static const int *getPoliceMazePS10TrackData2() {
 
 static const int *getPoliceMazePS10TrackData3() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIObstacleReset,	kItemPS10Target3,
-		kPMTIFacing,		993,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	3000, 5000,
-		kPMTIObstacleSet,	kItemPS10Target3,
-		kPMTIPlaySound,		159, 100,
-		kPMTITargetSet,		kItemPS10Target3, 1,
-		kPMTIEnemyReset,	kItemPS10Target3,
-		kPMTIMove,			5,
-		kPMTIWait,			1000,
-		kPMTIEnemySet,		kItemPS10Target3,
-		kPMTIRotate,		233, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		491, 80,
-		kPMTIWait,			500,
-		kPMTIShoot,			27, 33,
-		kPMTIWait,			500,
-		kPMTIRotate,		233, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		993, 80,
-		kPMTIPlaySound,		34, 33,
-		kPMTIMove,			0,
-		kPMTIObstacleReset,	kItemPS10Target3,
+		kPMTIActivate,      kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIObstacleReset, kItemPS10Target3,
+		kPMTIFacing,        993,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 5000,
+		kPMTIObstacleSet,   kItemPS10Target3,
+		kPMTIPlaySound,     159, 100,
+		kPMTITargetSet,     kItemPS10Target3, 1,
+		kPMTIEnemyReset,    kItemPS10Target3,
+		kPMTIMove,          5,
+		kPMTIWait,          1000,
+		kPMTIEnemySet,      kItemPS10Target3,
+		kPMTIRotate,        233, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        491, 80,
+		kPMTIWait,          500,
+		kPMTIShoot,         27, 33,
+		kPMTIWait,          500,
+		kPMTIRotate,        233, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        993, 80,
+		kPMTIPlaySound,     34, 33,
+		kPMTIMove,          0,
+		kPMTIObstacleReset, kItemPS10Target3,
 		kPMTIRestart
 	};
 	return trackData;
@@ -110,24 +110,24 @@ static const int *getPoliceMazePS10TrackData3() {
 
 static const int *getPoliceMazePS10TrackData4() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIObstacleReset,	kItemPS10Target4,
-		kPMTIFacing,		993,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	3000, 6000,
-		kPMTIObstacleSet,	kItemPS10Target4,
-		kPMTIPlaySound,		159, 100,
-		kPMTITargetSet,		kItemPS10Target4, 1,
-		kPMTIEnemyReset,	kItemPS10Target4,
-		kPMTIMove,			34,
-		kPMTIWait,			500,
-		kPMTIRotate,		491, 80,
-		kPMTIMove,			0,
+		kPMTIActivate,      kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIObstacleReset, kItemPS10Target4,
+		kPMTIFacing,        993,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 6000,
+		kPMTIObstacleSet,   kItemPS10Target4,
+		kPMTIPlaySound,     159, 100,
+		kPMTITargetSet,     kItemPS10Target4, 1,
+		kPMTIEnemyReset,    kItemPS10Target4,
+		kPMTIMove,          34,
+		kPMTIWait,          500,
+		kPMTIRotate,        491, 80,
+		kPMTIMove,          0,
 		kPMTILeave,
-		kPMTIObstacleReset,	kItemPS10Target4,
-		kPMTIPausedReset,	kItemPS10Target8,
-		kPMTIPausedSet,		kItemPS10Target4,
+		kPMTIObstacleReset, kItemPS10Target4,
+		kPMTIPausedReset,   kItemPS10Target8,
+		kPMTIPausedSet,     kItemPS10Target4,
 		kPMTIRestart
 	};
 	return trackData;
@@ -135,27 +135,27 @@ static const int *getPoliceMazePS10TrackData4() {
 
 static const int *getPoliceMazePS10TrackData5() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIObstacleReset,	kItemPS10Target5,
-		kPMTIFacing,		0,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	4000, 6000,
-		kPMTIObstacleSet,	kItemPS10Target5,
-		kPMTIPlaySound,		159, 100,
-		kPMTITargetSet,		kItemPS10Target5, 1,
-		kPMTIEnemyReset,	kItemPS10Target5,
-		kPMTIMove,			5,
-		kPMTIWait,			1000,
-		kPMTIRotate,		512, 100,
-		kPMTIWait,			2000,
-		kPMTIRotate,		0, -100,
-		kPMTIPlaySound,		34, 33,
-		kPMTIMove,			0,
+		kPMTIActivate,      kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIObstacleReset, kItemPS10Target5,
+		kPMTIFacing,        0,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    4000, 6000,
+		kPMTIObstacleSet,   kItemPS10Target5,
+		kPMTIPlaySound,     159, 100,
+		kPMTITargetSet,     kItemPS10Target5, 1,
+		kPMTIEnemyReset,    kItemPS10Target5,
+		kPMTIMove,          5,
+		kPMTIWait,          1000,
+		kPMTIRotate,        512, 100,
+		kPMTIWait,          2000,
+		kPMTIRotate,        0, -100,
+		kPMTIPlaySound,     34, 33,
+		kPMTIMove,          0,
 		kPMTILeave,
-		kPMTIObstacleReset,	kItemPS10Target5,
-		kPMTIPausedReset,	kItemPS10Target1,
-		kPMTIPausedSet,		kItemPS10Target5,
+		kPMTIObstacleReset, kItemPS10Target5,
+		kPMTIPausedReset,   kItemPS10Target1,
+		kPMTIPausedSet,     kItemPS10Target5,
 		kPMTIRestart
 	};
 	return trackData;
@@ -163,34 +163,34 @@ static const int *getPoliceMazePS10TrackData5() {
 
 static const int *getPoliceMazePS10TrackData6() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIObstacleReset,	kItemPS10Target6,
-		kPMTIFacing,		999,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	4000, 6000,
-		kPMTIObstacleSet,	kItemPS10Target6,
-		kPMTIPlaySound,		159, 100,
-		kPMTITargetSet,		kItemPS10Target6, 1,
-		kPMTIEnemyReset,	kItemPS10Target6,
-		kPMTIMove,			7,
-		kPMTIWait,			500,
-		kPMTIEnemySet,		kItemPS10Target6,
-		kPMTIRotate,		750, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		500, 80,
-		kPMTIWait,			1000,
-		kPMTIShoot,			27, 33,
-		kPMTIWait,			0,
-		kPMTIRotate,		750, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		999, 80,
-		kPMTIPlaySound,		34, 33,
-		kPMTIMove,			0,
-		kPMTIObstacleReset,	kItemPS10Target6,
-		kPMTIPausedReset,	kItemPS10Target7,
-		kPMTIPausedReset,	kItemPS10Target9,
-		kPMTIPausedSet,		kItemPS10Target6,
+		kPMTIActivate,      kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIObstacleReset, kItemPS10Target6,
+		kPMTIFacing,        999,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    4000, 6000,
+		kPMTIObstacleSet,   kItemPS10Target6,
+		kPMTIPlaySound,     159, 100,
+		kPMTITargetSet,     kItemPS10Target6, 1,
+		kPMTIEnemyReset,    kItemPS10Target6,
+		kPMTIMove,          7,
+		kPMTIWait,          500,
+		kPMTIEnemySet,      kItemPS10Target6,
+		kPMTIRotate,        750, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        500, 80,
+		kPMTIWait,          1000,
+		kPMTIShoot,         27, 33,
+		kPMTIWait,          0,
+		kPMTIRotate,        750, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        999, 80,
+		kPMTIPlaySound,     34, 33,
+		kPMTIMove,          0,
+		kPMTIObstacleReset, kItemPS10Target6,
+		kPMTIPausedReset,   kItemPS10Target7,
+		kPMTIPausedReset,   kItemPS10Target9,
+		kPMTIPausedSet,     kItemPS10Target6,
 		kPMTIRestart
 	};
 	return trackData;
@@ -198,22 +198,22 @@ static const int *getPoliceMazePS10TrackData6() {
 
 static const int *getPoliceMazePS10TrackData7() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIObstacleReset,	kItemPS10Target7,
-		kPMTIFacing,		264,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	3000, 6000,
-		kPMTITargetSet,		kItemPS10Target7, 1,
-		kPMTIEnemyReset,	kItemPS10Target7,
-		kPMTIObstacleSet,	kItemPS10Target7,
-		kPMTIMove,			89,
-		kPMTIWaitRandom,	4000, 8000,
-		kPMTIFacing,		776,
-		kPMTIMove,			0,
+		kPMTIActivate,      kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIObstacleReset, kItemPS10Target7,
+		kPMTIFacing,        264,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 6000,
+		kPMTITargetSet,     kItemPS10Target7, 1,
+		kPMTIEnemyReset,    kItemPS10Target7,
+		kPMTIObstacleSet,   kItemPS10Target7,
+		kPMTIMove,          89,
+		kPMTIWaitRandom,    4000, 8000,
+		kPMTIFacing,        776,
+		kPMTIMove,          0,
 		kPMTILeave,
-		kPMTIObstacleReset,	kItemPS10Target7,
-		kPMTIPausedSet,		kItemPS10Target7,
+		kPMTIObstacleReset, kItemPS10Target7,
+		kPMTIPausedSet,     kItemPS10Target7,
 		kPMTIRestart
 	};
 	return trackData;
@@ -221,27 +221,27 @@ static const int *getPoliceMazePS10TrackData7() {
 
 static const int *getPoliceMazePS10TrackData8() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIObstacleReset,	kItemPS10Target8,
-		kPMTIFacing,		993,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	4000, 6000,
-		kPMTIObstacleSet,	kItemPS10Target8,
-		kPMTIPlaySound,		159, 100,
-		kPMTITargetSet,		kItemPS10Target8, 1,
-		kPMTIEnemyReset,	kItemPS10Target8,
-		kPMTIMove,			34,
-		kPMTIWait,			500,
-		kPMTIEnemySet,		kItemPS10Target8,
-		kPMTIRotate,		491, 80,
-		kPMTIMove,			20,
-		kPMTIWait,			0,
-		kPMTIShoot,			27, 33,
-		kPMTIMove,			0,
-		kPMTIObstacleReset,	kItemPS10Target8,
-		kPMTIPausedReset,	kItemPS10Target4,
-		kPMTIPausedSet,		kItemPS10Target8,
+		kPMTIActivate,      kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIObstacleReset, kItemPS10Target8,
+		kPMTIFacing,        993,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    4000, 6000,
+		kPMTIObstacleSet,   kItemPS10Target8,
+		kPMTIPlaySound,     159, 100,
+		kPMTITargetSet,     kItemPS10Target8, 1,
+		kPMTIEnemyReset,    kItemPS10Target8,
+		kPMTIMove,          34,
+		kPMTIWait,          500,
+		kPMTIEnemySet,      kItemPS10Target8,
+		kPMTIRotate,        491, 80,
+		kPMTIMove,          20,
+		kPMTIWait,          0,
+		kPMTIShoot,         27, 33,
+		kPMTIMove,          0,
+		kPMTIObstacleReset, kItemPS10Target8,
+		kPMTIPausedReset,   kItemPS10Target4,
+		kPMTIPausedSet,     kItemPS10Target8,
 		kPMTIRestart
 	};
 	return trackData;
@@ -249,56 +249,56 @@ static const int *getPoliceMazePS10TrackData8() {
 
 static const int *getPoliceMazePS10TrackData9() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
-		kPMTIObstacleReset,	kItemPS10Target9,
-		kPMTIFacing,		738,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	2000, 5000,
-		kPMTITargetSet,		kItemPS10Target9, 1,
-		kPMTIEnemySet,		kItemPS10Target9,
-		kPMTIObstacleSet,	kItemPS10Target9,
-		kPMTIPlaySound,		0, 33,
-		kPMTIMove,			23,
-		kPMTIPlaySound,		0, 33,
-		kPMTIWait,			200,
-		kPMTIPlaySound,		32, 33,
-		kPMTIRotate,		498, 100,
-		kPMTIPlaySound,		0, 33,
-		kPMTIWait,			100,
-		kPMTIShoot,			27, 33,
-		kPMTIPlaySound,		32, 33,
-		kPMTIMove,			35,
-		kPMTIPlaySound,		32, 33,
-		kPMTIWait,			100,
-		kPMTIShoot,			27, 33,
-		kPMTIPlaySound,		0, 33,
-		kPMTIMove,			23,
-		kPMTIPlaySound,		32, 33,
-		kPMTIWait,			100,
-		kPMTIShoot,			27, 33,
-		kPMTIPlaySound,		32, 33,
-		kPMTIRotate,		758, 100,
-		kPMTIPlaySound,		32, 33,
-		kPMTIMove,			89,
-		kPMTIPlaySound,		0, 33,
-		kPMTIWaitRandom,	4000, 6000,
-		kPMTITargetSet,		kItemPS10Target9, 1,
-		kPMTIEnemySet,		kItemPS10Target9,
-		kPMTIFacing,		216,
-		kPMTIPlaySound,		32, 33,
-		kPMTIMove,			69,
-		kPMTIWait,			100,
-		kPMTIPlaySound,		32, 33,
-		kPMTIRotate,		498, 100,
-		kPMTIWait,			100,
-		kPMTIShoot,			27, 33,
-		kPMTIPlaySound,		0, 33,
-		kPMTIRotate,		216, 100,
-		kPMTIPlaySound,		32, 33,
-		kPMTIMove,			0,
-		kPMTIObstacleReset,	kItemPS10Target9,
-		kPMTIPausedSet,		kItemPS10Target9,
+		kPMTIActivate,      kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS10TargetCounter, kPoliceMazePS10TargetCount,
+		kPMTIObstacleReset, kItemPS10Target9,
+		kPMTIFacing,        738,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    2000, 5000,
+		kPMTITargetSet,     kItemPS10Target9, 1,
+		kPMTIEnemySet,      kItemPS10Target9,
+		kPMTIObstacleSet,   kItemPS10Target9,
+		kPMTIPlaySound,     0, 33,
+		kPMTIMove,          23,
+		kPMTIPlaySound,     0, 33,
+		kPMTIWait,          200,
+		kPMTIPlaySound,     32, 33,
+		kPMTIRotate,        498, 100,
+		kPMTIPlaySound,     0, 33,
+		kPMTIWait,          100,
+		kPMTIShoot,         27, 33,
+		kPMTIPlaySound,     32, 33,
+		kPMTIMove,          35,
+		kPMTIPlaySound,     32, 33,
+		kPMTIWait,          100,
+		kPMTIShoot,         27, 33,
+		kPMTIPlaySound,     0, 33,
+		kPMTIMove,          23,
+		kPMTIPlaySound,     32, 33,
+		kPMTIWait,          100,
+		kPMTIShoot,         27, 33,
+		kPMTIPlaySound,     32, 33,
+		kPMTIRotate,        758, 100,
+		kPMTIPlaySound,     32, 33,
+		kPMTIMove,          89,
+		kPMTIPlaySound,     0, 33,
+		kPMTIWaitRandom,    4000, 6000,
+		kPMTITargetSet,     kItemPS10Target9, 1,
+		kPMTIEnemySet,      kItemPS10Target9,
+		kPMTIFacing,        216,
+		kPMTIPlaySound,     32, 33,
+		kPMTIMove,          69,
+		kPMTIWait,          100,
+		kPMTIPlaySound,     32, 33,
+		kPMTIRotate,        498, 100,
+		kPMTIWait,          100,
+		kPMTIShoot,         27, 33,
+		kPMTIPlaySound,     0, 33,
+		kPMTIRotate,        216, 100,
+		kPMTIPlaySound,     32, 33,
+		kPMTIMove,          0,
+		kPMTIObstacleReset, kItemPS10Target9,
+		kPMTIPausedSet,     kItemPS10Target9,
 		kPMTIRestart
 	};
 	return trackData;
diff --git a/engines/bladerunner/script/scene/ps11.cpp b/engines/bladerunner/script/scene/ps11.cpp
index eac2df1844..5d70167a89 100644
--- a/engines/bladerunner/script/scene/ps11.cpp
+++ b/engines/bladerunner/script/scene/ps11.cpp
@@ -42,25 +42,25 @@ void SceneScriptPS11::InitializeScene() {
 
 static const int *getPoliceMazePS11TrackData9() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target1,
-		kPMTIFacing,			50,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		5000, 5000,
-		kPMTIObstacleSet,		kItemPS11Target1,
-		kPMTIPlaySound,			31, 33,
-		kPMTITargetSet,			kItemPS11Target1, 1,
-		kPMTIEnemySet,			kItemPS11Target1,
-		kPMTIMove,				7,
-		kPMTIWait,				1000,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIWait,				500,
-		kPMTIObstacleReset,		kItemPS11Target1,
-		kPMTIPausedReset1of2,	kItemPS11Target7, kItemPS11Target2,
-		kPMTIPausedSet,			kItemPS11Target1,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target1,
+		kPMTIFacing,          50,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 5000,
+		kPMTIObstacleSet,     kItemPS11Target1,
+		kPMTIPlaySound,       31, 33,
+		kPMTITargetSet,       kItemPS11Target1, 1,
+		kPMTIEnemySet,        kItemPS11Target1,
+		kPMTIMove,            7,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIWait,            500,
+		kPMTIObstacleReset,   kItemPS11Target1,
+		kPMTIPausedReset1of2, kItemPS11Target7, kItemPS11Target2,
+		kPMTIPausedSet,       kItemPS11Target1,
 		kPMTIRestart
 	};
 	return trackData;
@@ -68,25 +68,25 @@ static const int *getPoliceMazePS11TrackData9() {
 
 static const int *getPoliceMazePS11TrackData10() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,	kItemPS11Target2,
-		kPMTIObstacleReset,	kItemPS11Target3,
-		kPMTITargetSet,		kItemPS11Target2, 1,
-		kPMTITargetSet,		kItemPS11Target3, 1,
-		kPMTIFacing,		860,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	3000, 6000,
-		kPMTIEnemyReset,	kItemPS11Target2,
-		kPMTIObstacleSet,	kItemPS11Target2,
-		kPMTIPlaySound,		33, 33,
-		kPMTIMove,			14,
-		kPMTIWait,			500,
-		kPMTIPausedReset,	kItemPS11Target3,
-		kPMTIObstacleReset,	kItemPS11Target2,
-		kPMTIObstacleSet,	kItemPS11Target3,
-		kPMTIPausedSet,		kItemPS11Target2,
-		kPMTIPosition,		0,
+		kPMTIActivate,      kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset, kItemPS11Target2,
+		kPMTIObstacleReset, kItemPS11Target3,
+		kPMTITargetSet,     kItemPS11Target2, 1,
+		kPMTITargetSet,     kItemPS11Target3, 1,
+		kPMTIFacing,        860,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 6000,
+		kPMTIEnemyReset,    kItemPS11Target2,
+		kPMTIObstacleSet,   kItemPS11Target2,
+		kPMTIPlaySound,     33, 33,
+		kPMTIMove,          14,
+		kPMTIWait,          500,
+		kPMTIPausedReset,   kItemPS11Target3,
+		kPMTIObstacleReset, kItemPS11Target2,
+		kPMTIObstacleSet,   kItemPS11Target3,
+		kPMTIPausedSet,     kItemPS11Target2,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -94,25 +94,25 @@ static const int *getPoliceMazePS11TrackData10() {
 
 static const int *getPoliceMazePS11TrackData11() {
 	static int trackData[] = {
-		kPMTIFacing,			860,
-		kPMTIPosition,			0,
-		kPMTIEnemyReset,		kItemPS11Target3,
-		kPMTIObstacleSet,		kItemPS11Target3,
-		kPMTIMove,				25,
-		kPMTIWait,				500,
-		kPMTIEnemySet,			kItemPS11Target3,
-		kPMTIPlaySound,			32, 33,
-		kPMTIRotate,			644, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			388, 80,
-		kPMTIWait,				1000,
-		kPMTIShoot,				12, 33,
-		kPMTIMove,				79,
-		kPMTIObstacleReset,		kItemPS11Target3,
-		kPMTIPausedReset1of2,	kItemPS11Target7, kItemPS10Target9,
-		kPMTIPausedSet,			kItemPS11Target3,
-		kPMTIPosition,			0,
-		kPMTIFacing,			860,
+		kPMTIFacing,          860,
+		kPMTIPosition,        0,
+		kPMTIEnemyReset,      kItemPS11Target3,
+		kPMTIObstacleSet,     kItemPS11Target3,
+		kPMTIMove,            25,
+		kPMTIWait,            500,
+		kPMTIEnemySet,        kItemPS11Target3,
+		kPMTIPlaySound,       32, 33,
+		kPMTIRotate,          644, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          388, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           12, 33,
+		kPMTIMove,            79,
+		kPMTIObstacleReset,   kItemPS11Target3,
+		kPMTIPausedReset1of2, kItemPS11Target7, kItemPS10Target9,
+		kPMTIPausedSet,       kItemPS11Target3,
+		kPMTIPosition,        0,
+		kPMTIFacing,          860,
 		kPMTIRestart
 	};
 	return trackData;
@@ -120,31 +120,31 @@ static const int *getPoliceMazePS11TrackData11() {
 
 static const int *getPoliceMazePS11TrackData12() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,	kItemPS11Target4,
-		kPMTIFacing,		725,
-		kPMTIPosition,		0,
-		kPMTIWait,			2000,
-		kPMTITargetSet,		kItemPS11Target4, 1,
-		kPMTIEnemyReset,	kItemPS11Target4,
-		kPMTIObstacleSet,	kItemPS11Target4,
-		kPMTIMove,			82,
+		kPMTIActivate,      kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset, kItemPS11Target4,
+		kPMTIFacing,        725,
+		kPMTIPosition,      0,
+		kPMTIWait,          2000,
+		kPMTITargetSet,     kItemPS11Target4, 1,
+		kPMTIEnemyReset,    kItemPS11Target4,
+		kPMTIObstacleSet,   kItemPS11Target4,
+		kPMTIMove,          82,
 		kPMTILeave,
-		kPMTIWait,			1000,
-		kPMTIRotate,		570, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		462, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		213, 80,
-		kPMTIWait,			1000,
-		kPMTIMove,			0,
-		kPMTIRotate,		725, 80,
-		kPMTIMove,			99,
-		kPMTIObstacleReset,	kItemPS11Target4,
-		kPMTIPausedReset,	27,
-		kPMTIPausedSet,		kItemPS11Target4,
-		kPMTIPosition,		0,
+		kPMTIWait,          1000,
+		kPMTIRotate,        570, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        462, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        213, 80,
+		kPMTIWait,          1000,
+		kPMTIMove,          0,
+		kPMTIRotate,        725, 80,
+		kPMTIMove,          99,
+		kPMTIObstacleReset, kItemPS11Target4,
+		kPMTIPausedReset,   27,
+		kPMTIPausedSet,     kItemPS11Target4,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -152,40 +152,40 @@ static const int *getPoliceMazePS11TrackData12() {
 
 static const int *getPoliceMazePS11TrackData13() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target5,
-		kPMTIFacing,			340,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		4000, 8000,
-		kPMTIObstacleSet,		kItemPS11Target5,
-		kPMTIPlaySound,			33, 33,
-		kPMTITargetSet,			kItemPS11Target5, 1,
-		kPMTIEnemySet,			kItemPS11Target5,
-		kPMTIMove,				4,
-		kPMTIWait,				0,
-		kPMTIRotate,			435, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			530, 80,
-		kPMTIWait,				100,
-		kPMTIRotate,			435, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			340, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			260, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			180, 80,
-		kPMTIWait,				100,
-		kPMTIRotate,			260, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			340, 80,
-		kPMTIWait,				200,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target5,
-		kPMTIPausedReset1of2,	kItemPS11Target6, kItemPS11Target10,
-		kPMTIPausedSet,			kItemPS11Target5,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target5,
+		kPMTIFacing,          340,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      4000, 8000,
+		kPMTIObstacleSet,     kItemPS11Target5,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS11Target5, 1,
+		kPMTIEnemySet,        kItemPS11Target5,
+		kPMTIMove,            4,
+		kPMTIWait,            0,
+		kPMTIRotate,          435, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          530, 80,
+		kPMTIWait,            100,
+		kPMTIRotate,          435, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          340, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          260, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          180, 80,
+		kPMTIWait,            100,
+		kPMTIRotate,          260, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          340, 80,
+		kPMTIWait,            200,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target5,
+		kPMTIPausedReset1of2, kItemPS11Target6, kItemPS11Target10,
+		kPMTIPausedSet,       kItemPS11Target5,
 		kPMTIRestart
 	};
 	return trackData;
@@ -193,29 +193,29 @@ static const int *getPoliceMazePS11TrackData13() {
 
 static const int *getPoliceMazePS11TrackData14() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target6,
-		kPMTITargetSet,			kItemPS11Target6, 1,
-		kPMTIEnemyReset,		kItemPS11Target6,
-		kPMTIFacing,			900,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		3000, 6000,
-		kPMTIObstacleSet,		kItemPS11Target6,
-		kPMTIPlaySound,			33, 33,
-		kPMTIMove,				5,
-		kPMTIWait,				500,
-		kPMTIEnemySet,			kItemPS11Target6,
-		kPMTIRotate,			644, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			388, 80,
-		kPMTIWait,				1000,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target6,
-		kPMTIPausedReset1of2,	kItemPS11Target10, kItemPS11Target5,
-		kPMTIPausedSet,			kItemPS11Target6,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target6,
+		kPMTITargetSet,       kItemPS11Target6, 1,
+		kPMTIEnemyReset,      kItemPS11Target6,
+		kPMTIFacing,          900,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 6000,
+		kPMTIObstacleSet,     kItemPS11Target6,
+		kPMTIPlaySound,       33, 33,
+		kPMTIMove,            5,
+		kPMTIWait,            500,
+		kPMTIEnemySet,        kItemPS11Target6,
+		kPMTIRotate,          644, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          388, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target6,
+		kPMTIPausedReset1of2, kItemPS11Target10, kItemPS11Target5,
+		kPMTIPausedSet,       kItemPS11Target6,
 		kPMTIRestart
 	};
 	return trackData;
@@ -223,26 +223,26 @@ static const int *getPoliceMazePS11TrackData14() {
 
 static const int *getPoliceMazePS11TrackData15() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,	kItemPS11Target7,
-		kPMTIObstacleReset,	kItemPS11Target8,
-		kPMTITargetSet,		kItemPS11Target7, 1,
-		kPMTITargetSet,		kItemPS11Target8, 1,
-		kPMTIFacing,		860,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	3000, 7000,
-		kPMTIObstacleSet,	kItemPS11Target7,
-		kPMTIPlaySound,		29, 33,
-		kPMTIEnemyReset,	kItemPS11Target7,
-		kPMTIMove,			14,
+		kPMTIActivate,      kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset, kItemPS11Target7,
+		kPMTIObstacleReset, kItemPS11Target8,
+		kPMTITargetSet,     kItemPS11Target7, 1,
+		kPMTITargetSet,     kItemPS11Target8, 1,
+		kPMTIFacing,        860,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 7000,
+		kPMTIObstacleSet,   kItemPS11Target7,
+		kPMTIPlaySound,     29, 33,
+		kPMTIEnemyReset,    kItemPS11Target7,
+		kPMTIMove,          14,
 		kPMTILeave,
-		kPMTIWait,			1000,
-		kPMTIPausedReset,	kItemPS11Target8,
-		kPMTIObstacleReset,	kItemPS11Target7,
-		kPMTIObstacleSet,	kItemPS11Target8,
-		kPMTIPausedSet,		kItemPS11Target7,
-		kPMTIPosition,		0,
+		kPMTIWait,          1000,
+		kPMTIPausedReset,   kItemPS11Target8,
+		kPMTIObstacleReset, kItemPS11Target7,
+		kPMTIObstacleSet,   kItemPS11Target8,
+		kPMTIPausedSet,     kItemPS11Target7,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -250,24 +250,24 @@ static const int *getPoliceMazePS11TrackData15() {
 
 static const int *getPoliceMazePS11TrackData16() {
 	static int trackData[] = {
-		kPMTIFacing,			860,
-		kPMTIPosition,			0,
-		kPMTIObstacleSet,		kItemPS11Target8,
-		kPMTIEnemyReset,		kItemPS11Target8,
-		kPMTIMove,				25,
-		kPMTIWait,				500,
-		kPMTIPlaySound,			32, 33,
-		kPMTIRotate,			644, 100,
-		kPMTIWait,				0,
-		kPMTIRotate,			388, 200,
-		kPMTIWait,				500,
-		kPMTIMove,				79,
+		kPMTIFacing,          860,
+		kPMTIPosition,        0,
+		kPMTIObstacleSet,     kItemPS11Target8,
+		kPMTIEnemyReset,      kItemPS11Target8,
+		kPMTIMove,            25,
+		kPMTIWait,            500,
+		kPMTIPlaySound,       32, 33,
+		kPMTIRotate,          644, 100,
+		kPMTIWait,            0,
+		kPMTIRotate,          388, 200,
+		kPMTIWait,            500,
+		kPMTIMove,            79,
 		kPMTILeave,
-		kPMTIObstacleReset,		kItemPS11Target8,
-		kPMTIPausedReset1of2,	kItemPS11Target2, kItemPS11Target1,
-		kPMTIPausedSet,			kItemPS11Target8,
-		kPMTIPosition,			0,
-		kPMTIFacing,			860,
+		kPMTIObstacleReset,   kItemPS11Target8,
+		kPMTIPausedReset1of2, kItemPS11Target2, kItemPS11Target1,
+		kPMTIPausedSet,       kItemPS11Target8,
+		kPMTIPosition,        0,
+		kPMTIFacing,          860,
 		kPMTIRestart
 	};
 	return trackData;
@@ -275,33 +275,33 @@ static const int *getPoliceMazePS11TrackData16() {
 
 static const int *getPoliceMazePS11TrackData17() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIFacing,			310,
-		kPMTIPosition,			0,
-		kPMTIObstacleSet,		kItemPS11Target9,
-		kPMTITargetSet,			kItemPS11Target9, 1,
-		kPMTIEnemySet,			kItemPS11Target9,
-		kPMTIWaitRandom,		4000, 8000,
-		kPMTIPlaySound,			32, 33,
-		kPMTIMove,				10,
-		kPMTIWait,				0,
-		kPMTIShoot,				27, 33,
-		kPMTIMove,				0,
-		kPMTITargetSet,			kItemPS11Target9, 1,
-		kPMTIEnemySet,			kItemPS11Target9,
-		kPMTIMove,				24,
-		kPMTITargetSet,			kItemPS11Target9, 1,
-		kPMTIEnemySet,			kItemPS11Target9,
-		kPMTIMove,				10,
-		kPMTIWait,				0,
-		kPMTIShoot,				27, 33,
-		kPMTIMove,				24,
-		kPMTIWait,				1000,
-		kPMTIObstacleReset,		kItemPS11Target9,
-		kPMTIPausedReset1of2,	kItemPS11Target15, kItemPS11Target14,
-		kPMTIPausedSet, 		kItemPS11Target9,
-		kPMTIPosition,			0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIFacing,          310,
+		kPMTIPosition,        0,
+		kPMTIObstacleSet,     kItemPS11Target9,
+		kPMTITargetSet,       kItemPS11Target9, 1,
+		kPMTIEnemySet,        kItemPS11Target9,
+		kPMTIWaitRandom,      4000, 8000,
+		kPMTIPlaySound,       32, 33,
+		kPMTIMove,            10,
+		kPMTIWait,            0,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTITargetSet,       kItemPS11Target9, 1,
+		kPMTIEnemySet,        kItemPS11Target9,
+		kPMTIMove,            24,
+		kPMTITargetSet,       kItemPS11Target9, 1,
+		kPMTIEnemySet,        kItemPS11Target9,
+		kPMTIMove,            10,
+		kPMTIWait,            0,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            24,
+		kPMTIWait,            1000,
+		kPMTIObstacleReset,   kItemPS11Target9,
+		kPMTIPausedReset1of2, kItemPS11Target15, kItemPS11Target14,
+		kPMTIPausedSet,       kItemPS11Target9,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -309,33 +309,33 @@ static const int *getPoliceMazePS11TrackData17() {
 
 static const int *getPoliceMazePS11TrackData18() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,	kItemPS11Target10,
-		kPMTIObstacleReset,	kItemPS11Target11,
-		kPMTIFacing,		900,
-		kPMTIPosition,		0,
-		kPMTITargetSet,		kItemPS11Target10, 1,
-		kPMTITargetSet,		kItemPS11Target11, 1,
-		kPMTIEnemyReset,	kItemPS11Target10,
-		kPMTIWaitRandom,	4000, 6000,
-		kPMTIObstacleSet,	kItemPS11Target10,
-		kPMTIMove,			5,
-		kPMTIPlaySound,		kItemPS11Target11, 33,
-		kPMTIPlaySound,		3, 33,
-		kPMTIWait,			1000,
+		kPMTIActivate,      kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset, kItemPS11Target10,
+		kPMTIObstacleReset, kItemPS11Target11,
+		kPMTIFacing,        900,
+		kPMTIPosition,      0,
+		kPMTITargetSet,     kItemPS11Target10, 1,
+		kPMTITargetSet,     kItemPS11Target11, 1,
+		kPMTIEnemyReset,    kItemPS11Target10,
+		kPMTIWaitRandom,    4000, 6000,
+		kPMTIObstacleSet,   kItemPS11Target10,
+		kPMTIMove,          5,
+		kPMTIPlaySound,     kItemPS11Target11, 33,
+		kPMTIPlaySound,     3, 33,
+		kPMTIWait,          1000,
 		kPMTILeave,
-		kPMTIRotate,		700, 80,
-		kPMTIEnemySet,		kItemPS11Target10,
-		kPMTIWait,			0,
-		kPMTIRotate,		512, 200,
-		kPMTIWait,			1000,
-		kPMTIShoot,			12, 33,
-		kPMTIPausedReset,	kItemPS11Target11,
-		kPMTIObstacleReset,	kItemPS11Target10,
-		kPMTIObstacleSet,	kItemPS11Target11,
-		kPMTIPausedSet,		kItemPS11Target10,
-		kPMTIPosition,		0,
+		kPMTIRotate,        700, 80,
+		kPMTIEnemySet,      kItemPS11Target10,
+		kPMTIWait,          0,
+		kPMTIRotate,        512, 200,
+		kPMTIWait,          1000,
+		kPMTIShoot,         12, 33,
+		kPMTIPausedReset,   kItemPS11Target11,
+		kPMTIObstacleReset, kItemPS11Target10,
+		kPMTIObstacleSet,   kItemPS11Target11,
+		kPMTIPausedSet,     kItemPS11Target10,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -343,23 +343,23 @@ static const int *getPoliceMazePS11TrackData18() {
 
 static const int *getPoliceMazePS11TrackData19() {
 	static int trackData[] = {
-		kPMTIFacing,			512,
-		kPMTIPosition,			0,
-		kPMTIEnemySet,			kItemPS11Target11,
-		kPMTIMove,				8,
-		kPMTIWait,				4000,
-		kPMTITargetSet,			kItemPS11Target11, 1,
-		kPMTIEnemySet,			kItemPS11Target11,
-		kPMTIMove,				2,
-		kPMTIPlaySound,			32, 33,
-		kPMTIWait,				1000,
-		kPMTIShoot,				12, 33,
-		kPMTIMove,				kItemPS11Target11,
-		kPMTIWait,				500,
-		kPMTIObstacleReset,		kItemPS11Target11,
-		kPMTIPausedReset1of2,	kItemPS11Target5, kItemPS11Target6,
-		kPMTIPausedSet,			kItemPS11Target11,
-		kPMTIPosition,			0,
+		kPMTIFacing,          512,
+		kPMTIPosition,        0,
+		kPMTIEnemySet,        kItemPS11Target11,
+		kPMTIMove,            8,
+		kPMTIWait,            4000,
+		kPMTITargetSet,       kItemPS11Target11, 1,
+		kPMTIEnemySet,        kItemPS11Target11,
+		kPMTIMove,            2,
+		kPMTIPlaySound,       32, 33,
+		kPMTIWait,            1000,
+		kPMTIShoot,           12, 33,
+		kPMTIMove,            kItemPS11Target11,
+		kPMTIWait,            500,
+		kPMTIObstacleReset,   kItemPS11Target11,
+		kPMTIPausedReset1of2, kItemPS11Target5, kItemPS11Target6,
+		kPMTIPausedSet,       kItemPS11Target11,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -367,24 +367,24 @@ static const int *getPoliceMazePS11TrackData19() {
 
 static const int *getPoliceMazePS11TrackData20() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target12,
-		kPMTIFacing,			280,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		5000, 7000,
-		kPMTITargetSet,			kItemPS11Target12, 1,
-		kPMTIEnemySet,			kItemPS11Target12,
-		kPMTIObstacleSet,		kItemPS11Target12,
-		kPMTIMove,				9,
-		kPMTIPlaySound,			32, 33,
-		kPMTIWait,				1000,
-		kPMTIShoot,				27, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target12,
-		kPMTIPausedReset1of2,	kItemPS11Target13, kItemPS11Target4,
-		kPMTIPausedSet,			kItemPS11Target12,
-		kPMTIPosition,			0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target12,
+		kPMTIFacing,          280,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 7000,
+		kPMTITargetSet,       kItemPS11Target12, 1,
+		kPMTIEnemySet,        kItemPS11Target12,
+		kPMTIObstacleSet,     kItemPS11Target12,
+		kPMTIMove,            9,
+		kPMTIPlaySound,       32, 33,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target12,
+		kPMTIPausedReset1of2, kItemPS11Target13, kItemPS11Target4,
+		kPMTIPausedSet,       kItemPS11Target12,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -392,23 +392,23 @@ static const int *getPoliceMazePS11TrackData20() {
 
 static const int *getPoliceMazePS11TrackData21() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target13,
-		kPMTIFacing,			280,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		5000, 8000,
-		kPMTITargetSet,			kItemPS11Target13, 1,
-		kPMTIEnemyReset,		kItemPS11Target13,
-		kPMTIObstacleSet,		kItemPS11Target13,
-		kPMTIMove,				5,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target13,
+		kPMTIFacing,          280,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 8000,
+		kPMTITargetSet,       kItemPS11Target13, 1,
+		kPMTIEnemyReset,      kItemPS11Target13,
+		kPMTIObstacleSet,     kItemPS11Target13,
+		kPMTIMove,            5,
 		kPMTILeave,
-		kPMTIWait,				1000,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target13,
-		kPMTIPausedReset1of2,	kItemPS11Target12, kItemPS11Target4,
-		kPMTIPausedSet,			kItemPS11Target13,
-		kPMTIPosition,			0,
+		kPMTIWait,            1000,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target13,
+		kPMTIPausedReset1of2, kItemPS11Target12, kItemPS11Target4,
+		kPMTIPausedSet,       kItemPS11Target13,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -416,24 +416,24 @@ static const int *getPoliceMazePS11TrackData21() {
 
 static const int *getPoliceMazePS11TrackData22() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target14,
-		kPMTIFacing,			255,
-		kPMTIPosition,			0,
-		kPMTITargetSet,			kItemPS11Target14, 1,
-		kPMTIEnemySet,			kItemPS11Target14,
-		kPMTIWaitRandom,		5000, 5000,
-		kPMTIObstacleSet,		kItemPS11Target14,
-		kPMTIMove,				7,
-		kPMTIPlaySound,			32, 33,
-		kPMTIWait,				1000,
-		kPMTIShoot,				12, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target14,
-		kPMTIPausedReset1of2,	23, kItemPS11Target9,
-		kPMTIPausedSet,			kItemPS11Target14,
-		kPMTIPosition,			0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target14,
+		kPMTIFacing,          255,
+		kPMTIPosition,        0,
+		kPMTITargetSet,       kItemPS11Target14, 1,
+		kPMTIEnemySet,        kItemPS11Target14,
+		kPMTIWaitRandom,      5000, 5000,
+		kPMTIObstacleSet,     kItemPS11Target14,
+		kPMTIMove,            7,
+		kPMTIPlaySound,       32, 33,
+		kPMTIWait,            1000,
+		kPMTIShoot,           12, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target14,
+		kPMTIPausedReset1of2, 23, kItemPS11Target9,
+		kPMTIPausedSet,       kItemPS11Target14,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -441,24 +441,24 @@ static const int *getPoliceMazePS11TrackData22() {
 
 static const int *getPoliceMazePS11TrackData23() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target15,
-		kPMTIFacing,			310,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		3000, 6000,
-		kPMTITargetSet,			kItemPS11Target15, 1,
-		kPMTIEnemyReset,		kItemPS11Target15,
-		kPMTIObstacleSet,		kItemPS11Target15,
-		kPMTIWait,				1000,
-		kPMTIMove,				24,
-		kPMTIWait,				1000,
-		kPMTIMove,				0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target15,
+		kPMTIFacing,          310,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 6000,
+		kPMTITargetSet,       kItemPS11Target15, 1,
+		kPMTIEnemyReset,      kItemPS11Target15,
+		kPMTIObstacleSet,     kItemPS11Target15,
+		kPMTIWait,            1000,
+		kPMTIMove,            24,
+		kPMTIWait,            1000,
+		kPMTIMove,            0,
 		kPMTILeave,
-		kPMTIObstacleReset,		kItemPS11Target15,
-		kPMTIPausedReset1of2,	kItemPS11Target14, kItemPS11Target9,
-		kPMTIPausedSet,			kItemPS11Target15,
-		kPMTIPosition,			0,
+		kPMTIObstacleReset,   kItemPS11Target15,
+		kPMTIPausedReset1of2, kItemPS11Target14, kItemPS11Target9,
+		kPMTIPausedSet,       kItemPS11Target15,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -466,29 +466,28 @@ static const int *getPoliceMazePS11TrackData23() {
 
 static const int *getPoliceMazePS11TrackData27() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
-		kPMTIObstacleReset,		kItemPS11Target16,
-		kPMTIFacing,			346,
-		kPMTIPosition,			0,
-		kPMTIWait,				0,
-		kPMTITargetSet,			kItemPS11Target16, 1,
-		kPMTIEnemySet,			kItemPS11Target16,
-		kPMTIObstacleSet,		kItemPS11Target16,
-		kPMTIMove,				14,
-		kPMTIWait,				1000,
-		kPMTIShoot,				12, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS11Target16,
-		kPMTIPausedReset1of2,	kItemPS11Target13, kItemPS11Target12,
-		kPMTIPausedSet,			kItemPS11Target16,
-		kPMTIPosition,			0,
+		kPMTIActivate,        kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS11TargetCounter, kPoliceMazePS11TargetCount,
+		kPMTIObstacleReset,   kItemPS11Target16,
+		kPMTIFacing,          346,
+		kPMTIPosition,        0,
+		kPMTIWait,            0,
+		kPMTITargetSet,       kItemPS11Target16, 1,
+		kPMTIEnemySet,        kItemPS11Target16,
+		kPMTIObstacleSet,     kItemPS11Target16,
+		kPMTIMove,            14,
+		kPMTIWait,            1000,
+		kPMTIShoot,           12, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS11Target16,
+		kPMTIPausedReset1of2, kItemPS11Target13, kItemPS11Target12,
+		kPMTIPausedSet,       kItemPS11Target16,
+		kPMTIPosition,        0,
 		kPMTIRestart
 	};
 	return trackData;
 }
 
-
 void SceneScriptPS11::SceneLoaded() {
 	Obstacle_Object("PARKMETR01", true);
 	Obstacle_Object("PARKMETR02", true);
diff --git a/engines/bladerunner/script/scene/ps12.cpp b/engines/bladerunner/script/scene/ps12.cpp
index e527e71d94..a576de23c1 100644
--- a/engines/bladerunner/script/scene/ps12.cpp
+++ b/engines/bladerunner/script/scene/ps12.cpp
@@ -42,24 +42,24 @@ void SceneScriptPS12::InitializeScene() {
 
 static const int *getPoliceMazePS12TrackData29() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,		kItemPS12Target1,
-		kPMTIFacing,			200,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		4000, 10000,
-		kPMTIObstacleSet,		kItemPS12Target1,
-		kPMTIPlaySound,			33, 33,
-		kPMTITargetSet,			kItemPS12Target1, 1,
-		kPMTIEnemySet,			kItemPS12Target1,
-		kPMTIMove,				5,
-		kPMTIWait,				500,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS12Target1,
-		kPMTIPausedReset1of2,	kItemPS12Target16, kItemPS12Target14,
-		kPMTIPausedSet,			kItemPS12Target1,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset,   kItemPS12Target1,
+		kPMTIFacing,          200,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      4000, 10000,
+		kPMTIObstacleSet,     kItemPS12Target1,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS12Target1, 1,
+		kPMTIEnemySet,        kItemPS12Target1,
+		kPMTIMove,            5,
+		kPMTIWait,            500,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS12Target1,
+		kPMTIPausedReset1of2, kItemPS12Target16, kItemPS12Target14,
+		kPMTIPausedSet,       kItemPS12Target1,
 		kPMTIRestart
 	};
 	return trackData;
@@ -67,25 +67,25 @@ static const int *getPoliceMazePS12TrackData29() {
 
 static const int *getPoliceMazePS12TrackData30() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,		kItemPS12Target2,
-		kPMTIFacing,			67,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		3000, 9000,
-		kPMTIObstacleSet,		kItemPS12Target2,
-		kPMTIPlaySound,			33, 33,
-		kPMTITargetSet,			kItemPS12Target2, 1,
-		kPMTIEnemySet,			kItemPS12Target2,
-		kPMTIMove,				5,
-		kPMTIWait,				500,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS12Target2,
-		kPMTIPausedReset1of2,	kItemPS12Target13, kItemPS12Target11,
-		kPMTIPausedSet,			kItemPS12Target2,
-		kPMTITargetSet,			kItemPS12Target2, 0,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset,   kItemPS12Target2,
+		kPMTIFacing,          67,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 9000,
+		kPMTIObstacleSet,     kItemPS12Target2,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS12Target2, 1,
+		kPMTIEnemySet,        kItemPS12Target2,
+		kPMTIMove,            5,
+		kPMTIWait,            500,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS12Target2,
+		kPMTIPausedReset1of2, kItemPS12Target13, kItemPS12Target11,
+		kPMTIPausedSet,       kItemPS12Target2,
+		kPMTITargetSet,       kItemPS12Target2, 0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -93,27 +93,27 @@ static const int *getPoliceMazePS12TrackData30() {
 
 static const int *getPoliceMazePS12TrackData31() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTITargetSet,			kItemPS12Target3, 1,
-		kPMTIEnemyReset,		kItemPS12Target3,
-		kPMTIObstacleReset,		kItemPS12Target3,
-		kPMTIFacing,			480,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		3000, 10000,
-		kPMTIObstacleSet,		kItemPS12Target3,
-		kPMTIMove,				5,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				1000,
-		kPMTIRotate,			968, 100,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				500,
-		kPMTIMove,				0,
-		kPMTIPlaySound,			29, 33,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTITargetSet,       kItemPS12Target3, 1,
+		kPMTIEnemyReset,      kItemPS12Target3,
+		kPMTIObstacleReset,   kItemPS12Target3,
+		kPMTIFacing,          480,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 10000,
+		kPMTIObstacleSet,     kItemPS12Target3,
+		kPMTIMove,            5,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            1000,
+		kPMTIRotate,          968, 100,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            500,
+		kPMTIMove,            0,
+		kPMTIPlaySound,       29, 33,
 		kPMTILeave,
-		kPMTIObstacleReset,		kItemPS12Target3,
-		kPMTIPausedReset1of3,	kItemPS12Target12, kItemPS12Target4, kItemPS12Target5,
-		kPMTIPausedSet,			kItemPS12Target3,
+		kPMTIObstacleReset,   kItemPS12Target3,
+		kPMTIPausedReset1of3, kItemPS12Target12, kItemPS12Target4, kItemPS12Target5,
+		kPMTIPausedSet,       kItemPS12Target3,
 		kPMTIRestart
 	};
 	return trackData;
@@ -121,26 +121,26 @@ static const int *getPoliceMazePS12TrackData31() {
 
 static const int *getPoliceMazePS12TrackData32() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,		kItemPS12Target4,
-		kPMTIFacing,			1010,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		3000, 10000,
-		kPMTIObstacleSet,		kItemPS12Target4,
-		kPMTIPlaySound,			33, 33,
-		kPMTITargetSet,			kItemPS12Target4, 1,
-		kPMTIEnemySet,			kItemPS12Target4,
-		kPMTIMove,				5,
-		kPMTIWait,				500,
-		kPMTIShoot,				27, 33,
-		kPMTIRotate,			498, 80,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				500,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS12Target4,
-		kPMTIPausedReset1of3,	kItemPS12Target5, kItemPS12Target3, kItemPS12Target12,
-		kPMTIPausedSet,			kItemPS12Target4,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset,   kItemPS12Target4,
+		kPMTIFacing,          1010,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 10000,
+		kPMTIObstacleSet,     kItemPS12Target4,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS12Target4, 1,
+		kPMTIEnemySet,        kItemPS12Target4,
+		kPMTIMove,            5,
+		kPMTIWait,            500,
+		kPMTIShoot,           27, 33,
+		kPMTIRotate,          498, 80,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            500,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS12Target4,
+		kPMTIPausedReset1of3, kItemPS12Target5, kItemPS12Target3, kItemPS12Target12,
+		kPMTIPausedSet,       kItemPS12Target4,
 		kPMTIRestart
 	};
 	return trackData;
@@ -148,28 +148,28 @@ static const int *getPoliceMazePS12TrackData32() {
 
 static const int *getPoliceMazePS12TrackData33() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,		kItemPS12Target5,
-		kPMTIFacing,			540,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		4000, 10000,
-		kPMTIObstacleSet,		kItemPS12Target5,
-		kPMTITargetSet,			kItemPS12Target5, 1,
-		kPMTIEnemyReset,		kItemPS12Target5,
-		kPMTIMove,				5,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				1000,
-		kPMTIRotate,			284, 80,
-		kPMTIWait,				0,
-		kPMTIRotate,			28, 80,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				1000,
-		kPMTIMove,				0,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset,   kItemPS12Target5,
+		kPMTIFacing,          540,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      4000, 10000,
+		kPMTIObstacleSet,     kItemPS12Target5,
+		kPMTITargetSet,       kItemPS12Target5, 1,
+		kPMTIEnemyReset,      kItemPS12Target5,
+		kPMTIMove,            5,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            1000,
+		kPMTIRotate,          284, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          28, 80,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            1000,
+		kPMTIMove,            0,
 		kPMTILeave,
-		kPMTIObstacleReset,		kItemPS12Target5,
-		kPMTIPausedReset1of3,	kItemPS12Target12, kItemPS12Target3, kItemPS12Target4,
-		kPMTIPausedSet,			kItemPS12Target5,
+		kPMTIObstacleReset,   kItemPS12Target5,
+		kPMTIPausedReset1of3, kItemPS12Target12, kItemPS12Target3, kItemPS12Target4,
+		kPMTIPausedSet,       kItemPS12Target5,
 		kPMTIRestart
 	};
 	return trackData;
@@ -177,75 +177,75 @@ static const int *getPoliceMazePS12TrackData33() {
 
 static const int *getPoliceMazePS12TrackData34() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,	kItemPS12Target6,
-		kPMTIObstacleReset,	kItemPS12Target7,
-		kPMTIObstacleReset,	kItemPS12Target8,
-		kPMTIFacing,		469,
-		kPMTIPosition,		0,
-		kPMTITargetSet,		kItemPS12Target6, 1,
-		kPMTITargetSet,		kItemPS12Target7, 1,
-		kPMTITargetSet,		kItemPS12Target8, 1,
-		kPMTIWaitRandom,	3000, 10000,
-		kPMTIObstacleSet,	kItemPS12Target6,
-		kPMTIEnemySet,		kItemPS12Target6,
-		kPMTIEnemySet,		kItemPS12Target7,
-		kPMTIEnemySet,		kItemPS12Target8,
-		kPMTIMove,			5,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			1000,
-		kPMTIRotate,		376, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		168, 80,
-		kPMTIPlaySound,		29, 33,
-		kPMTIMove,			9,
-		kPMTIRotate,		33, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		15, 80,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			500,
-		kPMTIShoot,			27, 33,
-		kPMTIMove,			5,
-		kPMTIPlaySound,		29, 33,
-		kPMTIRotate,		168, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		376, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		469, 80,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			500,
-		kPMTITargetSet,		kItemPS12Target6, 1,
-		kPMTITargetSet,		kItemPS12Target7, 1,
-		kPMTITargetSet,		kItemPS12Target8, 1,
-		kPMTIEnemySet,		kItemPS12Target6,
-		kPMTIEnemySet,		kItemPS12Target7,
-		kPMTIEnemySet,		kItemPS12Target8,
-		kPMTIRotate,		376, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		168, 80,
-		kPMTIMove,			9,
-		kPMTIRotate,		33, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		15, 80,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			500,
-		kPMTIShoot,			27, 33,
-		kPMTIMove,			5,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			0,
-		kPMTIRotate,		469, 80,
-		kPMTIWait,			500,
-		kPMTIRotate,		198, 80,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			0,
-		kPMTIMove,			19,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			0,
-		kPMTIObstacleReset,	kItemPS12Target6,
-		kPMTIPausedReset,	kItemPS12Target7,
-		kPMTIPausedSet,		kItemPS12Target6,
-		kPMTIPosition,		0,
+		kPMTIActivate,      kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset, kItemPS12Target6,
+		kPMTIObstacleReset, kItemPS12Target7,
+		kPMTIObstacleReset, kItemPS12Target8,
+		kPMTIFacing,        469,
+		kPMTIPosition,      0,
+		kPMTITargetSet,     kItemPS12Target6, 1,
+		kPMTITargetSet,     kItemPS12Target7, 1,
+		kPMTITargetSet,     kItemPS12Target8, 1,
+		kPMTIWaitRandom,    3000, 10000,
+		kPMTIObstacleSet,   kItemPS12Target6,
+		kPMTIEnemySet,      kItemPS12Target6,
+		kPMTIEnemySet,      kItemPS12Target7,
+		kPMTIEnemySet,      kItemPS12Target8,
+		kPMTIMove,          5,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          1000,
+		kPMTIRotate,        376, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        168, 80,
+		kPMTIPlaySound,     29, 33,
+		kPMTIMove,          9,
+		kPMTIRotate,        33, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        15, 80,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          500,
+		kPMTIShoot,         27, 33,
+		kPMTIMove,          5,
+		kPMTIPlaySound,     29, 33,
+		kPMTIRotate,        168, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        376, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        469, 80,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          500,
+		kPMTITargetSet,     kItemPS12Target6, 1,
+		kPMTITargetSet,     kItemPS12Target7, 1,
+		kPMTITargetSet,     kItemPS12Target8, 1,
+		kPMTIEnemySet,      kItemPS12Target6,
+		kPMTIEnemySet,      kItemPS12Target7,
+		kPMTIEnemySet,      kItemPS12Target8,
+		kPMTIRotate,        376, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        168, 80,
+		kPMTIMove,          9,
+		kPMTIRotate,        33, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        15, 80,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          500,
+		kPMTIShoot,         27, 33,
+		kPMTIMove,          5,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          0,
+		kPMTIRotate,        469, 80,
+		kPMTIWait,          500,
+		kPMTIRotate,        198, 80,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          0,
+		kPMTIMove,          19,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          0,
+		kPMTIObstacleReset, kItemPS12Target6,
+		kPMTIPausedReset,   kItemPS12Target7,
+		kPMTIPausedSet,     kItemPS12Target6,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -253,18 +253,18 @@ static const int *getPoliceMazePS12TrackData34() {
 
 static const int *getPoliceMazePS12TrackData35() {
 	static int trackData[] = {
-		kPMTIObstacleSet,	kItemPS12Target7,
-		kPMTIFacing,		198,
-		kPMTIPosition,		0,
-		kPMTIRotate,		469, 80,
-		kPMTIMove,			9,
-		kPMTIWait,			0,
-		kPMTIObstacleReset,	kItemPS12Target7,
-		kPMTIPausedReset,	kItemPS12Target8,
-		kPMTIPausedSet,		kItemPS12Target7,
-		kPMTIFacing,		198,
-		kPMTIObstacleSet,	kItemPS12Target7,
-		kPMTIPosition,		0,
+		kPMTIObstacleSet,   kItemPS12Target7,
+		kPMTIFacing,        198,
+		kPMTIPosition,      0,
+		kPMTIRotate,        469, 80,
+		kPMTIMove,          9,
+		kPMTIWait,          0,
+		kPMTIObstacleReset, kItemPS12Target7,
+		kPMTIPausedReset,   kItemPS12Target8,
+		kPMTIPausedSet,     kItemPS12Target7,
+		kPMTIFacing,        198,
+		kPMTIObstacleSet,   kItemPS12Target7,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -272,21 +272,21 @@ static const int *getPoliceMazePS12TrackData35() {
 
 static const int *getPoliceMazePS12TrackData36() {
 	static int trackData[] = {
-		kPMTIObstacleSet,	kItemPS12Target8,
-		kPMTIFacing,		469,
-		kPMTIPosition,		0,
-		kPMTIObstacleSet,	kItemPS12Target8,
-		kPMTIMove,			9,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			1000,
-		kPMTIObstacleReset,	kItemPS12Target6,
-		kPMTIObstacleReset,	kItemPS12Target7,
-		kPMTIObstacleReset,	kItemPS12Target8,
-		kPMTIPausedReset,	kItemPS12Target9,
-		kPMTIPausedSet,		kItemPS12Target8,
-		kPMTIFacing,		469,
-		kPMTIObstacleSet,	kItemPS12Target8,
-		kPMTIPosition,		0,
+		kPMTIObstacleSet,   kItemPS12Target8,
+		kPMTIFacing,        469,
+		kPMTIPosition,      0,
+		kPMTIObstacleSet,   kItemPS12Target8,
+		kPMTIMove,          9,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          1000,
+		kPMTIObstacleReset, kItemPS12Target6,
+		kPMTIObstacleReset, kItemPS12Target7,
+		kPMTIObstacleReset, kItemPS12Target8,
+		kPMTIPausedReset,   kItemPS12Target9,
+		kPMTIPausedSet,     kItemPS12Target8,
+		kPMTIFacing,        469,
+		kPMTIObstacleSet,   kItemPS12Target8,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -294,26 +294,26 @@ static const int *getPoliceMazePS12TrackData36() {
 
 static const int *getPoliceMazePS12TrackData37() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,	kItemPS12Target9,
-		kPMTIWaitRandom,	3000, 6000,
-		kPMTIPausedReset,	kItemPS12Target10,
-		kPMTIFacing,		1010,
-		kPMTIPosition,		0,
-		kPMTIWait,			2000,
-		kPMTIObstacleSet,	kItemPS12Target9,
-		kPMTIPlaySound,		33, 33,
-		kPMTITargetSet,		kItemPS12Target9, 1,
-		kPMTIEnemyReset,	kItemPS12Target9,
-		kPMTIMove,			9,
-		kPMTIWait,			3000,
-		kPMTIPlaySound,		34, 33,
-		kPMTIMove,			0,
+		kPMTIActivate,      kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset, kItemPS12Target9,
+		kPMTIWaitRandom,    3000, 6000,
+		kPMTIPausedReset,   kItemPS12Target10,
+		kPMTIFacing,        1010,
+		kPMTIPosition,      0,
+		kPMTIWait,          2000,
+		kPMTIObstacleSet,   kItemPS12Target9,
+		kPMTIPlaySound,     33, 33,
+		kPMTITargetSet,     kItemPS12Target9, 1,
+		kPMTIEnemyReset,    kItemPS12Target9,
+		kPMTIMove,          9,
+		kPMTIWait,          3000,
+		kPMTIPlaySound,     34, 33,
+		kPMTIMove,          0,
 		kPMTILeave,
-		kPMTIObstacleReset,	kItemPS12Target9,
-		kPMTIPausedSet,		kItemPS12Target9,
-		kPMTIPosition,		0,
+		kPMTIObstacleReset, kItemPS12Target9,
+		kPMTIPausedSet,     kItemPS12Target9,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -321,23 +321,23 @@ static const int *getPoliceMazePS12TrackData37() {
 
 static const int *getPoliceMazePS12TrackData38() {
 	static int trackData[] = {
-		kPMTIObstacleReset,	kItemPS12Target10,
-		kPMTIFacing,		990,
-		kPMTIPosition,		0,
-		kPMTIWait,			3000,
-		kPMTIObstacleSet,	kItemPS12Target10,
-		kPMTIPlaySound,		33, 33,
-		kPMTITargetSet,		kItemPS12Target10, 1,
-		kPMTIEnemySet,		kItemPS12Target10,
-		kPMTIMove,			9,
-		kPMTIWait,			1000,
-		kPMTIShoot,			12, 33,
-		kPMTIPlaySound,		34, 33,
-		kPMTIMove,			0,
-		kPMTIObstacleReset,	kItemPS12Target10,
-		kPMTIPausedReset,	kItemPS12Target6,
-		kPMTIPausedSet,		kItemPS12Target10,
-		kPMTIPosition,		0,
+		kPMTIObstacleReset, kItemPS12Target10,
+		kPMTIFacing,        990,
+		kPMTIPosition,      0,
+		kPMTIWait,          3000,
+		kPMTIObstacleSet,   kItemPS12Target10,
+		kPMTIPlaySound,     33, 33,
+		kPMTITargetSet,     kItemPS12Target10, 1,
+		kPMTIEnemySet,      kItemPS12Target10,
+		kPMTIMove,          9,
+		kPMTIWait,          1000,
+		kPMTIShoot,         12, 33,
+		kPMTIPlaySound,     34, 33,
+		kPMTIMove,          0,
+		kPMTIObstacleReset, kItemPS12Target10,
+		kPMTIPausedReset,   kItemPS12Target6,
+		kPMTIPausedSet,     kItemPS12Target10,
+		kPMTIPosition,      0,
 		kPMTIRestart
 	};
 	return trackData;
@@ -345,27 +345,27 @@ static const int *getPoliceMazePS12TrackData38() {
 
 static const int *getPoliceMazePS12TrackData39() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,		kItemPS12Target11,
-		kPMTIFacing,			513,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		5000, 5000,
-		kPMTIObstacleSet,		kItemPS12Target11,
-		kPMTIPlaySound,			33, 33,
-		kPMTITargetSet,			kItemPS12Target11, 1,
-		kPMTIMove,				5,
-		kPMTIWait,				1000,
-		kPMTIEnemySet,			kItemPS12Target11,
-		kPMTIRotate,			1010, 80,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				500,
-		kPMTIShoot,				27, 33,
-		kPMTIPlaySound,			34, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS12Target11,
-		kPMTIPausedReset1of2,	kItemPS12Target13, kItemPS12Target2,
-		kPMTIPausedSet,			kItemPS12Target11,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset,   kItemPS12Target11,
+		kPMTIFacing,          513,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 5000,
+		kPMTIObstacleSet,     kItemPS12Target11,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS12Target11, 1,
+		kPMTIMove,            5,
+		kPMTIWait,            1000,
+		kPMTIEnemySet,        kItemPS12Target11,
+		kPMTIRotate,          1010, 80,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            500,
+		kPMTIShoot,           27, 33,
+		kPMTIPlaySound,       34, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS12Target11,
+		kPMTIPausedReset1of2, kItemPS12Target13, kItemPS12Target2,
+		kPMTIPausedSet,       kItemPS12Target11,
 		kPMTIRestart
 	};
 	return trackData;
@@ -373,27 +373,27 @@ static const int *getPoliceMazePS12TrackData39() {
 
 static const int *getPoliceMazePS12TrackData40() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,		kItemPS12Target12,
-		kPMTIFacing,			480,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		4000, 8000,
-		kPMTIObstacleSet,		kItemPS12Target12,
-		kPMTIPlaySound,			29, 33,
-		kPMTITargetSet,			kItemPS12Target12, 1,
-		kPMTIMove,				5,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				500,
-		kPMTIEnemySet,			kItemPS12Target12,
-		kPMTIRotate,			968, 80,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				1000,
-		kPMTIShoot,				27, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS12Target12,
-		kPMTIPausedReset1of3,	kItemPS12Target3, kItemPS12Target4, kItemPS12Target5,
-		kPMTIPausedSet,			kItemPS12Target12,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset,   kItemPS12Target12,
+		kPMTIFacing,          480,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      4000, 8000,
+		kPMTIObstacleSet,     kItemPS12Target12,
+		kPMTIPlaySound,       29, 33,
+		kPMTITargetSet,       kItemPS12Target12, 1,
+		kPMTIMove,            5,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            500,
+		kPMTIEnemySet,        kItemPS12Target12,
+		kPMTIRotate,          968, 80,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS12Target12,
+		kPMTIPausedReset1of3, kItemPS12Target3, kItemPS12Target4, kItemPS12Target5,
+		kPMTIPausedSet,       kItemPS12Target12,
 		kPMTIRestart
 	};
 	return trackData;
@@ -401,27 +401,27 @@ static const int *getPoliceMazePS12TrackData40() {
 
 static const int *getPoliceMazePS12TrackData41() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,		kItemPS12Target13,
-		kPMTIFacing,			513,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		4000, 6000,
-		kPMTIObstacleSet,		kItemPS12Target13,
-		kPMTIPlaySound,			33, 33,
-		kPMTITargetSet,			kItemPS12Target13, 1,
-		kPMTIEnemyReset,		kItemPS12Target13,
-		kPMTIMove,				5,
-		kPMTIWait,				500,
-		kPMTIRotate,			1010, 80,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				1000,
-		kPMTIMove,				0,
-		kPMTIPlaySound,			34, 33,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset,   kItemPS12Target13,
+		kPMTIFacing,          513,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      4000, 6000,
+		kPMTIObstacleSet,     kItemPS12Target13,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS12Target13, 1,
+		kPMTIEnemyReset,      kItemPS12Target13,
+		kPMTIMove,            5,
+		kPMTIWait,            500,
+		kPMTIRotate,          1010, 80,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            1000,
+		kPMTIMove,            0,
+		kPMTIPlaySound,       34, 33,
 		kPMTILeave,
-		kPMTIObstacleReset,		kItemPS12Target13,
-		kPMTIPausedReset1of2,	kItemPS12Target11, kItemPS12Target2,
-		kPMTIPausedSet,			kItemPS12Target13,
+		kPMTIObstacleReset,   kItemPS12Target13,
+		kPMTIPausedReset1of2, kItemPS12Target11, kItemPS12Target2,
+		kPMTIPausedSet,       kItemPS12Target13,
 		kPMTIRestart
 	};
 	return trackData;
@@ -429,22 +429,22 @@ static const int *getPoliceMazePS12TrackData41() {
 
 static const int *getPoliceMazePS12TrackData42() {
 	static int trackData[] = {
-		kPMTIObstacleReset,		kItemPS12Target14,
-		kPMTIFacing,			109,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		2000, 5000,
-		kPMTIObstacleSet,		kItemPS12Target14,
-		kPMTIPlaySound,			29, 33,
-		kPMTITargetSet,			kItemPS12Target14, 1,
-		kPMTIEnemySet,			kItemPS12Target14,
-		kPMTIMove,				5,
-		kPMTIPlaySound,			29, 33,
-		kPMTIWait,				1000,
-		kPMTIShoot,				27, 33,
-		kPMTIMove,				0,
-		kPMTIObstacleReset,		kItemPS12Target14,
-		kPMTIPausedReset1of2,	kItemPS12Target16, kItemPS12Target1,
-		kPMTIPausedSet,			kItemPS12Target14,
+		kPMTIObstacleReset,   kItemPS12Target14,
+		kPMTIFacing,          109,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      2000, 5000,
+		kPMTIObstacleSet,     kItemPS12Target14,
+		kPMTIPlaySound,       29, 33,
+		kPMTITargetSet,       kItemPS12Target14, 1,
+		kPMTIEnemySet,        kItemPS12Target14,
+		kPMTIMove,            5,
+		kPMTIPlaySound,       29, 33,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS12Target14,
+		kPMTIPausedReset1of2, kItemPS12Target16, kItemPS12Target1,
+		kPMTIPausedSet,       kItemPS12Target14,
 		kPMTIRestart
 	};
 	return trackData;
@@ -452,29 +452,29 @@ static const int *getPoliceMazePS12TrackData42() {
 
 static const int *getPoliceMazePS12TrackData43() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,	kItemPS12Target15,
-		kPMTIFacing,		540,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	5000, 7000,
-		kPMTIObstacleSet,	kItemPS12Target15,
-		kPMTIPlaySound,		33, 33,
-		kPMTITargetSet,		kItemPS12Target15, 1,
-		kPMTIEnemyReset,	kItemPS12Target15,
-		kPMTIMove,			9,
-		kPMTIWait,			2000,
-		kPMTIRotate,		284, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		28, 80,
-		kPMTIPlaySound,		29, 33,
-		kPMTIWait,			2000,
-		kPMTIPlaySound,		34, 33,
-		kPMTIMove,			0,
+		kPMTIActivate,      kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset, kItemPS12Target15,
+		kPMTIFacing,        540,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    5000, 7000,
+		kPMTIObstacleSet,   kItemPS12Target15,
+		kPMTIPlaySound,     33, 33,
+		kPMTITargetSet,     kItemPS12Target15, 1,
+		kPMTIEnemyReset,    kItemPS12Target15,
+		kPMTIMove,          9,
+		kPMTIWait,          2000,
+		kPMTIRotate,        284, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        28, 80,
+		kPMTIPlaySound,     29, 33,
+		kPMTIWait,          2000,
+		kPMTIPlaySound,     34, 33,
+		kPMTIMove,          0,
 		kPMTILeave,
-		kPMTIObstacleReset,	kItemPS12Target15,
-		kPMTIPausedReset,	kItemPS12Target17,
-		kPMTIPausedSet,		kItemPS12Target15,
+		kPMTIObstacleReset, kItemPS12Target15,
+		kPMTIPausedReset,   kItemPS12Target17,
+		kPMTIPausedSet,     kItemPS12Target15,
 		kPMTIRestart
 	};
 	return trackData;
@@ -482,24 +482,24 @@ static const int *getPoliceMazePS12TrackData43() {
 
 static const int *getPoliceMazePS12TrackData44() {
 	static int trackData[] = {
-		kPMTIActivate,			kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,		kItemPS12Target16,
-		kPMTIFacing,			109,
-		kPMTIPosition,			0,
-		kPMTIWaitRandom,		5000, 5000,
-		kPMTIObstacleSet,		kItemPS12Target16,
-		kPMTIPlaySound,			29, 33,
-		kPMTITargetSet,			kItemPS12Target16, 1,
-		kPMTIEnemyReset,		kItemPS12Target16,
-		kPMTIMove,				5,
-		kPMTIWaitRandom,		2000, 2000,
-		kPMTIPlaySound,			29, 33,
-		kPMTIMove,				0,
+		kPMTIActivate,        kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset,   kItemPS12Target16,
+		kPMTIFacing,          109,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 5000,
+		kPMTIObstacleSet,     kItemPS12Target16,
+		kPMTIPlaySound,       29, 33,
+		kPMTITargetSet,       kItemPS12Target16, 1,
+		kPMTIEnemyReset,      kItemPS12Target16,
+		kPMTIMove,            5,
+		kPMTIWaitRandom,      2000, 2000,
+		kPMTIPlaySound,       29, 33,
+		kPMTIMove,            0,
 		kPMTILeave,
-		kPMTIObstacleReset,		kItemPS12Target16,
-		kPMTIPausedReset1of2,	kItemPS12Target14, kItemPS12Target1,
-		kPMTIPausedSet,			kItemPS12Target16,
+		kPMTIObstacleReset,   kItemPS12Target16,
+		kPMTIPausedReset1of2, kItemPS12Target14, kItemPS12Target1,
+		kPMTIPausedSet,       kItemPS12Target16,
 		kPMTIRestart
 	};
 	return trackData;
@@ -507,28 +507,28 @@ static const int *getPoliceMazePS12TrackData44() {
 
 static const int *getPoliceMazePS12TrackData45() {
 	static int trackData[] = {
-		kPMTIActivate,		kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIVariableInc,	kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
-		kPMTIObstacleReset,	kItemPS12Target17,
-		kPMTIFacing,		540,
-		kPMTIPosition,		0,
-		kPMTIWaitRandom,	3000, 10000,
-		kPMTIObstacleSet,	kItemPS12Target17,
-		kPMTIPlaySound,		33, 33,
-		kPMTITargetSet,		kItemPS12Target17, 1,
-		kPMTIMove,			9,
-		kPMTIWait,			1000,
-		kPMTIEnemySet,		kItemPS12Target17,
-		kPMTIRotate,		284, 80,
-		kPMTIWait,			0,
-		kPMTIRotate,		28, 80,
-		kPMTIWait,			1000,
-		kPMTIShoot,			27, 33,
-		kPMTIPlaySound,		34, 33,
-		kPMTIMove,			0,
-		kPMTIObstacleReset,	kItemPS12Target17,
-		kPMTIPausedReset,	kItemPS12Target15,
-		kPMTIPausedSet,		kItemPS12Target17,
+		kPMTIActivate,      kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS12TargetCounter, kPoliceMazePS12TargetCount,
+		kPMTIObstacleReset, kItemPS12Target17,
+		kPMTIFacing,        540,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 10000,
+		kPMTIObstacleSet,   kItemPS12Target17,
+		kPMTIPlaySound,     33, 33,
+		kPMTITargetSet,     kItemPS12Target17, 1,
+		kPMTIMove,          9,
+		kPMTIWait,          1000,
+		kPMTIEnemySet,      kItemPS12Target17,
+		kPMTIRotate,        284, 80,
+		kPMTIWait,          0,
+		kPMTIRotate,        28, 80,
+		kPMTIWait,          1000,
+		kPMTIShoot,         27, 33,
+		kPMTIPlaySound,     34, 33,
+		kPMTIMove,          0,
+		kPMTIObstacleReset, kItemPS12Target17,
+		kPMTIPausedReset,   kItemPS12Target15,
+		kPMTIPausedSet,     kItemPS12Target17,
 		kPMTIRestart
 	};
 	return trackData;