STARTREK: Load the text of the TRIAL missions from RDF files

6 files changed, 379 insertions, 393 deletions

diff --git a/engines/startrek/rooms/trial0.cpp b/engines/startrek/rooms/trial0.cpp
index f4aba4d304..1a4a778445 100644
--- a/engines/startrek/rooms/trial0.cpp
+++ b/engines/startrek/rooms/trial0.cpp
@@ -93,7 +93,7 @@ void Room::trial0Tick1() {
 }
 
 void Room::trial0Tick40() {
-	showText(TX_SPEAKER_VLICT, TX_TRI0_058);
+	showText(TX_SPEAKER_VLICT, 58, true);
 }
 
 void Room::trial0Timer0Expired() { // Doesn't do anything?
@@ -110,79 +110,79 @@ void Room::trial0ReachedRoomCenter() {
 	bool gaveUp = false;
 
 	_awayMission->disableInput = false;
-	showText(TX_SPEAKER_VLICT, TX_TRI0_053);
+	showText(TX_SPEAKER_VLICT, 53, true);
 
 	const TextRef choices1[] = {
 		TX_SPEAKER_KIRK,
-		TX_TRI0_019, TX_TRI0_016, TX_TRI0_021,
+		19, 16, 21,
 		TX_BLANK
 	};
-	showMultipleTexts(choices1);
+	showMultipleTexts(choices1, true);
 
-	showText(TX_SPEAKER_VLICT, TX_TRI0_054);
-	showText(TX_SPEAKER_KIRK,  TX_TRI0_004);
-	showText(TX_SPEAKER_VLICT, TX_TRI0_047);
+	showText(TX_SPEAKER_VLICT, 54, true);
+	showText(TX_SPEAKER_KIRK,   4, true);
+	showText(TX_SPEAKER_VLICT, 47, true);
 
 	const TextRef choices2[] = {
 		TX_SPEAKER_KIRK,
-		TX_TRI0_011, TX_TRI0_018, TX_TRI0_015,
+		11, 18, 15,
 		TX_BLANK
 	};
-	int choice = showMultipleTexts(choices2);
+	int choice = showMultipleTexts(choices2, true);
 
 	if (choice == 0) { // Kirk intervenes as a warrior
-		showText(TX_SPEAKER_VLICT, TX_TRI0_043);
-		showText(TX_SPEAKER_KIRK,  TX_TRI0_002);
-		showText(TX_SPEAKER_VLICT, TX_TRI0_056);
-		showText(TX_SPEAKER_VLICT, TX_TRI0_061);
-		showText(TX_SPEAKER_KIRK,  TX_TRI0_001);
-		showText(TX_SPEAKER_VLICT, TX_TRI0_060);
+		showText(TX_SPEAKER_VLICT, 43, true);
+		showText(TX_SPEAKER_KIRK,   2, true);
+		showText(TX_SPEAKER_VLICT, 56, true);
+		showText(TX_SPEAKER_VLICT, 61, true);
+		showText(TX_SPEAKER_KIRK,   1, true);
+		showText(TX_SPEAKER_VLICT, 60, true);
 		_awayMission->disableInput = true;
 		loadRoomIndex(1, 4);
 	} else if (choice == 1) { // "This trial is a mockery"
-		showText(TX_SPEAKER_VLICT,        TX_TRI0_048);
-		showText(TX_SPEAKER_QUETZECOATL,  TX_TRI0_041);
-		showText(TX_SPEAKER_VLICT,        TX_TRI0_050);
-		showText(TX_SPEAKER_QUETZECOATL,  TX_TRI0_039);
-		showText(TX_SPEAKER_VLICT,        TX_TRI0_059);
-		showText(TX_SPEAKER_QUETZECOATL,  TX_TRI0_040);
-		showText(TX_SPEAKER_VLICT,        TX_TRI0_046);
+		showText(TX_SPEAKER_VLICT,        48, true);
+		showText(TX_SPEAKER_QUETZECOATL,  41, true);
+		showText(TX_SPEAKER_VLICT,        50, true);
+		showText(TX_SPEAKER_QUETZECOATL,  39, true);
+		showText(TX_SPEAKER_VLICT,        59, true);
+		showText(TX_SPEAKER_QUETZECOATL,  40, true);
+		showText(TX_SPEAKER_VLICT,        46, true);
 
 		const TextRef choices3[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI0_023, TX_TRI0_006, TX_TRI0_010,
+			23, 6, 10,
 			TX_BLANK
 		};
-		choice = showMultipleTexts(choices3);
+		choice = showMultipleTexts(choices3, true);
 
 		if (choice == 0 || choice == 1) {
-			showText(TX_SPEAKER_VLICT, TX_TRI0_052);
+			showText(TX_SPEAKER_VLICT, 52, true);
 
 			const TextRef choices4[] = {
 				TX_SPEAKER_KIRK,
-				TX_TRI0_017, TX_TRI0_020, TX_TRI0_008,
+				17, 20, 8,
 				TX_BLANK
 			};
-			choice = showMultipleTexts(choices4);
+			choice = showMultipleTexts(choices4, true);
 
 			if (choice == 0 || choice == 1) {
-				showText(TX_SPEAKER_VLICT, TX_TRI0_057);
-				showText(TX_SPEAKER_KIRK,  TX_TRI0_003);
-				showText(TX_SPEAKER_VLICT, TX_TRI0_051);
+				showText(TX_SPEAKER_VLICT, 57, true);
+				showText(TX_SPEAKER_KIRK,   3, true);
+				showText(TX_SPEAKER_VLICT, 51, true);
 
 				const TextRef choices5[] = {
 					TX_SPEAKER_KIRK,
-					TX_TRI0_009, TX_TRI0_014, TX_TRI0_013,
+					9, 14, 13,
 					TX_BLANK
 				};
-				choice = showMultipleTexts(choices5);
+				choice = showMultipleTexts(choices5, true);
 
 				if (choice == 0 || choice == 1) {
-					showText(TX_SPEAKER_VLICT, TX_TRI0_055);
+					showText(TX_SPEAKER_VLICT, 55, true);
 					_awayMission->disableInput = true;
 					loadRoomIndex(1, 4);
 				} else { // choice == 2
-					showText(TX_SPEAKER_VLICT, TX_TRI0_045);
+					showText(TX_SPEAKER_VLICT, 45, true);
 					_awayMission->disableInput = true;
 					loadRoomIndex(1, 4);
 				}
@@ -195,8 +195,8 @@ void Room::trial0ReachedRoomCenter() {
 
 	if (gaveUp) {
 		playMidiMusicTracks(2, -1);
-		showText(TX_SPEAKER_VLICT, TX_TRI0_049);
-		showText(TX_SPEAKER_VLICT, TX_TRI0_044);
+		showText(TX_SPEAKER_VLICT, 49, true);
+		showText(TX_SPEAKER_VLICT, 44, true);
 		_awayMission->trial.missionEndMethod = 0;
 
 		// FIXME: Are these parameters in the right order?
@@ -205,77 +205,77 @@ void Room::trial0ReachedRoomCenter() {
 }
 
 void Room::trial0LookAtWindow() {
-	showDescription(TX_TRI0N007);
+	showDescription(7, true);
 }
 
 void Room::trial0LookAtVlict() {
-	showDescription(TX_TRI0N001);
+	showDescription(1, true);
 }
 
 void Room::trial0LookAtGuard() {
-	showDescription(TX_TRI0N000);
+	showDescription(0, true);
 }
 
 void Room::trial0LookAtBench() {
-	showDescription(TX_TRI0N006);
+	showDescription(6, true);
 }
 
 void Room::trial0LookAtSeal() {
-	showDescription(TX_TRI0N008);
+	showDescription(8, true);
 }
 
 void Room::trial0LookAtKirk() {
-	showDescription(TX_TRI0N004);
+	showDescription(4, true);
 }
 
 void Room::trial0LookAtSpock() {
-	showDescription(TX_TRI0N005);
+	showDescription(5, true);
 }
 
 void Room::trial0LookAtMccoy() {
-	showDescription(TX_TRI0N002);
+	showDescription(2, true);
 }
 
 void Room::trial0LookAtRedshirt() {
-	showDescription(TX_TRI0N003);
+	showDescription(3, true);
 }
 
 void Room::trial0LookAtQuetzecoatl() {
-	showDescription(TX_TRI0N009);
+	showDescription(9, true);
 }
 
 void Room::trial0TalkToVlict() {
-	showText(TX_SPEAKER_VLICT, TX_TRI0_062);
+	showText(TX_SPEAKER_VLICT, 62, true);
 }
 
 void Room::trial0TalkToGuard() {
 	showText(TX_SPEAKER_KLINGON_GUARD, TX_TRI0_F24);
-	showText(TX_SPEAKER_BENNIE, TX_TRI0_065);
-	showText(TX_SPEAKER_KIRK,   TX_TRI0_007);
-	showText(TX_SPEAKER_BENNIE, TX_TRI0_064);
-	showText(TX_SPEAKER_KIRK,   TX_TRI0_022);
-	showText(TX_SPEAKER_BENNIE, TX_TRI0_066);
+	showText(TX_SPEAKER_BENNIE, 65, true);
+	showText(TX_SPEAKER_KIRK,    7, true);
+	showText(TX_SPEAKER_BENNIE, 64, true);
+	showText(TX_SPEAKER_KIRK,   22, true);
+	showText(TX_SPEAKER_BENNIE, 66, true);
 }
 
 void Room::trial0TalkToQuetzecoatl() {
-	showText(TX_SPEAKER_QUETZECOATL, TX_TRI0_042);
+	showText(TX_SPEAKER_QUETZECOATL, 42, true);
 }
 
 void Room::trial0TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI0_031);
+	showText(TX_SPEAKER_MCCOY, 31, true);
 }
 
 void Room::trial0TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI0_025);
+	showText(TX_SPEAKER_SPOCK, 25, true);
 }
 
 void Room::trial0TalkToRedshirt() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI0_063);
+	showText(TX_SPEAKER_BENNIE, 63, true);
 }
 
 void Room::trial0UsePhaserOrRock() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI0_026);
