STARTREK: Read most strings for the LOV mission from its RDF files

7 files changed, 352 insertions, 352 deletions

diff --git a/engines/startrek/rooms/love0.cpp b/engines/startrek/rooms/love0.cpp
index 38e90d208a..323cc68452 100644
--- a/engines/startrek/rooms/love0.cpp
+++ b/engines/startrek/rooms/love0.cpp
@@ -98,79 +98,79 @@ void Room::love0ReachedDoor1() {
 }
 
 void Room::love0LookAtConsole() {
-	showDescription(TX_LOV0N006);
+	showDescription(6, true);
 }
 
 void Room::love0LookAtViewscreen() {
-	showDescription(TX_LOV0N000);
+	showDescription(0, true);
 }
 
 void Room::love0LookAnywhere() {
-	showDescription(TX_LOV0N009);
+	showDescription(9, true);
 }
 
 void Room::love0LookAtDoor1() {
-	showDescription(TX_LOV0N008);
+	showDescription(8, true);
 }
 
 void Room::love0LookAtDoor2() {
-	showDescription(TX_LOV0N007);
+	showDescription(7, true);
 }
 
 void Room::love0LookAtKirk() {
-	showDescription(TX_LOV0N002);
+	showDescription(2, true);
 }
 
 void Room::love0LookAtMccoy() {
-	showDescription(TX_LOV0N004);
+	showDescription(4, true);
 }
 
 void Room::love0LookAtSpock() {
-	showDescription(TX_LOV0N005);
+	showDescription(5, true);
 }
 
 void Room::love0LookAtRedshirt() {
-	showDescription(TX_LOV0N003);
+	showDescription(3, true);
 }
 
 void Room::love0TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_LOV0_003);
+	showText(TX_SPEAKER_KIRK, 3, true);
 }
 
 void Room::love0TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV0_007);
+	showText(TX_SPEAKER_MCCOY, 7, true);
 }
 
 void Room::love0TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV0_027);
+	showText(TX_SPEAKER_SPOCK, 27, true);
 }
 
 void Room::love0TalkToRedshirt() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV0_038);
+	showText(TX_SPEAKER_FERRIS, 38, true);
 }
 
 void Room::love0UseMTricorderAnywhere() {
 	if (_awayMission->love.knowAboutVirus)
-		mccoyScan(DIR_N, TX_LOV0_008, false);
+		mccoyScan(DIR_N, 8, false, true);
 	else
-		mccoyScan(DIR_N, TX_LOV0_006, false);
+		mccoyScan(DIR_N, 6, false, true);
 }
 
 void Room::love0UseSTricorderOnConsole() {
-	spockScan(DIR_N, TX_LOV0_031, false);
+	spockScan(DIR_N, 31, false, true);
 }
 
 void Room::love0UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_LOV0_028, false);
+	spockScan(DIR_S, 28, false, true);
 }
 
 void Room::love0UseKirkOnConsole() {
-	showText(TX_SPEAKER_KIRK, TX_LOV0_002);
+	showText(TX_SPEAKER_KIRK, 2, true);
 	love0UseSpockOnConsole();
 }
 
 void Room::love0UseRedshirtOnConsole() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV0_036);
+	showText(TX_SPEAKER_FERRIS, 36, true);
 }
 
 void Room::love0UseSpockOnConsole() {
@@ -223,11 +223,11 @@ void Room::love0MccoyAccessedConsole() {
 			showText(TX_SPEAKER_COMPUTER, TX_COMPU188);
 			_roomVar.love.heardSummaryOfVirus = true;
 		}
-		showText(TX_SPEAKER_MCCOY, TX_LOV0_024);
-		showText(TX_SPEAKER_SPOCK, TX_LOV0_035);
-		showText(TX_SPEAKER_MCCOY, TX_LOV0_023);
-		showText(TX_SPEAKER_KIRK,  TX_LOV0_004);
-		showText(TX_SPEAKER_MCCOY, TX_LOV0_009);
+		showText(TX_SPEAKER_MCCOY, 24, true);
+		showText(TX_SPEAKER_SPOCK, 35, true);
+		showText(TX_SPEAKER_MCCOY, 23, true);
+		showText(TX_SPEAKER_KIRK,  4, true);
+		showText(TX_SPEAKER_MCCOY, 9, true);
 		_awayMission->love.knowAboutVirus = true;
 	}
 }
@@ -278,7 +278,7 @@ void Room::love0GetDoorOrConsole() {
 	// BUGFIX: There was a problem with "get door 1" where it would execute a bit of
 	// non-code before reaching where it was supposed to be. Not sure if it had any actual
 	// effect.
-	showDescription(TX_LOV0N001);
+	showDescription(1, true);
 
 	// NOTE: There is an unused block of code that's jumped over in the "get door 2"
 	// function. (Spock says "that's not logical".)
diff --git a/engines/startrek/rooms/love1.cpp b/engines/startrek/rooms/love1.cpp
index aba484689e..25d07853a7 100644
--- a/engines/startrek/rooms/love1.cpp
+++ b/engines/startrek/rooms/love1.cpp
@@ -158,122 +158,122 @@ void Room::love1ReachedDoor2() {
 }
 
 void Room::love1LookAtLaser() {
-	showDescription(TX_LOV1N000);
+	showDescription(0, true);
 }
 
 void Room::love1LookAtKirk() {
-	showDescription(TX_LOV1N003);
+	showDescription(3, true);
 }
 
 void Room::love1LookAtSpock() {
-	showDescription(TX_LOV1N004);
+	showDescription(4, true);
 }
 
 void Room::love1LookAtMccoy() {
-	showDescription(TX_LOV1N001);
+	showDescription(1, true);
 }
 
 void Room::love1LookAtRedshirt() {
-	showDescription(TX_LOV1N002);
+	showDescription(2, true);
 }
 
 void Room::love1LookAnywhere() {
-	showDescription(TX_LOV1N019);
+	showDescription(19, true);
 }
 
 void Room::love1LookAtNozzle() {
-	showDescription(TX_LOV1N022);
+	showDescription(22, true);
 }
 
 void Room::love1LookAtLadder() {
-	showDescription(TX_LOV1N021);
+	showDescription(21, true);
 }
 
 void Room::love1LookAtDoor1Or2() {
-	showDescription(TX_LOV1N020);
+	showDescription(20, true);
 }
 
 void Room::love1LookAtDoor3() {
-	showDescription(TX_LOV1N017);
+	showDescription(17, true);
 }
 
 void Room::love1LookAtDistillator() {
-	showDescription(TX_LOV1N016);
+	showDescription(16, true);
 }
 
 void Room::love1LookAtChamber() {
 	if (_awayMission->love.chamberHasCure)
-		showDescription(TX_LOV1N013);
+		showDescription(13, true);
 	else
-		showDescription(TX_LOV1N014);
+		showDescription(14, true);
 }
 
 void Room::love1LookAtReplicator() {
-	showDescription(TX_LOV1N015);
+	showDescription(15, true);
 }
 
 void Room::love1LookAtFreezer() {
 	if (_awayMission->love.freezerOpen)
-		showDescription(TX_LOV1N023);
+		showDescription(23, true);
 	else
-		showDescription(TX_LOV1N018);
+		showDescription(18, true);
 }
 
 void Room::love1LookAtDishes() {
-	showDescription(TX_LOV1N012);
+	showDescription(12, true);
 }
 
 void Room::love1TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_LOV1_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::love1TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV1_005);
+	showText(TX_SPEAKER_SPOCK, 5, true);
 }
 
 void Room::love1TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV1_011);
+	showText(TX_SPEAKER_MCCOY, 11, true);
 }
 
 void Room::love1TalkToRedshirt() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV1_027);
+	showText(TX_SPEAKER_FERRIS, 27, true);
 }
 
 void Room::love1UseMTricorderOnDishes() {
-	mccoyScan(DIR_W, TX_LOV1_017, false);
+	mccoyScan(DIR_W, 17, false, true);
 	// TODO: only works in this room, despite being inventory item?
 }
 
 void Room::love1UseMTricorderAnywhere() {
 	if (_awayMission->love.knowAboutVirus)
-		mccoyScan(DIR_S, TX_LOV1_009, false);
+		mccoyScan(DIR_S, 9, false, true);
 	else
-		mccoyScan(DIR_S, TX_LOV1_010, false);
+		mccoyScan(DIR_S, 10, false, true);
 }
 
 void Room::love1UseSTricorderOnReplicator() {
-	spockScan(DIR_N, TX_LOV1_022, false);
+	spockScan(DIR_N, 22, false, true);
 }
 
 void Room::love1UseSTricorderOnLaser() {
-	spockScan(DIR_E, TX_LOV1_006, false);
+	spockScan(DIR_E, 6, false, true);
 }
 
 void Room::love1UseSTricorderOnFreezer() {
-	spockScan(DIR_W, TX_LOV1_023, false);
+	spockScan(DIR_W, 23, false, true);
 }
 
 void Room::love1UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_LOV1_003, false);
