STARTREK: Read the text of the MUDD mission rooms from RDF files

Also, add a central mechanism to fix text typos

7 files changed, 418 insertions, 439 deletions

diff --git a/engines/startrek/rooms/mudd0.cpp b/engines/startrek/rooms/mudd0.cpp
index fca2584f16..9987a784f9 100644
--- a/engines/startrek/rooms/mudd0.cpp
+++ b/engines/startrek/rooms/mudd0.cpp
@@ -68,66 +68,66 @@ void Room::mudd0Tick60() {
 
 		_awayMission->mudd.muddFirstRoomState++;
 
-		showText(TX_SPEAKER_MUDD,  TX_MUD0_037);
-		showText(TX_SPEAKER_KIRK,  TX_MUD0_009);
-		showText(TX_SPEAKER_MUDD,  TX_MUD0_028);
-		showText(TX_SPEAKER_MCCOY, TX_MUD0_017);
-		showText(TX_SPEAKER_MUDD,  TX_MUD0_026);
-		showText(TX_SPEAKER_KIRK,  TX_MUD0_006);
-		showText(TX_SPEAKER_MUDD,  TX_MUD0_033);
-		showText(TX_SPEAKER_KIRK,  TX_MUD0_005);
-		showText(TX_SPEAKER_MUDD,  TX_MUD0_029);
+		showText(TX_SPEAKER_MUDD, 37, true);
+		showText(TX_SPEAKER_KIRK,  9, true);
+		showText(TX_SPEAKER_MUDD, 28, true);
+		showText(TX_SPEAKER_MCCOY,17, true);
+		showText(TX_SPEAKER_MUDD, 26, true);
+		showText(TX_SPEAKER_KIRK,  6, true);
+		showText(TX_SPEAKER_MUDD, 33, true);
+		showText(TX_SPEAKER_KIRK,  5, true);
+		showText(TX_SPEAKER_MUDD, 29, true);
 	}
 }
 
 void Room::mudd0UsePhaserOnMudd() {
-	showText(TX_SPEAKER_MUDD, TX_MUD0_025);
+	showText(TX_SPEAKER_MUDD, 25, true);
 }
 
 void Room::mudd0UseCommunicator() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD0_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 	showText(TX_SPEAKER_UHURA, TX_STATICU1);
 }
 
 void Room::mudd0LookAtFoodBox() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S;
 	loadActorStandAnim(OBJECT_KIRK);
-	showDescription(TX_MUD0N012);
+	showDescription(12, true);
 }
 
 void Room::mudd0LookAtComponentBox() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S;
 	loadActorStandAnim(OBJECT_KIRK);
-	showDescription(TX_MUD0N013);
+	showDescription(13, true);
 }
 
 void Room::mudd0LookAnywhere() {
-	showDescription(TX_MUD0N019);
+	showDescription(19, true);
 }
 
 void Room::mudd0LookAtMemoryDiskBox() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
 	loadActorStandAnim(OBJECT_KIRK);
-	showDescription(TX_MUD0N010);
+	showDescription(10, true);
 }
 
 void Room::mudd0LookAtDegrimerBox() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_W;
 	loadActorStandAnim(OBJECT_KIRK);
-	showDescription(TX_MUD0N008);
+	showDescription(8, true);
 }
 
 void Room::mudd0LookAtLense() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_E;
 	loadActorStandAnim(OBJECT_KIRK);
-	showDescription(TX_MUD0N014);
+	showDescription(14, true);
 }
 
 void Room::mudd0UseSTricorderAnywhere() {
 	// Narrator says something, not Spock (so we don't use "spockScan" function)
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(SND_TRICORDER);
-	showDescription(TX_MUD0N015);
+	showDescription(15, true);
 }
 
 void Room::mudd0UseMTricorderAnywhere() {
@@ -136,11 +136,11 @@ void Room::mudd0UseMTricorderAnywhere() {
 	// above.
 	loadActorAnim2(OBJECT_MCCOY, "mscans", -1, -1, 0);
 	playSoundEffectIndex(SND_TRICORDER);
-	showDescription(TX_MUD0N015);
+	showDescription(15, true);
 }
 
 void Room::mudd0UseSTricorderOnMemoryDiskBox() {
-	spockScan(DIR_N, TX_MUD0_021, true);
+	spockScan(DIR_N, 21, true);
 }
 
 void Room::mudd0UseSTricorderOnDegrimerBox() {
@@ -148,19 +148,19 @@ void Room::mudd0UseSTricorderOnDegrimerBox() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W;
 	loadActorAnim2(OBJECT_SPOCK, "sscanw", -1, -1, 0);
 	playSoundEffectIndex(SND_TRICORDER);
-	showDescription(TX_MUD0N000);
+	showDescription(0, true);
 }
 
 void Room::mudd0UseMTricorderOnLense() {
 	if (_awayMission->mudd.discoveredLenseAndDegrimerFunction)
-		mccoyScan(DIR_E, TX_MUD0_012, true);
+		mccoyScan(DIR_E, 12, true);
 	else
-		mccoyScan(DIR_E, TX_MUD0_013, true);
+		mccoyScan(DIR_E, 13, true);
 }
 
 void Room::mudd0GetLense() {
 	if (_awayMission->mudd.gotLense)
-		showDescription(TX_MUD0N016);
+		showDescription(16, true);
 	else {
 		_awayMission->mudd.gotLense = true;
 		_awayMission->mudd.missionScore++;
@@ -173,7 +173,7 @@ void Room::mudd0GetLense() {
 
 void Room::mudd0GetMemoryDisk() {
 	if (_awayMission->mudd.gotMemoryDisk)
-		showDescription(TX_MUD0N016);
+		showDescription(16, true);
 	else {
 		_awayMission->mudd.gotMemoryDisk = true;
 		_awayMission->mudd.missionScore++;
@@ -185,7 +185,7 @@ void Room::mudd0GetMemoryDisk() {
 
 void Room::mudd0GetDegrimer() {
 	if (_awayMission->mudd.gotDegrimer)
-		showDescription(TX_MUD0N016);
+		showDescription(16, true);
 	else {
 		_awayMission->mudd.gotDegrimer = true;
 		_awayMission->mudd.missionScore++;
@@ -232,79 +232,79 @@ void Room::mudd0TouchedHotspot0() { // Trigger top door opening
 }
 
 void Room::mudd0UseMedkit() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD0_011);
+	showText(TX_SPEAKER_MCCOY, 11, true);
 }
 
 void Room::mudd0LookAtKirk() {
-	showDescription(TX_MUD0N004);
+	showDescription(4, true);
 }
 
 void Room::mudd0LookAtSpock() {
-	showDescription(TX_MUD0N007);
+	showDescription(7, true);
 }
 
 void Room::mudd0LookAtMccoy() {
-	showDescription(TX_MUD0N001);
+	showDescription(1, true);
 }
 
 void Room::mudd0LookAtRedshirt() {
-	showDescription(TX_MUD0N005);
+	showDescription(5, true);
 }
 
 void Room::mudd0LookAtMudd() {
-	showDescription(TX_MUD0N003);
+	showDescription(3, true);
 }
 
 void Room::mudd0TalkToKirk() {
 	if (_awayMission->mudd.muddFirstRoomState == 2)
-		showText(TX_SPEAKER_KIRK, TX_MUD0_010);
+		showText(TX_SPEAKER_KIRK, 10, true);
 	else {
-		showText(TX_SPEAKER_KIRK, TX_MUD0_010);
-		showText(TX_SPEAKER_MUDD, TX_MUD0_031);
-		showText(TX_SPEAKER_KIRK, TX_MUD0_007);
+		showText(TX_SPEAKER_KIRK, 10, true);
+		showText(TX_SPEAKER_MUDD, 31, true);
+		showText(TX_SPEAKER_KIRK,  7, true);
 	}
 }
 
 void Room::mudd0TalkToSpock() {
 	if (_awayMission->mudd.muddFirstRoomState == 2)
-		showText(TX_SPEAKER_SPOCK, TX_MUD0_022);
+		showText(TX_SPEAKER_SPOCK, 22, true);
 	else {
-		showText(TX_SPEAKER_SPOCK, TX_MUD0_022);
-		showText(TX_SPEAKER_MUDD,  TX_MUD0_034);
-		showText(TX_SPEAKER_SPOCK, TX_MUD0_023);
-		showText(TX_SPEAKER_MCCOY, TX_MUD0_015);
-		showText(TX_SPEAKER_MUDD,  TX_MUD0_038);
+		showText(TX_SPEAKER_SPOCK, 22, true);
+		showText(TX_SPEAKER_MUDD,  34, true);
+		showText(TX_SPEAKER_SPOCK, 23, true);
+		showText(TX_SPEAKER_MCCOY, 15, true);
+		showText(TX_SPEAKER_MUDD,  38, true);
 	}
 }
 
 void Room::mudd0TalkToMccoy() {
 	if (_awayMission->mudd.muddFirstRoomState == 2)
-		showText(TX_SPEAKER_MCCOY, TX_MUD0_016);
+		showText(TX_SPEAKER_MCCOY, 16, true);
 	else {
-		showText(TX_SPEAKER_MCCOY, TX_MUD0_016);
-		showText(TX_SPEAKER_KIRK,  TX_MUD0_003);
-		showText(TX_SPEAKER_MUDD,  TX_MUD0_027);
-		showText(TX_SPEAKER_MCCOY, TX_MUD0_014);
+		showText(TX_SPEAKER_MCCOY, 16, true);
+		showText(TX_SPEAKER_KIRK,   3, true);
+		showText(TX_SPEAKER_MUDD,  27, true);
+		showText(TX_SPEAKER_MCCOY, 14, true);
 	}
 }
 
 void Room::mudd0TalkToRedshirt() {
 	if (_awayMission->mudd.muddFirstRoomState == 2) {
-		showText(TX_SPEAKER_BUCHERT, TX_MUD0_039);
-		showText(TX_SPEAKER_KIRK,    TX_MUD0_008);
+		showText(TX_SPEAKER_BUCHERT, 39, true);
+		showText(TX_SPEAKER_KIRK,     8, true);
 	} else {
-		showText(TX_SPEAKER_BUCHERT, TX_MUD0_040);
-		showText(TX_SPEAKER_MUDD,    TX_MUD0_030);
-		showText(TX_SPEAKER_BUCHERT, TX_MUD0_041);
-		showText(TX_SPEAKER_MUDD,    TX_MUD0_036);
+		showText(TX_SPEAKER_BUCHERT, 40, true);
+		showText(TX_SPEAKER_MUDD,    30, true);
+		showText(TX_SPEAKER_BUCHERT, 41, true);
+		showText(TX_SPEAKER_MUDD,    36, true);
 	}
 }
 
 void Room::mudd0TalkToMudd() {
-	showText(TX_SPEAKER_MUDD,  TX_MUD0_032);
-	showText(TX_SPEAKER_SPOCK, TX_MUD0_024);
-	showText(TX_SPEAKER_MUDD,  TX_MUD0_035);
-	showText(TX_SPEAKER_KIRK,  TX_MUD0_004);
+	showText(TX_SPEAKER_MUDD,  32, true);
+	showText(TX_SPEAKER_SPOCK, 24, true);
+	showText(TX_SPEAKER_MUDD,  35, true);
+	showText(TX_SPEAKER_KIRK,   4, true);
 }
 
 }
diff --git a/engines/startrek/rooms/mudd1.cpp b/engines/startrek/rooms/mudd1.cpp
index 0112567482..28a5cb3e46 100644
--- a/engines/startrek/rooms/mudd1.cpp
+++ b/engines/startrek/rooms/mudd1.cpp
@@ -64,7 +64,7 @@ void Room::mudd1Timer1Expired() {
 }
 
 void Room::mudd1UseCommunicator() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD1_001);
+	showText(TX_SPEAKER_KIRK,  1, true);
 	showText(TX_SPEAKER_UHURA, TX_STATICU1);
 }
 
@@ -99,9 +99,9 @@ void Room::mudd1CraneFinishedMoving() {
 	walkCrewman(OBJECT_SPOCK, 0x43, 0x9f);
 
 	if (_awayMission->mudd.torpedoLoaded)
-		showText(TX_SPEAKER_SPOCK, TX_MUD1_017);
+		showText(TX_SPEAKER_SPOCK, 17, true);
 	else
-		showText(TX_SPEAKER_SPOCK, TX_MUD1_016);
+		showText(TX_SPEAKER_SPOCK, 16, true);
 }
 
 
@@ -146,22 +146,22 @@ void Room::mudd1SpockReachedRedButton() {
 void Room::mudd1SpockPressedRedButton() {
 	walkCrewman(OBJECT_SPOCK, 0x43, 0x9f);
 
-	showText(TX_SPEAKER_SPOCK, TX_MUD1_022);
-	showText(TX_SPEAKER_SPOCK, TX_MUD1_021);
-	showText(TX_SPEAKER_SPOCK, TX_MUD1_023);
+	showText(TX_SPEAKER_SPOCK, 22, true);
+	showText(TX_SPEAKER_SPOCK, 21, true);
+	showText(TX_SPEAKER_SPOCK, 23, true);
 
 	_awayMission->disableInput = false;
 	_awayMission->mudd.knowAboutTorpedo = true;
 
 	const TextRef choices[] = {
 		TX_SPEAKER_KIRK,
-		TX_MUD1_004,
-		TX_MUD1_003,
-		TX_MUD1_007,
+		4,
+		3,
+		7,
 		TX_BLANK
 	};
 
-	int choice = showMultipleTexts(choices);
+	int choice = showMultipleTexts(choices, true);
 
 	switch (choice) {
 	case 0:
@@ -174,7 +174,7 @@ void Room::mudd1SpockPressedRedButton() {
 		break;
 
 	case 1:
-		showText(TX_SPEAKER_KIRK, TX_MUD1_007);
+		showText(TX_SPEAKER_KIRK, 7, true);
 	// fall through
 
 	case 2:
@@ -184,103 +184,102 @@ void Room::mudd1SpockPressedRedButton() {
 	}
 }
 
-
 void Room::mudd1GetTorpedo() {
-	showDescription(TX_MUD1N014);
+	showDescription(14, true);
 }
 
 void Room::mudd1UseSTricorderOnTorpedo() {
-	spockScan(DIR_W, TX_MUD1_025, false);
-	showText(TX_SPEAKER_BUCHERT, TX_MUD1_027);
-	showText(TX_SPEAKER_SPOCK,   TX_MUD1_020);
-	showText(TX_SPEAKER_BUCHERT, TX_MUD1_028);
-	showText(TX_SPEAKER_SPOCK,   TX_MUD1_024);
+	spockScan(DIR_W, 25, false, true);
+	showText(TX_SPEAKER_BUCHERT, 27, true);
+	showText(TX_SPEAKER_SPOCK,   20, true);
+	showText(TX_SPEAKER_BUCHERT, 28, true);
+	showText(TX_SPEAKER_SPOCK,   24, true);
 }
 
 void Room::mudd1UseSTricorderOnTorpedoLauncher() {
-	spockScan(DIR_W, TX_MUD1_010, false);
+	spockScan(DIR_W, 10, false, true);
 }
 
 void Room::mudd1UseSTricorderOnButton() {
 	// ENHANCEMENT: Do the whole "spockScan" thing, don't just show the text
-	spockScan(DIR_W, TX_MUD1_015, false);
+	spockScan(DIR_W, 15, false, true);
 }
 
 void Room::mudd1UseSTricorderOnCrane() {
 	// ENHANCEMENT: See above
-	spockScan(DIR_N, TX_MUD1_014, false);
+	spockScan(DIR_N, 14, false, true);
 }
 
 void Room::mudd1UseMedkitAnywhere() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD1_011);
+	showText(TX_SPEAKER_MCCOY, 11, true);
 }
 
 void Room::mudd1LookAnywhere() {
-	showDescription(TX_MUD1N011);
+	showDescription(11, true);
 }
 
 void Room::mudd1LookAtTorpedo() {
-	showDescription(TX_MUD1N002);
+	showDescription(2, true);
 }
 
 void Room::mudd1LookAtFallenTorpedo() {
-	showDescription(TX_MUD1N012);
+	showDescription(12, true);
 }
 
 void Room::mudd1LookAtTorpedoLauncher() {
-	showDescription(TX_MUD1N003);
+	showDescription(3, true);
 }
 
 void Room::mudd1LookAtKirk() {
-	showDescription(TX_MUD1N005);
+	showDescription(5, true);
 }
 
 void Room::mudd1LookAtSpock() {
-	showDescription(TX_MUD1N009);
+	showDescription(9, true);
 }
 
 void Room::mudd1LookAtMccoy() {
-	showDescription(TX_MUD1N008);
+	showDescription(8, true);
 }
 
 void Room::mudd1LookAtRedshirt() {
-	showDescription(TX_MUD1N006);
+	showDescription(6, true);
 }
 
 void Room::mudd1LookAtCrane() {
-	showDescription(TX_MUD1N000);
+	showDescription(0, true);
 }
 
 void Room::mudd1LookAtRedButton() {
-	showDescription(TX_MUD1N001);
+	showDescription(1, true);
 }
 
 void Room::mudd1LookAtBlueButton() {
-	showDescription(TX_MUD1N015);
+	showDescription(15, true);
 }
 
 void Room::mudd1LookAtYellowButton() {
-	showDescription(TX_MUD1N016);
+	showDescription(16, true);
 }
 
 void Room::mudd1TalkToKirk() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD1_006);
-	showText(TX_SPEAKER_MCCOY, TX_MUD1_013);
-	showText(TX_SPEAKER_KIRK,  TX_MUD1_005);
+	showText(TX_SPEAKER_KIRK,  6, true);
+	showText(TX_SPEAKER_MCCOY, 13, true);
+	showText(TX_SPEAKER_KIRK,  5, true);
 }
 
 void Room::mudd1TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_MUD1_019);
-	showText(TX_SPEAKER_KIRK,  TX_MUD1_008);
+	showText(TX_SPEAKER_SPOCK, 19, true);
+	showText(TX_SPEAKER_KIRK,  8, true);
 }
 
 void Room::mudd1TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD1_012);
