BLADERUNNER: Clean-up of PS13 target scripts

1 files changed, 430 insertions, 43 deletions

diff --git a/engines/bladerunner/script/scene/ps13.cpp b/engines/bladerunner/script/scene/ps13.cpp
index 3a1d906480..26cf31b3ba 100644
--- a/engines/bladerunner/script/scene/ps13.cpp
+++ b/engines/bladerunner/script/scene/ps13.cpp
@@ -37,41 +37,426 @@ void SceneScriptPS13::InitializeScene() {
 		Scene_Loop_Set_Default(1);
 		Setup_Scene_Information(World_Waypoint_Query_X(11), World_Waypoint_Query_Y(11), World_Waypoint_Query_Z(11), 840);
 	}
+
 	Scene_Exit_Add_2D_Exit(0, 0, 460, 639, 479, 2);
 	Scene_Exit_Add_2D_Exit(1, 0,   0,  20, 479, 3);
+
 	Ambient_Sounds_Remove_All_Non_Looping_Sounds(0);
 	Ambient_Sounds_Add_Looping_Sound(387, 50, 1, 1);
 	Ambient_Sounds_Add_Looping_Sound( 54, 50, 1, 1);
-	Ambient_Sounds_Add_Sound(1,  10,  50, 16, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(389, 5,  50, 16, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(390, 6,  50, 16, 25, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(443, 2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(444, 2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(445, 2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(446, 2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(303, 5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(304, 5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(305, 5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(306, 5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(307, 5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
-	Ambient_Sounds_Add_Sound(308, 5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(  1, 10,  50, 16, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(389,  5,  50, 16, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(390,  6,  50, 16, 25, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(443,  2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(444,  2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(445,  2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(446,  2, 100, 14, 16, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(303,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(304,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(305,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(306,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(307,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+	Ambient_Sounds_Add_Sound(308,  5, 100, 17, 27, -100, 100, -101, -101, 0, 0);
+}
+
+static const int *getPoliceMazePS13TrackData46() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target1,
+		kPMTIFacing,          960,
+		kPMTIPosition,        0,
+		kPMTIWait,            2000,
+		kPMTIObstacleSet,     kItemPS13Target1,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target1, 1,
+		kPMTIEnemySet,        kItemPS13Target1,
+		kPMTIWait,            1000,
+		kPMTIMove,            5,
+		kPMTIWait,            500,
+		kPMTIShoot,           27, 33,
+		kPMTIWait,            500,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target1,
+		kPMTIPausedReset1of2, kItemPS13Target14, kItemPS13Target15,
+		kPMTIPausedSet,       kItemPS13Target1,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData47() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target2,
+		kPMTIFacing,          823,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 5000,
+		kPMTIObstacleSet,     kItemPS13Target2,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target2, 1,
+		kPMTIEnemySet,        kItemPS13Target2,
+		kPMTIMove,            9,
+		kPMTIWait,            2000,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target2,
+		kPMTIPausedReset1of2, kItemPS13Target5, kItemPS13Target7,
+		kPMTIPausedSet,       kItemPS13Target2,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData48() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target3,
+		kPMTIFacing,          823,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      2000, 2000,
+		kPMTIObstacleSet,     kItemPS13Target3,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target3, 1,
+		kPMTIEnemyReset,      kItemPS13Target3,
+		kPMTIMove,            9,
+		kPMTIWait,            2000,
+		kPMTILeave,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target3,
+		kPMTIPausedReset1of2, kItemPS13Target8, kItemPS13Target6,
+		kPMTIPausedSet,       kItemPS13Target3,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData49() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target4,
+		kPMTIFacing,          922,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 3000,
+		kPMTIObstacleSet,     kItemPS13Target4,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target4, 1,
+		kPMTIEnemySet,        kItemPS13Target4,
+		kPMTIMove,            9,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target4,
+		kPMTIPausedReset1of2, kItemPS13Target9, kItemPS13Target10,
+		kPMTIPausedSet,       kItemPS13Target4,
+		kPMTIPosition,        0,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData50() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target5,
+		kPMTIFacing,          823,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 5000,
+		kPMTIObstacleSet,     kItemPS13Target5,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target5, 1,
+		kPMTIEnemyReset,      kItemPS13Target5,
+		kPMTIMove,            9,
+		kPMTIWait,            2000,
+		kPMTIMove,            0,
+		kPMTILeave,
+		kPMTIObstacleReset,   kItemPS13Target5,
+		kPMTIPausedReset1of2, kItemPS13Target2, kItemPS13Target7,
+		kPMTIPausedSet,       kItemPS13Target5,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData51() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target6,
+		kPMTIFacing,          823,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      2000, 2000,
+		kPMTIObstacleSet,     kItemPS13Target6,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target6, 1,
+		kPMTIEnemySet,        kItemPS13Target6,
+		kPMTIMove,            9,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIWait,            500,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target6,
+		kPMTIPausedReset1of2, kItemPS13Target8, kItemPS13Target3,
+		kPMTIPausedSet,       kItemPS13Target6,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData52() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target7,
+		kPMTIFacing,          305,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      5000, 10000,
+		kPMTIObstacleSet,     kItemPS13Target7,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target7, 1,
+		kPMTIEnemyReset,      kItemPS13Target7,
+		kPMTIMove,            9,
+		kPMTIWait,            500,
+		kPMTIEnemySet,        kItemPS13Target7,
+		kPMTIRotate,          555, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          833, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target7,
+		kPMTIPausedReset1of2, kItemPS13Target2, kItemPS13Target5,
+		kPMTIPausedSet,       kItemPS13Target7,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData53() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target8,
+		kPMTIFacing,          356,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 3000,
+		kPMTIObstacleSet,     kItemPS13Target8,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target8, 1,
+		kPMTIEnemyReset,      kItemPS13Target8,
+		kPMTIMove,            5,
+		kPMTIEnemySet,        kItemPS13Target8,
+		kPMTIRotate,          868, 200,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIRotate,          356, 60,
+		kPMTIWait,            1000,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target8,
+		kPMTIPausedReset1of2, kItemPS13Target3, kItemPS13Target6,
+		kPMTIPausedSet,       kItemPS13Target8,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData54() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target9,
+		kPMTIFacing,          512,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      10000, 20000,
+		kPMTIObstacleSet,     kItemPS13Target9,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target9, 1,
+		kPMTIEnemyReset,      kItemPS13Target9,
+		kPMTIMove,            3,
+		kPMTIWait,            500,
+		kPMTIEnemySet,        kItemPS13Target9,
+		kPMTIRotate,          768, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target9,
+		kPMTIPausedReset1of2, kItemPS13Target13, kItemPS13Target10,
+		kPMTIPausedSet,       kItemPS13Target9,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData55() {
+	static int trackData[] = {
+		kPMTIActivate,      kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset, kItemPS13Target10,
+		kPMTIObstacleReset, kItemPS13Target11,
+		kPMTIObstacleReset, kItemPS13Target12,
+		kPMTITargetSet,     kItemPS13Target10, 1,
+		kPMTITargetSet,     kItemPS13Target11, 1,
+		kPMTITargetSet,     kItemPS13Target12, 1,
+		kPMTIFacing,        327,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    1000, 1000,
+		kPMTIPlaySound,     33, 33,
+		kPMTIEnemyReset,    kItemPS13Target10,
+		kPMTIObstacleSet,   kItemPS13Target10,
+		kPMTIMove,          14,
+		kPMTIWait,          1000,
+		kPMTIPausedReset,   kItemPS13Target11,
+		kPMTIObstacleReset, kItemPS13Target10,
+		kPMTIObstacleSet,   kItemPS13Target11,
+		kPMTIPausedSet,     kItemPS13Target10,
+		kPMTIPosition,      0,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData56() {
+	static int trackData[] = {
+		kPMTIFacing,        327,
+		kPMTIPosition,      0,
+		kPMTIObstacleSet,   kItemPS13Target11,
+		kPMTIEnemyReset,    kItemPS13Target11,
+		kPMTIMove,          14,
+		kPMTIWait,          1000,
+		kPMTIPausedReset,   kItemPS13Target12,
+		kPMTIObstacleReset, kItemPS13Target11,
+		kPMTIObstacleSet,   kItemPS13Target12,
+		kPMTIPausedSet,     kItemPS13Target11,
+		kPMTIPosition,      0,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData57() {
+	static int trackData[] = {
+		kPMTIEnemySet,        kItemPS13Target12,
+		kPMTIFacing,          327,
+		kPMTIPosition,        0,
+		kPMTIObstacleSet,     kItemPS13Target12,
+		kPMTIRotate,          516, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          843, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIWait,            500,
+		kPMTIMove,            14,
+		kPMTIObstacleReset,   kItemPS13Target12,
+		kPMTIPausedReset1of2, kItemPS13Target13, kItemPS13Target9,
+		kPMTIPausedSet,       kItemPS13Target12,
+		kPMTIPosition,        0,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData58() {
+	static int trackData[] = {
+		kPMTIActivate,      kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,   kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset, kItemPS13Target13,
+		kPMTIFacing,        922,
+		kPMTIPosition,      0,
+		kPMTIWaitRandom,    3000, 3000,
+		kPMTIObstacleSet,   kItemPS13Target13,
+		kPMTIPlaySound,     33, 33,
+		kPMTITargetSet,     kItemPS13Target13, 1,
+		kPMTIEnemyReset,    kItemPS13Target13,
+		kPMTIMove,          9,
+		kPMTIWait,          200,
+		kPMTIMove,          0,
+		kPMTILeave,
+		kPMTITargetSet,     kItemPS13Target13, 1,
+		kPMTIEnemyReset,    kItemPS13Target13,
+		kPMTIWait,          200,
+		kPMTIMove,          9,
+		kPMTIWait,          200,
+		kPMTIMove,          0,
+		kPMTILeave,
+		kPMTIObstacleReset, kItemPS13Target13,
+		kPMTIPausedReset,   kItemPS13Target4,
+		kPMTIPausedSet,     kItemPS13Target13,
+		kPMTIPosition,      0,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData62() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target14,
+		kPMTIFacing,          465,
+		kPMTIPosition,        0,
+		kPMTIWaitRandom,      3000, 3000,
+		kPMTIObstacleSet,     kItemPS13Target14,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target14, 1,
+		kPMTIEnemyReset,      kItemPS13Target14,
+		kPMTIMove,            14,
+		kPMTIWait,            1000,
+		kPMTIEnemySet,        kItemPS13Target14,
+		kPMTIRotate,          650, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          937, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIWait,            500,
+		kPMTIRotate,          650, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          465, 80,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target14,
+		kPMTIPausedReset1of2, kItemPS13Target1, kItemPS13Target15,
+		kPMTIPausedSet,       kItemPS13Target14,
+		kPMTIRestart
+	};
+	return trackData;
+}
+
+static const int *getPoliceMazePS13TrackData63() {
+	static int trackData[] = {
+		kPMTIActivate,        kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIVariableInc,     kVariablePoliceMazePS13TargetCounter, kPoliceMazePS13TargetCount,
+		kPMTIObstacleReset,   kItemPS13Target15,
+		kPMTIFacing,          465,
+		kPMTIPosition,        0,
+		kPMTIWait,            3000,
+		kPMTIObstacleSet,     kItemPS13Target15,
+		kPMTIPlaySound,       33, 33,
+		kPMTITargetSet,       kItemPS13Target15, 1,
+		kPMTIEnemyReset,      kItemPS13Target15,
+		kPMTIMove,            9,
+		kPMTIWait,            1000,
+		kPMTIEnemySet,        kItemPS13Target15,
+		kPMTIRotate,          710, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          960, 80,
+		kPMTIWait,            1000,
+		kPMTIShoot,           27, 33,
+		kPMTIWait,            500,
+		kPMTIRotate,          710, 80,
+		kPMTIWait,            0,
+		kPMTIRotate,          460, 80,
+		kPMTIMove,            0,
+		kPMTIObstacleReset,   kItemPS13Target15,
+		kPMTIPausedReset1of2, kItemPS13Target1, kItemPS13Target14,
+		kPMTIPausedSet,       kItemPS13Target15,
+		kPMTIRestart
+	};
+	return trackData;
 }
 
-static int track_data_46[] = {-26, 13, 20, -18, 13, 20, -9, 46, -5, 960, -1, 0, -3, 2000, -8, 46, -10, 33, 33, -15, 46, 1, -22, 46, -3, 1000, -2, 5, -3, 500, -24, 27, 33, -3, 500, -2, 0, -9, 46, -13, 62, 63, -12, 46, -4};
-static int track_data_47[] = {-26, 13, 20, -18, 13, 20, -9, 47, -5, 823, -1, 0, -7, 5000, 5000, -8, 47, -10, 33, 33, -15, 47, 1, -22, 47, -2, 9, -3, 2000, -24, 27, 33, -2, 0, -9, 47, -13, 50, 52, -12, 47, -4};
-static int track_data_48[] = {-26, 13, 20, -18, 13, 20, -9, 48, -5, 823, -1, 0, -7, 2000, 2000, -8, 48, -10, 33, 33, -15, 48, 1, -23, 48, -2, 9, -3, 2000, -25, -2, 0, -9, 48, -13, 53, 51, -12, 48, -4};
-static int track_data_49[] = {-26, 13, 20, -18, 13, 20, -9, 49, -5, 922, -1, 0, -7, 3000, 3000, -8, 49, -10, 33, 33, -15, 49, 1, -22, 49, -2, 9, -3, 1000, -24, 27, 33, -2, 0, -9, 49, -13, 54, 55, -12, 49, -1, 0, -4};
-static int track_data_50[] = {-26, 13, 20, -18, 13, 20, -9, 50, -5, 823, -1, 0, -7, 3000, 5000, -8, 50, -10, 33, 33, -15, 50, 1, -23, 50, -2, 9, -3, 2000, -2, 0, -25, -9, 50, -13, 47, 52, -12, 50, -4};
-static int track_data_51[] = {-26, 13, 20, -18, 13, 20, -9, 51, -5, 823, -1, 0, -7, 2000, 2000, -8, 51, -10, 33, 33, -15, 51, 1, -22, 51, -2, 9, -3, 1000, -24, 27, 33, -3, 500, -2, 0, -9, 51, -13, 53, 48, -12, 51, -4};
-static int track_data_52[] = {-26, 13, 20, -18, 13, 20, -9, 52, -5, 305, -1, 0, -7, 5000, 10000, -8, 52, -10, 33, 33, -15, 52, 1, -23, 52, -2, 9, -3, 500, -22, 52, -6, 555, 80, -3, 0, -6, 833, 80, -3, 1000, -24, 27, 33, -2, 0, -9, 52, -13, 47, 50, -12, 52, -4};
-static int track_data_53[] = {-26, 13, 20, -18, 13, 20, -9, 53, -5, 356, -1, 0, -7, 3000, 3000, -8, 53, -10, 33, 33, -15, 53, 1, -23, 53, -2, 5, -22, 53, -6, 868, 200, -3, 1000, -24, 27, 33, -6, 356, 60, -3, 1000, -2, 0, -9, 53, -13, 48, 51, -12, 53, -4};
-static int track_data_54[] = {-26, 13, 20, -18, 13, 20, -9, 54, -5, 512, -1, 0, -7, 10000, 20000, -8, 54, -10, 33, 33, -15, 54, 1, -23, 54, -2, 3, -3, 500, -22, 54, -6, 768, 80, -3, 1000, -24, 27, 33, -2, 0, -9, 54, -13, 58, 55, -12, 54, -4};
-static int track_data_55[] = {-26, 13, 20, -18, 13, 20, -9, 55, -9, 56, -9, 57, -15, 55, 1, -15, 56, 1, -15, 57, 1, -5, 327, -1, 0, -7, 1000, 1000, -10, 33, 33, -23, 55, -8, 55, -2, 14, -3, 1000, -11, 56, -9, 55, -8, 56, -12, 55, -1, 0, -4};
-static int track_data_56[] = {-5, 327, -1, 0, -8, 56, -23, 56, -2, 14, -3, 1000, -11, 57, -9, 56, -8, 57, -12, 56, -1, 0, -4};
-static int track_data_57[] = {-22, 57, -5, 327, -1, 0, -8, 57, -6, 516, 80, -3, 0, -6, 843, 80, -3, 1000, -24, 27, 33, -3, 500, -2, 14, -9, 57, -13, 58, 54, -12, 57, -1, 0, -4};
-static int track_data_58[] = {-26, 13, 20, -18, 13, 20, -9, 58, -5, 922, -1, 0, -7, 3000, 3000, -8, 58, -10, 33, 33, -15, 58, 1, -23, 58, -2, 9, -3, 200, -2, 0, -25, -15, 58, 1, -23, 58, -3, 200, -2, 9, -3, 200, -2, 0, -25, -9, 58, -11, 49, -12, 58, -1, 0, -4};
-static int track_data_62[] = {-26, 13, 20, -18, 13, 20, -9, 62, -5, 465, -1, 0, -7, 3000, 3000, -8, 62, -10, 33, 33, -15, 62, 1, -23, 62, -2, 14, -3, 1000, -22, 62, -6, 650, 80, -3, 0, -6, 937, 80, -3, 1000, -24, 27, 33, -3, 500, -6, 650, 80, -3, 0, -6, 465, 80, -2, 0, -9, 62, -13, 46, 63, -12, 62, -4};
-static int track_data_63[] = {-26, 13, 20, -18, 13, 20, -9, 63, -5, 465, -1, 0, -3, 3000, -8, 63, -10, 33, 33, -15, 63, 1, -23, 63, -2, 9, -3, 1000, -22, 63, -6, 710, 80, -3, 0, -6, 960, 80, -3, 1000, -24, 27, 33, -3, 500, -6, 710, 80, -3, 0, -6, 460, 80, -2, 0, -9, 63, -13, 46, 62, -12, 63, -4};
 
 void SceneScriptPS13::SceneLoaded() {
 	Obstacle_Object("PARKMETR01", true);
@@ -92,6 +477,7 @@ void SceneScriptPS13::SceneLoaded() {
 	Unclickable_Object("PARKMETR11");
 	Unclickable_Object("PARKMETR15");
 	Unclickable_Object("PARKMETR16");
+
 	if (!Query_System_Currently_Loading_Game()) {
 		Item_Add_To_World(kItemPS13Target1,  443, kSetPS10_PS11_PS12_PS13, -372.0f,   -9.0f,  1509.0f, 960, 72, 36, true, false, false, true);
 		Item_Add_To_World(kItemPS13Target2,  443, kSetPS10_PS11_PS12_PS13, 291.61f,  -0.66f,  1610.3f, 823, 72, 36, true, false, false, true);
@@ -109,21 +495,22 @@ void SceneScriptPS13::SceneLoaded() {
 		Item_Add_To_World(kItemPS13Target14, 445, kSetPS10_PS11_PS12_PS13, -300.0f, -79.75f,  1543.0f, 465, 72, 36, true, false, false, true);
 		Item_Add_To_World(kItemPS13Target15, 449, kSetPS10_PS11_PS12_PS13, -325.0f,  -7.75f,  1543.0f, 465, 72, 36, true, false, false, true);
 	}
-	Police_Maze_Target_Track_Add(kItemPS13Target1,  -372.0f,   -9.0f,  1509.0f, -345.0f,   -9.0f,  1509.0f,  6, track_data_46,  true);
-	Police_Maze_Target_Track_Add(kItemPS13Target2,  291.61f,  -0.66f,  1610.3f, 238.83f,   1.03f, 1557.03f, 10, track_data_47,  true);
-	Police_Maze_Target_Track_Add(kItemPS13Target3,   -25.0f,  102.0f,  1625.0f,  -25.0f,  138.0f,  1625.0f, 10, track_data_48,  true);
-	Police_Maze_Target_Track_Add(kItemPS13Target4,  -45.51f,   -8.8f,  1676.0f,  15.51f,   -8.8f,  1679.0f, 10, track_data_49, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target5,  291.61f,  -0.66f,  1610.3f, 238.83f,   1.03f, 1557.03f, 10, track_data_50, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target6,   -24.0f,  102.0f,  1625.0f,  -24.0f,  138.0f,  1625.0f, 10, track_data_51, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target7,   180.0f,  -72.7f,  1605.0f,  180.0f,   -0.7f,  1605.0f, 10, track_data_52, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target8,  127.79f,  14.56f, 1703.03f, -56.07f,   1.89f, 1589.04f,  6, track_data_53, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target9,  136.37f,  -6.84f, 1425.43f, 117.55f,  -6.84f, 1442.09f,  4, track_data_54, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target10,  77.83f,  -79.8f,  1520.5f,  77.83f,   -7.8f,  1520.5f, 15, track_data_55, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target11,  77.83f,   -7.8f,  1520.5f,  -88.0f,   -8.8f,  1520.5f, 15, track_data_56, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target12,  -88.0f,   -8.8f,  1520.5f,  -88.0f,  -80.8f,  1520.5f, 15, track_data_57, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target13, -45.51f,   -8.8f,  1676.0f,  15.51f,   -8.8f,  1679.0f, 10, track_data_58,  true);
-	Police_Maze_Target_Track_Add(kItemPS13Target14, -300.0f, -79.75f,  1543.0f, -300.0f, -14.75f,  1543.0f, 15, track_data_62, false);
-	Police_Maze_Target_Track_Add(kItemPS13Target15, -325.0f,  -7.75f,  1543.0f, -300.0f,  -7.75f,  1543.0f, 10, track_data_63, false);
+
+	Police_Maze_Target_Track_Add(kItemPS13Target1,  -372.0f,   -9.0f,  1509.0f, -345.0f,   -9.0f,  1509.0f,  6, getPoliceMazePS13TrackData46(),  true);
+	Police_Maze_Target_Track_Add(kItemPS13Target2,  291.61f,  -0.66f,  1610.3f, 238.83f,   1.03f, 1557.03f, 10, getPoliceMazePS13TrackData47(),  true);
+	Police_Maze_Target_Track_Add(kItemPS13Target3,   -25.0f,  102.0f,  1625.0f,  -25.0f,  138.0f,  1625.0f, 10, getPoliceMazePS13TrackData48(),  true);
+	Police_Maze_Target_Track_Add(kItemPS13Target4,  -45.51f,   -8.8f,  1676.0f,  15.51f,   -8.8f,  1679.0f, 10, getPoliceMazePS13TrackData49(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target5,  291.61f,  -0.66f,  1610.3f, 238.83f,   1.03f, 1557.03f, 10, getPoliceMazePS13TrackData50(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target6,   -24.0f,  102.0f,  1625.0f,  -24.0f,  138.0f,  1625.0f, 10, getPoliceMazePS13TrackData51(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target7,   180.0f,  -72.7f,  1605.0f,  180.0f,   -0.7f,  1605.0f, 10, getPoliceMazePS13TrackData52(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target8,  127.79f,  14.56f, 1703.03f, -56.07f,   1.89f, 1589.04f,  6, getPoliceMazePS13TrackData53(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target9,  136.37f,  -6.84f, 1425.43f, 117.55f,  -6.84f, 1442.09f,  4, getPoliceMazePS13TrackData54(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target10,  77.83f,  -79.8f,  1520.5f,  77.83f,   -7.8f,  1520.5f, 15, getPoliceMazePS13TrackData55(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target11,  77.83f,   -7.8f,  1520.5f,  -88.0f,   -8.8f,  1520.5f, 15, getPoliceMazePS13TrackData56(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target12,  -88.0f,   -8.8f,  1520.5f,  -88.0f,  -80.8f,  1520.5f, 15, getPoliceMazePS13TrackData57(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target13, -45.51f,   -8.8f,  1676.0f,  15.51f,   -8.8f,  1679.0f, 10, getPoliceMazePS13TrackData58(),  true);
+	Police_Maze_Target_Track_Add(kItemPS13Target14, -300.0f, -79.75f,  1543.0f, -300.0f, -14.75f,  1543.0f, 15, getPoliceMazePS13TrackData62(), false);
+	Police_Maze_Target_Track_Add(kItemPS13Target15, -325.0f,  -7.75f,  1543.0f, -300.0f,  -7.75f,  1543.0f, 10, getPoliceMazePS13TrackData63(), false);
 }
 
 bool SceneScriptPS13::MouseClick(int x, int y) {