+	spockScan(DIR_S, 3, false, true);
 }
 
 void Room::love1UseSTricorderOnDishes() {
-	spockScan(DIR_W, TX_LOV1_004, false);
+	spockScan(DIR_W, 4, false, true);
 	// TODO: only works in this room, despite being inventory item?
 }
 
 void Room::love1UseSTricorderOnDistillator() {
-	spockScan(DIR_S, TX_LOV1_007, false);
+	spockScan(DIR_S, 7, false, true);
 }
 
 void Room::love1GetFreezer() {
@@ -284,17 +284,17 @@ void Room::love1KirkReachedFreezer() {
 	if (_awayMission->love.freezerOpen)
 		loadActorAnim2(OBJECT_KIRK, "kusehw", -1, -1, 9);
 	else
-		showDescription(TX_LOV1N010);
+		showDescription(10, true);
 }
 
 void Room::love1KirkGotVirusCulture() {
 	giveItem(OBJECT_IDISHES);
-	showDescription(TX_LOV1N006);
+	showDescription(6, true);
 }
 
 void Room::love1GetFromChamber() {
 	if (!_awayMission->love.chamberHasDish)
-		showDescription(TX_LOV1N009);
+		showDescription(9, true);
 	else
 		walkCrewman(OBJECT_KIRK, 0xb5, 0x8c, 8);
 }
@@ -306,14 +306,14 @@ void Room::love1KirkReachedChamber() {
 void Room::love1KirkGotCureSample() {
 	if (_awayMission->love.chamberHasCure) {
 		giveItem(OBJECT_ISAMPLE);
-		showDescription(TX_LOV1N035);
+		showDescription(35, true);
 
 		// BUGFIX: after removing the cure, unset this variable.
 		// Otherwise, any normal dish inserted afterward automagically becomes a cure.
 		_awayMission->love.chamberHasCure = false;
 	} else {
 		giveItem(OBJECT_IDISHES);
-		showDescription(TX_LOV1N006);
+		showDescription(6, true);
 	}
 
 	loadActorStandAnim(OBJECT_DISH_IN_CHAMBER);
@@ -328,7 +328,7 @@ void Room::love1GetFromNozzle() {
 
 void Room::love1KirkReachedNozzleToGet() {
 	if (_awayMission->love.bottleInNozzle == 0)
-		showDescription(TX_LOV1N011);
+		showDescription(11, true);
 	else
 		loadActorAnim2(OBJECT_KIRK, "kusemn", -1, -1, 11);
 }
@@ -354,7 +354,7 @@ void Room::love1KirkGotBottleFromNozzle() {
 
 	_awayMission->love.bottleInNozzle = BOTTLETYPE_NONE;
 	loadActorStandAnim(OBJECT_BOTTLE);
-	showDescription(TX_LOV1N007);
+	showDescription(7, true);
 	_roomVar.love.itemInNozzle = 0;
 }
 
@@ -404,15 +404,15 @@ void Room::love1KirkPutBottleInNozzle() {
 }
 
 void Room::love1UseAnthingOnNozzle() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV1_012);
+	showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 void Room::love1UseSpockOnReplicator() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV1_002);
+	showText(TX_SPEAKER_SPOCK, 2, true);
 }
 
 void Room::love1UseRedshirtOnReplicator() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV1_026);
+	showText(TX_SPEAKER_FERRIS, 26, true);
 }
 
 void Room::love1UseMccoyOnReplicator() {
@@ -421,10 +421,10 @@ void Room::love1UseMccoyOnReplicator() {
 
 void Room::love1MccoyReachedReplicator() {
 	if (_awayMission->love.bottleInNozzle == BOTTLETYPE_NONE) {
-		showText(TX_SPEAKER_MCCOY, TX_LOV1_021);
+		showText(TX_SPEAKER_MCCOY, 21, true);
 		walkCrewman(OBJECT_MCCOY, 0xbf, 0x98, 0);
 	} else if (!_awayMission->love.chamberHasDish) {
-		showText(TX_SPEAKER_MCCOY, TX_LOV1_015);
+		showText(TX_SPEAKER_MCCOY, 15, true);
 		walkCrewman(OBJECT_MCCOY, 0xbf, 0x98, 0);
 	} else
 		loadActorAnim2(OBJECT_MCCOY, "musehn", -1, -1, 13);
@@ -437,7 +437,7 @@ void Room::love1MccoyUsedReplicator() {
 		playSoundEffectIndex(SND_DOOR1);
 		walkCrewman(OBJECT_MCCOY, 0xbf, 0x98, 0);
 	} else {
-		showText(TX_SPEAKER_MCCOY, TX_LOV1_019);
+		showText(TX_SPEAKER_MCCOY, 19, true);
 		walkCrewman(OBJECT_MCCOY, 0xbf, 0x98, 0);
 	}
 }
@@ -449,12 +449,12 @@ void Room::love1ChamberClosed() {
 
 void Room::love1ChamberOpened() {
 	loadActorAnim(OBJECT_DISH_IN_CHAMBER, "dishes", 0xb4, 0x71, 0);
-	showText(TX_SPEAKER_MCCOY, TX_LOV1_018);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 	_awayMission->love.chamberHasCure = true;
 }
 
 void Room::love1UseAnythingOnChamber() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV1_013);
+	showText(TX_SPEAKER_MCCOY, 13, true);
 }
 
 void Room::love1UseDishesOnChamber() {
@@ -463,7 +463,7 @@ void Room::love1UseDishesOnChamber() {
 
 void Room::love1KirkReachedChamberToPut() {
 	if (_awayMission->love.chamberHasDish)
-		showText(TX_SPEAKER_MCCOY, TX_LOV1_014); // TODO: test
+		showText(TX_SPEAKER_MCCOY, 14, true); // TODO: test
 	else {
 		loadActorAnim(OBJECT_CHAMBER, "s3r2d5", 0xb4, 0x75, 1);
 		playSoundEffectIndex(SND_DOOR1);
@@ -491,7 +491,7 @@ void Room::love1KirkReachedDistillator() {
 
 void Room::love1KirkGotPolyberylcarbonate() {
 	// Result of using insulation on distillator
-	showDescription(TX_LOV1N034);
+	showDescription(34, true);
 	if (!_awayMission->love.gotPolyberylcarbonate) {
 		_awayMission->love.gotPolyberylcarbonate = true;
 		_awayMission->love.missionScore++;
@@ -561,7 +561,7 @@ void Room::love1ReachedFreezerWithArbitraryItem() {
 }
 
 void Room::love1FinishedUsingArbitraryItemOnFreezer() {
-	showDescription(TX_LOV1N008);
+	showDescription(8, true);
 }
 
 void Room::love1UseAnythingOnReplicator() {
@@ -573,7 +573,7 @@ void Room::love1ReachedReplicatorWithArbitraryItem() {
 }
 
 void Room::love1FinishedUsingArbitraryItemOnReplicator() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV1_016);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::love1UseAnythingOnDistillator() {
@@ -585,7 +585,7 @@ void Room::love1ReachedDistillatorWithArbitraryItem() {
 }
 
 void Room::love1FinishedUsingArbitraryItemOnDistillator() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV1_008);
+	showText(TX_SPEAKER_MCCOY, 8, true);
 }
 
 void Room::love1UseKirkOnLadder() {
@@ -639,10 +639,10 @@ void Room::love1CrewmanReachedLadder() {
 void Room::love1CrewmanDiedFromPhaser() {
 	if (_roomVar.love.crewmanUsingDevice == OBJECT_REDSHIRT) {
 		_awayMission->disableInput = false;
-		showText(TX_SPEAKER_FERRIS, TX_LOV1_024);
+		showText(TX_SPEAKER_FERRIS, 24, true);
 		_awayMission->redshirtDead = true;
 	} else {
-		showText(_roomVar.love.dyingSpeaker, TX_LOV1_025);
+		showText(_roomVar.love.dyingSpeaker, 25, true);
 		showGameOverMenu();
 	}
 }
@@ -654,7 +654,7 @@ void Room::love1TouchedHotspot0() {
 	loadActorAnim(OBJECT_PHASERSHOT, "s3r2s1", 0xf3, 0x89, 0);
 	playSoundEffectIndex(SND_PHASSHOT);
 	if (!_awayMission->redshirtDead)
-		showText(TX_SPEAKER_FERRIS, TX_LOV1_028);
+		showText(TX_SPEAKER_FERRIS, 28, true);
 }
 
 }
diff --git a/engines/startrek/rooms/love2.cpp b/engines/startrek/rooms/love2.cpp
index b4cbb3392d..8419db5c9c 100644
--- a/engines/startrek/rooms/love2.cpp
+++ b/engines/startrek/rooms/love2.cpp
@@ -195,65 +195,65 @@ void Room::love2DoorReachedOrOpened() {
 }
 
 void Room::love2LookAtCabinet() {
-	showDescription(TX_LOV2N027);
+	showDescription(27, true);
 }
 
 void Room::love2LookAtDoor() {
-	showDescription(TX_LOV2N001);
+	showDescription(1, true);
 }
 
 void Room::love2LookAtSynthesizer() {
-	showDescription(TX_LOV2N028);
+	showDescription(28, true);
 }
 
 void Room::love2LookAtAnywhere() {
-	showDescription(TX_LOV2N026);
+	showDescription(26, true);
 }
 
 void Room::love2LookAtAntigrav() {
-	showDescription(TX_LOV2N006);
+	showDescription(6, true);
 }
 
 void Room::love2LookAtMccoy() {
-	showDescription(TX_LOV2N011);
+	showDescription(11, true);
 }
 
 void Room::love2LookAtSpock() {
-	showDescription(TX_LOV2N014);
+	showDescription(14, true);
 }
 
 void Room::love2LookAtRedshirt() {
-	showDescription(TX_LOV2N010);
+	showDescription(10, true);
 }
 
 void Room::love2LookAtKirk() {
-	showDescription(TX_LOV2N009);
+	showDescription(9, true);
 }
 
 void Room::love2LookAtArdak() {
-	showDescription(TX_LOV2N045);
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_037);
+	showDescription(45, true);
+	showText(TX_SPEAKER_SPOCK, 37, true);
 }
 
 void Room::love2LookAtChamber() {
-	showDescription(TX_LOV2N029);
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_035);
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_019);
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_033);
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_016);
+	showDescription(29, true);
+	showText(TX_SPEAKER_SPOCK, 35, true);
+	showText(TX_SPEAKER_MCCOY, 19, true);
+	showText(TX_SPEAKER_SPOCK, 33, true);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::love2LookAtCan1() {
 	switch (_awayMission->love.canister1) {
 	case CANTYPE_O2:
-		showDescription(TX_LOV2N004);
+		showDescription(4, true);
 		break;
 	case CANTYPE_H2:
-		showDescription(TX_LOV2N002);
+		showDescription(2, true);
 		break;
 	case CANTYPE_N2:
 	default:
-		showDescription(TX_LOV2N003);
+		showDescription(3, true);
 		break;
 	}
 }
@@ -261,37 +261,37 @@ void Room::love2LookAtCan1() {
 void Room::love2LookAtCan2() {
 	switch (_awayMission->love.canister2) {
 	case CANTYPE_O2:
-		showDescription(TX_LOV2N004);
+		showDescription(4, true);
 		break;
 	case CANTYPE_H2:
-		showDescription(TX_LOV2N002);
+		showDescription(2, true);
 		break;
 	case CANTYPE_N2:
 	default:
-		showDescription(TX_LOV2N003);
+		showDescription(3, true);
 		break;
 	}
 }
 
 void Room::love2TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_LOV2_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::love2TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_029);
+	showText(TX_SPEAKER_SPOCK, 29, true);
 }
 
 void Room::love2TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_009);
+	showText(TX_SPEAKER_MCCOY, 9, true);
 }
 
 void Room::love2TalkToRedshirt() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV2_041);