+	showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 void Room::mudd1TalkToRedshirt() {
-	showText(TX_SPEAKER_BUCHERT, TX_MUD1_026);
-	showText(TX_SPEAKER_KIRK,    TX_MUD1_009);
+	showText(TX_SPEAKER_BUCHERT, 26, true);
+	showText(TX_SPEAKER_KIRK,    9, true);
 }
 
 void Room::mudd1WalkToSouthDoor() {
diff --git a/engines/startrek/rooms/mudd2.cpp b/engines/startrek/rooms/mudd2.cpp
index 6eb75cfc50..a0bb188f61 100644
--- a/engines/startrek/rooms/mudd2.cpp
+++ b/engines/startrek/rooms/mudd2.cpp
@@ -98,21 +98,21 @@ void Room::mudd2Timer1Expired() {
 }
 
 void Room::mudd2UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_MUD2_037, false);
+	spockScan(DIR_S, 37, false, true);
 }
 
 void Room::mudd2UseSpockOnCapsules() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_018);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 }
 
 void Room::mudd2GetCapsules() {
 	if (!_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious) {
 		if (!_awayMission->mudd.translatedAlienLanguage)
-			showText(TX_SPEAKER_MCCOY, TX_MUD2_024);
+			showText(TX_SPEAKER_MCCOY, 24, true);
 		else
 			walkCrewmanC(OBJECT_MCCOY, 0x9f, 0xbf, &Room::mudd2MccoyReachedCapsules);
 	} else {
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_023);
+		showText(TX_SPEAKER_MCCOY, 23, true);
 	}
 }
 
@@ -127,42 +127,42 @@ void Room::mudd2MccoyPickedUpCapsules() {
 }
 
 void Room::mudd2UseCommunicator() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD2_009);
+	showText(TX_SPEAKER_KIRK,  TX_MUD4_018);	// originally TX_MUD4_019, this matches the audio
 	showText(TX_SPEAKER_UHURA, TX_STATICU1);
 }
 
 void Room::mudd2LookAtCapsules() {
-	showDescription(TX_MUD2N008);
+	showDescription(8, true);
 }
 
 void Room::mudd2UseMTricorderOnCapsules() {
-	mccoyScan(DIR_W, TX_MUD2_030, false);
-	showText(TX_SPEAKER_KIRK,  TX_MUD2_004);
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_019);
+	mccoyScan(DIR_W, 30, false, true);
+	showText(TX_SPEAKER_KIRK,  4, true);
+	showText(TX_SPEAKER_MCCOY, 19, true);
 }
 
 void Room::mudd2UseCapsuleOnControlPanel() {
 	if (!_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious)
 		walkCrewmanC(OBJECT_MCCOY, 0x9f, 0xbf, &Room::mudd2MccoyReachedControlPanel);
 	else
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_023);
+		showText(TX_SPEAKER_MCCOY, 23, true);
 }
 
 void Room::mudd2MccoyReachedControlPanel() {
 	if (_awayMission->mudd.translatedAlienLanguage)
 		loadActorAnimC(OBJECT_MCCOY, "musehn", -1, -1, &Room::mudd2MccoyPutCapsuleInControlPanel);
 	else // NOTE: Unused, since you can't get capsules without translating the language first
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_014);
+		showText(TX_SPEAKER_MCCOY, 14, true);
 }
 
 void Room::mudd2MccoyPutCapsuleInControlPanel() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_N;
 	loadActorStandAnim(OBJECT_MCCOY);
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_020);
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_029);
-	showText(TX_SPEAKER_SPOCK, TX_MUD2_039);
+	showText(TX_SPEAKER_MCCOY, 20, true);
+	showText(TX_SPEAKER_MCCOY, 29, true);
+	showText(TX_SPEAKER_SPOCK, 39, true);
 	if (_awayMission->mudd.muddUnconscious)
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_034);
+		showText(TX_SPEAKER_MCCOY, 34, true);
 
 	_awayMission->mudd.putCapsuleInMedicalMachine = true;
 