-	showText(TX_SPEAKER_MCCOY, TX_TRI0_036);
+	showText(TX_SPEAKER_SPOCK, 26, true);
+	showText(TX_SPEAKER_MCCOY, 36, true);
 }
 
 void Room::trial0UseSnakeOnVlict() {
@@ -289,44 +289,44 @@ void Room::trial0UseSnakeOnGuard() {
 }
 
 void Room::trial0UseMTricorderOnQuetzecoatl() {
-	mccoyScan(DIR_S, TX_TRI0_029, true);
+	mccoyScan(DIR_S, 29, false, true);
 }
 
 void Room::trial0UseMTricorderOnVlict() {
-	mccoyScan(DIR_S, TX_TRI0_030, true);
+	mccoyScan(DIR_S, 30, false, true);
 }
 
 void Room::trial0UseMTricorderAnywhere() {
-	mccoyScan(DIR_S, TX_TRI0_035, true);
+	mccoyScan(DIR_S, 35, false, true);
 }
 
 void Room::trial0UseSTricorderOnWindow() {
-	spockScan(DIR_S, TX_TRI0_037, true);
+	spockScan(DIR_S, 37, false, true);
 }
 
 void Room::trial0UseSTricorderAnywhere() {
 	// ENHANCEMENT: Originally didn't play tricorder sound, etc
-	spockScan(DIR_S, TX_TRI0_038, true);
+	spockScan(DIR_S, 38, false, true);
 }
 
 void Room::trial0UseCommunicator() {
-	showText(TX_SPEAKER_UHURA, TX_TRI0U075);
+	showText(TX_SPEAKER_UHURA, 75, true);
 }
 
 void Room::trial0UseCrewmanOnKlingon() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI0_024);
+	showText(TX_SPEAKER_SPOCK, 24, true);
 }
 
 void Room::trial0UseMccoyOnVlict() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI0_027);
+	showText(TX_SPEAKER_MCCOY, 27, true);
 }
 
 void Room::trial0UseMccoyOnGuard() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI0_028);
+	showText(TX_SPEAKER_MCCOY, 28, true);
 }
 
 void Room::trial0UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI0_034);
+	showText(TX_SPEAKER_MCCOY, 34, true);
 }
 
 }
diff --git a/engines/startrek/rooms/trial1.cpp b/engines/startrek/rooms/trial1.cpp
index b1bdf0a725..9163c1578b 100644
--- a/engines/startrek/rooms/trial1.cpp
+++ b/engines/startrek/rooms/trial1.cpp
@@ -184,13 +184,13 @@ void Room::trial1Tick50() {
 	if (!_awayMission->trial.doorOpen)
 		_awayMission->disableInput = false;
 	if (!_awayMission->trial.entityDefeated) {
-		showText(TX_SPEAKER_BENNIE, TX_TRI1_056);
-		showText(TX_SPEAKER_SPOCK,  TX_TRI1_047);
-		showText(TX_SPEAKER_MCCOY,  TX_TRI1_032);
-		showText(TX_SPEAKER_KIRK,   TX_TRI1_007);
-		showText(TX_SPEAKER_BENNIE, TX_TRI1_057);
-		showText(TX_SPEAKER_KIRK,   TX_TRI1_010);
-		showText(TX_SPEAKER_BENNIE, TX_TRI1_055);
+		showText(TX_SPEAKER_BENNIE, 56, true);
+		showText(TX_SPEAKER_SPOCK,  47, true);
+		showText(TX_SPEAKER_MCCOY,  32, true);
+		showText(TX_SPEAKER_KIRK,   7, true);
+		showText(TX_SPEAKER_BENNIE, 57, true);
+		showText(TX_SPEAKER_KIRK,   10, true);
+		showText(TX_SPEAKER_BENNIE, 55, true);
 	}
 }
 
@@ -238,47 +238,47 @@ void Room::trial1PickedUpRod() {
 }
 
 void Room::trial1LookAtKirk() {
-	showDescription(TX_TRI1N003);
+	showDescription(3, true);
 }
 
 void Room::trial1LookAtSpock() {
-	showDescription(TX_TRI1N017);
+	showDescription(17, true);
 }
 
 void Room::trial1LookAtMccoy() {
-	showDescription(TX_TRI1N016);
+	showDescription(16, true);
 }
 
 void Room::trial1LookAtRedshirt() {
-	showDescription(TX_TRI1N015);
+	showDescription(15, true);
 }
 
 void Room::trial1LookAtWall() {
-	showDescription(TX_TRI1N011);
+	showDescription(11, true);
 }
 
 void Room::trial1LookAtFloor() {
-	showDescription(TX_TRI1N006);
+	showDescription(6, true);
 }
 
 void Room::trial1LookAtRods() {
-	showDescription(TX_TRI1N009);
+	showDescription(9, true);
 }
 
 void Room::trial1LookAtDoor() {
-	showDescription(TX_TRI1N001);
+	showDescription(1, true);
 }
 
 void Room::trial1LookAtLock() {
-	showDescription(TX_TRI1N002);
+	showDescription(2, true);
 }
 
 void Room::trial1LookAtEntity() {
-	showDescription(TX_TRI1N000);
+	showDescription(0, true);
 }
 
 void Room::trial1LookAtMoltenRock() {
-	showDescription(TX_TRI1N007);
+	showDescription(7, true);
 }
 
 void Room::trial1TalkToKirk() {
@@ -286,16 +286,16 @@ void Room::trial1TalkToKirk() {
 }
 
 void Room::trial1TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI1_046);
-	showText(TX_SPEAKER_MCCOY, TX_TRI1_034);
+	showText(TX_SPEAKER_SPOCK, 46, true);
+	showText(TX_SPEAKER_MCCOY, 34, true);
 }
 
 void Room::trial1TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI1_019);
+	showText(TX_SPEAKER_MCCOY, 19, true);
 }
 
 void Room::trial1TalkToRedshirt() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI1_053);
+	showText(TX_SPEAKER_BENNIE, 53, true);
 }
 
 void Room::trial1TalkToEntity() {
@@ -303,15 +303,15 @@ void Room::trial1TalkToEntity() {
 }
 
 void Room::trial1UsePhaserOnCrewman() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI1_048);
+	showText(TX_SPEAKER_BENNIE, 48, true);
 }
 
 void Room::trial1UsePhaserOnEntity() {
-	showDescription(TX_TRI1N004);
+	showDescription(4, true);
 }
 
 void Room::trial1UsePhaserOnWall() {
-	showDescription(TX_TRI1N008);
+	showDescription(8, true);
 }
 
 
@@ -345,7 +345,7 @@ void Room::trial1ReachedFloorToUseKillPhaser() {
 }
 
 void Room::trial1DoneShootingFloorWithKillPhaser() {
-	showDescription(TX_TRI1N014);
+	showDescription(14, true);
 	loadActorAnim2(OBJECT_MOLTEN_ROCK, "t1mltd", 0xca, 0xbc);
 
 	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E;
@@ -357,66 +357,66 @@ void Room::trial1DoneShootingFloorWithKillPhaser() {
 }
 
 void Room::trial1UsePhaserOnRod() {
-	showDescription(TX_TRI1N012);
+	showDescription(12, true);
 }
 
 void Room::trial1UsePhaserOnDoor() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI1_040);
+	showText(TX_SPEAKER_SPOCK, 40, true);
 }
 
 void Room::trial1UsePhaserOnLock() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI1_021);
