STARTREK: Read the text of the FEATHER mission from RDF files

11 files changed, 377 insertions, 1131 deletions

diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index 71c778acc0..0cc2a444be 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -203,6 +203,16 @@ Common::String Room::patchRoomMessage(const char *text) {
 		{ "#MUD3\\MUD3_011#", "to think after all the stunts that Harry has pulled", "to think that after all the stunts that Harry has pulled," },
 		{ "#MUD3\\MUD3_022#", "and they were certain", "and they are certain" },
 		{ "#MUD3\\MUD4_008#", "DId you know", "Did you know" },
+		{ "#FEA1\\FEA1_035#", "before it retreats Captain", "before it retreats, Captain" },
+		{ "#FEA1\\FEA1_041#", "it must have a nasty bite", "it may have a nasty bite" },
+		{ "#FEA3\\FEA3_012#", "he'll be up in about an hour", "he'll be up in about a half hour" },
+		{ "#FEA3\\FEA3_030#", "sHe's dead, Jim!", "He's dead, Jim!" },
+		{ "#FEA5\\FEA5_009#", "those thorns.You might", "those thorns. You might" },
+		{ "#FEA5\\FEA5_018#", "with our phaser not working", "with our phasers not working" },
+		{ "#FEA5\\FEA5_020#", "in a previous life", "in your previous life" },
+		{ "#FEA6\\FEA6_017#", "isn't that just great", "isn't this just great" },
+		{ "#FEA6\\FEA6_019#", "that action, Captain It may", "that action, Captain. It may" },
+		{ "#FEA6\\FEA6N016#", "that attack you", "that attacked you" },
 		{ "", "", "" }
 	};
 
@@ -211,6 +221,11 @@ Common::String Room::patchRoomMessage(const char *text) {
 	if (txt[10] == '-')
 		txt.replace(10, 1, "_");
 
+	// Fix typos where some messages contain double spacing (e.g. in FEA3_020)
+	int32 spacePos = txt.find("  ");
+	if (spacePos > 0)
+		txt.deleteChar(spacePos);
+
 	// Fix typos
 	do {
 		const Common::String origText = typoFixes[i].origText;
diff --git a/engines/startrek/rooms/feather0.cpp b/engines/startrek/rooms/feather0.cpp
index 482a5ebd93..1c52850310 100644
--- a/engines/startrek/rooms/feather0.cpp
+++ b/engines/startrek/rooms/feather0.cpp
@@ -52,73 +52,73 @@ void Room::feather0Tick60() {
 void Room::feather0TalkToQuetzecoatl() {
 	const TextRef choices[] = {
 		TX_SPEAKER_KIRK,
-		TX_FEA0_006,
-		TX_FEA0_007,
-		TX_FEA0_011,
+		6,
+		7,
+		11,
 		TX_BLANK
 	};
 
-	showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_028);
-	int choice = showMultipleTexts(choices);
+	showText(TX_SPEAKER_QUETZECOATL, 28, true);
+	int choice = showMultipleTexts(choices, true);
 	bool alreadyAngered = false;
 
 	if (choice == 0) {
 		const TextRef choices0[] = {
 			TX_SPEAKER_KIRK,
-			TX_FEA0_009,
-			TX_FEA0_004,
+			9,
+			4,
 			TX_BLANK
 		};
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_032);
-		choice = showMultipleTexts(choices0);
+		showText(TX_SPEAKER_QUETZECOATL, 32, true);
+		choice = showMultipleTexts(choices0, true);
 	} else if (choice == 1) {
 		const TextRef choices0[] = {
 			TX_SPEAKER_KIRK,
-			TX_FEA0_002,
-			TX_FEA0_012,
+			2,
+			12,
 			TX_BLANK
 		};
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_031);
-		choice = showMultipleTexts(choices0);
+		showText(TX_SPEAKER_QUETZECOATL, 31, true);
+		choice = showMultipleTexts(choices0, true);
 	} else if (choice == 2) {
 		const TextRef choices0[] = {
 			TX_SPEAKER_KIRK,
-			TX_FEA0_014,
-			TX_FEA0_008,
+			14,
+			8,
 			TX_BLANK
 		};
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_033);
-		choice = showMultipleTexts(choices0);
+		showText(TX_SPEAKER_QUETZECOATL, 33, true);
+		choice = showMultipleTexts(choices0, true);
 
 		if (choice == 0) {
 			alreadyAngered = true;
-			showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_024);
+			showText(TX_SPEAKER_QUETZECOATL, 24, true);
 		}
 	} else
 		showDescription(TX_DIALOG_ERROR);
 
 	if (!alreadyAngered) {
 		if (choice == 0)
-			showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_030);
+			showText(TX_SPEAKER_QUETZECOATL, 30, true);
 		else // choice == 1
-			showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_101);
-		showText(TX_SPEAKER_KIRK, TX_FEA0_010);
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_026);
+			showText(TX_SPEAKER_QUETZECOATL, 101, true);
+		showText(TX_SPEAKER_KIRK, 10, true);
+		showText(TX_SPEAKER_QUETZECOATL, 26, true);
 
 		const TextRef choices1[] = {
 			TX_SPEAKER_KIRK,
-			TX_FEA0_013,
-			TX_FEA0_005,
+			13,
+			5,
 			TX_BLANK
 		};
-		choice = showMultipleTexts(choices1);
+		choice = showMultipleTexts(choices1, true);
 
 		if (choice == 0) {
-			showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_029);
-			showText(TX_SPEAKER_KIRK, TX_FEA0_003);
+			showText(TX_SPEAKER_QUETZECOATL, 29, true);
+			showText(TX_SPEAKER_KIRK, 3, true);
 		}
 
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_027);
+		showText(TX_SPEAKER_QUETZECOATL, 27, true);
 	}
 
 	// Quetzecoatl ultimately warps the crew away no matter what
@@ -144,81 +144,81 @@ void Room::feather0Timer1Expired() {
 }
 
 void Room::feather0UsePhaserOnQuetzecoatl() {
-	showText(TX_SPEAKER_QUETZECOATL, TX_FEA0_025);
+	showText(TX_SPEAKER_QUETZECOATL, 25, true);
 }
 
 void Room::feather0UsePhaserOnMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA0_016);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::feather0UseMedkit() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA0_108);
+	showText(TX_SPEAKER_MCCOY, 108, true);
 }
 
 void Room::feather0LookAtQuetzecoatl() {
-	showDescription(TX_FEA0N008);
+	showDescription(8, true);
 }
 
 void Room::feather0LookAtMoon() {
-	showDescription(TX_FEA0N007);
+	showDescription(7, true);
 }
 
 void Room::feather0LookAtLog() {
-	showDescription(TX_FEA0N006);
+	showDescription(6, true);
 }
 
 void Room::feather0LookAtHut() {
-	showDescription(TX_FEA0N001);
+	showDescription(1, true);
 }
 
 void Room::feather0LookAnywhere() {
-	showDescription(TX_FEA0N009);
+	showDescription(9, true);
 }
 
 void Room::feather0LookAtEyes() {
-	showDescription(TX_FEA0N000);
+	showDescription(0, true);
 }
 
 void Room::feather0LookAtTree() {
-	showDescription(TX_FEA0N003);
+	showDescription(3, true);
 }
 
 void Room::feather0LookAtMccoy() {
-	showDescription(TX_FEA0N004);
+	showDescription(4, true);
 }
 
 void Room::feather0LookAtSpock() {
-	showDescription(TX_FEA0N005);
+	showDescription(5, true);
 }
 
 void Room::feather0LookAtRedshirt() {
-	showDescription(TX_FEA0N002);
+	showDescription(2, true);
 }
 
 void Room::feather0TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA0_017);
-	showText(TX_SPEAKER_SPOCK, TX_FEA0_021);
+	showText(TX_SPEAKER_MCCOY, 17, true);
+	showText(TX_SPEAKER_SPOCK, 21, true);
 }
 
 void Room::feather0TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA0_022);
-	showText(TX_SPEAKER_MCCOY, TX_FEA0_018);
+	showText(TX_SPEAKER_SPOCK, 22, true);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 }
 
 void Room::feather0TalkToRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA0_023);
+	showText(TX_SPEAKER_STRAGEY, 23, true);
 }
 
 void Room::feather0UseSTricorderOnQuetzecoatl() {
-	spockScan(DIR_S, TX_FEA0_020, false);
+	spockScan(DIR_S, 20, false, true);
 }
 
 void Room::feather0UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_FEA0_019, false);
+	spockScan(DIR_S, 19, false, true);
 }
 
 void Room::feather0UseMTricorderOnQuetzecoatl() {
-	mccoyScan(DIR_S, TX_FEA0_015, false);
+	mccoyScan(DIR_S, 15, false, true);
 }
 
 }