@@ -181,12 +181,12 @@ void Room::mudd2UseKirkOnBed() {
 
 void Room::mudd2KirkReachedBed() {
 	// BUGFIX: Speaker is mccoy, not none
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_022);
+	showText(TX_SPEAKER_MCCOY, 22, true);
 }
 
 
 void Room::mudd2MuddNoticedKirk() {
-	showText(TX_SPEAKER_MUDD, TX_MUD2_044);
+	showText(TX_SPEAKER_MUDD, 44, true);
 	playVoc("BATTYGAS");
 	loadActorAnimC(OBJECT_MUDD, "s4sbhb", 0x9f, 0xbf, &Room::mudd2MuddDroppedCapsule); // Drops the capsule
 	playMidiMusicTracks(0);
@@ -197,12 +197,12 @@ void Room::mudd2MuddDroppedCapsule() {
 	loadActorAnim2(OBJECT_CAPSULE, "s4sbvp", 0x93, 0xc3);
 	_awayMission->mudd.muddCurrentlyInsane = true;
 
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_032);
-	showText(TX_SPEAKER_MUDD,  TX_MUD2_049);
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_026);
-	showText(TX_SPEAKER_MUDD,  TX_MUD2_051);
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_031);
-	showText(TX_SPEAKER_MUDD,  TX_MUD2_050);
+	showText(TX_SPEAKER_MCCOY, 32, true);
+	showText(TX_SPEAKER_MUDD,  49, true);
+	showText(TX_SPEAKER_MCCOY, 26, true);
+	showText(TX_SPEAKER_MUDD,  51, true);
+	showText(TX_SPEAKER_MCCOY, 31, true);
+	showText(TX_SPEAKER_MUDD,  50, true);
 
 	_awayMission->disableInput = false;
 }
@@ -210,9 +210,9 @@ void Room::mudd2MuddDroppedCapsule() {
 
 void Room::mudd2UsePhaserOnMudd() {
 	if (_awayMission->mudd.muddInhaledGas && !_awayMission->mudd.muddUnconscious) {
-		showText(TX_SPEAKER_BUCHERT, TX_MUD2_053);
-		showText(TX_SPEAKER_MUDD,    TX_MUD2_042);
-		showText(TX_SPEAKER_MUDD,    TX_MUD2_043);
+		showText(TX_SPEAKER_BUCHERT, 53, true);
+		showText(TX_SPEAKER_MUDD,    42, true);
+		showText(TX_SPEAKER_MUDD,    43, true);
 	}
 }
 
@@ -234,7 +234,7 @@ void Room::mudd2SpockPinchedMudd() {
 	loadActorAnim2(OBJECT_MUDD, "s4sbob", 0x9f, 0xba);
 	loadActorAnim2(OBJECT_SPOCK, "sstnde", 0xd0, 0xbd);
 
-	showText(TX_SPEAKER_SPOCK, TX_MUD2_012);
+	showText(TX_SPEAKER_SPOCK, 12), true;
 
 	_awayMission->disableInput = false;
 	_awayMission->mudd.muddUnconscious = true;
@@ -244,7 +244,7 @@ void Room::mudd2SpockPinchedMudd() {
 
 void Room::mudd2UseKirkOnMudd() {
 	if (_awayMission->mudd.muddInhaledGas && !_awayMission->mudd.muddUnconscious) {
-		showText(TX_SPEAKER_KIRK, TX_MUD2_001);
+		showText(TX_SPEAKER_KIRK, 1, true);
 		mudd2UseSpockOnMudd();
 	}
 }
@@ -273,7 +273,7 @@ void Room::mudd2MuddFinishedPushingRedshirt() {
 }
 
 void Room::mudd2RedshirtPushedAway() {
-	showText(TX_SPEAKER_BUCHERT, TX_MUD2_052);
+	showText(TX_SPEAKER_BUCHERT, 52, true);
 	loadActorAnim(OBJECT_REDSHIRT, "rstnds", 0xd8, 0xc3);
 	_awayMission->disableInput = false;
 	_awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W;
@@ -287,7 +287,7 @@ void Room::mudd2RedshirtPushedAway() {
 // The function itself was also modified (ie. condition for showing text was inverted).
 void Room::mudd2UseMTricorderOnMudd() {
 	if (_awayMission->mudd.muddInhaledGas && !_awayMission->mudd.muddUnconscious)
-		mccoyScan(DIR_W, TX_MUD2_013, false);
+		mccoyScan(DIR_W, 13, false, true);
 }
 
 
@@ -296,13 +296,13 @@ void Room::mudd2UseMedkitOnMudd() {
 		return;
 	else if (_awayMission->mudd.muddUnconscious) {
 		if (!_awayMission->mudd.translatedAlienLanguage)
-			showText(TX_SPEAKER_MCCOY, TX_MUD2_015);
+			showText(TX_SPEAKER_MCCOY, 15, true);
 		else if (!_awayMission->mudd.putCapsuleInMedicalMachine)
-			showText(TX_SPEAKER_MCCOY, TX_MUD2_021);
+			showText(TX_SPEAKER_MCCOY, 21, true);
 		else
 			walkCrewmanC(OBJECT_MCCOY, 0xde, 0xaf, &Room::mudd2MccoyReachedMudd);
 	} else // Can't get to him since he's busy being crazy
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_016);
+		showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::mudd2MccoyReachedMudd() {
@@ -316,79 +316,79 @@ void Room::mudd2MccoyCuredMudd() {
 	_awayMission->mudd.muddCurrentlyInsane = false;
 	_awayMission->mudd.muddInhaledGas = false;
 
-	showText(TX_SPEAKER_MCCOY, TX_MUD2_033);
-	showText(TX_SPEAKER_MUDD,  TX_MUD2_045);
+	showText(TX_SPEAKER_MCCOY, 33, true);
+	showText(TX_SPEAKER_MUDD,  45, true);
 
 	_awayMission->mudd.muddUnconscious = false;
 }
 
 
 void Room::mudd2LookAtKirk() {
-	showDescription(TX_MUD2N003);
+	showDescription(3, true);
 }
 
 void Room::mudd2LookAtSpock() {
-	showDescription(TX_MUD2N006);
+	showDescription(6, true);
 }
 
 void Room::mudd2LookAtMccoy() {
-	showDescription(TX_MUD2N000);
+	showDescription(0, true);
 }
 
 void Room::mudd2LookAtRedshirt() {
-	showDescription(TX_MUD2N004);
+	showDescription(4, true);
 }
 
 void Room::mudd2LookAtMudd() {
-	showDescription(TX_MUD2N002);
+	showDescription(2, true);
 }
 
 void Room::mudd2LookAtControlPanel() {
-	showDescription(TX_MUD2N011);
+	showDescription(11, true);
 }
 
 void Room::mudd2LookAtBed() {
-	showDescription(TX_MUD2N007);
+	showDescription(7, true);
 }
 
 void Room::mudd2TalkToKirk() {
 	// BUGFIX: second condition in if statement changed to "must be false" instead of
 	// "must be true". (Same applies to below talk functions.)
 	if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious)
-		showText(TX_SPEAKER_KIRK, TX_MUD2_010);
+		showText(TX_SPEAKER_KIRK, 10, true);
 	else {
-		showText(TX_SPEAKER_KIRK,  TX_MUD2_005);
-		showText(TX_SPEAKER_MUDD,  TX_MUD2_046);
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_035);
+		showText(TX_SPEAKER_KIRK,   5, true);
+		showText(TX_SPEAKER_MUDD,  46, true);
+		showText(TX_SPEAKER_MCCOY, 35, true);
 	}
 }
 
 void Room::mudd2TalkToSpock() {
 	if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious) {
-		showText(TX_SPEAKER_SPOCK, TX_MUD2_040);
-		showText(TX_SPEAKER_KIRK,  TX_MUD2_011);
+		showText(TX_SPEAKER_SPOCK, 40, true);
+		showText(TX_SPEAKER_KIRK,  11, true);
 	} else {
-		showText(TX_SPEAKER_SPOCK, TX_MUD2_038);
+		showText(TX_SPEAKER_SPOCK, 38, true);
 	}
 }
 
 void Room::mudd2TalkToMccoy() {
 	if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious) {
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_025);
-		showText(TX_SPEAKER_KIRK,  TX_MUD2_007);
+		showText(TX_SPEAKER_MCCOY, 25, true);
+		showText(TX_SPEAKER_KIRK,   7, true);
 	} else {
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_027);
+		showText(TX_SPEAKER_MCCOY, 27, true);
 	}
 }
 
 void Room::mudd2TalkToRedshirt() {
 	if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious) {
-		showText(TX_SPEAKER_BUCHERT, TX_MUD2_054);
-		showText(TX_SPEAKER_KIRK,    TX_MUD2_008);
+		showText(TX_SPEAKER_BUCHERT, 54, true);
+		showText(TX_SPEAKER_KIRK,     8, true);
 	} else {
-		showText(TX_SPEAKER_BUCHERT, TX_MUD2_055);
-		showText(TX_SPEAKER_KIRK,    TX_MUD2_003);
-		showText(TX_SPEAKER_MCCOY,   TX_MUD2_036);
+		showText(TX_SPEAKER_BUCHERT, 55, true);
+		showText(TX_SPEAKER_KIRK,     3, true);
+		showText(TX_SPEAKER_MCCOY,   36, true);
 	}
 }
 
@@ -396,11 +396,11 @@ void Room::mudd2TalkToMudd() {
 	if (!_awayMission->mudd.muddCurrentlyInsane || !_awayMission->mudd.muddInhaledGas || _awayMission->mudd.muddUnconscious)
 		return;
 	else if (_awayMission->mudd.muddInhaledGas) {
-		showText(TX_SPEAKER_MUDD, TX_MUD2_048);
-		showText(TX_SPEAKER_MCCOY, TX_MUD2_028);
+		showText(TX_SPEAKER_MUDD, 48, true);
+		showText(TX_SPEAKER_MCCOY, 28, true);
 	} else { // NOTE: Unused (assumes harry is in a normal state, which doesn't happen here)
-		showText(TX_SPEAKER_MUDD, TX_MUD2_047);
-		showText(TX_SPEAKER_KIRK, TX_MUD2_006);
+		showText(TX_SPEAKER_MUDD, 47, true);
+		showText(TX_SPEAKER_KIRK,  6, true);
 	}
 }
 
diff --git a/engines/startrek/rooms/mudd3.cpp b/engines/startrek/rooms/mudd3.cpp
index 24c8ecb824..6c524ced8a 100644
--- a/engines/startrek/rooms/mudd3.cpp
+++ b/engines/startrek/rooms/mudd3.cpp
@@ -64,7 +64,7 @@ void Room::mudd3Tick1() {
 }
 
 void Room::mudd3UseCommunicator() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD3_003);