+	showText(TX_SPEAKER_MCCOY, 21, true);
 }
 
 void Room::trial1UseMTricorderOnKirk() {
-	mccoyScan(DIR_S, TX_TRI1_024, true);
+	mccoyScan(DIR_S, 24, false, true);
 }
 
 void Room::trial1UseMTricorderOnSpock() {
 	// ENHANCEMENT: Original didn't play tricorder sound, etc
-	mccoyScan(DIR_S, TX_TRI1_025, true);
+	mccoyScan(DIR_S, 25, false, true);
 }
 
 void Room::trial1UseMTricorderOnMccoy() {
-	mccoyScan(DIR_S, TX_TRI1_022, true);
+	mccoyScan(DIR_S, 22, false, true);
 }
 
 void Room::trial1UseMTricorderOnRedshirt() {
-	mccoyScan(DIR_S, TX_TRI1_023, true);
+	mccoyScan(DIR_S, 23, false, true);
 }
 
 void Room::trial1UseMTricorderOnEntity() {
-	mccoyScan(DIR_S, TX_TRI1_017, true);
+	mccoyScan(DIR_S, 17, false, true);
 }
 
 void Room::trial1UseSTricorderOnWall() {
-	spockScan(DIR_S, TX_TRI1_043, true);
+	spockScan(DIR_S, 43, false, true);
 }
 
 void Room::trial1UseSTricorderOnEntity() {
-	spockScan(DIR_S, TX_TRI1_012, true);
+	spockScan(DIR_S, 12, false, true);
 
 	// BUG: infinite score mechanism
 	_awayMission->trial.missionScore += 1;
 }
 
 void Room::trial1UseSTricorderOnRods() {
-	spockScan(DIR_S, TX_TRI1_041, true);
+	spockScan(DIR_S, 41, false, true);
 }
 
 void Room::trial1UseSTricorderOnFloor() {
-	spockScan(DIR_S, TX_TRI1_042, true);
+	spockScan(DIR_S, 42, false, true);
 
 	// BUG: infinite score mechanism
 	_awayMission->trial.missionScore += 1;
 }
 
 void Room::trial1UseSTricorderOnDoor() {
-	spockScan(DIR_S, TX_TRI1_013, true);
+	spockScan(DIR_S, 13, false, true);
 }
 
 void Room::trial1UseSTricorderOnLock() {
-	spockScan(DIR_S, TX_TRI1_014, true);
+	spockScan(DIR_S, 14, false, true);
 
 	if (!_awayMission->trial.scannedLock) {
 		_awayMission->trial.scannedLock = true;
@@ -427,64 +427,64 @@ void Room::trial1UseSTricorderOnLock() {
 
 void Room::trial1UseCommunicator() {
 	if (_awayMission->trial.forceFieldDown) {
-		showText(TX_SPEAKER_UHURA, TX_TRI1U090);
+		showText(TX_SPEAKER_UHURA, 90, true);
 
 		const TextRef choices[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI1_005, TX_TRI1_004, TX_TRI1_009,
+			5, 4, 9,
 			TX_BLANK
 		};
-		int choice = showMultipleTexts(choices);
+		int choice = showMultipleTexts(choices, true);
 
 		if (choice == 0) { // "Beam us back to the enterprise"
 			_awayMission->trial.missionEndMethod = 1;
 			endMission(1, 1, 1);
 		} else if (choice == 1) { // "Beam us to Vlict's position"
-			showText(TX_SPEAKER_UHURA, TX_TRI1U080);
+			showText(TX_SPEAKER_UHURA, 80, true);
 			_awayMission->disableInput = true;
 			loadRoomIndex(4, 4);
 		} // Else don't transport anywhere
 	} else { // Force field still up
 		if (_awayMission->trial.uhuraAnalyzedCode)
-			showText(TX_SPEAKER_UHURA, TX_TRI1U068);
+			showText(TX_SPEAKER_UHURA, 68, true);
 		else {
-			showText(TX_SPEAKER_UHURA, TX_TRI1U086);
-			showText(TX_SPEAKER_UHURA, TX_TRI1U106);
-			showText(TX_SPEAKER_UHURA, TX_TRI1U098);
+			showText(TX_SPEAKER_UHURA, 86, true);
+			showText(TX_SPEAKER_UHURA, 106, true);
+			showText(TX_SPEAKER_UHURA, 98, true);
 
 			if (_awayMission->trial.scannedLock) {
-				showText(TX_SPEAKER_KIRK,  TX_TRI1_011);
-				showText(TX_SPEAKER_UHURA, TX_TRI1U101);
+				showText(TX_SPEAKER_KIRK,  11, true);
+				showText(TX_SPEAKER_UHURA, 101, true);
 
 				const TextRef choices[] = {
 					TX_SPEAKER_KIRK,
-					TX_TRI1_006, TX_TRI1_002,
+					6, 2,
 					TX_BLANK
 				};
-				int choice = showMultipleTexts(choices);
+				int choice = showMultipleTexts(choices, true);
 
 				if (choice == 0) { // Don't analyze the anomolous program
-					showText(TX_SPEAKER_UHURA, TX_TRI1U079);
+					showText(TX_SPEAKER_UHURA, 79, true);
 					_awayMission->trial.doorCodeBehaviour = 2;
 					_awayMission->trial.uhuraAnalyzedCode = true;
 					_awayMission->trial.missionScore += 1;
 				} else { // Analyze the anomolous program
-					showText(TX_SPEAKER_UHURA, TX_TRI1U102);
+					showText(TX_SPEAKER_UHURA, 102, true);
 
 					const TextRef choices2[] = {
 						TX_SPEAKER_KIRK,
-						TX_TRI1_003, TX_TRI1_008,
+						3, 8,
 						TX_BLANK
 					};
-					choice = showMultipleTexts(choices2);
+					choice = showMultipleTexts(choices2, true);
 
 					if (choice == 0) { // Activate the program
-						showText(TX_SPEAKER_UHURA, TX_TRI1U095);
+						showText(TX_SPEAKER_UHURA, 95, true);
 						_awayMission->trial.doorCodeBehaviour = 5;
 						_awayMission->trial.uhuraAnalyzedCode = true;
 						_awayMission->trial.missionScore += 3;
 					} else { // Don't activate, only open the door
-						showText(TX_SPEAKER_UHURA, TX_TRI1U079);
+						showText(TX_SPEAKER_UHURA, 79, true);
 						_awayMission->trial.doorCodeBehaviour = 2;
 						_awayMission->trial.uhuraAnalyzedCode = true;
 						_awayMission->trial.missionScore += 1;
@@ -496,34 +496,34 @@ void Room::trial1UseCommunicator() {
 }
 
 void Room::trial1UseMccoyOnEntity() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI1_016);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::trial1UseMccoyOnLock() {
 	if (!_awayMission->trial.entityDefeated)
-		showText(TX_SPEAKER_MCCOY, TX_TRI1_018);
+		showText(TX_SPEAKER_MCCOY, 18, true);
 	else if (_awayMission->trial.doorCodeBehaviour == 0)
-		showText(TX_SPEAKER_MCCOY, TX_TRI1_020);
+		showText(TX_SPEAKER_MCCOY, 20, true);
 	else
-		showText(TX_SPEAKER_MCCOY, TX_TRI1_029);
+		showText(TX_SPEAKER_MCCOY, 29, true);
 }
 
 void Room::trial1UseMccoyOnFloor() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI1_031);
+	showText(TX_SPEAKER_MCCOY, 31, true);
 }
 
 void Room::trial1UseSpockOnEntity() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI1_039);
+	showText(TX_SPEAKER_SPOCK, 39, true);
 }
 
 
 void Room::trial1UseSpockOnLock() {
 	if (_awayMission->trial.doorOpen)
-		showText(TX_SPEAKER_SPOCK, TX_TRI1_038);
+		showText(TX_SPEAKER_SPOCK, 38, true);
 	else if (!_awayMission->trial.entityDefeated)
-		showText(TX_SPEAKER_SPOCK, TX_TRI1_036);
+		showText(TX_SPEAKER_SPOCK, 36, true);
 	else if (_awayMission->trial.doorCodeBehaviour == 0)
-		showText(TX_SPEAKER_SPOCK, TX_TRI1_044);
+		showText(TX_SPEAKER_SPOCK, 44, true);
 	else if (_awayMission->trial.doorCodeBehaviour == 2)
 		walkCrewmanC(OBJECT_SPOCK, 0x1f, 0xb8, &Room::trial1SpockReachedKeypad);
 	else
@@ -558,11 +558,11 @@ void Room::trial1SpockUsedKeypadWithExtraProgram() {
 
 
 void Room::trial1UseSpockOnFloor() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI1_035);
+	showText(TX_SPEAKER_SPOCK, 35, true);
 }
 
 void Room::trial1UseRedshirtOnEntity() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI1_050);
+	showText(TX_SPEAKER_BENNIE, 50, true);
 }
 
 
@@ -570,9 +570,9 @@ void Room::trial1UseRedshirtOnLock() {
 	if (_awayMission->trial.doorOpen)
 		return;
 	else if (!_awayMission->trial.entityDefeated)
-		showText(TX_SPEAKER_BENNIE, TX_TRI1_051);
+		showText(TX_SPEAKER_BENNIE, 51, true);
 	else if (_awayMission->trial.doorCodeBehaviour == 0)
-		showText(TX_SPEAKER_BENNIE, TX_TRI1_054);
+		showText(TX_SPEAKER_BENNIE, 54, true);
 	else if (_awayMission->trial.doorCodeBehaviour == 2)
 		walkCrewmanC(OBJECT_REDSHIRT, 0x1f, 0xb8, &Room::trial1RedshirtReachedKeypad);
 	else
@@ -607,21 +607,21 @@ void Room::trial1RedshirtUsedKeypadWithExtraProgram() {
 
 
 void Room::trial1UseRedshirtOnFloor() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI1_049);
+	showText(TX_SPEAKER_BENNIE, 49, true);
 }
 
 void Room::trial1UseRodOnMccoy() {
 	// ENHANCEMENT: This was originally only voiced with the wooden rod, not the iron rod.
 	// (This applies to the Spock and Redshirt functions below, too.)
-	showText(TX_SPEAKER_MCCOY, TX_TRI1_027);
+	showText(TX_SPEAKER_MCCOY, 27, true);
 }
 
 void Room::trial1UseRodOnSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI1_037);
+	showText(TX_SPEAKER_SPOCK, 37, true);
 }
 
 void Room::trial1UseRodOnRedshirt() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI1_052);