diff --git a/engines/startrek/rooms/feather1.cpp b/engines/startrek/rooms/feather1.cpp
index 66b3c6fcbc..ada6e6693f 100644
--- a/engines/startrek/rooms/feather1.cpp
+++ b/engines/startrek/rooms/feather1.cpp
@@ -1,4 +1,4 @@
-/* ScummVM - Graphic Adventure Engine
+/* ScummVM - Graphic Adventure Engine3
  *
  * ScummVM is the legal property of its developers, whose names
  * are too numerous to list here. Please refer to the COPYRIGHT
@@ -173,7 +173,7 @@ void Room::feather1Tick45() {
 
 void Room::feather1Tick85() {
 	if (_awayMission->feather.vineState == 0)
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA1_057);
+		showText(TX_SPEAKER_QUETZECOATL, 57, true);
 }
 
 void Room::feather1Tick95() {
@@ -188,21 +188,21 @@ void Room::feather1QuetzecoatlDisappeared() {
 }
 
 void Room::feather1GetRightVine() {
-	showDescription(TX_FEA1N008);
+	showDescription(8, true);
 }
 
 void Room::feather1GetLeftVine() {
 	if (_awayMission->feather.vineState == 0)
-		showDescription(TX_FEA1N009);
+		showDescription(9, true);
 	else
-		showDescription(TX_FEA1N008);
+		showDescription(8, true);
 }
 
 void Room::feather1GetRocks() {
 	if (_roomVar.feather.crewEscaped[OBJECT_KIRK])
-		showDescription(TX_FEA1N021);
+		showDescription(21, true);
 	else if (_awayMission->feather.gotRock)
-		showDescription(TX_FEA1N019);
+		showDescription(19, true);
 	else {
 		walkCrewmanC(OBJECT_KIRK, 0x90, 0xb6, &Room::feather1ReachedRocks);
 		_awayMission->disableInput = true;
@@ -217,7 +217,7 @@ void Room::feather1PickedUpRocks() {
 	_awayMission->disableInput = false;
 	loadActorStandAnim(OBJECT_KIRK);
 	giveItem(OBJECT_IROCK);
-	showDescription(TX_FEA1N022);
+	showDescription(22, true);
 	_awayMission->feather.gotRock = true;
 }
 
@@ -229,7 +229,7 @@ void Room::feather1GetSnake() {
 		walkCrewmanC(OBJECT_KIRK, 0x90, 0xbe, &Room::feather1ReachedSnake);
 		_awayMission->disableInput = true;
 	} else
-		showDescription(TX_FEA1N021);
+		showDescription(21, true);
 }
 
 void Room::feather1ReachedSnake() {
@@ -267,14 +267,14 @@ void Room::feather1Timer0Expired() { // Snake comes back out of hole
 }
 
 void Room::feather1UseCommunicator() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_023);
+	showText(TX_SPEAKER_SPOCK, 23, true);
 }
 
 void Room::feather1UseRockOnHole() {
 	if (_roomVar.feather.crewEscaped[OBJECT_KIRK])
-		showDescription(TX_FEA1N021);
+		showDescription(21, true);
 	else if (_awayMission->feather.holeBlocked)
-		showDescription(TX_FEA1N005);
+		showDescription(5, true);
 	else {
 		_awayMission->feather.missionScore++;
 		walkCrewmanC(OBJECT_KIRK, 0xa3, 0xb6, &Room::feather1ReachedHole);
@@ -300,17 +300,17 @@ void Room::feather1PutRockInHole() {
 }
 
 void Room::feather1UseSnakeOnLeftVine() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_037);
+	showText(TX_SPEAKER_SPOCK, 37, true);
 }
 
 void Room::feather1UseSnakeOnSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_041);
-	showText(TX_SPEAKER_KIRK,  TX_FEA1_001);
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_018);
+	showText(TX_SPEAKER_SPOCK, 41, true);
+	showText(TX_SPEAKER_KIRK,   1, true);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 }
 
 void Room::feather1UseSnakeOnKirk() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_026);
+	showText(TX_SPEAKER_SPOCK, 26, true);
 }
 
 void Room::feather1UseSnakeOnMccoy() {
@@ -318,7 +318,7 @@ void Room::feather1UseSnakeOnMccoy() {
 }
 
 void Room::feather1UseSnakeOnRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA1_050);
+	showText(TX_SPEAKER_STRAGEY, 50, true);
 }
 
 void Room::feather1UseRockOnSnake() {
@@ -326,69 +326,69 @@ void Room::feather1UseRockOnSnake() {
 		loadActorAnim2(OBJECT_SNAKE, "s5r1si");
 		_awayMission->timers[0] = 80;
 		_roomVar.feather.snakeInHole = true;
-		showText(TX_SPEAKER_SPOCK, TX_FEA1_034); // BUGFIX: speaker is Spock, not Stragey
+		showText(TX_SPEAKER_SPOCK, 34, true); // BUGFIX: speaker is Spock, not Stragey
 	}
 }
 
 void Room::feather1UseSpockOnSnake() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_035);
+	showText(TX_SPEAKER_SPOCK, 35, true);
 }
 
 void Room::feather1UseMccoyOnSnake() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_005);
+	showText(TX_SPEAKER_MCCOY, 5, true);
 }
 
 void Room::feather1UseRedshirtOnSnake() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA1_046);
+	showText(TX_SPEAKER_STRAGEY, 46, true);
 }
 
 void Room::feather1UseSpockOnHole() {
 	if (_roomVar.feather.snakeInHole)
-		showText(TX_SPEAKER_SPOCK, TX_FEA1_025);
+		showText(TX_SPEAKER_SPOCK, 25, true);
 	else
-		showText(TX_SPEAKER_SPOCK, TX_FEA1_027);
+		showText(TX_SPEAKER_SPOCK, 27, true);
 }
 
 void Room::feather1UseMccoyOnHole() {
 	if (_roomVar.feather.snakeInHole)
-		showText(TX_SPEAKER_MCCOY, TX_FEA1_004);
+		showText(TX_SPEAKER_MCCOY, 4, true);
 	else
-		showText(TX_SPEAKER_MCCOY, TX_FEA1_010);
+		showText(TX_SPEAKER_MCCOY, 10, true);
 }
 
 void Room::feather1UseRedshirtOnHole() {
 	if (_roomVar.feather.snakeInHole)
-		showText(TX_SPEAKER_STRAGEY, TX_FEA1_047);
+		showText(TX_SPEAKER_STRAGEY, 47, true);
 	else
-		showText(TX_SPEAKER_STRAGEY, TX_FEA1_051);
+		showText(TX_SPEAKER_STRAGEY, 51, true);
 }
 
 void Room::feather1UseRockOnMoss() {
-	showDescription(TX_FEA1N006);
+	showDescription(6, true);
 }
 
 void Room::feather1UseRockOnSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_032);
+	showText(TX_SPEAKER_SPOCK, 32, true);
 }
 
 void Room::feather1UseRockOnMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_009);
+	showText(TX_SPEAKER_MCCOY, 9, true);
 }
 
 void Room::feather1UseRockOnRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA1_045);
+	showText(TX_SPEAKER_STRAGEY, 45, true);
 }
 
 void Room::feather1UseSpockOnMoss() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_033);
+	showText(TX_SPEAKER_SPOCK, 33, true);
 }
 
 void Room::feather1UseMccoyOnMoss() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_015);
+	showText(TX_SPEAKER_MCCOY, 15, true);
 }
 
 void Room::feather1UseRedshirtOnMoss() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_049);
+	showText(TX_SPEAKER_MCCOY, 49, true);
 }
 
 void Room::feather1UseRockOnLeftVine() {
@@ -414,9 +414,9 @@ void Room::feather1ThrewRock1() {
 	_awayMission->disableInput = false;
 	loadActorStandAnim(OBJECT_KIRK);
 
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_042);
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_017);
-	showText(TX_SPEAKER_STRAGEY, TX_FEA1_054);
+	showText(TX_SPEAKER_SPOCK, 42, true);
+	showText(TX_SPEAKER_MCCOY, 17, true);
+	showText(TX_SPEAKER_STRAGEY, 54, true);
 }
 
 void Room::feather1ReadyToThrowRock2() {
@@ -431,9 +431,9 @@ void Room::feather1ThrewRock2() {
 	loadActorStandAnim(OBJECT_KIRK);
 	_awayMission->disableInput = false;
 
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_043);
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_021);
-	showText(TX_SPEAKER_STRAGEY, TX_FEA1_053);
+	showText(TX_SPEAKER_SPOCK, 43, true);
+	showText(TX_SPEAKER_MCCOY, 21, true);
+	showText(TX_SPEAKER_STRAGEY, 53, true);
 }
 
 
@@ -450,7 +450,7 @@ void Room::feather1UseMccoyOnVine() {
 		_roomVar.feather.crewmanClimbingVine = OBJECT_MCCOY;
 		feather1CrewmanClimbVine();
 	} else
-		showText(TX_SPEAKER_MCCOY, TX_FEA1_013);
+		showText(TX_SPEAKER_MCCOY, 13, true);
 }
 
 void Room::feather1UseRedshirtOnVine() {
@@ -458,7 +458,7 @@ void Room::feather1UseRedshirtOnVine() {
 		_roomVar.feather.crewmanClimbingVine = OBJECT_REDSHIRT;
 		feather1CrewmanClimbVine();
 	} else
-		showText(TX_SPEAKER_STRAGEY, TX_FEA1_052);
+		showText(TX_SPEAKER_STRAGEY, 52, true);
 }
 
 void Room::feather1UseKirkOnVine() {
@@ -466,7 +466,7 @@ void Room::feather1UseKirkOnVine() {
 		_roomVar.feather.crewmanClimbingVine = OBJECT_KIRK;
 		feather1CrewmanClimbVine();
 	} else
-		showDescription(TX_FEA1N010);
+		showDescription(10, true);
 }
 
 // This was refactored, due to the similarity of the code for each crewman. Originally, the
@@ -542,76 +542,76 @@ void Room::feather1ClimbedDownVine() {
 }
 
 void Room::feather1UsePhaser() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_028);
+	showText(TX_SPEAKER_SPOCK, 28, true);
 }
 
 void Room::feather1UseSTricorderOnRightVine() {
-	spockScan(DIR_N, TX_FEA1_039);
+	spockScan(DIR_N, 39, false, true);
 }
 
 void Room::feather1UseSTricorderOnSnake() {
-	spockScan(DIR_S, TX_FEA1_029);
+	spockScan(DIR_S, 29, false, true);
 }
 
 void Room::feather1UseSTricorderOnMoss() {
-	spockScan(DIR_E, TX_FEA1_038);
+	spockScan(DIR_E, 38, false, true);
 }
 
 void Room::feather1UseSTricorderOnHole() {
 	if (_roomVar.feather.snakeInHole)
-		spockScan(DIR_E, TX_FEA1_030);
+		spockScan(DIR_E, 30, false, true);
 	else
-		spockScan(DIR_E, TX_FEA1_031);
+		spockScan(DIR_E, 31, false, true);
 }
 
 void Room::feather1UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_FEA1_024);
+	spockScan(DIR_S, 24, false, true);
 }
 
 void Room::feather1UseSTricorderOnRocks() {
-	spockScan(DIR_E, TX_FEA1_003);
+	spockScan(DIR_E, 3, false, true);
 }
 
 void Room::feather1UseMTricorderOnVine() {
 	// ENHANCEMENT: Original didn't play tricorder sound, etc
-	mccoyScan(DIR_E, TX_FEA1_007);
+	mccoyScan(DIR_E, 7, false, true);
 }
 
 void Room::feather1UseMTricorderOnMoss() {
-	mccoyScan(DIR_E, TX_FEA1_014);
+	mccoyScan(DIR_E, 14, false, true);
 }
 
 void Room::feather1UseMTricorderOnHole() {
 	if (_roomVar.feather.snakeInHole)
-		mccoyScan(DIR_E, TX_FEA1_011);
+		mccoyScan(DIR_E, 11, false, true);
 	else
-		mccoyScan(DIR_E, TX_FEA1_012);
+		mccoyScan(DIR_E, 12, false, true);
 }
 
 void Room::feather1UseMTricorderOnSnake() {
-	mccoyScan(DIR_S, TX_FEA1_019);
+	mccoyScan(DIR_S, 19, false, true);
 	if (!_roomVar.feather.scannedSnake) {
-		showText(TX_SPEAKER_SPOCK,   TX_FEA1_044);
-		showText(TX_SPEAKER_STRAGEY, TX_FEA1_055);
-		showText(TX_SPEAKER_KIRK,    TX_FEA1_002);
+		showText(TX_SPEAKER_SPOCK,   44, true);
+		showText(TX_SPEAKER_STRAGEY, 55, true);
+		showText(TX_SPEAKER_KIRK,    2, true);
 		_roomVar.feather.scannedSnake = true;
 	}
 }
 
 void Room::feather1UseMedkit() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_008);
+	showText(TX_SPEAKER_MCCOY, 8, true);
 }
 
 void Room::feather1TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA1_006);
+	showText(TX_SPEAKER_MCCOY, 6, true);
 }
 
 void Room::feather1TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA1_040);
+	showText(TX_SPEAKER_SPOCK, 40, true);
 }
 
 void Room::feather1TalkToRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA1_048);
+	showText(TX_SPEAKER_STRAGEY, 48, true);
 }
 
 void Room::feather1WalkToExit() {
@@ -619,58 +619,58 @@ void Room::feather1WalkToExit() {
 }
 
 void Room::feather1LookAnywhere() {
-	showDescription(TX_FEA1N020);
+	showDescription(20, true);
 }
 
 void Room::feather1LookAtSnake() {
-	showDescription(TX_FEA1N017);
+	showDescription(17, true);
 }
 
 void Room::feather1LookAtRightVine() {
-	showDescription(TX_FEA1N015);
+	showDescription(15, true);
 }
 
 void Room::feather1LookAtHole() {
-	showDescription(TX_FEA1N014);
+	showDescription(14, true);
 }
 
 void Room::feather1LookAtMoss() {
-	showDescription(TX_FEA1N016);
+	showDescription(16, true);
 }
 
 void Room::feather1LookAtRocks() {
-	showDescription(TX_FEA1N011);
+	showDescription(11, true);
 }
 
 void Room::feather1LookAtLight() {
-	showDescription(TX_FEA1N013);
+	showDescription(13, true);
 }
 
 void Room::feather1LookAtEyes() {
-	showDescription(TX_FEA1N000);
+	showDescription(0, true);
 }
 
 void Room::feather1LookAtKirk() {
-	showDescription(TX_FEA1N001);
+	showDescription(1, true);
 }
 
 void Room::feather1LookAtSpock() {
-	showDescription(TX_FEA1N004);
+	showDescription(4, true);
 }
 
 void Room::feather1LookAtMccoy() {
-	showDescription(TX_FEA1N003);
+	showDescription(3, true);
 }
 
 void Room::feather1LookAtRedshirt() {
-	showDescription(TX_FEA1N002);
+	showDescription(2, true);
 }
 
 void Room::feather1LookAtLeftVine() {
 	if (_awayMission->feather.vineState == 0)
-		showDescription(TX_FEA1N012);
+		showDescription(12, true);
 	else
-		showDescription(TX_FEA1N015);
+		showDescription(15, true);
 }
 
 }
diff --git a/engines/startrek/rooms/feather2.cpp b/engines/startrek/rooms/feather2.cpp
index c81ce67143..cd829c4cfa 100644
--- a/engines/startrek/rooms/feather2.cpp
+++ b/engines/startrek/rooms/feather2.cpp
@@ -66,44 +66,44 @@ void Room::feather2Tick1() {
 }
 
 void Room::feather2UseCommunicator() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA2_006);
+	showText(TX_SPEAKER_SPOCK, 6, true);
 }
 
 void Room::feather2UsePhaser() {
 	// FIXME: Why does McCoy say "They're dead, Jim"?
-	showText(TX_SPEAKER_MCCOY, TX_FEA2_003);
+	showText(TX_SPEAKER_MCCOY, 3, true);
 }
 
 void Room::feather2UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_FEA2_007);
+	spockScan(DIR_S, 7, true);
 }
 
 void Room::feather2UseMTricorderAnywhere() {
 	// ENHANCEMENT: Original didn't play tricorder sound, etc
-	mccoyScan(DIR_S, TX_FEA2_002);
+	mccoyScan(DIR_S, 2, true);
 }
 
 void Room::feather2TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA2_004);
+	showText(TX_SPEAKER_MCCOY, 4, true);
 }
 
 void Room::feather2TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA2_008);
+	showText(TX_SPEAKER_SPOCK, 8, true);
 }
 
 void Room::feather2TalkToRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA2_009);
+	showText(TX_SPEAKER_STRAGEY, 9, true);
 }
 
 void Room::feather2LookAtVines() {
 	// NOTE: This might be unused? I can't find where HOTSPOT_VINES is supposed to be.
-	showDescription(TX_FEA2N000);
-	showText(TX_SPEAKER_STRAGEY, TX_FEA2_010);
-	showText(TX_SPEAKER_MCCOY,   TX_FEA2_005);
+	showDescription(0, true);
+	showText(TX_SPEAKER_STRAGEY, 10, true);
+	showText(TX_SPEAKER_MCCOY,   5, true);
 }
 
 void Room::feather2UseMedkit() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA2_001);
+	showText(TX_SPEAKER_MCCOY, 1, true);
 }
 
 void Room::feather2WalkToLeftExit() {
@@ -111,35 +111,35 @@ void Room::feather2WalkToLeftExit() {
 }
 
 void Room::feather2LookAtEyes() {
-	showDescription(TX_FEA2N001);
+	showDescription(1, true);
 }
 
 void Room::feather2LookAtBigTree() {
-	showDescription(TX_FEA2N006);
+	showDescription(6, true);
 }
 
 void Room::feather2LookAtTrees() {
-	showDescription(TX_FEA2N007);
+	showDescription(7, true);
 }
 
 void Room::feather2LookAnywhere() {
-	showDescription(TX_FEA2N008);
+	showDescription(8, true);
 }
 
 void Room::feather2LookAtKirk() {
-	showDescription(TX_FEA2N002);
+	showDescription(2, true);
 }
 
 void Room::feather2LookAtSpock() {
-	showDescription(TX_FEA2N005);
+	showDescription(5, true);
 }
 
 void Room::feather2LookAtMccoy() {
-	showDescription(TX_FEA2N004);
+	showDescription(4, true);
 }
 
 void Room::feather2LookAtRedshirt() {
-	showDescription(TX_FEA2N003);
+	showDescription(3, true);
 }
 
 }
diff --git a/engines/startrek/rooms/feather3.cpp b/engines/startrek/rooms/feather3.cpp
index 95680727ee..8ac18f8687 100644
--- a/engines/startrek/rooms/feather3.cpp
+++ b/engines/startrek/rooms/feather3.cpp
@@ -106,60 +106,60 @@ void Room::feather3Tick1() {
 
 void Room::feather3Tick40() {
 	if (!_awayMission->feather.tlaoxacTestPassed)
-		showText(TX_SPEAKER_TLAOXAC, TX_FEA3_036);
+		showText(TX_SPEAKER_TLAOXAC, 36, true);
 }
 
 void Room::feather3TouchedHotspot0() { // Tlaoxac prevents you from passing this point
 	if (!_awayMission->feather.tlaoxacTestPassed)
-		showText(TX_SPEAKER_TLAOXAC, TX_FEA3_035);
+		showText(TX_SPEAKER_TLAOXAC, 35, true);
 }
 
 void Room::feather3UseSpockOnTlaoxac() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA3_026);
-	showText(TX_SPEAKER_MCCOY, TX_FEA3_018);
-	showText(TX_SPEAKER_SPOCK, TX_FEA3_028);
-	showText(TX_SPEAKER_MCCOY, TX_FEA3_015);
+	showText(TX_SPEAKER_SPOCK, 26, true);
+	showText(TX_SPEAKER_MCCOY, 18, true);
+	showText(TX_SPEAKER_SPOCK, 28, true);
+	showText(TX_SPEAKER_MCCOY, 15, true);
 }
 
 void Room::feather3UseMccoyOnTlaoxac() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA3_016);
-	showText(TX_SPEAKER_SPOCK, TX_FEA3_027);
-	showText(TX_SPEAKER_MCCOY, TX_FEA3_017);
+	showText(TX_SPEAKER_MCCOY, 16, true);
+	showText(TX_SPEAKER_SPOCK, 27, true);
+	showText(TX_SPEAKER_MCCOY, 17, true);
 }
 
 void Room::feather3UseRedshirtOnTlaoxac() {
 	if (!_awayMission->redshirtDead)
-		showText(TX_SPEAKER_STRAGEY, TX_FEA3_029);
+		showText(TX_SPEAKER_STRAGEY, 29, true);
 }
 
 void Room::feather3UseCrewmanOnLeftExit() {
 	if (!_awayMission->feather.tlaoxacTestPassed)
-		showText(TX_SPEAKER_TLAOXAC, TX_FEA3_041);
+		showText(TX_SPEAKER_TLAOXAC, 41, true);
 }
 
 void Room::feather3UseCommunicator() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA3_024);
+	showText(TX_SPEAKER_SPOCK, 24, true);
 }
 
 void Room::feather3UseSnakeOnKirk() {
 	if (!_awayMission->feather.tlaoxacTestPassed && !_awayMission->redshirtDead) {
 		if (_roomVar.feather.showedSnakeToTlaoxac && _awayMission->feather.numRocksThrownAtTlaoxac == 0) {
-			showText(TX_SPEAKER_TLAOXAC, TX_FEA3_043);
+			showText(TX_SPEAKER_TLAOXAC, 43, true);
 			_awayMission->feather.tlaoxacTestPassed = true;
 			_awayMission->feather.missionScore += 2;
 			loadMapFile("feather3");
 			loadActorAnim(OBJECT_KNIFE, "s5r3nf", KNIFE_X, KNIFE_Y);
 			_awayMission->feather.field2e = true;
 		} else
-			showDescription(TX_FEA3N004);
+			showDescription(4, true);
 	}
 }
 
 void Room::feather3UseSnakeOnSpock() {
 	if (_roomVar.feather.showedSnakeToTlaoxac)
-		showText(TX_SPEAKER_SPOCK, TX_FEA3_004);
+		showText(TX_SPEAKER_SPOCK, 4, true);
 	else
-		showText(TX_SPEAKER_SPOCK, TX_FEA3_020);
+		showText(TX_SPEAKER_SPOCK, 20, true);
 }
 
 void Room::feather3UseSnakeOnRedshirt() {
@@ -168,15 +168,15 @@ void Room::feather3UseSnakeOnRedshirt() {
 			walkCrewmanC(OBJECT_KIRK, 0x7c, 0xbc, &Room::feather3KirkReachedRedshirtWithSnake);
 			_awayMission->disableInput = true;
 		} else
-			showText(TX_SPEAKER_STRAGEY, TX_FEA3_031);
+			showText(TX_SPEAKER_STRAGEY, 31, true);
 	}
 }
 
 void Room::feather3KirkReachedRedshirtWithSnake() {
 	_awayMission->disableInput = false;
 
-	showText(TX_SPEAKER_STRAGEY, TX_FEA3_034);
-	showText(TX_SPEAKER_TLAOXAC, TX_FEA3_044);
+	showText(TX_SPEAKER_STRAGEY, 34, true);
+	showText(TX_SPEAKER_TLAOXAC, 44, true);
 
 	_awayMission->feather.tlaoxacTestPassed = true;
 	_awayMission->feather.missionScore += 1;
@@ -186,12 +186,12 @@ void Room::feather3KirkReachedRedshirtWithSnake() {
 }
 
 void Room::feather3UseSnakeOnMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA3_007);
+	showText(TX_SPEAKER_MCCOY, 7, true);
 }
 
 void Room::feather3UseSnakeOnTlaoxac() {
 	if (!_awayMission->feather.tlaoxacTestPassed && _awayMission->feather.numRocksThrownAtTlaoxac == 0) {
-		showText(TX_SPEAKER_TLAOXAC, TX_FEA3_039);
+		showText(TX_SPEAKER_TLAOXAC, 39, true);
 		_roomVar.feather.showedSnakeToTlaoxac = true;
 		if (!_awayMission->feather.showedSnakeToTlaoxac) {
 			_awayMission->feather.showedSnakeToTlaoxac = true;
@@ -201,21 +201,21 @@ void Room::feather3UseSnakeOnTlaoxac() {
 }
 
 void Room::feather3UseKnifeOnSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA3_025);
+	showText(TX_SPEAKER_SPOCK, 25, true);
 }
 
 void Room::feather3UseKnifeOnMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA3_011); // BUGFIX: Speaker is Mccoy, not Spock.
+	showText(TX_SPEAKER_MCCOY, 11, true); // BUGFIX: Speaker is Mccoy, not Spock.
 }
 
 void Room::feather3UseKnifeOnRedshirt() {
 	if (!_awayMission->redshirtDead)
-		showText(TX_SPEAKER_STRAGEY, TX_FEA3_033); // BUGFIX: Speaker is Stragey, not Spock.
+		showText(TX_SPEAKER_STRAGEY, 33, true); // BUGFIX: Speaker is Stragey, not Spock.
 }
 
 void Room::feather3UseRockOnTlaoxac() {
 	if (_roomVar.feather.tlaoxacUnconscious)
-		showText(TX_SPEAKER_MCCOY, TX_FEA3_009);
+		showText(TX_SPEAKER_MCCOY, 9, true);
 	else {
 		_awayMission->feather.numRocksThrownAtTlaoxac++;
 		_awayMission->disableInput = true;
@@ -259,10 +259,10 @@ void Room::feather3Timer3Expired() {
 void Room::feather3TlaoxacKnockedOutFromRockThrow() {
 	_awayMission->disableInput = false;
 	loadActorStandAnim(OBJECT_KIRK);
-	showDescription(TX_FEA3N006);
+	showDescription(6, true);
 
 	if (!_awayMission->feather.tookKnife && !_awayMission->feather.field2e)
-		showText(TX_SPEAKER_MCCOY, TX_FEA3_008);
+		showText(TX_SPEAKER_MCCOY, 8, true);
 
 	_awayMission->feather.tlaoxacTestPassed = true;
 	_roomVar.feather.tlaoxacUnconscious = true;
@@ -270,42 +270,42 @@ void Room::feather3TlaoxacKnockedOutFromRockThrow() {
 }
 
 void Room::feather3UsePhaser() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA3_023);
+	showText(TX_SPEAKER_SPOCK, 23, true);
 }
 
 void Room::feather3TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA3_005);
+	showText(TX_SPEAKER_MCCOY, 5, true);
 }
 
 void Room::feather3TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA3_022);
+	showText(TX_SPEAKER_SPOCK, 22, true);
 }
 
 void Room::feather3TalkToRedshirt() {
 	if (!_awayMission->redshirtDead)
-		showText(TX_SPEAKER_STRAGEY, TX_FEA3_032);
+		showText(TX_SPEAKER_STRAGEY, 32, true);
 }
 
 void Room::feather3TalkToTlaoxac() {
 	if (!_awayMission->feather.tlaoxacTestPassed && !_awayMission->redshirtDead && !_roomVar.feather.tlaoxacUnconscious) {
 		if (!_roomVar.feather.showedSnakeToTlaoxac)
-			showText(TX_SPEAKER_TLAOXAC, TX_FEA3_038);
+			showText(TX_SPEAKER_TLAOXAC, 38, true);
 		else if (_awayMission->feather.numRocksThrownAtTlaoxac != 0)
-			showText(TX_SPEAKER_TLAOXAC, TX_FEA3_038);
+			showText(TX_SPEAKER_TLAOXAC, 38, true);
 		else {
 			const TextRef choices[] = {
 				TX_SPEAKER_KIRK,
-				TX_FEA3_001, TX_FEA3_002, TX_FEA3_003,
+				1, 2, 3,
 				TX_BLANK
 			};
-			int choice = showMultipleTexts(choices);
+			int choice = showMultipleTexts(choices, true);
 
 			if (choice == 0)
-				showText(TX_SPEAKER_TLAOXAC, TX_FEA3_037);
+				showText(TX_SPEAKER_TLAOXAC, 37, true);
 			else if (choice == 1)
-				showText(TX_SPEAKER_TLAOXAC, TX_FEA3_042);
+				showText(TX_SPEAKER_TLAOXAC, 42, true);
 			else if (choice == 2) { // Accidentally insulted Quetzecoatl
-				showText(TX_SPEAKER_TLAOXAC, TX_FEA3_040);
+				showText(TX_SPEAKER_TLAOXAC, 40, true);
 				_awayMission->disableInput = true;
 				loadActorAnimC(OBJECT_TLAOXAC, "s5r3aj", -1, -1, &Room::feather3TlaoxacKilledRedshirt);
 				playMidiMusicTracks(2);
@@ -323,14 +323,14 @@ void Room::feather3TlaoxacKilledRedshirt() {
 
 void Room::feather3UseMTricorderOnTlaoxac() {
 	if (_roomVar.feather.tlaoxacUnconscious)
-		mccoyScan(DIR_W, TX_FEA3_010);
+		mccoyScan(DIR_W, 10, false, true);
 	else
-		mccoyScan(DIR_W, TX_FEA3_014);
+		mccoyScan(DIR_W, 14, false, true);
 }
 
 void Room::feather3UseMedkitOnTlaoxac() {
 	if (_awayMission->feather.knockedOutTlaoxac)
-		showText(TX_SPEAKER_MCCOY, TX_FEA3_012);
+		showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 void Room::feather3UseMedkitOnRedshirt() {
@@ -339,19 +339,19 @@ void Room::feather3UseMedkitOnRedshirt() {
 }
 
 void Room::feather3UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA3_006);
+	showText(TX_SPEAKER_MCCOY, 6, true);
 }
 
 void Room::feather3UseMTricorderOnLight() {
-	mccoyScan(DIR_W, TX_FEA3_013);
+	mccoyScan(DIR_W, 13, false, true);
 }
 
 void Room::feather3UseSTricorderOnLight() {
-	spockScan(DIR_W, TX_FEA3_019);
+	spockScan(DIR_W, 19, false, true);
 }
 
 void Room::feather3UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_FEA3_021);
+	spockScan(DIR_S, 21, false, true);
 }
 
 void Room::feather3GetKnife() {
@@ -373,40 +373,40 @@ void Room::feather3Timer1Expired() {
 void Room::feather3PickedUpKnife() {
 	_awayMission->disableInput = false;
 	loadActorStandAnim(OBJECT_KIRK);
-	showDescription(TX_FEA3N010);
+	showDescription(10, true);
 }
 
 void Room::feather3LookAtSpock() {
 	if (!_awayMission->feather.knockedOutTlaoxac && !_awayMission->feather.tlaoxacTestPassed)
-		showDescription(TX_FEA3N002);
+		showDescription(2, true);
 	else // ENHANCEMENT: Originally did nothing here. Fall back to default behaviour in the engine.
 		_awayMission->rdfStillDoDefaultAction = true;
 }
 
 void Room::feather3LookAtRedshirt() {
 	if (_awayMission->redshirtDead)
-		showDescription(TX_FEA3N005);
+		showDescription(5, true);
 	else
-		showDescription(TX_FEA3N012);
+		showDescription(12, true);
 }
 
 void Room::feather3LookAtTlaoxac() {
 	if (_awayMission->feather.knockedOutTlaoxac)
-		showDescription(TX_FEA3N003);
+		showDescription(3, true);
 	else
-		showDescription(TX_FEA3N007);
+		showDescription(7, true);
 }
 
 void Room::feather3LookAtLight() {
-	showDescription(TX_FEA3N001);
+	showDescription(1, true);
 }
 
 void Room::feather3LookAtMccoy() {
-	showDescription(TX_FEA3N000);
+	showDescription(0, true);
 }
 
 void Room::feather3LookAtKnife() {
-	showDescription(TX_FEA3N011);
+	showDescription(11, true);
 }
 
 }
diff --git a/engines/startrek/rooms/feather4.cpp b/engines/startrek/rooms/feather4.cpp
index 1118350706..7b883032cd 100644
--- a/engines/startrek/rooms/feather4.cpp
+++ b/engines/startrek/rooms/feather4.cpp
@@ -73,91 +73,91 @@ void Room::feather4Tick1() {
 }
 
 void Room::feather4UseCommunicator() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA4_005); // BUGFIX: Original played wrong audio file (TX_FEA4N008)
+	showText(TX_SPEAKER_MCCOY, 5, true); // BUGFIX: Original played wrong audio file (TX_FEA4N008)
 }
 
 void Room::feather4UsePhaser() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA4_011);
+	showText(TX_SPEAKER_SPOCK, 11, true);
 }
 
 void Room::feather4UseSTricorderOnLight() {
-	spockScan(DIR_W, TX_FEA4_010);
+	spockScan(DIR_W, 10, true);
 }
 
 void Room::feather4UseSTricorderOnMushroom() {
-	spockScan(DIR_W, TX_FEA4_012);
+	spockScan(DIR_W, 12, true);
 }
 
 void Room::feather4UseSTricorderOnFern() {
-	spockScan(DIR_W, TX_FEA4_009);
+	spockScan(DIR_W, 9, false, true);
 }
 
 void Room::feather4UseSTricorderAnywhere() {
-	spockScan(DIR_W, TX_FEA4_008);
+	spockScan(DIR_W, 8, false, true);
 }
 
 void Room::feather4UseMTricorderOnLight() {
-	mccoyScan(DIR_W, TX_FEA4_001);
+	mccoyScan(DIR_W, 1, false, true);
 }
 
 void Room::feather4UseMTricorderOnMushroom() {
-	mccoyScan(DIR_W, TX_FEA4_003);
+	mccoyScan(DIR_W, 3, false, true);
 }
 
 void Room::feather4UseMTricorderAnywhere() {
-	mccoyScan(DIR_W, TX_FEA4_006);
+	mccoyScan(DIR_W, 6, false, true);
 }
 
 void Room::feather4UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA4_002);
+	showText(TX_SPEAKER_MCCOY, 2, true);
 }
 
 void Room::feather4TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA4_004);
+	showText(TX_SPEAKER_MCCOY, 4, true);
 }
 
 void Room::feather4TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA4_007);
+	showText(TX_SPEAKER_SPOCK, 7, true);
 }
 
 void Room::feather4TalkToRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA4_013);
+	showText(TX_SPEAKER_STRAGEY, 13, true);
 }
 
 void Room::feather4LookAtEyes() {
-	showDescription(TX_FEA4N003);
+	showDescription(3, true);
 }
 
 void Room::feather4LookAnywhere() {
-	showDescription(TX_FEA4N008);
+	showDescription(8, true);
 }
 
 void Room::feather4LookAtMushroom() {
-	showDescription(TX_FEA4N001);
+	showDescription(1, true);
 }
 
 void Room::feather4LookAtFern() {
-	showDescription(TX_FEA4N000);
+	showDescription(0, true);
 }
 
 void Room::feather4LookAtLight() {
-	showDescription(TX_FEA4N002);
+	showDescription(2, true);
 }
 
 void Room::feather4LookAtKirk() {
-	showDescription(TX_FEA4N004);
+	showDescription(4, true);
 }
 
 void Room::feather4LookAtSpock() {
-	showDescription(TX_FEA4N007);
+	showDescription(7, true);
 }
 
 void Room::feather4LookAtMccoy() {
-	showDescription(TX_FEA4N006);
+	showDescription(6, true);
 }
 
 void Room::feather4LookAtRedshirt() {
-	showDescription(TX_FEA4N005);
+	showDescription(5, true);
 }
 
 }
diff --git a/engines/startrek/rooms/feather5.cpp b/engines/startrek/rooms/feather5.cpp
index 2f86a1e468..1ce527a035 100644
--- a/engines/startrek/rooms/feather5.cpp
+++ b/engines/startrek/rooms/feather5.cpp
@@ -126,27 +126,27 @@ void Room::feather5Tick1() {
 
 void Room::feather5TouchedHotspot0() { // Approached the log
 	if (!_awayMission->feather.waterMonsterRetreated) {
-		showText(TX_SPEAKER_SPOCK, TX_FEA5_005);
+		showText(TX_SPEAKER_SPOCK, 5, true);
 		if (!_awayMission->redshirtDead)
-			showText(TX_SPEAKER_STRAGEY, TX_FEA5_033);
+			showText(TX_SPEAKER_STRAGEY, 33, true);
 	}
 }
 
 void Room::feather5UseSpockOnFern() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_004);
+	showText(TX_SPEAKER_SPOCK, 4, true);
 }
 
 void Room::feather5UseMccoyOnFern() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA5_009);
+	showText(TX_SPEAKER_MCCOY, 9, true);
 }
 
 void Room::feather5UseRedshirtOnFern() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA5_035);
+	showText(TX_SPEAKER_STRAGEY, 35, true);
 }
 
 void Room::feather5UseRedshirtOnLeftExit() {
 	if (!_awayMission->feather.waterMonsterRetreated) {
-		showText(TX_SPEAKER_STRAGEY, TX_FEA5_034);
+		showText(TX_SPEAKER_STRAGEY, 34, true);
 		_awayMission->disableInput = true;
 		loadMapFile("feath5b");
 		walkCrewmanC(OBJECT_REDSHIRT, 0x8f, 0x64, &Room::feather5RedshirtReachedLog);
@@ -169,32 +169,32 @@ void Room::feather5RedshirtDeathFinished() {
 
 void Room::feather5UseSpockOnLeftExit() {
 	if (!_awayMission->feather.waterMonsterRetreated)
-		showText(TX_SPEAKER_SPOCK, TX_FEA5_002);
+		showText(TX_SPEAKER_SPOCK, 2, true);
 }
 
 void Room::feather5UseMccoyOnLeftExit() {
 	if (!_awayMission->feather.waterMonsterRetreated)
-		showText(TX_SPEAKER_MCCOY, TX_FEA5_015);
+		showText(TX_SPEAKER_MCCOY, 15, true);
 }
 
 void Room::feather5UseSnakeOnKirk() {
-	showText(TX_SPEAKER_KIRK, TX_FEA5N010);
+	showText(TX_SPEAKER_KIRK, 10, true);
 }
 
 void Room::feather5UseSnakeOnSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_032);
+	showText(TX_SPEAKER_SPOCK, 32, true);
 }
 
 void Room::feather5UseSnakeOnMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA5_020);
+	showText(TX_SPEAKER_MCCOY, 20, true);
 }
 
 void Room::feather5UseSnakeOnRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA5_040);
+	showText(TX_SPEAKER_STRAGEY, 40, true);
 }
 
 void Room::feather5UseSnakeOnWater() {
-	showDescription(TX_FEA5N011);
+	showDescription(11, true);
 	loseItem(OBJECT_ISNAKE);
 }
 
@@ -203,36 +203,36 @@ void Room::feather5UseKnifeOnKirk() {
 	// However, there is an unused audio file for text that otherwise only appears in the
 	// mac version. (DOS floppy version has yet another variation for this text.)
 	// We'll use that unused audio file here...
-	showText(TX_SPEAKER_KIRK, TX_FEA5_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::feather5UseKnifeOnSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_029);
+	showText(TX_SPEAKER_SPOCK, 29, true);
 }
 
 void Room::feather5UseKnifeOnMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA5_008);
+	showText(TX_SPEAKER_MCCOY, 8, true);
 }
 
 void Room::feather5UseKnifeOnRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA5_039);
+	showText(TX_SPEAKER_STRAGEY, 39, true);
 }
 
 void Room::feather5UseKnifeOnWater() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA5_018);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 }
 
 void Room::feather5UseKnifeOnMonster() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_006);
+	showText(TX_SPEAKER_SPOCK, 6, true);
 }
 
 void Room::feather5GetFern() {
-	showDescription(TX_FEA5N008);
+	showDescription(8, true);
 }
 
 void Room::feather5UseKnifeOnFern() {
 	if (_awayMission->feather.gotFern)
-		showDescription(TX_FEA5N015);
+		showDescription(15, true);
 	else {
 		walkCrewmanC(OBJECT_KIRK, 0x106, 0x8a, &Room::feather5ReachedFern);
 		_awayMission->disableInput = true;
@@ -280,141 +280,141 @@ void Room::feather5FernFellIntoWater() {
 }
 
 void Room::feather5Timer1Expired() { // Spock explains that the creature retreated
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_025);
+	showText(TX_SPEAKER_SPOCK, 25, true);
 }
 
 
 void Room::feather5UseRockOnSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_027);
+	showText(TX_SPEAKER_SPOCK, 27, true);
 }
 
 void Room::feather5UseRockOnMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA5_019);
+	showText(TX_SPEAKER_MCCOY, 19, true);
 }
 
 void Room::feather5UseRockOnRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA5_038);
+	showText(TX_SPEAKER_STRAGEY, 38, true);
 }
 
 void Room::feather5UseCrewmanOnThrownFern() {
 	// This might be unused? The object in question (OBJECT_THROWN_FERN) shouldn't be
 	// visible while player control is active.
-	showDescription(TX_FEA5N003);
+	showDescription(3, true);
 }
 
 void Room::feather5UseSpockOnMonster() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_003);
+	showText(TX_SPEAKER_SPOCK, 3, true);
 }
 
 void Room::feather5UseMccoyOnMonster() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA5_016);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::feather5UseRedshirtOnMonster() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA5_037);
+	showText(TX_SPEAKER_STRAGEY, 37, true);
 }
 
 void Room::feather5UsePhaser() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_028);
+	showText(TX_SPEAKER_SPOCK, 28, true);
 }
 
 void Room::feather5LookAnywhere() {
-	showDescription(TX_FEA5N012);
+	showDescription(12, true);
 }
 
 void Room::feather5LookAtLog() {
-	showDescription(TX_FEA5N007);
+	showDescription(7, true);
 }
 
 void Room::feather5LookAtWater() {
-	showDescription(TX_FEA5N009);
+	showDescription(9, true);
 }
 
 void Room::feather5LookAtFern() {
-	showDescription(TX_FEA5N014);
+	showDescription(14, true);
 }
 
 void Room::feather5LookAtInsects() {
-	showDescription(TX_FEA5N005);
+	showDescription(5, true);
 }
 
 void Room::feather5LookAtCave() {
-	showDescription(TX_FEA5N013);
+	showDescription(13, true);
 }
 
 void Room::feather5LookAtMonster() {
-	showDescription(TX_FEA5N000);
+	showDescription(0, true);
 }
 
 void Room::feather5LookAtSpock() {
-	showDescription(TX_FEA5N006);
+	showDescription(6, true);
 }
 
 void Room::feather5LookAtKirk() {
 	if (!_awayMission->feather.waterMonsterRetreated)
-		showDescription(TX_FEA5N001);
+		showDescription(1, true);
 	else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing
 		_awayMission->rdfStillDoDefaultAction = true;
 }
 
 void Room::feather5LookAtMccoy() {
 	if (!_awayMission->feather.waterMonsterRetreated)
-		showDescription(TX_FEA5N002);
+		showDescription(2, true);
 	else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing
 		_awayMission->rdfStillDoDefaultAction = true;
 }
 
 void Room::feather5LookAtRedshirt() {
 	if (!_awayMission->feather.waterMonsterRetreated)
-		showDescription(TX_FEA5N004);
+		showDescription(4, true);
 	else // ENHANCEMENT: Fall back to default behaviour instead of doing nothing
 		_awayMission->rdfStillDoDefaultAction = true;
 }
 
 void Room::feather5TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA5_007);
+	showText(TX_SPEAKER_MCCOY, 7, true);
 }
 
 void Room::feather5TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA5_022);
+	showText(TX_SPEAKER_SPOCK, 22, true);
 }
 
 void Room::feather5TalkToRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA5_036);
+	showText(TX_SPEAKER_STRAGEY, 36, true);
 }
 
 void Room::feather5UseMTricorderOnWater() {
 	if (_awayMission->feather.waterMonsterRetreated)
-		mccoyScan(DIR_W, TX_FEA5_011);
+		mccoyScan(DIR_W, 11, false, true);
 	else
-		mccoyScan(DIR_W, TX_FEA5_014);
+		mccoyScan(DIR_W, 14, false, true);
 }
 
 void Room::feather5UseMTricorderOnMonster() {
-	mccoyScan(DIR_W, TX_FEA5_013);
+	mccoyScan(DIR_W, 13, false, true);
 }
 
 void Room::feather5UseSTricorderOnMonster() {
-	spockScan(DIR_W, TX_FEA5_024);
+	spockScan(DIR_W, 24, false, true);
 }
 
 void Room::feather5UseSTricorderAnywhere() {
-	spockScan(DIR_W, TX_FEA5_026);
+	spockScan(DIR_W, 26, false, true);
 }
 
 void Room::feather5UseSTricorderOnWater() {
 	if (_awayMission->feather.waterMonsterRetreated)
-		spockScan(DIR_W, TX_FEA5_031);
+		spockScan(DIR_W, 31, false, true);
 	else
-		spockScan(DIR_W, TX_FEA5_030);
+		spockScan(DIR_W, 30, false, true);
 }
 
 void Room::feather5UseSTricorderOnFern() {
-	spockScan(DIR_N, TX_FEA5_023);
+	spockScan(DIR_N, 23, false, true);
 }
 
 void Room::feather5UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA5_010);
+	showText(TX_SPEAKER_MCCOY, 10, true);
 }
 
 }
diff --git a/engines/startrek/rooms/feather6.cpp b/engines/startrek/rooms/feather6.cpp
index dba3f42f99..65935be31c 100644
--- a/engines/startrek/rooms/feather6.cpp
+++ b/engines/startrek/rooms/feather6.cpp
@@ -109,19 +109,19 @@ void Room::feather6Tick1() {
 }
 
 void Room::feather6TouchedHotspot0() { // McCoy warns you not to go back to the river
-	showText(TX_SPEAKER_MCCOY, TX_FEA6_014);
+	showText(TX_SPEAKER_MCCOY, 14, true);
 }
 
 void Room::feather6UseSpockOnCrystals() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA6_020);
+	showText(TX_SPEAKER_SPOCK, 20, true);
 }
 
 void Room::feather6UseMccoyOnCrystals() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA6_009);
+	showText(TX_SPEAKER_MCCOY, 9, true);
 }
 
 void Room::feather6UseRedshirtOnCrystals() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA6_040);
+	showText(TX_SPEAKER_STRAGEY, 40, true);
 }
 
 
@@ -146,8 +146,8 @@ void Room::feather6KirkDiedFromStalactites() {
 	_awayMission->feather.missionScore -= 3;
 	_awayMission->feather.diedFromStalactites = true;
 	_awayMission->disableInput = false;
-	showDescription(TX_FEA6N000);
-	showDescription(TX_FEA6N004);
+	showDescription(0, true);
+	showDescription(4, true);
 	loadRoomIndex(7, 5);
 }
 
@@ -174,7 +174,7 @@ void Room::feather6Tick() {
 void Room::feather6HitCrystalsWithRockFirstTime() {
 	_awayMission->disableInput = false;
 	loadActorStandAnim(OBJECT_KIRK);
-	showText(TX_SPEAKER_KIRK, TX_FEA6_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::feather6HitCrystalsWithRockSecondTime() {
@@ -184,180 +184,180 @@ void Room::feather6HitCrystalsWithRockSecondTime() {
 }
 
 void Room::feather6UseRockOnStalagmites() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA6_019);
+	showText(TX_SPEAKER_SPOCK, 19, true);
 }
 
 void Room::feather6UseRockAnywhere() {
 	// ENHANCEMENT: There were two implementations of this function. The first (which took
 	// precedence) showed TX_FEA6N009, a generic "nothing happens" text. The second is
 	// Spock advising you not to use rocks, which is more interesting.
-	showText(TX_SPEAKER_SPOCK, TX_FEA6_021);
+	showText(TX_SPEAKER_SPOCK, 21, true);
 }
 
 void Room::feather6UseKnifeOnStalagmites() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA6_028);
+	showText(TX_SPEAKER_SPOCK, 28, true);
 }
 
 void Room::feather6UseKnifeAnywhere() {
-	showDescription(TX_FEA6N010);
+	showDescription(10, true);
 }
 
 void Room::feather6UseKnifeOnMccoy() {
 	// BUG: Stragey could be dead...
-	showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+	showText(TX_SPEAKER_STRAGEY, 39, true); // BUGFIX: Speaker is Stragey (not Spock)
 }
 
 void Room::feather6UseKnifeOnSpock() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+	showText(TX_SPEAKER_STRAGEY, 39, true); // BUGFIX: Speaker is Stragey (not Spock)
 }
 
 void Room::feather6UseKnifeOnRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA6_039); // BUGFIX: Speaker is Stragey (not Spock)
+	showText(TX_SPEAKER_STRAGEY, 39, true); // BUGFIX: Speaker is Stragey (not Spock)
 }
 
 void Room::feather6UseCrystalAnywhere() {
-	showDescription(TX_FEA6N015);
+	showDescription(15, true);
 }
 
 void Room::feather6UseSnakeAnywhere() {
-	showDescription(TX_FEA6N001);
+	showDescription(1, true);
 }
 
 void Room::feather6UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA6_011);
+	showText(TX_SPEAKER_MCCOY, 11, true);
 }
 
 void Room::feather6UsePhaser() {
-	showText(TX_SPEAKER_SPOCK, TX_FEA6_023);
+	showText(TX_SPEAKER_SPOCK, 23, true);
 }
 
 void Room::feather6LookAtEastExit() {
-	showDescription(TX_FEA6N016);
+	showDescription(16, true);
 }
 
 void Room::feather6LookAnywhere() {
-	showDescription(TX_FEA6N003);
+	showDescription(3, true);
 }
 
 void Room::feather6LookAtRocks() {
-	showDescription(TX_FEA6N014);
+	showDescription(14, true);
 }
 
 void Room::feather6LookAtStalagmites() {
-	showDescription(TX_FEA6N013);
+	showDescription(13, true);
 }
 
 void Room::feather6LookAtCrystals() {
-	showDescription(TX_FEA6N005);
+	showDescription(5, true);
 }
 
 void Room::feather6LookAtKirk() {
-	showDescription(TX_FEA6N007);
+	showDescription(7, true);
 }
 
 void Room::feather6LookAtSpock() {
-	showDescription(TX_FEA6N011);
+	showDescription(11, true);
 }
 
 void Room::feather6LookAtMccoy() {
-	showDescription(TX_FEA6N002);
+	showDescription(2, true);
 }
 
 void Room::feather6LookAtRedshirt() {
-	showDescription(TX_FEA6N008);
+	showDescription(8, true);
 }
 
 void Room::feather6LookAtStalactites() {
-	showDescription(TX_FEA6N012);
-	showText(TX_SPEAKER_SPOCK, TX_FEA6_034);
-	showText(TX_SPEAKER_MCCOY, TX_FEA6_017);
-	showText(TX_SPEAKER_SPOCK, TX_FEA6_033);
+	showDescription(12, true);
+	showText(TX_SPEAKER_SPOCK, 34, true);
+	showText(TX_SPEAKER_MCCOY, 17, true);
+	showText(TX_SPEAKER_SPOCK, 33, true);
 
 	// BUG: Choice 2 (TX_FEA6_004) doesn't match with audio at all.
 	const TextRef choices[] = {
 		TX_SPEAKER_KIRK,
-		TX_FEA6_008, TX_FEA6_006, TX_FEA6_004,
+		8, 6, 4,
 		TX_BLANK
 	};
-	int choice = showMultipleTexts(choices);
+	int choice = showMultipleTexts(choices, true);
 
 	if (choice == 0)
-		showText(TX_SPEAKER_SPOCK, TX_FEA6_032);
+		showText(TX_SPEAKER_SPOCK, 32, true);
 	else if (choice == 1)
-		showText(TX_SPEAKER_SPOCK, TX_FEA6_036);
+		showText(TX_SPEAKER_SPOCK, 36, true);
 	else
-		showText(TX_SPEAKER_SPOCK, TX_FEA6_037);
+		showText(TX_SPEAKER_SPOCK, 37, true);
 }
 
 void Room::feather6TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_FEA6_013);
+	showText(TX_SPEAKER_MCCOY, 13, true);
 }
 
 void Room::feather6TalkToRedshirt() {
-	showText(TX_SPEAKER_STRAGEY, TX_FEA6_042);
-	showText(TX_SPEAKER_KIRK,    TX_FEA6_002);
-	showText(TX_SPEAKER_STRAGEY, TX_FEA6_041);
-	showText(TX_SPEAKER_MCCOY,   TX_FEA6_016);
-	showText(TX_SPEAKER_STRAGEY, TX_FEA6_043);
+	showText(TX_SPEAKER_STRAGEY, 42, true);
+	showText(TX_SPEAKER_KIRK,    2, true);
+	showText(TX_SPEAKER_STRAGEY, 41, true);
+	showText(TX_SPEAKER_MCCOY,   16, true);
+	showText(TX_SPEAKER_STRAGEY, 43, true);
 }
 
 void Room::feather6TalkToSpock() {
 	if (!_awayMission->redshirtDead)
-		showText(TX_SPEAKER_SPOCK, TX_FEA6_035);
+		showText(TX_SPEAKER_SPOCK, 35, true);
 	else {
-		showText(TX_SPEAKER_SPOCK, TX_FEA6_038);
+		showText(TX_SPEAKER_SPOCK, 38, true);
 
 		const TextRef choices[] = {
 			TX_SPEAKER_KIRK,
-			TX_FEA6_003, TX_FEA6_005, TX_FEA6_007,
+			3, 5, 7,
 			TX_BLANK
 		};
-		int choice = showMultipleTexts(choices);
+		int choice = showMultipleTexts(choices, true);
 
 		if (choice == 0)
-			showText(TX_SPEAKER_SPOCK, TX_FEA6_029);
+			showText(TX_SPEAKER_SPOCK, 29, true);
 		else if (choice == 1)
-			showText(TX_SPEAKER_SPOCK, TX_FEA6_030);
+			showText(TX_SPEAKER_SPOCK, 30, true);
 		else
-			showText(TX_SPEAKER_SPOCK, TX_FEA6_031);
+			showText(TX_SPEAKER_SPOCK, 31, true);
 	}
 }
 
 void Room::feather6UseMTricorderOnEastExit() {
-	mccoyScan(DIR_E, TX_FEA6_012);
+	mccoyScan(DIR_E, 12, false, true);
 }
 
 void Room::feather6UseMTricorderOnRocks() {
 	// ENHANCEMENT: Original didn't play tricorder noise, etc
-	mccoyScan(DIR_E, TX_FEA6_015);
+	mccoyScan(DIR_E, 15, false, true);
 }
 
 void Room::feather6UseSTricorderOnEastExit() {
-	spockScan(DIR_E, TX_FEA6_024);
+	spockScan(DIR_E, 24, false, true);
 }
 
 void Room::feather6UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_FEA6_022);
+	spockScan(DIR_S, 22, false, true);
 }
 
 void Room::feather6UseSTricorderOnRocks() {
-	spockScan(DIR_N, TX_FEA6_018);
+	spockScan(DIR_N, 18, false, true);
 }
 
 void Room::feather6UseSTricorderOnCrystals() {
-	spockScan(DIR_N, TX_FEA6_027);
+	spockScan(DIR_N, 27, false, true);
 }
 
 void Room::feather6UseSTricorderOnStalactites() {
-	spockScan(DIR_N, TX_FEA6_025);
+	spockScan(DIR_N, 25, false, true);
 }
 
 void Room::feather6UseSTricorderOnStalagmites() {
-	spockScan(DIR_N, TX_FEA6_026);
+	spockScan(DIR_N, 26, false, true);
 }
 
 void Room::feather6GetCrystals() {
-	showDescription(TX_FEA6N020);
+	showDescription(20, true);
 }
 
 void Room::feather6UseKnifeOnCrystals() {
@@ -375,7 +375,7 @@ void Room::feather6DoneCuttingCrystals() {
 	loadActorStandAnim(OBJECT_KIRK);
 	_awayMission->feather.missionScore += 1;
 	giveItem(OBJECT_ICRYSTAL);
-	showDescription(TX_FEA6N017);
+	showDescription(17, true);
 }
 
 void Room::feather6Timer4Expired() { // Crystal disappears when timer 4 expires
diff --git a/engines/startrek/rooms/feather7.cpp b/engines/startrek/rooms/feather7.cpp
index fcd213d6e8..21973d4906 100644
--- a/engines/startrek/rooms/feather7.cpp
+++ b/engines/startrek/rooms/feather7.cpp
@@ -49,19 +49,19 @@ void Room::feather7Tick1() {
 
 void Room::feather7Tick40() {
 	if (_awayMission->feather.diedFromStalactites)
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_017);
+		showText(TX_SPEAKER_QUETZECOATL, 17, true);
 
-	showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_022);
+	showText(TX_SPEAKER_QUETZECOATL, 22, true);
 
 	if (_awayMission->redshirtDead)
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_021);
+		showText(TX_SPEAKER_QUETZECOATL, 21, true);
 
 	// BUGFIX: Show this even if redshirt isn't dead (he wishes you wouldn't have knocked
 	// out Tlaoxac)
 	if (_awayMission->feather.knockedOutTlaoxac)
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_023);
+		showText(TX_SPEAKER_QUETZECOATL, 23, true);
 
-	showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_027);
+	showText(TX_SPEAKER_QUETZECOATL, 27, true);
 
 	walkCrewmanC(OBJECT_KIRK, 0x6c, 0x93, &Room::feather7KirkReachedSeat);
 	walkCrewmanC(OBJECT_SPOCK, 0xbb, 0x8c, &Room::feather7SpockReachedSeat);
@@ -88,57 +88,57 @@ void Room::feather7QuetzecoatlReachedSeat() {
 void Room::feather7KirkSatDown() {
 	const TextRef choices1[] = {
 		TX_SPEAKER_KIRK,
-		TX_FEA7_005, TX_FEA7_006, TX_FEA7_010,
+		5, 6, 10,
 		TX_BLANK
 	};
-	int choice = showMultipleTexts(choices1);
+	int choice = showMultipleTexts(choices1, true);
 
 	if (choice == 0) {
 		_roomVar.feather.insultedQuetzecoatl = true;
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_020);
+		showText(TX_SPEAKER_QUETZECOATL, 20, true);
 	} else if (choice == 1)
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_019);
+		showText(TX_SPEAKER_QUETZECOATL, 19, true);
 	else
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_016);
+		showText(TX_SPEAKER_QUETZECOATL, 16, true);
 
-	showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_029);
+	showText(TX_SPEAKER_QUETZECOATL, 29, true);
 
 	const TextRef choices2[] = {
 		TX_SPEAKER_KIRK,
-		TX_FEA7_007, TX_FEA7_004, TX_FEA7_012,
+		7, 4, 12,
 		TX_BLANK
 	};
-	choice = showMultipleTexts(choices2);
+	choice = showMultipleTexts(choices2, true);
 
 	if (choice == 0) {
 		_roomVar.feather.insultedQuetzecoatl = true;
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_030);
+		showText(TX_SPEAKER_QUETZECOATL, 30, true);
 	} else if (choice == 1)
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_018);
+		showText(TX_SPEAKER_QUETZECOATL, 18, true);
 	else {
 		_roomVar.feather.insultedQuetzecoatl = true;
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_026);
+		showText(TX_SPEAKER_QUETZECOATL, 26, true);
 	}
 
-	showText(TX_SPEAKER_SPOCK, TX_FEA7_014);
-	showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_024);
+	showText(TX_SPEAKER_SPOCK, 14, true);
+	showText(TX_SPEAKER_QUETZECOATL, 24, true);
 
 	const TextRef choices3[] = {
 		TX_SPEAKER_KIRK,
-		TX_FEA7_008, TX_FEA7_009, TX_FEA7_011,
+		8, 9, 11,
 		TX_BLANK
 	};
-	choice = showMultipleTexts(choices3);
+	choice = showMultipleTexts(choices3, true);
 
 	if (choice == 0) {
 		_roomVar.feather.insultedQuetzecoatl = true;
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_025);
+		showText(TX_SPEAKER_QUETZECOATL, 25, true);
 	} else if (choice == 1)
-		showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_028);
+		showText(TX_SPEAKER_QUETZECOATL, 28, true);
 
-	showText(TX_SPEAKER_QUETZECOATL, TX_FEA7_015);
-	showText(TX_SPEAKER_MCCOY, TX_FEA7_013);
-	showText(TX_SPEAKER_KIRK, TX_FEA7_003);
+	showText(TX_SPEAKER_QUETZECOATL, 15, true);
+	showText(TX_SPEAKER_MCCOY, 13, true);
+	showText(TX_SPEAKER_KIRK, 3, true);
 
 	loadActorAnimC(OBJECT_KIRK, "s5r7ku", -1, -1, &Room::feather7ReadyToBeamOut);
 	loadActorAnim2(OBJECT_SPOCK, "s5r7su");
@@ -147,10 +147,10 @@ void Room::feather7KirkSatDown() {
 
 void Room::feather7ReadyToBeamOut() {
 	if (_awayMission->redshirtDead)
-		showText(TX_SPEAKER_KIRK, TX_FEA7_002);
+		showText(TX_SPEAKER_KIRK, 2, true);
 	else {
 		_awayMission->feather.missionScore += 1;
-		showText(TX_SPEAKER_KIRK, TX_FEA7_001);
+		showText(TX_SPEAKER_KIRK, 1, true);
 	}
 
 	if (!_roomVar.feather.insultedQuetzecoatl)
diff --git a/engines/startrek/text.cpp b/engines/startrek/text.cpp
index 36ac32e76b..1257c5426e 100644
--- a/engines/startrek/text.cpp
+++ b/engines/startrek/text.cpp
@@ -144,389 +144,9 @@ extern const char *const g_gameStrings[] = {
 	"#MUD4\\MUD4_S02#The Elasi pirates have been driven off, Captain. We have damage, and injuries among the crew. We just arrived back here a few minutes ago, and we've been trying to raise you on the communicators.",
 	"#MUD4\\MUD4_S03#The neutron star is causing more and more problems, Captain.  I would recommend beaming over at your earliest possible convenience.",
 	"#MUD4\\MUD4_S04#We can do it, Captain, no problem. At least right now, but the situation is only going to get worse. Are you ready to beam over now?",
-
-	"#FEA0\\FEA0_002#And exactly what would you have done with them? Entering Klingon space for anything puts the peace in peril.",
-	"#FEA0\\FEA0_003#And then your followers were destroyed because when white men arrived on that continent, they were believed to be you in your promised return. Your people perverted your teachings, then were destroyed by it.",
-	"#FEA0\\FEA0_004#Damned right the results were swift. The Klingons have been raiding colonies looking for you.",
-	"#FEA0\\FEA0_005#Ha! You mean your followers love pieces! They slaughtered other believers hoping you'd return.",
-	"#FEA0\\FEA0_006#I am Captain James T. Kirk of the Starship Enterprise. Did you know the Klingons are looking for you?",
-	"#FEA0\\FEA0_007#I am Captain James T. Kirk of the Starship Enterprise. What did you do to get the Klingons so upset?",
-	"#FEA0\\FEA0_008#Listen, the Klingons are ripping colonies apart to find you, so stop this nonsense. This is serious.",
-	"#FEA0\\FEA0_009#Listen, Mister, any missions conducted within Klingon space fully jeopardize the peace.",
-	"#FEA0\\FEA0_010#Quetzecoatl? How fitting you would name yourself after one of the most bloody-handed gods in Earth's history.",
-	"#FEA0\\FEA0_011#We're not your children and we don't appreciate this wild goose chase you've forced us into.",
-	"#FEA0\\FEA0_012#Whatever you did has them very upset. They're raiding worlds looking for you.",
-	"#FEA0\\FEA0_013#Your followers regularly sacrificed other believers to you after you left, offering you their still-beating hearts.",
-	"#FEA0\\FEA0_014#Your people? We represent all of the Earth's people and we certainly do not recognize you.",
-	"#FEA0\\FEA0_015#He appears human... All life signs are normal, but I'm getting strange energy readings near the base of his pituitary gland.",
-	"#FEA0\\FEA0_016#Ouch!",
-	"#FEA0\\FEA0_017#Jim, that man is dressed in ancient Aztec clothing.",
-	"#FEA0\\FEA0_018#What do you know about Earth culture? He looks like an ancient Aztec!",
-	"#FEA0\\FEA0_019#I am picking up multiple life forms in the surrounding region, Captain.",
-	"#FEA0\\FEA0_020#I am picking up strange energy readings from the alien.  Perhaps Doctor McCoy could provide better data.",
-	"#FEA0\\FEA0_021#I believe you are mistaken, doctor. His clothing bears a distinct resemblance to fashions of a much later period.",
-	"#FEA0\\FEA0_022#The humanoid's adornments appear similar to those worn by leaders of Earth's early 20th century inhabitants of the South American continent.",
-	"#FEA0\\FEA0_023#I'm just a security officer, sir.",
-	"#FEA0\\FEA0_024#I am Quetzecoatl. I elevated a civilization on your world from barbarism to sentience. You are a perversion of that process. Be gone!",
-	"#FEA0\\FEA0_025#You dare fire at a god?",
-	"#FEA0\\FEA0_026#Bloody-handed? My people love peace!",
-	"#FEA0\\FEA0_027#Foul lying creatures, my gift was wasted upon you! Begone.",
-	"#FEA0\\FEA0_028#Greetings, my children. I can barely imagine that you have come so far.",
-	"#FEA0\\FEA0_029#Impossible! You must be lying!",
-	"#FEA0\\FEA0_030#Jeopardize the peace? Hardly. Peace is what I preach. I am Quetzecoatl, as you well know from the proud history of your world.",
-	"#FEA0\\FEA0_031#Quaint expression. I have done nothing to anger them. I did with them what I have done with everyone.",
-	"#FEA0\\FEA0_032#The Klingons? Amazing! This is the first time one of my missions has produced results so swiftly.",
-	"#FEA0\\FEA0_033#Who are you? I know you come from Terrasol, but you are not of my people. What goes on here?",
-	"#FEA0\\FEA0_101#No, you must be lying. They could not be raiding if they are looking for me. Violence was not the message of any of my missions. I, Quetzecoatl, preach universal brotherhood and peace.",
-	"#FEA0\\FEA0_108#Everyone is healthy, Jim, there's no need for the medical kit here.",
-	"#FEA0\\FEA0N000#Feral red eyes glare out of the dark at you.",
-	"#FEA0\\FEA0N001#It looks like the jungle has grown up into a small hut.",
-	"#FEA0\\FEA0N002#Lt. Stragey is carefully eyeing the humanoid.",
-	"#FEA0\\FEA0N003#Luminescent insects swarm near a large tree.",
-	"#FEA0\\FEA0N004#McCoy is fidgeting around.",
-	"#FEA0\\FEA0N005#Spock is analyzing the surroundings.",
-	"#FEA0\\FEA0N006#The log appears sturdy enough to cross.",
-	"#FEA0\\FEA0N007#The moon of Digifal. Legend says that the gods of good and evil fortune live there and will glance back at those who look at them, and either a miracle or a catastrophe will soon befall those who gaze upon it.",
-	"#FEA0\\FEA0N008#There is a tall, slender, dark haired man looking intently at you.",
-	"#FEA0\\FEA0N009#You see dense vegetation in all directions.",
-
-
-	"#FEA1\\FEA1_001#We wouldn't want to bleed all over Dr. McCoy now, would we?",
-	"#FEA1\\FEA1_002#Well, yes.",
-	"#FEA1\\FEA1_003#A pile of small igneous rocks, Captain.",
-	"#FEA1\\FEA1_004#And get my fingers taken off by some alien reptile? You've got to be joking.",
-	"#FEA1\\FEA1_005#Are you nuts? There's no way I'm touching any damned snake!",
-	"#FEA1\\FEA1_006#Do I look like Houdini to you? I'm afraid you're going to have to pull the rabbit out of the hat on this one.",
-	"#FEA1\\FEA1_007#Does it look sick to you, Captain?",
-	"#FEA1\\FEA1_008#Everyone is healthy, Jim, there's no need for the medical kit here.",
-	"#FEA1\\FEA1_009#Hey! What was that for?",
-	"#FEA1\\FEA1_010#I'm not putting my fingers in there, Jim.",
-	"#FEA1\\FEA1_011#It's a damned hole with a snake in it.",
-	"#FEA1\\FEA1_012#It's a damned hole.",
-	"#FEA1\\FEA1_013#It's bad enough that you put me in the damn transporter, now you want me to break my neck climbing that?!",
-	"#FEA1\\FEA1_014#It's moss. Anyone got any rolling stones?",
-	"#FEA1\\FEA1_015#No toxic reaction. It appears to be ordinary, except for this resin.",
-	"#FEA1\\FEA1_017#Didn't they have baseball on Vulcan? Show us your fastball, Jim.",
-	"#FEA1\\FEA1_018#Especially that green Vulcan blood. The last thing I need is a pint of T-Negative blood all over my uniform.",
-	"#FEA1\\FEA1_019#It's a damned snake! Do you know what snakebite does? It can ruin your whole day.",
-	"#FEA1\\FEA1_020#It's bad enough being around pointy-eared Vulcans, now I have to listen to ensigns who think they can do my job!",
-	"#FEA1\\FEA1_021#Probability? That was a perfect pitch if I ever saw one.",
-	"#FEA1\\FEA1_022#The bite wasn't serious Captain. He'll be fine, but I would like to get him to sickbay in case there's some alien infection.",
-	"#FEA1\\FEA1_023#Fascinating. Our communicators have apparently been rendered ineffective.",
-	"#FEA1\\FEA1_024#I am picking up residual energy readings from the area where the alien's projection was.",
-	"#FEA1\\FEA1_025#I can not reach the snake, Captain.",
-	"#FEA1\\FEA1_026#I realize that humans form emotional bonds with pets, but I recommend tribbles.",
-	"#FEA1\\FEA1_027#I see no logic in searching an empty hole, Captain.",
-	"#FEA1\\FEA1_028#It is logical that an entity that professes to teach peace would render our phasers inoperative.",
-	"#FEA1\\FEA1_029#It looks like a Zamphorian pit snake. A rather common species in this region, noted by galactic herpatologists for their quickness. It is not venomous or dangerous to humans. ",
-	"#FEA1\\FEA1_030#It would appear that this is where the snake lives, Captain. It is currently inside.",
-	"#FEA1\\FEA1_031#It would appear that this is where the snake lives, Captain.",
-	"#FEA1\\FEA1_032#Thank you, Captain, but I assure you that I was giving this situation my fullest attention.",
-	"#FEA1\\FEA1_033#The resin does not seem to have any unusual properties.",
-	"#FEA1\\FEA1_034#The snake has gone back into the hole, Captain.",
-	"#FEA1\\FEA1_035#The snake is too quick to be easily grabbed before it retreats, Captain.", // TYPO
-	"#FEA1\\FEA1_037#This isn't very logical, but as you are human, it is quite understandable.", // TYPO
-	"#FEA1\\FEA1_038#This variety of moss seems to leave a very sticky resin behind. Perhaps to trap the large amounts of pollen from the plants on the surface, and use it as a secondary food source.",
-	"#FEA1\\FEA1_039#This vine is not likely to support our weight by itself, Captain. You would have to find some way to reinforce it.",
-	"#FEA1\\FEA1_040#Those vines would be useful to escape, if we could reach them.",
-	"#FEA1\\FEA1_041#A fascinating specimen, Captain, but I would be careful handling it. From the looks of it, it may have a nasty bite.", // TYPO
-	"#FEA1\\FEA1_042#Fascinating. It did appear to knock the vine down near to the point where one of us can reach it.",
-	"#FEA1\\FEA1_043#The probability of getting the vine on the second try was only 36.53%. Well done, Captain.",
-	"#FEA1\\FEA1_044#We are not likely to find a way out of this pit with humor, doctor. I suggest you concentrate your efforts to the problem at hand.",
-	"#FEA1\\FEA1_045#I'm glad I was taught pain-nullification techniques.",
-	"#FEA1\\FEA1_046#It doesn't seem to want to be grabbed, sir. It just slithers back to its hole.",
-	"#FEA1\\FEA1_047#It's coming out again, sir.",
-	"#FEA1\\FEA1_048#No enemies in sight, but supplies could be a problem if we don't get out.",
-	"#FEA1\\FEA1_049#Sure is sticky sir. I can't see much use in it.",
-	"#FEA1\\FEA1_050#That's something of a runt, Captain. You should've seen this Rigilian python that Cadet Tyrli put in the shower at the Academy. Twenty meters long!",
-	"#FEA1\\FEA1_051#The hole is empty, sir.",
-	"#FEA1\\FEA1_052#There's no way that we're getting up that way, Captain.  The vine is too weak.",
-	"#FEA1\\FEA1_053#All Right! We're on our way!",
-	"#FEA1\\FEA1_054#Baseball? No one plays that anymore. Good try though, sir.",
-	"#FEA1\\FEA1_055#Do they always argue like this, Captain?",
-	"#FEA1\\FEA1_056#Doctors! It'll take more than a couple of scratches to put me out action, sir.",
-	"#FEA1\\FEA1_057#You clearly are not the inheritors of the noble Aztec world.  What you have said has greatly disturbed me. You should not lie so. You shall remain here until you have learned the error of angering Quetzecoatl!",
+	
 	"#FEA1\\FEA1_A46#There is not enough support, Captain.",
 	"#FEA1\\FEA1_F25#What on Earth are you doing with that slithering thing!",
-	"#FEA1\\FEA1N000#Feral red eyes glare out of the dark at you.",
-	"#FEA1\\FEA1N001#James T. Kirk does not seem very happy with his current predicament.",
-	"#FEA1\\FEA1N002#Lt. Stragey is carefully examining the pit.",
-	"#FEA1\\FEA1N003#McCoy is examining the floor of the pit.",
-	"#FEA1\\FEA1N004#Spock is carefully examining the pit.",
-	"#FEA1\\FEA1N005#The hole is already blocked.",
-	"#FEA1\\FEA1N006#The rock is a bit stickier.",
-	"#FEA1\\FEA1N007#The snake darts back into its hole before you can catch it.",
-	"#FEA1\\FEA1N008#The vine is attached to a tree above you.",
-	"#FEA1\\FEA1N009#The vine is not within reach.",
-	"#FEA1\\FEA1N010#The vine will not support you.",
-	"#FEA1\\FEA1N011#There are rocks here, quite suitable for picking up and throwing.",
-	"#FEA1\\FEA1N012#There are several loose vines hanging over the side of the pit, out of reach. This is one of them.",
-	"#FEA1\\FEA1N013#There is a light suspended from above by a chain.",
-	"#FEA1\\FEA1N014#There is a tiny hole in the wall at this point. Certainly no human could crawl through here.",
-	"#FEA1\\FEA1N015#There is a vine hanging down into the pit.",
-	"#FEA1\\FEA1N016#This moss is covered with a very sticky substance.",
-	"#FEA1\\FEA1N017#This particular snake doesn't seem to like your company, and moves whenever you get near it.",
-	"#FEA1\\FEA1N018#With no where for the snake to go, you easliy capture it.",
-	"#FEA1\\FEA1N019#You already have rocks.",
-	"#FEA1\\FEA1N020#You are in a deep pit. It is a long, hard climb to the top.",
-	"#FEA1\\FEA1N021#You cannot reach it from where you are.",
-	"#FEA1\\FEA1N022#You pick up some rocks from the pile.",
-
-
-	"#FEA2\\FEA2_001#Everyone is healthy, Jim, there's no need for the medical kit here.",
-	"#FEA2\\FEA2_002#Nothing interesting in this neck of the woods, Jim.",
-	"#FEA2\\FEA2_003#They're dead, Jim.",
-	"#FEA2\\FEA2_004#This jungle is sure lush, Jim. Speaking of lush, I could use a nice saurian brandy about now.",
-	"#FEA2\\FEA2_005#Really? Tell me more about your childhood Lieutenant...",
-	"#FEA2\\FEA2_006#Fascinating. Our communicators have apparently been rendered ineffective.",
-	"#FEA2\\FEA2_007#I am reading a life form to the west. It appears to be humanoid.",
-	"#FEA2\\FEA2_008#Staying in this overgrown region could prove quite dangerous. I suggest we continue, Captain.",
-	"#FEA2\\FEA2_009#I feel like someone is watching us, Captain.",
-	"#FEA2\\FEA2_010#You know, I always wanted to go swinging on a vine through a jungle. Just like in some old books I read when I was a kid.",
-	"#FEA2\\FEA2N000#A vine hangs from the trees.",
-	"#FEA2\\FEA2N001#Feral red eyes glare out of the dark at you.",
-	"#FEA2\\FEA2N002#Kirk is wondering what he said that made Quetzecoatl so angry...",
-	"#FEA2\\FEA2N003#Lt. Stragey appears fascinated by the vines hanging from the trees.",
-	"#FEA2\\FEA2N004#McCoy is filled with premonitions of injury and death. Why else would they have brought him along?",
-	"#FEA2\\FEA2N005#Spock is examining the surrounding terrain for signs of danger. Anything else would be illogical.",
-	"#FEA2\\FEA2N006#This great tree has been in this jungle for centuries.",
-	"#FEA2\\FEA2N007#Trees to the left of you! Trees to the right of you! Into the valley of trees raced the landing party!",
-	"#FEA2\\FEA2N008#You are in a densely vegetated area. The overgrowth blocks your view in all directions.",
-
-
-	"#FEA3\\FEA3_001#Well, does anyone have any suggestions?",
-	"#FEA3\\FEA3_002#Great Tlaoxac, I do not understand. Quetzecoatl says that his is the way of peace, yet you wish blood to be shed?",
-	"#FEA3\\FEA3_003#It is urgent that we speak to Quetzecoatl. His life may depend on it. Please stand aside and let us pass?",
-	"#FEA3\\FEA3_004#An intriguing solution Captain, but it is unlikely that he will accept green blood as a proper sacrifice.",
-	"#FEA3\\FEA3_005#Did you ever get the feeling that people don't like you?",
-	"#FEA3\\FEA3_006#Everyone is healthy, Jim, there's no need for the medical kit here.",
-	"#FEA3\\FEA3_007#Get that thing away from me!",
-	"#FEA3\\FEA3_008#He dropped a knife, Jim!",
-	"#FEA3\\FEA3_009#He's out cold, Jim.I don't think we'll have any more trouble from him.",
-	"#FEA3\\FEA3_010#He's unconscious, Jim.",
-	"#FEA3\\FEA3_011#Hey! What do you think you're doing?",
-	"#FEA3\\FEA3_012#Jim, he'll be up in about a half hour. If I wake him now he's liable to retalliate for your thoughtless actions.", // TYPO
-	"#FEA3\\FEA3_013#These lamps are made up of insects much like fireflies, Jim.",
-	"#FEA3\\FEA3_014#Well, either this Aztec is a real flesh and blood human being, or I'm going to be retired as soon as I get back to the Enterprise.",
-	"#FEA3\\FEA3_015#Damn. He noticed.",
-	"#FEA3\\FEA3_016#Isn't that what they said to David before he fought Goliath?",
-	"#FEA3\\FEA3_017#Well, then send in David!",
-	"#FEA3\\FEA3_018#What about your famous nerve pinch?",
-	"#FEA3\\FEA3_019#Fascinating. These lights are actually swarms of bio-luminescent insects. I wonder how they are controlled.",
-	"#FEA3\\FEA3_020#Interesting. From the angle of its fangs and the shape of its mouth, it might have had the ability to inject its prey with venom at one time.", // TYPO
-	"#FEA3\\FEA3_021#Nothing unusual here, Captain.",
-	"#FEA3\\FEA3_022#Perhaps our host will be more reasonable now. I recommend trying to locate him, Captain.",
-	"#FEA3\\FEA3_023#Still inoperative, Captain.",
-	"#FEA3\\FEA3_024#Still inoperative, Captain.",
-	"#FEA3\\FEA3_025#That is not a logical act, Captain.",
-	"#FEA3\\FEA3_026#Captain, I do not think that I can defeat him in personal combat.",
-	"#FEA3\\FEA3_027#Doctor, may I remind you that David defeated Goliath?",
-	"#FEA3\\FEA3_028#It is unlikely to work on a man of that size, doctor.",
-	"#FEA3\\FEA3_029#All right! Time for some action. Let me show you how we did it at the Acad... uh, Captain, do you realize how BIG this guy is?",
-	"#FEA3\\FEA3_030#sHe's dead, Jim!", // TYPO
-	"#FEA3\\FEA3_031#I'm really not that anxious to get a good look at it, sir.",
-	"#FEA3\\FEA3_032#Nice planet. I kinda like it.",
-	"#FEA3\\FEA3_033#Ouch, sir.",
-	"#FEA3\\FEA3_034#Well, there is a doctor here, so I guess it's all right. They never told me I'd be doing this at the Academy.",
-	"#FEA3\\FEA3_035#Get back! You may not pass until you prove your worthiness.",
-	"#FEA3\\FEA3_036#I am Tlaoxac, priest of Quetzecoatl. Only one who knows his ways may approach his holy ground.",
-	"#FEA3\\FEA3_037#I do not understand your words, but it does not matter. You may not pass until blood is shed.",
-	"#FEA3\\FEA3_038#I will not listen to your deceitful ways.",
-	"#FEA3\\FEA3_039#Indeed you know the ways of Quetzecoatl But only a man of courage, one who will shed blood will pass.",
-	"#FEA3\\FEA3_040#None can threaten the great Quetzecoatl! You lie! Truly you do not serve the serpent-god. You may not pass!",
-	"#FEA3\\FEA3_041#None shall pass until blood is shed.", // TYPO
-	"#FEA3\\FEA3_042#Nonetheless, that is what must be done. Only men of courage are allowed into his presence.",
-	"#FEA3\\FEA3_043#Self-sacrifice is the noblest quality of humanity. You may go. Beware the monster in the water. You may have my knife to defend yourself.",
-	"#FEA3\\FEA3_044#You are truly a noble man, unlike the coward who was not capable of shedding his own blood. You may pass, but beware the man in the golden robe. He may lead you to your death. Use this knife to defend yourself.",
-	"#FEA3\\FEA3N000#McCoy seems rather nervous.",
-	"#FEA3\\FEA3N001#Primitive lights illuminate this savage scene.",
-	"#FEA3\\FEA3N002#Spock looks small compared to the great warrior.",
-	"#FEA3\\FEA3N003#The aztec warrior lies on the ground unconcious.",
-	"#FEA3\\FEA3N004#The snake enjoys snacking on you.",
-	"#FEA3\\FEA3N005#This was once a living member of your crew.",
-	"#FEA3\\FEA3N006#Tloaxac falls to the ground unconscious.",
-	"#FEA3\\FEA3N007#Towering over your security officer, holding a great spear in his huge hands, the great warrior Tlaoxac will let no one pass him.",
-	"#FEA3\\FEA3N010#You pick up the beautifully crafted knife.",
-	"#FEA3\\FEA3N011#You see a jewel encrusted, gold colored knife.",
-	"#FEA3\\FEA3N012#Your security officer looks at you for orders and, perhaps, inspiration.",
-
-
-	"#FEA4\\FEA4_001#A swarm of fireflies, Jim.",
-	"#FEA4\\FEA4_002#Everyone is healthy, Jim, there's no need for the medical kit here.",
-	"#FEA4\\FEA4_003#I would strongly recommend against touching these, Jim. They are highly toxic.",
-	"#FEA4\\FEA4_004#It's getting a little cool out here. Keep warm. I don't want a bunch of sick crewmen when we get back to the ship. If we ever do get back to the ship.",
-	"#FEA4\\FEA4_005#Still out, Jim.",
-	"#FEA4\\FEA4_006#You're looking a little pale, Jim.",
-	"#FEA4\\FEA4_007#Fascinating. The trees are able to grow very close together in this forest, Captain.",
-	"#FEA4\\FEA4_008#I am reading a life form to the west, Captain.",
-	"#FEA4\\FEA4_009#It vaguely resembles the Terran Spanish Bayonette. The edges of the leaf are razor sharp and secrete a poisonous resin.",
-	"#FEA4\\FEA4_010#Small colonies of bio-luminescent insects, Captain.",
-	"#FEA4\\FEA4_011#They are not currently operational, Captain.",
-	"#FEA4\\FEA4_012#Tralxacian mushrooms. Their spores are highly toxic and are released if they are disturbed.",
-	"#FEA4\\FEA4_013#Does every planetside mission have this much adventure, Captain? Mind you, I can't say Mr. Quetzecoatl is making a very good impression on me...",
-	"#FEA4\\FEA4N000#A large fern fans the pathway.",
-	"#FEA4\\FEA4N001#Below this rock is a large growth of mushrooms.",
-	"#FEA4\\FEA4N002#Familiar glowing spheres light the path.",
-	"#FEA4\\FEA4N003#Feral red eyes glare out of the dark at you.",
-	"#FEA4\\FEA4N004#James T. Kirk realizes that every step increases their danger.",
-	"#FEA4\\FEA4N005#Lt. Stragey smiles as he strolls down the path.",
-	"#FEA4\\FEA4N006#McCoy doesn't want to be bothered right now.",
-	"#FEA4\\FEA4N007#Mr. Spock analyzes the surroundings.",
-	"#FEA4\\FEA4N008#You are in a dark forest. You can hear the flow of water to the northwest.",
-
-
-	"#FEA5\\FEA5_001#This is a very finely crafted knife.",
-	"#FEA5\\FEA5_002#Captain, I believe it would be suicide to try crossing the log while the creature is near.",
-	"#FEA5\\FEA5_003#Captain, I do not believe that my service to Starfleet includes, as humans say, 'throwing my life away'.",
-	"#FEA5\\FEA5_004#Captain, I would recommend using something to cut the plant. There are numerous small thorns along the stem.",
-	"#FEA5\\FEA5_005#Captain, it would not be wise to cross while the creature is near.",
-	"#FEA5\\FEA5_006#Due to the small size of the knife, I doubt it would harm such a large creature.",
-	"#FEA5\\FEA5_007#Anyone for a campfire?",
-	"#FEA5\\FEA5_008#Captain, I'll declare you unfit to command if you keep this up!",
-	"#FEA5\\FEA5_009#Damn! That's gonna hurt Jim. Take a look at those thorns. You might try cutting that with something.", // TYPO
-	"#FEA5\\FEA5_010#Everyone is healthy, Jim, there's no need for the medical kit here.",
-	"#FEA5\\FEA5_011#I'm not reading that creature anymore, Jim.",
-	"#FEA5\\FEA5_013#It's some kind of squid, and it doesn't look very friendly.",
-	"#FEA5\\FEA5_014#Jim! There's some kind of an aquatic creature down there.",
-	"#FEA5\\FEA5_015#Jim, that's ludicrous!",
-	"#FEA5\\FEA5_016#Jim, we've been friends a long time, but... I mean... you're not serious?",
-	"#FEA5\\FEA5_018#Jim, with our phasers not working, we may need that knife to protect ourselves!", // TYPO
-	"#FEA5\\FEA5_019#This planet is starting to get to me. I'm sure something just hit me.",
-	"#FEA5\\FEA5_020#You weren't a snake handler in your previous life were you? I don't like snakes.", // TYPO
-	"#FEA5\\FEA5_021#Good throw, Captain. However, I think the creature was merely startled. It may return in a little while.",
-	"#FEA5\\FEA5_022#I recommend caution here, Captain.",
-	"#FEA5\\FEA5_023#It appears that the leaves are slightly toxic. I would not recommend touching it for an extended amount of time, Captain.",
-	"#FEA5\\FEA5_024#It is some kind of mollusk; the river seems to be its home, and it is carnivorous, eating land and river based forms of life.",
-	"#FEA5\\FEA5_025#It would appear that the plant secretes a chemical that is a natural repellent to the creature. It has retreated far down stream, Captain.",
-	"#FEA5\\FEA5_026#Nothing unusual here, Captain.",
-	"#FEA5\\FEA5_027#Please stop that Captain. I have enough distractions from Dr. McCoy.",
-	"#FEA5\\FEA5_028#Still inoperative, Captain.",
-	"#FEA5\\FEA5_029#Thank you Captain, but Vulcans do not use knives.",
-	"#FEA5\\FEA5_030#The tricorder registers a lifeform, a large marine creature, lurking just below the surface of the water.",
-	"#FEA5\\FEA5_031#The tricorder shows nothing unusual, Captain. The creature is still down stream.",
-	"#FEA5\\FEA5_032#Was there a reason for that, Captain?",
-	"#FEA5\\FEA5_033#Captain, perhaps I should try to cross first.",
-	"#FEA5\\FEA5_034#I'll give it a try, Captain.",
-	"#FEA5\\FEA5_035#It looks like that plant fights back sir. You might want to use something to cut it loose.",
-	"#FEA5\\FEA5_036#Reminds me of a planet I was stationed on once. The native girls were real friendly. Ensign Shou had his bachelor party there, great time. You ever been to Omicron Draconis, Captain?",
-	"#FEA5\\FEA5_037#Sir, I finished second in my weight class in wrestling at the Academy, but I don't think that thing's in my weight class.",
-	"#FEA5\\FEA5_038#Sir, you dropped your rock.",
-	"#FEA5\\FEA5_039#Thanks Captain, but I can take care of myself. I finished second in my weight class in wrestling at the Academy. You keep the knife.",
-	"#FEA5\\FEA5_040#You're weird, sir.",
-	"#FEA5\\FEA5N000#A pair of eyes are all that you can see of the rest of this creature. Most of it is hidden beneath the murky water.",
-	"#FEA5\\FEA5N001#Captain Kirk is looking at the big creature in the water.",
-	"#FEA5\\FEA5N002#Dr. McCoy is looking at the big creature in the water.",
-	"#FEA5\\FEA5N003#He will not do that.",
-	"#FEA5\\FEA5N004#Lt. Stragey is looking at the big creature in the water.",
-	"#FEA5\\FEA5N005#Luminescent insects swarm near a large tree.",
-	"#FEA5\\FEA5N006#Mr. Spock is looking ahead to a cave opening on the other side of the log.",
-	"#FEA5\\FEA5N007#The log looks quite old but sturdy.",
-	"#FEA5\\FEA5N008#The plant is tough. You will need something sharp to cut it.",
-	"#FEA5\\FEA5N009#The river water is too muddy to get an idea of its depth or what may be beneath the surface.",
-	"#FEA5\\FEA5N010#The snake bites you.",
-	"#FEA5\\FEA5N011#The snake disapears beneath the surface of the water.",
-	"#FEA5\\FEA5N012#There is a slow muddy river blocking your path. A strong thick log serves as a footbridge. The river is unmoving, and the heat and stillness are oppressive.",
-	"#FEA5\\FEA5N013#There seems to be a lit cave beyond the log.",
-	"#FEA5\\FEA5N014#This plant has a rather thick stem and prickly leaves.", // TYPO
-	"#FEA5\\FEA5N015#You already have a piece of the plant.",
-
-
-	"#FEA6\\FEA6_001#I think I can get it with a few more blows.",
-	"#FEA6\\FEA6_002#Have you ever made it up the face of Half Dome, Lieutenant?",
-	"#FEA6\\FEA6_003#Perhaps we should hold onto that hope, Mr. Spock, that a civilised being will not kill for trivial motives.",
-	"#FEA6\\FEA6_004#Sometimes I feel like I'm the Captain of a nursery school.",
-	"#FEA6\\FEA6_005#That creature was quite real Mr. Spock. We will discuss this with our host, when we see him.",
-	"#FEA6\\FEA6_006#Then, gentlemen, I would advise you to stop arguing.",
-	"#FEA6\\FEA6_007#Unfortunately, human history is full of people who did not practice what they preached. Quetzecoatl is just one in a long line of them.",
-	"#FEA6\\FEA6_008#Will you two morons stop arguing just once!",
-	"#FEA6\\FEA6_009#Damn it Jim, I'm a surgeon not a geologist.",
-	"#FEA6\\FEA6_011#Everyone is healthy, Jim, there's no need for the medical kit here.",
-	"#FEA6\\FEA6_012#It would appear that our tentacled friend wants dessert. You can't go back that way, unless you enjoy being eaten.",
-	"#FEA6\\FEA6_013#I've lost any appetite I may have had for squid, Jim.", // TYPO
-	"#FEA6\\FEA6_014#Jim! Going back across that river would be insane.",
-	"#FEA6\\FEA6_015#Well, they're not organic. What did you think they were, calcified tribbles?",
-	"#FEA6\\FEA6_016#Captains and security officers. They don't realize how fragile the human body can be.",
-	"#FEA6\\FEA6_017#Well isn't this just great!", // TYPO
-	"#FEA6\\FEA6_018#Fascinating. These rocks are limestone, but contain an unusually high content of heavy metals. There are dilithium crystals here, but in a very raw form.",
-	"#FEA6\\FEA6_019#I fail to see any logic in that action, Captain. It may also cause stalactites to fall.", // TYPO
-	"#FEA6\\FEA6_020#I would suggest using something to pry that loose, Captain.",
-	"#FEA6\\FEA6_021#It is unwise to use a rock here, Captain.",
-	"#FEA6\\FEA6_022#My tricorder indicates unusual energy patterns in this direction, Captain.",
-	"#FEA6\\FEA6_023#Still inoperative, Captain.",
-	"#FEA6\\FEA6_024#The creature is still there, Captain.",
-	"#FEA6\\FEA6_025#These stalactites were made from limestone deposits. They took millennia to form.",
-	"#FEA6\\FEA6_026#These stalagmites were made from limestone deposits. They took millennia to form.",
-	"#FEA6\\FEA6_027#This appears to be a formation of raw dilithium crystals, Captain.",
-	"#FEA6\\FEA6_028#This illogical action would only dull the knife.",
-	"#FEA6\\FEA6_029#Agreed, Captain.",
-	"#FEA6\\FEA6_030#This whole experience feels like a test. The equivalent of 20th Century earth lab rats running through a maze.",
-	"#FEA6\\FEA6_031#I would wait until we meet him before judging him, Captain.",
-	"#FEA6\\FEA6_032#Captain, I cannot speak for Dr. McCoy, but my intelligence quotient is far higher than humans...",
-	"#FEA6\\FEA6_033#Doctor, I would point out that your voice could also trigger such a collapse.",
-	"#FEA6\\FEA6_034#I should warn you that the stalactites could collapse quite easily. Any sudden motion could cause large quantities of stalactites to fall on us.",
-	"#FEA6\\FEA6_035#I would suggest we continue on, Captain. It would not be logical to endanger ourselves by remaining here.",
-	"#FEA6\\FEA6_036#It would seem to be a prudent course of action Captain, if Doctor McCoy would agree.",
-	"#FEA6\\FEA6_037#Really? That's fascinating Captain.",
-	"#FEA6\\FEA6_038#There is a contradiction, Captain. If Quetzecoatl is really an entity of peace, then Lt. Stragey should not have died.",
-	"#FEA6\\FEA6_039#Captain, have we done something wrong?",
-	"#FEA6\\FEA6_040#I don't think I'll be able to get a good grip sir. You might try prying it loose.",
-	"#FEA6\\FEA6_041#If we ever get back to Earth, one hundred credits says I'll beat you.",
-	"#FEA6\\FEA6_042#Reminds me of some spelunking I did on Hades IV. Ever do any climbing, Captain?",
-	"#FEA6\\FEA6_043#Sure we do. That's the challenge.",
-	"#FEA6\\FEA6N000#A stalagtite breaks through and falls. You are mortally injured and die.", // TYPO
-	"#FEA6\\FEA6N001#An interesting, but useless, manuever.",
-	"#FEA6\\FEA6N002#As usual, Dr. McCoy looks annoyed by the mission. ",
-	"#FEA6\\FEA6N003#Darkness, leading into the unknown.",
-	"#FEA6\\FEA6N004#However, a strange force envelopes your body...",
-	"#FEA6\\FEA6N005#It is a large cluster of crystals.",
-	"#FEA6\\FEA6N006#It's Game Over man...",
-	"#FEA6\\FEA6N007#James Kirk remembers the last time he was in a cave, and is glad that this one seems more peaceful.",
-	"#FEA6\\FEA6N008#Lieutenant Stragey looks nervously at the stalactites hovering precariously above you.",
-	"#FEA6\\FEA6N009#Nothing happens.",
-	"#FEA6\\FEA6N010#Nothing happens.",
-	"#FEA6\\FEA6N011#Spock is his usual stoic self.",
-	"#FEA6\\FEA6N012#Stalactites descend from the ceiling.",
-	"#FEA6\\FEA6N013#Stalagmites rise from the floor of the cave.",
-	"#FEA6\\FEA6N014#They appear to be ordinary rocks. Spock's tricorder might say otherwise.",
-	"#FEA6\\FEA6N015#This is one place where dilithium crystals don't seem to be very useful.",
-	"#FEA6\\FEA6N016#This is the way that you entered the cave. If you leave this way, the tentacled creature that attacked you will probably try to get a second course for its dinner.", // TYPO
-	"#FEA6\\FEA6N017#You have one dilithium crystal, in raw form.",
-	"#FEA6\\FEA6N020#You will need something to pry it loose.",
-	"#FEA6\\FEA6N028#You manage to pry loose one dilithium crystal.",
-	"#FEA6\\FEA6N029#You scratch your initials. No dilithium crystals were found.",
-
-
-	"#FEA7\\FEA7_001#Scotty, five to beam up.",
-	"#FEA7\\FEA7_002#Scotty, four to beam up.",
-	"#FEA7\\FEA7_003#You've got to do it, Bones! If the Klingons realize he's no longer a threat to them, perhaps we can avoid a war!",
-	"#FEA7\\FEA7_004#Absolutely. Your best intentions were changed by the imperfect humans that you left in charge after you departed. Such is the way of our race, I'm afraid.",
-	"#FEA7\\FEA7_005#I've had it up to here with so-called superior beings terrorizing my crew because we're so 'primitive'. Maybe you should see how primitive you are before you go around testing others.",
-	"#FEA7\\FEA7_006#One thing first. If you're so peaceful, how come the Aztecs were so violent and agressive?",
-	"#FEA7\\FEA7_007#The Federation is not in the business of lying, mister.",
-	"#FEA7\\FEA7_008#We're a technologically advanced starfaring race, what do you think? That we wouldn't have made progress in medicine?",
-	"#FEA7\\FEA7_009#With Dr. McCoy, I sometimes wonder, but yes, I would say we have made considerable advances.",
-	"#FEA7\\FEA7_010#Yes, I guess we do. Go on.",
-	"#FEA7\\FEA7_011#Yes, why do you ask?",
-	"#FEA7\\FEA7_012#You messed up in a big way. Perhaps you should try following the Prime Directive. It changed our lives.",
-	"#FEA7\\FEA7_013#Jim, I'll try, but the physiology is completely alien...",
-	"#FEA7\\FEA7_014#You show great wisdom, sir. But your statement implies that you wish to change your condition.",
-	"#FEA7\\FEA7_015#At the top of my spine is a gland not found in your species. This is the seat of my power. I wish you to remove it, thereby making me a mortal.",
-	"#FEA7\\FEA7_016#First, I have one question...",
-	"#FEA7\\FEA7_017#I am sorry you had to go through this ordeal. It was not meant for you to die.",
-	"#FEA7\\FEA7_018#I sense truth in this. Perhaps this is what happened to my children on the Klingon world of Hrakkour, which would explain why they are searching for me. I have clearly abused the power that was given me long ago.",
-	"#FEA7\\FEA7_019#I tried to teach them the concept of self-sacrifice. It would appear they did not completely understand my teachings.",
-	"#FEA7\\FEA7_020#I was not aware you had been tested before. My apologies.",
-	"#FEA7\\FEA7_021#I was particularly impressed by the sacrifice made by Lt. Stragey. Of course, I gave him back his life. He is now safely aboard your vessel.",
-	"#FEA7\\FEA7_022#I watched as you worked through the problems I set in your path. you are a valiant, intelligent species.",
-	"#FEA7\\FEA7_023#I would have been more impressed had you found a less violent solution. My children are dear to me. Even so, few choices remain to me.",
-	"#FEA7\\FEA7_024#Indeed. If my mission of peace was overthrown, then I am no longer worthy of my power. Tell me, has your species made progress in the medical arts?",
-	"#FEA7\\FEA7_025#Of course, how foolish of me. Still, there are cultures where medical knowledge is considered a sign of weakness. Warrior cultures, where nothing matters but physical strength. Survival of the foolish.",
-	"#FEA7\\FEA7_026#Ours is an intensely curious race, Captain. My brothers and I have raised children on a thousand worlds, loved them, watched them grow, only to see them become separated from us by the passage of time. It is sad and lonely process, one which I shall not repeat again. I am no longer worthy of my gift.",
-	"#FEA7\\FEA7_027#Please sit down. We have much to discuss.",
-	"#FEA7\\FEA7_028#Then I shall ask to make use of your advances.",
-	"#FEA7\\FEA7_029#You are clearly not the liars I thought you to be. Were you telling me the truth about my disciples? That they became ruthless savages?",
-	"#FEA7\\FEA7_030#Your harshness is unwarranted, but I sense truth in this. Perhaps this is what happened to my children on the Klingon world of Hrakkour, which would explain why they are searching for me. I have clearly abused the power that was given me long ago.",
-
 
 	"#TRI0\\TRI0_001#I want your word of honor, Vlict, that Quetzecoatl will not be harmed while we take these tests.",
 	"#TRI0\\TRI0_002#I've faced Klingons, both in personal and ship-to-ship combat. Your own records will confirm this. If I'm not worthy of their honors, why didn't they kill me?",
diff --git a/engines/startrek/text.h b/engines/startrek/text.h
index c022ce5794..5b1adc7748 100644
--- a/engines/startrek/text.h
+++ b/engines/startrek/text.h
@@ -204,397 +204,8 @@ enum GameStringIDs {
 	TX_MUD4_S03,
 	TX_MUD4_S04,
 
-	// MISSING
-	TX_FEA0_002,
-	TX_FEA0_003,
-	TX_FEA0_004,
-	TX_FEA0_005,
-	TX_FEA0_006,
-	TX_FEA0_007,
-	TX_FEA0_008,
-	TX_FEA0_009,
-	TX_FEA0_010,
-	TX_FEA0_011,
-	TX_FEA0_012,
-	TX_FEA0_013,
-	TX_FEA0_014,
-	TX_FEA0_015,
-	TX_FEA0_016,
-	TX_FEA0_017,
-	TX_FEA0_018,
-	TX_FEA0_019,
-	TX_FEA0_020,
-	TX_FEA0_021,
-	TX_FEA0_022,
-	TX_FEA0_023,
-	TX_FEA0_024,
-	TX_FEA0_025,
-	TX_FEA0_026,
-	TX_FEA0_027,
-	TX_FEA0_028,
-	TX_FEA0_029,
-	TX_FEA0_030,
-	TX_FEA0_031,
-	TX_FEA0_032,
-	TX_FEA0_033,
-	TX_FEA0_101,
-	TX_FEA0_108,
-	TX_FEA0N000,
-	TX_FEA0N001,
-	TX_FEA0N002,
-	TX_FEA0N003,
-	TX_FEA0N004,
-	TX_FEA0N005,
-	TX_FEA0N006,
-	TX_FEA0N007,
-	TX_FEA0N008,
-	TX_FEA0N009,
-
-
-	TX_FEA1_001,
-	TX_FEA1_002,
-	TX_FEA1_003,
-	TX_FEA1_004,
-	TX_FEA1_005,
-	TX_FEA1_006,
-	TX_FEA1_007,
-	TX_FEA1_008,
-	TX_FEA1_009,
-	TX_FEA1_010,
-	TX_FEA1_011,
-	TX_FEA1_012,
-	TX_FEA1_013,
-	TX_FEA1_014,
-	TX_FEA1_015,
-	// MISSING
-	TX_FEA1_017,
-	TX_FEA1_018,
-	TX_FEA1_019,
-	TX_FEA1_020, // UNUSED
-	TX_FEA1_021,
-	TX_FEA1_022, // UNUSED
-	TX_FEA1_023,
-	TX_FEA1_024,
-	TX_FEA1_025,
-	TX_FEA1_026,
-	TX_FEA1_027,
-	TX_FEA1_028,
-	TX_FEA1_029,
-	TX_FEA1_030,
-	TX_FEA1_031,
-	TX_FEA1_032,
-	TX_FEA1_033,
-	TX_FEA1_034,
-	TX_FEA1_035,
-	// MISSING
-	TX_FEA1_037,
-	TX_FEA1_038,
-	TX_FEA1_039,
-	TX_FEA1_040,
-	TX_FEA1_041,
-	TX_FEA1_042,
-	TX_FEA1_043,
-	TX_FEA1_044,
-	TX_FEA1_045,
-	TX_FEA1_046,
-	TX_FEA1_047,
-	TX_FEA1_048,
-	TX_FEA1_049,
-	TX_FEA1_050,
-	TX_FEA1_051,
-	TX_FEA1_052,
-	TX_FEA1_053,
-	TX_FEA1_054,
-	TX_FEA1_055,
-	TX_FEA1_056, // UNUSED
-	TX_FEA1_057,
 	TX_FEA1_A46,
 	TX_FEA1_F25,
-	TX_FEA1N000,
-	TX_FEA1N001,
-	TX_FEA1N002,
-	TX_FEA1N003,
-	TX_FEA1N004,
-	TX_FEA1N005,
-	TX_FEA1N006,
-	TX_FEA1N007, // UNUSED
-	TX_FEA1N008,
-	TX_FEA1N009,
-	TX_FEA1N010,
-	TX_FEA1N011,
-	TX_FEA1N012,
-	TX_FEA1N013,
-	TX_FEA1N014,
-	TX_FEA1N015,
-	TX_FEA1N016,
-	TX_FEA1N017,
-	TX_FEA1N018, // UNUSED
-	TX_FEA1N019,
-	TX_FEA1N020,
-	TX_FEA1N021,
-	TX_FEA1N022,
-
-
-	TX_FEA2_001,
-	TX_FEA2_002,
-	TX_FEA2_003,
-	TX_FEA2_004,
-	TX_FEA2_005,
-	TX_FEA2_006,
-	TX_FEA2_007,
-	TX_FEA2_008,
-	TX_FEA2_009,
-	TX_FEA2_010,
-	TX_FEA2N000,
-	TX_FEA2N001,
-	TX_FEA2N002,
-	TX_FEA2N003,
-	TX_FEA2N004,
-	TX_FEA2N005,
-	TX_FEA2N006,
-	TX_FEA2N007,
-	TX_FEA2N008,
-
-
-	TX_FEA3_001,
-	TX_FEA3_002,
-	TX_FEA3_003,
-	TX_FEA3_004,
-	TX_FEA3_005,
-	TX_FEA3_006,
-	TX_FEA3_007,
-	TX_FEA3_008,
-	TX_FEA3_009,
-	TX_FEA3_010,
-	TX_FEA3_011,
-	TX_FEA3_012,
-	TX_FEA3_013,
-	TX_FEA3_014,
-	TX_FEA3_015,
-	TX_FEA3_016,
-	TX_FEA3_017,
-	TX_FEA3_018,
-	TX_FEA3_019,
-	TX_FEA3_020,
-	TX_FEA3_021,
-	TX_FEA3_022,
-	TX_FEA3_023,
-	TX_FEA3_024,
-	TX_FEA3_025,
-	TX_FEA3_026,
-	TX_FEA3_027,
-	TX_FEA3_028,
-	TX_FEA3_029,
-	TX_FEA3_030,
-	TX_FEA3_031,
-	TX_FEA3_032,
-	TX_FEA3_033,
-	TX_FEA3_034,
-	TX_FEA3_035,
-	TX_FEA3_036,
-	TX_FEA3_037,
-	TX_FEA3_038,
-	TX_FEA3_039,
-	TX_FEA3_040,
-	TX_FEA3_041,
-	TX_FEA3_042,
-	TX_FEA3_043,
-	TX_FEA3_044,
-	TX_FEA3N000,
-	TX_FEA3N001,
-	TX_FEA3N002,
-	TX_FEA3N003,
-	TX_FEA3N004,
-	TX_FEA3N005,
-	TX_FEA3N006,
-	TX_FEA3N007,
-	// MISSING
-	TX_FEA3N010,
-	TX_FEA3N011,
-	TX_FEA3N012,
-
-
-	TX_FEA4_001,
-	TX_FEA4_002,
-	TX_FEA4_003,
-	TX_FEA4_004,
-	TX_FEA4_005,
-	TX_FEA4_006,
-	TX_FEA4_007,
-	TX_FEA4_008,
-	TX_FEA4_009,
-	TX_FEA4_010,
-	TX_FEA4_011,
-	TX_FEA4_012,
-	TX_FEA4_013,
-	TX_FEA4N000,
-	TX_FEA4N001,
-	TX_FEA4N002,
-	TX_FEA4N003,
-	TX_FEA4N004,
-	TX_FEA4N005,
-	TX_FEA4N006,
-	TX_FEA4N007,
-	TX_FEA4N008,
-
-
-	TX_FEA5_001,
-	TX_FEA5_002,
-	TX_FEA5_003,
-	TX_FEA5_004,
-	TX_FEA5_005,
-	TX_FEA5_006,
-	TX_FEA5_007,
-	TX_FEA5_008,
-	TX_FEA5_009,
-	TX_FEA5_010,
-	TX_FEA5_011,
-	// MISSING
-	TX_FEA5_013,
-	TX_FEA5_014,
-	TX_FEA5_015,
-	TX_FEA5_016,
-	// MISSING
-	TX_FEA5_018,
-	TX_FEA5_019,
-	TX_FEA5_020,
-	TX_FEA5_021, // UNUSED
-	TX_FEA5_022,
-	TX_FEA5_023,
-	TX_FEA5_024,
-	TX_FEA5_025,
-	TX_FEA5_026,
-	TX_FEA5_027,
-	TX_FEA5_028,
-	TX_FEA5_029,
-	TX_FEA5_030,
-	TX_FEA5_031,
-	TX_FEA5_032,
-	TX_FEA5_033,
-	TX_FEA5_034,
-	TX_FEA5_035,
-	TX_FEA5_036,
-	TX_FEA5_037,
-	TX_FEA5_038,
-	TX_FEA5_039,
-	TX_FEA5_040,
-	TX_FEA5N000,
-	TX_FEA5N001,
-	TX_FEA5N002,
-	TX_FEA5N003,
-	TX_FEA5N004,
-	TX_FEA5N005,
-	TX_FEA5N006,
-	TX_FEA5N007,
-	TX_FEA5N008,
-	TX_FEA5N009,
-	TX_FEA5N010,
-	TX_FEA5N011,
-	TX_FEA5N012,
-	TX_FEA5N013,
-	TX_FEA5N014,
-	TX_FEA5N015,
-
-
-	TX_FEA6_001,
-	TX_FEA6_002,
-	TX_FEA6_003,
-	TX_FEA6_004,
-	TX_FEA6_005,
-	TX_FEA6_006,
-	TX_FEA6_007,
-	TX_FEA6_008,
-	TX_FEA6_009,
-	// MISSING
-	TX_FEA6_011,
-	TX_FEA6_012,
-	TX_FEA6_013,
-	TX_FEA6_014,
-	TX_FEA6_015,
-	TX_FEA6_016,
-	TX_FEA6_017,
-	TX_FEA6_018,
-	TX_FEA6_019,
-	TX_FEA6_020,
-	TX_FEA6_021,
-	TX_FEA6_022,
-	TX_FEA6_023,
-	TX_FEA6_024,
-	TX_FEA6_025,
-	TX_FEA6_026,
-	TX_FEA6_027,
-	TX_FEA6_028,
-	TX_FEA6_029,
-	TX_FEA6_030,
-	TX_FEA6_031,
-	TX_FEA6_032,
-	TX_FEA6_033,
-	TX_FEA6_034,
-	TX_FEA6_035,
-	TX_FEA6_036,
-	TX_FEA6_037,
-	TX_FEA6_038,
-	TX_FEA6_039,
-	TX_FEA6_040,
-	TX_FEA6_041,
-	TX_FEA6_042,
-	TX_FEA6_043,
-	TX_FEA6N000,
-	TX_FEA6N001,
-	TX_FEA6N002,
-	TX_FEA6N003,
-	TX_FEA6N004,
-	TX_FEA6N005,
-	TX_FEA6N006, // UNUSED
-	TX_FEA6N007,
-	TX_FEA6N008,
-	TX_FEA6N009,
-	TX_FEA6N010,
-	TX_FEA6N011,
-	TX_FEA6N012,
-	TX_FEA6N013,
-	TX_FEA6N014,
-	TX_FEA6N015,
-	TX_FEA6N016,
-	TX_FEA6N017,
-	// MISSING
-	TX_FEA6N020,
-	TX_FEA6N028, // UNUSED
-	TX_FEA6N029, // UNUSED
-
-
-	TX_FEA7_001,
-	TX_FEA7_002,
-	TX_FEA7_003,
-	TX_FEA7_004,
-	TX_FEA7_005,
-	TX_FEA7_006,
-	TX_FEA7_007,
-	TX_FEA7_008,
-	TX_FEA7_009,
-	TX_FEA7_010,
-	TX_FEA7_011,
-	TX_FEA7_012,
-	TX_FEA7_013,
-	TX_FEA7_014,
-	TX_FEA7_015,
-	TX_FEA7_016,
-	TX_FEA7_017,
-	TX_FEA7_018,
-	TX_FEA7_019,
-	TX_FEA7_020,
-	TX_FEA7_021,
-	TX_FEA7_022,
-	TX_FEA7_023,
-	TX_FEA7_024,
-	TX_FEA7_025,
-	TX_FEA7_026,
-	TX_FEA7_027,
-	TX_FEA7_028,
-	TX_FEA7_029,
-	TX_FEA7_030,
-
-
 	TX_TRI0_001,
 	TX_TRI0_002,
 	TX_TRI0_003,