+	showText(TX_SPEAKER_KIRK,  3, true);
 	showText(TX_SPEAKER_UHURA, TX_STATICU1);
 }
 
@@ -72,23 +72,23 @@ void Room::mudd3LookAtScreen() {
 	// BUGFIX: the condition was flipped in the original; the more "vague" description
 	// should be shown before the alien language is understood.
 	if (_awayMission->mudd.translatedAlienLanguage)
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_038);
+		showText(TX_SPEAKER_SPOCK, 38, true);
 	else
-		showDescription(TX_MUD3N017);
+		showDescription(17, true);
 }
 
 void Room::mudd3UseSTricorderOnScreen() {
 	if (_roomVar.mudd.tricordersUnavailable)
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_039);
+		showText(TX_SPEAKER_SPOCK, 39, true);
 	else
-		spockScan(DIR_S, TX_MUD3_017, false);
+		spockScan(DIR_S, 17, false, true);
 }
 
 // BUGFIX: Event was actually "use screen on kirk", which makes no sense.
 void Room::mudd3UseKirkOnScreen() {
 	if (!_awayMission->mudd.translatedAlienLanguage) {
-		showDescription(TX_MUD3N011);
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_037);
+		showDescription(11, true);
+		showText(TX_SPEAKER_SPOCK, 37, true);
 	}
 }
 
@@ -98,27 +98,27 @@ void Room::mudd3UseSpockOnSphere() {
 
 	if (_awayMission->mudd.computerDataErasedOrDestroyed) {
 		if (!_awayMission->mudd.databaseDestroyed) {
-			showDescription(TX_MUD3N000);
-			showText(TX_SPEAKER_SPOCK, TX_MUD3_052);
-			showText(TX_SPEAKER_KIRK,  TX_MUD3_012);
-			showText(TX_SPEAKER_MCCOY, TX_MUD3_024);
+			showDescription(0, true);
+			showText(TX_SPEAKER_SPOCK, 52, true);
+			showText(TX_SPEAKER_KIRK,  12, true);
+			showText(TX_SPEAKER_MCCOY, 24, true);
 		}
-		showText(TX_SPEAKER_KIRK,  TX_MUD3_006);
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_048);
-		showText(TX_SPEAKER_KIRK,  TX_MUD3_008);
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_051);
+		showText(TX_SPEAKER_KIRK,   6, true);
+		showText(TX_SPEAKER_SPOCK, 48, true);
+		showText(TX_SPEAKER_KIRK,   8, true);
+		showText(TX_SPEAKER_SPOCK, 51, true);
 	} else if (_awayMission->mudd.translatedAlienLanguage) {
 		if (_awayMission->mudd.accessedAlienDatabase)
-			showText(TX_SPEAKER_SPOCK, TX_MUD3_035);
+			showText(TX_SPEAKER_SPOCK, 35, true);
 		else {
 			_awayMission->mudd.accessedAlienDatabase = true;
 
-			showText(TX_SPEAKER_SPOCK, TX_MUD3_054);
-			showText(TX_SPEAKER_MCCOY, TX_MUD3_032);
-			showText(TX_SPEAKER_SPOCK, TX_MUD3_050);
-			showText(TX_SPEAKER_SPOCK, TX_MUD3_049);
-			showText(TX_SPEAKER_SPOCK, TX_MUD3_046);
-			showText(TX_SPEAKER_KIRK,  TX_MUD3_007);
+			showText(TX_SPEAKER_SPOCK, 54, true);
+			showText(TX_SPEAKER_MCCOY, 32, true);
+			showText(TX_SPEAKER_SPOCK, 50, true);
+			showText(TX_SPEAKER_SPOCK, 49, true);
+			showText(TX_SPEAKER_SPOCK, 46, true);
+			showText(TX_SPEAKER_KIRK,   7, true);
 
 			_awayMission->mudd.missionScore++;
 			playVoc("LSHAIANS");
@@ -137,14 +137,14 @@ void Room::mudd3UseSpockOnSphere() {
 			_awayMission->timers[3] = 40;
 		}
 	} else if (_awayMission->mudd.discoveredBase3System) {
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_043);
-		showText(TX_SPEAKER_MCCOY, TX_MUD3_022);
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_056);
-		showText(TX_SPEAKER_KIRK,  TX_MUD3_015);
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_047);
+		showText(TX_SPEAKER_SPOCK, 43, true);
+		showText(TX_SPEAKER_MCCOY, 22, true);
+		showText(TX_SPEAKER_SPOCK, 56, true);
+		showText(TX_SPEAKER_KIRK,  15, true);
+		showText(TX_SPEAKER_SPOCK, 47, true);
 		_roomVar.mudd.suggestedUsingTricorders = true;
 	} else {
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_044);
+		showText(TX_SPEAKER_SPOCK, 44, true);
 		_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W;
 		walkCrewman(OBJECT_SPOCK, 0xcd, 0x87);
 	}