+	showText(TX_SPEAKER_BENNIE, 52, true);
 }
 
 void Room::trial1UseRodOnFloorOrWall() {
@@ -645,7 +645,7 @@ void Room::trial1DoneThrowingWoodRod() {
 
 
 void Room::trial1UseWoodRodOnLock() {
-	showDescription(TX_TRI1N005);
+	showDescription(5, true);
 }
 
 
@@ -660,7 +660,7 @@ void Room::trial1ReachedMoltenRock() {
 
 void Room::trial1DoneCoatingWoodRod() {
 	_awayMission->disableInput = false;
-	showDescription(TX_TRI1N013);
+	showDescription(13, true);
 	loseItem(OBJECT_IWROD);
 	giveItem(OBJECT_IIROD);
 
@@ -691,19 +691,19 @@ void Room::trial1DoneThrowingIronRod() {
 
 	_awayMission->disableInput = false;
 	stopAllVocSounds();
-	showText(TX_SPEAKER_SPOCK, TX_TRI1_045);
-	showText(TX_SPEAKER_MCCOY, TX_TRI1_033);
+	showText(TX_SPEAKER_SPOCK, 45, true);
+	showText(TX_SPEAKER_MCCOY, 33, true);
 
 	_awayMission->trial.missionScore += 1;
 }
 
 
 void Room::trial1UseIronRodOnLock() {
-	showDescription(TX_TRI1N004);
+	showDescription(4, true);
 }
 
 void Room::trial1GetThrownIronRod() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI1_015);
+	showText(TX_SPEAKER_SPOCK, 15, true);
 }
 
 void Room::trial1WalkToDoor() {
@@ -712,7 +712,7 @@ void Room::trial1WalkToDoor() {
 }
 
 void Room::trial1UseMedkit() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI1_026);
+	showText(TX_SPEAKER_MCCOY, 26, true);
 }
 
 }
diff --git a/engines/startrek/rooms/trial2.cpp b/engines/startrek/rooms/trial2.cpp
index 53e7f66ad1..e8d580c32c 100644
--- a/engines/startrek/rooms/trial2.cpp
+++ b/engines/startrek/rooms/trial2.cpp
@@ -150,65 +150,65 @@ void Room::trial2Tick1() {
 void Room::trial2Tick60() {
 	if (!_awayMission->trial.enteredGlobRoom) {
 		_awayMission->disableInput = false;
-		showText(TX_SPEAKER_BENNIE, TX_TRI2_034);
-		showText(TX_SPEAKER_KIRK, TX_TRI2_005);
-		showText(TX_SPEAKER_SPOCK, TX_TRI2_030);
-		showText(TX_SPEAKER_KIRK, TX_TRI2_008);
+		showText(TX_SPEAKER_BENNIE, 34, true);
+		showText(TX_SPEAKER_KIRK, 5, true);
+		showText(TX_SPEAKER_SPOCK, 30, true);
+		showText(TX_SPEAKER_KIRK, 8, true);
 		_awayMission->trial.enteredGlobRoom = true;
 	}
 }
 
 void Room::trial2TouchedHotspot0() { // This is unused
 	if (_awayMission->trial.globEnergyLevels[1] != 0 || _awayMission->trial.globEnergyLevels[2] != 0)
-		showText(TX_SPEAKER_SPOCK, TX_TRI2_024);
+		showText(TX_SPEAKER_SPOCK, 24, true);
 }
 
 void Room::trial2LookAtKirk() {
-	showDescription(TX_TRI2N003);
+	showDescription(3, true);
 }
 
 void Room::trial2LookAtSpock() {
-	showDescription(TX_TRI2N001);
+	showDescription(1, true);
 }
 
 void Room::trial2LookAtMccoy() {
-	showDescription(TX_TRI2N006);
+	showDescription(6, true);
 }
 
 void Room::trial2LookAtRedshirt() {
-	showDescription(TX_TRI2N002);
+	showDescription(2, true);
 }
 
 void Room::trial2LookAtInsignia() {
-	showDescription(TX_TRI2N004);
+	showDescription(4, true);
 }
 
 void Room::trial2LookAtGlob() {
-	showDescription(TX_TRI2N000);
+	showDescription(0, true);
 }
 
 void Room::trial2LookAtWall() {
-	showDescription(TX_TRI2N007);
+	showDescription(7, true);
 }
 
 void Room::trial2LookAtDoor() {
-	showDescription(TX_TRI2N005);
+	showDescription(5, true);
 }
 
 void Room::trial2TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_TRI2_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::trial2TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI2_019);
+	showText(TX_SPEAKER_SPOCK, 19, true);
 }
 
 void Room::trial2TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI2_013);
+	showText(TX_SPEAKER_MCCOY, 13, true);
 }
 
 void Room::trial2TalkToRedshirt() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI2_033);
+	showText(TX_SPEAKER_BENNIE, 33, true);
 }
 
 void Room::trial2TalkToGlob() {
@@ -216,7 +216,7 @@ void Room::trial2TalkToGlob() {
 }
 
 void Room::trial2UsePhaserOnWall() {
-	showDescription(TX_TRI2N008);
+	showDescription(8, true);
 }
 
 
@@ -263,9 +263,9 @@ void Room::trial2DrewPhaserToShootGlob() {
 
 	if (!(_roomVar.trial.globBeingShot == OBJECT_GLOB && _roomVar.trial.phaserOnKill == true)) {
 		if (_roomVar.trial.phaserOnKill)
-			showText(TX_SPEAKER_SPOCK, TX_TRI2_023);
+			showText(TX_SPEAKER_SPOCK, 23, true);
 		else
-			showText(TX_SPEAKER_SPOCK, TX_TRI2_025);
+			showText(TX_SPEAKER_SPOCK, 25, true);
 	}
 
 
@@ -288,7 +288,7 @@ void Room::trial2DrewPhaserToShootGlob() {
 void Room::trial2GlobDoneExploding() {
 	stopAllVocSounds();
 	playVoc("Noooloop");
-	showText(TX_SPEAKER_SPOCK, TX_TRI2_020);
+	showText(TX_SPEAKER_SPOCK, 20, true);
 	_awayMission->trial.globDefeated = true;
 	playMidiMusicTracks(MIDITRACK_28, -1);
 	_awayMission->trial.missionScore += 1;
@@ -297,21 +297,7 @@ void Room::trial2GlobDoneExploding() {
 
 void Room::trial2GlobDoneSplitting() {
 	if (_roomVar.trial.globBeingShot == OBJECT_GLOB) {
-		if (true)
-			showText(TX_SPEAKER_SPOCK, TX_TRI2_009);
-		else {
-			// Unused code block: instead of killing the crew right away, the crew can
-			// interact with the split globs.
-			_awayMission->trial.globEnergyLevels[0] = 0;
-			_awayMission->trial.globEnergyLevels[1] = 1;
-			_awayMission->trial.globEnergyLevels[2] = 1;
-			_awayMission->trial.globSplitInTwo = true;
-			loadActorAnim2(OBJECT_SPLIT_GLOB_1, "sglob", SPLIT_GLOB_1_X, SPLIT_GLOB_1_Y);
-			loadActorAnim2(OBJECT_SPLIT_GLOB_2, "sglob", SPLIT_GLOB_2_X, SPLIT_GLOB_2_Y);
-			loadActorStandAnim(OBJECT_GLOB);
-			showText(TX_SPEAKER_SPOCK, TX_TRI2_021);
-			return;
-		}
+		showText(TX_SPEAKER_SPOCK, 9, true);
 	} else if (_roomVar.trial.globBeingShot == OBJECT_SPLIT_GLOB_1) {
 		loadActorAnim2(OBJECT_11, "sglob", 0x43, 0xaf);
 		loadActorAnim2(OBJECT_SPLIT_GLOB_1, "sglob", 0, 0xaf);
@@ -360,23 +346,23 @@ void Room::trial2UseKillPhaserOnSplitGlob2() {
 }
 
 void Room::trial2UseMTricorderOnKirk() {
-	mccoyScan(DIR_S, TX_TRI2_016, true);
+	mccoyScan(DIR_S, 16, true, true);
 }
 
 void Room::trial2UseMTricorderOnSpock() {
-	mccoyScan(DIR_S, TX_TRI2_017, true);
+	mccoyScan(DIR_S, 17, true, true);
 }
 
 void Room::trial2UseMTricorderOnMccoy() {
-	mccoyScan(DIR_S, TX_TRI2_014, true);
+	mccoyScan(DIR_S, 14, true, true);
 }
 
 void Room::trial2UseMTricorderOnRedshirt() {
-	mccoyScan(DIR_S, TX_TRI2_015, true);
+	mccoyScan(DIR_S, 15, true, true);
 }
 
 void Room::trial2UseMTricorderOnGlob() {
-	mccoyScan(DIR_S, TX_TRI2_011, true);
+	mccoyScan(DIR_S, 11, true, true);
 
 	if (!_awayMission->trial.gotPointsForScanningGlob) {
 		_awayMission->trial.gotPointsForScanningGlob = true;
@@ -385,15 +371,15 @@ void Room::trial2UseMTricorderOnGlob() {
 }
 
 void Room::trial2UseSTricorderOnWall() {
-	spockScan(DIR_S, TX_TRI2_029, true);
+	spockScan(DIR_S, 29, true, true);
 }
 
 void Room::trial2UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_TRI2_027, true);
+	spockScan(DIR_S, 27, true, true);
 }
 
 void Room::trial2UseSTricorderOnGlob() {
-	spockScan(DIR_S, TX_TRI2_026, true);
+	spockScan(DIR_S, 26, true, true);
 
 	if (!_awayMission->trial.gotPointsForScanningGlob) {
 		_awayMission->trial.gotPointsForScanningGlob = true;
@@ -403,14 +389,14 @@ void Room::trial2UseSTricorderOnGlob() {
 
 void Room::trial2UseCommunicator() {
 	if (_awayMission->trial.forceFieldDown) { // TODO: Refactor this between rooms?
-		showText(TX_SPEAKER_UHURA, TX_TRI2U091);
+		showText(TX_SPEAKER_UHURA, 91, true);
 
 		const TextRef choices[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI2_003, TX_TRI2_004, TX_TRI2_007,
+			3, 4, 7,
 			TX_BLANK
 		};
-		int choice = showMultipleTexts(choices);
+		int choice = showMultipleTexts(choices, true);
 
 		if (choice == 0) { // "Beam us back to the enterprise"
 			_awayMission->trial.missionEndMethod = 1;
@@ -421,40 +407,40 @@ void Room::trial2UseCommunicator() {
 			loadRoomIndex(4, 4);
 		} // Else don't transport anywhere
 	} else { // Force field still up
-		showText(TX_SPEAKER_UHURA, TX_TRI2U087);
-		showText(TX_SPEAKER_KIRK,  TX_TRI2_006);
-		showText(TX_SPEAKER_UHURA, TX_TRI2U104);
+		showText(TX_SPEAKER_UHURA, 87, true);
+		showText(TX_SPEAKER_KIRK,  6, true);
+		showText(TX_SPEAKER_UHURA, 104, true);
 		if (!_awayMission->trial.globDefeated) {
-			showText(TX_SPEAKER_UHURA, TX_TRI2U081);
-			showText(TX_SPEAKER_KIRK,  TX_TRI2_002);
+			showText(TX_SPEAKER_UHURA, 81, true);
+			showText(TX_SPEAKER_KIRK,  2, true);
 		}
-		showText(TX_SPEAKER_UHURA, TX_TRI2U074);
+		showText(TX_SPEAKER_UHURA, 74, true);
 	}
 }
 
 void Room::trial2UseMccoyOnGlob() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI2_012);
+	showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 void Room::trial2UseMccoyOnWall() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI2_010);
+	showText(TX_SPEAKER_MCCOY, 10, true);
 }
 
 void Room::trial2UseSpockOnGlob() {
 	// NOTE: Two possible audio files to use, TRI2_028 and TRI2_F11
-	showText(TX_SPEAKER_SPOCK, TX_TRI2_028);
+	showText(TX_SPEAKER_SPOCK, 28, true);
 }
 
 void Room::trial2UseSpockOnWall() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI2_022);
+	showText(TX_SPEAKER_SPOCK, 22, true);
 }
 
 void Room::trial2UseRedshirtOnGlob() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI2_031);
+	showText(TX_SPEAKER_BENNIE, 31, true);
 }
 
 void Room::trial2UseRedshirtOnWall() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI2_032);
+	showText(TX_SPEAKER_BENNIE, 32, true);
 }
 
 void Room::trial2WalkToDoor() {
@@ -462,7 +448,7 @@ void Room::trial2WalkToDoor() {
 }
 
 void Room::trial2UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI2_018);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 }
 
 }
