STARTREK: Load more messages from RDF files

The whole Demon chapter has been converted to the new logic.
The offsets for the extra room messages have been hardcoded, for now,
inside loadOtherRoomMessages(), until we figure out how they are
referenced.

7 files changed, 303 insertions, 303 deletions

diff --git a/engines/startrek/rooms/demon0.cpp b/engines/startrek/rooms/demon0.cpp
index 869bb9259f..2aaba6f791 100644
--- a/engines/startrek/rooms/demon0.cpp
+++ b/engines/startrek/rooms/demon0.cpp
@@ -53,7 +53,7 @@ void Room::demon0Tick140() {
 	if (_awayMission->demon.mccoyMentionedFlora)
 		return;
 
-	showText(TX_SPEAKER_MCCOY, TX_DEM0_016);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 
 	_awayMission->demon.mccoyMentionedFlora = true;
 }
@@ -199,18 +199,18 @@ void Room::demon0LookAtPrelate() {
 
 void Room::demon0UsePhaserOnSnow() {
 	// BUG: doesn't check if redshirt is dead.
-	showText(TX_SPEAKER_EVERTS, TX_DEM0_039);
+	showText(TX_SPEAKER_EVERTS, 39, true);
 }
 
 void Room::demon0UsePhaserOnSign() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM0_017);
+	showText(TX_SPEAKER_MCCOY, 17, true);
 }
 
 void Room::demon0UsePhaserOnShelter() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM0_015);
-	showText(TX_SPEAKER_SPOCK, TX_DEM0_013);
+	showText(TX_SPEAKER_MCCOY, 15, true);
+	showText(TX_SPEAKER_SPOCK, 13, true);
 	if (!_awayMission->redshirtDead)
-		showText(TX_SPEAKER_EVERTS, TX_DEM0_040);
+		showText(TX_SPEAKER_EVERTS, 40, true);
 }
 
 void Room::demon0UsePhaserOnPrelate() {
diff --git a/engines/startrek/rooms/demon1.cpp b/engines/startrek/rooms/demon1.cpp
index a33673c9fe..7034d75411 100644
--- a/engines/startrek/rooms/demon1.cpp
+++ b/engines/startrek/rooms/demon1.cpp
@@ -197,13 +197,13 @@ void Room::demon1KlingonFinishedAimingWeapon() {
 }
 
 void Room::demon1KirkShot() {
-	showText(TX_DEM1N000);
+	showText(0, true);
 	showGameOverMenu();
 }
 
 void Room::demon1UsePhaserOnAnything() {
 	if (_roomVar.demon.numKlingonsKilled == 3)
-		showText(TX_SPEAKER_MCCOY, TX_DEM1_011);
+		showText(TX_SPEAKER_MCCOY, 11, true);
 }
 
 void Room::demon1UsePhaserOnKlingon1() {
@@ -239,12 +239,12 @@ void Room::demon1KlingonDropsHand() {
 	loadActorAnim(13, "klghnd", 0x10b, 0x8e, 0);
 	_awayMission->disableInput = 0;
 	_awayMission->timers[1] = 0;
-	showText(TX_DEM1N020);
+	showText(20, true);
 
 	if (_awayMission->crewDownBitset & (1 << OBJECT_REDSHIRT))
 		return;
 
-	showText(TX_SPEAKER_EVERTS, TX_DEM1_025);
+	showText(TX_SPEAKER_EVERTS, 25, true);
 
 	if (_roomVar.demon.numKlingonsKilled == 3)
 		return;
@@ -324,50 +324,50 @@ void Room::demon1Timer5Expired() {
 	if (_awayMission->crewDownBitset != 0)
 		return;
 
-	showText(TX_SPEAKER_UHURA, TX_DEM1U077);
-	showText(TX_SPEAKER_KIRK,  TX_DEM1_003);
-	showText(TX_SPEAKER_UHURA, TX_DEM1U078);
-	showText(TX_SPEAKER_KIRK,  TX_DEM1_002);
-	showText(TX_SPEAKER_SPOCK, TX_DEM1_020);
-	showText(TX_SPEAKER_KIRK,  TX_DEM1_004);
-	showText(TX_SPEAKER_SPOCK, TX_DEM1_021);
+	showText(TX_SPEAKER_UHURA, 77, true);
+	showText(TX_SPEAKER_KIRK,  3, true);
+	showText(TX_SPEAKER_UHURA, 78, true);
+	showText(TX_SPEAKER_KIRK,  2, true);
+	showText(TX_SPEAKER_SPOCK, 20, true);
+	showText(TX_SPEAKER_KIRK,  4, true);
+	showText(TX_SPEAKER_SPOCK, 21, true);
 }
 
 
 void Room::demon1UseMTricorderOnKlingon() {
 	loadActorAnim2(OBJECT_MCCOY, "mscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_MCCOY, TX_DEM1_012);
+	showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 void Room::demon1UseSTricorderOnTulips() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM1_007);
+	showText(TX_SPEAKER_SPOCK, 7, true);
 }
 
 void Room::demon1UseSTricorderOnPods() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM1_008);
+	showText(TX_SPEAKER_SPOCK, 8, true);
 }
 
 void Room::demon1UseSTricorderOnCattails() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM1_005);
+	showText(TX_SPEAKER_SPOCK, 5, true);
 }
 
 void Room::demon1UseSTricorderOnFerns() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM1_006);
+	showText(TX_SPEAKER_SPOCK, 6, true);
 }
 
 void Room::demon1UseSTricorderOnHand() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM1_017);
+	showText(TX_SPEAKER_SPOCK, 17, true);
 }
 
 void Room::demon1UseSTricorderOnKlingon1() {
@@ -378,17 +378,17 @@ void Room::demon1UseSTricorderOnKlingon1() {
 	playSoundEffectIndex(0x04);
 
 	if (_roomVar.demon.numKlingonsKilled == 3 && !_awayMission->demon.tookKlingonHand && _rdfData[0xcf] != 1) {
-		showText(TX_SPEAKER_SPOCK, TX_DEM1_018);
+		showText(TX_SPEAKER_SPOCK, 18, true);
 		_rdfData[0xcf] = 1;
 	} else {
-		showText(TX_SPEAKER_SPOCK, TX_DEM1_019);
+		showText(TX_SPEAKER_SPOCK, 19, true);
 	}
 }
 
 void Room::demon1UseSTricorderOnKlingon2Or3() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM1_019);
