PEGASUS: Cleanup from unused constants.

Agreed with clone2727.

2 files changed, 498 insertions, 471 deletions

diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
index 92b79c038e..f7996fabf5 100644
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -41,41 +41,45 @@ namespace Pegasus {
 
 // TSA PICTs:
 
-static const ResIDType kTBPCloseBoxPICTID = 800;
-static const ResIDType kTBPRewindPICTID = 801;
-static const ResIDType kUnresolvedPICTID = 802;
-static const ResIDType kResolvedPICTID = 803;
-static const ResIDType kJumpMenuPICTID = 804;
-static const ResIDType kJumpMenuHilitedPICTID = 805;
-static const ResIDType kExitPICTID = 806;
-static const ResIDType kExitHilitedPICTID = 807;
-static const ResIDType kLeftRipPICTID = 808;
-static const ResIDType kComparisonCloseBoxPICTID = 809;
-static const ResIDType kComparisonLeftRewindPICTID = 810;
-static const ResIDType kComparisonRightRewindPICTID = 811;
-static const ResIDType kComparisonHiliteNoradPICTID = 812;
-static const ResIDType kComparisonHiliteMarsPICTID = 813;
-static const ResIDType kComparisonHiliteCaldoriaPICTID = 814;
-static const ResIDType kComparisonHiliteWSCPICTID = 815;
-static const ResIDType kComparisonChancesNoradPICTID = 816;
-static const ResIDType kComparisonChancesMarsPICTID = 817;
-static const ResIDType kComparisonChancesCaldoriaPICTID = 818;
-static const ResIDType kComparisonChancesWSCPICTID = 819;
-static const ResIDType kRedirectionCCRolloverPICTID = 820;
-static const ResIDType kRedirectionRRRolloverPICTID = 821;
-static const ResIDType kRedirectionFDRolloverPICTID = 822;
-static const ResIDType kRedirectionCCDoorPICTID = 823;
-static const ResIDType kRedirectionRRDoorPICTID = 824;
-static const ResIDType kRedirectionFDDoorPICTID = 825;
-static const ResIDType kRedirectionSecuredPICTID = 826;
-static const ResIDType kRedirectionNewTargetPICTID = 827;
-static const ResIDType kRedirectionClosePICTID = 828;
+enum {
+	kTBPCloseBoxPICTID = 800,
+	kTBPRewindPICTID = 801,
+	kUnresolvedPICTID = 802,
+	kResolvedPICTID = 803,
+	kJumpMenuPICTID = 804,
+	kJumpMenuHilitedPICTID = 805,
+	kExitPICTID = 806,
+	kExitHilitedPICTID = 807,
+	kLeftRipPICTID = 808,
+	kComparisonCloseBoxPICTID = 809,
+	kComparisonLeftRewindPICTID = 810,
+	kComparisonRightRewindPICTID = 811,
+	kComparisonHiliteNoradPICTID = 812,
+	kComparisonHiliteMarsPICTID = 813,
+	kComparisonHiliteCaldoriaPICTID = 814,
+	kComparisonHiliteWSCPICTID = 815,
+	kComparisonChancesNoradPICTID = 816,
+	kComparisonChancesMarsPICTID = 817,
+	kComparisonChancesCaldoriaPICTID = 818,
+	kComparisonChancesWSCPICTID = 819,
+	kRedirectionCCRolloverPICTID = 820,
+	kRedirectionRRRolloverPICTID = 821,
+	kRedirectionFDRolloverPICTID = 822,
+	kRedirectionCCDoorPICTID = 823,
+	kRedirectionRRDoorPICTID = 824,
+	kRedirectionFDDoorPICTID = 825,
+	kRedirectionSecuredPICTID = 826,
+	kRedirectionNewTargetPICTID = 827,
+	kRedirectionClosePICTID = 828
+};
 
 static const int16 kCompassShift = 15;
 
-static const TimeScale kFullTSAMovieScale = 600;
-static const TimeScale kFullTSAFramesPerSecond = 15;
-static const TimeScale kFullTSAFrameDuration = 40;
+enum {
+	kFullTSAMovieScale = 600,
+	kFullTSAFramesPerSecond = 15,
+	kFullTSAFrameDuration = 40
+};
 
 // Alternate IDs.
 static const AlternateID kAltTSANormal = 0;
@@ -84,416 +88,425 @@ static const AlternateID kAltTSARobotsAtFrontDoor = 2;
 static const AlternateID kAltTSARedAlert = 3;
 
 // Room IDs.
-static const RoomID kTSA01 = 1;
-static const RoomID kTSA02 = 2;
-static const RoomID kTSA03 = 3;
-static const RoomID kTSA04 = 4;
-static const RoomID kTSA05 = 5;
-static const RoomID kTSA0A = 6;
-static const RoomID kTSA06 = 7;
-static const RoomID kTSA07 = 8;
-static const RoomID kTSA08 = 9;
-static const RoomID kTSA09 = 10;
-static const RoomID kTSA10 = 11;
-static const RoomID kTSA11 = 12;
-static const RoomID kTSA12 = 13;
-static const RoomID kTSA13 = 14;
-static const RoomID kTSA14 = 15;
-static const RoomID kTSA15 = 16;
-static const RoomID kTSA16 = 17;
-static const RoomID kTSA17 = 18;
-static const RoomID kTSA18 = 19;
-static const RoomID kTSA19 = 20;
-static const RoomID kTSA0B = 21;
-static const RoomID kTSA21Cyan = 22;
-static const RoomID kTSA22Cyan = 23;
-static const RoomID kTSA23Cyan = 24;
-static const RoomID kTSA24Cyan = 25;
-static const RoomID kTSA25Cyan = 26;
-static const RoomID kTSA21Red = 27;
-static const RoomID kTSA23Red = 29;
-static const RoomID kTSA24Red = 30;
-static const RoomID kTSA25Red = 31;
-static const RoomID kTSA26 = 32;
-static const RoomID kTSA27 = 33;
-static const RoomID kTSA28 = 34;
-static const RoomID kTSA29 = 35;
-static const RoomID kTSA30 = 36;
-static const RoomID kTSA31 = 37;
-static const RoomID kTSA32 = 38;
-static const RoomID kTSA33 = 39;
-static const RoomID kTSA34 = 40;
-static const RoomID kTSA35 = 41;
-static const RoomID kTSADeathRoom = 43;
+enum {
+	kTSA01 = 1,
+	kTSA02 = 2,
+	kTSA03 = 3,
+	kTSA04 = 4,
+	kTSA05 = 5,
+	kTSA0A = 6,
+	kTSA06 = 7,
+	kTSA07 = 8,
+	kTSA08 = 9,
+	kTSA09 = 10,
+	kTSA10 = 11,
+	kTSA11 = 12,
+	kTSA12 = 13,
+	kTSA13 = 14,
+	kTSA14 = 15,
+	kTSA15 = 16,
+	kTSA16 = 17,
+	kTSA17 = 18,
+	kTSA18 = 19,
+	kTSA19 = 20,
+	kTSA0B = 21,
+	kTSA21Cyan = 22,
+	kTSA22Cyan = 23,
+	kTSA23Cyan = 24,
+	kTSA24Cyan = 25,
+	kTSA25Cyan = 26,
+	kTSA21Red = 27,
+	kTSA23Red = 29,
+	kTSA24Red = 30,
+	kTSA25Red = 31,
+	kTSA26 = 32,
+	kTSA27 = 33,
+	kTSA28 = 34,
+	kTSA29 = 35,
+	kTSA30 = 36,
+	kTSA31 = 37,
+	kTSA32 = 38,
+	kTSA33 = 39,
+	kTSA34 = 40,
+	kTSA35 = 41,
+	kTSADeathRoom = 43
+};
 
 // Hot Spot Activation IDs.
-static const HotSpotActivationID kActivateTSAReadyForCard = 1;
-static const HotSpotActivationID kActivateTSAReadyToTransport = 2;
-static const HotSpotActivationID kActivateTSARobotsAwake = 3;
-static const HotSpotActivationID kActivateTSA0BZoomedOut = 4;
-static const HotSpotActivationID kActivateTSA0BZoomedIn = 5;
-static const HotSpotActivationID kActivateTSA0BComparisonVideo = 6;
-static const HotSpotActivationID kActivationLogReaderOpen = 7;
-static const HotSpotActivationID kActivateTSA0BTBPVideo = 8;
-static const HotSpotActivationID kActivationDoesntHaveKey = 9;
-static const HotSpotActivationID kActivationKeyVaultOpen = 10;
-static const HotSpotActivationID kActivationDoesntHaveChips = 11;
-static const HotSpotActivationID kActivationChipVaultOpen = 12;
-static const HotSpotActivationID kActivationJumpToPrehistoric = 13;
-static const HotSpotActivationID kActivationJumpToNorad = 14;
-static const HotSpotActivationID kActivationJumpToMars = 15;
-static const HotSpotActivationID kActivationJumpToWSC = 16;
-static const HotSpotActivationID kActivationReadyToExit = 17;
-static const HotSpotActivationID kActivationReadyForJumpMenu = 18;
-static const HotSpotActivationID kActivationMainJumpMenu = 19;
+enum {
+	kActivateTSAReadyForCard = 1,
+	kActivateTSAReadyToTransport = 2,
+	kActivateTSARobotsAwake = 3,
+	kActivateTSA0BZoomedOut = 4,
+	kActivateTSA0BZoomedIn = 5,
+	kActivateTSA0BComparisonVideo = 6,
+	kActivationLogReaderOpen = 7,
+	kActivateTSA0BTBPVideo = 8,
+	kActivationDoesntHaveKey = 9,
+	kActivationKeyVaultOpen = 10,
+	kActivationDoesntHaveChips = 11,
+	kActivationChipVaultOpen = 12,
+	kActivationJumpToPrehistoric = 13,
+	kActivationJumpToNorad = 14,
+	kActivationJumpToMars = 15,
+	kActivationJumpToWSC = 16,
+	kActivationReadyToExit = 17,
+	kActivationReadyForJumpMenu = 18,
+	kActivationMainJumpMenu = 19
+};
 
 // Hot Spot IDs.
-static const HotSpotID kTSAGTCardDropSpotID = 5000;
-static const HotSpotID kTSAGTTokyoSpotID = 5001;
-static const HotSpotID kTSAGTCaldoriaSpotID = 5002;
-static const HotSpotID kTSAGTBeachSpotID = 5003;
-static const HotSpotID kTSAGTOtherSpotID = 5004;
-static const HotSpotID kTSA02DoorSpotID = 5005;
-static const HotSpotID kTSA03EastJimenezSpotID = 5006;
-static const HotSpotID kTSA03WestCrenshawSpotID = 5007;
-static const HotSpotID kTSA04EastMatsumotoSpotID = 5008;
-static const HotSpotID kTSA04WestCastilleSpotID = 5009;
-static const HotSpotID kTSA05EastSinclairSpotID = 5010;
-static const HotSpotID kTSA05WestWhiteSpotID = 5011;
-static const HotSpotID kTSA0AEastSpotID = 5012;
-static const HotSpotID kTSA0AWastSpotID = 5013;
-static const HotSpotID kTSA0BEastMonitorSpotID = 5014;
-static const HotSpotID kTSA0BEastMonitorOutSpotID = 5015;
-static const HotSpotID kTSA0BEastCompareNoradSpotID = 5016;
-static const HotSpotID kTSA0BEastCompareMarsSpotID = 5017;
-static const HotSpotID kTSA0BEastCompareCaldoriaSpotID = 5018;
-static const HotSpotID kTSA0BEastCompareWSCSpotID = 5019;
-static const HotSpotID kTSA0BEastLeftRewindSpotID = 5020;
-static const HotSpotID kTSA0BEastLeftPlaySpotID = 5021;
-static const HotSpotID kTSA0BEastRightRewindSpotID = 5022;
-static const HotSpotID kTSA0BEastRightPlaySpotID = 5023;
-static const HotSpotID kTSA0BEastCloseVideoSpotID = 5024;
-static const HotSpotID kTSA0BNorthMonitorSpotID = 5025;
-static const HotSpotID kTSA0BNorthMonitorOutSpotID = 5026;
-static const HotSpotID kTSA0BNorthHistLogSpotID = 5027;
-static const HotSpotID kTSA0BNorthRobotsToCommandCenterSpotID = 5028;
-static const HotSpotID kTSA0BNorthRobotsToReadyRoomSpotID = 5029;
-static const HotSpotID kTSA0BNorthRobotsToFrontDoorSpotID = 5030;
-static const HotSpotID kTSA0BWestMonitorSpotID = 5031;
-static const HotSpotID kTSA0BWestMonitorOutSpotID = 5032;
-static const HotSpotID kTSA0BWestTheorySpotID = 5033;
-static const HotSpotID kTSA0BWestBackgroundSpotID = 5034;
-static const HotSpotID kTSA0BWestProcedureSpotID = 5035;
-static const HotSpotID kTSA0BWestCloseVideoSpotID = 5036;
-static const HotSpotID kTSA0BWestPlayVideoSpotID = 5037;
-static const HotSpotID kTSA0BWestRewindVideoSpotID = 5038;
-static const HotSpotID kTSA22EastMonitorSpotID = 5039;
-static const HotSpotID kTSA22EastKeySpotID = 5040;
-static const HotSpotID kTSA23WestMonitorSpotID = 5041;
-static const HotSpotID kTSA23WestChipsSpotID = 5042;
-static const HotSpotID kTSA34NorthDoorSpotID = 5043;
-static const HotSpotID kTSA37NorthJumpToPrehistoricSpotID = 5044;
-static const HotSpotID kTSA37NorthJumpToNoradSpotID = 5045;
-static const HotSpotID kTSA37NorthCancelNoradSpotID = 5046;
-static const HotSpotID kTSA37NorthJumpToMarsSpotID = 5047;
-static const HotSpotID kTSA37NorthCancelMarsSpotID = 5048;
-static const HotSpotID kTSA37NorthJumpToWSCSpotID = 5049;
-static const HotSpotID kTSA37NorthCancelWSCSpotID = 5050;
-static const HotSpotID kTSA37NorthExitSpotID = 5051;
-static const HotSpotID kTSA37NorthJumpMenuSpotID = 5052;
-static const HotSpotID kTSA37NorthNoradMenuSpotID = 5053;
-static const HotSpotID kTSA37NorthMarsMenuSpotID = 5054;
-static const HotSpotID kTSA37NorthWSCMenuSpotID = 5055;
+enum {
+	kTSAGTCardDropSpotID = 5000,
+	kTSAGTTokyoSpotID = 5001,
+	kTSAGTCaldoriaSpotID = 5002,
+	kTSAGTBeachSpotID = 5003,
+	kTSAGTOtherSpotID = 5004,
+	kTSA02DoorSpotID = 5005,
+	kTSA03EastJimenezSpotID = 5006,
+	kTSA03WestCrenshawSpotID = 5007,
+	kTSA04EastMatsumotoSpotID = 5008,
+	kTSA04WestCastilleSpotID = 5009,
+	kTSA05EastSinclairSpotID = 5010,
+	kTSA05WestWhiteSpotID = 5011,
+	kTSA0AEastSpotID = 5012,
+	kTSA0AWastSpotID = 5013,
+	kTSA0BEastMonitorSpotID = 5014,
+	kTSA0BEastMonitorOutSpotID = 5015,
+	kTSA0BEastCompareNoradSpotID = 5016,
+	kTSA0BEastCompareMarsSpotID = 5017,
+	kTSA0BEastCompareCaldoriaSpotID = 5018,
+	kTSA0BEastCompareWSCSpotID = 5019,
+	kTSA0BEastLeftRewindSpotID = 5020,
+	kTSA0BEastLeftPlaySpotID = 5021,
+	kTSA0BEastRightRewindSpotID = 5022,
+	kTSA0BEastRightPlaySpotID = 5023,
+	kTSA0BEastCloseVideoSpotID = 5024,
+	kTSA0BNorthMonitorSpotID = 5025,
+	kTSA0BNorthMonitorOutSpotID = 5026,
+	kTSA0BNorthHistLogSpotID = 5027,
+	kTSA0BNorthRobotsToCommandCenterSpotID = 5028,
+	kTSA0BNorthRobotsToReadyRoomSpotID = 5029,
+	kTSA0BNorthRobotsToFrontDoorSpotID = 5030,
+	kTSA0BWestMonitorSpotID = 5031,
+	kTSA0BWestMonitorOutSpotID = 5032,
+	kTSA0BWestTheorySpotID = 5033,
+	kTSA0BWestBackgroundSpotID = 5034,
+	kTSA0BWestProcedureSpotID = 5035,
+	kTSA0BWestCloseVideoSpotID = 5036,
+	kTSA0BWestPlayVideoSpotID = 5037,
+	kTSA0BWestRewindVideoSpotID = 5038,
+	kTSA22EastMonitorSpotID = 5039,
+	kTSA22EastKeySpotID = 5040,
+	kTSA23WestMonitorSpotID = 5041,
+	kTSA23WestChipsSpotID = 5042,
+	kTSA34NorthDoorSpotID = 5043,
+	kTSA37NorthJumpToPrehistoricSpotID = 5044,
+	kTSA37NorthJumpToNoradSpotID = 5045,
+	kTSA37NorthCancelNoradSpotID = 5046,
+	kTSA37NorthJumpToMarsSpotID = 5047,
+	kTSA37NorthCancelMarsSpotID = 5048,
+	kTSA37NorthJumpToWSCSpotID = 5049,
+	kTSA37NorthCancelWSCSpotID = 5050,
+	kTSA37NorthExitSpotID = 5051,
+	kTSA37NorthJumpMenuSpotID = 5052,
+	kTSA37NorthNoradMenuSpotID = 5053,
+	kTSA37NorthMarsMenuSpotID = 5054,
+	kTSA37NorthWSCMenuSpotID = 5055
+};
 
 // Extra sequence IDs.
-static const ExtraID kTSATransporterArrowLoop = 0;
-static const ExtraID kTSAArriveFromCaldoria = 1;
-static const ExtraID kTSAGTOtherChoice = 2;
-static const ExtraID kTSAGTCardSwipe = 3;
-static const ExtraID kTSAGTSelectCaldoria = 4;
-static const ExtraID kTSAGTGoToCaldoria = 5;
-static const ExtraID kTSAGTSelectBeach = 6;
-static const ExtraID kTSAGTGoToBeach = 7;
-static const ExtraID kTSAGTArriveAtBeach = 8;
-static const ExtraID kTSAGTSelectTokyo = 9;
-static const ExtraID kTSAGTGoToTokyo = 10;
-static const ExtraID kTSAGTArriveAtTokyo = 11;
-static const ExtraID kTSA02NorthZoomIn = 12;
-static const ExtraID kTSA02NorthTenSecondDoor = 13;
-static const ExtraID kTSA02NorthZoomOut = 14;
-static const ExtraID kTSA02NorthDoorWithAgent3 = 15;
-static const ExtraID kTSA03JimenezZoomIn = 16;
-static const ExtraID kTSA03JimenezSpeech = 17;
-static const ExtraID kTSA03JimenezZoomOut = 18;
-static const ExtraID kTSA03CrenshawZoomIn = 19;
-static const ExtraID kTSA03CrenshawSpeech = 20;
-static const ExtraID kTSA03CrenshawZoomOut = 21;
-static const ExtraID kTSA03SouthRobotDeath = 22;
-static const ExtraID kTSA04NorthRobotGreeting = 23;
-static const ExtraID kTSA04MatsumotoZoomIn = 24;
-static const ExtraID kTSA04MatsumotoSpeech = 25;
-static const ExtraID kTSA04MatsumotoZoomOut = 26;
-static const ExtraID kTSA04CastilleZoomIn = 27;
-static const ExtraID kTSA04CastilleSpeech = 28;
-static const ExtraID kTSA04CastilleZoomOut = 29;
-static const ExtraID kTSA05SinclairZoomIn = 30;
-static const ExtraID kTSA05SinclairSpeech = 31;
-static const ExtraID kTSA05SinclairZoomOut = 32;
-static const ExtraID kTSA05WhiteZoomIn = 33;
-static const ExtraID kTSA05WhiteSpeech = 34;
-static const ExtraID kTSA05WhiteZoomOut = 35;
-static const ExtraID kTSA0AEastRobot = 36;
-static const ExtraID kTSA0AWestRobot = 37;
-static const ExtraID kTSA16NorthRobotDeath = 38;
-static const ExtraID kTSA0BEastZoomIn = 39;
-static const ExtraID kTSA0BEastZoomedView = 40;
-static const ExtraID kTSA0BEastZoomOut = 41;
-static const ExtraID kTSA0BEastTurnLeft = 42;
-static const ExtraID kTSA0BComparisonStartup = 43;
-static const ExtraID kTSA0BComparisonView0000 = 44;
-static const ExtraID kTSA0BComparisonView0002 = 45;
-static const ExtraID kTSA0BComparisonView0020 = 46;
-static const ExtraID kTSA0BComparisonView0022 = 47;
-static const ExtraID kTSA0BComparisonView0200 = 48;
-static const ExtraID kTSA0BComparisonView0202 = 49;
-static const ExtraID kTSA0BComparisonView0220 = 50;
-static const ExtraID kTSA0BComparisonView0222 = 51;
-static const ExtraID kTSA0BComparisonView2000 = 52;
-static const ExtraID kTSA0BComparisonView2002 = 53;
-static const ExtraID kTSA0BComparisonView2020 = 54;
-static const ExtraID kTSA0BComparisonView2022 = 55;
-static const ExtraID kTSA0BComparisonView2200 = 56;
-static const ExtraID kTSA0BComparisonView2202 = 57;
-static const ExtraID kTSA0BComparisonView2220 = 58;
-static const ExtraID kTSA0BComparisonView2222 = 59;
-static const ExtraID kTSA0BNoradComparisonView = 60;
-static const ExtraID kTSA0BNoradUnaltered = 61;
-static const ExtraID kTSA0BNoradAltered = 62;
-static const ExtraID kTSA0BMarsComparisonView = 63;
-static const ExtraID kTSA0BMarsUnaltered = 64;
-static const ExtraID kTSA0BMarsAltered = 65;
-static const ExtraID kTSA0BWSCComparisonView = 66;
-static const ExtraID kTSA0BWSCUnaltered = 67;
-static const ExtraID kTSA0BWSCAltered = 68;
-static const ExtraID kTSA0BCaldoriaComparisonView = 69;
-static const ExtraID kTSA0BCaldoriaUnaltered = 70;
-static const ExtraID kTSA0BCaldoriaAltered = 71;
-static const ExtraID kTSA0BNorthZoomIn = 72;
-static const ExtraID kTSA0BNorthZoomedView = 73;
-static const ExtraID kTSA0BNorthZoomOut = 74;
-static const ExtraID kTSA0BNorthTurnLeft = 75;
-static const ExtraID kTSA0BNorthTurnRight = 76;
-static const ExtraID kTSA0BNorthHistLogOpen = 77;
-static const ExtraID kTSA0BNorthHistLogClose = 78;
-static const ExtraID kTSA0BNorthHistLogCloseWithLog = 79;
-static const ExtraID kTSA0BNorthCantChangeHistory = 80;
-static const ExtraID kTSA0BNorthYoureBusted = 81;
-static const ExtraID kTSA0BNorthFinallyHappened = 82;
-static const ExtraID kTSA0BShowRip1 = 83;
-static const ExtraID kTSA0BNorthRipView1 = 84;
-static const ExtraID kTSA0BShowRip2 = 85;
-static const ExtraID kTSA0BShowGuardRobots = 86;
-static const ExtraID kTSA0BAIInterruption = 87;
-static const ExtraID kTSA0BRobotsToCommandCenter = 88;
-static const ExtraID kTSA0BNorthRobotsAtCCView = 89;
-static const ExtraID kTSA0BNorthRobotsAtRRView = 90;
-static const ExtraID kTSA0BNorthRobotsAtFDView = 91;
-static const ExtraID kTSA0BRobotsFromCommandCenterToReadyRoom = 92;
-static const ExtraID kTSA0BRobotsFromReadyRoomToCommandCenter = 93;
-static const ExtraID kTSA0BRobotsFromCommandCenterToFrontDoor = 94;
-static const ExtraID kTSA0BRobotsFromFrontDoorToCommandCenter = 95;
-static const ExtraID kTSA0BRobotsFromFrontDoorToReadyRoom = 96;
-static const ExtraID kTSA0BRobotsFromReadyRoomToFrontDoor = 97;
-static const ExtraID kTSA0BWestZoomIn = 98;
-static const ExtraID kTSA0BWestZoomedView = 99;
-static const ExtraID kTSA0BWestZoomOut = 100;
-static const ExtraID kTSA0BWestTurnRight = 101;
-static const ExtraID kTSA0BTBPTheoryHighlight = 102;
-static const ExtraID kTSA0BTBPBackgroundHighlight = 103;
-static const ExtraID kTSA0BTBPProcedureHighlight = 104;
-static const ExtraID kTSA0BTBPTheory = 105;
-static const ExtraID kTSA0BTBPBackground = 106;
-static const ExtraID kTSA0BTBPProcedure = 107;
-static const ExtraID kTSA0BRipAlarmScreen = 108;
-static const ExtraID kTSA22RedEastZoomInSequence = 109;
-static const ExtraID kTSA22RedEastVaultViewWithKey = 110;
-static const ExtraID kTSA22RedEastVaultViewNoKey = 111;
-static const ExtraID kTSA23RedWestVaultZoomInSequence = 112;
-static const ExtraID kTSA23RedWestVaultViewWithChips = 113;
-static const ExtraID kTSA23RedWestVaultViewNoChips = 114;
-static const ExtraID kTSA25NorthDeniedNoKey = 115;
-static const ExtraID kTSA25NorthDeniedNoChip = 116;
-static const ExtraID kTSA25NorthPutOnSuit = 117;
-static const ExtraID kTSA25NorthAlreadyHaveSuit = 118;
-static const ExtraID kTSA25NorthDescending1 = 119;
-static const ExtraID kTSA25NorthDescending2 = 120;
-static const ExtraID kTSA37HorseToAI1 = 121;
-static const ExtraID kTSA37PegasusAI1 = 122;
-static const ExtraID kTSA37AI1ToCommissioner1 = 123;
-static const ExtraID kTSA37Commissioner1 = 124;
-static const ExtraID kTSA37Commissioner1ToZoom = 125;
-static const ExtraID kTSA37ZoomToPrehistoric = 126;
-static const ExtraID kTSA37PrehistoricToAI2 = 127;
-static const ExtraID kTSA37PegasusAI2 = 128;
-static const ExtraID kTSA37AI2ToPrehistoric = 129;
-static const ExtraID kTSA37PrehistoricToDepart = 130;
-static const ExtraID kTSA37PegasusDepart = 131;
-static const ExtraID kTSA37TimeJumpToPegasus = 132;
-static const ExtraID kTSA37RecallToDownload = 133;
-static const ExtraID kTSA37DownloadToColonel1 = 134;
-static const ExtraID kTSA37Colonel1 = 135;
-static const ExtraID kTSA37Colonel1ToReviewRequired = 136;
-static const ExtraID kTSA37ReviewRequiredToExit = 137;
-static const ExtraID kTSA37ExitHilited = 138;
-static const ExtraID kTSA37ExitToHorse = 139;
-static const ExtraID kTSA37HorseToColonel2 = 140;
-static const ExtraID kTSA37Colonel2 = 141;
-static const ExtraID kTSA37PegasusAI3 = 142;
-static const ExtraID kTSA37AI3ToHorse = 143;
-static const ExtraID kTSA37HorseToZoom = 144;
-static const ExtraID kTSA37ZoomToMainMenu = 145;
-static const ExtraID kTSA37MainMenuToAI4 = 146;
-static const ExtraID kTSA37PegasusAI4 = 147;
-static const ExtraID kTSA37AI4ToMainMenu = 148;
-static const ExtraID kTSA37JumpMenu000 = 149;
-static const ExtraID kTSA37JumpMenu001 = 150;
-static const ExtraID kTSA37JumpMenu010 = 151;
-static const ExtraID kTSA37JumpMenu011 = 152;
-static const ExtraID kTSA37JumpMenu100 = 153;
-static const ExtraID kTSA37JumpMenu101 = 154;
-static const ExtraID kTSA37JumpMenu110 = 155;
-static const ExtraID kTSA37JumpMenu111 = 156;
-static const ExtraID kTSA37JumpToWSCMenu = 157;
-static const ExtraID kTSA37CancelWSC = 158;
-static const ExtraID kTSA37JumpToWSC = 159;
-static const ExtraID kTSA37WSCToAI5 = 160;
-static const ExtraID kTSA37PegasusAI5 = 161;
-static const ExtraID kTSA37AI5ToWSC = 162;
-static const ExtraID kTSA37WSCToDepart = 163;
-static const ExtraID kTSA37JumpToMarsMenu = 164;
-static const ExtraID kTSA37CancelMars = 165;
-static const ExtraID kTSA37JumpToMars = 166;
-static const ExtraID kTSA37MarsToAI6 = 167;
-static const ExtraID kTSA37PegasusAI6 = 168;
-static const ExtraID kTSA37AI6ToMars = 169;
-static const ExtraID kTSA37MarsToDepart = 170;
-static const ExtraID kTSA37JumpToNoradMenu = 171;
-static const ExtraID kTSA37CancelNorad = 172;
-static const ExtraID kTSA37JumpToNorad = 173;
-static const ExtraID kTSA37NoradToAI7 = 174;
-static const ExtraID kTSA37PegasusAI7 = 175;
-static const ExtraID kTSA37AI7ToNorad = 176;
-static const ExtraID kTSA37NoradToDepart = 177;
-static const ExtraID kTSA37EnvironmentalScan = 178;
-static const ExtraID kTSA37DownloadToMainMenu = 179;
-static const ExtraID kTSA37DownloadToOpMemReview = 180;
-static const ExtraID kTSA37OpMemReviewToMainMenu = 181;
-static const ExtraID kTSA37OpMemReviewToAllClear = 182;
-static const ExtraID kTSA37AllClearToCongratulations = 183;
-static const ExtraID kTSA37Congratulations = 184;
-static const ExtraID kTSA37CongratulationsToExit = 185;
+enum {
+	kTSATransporterArrowLoop = 0,
+	kTSAArriveFromCaldoria = 1,
+	kTSAGTOtherChoice = 2,
+	kTSAGTCardSwipe = 3,
+	kTSAGTSelectCaldoria = 4,
+	kTSAGTGoToCaldoria = 5,
+	kTSAGTSelectBeach = 6,
+	kTSAGTGoToBeach = 7,
+	kTSAGTArriveAtBeach = 8,
+	kTSAGTSelectTokyo = 9,
+	kTSAGTGoToTokyo = 10,
+	kTSAGTArriveAtTokyo = 11,
+	kTSA02NorthZoomIn = 12,
+	kTSA02NorthTenSecondDoor = 13,
+	kTSA02NorthZoomOut = 14,
+	kTSA02NorthDoorWithAgent3 = 15,
+	kTSA03JimenezZoomIn = 16,
+	kTSA03JimenezSpeech = 17,
+	kTSA03JimenezZoomOut = 18,
+	kTSA03CrenshawZoomIn = 19,
+	kTSA03CrenshawSpeech = 20,
+	kTSA03CrenshawZoomOut = 21,
+	kTSA03SouthRobotDeath = 22,
+	kTSA04NorthRobotGreeting = 23,
+	kTSA04MatsumotoZoomIn = 24,
+	kTSA04MatsumotoSpeech = 25,
+	kTSA04MatsumotoZoomOut = 26,
+	kTSA04CastilleZoomIn = 27,
+	kTSA04CastilleSpeech = 28,
+	kTSA04CastilleZoomOut = 29,
+	kTSA05SinclairZoomIn = 30,
+	kTSA05SinclairSpeech = 31,
+	kTSA05SinclairZoomOut = 32,
+	kTSA05WhiteZoomIn = 33,
+	kTSA05WhiteSpeech = 34,
+	kTSA05WhiteZoomOut = 35,
+	kTSA0AEastRobot = 36,
+	kTSA0AWestRobot = 37,
+	kTSA16NorthRobotDeath = 38,
+	kTSA0BEastZoomIn = 39,
+	kTSA0BEastZoomedView = 40,
+	kTSA0BEastZoomOut = 41,
+	kTSA0BEastTurnLeft = 42,
+	kTSA0BComparisonStartup = 43,
+	kTSA0BComparisonView0000 = 44,
+	kTSA0BComparisonView0002 = 45,
+	kTSA0BComparisonView0020 = 46,
+	kTSA0BComparisonView0022 = 47,
+	kTSA0BComparisonView0200 = 48,
+	kTSA0BComparisonView0202 = 49,
+	kTSA0BComparisonView0220 = 50,
+	kTSA0BComparisonView0222 = 51,
+	kTSA0BComparisonView2000 = 52,
+	kTSA0BComparisonView2002 = 53,
+	kTSA0BComparisonView2020 = 54,
+	kTSA0BComparisonView2022 = 55,
+	kTSA0BComparisonView2200 = 56,
+	kTSA0BComparisonView2202 = 57,
+	kTSA0BComparisonView2220 = 58,
+	kTSA0BComparisonView2222 = 59,
+	kTSA0BNoradComparisonView = 60,
+	kTSA0BNoradUnaltered = 61,
+	kTSA0BNoradAltered = 62,
+	kTSA0BMarsComparisonView = 63,
+	kTSA0BMarsUnaltered = 64,
+	kTSA0BMarsAltered = 65,
+	kTSA0BWSCComparisonView = 66,
+	kTSA0BWSCUnaltered = 67,
+	kTSA0BWSCAltered = 68,
+	kTSA0BCaldoriaComparisonView = 69,
+	kTSA0BCaldoriaUnaltered = 70,
+	kTSA0BCaldoriaAltered = 71,
+	kTSA0BNorthZoomIn = 72,
+	kTSA0BNorthZoomedView = 73,
+	kTSA0BNorthZoomOut = 74,
+	kTSA0BNorthTurnLeft = 75,
+	kTSA0BNorthTurnRight = 76,
+	kTSA0BNorthHistLogOpen = 77,
+	kTSA0BNorthHistLogClose = 78,
+	kTSA0BNorthHistLogCloseWithLog = 79,
+	kTSA0BNorthCantChangeHistory = 80,
+	kTSA0BNorthYoureBusted = 81,
+	kTSA0BNorthFinallyHappened = 82,
+	kTSA0BShowRip1 = 83,
+	kTSA0BNorthRipView1 = 84,
+	kTSA0BShowRip2 = 85,
+	kTSA0BShowGuardRobots = 86,
+	kTSA0BAIInterruption = 87,
+	kTSA0BRobotsToCommandCenter = 88,
+	kTSA0BNorthRobotsAtCCView = 89,
+	kTSA0BNorthRobotsAtRRView = 90,
+	kTSA0BNorthRobotsAtFDView = 91,
+	kTSA0BRobotsFromCommandCenterToReadyRoom = 92,
+	kTSA0BRobotsFromReadyRoomToCommandCenter = 93,
+	kTSA0BRobotsFromCommandCenterToFrontDoor = 94,
+	kTSA0BRobotsFromFrontDoorToCommandCenter = 95,
+	kTSA0BRobotsFromFrontDoorToReadyRoom = 96,
+	kTSA0BRobotsFromReadyRoomToFrontDoor = 97,
+	kTSA0BWestZoomIn = 98,
+	kTSA0BWestZoomedView = 99,
+	kTSA0BWestZoomOut = 100,
+	kTSA0BWestTurnRight = 101,
+	kTSA0BTBPTheoryHighlight = 102,
+	kTSA0BTBPBackgroundHighlight = 103,
+	kTSA0BTBPProcedureHighlight = 104,
+	kTSA0BTBPTheory = 105,
+	kTSA0BTBPBackground = 106,
+	kTSA0BTBPProcedure = 107,
+	kTSA0BRipAlarmScreen = 108,
+	kTSA22RedEastZoomInSequence = 109,
+	kTSA22RedEastVaultViewWithKey = 110,
+	kTSA22RedEastVaultViewNoKey = 111,
+	kTSA23RedWestVaultZoomInSequence = 112,
+	kTSA23RedWestVaultViewWithChips = 113,
+	kTSA23RedWestVaultViewNoChips = 114,
+	kTSA25NorthDeniedNoKey = 115,
+	kTSA25NorthDeniedNoChip = 116,
+	kTSA25NorthPutOnSuit = 117,
+	kTSA25NorthAlreadyHaveSuit = 118,
+	kTSA25NorthDescending1 = 119,
+	kTSA25NorthDescending2 = 120,
+	kTSA37HorseToAI1 = 121,
+	kTSA37PegasusAI1 = 122,
+	kTSA37AI1ToCommissioner1 = 123,
+	kTSA37Commissioner1 = 124,
+	kTSA37Commissioner1ToZoom = 125,
+	kTSA37ZoomToPrehistoric = 126,
+	kTSA37PrehistoricToAI2 = 127,
+	kTSA37PegasusAI2 = 128,
+	kTSA37AI2ToPrehistoric = 129,
+	kTSA37PrehistoricToDepart = 130,
+	kTSA37PegasusDepart = 131,
+	kTSA37TimeJumpToPegasus = 132,
+	kTSA37RecallToDownload = 133,
+	kTSA37DownloadToColonel1 = 134,
+	kTSA37Colonel1 = 135,
+	kTSA37Colonel1ToReviewRequired = 136,
+	kTSA37ReviewRequiredToExit = 137,
+	kTSA37ExitHilited = 138,
+	kTSA37ExitToHorse = 139,
+	kTSA37HorseToColonel2 = 140,
+	kTSA37Colonel2 = 141,
+	kTSA37PegasusAI3 = 142,
+	kTSA37AI3ToHorse = 143,
+	kTSA37HorseToZoom = 144,
+	kTSA37ZoomToMainMenu = 145,
+	kTSA37MainMenuToAI4 = 146,
+	kTSA37PegasusAI4 = 147,
+	kTSA37AI4ToMainMenu = 148,
+	kTSA37JumpMenu000 = 149,
+	kTSA37JumpMenu001 = 150,
+	kTSA37JumpMenu010 = 151,
+	kTSA37JumpMenu011 = 152,
+	kTSA37JumpMenu100 = 153,
+	kTSA37JumpMenu101 = 154,
+	kTSA37JumpMenu110 = 155,
+	kTSA37JumpMenu111 = 156,
+	kTSA37JumpToWSCMenu = 157,
+	kTSA37CancelWSC = 158,
+	kTSA37JumpToWSC = 159,
+	kTSA37WSCToAI5 = 160,
+	kTSA37PegasusAI5 = 161,
+	kTSA37AI5ToWSC = 162,
+	kTSA37WSCToDepart = 163,
+	kTSA37JumpToMarsMenu = 164,
+	kTSA37CancelMars = 165,
+	kTSA37JumpToMars = 166,
+	kTSA37MarsToAI6 = 167,
+	kTSA37PegasusAI6 = 168,
+	kTSA37AI6ToMars = 169,
+	kTSA37MarsToDepart = 170,
+	kTSA37JumpToNoradMenu = 171,
+	kTSA37CancelNorad = 172,
+	kTSA37JumpToNorad = 173,
+	kTSA37NoradToAI7 = 174,
+	kTSA37PegasusAI7 = 175,
+	kTSA37AI7ToNorad = 176,
+	kTSA37NoradToDepart = 177,
+	kTSA37EnvironmentalScan = 178,
+	kTSA37DownloadToMainMenu = 179,
+	kTSA37DownloadToOpMemReview = 180,
+	kTSA37OpMemReviewToMainMenu = 181,
+	kTSA37OpMemReviewToAllClear = 182,
+	kTSA37AllClearToCongratulations = 183,
+	kTSA37Congratulations = 184,
+	kTSA37CongratulationsToExit = 185
+};
 
 const DisplayOrder kRipTimerOrder = kMonitorLayer;
 
+enum {
+	kUnresolvedLeft = kNavAreaLeft + 14,
+	kUnresolvedTop = kNavAreaTop + 236,
 
-const CoordType kUnresolvedLeft = kNavAreaLeft + 14;
-const CoordType kUnresolvedTop = kNavAreaTop + 236;
-
-const CoordType kResolvedLeft = kNavAreaLeft + 36;
-const CoordType kResolvedTop = kNavAreaTop + 236;
+	kResolvedLeft = kNavAreaLeft + 36,
+	kResolvedTop = kNavAreaTop + 236,
 
-const CoordType kJumpMenuLeft = kNavAreaLeft + 360;
-const CoordType kJumpMenuTop = kNavAreaTop + 202;
+	kJumpMenuLeft = kNavAreaLeft + 360,
+	kJumpMenuTop = kNavAreaTop + 202,
 
-const CoordType kJumpMenuHilitedLeft = kNavAreaLeft + 354;
-const CoordType kJumpMenuHilitedTop = kNavAreaTop + 196;
+	kJumpMenuHilitedLeft = kNavAreaLeft + 354,
+	kJumpMenuHilitedTop = kNavAreaTop + 196,
 
-const CoordType kExitLeft = kNavAreaLeft + 360;
-const CoordType kExitTop = kNavAreaTop + 216;
+	kExitLeft = kNavAreaLeft + 360,
+	kExitTop = kNavAreaTop + 216,
 
-const CoordType kExitHilitedLeft = kNavAreaLeft + 354;
-const CoordType kExitHilitedTop = kNavAreaTop + 210;
+	kExitHilitedLeft = kNavAreaLeft + 354,
+	kExitHilitedTop = kNavAreaTop + 210,
 
-const CoordType kRipTimerLeft = kNavAreaLeft + 95;
-const CoordType kRipTimerTop = kNavAreaTop + 87;
+	kRipTimerLeft = kNavAreaLeft + 95,
+	kRipTimerTop = kNavAreaTop + 87,
 
-const CoordType kTBPCloseLeft = kNavAreaLeft + 30;
-const CoordType kTBPCloseTop = kNavAreaTop + 16;
+	kTBPCloseLeft = kNavAreaLeft + 30,
+	kTBPCloseTop = kNavAreaTop + 16,
 
-const CoordType kTBPRewindLeft = kNavAreaLeft + 86;
-const CoordType kTBPRewindTop = kNavAreaTop + 218;
+	kTBPRewindLeft = kNavAreaLeft + 86,
+	kTBPRewindTop = kNavAreaTop + 218,
 
-const CoordType kComparisonCloseLeft = kNavAreaLeft + 50;
-const CoordType kComparisonCloseTop = kNavAreaTop + 14;
+	kComparisonCloseLeft = kNavAreaLeft + 50,
+	kComparisonCloseTop = kNavAreaTop + 14,
 
-const CoordType kComparisonLeftRewindLeft = kNavAreaLeft + 96;
-const CoordType kComparisonLeftRewindTop = kNavAreaTop + 190;
+	kComparisonLeftRewindLeft = kNavAreaLeft + 96,
+	kComparisonLeftRewindTop = kNavAreaTop + 190,
 
-const CoordType kComparisonRightRewindLeft = kNavAreaLeft + 282;
-const CoordType kComparisonRightRewindTop = kNavAreaTop + 190;
+	kComparisonRightRewindLeft = kNavAreaLeft + 282,
+	kComparisonRightRewindTop = kNavAreaTop + 190,
 
-const CoordType kComparisonHiliteSpriteLeft = kNavAreaLeft + 45;
-const CoordType kComparisonHiliteSpriteTop = kNavAreaTop + 65;
+	kComparisonHiliteSpriteLeft = kNavAreaLeft + 45,
+	kComparisonHiliteSpriteTop = kNavAreaTop + 65,
 
-const CoordType kComparisonHiliteNoradLeft = kNavAreaLeft + 45;
-const CoordType kComparisonHiliteNoradTop = kNavAreaTop + 65;
+	kComparisonHiliteNoradLeft = kNavAreaLeft + 45,
+	kComparisonHiliteNoradTop = kNavAreaTop + 65,
 
-const CoordType kComparisonHiliteMarsLeft = kNavAreaLeft + 45 + 4;
-const CoordType kComparisonHiliteMarsTop = kNavAreaTop + 65 + 23;
+	kComparisonHiliteMarsLeft = kNavAreaLeft + 45 + 4,
+	kComparisonHiliteMarsTop = kNavAreaTop + 65 + 23,
 
-const CoordType kComparisonHiliteCaldoriaLeft = kNavAreaLeft + 45 + 7;
-const CoordType kComparisonHiliteCaldoriaTop = kNavAreaTop + 65 + 46;
+	kComparisonHiliteCaldoriaLeft = kNavAreaLeft + 45 + 7,
+	kComparisonHiliteCaldoriaTop = kNavAreaTop + 65 + 46,
 
-const CoordType kComparisonHiliteWSCLeft = kNavAreaLeft + 45 + 11;
-const CoordType kComparisonHiliteWSCTop = kNavAreaTop + 65 + 68;
+	kComparisonHiliteWSCLeft = kNavAreaLeft + 45 + 11,
+	kComparisonHiliteWSCTop = kNavAreaTop + 65 + 68,
 
-const CoordType kComparisonChancesSpriteLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesSpriteTop = kNavAreaTop + 162;
+	kComparisonChancesSpriteLeft = kNavAreaLeft + 148,
+	kComparisonChancesSpriteTop = kNavAreaTop + 162,
 
-const CoordType kComparisonChancesNoradLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesNoradTop = kNavAreaTop + 162;
+	kComparisonChancesNoradLeft = kNavAreaLeft + 148,
+	kComparisonChancesNoradTop = kNavAreaTop + 162,
 
-const CoordType kComparisonChancesMarsLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesMarsTop = kNavAreaTop + 162;
+	kComparisonChancesMarsLeft = kNavAreaLeft + 148,
+	kComparisonChancesMarsTop = kNavAreaTop + 162,
 
-const CoordType kComparisonChancesCaldoriaLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesCaldoriaTop = kNavAreaTop + 162 + 1;
+	kComparisonChancesCaldoriaLeft = kNavAreaLeft + 148,
+	kComparisonChancesCaldoriaTop = kNavAreaTop + 162 + 1,
 
-const CoordType kComparisonChancesWSCLeft = kNavAreaLeft + 148;
-const CoordType kComparisonChancesWSCTop = kNavAreaTop + 162;
+	kComparisonChancesWSCLeft = kNavAreaLeft + 148,
+	kComparisonChancesWSCTop = kNavAreaTop + 162,
 
-const CoordType kRedirectionSprite1Left = kNavAreaLeft + 58;
-const CoordType kRedirectionSprite1Top = kNavAreaTop + 16;
+	kRedirectionSprite1Left = kNavAreaLeft + 58,
+	kRedirectionSprite1Top = kNavAreaTop + 16,
 
-const CoordType kRedirectionSprite2Left = kNavAreaLeft + 36;
-const CoordType kRedirectionSprite2Top = kNavAreaTop + 166;
+	kRedirectionSprite2Left = kNavAreaLeft + 36,
+	kRedirectionSprite2Top = kNavAreaTop + 166,
 
-const CoordType kRedirectionCCRolloverLeft = kNavAreaLeft + 58;
-const CoordType kRedirectionCCRolloverTop = kNavAreaTop + 16;
+	kRedirectionCCRolloverLeft = kNavAreaLeft + 58,
+	kRedirectionCCRolloverTop = kNavAreaTop + 16,
 
-const CoordType kRedirectionRRRolloverLeft = kNavAreaLeft + 430;
-const CoordType kRedirectionRRRolloverTop = kNavAreaTop + 30;
+	kRedirectionRRRolloverLeft = kNavAreaLeft + 430,
+	kRedirectionRRRolloverTop = kNavAreaTop + 30,
 
-const CoordType kRedirectionFDRolloverLeft = kNavAreaLeft + 278;
-const CoordType kRedirectionFDRolloverTop = kNavAreaTop + 160;
+	kRedirectionFDRolloverLeft = kNavAreaLeft + 278,
+	kRedirectionFDRolloverTop = kNavAreaTop + 160,
 
-const CoordType kRedirectionCCDoorLeft = kNavAreaLeft + 174;
-const CoordType kRedirectionCCDoorTop = kNavAreaTop + 36;
+	kRedirectionCCDoorLeft = kNavAreaLeft + 174,
+	kRedirectionCCDoorTop = kNavAreaTop + 36,
 
-const CoordType kRedirectionRRDoorLeft = kNavAreaLeft + 418;
-const CoordType kRedirectionRRDoorTop = kNavAreaTop + 32;
+	kRedirectionRRDoorLeft = kNavAreaLeft + 418,
+	kRedirectionRRDoorTop = kNavAreaTop + 32,
 
-const CoordType kRedirectionFDDoorLeft = kNavAreaLeft + 298;
-const CoordType kRedirectionFDDoorTop = kNavAreaTop + 240;
+	kRedirectionFDDoorLeft = kNavAreaLeft + 298,
+	kRedirectionFDDoorTop = kNavAreaTop + 240,
 
-const CoordType kRedirectionSecuredLeft = kNavAreaLeft + 36;
-const CoordType kRedirectionSecuredTop = kNavAreaTop + 166;
+	kRedirectionSecuredLeft = kNavAreaLeft + 36,
+	kRedirectionSecuredTop = kNavAreaTop + 166,
 
-const CoordType kRedirectionNewTargetLeft = kNavAreaLeft + 36;
-const CoordType kRedirectionNewTargetTop = kNavAreaTop + 166;
+	kRedirectionNewTargetLeft = kNavAreaLeft + 36,
+	kRedirectionNewTargetTop = kNavAreaTop + 166,
 
-const CoordType kRedirectionCloseLeft = kNavAreaLeft + 56;
-const CoordType kRedirectionCloseTop = kNavAreaTop + 220;
+	kRedirectionCloseLeft = kNavAreaLeft + 56,
+	kRedirectionCloseTop = kNavAreaTop + 220
+};
 
 static const TimeValue kTSABumpIntoWallIn = 0;
 static const TimeValue kTSABumpIntoWallOut = 148;
@@ -516,10 +529,12 @@ static const TimeValue kTSAVaultCloseOut = 5388;
 static const TimeValue kTSAPegasusDoorCloseIn = 5388;
 static const TimeValue kTSAPegasusDoorCloseOut = 6457;
 
-static const bool kPegasusUnresolved = false;
-static const bool kPegasusResolved = true;
-static const bool kPegasusCantExit = false;
-static const bool kPegasusCanExit = true;
+enum {
+	kPegasusUnresolved = false,
+	kPegasusResolved = true,
+	kPegasusCantExit = false,
+	kPegasusCanExit = true
+};
 
 // Monitor modes
 enum {
@@ -582,15 +597,17 @@ static const ExtraID s_historicalLogViews[16] = {
 	kTSA0BComparisonView2222
 };
 
-static const int kRedirectionCCRolloverSprite = 0;
-static const int kRedirectionRRRolloverSprite = 1;
-static const int kRedirectionFDRolloverSprite = 2;
-static const int kRedirectionCCDoorSprite = 3;
-static const int kRedirectionRRDoorSprite = 4;
-static const int kRedirectionFDDoorSprite = 5;
-static const int kRedirectionCloseSprite = 6;
-static const int kRedirectionSecuredSprite = 0;
-static const int kRedirectionNewTargetSprite = 1;
+enum {
+	kRedirectionCCRolloverSprite = 0,
+	kRedirectionRRRolloverSprite = 1,
+	kRedirectionFDRolloverSprite = 2,
+	kRedirectionCCDoorSprite = 3,
+	kRedirectionRRDoorSprite = 4,
+	kRedirectionFDDoorSprite = 5,
+	kRedirectionCloseSprite = 6,
+	kRedirectionSecuredSprite = 0,
+	kRedirectionNewTargetSprite = 1
+};
 
 void RipTimer::initImage() {
 	_middle = -1;
diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
index c808325b0f..0c29e06f41 100644
--- a/engines/pegasus/neighborhood/tsa/tinytsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
@@ -38,71 +38,81 @@ namespace Pegasus {
 
 static const int16 kCompassShift = 30;
 
-static const TimeScale kTinyTSAMovieScale = 600;
-static const TimeScale kTinyTSAFramesPerSecond = 15;
-static const TimeScale kTinyTSAFrameDuration = 40;
+enum {
+	kTinyTSAMovieScale = 600,
+	kTinyTSAFramesPerSecond = 15,
+	kTinyTSAFrameDuration = 40
+};
 
 // Alternate IDs.
-static const AlternateID kAltTinyTSANormal = 0;
+enum {
+	kAltTinyTSANormal = 0
+};
 
 // Hot Spot Activation IDs.
-static const HotSpotActivationID kActivationTinyTSAJumpToNorad = 1;
-static const HotSpotActivationID kActivationTinyTSAJumpToMars = 2;
-static const HotSpotActivationID kActivationTinyTSAJumpToWSC = 3;
-static const HotSpotActivationID kActivationTinyTSAReadyForJumpMenu = 4;
-static const HotSpotActivationID kActivationTinyTSAMainJumpMenu = 5;
+enum {
+	kActivationTinyTSAJumpToNorad = 1,
+	kActivationTinyTSAJumpToMars = 2,
+	kActivationTinyTSAJumpToWSC = 3,
+	kActivationTinyTSAReadyForJumpMenu = 4,
+	kActivationTinyTSAMainJumpMenu = 5
+};
 
 // Hot Spot IDs.
-static const HotSpotID kTinyTSA37NorthJumpToNoradSpotID = 5000;
-static const HotSpotID kTinyTSA37NorthCancelNoradSpotID = 5001;
-static const HotSpotID kTinyTSA37NorthJumpToMarsSpotID = 5002;
-static const HotSpotID kTinyTSA37NorthCancelMarsSpotID = 5003;
-static const HotSpotID kTinyTSA37NorthJumpToWSCSpotID = 5004;
-static const HotSpotID kTinyTSA37NorthCancelWSCSpotID = 5005;
-static const HotSpotID kTinyTSA37NorthJumpMenuSpotID = 5006;
-static const HotSpotID kTinyTSA37NorthNoradMenuSpotID = 5007;
-static const HotSpotID kTinyTSA37NorthMarsMenuSpotID = 5008;
-static const HotSpotID kTinyTSA37NorthWSCMenuSpotID = 5009;
+enum {
+	kTinyTSA37NorthJumpToNoradSpotID = 5000,
+	kTinyTSA37NorthCancelNoradSpotID = 5001,
+	kTinyTSA37NorthJumpToMarsSpotID = 5002,
+	kTinyTSA37NorthCancelMarsSpotID = 5003,
+	kTinyTSA37NorthJumpToWSCSpotID = 5004,
+	kTinyTSA37NorthCancelWSCSpotID = 5005,
+	kTinyTSA37NorthJumpMenuSpotID = 5006,
+	kTinyTSA37NorthNoradMenuSpotID = 5007,
+	kTinyTSA37NorthMarsMenuSpotID = 5008,
+	kTinyTSA37NorthWSCMenuSpotID = 5009
+};
 
 // Extra sequence IDs.
-static const ExtraID kTinyTSA37PegasusDepart = 0;
-static const ExtraID kTinyTSA37TimeJumpToPegasus = 1;
-static const ExtraID kTinyTSA37RecallToDownload = 2;
-static const ExtraID kTinyTSA37ExitHilited = 3;
-static const ExtraID kTinyTSA37ExitToHorse = 4;
-static const ExtraID kTinyTSA37JumpMenu000 = 5;
-static const ExtraID kTinyTSA37JumpMenu001 = 6;
-static const ExtraID kTinyTSA37JumpMenu010 = 7;
-static const ExtraID kTinyTSA37JumpMenu011 = 8;
-static const ExtraID kTinyTSA37JumpMenu100 = 9;
-static const ExtraID kTinyTSA37JumpMenu101 = 10;
-static const ExtraID kTinyTSA37JumpMenu110 = 11;
-static const ExtraID kTinyTSA37JumpMenu111 = 12;
-static const ExtraID kTinyTSA37JumpToWSCMenu = 13;
-static const ExtraID kTinyTSA37CancelWSC = 14;
-static const ExtraID kTinyTSA37JumpToWSC = 15;
-static const ExtraID kTinyTSA37WSCToAI5 = 16;
-static const ExtraID kTinyTSA37PegasusAI5 = 17;
-static const ExtraID kTinyTSA37AI5ToWSC = 18;
-static const ExtraID kTinyTSA37WSCToDepart = 19;
-static const ExtraID kTinyTSA37JumpToMarsMenu = 20;
-static const ExtraID kTinyTSA37CancelMars = 21;
-static const ExtraID kTinyTSA37JumpToMars = 22;
-static const ExtraID kTinyTSA37MarsToAI6 = 23;
-static const ExtraID kTinyTSA37PegasusAI6 = 24;
-static const ExtraID kTinyTSA37AI6ToMars = 25;
-static const ExtraID kTinyTSA37MarsToDepart = 26;
-static const ExtraID kTinyTSA37JumpToNoradMenu = 27;
-static const ExtraID kTinyTSA37CancelNorad = 28;
-static const ExtraID kTinyTSA37JumpToNorad = 29;
-static const ExtraID kTinyTSA37NoradToAI7 = 30;
-static const ExtraID kTinyTSA37PegasusAI7 = 31;
-static const ExtraID kTinyTSA37AI7ToNorad = 32;
-static const ExtraID kTinyTSA37NoradToDepart = 33;
-static const ExtraID kTinyTSA37EnvironmentalScan = 34;
-static const ExtraID kTinyTSA37DownloadToMainMenu = 35;
-static const ExtraID kTinyTSA37DownloadToOpMemReview = 36;
-static const ExtraID kTinyTSA37OpMemReviewToMainMenu = 37;
+enum {
+	kTinyTSA37PegasusDepart = 0,
+	kTinyTSA37TimeJumpToPegasus = 1,
+	kTinyTSA37RecallToDownload = 2,
+	kTinyTSA37ExitHilited = 3,
+	kTinyTSA37ExitToHorse = 4,
+	kTinyTSA37JumpMenu000 = 5,
+	kTinyTSA37JumpMenu001 = 6,
+	kTinyTSA37JumpMenu010 = 7,
+	kTinyTSA37JumpMenu011 = 8,
+	kTinyTSA37JumpMenu100 = 9,
+	kTinyTSA37JumpMenu101 = 10,
+	kTinyTSA37JumpMenu110 = 11,
+	kTinyTSA37JumpMenu111 = 12,
+	kTinyTSA37JumpToWSCMenu = 13,
+	kTinyTSA37CancelWSC = 14,
+	kTinyTSA37JumpToWSC = 15,
+	kTinyTSA37WSCToAI5 = 16,
+	kTinyTSA37PegasusAI5 = 17,
+	kTinyTSA37AI5ToWSC = 18,
+	kTinyTSA37WSCToDepart = 19,
+	kTinyTSA37JumpToMarsMenu = 20,
+	kTinyTSA37CancelMars = 21,
+	kTinyTSA37JumpToMars = 22,
+	kTinyTSA37MarsToAI6 = 23,
+	kTinyTSA37PegasusAI6 = 24,
+	kTinyTSA37AI6ToMars = 25,
+	kTinyTSA37MarsToDepart = 26,
+	kTinyTSA37JumpToNoradMenu = 27,
+	kTinyTSA37CancelNorad = 28,
+	kTinyTSA37JumpToNorad = 29,
+	kTinyTSA37NoradToAI7 = 30,
+	kTinyTSA37PegasusAI7 = 31,
+	kTinyTSA37AI7ToNorad = 32,
+	kTinyTSA37NoradToDepart = 33,
+	kTinyTSA37EnvironmentalScan = 34,
+	kTinyTSA37DownloadToMainMenu = 35,
+	kTinyTSA37DownloadToOpMemReview = 36,
+	kTinyTSA37OpMemReviewToMainMenu = 37
+};
 
 TinyTSA::TinyTSA(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHandler, owner, "Tiny TSA", kTinyTSAID) {
 }