diff --git a/engines/startrek/rooms/trial3.cpp b/engines/startrek/rooms/trial3.cpp
index acfd2be4d3..0c321bcba4 100644
--- a/engines/startrek/rooms/trial3.cpp
+++ b/engines/startrek/rooms/trial3.cpp
@@ -109,12 +109,12 @@ void Room::trial3Tick30() {
 		_awayMission->disableInput = false;
 		_awayMission->trial.enteredTrial3FirstTime = true;
 
-		showText(TX_SPEAKER_BENNIE, TX_TRI3_030);
-		showText(TX_SPEAKER_KIRK,   TX_TRI3_005);
-		showText(TX_SPEAKER_MCCOY,  TX_TRI3_019);
-		showText(TX_SPEAKER_SPOCK,  TX_TRI3_025);
-		showText(TX_SPEAKER_MCCOY,  TX_TRI3_020);
-		showText(TX_SPEAKER_KIRK,   TX_TRI3_004);
+		showText(TX_SPEAKER_BENNIE, 30, true);
+		showText(TX_SPEAKER_KIRK,    5, true);
+		showText(TX_SPEAKER_MCCOY,  19, true);
+		showText(TX_SPEAKER_SPOCK,  25, true);
+		showText(TX_SPEAKER_MCCOY,  20, true);
+		showText(TX_SPEAKER_KIRK,    4, true);
 	}
 }
 
@@ -209,18 +209,18 @@ void Room::trial3CheckShowUhuraText() {
 		_awayMission->disableWalking = false;
 		loadActorStandAnim(OBJECT_KIRK);
 
-		showText(TX_SPEAKER_UHURA, TX_TRI3U084);
-		showText(TX_SPEAKER_KIRK,  TX_TRI3_007);
-		showText(TX_SPEAKER_UHURA, TX_TRI3U099);
+		showText(TX_SPEAKER_UHURA, 84, true);
+		showText(TX_SPEAKER_KIRK,   7, true);
+		showText(TX_SPEAKER_UHURA, 99, true);
 
 		_awayMission->trial.forceFieldDown = true;
 
 		const TextRef choices[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI3_006, TX_TRI3_002, TX_TRI3_003,
+			6, 2, 3,
 			TX_BLANK
 		};
-		int choice = showMultipleTexts(choices);
+		int choice = showMultipleTexts(choices, true);
 
 		if (choice == 0) { // Don't beam out
 		} else if (choice == 1) { // Beam to enterprise
@@ -260,47 +260,47 @@ void Room::trial3KirkExploded() {
 }
 
 void Room::trial3LookAtKirk() {
-	showDescription(TX_TRI3N000);
+	showDescription(0, true);
 }
 
 void Room::trial3LookAtSpock() {
-	showDescription(TX_TRI3N004);
+	showDescription(4, true);
 }
 
 void Room::trial3LookAtMccoy() {
-	showDescription(TX_TRI3N001);
+	showDescription(1, true);
 }
 
 void Room::trial3LookAtRedshirt() {
-	showDescription(TX_TRI3N002);
+	showDescription(2, true);
 }
 
 void Room::trial3LookAtExit() {
-	showDescription(TX_TRI3N005);
+	showDescription(5, true);
 }
 
 void Room::trial3LookAtWall() {
-	showDescription(TX_TRI3N007);
+	showDescription(7, true);
 }
 
 void Room::trial3TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_TRI3_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::trial3TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI3_022);
+	showText(TX_SPEAKER_SPOCK, 22, true);
 }
 
 void Room::trial3TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI3_018);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 }
 
 void Room::trial3TalkToRedshirt() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI3_029);
+	showText(TX_SPEAKER_BENNIE, 29, true);
 }
 
 void Room::trial3UsePhaserOnWall() {
-	showDescription(TX_TRI3N006);
+	showDescription(6, true);
 }
 
 void Room::trial3UseStunPhaserOnKlingon1() {
@@ -346,56 +346,56 @@ void Room::trial3ReadyToShootKlingon1OnKill() {
 }
 
 void Room::trial3UsePhaserAnywhere() {
-	showDescription(TX_TRI3N003);
+	showDescription(3, true);
 }
 
 void Room::trial3UseMTricorderOnKirk() {
 	// BUGFIX: Original animated Spock instead of Mccoy (same for below mccoy-scan functions)
-	mccoyScan(DIR_S, TX_TRI3_015, true);
+	mccoyScan(DIR_S, 15, true, true);
 }
 
 void Room::trial3UseMTricorderOnSpock() {
-	mccoyScan(DIR_S, TX_TRI3_016, true);
+	mccoyScan(DIR_S, 16, true, true);
 }
 
 void Room::trial3UseMTricorderOnMccoy() {
-	mccoyScan(DIR_S, TX_TRI3_013, true);
+	mccoyScan(DIR_S, 13, true, true);
 }
 
 void Room::trial3UseMTricorderOnRedshirt() {
-	mccoyScan(DIR_S, TX_TRI3_014, true);
+	mccoyScan(DIR_S, 14, true, true);
 }
 
 void Room::trial3UseMTricorderOnExit() {
-	mccoyScan(DIR_S, TX_TRI3_009, true);
+	mccoyScan(DIR_S, 9, true, true);
 }
 
 void Room::trial3UseSTricorderOnWall() {
-	spockScan(DIR_S, TX_TRI3_024, true);
+	spockScan(DIR_S, 24, true, true);
 }
 
 void Room::trial3UseSTricorderOnExit() {
-	spockScan(DIR_S, TX_TRI3_023, true);
+	spockScan(DIR_S, 23, true, true);
 }
 
 void Room::trial3UseMTricorderOnKlingon() {
 	if (_awayMission->trial.shotKlingonState == 22) { // Unconscious
-		mccoyScan(DIR_S, TX_TRI3_011);
+		mccoyScan(DIR_S, 11, false, true);
 		if (!_awayMission->redshirtDead) // BUGFIX: Check if redshirt is dead
-			showText(TX_SPEAKER_BENNIE, TX_TRI3_028);
+			showText(TX_SPEAKER_BENNIE, 28, true);
 	}
 }
 
 void Room::trial3UseCommunicator() {
 	if (_awayMission->trial.forceFieldDown) {
-		showText(TX_SPEAKER_UHURA, TX_TRI3U089);
+		showText(TX_SPEAKER_UHURA, 89, true);
 
 		const TextRef choices[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI3_103, TX_TRI3_104, TX_TRI3_107,
+			103, 104, 107,
 			TX_BLANK
 		};
-		int choice = showMultipleTexts(choices);
+		int choice = showMultipleTexts(choices, true);
 
 		if (choice == 0) { // "Beam us back to the enterprise"
 			_awayMission->trial.missionEndMethod = 1;
@@ -404,7 +404,7 @@ void Room::trial3UseCommunicator() {
 			trial3BeamToVlict();
 		} // Else don't transport anywhere
 	} else { // Force field still up
-		showText(TX_SPEAKER_UHURA, TX_TRI3U067);
+		showText(TX_SPEAKER_UHURA, 67, true);
 	}
 }
 
@@ -425,27 +425,27 @@ void Room::trial3BeamToVlict() {
 }
 
 void Room::trial3UseMccoyOnWall() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI3_010);
+	showText(TX_SPEAKER_MCCOY, 10, true);
 }
 
 void Room::trial3UseMccoyOnExit() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI3_012);