+	showText(TX_SPEAKER_FERRIS, 41, true);
 }
 
 void Room::love2UseMTricorderAnywhere() {
 	if (_awayMission->love.knowAboutVirus)
-		mccoyScan(DIR_S, TX_LOV2_008, false);
+		mccoyScan(DIR_S, 8, false, true);
 	else
 		// BUGFIX: should be TX_LOV2_012, but the audio file is missing. Using equivalent
 		// audio from another room.
@@ -299,7 +299,7 @@ void Room::love2UseMTricorderAnywhere() {
 }
 
 void Room::love2UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_LOV2_027, false);
+	spockScan(DIR_S, 27, false, true);
 }
 
 void Room::love2UseKirkOnCabinet() {
@@ -359,11 +359,11 @@ void Room::love2ChangedGasFeed() {
 	if (_awayMission->love.gasFeedOn) {
 		_awayMission->love.gasFeedOn = false;
 		loadActorAnim2(OBJECT_GAS_FEED, "s3r3v2", 0xac, 0x75, 0);
-		showDescription(TX_LOV2N007);
+		showDescription(7, true);
 	} else {
 		_awayMission->love.gasFeedOn = true;
 		loadActorAnim2(OBJECT_GAS_FEED, "s3r3v1", 0xac, 0x75, 0);
-		showDescription(TX_LOV2N008);
+		showDescription(8, true);
 	}
 }
 
@@ -390,14 +390,14 @@ void Room::love2UseN2GasOnCanisterSlot() {
 
 void Room::love2ReachedCanisterSlot() {
 	if (_awayMission->love.gasFeedOn)
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_026);
+		showText(TX_SPEAKER_SPOCK, 26, true);
 	else {
 		if (_awayMission->love.canister1 == CANTYPE_NONE)
 			loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 13);
 		else if (_awayMission->love.canister2 == CANTYPE_NONE)
 			loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 14);
 		else
-			showDescription(TX_LOV2N024);
+			showDescription(24, true);
 	}
 }
 
@@ -405,7 +405,7 @@ void Room::love2PutCanisterInSlot1() {
 	playVoc("SE6FOOD");
 	loadActorAnim(OBJECT_CAN1, _roomVar.love.canisterAnim, 0xa7, 0xae, 0);
 	_awayMission->love.canister1 = _roomVar.love.canisterType;
-	showDescription(TX_LOV2N034);
+	showDescription(34, true);
 	loseItem(_roomVar.love.canisterItem);
 }
 
@@ -413,7 +413,7 @@ void Room::love2PutCanisterInSlot2() {
 	playVoc("SE6FOOD");
 	loadActorAnim(OBJECT_CAN2, _roomVar.love.canisterAnim, 0xb1, 0xaf, 0);
 	_awayMission->love.canister2 = _roomVar.love.canisterType;
-	showDescription(TX_LOV2N035);
+	showDescription(35, true);
 	loseItem(_roomVar.love.canisterItem);
 }
 
@@ -423,7 +423,7 @@ void Room::love2UseAntigravOnCanister1() {
 
 void Room::love2ReachedCanisterSlot1ToGet() {
 	if (_awayMission->love.gasFeedOn)
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_025);
+		showText(TX_SPEAKER_SPOCK, 25, true);
 	else {
 		loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 15);
 		// BUGFIX: original game only played this for canister 2
@@ -432,7 +432,7 @@ void Room::love2ReachedCanisterSlot1ToGet() {
 }
 
 void Room::love2TookCanister1() {
-	showDescription(TX_LOV2N030);
+	showDescription(30, true);
 	loadActorStandAnim(OBJECT_CAN1);
 
 	switch (_awayMission->love.canister1) {
@@ -457,7 +457,7 @@ void Room::love2UseAntigravOnCanister2() {
 
 void Room::love2ReachedCanisterSlot2ToGet() {
 	if (_awayMission->love.gasFeedOn)
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_025);
+		showText(TX_SPEAKER_SPOCK, 25, true);
 	else {
 		loadActorAnim2(OBJECT_KIRK, "kusehn", -1, -1, 16);
 		playVoc("SE3PLBAT");
@@ -465,7 +465,7 @@ void Room::love2ReachedCanisterSlot2ToGet() {
 }
 
 void Room::love2TookCanister2() {
-	showDescription(TX_LOV2N031);
+	showDescription(31, true);
 	loadActorStandAnim(OBJECT_CAN2);
 
 	switch (_awayMission->love.canister2) {
@@ -515,13 +515,13 @@ void Room::love2CrewmanUsedSynthesizer() {
 	} else {
 		if (_roomVar.love.cb == 3) {
 			if (haveItem(OBJECT_IWRENCH)) {
-				showText(TX_SPEAKER_SPOCK, TX_LOV2_005);
+				showText(TX_SPEAKER_SPOCK, 5, true);
 				walkCrewman(OBJECT_SPOCK, 0xa8, 0xb7, 16);
 			} else
-				showText(TX_SPEAKER_SPOCK, TX_LOV2_006);
+				showText(TX_SPEAKER_SPOCK, 6, true);
 		} else {
 			_roomVar.love.cb++;
-			showDescription(TX_LOV2N012);
+			showDescription(12, true);
 		}
 	}
 }
@@ -535,7 +535,7 @@ void Room::love2SpockEnabledGasFeeds() {
 	_awayMission->love.gasFeedOn = true;
 
 	loadActorAnim2(OBJECT_GAS_FEED, "s3r3v1", 0xac, 0x75, 0);
-	showDescription(TX_LOV2N008);
+	showDescription(8, true);
 	walkCrewman(OBJECT_SPOCK, 0xc6, 0xbb, 0);
 
 	love2UseSynthesizer();
@@ -562,21 +562,21 @@ void Room::love2UseSynthesizer() {
 					break;
 
 				case SYNTHITEM_VIRUS_SAMPLE: // Wet goo
-					showDescription(TX_LOV2N051);
-					showText(TX_SPEAKER_KIRK, TX_LOV2_002);
+					showDescription(51, true);
+					showText(TX_SPEAKER_KIRK, 2, true);
 					loadActorStandAnim(OBJECT_VIRUSSAMPLE);
 					goto closeSynthesizerDoor;
 
 				case SYNTHITEM_CURE_SAMPLE: // Wet goo
 wetGooFailure:
-					showDescription(TX_LOV2N050);
-					showText(TX_SPEAKER_MCCOY, TX_LOV2_021);
+					showDescription(50, true);
+					showText(TX_SPEAKER_MCCOY, 21, true);
 					loadActorStandAnim(OBJECT_CURESAMPLE);
 					goto closeSynthesizerDoor;
 
 				case SYNTHITEM_BOTTLE: // Nothing happens
 bottleFailure:
-					showText(TX_SPEAKER_SPOCK, TX_LOV2_028);
+					showText(TX_SPEAKER_SPOCK, 28, true);
 					break;
 
 				case SYNTHITEM_NONE: // Water
@@ -598,15 +598,15 @@ closeSynthesizerDoor:
 				switch (_awayMission->love.synthesizerContents) {
 				case SYNTHITEM_PBC: // Inert matter
 inertMatterFailure:
-					showDescription(TX_LOV2N049);
-					showText(TX_SPEAKER_SPOCK, TX_LOV2_039); // BUGFIX: original didn't play audio
+					showDescription(49, true);
+					showText(TX_SPEAKER_SPOCK, 39, true); // BUGFIX: original didn't play audio
 					loadActorStandAnim(OBJECT_POLYBERYLCARBONATE);
 					goto closeSynthesizerDoor;
 
 				case SYNTHITEM_VIRUS_SAMPLE: // Colorless goo (with useful information about virus in ammonia)
-					showDescription(TX_LOV2N048);
-					showText(TX_SPEAKER_SPOCK, TX_LOV2_034); // BUGFIX: original didn't play audio
-					showText(TX_SPEAKER_MCCOY, TX_LOV2_023);
+					showDescription(48, true);
+					showText(TX_SPEAKER_SPOCK, 34, true); // BUGFIX: original didn't play audio
+					showText(TX_SPEAKER_MCCOY, 23, true);
 					loadActorStandAnim(OBJECT_VIRUSSAMPLE);
 					goto closeSynthesizerDoor;
 
@@ -631,8 +631,8 @@ inertMatterFailure:
 					goto inertMatterFailure;
 
 				case SYNTHITEM_VIRUS_SAMPLE: // Wet goo
-					showDescription(TX_LOV2N047);
-					showText(TX_SPEAKER_MCCOY, TX_LOV2_017);
+					showDescription(47, true);
+					showText(TX_SPEAKER_MCCOY, 17, true);
 					loadActorStandAnim(OBJECT_VIRUSSAMPLE);
 					goto closeSynthesizerDoor;
 
@@ -651,13 +651,13 @@ inertMatterFailure:
 			}
 		} else {
 			playVoc("EFX24");
-			showDescription(TX_LOV2N005);
-			showText(TX_SPEAKER_MCCOY, TX_LOV2_010);
+			showDescription(5, true);
+			showText(TX_SPEAKER_MCCOY, 10, true);
 		}
 	} else {
 		playVoc("EFX24");
-		showDescription(TX_LOV2N005);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_024);
+		showDescription(5, true);
+		showText(TX_SPEAKER_SPOCK, 24, true);
 	}
 }
 
@@ -671,33 +671,33 @@ void Room::love2SynthesizerDoorClosed() {
 void Room::love2SynthesizerFinished() {
 	switch (_awayMission->love.synthesizerBottleIndex) {
 	case BOTTLETYPE_N2O:
-		showDescription(TX_LOV2N017);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_032);
-		showText(TX_SPEAKER_MCCOY, TX_LOV2_015);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_036);
+		showDescription(17, true);
+		showText(TX_SPEAKER_SPOCK, 32);
+		showText(TX_SPEAKER_MCCOY, 15);
+		showText(TX_SPEAKER_SPOCK, 36);
 		break;
 
 	case BOTTLETYPE_NH3:
-		showDescription(TX_LOV2N016);
+		showDescription(16, true);
 		if (!_awayMission->redshirtDead) {
-			showText(TX_SPEAKER_FERRIS, TX_LOV2_043);
-			showText(TX_SPEAKER_KIRK, TX_LOV2_003);
+			showText(TX_SPEAKER_FERRIS, 43, true);
+			showText(TX_SPEAKER_KIRK, 3, true);
 		}
 		break;
 
 	case BOTTLETYPE_H2O:
-		showDescription(TX_LOV2N018);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_004);
+		showDescription(18, true);
+		showText(TX_SPEAKER_SPOCK, 4, true);
 		break;
 
 	case BOTTLETYPE_RLG:
 	default:
-		showDescription(TX_LOV2N019);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_031);
-		showText(TX_SPEAKER_MCCOY, TX_LOV2_018);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_030);
-		showText(TX_SPEAKER_MCCOY, TX_LOV2_022);
-		showText(TX_SPEAKER_SPOCK, TX_LOV2_038);
+		showDescription(19, true);
+		showText(TX_SPEAKER_SPOCK, 31, true);
+		showText(TX_SPEAKER_MCCOY, 18, true);
+		showText(TX_SPEAKER_SPOCK, 30, true);
+		showText(TX_SPEAKER_MCCOY, 22, true);
+		showText(TX_SPEAKER_SPOCK, 38, true);
 		break;
 	}
 }
