BLADERUNNER: introduced some game constants

Game script are more readable now
Fixed name of Officer Leary

3 files changed, 748 insertions, 775 deletions

diff --git a/engines/bladerunner/script/ai/mccoy.cpp b/engines/bladerunner/script/ai/mccoy.cpp
index fb9561cbcb..bda6b093e6 100644
--- a/engines/bladerunner/script/ai/mccoy.cpp
+++ b/engines/bladerunner/script/ai/mccoy.cpp
@@ -38,7 +38,7 @@ void AIScriptMcCoy::Initialize() {
 	dword_45A0F8 = -1;
 	dword_45A0FC = 0;
 	off_45A100 = 0;
-	Actor_Set_Goal_Number(0, 0);
+	Actor_Set_Goal_Number(kActorMcCoy, 0);
 }
 
 bool AIScriptMcCoy::Update() {
@@ -46,26 +46,26 @@ bool AIScriptMcCoy::Update() {
 		Sound_Play(dword_45A0F8, 100, 0, 0, 50);
 		dword_45A0F8 = -1;
 	}
-	switch (Actor_Query_Goal_Number(0)) {
+	switch (Actor_Query_Goal_Number(kActorMcCoy)) {
 	case 101:
-		Actor_Set_Goal_Number(0, 102);
+		Actor_Set_Goal_Number(kActorMcCoy, 102);
 		return true;
 	case 102:
-		if (Actor_Query_Inch_Distance_From_Waypoint(0, 316) < 36 && !Game_Flag_Query(375)) {
-			Actor_Change_Animation_Mode(0, 21);
+		if (Actor_Query_Inch_Distance_From_Waypoint(kActorMcCoy, 316) < 36 && !Game_Flag_Query(375)) {
+			Actor_Change_Animation_Mode(kActorMcCoy, 21);
 			Game_Flag_Set(375);
 		}
-		if (Actor_Query_Inch_Distance_From_Waypoint(0, 316) < 4) {
-			Actor_Set_Goal_Number(0, 103);
+		if (Actor_Query_Inch_Distance_From_Waypoint(kActorMcCoy, 316) < 4) {
+			Actor_Set_Goal_Number(kActorMcCoy, 103);
 		}
 		return true;
 	case 201:
-		Actor_Set_Goal_Number(0, 0);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
 		if (Player_Query_Current_Set() == 55) {
-			Loop_Actor_Walk_To_XYZ(0, -166.0f, -70.19f, -501.0f, 0, 0, false, 0);
-			Actor_Face_Heading(0, 300, false);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -166.0f, -70.19f, -501.0f, 0, 0, false, 0);
+			Actor_Face_Heading(kActorMcCoy, 300, false);
 		} else {
-			Loop_Actor_Walk_To_XYZ(0, -461.0f, 0.0f, -373.0f, 0, 0, false, 0);
+			Loop_Actor_Walk_To_XYZ(kActorMcCoy, -461.0f, 0.0f, -373.0f, 0, 0, false, 0);
 		}
 		Player_Gains_Control();
 		return true;
@@ -77,15 +77,15 @@ bool AIScriptMcCoy::Update() {
 		}
 		break;
 	case 221:
-		Actor_Set_Goal_Number(0, 0);
-		Actor_Set_Goal_Number(18, 212);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
+		Actor_Set_Goal_Number(kActorEarlyQ, 212);
 		return true;
 	case 309:
 		sub_4053E0();
 		break;
 	case 391:
-		Actor_Retired_Here(0, 12, 48, 1, -1);
-		Actor_Set_Goal_Number(0, 599);
+		Actor_Retired_Here(kActorMcCoy, 12, 48, 1, -1);
+		Actor_Set_Goal_Number(kActorMcCoy, 599);
 		break;
 	case 231:
 		sub_4053E0();
@@ -153,9 +153,9 @@ void AIScriptMcCoy::ReceivedClue(int clueId, int fromActorId) {
 		Global_Variable_Increment(48, 1);
 		break;
 	}
-	if (Global_Variable_Query(49) > 6 && Global_Variable_Query(1) > 3 && !Actor_Clue_Query(0, 126)) {
+	if (Global_Variable_Query(49) > 6 && Global_Variable_Query(1) > 3 && !Actor_Clue_Query(kActorMcCoy, kClueGuzzaFramedMcCoy)) {
 		Delay(500);
-		Actor_Voice_Over(3320, 99);
+		Actor_Voice_Over(3320, kActorVoiceOver);
 		switch (clueId) {
 		case 66:
 		case 80:
@@ -163,40 +163,40 @@ void AIScriptMcCoy::ReceivedClue(int clueId, int fromActorId) {
 		case 83:
 		case 121:
 		case 128:
-			Actor_Voice_Over(3340, 99);
-			Actor_Voice_Over(3350, 99);
-			Actor_Voice_Over(3360, 99);
-			Actor_Voice_Over(3370, 99);
-			Actor_Voice_Over(3380, 99);
+			Actor_Voice_Over(3340, kActorVoiceOver);
+			Actor_Voice_Over(3350, kActorVoiceOver);
+			Actor_Voice_Over(3360, kActorVoiceOver);
+			Actor_Voice_Over(3370, kActorVoiceOver);
+			Actor_Voice_Over(3380, kActorVoiceOver);
 			break;
 		case 124:
-			Actor_Voice_Over(3330, 99);
+			Actor_Voice_Over(3330, kActorVoiceOver);
 			break;
 		case 120:
-			Actor_Voice_Over(3390, 99);
-			Actor_Voice_Over(3400, 99);
-			Actor_Voice_Over(3420, 99);
+			Actor_Voice_Over(3390, kActorVoiceOver);
+			Actor_Voice_Over(3400, kActorVoiceOver);
+			Actor_Voice_Over(3420, kActorVoiceOver);
 			break;
 		}
-		Actor_Clue_Acquire(0, 126, 1, -1);
+		Actor_Clue_Acquire(kActorMcCoy, kClueGuzzaFramedMcCoy, 1, -1);
 		if (clueId == 125) {
-			Actor_Voice_Over(2780, 99);
-			Actor_Voice_Over(2800, 99);
-			Actor_Voice_Over(2810, 99);
-		} else if (Actor_Clue_Query(0, 125)) {
-			Actor_Voice_Over(3430, 99);
-			Actor_Voice_Over(3440, 99);
-			Actor_Voice_Over(3450, 99);
-			Actor_Voice_Over(3460, 99);
-			Actor_Voice_Over(3470, 99);
-			Actor_Voice_Over(3480, 99);
-			Actor_Voice_Over(3490, 99);
-			Actor_Voice_Over(3500, 99);
+			Actor_Voice_Over(2780, kActorVoiceOver);
+			Actor_Voice_Over(2800, kActorVoiceOver);
+			Actor_Voice_Over(2810, kActorVoiceOver);
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueFolder)) {
+			Actor_Voice_Over(3430, kActorVoiceOver);
+			Actor_Voice_Over(3440, kActorVoiceOver);
+			Actor_Voice_Over(3450, kActorVoiceOver);
+			Actor_Voice_Over(3460, kActorVoiceOver);
+			Actor_Voice_Over(3470, kActorVoiceOver);
+			Actor_Voice_Over(3480, kActorVoiceOver);
+			Actor_Voice_Over(3490, kActorVoiceOver);
+			Actor_Voice_Over(3500, kActorVoiceOver);
 		} else {
-			Actor_Voice_Over(3510, 99);
-			Actor_Voice_Over(3520, 99);
-			Actor_Voice_Over(3530, 99);
-			Actor_Voice_Over(3540, 99);
+			Actor_Voice_Over(3510, kActorVoiceOver);
+			Actor_Voice_Over(3520, kActorVoiceOver);
+			Actor_Voice_Over(3530, kActorVoiceOver);
+			Actor_Voice_Over(3540, kActorVoiceOver);
 		}
 	}
 }
@@ -223,24 +223,24 @@ void AIScriptMcCoy::ShotAtAndHit() {
 }
 
 void AIScriptMcCoy::Retired(int byActorId) {
-	if (byActorId == 1 && Actor_Query_In_Set(1, 42)) {
-		if (Actor_Query_In_Set(3, 42) && Actor_Query_Goal_Number(3) != 599) {
-			Non_Player_Actor_Combat_Mode_On(1, 3, 1, 3, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
-		} else if (Actor_Query_In_Set(6, 42) && Actor_Query_Goal_Number(6) != 599) {
-			Non_Player_Actor_Combat_Mode_On(1, 3, 1, 6, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (byActorId == kActorSteele && Actor_Query_In_Set(kActorSteele, 42)) {
+		if (Actor_Query_In_Set(kActorDektora, 42) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+			Non_Player_Actor_Combat_Mode_On(kActorSteele, 3, 1, kActorDektora, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+		} else if (Actor_Query_In_Set(kActorLucy, 42) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+			Non_Player_Actor_Combat_Mode_On(kActorSteele, 3, 1, kActorLucy, 15, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 		}
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(23, 41) && Actor_Query_In_Set(3, 41) && Actor_Query_Goal_Number(3) != 599) {
-		Non_Player_Actor_Combat_Mode_On(23, 3, 1, 3, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerLeary, 41) && Actor_Query_In_Set(kActorDektora, 41) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 3, 1, kActorDektora, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(24, 41) && Actor_Query_In_Set(3, 41) && Actor_Query_Goal_Number(3) != 599) {
-		Non_Player_Actor_Combat_Mode_On(24, 3, 1, 3, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerGrayford, 41) && Actor_Query_In_Set(kActorDektora, 41) && Actor_Query_Goal_Number(kActorDektora) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, 3, 1, kActorDektora, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(23, 41) && Actor_Query_In_Set(6, 41) && Actor_Query_Goal_Number(6) != 599) {
-		Non_Player_Actor_Combat_Mode_On(23, 3, 1, 6, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerLeary, 41) && Actor_Query_In_Set(kActorLucy, 41) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 3, 1, kActorLucy, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
-	if (Actor_Query_In_Set(0, 41) && Actor_Query_In_Set(24, 41) && Actor_Query_In_Set(6, 41) && Actor_Query_Goal_Number(6) != 599) {
-		Non_Player_Actor_Combat_Mode_On(24, 3, 1, 6, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
+	if (Actor_Query_In_Set(kActorMcCoy, 41) && Actor_Query_In_Set(kActorOfficerGrayford, 41) && Actor_Query_In_Set(kActorLucy, 41) && Actor_Query_Goal_Number(kActorLucy) != 599) {
+		Non_Player_Actor_Combat_Mode_On(kActorOfficerGrayford, 3, 1, kActorLucy, 4, 4, 7, 8, 0, 0, 100, 25, 300, 0);
 	}
 }
 
@@ -262,26 +262,26 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		sub_405920();
 		return true;
 	case 100:
-		Actor_Set_At_Waypoint(0, 315, 263);
+		Actor_Set_At_Waypoint(kActorMcCoy, 315, 263);
 		dword_45A0D0_animation_state = 53;
 		dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		return true;
 	case 102:
-		Async_Actor_Walk_To_Waypoint(0, 316, 0, 1);
+		Async_Actor_Walk_To_Waypoint(kActorMcCoy, 316, 0, 1);
 		return true;
 	case 103:
-		Actor_Face_Actor(0, 8, true);
+		Actor_Face_Actor(kActorMcCoy, kActorSadik, true);
 		return true;
 	case 231:
 		Player_Set_Combat_Mode(false);
 		Preload(18);
 		Set_Enter(59, 63);
 		Player_Loses_Control();
-		Actor_Force_Stop_Walking(0);
-		Actor_Put_In_Set(0, 59);
-		Actor_Set_At_XYZ(0, 14.0f, 110.84f, -300.0f, 926);
-		Actor_Change_Animation_Mode(0, 48);
+		Actor_Force_Stop_Walking(kActorMcCoy);
+		Actor_Put_In_Set(kActorMcCoy, 59);
+		Actor_Set_At_XYZ(kActorMcCoy, 14.0f, 110.84f, -300.0f, 926);
+		Actor_Change_Animation_Mode(kActorMcCoy, 48);
 		dword_45A0D0_animation_state = 27;
 		dword_45A0D4_animation_frame = 0;
 		flt_462714 = 2.84f;
@@ -289,11 +289,11 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		off_45A100 = -6.0f;
 		return true;
 	case 230:
-		dword_45A0FC = Actor_Query_Goal_Number(1) == 215;
-		Actor_Change_Animation_Mode(0, 6);
+		dword_45A0FC = Actor_Query_Goal_Number(kActorSteele) == 215;
+		Actor_Change_Animation_Mode(kActorMcCoy, 6);
 		return true;
 	case 220:
-		Actor_Change_Animation_Mode(0, 75);
+		Actor_Change_Animation_Mode(kActorMcCoy, 75);
 		return true;
 	case 212:
 		Global_Variable_Set(47, 0);
@@ -304,33 +304,33 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
 		return true;
 	case 211:
-		Actor_Face_Heading(0, 512, false);
-		Actor_Face_Heading(0, 768, true);
+		Actor_Face_Heading(kActorMcCoy, 512, false);
+		Actor_Face_Heading(kActorMcCoy, 768, true);
 		if (Random_Query(0, 1)) {
-			Actor_Change_Animation_Mode(0, 18);
+			Actor_Change_Animation_Mode(kActorMcCoy, 18);
 		} else {
-			Actor_Change_Animation_Mode(0, 16);
+			Actor_Change_Animation_Mode(kActorMcCoy, 16);
 		}
 		Delay(150);
-		Actor_Change_Animation_Mode(0, 0);
-		Actor_Set_Goal_Number(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
 		Player_Gains_Control();
 		return true;
 	case 210:
-		Actor_Put_In_Set(0, 54);
-		Actor_Set_At_XYZ(0, -204.0, 24.0, -817.0, 256);
-		Actor_Set_Invisible(0, false);
+		Actor_Put_In_Set(kActorMcCoy, 54);
+		Actor_Set_At_XYZ(kActorMcCoy, -204.0, 24.0, -817.0, 256);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		if (Game_Flag_Query(627)) {
-			Actor_Set_Goal_Number(0, 212);
+			Actor_Set_Goal_Number(kActorMcCoy, 212);
 		} else {
 			dword_45A0D0_animation_state = 53;
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
-			Actor_Set_Invisible(0, false);
+			Actor_Set_Invisible(kActorMcCoy, false);
 		}
 		return true;
 	case 200:
 		Player_Loses_Control();
-		Actor_Change_Animation_Mode(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		return true;
 	case 301:
 		dword_45A0D0_animation_state = 62;
@@ -350,39 +350,39 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		Sound_Play(403, 30, 0, 0, 50);
 		Delay(1000);
 		Sound_Play(123, 50, 0, 0, 50);
-		Actor_Says(4, 1380, 3);
-		Actor_Says(0, 6610, 13);
-		Actor_Says(4, 1390, 3);
-		Actor_Says(0, 6615, 18);
-		Actor_Says(4, 1420, 3);
-		Actor_Says(0, 6625, 11);
-		Actor_Says(4, 1430, 3);
-		Actor_Says(0, 6630, 12);
-		Actor_Says(0, 6635, 17);
-		Actor_Says(0, 6640, 13);
-		Actor_Says(0, 6645, 19);
-		Actor_Says(0, 6650, 18);
-		Actor_Says(0, 6655, 11);
-		Actor_Says(4, 1440, 3);
-		Actor_Says(0, 6660, 17);
-		Actor_Says(0, 6665, 13);
+		Actor_Says(kActorGuzza, 1380, 3);
+		Actor_Says(kActorMcCoy, 6610, 13);
+		Actor_Says(kActorGuzza, 1390, 3);
+		Actor_Says(kActorMcCoy, 6615, 18);
+		Actor_Says(kActorGuzza, 1420, 3);
+		Actor_Says(kActorMcCoy, 6625, 11);
+		Actor_Says(kActorGuzza, 1430, 3);
+		Actor_Says(kActorMcCoy, 6630, 12);
+		Actor_Says(kActorMcCoy, 6635, 17);
+		Actor_Says(kActorMcCoy, 6640, 13);
+		Actor_Says(kActorMcCoy, 6645, 19);
+		Actor_Says(kActorMcCoy, 6650, 18);
+		Actor_Says(kActorMcCoy, 6655, 11);
+		Actor_Says(kActorGuzza, 1440, 3);
+		Actor_Says(kActorMcCoy, 6660, 17);
+		Actor_Says(kActorMcCoy, 6665, 13);
 		Delay(1000);
-		Actor_Says(4, 1450, 3);
-		Actor_Says(0, 6670, 14);
-		Actor_Says(0, 6675, 11);
-		Actor_Says(4, 1460, 3);
-		Actor_Says(0, 6680, 12);
-		Actor_Says(4, 1470, 3);
-		Actor_Says(0, 6685, 13);
+		Actor_Says(kActorGuzza, 1450, 3);
+		Actor_Says(kActorMcCoy, 6670, 14);
+		Actor_Says(kActorMcCoy, 6675, 11);
+		Actor_Says(kActorGuzza, 1460, 3);
+		Actor_Says(kActorMcCoy, 6680, 12);
+		Actor_Says(kActorGuzza, 1470, 3);
+		Actor_Says(kActorMcCoy, 6685, 13);
 		Delay(500);
-		Actor_Says(0, 6695, 16);
-		Actor_Says(0, 6700, 17);
-		Actor_Says(4, 1480, 3);
-		Actor_Says(0, 6705, 11);
+		Actor_Says(kActorMcCoy, 6695, 16);
+		Actor_Says(kActorMcCoy, 6700, 17);
+		Actor_Says(kActorGuzza, 1480, 3);
+		Actor_Says(kActorMcCoy, 6705, 11);
 		Sound_Play(123, 50, 0, 0, 50);
 		return true;
 	case 390:
-		Actor_Force_Stop_Walking(0);
+		Actor_Force_Stop_Walking(kActorMcCoy);
 		Player_Loses_Control();
 		flt_462710 = 48.07f;
 		off_45A100 = -4.0f;
@@ -393,22 +393,22 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 		}
 		return true;
 	case 400:
-		Actor_Set_Health(0, 50, 50);
+		Actor_Set_Health(kActorMcCoy, 50, 50);
 		Game_Flag_Set(373);
 		v5 = Global_Variable_Query(45);
 		if (v5 == 1) {
-			Actor_Modify_Friendliness_To_Other(1, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
 		} else if (v5 == 2) {
-			Actor_Modify_Friendliness_To_Other(1, 0, -5);
-			Actor_Modify_Friendliness_To_Other(5, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 3);
 		} else if (v5 == 3) {
-			Actor_Modify_Friendliness_To_Other(1, 0, -5);
-			Actor_Modify_Friendliness_To_Other(5, 0, 5);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, -5);
+			Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 5);
 		}
 		if (Game_Flag_Query(666)) {
-			Actor_Modify_Friendliness_To_Other(1, 0, 3);
+			Actor_Modify_Friendliness_To_Other(kActorSteele, kActorMcCoy, 3);
 		}
-		if (Actor_Query_Friendliness_To_Other(1, 0) < Actor_Query_Friendliness_To_Other(5, 0)) {
+		if (Actor_Query_Friendliness_To_Other(kActorSteele, kActorMcCoy) < Actor_Query_Friendliness_To_Other(kActorClovis, kActorMcCoy)) {
 			Game_Flag_Set(653);
 		}
 		v7 = Global_Variable_Query(45);
@@ -438,7 +438,7 @@ bool AIScriptMcCoy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	case 500:
 		Music_Stop(3);
 		Player_Set_Combat_Mode(false);
-		Actor_Change_Animation_Mode(0, 0);
+		Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		dword_45A0D0_animation_state = 0;
 		dword_45A0D4_animation_frame = 0;
 		Game_Flag_Set(465);
@@ -455,7 +455,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 52;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(52)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
@@ -473,7 +473,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 50;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(50)) {
-			Actor_Change_Animation_Mode(0, 53);
+			Actor_Change_Animation_Mode(kActorMcCoy, 53);
 			*animation = 51;
 		}
 		break;
@@ -486,26 +486,26 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame--;
 		}
 		if (dword_45A0D4_animation_frame <= 0) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D0_animation_state = 0;
 			dword_45A0D4_animation_frame = 0;
 			Game_Flag_Reset(627);
 			Scene_Exits_Enable();
 			Player_Set_Combat_Mode_Access(true);
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 		}
 		break;
 	case 67:
 		*animation = 53;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(53)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D0_animation_state = 0;
 			dword_45A0D4_animation_frame = 0;
-			if (Actor_Query_Goal_Number(0) == 220) {
-				Actor_Change_Animation_Mode(0, 48);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 220) {
+				Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			}
 		}
 		break;
@@ -513,7 +513,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 40;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(40)) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
@@ -526,7 +526,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 		}
 		break;
 	case 64:
@@ -561,8 +561,8 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			if (Actor_Query_Goal_Number(0) == 200) {
-				Actor_Set_Goal_Number(0, 201);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 200) {
+				Actor_Set_Goal_Number(kActorMcCoy, 201);
 			}
 		}
 		break;
@@ -620,12 +620,12 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(49)) {
 			dword_45A0D4_animation_frame = 0;
-			if (Actor_Query_Which_Set_In(0) == 87) {
+			if (Actor_Query_Which_Set_In(kActorMcCoy) == 87) {
 				dword_45A0D0_animation_state = 27;
 			} else {
 				*animation = 19;
 				dword_45A0D0_animation_state = 0;
-				Actor_Change_Animation_Mode(0, 0);
+				Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			}
 		}
 		break;
@@ -633,7 +633,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 32;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame == 7) {
-			Actor_Change_Animation_Mode(66, 52);
+			Actor_Change_Animation_Mode(kActorMaggie, 52);
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
 			*animation = 19;
@@ -644,15 +644,15 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 18;
 		dword_45A0D4_animation_frame--;
 		if (dword_45A0D4_animation_frame <= 0) {
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			if (Actor_Query_Goal_Number(0) == 100) {
-				Actor_Set_Goal_Number(0, 101);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 100) {
+				Actor_Set_Goal_Number(kActorMcCoy, 101);
 			}
-			if (Actor_Query_Goal_Number(0) == 210) {
-				Actor_Set_Goal_Number(0, 211);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 210) {
+				Actor_Set_Goal_Number(kActorMcCoy, 211);
 			}
 		}
 		break;
@@ -670,7 +670,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(28)) {
 			Player_Set_Combat_Mode(true);
 			sub_405800();
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 			dword_45A0D4_animation_frame = 0;
 			Player_Gains_Control();
 		}
@@ -683,7 +683,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		*animation = 34;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(34)) {
-			Actor_Set_Goal_Number(0, 0);
+			Actor_Set_Goal_Number(kActorMcCoy, 0);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			sub_405660();
@@ -708,7 +708,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		break;
 	case 46:
-		Actor_Set_Invisible(0, false);
+		Actor_Set_Invisible(kActorMcCoy, false);
 		*animation = 36;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(36)) {
@@ -716,14 +716,14 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			Player_Gains_Control();
 			sub_405660();
-			Actor_Face_Heading(0, (Actor_Query_Facing_1024(0) + 512) & 1023, false);
+			Actor_Face_Heading(kActorMcCoy, (Actor_Query_Facing_1024(kActorMcCoy) + 512) & 1023, false);
 		}
 		break;
 	case 45:
 		*animation = 35;
 		dword_45A0D4_animation_frame++;
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(35)) {
-			Actor_Set_Invisible(0, true);
+			Actor_Set_Invisible(kActorMcCoy, true);
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			sub_405660();
@@ -737,7 +737,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(30)) {
 			*animation = 19;
 			sub_405660();
-			Actor_Set_At_XYZ(0, -203.41f, -621.3f, 724.57f, 538);
+			Actor_Set_At_XYZ(kActorMcCoy, -203.41f, -621.3f, 724.57f, 538);
 			Player_Gains_Control();
 		}
 		break;
@@ -749,13 +749,13 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		switch (dword_45A0D4_animation_frame) {
 		case 9:
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 			break;
 		case 4:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		case 1:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		}
 		break;
@@ -767,13 +767,13 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		switch (dword_45A0D4_animation_frame) {
 		case 9:
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 			break;
 		case 4:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		case 1:
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 			break;
 		}
 		break;
@@ -785,9 +785,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 9) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 4) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(359)) {
 			sub_4059D0(-0.2f);
@@ -801,9 +801,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 8) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 3) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(358)) {
 			sub_405940(0.5f);
@@ -817,9 +817,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 8) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 3) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(359)) {
 			sub_4059D0(-0.2f);
@@ -833,9 +833,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			++off_45A0EC;
 		}
 		if (dword_45A0D4_animation_frame == 9) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 4) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		if (Game_Flag_Query(358)) {
 			sub_405940(0.5f);
@@ -848,10 +848,10 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 4;
 		if (dword_45A0D4_animation_frame == 6) {
-			Sound_Left_Footstep_Run(0);
+			Sound_Left_Footstep_Run(kActorMcCoy);
 		}
 		if (dword_45A0D4_animation_frame == 0) {
-			Sound_Right_Footstep_Run(0);
+			Sound_Right_Footstep_Run(kActorMcCoy);
 		}
 		break;
 	case 36:
@@ -861,10 +861,10 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 3;
 		if (dword_45A0D4_animation_frame == 15) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		}
 		if (dword_45A0D4_animation_frame == 6) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		}
 		break;
 	case 32:
@@ -879,9 +879,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 		}
 		*animation = 14;
 		if (dword_45A0D4_animation_frame == 5) {
-			Sound_Left_Footstep_Run(0);
+			Sound_Left_Footstep_Run(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 12) {
-			Sound_Right_Footstep_Run(0);
+			Sound_Right_Footstep_Run(kActorMcCoy);
 		}
 		break;
 	case 30:
@@ -891,9 +891,9 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 		}
 		if (dword_45A0D4_animation_frame == 2) {
-			Sound_Right_Footstep_Walk(0);
+			Sound_Right_Footstep_Walk(kActorMcCoy);
 		} else if (dword_45A0D4_animation_frame == 10) {
-			Sound_Left_Footstep_Walk(0);
+			Sound_Left_Footstep_Walk(kActorMcCoy);
 		}
 		break;
 	case 29:
@@ -904,7 +904,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0E0 = 1;
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(*animation)) {
-			Actor_Change_Animation_Mode(0, 48);
+			Actor_Change_Animation_Mode(kActorMcCoy, 48);
 			*animation = 18;
 			dword_45A0D0_animation_state = 27;
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(18) - 1;
@@ -926,8 +926,8 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = Slice_Animation_Query_Number_Of_Frames(*animation) - 1;
 			dword_45A0D0_animation_state = 50;
 			sub_4054F0();
-			if (Actor_Query_Goal_Number(0) == 220) {
-				Actor_Set_Goal_Number(0, 221);
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 220) {
+				Actor_Set_Goal_Number(kActorMcCoy, 221);
 			}
 		}
 		break;