+	showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 void Room::trial3UseSpockOnWall() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI3_021);
+	showText(TX_SPEAKER_SPOCK, 21, true);
 }
 
 void Room::trial3UseSpockOnExit() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI3_008);
+	showText(TX_SPEAKER_SPOCK, 8, true);
 }
 
 void Room::trial3UseRedshirtOnExit() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI3_027);
+	showText(TX_SPEAKER_BENNIE, 27, true);
 }
 
 void Room::trial3UseRedshirtOnWall() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI3_026);
+	showText(TX_SPEAKER_BENNIE, 26, true);
 }
 
 void Room::trial3WalkToExit() {
@@ -453,7 +453,7 @@ void Room::trial3WalkToExit() {
 }
 
 void Room::trial3UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI3_017);
+	showText(TX_SPEAKER_MCCOY, 17, true);
 }
 
 }
diff --git a/engines/startrek/rooms/trial4.cpp b/engines/startrek/rooms/trial4.cpp
index 62f00c63e2..5faeed10b5 100644
--- a/engines/startrek/rooms/trial4.cpp
+++ b/engines/startrek/rooms/trial4.cpp
@@ -47,139 +47,139 @@ void Room::trial4Tick1() {
 }
 
 void Room::trial4Tick60() {
-	showText(TX_SPEAKER_VLICT, TX_TRI4_061);
+	showText(TX_SPEAKER_VLICT, 61, true);
 
 	const TextRef choices[] = {
 		TX_SPEAKER_KIRK,
-		TX_TRI4_022, TX_TRI4_039, TX_TRI4_032,
+		22, 39, 32,
 		TX_BLANK
 	};
-	int choice = showMultipleTexts(choices);
+	int choice = showMultipleTexts(choices, true);
 
 	if (choice == 0) { // "You were trying to kill us"
-		showText(TX_SPEAKER_VLICT, TX_TRI4_064);
+		showText(TX_SPEAKER_VLICT, 64, true);
 
 		const TextRef choices2[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI4_033, TX_TRI4_009, TX_TRI4_002,
+			33, 9, 2,
 			TX_BLANK
 		};
-		showMultipleTexts(choices2); // choice doesn't matter
+		showMultipleTexts(choices2, true); // choice doesn't matter
 
-		showText(TX_SPEAKER_VLICT, TX_TRI4_062);
-		showText(TX_SPEAKER_KIRK,  TX_TRI4_014);
-		showText(TX_SPEAKER_VLICT, TX_TRI4_066);
-		showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_043);
+		showText(TX_SPEAKER_VLICT, 62, true);
+		showText(TX_SPEAKER_KIRK,  14, true);
+		showText(TX_SPEAKER_VLICT, 66, true);
+		showText(TX_SPEAKER_QUETZECOATL, 43, true);
 
 		const TextRef choices3[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI4_029, TX_TRI4_020, TX_TRI4_030,
+			29, 20, 30,
 			TX_BLANK
 		};
-		choice = showMultipleTexts(choices3);
+		choice = showMultipleTexts(choices3, true);
 
 		if (choice == 0) { // "Then you have my deepest respect"
 			// Nothing more
 		} else if (choice == 1) { // "Make it a painless death"
-			showText(TX_SPEAKER_VLICT, TX_TRI4_063);
+			showText(TX_SPEAKER_VLICT, 63, true);
 		} else if (choice == 2) { // "I hope you chose the right time"
-			showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_040);
+			showText(TX_SPEAKER_QUETZECOATL, 40, true);
 		}
 	} else if (choice == 1) { // "Use of guile is honorable?"
-		showText(TX_SPEAKER_VLICT, TX_TRI4_060);
-		showText(TX_SPEAKER_KIRK,  TX_TRI4_013);
-		showText(TX_SPEAKER_VLICT, TX_TRI4_072);
-		showText(TX_SPEAKER_KIRK,  TX_TRI4_015);
-		showText(TX_SPEAKER_VLICT, TX_TRI4_071);
-		showText(TX_SPEAKER_KIRK,  TX_TRI4_005);
-		showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_052);
-		showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_041);
-		showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_051);
-		showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_053);
-		showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_050);
-		showText(TX_SPEAKER_VLICT, TX_TRI4_070);
+		showText(TX_SPEAKER_VLICT, 60, true);
+		showText(TX_SPEAKER_KIRK,  13, true);
+		showText(TX_SPEAKER_VLICT, 72, true);
+		showText(TX_SPEAKER_KIRK,  15, true);
+		showText(TX_SPEAKER_VLICT, 71, true);
+		showText(TX_SPEAKER_KIRK,  05, true);
+		showText(TX_SPEAKER_QUETZECOATL, 52, true);
+		showText(TX_SPEAKER_QUETZECOATL, 41, true);
+		showText(TX_SPEAKER_QUETZECOATL, 51, true);
+		showText(TX_SPEAKER_QUETZECOATL, 53, true);
+		showText(TX_SPEAKER_QUETZECOATL, 50, true);
+		showText(TX_SPEAKER_VLICT, 70, true);
 
 		const TextRef choices2[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI4_019, TX_TRI4_025, TX_TRI4_008,
+			19, 25, 8,
 			TX_BLANK
 		};
-		choice = showMultipleTexts(choices2);
+		choice = showMultipleTexts(choices2, true);
 
 		if (choice == 1) { // Threatened Vlict
-			showText(TX_SPEAKER_VLICT, TX_TRI4_069);
-			showText(TX_SPEAKER_KIRK,  TX_TRI4_004);
+			showText(TX_SPEAKER_VLICT, 69, true);
+			showText(TX_SPEAKER_KIRK,  04, true);
 		} // else, nothing more
 	} else if (choice == 2) { // "You didn't say I couldn't use my ship"
-		showText(TX_SPEAKER_VLICT, TX_TRI4_058);
+		showText(TX_SPEAKER_VLICT, 58, true);
 
 		const TextRef choices2[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI4_027, TX_TRI4_034, TX_TRI4_018,
+			27, 34, 18,
 			TX_BLANK
 		};
-		choice = showMultipleTexts(choices2);
+		choice = showMultipleTexts(choices2, true);
 
 		if (choice == 0) { // "Let's stop playing games"
-			showText(TX_SPEAKER_VLICT, TX_TRI4_075);
-			showText(TX_SPEAKER_KIRK,  TX_TRI4_017);
-			showText(TX_SPEAKER_QUETZECOATL,  TX_TRI4_042);
-			showText(TX_SPEAKER_VLICT, TX_TRI4_054);
+			showText(TX_SPEAKER_VLICT, 75, true);
+			showText(TX_SPEAKER_KIRK,  17, true);
+			showText(TX_SPEAKER_QUETZECOATL,  42, true);
+			showText(TX_SPEAKER_VLICT, 54, true);
 
 			const TextRef choices3[] = {
 				TX_SPEAKER_KIRK,
-				TX_TRI4_028, TX_TRI4_021, TX_TRI4_031,
+				28, 21, 31,
 				TX_BLANK
 			};
-			choice = showMultipleTexts(choices3);
+			choice = showMultipleTexts(choices3, true);
 
 			if (choice == 0 || choice == 1) {
-				showText(TX_SPEAKER_VLICT, TX_TRI4_068);
-				showText(TX_SPEAKER_MCCOY, TX_TRI4_036);
+				showText(TX_SPEAKER_VLICT, 68, true);
+				showText(TX_SPEAKER_MCCOY, 36, true);
 			} else if (choice == 2) {
-				showText(TX_SPEAKER_VLICT, TX_TRI4_056);
-				showText(TX_SPEAKER_KIRK, TX_TRI4_001);
+				showText(TX_SPEAKER_VLICT, 56, true);
+				showText(TX_SPEAKER_KIRK, 01, true);
 			}
 		} else if (choice == 1) { // "You lost, release Quetzecoatl"
-			showText(TX_SPEAKER_VLICT, TX_TRI4_076);
-			showText(TX_SPEAKER_MCCOY, TX_TRI4_037);
-			showText(TX_SPEAKER_VLICT, TX_TRI4_073);
-			showText(TX_SPEAKER_KIRK,  TX_TRI4_011);
-			showText(TX_SPEAKER_VLICT, TX_TRI4_059);
+			showText(TX_SPEAKER_VLICT, 76, true);
+			showText(TX_SPEAKER_MCCOY, 37, true);
+			showText(TX_SPEAKER_VLICT, 73, true);
+			showText(TX_SPEAKER_KIRK,  11, true);
+			showText(TX_SPEAKER_VLICT, 59, true);
 		} else if (choice == 2) { // "Nature beat me to it"
-			showText(TX_SPEAKER_VLICT, TX_TRI4_065);
-			showText(TX_SPEAKER_KIRK,  TX_TRI4_016);
-			showText(TX_SPEAKER_VLICT, TX_TRI4_074);
+			showText(TX_SPEAKER_VLICT, 65, true);
+			showText(TX_SPEAKER_KIRK,  16, true);
+			showText(TX_SPEAKER_VLICT, 74, true);
 
 			const TextRef choices3[] = {
 				TX_SPEAKER_KIRK,
-				TX_TRI4_026, TX_TRI4_024, TX_TRI4_023,
+				26, 24, 23,
 				TX_BLANK
 			};
-			choice = showMultipleTexts(choices3);
+			choice = showMultipleTexts(choices3, true);
 
 			if (choice == 0) { // "The empire will learn you betrayed them"
-				showText(TX_SPEAKER_VLICT, TX_TRI4_057);
-				showText(TX_SPEAKER_SPOCK, TX_TRI4_038);
-				showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_044);
-				showText(TX_SPEAKER_KIRK, TX_TRI4_006);
-				showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_048);
+				showText(TX_SPEAKER_VLICT, 57, true);
+				showText(TX_SPEAKER_SPOCK, 38, true);
+				showText(TX_SPEAKER_QUETZECOATL, 44, true);
+				showText(TX_SPEAKER_KIRK, 06, true);
+				showText(TX_SPEAKER_QUETZECOATL, 48, true);
 			} else if (choice == 1) { // "You didn't give him a fair trial"
-				showText(TX_SPEAKER_VLICT,       TX_TRI4_055);
-				showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_045);
-				showText(TX_SPEAKER_KIRK,        TX_TRI4_003);
-				showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_047);
-				showText(TX_SPEAKER_KIRK,        TX_TRI4_010);
+				showText(TX_SPEAKER_VLICT,       55, true);
+				showText(TX_SPEAKER_QUETZECOATL, 45, true);
+				showText(TX_SPEAKER_KIRK,        03, true);
+				showText(TX_SPEAKER_QUETZECOATL, 47, true);
+				showText(TX_SPEAKER_KIRK,        10, true);
 			} else if (choice == 2) { // "How can a liar like you say 'honor'"
-				showText(TX_SPEAKER_VLICT,       TX_TRI4_067);
-				showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_046);
-				showText(TX_SPEAKER_KIRK,        TX_TRI4_007);
-				showText(TX_SPEAKER_QUETZECOATL, TX_TRI4_049);
+				showText(TX_SPEAKER_VLICT,       67, true);
+				showText(TX_SPEAKER_QUETZECOATL, 46, true);
+				showText(TX_SPEAKER_KIRK,        07, true);
+				showText(TX_SPEAKER_QUETZECOATL, 49, true);
 			}
 		}
 	}
 