+	showText(TX_SPEAKER_SPOCK, 19, true);
 }
 
 void Room::demon1UseMTricorderOnKirk() {
@@ -409,7 +409,7 @@ void Room::demon1UseMTricorderOnRedshirt() {
 void Room::demon1UseMTricorderOnCrewman() {
 	loadActorAnim2(OBJECT_MCCOY, "mscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_MCCOY, TX_DEM1_009);
+	showText(TX_SPEAKER_MCCOY, 9, true);
 }
 
 void Room::demon1GetHand() {
@@ -433,96 +433,96 @@ void Room::demon1PickedUpHand() {
 void Room::demon1FinishedGettingHand() {
 
 	if (_awayMission->demon.tookKlingonHand)
-		showText(TX_DEM1N005);
+		showText(5, true);
 	else {
 		_awayMission->demon.tookKlingonHand = true;
 		giveItem(OBJECT_IHAND);
-		showText(TX_DEM1N007);
+		showText(7, true);
 	}
 }
 
 void Room::demon1LookAtKlingon() {
-	showText(TX_DEM1N004);
+	showText(4, true);
 }
 
 void Room::demon1LookAtCattails() {
-	showText(TX_DEM1N018);
+	showText(18, true);
 }
 
 void Room::demon1LookAtTulips() {
-	showText(TX_DEM1N010);
+	showText(10, true);
 }
 
 void Room::demon1LookAtPods() {
-	showText(TX_DEM1N019);
+	showText(19, true);
 }
 
 void Room::demon1LookAtFerns() {
-	showText(TX_DEM1N009);
+	showText(9, true);
 }
 
 void Room::demon1LookAtStream() {
-	showText(TX_DEM1N011);
+	showText(11, true);
 }
 
 void Room::demon1LookAtMine() {
-	showText(TX_DEM1N021);
+	showText(21, true);
 }
 
 void Room::demon1LookAtMountain() {
-	showText(TX_DEM1N016);
+	showText(16, true);
 }
 
 void Room::demon1LookAtHand() {
-	showText(TX_DEM1N023);
+	showText(23, true);
 }
 void Room::demon1LookAnywhere() {
-	showText(TX_DEM1N017);
+	showText(17, true);
 }
 
 void Room::demon1LookAtKirk() {
 	if (_awayMission->crewDownBitset & (1 << OBJECT_KIRK))
-		showText(TX_DEM1N012);
+		showText(12, true);
 	else
-		showText(TX_DEM1N003);
+		showText(3, true);
 }
 
 void Room::demon1LookAtSpock() {
 	if (_awayMission->crewDownBitset & (1 << OBJECT_SPOCK))
-		showText(TX_DEM1N015);
+		showText(15, true);
 	else
-		showText(TX_DEM1N008);
+		showText(8, true);
 }
 
 void Room::demon1LookAtMcCoy() {
 	if (_awayMission->crewDownBitset & (1 << OBJECT_MCCOY))
-		showText(TX_DEM1N013);
+		showText(13, true);
 	else
-		showText(TX_DEM1N001);
+		showText(1, true);
 }
 
 void Room::demon1LookAtRedshirt() {
 	if (_awayMission->crewDownBitset & (1 << OBJECT_REDSHIRT))
-		showText(TX_DEM1N014);
+		showText(14, true);
 	else
-		showText(TX_DEM1N002);
+		showText(2, true);
 }
 
 void Room::demon1TalkToKirk() {
 	if (_awayMission->crewDownBitset & (1 << OBJECT_KIRK))
 		demon1TalkToUnconsciousCrewman();
 	else if (_roomVar.demon.numKlingonsKilled == 3)
-		showText(TX_SPEAKER_KIRK, TX_DEM1_001);
+		showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::demon1TalkToSpock() {
 	if (_awayMission->crewDownBitset & (1 << OBJECT_SPOCK))
 		demon1TalkToUnconsciousCrewman();
 	else {
-		showText(TX_SPEAKER_SPOCK, TX_DEM1_022);
-		showText(TX_SPEAKER_MCCOY, TX_DEM1_013);
-		showText(TX_SPEAKER_SPOCK, TX_DEM1_024);
-		showText(TX_SPEAKER_MCCOY, TX_DEM1_014);
+		showText(TX_SPEAKER_SPOCK, 22, true);
+		showText(TX_SPEAKER_MCCOY, 13, true);
+		showText(TX_SPEAKER_SPOCK, 24, true);
+		showText(TX_SPEAKER_MCCOY, 14, true);
 	}
 }
 
@@ -530,8 +530,8 @@ void Room::demon1TalkToMcCoy() {
 	if (_awayMission->crewDownBitset & (1 << OBJECT_MCCOY))
 		demon1TalkToUnconsciousCrewman();
 	else {
-		showText(TX_SPEAKER_MCCOY, TX_DEM1_015);
-		showText(TX_SPEAKER_SPOCK, TX_DEM1_023);
+		showText(TX_SPEAKER_MCCOY, 15, true);
+		showText(TX_SPEAKER_SPOCK, 23, true);
 	}
 }
 
@@ -539,7 +539,7 @@ void Room::demon1TalkToRedshirt() {
 	if (_awayMission->crewDownBitset & (1 << OBJECT_REDSHIRT))
 		demon1TalkToUnconsciousCrewman();
 	else
-		showText(TX_SPEAKER_EVERTS, TX_DEM1_026);
+		showText(TX_SPEAKER_EVERTS, 26, true);
 }
 
 // FIXME: this doesn't happen in actual game? (does the event get blocked from higher up?)
diff --git a/engines/startrek/rooms/demon2.cpp b/engines/startrek/rooms/demon2.cpp
index d31f417a44..a0b7f88ae7 100644
--- a/engines/startrek/rooms/demon2.cpp
+++ b/engines/startrek/rooms/demon2.cpp
@@ -42,91 +42,91 @@ void Room::demon2TouchedWarp1() {
 }
 
 void Room::demon2LookAtCave() {
-	showText(TX_DEM2N009);
+	showText(9, true);
 }
 
 void Room::demon2LookAtMountain() {
-	showText(TX_DEM2N007);
+	showText(7, true);
 }
 
 void Room::demon2LookAtBerries() {
-	showText(TX_DEM2N012);
+	showText(12, true);
 }
 
 void Room::demon2LookAtFern() {
-	showText(TX_DEM2N005);
+	showText(5, true);
 }
 
 void Room::demon2LookAtMoss() {
-	showText(TX_DEM2N010);
+	showText(10, true);
 }
 
 void Room::demon2LookAtLights() {
-	showText(TX_DEM2N006);
+	showText(6, true);
 }
 
 void Room::demon2LookAtAnything() {
-	showText(TX_DEM2N011);
+	showText(11, true);
 }
 
 void Room::demon2LookAtKirk() {
-	showText(TX_DEM2N002);
+	showText(2, true);
 }
 
 void Room::demon2LookAtSpock() {
-	showText(TX_DEM2N004);
+	showText(4, true);
 }
 
 void Room::demon2LookAtMcCoy() {
-	showText(TX_DEM2N003);
+	showText(3, true);
 }
 
 void Room::demon2LookAtRedshirt() {
-	showText(TX_DEM2N000);
+	showText(0, true);
 }
 
 void Room::demon2TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_DEM2_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::demon2TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM2_018);
-	showText(TX_SPEAKER_KIRK,  TX_DEM2_003);
+	showText(TX_SPEAKER_SPOCK, 18, true);
+	showText(TX_SPEAKER_KIRK,  3, true);
 }
 
 void Room::demon2TalkToMcCoy() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM2_015);
-	showText(TX_SPEAKER_SPOCK, TX_DEM2_017);
-	showText(TX_SPEAKER_MCCOY, TX_DEM2_016);
+	showText(TX_SPEAKER_MCCOY, 15, true);
+	showText(TX_SPEAKER_SPOCK, 17, true);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::demon2TalkToRedshirt() {
-	showText(TX_SPEAKER_EVERTS, TX_DEM2_019);
-	showText(TX_SPEAKER_KIRK,   TX_DEM2_002);
-	showText(TX_SPEAKER_EVERTS, TX_DEM2_020);
-	showText(TX_SPEAKER_KIRK,   TX_DEM2_004);
+	showText(TX_SPEAKER_EVERTS, 19, true);
+	showText(TX_SPEAKER_KIRK,   2, true);
+	showText(TX_SPEAKER_EVERTS, 20, true);
+	showText(TX_SPEAKER_KIRK,   4, true);
 }
 
 void Room::demon2UsePhaserOnBerries() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM2_011);
+	showText(TX_SPEAKER_MCCOY, 11, true);
 }
 
 void Room::demon2UseSTricorderOnBerries() {
 	loadActorAnim2(OBJECT_SPOCK, "sscane", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM2_008);
+	showText(TX_SPEAKER_SPOCK, 8, true);
 }
 
 void Room::demon2UseSTricorderOnMoss() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM2_007);
+	showText(TX_SPEAKER_SPOCK, 7, true);
 }
 
 void Room::demon2UseSTricorderOnFern() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM2_006);