@@ -938,7 +938,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		}
 		break;
 	case 25:
@@ -948,7 +948,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 19;
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 0;
-			Actor_Change_Animation_Mode(0, 0);
+			Actor_Change_Animation_Mode(kActorMcCoy, 0);
 		}
 		break;
 	case 24:
@@ -958,7 +958,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Change_Animation_Mode(0, 4);
+			Actor_Change_Animation_Mode(kActorMcCoy, 4);
 		}
 		break;
 	case 23:
@@ -968,7 +968,7 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 			dword_45A0D4_animation_frame = 0;
 			dword_45A0D0_animation_state = 14;
 			*animation = 0;
-			Actor_Change_Animation_Mode(0, 4);
+			Actor_Change_Animation_Mode(kActorMcCoy, 4);
 		}
 		break;
 	case 22:
@@ -979,14 +979,14 @@ bool AIScriptMcCoy::UpdateAnimation(int *animation, int *frame) {
 	case 21:
 		*animation = 12;
 		dword_45A0D4_animation_frame++;
-		if (dword_45A0D4_animation_frame == 1 && Actor_Query_Goal_Number(0) == 230 && dword_45A0FC == 1) {
+		if (dword_45A0D4_animation_frame == 1 && Actor_Query_Goal_Number(kActorMcCoy) == 230 && dword_45A0FC == 1) {
 			dword_45A0F8 = 27;
 		}
 		if (dword_45A0D4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(12)) {
 			dword_45A0D0_animation_state = 17;
 			dword_45A0D4_animation_frame = 0;
 			*animation = 12;
-			if (Actor_Query_Goal_Number(0) == 230) {
+			if (Actor_Query_Goal_Number(kActorMcCoy) == 230) {
 				dword_45A0D4_animation_frame = 0;
 				dword_45A0D0_animation_state = 21;
 				dword_45A0FC = 1;
@@ -1386,7 +1386,7 @@ bool AIScriptMcCoy::ChangeAnimationMode(int mode) {
 		}
 		return true;
 	case 20:
-		v2 = Actor_Query_Which_Set_In(0);
+		v2 = Actor_Query_Which_Set_In(kActorMcCoy);
 		if (v2 == 27) {
 			dword_45A0D0_animation_state = 51;
 			dword_45A0D4_animation_frame = 0;
@@ -1665,33 +1665,33 @@ void AIScriptMcCoy::FledCombat() {}
 
 void AIScriptMcCoy::sub_4053E0() {
 	float x, y, z;
-	Actor_Query_XYZ(0, &x, &y, &z);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	flt_462710 = flt_462710 + off_45A100;
 	if (flt_462714 < flt_462710) {
 		off_45A100 = off_45A100 - 0.2f;
 	} else {
 		flt_462710 = flt_462714;
-		Actor_Set_Goal_Number(0, 0);
-		Actor_Retired_Here(0, 12, 48, 1, -1);
+		Actor_Set_Goal_Number(kActorMcCoy, 0);
+		Actor_Retired_Here(kActorMcCoy, 12, 48, 1, -1);
 	}
-	return Actor_Set_At_XYZ(0, x, flt_462710, z, Actor_Query_Facing_1024(0));
+	return Actor_Set_At_XYZ(kActorMcCoy, x, flt_462710, z, Actor_Query_Facing_1024(kActorMcCoy));
 }
 
 void AIScriptMcCoy::sub_4054F0() {
-	if (Actor_Query_Which_Set_In(0) == 87 && Actor_Query_Goal_Number(0) != 390 && !Game_Flag_Query(682)) {
+	if (Actor_Query_Which_Set_In(kActorMcCoy) == 87 && Actor_Query_Goal_Number(kActorMcCoy) != 390 && !Game_Flag_Query(682)) {
 		float x, y, z;
-		Actor_Query_XYZ(0, &x, &y, &z);
+		Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 		if ((z < 220.0f) && (-210.0f < x) && (-70.0f > x)) {
 			Game_Flag_Set(682);
 			Scene_Loop_Set_Default(3);
 			Scene_Loop_Start_Special(2, 2, 1);
-			Actor_Set_Goal_Number(0, 390);
-			Actor_Query_XYZ(64, &x, &y, &z);
+			Actor_Set_Goal_Number(kActorMcCoy, 390);
+			Actor_Query_XYZ(kActorFreeSlotA, &x, &y, &z);
 			if (-200.0 < x && -62.0f > x) {
-				Actor_Set_Goal_Number(64, 309);
+				Actor_Set_Goal_Number(kActorFreeSlotA, 309);
 			}
 		} else {
-			Actor_Set_Goal_Number(0, 391);
+			Actor_Set_Goal_Number(kActorMcCoy, 391);
 		}
 	}
 }
@@ -1801,7 +1801,7 @@ void AIScriptMcCoy::sub_405800() {
 }
 
 void AIScriptMcCoy::sub_4058B0() {
-	int v0 = Actor_Query_Which_Set_In(0);
+	int v0 = Actor_Query_Which_Set_In(kActorMcCoy);
 	if (v0 == 27) {
 		dword_45A0D0_animation_state = 51;
 		dword_45A0D4_animation_frame = 0;
@@ -1820,8 +1820,8 @@ void AIScriptMcCoy::sub_405920() {
 
 void AIScriptMcCoy::sub_405940(float a1) {
 	float x, y, z;
-	int currentAngle = Actor_Query_Facing_1024(0);
-	Actor_Query_XYZ(0, &x, &y, &z);
+	int currentAngle = Actor_Query_Facing_1024(kActorMcCoy);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	int angle = currentAngle - 12;
 	y = y + a1;
 	if (angle < 0) {
@@ -1830,13 +1830,13 @@ void AIScriptMcCoy::sub_405940(float a1) {
 	if (angle > 1023) {
 		angle -= 1024;
 	}
-	Actor_Set_At_XYZ(0, x, y, z, angle);
+	Actor_Set_At_XYZ(kActorMcCoy, x, y, z, angle);
 }
 
 void AIScriptMcCoy::sub_4059D0(float a1) {
 	float x, y, z;
-	int currentAngle = Actor_Query_Facing_1024(0);
-	Actor_Query_XYZ(0, &x, &y, &z);
+	int currentAngle = Actor_Query_Facing_1024(kActorMcCoy);
+	Actor_Query_XYZ(kActorMcCoy, &x, &y, &z);
 	int angle = currentAngle + 15;
 	y = y + a1;
 	if (angle < 0) {
@@ -1845,7 +1845,7 @@ void AIScriptMcCoy::sub_4059D0(float a1) {
 	if (angle > 1023) {
 		angle -= 1024;
 	}
-	return Actor_Set_At_XYZ(0, x, y, z, angle);
+	return Actor_Set_At_XYZ(kActorMcCoy, x, y, z, angle);
 }
 
 } // End of namespace BladeRunner
diff --git a/engines/bladerunner/script/ai/officer_leroy.cpp b/engines/bladerunner/script/ai/officer_leary.cpp
index 9dc41650e8..5c48d0670b 100644
--- a/engines/bladerunner/script/ai/officer_leroy.cpp
+++ b/engines/bladerunner/script/ai/officer_leary.cpp
@@ -24,118 +24,118 @@
 
 namespace BladeRunner {
 
-void AIScriptOfficerLeroy::Initialize() {
+void AIScriptOfficerLeary::Initialize() {
 	var_45D5B0_animation_state = 0;
 	var_45D5B4_animation_frame = 0;
 	var_462880 = 0;
 	var_45D5B8 = 0;
 	var_45D5BC = 0;
 
-	Actor_Put_In_Set(23, 69);
-	Actor_Set_At_XYZ(23, -261.80f, 6.00f, 79.58f, 512);
-	Actor_Set_Goal_Number(23, 0);
-	Actor_Set_Frame_Rate_FPS(23, 8);
+	Actor_Put_In_Set(kActorOfficerLeary, 69);
+	Actor_Set_At_XYZ(kActorOfficerLeary, -261.80f, 6.00f, 79.58f, 512);
+	Actor_Set_Goal_Number(kActorOfficerLeary, 0);
+	Actor_Set_Frame_Rate_FPS(kActorOfficerLeary, 8);
 }
 
-bool AIScriptOfficerLeroy::Update() {
-	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(23) < 300) {
-		AI_Movement_Track_Flush(23);
-		Actor_Set_Goal_Number(23, 300);
-	} else if (Global_Variable_Query(1) == 5 && Actor_Query_Goal_Number(23) < 400) {
-		AI_Movement_Track_Flush(23);
-		Actor_Set_Goal_Number(23, 400);
+bool AIScriptOfficerLeary::Update() {
+	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(kActorOfficerLeary) < 300) {
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 300);
+	} else if (Global_Variable_Query(1) == 5 && Actor_Query_Goal_Number(kActorOfficerLeary) < 400) {
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 400);
 	} else if (!Game_Flag_Query(182) && Game_Flag_Query(147) == 1 && Game_Flag_Query(163) == 1 && Player_Query_Current_Scene() != 78 && Global_Variable_Query(1) < 3) {
 		Game_Flag_Set(186);
-		Actor_Set_Goal_Number(23, 3);
-	} else if (Actor_Query_Goal_Number(23) != 1 && Actor_Query_Goal_Number(23) != 2 && Game_Flag_Query(199) == 1) {
+		Actor_Set_Goal_Number(kActorOfficerLeary, 3);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) != 1 && Actor_Query_Goal_Number(kActorOfficerLeary) != 2 && Game_Flag_Query(199) == 1) {
 		Game_Flag_Reset(199);
-	} else if (Global_Variable_Query(15) > 4 && !Actor_Clue_Query(23, 239)) {
-		Actor_Clue_Acquire(23, 239, 1, -1);
+	} else if (Global_Variable_Query(15) > 4 && !Actor_Clue_Query(kActorOfficerLeary, kClueMcCoyIsStupid)) {
+		Actor_Clue_Acquire(kActorOfficerLeary, kClueMcCoyIsStupid, 1, -1);
 	} else if (Game_Flag_Query(629) == 1) {
 		Game_Flag_Reset(629);
 	} else if (Game_Flag_Query(623) == 1 && !Game_Flag_Query(664)) {
 		Game_Flag_Set(664);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 310 && Actor_Query_Which_Set_In(23) != Player_Query_Current_Set()) {
-		Non_Player_Actor_Combat_Mode_Off(23);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 599 && Actor_Query_Which_Set_In(23) != Player_Query_Current_Set()) {
-		Actor_Set_Health(23, 40, 40);
-		Actor_Set_Goal_Number(23, 305);
-	} else if (Actor_Query_Goal_Number(23) == 305) {
-		switch (Actor_Query_Which_Set_In(23)) {
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 310 && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set()) {
+		Non_Player_Actor_Combat_Mode_Off(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 599 && Actor_Query_Which_Set_In(kActorOfficerLeary) != Player_Query_Current_Set()) {
+		Actor_Set_Health(kActorOfficerLeary, 40, 40);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
+	} else if (Actor_Query_Goal_Number(kActorOfficerLeary) == 305) {
+		switch (Actor_Query_Which_Set_In(kActorOfficerLeary)) {
 		case 7:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 0, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 0, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 20:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 1, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 1, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 33:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 5, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 5, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 53:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 7, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 7, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 54:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 3, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 3, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 70:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 18, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 18, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 74:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 11, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 77:
 		case 78:
 		case 79:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 10, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 81:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 13, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 13, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 83:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 14, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 84:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 16, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 16, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		case 86:
-			if (Actor_Query_Which_Set_In(23) == Player_Query_Current_Set()) {
-				Actor_Set_Goal_Number(23, 310);
-				Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 17, 4, 7, 8, -1, -1, -1, 10, 300, 0);
+			if (Actor_Query_Which_Set_In(kActorOfficerLeary) == Player_Query_Current_Set()) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 310);
+				Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 17, 4, 7, 8, -1, -1, -1, 10, 300, 0);
 			}
 			break;
 		}
@@ -143,28 +143,28 @@ bool AIScriptOfficerLeroy::Update() {
 	return false;
 }
 
-void AIScriptOfficerLeroy::TimerExpired(int timer) {
+void AIScriptOfficerLeary::TimerExpired(int timer) {
 	if (timer == 1) {
-		AI_Countdown_Timer_Reset(23, 1);
-		if (Actor_Query_In_Set(0, 41)) {
-			Actor_Set_Goal_Number(23, 430);
-			Actor_Set_Goal_Number(24, 430);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		if (Actor_Query_In_Set(kActorMcCoy, 41)) {
+			Actor_Set_Goal_Number(kActorOfficerLeary, 430);
+			Actor_Set_Goal_Number(kActorOfficerGrayford, 430);
 		} else {
 			Game_Flag_Set(684);
 		}
 	} else if (timer == 2) {
-		AI_Countdown_Timer_Reset(23, 2);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 2);
 		sub_431420();
 	}
 }
 
-void AIScriptOfficerLeroy::CompletedMovementTrack() {
+void AIScriptOfficerLeary::CompletedMovementTrack() {
 	int v0;
 	unsigned int v1;
 
-	v0 = Actor_Query_Goal_Number(23);
+	v0 = Actor_Query_Goal_Number(kActorOfficerLeary);
 	if (v0 == 1) {
-		Actor_Set_Goal_Number(23, 2);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 2);
 		return;
 	}
 	//todo: tidyup
@@ -173,54 +173,54 @@ void AIScriptOfficerLeroy::CompletedMovementTrack() {
 		return;
 	}
 	if (!v1) {
-		Actor_Set_Goal_Number(23, 306);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 306);
 		return;
 	}
 	if (v1 != 2) {
 		if (v1 == 3) {
-			Actor_Change_Animation_Mode(23, 4);
-			Actor_Face_Actor(23, 0, true);
-			Actor_Set_Goal_Number(23, 309);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			Actor_Face_Actor(kActorOfficerLeary, kActorMcCoy, true);
+			Actor_Set_Goal_Number(kActorOfficerLeary, 309);
 		}
 		return;
 	}
-	Non_Player_Actor_Combat_Mode_On(23, 0, 1, 0, 12, 4, 7, 8, 0, -1, -1, 15, 300, 0);
+	Non_Player_Actor_Combat_Mode_On(kActorOfficerLeary, 0, 1, kActorMcCoy, 12, kAnimationModeCombatIdle, kAnimationModeCombatWalk, kAnimationModeCombatRun, 0, -1, -1, 15, 300, 0);
 }
 
-void AIScriptOfficerLeroy::ReceivedClue(int clueId, int fromActorId) {
+void AIScriptOfficerLeary::ReceivedClue(int clueId, int fromActorId) {
 	if (clueId == 222) {
-		Actor_Modify_Friendliness_To_Other(23, 0, 5);
+		Actor_Modify_Friendliness_To_Other(kActorOfficerLeary, kActorMcCoy, 5);
 	}
 	if (clueId == 215) {
-		Actor_Modify_Friendliness_To_Other(23, 0, -4);
+		Actor_Modify_Friendliness_To_Other(kActorOfficerLeary, kActorMcCoy, -4);
 	}
 }
 
-void AIScriptOfficerLeroy::ClickedByPlayer() {}
+void AIScriptOfficerLeary::ClickedByPlayer() {}
 
-void AIScriptOfficerLeroy::EnteredScene(int sceneId) {}
+void AIScriptOfficerLeary::EnteredScene(int sceneId) {}
 
-void AIScriptOfficerLeroy::OtherAgentEnteredThisScene(int otherActorId) {}
+void AIScriptOfficerLeary::OtherAgentEnteredThisScene(int otherActorId) {}
 
-void AIScriptOfficerLeroy::OtherAgentExitedThisScene(int otherActorId) {}
+void AIScriptOfficerLeary::OtherAgentExitedThisScene(int otherActorId) {}
 
-void AIScriptOfficerLeroy::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {}
+void AIScriptOfficerLeary::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {}
 
-void AIScriptOfficerLeroy::ShotAtAndMissed() {}
+void AIScriptOfficerLeary::ShotAtAndMissed() {}
 
-void AIScriptOfficerLeroy::ShotAtAndHit() {
-	if (Actor_Query_Goal_Number(23) == 307) {
-		Actor_Set_Health(23, 50, 50);
+void AIScriptOfficerLeary::ShotAtAndHit() {
+	if (Actor_Query_Goal_Number(kActorOfficerLeary) == 307) {
+		Actor_Set_Health(kActorOfficerLeary, 50, 50);
 	}
 }
 
-void AIScriptOfficerLeroy::Retired(int byActorId) {
-	Actor_Set_Goal_Number(23, 599);
+void AIScriptOfficerLeary::Retired(int byActorId) {
+	Actor_Set_Goal_Number(kActorOfficerLeary, 599);
 	Game_Flag_Set(607);
 }
 
-int AIScriptOfficerLeroy::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
-	if (otherActorId) {
+int AIScriptOfficerLeary::GetFriendlinessModifierIfGetsClue(int otherActorId, int clueId) {
+	if (otherActorId != kActorMcCoy) {
 		return 0;
 	}
 	switch (clueId) {
@@ -250,168 +250,168 @@ int AIScriptOfficerLeroy::GetFriendlinessModifierIfGetsClue(int otherActorId, in
 	return 0;
 }
 
-bool AIScriptOfficerLeroy::GoalChanged(int currentGoalNumber, int newGoalNumber) {
+bool AIScriptOfficerLeary::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	switch (newGoalNumber) {
 	case 1:
-		AI_Movement_Track_Flush(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
 		if (Random_Query(1, 2) == 1) {
-			AI_Movement_Track_Append(23, 57, 7);
-			AI_Movement_Track_Append(23, 58, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 57, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 58, 7);
 		} else {
-			AI_Movement_Track_Append(23, 58, 7);
-			AI_Movement_Track_Append(23, 57, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 58, 7);
+			AI_Movement_Track_Append(kActorOfficerLeary, 57, 7);
 		}
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 2:
 		if (Random_Query(1, 3) == 1) {
-			if (Random_Query(1, 2) == 1 && !Actor_Clue_Query(23, 16)) {
-				Actor_Clue_Acquire(23, 16, 0, -1);
-			} else if (!Actor_Clue_Query(23, 17)) {
-				Actor_Clue_Acquire(23, 17, 0, -1);
+			if (Random_Query(1, 2) == 1 && !Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA)) {
+				Actor_Clue_Acquire(kActorOfficerLeary, kClueCrowdInterviewA, 0, -1);
+			} else if (!Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB)) {
+				Actor_Clue_Acquire(kActorOfficerLeary, kClueCrowdInterviewB, 0, -1);
 			}
 		}
 		if (Game_Flag_Query(182)) {
-			if (Actor_Clue_Query(23, 16) && Actor_Clue_Query(23, 17)) {
-				Actor_Set_Goal_Number(23, 0);
+			if (Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewA) && Actor_Clue_Query(kActorOfficerLeary, kClueCrowdInterviewB)) {
+				Actor_Set_Goal_Number(kActorOfficerLeary, 0);
 			} else {
-				Actor_Set_Goal_Number(23, 1);
+				Actor_Set_Goal_Number(kActorOfficerLeary, 1);
 			}
 		} else {
-			Actor_Set_Goal_Number(23, 0);
+			Actor_Set_Goal_Number(kActorOfficerLeary, 0);
 		}
 		return true;
 	case 3:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 39, Random_Query(120, 240));
-		AI_Movement_Track_Append(23, 35, 0);
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 39, Random_Query(120, 240));
+		AI_Movement_Track_Append(kActorOfficerLeary, 35, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 99:
-		AI_Movement_Track_Flush(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
 		return false;
 	case 102:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 107, 0);
-		AI_Movement_Track_Append(23, 108, 0);
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 107, 0);
+		AI_Movement_Track_Append(kActorOfficerLeary, 108, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 300:
-		Actor_Set_Goal_Number(23, 305);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
 		return true;
 	case 305:
-		AI_Movement_Track_Flush(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
 		switch (Random_Query(1, 10)) {
 		case 1:
-			AI_Movement_Track_Append(23, 398, 15);
-			AI_Movement_Track_Append(23, 399, 0);
-			AI_Movement_Track_Append(23, 400, 0);
-			AI_Movement_Track_Append(23, 401, 0);
-			AI_Movement_Track_Append_With_Facing(23, 402, 3, 276);
-			AI_Movement_Track_Append(23, 403, 0);
-			AI_Movement_Track_Append(23, 404, 15);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 398, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 399, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 400, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 401, 0);
+			AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 402, 3, 276);
+			AI_Movement_Track_Append(kActorOfficerLeary, 403, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 404, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 2:
-			AI_Movement_Track_Append(23, 385, 10);
-			AI_Movement_Track_Append(23, 242, 2);
-			AI_Movement_Track_Append(23, 386, 2);
-			AI_Movement_Track_Append(23, 387, 15);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 385, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 242, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 386, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 387, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 3:
-			AI_Movement_Track_Append(23, 390, 10);
-			AI_Movement_Track_Append(23, 391, 0);
-			AI_Movement_Track_Append(23, 392, 5);
-			AI_Movement_Track_Append(23, 345, 0);
-			AI_Movement_Track_Append(23, 393, 15);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 390, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 391, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 392, 5);
+			AI_Movement_Track_Append(kActorOfficerLeary, 345, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 393, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 4:
-			AI_Movement_Track_Append(23, 381, 15);
-			AI_Movement_Track_Append(23, 382, 0);
-			AI_Movement_Track_Append(23, 383, 15);
-			AI_Movement_Track_Append(23, 382, 3);
-			AI_Movement_Track_Append(23, 384, 0);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 381, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 382, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 383, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 382, 3);
+			AI_Movement_Track_Append(kActorOfficerLeary, 384, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 5:
-			AI_Movement_Track_Append(23, 388, 10);
-			AI_Movement_Track_Append(23, 389, 10);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 388, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 389, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 6:
-			AI_Movement_Track_Append(23, 385, 10);
-			AI_Movement_Track_Append(23, 242, 2);
-			AI_Movement_Track_Append(23, 386, 2);
-			AI_Movement_Track_Append(23, 387, 15);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 385, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 242, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 386, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 387, 15);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 7:
-			AI_Movement_Track_Append(23, 394, 15);
-			AI_Movement_Track_Append(23, 395, 0);
-			AI_Movement_Track_Append(23, 396, 0);
-			AI_Movement_Track_Append(23, 397, 15);
-			AI_Movement_Track_Append(23, 396, 0);
-			AI_Movement_Track_Append(23, 395, 0);
-			AI_Movement_Track_Append(23, 430, 15);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 394, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 395, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 396, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 397, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 396, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 395, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 430, 15);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			break;
 		case 8:
 			switch (Random_Query(1, 7)) {
 			case 1:
-				AI_Movement_Track_Append(23, 302, 0);
-				AI_Movement_Track_Append(23, 407, 0);
-				AI_Movement_Track_Append(23, 408, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 302, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 407, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 408, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 2:
-				AI_Movement_Track_Append(23, 536, 0);
-				AI_Movement_Track_Append(23, 537, 0);
-				AI_Movement_Track_Append(23, 538, 1);
-				AI_Movement_Track_Append(23, 537, 0);
-				AI_Movement_Track_Append(23, 536, 0);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 536, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 537, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 538, 1);
+				AI_Movement_Track_Append(kActorOfficerLeary, 537, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 536, 0);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 3:
-				AI_Movement_Track_Append(23, 296, 10);
-				AI_Movement_Track_Append(23, 409, 2);
-				AI_Movement_Track_Append(23, 296, 10);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 296, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 409, 2);
+				AI_Movement_Track_Append(kActorOfficerLeary, 296, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 4:
-				AI_Movement_Track_Append(23, 411, 10);
-				AI_Movement_Track_Append(23, 412, 5);
-				AI_Movement_Track_Append(23, 411, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 411, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 412, 5);
+				AI_Movement_Track_Append(kActorOfficerLeary, 411, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 5:
-				AI_Movement_Track_Append(23, 413, 10);
-				AI_Movement_Track_Append(23, 414, 0);
-				AI_Movement_Track_Append_With_Facing(23, 431, 0, 1017);
-				AI_Movement_Track_Append(23, 432, 10);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 413, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 414, 0);
+				AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 431, 0, 1017);
+				AI_Movement_Track_Append(kActorOfficerLeary, 432, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 6:
-				AI_Movement_Track_Append(23, 415, 0);
-				AI_Movement_Track_Append_With_Facing(23, 416, 0, 620);
-				AI_Movement_Track_Append(23, 417, 0);
-				AI_Movement_Track_Append(23, 418, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 415, 0);
+				AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 416, 0, 620);
+				AI_Movement_Track_Append(kActorOfficerLeary, 417, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 418, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				break;
 			case 7:
-				AI_Movement_Track_Append(23, 405, 10);
-				AI_Movement_Track_Append(23, 406, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 405, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 406, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				return false;
 			default:
 				return false;
@@ -419,74 +419,74 @@ bool AIScriptOfficerLeroy::GoalChanged(int currentGoalNumber, int newGoalNumber)
 			//no break
 		case 9:
 			if (Random_Query(1, 2) - 1 == 1) {
-				AI_Movement_Track_Append(23, 433, 10);
-				AI_Movement_Track_Append(23, 434, 0);
-				AI_Movement_Track_Append(23, 435, 0);
-				AI_Movement_Track_Append(23, 35, 30);
-				AI_Movement_Track_Repeat(23);
+				AI_Movement_Track_Append(kActorOfficerLeary, 433, 10);
+				AI_Movement_Track_Append(kActorOfficerLeary, 434, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 435, 0);
+				AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+				AI_Movement_Track_Repeat(kActorOfficerLeary);
 				return false;
 			}
-			AI_Movement_Track_Append(23, 420, 10);
-			AI_Movement_Track_Append(23, 422, 2);
-			AI_Movement_Track_Append(23, 421, 1);
-			AI_Movement_Track_Append_With_Facing(23, 422, 4, 182);
-			AI_Movement_Track_Append(23, 420, 10);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 420, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 422, 2);
+			AI_Movement_Track_Append(kActorOfficerLeary, 421, 1);
+			AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 422, 4, 182);
+			AI_Movement_Track_Append(kActorOfficerLeary, 420, 10);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			//no break
 		case 10:
-			AI_Movement_Track_Append(23, 310, 0);
-			AI_Movement_Track_Append(23, 307, 0);
-			AI_Movement_Track_Append(23, 309, 0);
-			AI_Movement_Track_Append(23, 310, 0);
-			AI_Movement_Track_Append(23, 35, 30);
-			AI_Movement_Track_Repeat(23);
+			AI_Movement_Track_Append(kActorOfficerLeary, 310, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 307, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 309, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 310, 0);
+			AI_Movement_Track_Append(kActorOfficerLeary, 35, 30);
+			AI_Movement_Track_Repeat(kActorOfficerLeary);
 			return false;
 		default:
 			return false;
 		}
 		//no break
 	case 306:
-		Actor_Set_Goal_Number(23, 305);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 305);
 		return true;
 	case 307:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append_With_Facing(23, 416, 0, 556);
-		Actor_Change_Animation_Mode(23, 4);
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append_With_Facing(kActorOfficerLeary, 416, 0, 556);
+		Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 308:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append_Run_With_Facing(23, 440, 2, 355);
-		AI_Movement_Track_Append_Run_With_Facing(23, 441, 0, 825);
-		AI_Movement_Track_Repeat(23);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append_Run_With_Facing(kActorOfficerLeary, 440, 2, 355);
+		AI_Movement_Track_Append_Run_With_Facing(kActorOfficerLeary, 441, 0, 825);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
 		return true;
 	case 400:
-		AI_Movement_Track_Flush(23);
-		AI_Movement_Track_Append(23, 35, 0);
-		AI_Movement_Track_Repeat(23);
-		Actor_Set_Goal_Number(23, 410);
+		AI_Movement_Track_Flush(kActorOfficerLeary);
+		AI_Movement_Track_Append(kActorOfficerLeary, 35, 0);
+		AI_Movement_Track_Repeat(kActorOfficerLeary);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
 		return true;
 	case 420:
-		AI_Countdown_Timer_Reset(23, 1);
-		AI_Countdown_Timer_Start(23, 1, 120);
-		Actor_Set_Goal_Number(23, 410);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 1, 120);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
 		return true;
 	case 425:
-		AI_Countdown_Timer_Reset(23, 1);
-		AI_Countdown_Timer_Start(23, 1, 60);
-		Actor_Set_Goal_Number(23, 410);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 1);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 1, 60);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
 		return true;
 	case 430:
-		Actor_Set_Goal_Number(23, 410);
-		Actor_Set_Goal_Number(24, 410);
+		Actor_Set_Goal_Number(kActorOfficerLeary, 410);
+		Actor_Set_Goal_Number(kActorOfficerGrayford, 410);
 		return false;
 	default:
 		return false;
 	}
 }
 
-bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
+bool AIScriptOfficerLeary::UpdateAnimation(int *animation, int *frame) {
 	int v57;
 	int a1;
 
@@ -519,7 +519,7 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 589;
 			var_45D5B0_animation_state = 0;
 			var_45D5B4_animation_frame = 0;
-			Actor_Change_Animation_Mode(23, 0);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 0);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -530,7 +530,7 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 			*animation = 589;
 			var_45D5B0_animation_state = 0;
 			var_45D5B4_animation_frame = 0;
-			Actor_Change_Animation_Mode(23, 0);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 0);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -555,7 +555,7 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 			var_45D5B0_animation_state = 21;
 			var_45D5B4_animation_frame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -566,7 +566,7 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 			var_45D5B0_animation_state = 21;
 			var_45D5B4_animation_frame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -575,19 +575,19 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 		var_45D5B4_animation_frame++;
 		if (var_45D5B4_animation_frame == 4) {
 			if (Random_Query(1, 2) == 1) {
-				Sound_Play_Speech_Line(23, 9010, 75, 0, 99);
+				Sound_Play_Speech_Line(kActorOfficerLeary, 9010, 75, 0, 99);
 			} else {
-				Sound_Play_Speech_Line(23, 9015, 75, 0, 99);
+				Sound_Play_Speech_Line(kActorOfficerLeary, 9015, 75, 0, 99);
 			}
 		}
 		if (var_45D5B4_animation_frame == 5) {
-			Actor_Combat_AI_Hit_Attempt(23);
+			Actor_Combat_AI_Hit_Attempt(kActorOfficerLeary);
 		}
 		if (var_45D5B4_animation_frame >= Slice_Animation_Query_Number_Of_Frames(581)) {
 			var_45D5B0_animation_state = 21;
 			var_45D5B4_animation_frame = 0;
 			*animation = 571;
-			Actor_Change_Animation_Mode(23, 4);
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
 		}
 		*frame = var_45D5B4_animation_frame;
 		return true;
@@ -888,93 +888,143 @@ bool AIScriptOfficerLeroy::UpdateAnimation(int *animation, int *frame) {
 	}
 }
 
-bool AIScriptOfficerLeroy::ChangeAnimationMode(int mode) {
+bool AIScriptOfficerLeary::ChangeAnimationMode(int mode) {
 	int v1;
 
 	switch (mode) {
-	case 28:
-		Game_Flag_Set(199);
-		break;
-	case 27:
-		Game_Flag_Reset(199);
-		break;
-	case 22:
-		if (Random_Query(0, 1)) {
-			var_45D5B0_animation_state = 25;
-		} else {
-			var_45D5B0_animation_state = 26;
-		}
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 21:
-		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 24) {
-			if (Random_Query(0, 1)) {
-				var_45D5B0_animation_state = 25;
-			} else {
-				var_45D5B0_animation_state = 26;
-			}
+	case kAnimationModeIdle:
+		switch (var_45D5B0_animation_state) {
+		case 21:
+		case 24:
+			var_45D5B0_animation_state = 23;
 			var_45D5B4_animation_frame = 0;
-		} else {
-			if (Random_Query(0, 1)) {
-				var_45D5B0_animation_state = 29;
-			} else {
-				var_45D5B0_animation_state = 30;
-			}
+			break;
+		case 20:
+			v1 = var_45D5B4_animation_frame;
+			Actor_Change_Animation_Mode(kActorOfficerLeary, 4);
+			var_45D5B4_animation_frame = v1;
+			var_45D5B0_animation_state = 21;
+			break;
+		case 11:
+		case 12:
+		case 13:
+		case 14:
+		case 15:
+		case 16:
+		case 17:
+		case 18:
+		case 19:
+			var_45D5BC = 1;
+			break;
+		case 0:
+		case 23:
+			break;
+		default:
+			var_45D5B0_animation_state = 0;
 			var_45D5B4_animation_frame = 0;
+			var_45D5B8 = Random_Query(0, 1);
+			break;
 		}
 		break;
-	case 19:
+	case kAnimationModeWalk:
+		var_45D5B0_animation_state = 3;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeRun:
+		var_45D5B0_animation_state = 4;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 3:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 19;
-			var_462884 = 600;
+			var_462880 = 11;
+			var_462884 = 592;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 19;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 11;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 18:
+	case kAnimationModeCombatIdle:
+		switch (var_45D5B0_animation_state) {
+		case 21:
+		case 22:
+		case 24:
+			break;
+		case 7:
+		case 8:
+		case 9:
+		case 10:
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			break;
+		case 0:
+			var_45D5B0_animation_state = 22;
+			var_45D5B4_animation_frame = 0;
+			break;
+		default:
+			var_45D5B0_animation_state = 21;
+			var_45D5B4_animation_frame = 0;
+			break;
+		}
+		break;
+	case 6:
+		var_45D5B0_animation_state = 24;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeCombatWalk:
+		var_45D5B0_animation_state = 7;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case kAnimationModeCombatRun:
+		var_45D5B0_animation_state = 8;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 12:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 18;
-			var_462884 = 599;
+			var_462880 = 12;
+			var_462884 = 593;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 18;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 12;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 17:
+	case 13:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 17;
-			var_462884 = 598;
+			var_462880 = 13;
+			var_462884 = 594;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 17;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 13;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 16:
+	case 14:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 16;
-			var_462884 = 597;
+			var_462880 = 14;
+			var_462884 = 595;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 16;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 14;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
@@ -987,227 +1037,168 @@ bool AIScriptOfficerLeroy::ChangeAnimationMode(int mode) {
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
 			var_45D5B0_animation_state = 15;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 14:
+	case 16:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 14;
-			var_462884 = 595;
+			var_462880 = 16;
+			var_462884 = 597;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 14;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 16;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 13:
+	case 17:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 13;
-			var_462884 = 594;
+			var_462880 = 17;
+			var_462884 = 598;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
-		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 13;
+		}
+		else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
+			var_45D5B0_animation_state = 17;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 12:
+	case 18:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 12;
-			var_462884 = 593;
+			var_462880 = 18;
+			var_462884 = 599;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
 		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 12;
+			var_45D5B0_animation_state = 18;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 8:
-		var_45D5B0_animation_state = 8;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 7:
-		var_45D5B0_animation_state = 7;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 6:
-		var_45D5B0_animation_state = 24;
-		var_45D5B4_animation_frame = 0;
-		break;
-	case 4:
-		switch (var_45D5B0_animation_state) {
-		case 21:
-		case 22:
-		case 24:
-			return true;
-		case 7:
-		case 8:
-		case 9:
-		case 10:
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 0:
-			var_45D5B0_animation_state = 22;
-			var_45D5B4_animation_frame = 0;
-			break;
-		default:
-			var_45D5B0_animation_state = 21;
-			var_45D5B4_animation_frame = 0;
-			break;
-		}
-		break;
-	case 3:
+	case 19:
 		if (var_45D5B0_animation_state == 0 || var_45D5B0_animation_state == 1) {
 			var_45D5B0_animation_state = 2;
-			var_462880 = 11;
-			var_462884 = 592;
+			var_462880 = 19;
+			var_462884 = 600;
 			if (Game_Flag_Query(199) == 1) {
 				var_45D5B4_animation_frame = 0;
 			}
 		} else if (var_45D5B0_animation_state < 11 || var_45D5B0_animation_state > 19) {
-			var_45D5B0_animation_state = 11;
+			var_45D5B0_animation_state = 19;
 			var_45D5B4_animation_frame = 0;
 			var_45D5BC = 0;
 		}
 		break;
-	case 2:
-		var_45D5B0_animation_state = 4;
+	case 21:
+		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 24) {
+			if (Random_Query(0, 1)) {
+				var_45D5B0_animation_state = 25;
+			} else {
+				var_45D5B0_animation_state = 26;
+			}
+			var_45D5B4_animation_frame = 0;
+		} else {
+			if (Random_Query(0, 1)) {
+				var_45D5B0_animation_state = 29;
+			} else {
+				var_45D5B0_animation_state = 30;
+			}
+			var_45D5B4_animation_frame = 0;
+		}
+		break;
+	case 22:
+		if (Random_Query(0, 1)) {
+			var_45D5B0_animation_state = 25;
+		} else {
+			var_45D5B0_animation_state = 26;
+		}
 		var_45D5B4_animation_frame = 0;
 		break;
-	case 1:
-		var_45D5B0_animation_state = 3;
+	case 27:
+		Game_Flag_Reset(199);
+		break;
+	case 28:
+		Game_Flag_Set(199);
+		break;
+	case 44:
+		var_45D5B0_animation_state = 5;
 		var_45D5B4_animation_frame = 0;
 		break;
-	case 0:
-		switch (var_45D5B0_animation_state) {
-		case 21:
-		case 24:
-			var_45D5B0_animation_state = 23;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 20:
-			v1 = var_45D5B4_animation_frame;
-			Actor_Change_Animation_Mode(23, 4);
-			var_45D5B4_animation_frame = v1;
-			var_45D5B0_animation_state = 21;
-			break;
-		case 11:
-		case 12:
-		case 13:
-		case 14:
-		case 15:
-		case 16:
-		case 17:
-		case 18:
-		case 19:
-			var_45D5BC = 1;
-			break;
-		case 0:
-		case 23:
-			return true;
-		default:
-			var_45D5B0_animation_state = 0;
-			var_45D5B4_animation_frame = 0;
-			var_45D5B8 = Random_Query(0, 1);
-			break;
-		}
+	case 45:
+		var_45D5B0_animation_state = 6;
+		var_45D5B4_animation_frame = 0;
 		break;
-	case 5:
-	case 9:
-	case 10:
-	case 11:
-	case 20:
-	case 23:
-	case 24:
-	case 25:
-	case 26:
-		return true;
-	default:
-		switch (mode) {
-		case 58:
-			var_45D5B0_animation_state = 20;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 48:
-			if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 22 || var_45D5B0_animation_state == 24) {
-				var_45D5B0_animation_state = 28;
-				var_45D5B4_animation_frame = 0;
-			} else {
-				var_45D5B0_animation_state = 27;
-				var_45D5B4_animation_frame = 0;
-			}
-			break;
-		case 47:
-			var_45D5B0_animation_state = 10;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 46:
-			var_45D5B0_animation_state = 9;
-			var_45D5B4_animation_frame = 0;
-			break;
-		case 45:
-			var_45D5B0_animation_state = 6;
+	case 46:
+		var_45D5B0_animation_state = 9;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 47:
+		var_45D5B0_animation_state = 10;
+		var_45D5B4_animation_frame = 0;
+		break;
+	case 48:
+		if (var_45D5B0_animation_state == 21 || var_45D5B0_animation_state == 22 || var_45D5B0_animation_state == 24) {
+			var_45D5B0_animation_state = 28;
 			var_45D5B4_animation_frame = 0;
-			break;
-		case 44:
-			var_45D5B0_animation_state = 5;
+		} else {
+			var_45D5B0_animation_state = 27;
 			var_45D5B4_animation_frame = 0;
-			break;
-		default:
-			return true;
 		}
 		break;
+	case 58:
+		var_45D5B0_animation_state = 20;
+		var_45D5B4_animation_frame = 0;
+		break;
 	}
 	return true;
 }
 
-void AIScriptOfficerLeroy::QueryAnimationState(int *animationState, int *animationFrame, int *a3, int *a4) {
+void AIScriptOfficerLeary::QueryAnimationState(int *animationState, int *animationFrame, int *a3, int *a4) {
 	*animationState = var_45D5B0_animation_state;
 	*animationFrame = var_45D5B4_animation_frame;
 	*a3 = var_462880;
 	*a4 = var_462884;
 }
 
-void AIScriptOfficerLeroy::SetAnimationState(int animationState, int animationFrame, int a3, int a4) {
+void AIScriptOfficerLeary::SetAnimationState(int animationState, int animationFrame, int a3, int a4) {
 	var_45D5B0_animation_state = animationState;
 	var_45D5B4_animation_frame = animationFrame;
 	var_462880 = a3;
 	var_462884 = a4;
 }
 
-bool AIScriptOfficerLeroy::ReachedMovementTrackWaypoint(int waypointId) {
+bool AIScriptOfficerLeary::ReachedMovementTrackWaypoint(int waypointId) {
 	if (waypointId == 57 || waypointId == 58) {
 		sub_431408();
-		AI_Countdown_Timer_Reset(23, 2);
-		AI_Countdown_Timer_Start(23, 2, 6);
+		AI_Countdown_Timer_Reset(kActorOfficerLeary, 2);
+		AI_Countdown_Timer_Start(kActorOfficerLeary, 2, 6);
 	}
 	return true;
 }
 
-void AIScriptOfficerLeroy::FledCombat() {
-	Actor_Set_Goal_Number(23, 300);
+void AIScriptOfficerLeary::FledCombat() {
+	Actor_Set_Goal_Number(kActorOfficerLeary, 300);
 }
 
-bool AIScriptOfficerLeroy::sub_431408() {
+bool AIScriptOfficerLeary::sub_431408() {
 	Game_Flag_Set(199);
 	return true;
 }
 
-bool AIScriptOfficerLeroy::sub_431420() {
+bool AIScriptOfficerLeary::sub_431420() {
 	Game_Flag_Reset(199);
 	return true;
 }
diff --git a/engines/bladerunner/script/ai/runciter.cpp b/engines/bladerunner/script/ai/runciter.cpp
index 998f385a4f..d34b4a8a01 100644
--- a/engines/bladerunner/script/ai/runciter.cpp
+++ b/engines/bladerunner/script/ai/runciter.cpp
@@ -33,15 +33,15 @@ void AIScriptRunciter::Initialize() {
 	var_45CD80 = 1;
 	var_45CD84 = 0;
 	var_45CD88 = 0;
-	Actor_Set_Goal_Number(15, 0);
+	Actor_Set_Goal_Number(kActorRunciter, 0);
 }
 
 bool AIScriptRunciter::Update() {
-	if (Actor_Query_Goal_Number(15) == 0 && Game_Flag_Query(186)) {
-		Actor_Set_Goal_Number(15, 2);
+	if (Actor_Query_Goal_Number(kActorRunciter) == 0 && Game_Flag_Query(186)) {
+		Actor_Set_Goal_Number(kActorRunciter, 2);
 	}
-	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(15) < 300) {
-		Actor_Set_Goal_Number(15, 300);
+	if (Global_Variable_Query(1) == 4 && Actor_Query_Goal_Number(kActorRunciter) < 300) {
+		Actor_Set_Goal_Number(kActorRunciter, 300);
 	}
 	return false;
 }
@@ -49,24 +49,24 @@ bool AIScriptRunciter::Update() {
 void AIScriptRunciter::TimerExpired(int timer) {}
 
 void AIScriptRunciter::CompletedMovementTrack() {
-	if (Actor_Query_Goal_Number(15) == 1) {
+	if (Actor_Query_Goal_Number(kActorRunciter) == 1) {
 		if (Player_Query_Current_Scene() == 79) {
 			switch (Random_Query(1, 5)) {
 			case 2:
 			case 3:
-				ADQ_Add(15, 530, -1);
+				ADQ_Add(kActorRunciter, 530, -1);
 				break;
 			case 1:
 			case 5:
-				ADQ_Add(15, 80, -1);
+				ADQ_Add(kActorRunciter, 80, -1);
 				break;
 			case 4:
-				ADQ_Add(15, 930, -1);
+				ADQ_Add(kActorRunciter, 930, -1);
 				break;
 			}
 		}
-		Actor_Set_Goal_Number(15, 99);
-		Actor_Set_Goal_Number(15, 1);
+		Actor_Set_Goal_Number(kActorRunciter, 99);
+		Actor_Set_Goal_Number(kActorRunciter, 1);
 		//return true;
 	}
 	//return false;
@@ -83,48 +83,48 @@ void AIScriptRunciter::OtherAgentEnteredThisScene(int otherActorId) {}
 void AIScriptRunciter::OtherAgentExitedThisScene(int otherActorId) {}
 
 void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatMode) {
-	if (Actor_Query_Goal_Number(15) == 300 && combatMode == 1 && !Game_Flag_Query(705)) {
-		Actor_Set_Targetable(15, true);
-		Actor_Face_Actor(15, 0, true);
-		Actor_Says(15, 420, 12);
-		Actor_Face_Actor(0, 15, true);
-		Actor_Change_Animation_Mode(0, 5);
-		if (Actor_Clue_Query(0, 158)) {
-			Actor_Says(0, 4770, -1);
-			Actor_Says(15, 590, 13);
-			Actor_Says(0, 4775, -1);
-			Actor_Says(15, 600, 17);
+	if (Actor_Query_Goal_Number(kActorRunciter) == 300 && combatMode == 1 && !Game_Flag_Query(705)) {
+		Actor_Set_Targetable(kActorRunciter, true);
+		Actor_Face_Actor(kActorRunciter, kActorMcCoy, true);
+		Actor_Says(kActorRunciter, 420, 12);
+		Actor_Face_Actor(kActorMcCoy, kActorRunciter, true);
+		Actor_Change_Animation_Mode(kActorMcCoy, 5);
+		if (Actor_Clue_Query(kActorMcCoy, kClueZubensMotive)) {
+			Actor_Says(kActorMcCoy, 4770, -1);
+			Actor_Says(kActorRunciter, 590, 13);
+			Actor_Says(kActorMcCoy, 4775, -1);
+			Actor_Says(kActorRunciter, 600, 17);
 			Sound_Play(492, 100, 0, 100, 50);
-			Actor_Says(0, 4780, -1);
-			Actor_Says(15, 610, 18);
-			Actor_Says(0, 4785, -1);
-			Actor_Says(15, 620, 15);
+			Actor_Says(kActorMcCoy, 4780, -1);
+			Actor_Says(kActorRunciter, 610, 18);
+			Actor_Says(kActorMcCoy, 4785, -1);
+			Actor_Says(kActorRunciter, 620, 15);
 			if (Game_Flag_Query(46)) {
-				Actor_Says(15, 630, 12);
-				Actor_Says(15, 640, 17);
-				Actor_Says(0, 4790, -1);
-				Actor_Says(15, 650, 18);
-				Actor_Says(15, 660, 19);
-				Actor_Clue_Acquire(0, 280, 1, 15);
+				Actor_Says(kActorRunciter, 630, 12);
+				Actor_Says(kActorRunciter, 640, 17);
+				Actor_Says(kActorMcCoy, 4790, -1);
+				Actor_Says(kActorRunciter, 650, 18);
+				Actor_Says(kActorRunciter, 660, 19);
+				Actor_Clue_Acquire(kActorMcCoy, kClueRuncitersConfession1, 1, kActorRunciter);
 			} else {
-				Actor_Says(15, 670, 18);
-				Actor_Says(0, 4795, -1);
-				Actor_Says(15, 730, 17);
+				Actor_Says(kActorRunciter, 670, 18);
+				Actor_Says(kActorMcCoy, 4795, -1);
+				Actor_Says(kActorRunciter, 730, 17);
 			}
-		} else if (Actor_Clue_Query(0, 76)) {
-			Actor_Says(0, 4730, -1);
-			Actor_Says(15, 480, 17);
-			Actor_Says(0, 4735, -1);
-			Actor_Says(15, 490, 16);
+		} else if (Actor_Clue_Query(kActorMcCoy, kClueEnvelope)) {
+			Actor_Says(kActorMcCoy, 4730, -1);
+			Actor_Says(kActorRunciter, 480, 17);
+			Actor_Says(kActorMcCoy, 4735, -1);
+			Actor_Says(kActorRunciter, 490, 16);
 			Sound_Play(492, 100, 0, 100, 50);
-			Actor_Says(0, 4740, -1);
-			Actor_Says(15, 500, 18);
-			Actor_Says(15, 510, 19);
-			Actor_Says(0, 4745, -1);
-			Actor_Says(0, 4750, -1);
-			Actor_Says(15, 520, 17);
-			Actor_Says(15, 530, 18);
-			Actor_Says(15, 540, 16);
+			Actor_Says(kActorMcCoy, 4740, -1);
+			Actor_Says(kActorRunciter, 500, 18);
+			Actor_Says(kActorRunciter, 510, 19);
+			Actor_Says(kActorMcCoy, 4745, -1);
+			Actor_Says(kActorMcCoy, 4750, -1);
+			Actor_Says(kActorRunciter, 520, 17);
+			Actor_Says(kActorRunciter, 530, 18);
+			Actor_Says(kActorRunciter, 540, 16);
 		}
 		Game_Flag_Set(705);
 	}
@@ -133,19 +133,19 @@ void AIScriptRunciter::OtherAgentEnteredCombatMode(int otherActorId, int combatM
 void AIScriptRunciter::ShotAtAndMissed() {}
 
 void AIScriptRunciter::ShotAtAndHit() {
-	Actor_Set_Targetable(15, false);
-	Actor_Change_Animation_Mode(15, 48);
-	Actor_Set_Goal_Number(15, 599);
+	Actor_Set_Targetable(kActorRunciter, false);
+	Actor_Change_Animation_Mode(kActorRunciter, 48);
+	Actor_Set_Goal_Number(kActorRunciter, 599);
 	Delay(2000);
-	if (Actor_Clue_Query(0, 158)) {
-		Actor_Voice_Over(2050, 99);
-		Actor_Voice_Over(2060, 99);
+	if (Actor_Clue_Query(kActorMcCoy, kClueZubensMotive)) {
+		Actor_Voice_Over(2050, kActorVoiceOver);
+		Actor_Voice_Over(2060, kActorVoiceOver);
 	} else {
-		Actor_Voice_Over(2070, 99);
-		Actor_Voice_Over(2080, 99);
-		Actor_Voice_Over(2090, 99);
+		Actor_Voice_Over(2070, kActorVoiceOver);
+		Actor_Voice_Over(2080, kActorVoiceOver);
+		Actor_Voice_Over(2090, kActorVoiceOver);
 	}
-	Actor_Modify_Friendliness_To_Other(5, 0, 3);
+	Actor_Modify_Friendliness_To_Other(kActorClovis, kActorMcCoy, 3);
 }
 
 void AIScriptRunciter::Retired(int byActorId) {}
@@ -156,38 +156,38 @@ int AIScriptRunciter::GetFriendlinessModifierIfGetsClue(int otherActorId, int cl
 
 bool AIScriptRunciter::GoalChanged(int currentGoalNumber, int newGoalNumber) {
 	if (newGoalNumber == 0) {
-		Actor_Put_In_Set(15, 16);
-		Actor_Set_At_Waypoint(15, 92, 567);
+		Actor_Put_In_Set(kActorRunciter, 16);
+		Actor_Set_At_Waypoint(kActorRunciter, 92, 567);
 		return false;
 	}
 	if (newGoalNumber == 1) {
-		AI_Movement_Track_Flush(15);
+		AI_Movement_Track_Flush(kActorRunciter);
 		if (Random_Query(0, 1) == 1) {
 			if (Random_Query(0, 1) == 0) {
-				AI_Movement_Track_Append_With_Facing(15, 89, Random_Query(6, 10), 567);
+				AI_Movement_Track_Append_With_Facing(kActorRunciter, 89, Random_Query(6, 10), 567);
 			}
-			AI_Movement_Track_Append_With_Facing(15, 93, Random_Query(2, 6), 1002);
-			AI_Movement_Track_Append(15, 92, 5);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 93, Random_Query(2, 6), 1002);
+			AI_Movement_Track_Append(kActorRunciter, 92, 5);
 		} else {
-			AI_Movement_Track_Append_With_Facing(15, 91, Random_Query(3, 10), 120);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 91, Random_Query(3, 10), 120);
 			if (Random_Query(1, 3) == 1) {
-				AI_Movement_Track_Append_With_Facing(15, 93, Random_Query(2, 6), 1002);
+				AI_Movement_Track_Append_With_Facing(kActorRunciter, 93, Random_Query(2, 6), 1002);
 			}
-			AI_Movement_Track_Append_With_Facing(15, 90, Random_Query(5, 10), 170);
+			AI_Movement_Track_Append_With_Facing(kActorRunciter, 90, Random_Query(5, 10), 170);
 		}
-		AI_Movement_Track_Repeat(15);
+		AI_Movement_Track_Repeat(kActorRunciter);
 		return true;
 	}
 	if (newGoalNumber == 2) {
-		AI_Movement_Track_Flush(15);
-		AI_Movement_Track_Append(15, 39, 120);
-		AI_Movement_Track_Append(15, 40, 0);
-		AI_Movement_Track_Repeat(15);
+		AI_Movement_Track_Flush(kActorRunciter);
+		AI_Movement_Track_Append(kActorRunciter, 39, 120);
+		AI_Movement_Track_Append(kActorRunciter, 40, 0);
+		AI_Movement_Track_Repeat(kActorRunciter);
 		return false;
 	}
 	if (newGoalNumber == 300) {
-		Actor_Put_In_Set(15, 16);
-		Actor_Set_At_Waypoint(15, 93, 1007);
+		Actor_Put_In_Set(kActorRunciter, 16);
+		Actor_Set_At_Waypoint(kActorRunciter, 93, 1007);
 		return false;
 	}
 	return false;
@@ -242,7 +242,7 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 			var_45CD70_animation_state = 0;
 			var_45CD74_animation_frame = 0;
 			var_45CD78 = 0;
-			Actor_Change_Animation_Mode(15, 0);
+			Actor_Change_Animation_Mode(kActorRunciter, kAnimationModeCombatIdle);
 		}
 		*frame = var_45CD74_animation_frame;
 		break;
@@ -464,53 +464,67 @@ bool AIScriptRunciter::UpdateAnimation(int *animation, int *frame) {
 }
 
 bool AIScriptRunciter::ChangeAnimationMode(int mode) {
-
 	switch (mode) {
-	case 23:
-		var_45CD70_animation_state = 12;
-		var_45CD74_animation_frame = 0;
+	case kAnimationModeCombatIdle:
+		if (var_45CD70_animation_state >= 2 && var_45CD70_animation_state <= 11) {
+			var_45CD88 = 1;
+		} else {
+			var_45CD70_animation_state = 0;
+			var_45CD74_animation_frame = 0;
+			var_45CD78 = 0;
+		}
 		break;
-	case 19:
+	case kAnimationModeWalk:
+		if (var_45CD70_animation_state > 1) {
+			var_45CD70_animation_state = 1;
+			var_45CD74_animation_frame = 0;
+		} else if (!var_45CD70_animation_state) {
+			var_45CD70_animation_state = 13;
+			var_462800 = 1;
+			var_462804 = 526;
+		}
+		break;
+	case 3:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 11;
-			var_462804 = 541;
+			var_462800 = 2;
+			var_462804 = 526;
 		}
 		var_45CD88 = 0;
 		break;
-	case 18:
+	case 12:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 10;
-			var_462804 = 540;
+			var_462800 = 4;
+			var_462804 = 534;
 		}
 		var_45CD88 = 0;
 		break;
-	case 17:
+	case 13:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 9;
-			var_462804 = 539;
+			var_462800 = 5;
+			var_462804 = 535;
 		}
 		var_45CD88 = 0;
 		break;
-	case 16:
+	case 14:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 8;
-			var_462804 = 538;
+			var_462800 = 6;
+			var_462804 = 536;
 		}
 		var_45CD88 = 0;
 		break;
@@ -525,87 +539,57 @@ bool AIScriptRunciter::ChangeAnimationMode(int mode) {
 		}
 		var_45CD88 = 0;
 		break;
-	case 14:
+	case 16:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 6;
-			var_462804 = 536;
+			var_462800 = 8;
+			var_462804 = 538;
 		}
 		var_45CD88 = 0;
 		break;
-	case 13:
+	case 17:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 5;
-			var_462804 = 535;
+			var_462800 = 9;
+			var_462804 = 539;
 		}
 		var_45CD88 = 0;
 		break;
-	case 12:
+	case 18:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 4;
-			var_462804 = 534;
+			var_462800 = 10;
+			var_462804 = 540;
 		}
 		var_45CD88 = 0;
 		break;
-	case 3:
+	case 19:
 		if (var_45CD70_animation_state) {
 			var_45CD70_animation_state = 2;
 			var_45CD74_animation_frame = 0;
 		} else {
 			var_45CD70_animation_state = 13;
-			var_462800 = 2;
-			var_462804 = 526;
+			var_462800 = 11;
+			var_462804 = 541;
 		}
 		var_45CD88 = 0;
 		break;
-	case 1:
-		if (var_45CD70_animation_state > 1) {
-			var_45CD70_animation_state = 1;
-			var_45CD74_animation_frame = 0;
-		} else if (!var_45CD70_animation_state) {
-			var_45CD70_animation_state = 13;
-			var_462800 = 1;
-			var_462804 = 526;
-		}
-		break;
-	case 0:
-		if (var_45CD70_animation_state >= 2 && var_45CD70_animation_state <= 11) {
-			var_45CD88 = 1;
-		} else {
-			var_45CD70_animation_state = 0;
-			var_45CD74_animation_frame = 0;
-			var_45CD78 = 0;
-		}
-		break;
-	case 2:
-	case 4:
-	case 5:
-	case 6:
-	case 7:
-	case 8:
-	case 9:
-	case 10:
-	case 11:
-	case 20:
-	case 21:
-	case 22:
+	case 23:
+		var_45CD70_animation_state = 12;
+		var_45CD74_animation_frame = 0;
 		break;
-	default:
-		if (mode == 48) {
-			var_45CD70_animation_state = 14;
-			var_45CD74_animation_frame = 0;
-		}
+	case 48:
+		var_45CD70_animation_state = 14;
+		var_45CD74_animation_frame = 0;
 		break;
 	}
 	return true;
@@ -627,23 +611,21 @@ void AIScriptRunciter::SetAnimationState(int animationState, int animationFrame,
 
 bool AIScriptRunciter::ReachedMovementTrackWaypoint(int waypointId) {
 	switch (waypointId) {
-	case 93:
-		Actor_Face_Heading(15, 1002, true);
+	case 89:
+		Actor_Face_Heading(kActorRunciter, 567, true);
 		break;
-	case 92:
-		Actor_Face_Heading(15, 664, true);
+	case 90:
+		Actor_Face_Heading(kActorRunciter, 170, true);
 		break;
 	case 91:
-		Actor_Face_Heading(15, 120, true);
+		Actor_Face_Heading(kActorRunciter, 120, true);
 		break;
-	case 90:
-		Actor_Face_Heading(15, 170, true);
+	case 92:
+		Actor_Face_Heading(kActorRunciter, 664, true);
 		break;
-	case 89:
-		Actor_Face_Heading(15, 567, true);
+	case 93:
+		Actor_Face_Heading(kActorRunciter, 1002, true);
 		break;
-	default:
-		return true;
 	}
 	return true;
 }