@@ -154,10 +154,10 @@ void Room::mudd3UseSpockOnSphere() {
 void Room::mudd3Timer3Expired() {
 	_awayMission->disableInput = false;
 
-	showText(TX_SPEAKER_MCCOY, TX_MUD3_027);
-	showText(TX_SPEAKER_SPOCK, TX_MUD3_053);
-	showText(TX_SPEAKER_MCCOY, TX_MUD3_028);
-	showText(TX_SPEAKER_MCCOY, TX_MUD3_026);
+	showText(TX_SPEAKER_MCCOY, 27, true);
+	showText(TX_SPEAKER_SPOCK, 53, true);
+	showText(TX_SPEAKER_MCCOY, 28, true);
+	showText(TX_SPEAKER_MCCOY, 26, true);
 }
 
 void Room::mudd3UseMccoyOnSphere() {
@@ -165,7 +165,7 @@ void Room::mudd3UseMccoyOnSphere() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S;
 	loadActorStandAnim(OBJECT_MCCOY);
 
-	showText(TX_SPEAKER_MCCOY, TX_MUD3_021);
+	showText(TX_SPEAKER_MCCOY, 21, true);
 	_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W;
 	walkCrewman(OBJECT_MCCOY, 0xec, 0x84);
 }
@@ -175,14 +175,14 @@ void Room::mudd3UseRedshirtOnSphere() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_S;
 	loadActorStandAnim(OBJECT_REDSHIRT);
 
-	showText(TX_SPEAKER_BUCHERT, TX_MUD3_068); // BUGFIX: original played McCoy's audio by mistake
+	showText(TX_SPEAKER_BUCHERT, 68, true); // BUGFIX: original played McCoy's audio by mistake
 	_awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_W;
 	walkCrewman(OBJECT_REDSHIRT, 0xec, 0x84);
 }
 
 void Room::mudd3UseMTricorderOnSphere() {
 	if (_roomVar.mudd.tricordersUnavailable)
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_039); // BUGFIX: speaker is Spock
+		showText(TX_SPEAKER_SPOCK, 39, true); // BUGFIX: speaker is Spock
 	else {
 		_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S;
 		loadActorStandAnim(OBJECT_MCCOY);
@@ -194,7 +194,7 @@ void Room::mudd3UseMTricorderOnSphere() {
 			_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_S;
 			walkCrewmanC(OBJECT_SPOCK, 0xa5, 0x8c, &Room::mudd3ReadyToHookUpTricorders);
 		} else {
-			showText(TX_SPEAKER_MCCOY, TX_MUD3_021);
+			showText(TX_SPEAKER_MCCOY, 21, true);
 			_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W;
 			walkCrewman(OBJECT_MCCOY, 0xec, 0x84);
 		}
@@ -206,9 +206,9 @@ void Room::mudd3UseSTricorderOnSphere() {
 	loadActorStandAnim(OBJECT_SPOCK);
 
 	if (_roomVar.mudd.tricordersUnavailable)
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_039); // BUGFIX: speaker is Spock
+		showText(TX_SPEAKER_SPOCK, 39, true); // BUGFIX: speaker is Spock
 	else if (_awayMission->mudd.translatedAlienLanguage || (_awayMission->mudd.discoveredBase3System && !_roomVar.mudd.suggestedUsingTricorders)) {
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_041);
+		showText(TX_SPEAKER_SPOCK, 41, true);
 		_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_W;
 		walkCrewman(OBJECT_SPOCK, 0xcd, 0x87);
 	} else if (_awayMission->mudd.discoveredBase3System && _roomVar.mudd.suggestedUsingTricorders) { // Hooking up tricorders
@@ -216,13 +216,13 @@ void Room::mudd3UseSTricorderOnSphere() {
 		_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_S;
 		walkCrewmanC(OBJECT_MCCOY, 0xca, 0x88, &Room::mudd3ReadyToHookUpTricorders);
 	} else { // No idea how to access it
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_042);
+		showText(TX_SPEAKER_SPOCK, 42, true);
 		walkCrewman(OBJECT_SPOCK, 0xcd, 0x87);
 	}
 }
 
 void Room::mudd3ReadyToHookUpTricorders() {
-	showText(TX_SPEAKER_SPOCK, TX_MUD3_018);
+	showText(TX_SPEAKER_SPOCK, 18, true);
 
 	_roomVar.mudd.tricordersUnavailable = true;
 	_awayMission->timers[1] = 50;
@@ -232,8 +232,8 @@ void Room::mudd3ReadyToHookUpTricorders() {
 }
 
 void Room::mudd3Timer1Expired() { // Tricorders ready for use again
-	showText(TX_SPEAKER_SPOCK, TX_MUD3_040);
-	showText(TX_SPEAKER_SPOCK, TX_MUD3_034);
+	showText(TX_SPEAKER_SPOCK, 40, true);
+	showText(TX_SPEAKER_SPOCK, 34, true);
 
 	_awayMission->disableInput = false;
 	_roomVar.mudd.tricordersUnavailable = false;
@@ -251,29 +251,29 @@ void Room::mudd3Timer1Expired() { // Tricorders ready for use again
 void Room::mudd3Timer2Expired() {
 	const TextRef choices[] = {
 		TX_SPEAKER_KIRK,
-		TX_MUD3_010,
-		TX_MUD3_009,
+		10,
+		9,
 		TX_BLANK
 	};
 
 	_awayMission->mudd.computerDataErasedOrDestroyed = true;
 
-	showText(TX_SPEAKER_MUDD, TX_MUD3_065);
-	int choice = showMultipleTexts(choices);
+	showText(TX_SPEAKER_MUDD, 65, true);
+	int choice = showMultipleTexts(choices, true);
 
 	if (choice == 0) { // Allow him to access the database (he ends up erasing it)
-		showText(TX_SPEAKER_MUDD, TX_MUD3_066);
+		showText(TX_SPEAKER_MUDD, 66, true);
 		_awayMission->mudd.muddErasedDatabase = true;
 
 		// ENHANCEMENT: Add a few lines to make it clear that Mudd erased the databanks.
 		// Otherwise, the end of the mission when you confront Mudd doesn't make sense
 		// unless the player happened to try accessing the database again. Also, if you
 		// talk to the crew, they berate him for no apparent reason if this isn't clear.
-		showDescription(TX_MUD3N000);
-		showText(TX_SPEAKER_MCCOY, TX_MUD3_031);
+		showDescription(0, true);
+		showText(TX_SPEAKER_MCCOY, 31, true);
 
 	} else { // Don't allow it (he destroys it by accident)
-		showText(TX_SPEAKER_MUDD, TX_MUD3_064);
+		showText(TX_SPEAKER_MUDD, 64, true);
 		_awayMission->timers[4] = 98;
 		_awayMission->disableInput = 2;
 		playMidiMusicTracks(26);
@@ -284,8 +284,8 @@ void Room::mudd3Timer2Expired() {
 void Room::mudd3Timer4Expired() {
 	_awayMission->mudd.databaseDestroyed = true;
 
-	showText(TX_SPEAKER_MUDD, TX_MUD3_063);
-	showText(TX_SPEAKER_MCCOY, TX_MUD3_031);
+	showText(TX_SPEAKER_MUDD, 63, true);
+	showText(TX_SPEAKER_MCCOY, 31, true);
 
 	_awayMission->disableInput = false;
 }
@@ -296,21 +296,21 @@ void Room::mudd3UseMemoryDiskOnSphere() {
 	loadActorStandAnim(OBJECT_KIRK);
 
 	if (_awayMission->mudd.databaseDestroyed)
-		showDescription(TX_MUD3N014);
+		showDescription(14, true);
 	else if (_awayMission->mudd.translatedAlienLanguage && !_awayMission->mudd.muddErasedDatabase) {
-		showDescription(TX_MUD3N020);
+		showDescription(20, true);
 		if (!_awayMission->mudd.gotPointsForDownloadingData) {
 			_awayMission->mudd.missionScore += 3;
 			_awayMission->mudd.gotPointsForDownloadingData = true;
 		}
 	} else
-		showDescription(TX_MUD3N019);
+		showDescription(19, true);
 }
 
 
 void Room::mudd3GetRepairTool() {
 	if (_awayMission->mudd.tookRepairTool)
-		showDescription(TX_MUD3N018); // NOTE: unused, since the object disappears, can't be selected again
+		showDescription(18, true); // NOTE: unused, since the object disappears, can't be selected again
 	else {
 		_awayMission->disableInput = true;
 		_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
@@ -336,7 +336,7 @@ void Room::mudd3LookAtSphere() {
 	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S;
 	loadActorStandAnim(OBJECT_KIRK);
 
-	showDescription(TX_MUD3N015);
+	showDescription(15, true);
 }
 
 void Room::mudd3WalkToNorthDoor() {
@@ -366,90 +366,90 @@ void Room::mudd3TouchedHotspot1() {
 
 void Room::mudd3LookAtKirk() {
 	if (!_awayMission->mudd.muddInDatabaseRoom)
-		showDescription(TX_MUD3N005);
+		showDescription(5, true);
 	else
-		showDescription(TX_MUD3N004);
+		showDescription(4, true);
 }
 
 void Room::mudd3LookAtSpock() {
 	if (!_awayMission->mudd.muddInDatabaseRoom)
-		showDescription(TX_MUD3N012);
+		showDescription(12, true);
 	else
-		showDescription(TX_MUD3N002);
+		showDescription( 2, true);
 }
 
 void Room::mudd3LookAtMccoy() {
 	if (!_awayMission->mudd.muddInDatabaseRoom)
-		showDescription(TX_MUD3N010);
+		showDescription(10, true);
 	else
-		showDescription(TX_MUD3N009);
+		showDescription( 9, true);
 }
 
 void Room::mudd3LookAtRedshirt() {
 	if (!_awayMission->mudd.muddInDatabaseRoom)
-		showDescription(TX_MUD3N007);
+		showDescription(7, true);
 	else
-		showDescription(TX_MUD3N006);
+		showDescription(6, true);
 }
 
 void Room::mudd3LookAtMudd() {
-	showDescription(TX_MUD3N003);
+	showDescription(3, true);
 }
 
 void Room::mudd3TalkToKirk() {
 	if (!_awayMission->mudd.muddInDatabaseRoom) {
-		showText(TX_SPEAKER_KIRK,  TX_MUD3_014);
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_057);
-		showText(TX_SPEAKER_MCCOY, TX_MUD3_025);
+		showText(TX_SPEAKER_KIRK,  14, true);
+		showText(TX_SPEAKER_SPOCK, 57, true);
+		showText(TX_SPEAKER_MCCOY, 25, true);
 	} else
-		showText(TX_SPEAKER_KIRK, TX_MUD3_002);
+		showText(TX_SPEAKER_KIRK,  2, true);
 }
 
 void Room::mudd3TalkToSpock() {
 	if (!_awayMission->mudd.muddInDatabaseRoom) {
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_055);
-		showText(TX_SPEAKER_MCCOY, TX_MUD3_033);
-		showText(TX_SPEAKER_KIRK,  TX_MUD3_011);
+		showText(TX_SPEAKER_SPOCK, 55, true);
+		showText(TX_SPEAKER_MCCOY, 33, true);
+		showText(TX_SPEAKER_KIRK,  11, true);
 	} else
-		showText(TX_SPEAKER_SPOCK, TX_MUD3_019);
+		showText(TX_SPEAKER_SPOCK, 19, true);
 }
 
 void Room::mudd3TalkToMccoy() {
 	if (!_awayMission->mudd.muddInDatabaseRoom)
-		showText(TX_SPEAKER_MCCOY, TX_MUD3_023);
+		showText(TX_SPEAKER_MCCOY, 23, true);
 	else {
-		showText(TX_SPEAKER_MCCOY, TX_MUD3_030);
-		showText(TX_SPEAKER_MUDD,  TX_MUD3_062);
+		showText(TX_SPEAKER_MCCOY, 30, true);
+		showText(TX_SPEAKER_MUDD,  62, true);
 	}
 }
 
 void Room::mudd3TalkToRedshirt() {
 	if (!_awayMission->mudd.muddInDatabaseRoom) {
-		showText(TX_SPEAKER_BUCHERT, TX_MUD3_070);
-		showText(TX_SPEAKER_KIRK,    TX_MUD3_016);
-		showText(TX_SPEAKER_BUCHERT, TX_MUD3_071);
+		showText(TX_SPEAKER_BUCHERT, 70, true);
+		showText(TX_SPEAKER_KIRK,    16, true);
+		showText(TX_SPEAKER_BUCHERT, 71, true);
 	} else
-		showText(TX_SPEAKER_BUCHERT, TX_MUD3_067);
+		showText(TX_SPEAKER_BUCHERT, 67, true);
 }
 
 void Room::mudd3TalkToMudd() {
 	// ENHANCEMENT: the 2nd part of the if condition is new; whether he physically
 	// destroys the database or does through software, he should give this reaction.
 	if (_awayMission->mudd.databaseDestroyed || _awayMission->mudd.muddErasedDatabase) {
-		showText(TX_SPEAKER_MUDD,    TX_MUD3_060);
-		showText(TX_SPEAKER_MCCOY,   TX_MUD3_029);
-		showText(TX_SPEAKER_MUDD,    TX_MUD3_061);
-		showText(TX_SPEAKER_KIRK,    TX_MUD3_013);
-		showText(TX_SPEAKER_MUDD,    TX_MUD3_058);
-		showText(TX_SPEAKER_SPOCK,   TX_MUD3C001);
-		showText(TX_SPEAKER_BUCHERT, TX_MUD3_069);
-		showText(TX_SPEAKER_MUDD,    TX_MUD3_059);
-		showText(TX_SPEAKER_KIRK,    TX_MUD3_005);
+		showText(TX_SPEAKER_MUDD,    60, true);
+		showText(TX_SPEAKER_MCCOY,   29, true);
+		showText(TX_SPEAKER_MUDD,    61, true);
+		showText(TX_SPEAKER_KIRK,    13, true);
+		showText(TX_SPEAKER_MUDD,    58, true);
+		showText(TX_SPEAKER_SPOCK,   TX_DEM0N009);
+		showText(TX_SPEAKER_BUCHERT, 69, true);
+		showText(TX_SPEAKER_MUDD,    59, true);
+		showText(TX_SPEAKER_KIRK,     5, true);
 	}
 }
 
 void Room::mudd3UseMedkit() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD3_020);
+	showText(TX_SPEAKER_MCCOY, 20, true);
 }
 
 }
diff --git a/engines/startrek/rooms/mudd4.cpp b/engines/startrek/rooms/mudd4.cpp
index e7b90f7488..4cbb8a31b8 100644
--- a/engines/startrek/rooms/mudd4.cpp
+++ b/engines/startrek/rooms/mudd4.cpp
@@ -47,7 +47,7 @@ void Room::mudd4Tick1() {
 }
 
 void Room::mudd4UseCommunicator() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD4_018);
+	showText(TX_SPEAKER_KIRK,  18, true);
 	showText(TX_SPEAKER_UHURA, TX_STATICU1);
 }
 
@@ -75,17 +75,17 @@ void Room::mudd4UseSpockOnConsole() {
 
 	if (_awayMission->mudd.translatedAlienLanguage) {
 		if (!_roomVar.mudd.usingLeftConsole)
-			showText(TX_SPEAKER_SPOCK, TX_MUD4_057);
+			showText(TX_SPEAKER_SPOCK, 57, true);
 	} else if (_awayMission->mudd.discoveredBase3System) {
-		showText(TX_SPEAKER_SPOCK, TX_MUD4_062);
+		showText(TX_SPEAKER_SPOCK, 62, true);
 	} else {
-		showText(TX_SPEAKER_SPOCK, TX_MUD4_061);
-		showText(TX_SPEAKER_KIRK,  TX_MUD4_013);
-		showText(TX_SPEAKER_SPOCK, TX_MUD4_062);
-		showText(TX_SPEAKER_MCCOY, TX_MUD4_048);
-		showText(TX_SPEAKER_SPOCK, TX_MUD4_059);
-		showText(TX_SPEAKER_KIRK,  TX_MUD4_031);
-		showText(TX_SPEAKER_SPOCK, TX_MUD4_060);
+		showText(TX_SPEAKER_SPOCK, 61, true);
+		showText(TX_SPEAKER_KIRK,  13, true);
+		showText(TX_SPEAKER_SPOCK, 62, true);
+		showText(TX_SPEAKER_MCCOY, 48, true);
+		showText(TX_SPEAKER_SPOCK, 59, true);
+		showText(TX_SPEAKER_KIRK,  31, true);
+		showText(TX_SPEAKER_SPOCK, 60, true);
 
 		if (!_awayMission->mudd.discoveredBase3System) {
 			_awayMission->mudd.discoveredBase3System = true;
@@ -108,21 +108,21 @@ void Room::mudd4SpockReachedChair() {
 void Room::mudd4SpockSatInChair() {
 	loadActorAnim2(OBJECT_SPOCK, "s4crsr", 0x55, 0x98);
 
-	showText(TX_SPEAKER_SPOCK, TX_MUD4_058);
+	showText(TX_SPEAKER_SPOCK, 58, true);
 	mudd4ShowLeftConsoleMenu();
 }
 
 void Room::mudd4ShowLeftConsoleMenu() {
 	const TextRef choices[] = {
 		TX_SPEAKER_SPOCK,
-		TX_MUD4_038,
-		TX_MUD4_039,
-		TX_MUD4_040,
-		TX_MUD4_041,
+		38,
+		39,
+		40,
+		41,
 		TX_BLANK
 	};
 
-	int choice = showMultipleTexts(choices);
+	int choice = showMultipleTexts(choices, true);
 
 	switch (choice) {
 	case 0: // Sensors
@@ -150,19 +150,19 @@ void Room::mudd4ShowLeftConsoleMenu() {
 
 void Room::mudd4SpockUsedSensors() {
 	_awayMission->disableInput = false;
-	showText(TX_SPEAKER_SPOCK, TX_MUD4_053);
+	showText(TX_SPEAKER_SPOCK, 53, true);
 	mudd4ShowLeftConsoleMenu();
 }
 
 void Room::mudd4SpockUsedEngineering() {
 	_awayMission->disableInput = false;
-	showText(TX_SPEAKER_SPOCK, TX_MUD4_056);
+	showText(TX_SPEAKER_SPOCK, 56, true);
 	mudd4ShowLeftConsoleMenu();
 }
 
 void Room::mudd4SpockUsedNavigation() {
 	_awayMission->disableInput = false;
-	showText(TX_SPEAKER_SPOCK, TX_MUD4_055);
+	showText(TX_SPEAKER_SPOCK, 55, true);
 	mudd4ShowLeftConsoleMenu();
 }
 
@@ -186,13 +186,13 @@ void Room::mudd4UseKirkOnConsole() {
 	loadActorStandAnim(OBJECT_KIRK);
 
 	if (!_awayMission->mudd.translatedAlienLanguage) {
-		showText(TX_SPEAKER_KIRK, TX_MUD4_006);
+		showText(TX_SPEAKER_KIRK, 06, true);
 		_awayMission->crewDirectionsAfterWalk[OBJECT_SPOCK] = DIR_N;
 		walkCrewmanC(OBJECT_SPOCK, 0x6d, 0x9a, &Room::mudd4FinishedWalking3);
 		_awayMission->disableInput = true;
 	} else {
 		if (!_roomVar.mudd.kirkUsingRightConsole)
-			showText(TX_SPEAKER_KIRK, TX_MUD4_049);
+			showText(TX_SPEAKER_KIRK, 49, true);
 		_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
 		walkCrewmanC(OBJECT_KIRK, 0x7e, 0x98, &Room::mudd4KirkReachedRightConsole);
 		_awayMission->disableInput = true;
@@ -211,7 +211,7 @@ void Room::mudd4KirkSatInChair() {
 	_awayMission->timers[2] = 5;
 	_awayMission->disableInput = false;
 
-	showText(TX_SPEAKER_SPOCK, TX_MUD4_052); // NOTE: why is Spock talking here?
+	showText(TX_SPEAKER_SPOCK, 52, true); // NOTE: why is Spock talking here?
 
 	mudd4ShowRightConsoleMenu();
 }
@@ -219,13 +219,13 @@ void Room::mudd4KirkSatInChair() {
 void Room::mudd4ShowRightConsoleMenu() {
 	const TextRef choices[] = {
 		TX_SPEAKER_KIRK,
-		TX_MUD4_002,
-		TX_MUD4_007,
-		TX_MUD4_003, // BUGFIX: this used Spock's voice instead of Kirk's in original
+		2,
+		7,
+		3,	// BUGFIX: this used Spock's voice instead of Kirk's in original
 		TX_BLANK
 	};
 
-	int choice = showMultipleTexts(choices);
+	int choice = showMultipleTexts(choices, true);
 
 	switch (choice) {
 	case 0: // Communications
@@ -267,37 +267,37 @@ void Room::mudd4KirkUsedViewScreen() {
 void Room::mudd4Timer1Expired() {
 	_awayMission->disableInput = false;
 	if (_awayMission->mudd.viewScreenEnabled)
-		showText(TX_SPEAKER_KIRK, TX_MUD4_004);
+		showText(TX_SPEAKER_KIRK, 04, true);
 	mudd4ShowRightConsoleMenu();
 }
 
 void Room::mudd4KirkUsedCommunications() {
 	_awayMission->disableInput = false;
 	if (!_awayMission->mudd.knowAboutTorpedo) {
-		showText(TX_SPEAKER_SPOCK, TX_MUD4_054);
+		showText(TX_SPEAKER_SPOCK, 54, true);
 		mudd4ShowRightConsoleMenu();
 	} else {
 		if (!_awayMission->mudd.contactedEnterpriseFirstTime) {
 			_awayMission->mudd.missionScore++;
-			showText(TX_SPEAKER_KIRK,  TX_MUD4_025);
+			showText(TX_SPEAKER_KIRK,  25, true);
 			showText(TX_SPEAKER_SCOTT, TX_MUD4_S02);
 
 			if (_awayMission->mudd.torpedoStatus == 1)
-				showText(TX_SPEAKER_KIRK, TX_MUD4_027);
+				showText(TX_SPEAKER_KIRK, 27, true);
 			else
-				showText(TX_SPEAKER_KIRK, TX_MUD4_028);
+				showText(TX_SPEAKER_KIRK, 28, true);
 
 			showText(TX_SPEAKER_SCOTT, TX_MUD4_S04);
 
 			const TextRef choices[] = {
 				TX_SPEAKER_KIRK,
-				TX_MUD4_024,
-				TX_MUD4_033,
-				TX_MUD4_022, // ENHANCEMENT: This line was recorded twice (MUD4_022 and MUD4_023). It's used twice, so, might as well make use of the second recording.
+				24,
+				33,
+				22,	// ENHANCEMENT: This line was recorded twice (MUD4_022 and MUD4_023). It's used twice, so, might as well make use of the second recording.
 				TX_BLANK
 			};
 
-			int choice = showMultipleTexts(choices);
+			int choice = showMultipleTexts(choices, true);
 
 			if (choice == 1) {
 				endMission(_awayMission->mudd.missionScore, 0x1b, _awayMission->mudd.torpedoStatus);
@@ -315,7 +315,7 @@ void Room::mudd4KirkUsedCommunications() {
 				TX_BLANK
 			};
 
-			showText(TX_SPEAKER_KIRK,  TX_MUD4_020);
+			showText(TX_SPEAKER_KIRK,  20, true);
 			showText(TX_SPEAKER_SCOTT, TX_MUD4_S03);
 			int choice = showMultipleTexts(choices);
 
@@ -359,32 +359,32 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() {
 	        || !_awayMission->mudd.accessedAlienDatabase) { // NOTE: why this last line? Test this...
 		const TextRef choices[] = {
 			TX_SPEAKER_KIRK,
-			TX_MUD4_009,
-			TX_MUD4_016,
+			 9,
+			16,
 			TX_BLANK
 		};
 
-		showText(TX_SPEAKER_MUDD, TX_MUD4_066);
-		int choice = showMultipleTexts(choices);
+		showText(TX_SPEAKER_MUDD, 66, true);
+		int choice = showMultipleTexts(choices, true);
 
 		if (choice == 1) {
 			// Copy of code at very bottom of function
-			showText(TX_SPEAKER_MUDD, TX_MUD4_074);
-			showText(TX_SPEAKER_KIRK, TX_MUD4_017);
-			showText(TX_SPEAKER_MUDD, TX_MUD4_072);
-			showText(TX_SPEAKER_KIRK, TX_MUD4_008);
-			showText(TX_SPEAKER_MUDD, TX_MUD4_068);
-			showText(TX_SPEAKER_KIRK, TX_MUD4_032);
+			showText(TX_SPEAKER_MUDD, 74, true);
+			showText(TX_SPEAKER_KIRK, 17, true);
+			showText(TX_SPEAKER_MUDD, 72, true);
+			showText(TX_SPEAKER_KIRK,  8, true);
+			showText(TX_SPEAKER_MUDD, 68, true);
+			showText(TX_SPEAKER_KIRK, 32, true);
 
 			endMission(_awayMission->mudd.missionScore, 0x1b, _awayMission->mudd.torpedoStatus);
 		} else {
 			// Threaten to arrest Mudd.
 			if (_awayMission->mudd.muddErasedDatabase || _awayMission->mudd.databaseDestroyed)
-				showText(TX_SPEAKER_KIRK, TX_MUD4_034);
+				showText(TX_SPEAKER_KIRK, 34, true);
 			if (_awayMission->mudd.discoveredLenseAndDegrimerFunction)
-				showText(TX_SPEAKER_KIRK, TX_MUD4_037);
+				showText(TX_SPEAKER_KIRK, 37, true);
 
-			showText(TX_SPEAKER_KIRK, TX_MUD4_026);
+			showText(TX_SPEAKER_KIRK, 26, true);
 
 			if (_awayMission->mudd.muddErasedDatabase && _awayMission->mudd.databaseDestroyed) {
 				// Mudd offers to copy the lost data to the enterprise computer. You don't
@@ -393,57 +393,57 @@ void Room::mudd4KirkReachedPositionToTalkToMudd() {
 				// NOTE: This combination is probably impossible, making this unused?
 				// (Either you give Mudd access to the database, or he destroys it.)
 
-				showText(TX_SPEAKER_MUDD,  TX_MUD4_071);
-				showText(TX_SPEAKER_KIRK,  TX_MUD4_036);
-				showText(TX_SPEAKER_SPOCK, TX_MUD4_029);
-				showText(TX_SPEAKER_KIRK,  TX_MUD4_030);
+				showText(TX_SPEAKER_MUDD,  71, true);
+				showText(TX_SPEAKER_KIRK,  36, true);
+				showText(TX_SPEAKER_SPOCK, 29, true);
+				showText(TX_SPEAKER_KIRK,  30, true);
 			} else {
 				// Mudd is forced to agree to give samples to a university.
-				showText(TX_SPEAKER_MUDD, TX_MUD4_064);
-				showText(TX_SPEAKER_KIRK, TX_MUD4_012);
-				showText(TX_SPEAKER_MUDD, TX_MUD4_070);
-				showText(TX_SPEAKER_KIRK, TX_MUD4_010);
-				showText(TX_SPEAKER_MUDD, TX_MUD4_067);
-				showText(TX_SPEAKER_KIRK, TX_MUD4_011);
+				showText(TX_SPEAKER_MUDD, 64, true);
+				showText(TX_SPEAKER_KIRK, 12, true);
+				showText(TX_SPEAKER_MUDD, 70, true);
+				showText(TX_SPEAKER_KIRK, 10, true);
+				showText(TX_SPEAKER_MUDD, 67, true);
+				showText(TX_SPEAKER_KIRK, 11, true);
 
 				_awayMission->mudd.missionScore += 4;
 				playMidiMusicTracks(30);
 
-				showText(TX_SPEAKER_MUDD, TX_MUD4_073);
-				showText(TX_SPEAKER_KIRK, TX_MUD4_035);
+				showText(TX_SPEAKER_MUDD, 73, true);
+				showText(TX_SPEAKER_KIRK, 35, true);
 			}
-			showText(TX_SPEAKER_MUDD, TX_MUD4_069);
-			showText(TX_SPEAKER_KIRK, TX_MUD4_001);
+			showText(TX_SPEAKER_MUDD, 69, true);
+			showText(TX_SPEAKER_KIRK, 01, true);
 
 			endMission(_awayMission->mudd.missionScore, 0x1b, _awayMission->mudd.torpedoStatus);
 		}
 	} else {
 		const TextRef choices[] = {
 			TX_SPEAKER_KIRK,
-			TX_MUD4_014,
-			TX_MUD4_021,
+			14,
+			21,
 			TX_BLANK
 		};
 
-		showText(TX_SPEAKER_MUDD, TX_MUD4_065);
-		int choice = showMultipleTexts(choices);
+		showText(TX_SPEAKER_MUDD, 65, true);
+		int choice = showMultipleTexts(choices, true);
 
 		if (choice == 1) {
-			showText(TX_SPEAKER_MUDD, TX_MUD4_074);
-			showText(TX_SPEAKER_KIRK, TX_MUD4_017);
+			showText(TX_SPEAKER_MUDD, 74, true);
+			showText(TX_SPEAKER_KIRK, 17, true);
 		}
-		showText(TX_SPEAKER_MUDD, TX_MUD4_072);
-		showText(TX_SPEAKER_KIRK, TX_MUD4_008);
-		showText(TX_SPEAKER_MUDD, TX_MUD4_068);
-		showText(TX_SPEAKER_KIRK, TX_MUD4_032);
+		showText(TX_SPEAKER_MUDD, 72, true);
+		showText(TX_SPEAKER_KIRK,  8, true);
+		showText(TX_SPEAKER_MUDD, 68, true);
+		showText(TX_SPEAKER_KIRK, 32, true);
 
 		endMission(_awayMission->mudd.missionScore, 0x1b, _awayMission->mudd.torpedoStatus);
 	}
 }
 
 void Room::mudd4UseMccoyOnConsole() {
-	// NOTE: This audio was recorded twice (TX_MUD4_045, and TX_MUD4_044 which is unused)
-	showText(TX_SPEAKER_MCCOY, TX_MUD4_045);
+	// NOTE: This audio was recorded twice (45, true, and 44, true which is unused)
+	showText(TX_SPEAKER_MCCOY, 45, true);
 
 	_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_N;
 	walkCrewman(OBJECT_MCCOY, 0x7d, 0xc3);
@@ -453,33 +453,33 @@ void Room::mudd4UseRedshirtOnConsole() {
 	// Floppy version shows two different pieces of text here, but in the CD version,
 	// there's no difference
 	if (!_awayMission->mudd.translatedAlienLanguage)
-		showText(TX_SPEAKER_BUCHERT, TX_MUD4_075);
+		showText(TX_SPEAKER_BUCHERT, 75, true);
 	else
-		showText(TX_SPEAKER_BUCHERT, TX_MUD4_075);
+		showText(TX_SPEAKER_BUCHERT, 75, true);
 
 	_awayMission->crewDirectionsAfterWalk[OBJECT_REDSHIRT] = DIR_N;
 	walkCrewman(OBJECT_REDSHIRT, 0x2a, 0xbb);
 }
 
 void Room::mudd4UseSTricorderOnRepairTool() {
-	spockScan(DIR_E, TX_MUD4_051, false);
+	spockScan(DIR_E, 51, false, true);
 }
 
 void Room::mudd4UseSTricorderOnConsole() {
-	spockScan(DIR_N, TX_MUD4_042, false);
+	spockScan(DIR_N, 42, false, true);
 }
 
 void Room::mudd4UseSTricorderOnViewscreen() {
-	spockScan(DIR_N, TX_MUD4_050, false);
+	spockScan(DIR_N, 50, false, true);
 }
 
 void Room::mudd4UseMedkit() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD4_043);
+	showText(TX_SPEAKER_MCCOY, 43, true);
 }
 
 void Room::mudd4GetRepairTool() {
 	if (_awayMission->mudd.tookRepairTool)
-		showDescription(TX_MUD4N012); // NOTE: unused, since the object disappears, can't be selected again
+		showDescription(12, true); // NOTE: unused, since the object disappears, can't be selected again
 	else {
 		_awayMission->disableInput = true;
 		_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
@@ -500,52 +500,52 @@ void Room::mudd4PickedUpRepairTool() {
 }
 
 void Room::mudd4LookAtConsole() {
-	showDescription(TX_MUD4N000);
+	showDescription(0, true);
 }
 
 void Room::mudd4LookAtViewscreen() {
 	if (_awayMission->mudd.viewScreenEnabled)
-		showDescription(TX_MUD4N008);
+		showDescription(8, true);
 	else
-		showDescription(TX_MUD4N013);
+		showDescription(13, true);
 }
 
 void Room::mudd4LookAtKirk() {
-	showDescription(TX_MUD4N003);
+	showDescription(3, true);
 }
 
 void Room::mudd4LookAtSpock() {
-	showDescription(TX_MUD4N006);
+	showDescription(6, true);
 }
 
 void Room::mudd4LookAtMccoy() {
-	showDescription(TX_MUD4N001);
+	showDescription(1, true);
 }
 
 void Room::mudd4LookAtRedshirt() {
-	showDescription(TX_MUD4N004);
+	showDescription(4, true);
 }
 
 void Room::mudd4LookAtRepairTool() {
-	showDescription(TX_MUD4N011);
+	showDescription(11, true);
 }
 
 void Room::mudd4TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_MUD4_005);
+	showText(TX_SPEAKER_KIRK, 05, true);
 }
 
 void Room::mudd4TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_MUD4_063);
-	showText(TX_SPEAKER_KIRK,  TX_MUD4_015);
-	showText(TX_SPEAKER_MCCOY, TX_MUD4_047);
+	showText(TX_SPEAKER_SPOCK, 63, true);
+	showText(TX_SPEAKER_KIRK,  15, true);
+	showText(TX_SPEAKER_MCCOY, 47, true);
 }
 
 void Room::mudd4TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD4_046);
+	showText(TX_SPEAKER_MCCOY, 46, true);
 }
 
 void Room::mudd4TalkToRedshirt() {
-	showText(TX_SPEAKER_BUCHERT, TX_MUD4_076);
+	showText(TX_SPEAKER_BUCHERT, 76, true);
 }
 
 void Room::mudd4WalkToEastDoor() {
diff --git a/engines/startrek/rooms/mudd5.cpp b/engines/startrek/rooms/mudd5.cpp
index b3d4f73adb..23080500ba 100644
--- a/engines/startrek/rooms/mudd5.cpp
+++ b/engines/startrek/rooms/mudd5.cpp
@@ -63,14 +63,14 @@ void Room::mudd5Tick1() {
 void Room::mudd5Timer1Expired() { // Mudd enters room through hatch
 	const TextRef choices[] = {
 		TX_SPEAKER_KIRK,
-		TX_MUD5_006,
-		TX_MUD5_010,
+		6, true,
+		10, true,
 		TX_BLANK
 	};
 
-	showText(TX_SPEAKER_MUDD, TX_MUD5_034);
+	showText(TX_SPEAKER_MUDD, 34, true);
 	showMultipleTexts(choices);
-	showText(TX_SPEAKER_MUDD, TX_MUD5_037);
+	showText(TX_SPEAKER_MUDD, 37, true);
 
 	loadActorAnim2(OBJECT_MUDD, "s4ephc");
 	_awayMission->timers[2] = 140;
@@ -84,47 +84,47 @@ void Room::mudd5Timer2Expired() { // Life-support generator starts acting up
 }
 
 void Room::mudd5UseCommunicator() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD5_003);
+	showText(TX_SPEAKER_KIRK,  3, true);
 	showText(TX_SPEAKER_UHURA, TX_STATICU1);
 }
 
 void Room::mudd5UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_MUD5_022, false);
+	spockScan(DIR_S, 22, false, true);
 }
 
 void Room::mudd5UseSTricorderOnEngine() {
-	spockScan(DIR_E, TX_MUD5_011, false);
+	spockScan(DIR_E, 11, false, true);
 }
 
 void Room::mudd5UseSTricorderOnCrane() {
-	spockScan(DIR_S, TX_MUD5_023, false);
+	spockScan(DIR_S, 23, false, true);
 }
 
 void Room::mudd5UseSTricorderOnHatch() {
-	spockScan(DIR_W, TX_MUD5_024, false);
-	showText(TX_SPEAKER_KIRK, TX_MUD5_001);
+	spockScan(DIR_W, 24, false, true);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::mudd5UseSTricorderOnLifeSupportGenerator() {
 	if (_awayMission->mudd.lifeSupportMalfunctioning)
-		spockScan(DIR_W, TX_MUD5_019, false);
+		spockScan(DIR_W, 19, false, true);
 	else
-		spockScan(DIR_W, TX_MUD5_021, false);
+		spockScan(DIR_W, 21, false, true);
 }
 
 void Room::mudd5UseStunPhaserOnHatch() {
-	showText(TX_SPEAKER_SPOCK, TX_MUD5_025);
-	showText(TX_SPEAKER_MCCOY, TX_MUD5_015);
-	showText(TX_SPEAKER_SPOCK, TX_MUD5_030);
+	showText(TX_SPEAKER_SPOCK, 25, true);
+	showText(TX_SPEAKER_MCCOY, 15, true);
+	showText(TX_SPEAKER_SPOCK, 30, true);
 }
 
 void Room::mudd5UseKillPhaserOnHatch() {
-	showText(TX_SPEAKER_BUCHERT, TX_MUD5_039);
-	showText(TX_SPEAKER_SPOCK,   TX_MUD5_027);
+	showText(TX_SPEAKER_BUCHERT, 39, true);
+	showText(TX_SPEAKER_SPOCK,   27, true);
 }
 
 void Room::mudd5UseAnythingOnLifeSupportGenerator() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD5_014); // BUGFIX: speaker is McCoy, not none
+	showText(TX_SPEAKER_MCCOY, 14, true); // BUGFIX: speaker is McCoy, not none
 }
 
 
@@ -134,7 +134,7 @@ void Room::mudd5UseDooverOnLifeSupportGenerator() {
 		_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_N;
 		walkCrewmanC(OBJECT_KIRK, 0x57, 0xb4, &Room::mudd5KirkReachedLifeSupportGenerator);
 	} else
-		showText(TX_SPEAKER_MCCOY, TX_MUD5_014); // BUGFIX: speaker is McCoy, not none
+		showText(TX_SPEAKER_MCCOY, 14, true); // BUGFIX: speaker is McCoy, not none
 }
 
 void Room::mudd5KirkReachedLifeSupportGenerator() {
@@ -150,8 +150,8 @@ void Room::mudd5KirkTimer4Expired() {
 }
 
 void Room::mudd5KirkRepairedLifeSupportGenerator() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD5_007);
-	showText(TX_SPEAKER_SPOCK, TX_MUD5_028);
+	showText(TX_SPEAKER_KIRK,  7, true);
+	showText(TX_SPEAKER_SPOCK, 28, true);
 
 	_awayMission->mudd.lifeSupportMalfunctioning = false;
 	_awayMission->mudd.muddUnavailable = false;
@@ -166,26 +166,26 @@ void Room::mudd5KirkRepairedLifeSupportGenerator() {
 }
 
 void Room::mudd5KirkTimer3Expired() { // Mudd popped back in after repairing generator
-	showText(TX_SPEAKER_MUDD, TX_MUD5_035);
-	showText(TX_SPEAKER_KIRK, TX_MUD5_005);
-	showText(TX_SPEAKER_MUDD, TX_MUD5_036);
+	showText(TX_SPEAKER_MUDD, 35, true);
+	showText(TX_SPEAKER_KIRK,  5, true);
+	showText(TX_SPEAKER_MUDD, 36, true);
 
 	loadActorAnim2(OBJECT_MUDD, "s4ephc");
 	_awayMission->disableInput = false;
 }
 
 void Room::mudd5LookAtHatch() {
-	showDescription(TX_MUD5N011);
-	showText(TX_SPEAKER_SPOCK, TX_MUD5_031);
-	showText(TX_SPEAKER_KIRK,  TX_MUD5_009);
+	showDescription(11, true);
+	showText(TX_SPEAKER_SPOCK, 31, true);
+	showText(TX_SPEAKER_KIRK,   9, true);
 }
 
 void Room::mudd5LookAtLifeSupportGenerator() {
 	if (_awayMission->mudd.lifeSupportMalfunctioning)
-		showDescription(TX_MUD5N008);
+		showDescription(8, true);
 	else {
-		showDescription(TX_MUD5N012);
-		showText(TX_SPEAKER_SPOCK, TX_MUD5_026);
+		showDescription(12, true);
+		showText(TX_SPEAKER_SPOCK, 26, true);
 	}
 }
 
@@ -203,55 +203,55 @@ void Room::mudd5WalkToDoor() {
 }
 
 void Room::mudd5LookAtKirk() {
-	showDescription(TX_MUD5N002);
+	showDescription(2, true);
 }
 
 void Room::mudd5LookAtSpock() {
-	showDescription(TX_MUD5N005);
+	showDescription(5, true);
 }
 
 void Room::mudd5LookAtMccoy() {
-	showDescription(TX_MUD5N004);
+	showDescription(4, true);
 }
 
 void Room::mudd5LookAtRedshirt() {
-	showDescription(TX_MUD5N003);
+	showDescription(3, true);
 }
 
 void Room::mudd5LookAtDoor() {
-	showDescription(TX_MUD5N010);
+	showDescription(10, true);
 }
 
 void Room::mudd5LookAtCrane() {
-	showDescription(TX_MUD5N000);
+	showDescription(0, true);
 }
 
 void Room::mudd5LookAtEngine() {
-	showDescription(TX_MUD5N006);
+	showDescription(6, true);
 }
 
 void Room::mudd5TalkToKirk() {
-	showText(TX_SPEAKER_KIRK,  TX_MUD5_002);
-	showText(TX_SPEAKER_SPOCK, TX_MUD5_032);
+	showText(TX_SPEAKER_KIRK,   2, true);
+	showText(TX_SPEAKER_SPOCK, 32, true);
 }
 
 void Room::mudd5TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_MUD5_033);
-	showText(TX_SPEAKER_MCCOY, TX_MUD5_016);
+	showText(TX_SPEAKER_SPOCK, 33, true);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::mudd5TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD5_017);
-	showText(TX_SPEAKER_KIRK,  TX_MUD5_004);
+	showText(TX_SPEAKER_MCCOY, 17, true);
+	showText(TX_SPEAKER_KIRK,   4, true);
 }
 
 void Room::mudd5TalkToRedshirt() {
-	showText(TX_SPEAKER_BUCHERT, TX_MUD5_040);
-	showText(TX_SPEAKER_MCCOY,   TX_MUD5_018);
+	showText(TX_SPEAKER_BUCHERT, 40, true);
+	showText(TX_SPEAKER_MCCOY,   18, true);
 }
 
 void Room::mudd5UseMedkit() {
-	showText(TX_SPEAKER_MCCOY, TX_MUD5_012);
+	showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 }
diff --git a/engines/startrek/rooms/mudda.cpp b/engines/startrek/rooms/mudda.cpp
index 20389ea030..93c472630f 100644
--- a/engines/startrek/rooms/mudda.cpp
+++ b/engines/startrek/rooms/mudda.cpp
@@ -31,13 +31,14 @@ namespace StarTrek {
 void Room::muddaUseLenseOnDegrimer() {
 	assert(_vm->_roomIndex >= 0 && _vm->_roomIndex <= 5);
 
+	// All of these audio files are identical, but there's one for each room.
 	const TextRef text[] = {
-		TX_MUD0N011, // All of these audio files are identical, but there's one for each room.
-		TX_MUD1N013,
-		TX_MUD2N010,
-		TX_MUD3N016,
-		TX_MUD4N009,
-		TX_MUD5N009,
+		11,	// MUDD0
+		13,	// MUDD1
+		10,	// MUDD2
+		16,	// MUDD3
+		 9,	// MUDD4
+		 9,	// MUDD5
 	};
 
 	giveItem(OBJECT_IALIENDV);
@@ -45,7 +46,7 @@ void Room::muddaUseLenseOnDegrimer() {
 	loseItem(OBJECT_ILENSES);
 
 	_awayMission->mudd.missionScore++;
-	showDescription(text[_vm->_roomIndex]);
+	showDescription(text[_vm->_roomIndex], true);
 }
 
 
@@ -73,20 +74,11 @@ void Room::muddaUseAlienDevice() {
 void Room::muddaFiredAlienDevice() {
 	assert(_vm->_roomIndex >= 0 && _vm->_roomIndex <= 5);
 
-	const TextRef text[] = {
-		TX_MUD0_002, // These audio files aren't identical, but the text is mostly the same.
-		TX_MUD1_002,
-		TX_MUD2_002,
-		TX_MUD2_002, // Rooms 3-5 reuse MUD2
-		TX_MUD2_002,
-		TX_MUD2_002,
-	};
-
 	_awayMission->disableInput = false;
 	if (!_awayMission->mudd.discoveredLenseAndDegrimerFunction) {
 		_awayMission->mudd.discoveredLenseAndDegrimerFunction = true;
 		_awayMission->mudd.missionScore += 5; // BUGFIX: didn't happen if done in MUDD5
-		showText(TX_SPEAKER_KIRK, text[_vm->_roomIndex]);
+		showText(TX_SPEAKER_KIRK, 2, true);
 	}
 }
 
@@ -94,16 +86,17 @@ void Room::muddaFiredAlienDevice() {
 void Room::muddaUseDegrimer() {
 	assert(_vm->_roomIndex >= 0 && _vm->_roomIndex <= 5);
 
+	// All of these audio files are identical, but there's one for each room.
 	const TextRef text[] = {
-		TX_MUD0N002, // All of these audio files are identical, but there's one for each room.
-		TX_MUD1N004,
-		TX_MUD2N001,
-		TX_MUD3N001,
-		TX_MUD4N002,
-		TX_MUD5N001,
+		2,	// MUDD0
+		4,	// MUDD1
+		1,	// MUDD2
+		1,	// MUDD3
+		2,	// MUDD4
+		1,	// MUDD5
 	};
 
-	showDescription(text[_vm->_roomIndex]);
+	showDescription(text[_vm->_roomIndex], true);
 }
 
 void Room::muddaTick() {
@@ -117,28 +110,15 @@ void Room::muddaTick() {
 
 	assert(_vm->_roomIndex >= 0 && _vm->_roomIndex <= 5);
 
-	/*
-	// Unused: The positions to they originally walked to before collapsing.
-	const Common::Point deathPositions[][4] = {
-	    { Common::Point(0xbb, 0x8d), Common::Point(0xd0, 0x89), Common::Point(0xaa, 0x85), Common::Point(0xbf, 0x83) },
-	    { Common::Point(0xaa, 0xa5), Common::Point(0x83, 0xac), Common::Point(-1, -1), Common::Point(-1, -1) },
-	    { Common::Point(0x108, 0xbb), Common::Point(0x118, 0xc4), Common::Point(0xfe, 0xb2), Common::Point(0x117, 0xae) },
-	    { Common::Point(0xf1, 0x95), Common::Point(0xcd, 0x87), Common::Point(0xec, 0x84), Common::Point(0x110, 0xa6) },
-	    { Common::Point(0x8b, 0xb6), Common::Point(0x69, 0xb7), Common::Point(-1, -1), Common::Point(-1, -1) },
-	    { Common::Point(0x8b, 0xac), Common::Point(0x6f, 0x99), Common::Point(-1, -1), Common::Point(-1, -1) },
-	};
-	*/
-
-	const TextRef deathText[] = { // All of these audio files are identical, but there's one for each room.
-		TX_MUD0N006, TX_MUD1N007, TX_MUD2N005, TX_MUD3N008, TX_MUD4N005, TX_MUD5N105
-	};
-
-	// UNUSED: something similar to "deathText" which would also fit in this situation.
-	/*
-	const TextRef deathText2[] = { // All of these audio files are identical, but there's one for each room.
-		TX_MUD0N009, TX_MUD1N010, TX_MUD2N009, TX_MUD3N013, TX_MUD4N007, TX_MUD5N007
+	// All of these audio files are identical, but there's one for each room.
+	const TextRef deathText[] = {
+		6,	// MUDD0
+		7,	// MUDD1
+		5,	// MUDD2
+		8,	// MUDD3
+		5,	// MUDD4
+		5	// MUDD5
 	};
-	*/
 
 	const int TIMER_LENGTH = 27000;
 
@@ -176,7 +156,7 @@ void Room::muddaTick() {
 				anim += directions[i][_vm->_roomIndex];
 				loadActorAnim2(i, anim);
 			}
-			showDescription(deathText[_vm->_roomIndex]);
+			showDescription(deathText[_vm->_roomIndex], true);
 			showGameOverMenu();
 		}
 	}