@@ -719,8 +719,8 @@ void Room::love2CureStartedSynthesizing() {
 }
 
 void Room::love2CureSynthesized() {
-	showDescription(TX_LOV2N046);
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_020);
+	showDescription(46, true);
+	showText(TX_SPEAKER_MCCOY, 20, true);
 }
 
 
@@ -732,7 +732,7 @@ void Room::love2UsePolyberylcarbonateOnSynthesizerDoor() {
 
 void Room::love2KirkReachedSynthesizerWithPolyberylcarbonate() {
 	if (_awayMission->love.synthesizerContents != 0)
-		showDescription(TX_LOV2N025);
+		showDescription(25, true);
 	else {
 		loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d2", 0x8a, 0x8d, 5);
 		playSoundEffectIndex(SND_DOOR1);
@@ -758,7 +758,7 @@ void Room::love2UseVirusSampleOnSynthesizerDoor() {
 
 void Room::love2KirkReachedSynthesizerWithVirusSample() {
 	if (_awayMission->love.synthesizerContents != 0)
-		showDescription(TX_LOV2N025);
+		showDescription(25, true);
 	else {
 		loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d2", 0x8a, 0x8d, 6);
 		playSoundEffectIndex(SND_DOOR1);
@@ -784,7 +784,7 @@ void Room::love2UseCureSampleOnSynthesizerDoor() {
 
 void Room::love2KirkReachedSynthesizerWithCureSample() {
 	if (_awayMission->love.synthesizerContents != 0)
-		showDescription(TX_LOV2N025); // BUGFIX: original didn't play audio
+		showDescription(25, true); // BUGFIX: original didn't play audio
 	else {
 		loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d2", 0x8a, 0x8d, 7);
 		playSoundEffectIndex(SND_DOOR1);
@@ -804,18 +804,18 @@ void Room::love2PutCureSampleInSynthesizer() {
 
 
 void Room::love2UseAnythingOnSynthesizerDoor() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV2_014);
+	showText(TX_SPEAKER_MCCOY, 14, true);
 }
 
 void Room::love2UseAnythingOnSynthesizer() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV2_007);
+	showText(TX_SPEAKER_SPOCK, 7, true);
 }
 
 void Room::love2GetCanister() {
 	if (_awayMission->redshirtDead)
-		showText(TX_SPEAKER_MCCOY, TX_LOV2_011);
+		showText(TX_SPEAKER_MCCOY, 11, true);
 	else
-		showText(TX_SPEAKER_FERRIS, TX_LOV2_040);
+		showText(TX_SPEAKER_FERRIS, 40, true);
 }
 
 
@@ -831,7 +831,7 @@ void Room::love2ReachedAntigrav() {
 void Room::love2GotAntigrav() {
 	loadActorStandAnim(OBJECT_ANTIGRAV);
 	giveItem(OBJECT_IANTIGRA);
-	showDescription(TX_LOV2N042);
+	showDescription(42, true);
 }
 
 
@@ -847,7 +847,7 @@ void Room::love2ReachedPolyberylcarbonate() {
 
 void Room::love2GotPolyberylcarbonate() {
 	loadActorStandAnim(OBJECT_POLYBERYLCARBONATE);
-	showDescription(TX_LOV2N044);
+	showDescription(44, true);
 	giveItem(OBJECT_IPBC);
 	_awayMission->love.synthesizerContents = 0;
 	loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0);
@@ -867,7 +867,7 @@ void Room::love2ReachedDishes() {
 
 void Room::love2GotDishes() {
 	loadActorStandAnim(OBJECT_VIRUSSAMPLE);
-	showDescription(TX_LOV2N036); // FIXME: text doesn't match audio
+	showDescription(36, true); // FIXME: text doesn't match audio
 	giveItem(OBJECT_IDISHES);
 	_awayMission->love.synthesizerContents = 0;
 	loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0);
@@ -887,7 +887,7 @@ void Room::love2ReachedSample() {
 
 void Room::love2GotSample() {
 	loadActorStandAnim(OBJECT_CURESAMPLE);
-	showDescription(TX_LOV2N037);
+	showDescription(37, true);
 	giveItem(OBJECT_ISAMPLE);
 	_awayMission->love.synthesizerContents = 0;
 	loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0);
@@ -908,23 +908,23 @@ void Room::love2ReachedSynthesizerOutput() {
 void Room::love2GotSynthesizerOutput() {
 	switch (_awayMission->love.synthesizerBottleIndex) {
 	case BOTTLETYPE_N2O:
-		showDescription(TX_LOV2N040);
+		showDescription(40, true);
 		giveItem(OBJECT_IN2O);
 		break;
 
 	case BOTTLETYPE_NH3:
-		showDescription(TX_LOV2N039);
+		showDescription(39, true);
 		giveItem(OBJECT_INH3);
 		break;
 
 	case BOTTLETYPE_H2O:
-		showDescription(TX_LOV2N041);
+		showDescription(41, true);
 		giveItem(OBJECT_IH2O);
 		break;
 
 	case BOTTLETYPE_RLG:
 	default:
-		showDescription(TX_LOV2N038);
+		showDescription(38, true);
 		if (!_awayMission->love.gotTLDH) {
 			_awayMission->love.gotTLDH = true;
 			_awayMission->love.missionScore += 4;
@@ -959,7 +959,7 @@ void Room::love2GotCure() {
 
 	giveItem(OBJECT_ICURE);
 	loadActorStandAnim(OBJECT_CURE);
-	showDescription(TX_LOV2N043);
+	showDescription(43, true);
 
 	loadActorAnim(OBJECT_SYNTHESIZER_DOOR, "s3r3d5", 0x8a, 0x8d, 0);
 	playSoundEffectIndex(SND_DOOR1);
diff --git a/engines/startrek/rooms/love3.cpp b/engines/startrek/rooms/love3.cpp
index b0b90f0369..bf1b97f930 100644
--- a/engines/startrek/rooms/love3.cpp
+++ b/engines/startrek/rooms/love3.cpp
@@ -69,8 +69,8 @@ void Room::love3Tick1() {
 
 void Room::love3Tick80() {
 	if (!_awayMission->love.visitedRoomWithRomulans && haveItem(OBJECT_IRLG)) {
-		showText(TX_SPEAKER_MCCOY, TX_LOV3_010);
-		showText(TX_SPEAKER_SPOCK, TX_LOV3_020);
+		showText(TX_SPEAKER_MCCOY, 10, true);
+		showText(TX_SPEAKER_SPOCK, 20, true);
 	}
 }
 
@@ -89,27 +89,27 @@ void Room::love3LookAtServicePanel() {
 }
 
 void Room::love3LookAtMonitor() {
-	showDescription(TX_LOV3N000); // BUGFIX: original didn't play the audio
+	showDescription(0, true); // BUGFIX: original didn't play the audio
 }
 
 void Room::love3LookAtWrench() {
-	showDescription(TX_LOV3N002);
+	showDescription(2, true);
 }
 
 void Room::love3LookAtKirk() {
-	showDescription(TX_LOV3N003);
+	showDescription(3, true);
 }
 
 void Room::love3LookAtMccoy() {
-	showDescription(TX_LOV3N005);
+	showDescription(5, true);
 }
 
 void Room::love3LookAtSpock() {
-	showDescription(TX_LOV3N008);
+	showDescription(8, true);
 }
 
 void Room::love3LookAtRedshirt() {
-	showDescription(TX_LOV3N004);
+	showDescription(4, true);
 }
 
 void Room::love3LookAnywhere() {
@@ -121,69 +121,69 @@ void Room::love3LookAtShaft() {
 }
 
 void Room::love3LookAtGrate() {
-	showDescription(TX_LOV3N019);
+	showDescription(19, true);
 }
 
 void Room::love3LookAtPanel() {
 	if (_awayMission->love.insulationOnGround)
-		showDescription(TX_LOV3N017);
+		showDescription(17, true);
 	else
 		showDescription(TX_LOV3NA22);
 }
 
 void Room::love3LookAtGasTank() {
-	showDescription(TX_LOV3N006);
+	showDescription(6, true);
 }
 
 void Room::love3LookAtTurbines() {
-	showDescription(TX_LOV3N026);
-	showText(TX_SPEAKER_MCCOY, TX_LOV3_009);
-	showText(TX_SPEAKER_SPOCK, TX_LOV3_019);
+	showDescription(26, true);
+	showText(TX_SPEAKER_MCCOY, 9, true);
+	showText(TX_SPEAKER_SPOCK, 19, true);
 	if (!_awayMission->redshirtDead)
-		showText(TX_SPEAKER_FERRIS, TX_LOV3_026);
+		showText(TX_SPEAKER_FERRIS, 26, true);
 }
 
 void Room::love3TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_LOV3_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::love3TalkToSpock() {
 	if (_awayMission->love.visitedRoomWithRomulans)
-		showText(TX_SPEAKER_SPOCK, TX_LOV3_003);
+		showText(TX_SPEAKER_SPOCK, 3, true);
 	else if (_awayMission->love.romulansUnconsciousFromLaughingGas)
-		showText(TX_SPEAKER_SPOCK, TX_LOV3_017);
+		showText(TX_SPEAKER_SPOCK, 17, true);
 	else if (haveItem(OBJECT_IRLG))
-		showText(TX_SPEAKER_SPOCK, TX_LOV3_004);
+		showText(TX_SPEAKER_SPOCK, 4, true);
 	else
-		showText(TX_SPEAKER_SPOCK, TX_LOV3_003);
+		showText(TX_SPEAKER_SPOCK, 3, true);
 }
 
 void Room::love3TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV3_008);
+	showText(TX_SPEAKER_MCCOY, 8, true);
 }
 
 void Room::love3TalkToRedshirt() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV3_024);
+	showText(TX_SPEAKER_FERRIS, 24, true);
 }
 
 void Room::love3UseMTricorderAnywhere() {
 	if (_awayMission->love.knowAboutVirus)
-		mccoyScan(DIR_S, TX_LOV3_005, false);
+		mccoyScan(DIR_S, 5, false, true);
 	else
-		mccoyScan(DIR_S, TX_LOV3_006, false);
+		mccoyScan(DIR_S, 6, false, true);
 }
 
 void Room::love3UseSTricorderOnTurbines() {
-	spockScan(DIR_N, TX_LOV3_014, false);
+	spockScan(DIR_N, 14, false, true);
 }
 
 void Room::love3UseSTricorderOnInsulation() {
 	if (_awayMission->love.insulationOnGround)
-		spockScan(DIR_W, TX_LOV3_002, false);
+		spockScan(DIR_W, 2, false, true);
 }
 
 void Room::love3UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_LOV3_013, false);
+	spockScan(DIR_S, 13, false, true);
 }
 
 void Room::love3UseKirkOnServicePanel() {
@@ -222,11 +222,11 @@ void Room::love3OpenedOrClosedServicePanel() {
 
 	if (_awayMission->love.servicePanelOpen) {
 		if (_awayMission->love.tookN2TankFromServicePanel)
-			showDescription(TX_LOV3N023);
+			showDescription(23, true);
 		else
-			showDescription(TX_LOV3N022);
+			showDescription(22, true);
 	} else
-		showDescription(TX_LOV3N020);
+		showDescription(20, true);
 }
 
 // Use wrench on gas tank, to screw or unscrew it in position
@@ -241,19 +241,19 @@ void Room::love3ReachedGasTankToUnscrew() {
 
 void Room::love3ScrewedOrUnscrewedGasTank() {
 	if (!_awayMission->love.gasTankUnscrewed) {
-		showDescription(TX_LOV3N012);
+		showDescription(12, true);
 		if (!_awayMission->redshirtDead)
-			showText(TX_SPEAKER_FERRIS, TX_LOV3_022);
+			showText(TX_SPEAKER_FERRIS, 22, true);
 		_awayMission->love.gasTankUnscrewed = true;
 	} else {
-		showDescription(TX_LOV3N015);
+		showDescription(15, true);
 		_awayMission->love.gasTankUnscrewed = false;
 	}
 }
 
 
 void Room::love3UseWrenchOnO2OrH2Gas() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV3_016);
+	showText(TX_SPEAKER_SPOCK, 16, true);
 }
 
 
@@ -268,7 +268,7 @@ void Room::love3ReachedGasTankToPutDown() {
 }
 
 void Room::love3PutN2TankBack() {
-	showDescription(TX_LOV3N013);
+	showDescription(13, true);
 	_awayMission->love.tookN2TankFromServicePanel = false;
 	loseItem(OBJECT_IN2GAS);
 	loadActorAnim(OBJECT_GAS_TANK, "r4n2", 0, 0, 0);
@@ -291,12 +291,12 @@ void Room::love3OpenedEngineeringPanel() {
 		loadActorAnim(OBJECT_INSULATION, "s3r4p1", 0, 0, 0);
 		_awayMission->love.insulationOnGround = true;
 	}
-	showDescription(TX_LOV3N021);
+	showDescription(21, true);
 }
 
 
 void Room::love3UseWrenchOnMonitor() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV3_018);
+	showText(TX_SPEAKER_SPOCK, 18, true);
 }
 
 
@@ -312,14 +312,14 @@ void Room::love3PouredWaterOnMonitor() {
 	// BUGFIX: the speaker should be Lt. Ferris. In the original, the speaker wasn't
 	// specified.
 	// However, there is no substitute text for when Lt. Ferris is dead.
-	showText(TX_SPEAKER_FERRIS, TX_LOV3_021);
+	showText(TX_SPEAKER_FERRIS, 21, true);
 
 	loseItem(OBJECT_IH2O);
 }
 
 
 void Room::love3UseCrewmanOnEngineeringPanelOrGrate() {
-	showDescription(TX_LOV3N030);
+	showDescription(30, true);
 }
 
 
@@ -344,7 +344,7 @@ void Room::love3OpenedOrClosedGrate() {
 	if (!_awayMission->love.grateRemoved) {
 		_awayMission->love.grateRemoved = true;
 		loadActorAnim(OBJECT_GRATE, "s3r4g3", 0, 0, 0);
-		showDescription(TX_LOV3N016);
+		showDescription(16, true);
 		if (!_awayMission->love.gotPointsForOpeningGrate) {
 			_awayMission->love.gotPointsForOpeningGrate = true;
 			_awayMission->love.missionScore++;
@@ -352,13 +352,13 @@ void Room::love3OpenedOrClosedGrate() {
 	} else {
 		loadActorAnim(OBJECT_GRATE, "s3r4g1", 0x116, 0x8f, 0);
 		_awayMission->love.grateRemoved = false;
-		showDescription(TX_LOV3N032);
+		showDescription(32, true);
 	}
 }
 
 
 void Room::love3UseCrewmanOnShaft() {
-	showDescription(TX_LOV3N011);
+	showDescription(11, true);
 }
 
 
@@ -368,13 +368,13 @@ void Room::love3UseWaterOnShaft() {
 
 void Room::love3ReachedShaftUsingWater() {
 	if (!_awayMission->love.grateRemoved)
-		showDescription(TX_LOV3N025);
+		showDescription(25, true);
 	else
 		loadActorAnimC(OBJECT_KIRK, "kuseme", -1, -1, &Room::love3PouredWaterDownShaft);
 }
 
 void Room::love3PouredWaterDownShaft() {
-	showDescription(TX_LOV3N009);
+	showDescription(9, true);
 	loseItem(OBJECT_IH2O);
 }
 
@@ -385,14 +385,14 @@ void Room::love3UseNitrousOxideOnShaft() {
 
 void Room::love3ReachedShaftUsingNitrousOxide() {
 	if (!_awayMission->love.grateRemoved)
-		showDescription(TX_LOV3N025);
+		showDescription(25, true);
 	else
 		loadActorAnimC(OBJECT_KIRK, "kuseme", -1, -1, &Room::love3PouredNitrousOxideDownShaft);
 }
 
 void Room::love3PouredNitrousOxideDownShaft() {
-	showDescription(TX_LOV3N018);
-	showText(TX_SPEAKER_SPOCK, TX_LOV3_012);
+	showDescription(18, true);
+	showText(TX_SPEAKER_SPOCK, 12, true);
 	loseItem(OBJECT_IN2O);
 }
 
@@ -403,16 +403,16 @@ void Room::love3UseAmmoniaOnShaft() {
 
 void Room::love3ReachedShaftUsingAmmonia() {
 	if (!_awayMission->love.grateRemoved)
-		showDescription(TX_LOV3N025);
+		showDescription(25, true);
 	else
 		loadActorAnimC(OBJECT_KIRK, "kuseme", -1, -1, &Room::love3PouredAmmoniaDownShaft);
 }
 
 void Room::love3PouredAmmoniaDownShaft() {
 	if (!_awayMission->love.romulansUnconsciousFromVirus) {
-		showDescription(TX_LOV3N001);
+		showDescription(01, true);
 		if (!_awayMission->redshirtDead)
-			showText(TX_SPEAKER_FERRIS, TX_LOV3_023);
+			showText(TX_SPEAKER_FERRIS, 23, true);
 	}
 
 	loseItem(OBJECT_INH3);
@@ -427,7 +427,7 @@ void Room::love3UseRomulanLaughingGasOnShaft() {
 		_awayMission->love.missionScore += 6;
 	}
 	if (_awayMission->love.romulansUnconsciousFromLaughingGas)
-		showText(TX_SPEAKER_SPOCK, TX_LOV3_011);
+		showText(TX_SPEAKER_SPOCK, 11, true);
 	else {
 		walkCrewmanC(OBJECT_KIRK, 0xf6, 0xa4, &Room::love3ReachedShaftUsingRomulanLaughingGas);
 	}
@@ -435,7 +435,7 @@ void Room::love3UseRomulanLaughingGasOnShaft() {
 
 void Room::love3ReachedShaftUsingRomulanLaughingGas() {
 	if (!_awayMission->love.grateRemoved)
-		showDescription(TX_LOV3N025);
+		showDescription(25, true);
 	else {
 		loadActorAnimC(OBJECT_KIRK, "kuseme", -1, -1, &Room::love3PouredRomulanLaughingGasDownShaft);
 		playVoc("EFX24");
@@ -470,7 +470,7 @@ void Room::love3PickedUpWrench() {
 	giveItem(OBJECT_IWRENCH);
 	loadActorStandAnim(OBJECT_WRENCH);
 	_awayMission->love.wrenchTaken = true;
-	showDescription(TX_LOV3N031);
+	showDescription(31, true);
 }
 
 
@@ -481,9 +481,9 @@ void Room::love3GetGasTank() {
 
 void Room::love3ReachedGasTankToGet() {
 	if (_awayMission->love.gasTankUnscrewed)
-		showDescription(TX_LOV3N007);
+		showDescription(07, true);
 	else
-		showDescription(TX_LOV3N014);
+		showDescription(14, true);
 }
 
 
@@ -497,8 +497,8 @@ void Room::love3ReachedGasTankUsingAntigrav() {
 		loadActorAnimC(OBJECT_KIRK, "kusehe", -1, -1, &Room::love3PickedUpGasTank);
 		playVoc("SE3PLBAT");
 	} else {
-		showDescription(TX_LOV3N010);
-		showText(TX_SPEAKER_SPOCK, TX_LOV3_015);
+		showDescription(10, true);
+		showText(TX_SPEAKER_SPOCK, 15, true);
 	}
 }
 
@@ -509,7 +509,7 @@ void Room::love3PickedUpGasTank() {
 
 	showDescription(TX_LOV3NJ32);
 	if (!_awayMission->redshirtDead)
-		showText(TX_SPEAKER_FERRIS, TX_LOV3_025);
+		showText(TX_SPEAKER_FERRIS, 25, true);
 }
 
 void Room::love3GetInsulation() {
@@ -524,7 +524,7 @@ void Room::love3ReachedInsulationToGet() {
 void Room::love3PickedUpInsulation() {
 	loadActorStandAnim(OBJECT_KIRK);
 	giveItem(OBJECT_IINSULAT);
-	showDescription(TX_LOV3N029);
+	showDescription(29, true);
 }
 
 }
diff --git a/engines/startrek/rooms/love4.cpp b/engines/startrek/rooms/love4.cpp
index 9ca5305893..9d48dab3ed 100644
--- a/engines/startrek/rooms/love4.cpp
+++ b/engines/startrek/rooms/love4.cpp
@@ -96,23 +96,23 @@ void Room::love4ReachedLadder() {
 }
 
 void Room::love4UseStunPhaserOnRomulan() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV4_007);
+	showText(TX_SPEAKER_MCCOY, 7, true);
 }
 
 void Room::love4LookAnywhere() {
-	showDescription(TX_LOV4N009);
+	showDescription(9, true);
 }
 
 void Room::love4LookAtLadder() {
-	showDescription(TX_LOV4N010);
+	showDescription(10, true);
 }
 
 void Room::love4LookAtDoor() {
-	showDescription(TX_LOV4N008);
+	showDescription(8, true);
 }
 
 void Room::love4LookAtKirk() {
-	showDescription(TX_LOV4N002);
+	showDescription(2, true);
 }
 
 void Room::love4LookAtMccoy() {
@@ -121,76 +121,76 @@ void Room::love4LookAtMccoy() {
 	// is thinking it.
 	// Not sure if this was an intentional decision, but there is another unused audio
 	// file which matches with the text more accurately, so I'm using that instead.
-	showDescription(TX_LOV4N012);
+	showDescription(12, true);
 }
 
 void Room::love4LookAtSpock() {
-	showDescription(TX_LOV4N003);
+	showDescription(03, true);
 }
 
 void Room::love4LookAtRedshirt() {
-	showDescription(TX_LOV4N001);
+	showDescription(01, true);
 }
 
 void Room::love4LookAtRomulan() {
 	if (!_awayMission->love.romulansCured)
-		showDescription(TX_LOV4N006);
+		showDescription(06, true);
 	else
-		showDescription(TX_LOV4N011);
+		showDescription(11, true);
 }
 
 void Room::love4TalkToKirk() {
-	showText(TX_SPEAKER_KIRK,  TX_LOV4_005);
-	showText(TX_SPEAKER_MCCOY, TX_LOV4_024);
-	showText(TX_SPEAKER_KIRK,  TX_LOV4_002);
+	showText(TX_SPEAKER_KIRK,  05, true);
+	showText(TX_SPEAKER_MCCOY, 24, true);
+	showText(TX_SPEAKER_KIRK,  02, true);
 }
 
 void Room::love4TalkToMccoy() {
 	if (_awayMission->love.romulansCured)
-		showText(TX_SPEAKER_MCCOY, TX_LOV4_022);
+		showText(TX_SPEAKER_MCCOY, 22, true);
 	else
-		showText(TX_SPEAKER_MCCOY, TX_LOV4_010);
+		showText(TX_SPEAKER_MCCOY, 10, true);
 }
 
 void Room::love4TalkToRedshirt() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV4_028);
+	showText(TX_SPEAKER_FERRIS, 28, true);
 }
 
 void Room::love4TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_LOV4_027);
-	showText(TX_SPEAKER_KIRK,  TX_LOV4_003);
+	showText(TX_SPEAKER_SPOCK, 27, true);
+	showText(TX_SPEAKER_KIRK,   3, true);
 }
 
 void Room::love4TalkToRomulan() {
 	if (_awayMission->love.romulansCured)
-		showDescription(TX_LOV4N007); // BUGFIX: original didn't play audio
+		showDescription(7, true); // BUGFIX: original didn't play audio
 }
 
 void Room::love4UseMTricorderOnRomulan() {
 	if (_awayMission->love.romulansCured)
-		mccoyScan(DIR_S, TX_LOV4_018, false);
+		mccoyScan(DIR_S, 18, false, true);
 	else
-		mccoyScan(DIR_S, TX_LOV4_015, false);
+		mccoyScan(DIR_S, 15, false, true);
 }
 
 void Room::love4UseMTricorderAnywhere() {
 	if (_awayMission->love.romulansCured)
-		mccoyScan(DIR_S, TX_LOV4_019, false);
+		mccoyScan(DIR_S, 19, false, true);
 	else if (_awayMission->love.romulansUnconsciousFromLaughingGas)
-		mccoyScan(DIR_S, TX_LOV4_020, false);
+		mccoyScan(DIR_S, 20, false, true);
 	else
-		mccoyScan(DIR_S, TX_LOV4_021, false);
+		mccoyScan(DIR_S, 21, false, true);
 }
 
 void Room::love4UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_LOV4_006, false);
+	spockScan(DIR_S, 6, false, true);
 }
 
 
 // Mccoy walks around to all romulans, giving each the cure
 void Room::love4UseCureOnRomulan() {
 	if (_awayMission->love.romulansCured)
-		showText(TX_SPEAKER_MCCOY, TX_LOV4_013);
+		showText(TX_SPEAKER_MCCOY, 13, true);
 	else {
 		_awayMission->love.missionScore += 2;
 		_awayMission->love.romulansCured = true;
@@ -233,9 +233,9 @@ void Room::love4MccoyReachedRomulan1() {
 void Room::love4MccoyCuredRomulan1() {
 	loadActorAnim2(OBJECT_ROMULAN_1, "s3r5r1", 0x36, 0xb3, 0);
 
-	showDescription(TX_LOV4N005);
+	showDescription(05, true);
 	if (!_roomVar.love.gaveWaterToRomulans)
-		showText(TX_SPEAKER_MCCOY, TX_LOV4_023);
+		showText(TX_SPEAKER_MCCOY, 23, true);
 
 	_awayMission->disableInput = false;
 }
@@ -246,13 +246,13 @@ void Room::love4UseWaterOnRomulan() {
 	// In the original, you could use water on them, but there would be no corresponding
 	// narration, you'd get no points for it, and you'd lose the water anyway.
 	if (!_awayMission->love.romulansCured)
-		showText(TX_SPEAKER_MCCOY, TX_LOV4_009);
+		showText(TX_SPEAKER_MCCOY, 9, true);
 	else {
 		_roomVar.love.gaveWaterToRomulans = true;
 		if (_awayMission->love.romulansCured) {
-			showDescription(TX_LOV4N013);
-			showText(TX_SPEAKER_MCCOY, TX_LOV4_026);
-			showText(TX_SPEAKER_KIRK, TX_LOV4_001);
+			showDescription(13, true);
+			showText(TX_SPEAKER_MCCOY, 26, true);
+			showText(TX_SPEAKER_KIRK, 1, true);
 			if (!_awayMission->love.gotPointsForHydratingRomulans) {
 				_awayMission->love.gotPointsForHydratingRomulans = true;
 				_awayMission->love.missionScore += 2;
@@ -271,29 +271,29 @@ void Room::love4UseWaterOnRomulan() {
 	// they did get voice acted anyway.
 	if (false) {
 		if (_awayMission->love.romulansUnconsciousFromVirus)
-			showText(TX_SPEAKER_MCCOY, TX_LOV4_009);
+			showText(TX_SPEAKER_MCCOY, 9, true);
 		else {
-			showDescription(TX_LOV4N004);
+			showDescription(4, true);
 			if (!_awayMission->redshirtDead) {
-				showText(TX_SPEAKER_FERRIS, TX_LOV4_029);
-				showText(TX_SPEAKER_KIRK,   TX_LOV4_004);
+				showText(TX_SPEAKER_FERRIS, 29, true);
+				showText(TX_SPEAKER_KIRK,    4, true);
 			}
-			showText(TX_SPEAKER_MCCOY, TX_LOV4_011);
+			showText(TX_SPEAKER_MCCOY, 11, true);
 			loseItem(OBJECT_IH2O);
 		}
 	}
 }
 
 void Room::love4UseMedkitOnRomulan() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV4_012);
+	showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 void Room::love4UseCureSampleOnRomulan() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV4_014);
+	showText(TX_SPEAKER_MCCOY, 14, true);
 }
 
 void Room::love4UseAnythingOnRomulan() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV4_017);
+	showText(TX_SPEAKER_MCCOY, 17, true);
 }
 
 }
diff --git a/engines/startrek/rooms/love5.cpp b/engines/startrek/rooms/love5.cpp
index ce30d4c00c..3575f92bcb 100644
--- a/engines/startrek/rooms/love5.cpp
+++ b/engines/startrek/rooms/love5.cpp
@@ -71,7 +71,7 @@ void Room::love5Timer4Expired() {
 }
 
 void Room::love5UseStunPhaserOnPreax() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV5_011);
+	showText(TX_SPEAKER_MCCOY, 11, true);
 
 	// BUG: this function has two implementations. The second one (which is shadowed) is
 	// below.
@@ -80,23 +80,23 @@ void Room::love5UseStunPhaserOnPreax() {
 }
 
 void Room::love5LookAtKirk() {
-	showDescription(TX_LOV5N004);
+	showDescription(04, true);
 }
 
 void Room::love5LookAtSpock() {
-	showDescription(TX_LOV5N005);
+	showDescription(05, true);
 }
 
 void Room::love5LookAtMccoy() {
-	showDescription(TX_LOV5N002);
+	showDescription(02, true);
 }
 
 void Room::love5LookAtRedshirt() {
-	showDescription(TX_LOV5N003);
+	showDescription(3, true);
 }
 
 void Room::love5LookAnywhere() {
-	showDescription(TX_LOV5N008);
+	showDescription(8, true);
 
 	// There is an unused version of this function, which states "This is Dr. Marcus's
 	// quarters, and there are hostages and 4 romulans here". That description doesn't
@@ -105,104 +105,104 @@ void Room::love5LookAnywhere() {
 	// load room LOVE6. This may be a leftover from a removed room that somehow ended up
 	// here.
 
-	//showText(TX_LOV5N009);
+	//showText(09, true);
 }
 
 void Room::love5LookAtDevice() {
-	showDescription(TX_LOV5N013);
-	showText(TX_SPEAKER_MCCOY, TX_LOV5_028);
-	showText(TX_SPEAKER_MARCUS, TX_LOV5_044);
+	showDescription(13, true);
+	showText(TX_SPEAKER_MCCOY, 28, true);
+	showText(TX_SPEAKER_MARCUS, 44, true);
 }
 
 void Room::love5LookAtConsole() {
-	showDescription(TX_LOV5N016);
-	showText(TX_SPEAKER_MCCOY, TX_LOV5_031);
-	showText(TX_SPEAKER_MARCUS, TX_LOV5_050);
+	showDescription(16, true);
+	showText(TX_SPEAKER_MCCOY, 31, true);
+	showText(TX_SPEAKER_MARCUS, 50, true);
 }
 
 void Room::love5LookAtDrMarcus() {
 	if (_awayMission->love.freedMarcusAndCheever)
-		showDescription(TX_LOV5N001);
+		showDescription(01, true);
 	else {
 		// BUGFIX: originally played audio "LOV5N001", which is only the first sentence of
 		// what should be spoken.
-		showDescription(TX_LOV5N015);
+		showDescription(15, true);
 
-		showText(TX_SPEAKER_MARCUS, TX_LOV5_046);
+		showText(TX_SPEAKER_MARCUS, 46, true);
 	}
 }
 
 void Room::love5LookAtDrCheever() {
 	if (_awayMission->love.freedMarcusAndCheever)
-		showDescription(TX_LOV5N000);
+		showDescription(00, true);
 	else {
-		showDescription(TX_LOV5N014);
-		showText(TX_SPEAKER_CHEEVER, TX_LOV5_057);
+		showDescription(14, true);
+		showText(TX_SPEAKER_CHEEVER, 57, true);
 		if (!_awayMission->redshirtDead) {
-			showText(TX_SPEAKER_FERRIS, TX_LOV5_054);
-			showText(TX_SPEAKER_CHEEVER, TX_LOV5_058);
+			showText(TX_SPEAKER_FERRIS, 54, true);
+			showText(TX_SPEAKER_CHEEVER, 58, true);
 		}
 	}
 }
 
 void Room::love5LookAtPreax() {
 	if (_awayMission->love.preaxCured)
-		showDescription(TX_LOV5N011);
+		showDescription(11, true);
 	else
-		showDescription(TX_LOV5N012);
+		showDescription(12, true);
 }
 
 void Room::love5TalkToPreax() {
 	if (_awayMission->love.preaxCured) {
 		if (!_awayMission->love.freedMarcusAndCheever)
-			showDescription(TX_LOV5N006);
+			showDescription(06, true);
 		else {
 			const TextRef choices[] = {
 				TX_SPEAKER_KIRK,
-				TX_LOV5_008,
-				TX_LOV5_004,
-				TX_LOV5_006,
+				8,
+				4,
+				6,
 				TX_BLANK,
 			};
 
-			showText(TX_SPEAKER_PREAX, TX_LOV5_059);
-			int choice = showMultipleTexts(choices);
+			showText(TX_SPEAKER_PREAX, 59, true);
+			int choice = showMultipleTexts(choices, true);
 
 			switch (choice) {
 			case 1:
-				showText(TX_SPEAKER_MARCUS, TX_LOV5_043);
+				showText(TX_SPEAKER_MARCUS, 43, true);
 			// fall through
 			case 0:
-				showText(TX_SPEAKER_PREAX, TX_LOV5_061);
-				showText(TX_SPEAKER_KIRK, TX_LOV5_010);
+				showText(TX_SPEAKER_PREAX, 61, true);
+				showText(TX_SPEAKER_KIRK, 10, true);
 
 				// NOTE: This just says "(Spock raises an eyebrow)". No audio associated.
 				showText(TX_SPEAKER_SPOCK, TX_LOV5C001);
 
-				showText(TX_SPEAKER_MCCOY, TX_LOV5_032);
+				showText(TX_SPEAKER_MCCOY, 32, true);
 
 				break;
 			case 2:
-				showText(TX_SPEAKER_PREAX, TX_LOV5_060);
+				showText(TX_SPEAKER_PREAX, 60, true);
 				break;
 			default:
 				showDescription(TX_DIALOG_ERROR);
 				break;
 			}
 
-			showText(TX_SPEAKER_KIRK,   TX_LOV5_002);
-			showText(TX_SPEAKER_MARCUS, TX_LOV5_045);
+			showText(TX_SPEAKER_KIRK,   02, true);
+			showText(TX_SPEAKER_MARCUS, 45, true);
 
 			_awayMission->disableInput = true;
 
 			if (!_awayMission->love.spockCured) {
-				showText(TX_SPEAKER_MCCOY, TX_LOV5_021);
+				showText(TX_SPEAKER_MCCOY, 21, true);
 				walkCrewmanC(OBJECT_MCCOY, 0x87, 0xc3, &Room::love5MccoyReachedSpockToCure);
 			} else
 				love5EndMission();
 		}
 	} else
-		showText(TX_SPEAKER_MARCUS, TX_LOV5_018);
+		showText(TX_SPEAKER_MARCUS, 18, true);
 }
 
 void Room::love5MccoyReachedSpockToCure() {
@@ -210,16 +210,16 @@ void Room::love5MccoyReachedSpockToCure() {
 }
 
 void Room::love5MccoyCuredSpock() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV5_030);
-	showText(TX_SPEAKER_SPOCK, TX_LOV5_038);
-	showText(TX_SPEAKER_MCCOY, TX_LOV5_027);
+	showText(TX_SPEAKER_MCCOY, 30, true);
+	showText(TX_SPEAKER_SPOCK, 38, true);
+	showText(TX_SPEAKER_MCCOY, 27, true);
 	// NOTE: This just says "(Spock raises an eyebrow)". No audio associated.
 	showText(TX_SPEAKER_SPOCK, TX_LOV5C001);
 	love5EndMission();
 }
 
 void Room::love5EndMission() {
-	showText(TX_SPEAKER_KIRK, TX_LOV5_001);
+	showText(TX_SPEAKER_KIRK, 01, true);
 
 	_awayMission->crewDirectionsAfterWalk[OBJECT_KIRK] = DIR_S;
 	walkCrewmanC(OBJECT_KIRK, 0x64, 0xc2, &Room::love5CrewmanReachedBeamoutPosition);
@@ -247,78 +247,78 @@ void Room::love5CrewmanReachedBeamoutPosition() {
 
 void Room::love5TalkToDrMarcus() {
 	if (!_awayMission->love.freedMarcusAndCheever)
-		showText(TX_SPEAKER_MARCUS, TX_LOV5_040);
+		showText(TX_SPEAKER_MARCUS, 40, true);
 	else {
 		if (!haveItem(OBJECT_ICURE))
-			showText(TX_SPEAKER_MARCUS, TX_LOV5_039);
+			showText(TX_SPEAKER_MARCUS, 39, true);
 		else
-			showText(TX_SPEAKER_MARCUS, TX_LOV5_042);
+			showText(TX_SPEAKER_MARCUS, 42, true);
 	}
 }
 
 void Room::love5TalkToDrCheever() {
 	if (!_awayMission->love.freedMarcusAndCheever)
-		showText(TX_SPEAKER_CHEEVER, TX_LOV5_055);
+		showText(TX_SPEAKER_CHEEVER, 55, true);
 	else
-		showText(TX_SPEAKER_CHEEVER, TX_LOV5_056);
+		showText(TX_SPEAKER_CHEEVER, 56, true);
 }
 
 void Room::love5TalkToKirk() {
-	showText(TX_SPEAKER_KIRK,   TX_LOV5_003);
-	showText(TX_SPEAKER_MARCUS, TX_LOV5_048);
-	showText(TX_SPEAKER_KIRK,   TX_LOV5_009);
-	showText(TX_SPEAKER_MARCUS, TX_LOV5_047);
+	showText(TX_SPEAKER_KIRK,    3, true);
+	showText(TX_SPEAKER_MARCUS, 48, true);
+	showText(TX_SPEAKER_KIRK,    9, true);
+	showText(TX_SPEAKER_MARCUS, 47, true);
 }
 
 void Room::love5TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK,  TX_LOV5_036);
-	showText(TX_SPEAKER_MARCUS, TX_LOV5_051);
+	showText(TX_SPEAKER_SPOCK,  36, true);
+	showText(TX_SPEAKER_MARCUS, 51, true);
 	showText(TX_SPEAKER_SPOCK,  TX_G_024);
 }
 
 void Room::love5TalkToMccoy() {
 	if (!_awayMission->love.preaxCured)
-		showText(TX_SPEAKER_MCCOY, TX_LOV5_014);
+		showText(TX_SPEAKER_MCCOY, 14, true);
 }
 
 void Room::love5TalkToRedshirt() {
-	showText(TX_SPEAKER_FERRIS, TX_LOV5_052);
+	showText(TX_SPEAKER_FERRIS, 52, true);
 }
 
 void Room::love5UseSTricorderAnywhere() {
-	spockScan(DIR_S, TX_LOV5_033, false);
+	spockScan(DIR_S, 33, false, true);
 }
 
 void Room::love5UseSTricorderOnDevice() {
-	spockScan(DIR_N, TX_LOV5_034, false);
-	showText(TX_SPEAKER_MARCUS, TX_LOV5_049);
+	spockScan(DIR_N, 34, false, true);
+	showText(TX_SPEAKER_MARCUS, 49, true);
 }
 
 void Room::love5UseMTricorderOnMarcusOrCheever() {
-	mccoyScan(DIR_W, TX_LOV5_025, false);
+	mccoyScan(DIR_W, 25, false, true);
 }
 
 void Room::love5UseMTricorderOnPreax() {
 	if (!_awayMission->love.preaxCured) {
 		if (_awayMission->love.romulansUnconsciousFromLaughingGas)
-			mccoyScan(DIR_E, TX_LOV5_024, false);
+			mccoyScan(DIR_E, 24, false, true);
 		else
-			mccoyScan(DIR_E, TX_LOV5_016, false);
+			mccoyScan(DIR_E, 16, false, true);
 	}
 }
 
 void Room::love5UseMedkitOnPreax() {
 	if (_awayMission->love.preaxCured)
-		showText(TX_SPEAKER_MCCOY, TX_LOV5_015);
+		showText(TX_SPEAKER_MCCOY, 15, true);
 	else
-		showText(TX_SPEAKER_MCCOY, TX_LOV5_019);
+		showText(TX_SPEAKER_MCCOY, 19, true);
 }
 
 void Room::love5UseWaterOnPreax() {
 	if (_awayMission->love.preaxCured) {
-		showDescription(TX_LOV5N018);
-		showText(TX_SPEAKER_MCCOY, TX_LOV5_029);
-		showText(TX_SPEAKER_KIRK,  TX_LOV5_007);
+		showDescription(18, true);
+		showText(TX_SPEAKER_MCCOY, 29, true);
+		showText(TX_SPEAKER_KIRK,  07, true);
 		if (!_awayMission->love.gotPointsForHydratingPreax) {
 			_awayMission->love.gotPointsForHydratingPreax = true;
 			_awayMission->love.missionScore++;
@@ -326,16 +326,16 @@ void Room::love5UseWaterOnPreax() {
 		loseItem(OBJECT_IH2O);
 	} else {
 		if (_awayMission->love.romulansUnconsciousFromVirus) {
-			showText(TX_SPEAKER_MCCOY, TX_LOV5_013);
+			showText(TX_SPEAKER_MCCOY, 13, true);
 			// BUGFIX: original didn't have correct speaker. Also, you shouldn't lose your
 			// water since it's not actually used here, so a "loseItem" line was removed.
 		} else {
-			showDescription(TX_LOV5N017);
+			showDescription(17, true);
 			if (!_awayMission->redshirtDead) {
-				showText(TX_SPEAKER_FERRIS, TX_LOV5_053);
-				showText(TX_SPEAKER_KIRK,   TX_LOV5_005);
+				showText(TX_SPEAKER_FERRIS, 53, true);
+				showText(TX_SPEAKER_KIRK,   05, true);
 			}
-			showText(TX_SPEAKER_MCCOY,  TX_LOV5_026);
+			showText(TX_SPEAKER_MCCOY,  26, true);
 			loseItem(OBJECT_IH2O);
 
 			// BUGFIX: give a point for hydrating the Preax. It's inconsistent to only
@@ -349,7 +349,7 @@ void Room::love5UseWaterOnPreax() {
 }
 
 void Room::love5UseCureSampleOnPreax() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV5_020); // BUGFIX: original didn't have correct speaker
+	showText(TX_SPEAKER_MCCOY, 20, true); // BUGFIX: original didn't have correct speaker
 }
 
 
@@ -366,13 +366,13 @@ void Room::love5CuredPreax() {
 	walkCrewman(OBJECT_MCCOY, 0xdc, 0xc3);
 	_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_E;
 
-	showDescription(TX_LOV5N007);
+	showDescription(07, true);
 
 	// BUG: says he's dehydrated, but doesn't check whether you've given water to him
 	// already (like it does in LOVE4).
 	// TODO: make the whole "giving water to romulans" thing consistent between LOVE4 and
 	// LOVE5?
-	showText(TX_SPEAKER_MCCOY, TX_LOV5_017);
+	showText(TX_SPEAKER_MCCOY, 17, true);
 
 	loadActorAnim2(OBJECT_PREAX, "s3r6r1", 0x116, 0xba);
 	_awayMission->love.preaxCured = true;
@@ -380,7 +380,7 @@ void Room::love5CuredPreax() {
 
 
 void Room::love5UseAnythingOnPreax() {
-	showText(TX_SPEAKER_MCCOY, TX_LOV5_023);
+	showText(TX_SPEAKER_MCCOY, 23, true);
 }
 
 
@@ -415,7 +415,7 @@ void Room::love5KirkUntiedMarcus() {
 
 void Room::love5MarcusStoodUp() {
 	_awayMission->disableInput = false;
-	showText(TX_SPEAKER_MARCUS, TX_LOV5_041);
+	showText(TX_SPEAKER_MARCUS, 41, true);
 }
 
 }
diff --git a/engines/startrek/rooms/tug2.cpp b/engines/startrek/rooms/tug2.cpp
index ec23197c7c..3f6241f177 100644
--- a/engines/startrek/rooms/tug2.cpp
+++ b/engines/startrek/rooms/tug2.cpp
@@ -187,7 +187,7 @@ void Room::tug2LookAtWires() {
 void Room::tug2UseSTricorderOnButton() {
 	if (_awayMission->tug.field35 != 0)
 		return;
-	spockScan(DIR_E, TX_TUG2_007, true);
+	spockScan(DIR_E, 7, true, true);
 }
 
 void Room::tug2UseMccoyOnWires() {
@@ -780,18 +780,18 @@ void Room::tug2Timer2Expired() {
 }
 
 void Room::tug2UseSTricorderOnBomb() {
-	spockScan(DIR_E, TX_TUG2_004, true);
+	spockScan(DIR_E, 4, true, true);
 }
 
 void Room::tug2UseMTricorderOnGuard1() {
 	if (_awayMission->tug.guard1Status == GUARDSTAT_STUNNED)
-		mccoyScan(DIR_E, TX_TUG2_016, true);
+		mccoyScan(DIR_E, 16, true, true);
 }
 
 void Room::tug2UseMTricorderOnGuard2() {
 	// BUGFIX: original didn't play audio for this (despite being the same as above).
 	if (_awayMission->tug.guard2Status == GUARDSTAT_STUNNED)
-		mccoyScan(DIR_E, TX_TUG2_016, true);
+		mccoyScan(DIR_E, 16, true, true);
 }
 
 void Room::tug2TalkToGuard1() {
@@ -852,19 +852,19 @@ void Room::tug2TalkToBrig() {
 	if (_awayMission->tug.brigForceFieldDown && _awayMission->tug.talkedToBrigCrewman)
 		showText(TX_SPEAKER_MASADA_CREWMAN, 27, true);
 	else if (!_awayMission->tug.brigForceFieldDown)
-		mccoyScan(DIR_E, TX_TUG2_015, true);
+		mccoyScan(DIR_E, 15, true, true);
 }
 
 void Room::tug2UseMTricorderOnBrig() {
 	if (_awayMission->tug.field35 == 6)
-		mccoyScan(DIR_E, TX_TUG2_019, true);
+		mccoyScan(DIR_E, 19, true, true);
 	else if (!_awayMission->tug.brigForceFieldDown)
-		mccoyScan(DIR_E, TX_TUG2_015, true);
+		mccoyScan(DIR_E, 15, true, true);
 }
 
 void Room::tug2UseMTricorderOnOpenBrig() {
 	if (_awayMission->tug.brigForceFieldDown)
-		mccoyScan(DIR_E, TX_TUG2_015, true);
+		mccoyScan(DIR_E, 15, true, true);
 }
 
 void Room::tug2UsePhaserAnywhere() {