+	showText(TX_SPEAKER_SPOCK, 6, true);
 }
 
 void Room::demon2UseSTricorderOnCave() {
@@ -134,7 +134,7 @@ void Room::demon2UseSTricorderOnCave() {
 	playSoundEffectIndex(0x04);
 
 	// NOTE: audio file for this is empty.
-	showText(TX_SPEAKER_SPOCK, TX_DEM2_005);
+	showText(TX_SPEAKER_SPOCK, 5, true);
 }
 
 void Room::demon2UseMTricorderOnBerries() {
@@ -142,18 +142,18 @@ void Room::demon2UseMTricorderOnBerries() {
 	playSoundEffectIndex(0x04);
 
 	if (_awayMission->demon.curedChub)
-		showText(TX_SPEAKER_MCCOY, TX_DEM2_013);
+		showText(TX_SPEAKER_MCCOY, 13, true);
 	else if (_awayMission->demon.madeHypoDytoxin)
-		showText(TX_SPEAKER_MCCOY, TX_DEM2_009);
+		showText(TX_SPEAKER_MCCOY, 9, true);
 	else if (_awayMission->demon.knowAboutHypoDytoxin)
-		showText(TX_SPEAKER_MCCOY, TX_DEM2_010);
+		showText(TX_SPEAKER_MCCOY, 10, true);
 	else
-		showText(TX_SPEAKER_MCCOY, TX_DEM2_012);
+		showText(TX_SPEAKER_MCCOY, 12, true);
 }
 
 void Room::demon2GetBerries() {
 	if (_awayMission->demon.gotBerries)
-		showText(TX_SPEAKER_MCCOY, TX_DEM2_014);
+		showText(TX_SPEAKER_MCCOY, 14, true);
 	else
 		walkCrewman(OBJECT_KIRK, 0xe8, 0x97, 1);
 }
@@ -164,7 +164,7 @@ void Room::demon2ReachedBerries() {
 }
 
 void Room::demon2PickedUpBerries() {
-	showText(TX_DEM2N013);
+	showText(13, true);
 	giveItem(OBJECT_IBERRY);
 	_awayMission->demon.gotBerries = true;
 	_awayMission->demon.missionScore += 1;
diff --git a/engines/startrek/rooms/demon3.cpp b/engines/startrek/rooms/demon3.cpp
index 8f3bf3b9be..a0120d8bec 100644
--- a/engines/startrek/rooms/demon3.cpp
+++ b/engines/startrek/rooms/demon3.cpp
@@ -85,13 +85,13 @@ void Room::demon3Timer1Expired() {
 // Door just opened
 void Room::demon3Timer3Expired() {
 	if (_awayMission->demon.repairedHand) {
-		showText(TX_DEM3N008);
+		showText(8, true);
 		loadActorAnim(14, "door", 0x82, 0xc, 0);
 		loadMapFile("demon3");
 		_awayMission->demon.doorOpened = true;
 		_awayMission->demon.missionScore += 2;
 	} else {
-		showText(TX_DEM3N007);
+		showText(7, true);
 	}
 }
 
@@ -112,7 +112,7 @@ void Room::demon3FinishedAnimation2() {
 void Room::demon3FinishedWalking5() {
 	loadActorAnim2(OBJECT_MCCOY, "mscanw", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_MCCOY, TX_DEM3_019);
+	showText(TX_SPEAKER_MCCOY, 19, true);
 
 	_awayMission->disableInput = false;
 }
@@ -198,11 +198,11 @@ void Room::demon3FireAtBoulder() {
 void Room::demon3UsePhaserOnRedshirt() {
 	if (!_awayMission->redshirtDead)
 		return;
-	showText(TX_SPEAKER_MCCOY, TX_DEM3_013);
+	showText(TX_SPEAKER_MCCOY, 13, true);
 }
 
 void Room::demon3UseStunPhaserOnBoulder() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM3_007);
+	showText(TX_SPEAKER_SPOCK, 7, true);
 }
 
 void Room::demon3UsePhaserOnBoulder1() {
@@ -236,7 +236,7 @@ void Room::demon3UsePhaserOnBoulder3() {
 		strcpy(_roomVar.demon.boulderAnim, "s0r3s1");
 		demon3BoulderCommon();
 	} else {
-		showText(TX_SPEAKER_SPOCK, TX_DEM3_006);
+		showText(TX_SPEAKER_SPOCK, 6, true);
 	}
 }
 
@@ -253,7 +253,7 @@ void Room::demon3UsePhaserOnBoulder4() {
 	} else {
 		// BUGFIX: In the original, the audio didn't play, despite the file existing (and
 		// despite it being used for the boulder on the left).
-		showText(TX_SPEAKER_SPOCK, TX_DEM3_006);
+		showText(TX_SPEAKER_SPOCK, 6, true);
 	}
 }
 
@@ -268,7 +268,7 @@ void Room::demon3BoulderCommon() {
 	if (_roomVar.demon.inFiringPosition) {
 		demon3PullOutPhaserAndFireAtBoulder();
 	} else {
-		showText(TX_SPEAKER_KIRK, TX_DEM3_001);
+		showText(TX_SPEAKER_KIRK, 1, true);
 
 		walkCrewman(OBJECT_KIRK, 0x79, 0xa0, 1);
 		walkCrewman(OBJECT_SPOCK, 0xae, 0xb4, 2);
@@ -284,13 +284,13 @@ void Room::demon3BoulderCommon() {
 void Room::demon3UseSTricorderOnMiner() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM3_008);
+	showText(TX_SPEAKER_SPOCK, 8, true);
 }
 
 void Room::demon3UseSTricorderOnPanel() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM3_009);
+	showText(TX_SPEAKER_SPOCK, 9, true);
 }
 
 void Room::demon3UseSTricorderOnBoulder() {
@@ -298,7 +298,7 @@ void Room::demon3UseSTricorderOnBoulder() {
 		return;
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM3_010);
+	showText(TX_SPEAKER_SPOCK, 10, true);
 }
 
 void Room::demon3UseMTricorderOnBoulder() {
@@ -306,13 +306,13 @@ void Room::demon3UseMTricorderOnBoulder() {
 		return;
 	loadActorAnim2(OBJECT_MCCOY, "mscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_MCCOY, TX_DEM3_020);
+	showText(TX_SPEAKER_MCCOY, 20, true);
 }
 
 void Room::demon3UseCrewmanOnPanel() {
 	if (_awayMission->demon.numBouldersGone != 4 || _awayMission->redshirtDead)
 		return;
-	showText(TX_SPEAKER_EVERTS, TX_DEM3_031);
+	showText(TX_SPEAKER_EVERTS, 31, true);
 	demon3UseRedshirtOnPanel();
 }
 
@@ -321,7 +321,7 @@ void Room::demon3UseRedshirtOnPanel() {
 		return;
 
 	if (_awayMission->demon.numBouldersGone != 4)
-		showText(TX_SPEAKER_EVERTS, TX_DEM3_030);
+		showText(TX_SPEAKER_EVERTS, 30, true);
 	else
 		walkCrewman(OBJECT_REDSHIRT, 0xd8, 0x70, 8);
 }
@@ -345,10 +345,10 @@ void Room::demon3RedshirtUsedPanel() {
 		_awayMission->demon.field45 = true;
 	} else {
 		const TextRef textTable[] = {
-			TX_DEM3N005,
-			TX_DEM3_033,
-			TX_DEM3_035,
-			TX_DEM3_034,
+			5,
+			33,
+			35,
+			34,
 		};
 
 		TextRef text[] = {
@@ -357,40 +357,40 @@ void Room::demon3RedshirtUsedPanel() {
 			TX_BLANK
 		};
 		text[1] = textTable[_awayMission->demon.field41 - 1];
-		showText(text);
+		showText(text, true);
 		walkCrewman(OBJECT_REDSHIRT, 0xbe, 0x9b, 0);
 	}
 }
 
 void Room::demon3RedshirtElectrocuted() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM3_018);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 }
 
 void Room::demon3UseSTricorderOnDoor() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM3_012);
+	showText(TX_SPEAKER_SPOCK, 12, true);
 }
 
 void Room::demon3UseSTricorderOnAnything() {
 	loadActorAnim2(OBJECT_SPOCK, "sscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM3_027);
+	showText(TX_SPEAKER_SPOCK, 27, true);
 }
 
 void Room::demon3UseMTricorderOnDoor() {
 	loadActorAnim2(OBJECT_SPOCK, "mscann", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_MCCOY, TX_DEM3_016);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::demon3UsePhaserOnDoor() {
 	_roomVar.demon.usedPhaserOnDoor++;
 
 	if (_roomVar.demon.usedPhaserOnDoor == 1)
-		showText(TX_DEM3N009);
+		showText(9, true);
 	else if (_roomVar.demon.usedPhaserOnDoor == 2)
-		showText(TX_SPEAKER_SPOCK, TX_DEM3_011);
+		showText(TX_SPEAKER_SPOCK, 11, true);
 }
 
 void Room::demon3UseHandOnPanel() {
@@ -399,7 +399,7 @@ void Room::demon3UseHandOnPanel() {
 			return;
 		walkCrewman(OBJECT_KIRK, 0xd8, 0x70, 7);
 	} else {
-		showText(TX_SPEAKER_SPOCK, TX_DEM3_005);
+		showText(TX_SPEAKER_SPOCK, 5, true);
 	}
 }
 
@@ -420,15 +420,15 @@ void Room::demon3UseMTricorderOnMiner() {
 	playSoundEffectIndex(0x04);
 
 	if (_awayMission->demon.minerDead) {
-		showText(TX_SPEAKER_MCCOY, TX_DEM3_022);
+		showText(TX_SPEAKER_MCCOY, 22, true);
 	} else {
-		showText(TX_SPEAKER_MCCOY, TX_DEM3_023);
+		showText(TX_SPEAKER_MCCOY, 23, true);
 	}
 }
 
 void Room::demon3UseMedkitOnMiner() {
 	if (_awayMission->demon.healedMiner) {
-		showText(TX_SPEAKER_MCCOY, TX_DEM3_015);
+		showText(TX_SPEAKER_MCCOY, 15, true);
 	} else {
 		walkCrewman(OBJECT_MCCOY, 0xe6, 0x7b, 6);
 		_roomVar.demon.inFiringPosition = false;
@@ -442,9 +442,9 @@ void Room::demon3McCoyReachedMiner() {
 
 void Room::demon3McCoyFinishedHealingMiner() {
 	if (_awayMission->demon.minerDead) {
-		showText(TX_SPEAKER_MCCOY, TX_DEM3_022);
+		showText(TX_SPEAKER_MCCOY, 22, true);
 	} else {
-		showText(TX_SPEAKER_MCCOY, TX_DEM3_021);
+		showText(TX_SPEAKER_MCCOY, 21, true);
 		_awayMission->demon.healedMiner = true;
 		loadActorAnim2(13, "drmine", 0xda, 0x6c, 0);
 		_awayMission->demon.missionScore += 2;
@@ -453,7 +453,7 @@ void Room::demon3McCoyFinishedHealingMiner() {
 }
 
 void Room::demon3GetMiner() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM3_017);
+	showText(TX_SPEAKER_MCCOY, 17, true);
 }
 
 void Room::demon3TalkToMiner() {
@@ -463,22 +463,22 @@ void Room::demon3TalkToMiner() {
 }
 
 void Room::demon3TalkToKirk() {
-	showText(TX_SPEAKER_KIRK,  TX_DEM3_002);
-	showText(TX_SPEAKER_SPOCK, TX_DEM3_029);
-	showText(TX_SPEAKER_MCCOY, TX_DEM3_026);
+	showText(TX_SPEAKER_KIRK,  2, true);
+	showText(TX_SPEAKER_SPOCK, 29, true);
+	showText(TX_SPEAKER_MCCOY, 26, true);
 }
 
 void Room::demon3TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM3_028);
+	showText(TX_SPEAKER_SPOCK, 28, true);
 }
 
 void Room::demon3TalkToMccoy() {
 	if (_awayMission->redshirtDead) {
-		showText(TX_SPEAKER_MCCOY, TX_DEM3_014);
+		showText(TX_SPEAKER_MCCOY, 14, true);
 	} else {
-		showText(TX_SPEAKER_MCCOY, TX_DEM3_025);
-		showText(TX_SPEAKER_KIRK,  TX_DEM3_003);
-		showText(TX_SPEAKER_MCCOY, TX_DEM3_024);
+		showText(TX_SPEAKER_MCCOY, 25, true);
+		showText(TX_SPEAKER_KIRK,  3, true);
+		showText(TX_SPEAKER_MCCOY, 24, true);
 
 	}
 }
@@ -486,77 +486,77 @@ void Room::demon3TalkToMccoy() {
 void Room::demon3TalkToRedshirt() {
 	// FIXME: this shouldn't work if he's dead. Should it check higher up whether that's
 	// the case?
-	showText(TX_SPEAKER_EVERTS, TX_DEM3_036);
-	showText(TX_SPEAKER_KIRK,   TX_DEM3_004);
+	showText(TX_SPEAKER_EVERTS, 36, true);
+	showText(TX_SPEAKER_KIRK,   4, true);
 }
 
 void Room::demon3LookAtKirk() {
-	showText(TX_DEM3N004);
+	showText(4, true);
 }
 
 void Room::demon3LookAtSpock() {
-	showText(TX_DEM3N001);
+	showText(1, true);
 }
 
 void Room::demon3LookAtMccoy() {
-	showText(TX_DEM3N002);
+	showText(2, true);
 }
 
 void Room::demon3LookAtRedshirt() {
 	if (_awayMission->redshirtDead) {
-		showText(TX_DEM3N017);
+		showText(17, true);
 		// NOTE: there's an alternate string that isn't used? (TX_DEM3N018)
 	} else {
-		showText(TX_DEM3N003);
+		showText(3, true);
 	}
 }
 
 void Room::demon3LookAnywhere() {
-	showText(TX_DEM3N010);
+	showText(10, true);
 }
 
 void Room::demon3LookAtMiner() {
 	if (_awayMission->demon.healedMiner) {
-		showText(TX_DEM3N000);
+		showText(0, true);
 	} else {
-		showText(TX_DEM3N006);
+		showText(6, true);
 	}
 }
 
 void Room::demon3LookAtBoulder1() {
-	showText(TX_DEM3N011);
+	showText(11, true);
 }
 
 void Room::demon3LookAtBoulder2() {
-	showText(TX_DEM3N013);
+	showText(13, true);
 }
 
 void Room::demon3LookAtBoulder3() {
-	showText(TX_DEM3N013);
+	showText(13, true);
 }
 
 void Room::demon3LookAtBoulder4() {
-	showText(TX_DEM3N020);
+	showText(20, true);
 }
 
 void Room::demon3LookAtStructure() {
-	showText(TX_DEM3N016);
+	showText(16, true);
 }
 
 void Room::demon3LookAtDoor() {
 	if (_awayMission->demon.doorOpened) {
-		showText(TX_DEM3N014);
+		showText(14, true);
 	} else {
-		showText(TX_DEM3N012);
+		showText(12, true);
 	}
 }
 
 void Room::demon3LookAtPanel() {
-	showText(TX_DEM3N019);
+	showText(19, true);
 }
 
 void Room::demon3LookAtLight() {
-	showText(TX_DEM3N015);
+	showText(15, true);
 }
 
 }
diff --git a/engines/startrek/rooms/demon4.cpp b/engines/startrek/rooms/demon4.cpp
index d7e3227a8c..bd1717411d 100644
--- a/engines/startrek/rooms/demon4.cpp
+++ b/engines/startrek/rooms/demon4.cpp
@@ -60,7 +60,7 @@ void Room::demon4FinishedAnimation1() {
 void Room::demon4FinishedAnimation2() {
 	if (!_roomVar.demon.cd) {
 		_roomVar.demon.cd = true;
-		showText(TX_DEM4N011);
+		showText(11, true);
 	}
 
 	showGameOverMenu();
@@ -72,10 +72,10 @@ void Room::demon4FinishedAnimation2() {
 }
 
 void Room::demon4FinishedAnimation3() {
-	showText(TX_SPEAKER_NAUIAN, TX_DEM4_034);
-	showText(TX_SPEAKER_KIRK,   TX_DEM4_010);
-	showText(TX_SPEAKER_NAUIAN, TX_DEM4_035);
-	showText(TX_SPEAKER_SPOCK,  TX_DEM4_030);
+	showText(TX_SPEAKER_NAUIAN, 34, true);
+	showText(TX_SPEAKER_KIRK,   10, true);
+	showText(TX_SPEAKER_NAUIAN, 35, true);
+	showText(TX_SPEAKER_SPOCK,  30, true);
 
 	_awayMission->disableInput = true;
 	_awayMission->demon.missionScore += 5;
@@ -92,7 +92,7 @@ void Room::demon4Timer0Expired() {
 
 // Mission end
 void Room::demon4Timer1Expired() {
-	showText(TX_SPEAKER_KIRK, TX_DEM4_011);
+	showText(TX_SPEAKER_KIRK, 11, true);
 
 	walkCrewman(OBJECT_KIRK, 0xbe, 0xa5, 4);
 	walkCrewman(OBJECT_SPOCK, 0xb4, 0x9b, 4);
@@ -134,15 +134,15 @@ void Room::demon4Timer5Expired() {
 }
 
 void Room::demon4Timer6Expired() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM4_017);
+	showText(TX_SPEAKER_MCCOY, 17, true);
 }
 
 void Room::demon4UsePhaserOnNauian() {
 	if (!_roomVar.demon.triedToShootNauian) { // Lenient the first time
-		showText(TX_SPEAKER_NAUIAN, TX_DEM4_033);
+		showText(TX_SPEAKER_NAUIAN, 33, true);
 		_roomVar.demon.triedToShootNauian = true;
 	} else { // Murdery the second time
-		showText(TX_SPEAKER_NAUIAN, TX_DEM4_032);
+		showText(TX_SPEAKER_NAUIAN, 32, true);
 		loadActorAnim2(10, "bxfire", 0, 0, 2);
 		playVoc("V0SPOCKT");
 		_awayMission->disableInput = true;
@@ -164,7 +164,7 @@ void Room::demon4KirkReachedSecurityEquipment() {
 
 void Room::demon4KirkFinishedUsingSecurityEquipment() {
 	_awayMission->disableInput = false;
-	showText(TX_DEM4N014);
+	showText(14, true);
 }
 
 void Room::demon4UseMetalOnNauian() {
@@ -184,10 +184,10 @@ void Room::demon4UseSkullOnNauian() {
 }
 
 void Room::demon4KirkReachedNauianWithSkull() {
-	showText(TX_SPEAKER_NAUIAN, TX_DEM4_036);
+	showText(TX_SPEAKER_NAUIAN, 36, true);
 
-	const TextRef choices[] = { TX_SPEAKER_KIRK, TX_DEM4_006, TX_DEM4_003, TX_DEM4_005, TX_BLANK };
-	int choice = showText(choices);
+	const TextRef choices[] = { TX_SPEAKER_KIRK, 6, 3, 5, TX_BLANK };
+	int choice = showText(choices, true);
 
 	switch (choice) {
 	case 0:
@@ -209,15 +209,15 @@ void Room::demon4KirkReachedNauianWithSkull() {
 }
 
 void Room::demon4UsePhaserOnPanel() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_013);
+	showText(TX_SPEAKER_SPOCK, 13, true);
 }
 
 void Room::demon4UsePhaserOnPattern() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_045);
+	showText(TX_SPEAKER_SPOCK, 45, true);
 }
 
 void Room::demon4UsePhaserOnMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM4_018);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 }
 
 void Room::demon4TalkToNauian() {
@@ -225,22 +225,22 @@ void Room::demon4TalkToNauian() {
 
 	if (!_awayMission->demon.metNauian) {
 		_awayMission->demon.metNauian = true;
-		showText(TX_SPEAKER_NAUIAN, TX_DEM4_044);
+		showText(TX_SPEAKER_NAUIAN, 44, true);
 
-		const TextRef choices[] = { TX_SPEAKER_KIRK, TX_DEM4_002, TX_DEM4_004, TX_DEM4_009, TX_BLANK };
-		int choice = showText(choices);
+		const TextRef choices[] = { TX_SPEAKER_KIRK, 2, 4, 9, TX_BLANK };
+		int choice = showText(choices, true);
 
 		switch (choice) {
 		case 0:
 			_awayMission->demon.field2d = true;
-			showText(TX_SPEAKER_NAUIAN, TX_DEM4_042);
+			showText(TX_SPEAKER_NAUIAN, 42, true);
 			break;
 
 		case 1:
 			break;
 
 		case 2:
-			showText(TX_SPEAKER_NAUIAN, TX_DEM4_039);
+			showText(TX_SPEAKER_NAUIAN, 39, true);
 			break;
 
 		default:
@@ -248,15 +248,15 @@ void Room::demon4TalkToNauian() {
 			break;
 		}
 
-		showText(TX_SPEAKER_NAUIAN, TX_DEM4_043);
+		showText(TX_SPEAKER_NAUIAN, 43, true);
 
-		const TextRef choices2[] = { TX_SPEAKER_KIRK, TX_DEM4_008, TX_DEM4_007, TX_BLANK };
-		choice = showText(choices2);
+		const TextRef choices2[] = { TX_SPEAKER_KIRK, 8, 7, TX_BLANK };
+		choice = showText(choices2, true);
 
 		switch (choice) {
 		case 0:
 			_awayMission->demon.field2d = true;
-			showText(TX_SPEAKER_NAUIAN, TX_DEM4_041);
+			showText(TX_SPEAKER_NAUIAN, 41, true);
 			break;
 		case 1:
 			break;
@@ -265,70 +265,70 @@ void Room::demon4TalkToNauian() {
 			break;
 		}
 
-		showText(TX_SPEAKER_NAUIAN, TX_DEM4_040);
+		showText(TX_SPEAKER_NAUIAN, 40, true);
 
 		if (_roomVar.demon.disabledSecurity) { // Impossible condition?
-			showText(TX_SPEAKER_NAUIAN, TX_DEM4_037);
+			showText(TX_SPEAKER_NAUIAN, 37, true);
 
 			// BUGFIX: Originally all of these used no audio, despite the files existing
 			// (being used elsewhere).
-			showText(TX_SPEAKER_KIRK,   TX_DEM4_010);
-			showText(TX_SPEAKER_NAUIAN, TX_DEM4_035);
-			showText(TX_SPEAKER_SPOCK,  TX_DEM4_030);
+			showText(TX_SPEAKER_KIRK,   10, true);
+			showText(TX_SPEAKER_NAUIAN, 35, true);
+			showText(TX_SPEAKER_SPOCK,  30, true);
 
 			_awayMission->disableInput = true;
 			_awayMission->demon.missionScore += 5;
 			_awayMission->timers[1] = 20;
 		} else {
-			showText(TX_SPEAKER_NAUIAN, TX_DEM4_038);
+			showText(TX_SPEAKER_NAUIAN, 38, true);
 		}
 	} else {
-		showText(TX_SPEAKER_NAUIAN, TX_DEM4_031);
+		showText(TX_SPEAKER_NAUIAN, 31, true);
 	}
 }
 
 void Room::demon4LookAtPattern() {
-	showText(TX_DEM4N002);
+	showText(2, true);
 }
 
 void Room::demon4LookAtAlien() {
-	showText(TX_DEM4N007);
+	showText(7, true);
 }
 
 void Room::demon4LookAnywhere() {
-	showText(TX_DEM4N004);
+	showText(4, true);
 }
 
 void Room::demon4LookAtSecurityEquipment() {
-	showText(TX_DEM4N008);
+	showText(8, true);
 }
 
 void Room::demon4LookAtFloor() {
-	showText(TX_DEM4N009);
+	showText(9, true);
 }
 
 void Room::demon4LookAtKirk() {
-	showText(TX_DEM4N003);
+	showText(3, true);
 }
 
 void Room::demon4LookAtMccoy() {
-	showText(TX_DEM4N000);
+	showText(0, true);
 }
 
 void Room::demon4LookAtSpock() {
-	showText(TX_DEM4N005);
+	showText(5, true);
 }
 
 void Room::demon4LookAtRedshirt() {
-	showText(TX_DEM4N001);
+	showText(1, true);
 }
 
 void Room::demon4LookAtChamber() {
-	showText(TX_DEM4N006);
+	showText(6, true);
 }
 
 void Room::demon4LookAtPanel() {
-	showText(TX_DEM4N012);
+	showText(12, true);
 }
 
 void Room::demon4UseKirkOnPanel() {
@@ -366,7 +366,7 @@ void Room::demon4CrewmanReachedPanel() {
 		_awayMission->demon.missionScore += 3;
 		_awayMission->timers[0] = 10;
 	} else
-		showText(TX_DEM4N013);
+		showText(13, true);
 
 	walkCrewman(_roomVar.demon.crewmanUsingPanel, 0xae, 0x93, 0);
 	_awayMission->disableInput = false;
@@ -536,93 +536,93 @@ done:
 }
 
 void Room::demon4TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_DEM4_001);
+	showText(TX_SPEAKER_KIRK, 1, true);
 }
 
 void Room::demon4TalkToMccoy() {
 	if (_roomVar.demon.nauianEmerged)
-		showText(TX_SPEAKER_MCCOY, TX_DEM4_019);
+		showText(TX_SPEAKER_MCCOY, 19, true);
 	else
-		showText(TX_SPEAKER_MCCOY, TX_DEM4_015);
+		showText(TX_SPEAKER_MCCOY, 15, true);
 }
 
 void Room::demon4TalkToSpock() {
 	if (_roomVar.demon.nauianEmerged)
-		showText(TX_SPEAKER_SPOCK, TX_DEM4_022);
+		showText(TX_SPEAKER_SPOCK, 22, true);
 	else
-		showText(TX_SPEAKER_SPOCK, TX_DEM4_024);
+		showText(TX_SPEAKER_SPOCK, 24, true);
 }
 
 void Room::demon4TalkToRedshirt() {
 	if (_roomVar.demon.nauianEmerged)
-		showText(TX_SPEAKER_EVERTS, TX_DEM4_047);
+		showText(TX_SPEAKER_EVERTS, 47, true);
 	else
-		showText(TX_SPEAKER_EVERTS, TX_DEM4_046);
+		showText(TX_SPEAKER_EVERTS, 46, true);
 }
 
 void Room::demon4UseSTricorderOnChamber() {
 	loadActorAnim2(OBJECT_SPOCK, "sscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_012);
+	showText(TX_SPEAKER_SPOCK, 12, true);
 }
 
 void Room::demon4UseSTricorderOnPattern() {
 	loadActorAnim2(OBJECT_SPOCK, "sscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_014);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_025);
+	showText(TX_SPEAKER_SPOCK, 14, true);
+	showText(TX_SPEAKER_SPOCK, 25, true);
 }
 
 void Room::demon4UseMTricorderOnPattern() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM4_021);
+	showText(TX_SPEAKER_MCCOY, 21, true);
 }
 
 void Room::demon4UseSTricorderOnPanel() {
 	loadActorAnim2(OBJECT_SPOCK, "sscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_027);
+	showText(TX_SPEAKER_SPOCK, 27, true);
 }
 
 void Room::demon4UseMTricorderOnPanel() {
 	loadActorAnim2(OBJECT_MCCOY, "mscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_MCCOY, TX_DEM4_027); // BUG: Uses spock's voice (though speaker says "Mccoy")
+	showText(TX_SPEAKER_MCCOY, 27, true); // BUG: Uses spock's voice (though speaker says "Mccoy")
 }
 
 void Room::demon4UseSTricorderOnAnything() {
 	loadActorAnim2(OBJECT_SPOCK, "sscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_023);
+	showText(TX_SPEAKER_SPOCK, 23, true);
 }
 
 void Room::demon4UseMTricorderOnAnything() {
 	loadActorAnim2(OBJECT_MCCOY, "mscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_MCCOY, TX_DEM4_020);
+	showText(TX_SPEAKER_MCCOY, 20, true);
 }
 
 void Room::demon4UseSTricorderOnNauian() {
 	loadActorAnim2(OBJECT_SPOCK, "sscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_029);
+	showText(TX_SPEAKER_SPOCK, 29, true);
 }
 
 void Room::demon4UseMTricorderOnNauian() {
 	loadActorAnim2(OBJECT_MCCOY, "mscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_029); // BUG: Uses spock's voice (speaker says "Spock" too)
+	showText(TX_SPEAKER_SPOCK, 29, true); // BUG: Uses spock's voice (speaker says "Spock" too)
 }
 
 void Room::demon4UseSTricorderOnSecurityEquipment() {
 	loadActorAnim2(OBJECT_SPOCK, "sscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_026);
+	showText(TX_SPEAKER_SPOCK, 26, true);
 }
 
 void Room::demon4UseMTricorderOnSecurityEquipment() {
 	loadActorAnim2(OBJECT_MCCOY, "mscane", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM4_026); // BUG: Uses spock's voice (speaker says "Spock" too)
+	showText(TX_SPEAKER_SPOCK, 26, true); // BUG: Uses spock's voice (speaker says "Spock" too)
 }
 
 }
diff --git a/engines/startrek/rooms/demon5.cpp b/engines/startrek/rooms/demon5.cpp
index 03a9c89f4d..f0dea9a58f 100644
--- a/engines/startrek/rooms/demon5.cpp
+++ b/engines/startrek/rooms/demon5.cpp
@@ -59,26 +59,26 @@ void Room::demon5DoorOpenedOrReachedDoor() {
 void Room::demon5UseSTricorderOnCrate() {
 	loadActorAnim(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(0x04);
-	showText(TX_SPEAKER_SPOCK, TX_DEM5_006);
+	showText(TX_SPEAKER_SPOCK, 6, true);
 }
 
 // FIXME: should work when used on people as well, but doesn't
 void Room::demon5UsePhaserOnAnything() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM5_007);
+	showText(TX_SPEAKER_SPOCK, 7, true);
 }
 
 void Room::demon5UseHandOnStephen() {
 	if (_awayMission->demon.repairedHand)
-		showText(TX_SPEAKER_STEPHEN, TX_DEM5_036);
+		showText(TX_SPEAKER_STEPHEN, 36, true);
 	else
-		showText(TX_SPEAKER_STEPHEN, TX_DEM5_039);
+		showText(TX_SPEAKER_STEPHEN, 39, true);
 }
 
 void Room::demon5UseBerryOnStephen() {
 	if (_awayMission->demon.knowAboutHypoDytoxin)
-		showText(TX_SPEAKER_STEPHEN, TX_DEM5_033);
+		showText(TX_SPEAKER_STEPHEN, 33, true);
 	else
-		showText(TX_SPEAKER_STEPHEN, TX_DEM5_037);
+		showText(TX_SPEAKER_STEPHEN, 37, true);
 }
 
 void Room::demon5UseHypoDytoxinOnChub() {
@@ -92,18 +92,18 @@ void Room::demon5MccoyReachedChub() {
 void Room::demon5MccoyHealedChub() {
 	walkCrewman(OBJECT_MCCOY, 0xc8, 0xba, 0);
 	_awayMission->crewDirectionsAfterWalk[OBJECT_MCCOY] = DIR_W;
-	showText(TX_SPEAKER_CHUB, TX_DEM5L027);
+	showText(TX_SPEAKER_CHUB, 27, true);
 	loseItem(OBJECT_IDETOXIN);
 	_awayMission->demon.curedChub = true;
 	_awayMission->demon.missionScore += 2;
 }
 
 void Room::demon5UseHypoDytoxinOnAnything() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM5_008);
+	showText(TX_SPEAKER_MCCOY, 8, true);
 }
 
 void Room::demon5UseBerryOnChub() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM5_009);
+	showText(TX_SPEAKER_MCCOY, 9, true);
 }
 
 void Room::demon5LookAtRoberts() {
@@ -147,7 +147,7 @@ void Room::demon5LookAnywhere() {
 }
 
 void Room::demon5LookAtChub() {
-	showText(TX_SPEAKER_CHUB, TX_DEM5L028);
+	showText(TX_SPEAKER_CHUB, 28, true, true);
 }
 
 void Room::demon5TalkToRoberts() {
@@ -159,17 +159,17 @@ void Room::demon5TalkToRoberts() {
 			demon5CheckCompletedStudy();
 		}
 	} else {
-		showText(TX_DEM5N010);
+		showText(10, true);
 	}
 }
 
 void Room::demon5TalkToChub() {
 	if (_awayMission->demon.curedChub) {
-		showText(TX_SPEAKER_CHUB, TX_DEM5L029);
+		showText(TX_SPEAKER_CHUB, 29, true, true);
 		showText(TX_SPEAKER_KIRK, 2, true);
-		showText(TX_SPEAKER_CHUB, TX_DEM5L030);
+		showText(TX_SPEAKER_CHUB, 30, true, true);
 		showText(TX_SPEAKER_KIRK, 5, true);
-		showText(TX_SPEAKER_CHUB, TX_DEM5L031);
+		showText(TX_SPEAKER_CHUB, 31, true, true);
 
 		if (!_roomVar.demon.talkedToChub) {
 			_roomVar.demon.talkedToChub = true;
@@ -177,7 +177,7 @@ void Room::demon5TalkToChub() {
 			demon5CheckCompletedStudy();
 		}
 	} else {
-		showText(TX_DEM5N013);
+		showText(13, true);
 	}
 }
 
@@ -194,7 +194,7 @@ void Room::demon5TalkToGrisnash() {
 			demon5CheckCompletedStudy();
 		}
 	} else {
-		showText(TX_DEM5N011);
+		showText(11, true);
 	}
 }
 
@@ -212,16 +212,16 @@ void Room::demon5TalkToStephen() {
 			demon5CheckCompletedStudy();
 		}
 	} else if (!_awayMission->demon.knowAboutHypoDytoxin) {
-		showText(TX_SPEAKER_ROBERTS, TX_DEM5_034);
+		showText(TX_SPEAKER_ROBERTS, 34, true);
 	} else if (_awayMission->demon.madeHypoDytoxin) {
-		showText(TX_SPEAKER_ROBERTS, TX_DEM5_035);
+		showText(TX_SPEAKER_ROBERTS, 35, true);
 	} else if (_awayMission->demon.gotBerries) {
-		showText(TX_SPEAKER_ROBERTS, TX_DEM5_032);
+		showText(TX_SPEAKER_ROBERTS, 32, true);
 		_awayMission->demon.field3e = false;
 	} else if (_awayMission->demon.field3e) {
-		showText(TX_SPEAKER_ROBERTS, TX_DEM5_038);
+		showText(TX_SPEAKER_ROBERTS, 38, true);
 	} else {
-		showText(TX_SPEAKER_ROBERTS, TX_DEM5_034);
+		showText(TX_SPEAKER_ROBERTS, 34, true);
 	}
 }
 
@@ -280,7 +280,7 @@ void Room::demon5UseMTricorderOnChub() {
 		demon5CheckCompletedStudy();
 	} else {
 		if (_awayMission->demon.field3e)
-			showText(TX_SPEAKER_MCCOY, TX_DEM5_010);
+			showText(TX_SPEAKER_MCCOY, 10, true);
 		else {
 			showText(TX_SPEAKER_MCCOY, 12, true);
 			showText(TX_SPEAKER_STEPHEN, 40, true);
@@ -323,7 +323,7 @@ void Room::demon5CheckCompletedStudy() {
 }
 
 void Room::demon5GetCrate() {
-	showText(TX_DEM5N012);
+	showText(12, true);
 }
 
 }
diff --git a/engines/startrek/rooms/demon6.cpp b/engines/startrek/rooms/demon6.cpp
index c56ad6c5c4..464d5f6fbb 100644
--- a/engines/startrek/rooms/demon6.cpp
+++ b/engines/startrek/rooms/demon6.cpp
@@ -45,12 +45,12 @@ void Room::demon6Tick30() {
 	if (_awayMission->demon.stephenWelcomedToStudy)
 		return;
 
-	showText(TX_SPEAKER_STEPHEN, TX_DEM6_042);
+	showText(TX_SPEAKER_STEPHEN, 42, true);
 	_awayMission->demon.stephenWelcomedToStudy = true;
 }
 
 void Room::demon6SpockReachedComputer() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_014);
+	showText(TX_SPEAKER_SPOCK, 14, true);
 }
 
 void Room::demon6WalkToDoor() {
@@ -73,71 +73,71 @@ void Room::demon6DoorOpenedOrReachedDoor() {
 }
 
 void Room::demon6UsePhaserOnStephen() {
-	showText(TX_SPEAKER_STEPHEN, TX_DEM6_028);
+	showText(TX_SPEAKER_STEPHEN, 28, true);
 }
 
 void Room::demon6UsePhaserOnCase() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM6_017);
+	showText(TX_SPEAKER_MCCOY, 17, true);
 }
 
 void Room::demon6LookAtWorkspace() {
-	showText(TX_DEM6N003);
+	showText(3, true);
 }
 
 void Room::demon6LookAtCase() {
-	showText(TX_DEM6N001);
+	showText(1, true);
 }
 
 void Room::demon6LookAtTable() {
-	showText(TX_DEM6N007);
+	showText(7, true);
 }
 
 void Room::demon6LookAtMineral() {
-	showText(TX_DEM6N016);
+	showText(16, true);
 }
 
 void Room::demon6LookAtShells() {
-	showText(TX_DEM6N011);
+	showText(11, true);
 }
 
 void Room::demon6LookAtSkull() {
-	showText(TX_DEM6N017);
+	showText(17, true);
 }
 
 void Room::demon6LookAtMetal() {
-	showText(TX_DEM6N005);
+	showText(5, true);
 }
 
 void Room::demon6LookAtMeteor() {
-	showText(TX_DEM6N000);
+	showText(0, true);
 }
 
 void Room::demon6LookAtMountain() {
-	showText(TX_DEM6N002);
+	showText(2, true);
 }
 
 void Room::demon6LookAtSynthesizer() {
-	showText(TX_DEM6N004);
+	showText(4, true);
 }
 
 void Room::demon6LookAtKirk() {
-	showText(TX_DEM6N008);
+	showText(8, true);
 }
 
 void Room::demon6LookAtSpock() {
-	showText(TX_DEM6N015);
+	showText(15, true);
 }
 
 void Room::demon6LookAtMccoy() {
-	showText(TX_DEM6N009);
+	showText(9, true);
 }
 
 void Room::demon6LookAtRedshirt() {
-	showText(TX_DEM6N010);
+	showText(10, true);
 }
 
 void Room::demon6LookAtComputer() {
-	showText(TX_DEM6N006);
+	showText(6, true);
 	if (!_awayMission->demon.lookedAtComputer) {
 		_awayMission->demon.lookedAtComputer = true;
 		_awayMission->demon.missionScore++;
@@ -145,38 +145,38 @@ void Room::demon6LookAtComputer() {
 }
 
 void Room::demon6LookAnywhere() {
-	showText(TX_DEM6N024);
+	showText(24, true);
 }
 
 void Room::demon6LookAtStephen() {
-	showText(TX_DEM6N021);
+	showText(21, true);
 }
 
 void Room::demon6TalkToMccoy() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM6_020);
+	showText(TX_SPEAKER_MCCOY, 20, true);
 }
 
 void Room::demon6TalkToSpock() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_025);
+	showText(TX_SPEAKER_SPOCK, 25, true);
 }
 
 void Room::demon6TalkToKirk() {
-	showText(TX_SPEAKER_KIRK, TX_DEM6_002);
+	showText(TX_SPEAKER_KIRK, 2, true);
 }
 
 void Room::demon6TalkToRedshirt() {
-	showText(TX_SPEAKER_EVERTS, TX_DEM6_053);
+	showText(TX_SPEAKER_EVERTS, 53, true);
 }
 
 void Room::demon6TalkToStephen() {
-	showText(TX_SPEAKER_STEPHEN, TX_DEM6_035);
+	showText(TX_SPEAKER_STEPHEN, 35, true);
 }
 
 void Room::demon6UseBerryOnStephen() {
 	if (_awayMission->demon.knowAboutHypoDytoxin) {
-		showText(TX_SPEAKER_STEPHEN, TX_DEM6_027);
+		showText(TX_SPEAKER_STEPHEN, 27, true);
 	} else {
-		showText(TX_SPEAKER_STEPHEN, TX_DEM6_026);
+		showText(TX_SPEAKER_STEPHEN, 26, true);
 	}
 }
 
@@ -193,8 +193,8 @@ void Room::demon6MccoyReachedSynthesizer() {
 
 void Room::demon6FinishedMakingHypoDytoxin() {
 	playMidiMusicTracks(-1, -1);
-	showText(TX_DEM6N023);
-	showText(TX_SPEAKER_MCCOY, TX_DEM6_018);
+	showText(23, true);
+	showText(TX_SPEAKER_MCCOY, 18, true);
 
 	giveItem(OBJECT_IDETOXIN);
 	_awayMission->demon.madeHypoDytoxin = true;
@@ -208,10 +208,10 @@ void Room::demon6FinishedMakingHypoDytoxin() {
 
 void Room::demon6UseHandOnWorkspace() {
 	if (_awayMission->demon.repairedHand) {
-		showText(TX_SPEAKER_SPOCK, TX_DEM6N018); // FIXME
+		showText(TX_SPEAKER_SPOCK, 18, true); // FIXME
 	} else {
 		_awayMission->disableInput = true;
-		showText(TX_SPEAKER_KIRK, TX_DEM6_005);
+		showText(TX_SPEAKER_KIRK, 5, true);
 		walkCrewman(OBJECT_SPOCK, 0xb3, 0xbb, 2);
 	}
 }
@@ -221,7 +221,7 @@ void Room::demon6SpockReachedWorkspace() {
 }
 
 void Room::demon6SpockFinishedRepairingHand() {
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_024);
+	showText(TX_SPEAKER_SPOCK, 24, true);
 	_awayMission->demon.repairedHand = true;
 	_awayMission->demon.missionScore += 2;
 	loadActorStandAnim(OBJECT_SPOCK);
@@ -230,39 +230,39 @@ void Room::demon6SpockFinishedRepairingHand() {
 
 // FIXME: doesn't work
 void Room::demon6UseAnythingOnWorkspace() {
-	showText(TX_DEM6N020);
+	showText(20, true);
 }
 
 void Room::demon6StephenIsInsulted() {
-	showText(TX_SPEAKER_STEPHEN, TX_DEM6_030);
+	showText(TX_SPEAKER_STEPHEN, 30, true);
 	_roomVar.demon.insultedStephenRecently = true;
 	_awayMission->demon.insultedStephen = true;
 }
 
 void Room::demon6StephenDescribesItemsInCase() {
 	while (true) {
-		showText(TX_SPEAKER_STEPHEN, TX_DEM6_051);
-		TextRef choices2[] = { TX_SPEAKER_STEPHEN, TX_DEM6_045, TX_DEM6_046, TX_DEM6_047, TX_DEM6_048, TX_DEM6_049, TX_DEM6_050, TX_BLANK };
-		TextRef choice = showText(choices2);
+		showText(TX_SPEAKER_STEPHEN, 51, true);
+		TextRef choices2[] = { TX_SPEAKER_STEPHEN, 45, 46, 47, 48, 49, 50, TX_BLANK };
+		TextRef choice = showText(choices2, true);
 
 		switch (choice) {
 		case 0:
-			showText(TX_SPEAKER_STEPHEN, TX_DEM6_040);
+			showText(TX_SPEAKER_STEPHEN, 40, true);
 			break;
 		case 1:
-			showText(TX_SPEAKER_STEPHEN, TX_DEM6_033);
+			showText(TX_SPEAKER_STEPHEN, 33, true);
 			break;
 		case 2:
-			showText(TX_SPEAKER_STEPHEN, TX_DEM6_036);
+			showText(TX_SPEAKER_STEPHEN, 36, true);
 			break;
 		case 3:
-			showText(TX_SPEAKER_STEPHEN, TX_DEM6_038);
+			showText(TX_SPEAKER_STEPHEN, 38, true);
 			break;
 		case 4:
-			showText(TX_SPEAKER_STEPHEN, TX_DEM6_039);
+			showText(TX_SPEAKER_STEPHEN, 39, true);
 			break;
 		case 5:
-			showText(TX_SPEAKER_STEPHEN, TX_DEM6_041);
+			showText(TX_SPEAKER_STEPHEN, 41, true);
 			_roomVar.demon.caseOpened = true;
 			return;
 		default:
@@ -275,19 +275,19 @@ void Room::demon6UseCrewmanOnCase() {
 	if (_roomVar.demon.stephenInRoom) {
 		if (_roomVar.demon.insultedStephenRecently)
 			return;
-		showText(TX_SPEAKER_STEPHEN, TX_DEM6_044);
-		TextRef choices1[] = {TX_SPEAKER_KIRK, TX_DEM6_001, TX_DEM6_006, TX_DEM6_003, TX_BLANK};
-		TextRef choice = showText(choices1);
+		showText(TX_SPEAKER_STEPHEN, 44, true);
+		TextRef choices1[] = {TX_SPEAKER_KIRK, 1, 6, 3, TX_BLANK};
+		TextRef choice = showText(choices1, true);
 
 		if (choice == 0) {
 			demon6StephenIsInsulted();
 		} else if (choice == 1) {
-			showText(TX_SPEAKER_STEPHEN, TX_DEM6_034);
+			showText(TX_SPEAKER_STEPHEN, 34, true);
 			demon6StephenDescribesItemsInCase();
 		} else if (choice == 2) {
-			showText(TX_SPEAKER_STEPHEN, TX_DEM6_031);
-			TextRef choices3[] = {TX_SPEAKER_KIRK, TX_DEM6_001, TX_DEM6_006, TX_BLANK};
-			choice = showText(choices3);
+			showText(TX_SPEAKER_STEPHEN, 31, true);
+			TextRef choices3[] = {TX_SPEAKER_KIRK, 1, 6, TX_BLANK};
+			choice = showText(choices3, true);
 
 			if (choice == 0)
 				demon6StephenIsInsulted();
@@ -299,22 +299,22 @@ void Room::demon6UseCrewmanOnCase() {
 			showText(TX_DIALOG_ERROR);
 		}
 	} else {
-		showText(TX_DEM6N012);
-		showText(TX_SPEAKER_MCCOY, TX_DEM6_019);
+		showText(12, true);
+		showText(TX_SPEAKER_MCCOY, 19, true);
 	}
 }
 
 void Room::demon6UseKirkOnComputer() {
-	showText(TX_SPEAKER_KIRK, TX_DEM6_004);
+	showText(TX_SPEAKER_KIRK, 4, true);
 	demon6UseSpockOnComputer();
 }
 
 void Room::demon6UseMccoyOnComputer() {
-	showText(TX_SPEAKER_MCCOY, TX_DEM6_015);
+	showText(TX_SPEAKER_MCCOY, 15, true);
 }
 
 void Room::demon6UseRedshirtOnComputer() {
-	showText(TX_SPEAKER_EVERTS, TX_DEM6_052);
+	showText(TX_SPEAKER_EVERTS, 52, true);
 }
 
 void Room::demon6UseSpockOnComputer() {
@@ -348,80 +348,80 @@ void Room::demon6UseMetalOnStephen() {
 
 void Room::demon6ReturnItemToStephen(int item) {
 	loseItem(item);
-	showText(TX_DEM6N019);
-	showText(TX_SPEAKER_STEPHEN, TX_DEM6_029);
+	showText(19, true);
+	showText(TX_SPEAKER_STEPHEN, 29, true);
 }
 
 void Room::demon6UseHandOnStephen() {
 	if (_awayMission->demon.repairedHand)
-		showText(TX_SPEAKER_STEPHEN, TX_DEM6_037);
+		showText(TX_SPEAKER_STEPHEN, 37, true);
 	else
-		showText(TX_SPEAKER_STEPHEN, TX_DEM6_043);
+		showText(TX_SPEAKER_STEPHEN, 43, true);
 }
 
 void Room::demon6UseMTricoderOnStephen() {
 	loadActorAnim2(OBJECT_MCCOY, "mscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_MCCOY, TX_DEM6_016);
+	showText(TX_SPEAKER_MCCOY, 16, true);
 }
 
 void Room::demon6UseSTricoderOnTable() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_009);
+	showText(TX_SPEAKER_SPOCK, 9, true);
 }
 
 void Room::demon6UseSTricoderOnComputer() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_007);
+	showText(TX_SPEAKER_SPOCK, 7, true);
 }
 
 void Room::demon6UseSTricoderOnMineral() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_013);
+	showText(TX_SPEAKER_SPOCK, 13, true);
 }
 
 void Room::demon6UseSTricoderOnShells() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_021);
+	showText(TX_SPEAKER_SPOCK, 21, true);
 }
 
 void Room::demon6UseSTricoderOnSkull() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_012);
+	showText(TX_SPEAKER_SPOCK, 12, true);
 }
 
 void Room::demon6UseSTricoderOnMetal() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_011);
+	showText(TX_SPEAKER_SPOCK, 11, true);
 }
 
 void Room::demon6UseSTricoderOnMeteor() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_010);
+	showText(TX_SPEAKER_SPOCK, 10, true);
 }
 
 void Room::demon6UseSTricoderOnCase() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_023);
+	showText(TX_SPEAKER_SPOCK, 23, true);
 }
 
 void Room::demon6UseSTricoderOnSynthesizer() {
 	loadActorAnim2(OBJECT_SPOCK, "sscans", -1, -1, 0);
 	playSoundEffectIndex(4);
-	showText(TX_SPEAKER_SPOCK, TX_DEM6_008);
+	showText(TX_SPEAKER_SPOCK, 8, true);
 }
 
 void Room::demon6GetCase() {
 	if (!_roomVar.demon.caseOpened)
-		showText(TX_DEM6N022);
+		showText(22, true);
 	else
 		walkCrewman(OBJECT_KIRK, 0xff, 0xba, 5);
 }