-	showText(TX_SPEAKER_KIRK, TX_TRI4_012);
+	showText(TX_SPEAKER_KIRK, 12, true);
 	_awayMission->trial.missionEndMethod = 2;
 	endMission(_awayMission->trial.missionScore, _awayMission->trial.field2b, 2);
 }
diff --git a/engines/startrek/rooms/trial5.cpp b/engines/startrek/rooms/trial5.cpp
index 59c6a71931..85761368fd 100644
--- a/engines/startrek/rooms/trial5.cpp
+++ b/engines/startrek/rooms/trial5.cpp
@@ -179,37 +179,37 @@ void Room::trial5Tick1() {
 }
 
 void Room::trial5Tick60() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI5_052);
-	showText(TX_SPEAKER_SPOCK,  TX_TRI5_017);
-	showText(TX_SPEAKER_MCCOY,  TX_TRI5_014);
-	showText(TX_SPEAKER_KIRK,   TX_TRI5_002);
+	showText(TX_SPEAKER_BENNIE, 52, true);
+	showText(TX_SPEAKER_SPOCK,  17, true);
+	showText(TX_SPEAKER_MCCOY,  14, true);
+	showText(TX_SPEAKER_KIRK,    2, true);
 }
 
 void Room::trial5VlictAppeared() {
-	showText(TX_SPEAKER_BIALBI, TX_TRI5_027);
-	showText(TX_SPEAKER_VLICT,  TX_TRI5_020);
-	showText(TX_SPEAKER_BIALBI, TX_TRI5_031);
-	showText(TX_SPEAKER_VLICT,  TX_TRI5_022);
-	showText(TX_SPEAKER_BIALBI, TX_TRI5_029);
-	showText(TX_SPEAKER_VLICT,  TX_TRI5_018);
+	showText(TX_SPEAKER_BIALBI, 27, true);
+	showText(TX_SPEAKER_VLICT,  20, true);
+	showText(TX_SPEAKER_BIALBI, 31, true);
+	showText(TX_SPEAKER_VLICT,  22, true);
+	showText(TX_SPEAKER_BIALBI, 29, true);
+	showText(TX_SPEAKER_VLICT,  18, true);
 
 	const TextRef choices[] = {
 		TX_SPEAKER_KIRK,
-		TX_TRI5_003, TX_TRI5_008, TX_TRI5_006,
+		3, 8, 6,
 		TX_BLANK
 	};
-	int choice = showMultipleTexts(choices);
+	int choice = showMultipleTexts(choices, true);
 
 	if (choice == 0) { // "Do you want me to help you?"
-		showText(TX_SPEAKER_VLICT, TX_TRI5_023);
-		showText(TX_SPEAKER_MCCOY, TX_TRI5_015);
+		showText(TX_SPEAKER_VLICT, 23, true);
+		showText(TX_SPEAKER_MCCOY, 15, true);
 
 		const TextRef choices2[] = {
 			TX_SPEAKER_KIRK,
-			TX_TRI5_009, TX_TRI5_007,
+			9, 7,
 			TX_BLANK
 		};
-		choice = showMultipleTexts(choices2);
+		choice = showMultipleTexts(choices2, true);
 
 		if (choice == 0)
 			choice = 1;
@@ -218,24 +218,24 @@ void Room::trial5VlictAppeared() {
 	}
 
 	if (choice == 1) { // "Now you can rot as you deserve"
-		showText(TX_SPEAKER_BIALBI, TX_TRI5_034);
+		showText(TX_SPEAKER_BIALBI, 34, true);
 
 		_awayMission->trial.missionEndMethod = 4;
 		endMission(_awayMission->trial.missionScore, 1, 4);
 	} else if (choice == 2) { // "I'll intervene if Quetzecoatl goes free"
-		showText(TX_SPEAKER_VLICT, TX_TRI5_019);
+		showText(TX_SPEAKER_VLICT, 19, true);
 		playMidiMusicTracks(MIDITRACK_28, -1);
 
-		showText(TX_SPEAKER_BIALBI, TX_TRI5_025);
+		showText(TX_SPEAKER_BIALBI, 25, true);
 		_awayMission->trial.missionScore += 4;
-		showText(TX_SPEAKER_KIRK,   TX_TRI5_004);
-		showText(TX_SPEAKER_BIALBI, TX_TRI5_030);
-		showText(TX_SPEAKER_BIALBI, TX_TRI5_026);
-		showText(TX_SPEAKER_VLICT,  TX_TRI5_021);
-		showText(TX_SPEAKER_BIALBI, TX_TRI5_028);
-		showText(TX_SPEAKER_KIRK,   TX_TRI5_005);
-		showText(TX_SPEAKER_BIALBI, TX_TRI5_033);
-		showText(TX_SPEAKER_BIALBI, TX_TRI5_032);
+		showText(TX_SPEAKER_KIRK,    4, true);
+		showText(TX_SPEAKER_BIALBI, 30, true);
+		showText(TX_SPEAKER_BIALBI, 26, true);
+		showText(TX_SPEAKER_VLICT,  21, true);
+		showText(TX_SPEAKER_BIALBI, 28, true);
+		showText(TX_SPEAKER_KIRK,    5, true);
+		showText(TX_SPEAKER_BIALBI, 33, true);
+		showText(TX_SPEAKER_BIALBI, 32, true);
 
 		_awayMission->trial.missionEndMethod = 3;
 		endMission(1, 1, 3); // FIXME: Are these parameters correct?
@@ -248,9 +248,9 @@ void Room::trial5WalkToInterface() {
 
 void Room::trial5ReachedInterface() {
 	if (!_awayMission->trial.neuralInterfaceActive)
-		showText(TX_SPEAKER_VOICE, TX_TRI5_035);
+		showText(TX_SPEAKER_VOICE, 35, true);
 	else {
-		showText(TX_SPEAKER_BIALBI, TX_TRI5_024);
+		showText(TX_SPEAKER_BIALBI, 24, true);
 		loadActorAnimC(OBJECT_VLICT, "vlict1", 0xbe, 0x91, &Room::trial5VlictAppeared);
 		_awayMission->trial.missionScore += 5;
 		playMidiMusicTracks(MIDITRACK_1, -1);
@@ -332,110 +332,110 @@ void Room::trial5GetBlueGem3() {
 }
 
 void Room::trial5LookAtKirk() {
-	showDescription(TX_TRI5N005);
+	showDescription(5, true);
 }
 
 void Room::trial5LookAtSpock() {
-	showDescription(TX_TRI5N009);
+	showDescription(9, true);
 }
 
 void Room::trial5LookAtMccoy() {
-	showDescription(TX_TRI5N008);
+	showDescription(8, true);
 }
 
 void Room::trial5LookAtRedshirt() {
-	showDescription(TX_TRI5N010);
+	showDescription(10, true);
 }
 
 void Room::trial5LookAtBeam() {
-	showDescription(TX_TRI5N002);
+	showDescription(2, true);
 }
 
 void Room::trial5LookAtInterface() {
-	showDescription(TX_TRI5N004);
+	showDescription(4, true);
 }
 
 void Room::trial5UseSTricorderOnInterface() {
-	spockScan(DIR_E, TX_TRI5_010, true);
+	spockScan(DIR_E, 10, true, true);
 }
 
 void Room::trial5UseMTricorderOnInterface() {
-	mccoyScan(DIR_E, TX_TRI5_011, true);
+	mccoyScan(DIR_E, 11, true, true);
 }
 
 void Room::trial5LookAtRedGem1() {
-	showDescription(TX_TRI5N013);
+	showDescription(13, true);
 }
 
 void Room::trial5LookAtRedGem2() {
-	showDescription(TX_TRI5N014);
+	showDescription(14, true);
 }
 
 void Room::trial5LookAtRedGem3() {
-	showDescription(TX_TRI5N015);
+	showDescription(15, true);
 }
 
 void Room::trial5LookAtGreenGem1() {
-	showDescription(TX_TRI5N019);
+	showDescription(19, true);
 }
 
 void Room::trial5LookAtGreenGem2() {
-	showDescription(TX_TRI5N020);
+	showDescription(20, true);
 }
 
 void Room::trial5LookAtGreenGem3() {
-	showDescription(TX_TRI5N021);
+	showDescription(21, true);
 }
 
 void Room::trial5LookAtBlueGem1() {
-	showDescription(TX_TRI5N016);
+	showDescription(16, true);
 }
 
 void Room::trial5LookAtBlueGem2() {
-	showDescription(TX_TRI5N017);
+	showDescription(17, true);
 }
 
 void Room::trial5LookAtBlueGem3() {
-	showDescription(TX_TRI5N018);
+	showDescription(18, true);
 }
 
 void Room::trial5LookAtHole() {
-	showDescription(TX_TRI5N006);
+	showDescription(6, true);
 }
 
 void Room::trial5TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_TRI5_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::trial5TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_TRI5_016);
+	showText(TX_SPEAKER_SPOCK, 16, true);
 }
 
 void Room::trial5TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI5_013);
+	showText(TX_SPEAKER_MCCOY, 13, true);
 }
 
 void Room::trial5TalkToRedshirt() {
-	showText(TX_SPEAKER_BENNIE, TX_TRI5_051);
+	showText(TX_SPEAKER_BENNIE, 51, true);
 }
 
 void Room::trial5UsePhaser() {
-	showDescription(TX_TRI5N011);
+	showDescription(11, true);
 }
 
 void Room::trial5UseMTricorderAnywhere() {
 	// BUGFIX: Original had Spock doing the animation, not Mccoy
 	mccoyScan(DIR_S, -1, true);
-	showDescription(TX_TRI5N012);
+	showDescription(12, true);
 }
 
 void Room::trial5UseSTricorderAnywhere() {
 	spockScan(DIR_S, -1, true);
-	showDescription(TX_TRI5N012);
+	showDescription(12, true);
 }
 
 void Room::trial5UseCommunicator() {
-	showDescription(TX_TRI5N007);
+	showDescription(7, true);
 }
 
 void Room::trial5UseGemOnHole(int16 item, int16 object, int16 hole) {
@@ -502,7 +502,7 @@ void Room::trial5ReachedHoleToPutGem() {
 		if COMBO(RED, RED, RED) {
 			trial5ActivateLightOfWar();
 			playMidiMusicTracks(MIDITRACK_1, -1);
-			showText(TX_SPEAKER_LIGHT_OF_WAR, TX_TRI5_050); // All ships in orbit destroyed
+			showText(TX_SPEAKER_LIGHT_OF_WAR, 50, true); // All ships in orbit destroyed
 			showGameOverMenu();
 		} else if COMBO(RED, RED, GREEN) {
 			trial5RestrictedCombination1();
@@ -512,20 +512,20 @@ void Room::trial5ReachedHoleToPutGem() {
 			trial5RestrictedCombination1();
 		} else if COMBO(RED, GREEN, GREEN) {
 			trial5ActivateLightOfWar();
-			showText(TX_SPEAKER_LIGHT_OF_WAR, TX_TRI5_036);
+			showText(TX_SPEAKER_LIGHT_OF_WAR, 36, true);
 		} else if COMBO(RED, GREEN, BLUE) {
 			trial5ActivateLightOfWar();
-			showText(TX_SPEAKER_LIGHT_OF_WAR, TX_TRI5_048);
+			showText(TX_SPEAKER_LIGHT_OF_WAR, 48, true);
 		} else if COMBO(RED, BLUE, RED) {
 			trial5RestrictedCombination1();
 		} else if COMBO(RED, BLUE, GREEN) {
 			trial5RestrictedCombination1();
 		} else if COMBO(RED, BLUE, BLUE) {
 			trial5ActivateLightOfWar();
-			showText(TX_SPEAKER_LIGHT_OF_WAR, TX_TRI5_049);
+			showText(TX_SPEAKER_LIGHT_OF_WAR, 49, true);
 		} else if COMBO(GREEN, RED, RED) {
 			trial5ActivateLightOfKnowledge();
-			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, TX_TRI5_047);
+			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 47, true);
 		} else if COMBO(GREEN, RED, GREEN) {
 			trial5RestrictedCombination2();
 		} else if COMBO(GREEN, RED, BLUE) {
@@ -535,8 +535,8 @@ void Room::trial5ReachedHoleToPutGem() {
 		} else if COMBO(GREEN, GREEN, GREEN) {
 			trial5ActivateLightOfKnowledge();
 			playVoc("EFX12B");
-			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, TX_TRI5_040);
-			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, TX_TRI5_037);
+			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 40, true);
+			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 37, true);
 			_awayMission->trial.neuralInterfaceActive = true;
 
 			if (!_awayMission->trial.gotPointsForActivatingInterface) {
@@ -547,25 +547,25 @@ void Room::trial5ReachedHoleToPutGem() {
 			trial5RestrictedCombination1();
 		} else if COMBO(GREEN, BLUE, RED) {
 			trial5ActivateLightOfKnowledge();
-			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, TX_TRI5_041);
+			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 41, true);
 		} else if COMBO(GREEN, BLUE, GREEN) {
 			trial5RestrictedCombination2();
 		} else if COMBO(GREEN, BLUE, BLUE) {
 			trial5ActivateLightOfKnowledge();
-			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, TX_TRI5_038);
+			showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 38, true);
 		} else if COMBO(BLUE, RED, RED) {
 			trial5ActivateLightOfTravel();
-			showText(TX_SPEAKER_LIGHT_OF_TRAVEL, TX_TRI5_045);
+			showText(TX_SPEAKER_LIGHT_OF_TRAVEL, 45, true);
 		} else if COMBO(BLUE, RED, GREEN) {
 			trial5DestinationNoLongerExists();
 		} else if COMBO(BLUE, RED, BLUE) {
 			trial5DestinationNoLongerExists();
 		} else if COMBO(BLUE, GREEN, RED) {
 			trial5ActivateLightOfTravel();
-			showText(TX_SPEAKER_LIGHT_OF_TRAVEL, TX_TRI5_042);
+			showText(TX_SPEAKER_LIGHT_OF_TRAVEL, 42, true);
 		} else if COMBO(BLUE, GREEN, GREEN) {
 			trial5ActivateLightOfTravel();
-			showText(TX_SPEAKER_LIGHT_OF_TRAVEL, TX_TRI5_044);
+			showText(TX_SPEAKER_LIGHT_OF_TRAVEL, 44, true);
 		} else if COMBO(BLUE, GREEN, BLUE) {
 			trial5DestinationNoLongerExists();
 		} else if COMBO(BLUE, BLUE, RED) {
@@ -574,7 +574,7 @@ void Room::trial5ReachedHoleToPutGem() {
 			trial5RestrictedCombination1();
 		} else if COMBO(BLUE, BLUE, BLUE) {
 			trial5ActivateLightOfTravel();
-			showText(TX_SPEAKER_LIGHT_OF_TRAVEL, TX_TRI5_046);
+			showText(TX_SPEAKER_LIGHT_OF_TRAVEL, 46, true);
 
 			_awayMission->disableInput = true;
 			playSoundEffectIndex(SND_TRANSDEM);
@@ -612,17 +612,17 @@ void Room::trial5RestrictedCombination1() {
 	// knowledge.
 	// It's inconsistent, but I guess we can chalk it up to the aliens being mysterious...
 	playSoundEffectIndex(SND_TRANSENE);
-	showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, TX_TRI5_039);
+	showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 39, true);
 }
 
 void Room::trial5RestrictedCombination2() {
 	trial5ActivateLightOfKnowledge();
-	showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, TX_TRI5_039);
+	showText(TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 39, true);
 }
 
 void Room::trial5DestinationNoLongerExists() {
 	trial5ActivateLightOfTravel();
-	showText(TX_SPEAKER_LIGHT_OF_TRAVEL, TX_TRI5_043);
+	showText(TX_SPEAKER_LIGHT_OF_TRAVEL, 43, true);
 }
 
 void Room::trial5CrewmanBeamedOut() {
@@ -746,7 +746,7 @@ void Room::trial5UseBlueGem3OnHole3() {
 
 
 void Room::trial5UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_TRI5_012);
+	showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 }