[Scummvm-git-logs] scummvm master -> 5bead291d6d7a5d5ef573affe16d30e210183154
bluegr
bluegr at gmail.com
Mon Aug 30 19:05:45 UTC 2021
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5bead291d6 STARTREK: Initial work on the texts of the German and French versions
Commit: 5bead291d6d7a5d5ef573affe16d30e210183154
https://github.com/scummvm/scummvm/commit/5bead291d6d7a5d5ef573affe16d30e210183154
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-08-30T22:05:30+03:00
Commit Message:
STARTREK: Initial work on the texts of the German and French versions
This is still a proof of concept, and only some of the first room texts
have been added
Changed paths:
engines/startrek/room.cpp
engines/startrek/rooms/demon0.cpp
engines/startrek/rooms/demon1.cpp
engines/startrek/rooms/demon2.cpp
engines/startrek/rooms/demon3.cpp
engines/startrek/rooms/demon4.cpp
engines/startrek/rooms/demon5.cpp
engines/startrek/rooms/demon6.cpp
engines/startrek/rooms/feather0.cpp
engines/startrek/rooms/feather1.cpp
engines/startrek/rooms/feather2.cpp
engines/startrek/rooms/feather3.cpp
engines/startrek/rooms/feather4.cpp
engines/startrek/rooms/feather5.cpp
engines/startrek/rooms/feather6.cpp
engines/startrek/rooms/feather7.cpp
engines/startrek/rooms/love0.cpp
engines/startrek/rooms/love1.cpp
engines/startrek/rooms/love2.cpp
engines/startrek/rooms/love3.cpp
engines/startrek/rooms/love4.cpp
engines/startrek/rooms/love5.cpp
engines/startrek/rooms/lovea.cpp
engines/startrek/rooms/mudd0.cpp
engines/startrek/rooms/mudd1.cpp
engines/startrek/rooms/mudd2.cpp
engines/startrek/rooms/mudd3.cpp
engines/startrek/rooms/mudd4.cpp
engines/startrek/rooms/mudd5.cpp
engines/startrek/rooms/mudda.cpp
engines/startrek/rooms/sins0.cpp
engines/startrek/rooms/sins1.cpp
engines/startrek/rooms/sins2.cpp
engines/startrek/rooms/sins3.cpp
engines/startrek/rooms/sins4.cpp
engines/startrek/rooms/sins5.cpp
engines/startrek/rooms/trial0.cpp
engines/startrek/rooms/trial1.cpp
engines/startrek/rooms/trial2.cpp
engines/startrek/rooms/trial3.cpp
engines/startrek/rooms/trial4.cpp
engines/startrek/rooms/trial5.cpp
engines/startrek/rooms/tug0.cpp
engines/startrek/rooms/tug1.cpp
engines/startrek/rooms/tug2.cpp
engines/startrek/rooms/tug3.cpp
engines/startrek/rooms/veng0.cpp
engines/startrek/rooms/veng1.cpp
engines/startrek/rooms/veng2.cpp
engines/startrek/rooms/veng3.cpp
engines/startrek/rooms/veng4.cpp
engines/startrek/rooms/veng5.cpp
engines/startrek/rooms/veng6.cpp
engines/startrek/rooms/veng7.cpp
engines/startrek/rooms/veng8.cpp
engines/startrek/rooms/venga.cpp
engines/startrek/text.h
diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index 39de1ca748..498dfb77d5 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -349,7 +349,12 @@ const char *Room::getText(uint16 textId) {
error("Missing text ID: %d", textId);
switch (_vm->getLanguage()) {
- // TODO: Add non-English languages
+ case Common::FR_FRA:
+ offset = offsets->offsetFrenchCD;
+ break;
+ case Common::DE_DEU:
+ offset = offsets->offsetGermanCD;
+ break;
default:
offset = isCD ? offsets->offsetEnglishCD : offsets->offsetEnglishFloppy;
break;
diff --git a/engines/startrek/rooms/demon0.cpp b/engines/startrek/rooms/demon0.cpp
index 9dd603fb97..2535c7dd17 100644
--- a/engines/startrek/rooms/demon0.cpp
+++ b/engines/startrek/rooms/demon0.cpp
@@ -101,68 +101,68 @@ enum demon0TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets demon0TextOffsets[] = {
- { TX_SPEAKER_KIRK, 2597, 2480 },
- { TX_SPEAKER_ANGIVEN, 2608, 2491 },
- { TX_SPEAKER_MCCOY, 2622, 2505 },
- { TX_SPEAKER_SPOCK, 2632, 2515 },
- { TX_SPEAKER_EVERTS, 2642, 2525 },
- { TX_SPEAKER_SIGN, 2661, 0 },
- { TX_DEM0_001, 7829, 7085 },
- { TX_DEM0_002, 3960, 3739 },
- { TX_DEM0_003, 3148, 2987 },
- { TX_DEM0_004, 7588, 6889 },
- { TX_DEM0_005, 4061, 3825 },
- { TX_DEM0_006, 2797, 2665 },
- { TX_DEM0_007, 7380, 6741 },
- { TX_DEM0_008, 2988, 2842 },
- { TX_DEM0_009, 7460, 6791 },
- { TX_DEM0_010, 4303, 4052 },
- { TX_DEM0_011, 6827, 6304 },
- { TX_DEM0_012, 4362, 4096 },
- { TX_DEM0_013, 1334, 0 },
- { TX_DEM0_014, 6593, 6085 },
- { TX_DEM0_015, 1233, 0 },
- { TX_DEM0_016, 473, 0 },
- { TX_DEM0_017, 1167, 0 },
- { TX_DEM0_018, 8094, 7320 },
- { TX_DEM0_019, 6427, 5934 },
- { TX_DEM0_020, 8648, 7829 },
- { TX_DEM0_021, 8180, 7391 },
- { TX_DEM0_022, 8050, 7291 },
- { TX_DEM0_023, 6871, 0 },
- { TX_DEM0_024, 7656, 0 },
- { TX_DEM0_025, 7357, 0 },
- { TX_DEM0_026, 7213, 0 },
- { TX_DEM0_027, 7526, 0 },
- { TX_DEM0_028, 8405, 7601 },
- { TX_DEM0_029, 6995, 0 },
- { TX_DEM0_030, 7709, 6980 },
- { TX_DEM0_031, 4125, 0 },
- { TX_DEM0_032, 3563, 0 },
- { TX_DEM0_033, 3743, 0 },
- { TX_DEM0_034, 5325, 0 },
- { TX_DEM0_035, 4533, 0 },
- { TX_DEM0_036, 2666, 2549 },
- { TX_DEM0_037, 5196, 4898 },
- { TX_DEM0_038, 3237, 3061 },
- { TX_DEM0_039, 1058, 0 },
- { TX_DEM0_040, 1400, 0 },
- { TX_DEM0_041, 7080, 0 },
- { TX_DEM0_042, 7275, 0 },
- { TX_DEM0_043, 7144, 0 },
- { TX_DEM0_044, 7429, 0 },
- { TX_DEM0N000, 5591, 0 },
- { TX_DEM0N001, 5805, 0 },
- { TX_DEM0N002, 6184, 0 },
- { TX_DEM0N003, 6290, 0 },
- { TX_DEM0N004, 5467, 0 },
- { TX_DEM0N005, 6076, 0 },
- { TX_DEM0N006, 5678, 0 },
- { TX_DEM0N007, 5897, 0 },
- { TX_DEM0N008, 5560, 0 },
- { TX_DEM0N009, 6036, 0 },
- { TX_DEM0N010, 5960, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 2597, 2480, 2676, 2697 },
+ { TX_SPEAKER_ANGIVEN, 2608, 2491, 2687, 2690 },
+ { TX_SPEAKER_MCCOY, 2622, 2505, 2701, 2704 },
+ { TX_SPEAKER_SPOCK, 2632, 2515, 2711, 02714 },
+ { TX_SPEAKER_EVERTS, 2642, 2525, 2721, 2724 },
+ { TX_SPEAKER_SIGN, 2661, 0, 2740, 2743 },
+ { TX_DEM0_001, 7829, 7085, 8665, 8597 },
+ { TX_DEM0_002, 3960, 3739, 4251, 4192 },
+ { TX_DEM0_003, 3148, 2987, 3294, 3303 },
+ { TX_DEM0_004, 7588, 6889, 0, 0 },
+ { TX_DEM0_005, 4061, 3825, 0, 0 },
+ { TX_DEM0_006, 2797, 2665, 2884, 2901 },
+ { TX_DEM0_007, 7380, 6741, 0, 0 },
+ { TX_DEM0_008, 2988, 2842, 3110, 3097 },
+ { TX_DEM0_009, 7460, 6791, 0, 0 },
+ { TX_DEM0_010, 4303, 4052, 0, 0 },
+ { TX_DEM0_011, 6827, 6304, 0, 0 },
+ { TX_DEM0_012, 4362, 4096, 0, 0 },
+ { TX_DEM0_013, 1334, 0, 1387, 1384 },
+ { TX_DEM0_014, 6593, 6085, 0, 0 },
+ { TX_DEM0_015, 1233, 0, 1281, 1270 },
+ { TX_DEM0_016, 473, 0, 474, 474 },
+ { TX_DEM0_017, 1167, 0, 1211, 1193 },
+ { TX_DEM0_018, 8094, 7320, 0, 0 },
+ { TX_DEM0_019, 6427, 5934, 0, 0 },
+ { TX_DEM0_020, 8648, 7829, 0, 0 },
+ { TX_DEM0_021, 8180, 7391, 0, 0 },
+ { TX_DEM0_022, 8050, 7291, 0, 0 },
+ { TX_DEM0_023, 6871, 0, 0, 0 },
+ { TX_DEM0_024, 7656, 0, 0, 0 },
+ { TX_DEM0_025, 7357, 0, 0, 0 },
+ { TX_DEM0_026, 7213, 0, 0, 0 },
+ { TX_DEM0_027, 7526, 0, 0, 0 },
+ { TX_DEM0_028, 8405, 7601, 0, 0 },
+ { TX_DEM0_029, 6995, 0, 0, 0 },
+ { TX_DEM0_030, 7709, 6980, 0, 0 },
+ { TX_DEM0_031, 4125, 0, 0, 0 },
+ { TX_DEM0_032, 3563, 0, 0, 0 },
+ { TX_DEM0_033, 3743, 0, 0, 0 },
+ { TX_DEM0_034, 5325, 0, 0, 0 },
+ { TX_DEM0_035, 4533, 0, 0, 0 },
+ { TX_DEM0_036, 2666, 2549, 2745, 2750 },
+ { TX_DEM0_037, 5196, 4898, 0, 0 },
+ { TX_DEM0_038, 3237, 3061, 0, 0 },
+ { TX_DEM0_039, 1058, 0, 1078, 1064 },
+ { TX_DEM0_040, 1400, 0, 1454, 1456 },
+ { TX_DEM0_041, 7080, 0, 0, 0 },
+ { TX_DEM0_042, 7275, 0, 0, 0 },
+ { TX_DEM0_043, 7144, 0, 0, 0 },
+ { TX_DEM0_044, 7429, 0, 0, 0 },
+ { TX_DEM0N000, 5591, 0, 0, 0 },
+ { TX_DEM0N001, 5805, 0, 0, 0 },
+ { TX_DEM0N002, 6184, 0, 0, 0 },
+ { TX_DEM0N003, 6290, 0, 0, 0 },
+ { TX_DEM0N004, 5467, 0, 0, 0 },
+ { TX_DEM0N005, 6076, 0, 0, 0 },
+ { TX_DEM0N006, 5678, 0, 0, 0 },
+ { TX_DEM0N007, 5897, 0, 0, 0 },
+ { TX_DEM0N008, 5560, 0, 0, 0 },
+ { TX_DEM0N009, 6036, 0, 0, 0 },
+ { TX_DEM0N010, 5960, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText demon0Texts[] = {
diff --git a/engines/startrek/rooms/demon1.cpp b/engines/startrek/rooms/demon1.cpp
index 2f6769cb2f..435083c6f6 100644
--- a/engines/startrek/rooms/demon1.cpp
+++ b/engines/startrek/rooms/demon1.cpp
@@ -128,64 +128,64 @@ enum demon1TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets demon1TextOffsets[] = {
- { TX_SPEAKER_KIRK, 5869, 0 },
- { TX_SPEAKER_SPOCK, 5880, 0 },
- { TX_SPEAKER_MCCOY, 5890, 0 },
- { TX_SPEAKER_EVERTS, 5900, 0 },
- { TX_SPEAKER_UHURA, 5914, 0 },
- { TX_SPEAKER_KLINGON, 5924, 0 },
- { TX_DEM1_001, 7374, 0 },
- { TX_DEM1_002, 2710, 0 },
- { TX_DEM1_003, 2566, 0 },
- { TX_DEM1_004, 2906, 0 },
- { TX_DEM1_005, 3458, 0 },
- { TX_DEM1_006, 3669, 0 },
- { TX_DEM1_007, 3142, 0 },
- { TX_DEM1_008, 3285, 0 },
- { TX_DEM1_009, 4222, 0 },
- { TX_DEM1_011, 1492, 0 },
- { TX_DEM1_012, 6779, 0 },
- { TX_DEM1_013, 7645, 0 },
- { TX_DEM1_014, 7779, 0 },
- { TX_DEM1_015, 7904, 0 },
- { TX_DEM1_016, 7111, 0 },
- { TX_DEM1_017, 6837, 0 },
- { TX_DEM1_018, 6358, 0 },
- { TX_DEM1_019, 6926, 0 },
- { TX_DEM1_020, 2764, 0 },
- { TX_DEM1_021, 2951, 0 },
- { TX_DEM1_022, 7478, 0 },
- { TX_DEM1_023, 7983, 0 },
- { TX_DEM1_024, 7735, 0 },
- { TX_DEM1_025, 1937, 0 },
- { TX_DEM1_026, 8115, 0 },
- { TX_DEM1_F23, 2028, 0 },
- { TX_DEM1N000, 6289, 0 },
- { TX_DEM1N001, 6015, 0 },
- { TX_DEM1N002, 6209, 0 },
- { TX_DEM1N003, 5933, 0 },
- { TX_DEM1N004, 7334, 0 },
- { TX_DEM1N005, 7222, 0 },
- { TX_DEM1N006, 6742, 0 },
- { TX_DEM1N007, 7281, 0 },
- { TX_DEM1N008, 6118, 0 },
- { TX_DEM1N009, 4721, 0 },
- { TX_DEM1N010, 4561, 0 },
- { TX_DEM1N011, 4772, 0 },
- { TX_DEM1N012, 5145, 0 },
- { TX_DEM1N013, 5298, 0 },
- { TX_DEM1N014, 5373, 0 },
- { TX_DEM1N015, 5223, 0 },
- { TX_DEM1N016, 4917, 0 },
- { TX_DEM1N017, 5044, 0 },
- { TX_DEM1N018, 4486, 0 },
- { TX_DEM1N019, 4630, 0 },
- { TX_DEM1N020, 1814, 0 },
- { TX_DEM1N021, 4851, 0 },
- { TX_DEM1N023, 4977, 0 },
- { TX_DEM1U077, 2462, 0 },
- { TX_DEM1U078, 2641, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 5869, 0, 6162, 0 },
+ { TX_SPEAKER_SPOCK, 5880, 0, 6173, 0 },
+ { TX_SPEAKER_MCCOY, 5890, 0, 6183, 0 },
+ { TX_SPEAKER_EVERTS, 5900, 0, 6193, 0 },
+ { TX_SPEAKER_UHURA, 5914, 0, 6207, 0 },
+ { TX_SPEAKER_KLINGON, 5924, 0, 6217, 0 },
+ { TX_DEM1_001, 7374, 0, 7761, 0 },
+ { TX_DEM1_002, 2710, 0, 2790, 0 },
+ { TX_DEM1_003, 2566, 0, 2633, 0 },
+ { TX_DEM1_004, 2906, 0, 2999, 0 },
+ { TX_DEM1_005, 3458, 0, 3627, 0 },
+ { TX_DEM1_006, 3669, 0, 3866, 0 },
+ { TX_DEM1_007, 3142, 0, 3276, 0 },
+ { TX_DEM1_008, 3285, 0, 3440, 0 },
+ { TX_DEM1_009, 4222, 0, 4454, 0 },
+ { TX_DEM1_011, 1492, 0, 1492, 0 },
+ { TX_DEM1_012, 6779, 0, 0, 0 },
+ { TX_DEM1_013, 7645, 0, 0, 0 },
+ { TX_DEM1_014, 7779, 0, 0, 0 },
+ { TX_DEM1_015, 7904, 0, 0, 0 },
+ { TX_DEM1_016, 7111, 0, 0, 0 },
+ { TX_DEM1_017, 6837, 0, 0, 0 },
+ { TX_DEM1_018, 6358, 0, 0, 0 },
+ { TX_DEM1_019, 6926, 0, 0, 0 },
+ { TX_DEM1_020, 2764, 0, 2853, 0 },
+ { TX_DEM1_021, 2951, 0, 3053, 0 },
+ { TX_DEM1_022, 7478, 0, 0, 0 },
+ { TX_DEM1_023, 7983, 0, 0, 0 },
+ { TX_DEM1_024, 7735, 0, 0, 0 },
+ { TX_DEM1_025, 1937, 0, 1949, 0 },
+ { TX_DEM1_026, 8115, 0, 0, 0 },
+ { TX_DEM1_F23, 2028, 0, 2062, 0 },
+ { TX_DEM1N000, 6289, 0, 0, 0 },
+ { TX_DEM1N001, 6015, 0, 0, 0 },
+ { TX_DEM1N002, 6209, 0, 0, 0 },
+ { TX_DEM1N003, 5933, 0, 0, 0 },
+ { TX_DEM1N004, 7334, 0, 0, 0 },
+ { TX_DEM1N005, 7222, 0, 0, 0 },
+ { TX_DEM1N006, 6742, 0, 0, 0 },
+ { TX_DEM1N007, 7281, 0, 0, 0 },
+ { TX_DEM1N008, 6118, 0, 0, 0 },
+ { TX_DEM1N009, 4721, 0, 4988, 0 },
+ { TX_DEM1N010, 4561, 0, 4811, 0 },
+ { TX_DEM1N011, 4772, 0, 5046, 0 },
+ { TX_DEM1N012, 5145, 0, 5423, 0 },
+ { TX_DEM1N013, 5298, 0, 5582, 0 },
+ { TX_DEM1N014, 5373, 0, 5661, 0 },
+ { TX_DEM1N015, 5223, 0, 5507, 0 },
+ { TX_DEM1N016, 4917, 0, 5195, 0 },
+ { TX_DEM1N017, 5044, 0, 5330, 0 },
+ { TX_DEM1N018, 4486, 0, 4738, 0 },
+ { TX_DEM1N019, 4630, 0, 4888, 0 },
+ { TX_DEM1N020, 1814, 0, 1825, 0 },
+ { TX_DEM1N021, 4851, 0, 5118, 0 },
+ { TX_DEM1N023, 4977, 0, 5262, 0 },
+ { TX_DEM1U077, 2462, 0, 2504, 0 },
+ { TX_DEM1U078, 2641, 0, 2708, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText demon1Texts[] = {
diff --git a/engines/startrek/rooms/demon2.cpp b/engines/startrek/rooms/demon2.cpp
index dd0080ffe0..e0789cba54 100644
--- a/engines/startrek/rooms/demon2.cpp
+++ b/engines/startrek/rooms/demon2.cpp
@@ -80,44 +80,44 @@ enum demon2TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets demon2TextOffsets[] = {
- { TX_SPEAKER_KIRK, 2890, 0 },
- { TX_SPEAKER_MCCOY, 2901, 0 },
- { TX_SPEAKER_SPOCK, 2911, 0 },
- { TX_SPEAKER_EVERTS, 2921, 0 },
- { TX_DEM2_001, 3275, 0 },
- { TX_DEM2_002, 3732, 0 },
- { TX_DEM2_003, 4228, 0 },
- { TX_DEM2_004, 3912, 0 },
- { TX_DEM2_005, 1613, 0 },
- { TX_DEM2_006, 1466, 0 },
- { TX_DEM2_007, 1336, 0 },
- { TX_DEM2_008, 1161, 0 },
- { TX_DEM2_009, 1963, 0 },
- { TX_DEM2_010, 2071, 0 },
- { TX_DEM2_011, 1050, 0 },
- { TX_DEM2_012, 2212, 0 },
- { TX_DEM2_013, 1869, 0 },
- { TX_DEM2_014, 2384, 0 },
- { TX_DEM2_015, 3346, 0 },
- { TX_DEM2_016, 3561, 0 },
- { TX_DEM2_017, 3414, 0 },
- { TX_DEM2_018, 4111, 0 },
- { TX_DEM2_019, 3618, 0 },
- { TX_DEM2_020, 3791, 0 },
- { TX_DEM2N000, 3197, 0 },
- { TX_DEM2N002, 2935, 0 },
- { TX_DEM2N003, 3117, 0 },
- { TX_DEM2N004, 3014, 0 },
- { TX_DEM2N005, 586, 0 },
- { TX_DEM2N006, 710, 0 },
- { TX_DEM2N007, 405, 0 },
- { TX_DEM2N008, 454, 0 },
- { TX_DEM2N009, 357, 0 },
- { TX_DEM2N010, 637, 0 },
- { TX_DEM2N011, 785, 0 },
- { TX_DEM2N012, 503, 0 },
- { TX_DEM2N013, 2529, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 2890, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 2901, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 2911, 0, 0, 0 },
+ { TX_SPEAKER_EVERTS, 2921, 0, 0, 0 },
+ { TX_DEM2_001, 3275, 0, 0, 0 },
+ { TX_DEM2_002, 3732, 0, 0, 0 },
+ { TX_DEM2_003, 4228, 0, 0, 0 },
+ { TX_DEM2_004, 3912, 0, 0, 0 },
+ { TX_DEM2_005, 1613, 0, 0, 0 },
+ { TX_DEM2_006, 1466, 0, 0, 0 },
+ { TX_DEM2_007, 1336, 0, 0, 0 },
+ { TX_DEM2_008, 1161, 0, 0, 0 },
+ { TX_DEM2_009, 1963, 0, 0, 0 },
+ { TX_DEM2_010, 2071, 0, 0, 0 },
+ { TX_DEM2_011, 1050, 0, 0, 0 },
+ { TX_DEM2_012, 2212, 0, 0, 0 },
+ { TX_DEM2_013, 1869, 0, 0, 0 },
+ { TX_DEM2_014, 2384, 0, 0, 0 },
+ { TX_DEM2_015, 3346, 0, 0, 0 },
+ { TX_DEM2_016, 3561, 0, 0, 0 },
+ { TX_DEM2_017, 3414, 0, 0, 0 },
+ { TX_DEM2_018, 4111, 0, 0, 0 },
+ { TX_DEM2_019, 3618, 0, 0, 0 },
+ { TX_DEM2_020, 3791, 0, 0, 0 },
+ { TX_DEM2N000, 3197, 0, 0, 0 },
+ { TX_DEM2N002, 2935, 0, 0, 0 },
+ { TX_DEM2N003, 3117, 0, 0, 0 },
+ { TX_DEM2N004, 3014, 0, 0, 0 },
+ { TX_DEM2N005, 586, 0, 0, 0 },
+ { TX_DEM2N006, 710, 0, 0, 0 },
+ { TX_DEM2N007, 405, 0, 0, 0 },
+ { TX_DEM2N008, 454, 0, 0, 0 },
+ { TX_DEM2N009, 357, 0, 0, 0 },
+ { TX_DEM2N010, 637, 0, 0, 0 },
+ { TX_DEM2N011, 785, 0, 0, 0 },
+ { TX_DEM2N012, 503, 0, 0, 0 },
+ { TX_DEM2N013, 2529, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText demon2Texts[] = {
diff --git a/engines/startrek/rooms/demon3.cpp b/engines/startrek/rooms/demon3.cpp
index 438103817b..de37221410 100644
--- a/engines/startrek/rooms/demon3.cpp
+++ b/engines/startrek/rooms/demon3.cpp
@@ -140,72 +140,72 @@ enum demon3TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets demon3TextOffsets[] = {
- { TX_SPEAKER_KIRK, 6011, 0 },
- { TX_SPEAKER_MCCOY, 6022, 0 },
- { TX_SPEAKER_SPOCK, 6032, 0 },
- { TX_SPEAKER_EVERTS, 6042, 0 },
- { TX_SPEAKER_KANDREY, 6056, 0 },
- { TX_DEM3_001, 7134, 0 },
- { TX_DEM3_002, 6521, 0 },
- { TX_DEM3_003, 6854, 0 },
- { TX_DEM3_004, 7058, 0 },
- { TX_DEM3_005, 3794, 0 },
- { TX_DEM3_006, 1957, 0 },
- { TX_DEM3_007, 1747, 0 },
- { TX_DEM3_008, 2585, 0 },
- { TX_DEM3_009, 2714, 0 },
- { TX_DEM3_010, 7277, 0 },
- { TX_DEM3_011, 8332, 0 },
- { TX_DEM3_012, 7918, 0 },
- { TX_DEM3_013, 1634, 0 },
- { TX_DEM3_014, 4494, 0 },
- { TX_DEM3_015, 4174, 0 },
- { TX_DEM3_016, 3603, 0 },
- { TX_DEM3_017, 7606, 0 },
- { TX_DEM3_018, 7876, 0 },
- { TX_DEM3_019, 8548, 0 },
- { TX_DEM3_020, 7174, 0 },
- { TX_DEM3_021, 7520, 0 },
- { TX_DEM3_022, 7572, 0 },
- { TX_DEM3_023, 7434, 0 },
- { TX_DEM3_024, 6877, 0 },
- { TX_DEM3_025, 6781, 0 },
- { TX_DEM3_026, 6659, 0 },
- { TX_DEM3_027, 8059, 0 },
- { TX_DEM3_028, 6704, 0 },
- { TX_DEM3_029, 6627, 0 },
- { TX_DEM3_030, 3120, 0 },
- { TX_DEM3_031, 3031, 0 },
- { TX_DEM3_033, 7728, 0 },
- { TX_DEM3_034, 7820, 0 },
- { TX_DEM3_035, 7771, 0 },
- { TX_DEM3_036, 6927, 0 },
- { TX_DEM3_A32, 3326, 0 },
- { TX_DEM3_B32, 7852, 0 },
- { TX_DEM3_F21, 8642, 0 },
- { TX_DEM3N000, 6418, 0 },
- { TX_DEM3N001, 6134, 0 },
- { TX_DEM3N002, 6197, 0 },
- { TX_DEM3N003, 6292, 0 },
- { TX_DEM3N004, 6077, 0 },
- { TX_DEM3N005, 7696, 0 },
- { TX_DEM3N006, 6345, 0 },
- { TX_DEM3N007, 8394, 0 },
- { TX_DEM3N008, 8469, 0 },
- { TX_DEM3N009, 8288, 0 },
- { TX_DEM3N010, 4772, 0 },
- { TX_DEM3N011, 4995, 0 },
- { TX_DEM3N012, 5547, 0 },
- { TX_DEM3N013, 5077, 0 },
- { TX_DEM3N013, 5187, 0 },
- { TX_DEM3N014, 5621, 0 },
- { TX_DEM3N015, 5805, 0 },
- { TX_DEM3N016, 5410, 0 },
- { TX_DEM3N017, 4680, 0 },
- { TX_DEM3N018, 4852, 0 },
- { TX_DEM3N019, 5704, 0 },
- { TX_DEM3N020, 5297, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 6011, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 6022, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 6032, 0, 0, 0 },
+ { TX_SPEAKER_EVERTS, 6042, 0, 0, 0 },
+ { TX_SPEAKER_KANDREY, 6056, 0, 0, 0 },
+ { TX_DEM3_001, 7134, 0, 0, 0 },
+ { TX_DEM3_002, 6521, 0, 0, 0 },
+ { TX_DEM3_003, 6854, 0, 0, 0 },
+ { TX_DEM3_004, 7058, 0, 0, 0 },
+ { TX_DEM3_005, 3794, 0, 0, 0 },
+ { TX_DEM3_006, 1957, 0, 0, 0 },
+ { TX_DEM3_007, 1747, 0, 0, 0 },
+ { TX_DEM3_008, 2585, 0, 0, 0 },
+ { TX_DEM3_009, 2714, 0, 0, 0 },
+ { TX_DEM3_010, 7277, 0, 0, 0 },
+ { TX_DEM3_011, 8332, 0, 0, 0 },
+ { TX_DEM3_012, 7918, 0, 0, 0 },
+ { TX_DEM3_013, 1634, 0, 0, 0 },
+ { TX_DEM3_014, 4494, 0, 0, 0 },
+ { TX_DEM3_015, 4174, 0, 0, 0 },
+ { TX_DEM3_016, 3603, 0, 0, 0 },
+ { TX_DEM3_017, 7606, 0, 0, 0 },
+ { TX_DEM3_018, 7876, 0, 0, 0 },
+ { TX_DEM3_019, 8548, 0, 0, 0 },
+ { TX_DEM3_020, 7174, 0, 0, 0 },
+ { TX_DEM3_021, 7520, 0, 0, 0 },
+ { TX_DEM3_022, 7572, 0, 0, 0 },
+ { TX_DEM3_023, 7434, 0, 0, 0 },
+ { TX_DEM3_024, 6877, 0, 0, 0 },
+ { TX_DEM3_025, 6781, 0, 0, 0 },
+ { TX_DEM3_026, 6659, 0, 0, 0 },
+ { TX_DEM3_027, 8059, 0, 0, 0 },
+ { TX_DEM3_028, 6704, 0, 0, 0 },
+ { TX_DEM3_029, 6627, 0, 0, 0 },
+ { TX_DEM3_030, 3120, 0, 0, 0 },
+ { TX_DEM3_031, 3031, 0, 0, 0 },
+ { TX_DEM3_033, 7728, 0, 0, 0 },
+ { TX_DEM3_034, 7820, 0, 0, 0 },
+ { TX_DEM3_035, 7771, 0, 0, 0 },
+ { TX_DEM3_036, 6927, 0, 0, 0 },
+ { TX_DEM3_A32, 3326, 0, 0, 0 },
+ { TX_DEM3_B32, 7852, 0, 0, 0 },
+ { TX_DEM3_F21, 8642, 0, 0, 0 },
+ { TX_DEM3N000, 6418, 0, 0, 0 },
+ { TX_DEM3N001, 6134, 0, 0, 0 },
+ { TX_DEM3N002, 6197, 0, 0, 0 },
+ { TX_DEM3N003, 6292, 0, 0, 0 },
+ { TX_DEM3N004, 6077, 0, 0, 0 },
+ { TX_DEM3N005, 7696, 0, 0, 0 },
+ { TX_DEM3N006, 6345, 0, 0, 0 },
+ { TX_DEM3N007, 8394, 0, 0, 0 },
+ { TX_DEM3N008, 8469, 0, 0, 0 },
+ { TX_DEM3N009, 8288, 0, 0, 0 },
+ { TX_DEM3N010, 4772, 0, 0, 0 },
+ { TX_DEM3N011, 4995, 0, 0, 0 },
+ { TX_DEM3N012, 5547, 0, 0, 0 },
+ { TX_DEM3N013, 5077, 0, 0, 0 },
+ { TX_DEM3N013, 5187, 0, 0, 0 },
+ { TX_DEM3N014, 5621, 0, 0, 0 },
+ { TX_DEM3N015, 5805, 0, 0, 0 },
+ { TX_DEM3N016, 5410, 0, 0, 0 },
+ { TX_DEM3N017, 4680, 0, 0, 0 },
+ { TX_DEM3N018, 4852, 0, 0, 0 },
+ { TX_DEM3N019, 5704, 0, 0, 0 },
+ { TX_DEM3N020, 5297, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText demon3Texts[] = {
diff --git a/engines/startrek/rooms/demon4.cpp b/engines/startrek/rooms/demon4.cpp
index 0b2e73b562..0a46bc283f 100644
--- a/engines/startrek/rooms/demon4.cpp
+++ b/engines/startrek/rooms/demon4.cpp
@@ -114,73 +114,73 @@ enum demon4TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets demon4TextOffsets[] = {
- { TX_SPEAKER_KIRK, 3902, 0 },
- { TX_SPEAKER_NAUIAN, 3913, 0 },
- { TX_SPEAKER_MCCOY, 3920, 0 },
- { TX_SPEAKER_SPOCK, 3930, 0 },
- { TX_SPEAKER_EVERTS, 3940, 0 },
- { TX_DEM4_001, 2980, 0 },
- { TX_DEM4_002, 4032, 0 },
- { TX_DEM4_003, 9925, 0 },
- { TX_DEM4_004, 4097, 0 },
- { TX_DEM4_005, 9991, 0 },
- { TX_DEM4_006, 9774, 0 },
- { TX_DEM4_007, 5073, 0 },
- { TX_DEM4_008, 5030, 0 },
- { TX_DEM4_009, 4210, 0 },
- { TX_DEM4_010, 596, 0 },
- { TX_DEM4_011, 1055, 0 },
- { TX_DEM4_012, 3195, 0 },
- { TX_DEM4_013, 8780, 0 },
- { TX_DEM4_014, 7484, 0 },
- { TX_DEM4_015, 6822, 0 },
- { TX_DEM4_017, 9415, 0 },
- { TX_DEM4_018, 8903, 0 },
- { TX_DEM4_019, 7104, 0 },
- { TX_DEM4_020, 7376, 0 },
- { TX_DEM4_021, 7334, 0 },
- { TX_DEM4_022, 7172, 0 },
- { TX_DEM4_023, 7999, 0 },
- { TX_DEM4_024, 6882, 0 },
- { TX_DEM4_025, 7756, 0 },
- { TX_DEM4_026, 8239, 0 },
- { TX_DEM4_027, 8146, 0 },
- { TX_DEM4_029, 8429, 0 },
- { TX_DEM4_030, 914, 0 },
- { TX_DEM4_031, 1971, 0 },
- { TX_DEM4_032, 8718, 0 },
- { TX_DEM4_033, 8637, 0 },
- { TX_DEM4_034, 9051, 0 },
- { TX_DEM4_035, 755, 0 },
- { TX_DEM4_036, 9539, 0 },
- { TX_DEM4_037, 6019, 0 },
- { TX_DEM4_038, 5821, 0 },
- { TX_DEM4_039, 4845, 0 },
- { TX_DEM4_040, 5272, 0 },
- { TX_DEM4_041, 5130, 0 },
- { TX_DEM4_042, 4310, 0 },
- { TX_DEM4_043, 4476, 0 },
- { TX_DEM4_044, 3955, 0 },
- { TX_DEM4_045, 8836, 0 },
- { TX_DEM4_046, 7055, 0 },
- { TX_DEM4_047, 7305, 0 },
- { TX_DEM4N000, 6576, 0 },
- { TX_DEM4N001, 6667, 0 },
- { TX_DEM4N002, 6301, 0 },
- { TX_DEM4N003, 6765, 0 },
- { TX_DEM4N004, 6715, 0 },
- { TX_DEM4N005, 6613, 0 },
- { TX_DEM4N006, 10194, 0 },
- { TX_DEM4N007, 6491, 0 },
- { TX_DEM4N008, 6419, 0 },
- { TX_DEM4N009, 10116, 0 },
- { TX_DEM4N010, 6365, 0 },
- { TX_DEM4N011, 8924, 0 },
- { TX_DEM4N012, 2666, 0 },
- { TX_DEM4N013, 2868, 0 },
- { TX_DEM4N014, 1602, 0 },
- { TX_DIALOG_ERROR, 10252, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 3902, 0, 0, 0 },
+ { TX_SPEAKER_NAUIAN, 3913, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 3920, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 3930, 0, 0, 0 },
+ { TX_SPEAKER_EVERTS, 3940, 0, 0, 0 },
+ { TX_DEM4_001, 2980, 0, 0, 0 },
+ { TX_DEM4_002, 4032, 0, 0, 0 },
+ { TX_DEM4_003, 9925, 0, 0, 0 },
+ { TX_DEM4_004, 4097, 0, 0, 0 },
+ { TX_DEM4_005, 9991, 0, 0, 0 },
+ { TX_DEM4_006, 9774, 0, 0, 0 },
+ { TX_DEM4_007, 5073, 0, 0, 0 },
+ { TX_DEM4_008, 5030, 0, 0, 0 },
+ { TX_DEM4_009, 4210, 0, 0, 0 },
+ { TX_DEM4_010, 596, 0, 0, 0 },
+ { TX_DEM4_011, 1055, 0, 0, 0 },
+ { TX_DEM4_012, 3195, 0, 0, 0 },
+ { TX_DEM4_013, 8780, 0, 0, 0 },
+ { TX_DEM4_014, 7484, 0, 0, 0 },
+ { TX_DEM4_015, 6822, 0, 0, 0 },
+ { TX_DEM4_017, 9415, 0, 0, 0 },
+ { TX_DEM4_018, 8903, 0, 0, 0 },
+ { TX_DEM4_019, 7104, 0, 0, 0 },
+ { TX_DEM4_020, 7376, 0, 0, 0 },
+ { TX_DEM4_021, 7334, 0, 0, 0 },
+ { TX_DEM4_022, 7172, 0, 0, 0 },
+ { TX_DEM4_023, 7999, 0, 0, 0 },
+ { TX_DEM4_024, 6882, 0, 0, 0 },
+ { TX_DEM4_025, 7756, 0, 0, 0 },
+ { TX_DEM4_026, 8239, 0, 0, 0 },
+ { TX_DEM4_027, 8146, 0, 0, 0 },
+ { TX_DEM4_029, 8429, 0, 0, 0 },
+ { TX_DEM4_030, 914, 0, 0, 0 },
+ { TX_DEM4_031, 1971, 0, 0, 0 },
+ { TX_DEM4_032, 8718, 0, 0, 0 },
+ { TX_DEM4_033, 8637, 0, 0, 0 },
+ { TX_DEM4_034, 9051, 0, 0, 0 },
+ { TX_DEM4_035, 755, 0, 0, 0 },
+ { TX_DEM4_036, 9539, 0, 0, 0 },
+ { TX_DEM4_037, 6019, 0, 0, 0 },
+ { TX_DEM4_038, 5821, 0, 0, 0 },
+ { TX_DEM4_039, 4845, 0, 0, 0 },
+ { TX_DEM4_040, 5272, 0, 0, 0 },
+ { TX_DEM4_041, 5130, 0, 0, 0 },
+ { TX_DEM4_042, 4310, 0, 0, 0 },
+ { TX_DEM4_043, 4476, 0, 0, 0 },
+ { TX_DEM4_044, 3955, 0, 0, 0 },
+ { TX_DEM4_045, 8836, 0, 0, 0 },
+ { TX_DEM4_046, 7055, 0, 0, 0 },
+ { TX_DEM4_047, 7305, 0, 0, 0 },
+ { TX_DEM4N000, 6576, 0, 0, 0 },
+ { TX_DEM4N001, 6667, 0, 0, 0 },
+ { TX_DEM4N002, 6301, 0, 0, 0 },
+ { TX_DEM4N003, 6765, 0, 0, 0 },
+ { TX_DEM4N004, 6715, 0, 0, 0 },
+ { TX_DEM4N005, 6613, 0, 0, 0 },
+ { TX_DEM4N006, 10194, 0, 0, 0 },
+ { TX_DEM4N007, 6491, 0, 0, 0 },
+ { TX_DEM4N008, 6419, 0, 0, 0 },
+ { TX_DEM4N009, 10116, 0, 0, 0 },
+ { TX_DEM4N010, 6365, 0, 0, 0 },
+ { TX_DEM4N011, 8924, 0, 0, 0 },
+ { TX_DEM4N012, 2666, 0, 0, 0 },
+ { TX_DEM4N013, 2868, 0, 0, 0 },
+ { TX_DEM4N014, 1602, 0, 0, 0 },
+ { TX_DIALOG_ERROR, 10252, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText demon4Texts[] = {
diff --git a/engines/startrek/rooms/demon5.cpp b/engines/startrek/rooms/demon5.cpp
index f795288ebc..f4110c73ac 100644
--- a/engines/startrek/rooms/demon5.cpp
+++ b/engines/startrek/rooms/demon5.cpp
@@ -100,79 +100,79 @@ enum demon5TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets demon5TextOffsets[] = {
- { TX_SPEAKER_KIRK, 3530, 0 },
- { TX_SPEAKER_MCCOY, 3541, 0 },
- { TX_SPEAKER_SPOCK, 3551, 0 },
- { TX_SPEAKER_EVERTS, 3561, 0 },
- { TX_SPEAKER_ROBERTS, 3575, 0 },
- { TX_SPEAKER_CHUB, 3591, 0 },
- { TX_SPEAKER_GRISNASH, 3604, 0 },
- { TX_SPEAKER_STEPHEN, 3621, 0 },
- { TX_DEM5_001, 7000, 0 },
- { TX_DEM5_002, 4928, 0 },
- { TX_DEM5_003, 7506, 0 },
- { TX_DEM5_004, 7798, 0 },
- { TX_DEM5_005, 5344, 0 },
- { TX_DEM5_006, 636, 0 },
- { TX_DEM5_007, 743, 0 },
- { TX_DEM5_008, 1506, 0 },
- { TX_DEM5_009, 1567, 0 },
- { TX_DEM5_010, 2942, 0 },
- { TX_DEM5_011, 9224, 0 },
- { TX_DEM5_012, 8086, 0 },
- { TX_DEM5_013, 8998, 0 },
- { TX_DEM5_014, 9101, 0 },
- { TX_DEM5_015, 8705, 0 },
- { TX_DEM5_016, 8808, 0 },
- { TX_DEM5_017, 7564, 0 },
- { TX_DEM5_018, 7136, 0 },
- { TX_DEM5_019, 8035, 0 },
- { TX_DEM5_020, 7941, 0 },
- { TX_DEM5_021, 7423, 0 },
- { TX_DEM5_022, 6203, 0 },
- { TX_DEM5_023, 7653, 0 },
- { TX_DEM5_024, 5638, 0 },
- { TX_DEM5_025, 5838, 0 },
- { TX_DEM5_026, 7991, 0 },
- { TX_DEM5_027, 7055, 0 },
- { TX_DEM5_028, 5408, 0 },
- { TX_DEM5_029, 5816, 0 },
- { TX_DEM5_030, 4526, 0 },
- { TX_DEM5_031, 6611, 0 },
- { TX_DEM5_032, 2308, 0 },
- { TX_DEM5_033, 1155, 0 },
- { TX_DEM5_034, 2488, 0 },
- { TX_DEM5_035, 2223, 0 },
- { TX_DEM5_036, 1080, 0 },
- { TX_DEM5_037, 1246, 0 },
- { TX_DEM5_038, 2398, 0 },
- { TX_DEM5_039, 903, 0 },
- { TX_DEM5_040, 8411, 0 },
- { TX_DEM5_041, 5897, 0 },
- { TX_DEM5_042, 6680, 0 },
- { TX_DEM5_043, 6286, 0 },
- { TX_DEM5_044, 7849, 0 },
- { TX_DEM5_045, 7268, 0 },
- { TX_DEM5L027, 1423, 0 },
- { TX_DEM5L028, 3700, 0 },
- { TX_DEM5L029, 4772, 0 },
- { TX_DEM5L030, 4982, 0 },
- { TX_DEM5L031, 5389, 0 },
- { TX_DEM5N000, 4183, 0 },
- { TX_DEM5N001, 3637, 0 },
- { TX_DEM5N002, 4033, 0 },
- { TX_DEM5N003, 3918, 0 },
- { TX_DEM5N004, 4111, 0 },
- { TX_DEM5N005, 4298, 0 },
- { TX_DEM5N006, 4440, 0 },
- { TX_DEM5N007, 4245, 0 },
- { TX_DEM5N008, 4378, 0 },
- { TX_DEM5N009, 3777, 0 },
- { TX_DEM5N010, 1811, 0 },
- { TX_DEM5N011, 2066, 0 },
- { TX_DEM5N012, 3276, 0 },
- { TX_DEM5N013, 1923, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 3530, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 3541, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 3551, 0, 0, 0 },
+ { TX_SPEAKER_EVERTS, 3561, 0, 0, 0 },
+ { TX_SPEAKER_ROBERTS, 3575, 0, 0, 0 },
+ { TX_SPEAKER_CHUB, 3591, 0, 0, 0 },
+ { TX_SPEAKER_GRISNASH, 3604, 0, 0, 0 },
+ { TX_SPEAKER_STEPHEN, 3621, 0, 0, 0 },
+ { TX_DEM5_001, 7000, 0, 0, 0 },
+ { TX_DEM5_002, 4928, 0, 0, 0 },
+ { TX_DEM5_003, 7506, 0, 0, 0 },
+ { TX_DEM5_004, 7798, 0, 0, 0 },
+ { TX_DEM5_005, 5344, 0, 0, 0 },
+ { TX_DEM5_006, 636, 0, 0, 0 },
+ { TX_DEM5_007, 743, 0, 0, 0 },
+ { TX_DEM5_008, 1506, 0, 0, 0 },
+ { TX_DEM5_009, 1567, 0, 0, 0 },
+ { TX_DEM5_010, 2942, 0, 0, 0 },
+ { TX_DEM5_011, 9224, 0, 0, 0 },
+ { TX_DEM5_012, 8086, 0, 0, 0 },
+ { TX_DEM5_013, 8998, 0, 0, 0 },
+ { TX_DEM5_014, 9101, 0, 0, 0 },
+ { TX_DEM5_015, 8705, 0, 0, 0 },
+ { TX_DEM5_016, 8808, 0, 0, 0 },
+ { TX_DEM5_017, 7564, 0, 0, 0 },
+ { TX_DEM5_018, 7136, 0, 0, 0 },
+ { TX_DEM5_019, 8035, 0, 0, 0 },
+ { TX_DEM5_020, 7941, 0, 0, 0 },
+ { TX_DEM5_021, 7423, 0, 0, 0 },
+ { TX_DEM5_022, 6203, 0, 0, 0 },
+ { TX_DEM5_023, 7653, 0, 0, 0 },
+ { TX_DEM5_024, 5638, 0, 0, 0 },
+ { TX_DEM5_025, 5838, 0, 0, 0 },
+ { TX_DEM5_026, 7991, 0, 0, 0 },
+ { TX_DEM5_027, 7055, 0, 0, 0 },
+ { TX_DEM5_028, 5408, 0, 0, 0 },
+ { TX_DEM5_029, 5816, 0, 0, 0 },
+ { TX_DEM5_030, 4526, 0, 0, 0 },
+ { TX_DEM5_031, 6611, 0, 0, 0 },
+ { TX_DEM5_032, 2308, 0, 0, 0 },
+ { TX_DEM5_033, 1155, 0, 0, 0 },
+ { TX_DEM5_034, 2488, 0, 0, 0 },
+ { TX_DEM5_035, 2223, 0, 0, 0 },
+ { TX_DEM5_036, 1080, 0, 0, 0 },
+ { TX_DEM5_037, 1246, 0, 0, 0 },
+ { TX_DEM5_038, 2398, 0, 0, 0 },
+ { TX_DEM5_039, 903, 0, 0, 0 },
+ { TX_DEM5_040, 8411, 0, 0, 0 },
+ { TX_DEM5_041, 5897, 0, 0, 0 },
+ { TX_DEM5_042, 6680, 0, 0, 0 },
+ { TX_DEM5_043, 6286, 0, 0, 0 },
+ { TX_DEM5_044, 7849, 0, 0, 0 },
+ { TX_DEM5_045, 7268, 0, 0, 0 },
+ { TX_DEM5L027, 1423, 0, 0, 0 },
+ { TX_DEM5L028, 3700, 0, 0, 0 },
+ { TX_DEM5L029, 4772, 0, 0, 0 },
+ { TX_DEM5L030, 4982, 0, 0, 0 },
+ { TX_DEM5L031, 5389, 0, 0, 0 },
+ { TX_DEM5N000, 4183, 0, 0, 0 },
+ { TX_DEM5N001, 3637, 0, 0, 0 },
+ { TX_DEM5N002, 4033, 0, 0, 0 },
+ { TX_DEM5N003, 3918, 0, 0, 0 },
+ { TX_DEM5N004, 4111, 0, 0, 0 },
+ { TX_DEM5N005, 4298, 0, 0, 0 },
+ { TX_DEM5N006, 4440, 0, 0, 0 },
+ { TX_DEM5N007, 4245, 0, 0, 0 },
+ { TX_DEM5N008, 4378, 0, 0, 0 },
+ { TX_DEM5N009, 3777, 0, 0, 0 },
+ { TX_DEM5N010, 1811, 0, 0, 0 },
+ { TX_DEM5N011, 2066, 0, 0, 0 },
+ { TX_DEM5N012, 3276, 0, 0, 0 },
+ { TX_DEM5N013, 1923, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText demon5Texts[] = {
diff --git a/engines/startrek/rooms/demon6.cpp b/engines/startrek/rooms/demon6.cpp
index b51b8c814d..c5ce6c5a0f 100644
--- a/engines/startrek/rooms/demon6.cpp
+++ b/engines/startrek/rooms/demon6.cpp
@@ -129,91 +129,91 @@ enum demon6TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets demon6TextOffsets[] = {
- { TX_SPEAKER_KIRK, 4150, 0 },
- { TX_SPEAKER_MCCOY, 4161, 0 },
- { TX_SPEAKER_SPOCK, 4171, 0 },
- { TX_SPEAKER_EVERTS, 4181, 0 },
- { TX_SPEAKER_STEPHEN, 4195, 0 },
- { TX_DEM6_001, 6283, 0 },
- { TX_DEM6_002, 9373, 0 },
- { TX_DEM6_003, 6387, 0 },
- { TX_DEM6_004, 2427, 0 },
- { TX_DEM6_005, 1927, 0 },
- { TX_DEM6_006, 6339, 0 },
- { TX_DEM6_007, 3239, 0 },
- { TX_DEM6_008, 3668, 0 },
- { TX_DEM6_009, 3057, 0 },
- { TX_DEM6_010, 10137, 0 },
- { TX_DEM6_011, 10040, 0 },
- { TX_DEM6_012, 9812, 0 },
- { TX_DEM6_013, 9601, 0 },
- { TX_DEM6_014, 8244, 0 },
- { TX_DEM6_015, 2549, 0 },
- { TX_DEM6_016, 2942, 0 },
- { TX_DEM6_017, 715, 0 },
- { TX_DEM6_018, 1765, 0 },
- { TX_DEM6_019, 6103, 0 },
- { TX_DEM6_020, 8973, 0 },
- { TX_DEM6_021, 9718, 0 },
- { TX_DEM6_022, 5898, 0 },
- { TX_DEM6_023, 10197, 0 },
- { TX_DEM6_024, 5812, 0 },
- { TX_DEM6_025, 9188, 0 },
- { TX_DEM6_026, 1485, 0 },
- { TX_DEM6_027, 1322, 0 },
- { TX_DEM6_028, 613, 0 },
- { TX_DEM6_029, 8443, 0 },
- { TX_DEM6_030, 6431, 0 },
- { TX_DEM6_031, 6524, 0 },
- { TX_DEM6_032, 8881, 0 },
- { TX_DEM6_033, 7758, 0 },
- { TX_DEM6_034, 6613, 0 },
- { TX_DEM6_035, 9475, 0 },
- { TX_DEM6_036, 7210, 0 },
- { TX_DEM6_037, 8785, 0 },
- { TX_DEM6_038, 7315, 0 },
- { TX_DEM6_039, 6930, 0 },
- { TX_DEM6_040, 7122, 0 },
- { TX_DEM6_041, 7566, 0 },
- { TX_DEM6_042, 4216, 0 },
- { TX_DEM6_043, 8493, 0 },
- { TX_DEM6_044, 6213, 0 },
- { TX_DEM6_045, 6701, 0 },
- { TX_DEM6_046, 6735, 0 },
- { TX_DEM6_047, 6761, 0 },
- { TX_DEM6_048, 6791, 0 },
- { TX_DEM6_049, 6837, 0 },
- { TX_DEM6_050, 6868, 0 },
- { TX_DEM6_051, 6667, 0 },
- { TX_DEM6_052, 2655, 0 },
- { TX_DEM6_053, 9413, 0 },
- { TX_DEM6N000, 5105, 0 },
- { TX_DEM6N001, 4691, 0 },
- { TX_DEM6N002, 5174, 0 },
- { TX_DEM6N003, 4592, 0 },
- { TX_DEM6N004, 5252, 0 },
- { TX_DEM6N005, 5058, 0 },
- { TX_DEM6N006, 4498, 0 },
- { TX_DEM6N007, 5323, 0 },
- { TX_DEM6N008, 5424, 0 },
- { TX_DEM6N009, 5594, 0 },
- { TX_DEM6N010, 5662, 0 },
- { TX_DEM6N011, 4909, 0 },
- { TX_DEM6N012, 6074, 0 },
- { TX_DEM6N013, 6188, 0 },
- { TX_DEM6N014, 10359, 0 },
- { TX_DEM6N015, 5501, 0 },
- { TX_DEM6N016, 4871, 0 },
- { TX_DEM6N017, 4960, 0 },
- { TX_DEM6N018, 6006, 0 },
- { TX_DEM6N019, 8372, 0 },
- { TX_DEM6N020, 5750, 0 },
- { TX_DEM6N021, 1139, 0 },
- { TX_DEM6N022, 3812, 0 },
- { TX_DEM6N023, 1687, 0 },
- { TX_DEM6N024, 1036, 0 },
- {TX_DIALOG_ERROR, 8214, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 4150, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 4161, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 4171, 0, 0, 0 },
+ { TX_SPEAKER_EVERTS, 4181, 0, 0, 0 },
+ { TX_SPEAKER_STEPHEN, 4195, 0, 0, 0 },
+ { TX_DEM6_001, 6283, 0, 0, 0 },
+ { TX_DEM6_002, 9373, 0, 0, 0 },
+ { TX_DEM6_003, 6387, 0, 0, 0 },
+ { TX_DEM6_004, 2427, 0, 0, 0 },
+ { TX_DEM6_005, 1927, 0, 0, 0 },
+ { TX_DEM6_006, 6339, 0, 0, 0 },
+ { TX_DEM6_007, 3239, 0, 0, 0 },
+ { TX_DEM6_008, 3668, 0, 0, 0 },
+ { TX_DEM6_009, 3057, 0, 0, 0 },
+ { TX_DEM6_010, 10137, 0, 0, 0 },
+ { TX_DEM6_011, 10040, 0, 0, 0 },
+ { TX_DEM6_012, 9812, 0, 0, 0 },
+ { TX_DEM6_013, 9601, 0, 0, 0 },
+ { TX_DEM6_014, 8244, 0, 0, 0 },
+ { TX_DEM6_015, 2549, 0, 0, 0 },
+ { TX_DEM6_016, 2942, 0, 0, 0 },
+ { TX_DEM6_017, 715, 0, 0, 0 },
+ { TX_DEM6_018, 1765, 0, 0, 0 },
+ { TX_DEM6_019, 6103, 0, 0, 0 },
+ { TX_DEM6_020, 8973, 0, 0, 0 },
+ { TX_DEM6_021, 9718, 0, 0, 0 },
+ { TX_DEM6_022, 5898, 0, 0, 0 },
+ { TX_DEM6_023, 10197, 0, 0, 0 },
+ { TX_DEM6_024, 5812, 0, 0, 0 },
+ { TX_DEM6_025, 9188, 0, 0, 0 },
+ { TX_DEM6_026, 1485, 0, 0, 0 },
+ { TX_DEM6_027, 1322, 0, 0, 0 },
+ { TX_DEM6_028, 613, 0, 0, 0 },
+ { TX_DEM6_029, 8443, 0, 0, 0 },
+ { TX_DEM6_030, 6431, 0, 0, 0 },
+ { TX_DEM6_031, 6524, 0, 0, 0 },
+ { TX_DEM6_032, 8881, 0, 0, 0 },
+ { TX_DEM6_033, 7758, 0, 0, 0 },
+ { TX_DEM6_034, 6613, 0, 0, 0 },
+ { TX_DEM6_035, 9475, 0, 0, 0 },
+ { TX_DEM6_036, 7210, 0, 0, 0 },
+ { TX_DEM6_037, 8785, 0, 0, 0 },
+ { TX_DEM6_038, 7315, 0, 0, 0 },
+ { TX_DEM6_039, 6930, 0, 0, 0 },
+ { TX_DEM6_040, 7122, 0, 0, 0 },
+ { TX_DEM6_041, 7566, 0, 0, 0 },
+ { TX_DEM6_042, 4216, 0, 0, 0 },
+ { TX_DEM6_043, 8493, 0, 0, 0 },
+ { TX_DEM6_044, 6213, 0, 0, 0 },
+ { TX_DEM6_045, 6701, 0, 0, 0 },
+ { TX_DEM6_046, 6735, 0, 0, 0 },
+ { TX_DEM6_047, 6761, 0, 0, 0 },
+ { TX_DEM6_048, 6791, 0, 0, 0 },
+ { TX_DEM6_049, 6837, 0, 0, 0 },
+ { TX_DEM6_050, 6868, 0, 0, 0 },
+ { TX_DEM6_051, 6667, 0, 0, 0 },
+ { TX_DEM6_052, 2655, 0, 0, 0 },
+ { TX_DEM6_053, 9413, 0, 0, 0 },
+ { TX_DEM6N000, 5105, 0, 0, 0 },
+ { TX_DEM6N001, 4691, 0, 0, 0 },
+ { TX_DEM6N002, 5174, 0, 0, 0 },
+ { TX_DEM6N003, 4592, 0, 0, 0 },
+ { TX_DEM6N004, 5252, 0, 0, 0 },
+ { TX_DEM6N005, 5058, 0, 0, 0 },
+ { TX_DEM6N006, 4498, 0, 0, 0 },
+ { TX_DEM6N007, 5323, 0, 0, 0 },
+ { TX_DEM6N008, 5424, 0, 0, 0 },
+ { TX_DEM6N009, 5594, 0, 0, 0 },
+ { TX_DEM6N010, 5662, 0, 0, 0 },
+ { TX_DEM6N011, 4909, 0, 0, 0 },
+ { TX_DEM6N012, 6074, 0, 0, 0 },
+ { TX_DEM6N013, 6188, 0, 0, 0 },
+ { TX_DEM6N014, 10359, 0, 0, 0 },
+ { TX_DEM6N015, 5501, 0, 0, 0 },
+ { TX_DEM6N016, 4871, 0, 0, 0 },
+ { TX_DEM6N017, 4960, 0, 0, 0 },
+ { TX_DEM6N018, 6006, 0, 0, 0 },
+ { TX_DEM6N019, 8372, 0, 0, 0 },
+ { TX_DEM6N020, 5750, 0, 0, 0 },
+ { TX_DEM6N021, 1139, 0, 0, 0 },
+ { TX_DEM6N022, 3812, 0, 0, 0 },
+ { TX_DEM6N023, 1687, 0, 0, 0 },
+ { TX_DEM6N024, 1036, 0, 0, 0 },
+ { TX_DIALOG_ERROR, 8214, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText demon6Texts[] = {
diff --git a/engines/startrek/rooms/feather0.cpp b/engines/startrek/rooms/feather0.cpp
index b6e76c0a69..3bc7d977f6 100644
--- a/engines/startrek/rooms/feather0.cpp
+++ b/engines/startrek/rooms/feather0.cpp
@@ -93,57 +93,57 @@ enum feather0TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets feather0TextOffsets[] = {
- { TX_SPEAKER_KIRK, 1775, 0 },
- { TX_SPEAKER_QUETZECOATL, 1786, 0 },
- { TX_SPEAKER_MCCOY, 1798, 0 },
- { TX_SPEAKER_SPOCK, 1808, 0 },
- { TX_SPEAKER_STRAGEY, 1818, 0 },
- { TX_FEA0_002, 5547, 0 },
- { TX_FEA0_003, 5324, 0 },
- { TX_FEA0_004, 4335, 0 },
- { TX_FEA0_005, 5094, 0 },
- { TX_FEA0_006, 3553, 0 },
- { TX_FEA0_007, 3670, 0 },
- { TX_FEA0_008, 5870, 0 },
- { TX_FEA0_009, 4232, 0 },
- { TX_FEA0_010, 4586, 0 },
- { TX_FEA0_011, 3786, 0 },
- { TX_FEA0_012, 5671, 0 },
- { TX_FEA0_013, 4963, 0 },
- { TX_FEA0_014, 5764, 0 },
- { TX_FEA0_015, 3203, 0 },
- { TX_FEA0_016, 3382, 0 },
- { TX_FEA0_017, 2597, 0 },
- { TX_FEA0_018, 2949, 0 },
- { TX_FEA0_019, 6135, 0 },
- { TX_FEA0_020, 3083, 0 },
- { TX_FEA0_021, 2664, 0 },
- { TX_FEA0_022, 2793, 0 },
- { TX_FEA0_023, 3034, 0 },
- { TX_FEA0_024, 5986, 0 },
- { TX_FEA0_025, 3343, 0 },
- { TX_FEA0_026, 4911, 0 },
- { TX_FEA0_027, 5250, 0 },
- { TX_FEA0_028, 3466, 0 },
- { TX_FEA0_029, 5204, 0 },
- { TX_FEA0_030, 4444, 0 },
- { TX_FEA0_031, 4007, 0 },
- { TX_FEA0_032, 3894, 0 },
- { TX_FEA0_033, 4124, 0 },
- { TX_FEA0_101, 4711, 0 },
- { TX_FEA0_108, 830, 0 },
- { TX_FEA0N000, 1830, 0 },
- { TX_FEA0N001, 1950, 0 },
- { TX_FEA0N002, 2477, 0 },
- { TX_FEA0N003, 1890, 0 },
- { TX_FEA0N004, 2383, 0 },
- { TX_FEA0N005, 2425, 0 },
- { TX_FEA0N006, 2021, 0 },
- { TX_FEA0N007, 2158, 0 },
- { TX_FEA0N008, 2076, 0 },
- { TX_FEA0N009, 2538, 0 },
- { TX_DIALOG_ERROR, 6222, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 1775, 0, 0, 0 },
+ { TX_SPEAKER_QUETZECOATL, 1786, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 1798, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 1808, 0, 0, 0 },
+ { TX_SPEAKER_STRAGEY, 1818, 0, 0, 0 },
+ { TX_FEA0_002, 5547, 0, 0, 0 },
+ { TX_FEA0_003, 5324, 0, 0, 0 },
+ { TX_FEA0_004, 4335, 0, 0, 0 },
+ { TX_FEA0_005, 5094, 0, 0, 0 },
+ { TX_FEA0_006, 3553, 0, 0, 0 },
+ { TX_FEA0_007, 3670, 0, 0, 0 },
+ { TX_FEA0_008, 5870, 0, 0, 0 },
+ { TX_FEA0_009, 4232, 0, 0, 0 },
+ { TX_FEA0_010, 4586, 0, 0, 0 },
+ { TX_FEA0_011, 3786, 0, 0, 0 },
+ { TX_FEA0_012, 5671, 0, 0, 0 },
+ { TX_FEA0_013, 4963, 0, 0, 0 },
+ { TX_FEA0_014, 5764, 0, 0, 0 },
+ { TX_FEA0_015, 3203, 0, 0, 0 },
+ { TX_FEA0_016, 3382, 0, 0, 0 },
+ { TX_FEA0_017, 2597, 0, 0, 0 },
+ { TX_FEA0_018, 2949, 0, 0, 0 },
+ { TX_FEA0_019, 6135, 0, 0, 0 },
+ { TX_FEA0_020, 3083, 0, 0, 0 },
+ { TX_FEA0_021, 2664, 0, 0, 0 },
+ { TX_FEA0_022, 2793, 0, 0, 0 },
+ { TX_FEA0_023, 3034, 0, 0, 0 },
+ { TX_FEA0_024, 5986, 0, 0, 0 },
+ { TX_FEA0_025, 3343, 0, 0, 0 },
+ { TX_FEA0_026, 4911, 0, 0, 0 },
+ { TX_FEA0_027, 5250, 0, 0, 0 },
+ { TX_FEA0_028, 3466, 0, 0, 0 },
+ { TX_FEA0_029, 5204, 0, 0, 0 },
+ { TX_FEA0_030, 4444, 0, 0, 0 },
+ { TX_FEA0_031, 4007, 0, 0, 0 },
+ { TX_FEA0_032, 3894, 0, 0, 0 },
+ { TX_FEA0_033, 4124, 0, 0, 0 },
+ { TX_FEA0_101, 4711, 0, 0, 0 },
+ { TX_FEA0_108, 830, 0, 0, 0 },
+ { TX_FEA0N000, 1830, 0, 0, 0 },
+ { TX_FEA0N001, 1950, 0, 0, 0 },
+ { TX_FEA0N002, 2477, 0, 0, 0 },
+ { TX_FEA0N003, 1890, 0, 0, 0 },
+ { TX_FEA0N004, 2383, 0, 0, 0 },
+ { TX_FEA0N005, 2425, 0, 0, 0 },
+ { TX_FEA0N006, 2021, 0, 0, 0 },
+ { TX_FEA0N007, 2158, 0, 0, 0 },
+ { TX_FEA0N008, 2076, 0, 0, 0 },
+ { TX_FEA0N009, 2538, 0, 0, 0 },
+ { TX_DIALOG_ERROR, 6222, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText feather0Texts[] = {
diff --git a/engines/startrek/rooms/feather1.cpp b/engines/startrek/rooms/feather1.cpp
index e3f8617c0c..b68ec7cfc7 100644
--- a/engines/startrek/rooms/feather1.cpp
+++ b/engines/startrek/rooms/feather1.cpp
@@ -164,94 +164,94 @@ enum feather1TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets feather1TextOffsets[] = {
- { TX_SPEAKER_KIRK, 4412, 0 },
- { TX_SPEAKER_MCCOY, 4435, 0 },
- { TX_SPEAKER_SPOCK, 4445, 0 },
- { TX_SPEAKER_QUETZECOATL, 4423, 0 },
- { TX_SPEAKER_STRAGEY, 4455, 0 },
- { TX_FEA1_001, 10730, 0 },
- { TX_FEA1_002, 9907, 0 },
- { TX_FEA1_003, 10929, 0 },
- { TX_FEA1_004, 6487, 0 },
- { TX_FEA1_005, 6143, 0 },
- { TX_FEA1_006, 7970, 0 },
- { TX_FEA1_007, 9933, 0 },
- { TX_FEA1_008, 3761, 0 },
- { TX_FEA1_009, 4949, 0 },
- { TX_FEA1_010, 6430, 0 },
- { TX_FEA1_011, 9554, 0 },
- { TX_FEA1_012, 9519, 0 },
- { TX_FEA1_013, 5288, 0 },
- { TX_FEA1_014, 9462, 0 },
- { TX_FEA1_015, 6775, 0 },
- { TX_FEA1_017, 5616, 0 },
- { TX_FEA1_018, 10805, 0 },
- { TX_FEA1_019, 9608, 0 },
- { TX_FEA1_020, 10217, 0 },
- { TX_FEA1_021, 5876, 0 },
- { TX_FEA1_022, 9983, 0 },
- { TX_FEA1_023, 4693, 0 },
- { TX_FEA1_023, 4693, 0 },
- { TX_FEA1_024, 10984, 0 },
- { TX_FEA1_025, 6379, 0 },
- { TX_FEA1_026, 7037, 0 },
- { TX_FEA1_027, 6312, 0 },
- { TX_FEA1_028, 8659, 0 },
- { TX_FEA1_029, 8901, 0 },
- { TX_FEA1_030, 9168, 0 },
- { TX_FEA1_031, 9092, 0 },
- { TX_FEA1_032, 4842, 0 },
- { TX_FEA1_033, 6704, 0 },
- { TX_FEA1_034, 5992, 0 },
- { TX_FEA1_035, 6055, 0 },
- { TX_FEA1_037, 5146, 0 },
- { TX_FEA1_038, 9268, 0 },
- { TX_FEA1_039, 8771, 0 },
- { TX_FEA1_040, 8095, 0 },
- { TX_FEA1_041, 10597, 0 },
- { TX_FEA1_042, 5503, 0 },
- { TX_FEA1_043, 5770, 0 },
- { TX_FEA1_044, 9705, 0 },
- { TX_FEA1_045, 4988, 0 },
- { TX_FEA1_046, 6218, 0 },
- { TX_FEA1_047, 6618, 0 },
- { TX_FEA1_048, 8173, 0 },
- { TX_FEA1_049, 6859, 0 },
- { TX_FEA1_049, 6859, 0 },
- { TX_FEA1_050, 7132, 0 },
- { TX_FEA1_051, 6579, 0 },
- { TX_FEA1_052, 5409, 0 },
- { TX_FEA1_053, 5948, 0 },
- { TX_FEA1_054, 5696, 0 },
- { TX_FEA1_055, 9851, 0 },
- { TX_FEA1_056, 10123, 0 },
- { TX_FEA1_057, 4468, 0 },
- { TX_FEA1_A46, 5235, 0 },
- { TX_FEA1_F25, 6966, 0 },
- { TX_FEA1N000, 4782, 0 },
- { TX_FEA1N001, 10345, 0 },
- { TX_FEA1N002, 10538, 0 },
- { TX_FEA1N003, 10482, 0 },
- { TX_FEA1N004, 10429, 0 },
- { TX_FEA1N005, 5056, 0 },
- { TX_FEA1N006, 6661, 0 },
- { TX_FEA1N007, 8511, 0 },
- { TX_FEA1N008, 8454, 0 },
- { TX_FEA1N009, 8409, 0 },
- { TX_FEA1N010, 5100, 0 },
- { TX_FEA1N011, 7824, 0 },
- { TX_FEA1N012, 7295, 0 },
- { TX_FEA1N013, 7905, 0 },
- { TX_FEA1N014, 7650, 0 },
- { TX_FEA1N015, 7409, 0 },
- { TX_FEA1N016, 7758, 0 },
- { TX_FEA1N017, 7542, 0 },
- { TX_FEA1N018, 8586, 0 },
- { TX_FEA1N019, 8370, 0 },
- { TX_FEA1N020, 7467, 0 },
- { TX_FEA1N021, 8262, 0 },
- { TX_FEA1N022, 8317, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 4412, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 4435, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 4445, 0, 0, 0 },
+ { TX_SPEAKER_QUETZECOATL, 4423, 0, 0, 0 },
+ { TX_SPEAKER_STRAGEY, 4455, 0, 0, 0 },
+ { TX_FEA1_001, 10730, 0, 0, 0 },
+ { TX_FEA1_002, 9907, 0, 0, 0 },
+ { TX_FEA1_003, 10929, 0, 0, 0 },
+ { TX_FEA1_004, 6487, 0, 0, 0 },
+ { TX_FEA1_005, 6143, 0, 0, 0 },
+ { TX_FEA1_006, 7970, 0, 0, 0 },
+ { TX_FEA1_007, 9933, 0, 0, 0 },
+ { TX_FEA1_008, 3761, 0, 0, 0 },
+ { TX_FEA1_009, 4949, 0, 0, 0 },
+ { TX_FEA1_010, 6430, 0, 0, 0 },
+ { TX_FEA1_011, 9554, 0, 0, 0 },
+ { TX_FEA1_012, 9519, 0, 0, 0 },
+ { TX_FEA1_013, 5288, 0, 0, 0 },
+ { TX_FEA1_014, 9462, 0, 0, 0 },
+ { TX_FEA1_015, 6775, 0, 0, 0 },
+ { TX_FEA1_017, 5616, 0, 0, 0 },
+ { TX_FEA1_018, 10805, 0, 0, 0 },
+ { TX_FEA1_019, 9608, 0, 0, 0 },
+ { TX_FEA1_020, 10217, 0, 0, 0 },
+ { TX_FEA1_021, 5876, 0, 0, 0 },
+ { TX_FEA1_022, 9983, 0, 0, 0 },
+ { TX_FEA1_023, 4693, 0, 0, 0 },
+ { TX_FEA1_023, 4693, 0, 0, 0 },
+ { TX_FEA1_024, 10984, 0, 0, 0 },
+ { TX_FEA1_025, 6379, 0, 0, 0 },
+ { TX_FEA1_026, 7037, 0, 0, 0 },
+ { TX_FEA1_027, 6312, 0, 0, 0 },
+ { TX_FEA1_028, 8659, 0, 0, 0 },
+ { TX_FEA1_029, 8901, 0, 0, 0 },
+ { TX_FEA1_030, 9168, 0, 0, 0 },
+ { TX_FEA1_031, 9092, 0, 0, 0 },
+ { TX_FEA1_032, 4842, 0, 0, 0 },
+ { TX_FEA1_033, 6704, 0, 0, 0 },
+ { TX_FEA1_034, 5992, 0, 0, 0 },
+ { TX_FEA1_035, 6055, 0, 0, 0 },
+ { TX_FEA1_037, 5146, 0, 0, 0 },
+ { TX_FEA1_038, 9268, 0, 0, 0 },
+ { TX_FEA1_039, 8771, 0, 0, 0 },
+ { TX_FEA1_040, 8095, 0, 0, 0 },
+ { TX_FEA1_041, 10597, 0, 0, 0 },
+ { TX_FEA1_042, 5503, 0, 0, 0 },
+ { TX_FEA1_043, 5770, 0, 0, 0 },
+ { TX_FEA1_044, 9705, 0, 0, 0 },
+ { TX_FEA1_045, 4988, 0, 0, 0 },
+ { TX_FEA1_046, 6218, 0, 0, 0 },
+ { TX_FEA1_047, 6618, 0, 0, 0 },
+ { TX_FEA1_048, 8173, 0, 0, 0 },
+ { TX_FEA1_049, 6859, 0, 0, 0 },
+ { TX_FEA1_049, 6859, 0, 0, 0 },
+ { TX_FEA1_050, 7132, 0, 0, 0 },
+ { TX_FEA1_051, 6579, 0, 0, 0 },
+ { TX_FEA1_052, 5409, 0, 0, 0 },
+ { TX_FEA1_053, 5948, 0, 0, 0 },
+ { TX_FEA1_054, 5696, 0, 0, 0 },
+ { TX_FEA1_055, 9851, 0, 0, 0 },
+ { TX_FEA1_056, 10123, 0, 0, 0 },
+ { TX_FEA1_057, 4468, 0, 0, 0 },
+ { TX_FEA1_A46, 5235, 0, 0, 0 },
+ { TX_FEA1_F25, 6966, 0, 0, 0 },
+ { TX_FEA1N000, 4782, 0, 0, 0 },
+ { TX_FEA1N001, 10345, 0, 0, 0 },
+ { TX_FEA1N002, 10538, 0, 0, 0 },
+ { TX_FEA1N003, 10482, 0, 0, 0 },
+ { TX_FEA1N004, 10429, 0, 0, 0 },
+ { TX_FEA1N005, 5056, 0, 0, 0 },
+ { TX_FEA1N006, 6661, 0, 0, 0 },
+ { TX_FEA1N007, 8511, 0, 0, 0 },
+ { TX_FEA1N008, 8454, 0, 0, 0 },
+ { TX_FEA1N009, 8409, 0, 0, 0 },
+ { TX_FEA1N010, 5100, 0, 0, 0 },
+ { TX_FEA1N011, 7824, 0, 0, 0 },
+ { TX_FEA1N012, 7295, 0, 0, 0 },
+ { TX_FEA1N013, 7905, 0, 0, 0 },
+ { TX_FEA1N014, 7650, 0, 0, 0 },
+ { TX_FEA1N015, 7409, 0, 0, 0 },
+ { TX_FEA1N016, 7758, 0, 0, 0 },
+ { TX_FEA1N017, 7542, 0, 0, 0 },
+ { TX_FEA1N018, 8586, 0, 0, 0 },
+ { TX_FEA1N019, 8370, 0, 0, 0 },
+ { TX_FEA1N020, 7467, 0, 0, 0 },
+ { TX_FEA1N021, 8262, 0, 0, 0 },
+ { TX_FEA1N022, 8317, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText feather1Texts[] = {
diff --git a/engines/startrek/rooms/feather2.cpp b/engines/startrek/rooms/feather2.cpp
index 2c96ff3dc2..884cf4f2ae 100644
--- a/engines/startrek/rooms/feather2.cpp
+++ b/engines/startrek/rooms/feather2.cpp
@@ -68,31 +68,31 @@ enum feather2TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets feather2TextOffsets[] = {
- { TX_SPEAKER_KIRK, 965, 0 },
- { TX_SPEAKER_MCCOY, 988, 0 },
- { TX_SPEAKER_SPOCK, 998, 0 },
- { TX_SPEAKER_QUETZECOATL, 976, 0 },
- { TX_SPEAKER_STRAGEY, 1008, 0 },
- { TX_FEA2_001, 465, 0 },
- { TX_FEA2_002, 1827, 0 },
- { TX_FEA2_003, 1713, 0 },
- { TX_FEA2_004, 1894, 0 },
- { TX_FEA2_005, 1390, 0 },
- { TX_FEA2_006, 1624, 0 },
- { TX_FEA2_007, 1747, 0 },
- { TX_FEA2_008, 2003, 0 },
- { TX_FEA2_009, 2112, 0 },
- { TX_FEA2_010, 1253, 0 },
- { TX_FEA2N000, 1209, 0 },
- { TX_FEA2N001, 1461, 0 },
- { TX_FEA2N002, 2172, 0 },
- { TX_FEA2N003, 2479, 0 },
- { TX_FEA2N004, 2365, 0 },
- { TX_FEA2N005, 2252, 0 },
- { TX_FEA2N006, 1021, 0 },
- { TX_FEA2N007, 1091, 0 },
- { TX_FEA2N008, 1521, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 965, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 988, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 998, 0, 0, 0 },
+ { TX_SPEAKER_QUETZECOATL, 976, 0, 0, 0 },
+ { TX_SPEAKER_STRAGEY, 1008, 0, 0, 0 },
+ { TX_FEA2_001, 465, 0, 0, 0 },
+ { TX_FEA2_002, 1827, 0, 0, 0 },
+ { TX_FEA2_003, 1713, 0, 0, 0 },
+ { TX_FEA2_004, 1894, 0, 0, 0 },
+ { TX_FEA2_005, 1390, 0, 0, 0 },
+ { TX_FEA2_006, 1624, 0, 0, 0 },
+ { TX_FEA2_007, 1747, 0, 0, 0 },
+ { TX_FEA2_008, 2003, 0, 0, 0 },
+ { TX_FEA2_009, 2112, 0, 0, 0 },
+ { TX_FEA2_010, 1253, 0, 0, 0 },
+ { TX_FEA2N000, 1209, 0, 0, 0 },
+ { TX_FEA2N001, 1461, 0, 0, 0 },
+ { TX_FEA2N002, 2172, 0, 0, 0 },
+ { TX_FEA2N003, 2479, 0, 0, 0 },
+ { TX_FEA2N004, 2365, 0, 0, 0 },
+ { TX_FEA2N005, 2252, 0, 0, 0 },
+ { TX_FEA2N006, 1021, 0, 0, 0 },
+ { TX_FEA2N007, 1091, 0, 0, 0 },
+ { TX_FEA2N008, 1521, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText feather2Texts[] = {
diff --git a/engines/startrek/rooms/feather3.cpp b/engines/startrek/rooms/feather3.cpp
index e28031066e..98048ce9c9 100644
--- a/engines/startrek/rooms/feather3.cpp
+++ b/engines/startrek/rooms/feather3.cpp
@@ -109,69 +109,69 @@ enum feather3TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets feather3TextOffsets[] = {
- { TX_SPEAKER_KIRK, 2681, 0 },
- { TX_SPEAKER_MCCOY, 2692, 0 },
- { TX_SPEAKER_SPOCK, 2702, 0 },
- { TX_SPEAKER_STRAGEY, 2712, 0 },
- { TX_SPEAKER_TLAOXAC, 2724, 0 },
- { TX_FEA3_001, 5973, 0 },
- { TX_FEA3_002, 6028, 0 },
- { TX_FEA3_003, 6157, 0 },
- { TX_FEA3_004, 4518, 0 },
- { TX_FEA3_005, 5799, 0 },
- { TX_FEA3_006, 1987, 0 },
- { TX_FEA3_007, 4639, 0 },
- { TX_FEA3_008, 2843, 0 },
- { TX_FEA3_009, 5281, 0 },
- { TX_FEA3_010, 6762, 0 },
- { TX_FEA3_011, 5418, 0 },
- { TX_FEA3_012, 1792, 0 },
- { TX_FEA3_013, 5619, 0 },
- { TX_FEA3_014, 6616, 0 },
- { TX_FEA3_015, 3671, 0 },
- { TX_FEA3_016, 3704, 0 },
- { TX_FEA3_017, 3849, 0 },
- { TX_FEA3_018, 3551, 0 },
- { TX_FEA3_019, 5496, 0 },
- { TX_FEA3_020, 4360, 0 },
- { TX_FEA3_021, 6832, 0 },
- { TX_FEA3_022, 5695, 0 },
- { TX_FEA3_023, 6936, 0 },
- { TX_FEA3_024, 6979, 0 },
- { TX_FEA3_025, 5367, 0 },
- { TX_FEA3_026, 3470, 0 },
- { TX_FEA3_027, 3780, 0 },
- { TX_FEA3_028, 3602, 0 },
- { TX_FEA3_029, 3890, 0 },
- { TX_FEA3_030, 6800, 0 },
- { TX_FEA3_031, 4683, 0 },
- { TX_FEA3_032, 5871, 0 },
- { TX_FEA3_033, 5470, 0 },
- { TX_FEA3_034, 4757, 0 },
- { TX_FEA3_035, 4032, 0 },
- { TX_FEA3_036, 2733, 0 },
- { TX_FEA3_037, 6278, 0 },
- { TX_FEA3_038, 5916, 0 },
- { TX_FEA3_039, 5108, 0 },
- { TX_FEA3_040, 6493, 0 },
- { TX_FEA3_041, 4107, 0 },
- { TX_FEA3_042, 6387, 0 },
- { TX_FEA3_043, 4207, 0 },
- { TX_FEA3_044, 4882, 0 },
- { TX_FEA3N000, 3092, 0 },
- { TX_FEA3N001, 3030, 0 },
- { TX_FEA3N002, 3135, 0 },
- { TX_FEA3N003, 3344, 0 },
- { TX_FEA3N004, 4158, 0 },
- { TX_FEA3N005, 2971, 0 },
- { TX_FEA3N006, 5225, 0 },
- { TX_FEA3N007, 3199, 0 },
- { TX_FEA3N010, 6878, 0 },
- { TX_FEA3N011, 3408, 0 },
- { TX_FEA3N012, 2883, 0 },
- { TX_LOVA_100, 8620, 0 },
- { TX_DIALOG_ERROR, 7022, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 2681, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 2692, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 2702, 0, 0, 0 },
+ { TX_SPEAKER_STRAGEY, 2712, 0, 0, 0 },
+ { TX_SPEAKER_TLAOXAC, 2724, 0, 0, 0 },
+ { TX_FEA3_001, 5973, 0, 0, 0 },
+ { TX_FEA3_002, 6028, 0, 0, 0 },
+ { TX_FEA3_003, 6157, 0, 0, 0 },
+ { TX_FEA3_004, 4518, 0, 0, 0 },
+ { TX_FEA3_005, 5799, 0, 0, 0 },
+ { TX_FEA3_006, 1987, 0, 0, 0 },
+ { TX_FEA3_007, 4639, 0, 0, 0 },
+ { TX_FEA3_008, 2843, 0, 0, 0 },
+ { TX_FEA3_009, 5281, 0, 0, 0 },
+ { TX_FEA3_010, 6762, 0, 0, 0 },
+ { TX_FEA3_011, 5418, 0, 0, 0 },
+ { TX_FEA3_012, 1792, 0, 0, 0 },
+ { TX_FEA3_013, 5619, 0, 0, 0 },
+ { TX_FEA3_014, 6616, 0, 0, 0 },
+ { TX_FEA3_015, 3671, 0, 0, 0 },
+ { TX_FEA3_016, 3704, 0, 0, 0 },
+ { TX_FEA3_017, 3849, 0, 0, 0 },
+ { TX_FEA3_018, 3551, 0, 0, 0 },
+ { TX_FEA3_019, 5496, 0, 0, 0 },
+ { TX_FEA3_020, 4360, 0, 0, 0 },
+ { TX_FEA3_021, 6832, 0, 0, 0 },
+ { TX_FEA3_022, 5695, 0, 0, 0 },
+ { TX_FEA3_023, 6936, 0, 0, 0 },
+ { TX_FEA3_024, 6979, 0, 0, 0 },
+ { TX_FEA3_025, 5367, 0, 0, 0 },
+ { TX_FEA3_026, 3470, 0, 0, 0 },
+ { TX_FEA3_027, 3780, 0, 0, 0 },
+ { TX_FEA3_028, 3602, 0, 0, 0 },
+ { TX_FEA3_029, 3890, 0, 0, 0 },
+ { TX_FEA3_030, 6800, 0, 0, 0 },
+ { TX_FEA3_031, 4683, 0, 0, 0 },
+ { TX_FEA3_032, 5871, 0, 0, 0 },
+ { TX_FEA3_033, 5470, 0, 0, 0 },
+ { TX_FEA3_034, 4757, 0, 0, 0 },
+ { TX_FEA3_035, 4032, 0, 0, 0 },
+ { TX_FEA3_036, 2733, 0, 0, 0 },
+ { TX_FEA3_037, 6278, 0, 0, 0 },
+ { TX_FEA3_038, 5916, 0, 0, 0 },
+ { TX_FEA3_039, 5108, 0, 0, 0 },
+ { TX_FEA3_040, 6493, 0, 0, 0 },
+ { TX_FEA3_041, 4107, 0, 0, 0 },
+ { TX_FEA3_042, 6387, 0, 0, 0 },
+ { TX_FEA3_043, 4207, 0, 0, 0 },
+ { TX_FEA3_044, 4882, 0, 0, 0 },
+ { TX_FEA3N000, 3092, 0, 0, 0 },
+ { TX_FEA3N001, 3030, 0, 0, 0 },
+ { TX_FEA3N002, 3135, 0, 0, 0 },
+ { TX_FEA3N003, 3344, 0, 0, 0 },
+ { TX_FEA3N004, 4158, 0, 0, 0 },
+ { TX_FEA3N005, 2971, 0, 0, 0 },
+ { TX_FEA3N006, 5225, 0, 0, 0 },
+ { TX_FEA3N007, 3199, 0, 0, 0 },
+ { TX_FEA3N010, 6878, 0, 0, 0 },
+ { TX_FEA3N011, 3408, 0, 0, 0 },
+ { TX_FEA3N012, 2883, 0, 0, 0 },
+ { TX_LOVA_100, 8620, 0, 0, 0 },
+ { TX_DIALOG_ERROR, 7022, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText feather3Texts[] = {
diff --git a/engines/startrek/rooms/feather4.cpp b/engines/startrek/rooms/feather4.cpp
index 9571bdefc1..e2cf13fc7f 100644
--- a/engines/startrek/rooms/feather4.cpp
+++ b/engines/startrek/rooms/feather4.cpp
@@ -76,33 +76,33 @@ enum feather4TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets feather4TextOffsets[] = {
- { TX_SPEAKER_KIRK, 1205, 0 },
- { TX_SPEAKER_MCCOY, 1228, 0 },
- { TX_SPEAKER_SPOCK, 1238, 0 },
- { TX_SPEAKER_STRAGEY, 1248, 0 },
- { TX_SPEAKER_QUETZECOATL, 1216, 0 },
- { TX_FEA4_001, 2525, 0 },
- { TX_FEA4_002, 700, 0 },
- { TX_FEA4_003, 2674, 0 },
- { TX_FEA4_004, 1779, 0 },
- { TX_FEA4_006, 1729, 0 },
- { TX_FEA4_007, 1945, 0 },
- { TX_FEA4_008, 1667, 0 },
- { TX_FEA4_009, 2768, 0 },
- { TX_FEA4_010, 2458, 0 },
- { TX_FEA4_011, 1607, 0 },
- { TX_FEA4_012, 2567, 0 },
- { TX_FEA4_013, 2298, 0 },
- { TX_FEA4N000, 1324, 0 },
- { TX_FEA4N001, 1261, 0 },
- { TX_FEA4N002, 1370, 0 },
- { TX_FEA4N003, 1426, 0 },
- { TX_FEA4N004, 2045, 0 },
- { TX_FEA4N005, 2235, 0 },
- { TX_FEA4N006, 2175, 0 },
- { TX_FEA4N007, 2123, 0 },
- { TX_FEA4N008, 1576, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 1205, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 1228, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 1238, 0, 0, 0 },
+ { TX_SPEAKER_STRAGEY, 1248, 0, 0, 0 },
+ { TX_SPEAKER_QUETZECOATL, 1216, 0, 0, 0 },
+ { TX_FEA4_001, 2525, 0, 0, 0 },
+ { TX_FEA4_002, 700, 0, 0, 0 },
+ { TX_FEA4_003, 2674, 0, 0, 0 },
+ { TX_FEA4_004, 1779, 0, 0, 0 },
+ { TX_FEA4_006, 1729, 0, 0, 0 },
+ { TX_FEA4_007, 1945, 0, 0, 0 },
+ { TX_FEA4_008, 1667, 0, 0, 0 },
+ { TX_FEA4_009, 2768, 0, 0, 0 },
+ { TX_FEA4_010, 2458, 0, 0, 0 },
+ { TX_FEA4_011, 1607, 0, 0, 0 },
+ { TX_FEA4_012, 2567, 0, 0, 0 },
+ { TX_FEA4_013, 2298, 0, 0, 0 },
+ { TX_FEA4N000, 1324, 0, 0, 0 },
+ { TX_FEA4N001, 1261, 0, 0, 0 },
+ { TX_FEA4N002, 1370, 0, 0, 0 },
+ { TX_FEA4N003, 1426, 0, 0, 0 },
+ { TX_FEA4N004, 2045, 0, 0, 0 },
+ { TX_FEA4N005, 2235, 0, 0, 0 },
+ { TX_FEA4N006, 2175, 0, 0, 0 },
+ { TX_FEA4N007, 2123, 0, 0, 0 },
+ { TX_FEA4N008, 1576, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText feather4Texts[] = {
diff --git a/engines/startrek/rooms/feather5.cpp b/engines/startrek/rooms/feather5.cpp
index 317a260fec..10cf5e61c5 100644
--- a/engines/startrek/rooms/feather5.cpp
+++ b/engines/startrek/rooms/feather5.cpp
@@ -128,12 +128,13 @@ enum feather5TextIds {
};
// TODO: Finish floppy offsets
+// TODO: Finish offsets
extern const RoomTextOffsets feather5TextOffsets[] = {
- { TX_SPEAKER_KIRK, 2385, 0 },
- { TX_SPEAKER_MCCOY, 2396, 0 },
- { TX_SPEAKER_SPOCK, 2406, 0 },
- { TX_SPEAKER_STRAGEY, 2416, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 2385, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 2396, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 2406, 0, 0, 0 },
+ { TX_SPEAKER_STRAGEY, 2416, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText feather5Texts[] = {
diff --git a/engines/startrek/rooms/feather6.cpp b/engines/startrek/rooms/feather6.cpp
index 14106f1503..ed71160305 100644
--- a/engines/startrek/rooms/feather6.cpp
+++ b/engines/startrek/rooms/feather6.cpp
@@ -118,74 +118,74 @@ enum feather6TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets feather6TextOffsets[] = {
- { TX_SPEAKER_KIRK, 2326, 0 },
- { TX_SPEAKER_MCCOY, 2337, 0 },
- { TX_SPEAKER_SPOCK, 2347, 0 },
- { TX_SPEAKER_STRAGEY, 2357, 0 },
- { TX_FEA6_001, 2687, 0 },
- { TX_FEA6_002, 5067, 0 },
- { TX_FEA6_003, 5632, 0 },
- { TX_FEA6_004, 4306, 0 },
- { TX_FEA6_005, 5755, 0 },
- { TX_FEA6_006, 4238, 0 },
- { TX_FEA6_007, 5863, 0 },
- { TX_FEA6_008, 4179, 0 },
- { TX_FEA6_009, 2445, 0 },
- { TX_FEA6_011, 1104, 0 },
- { TX_FEA6_012, 6315, 0 },
- { TX_FEA6_013, 6247, 0 },
- { TX_FEA6_014, 7241, 0 },
- { TX_FEA6_015, 6445, 0 },
- { TX_FEA6_016, 5227, 0 },
- { TX_FEA6_017, 4043, 0 },
- { TX_FEA6_018, 6874, 0 },
- { TX_FEA6_019, 3201, 0 },
- { TX_FEA6_020, 2370, 0 },
- { TX_FEA6_021, 2778, 0 },
- { TX_FEA6_022, 6590, 0 },
- { TX_FEA6_023, 7370, 0 },
- { TX_FEA6_024, 6537, 0 },
- { TX_FEA6_025, 6680, 0 },
- { TX_FEA6_026, 6777, 0 },
- { TX_FEA6_027, 7043, 0 },
- { TX_FEA6_028, 3303, 0 },
- { TX_FEA6_029, 6014, 0 },
- { TX_FEA6_030, 6046, 0 },
- { TX_FEA6_031, 6172, 0 },
- { TX_FEA6_032, 4380, 0 },
- { TX_FEA6_033, 4086, 0 },
- { TX_FEA6_034, 3883, 0 },
- { TX_FEA6_035, 5377, 0 },
- { TX_FEA6_036, 4492, 0 },
- { TX_FEA6_037, 4592, 0 },
- { TX_FEA6_038, 5498, 0 },
- { TX_FEA6_039, 2867, 0 },
- { TX_FEA6_040, 2504, 0 },
- { TX_FEA6_041, 5142, 0 },
- { TX_FEA6_042, 4972, 0 },
- { TX_FEA6_043, 5328, 0 },
- { TX_FEA6N000, 2601, 0 },
- { TX_FEA6N001, 3147, 0 },
- { TX_FEA6N002, 4804, 0 },
- { TX_FEA6N003, 3631, 0 },
- { TX_FEA6N004, 7307, 0 },
- { TX_FEA6N005, 3404, 0 },
- { TX_FEA6N006, 3367, 0 },
- { TX_FEA6N007, 4643, 0 },
- { TX_FEA6N008, 4870, 0 },
- { TX_FEA6N009, 2746, 0 },
- { TX_FEA6N010, 2835, 0 },
- { TX_FEA6N011, 4758, 0 },
- { TX_FEA6N012, 3770, 0 },
- { TX_FEA6N013, 3823, 0 },
- { TX_FEA6N014, 3682, 0 },
- { TX_FEA6N015, 3059, 0 },
- { TX_FEA6N016, 3454, 0 },
- { TX_FEA6N017, 7125, 0 },
- { TX_FEA6N020, 7185, 0 },
- { TX_FEA6N028, 2997, 0 },
- { TX_FEA6N029, 2921, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 2326, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 2337, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 2347, 0, 0, 0 },
+ { TX_SPEAKER_STRAGEY, 2357, 0, 0, 0 },
+ { TX_FEA6_001, 2687, 0, 0, 0 },
+ { TX_FEA6_002, 5067, 0, 0, 0 },
+ { TX_FEA6_003, 5632, 0, 0, 0 },
+ { TX_FEA6_004, 4306, 0, 0, 0 },
+ { TX_FEA6_005, 5755, 0, 0, 0 },
+ { TX_FEA6_006, 4238, 0, 0, 0 },
+ { TX_FEA6_007, 5863, 0, 0, 0 },
+ { TX_FEA6_008, 4179, 0, 0, 0 },
+ { TX_FEA6_009, 2445, 0, 0, 0 },
+ { TX_FEA6_011, 1104, 0, 0, 0 },
+ { TX_FEA6_012, 6315, 0, 0, 0 },
+ { TX_FEA6_013, 6247, 0, 0, 0 },
+ { TX_FEA6_014, 7241, 0, 0, 0 },
+ { TX_FEA6_015, 6445, 0, 0, 0 },
+ { TX_FEA6_016, 5227, 0, 0, 0 },
+ { TX_FEA6_017, 4043, 0, 0, 0 },
+ { TX_FEA6_018, 6874, 0, 0, 0 },
+ { TX_FEA6_019, 3201, 0, 0, 0 },
+ { TX_FEA6_020, 2370, 0, 0, 0 },
+ { TX_FEA6_021, 2778, 0, 0, 0 },
+ { TX_FEA6_022, 6590, 0, 0, 0 },
+ { TX_FEA6_023, 7370, 0, 0, 0 },
+ { TX_FEA6_024, 6537, 0, 0, 0 },
+ { TX_FEA6_025, 6680, 0, 0, 0 },
+ { TX_FEA6_026, 6777, 0, 0, 0 },
+ { TX_FEA6_027, 7043, 0, 0, 0 },
+ { TX_FEA6_028, 3303, 0, 0, 0 },
+ { TX_FEA6_029, 6014, 0, 0, 0 },
+ { TX_FEA6_030, 6046, 0, 0, 0 },
+ { TX_FEA6_031, 6172, 0, 0, 0 },
+ { TX_FEA6_032, 4380, 0, 0, 0 },
+ { TX_FEA6_033, 4086, 0, 0, 0 },
+ { TX_FEA6_034, 3883, 0, 0, 0 },
+ { TX_FEA6_035, 5377, 0, 0, 0 },
+ { TX_FEA6_036, 4492, 0, 0, 0 },
+ { TX_FEA6_037, 4592, 0, 0, 0 },
+ { TX_FEA6_038, 5498, 0, 0, 0 },
+ { TX_FEA6_039, 2867, 0, 0, 0 },
+ { TX_FEA6_040, 2504, 0, 0, 0 },
+ { TX_FEA6_041, 5142, 0, 0, 0 },
+ { TX_FEA6_042, 4972, 0, 0, 0 },
+ { TX_FEA6_043, 5328, 0, 0, 0 },
+ { TX_FEA6N000, 2601, 0, 0, 0 },
+ { TX_FEA6N001, 3147, 0, 0, 0 },
+ { TX_FEA6N002, 4804, 0, 0, 0 },
+ { TX_FEA6N003, 3631, 0, 0, 0 },
+ { TX_FEA6N004, 7307, 0, 0, 0 },
+ { TX_FEA6N005, 3404, 0, 0, 0 },
+ { TX_FEA6N006, 3367, 0, 0, 0 },
+ { TX_FEA6N007, 4643, 0, 0, 0 },
+ { TX_FEA6N008, 4870, 0, 0, 0 },
+ { TX_FEA6N009, 2746, 0, 0, 0 },
+ { TX_FEA6N010, 2835, 0, 0, 0 },
+ { TX_FEA6N011, 4758, 0, 0, 0 },
+ { TX_FEA6N012, 3770, 0, 0, 0 },
+ { TX_FEA6N013, 3823, 0, 0, 0 },
+ { TX_FEA6N014, 3682, 0, 0, 0 },
+ { TX_FEA6N015, 3059, 0, 0, 0 },
+ { TX_FEA6N016, 3454, 0, 0, 0 },
+ { TX_FEA6N017, 7125, 0, 0, 0 },
+ { TX_FEA6N020, 7185, 0, 0, 0 },
+ { TX_FEA6N028, 2997, 0, 0, 0 },
+ { TX_FEA6N029, 2921, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText feather6Texts[] = {
diff --git a/engines/startrek/rooms/feather7.cpp b/engines/startrek/rooms/feather7.cpp
index a4f4087dee..2fd7cbce13 100644
--- a/engines/startrek/rooms/feather7.cpp
+++ b/engines/startrek/rooms/feather7.cpp
@@ -50,42 +50,42 @@ enum feather7TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets feather7TextOffsets[] = {
- { TX_SPEAKER_KIRK, 1064, 0 },
- { TX_SPEAKER_MCCOY, 1075, 0 },
- { TX_SPEAKER_SPOCK, 1085, 0 },
- { TX_SPEAKER_STRAGEY, 1095, 0 },
- { TX_SPEAKER_QUETZECOATL, 1107, 0 },
- { TX_FEA7_001, 4842, 0 },
- { TX_FEA7_002, 4802, 0 },
- { TX_FEA7_003, 4674, 0 },
- { TX_FEA7_004, 2517, 0 },
- { TX_FEA7_005, 1697, 0 },
- { TX_FEA7_006, 1896, 0 },
- { TX_FEA7_007, 2446, 0 },
- { TX_FEA7_008, 3887, 0 },
- { TX_FEA7_009, 4020, 0 },
- { TX_FEA7_010, 2002, 0 },
- { TX_FEA7_011, 4128, 0 },
- { TX_FEA7_012, 2687, 0 },
- { TX_FEA7_013, 4602, 0 },
- { TX_FEA7_014, 3614, 0 },
- { TX_FEA7_015, 4443, 0 },
- { TX_FEA7_016, 2250, 0 },
- { TX_FEA7_017, 1120, 0 },
- { TX_FEA7_018, 3069, 0 },
- { TX_FEA7_019, 2117, 0 },
- { TX_FEA7_020, 2044, 0 },
- { TX_FEA7_021, 1334, 0 },
- { TX_FEA7_022, 1214, 0 },
- { TX_FEA7_023, 1547, 0 },
- { TX_FEA7_024, 3724, 0 },
- { TX_FEA7_025, 4164, 0 },
- { TX_FEA7_026, 3297, 0 },
- { TX_FEA7_027, 1490, 0 },
- { TX_FEA7_028, 4381, 0 },
- { TX_FEA7_029, 2295, 0 },
- { TX_FEA7_030, 2806, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 1064, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 1075, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 1085, 0, 0, 0 },
+ { TX_SPEAKER_STRAGEY, 1095, 0, 0, 0 },
+ { TX_SPEAKER_QUETZECOATL, 1107, 0, 0, 0 },
+ { TX_FEA7_001, 4842, 0, 0, 0 },
+ { TX_FEA7_002, 4802, 0, 0, 0 },
+ { TX_FEA7_003, 4674, 0, 0, 0 },
+ { TX_FEA7_004, 2517, 0, 0, 0 },
+ { TX_FEA7_005, 1697, 0, 0, 0 },
+ { TX_FEA7_006, 1896, 0, 0, 0 },
+ { TX_FEA7_007, 2446, 0, 0, 0 },
+ { TX_FEA7_008, 3887, 0, 0, 0 },
+ { TX_FEA7_009, 4020, 0, 0, 0 },
+ { TX_FEA7_010, 2002, 0, 0, 0 },
+ { TX_FEA7_011, 4128, 0, 0, 0 },
+ { TX_FEA7_012, 2687, 0, 0, 0 },
+ { TX_FEA7_013, 4602, 0, 0, 0 },
+ { TX_FEA7_014, 3614, 0, 0, 0 },
+ { TX_FEA7_015, 4443, 0, 0, 0 },
+ { TX_FEA7_016, 2250, 0, 0, 0 },
+ { TX_FEA7_017, 1120, 0, 0, 0 },
+ { TX_FEA7_018, 3069, 0, 0, 0 },
+ { TX_FEA7_019, 2117, 0, 0, 0 },
+ { TX_FEA7_020, 2044, 0, 0, 0 },
+ { TX_FEA7_021, 1334, 0, 0, 0 },
+ { TX_FEA7_022, 1214, 0, 0, 0 },
+ { TX_FEA7_023, 1547, 0, 0, 0 },
+ { TX_FEA7_024, 3724, 0, 0, 0 },
+ { TX_FEA7_025, 4164, 0, 0, 0 },
+ { TX_FEA7_026, 3297, 0, 0, 0 },
+ { TX_FEA7_027, 1490, 0, 0, 0 },
+ { TX_FEA7_028, 4381, 0, 0, 0 },
+ { TX_FEA7_029, 2295, 0, 0, 0 },
+ { TX_FEA7_030, 2806, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText feather7Texts[] = {
diff --git a/engines/startrek/rooms/love0.cpp b/engines/startrek/rooms/love0.cpp
index dfaf73a05d..5a9d1ba200 100644
--- a/engines/startrek/rooms/love0.cpp
+++ b/engines/startrek/rooms/love0.cpp
@@ -104,102 +104,61 @@ enum love0TextIds {
TX_LOV0N009, TX_COMPA186, TX_COMPA187, TX_COMPA189, TX_COMPA190,
TX_COMPA191, TX_COMPA193, TX_COMPU186, TX_COMPU187, TX_COMPU188,
TX_COMPU189, TX_COMPU190, TX_COMPU192, TX_COMPU193, TX_DIALOG_ERROR
- // Global in lovea
- //TX_LOV0_011, TX_LOV0_012, TX_LOV0_013, TX_LOV0_014, TX_LOV0_015,
- //TX_LOV0_016, TX_LOV0_017, TX_LOV0_019, TX_LOV0_020, TX_LOV0_021,
- //TX_LOV0_022, TX_LOV0_026, TX_LOV0_029, TX_LOV0_033, TX_LOV0_039,
- //TX_LOV0_040, TX_LOV0_041, TX_LOV0_042, TX_LOV0_043, TX_LOV0_045,
- //TX_LOV0_046, TX_LOV0_047, TX_LOV0_048, TX_LOV0_050, TX_LOV0_101,
- //TX_LOV0_102, TX_LOV0_103, TX_LOV0_104, TX_LOV0_105, TX_LOV0_106,
- //TX_LOV0_107, TX_LOV0_124
};
// TODO: Finish floppy offsets
extern const RoomTextOffsets love0TextOffsets[] = {
- { TX_SPEAKER_KIRK, 5915, 0 },
- { TX_SPEAKER_MCCOY, 5926, 0 },
- { TX_SPEAKER_SPOCK, 5936, 0 },
- { TX_SPEAKER_FERRIS, 5946, 0 },
- { TX_SPEAKER_COMPUTER, 5957, 0 },
- { TX_LOV0_001, 10075, 0 },
- { TX_LOV0_002, 1488, 0 },
- { TX_LOV0_003, 959, 0 },
- { TX_LOV0_004, 7933, 0 },
- { TX_LOV0_005, 10149, 0 },
- { TX_LOV0_006, 1256, 0 },
- { TX_LOV0_007, 1105, 0 },
- { TX_LOV0_008, 6848, 0 },
- { TX_LOV0_009, 7999, 0 },
- { TX_LOV0_010, 10477, 0 },
- { TX_LOV0_023, 7881, 0 },
- { TX_LOV0_024, 7536, 0 },
- { TX_LOV0_027, 6650, 0 },
- { TX_LOV0_028, 7062, 0 },
- { TX_LOV0_030, 10335, 0 },
- { TX_LOV0_031, 6931, 0 },
- { TX_LOV0_035, 7805, 0 },
- { TX_LOV0_036, 1591, 0 },
- { TX_LOV0_037, 10240, 0 },
- { TX_LOV0_038, 6760, 0 },
- { TX_LOV0_049, 11461, 0 },
- { TX_LOV0N000, 6449, 0 },
- { TX_LOV0N001, 10380, 0 },
- { TX_LOV0N002, 6227, 0 },
- { TX_LOV0N003, 6344, 0 },
- { TX_LOV0N004, 6185, 0 },
- { TX_LOV0N005, 6292, 0 },
- { TX_LOV0N006, 6049, 0 },
- { TX_LOV0N007, 6525, 0 },
- { TX_LOV0N008, 5971, 0 },
- { TX_LOV0N009, 6399, 0 },
- { TX_COMPA186, 8349, 0 },
- { TX_COMPA187, 8372, 0 },
- { TX_COMPA189, 8320, 0 },
- { TX_COMPA190, 8265, 0 },
- { TX_COMPA191, 8405, 0 },
- { TX_COMPA193, 8295, 0 },
- { TX_COMPU186, 9642, 0 },
- { TX_COMPU187, 9864, 0 },
- { TX_COMPU188, 7106, 0 },
- { TX_COMPU189, 9381, 0 },
- { TX_COMPU190, 8434, 0 },
- { TX_COMPU192, 8220, 0 },
- { TX_COMPU193, 8858, 0 },
- { TX_DIALOG_ERROR, 12536, 0 },
- // Global in lovea
- //{ TX_LOV0_011, 10498, 0 },
- //{ TX_LOV0_012, 10625, 0 },
- //{ TX_LOV0_013, 10921, 0 },
- //{ TX_LOV0_014, 10685, 0 },
- //{ TX_LOV0_015, 10789, 0 },
- //{ TX_LOV0_016, 10592, 0 },
- //{ TX_LOV0_017, 11055, 0 },
- //{ TX_LOV0_019, 10975, 0 },
- //{ TX_LOV0_020, 10532, 0 },
- //{ TX_LOV0_021, 10843, 0 },
- //{ TX_LOV0_022, 10733, 0 },
- //{ TX_LOV0_026, 11854, 0 },
- //{ TX_LOV0_029, 11734, 0 },
- //{ TX_LOV0_033, 11794, 0 },
- //{ TX_LOV0_039, 11116, 0 },
- //{ TX_LOV0_040, 11243, 0 },
- //{ TX_LOV0_041, 11539, 0 },
- //{ TX_LOV0_042, 11303, 0 },
- //{ TX_LOV0_043, 11407, 0 },
- //{ TX_LOV0_045, 11210, 0 },
- //{ TX_LOV0_046, 11673, 0 },
- //{ TX_LOV0_047, 11593, 0 },
- //{ TX_LOV0_048, 11150, 0 },
- //{ TX_LOV0_050, 11351, 0 },
- //{ TX_LOV0_101, 12062, 0 },
- //{ TX_LOV0_102, 12126, 0 },
- //{ TX_LOV0_103, 12196, 0 },
- //{ TX_LOV0_104, 12246, 0 },
- //{ TX_LOV0_105, 12303, 0 },
- //{ TX_LOV0_106, 12415, 0 },
- //{ TX_LOV0_107, 12483, 0 },
- //{ TX_LOV0_124, 11931, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 5915, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 5926, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 5936, 0, 0, 0 },
+ { TX_SPEAKER_FERRIS, 5946, 0, 0, 0 },
+ { TX_SPEAKER_COMPUTER, 5957, 0, 0, 0 },
+ { TX_LOV0_001, 10075, 0, 0, 0 },
+ { TX_LOV0_002, 1488, 0, 0, 0 },
+ { TX_LOV0_003, 959, 0, 0, 0 },
+ { TX_LOV0_004, 7933, 0, 0, 0 },
+ { TX_LOV0_005, 10149, 0, 0, 0 },
+ { TX_LOV0_006, 1256, 0, 0, 0 },
+ { TX_LOV0_007, 1105, 0, 0, 0 },
+ { TX_LOV0_008, 6848, 0, 0, 0 },
+ { TX_LOV0_009, 7999, 0, 0, 0 },
+ { TX_LOV0_010, 10477, 0, 0, 0 },
+ { TX_LOV0_023, 7881, 0, 0, 0 },
+ { TX_LOV0_024, 7536, 0, 0, 0 },
+ { TX_LOV0_027, 6650, 0, 0, 0 },
+ { TX_LOV0_028, 7062, 0, 0, 0 },
+ { TX_LOV0_030, 10335, 0, 0, 0 },
+ { TX_LOV0_031, 6931, 0, 0, 0 },
+ { TX_LOV0_035, 7805, 0, 0, 0 },
+ { TX_LOV0_036, 1591, 0, 0, 0 },
+ { TX_LOV0_037, 10240, 0, 0, 0 },
+ { TX_LOV0_038, 6760, 0, 0, 0 },
+ { TX_LOV0_049, 11461, 0, 0, 0 },
+ { TX_LOV0N000, 6449, 0, 0, 0 },
+ { TX_LOV0N001, 10380, 0, 0, 0 },
+ { TX_LOV0N002, 6227, 0, 0, 0 },
+ { TX_LOV0N003, 6344, 0, 0, 0 },
+ { TX_LOV0N004, 6185, 0, 0, 0 },
+ { TX_LOV0N005, 6292, 0, 0, 0 },
+ { TX_LOV0N006, 6049, 0, 0, 0 },
+ { TX_LOV0N007, 6525, 0, 0, 0 },
+ { TX_LOV0N008, 5971, 0, 0, 0 },
+ { TX_LOV0N009, 6399, 0, 0, 0 },
+ { TX_COMPA186, 8349, 0, 0, 0 },
+ { TX_COMPA187, 8372, 0, 0, 0 },
+ { TX_COMPA189, 8320, 0, 0, 0 },
+ { TX_COMPA190, 8265, 0, 0, 0 },
+ { TX_COMPA191, 8405, 0, 0, 0 },
+ { TX_COMPA193, 8295, 0, 0, 0 },
+ { TX_COMPU186, 9642, 0, 0, 0 },
+ { TX_COMPU187, 9864, 0, 0, 0 },
+ { TX_COMPU188, 7106, 0, 0, 0 },
+ { TX_COMPU189, 9381, 0, 0, 0 },
+ { TX_COMPU190, 8434, 0, 0, 0 },
+ { TX_COMPU192, 8220, 0, 0, 0 },
+ { TX_COMPU193, 8858, 0, 0, 0 },
+ { TX_DIALOG_ERROR, 12536, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText love0Texts[] = {
diff --git a/engines/startrek/rooms/love1.cpp b/engines/startrek/rooms/love1.cpp
index df975b7ba8..187a680a8e 100644
--- a/engines/startrek/rooms/love1.cpp
+++ b/engines/startrek/rooms/love1.cpp
@@ -210,134 +210,134 @@ enum love1TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets love1TextOffsets[] = {
- { TX_SPEAKER_KIRK, 11280, 0 },
- { TX_SPEAKER_MCCOY, 11291, 0 },
- { TX_SPEAKER_SPOCK, 11301, 0 },
- { TX_SPEAKER_FERRIS, 11311, 0 },
- { TX_LOV0_011, 12397, 0 },
- { TX_LOV0_012, 12524, 0 },
- { TX_LOV0_013, 12820, 0 },
- { TX_LOV0_014, 12584, 0 },
- { TX_LOV0_015, 12688, 0 },
- { TX_LOV0_016, 12491, 0 },
- { TX_LOV0_017, 12954, 0 },
- { TX_LOV0_019, 12874, 0 },
- { TX_LOV0_020, 12431, 0 },
- { TX_LOV0_021, 12742, 0 },
- { TX_LOV0_022, 12632, 0 },
- { TX_LOV0_025, 13880, 0 },
- { TX_LOV0_026, 13753, 0 },
- { TX_LOV0_029, 13633, 0 },
- { TX_LOV0_033, 13693, 0 },
- { TX_LOV0_039, 13015, 0 },
- { TX_LOV0_040, 13142, 0 },
- { TX_LOV0_041, 13438, 0 },
- { TX_LOV0_042, 13202, 0 },
- { TX_LOV0_043, 13306, 0 },
- { TX_LOV0_045, 13109, 0 },
- { TX_LOV0_046, 13572, 0 },
- { TX_LOV0_047, 13492, 0 },
- { TX_LOV0_048, 13049, 0 },
- { TX_LOV0_049, 13360, 0 },
- { TX_LOV0_050, 13250, 0 },
- { TX_LOV0_101, 13961, 0 },
- { TX_LOV0_102, 14025, 0 },
- { TX_LOV0_103, 14095, 0 },
- { TX_LOV0_104, 14145, 0 },
- { TX_LOV0_105, 14202, 0 },
- { TX_LOV0_106, 14314, 0 },
- { TX_LOV0_107, 14382, 0 },
- { TX_LOV0_124, 13830, 0 },
- { TX_LOV1_001, 2668, 0 },
- { TX_LOV1_002, 5066, 0 },
- { TX_LOV1_003, 3804, 0 },
- { TX_LOV1_004, 3901, 0 },
- { TX_LOV1_005, 2812, 0 },
- { TX_LOV1_006, 12236, 0 },
- { TX_LOV1_007, 11998, 0 },
- { TX_LOV1_008, 6774, 0 },
- { TX_LOV1_009, 3507, 0 },
- { TX_LOV1_010, 3389, 0 },
- { TX_LOV1_011, 2940, 0 },
- { TX_LOV1_012, 4991, 0 },
- { TX_LOV1_013, 5598, 0 },
- { TX_LOV1_014, 5709, 0 },
- { TX_LOV1_015, 5330, 0 },
- { TX_LOV1_016, 6618, 0 },
- { TX_LOV1_017, 3246, 0 },
- { TX_LOV1_018, 11433, 0 },
- { TX_LOV1_019, 11560, 0 },
- { TX_LOV1_021, 11620, 0 },
- { TX_LOV1_022, 12328, 0 },
- { TX_LOV1_023, 12144, 0 },
- { TX_LOV1_024, 7186, 0 },
- { TX_LOV1_025, 7248, 0 },
- { TX_LOV1_026, 5176, 0 },
- { TX_LOV1_027, 3073, 0 },
- { TX_LOV1_028, 7353, 0 },
- { TX_LOV5_015, 8435, 0 },
- //{ TX_LOV5_015, 8256, 0 }, // ignore duplicate line
- { TX_LOV5_019, 8178, 0 },
- { TX_LOV5_027, 8691, 0 },
- { TX_LOV5_030, 8595, 0 },
- { TX_LOV5_038, 8646, 0 },
- { TX_LOVA_100, 9800, 0 },
- { TX_LOVA_F01, 9242, 0 },
- { TX_LOVA_F02, 9314, 0 },
- { TX_LOVA_F03, 9513, 0 },
- { TX_LOVA_F04, 9428, 0 },
- { TX_LOVA_F07, 9877, 0 },
- { TX_LOVA_F08, 8866, 0 },
- //{ TX_LOVA_F08, 9581, 0 }, // ignore duplicate line
- { TX_LOVA_F10, 9748, 0 },
- { TX_LOVA_F54, 9022, 0 },
- { TX_LOVA_F55, 8323, 0 },
- { TX_MUD2_040, 10073, 0 },
- { TX_MUD4_018, 10446, 0 },
- //{ TX_MUD4_018, 10779, 0 }, // ignore duplicate line
- //{ TX_MUD4_018, 10282, 0 }, // ignore duplicate line
- //{ TX_MUD4_018, 10615, 0 }, // ignore duplicate line
- { TX_TUG2_010, 9678, 0 },
- { TX_VENA_F41, 10569, 0 },
- { TX_VENA_F41, 10405, 0 },
- //{ TX_VENA_F41, 10902, 0 }, // ignore duplicate line
- //{ TX_VENA_F41, 10738, 0 }, // ignore duplicate line
- { TX_LOV1N000, 11684, 0 },
- { TX_LOV1N001, 11864, 0 },
- { TX_LOV1N002, 11926, 0 },
- { TX_LOV1N003, 11766, 0 },
- { TX_LOV1N004, 11802, 0 },
- { TX_LOV1N005, 11333, 0 },
- { TX_LOV1N006, 11381, 0 },
- { TX_LOV1N007, 4720, 0 },
- { TX_LOV1N008, 6479, 0 },
- { TX_LOV1N009, 4452, 0 },
- { TX_LOV1N010, 4093, 0 },
- { TX_LOV1N011, 4548, 0 },
- { TX_LOV1N012, 2547, 0 },
- { TX_LOV1N013, 2113, 0 },
- { TX_LOV1N014, 2038, 0 },
- { TX_LOV1N015, 2239, 0 },
- { TX_LOV1N016, 1914, 0 },
- { TX_LOV1N017, 1782, 0 },
- { TX_LOV1N018, 2478, 0 },
- { TX_LOV1N019, 1399, 0 },
- { TX_LOV1N020, 1686, 0 },
- { TX_LOV1N021, 1576, 0 },
- { TX_LOV1N022, 1498, 0 },
- { TX_LOV1N023, 2393, 0 },
- { TX_LOV1N034, 5974, 0 },
- { TX_LOV1N035, 4313, 0 },
- { TX_LOV2N005, 9936, 0 },
- //{ TX_LOV2N005, 10016, 0 }, // ignore duplicate line
- //{ TX_LOV2N005, 10162, 0 }, // ignore duplicate line
- { TX_BRIDU146, 10848, 0 },
- //{ TX_BRIDU146, 10515, 0 }, // ignore duplicate line
- //{ TX_BRIDU146, 10684, 0 }, // ignore duplicate line
- //{ TX_BRIDU146, 10351, 0 }, // ignore duplicate line
- { TX_GENER004, 9171, 0 },
- { TX_GET_BOTTLE_ERROR, 4664, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 11280, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 11291, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 11301, 0, 0, 0 },
+ { TX_SPEAKER_FERRIS, 11311, 0, 0, 0 },
+ { TX_LOV0_011, 12397, 0, 0, 0 },
+ { TX_LOV0_012, 12524, 0, 0, 0 },
+ { TX_LOV0_013, 12820, 0, 0, 0 },
+ { TX_LOV0_014, 12584, 0, 0, 0 },
+ { TX_LOV0_015, 12688, 0, 0, 0 },
+ { TX_LOV0_016, 12491, 0, 0, 0 },
+ { TX_LOV0_017, 12954, 0, 0, 0 },
+ { TX_LOV0_019, 12874, 0, 0, 0 },
+ { TX_LOV0_020, 12431, 0, 0, 0 },
+ { TX_LOV0_021, 12742, 0, 0, 0 },
+ { TX_LOV0_022, 12632, 0, 0, 0 },
+ { TX_LOV0_025, 13880, 0, 0, 0 },
+ { TX_LOV0_026, 13753, 0, 0, 0 },
+ { TX_LOV0_029, 13633, 0, 0, 0 },
+ { TX_LOV0_033, 13693, 0, 0, 0 },
+ { TX_LOV0_039, 13015, 0, 0, 0 },
+ { TX_LOV0_040, 13142, 0, 0, 0 },
+ { TX_LOV0_041, 13438, 0, 0, 0 },
+ { TX_LOV0_042, 13202, 0, 0, 0 },
+ { TX_LOV0_043, 13306, 0, 0, 0 },
+ { TX_LOV0_045, 13109, 0, 0, 0 },
+ { TX_LOV0_046, 13572, 0, 0, 0 },
+ { TX_LOV0_047, 13492, 0, 0, 0 },
+ { TX_LOV0_048, 13049, 0, 0, 0 },
+ { TX_LOV0_049, 13360, 0, 0, 0 },
+ { TX_LOV0_050, 13250, 0, 0, 0 },
+ { TX_LOV0_101, 13961, 0, 0, 0 },
+ { TX_LOV0_102, 14025, 0, 0, 0 },
+ { TX_LOV0_103, 14095, 0, 0, 0 },
+ { TX_LOV0_104, 14145, 0, 0, 0 },
+ { TX_LOV0_105, 14202, 0, 0, 0 },
+ { TX_LOV0_106, 14314, 0, 0, 0 },
+ { TX_LOV0_107, 14382, 0, 0, 0 },
+ { TX_LOV0_124, 13830, 0, 0, 0 },
+ { TX_LOV1_001, 2668, 0, 0, 0 },
+ { TX_LOV1_002, 5066, 0, 0, 0 },
+ { TX_LOV1_003, 3804, 0, 0, 0 },
+ { TX_LOV1_004, 3901, 0, 0, 0 },
+ { TX_LOV1_005, 2812, 0, 0, 0 },
+ { TX_LOV1_006, 12236, 0, 0, 0 },
+ { TX_LOV1_007, 11998, 0, 0, 0 },
+ { TX_LOV1_008, 6774, 0, 0, 0 },
+ { TX_LOV1_009, 3507, 0, 0, 0 },
+ { TX_LOV1_010, 3389, 0, 0, 0 },
+ { TX_LOV1_011, 2940, 0, 0, 0 },
+ { TX_LOV1_012, 4991, 0, 0, 0 },
+ { TX_LOV1_013, 5598, 0, 0, 0 },
+ { TX_LOV1_014, 5709, 0, 0, 0 },
+ { TX_LOV1_015, 5330, 0, 0, 0 },
+ { TX_LOV1_016, 6618, 0, 0, 0 },
+ { TX_LOV1_017, 3246, 0, 0, 0 },
+ { TX_LOV1_018, 11433, 0, 0, 0 },
+ { TX_LOV1_019, 11560, 0, 0, 0 },
+ { TX_LOV1_021, 11620, 0, 0, 0 },
+ { TX_LOV1_022, 12328, 0, 0, 0 },
+ { TX_LOV1_023, 12144, 0, 0, 0 },
+ { TX_LOV1_024, 7186, 0, 0, 0 },
+ { TX_LOV1_025, 7248, 0, 0, 0 },
+ { TX_LOV1_026, 5176, 0, 0, 0 },
+ { TX_LOV1_027, 3073, 0, 0, 0 },
+ { TX_LOV1_028, 7353, 0, 0, 0 },
+ { TX_LOV5_015, 8435, 0, 0, 0 },
+ //{ TX_LOV5_015, 8256, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV5_019, 8178, 0, 0, 0 },
+ { TX_LOV5_027, 8691, 0, 0, 0 },
+ { TX_LOV5_030, 8595, 0, 0, 0 },
+ { TX_LOV5_038, 8646, 0, 0, 0 },
+ { TX_LOVA_100, 9800, 0, 0, 0 },
+ { TX_LOVA_F01, 9242, 0, 0, 0 },
+ { TX_LOVA_F02, 9314, 0, 0, 0 },
+ { TX_LOVA_F03, 9513, 0, 0, 0 },
+ { TX_LOVA_F04, 9428, 0, 0, 0 },
+ { TX_LOVA_F07, 9877, 0, 0, 0 },
+ { TX_LOVA_F08, 8866, 0, 0, 0 },
+ //{ TX_LOVA_F08, 9581, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOVA_F10, 9748, 0, 0, 0 },
+ { TX_LOVA_F54, 9022, 0, 0, 0 },
+ { TX_LOVA_F55, 8323, 0, 0, 0 },
+ { TX_MUD2_040, 10073, 0, 0, 0 },
+ { TX_MUD4_018, 10446, 0, 0, 0 },
+ //{ TX_MUD4_018, 10779, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_MUD4_018, 10282, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_MUD4_018, 10615, 0, 0, 0 }, // ignore duplicate line
+ { TX_TUG2_010, 9678, 0, 0, 0 },
+ { TX_VENA_F41, 10569, 0, 0, 0 },
+ { TX_VENA_F41, 10405, 0, 0, 0 },
+ //{ TX_VENA_F41, 10902, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_VENA_F41, 10738, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV1N000, 11684, 0, 0, 0 },
+ { TX_LOV1N001, 11864, 0, 0, 0 },
+ { TX_LOV1N002, 11926, 0, 0, 0 },
+ { TX_LOV1N003, 11766, 0, 0, 0 },
+ { TX_LOV1N004, 11802, 0, 0, 0 },
+ { TX_LOV1N005, 11333, 0, 0, 0 },
+ { TX_LOV1N006, 11381, 0, 0, 0 },
+ { TX_LOV1N007, 4720, 0, 0, 0 },
+ { TX_LOV1N008, 6479, 0, 0, 0 },
+ { TX_LOV1N009, 4452, 0, 0, 0 },
+ { TX_LOV1N010, 4093, 0, 0, 0 },
+ { TX_LOV1N011, 4548, 0, 0, 0 },
+ { TX_LOV1N012, 2547, 0, 0, 0 },
+ { TX_LOV1N013, 2113, 0, 0, 0 },
+ { TX_LOV1N014, 2038, 0, 0, 0 },
+ { TX_LOV1N015, 2239, 0, 0, 0 },
+ { TX_LOV1N016, 1914, 0, 0, 0 },
+ { TX_LOV1N017, 1782, 0, 0, 0 },
+ { TX_LOV1N018, 2478, 0, 0, 0 },
+ { TX_LOV1N019, 1399, 0, 0, 0 },
+ { TX_LOV1N020, 1686, 0, 0, 0 },
+ { TX_LOV1N021, 1576, 0, 0, 0 },
+ { TX_LOV1N022, 1498, 0, 0, 0 },
+ { TX_LOV1N023, 2393, 0, 0, 0 },
+ { TX_LOV1N034, 5974, 0, 0, 0 },
+ { TX_LOV1N035, 4313, 0, 0, 0 },
+ { TX_LOV2N005, 9936, 0, 0, 0 },
+ //{ TX_LOV2N005, 10016, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_LOV2N005, 10162, 0, 0, 0 }, // ignore duplicate line
+ { TX_BRIDU146, 10848, 0, 0, 0 },
+ //{ TX_BRIDU146, 10515, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_BRIDU146, 10684, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_BRIDU146, 10351, 0, 0, 0 }, // ignore duplicate line
+ { TX_GENER004, 9171, 0, 0, 0 },
+ { TX_GET_BOTTLE_ERROR, 4664, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText love1Texts[] = {
diff --git a/engines/startrek/rooms/love2.cpp b/engines/startrek/rooms/love2.cpp
index 14d035de53..7ea175e2cd 100644
--- a/engines/startrek/rooms/love2.cpp
+++ b/engines/startrek/rooms/love2.cpp
@@ -212,173 +212,173 @@ enum love2TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets love2TextOffsets[] = {
- { TX_SPEAKER_KIRK, 14244, 0 },
- { TX_SPEAKER_MCCOY, 14255, 0 },
- { TX_SPEAKER_SPOCK, 14265, 0 },
- { TX_SPEAKER_FERRIS, 14275, 0 },
- { TX_SPEAKER_COMPUTER, 14287, 0 },
- { TX_LOV0_011, 16471, 0 },
- { TX_LOV0_012, 16598, 0 },
- { TX_LOV0_013, 16894, 0 },
- { TX_LOV0_014, 16658, 0 },
- { TX_LOV0_015, 16762, 0 },
- { TX_LOV0_016, 16565, 0 },
- { TX_LOV0_017, 17028, 0 },
- { TX_LOV0_019, 16948, 0 },
- { TX_LOV0_020, 16505, 0 },
- { TX_LOV0_021, 16816, 0 },
- { TX_LOV0_022, 16706, 0 },
- { TX_LOV0_025, 17954, 0 },
- { TX_LOV0_026, 17827, 0 },
- { TX_LOV0_029, 17707, 0 },
- { TX_LOV0_033, 17767, 0 },
- { TX_LOV0_039, 17089, 0 },
- { TX_LOV0_040, 17216, 0 },
- { TX_LOV0_041, 17512, 0 },
- { TX_LOV0_042, 17276, 0 },
- { TX_LOV0_043, 17380, 0 },
- { TX_LOV0_045, 17183, 0 },
- { TX_LOV0_046, 17646, 0 },
- { TX_LOV0_047, 17566, 0 },
- { TX_LOV0_048, 17123, 0 },
- { TX_LOV0_049, 17434, 0 },
- { TX_LOV0_050, 17324, 0 },
- { TX_LOV0_101, 18035, 0 },
- { TX_LOV0_102, 18099, 0 },
- { TX_LOV0_103, 18169, 0 },
- { TX_LOV0_104, 18219, 0 },
- { TX_LOV0_105, 18276, 0 },
- { TX_LOV0_106, 18388, 0 },
- { TX_LOV0_107, 18456, 0 },
- { TX_LOV0_124, 17904, 0 },
- { TX_LOV2_001, 1734, 0 },
- { TX_LOV2_002, 6690, 0 },
- { TX_LOV2_003, 5722, 0 },
- { TX_LOV2_004, 5885, 0 },
- { TX_LOV2_005, 4110, 0 },
- { TX_LOV2_006, 4025, 0 },
- { TX_LOV2_007, 8933, 0 },
- { TX_LOV2_008, 15998, 0 },
- { TX_LOV2_009, 15764, 0 },
- { TX_LOV2_010, 4710, 0 },
- //{ TX_LOV2_010, 16437, 0 }, // ignore duplicate line
- { TX_LOV2_011, 9129, 0 },
- { TX_LOV2_012, 1916, 0 },
- { TX_LOV2_014, 8848, 0 },
- { TX_LOV2_015, 5377, 0 },
- { TX_LOV2_016, 15386, 0 },
- { TX_LOV2_017, 7699, 0 },
- { TX_LOV2_018, 6248, 0 },
- { TX_LOV2_019, 15259, 0 },
- { TX_LOV2_020, 8083, 0 },
- { TX_LOV2_021, 6856, 0 },
- { TX_LOV2_022, 6402, 0 },
- { TX_LOV2_023, 7371, 0 },
- { TX_LOV2_024, 4468, 0 },
- { TX_LOV2_025, 3226, 0 },
- //{ TX_LOV2_025, 3540, 0 }, // ignore duplicate line
- { TX_LOV2_026, 2639, 0 },
- { TX_LOV2_027, 16081, 0 },
- { TX_LOV2_028, 6936, 0 },
- { TX_LOV2_029, 15832, 0 },
- { TX_LOV2_030, 6312, 0 },
- { TX_LOV2_031, 6088, 0 },
- { TX_LOV2_032, 5224, 0 },
- { TX_LOV2_033, 15321, 0 },
- { TX_LOV2_034, 7288, 0 }, // NOTE: has typo (dash instead of underscore)
- { TX_LOV2_035, 14978, 0 },
- { TX_LOV2_036, 5447, 0 },
- { TX_LOV2_037, 15561, 0 },
- { TX_LOV2_038, 6472, 0 },
- { TX_LOV2_039, 7111, 0 }, // NOTE: has typo (dash instead of underscore)
- { TX_LOV2_040, 9058, 0 },
- { TX_LOV2_041, 15889, 0 },
- { TX_LOV2_043, 5634, 0 },
- { TX_LOV5_015, 11567, 0 },
- //{ TX_LOV5_015, 11388, 0 }, // ignore duplicate line
- { TX_LOV5_019, 11310, 0 },
- { TX_LOV5_027, 11823, 0 },
- { TX_LOV5_030, 11727, 0 },
- { TX_LOV5_038, 11778, 0 },
- { TX_LOVA_100, 12932, 0 },
- { TX_LOVA_F01, 12374, 0 },
- { TX_LOVA_F02, 12446, 0 },
- { TX_LOVA_F03, 12645, 0 },
- { TX_LOVA_F04, 12560, 0 },
- { TX_LOVA_F07, 13009, 0 },
- { TX_LOVA_F08, 11998, 0 },
- //{ TX_LOVA_F08, 12713, 0 }, // ignore duplicate line
- { TX_LOVA_F10, 12880, 0 },
- { TX_LOVA_F54, 12154, 0 },
- { TX_LOVA_F55, 11455, 0 },
- { TX_LOV2N000, 16147, 0 },
- { TX_LOV2N001, 15741, 0 },
- { TX_LOV2N002, 14608, 0 },
- { TX_LOV2N003, 14647, 0 },
- { TX_LOV2N004, 14569, 0 },
- { TX_LOV2N005, 4653, 0 },
- //{ TX_LOV2N005, 13294, 0 }, // ignore duplicate line
- //{ TX_LOV2N005, 13148, 0 }, // ignore duplicate line
- //{ TX_LOV2N005, 13068, 0 }, // ignore duplicate line
- //{ TX_LOV2N005, 4410, 0 }, // ignore duplicate line
- { TX_LOV2N006, 14300, 0 },
- { TX_LOV2N007, 16217, 0 },
- { TX_LOV2N008, 16186, 0 },
- { TX_LOV2N009, 1467, 0 },
- { TX_LOV2N010, 14780, 0 },
- { TX_LOV2N011, 14686, 0 },
- { TX_LOV2N012, 4334, 0 },
- { TX_LOV2N013, 16249, 0 },
- { TX_LOV2N014, 14728, 0 },
- { TX_LOV2N015, 16281, 0 },
- { TX_LOV2N016, 5555, 0 },
- { TX_LOV2N017, 5147, 0 },
- { TX_LOV2N018, 5812, 0 },
- { TX_LOV2N019, 6013, 0 },
- { TX_LOV2N024, 2955, 0 },
- { TX_LOV2N025, 8231, 0 },
- //{ TX_LOV2N025, 8454, 0 }, // ignore duplicate line
- { TX_LOV2N026, 14840, 0 },
- { TX_LOV2N027, 14878, 0 },
- { TX_LOV2N028, 14425, 0 },
- { TX_LOV2N029, 14920, 0 },
- { TX_LOV2N030, 3356, 0 },
- { TX_LOV2N031, 3696, 0 },
- { TX_LOV2N033, 16366, 0 },
- { TX_LOV2N034, 2843, 0 },
- { TX_LOV2N035, 3081, 0 },
- { TX_LOV2N036, 9618, 0 },
- { TX_LOV2N037, 9803, 0 },
- { TX_LOV2N038, 10228, 0 },
- { TX_LOV2N039, 10072, 0 },
- { TX_LOV2N040, 9986, 0 },
- { TX_LOV2N041, 10152, 0 },
- { TX_LOV2N042, 9298, 0 },
- { TX_LOV2N043, 10484, 0 },
- { TX_LOV2N044, 9430, 0 },
- { TX_LOV2N045, 15417, 0 },
- { TX_LOV2N046, 8005, 0 },
- { TX_LOV2N047, 7616, 0 },
- { TX_LOV2N048, 7209, 0 },
- { TX_LOV2N049, 7033, 0 },
- { TX_LOV2N050, 6778, 0 },
- { TX_LOV2N051, 6612, 0 },
- { TX_MUD2_040, 13205, 0 },
- { TX_MUD4_018, 13414, 0 },
- //{ TX_MUD4_018, 13911, 0 }, // ignore duplicate line
- //{ TX_MUD4_018, 13747, 0 }, // ignore duplicate line
- //{ TX_MUD4_018, 13578, 0 }, // ignore duplicate line
- { TX_TUG2_010, 12810, 0 },
- { TX_VENA_F41, 14034, 0 },
- //{ TX_VENA_F41, 13537, 0 }, // ignore duplicate line
- //{ TX_VENA_F41, 13870, 0 }, // ignore duplicate line
- //{ TX_VENA_F41, 13701, 0 }, // ignore duplicate line
- { TX_BRIDU146, 13647, 0 },
- //{ TX_BRIDU146, 13980, 0 }, // ignore duplicate line
- //{ TX_BRIDU146, 13816, 0 }, // ignore duplicate line
- //{ TX_BRIDU146, 13483, 0 }, // ignore duplicate line
- { TX_GENER004, 12303, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 14244, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 14255, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 14265, 0, 0, 0 },
+ { TX_SPEAKER_FERRIS, 14275, 0, 0, 0 },
+ { TX_SPEAKER_COMPUTER, 14287, 0, 0, 0 },
+ { TX_LOV0_011, 16471, 0, 0, 0 },
+ { TX_LOV0_012, 16598, 0, 0, 0 },
+ { TX_LOV0_013, 16894, 0, 0, 0 },
+ { TX_LOV0_014, 16658, 0, 0, 0 },
+ { TX_LOV0_015, 16762, 0, 0, 0 },
+ { TX_LOV0_016, 16565, 0, 0, 0 },
+ { TX_LOV0_017, 17028, 0, 0, 0 },
+ { TX_LOV0_019, 16948, 0, 0, 0 },
+ { TX_LOV0_020, 16505, 0, 0, 0 },
+ { TX_LOV0_021, 16816, 0, 0, 0 },
+ { TX_LOV0_022, 16706, 0, 0, 0 },
+ { TX_LOV0_025, 17954, 0, 0, 0 },
+ { TX_LOV0_026, 17827, 0, 0, 0 },
+ { TX_LOV0_029, 17707, 0, 0, 0 },
+ { TX_LOV0_033, 17767, 0, 0, 0 },
+ { TX_LOV0_039, 17089, 0, 0, 0 },
+ { TX_LOV0_040, 17216, 0, 0, 0 },
+ { TX_LOV0_041, 17512, 0, 0, 0 },
+ { TX_LOV0_042, 17276, 0, 0, 0 },
+ { TX_LOV0_043, 17380, 0, 0, 0 },
+ { TX_LOV0_045, 17183, 0, 0, 0 },
+ { TX_LOV0_046, 17646, 0, 0, 0 },
+ { TX_LOV0_047, 17566, 0, 0, 0 },
+ { TX_LOV0_048, 17123, 0, 0, 0 },
+ { TX_LOV0_049, 17434, 0, 0, 0 },
+ { TX_LOV0_050, 17324, 0, 0, 0 },
+ { TX_LOV0_101, 18035, 0, 0, 0 },
+ { TX_LOV0_102, 18099, 0, 0, 0 },
+ { TX_LOV0_103, 18169, 0, 0, 0 },
+ { TX_LOV0_104, 18219, 0, 0, 0 },
+ { TX_LOV0_105, 18276, 0, 0, 0 },
+ { TX_LOV0_106, 18388, 0, 0, 0 },
+ { TX_LOV0_107, 18456, 0, 0, 0 },
+ { TX_LOV0_124, 17904, 0, 0, 0 },
+ { TX_LOV2_001, 1734, 0, 0, 0 },
+ { TX_LOV2_002, 6690, 0, 0, 0 },
+ { TX_LOV2_003, 5722, 0, 0, 0 },
+ { TX_LOV2_004, 5885, 0, 0, 0 },
+ { TX_LOV2_005, 4110, 0, 0, 0 },
+ { TX_LOV2_006, 4025, 0, 0, 0 },
+ { TX_LOV2_007, 8933, 0, 0, 0 },
+ { TX_LOV2_008, 15998, 0, 0, 0 },
+ { TX_LOV2_009, 15764, 0, 0, 0 },
+ { TX_LOV2_010, 4710, 0, 0, 0 },
+ //{ TX_LOV2_010, 16437, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV2_011, 9129, 0, 0, 0 },
+ { TX_LOV2_012, 1916, 0, 0, 0 },
+ { TX_LOV2_014, 8848, 0, 0, 0 },
+ { TX_LOV2_015, 5377, 0, 0, 0 },
+ { TX_LOV2_016, 15386, 0, 0, 0 },
+ { TX_LOV2_017, 7699, 0, 0, 0 },
+ { TX_LOV2_018, 6248, 0, 0, 0 },
+ { TX_LOV2_019, 15259, 0, 0, 0 },
+ { TX_LOV2_020, 8083, 0, 0, 0 },
+ { TX_LOV2_021, 6856, 0, 0, 0 },
+ { TX_LOV2_022, 6402, 0, 0, 0 },
+ { TX_LOV2_023, 7371, 0, 0, 0 },
+ { TX_LOV2_024, 4468, 0, 0, 0 },
+ { TX_LOV2_025, 3226, 0, 0, 0 },
+ //{ TX_LOV2_025, 3540, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV2_026, 2639, 0, 0, 0 },
+ { TX_LOV2_027, 16081, 0, 0, 0 },
+ { TX_LOV2_028, 6936, 0, 0, 0 },
+ { TX_LOV2_029, 15832, 0, 0, 0 },
+ { TX_LOV2_030, 6312, 0, 0, 0 },
+ { TX_LOV2_031, 6088, 0, 0, 0 },
+ { TX_LOV2_032, 5224, 0, 0, 0 },
+ { TX_LOV2_033, 15321, 0, 0, 0 },
+ { TX_LOV2_034, 7288, 0, 0, 0 }, // NOTE: has typo (dash instead of underscore)
+ { TX_LOV2_035, 14978, 0, 0, 0 },
+ { TX_LOV2_036, 5447, 0, 0, 0 },
+ { TX_LOV2_037, 15561, 0, 0, 0 },
+ { TX_LOV2_038, 6472, 0, 0, 0 },
+ { TX_LOV2_039, 7111, 0, 0, 0 }, // NOTE: has typo (dash instead of underscore)
+ { TX_LOV2_040, 9058, 0, 0, 0 },
+ { TX_LOV2_041, 15889, 0, 0, 0 },
+ { TX_LOV2_043, 5634, 0, 0, 0 },
+ { TX_LOV5_015, 11567, 0, 0, 0 },
+ //{ TX_LOV5_015, 11388, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV5_019, 11310, 0, 0, 0 },
+ { TX_LOV5_027, 11823, 0, 0, 0 },
+ { TX_LOV5_030, 11727, 0, 0, 0 },
+ { TX_LOV5_038, 11778, 0, 0, 0 },
+ { TX_LOVA_100, 12932, 0, 0, 0 },
+ { TX_LOVA_F01, 12374, 0, 0, 0 },
+ { TX_LOVA_F02, 12446, 0, 0, 0 },
+ { TX_LOVA_F03, 12645, 0, 0, 0 },
+ { TX_LOVA_F04, 12560, 0, 0, 0 },
+ { TX_LOVA_F07, 13009, 0, 0, 0 },
+ { TX_LOVA_F08, 11998, 0, 0, 0 },
+ //{ TX_LOVA_F08, 12713, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOVA_F10, 12880, 0, 0, 0 },
+ { TX_LOVA_F54, 12154, 0, 0, 0 },
+ { TX_LOVA_F55, 11455, 0, 0, 0 },
+ { TX_LOV2N000, 16147, 0, 0, 0 },
+ { TX_LOV2N001, 15741, 0, 0, 0 },
+ { TX_LOV2N002, 14608, 0, 0, 0 },
+ { TX_LOV2N003, 14647, 0, 0, 0 },
+ { TX_LOV2N004, 14569, 0, 0, 0 },
+ { TX_LOV2N005, 4653, 0, 0, 0 },
+ //{ TX_LOV2N005, 13294, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_LOV2N005, 13148, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_LOV2N005, 13068, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_LOV2N005, 4410, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV2N006, 14300, 0, 0, 0 },
+ { TX_LOV2N007, 16217, 0, 0, 0 },
+ { TX_LOV2N008, 16186, 0, 0, 0 },
+ { TX_LOV2N009, 1467, 0, 0, 0 },
+ { TX_LOV2N010, 14780, 0, 0, 0 },
+ { TX_LOV2N011, 14686, 0, 0, 0 },
+ { TX_LOV2N012, 4334, 0, 0, 0 },
+ { TX_LOV2N013, 16249, 0, 0, 0 },
+ { TX_LOV2N014, 14728, 0, 0, 0 },
+ { TX_LOV2N015, 16281, 0, 0, 0 },
+ { TX_LOV2N016, 5555, 0, 0, 0 },
+ { TX_LOV2N017, 5147, 0, 0, 0 },
+ { TX_LOV2N018, 5812, 0, 0, 0 },
+ { TX_LOV2N019, 6013, 0, 0, 0 },
+ { TX_LOV2N024, 2955, 0, 0, 0 },
+ { TX_LOV2N025, 8231, 0, 0, 0 },
+ //{ TX_LOV2N025, 8454, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV2N026, 14840, 0, 0, 0 },
+ { TX_LOV2N027, 14878, 0, 0, 0 },
+ { TX_LOV2N028, 14425, 0, 0, 0 },
+ { TX_LOV2N029, 14920, 0, 0, 0 },
+ { TX_LOV2N030, 3356, 0, 0, 0 },
+ { TX_LOV2N031, 3696, 0, 0, 0 },
+ { TX_LOV2N033, 16366, 0, 0, 0 },
+ { TX_LOV2N034, 2843, 0, 0, 0 },
+ { TX_LOV2N035, 3081, 0, 0, 0 },
+ { TX_LOV2N036, 9618, 0, 0, 0 },
+ { TX_LOV2N037, 9803, 0, 0, 0 },
+ { TX_LOV2N038, 10228, 0, 0, 0 },
+ { TX_LOV2N039, 10072, 0, 0, 0 },
+ { TX_LOV2N040, 9986, 0, 0, 0 },
+ { TX_LOV2N041, 10152, 0, 0, 0 },
+ { TX_LOV2N042, 9298, 0, 0, 0 },
+ { TX_LOV2N043, 10484, 0, 0, 0 },
+ { TX_LOV2N044, 9430, 0, 0, 0 },
+ { TX_LOV2N045, 15417, 0, 0, 0 },
+ { TX_LOV2N046, 8005, 0, 0, 0 },
+ { TX_LOV2N047, 7616, 0, 0, 0 },
+ { TX_LOV2N048, 7209, 0, 0, 0 },
+ { TX_LOV2N049, 7033, 0, 0, 0 },
+ { TX_LOV2N050, 6778, 0, 0, 0 },
+ { TX_LOV2N051, 6612, 0, 0, 0 },
+ { TX_MUD2_040, 13205, 0, 0, 0 },
+ { TX_MUD4_018, 13414, 0, 0, 0 },
+ //{ TX_MUD4_018, 13911, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_MUD4_018, 13747, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_MUD4_018, 13578, 0, 0, 0 }, // ignore duplicate line
+ { TX_TUG2_010, 12810, 0, 0, 0 },
+ { TX_VENA_F41, 14034, 0, 0, 0 },
+ //{ TX_VENA_F41, 13537, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_VENA_F41, 13870, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_VENA_F41, 13701, 0, 0, 0 }, // ignore duplicate line
+ { TX_BRIDU146, 13647, 0, 0, 0 },
+ //{ TX_BRIDU146, 13980, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_BRIDU146, 13816, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_BRIDU146, 13483, 0, 0, 0 }, // ignore duplicate line
+ { TX_GENER004, 12303, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText love2Texts[] = {
diff --git a/engines/startrek/rooms/love3.cpp b/engines/startrek/rooms/love3.cpp
index b3b6589cd1..eef4aa5e75 100644
--- a/engines/startrek/rooms/love3.cpp
+++ b/engines/startrek/rooms/love3.cpp
@@ -190,147 +190,147 @@ enum love3TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets love3TextOffsets[] = {
- { TX_SPEAKER_KIRK, 9959, 0 },
- { TX_SPEAKER_MCCOY, 9970, 0 },
- { TX_SPEAKER_SPOCK, 9980, 0 },
- { TX_SPEAKER_FERRIS, 9990, 0 },
- { TX_LOV0_011, 12469, 0 },
- { TX_LOV0_012, 12596, 0 },
- { TX_LOV0_013, 12892, 0 },
- { TX_LOV0_014, 12656, 0 },
- { TX_LOV0_015, 12760, 0 },
- { TX_LOV0_016, 12563, 0 },
- { TX_LOV0_017, 13026, 0 },
- { TX_LOV0_019, 12946, 0 },
- { TX_LOV0_020, 12503, 0 },
- { TX_LOV0_021, 12814, 0 },
- { TX_LOV0_022, 12704, 0 },
- { TX_LOV0_025, 13952, 0 },
- { TX_LOV0_026, 13825, 0 },
- { TX_LOV0_029, 13705, 0 },
- { TX_LOV0_033, 13765, 0 },
- { TX_LOV0_039, 13087, 0 },
- { TX_LOV0_040, 13214, 0 },
- { TX_LOV0_041, 13510, 0 },
- { TX_LOV0_042, 13274, 0 },
- { TX_LOV0_043, 13378, 0 },
- { TX_LOV0_045, 13181, 0 },
- { TX_LOV0_046, 13644, 0 },
- { TX_LOV0_047, 13564, 0 },
- { TX_LOV0_048, 13121, 0 },
- { TX_LOV0_049, 13432, 0 },
- { TX_LOV0_050, 13322, 0 },
- { TX_LOV0_101, 14033, 0 },
- { TX_LOV0_102, 14097, 0 },
- { TX_LOV0_103, 14167, 0 },
- { TX_LOV0_104, 14217, 0 },
- { TX_LOV0_105, 14274, 0 },
- { TX_LOV0_106, 14386, 0 },
- { TX_LOV0_107, 14454, 0 },
- { TX_LOV0_124, 13902, 0 },
- { TX_LOV3_001, 1598, 0 },
- { TX_LOV3_002, 11502, 0 },
- { TX_LOV3_003, 11007, 0 },
- { TX_LOV3_004, 11136, 0 },
- { TX_LOV3_005, 11251, 0 },
- { TX_LOV3_006, 2083, 0 },
- { TX_LOV3_007, 14507, 0 },
- { TX_LOV3_008, 1826, 0 },
- { TX_LOV3_009, 10712, 0 },
- { TX_LOV3_010, 684, 0 },
- { TX_LOV3_011, 5079, 0 },
- { TX_LOV3_012, 4619, 0 },
- { TX_LOV3_013, 11334, 0 },
- { TX_LOV3_014, 11378, 0 },
- { TX_LOV3_015, 6046, 0 },
- { TX_LOV3_016, 3156, 0 },
- { TX_LOV3_017, 1696, 0 },
- { TX_LOV3_018, 11891, 0 },
- { TX_LOV3_019, 10794, 0 },
- { TX_LOV3_020, 851, 0 },
- { TX_LOV3_021, 3714, 0 },
- { TX_LOV3_022, 2953, 0 },
- { TX_LOV3_023, 4928, 0 },
- { TX_LOV3_024, 1960, 0 },
- { TX_LOV3_025, 5869, 0 },
- { TX_LOV3_026, 10954, 0 },
- { TX_LOV5_015, 7076, 0 },
- //{ TX_LOV5_015, 7255, 0 }, // ignore duplicate line
- { TX_LOV5_019, 6998, 0 },
- { TX_LOV5_027, 7511, 0 },
- { TX_LOV5_030, 7415, 0 },
- { TX_LOV5_038, 7466, 0 },
- { TX_LOVA_100, 8620, 0 },
- { TX_LOVA_F01, 8062, 0 },
- { TX_LOVA_F02, 8134, 0 },
- { TX_LOVA_F03, 8333, 0 },
- { TX_LOVA_F04, 8248, 0 },
- { TX_LOVA_F07, 8697, 0 },
- { TX_LOVA_F08, 7686, 0 },
- //{ TX_LOVA_F08, 8401, 0 }, // ignore duplicate line
- { TX_LOVA_F10, 8568, 0 },
- { TX_LOVA_F54, 7842, 0 },
- { TX_LOVA_F55, 7143, 0 },
- { TX_MUD2_040, 8893, 0 },
- { TX_MUD4_018, 9435, 0 },
- //{ TX_MUD4_018, 9266, 0 }, // ignore duplicate line
- //{ TX_MUD4_018, 9599, 0 }, // ignore duplicate line
- //{ TX_MUD4_018, 9102, 0 }, // ignore duplicate line
- { TX_TUG2_010, 8498, 0 },
- { TX_VENA_F41, 9389, 0 },
- //{ TX_VENA_F41, 9722, 0 }, // ignore duplicate line
- //{ TX_VENA_F41, 9225, 0 }, // ignore duplicate line
- //{ TX_VENA_F41, 9558, 0 }, // ignore duplicate line
- { TX_BRIDU146, 9668, 0 },
- //{ TX_BRIDU146, 9335, 0 }, // ignore duplicate line
- //{ TX_BRIDU146, 9504, 0 }, // ignore duplicate line
- //{ TX_BRIDU146, 9171, 0 }, // ignore duplicate line
- { TX_GENER004, 7991, 0 },
- { TX_LOV2N005, 8756, 0 },
- //{ TX_LOV2N005, 8982, 0 }, // ignore duplicate line
- //{ TX_LOV2N005, 8836, 0 }, // ignore duplicate line
- { TX_LOV3N000, 10223, 0 }, // typo: the audio file is wrong
- { TX_LOV3N001, 4852, 0 },
- { TX_LOV3N002, 10260, 0 },
- { TX_LOV3N003, 10324, 0 },
- { TX_LOV3N004, 10475, 0 },
- { TX_LOV3N005, 10381, 0 },
- { TX_LOV3N006, 1503, 0 },
- { TX_LOV3N007, 5476, 0 },
- { TX_LOV3N008, 10423, 0 },
- { TX_LOV3N009, 4422, 0 },
- { TX_LOV3N010, 5947, 0 },
- { TX_LOV3N011, 4277, 0 },
- { TX_LOV3N012, 2895, 0 },
- { TX_LOV3N013, 3371, 0 },
- { TX_LOV3N014, 5550, 0 },
- { TX_LOV3N015, 3060, 0 },
- { TX_LOV3N016, 12045, 0 },
- { TX_LOV3N017, 1374, 0 },
- { TX_LOV3N018, 4564, 0 },
- { TX_LOV3N019, 1272, 0 },
- { TX_LOV3N020, 2580, 0 },
- { TX_LOV3N021, 11748, 0 },
- { TX_LOV3N022, 2675, 0 },
- { TX_LOV3N023, 2631, 0 },
- { TX_LOV3N024, 10535, 0 },
- { TX_LOV3N025, 12110, 0 },
- { TX_LOV3N026, 10600, 0 },
- { TX_LOV3N027, 11699, 0 },
- { TX_LOV3N028, 11606, 0 },
- { TX_LOV3N029, 11650, 0 },
- { TX_LOV3N030, 3914, 0 },
- { TX_LOV3N031, 11563, 0 },
- { TX_LOV3N032, 4188, 0 },
- { TX_LOV3NA08, 12359, 0 },
- { TX_LOV3NA09, 12156, 0 },
- { TX_LOV3NA20, 10123, 0 },
- { TX_LOV3NA21, 1187, 0 },
- { TX_LOV3NA22, 10002, 0 },
- { TX_LOV3NA23, 1089, 0 },
- { TX_LOV3NJ32, 5767, 0 },
- { TX_DIALOG_ERROR, 14528, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 9959, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 9970, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 9980, 0, 0, 0 },
+ { TX_SPEAKER_FERRIS, 9990, 0, 0, 0 },
+ { TX_LOV0_011, 12469, 0, 0, 0 },
+ { TX_LOV0_012, 12596, 0, 0, 0 },
+ { TX_LOV0_013, 12892, 0, 0, 0 },
+ { TX_LOV0_014, 12656, 0, 0, 0 },
+ { TX_LOV0_015, 12760, 0, 0, 0 },
+ { TX_LOV0_016, 12563, 0, 0, 0 },
+ { TX_LOV0_017, 13026, 0, 0, 0 },
+ { TX_LOV0_019, 12946, 0, 0, 0 },
+ { TX_LOV0_020, 12503, 0, 0, 0 },
+ { TX_LOV0_021, 12814, 0, 0, 0 },
+ { TX_LOV0_022, 12704, 0, 0, 0 },
+ { TX_LOV0_025, 13952, 0, 0, 0 },
+ { TX_LOV0_026, 13825, 0, 0, 0 },
+ { TX_LOV0_029, 13705, 0, 0, 0 },
+ { TX_LOV0_033, 13765, 0, 0, 0 },
+ { TX_LOV0_039, 13087, 0, 0, 0 },
+ { TX_LOV0_040, 13214, 0, 0, 0 },
+ { TX_LOV0_041, 13510, 0, 0, 0 },
+ { TX_LOV0_042, 13274, 0, 0, 0 },
+ { TX_LOV0_043, 13378, 0, 0, 0 },
+ { TX_LOV0_045, 13181, 0, 0, 0 },
+ { TX_LOV0_046, 13644, 0, 0, 0 },
+ { TX_LOV0_047, 13564, 0, 0, 0 },
+ { TX_LOV0_048, 13121, 0, 0, 0 },
+ { TX_LOV0_049, 13432, 0, 0, 0 },
+ { TX_LOV0_050, 13322, 0, 0, 0 },
+ { TX_LOV0_101, 14033, 0, 0, 0 },
+ { TX_LOV0_102, 14097, 0, 0, 0 },
+ { TX_LOV0_103, 14167, 0, 0, 0 },
+ { TX_LOV0_104, 14217, 0, 0, 0 },
+ { TX_LOV0_105, 14274, 0, 0, 0 },
+ { TX_LOV0_106, 14386, 0, 0, 0 },
+ { TX_LOV0_107, 14454, 0, 0, 0 },
+ { TX_LOV0_124, 13902, 0, 0, 0 },
+ { TX_LOV3_001, 1598, 0, 0, 0 },
+ { TX_LOV3_002, 11502, 0, 0, 0 },
+ { TX_LOV3_003, 11007, 0, 0, 0 },
+ { TX_LOV3_004, 11136, 0, 0, 0 },
+ { TX_LOV3_005, 11251, 0, 0, 0 },
+ { TX_LOV3_006, 2083, 0, 0, 0 },
+ { TX_LOV3_007, 14507, 0, 0, 0 },
+ { TX_LOV3_008, 1826, 0, 0, 0 },
+ { TX_LOV3_009, 10712, 0, 0, 0 },
+ { TX_LOV3_010, 684, 0, 0, 0 },
+ { TX_LOV3_011, 5079, 0, 0, 0 },
+ { TX_LOV3_012, 4619, 0, 0, 0 },
+ { TX_LOV3_013, 11334, 0, 0, 0 },
+ { TX_LOV3_014, 11378, 0, 0, 0 },
+ { TX_LOV3_015, 6046, 0, 0, 0 },
+ { TX_LOV3_016, 3156, 0, 0, 0 },
+ { TX_LOV3_017, 1696, 0, 0, 0 },
+ { TX_LOV3_018, 11891, 0, 0, 0 },
+ { TX_LOV3_019, 10794, 0, 0, 0 },
+ { TX_LOV3_020, 851, 0, 0, 0 },
+ { TX_LOV3_021, 3714, 0, 0, 0 },
+ { TX_LOV3_022, 2953, 0, 0, 0 },
+ { TX_LOV3_023, 4928, 0, 0, 0 },
+ { TX_LOV3_024, 1960, 0, 0, 0 },
+ { TX_LOV3_025, 5869, 0, 0, 0 },
+ { TX_LOV3_026, 10954, 0, 0, 0 },
+ { TX_LOV5_015, 7076, 0, 0, 0 },
+ //{ TX_LOV5_015, 7255, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV5_019, 6998, 0, 0, 0 },
+ { TX_LOV5_027, 7511, 0, 0, 0 },
+ { TX_LOV5_030, 7415, 0, 0, 0 },
+ { TX_LOV5_038, 7466, 0, 0, 0 },
+ { TX_LOVA_100, 8620, 0, 0, 0 },
+ { TX_LOVA_F01, 8062, 0, 0, 0 },
+ { TX_LOVA_F02, 8134, 0, 0, 0 },
+ { TX_LOVA_F03, 8333, 0, 0, 0 },
+ { TX_LOVA_F04, 8248, 0, 0, 0 },
+ { TX_LOVA_F07, 8697, 0, 0, 0 },
+ { TX_LOVA_F08, 7686, 0, 0, 0 },
+ //{ TX_LOVA_F08, 8401, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOVA_F10, 8568, 0, 0, 0 },
+ { TX_LOVA_F54, 7842, 0, 0, 0 },
+ { TX_LOVA_F55, 7143, 0, 0, 0 },
+ { TX_MUD2_040, 8893, 0, 0, 0 },
+ { TX_MUD4_018, 9435, 0, 0, 0 },
+ //{ TX_MUD4_018, 9266, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_MUD4_018, 9599, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_MUD4_018, 9102, 0, 0, 0 }, // ignore duplicate line
+ { TX_TUG2_010, 8498, 0, 0, 0 },
+ { TX_VENA_F41, 9389, 0, 0, 0 },
+ //{ TX_VENA_F41, 9722, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_VENA_F41, 9225, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_VENA_F41, 9558, 0, 0, 0 }, // ignore duplicate line
+ { TX_BRIDU146, 9668, 0, 0, 0 },
+ //{ TX_BRIDU146, 9335, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_BRIDU146, 9504, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_BRIDU146, 9171, 0, 0, 0 }, // ignore duplicate line
+ { TX_GENER004, 7991, 0, 0, 0 },
+ { TX_LOV2N005, 8756, 0, 0, 0 },
+ //{ TX_LOV2N005, 8982, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_LOV2N005, 8836, 0, 0, 0 }, // ignore duplicate line
+ { TX_LOV3N000, 10223, 0, 0, 0 }, // typo: the audio file is wrong
+ { TX_LOV3N001, 4852, 0, 0, 0 },
+ { TX_LOV3N002, 10260, 0, 0, 0 },
+ { TX_LOV3N003, 10324, 0, 0, 0 },
+ { TX_LOV3N004, 10475, 0, 0, 0 },
+ { TX_LOV3N005, 10381, 0, 0, 0 },
+ { TX_LOV3N006, 1503, 0, 0, 0 },
+ { TX_LOV3N007, 5476, 0, 0, 0 },
+ { TX_LOV3N008, 10423, 0, 0, 0 },
+ { TX_LOV3N009, 4422, 0, 0, 0 },
+ { TX_LOV3N010, 5947, 0, 0, 0 },
+ { TX_LOV3N011, 4277, 0, 0, 0 },
+ { TX_LOV3N012, 2895, 0, 0, 0 },
+ { TX_LOV3N013, 3371, 0, 0, 0 },
+ { TX_LOV3N014, 5550, 0, 0, 0 },
+ { TX_LOV3N015, 3060, 0, 0, 0 },
+ { TX_LOV3N016, 12045, 0, 0, 0 },
+ { TX_LOV3N017, 1374, 0, 0, 0 },
+ { TX_LOV3N018, 4564, 0, 0, 0 },
+ { TX_LOV3N019, 1272, 0, 0, 0 },
+ { TX_LOV3N020, 2580, 0, 0, 0 },
+ { TX_LOV3N021, 11748, 0, 0, 0 },
+ { TX_LOV3N022, 2675, 0, 0, 0 },
+ { TX_LOV3N023, 2631, 0, 0, 0 },
+ { TX_LOV3N024, 10535, 0, 0, 0 },
+ { TX_LOV3N025, 12110, 0, 0, 0 },
+ { TX_LOV3N026, 10600, 0, 0, 0 },
+ { TX_LOV3N027, 11699, 0, 0, 0 },
+ { TX_LOV3N028, 11606, 0, 0, 0 },
+ { TX_LOV3N029, 11650, 0, 0, 0 },
+ { TX_LOV3N030, 3914, 0, 0, 0 },
+ { TX_LOV3N031, 11563, 0, 0, 0 },
+ { TX_LOV3N032, 4188, 0, 0, 0 },
+ { TX_LOV3NA08, 12359, 0, 0, 0 },
+ { TX_LOV3NA09, 12156, 0, 0, 0 },
+ { TX_LOV3NA20, 10123, 0, 0, 0 },
+ { TX_LOV3NA21, 1187, 0, 0, 0 },
+ { TX_LOV3NA22, 10002, 0, 0, 0 },
+ { TX_LOV3NA23, 1089, 0, 0, 0 },
+ { TX_LOV3NJ32, 5767, 0, 0, 0 },
+ { TX_DIALOG_ERROR, 14528, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText love3Texts[] = {
diff --git a/engines/startrek/rooms/love4.cpp b/engines/startrek/rooms/love4.cpp
index debaee4b66..2fbd5d4172 100644
--- a/engines/startrek/rooms/love4.cpp
+++ b/engines/startrek/rooms/love4.cpp
@@ -152,122 +152,122 @@ enum love4TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets love4TextOffsets[] = {
- { TX_SPEAKER_KIRK, 7266, 0 },
- { TX_SPEAKER_MCCOY, 7277, 0 },
- { TX_SPEAKER_SPOCK, 7287, 0 },
- { TX_SPEAKER_FERRIS, 7297, 0 },
- { TX_LOV0_011, 8771, 0 },
- { TX_LOV0_012, 8898, 0 },
- { TX_LOV0_013, 9194, 0 },
- { TX_LOV0_014, 8958, 0 },
- { TX_LOV0_015, 9062, 0 },
- { TX_LOV0_016, 8865, 0 },
- { TX_LOV0_017, 9328, 0 },
- { TX_LOV0_019, 9248, 0 },
- { TX_LOV0_020, 8805, 0 },
- { TX_LOV0_021, 9116, 0 },
- { TX_LOV0_022, 9006, 0 },
- { TX_LOV0_025, 10254, 0 },
- { TX_LOV0_026, 10127, 0 },
- { TX_LOV0_029, 10007, 0 },
- { TX_LOV0_033, 10067, 0 },
- { TX_LOV0_039, 9389, 0 },
- { TX_LOV0_040, 9516, 0 },
- { TX_LOV0_041, 9812, 0 },
- { TX_LOV0_042, 9576, 0 },
- { TX_LOV0_043, 9680, 0 },
- { TX_LOV0_045, 9483, 0 },
- { TX_LOV0_046, 9946, 0 },
- { TX_LOV0_047, 9866, 0 },
- { TX_LOV0_048, 9423, 0 },
- { TX_LOV0_049, 9734, 0 },
- { TX_LOV0_050, 9624, 0 },
- { TX_LOV0_101, 10335, 0 },
- { TX_LOV0_102, 10399, 0 },
- { TX_LOV0_103, 10469, 0 },
- { TX_LOV0_104, 10519, 0 },
- { TX_LOV0_105, 10576, 0 },
- { TX_LOV0_106, 10688, 0 },
- { TX_LOV0_107, 10756, 0 },
- { TX_LOV0_124, 10204, 0 },
- { TX_LOV4_001, 2899, 0 },
- { TX_LOV4_002, 1211, 0 },
- { TX_LOV4_003, 8428, 0 },
- { TX_LOV4_004, 3355, 0 },
- { TX_LOV4_005, 1095, 0 },
- { TX_LOV4_006, 8685, 0 },
- { TX_LOV4_007, 7977, 0 },
- { TX_LOV4_009, 3010, 0 },
- { TX_LOV4_010, 8197, 0 },
- { TX_LOV4_011, 3416, 0 },
- { TX_LOV4_012, 3537, 0 },
- { TX_LOV4_013, 2078, 0 },
- { TX_LOV4_014, 7908, 0 },
- { TX_LOV4_015, 1733, 0 },
- { TX_LOV4_016, 10809, 0 },
- { TX_LOV4_017, 8130, 0 },
- { TX_LOV4_018, 1601, 0 },
- { TX_LOV4_019, 1855, 0 },
- { TX_LOV4_020, 8489, 0 },
- { TX_LOV4_021, 8618, 0 },
- { TX_LOV4_022, 1301, 0 },
- { TX_LOV4_023, 2545, 0 },
- { TX_LOV4_024, 1164, 0 },
- { TX_LOV4_025, 7610, 0 },
- { TX_LOV4_026, 2772, 0 },
- { TX_LOV4_027, 8360, 0 },
- { TX_LOV4_028, 8291, 0 },
- { TX_LOV4_029, 3295, 0 },
- { TX_LOV5_015, 4669, 0 },
- //{ TX_LOV5_015, 4490, 0 },
- { TX_LOV5_019, 4412, 0 },
- { TX_LOV5_027, 4925, 0 },
- { TX_LOV5_030, 4829, 0 },
- { TX_LOV5_038, 4880, 0 },
- { TX_LOVA_100, 6034, 0 },
- { TX_LOVA_F01, 5476, 0 },
- { TX_LOVA_F02, 5548, 0 },
- { TX_LOVA_F03, 5747, 0 },
- { TX_LOVA_F04, 5662, 0 },
- { TX_LOVA_F07, 6111, 0 },
- { TX_LOVA_F08, 5100, 0 },
- //{ TX_LOVA_F08, 5815, 0 },
- { TX_LOVA_F10, 5982, 0 },
- { TX_LOVA_F54, 5256, 0 },
- { TX_LOVA_F55, 4557, 0 },
- { TX_FEA5_008, 8051, 0 },
- { TX_MUD2_040, 6307, 0 },
- { TX_MUD4_018, 7013, 0 },
- //{ TX_MUD4_018, 6680, 0 },
- //{ TX_MUD4_018, 6516, 0 },
- //{ TX_MUD4_018, 6849, 0 },
- { TX_TUG2_010, 5912, 0 },
- { TX_VENA_F41, 7136, 0 },
- //{ TX_VENA_F41, 6803, 0 },
- //{ TX_VENA_F41, 6972, 0 },
- //{ TX_VENA_F41, 6639, 0 },
- { TX_LOV2N005, 6170, 0 },
- //{ TX_LOV2N005, 6250, 0 },
- //{ TX_LOV2N005, 6396, 0 },
- { TX_LOV4N000, 8170, 0 },
- { TX_LOV4N001, 7740, 0 },
- { TX_LOV4N002, 7554, 0 },
- { TX_LOV4N003, 7690, 0 },
- { TX_LOV4N004, 3206, 0 },
- { TX_LOV4N005, 2437, 0 },
- { TX_LOV4N006, 7309, 0 },
- { TX_LOV4N007, 1473, 0 },
- { TX_LOV4N008, 7843, 0 },
- { TX_LOV4N009, 7362, 0 },
- { TX_LOV4N010, 7495, 0 },
- { TX_LOV4N011, 7441, 0 },
- { TX_LOV4N013, 2692, 0 },
- { TX_BRIDU146, 6749, 0 },
- //{ TX_BRIDU146, 7082, 0 },
- //{ TX_BRIDU146, 6918, 0 },
- //{ TX_BRIDU146, 6585, 0 },
- { TX_GENER004, 5405, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 7266, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 7277, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 7287, 0, 0, 0 },
+ { TX_SPEAKER_FERRIS, 7297, 0, 0, 0 },
+ { TX_LOV0_011, 8771, 0, 0, 0 },
+ { TX_LOV0_012, 8898, 0, 0, 0 },
+ { TX_LOV0_013, 9194, 0, 0, 0 },
+ { TX_LOV0_014, 8958, 0, 0, 0 },
+ { TX_LOV0_015, 9062, 0, 0, 0 },
+ { TX_LOV0_016, 8865, 0, 0, 0 },
+ { TX_LOV0_017, 9328, 0, 0, 0 },
+ { TX_LOV0_019, 9248, 0, 0, 0 },
+ { TX_LOV0_020, 8805, 0, 0, 0 },
+ { TX_LOV0_021, 9116, 0, 0, 0 },
+ { TX_LOV0_022, 9006, 0, 0, 0 },
+ { TX_LOV0_025, 10254, 0, 0, 0 },
+ { TX_LOV0_026, 10127, 0, 0, 0 },
+ { TX_LOV0_029, 10007, 0, 0, 0 },
+ { TX_LOV0_033, 10067, 0, 0, 0 },
+ { TX_LOV0_039, 9389, 0, 0, 0 },
+ { TX_LOV0_040, 9516, 0, 0, 0 },
+ { TX_LOV0_041, 9812, 0, 0, 0 },
+ { TX_LOV0_042, 9576, 0, 0, 0 },
+ { TX_LOV0_043, 9680, 0, 0, 0 },
+ { TX_LOV0_045, 9483, 0, 0, 0 },
+ { TX_LOV0_046, 9946, 0, 0, 0 },
+ { TX_LOV0_047, 9866, 0, 0, 0 },
+ { TX_LOV0_048, 9423, 0, 0, 0 },
+ { TX_LOV0_049, 9734, 0, 0, 0 },
+ { TX_LOV0_050, 9624, 0, 0, 0 },
+ { TX_LOV0_101, 10335, 0, 0, 0 },
+ { TX_LOV0_102, 10399, 0, 0, 0 },
+ { TX_LOV0_103, 10469, 0, 0, 0 },
+ { TX_LOV0_104, 10519, 0, 0, 0 },
+ { TX_LOV0_105, 10576, 0, 0, 0 },
+ { TX_LOV0_106, 10688, 0, 0, 0 },
+ { TX_LOV0_107, 10756, 0, 0, 0 },
+ { TX_LOV0_124, 10204, 0, 0, 0 },
+ { TX_LOV4_001, 2899, 0, 0, 0 },
+ { TX_LOV4_002, 1211, 0, 0, 0 },
+ { TX_LOV4_003, 8428, 0, 0, 0 },
+ { TX_LOV4_004, 3355, 0, 0, 0 },
+ { TX_LOV4_005, 1095, 0, 0, 0 },
+ { TX_LOV4_006, 8685, 0, 0, 0 },
+ { TX_LOV4_007, 7977, 0, 0, 0 },
+ { TX_LOV4_009, 3010, 0, 0, 0 },
+ { TX_LOV4_010, 8197, 0, 0, 0 },
+ { TX_LOV4_011, 3416, 0, 0, 0 },
+ { TX_LOV4_012, 3537, 0, 0, 0 },
+ { TX_LOV4_013, 2078, 0, 0, 0 },
+ { TX_LOV4_014, 7908, 0, 0, 0 },
+ { TX_LOV4_015, 1733, 0, 0, 0 },
+ { TX_LOV4_016, 10809, 0, 0, 0 },
+ { TX_LOV4_017, 8130, 0, 0, 0 },
+ { TX_LOV4_018, 1601, 0, 0, 0 },
+ { TX_LOV4_019, 1855, 0, 0, 0 },
+ { TX_LOV4_020, 8489, 0, 0, 0 },
+ { TX_LOV4_021, 8618, 0, 0, 0 },
+ { TX_LOV4_022, 1301, 0, 0, 0 },
+ { TX_LOV4_023, 2545, 0, 0, 0 },
+ { TX_LOV4_024, 1164, 0, 0, 0 },
+ { TX_LOV4_025, 7610, 0, 0, 0 },
+ { TX_LOV4_026, 2772, 0, 0, 0 },
+ { TX_LOV4_027, 8360, 0, 0, 0 },
+ { TX_LOV4_028, 8291, 0, 0, 0 },
+ { TX_LOV4_029, 3295, 0, 0, 0 },
+ { TX_LOV5_015, 4669, 0, 0, 0 },
+ //{ TX_LOV5_015, 4490, 0, 0, 0 },
+ { TX_LOV5_019, 4412, 0, 0, 0 },
+ { TX_LOV5_027, 4925, 0, 0, 0 },
+ { TX_LOV5_030, 4829, 0, 0, 0 },
+ { TX_LOV5_038, 4880, 0, 0, 0 },
+ { TX_LOVA_100, 6034, 0, 0, 0 },
+ { TX_LOVA_F01, 5476, 0, 0, 0 },
+ { TX_LOVA_F02, 5548, 0, 0, 0 },
+ { TX_LOVA_F03, 5747, 0, 0, 0 },
+ { TX_LOVA_F04, 5662, 0, 0, 0 },
+ { TX_LOVA_F07, 6111, 0, 0, 0 },
+ { TX_LOVA_F08, 5100, 0, 0, 0 },
+ //{ TX_LOVA_F08, 5815, 0, 0, 0 },
+ { TX_LOVA_F10, 5982, 0, 0, 0 },
+ { TX_LOVA_F54, 5256, 0, 0, 0 },
+ { TX_LOVA_F55, 4557, 0, 0, 0 },
+ { TX_FEA5_008, 8051, 0, 0, 0 },
+ { TX_MUD2_040, 6307, 0, 0, 0 },
+ { TX_MUD4_018, 7013, 0, 0, 0 },
+ //{ TX_MUD4_018, 6680, 0, 0, 0 },
+ //{ TX_MUD4_018, 6516, 0, 0, 0 },
+ //{ TX_MUD4_018, 6849, 0, 0, 0 },
+ { TX_TUG2_010, 5912, 0, 0, 0 },
+ { TX_VENA_F41, 7136, 0, 0, 0 },
+ //{ TX_VENA_F41, 6803, 0, 0, 0 },
+ //{ TX_VENA_F41, 6972, 0, 0, 0 },
+ //{ TX_VENA_F41, 6639, 0, 0, 0 },
+ { TX_LOV2N005, 6170, 0, 0, 0 },
+ //{ TX_LOV2N005, 6250, 0, 0, 0 },
+ //{ TX_LOV2N005, 6396, 0, 0, 0 },
+ { TX_LOV4N000, 8170, 0, 0, 0 },
+ { TX_LOV4N001, 7740, 0, 0, 0 },
+ { TX_LOV4N002, 7554, 0, 0, 0 },
+ { TX_LOV4N003, 7690, 0, 0, 0 },
+ { TX_LOV4N004, 3206, 0, 0, 0 },
+ { TX_LOV4N005, 2437, 0, 0, 0 },
+ { TX_LOV4N006, 7309, 0, 0, 0 },
+ { TX_LOV4N007, 1473, 0, 0, 0 },
+ { TX_LOV4N008, 7843, 0, 0, 0 },
+ { TX_LOV4N009, 7362, 0, 0, 0 },
+ { TX_LOV4N010, 7495, 0, 0, 0 },
+ { TX_LOV4N011, 7441, 0, 0, 0 },
+ { TX_LOV4N013, 2692, 0, 0, 0 },
+ { TX_BRIDU146, 6749, 0, 0, 0 },
+ //{ TX_BRIDU146, 7082, 0, 0, 0 },
+ //{ TX_BRIDU146, 6918, 0, 0, 0 },
+ //{ TX_BRIDU146, 6585, 0, 0, 0 },
+ { TX_GENER004, 5405, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText love4Texts[] = {
diff --git a/engines/startrek/rooms/love5.cpp b/engines/startrek/rooms/love5.cpp
index 6de3d29296..d7b3b625f4 100644
--- a/engines/startrek/rooms/love5.cpp
+++ b/engines/startrek/rooms/love5.cpp
@@ -128,128 +128,128 @@ enum love5TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets love5TextOffsets[] = {
- { TX_SPEAKER_KIRK, 8968, 0 },
- { TX_SPEAKER_MCCOY, 8979, 0 },
- { TX_SPEAKER_SPOCK, 8989, 0 },
- { TX_SPEAKER_FERRIS, 8999, 0 },
- { TX_SPEAKER_CHEEVER, 9027, 0 },
- { TX_SPEAKER_MARCUS, 9016, 0 },
- { TX_SPEAKER_PREAX, 9010, 0 },
- { TX_LOV0_011, 13010, 0 },
- { TX_LOV0_012, 13137, 0 },
- { TX_LOV0_013, 13433, 0 },
- { TX_LOV0_014, 13197, 0 },
- { TX_LOV0_015, 13301, 0 },
- { TX_LOV0_016, 13104, 0 },
- { TX_LOV0_017, 13567, 0 },
- { TX_LOV0_019, 13487, 0 },
- { TX_LOV0_020, 13044, 0 },
- { TX_LOV0_021, 13355, 0 },
- { TX_LOV0_022, 13245, 0 },
- { TX_LOV0_025, 14493, 0 },
- { TX_LOV0_026, 14366, 0 },
- { TX_LOV0_029, 14246, 0 },
- { TX_LOV0_033, 14306, 0 },
- { TX_LOV0_039, 13628, 0 },
- { TX_LOV0_040, 13755, 0 },
- { TX_LOV0_041, 14051, 0 },
- { TX_LOV0_042, 13815, 0 },
- { TX_LOV0_043, 13919, 0 },
- { TX_LOV0_045, 13722, 0 },
- { TX_LOV0_046, 14185, 0 },
- { TX_LOV0_047, 14105, 0 },
- { TX_LOV0_048, 13662, 0 },
- { TX_LOV0_049, 13973, 0 },
- { TX_LOV0_050, 13863, 0 },
- { TX_LOV0_101, 14574, 0 },
- { TX_LOV0_102, 14638, 0 },
- { TX_LOV0_103, 14708, 0 },
- { TX_LOV0_104, 14758, 0 },
- { TX_LOV0_105, 14815, 0 },
- { TX_LOV0_106, 14927, 0 },
- { TX_LOV0_107, 14995, 0 },
- { TX_LOV0_124, 14443, 0 },
- { TX_LOV5_001, 2119, 0 },
- { TX_LOV5_002, 1715, 0 },
- { TX_LOV5_003, 10797, 0 },
- { TX_LOV5_004, 12334, 0 },
- { TX_LOV5_005, 4485, 0 },
- { TX_LOV5_006, 12464, 0 },
- { TX_LOV5_007, 4020, 0 },
- { TX_LOV5_008, 12178, 0 },
- { TX_LOV5_009, 10983, 0 },
- { TX_LOV5_010, 1502, 0 },
- { TX_LOV5_011, 614, 0 },
- { TX_LOV5_013, 4130, 0 },
- { TX_LOV5_014, 2897, 0 },
- { TX_LOV5_015, 3732, 0 },
- { TX_LOV5_016, 3576, 0 },
- { TX_LOV5_017, 4915, 0 },
- { TX_LOV5_018, 1263, 0 },
- { TX_LOV5_019, 3654, 0 },
- { TX_LOV5_020, 4640, 0 },
- { TX_LOV5_021, 1821, 0 },
- { TX_LOV5_024, 3407, 0 },
- { TX_LOV5_025, 11753, 0 },
- { TX_LOV5_026, 4543, 0 },
- { TX_LOV5_027, 2035, 0 },
- { TX_LOV5_028, 9148, 0 },
- { TX_LOV5_029, 3893, 0 },
- { TX_LOV5_030, 1939, 0 },
- { TX_LOV5_031, 9380, 0 },
- { TX_LOV5_032, 1629, 0 },
- { TX_LOV5_033, 3159, 0 },
- { TX_LOV5_034, 11526, 0 },
- { TX_LOV5_036, 11189, 0 },
- { TX_LOV5_038, 1990, 0 },
- { TX_LOV5_039, 2414, 0 },
- { TX_LOV5_040, 2334, 0 },
- { TX_LOV5_042, 2607, 0 },
- { TX_LOV5_043, 12668, 0 },
- { TX_LOV5_044, 9199, 0 },
- { TX_LOV5_045, 1756, 0 },
- { TX_LOV5_046, 9839, 0 },
- { TX_LOV5_047, 11049, 0 },
- { TX_LOV5_048, 10854, 0 },
- { TX_LOV5_049, 11642, 0 },
- { TX_LOV5_050, 9442, 0 },
- { TX_LOV5_051, 11290, 0 },
- { TX_LOV5_052, 3039, 0 },
- { TX_LOV5_053, 4426, 0 },
- { TX_LOV5_054, 10123, 0 },
- { TX_LOV5_055, 2685, 0 },
- { TX_LOV5_056, 2744, 0 },
- { TX_LOV5_057, 10052, 0 },
- { TX_LOV5_058, 10193, 0 },
- { TX_LOV5_059, 11980, 0 },
- { TX_LOV5_060, 12789, 0 },
- { TX_LOV5_061, 12604, 0 },
- { TX_LOV5_023, 5017, 0 },
- { TX_LOV5_041, 5296, 0 },
- { TX_FEA5_008, 706, 0 },
- { TX_G_024, 11501, 0 },
- { TX_LOV5N000, 10294, 0 },
- { TX_LOV5N001, 9732, 0 },
- { TX_LOV5N001, 9890, 0 },
- { TX_LOV5N002, 10571, 0 },
- { TX_LOV5N003, 10691, 0 },
- { TX_LOV5N004, 10481, 0 },
- { TX_LOV5N005, 10633, 0 },
- { TX_LOV5N006, 1352, 0 },
- { TX_LOV5N007, 4813, 0 },
- { TX_LOV5N008, 863, 0 },
- { TX_LOV5N009, 1115, 0 },
- { TX_LOV5N010, 9660, 0 },
- { TX_LOV5N011, 10413, 0 },
- { TX_LOV5N012, 10359, 0 },
- { TX_LOV5N013, 9040, 0 },
- { TX_LOV5N014, 9961, 0 },
- { TX_LOV5N016, 9311, 0 },
- { TX_LOV5N017, 4320, 0 },
- { TX_LOV5N018, 3805, 0 },
- //{ TX_LOV5C001, 1598, 0 },
- { TX_DIALOG_ERROR, 11927, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 8968, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 8979, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 8989, 0, 0, 0 },
+ { TX_SPEAKER_FERRIS, 8999, 0, 0, 0 },
+ { TX_SPEAKER_CHEEVER, 9027, 0, 0, 0 },
+ { TX_SPEAKER_MARCUS, 9016, 0, 0, 0 },
+ { TX_SPEAKER_PREAX, 9010, 0, 0, 0 },
+ { TX_LOV0_011, 13010, 0, 0, 0 },
+ { TX_LOV0_012, 13137, 0, 0, 0 },
+ { TX_LOV0_013, 13433, 0, 0, 0 },
+ { TX_LOV0_014, 13197, 0, 0, 0 },
+ { TX_LOV0_015, 13301, 0, 0, 0 },
+ { TX_LOV0_016, 13104, 0, 0, 0 },
+ { TX_LOV0_017, 13567, 0, 0, 0 },
+ { TX_LOV0_019, 13487, 0, 0, 0 },
+ { TX_LOV0_020, 13044, 0, 0, 0 },
+ { TX_LOV0_021, 13355, 0, 0, 0 },
+ { TX_LOV0_022, 13245, 0, 0, 0 },
+ { TX_LOV0_025, 14493, 0, 0, 0 },
+ { TX_LOV0_026, 14366, 0, 0, 0 },
+ { TX_LOV0_029, 14246, 0, 0, 0 },
+ { TX_LOV0_033, 14306, 0, 0, 0 },
+ { TX_LOV0_039, 13628, 0, 0, 0 },
+ { TX_LOV0_040, 13755, 0, 0, 0 },
+ { TX_LOV0_041, 14051, 0, 0, 0 },
+ { TX_LOV0_042, 13815, 0, 0, 0 },
+ { TX_LOV0_043, 13919, 0, 0, 0 },
+ { TX_LOV0_045, 13722, 0, 0, 0 },
+ { TX_LOV0_046, 14185, 0, 0, 0 },
+ { TX_LOV0_047, 14105, 0, 0, 0 },
+ { TX_LOV0_048, 13662, 0, 0, 0 },
+ { TX_LOV0_049, 13973, 0, 0, 0 },
+ { TX_LOV0_050, 13863, 0, 0, 0 },
+ { TX_LOV0_101, 14574, 0, 0, 0 },
+ { TX_LOV0_102, 14638, 0, 0, 0 },
+ { TX_LOV0_103, 14708, 0, 0, 0 },
+ { TX_LOV0_104, 14758, 0, 0, 0 },
+ { TX_LOV0_105, 14815, 0, 0, 0 },
+ { TX_LOV0_106, 14927, 0, 0, 0 },
+ { TX_LOV0_107, 14995, 0, 0, 0 },
+ { TX_LOV0_124, 14443, 0, 0, 0 },
+ { TX_LOV5_001, 2119, 0, 0, 0 },
+ { TX_LOV5_002, 1715, 0, 0, 0 },
+ { TX_LOV5_003, 10797, 0, 0, 0 },
+ { TX_LOV5_004, 12334, 0, 0, 0 },
+ { TX_LOV5_005, 4485, 0, 0, 0 },
+ { TX_LOV5_006, 12464, 0, 0, 0 },
+ { TX_LOV5_007, 4020, 0, 0, 0 },
+ { TX_LOV5_008, 12178, 0, 0, 0 },
+ { TX_LOV5_009, 10983, 0, 0, 0 },
+ { TX_LOV5_010, 1502, 0, 0, 0 },
+ { TX_LOV5_011, 614, 0, 0, 0 },
+ { TX_LOV5_013, 4130, 0, 0, 0 },
+ { TX_LOV5_014, 2897, 0, 0, 0 },
+ { TX_LOV5_015, 3732, 0, 0, 0 },
+ { TX_LOV5_016, 3576, 0, 0, 0 },
+ { TX_LOV5_017, 4915, 0, 0, 0 },
+ { TX_LOV5_018, 1263, 0, 0, 0 },
+ { TX_LOV5_019, 3654, 0, 0, 0 },
+ { TX_LOV5_020, 4640, 0, 0, 0 },
+ { TX_LOV5_021, 1821, 0, 0, 0 },
+ { TX_LOV5_024, 3407, 0, 0, 0 },
+ { TX_LOV5_025, 11753, 0, 0, 0 },
+ { TX_LOV5_026, 4543, 0, 0, 0 },
+ { TX_LOV5_027, 2035, 0, 0, 0 },
+ { TX_LOV5_028, 9148, 0, 0, 0 },
+ { TX_LOV5_029, 3893, 0, 0, 0 },
+ { TX_LOV5_030, 1939, 0, 0, 0 },
+ { TX_LOV5_031, 9380, 0, 0, 0 },
+ { TX_LOV5_032, 1629, 0, 0, 0 },
+ { TX_LOV5_033, 3159, 0, 0, 0 },
+ { TX_LOV5_034, 11526, 0, 0, 0 },
+ { TX_LOV5_036, 11189, 0, 0, 0 },
+ { TX_LOV5_038, 1990, 0, 0, 0 },
+ { TX_LOV5_039, 2414, 0, 0, 0 },
+ { TX_LOV5_040, 2334, 0, 0, 0 },
+ { TX_LOV5_042, 2607, 0, 0, 0 },
+ { TX_LOV5_043, 12668, 0, 0, 0 },
+ { TX_LOV5_044, 9199, 0, 0, 0 },
+ { TX_LOV5_045, 1756, 0, 0, 0 },
+ { TX_LOV5_046, 9839, 0, 0, 0 },
+ { TX_LOV5_047, 11049, 0, 0, 0 },
+ { TX_LOV5_048, 10854, 0, 0, 0 },
+ { TX_LOV5_049, 11642, 0, 0, 0 },
+ { TX_LOV5_050, 9442, 0, 0, 0 },
+ { TX_LOV5_051, 11290, 0, 0, 0 },
+ { TX_LOV5_052, 3039, 0, 0, 0 },
+ { TX_LOV5_053, 4426, 0, 0, 0 },
+ { TX_LOV5_054, 10123, 0, 0, 0 },
+ { TX_LOV5_055, 2685, 0, 0, 0 },
+ { TX_LOV5_056, 2744, 0, 0, 0 },
+ { TX_LOV5_057, 10052, 0, 0, 0 },
+ { TX_LOV5_058, 10193, 0, 0, 0 },
+ { TX_LOV5_059, 11980, 0, 0, 0 },
+ { TX_LOV5_060, 12789, 0, 0, 0 },
+ { TX_LOV5_061, 12604, 0, 0, 0 },
+ { TX_LOV5_023, 5017, 0, 0, 0 },
+ { TX_LOV5_041, 5296, 0, 0, 0 },
+ { TX_FEA5_008, 706, 0, 0, 0 },
+ { TX_G_024, 11501, 0, 0, 0 },
+ { TX_LOV5N000, 10294, 0, 0, 0 },
+ { TX_LOV5N001, 9732, 0, 0, 0 },
+ { TX_LOV5N001, 9890, 0, 0, 0 },
+ { TX_LOV5N002, 10571, 0, 0, 0 },
+ { TX_LOV5N003, 10691, 0, 0, 0 },
+ { TX_LOV5N004, 10481, 0, 0, 0 },
+ { TX_LOV5N005, 10633, 0, 0, 0 },
+ { TX_LOV5N006, 1352, 0, 0, 0 },
+ { TX_LOV5N007, 4813, 0, 0, 0 },
+ { TX_LOV5N008, 863, 0, 0, 0 },
+ { TX_LOV5N009, 1115, 0, 0, 0 },
+ { TX_LOV5N010, 9660, 0, 0, 0 },
+ { TX_LOV5N011, 10413, 0, 0, 0 },
+ { TX_LOV5N012, 10359, 0, 0, 0 },
+ { TX_LOV5N013, 9040, 0, 0, 0 },
+ { TX_LOV5N014, 9961, 0, 0, 0 },
+ { TX_LOV5N016, 9311, 0, 0, 0 },
+ { TX_LOV5N017, 4320, 0, 0, 0 },
+ { TX_LOV5N018, 3805, 0, 0, 0 },
+ //{ TX_LOV5C001, 1598, 0, 0, 0 },
+ { TX_DIALOG_ERROR, 11927, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText love5Texts[] = {
diff --git a/engines/startrek/rooms/lovea.cpp b/engines/startrek/rooms/lovea.cpp
index a0e7d56cb5..f00cdcc431 100644
--- a/engines/startrek/rooms/lovea.cpp
+++ b/engines/startrek/rooms/lovea.cpp
@@ -46,69 +46,69 @@ enum loveTextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets loveTextOffsets[] = {
- { TX_SPEAKER_KIRK, 5915, 0 },
- { TX_SPEAKER_MCCOY, 5926, 0 },
- { TX_SPEAKER_SPOCK, 5936, 0 },
- { TX_SPEAKER_UHURA, 4990, 0 },
- { TX_SPEAKER_FERRIS, 5946, 0 },
- { TX_LOV0_011, 10498, 0 },
- { TX_LOV0_012, 10625, 0 },
- { TX_LOV0_013, 10921, 0 },
- { TX_LOV0_014, 10685, 0 },
- { TX_LOV0_015, 10789, 0 },
- { TX_LOV0_016, 10592, 0 },
- { TX_LOV0_017, 11055, 0 },
- { TX_LOV0_019, 10975, 0 },
- { TX_LOV0_020, 10532, 0 },
- { TX_LOV0_021, 10843, 0 },
- { TX_LOV0_022, 10733, 0 },
- { TX_LOV0_025, 11981, 0 },
- { TX_LOV0_026, 11854, 0 },
- { TX_LOV0_029, 11734, 0 },
- { TX_LOV0_033, 11794, 0 },
- { TX_LOV0_039, 11116, 0 },
- { TX_LOV0_040, 11243, 0 },
- { TX_LOV0_041, 11539, 0 },
- { TX_LOV0_042, 11303, 0 },
- { TX_LOV0_043, 11407, 0 },
- { TX_LOV0_045, 11210, 0 },
- { TX_LOV0_046, 11673, 0 },
- { TX_LOV0_047, 11593, 0 },
- { TX_LOV0_048, 11150, 0 },
- { TX_LOV0_050, 11351, 0 },
- { TX_LOV0_101, 12062, 0 },
- { TX_LOV0_102, 12126, 0 },
- { TX_LOV0_103, 12196, 0 },
- { TX_LOV0_104, 12246, 0 },
- { TX_LOV0_105, 12303, 0 },
- { TX_LOV0_106, 12415, 0 },
- { TX_LOV0_107, 12483, 0 },
- { TX_LOV0_124, 11931, 0 },
- { TX_LOV5_015, 3009, 0 },
- { TX_LOV5_019, 2931, 0 },
- { TX_LOV5_027, 3444, 0 },
- { TX_LOV5_030, 3348, 0 },
- { TX_LOV5_038, 444, 0 },
- { TX_LOVA_100, 4553, 0 },
- { TX_LOVA_F01, 3995, 0 },
- { TX_LOVA_F02, 4067, 0 },
- { TX_LOVA_F03, 4266, 0 },
- { TX_LOVA_F04, 4181, 0 },
- { TX_LOVA_F07, 4630, 0 },
- { TX_LOVA_F08, 3619, 0 },
- { TX_LOVA_F10, 4501, 0 },
- { TX_LOVA_F54, 3775, 0 },
- { TX_LOVA_F55, 3076, 0 },
- { TX_TUG2_010, 4431, 0 },
- { TX_MUD2_040, 4826, 0 },
- { TX_LOV2N005, 4689, 0 },
- { TX_MUD4_018, 5035, 0 },
- { TX_BRIDU146, 5104, 0 },
- { TX_VENA_F41, 5158, 0 },
- { TX_LOV5C001, 3497, 0 },
- { TX_SPOKCOFF, 3564, 0 },
- { TX_GENER004, 3924, 0 }, // Game over
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 5915, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 5926, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 5936, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 4990, 0, 0, 0 },
+ { TX_SPEAKER_FERRIS, 5946, 0, 0, 0 },
+ { TX_LOV0_011, 10498, 0, 0, 0 },
+ { TX_LOV0_012, 10625, 0, 0, 0 },
+ { TX_LOV0_013, 10921, 0, 0, 0 },
+ { TX_LOV0_014, 10685, 0, 0, 0 },
+ { TX_LOV0_015, 10789, 0, 0, 0 },
+ { TX_LOV0_016, 10592, 0, 0, 0 },
+ { TX_LOV0_017, 11055, 0, 0, 0 },
+ { TX_LOV0_019, 10975, 0, 0, 0 },
+ { TX_LOV0_020, 10532, 0, 0, 0 },
+ { TX_LOV0_021, 10843, 0, 0, 0 },
+ { TX_LOV0_022, 10733, 0, 0, 0 },
+ { TX_LOV0_025, 11981, 0, 0, 0 },
+ { TX_LOV0_026, 11854, 0, 0, 0 },
+ { TX_LOV0_029, 11734, 0, 0, 0 },
+ { TX_LOV0_033, 11794, 0, 0, 0 },
+ { TX_LOV0_039, 11116, 0, 0, 0 },
+ { TX_LOV0_040, 11243, 0, 0, 0 },
+ { TX_LOV0_041, 11539, 0, 0, 0 },
+ { TX_LOV0_042, 11303, 0, 0, 0 },
+ { TX_LOV0_043, 11407, 0, 0, 0 },
+ { TX_LOV0_045, 11210, 0, 0, 0 },
+ { TX_LOV0_046, 11673, 0, 0, 0 },
+ { TX_LOV0_047, 11593, 0, 0, 0 },
+ { TX_LOV0_048, 11150, 0, 0, 0 },
+ { TX_LOV0_050, 11351, 0, 0, 0 },
+ { TX_LOV0_101, 12062, 0, 0, 0 },
+ { TX_LOV0_102, 12126, 0, 0, 0 },
+ { TX_LOV0_103, 12196, 0, 0, 0 },
+ { TX_LOV0_104, 12246, 0, 0, 0 },
+ { TX_LOV0_105, 12303, 0, 0, 0 },
+ { TX_LOV0_106, 12415, 0, 0, 0 },
+ { TX_LOV0_107, 12483, 0, 0, 0 },
+ { TX_LOV0_124, 11931, 0, 0, 0 },
+ { TX_LOV5_015, 3009, 0, 0, 0 },
+ { TX_LOV5_019, 2931, 0, 0, 0 },
+ { TX_LOV5_027, 3444, 0, 0, 0 },
+ { TX_LOV5_030, 3348, 0, 0, 0 },
+ { TX_LOV5_038, 444, 0, 0, 0 },
+ { TX_LOVA_100, 4553, 0, 0, 0 },
+ { TX_LOVA_F01, 3995, 0, 0, 0 },
+ { TX_LOVA_F02, 4067, 0, 0, 0 },
+ { TX_LOVA_F03, 4266, 0, 0, 0 },
+ { TX_LOVA_F04, 4181, 0, 0, 0 },
+ { TX_LOVA_F07, 4630, 0, 0, 0 },
+ { TX_LOVA_F08, 3619, 0, 0, 0 },
+ { TX_LOVA_F10, 4501, 0, 0, 0 },
+ { TX_LOVA_F54, 3775, 0, 0, 0 },
+ { TX_LOVA_F55, 3076, 0, 0, 0 },
+ { TX_TUG2_010, 4431, 0, 0, 0 },
+ { TX_MUD2_040, 4826, 0, 0, 0 },
+ { TX_LOV2N005, 4689, 0, 0, 0 },
+ { TX_MUD4_018, 5035, 0, 0, 0 },
+ { TX_BRIDU146, 5104, 0, 0, 0 },
+ { TX_VENA_F41, 5158, 0, 0, 0 },
+ { TX_LOV5C001, 3497, 0, 0, 0 },
+ { TX_SPOKCOFF, 3564, 0, 0, 0 },
+ { TX_GENER004, 3924, 0, 0, 0 }, // Game over
+ { -1, 0, 0, 0, 0 }
};
// Mccoy or Ferris say something under effects of laughing gas
diff --git a/engines/startrek/rooms/mudd0.cpp b/engines/startrek/rooms/mudd0.cpp
index 111d1b8ddb..0c738c06f5 100644
--- a/engines/startrek/rooms/mudd0.cpp
+++ b/engines/startrek/rooms/mudd0.cpp
@@ -110,73 +110,73 @@ enum mudd0TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets mudd0TextOffsets[] = {
- { TX_SPEAKER_KIRK, 2941, 0 },
- { TX_SPEAKER_MCCOY, 2966, 0 },
- { TX_SPEAKER_SPOCK, 2976, 0 },
- { TX_SPEAKER_MUDD, 2999, 0 },
- { TX_SPEAKER_UHURA, 727, 0 },
- { TX_SPEAKER_BUCHERT, 2986, 0 },
- { TX_MUD0_001, 690, 0 },
- { TX_MUD0_003, 7333, 0 },
- { TX_MUD0_004, 7962, 0 },
- { TX_MUD0_005, 4373, 0 },
- { TX_MUD0_006, 4091, 0 },
- { TX_MUD0_007, 6698, 0 },
- { TX_MUD0_008, 8489, 0 },
- { TX_MUD0_009, 3167, 0 },
- { TX_MUD0_010, 6572, 0 },
- { TX_MUD0_011, 1774, 0 },
- { TX_MUD0_012, 5833, 0 },
- { TX_MUD0_013, 5700, 0 },
- { TX_MUD0_014, 7508, 0 },
- { TX_MUD0_015, 7108, 0 },
- { TX_MUD0_016, 7243, 0 },
- { TX_MUD0_017, 3644, 0 },
- { TX_MUD0_018, 2523, 0 },
- { TX_MUD0_019, 2473, 0 },
- { TX_MUD0_020, 2423, 0 },
- { TX_MUD0_021, 5215, 0 },
- { TX_MUD0_022, 6751, 0 },
- { TX_MUD0_023, 6970, 0 },
- { TX_MUD0_024, 7671, 0 },
- { TX_MUD0_025, 8568, 0 },
- { TX_MUD0_026, 3693, 0 },
- { TX_MUD0_027, 7440, 0 },
- { TX_MUD0_028, 3258, 0 },
- { TX_MUD0_029, 4528, 0 },
- { TX_MUD0_030, 8093, 0 },
- { TX_MUD0_031, 6649, 0 },
- { TX_MUD0_032, 7581, 0 },
- { TX_MUD0_033, 4188, 0 },
- { TX_MUD0_034, 6861, 0 },
- { TX_MUD0_035, 7889, 0 },
- { TX_MUD0_036, 8345, 0 },
- { TX_MUD0_037, 3064, 0 },
- { TX_MUD0_038, 7179, 0 },
- { TX_MUD0_039, 8416, 0 },
- { TX_MUD0_040, 8007, 0 },
- { TX_MUD0_041, 8265, 0 },
- { TX_MUD0N000, 5404, 0 },
- { TX_MUD0N001, 6253, 0 },
- { TX_MUD0N002, 5513, 0 },
- { TX_MUD0N003, 6478, 0 },
- { TX_MUD0N004, 6117, 0 },
- { TX_MUD0N005, 6374, 0 },
- { TX_MUD0N006, 2573, 0 },
- { TX_MUD0N007, 6183, 0 },
- { TX_MUD0N008, 5330, 0 },
- { TX_MUD0N009, 2781, 0 },
- { TX_MUD0N010, 5139, 0 },
- { TX_MUD0N011, 6036, 0 },
- { TX_MUD0N012, 4711, 0 },
- { TX_MUD0N013, 4816, 0 },
- { TX_MUD0N014, 5599, 0 },
- { TX_MUD0N015, 5067, 0 },
- { TX_MUD0N016, 8799, 0 },
- { TX_MUD0N019, 4899, 0 },
- { TX_LOV1N007, 8778, 0 },
- { TX_STATICU1, 737, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 2941, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 2966, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 2976, 0, 0, 0 },
+ { TX_SPEAKER_MUDD, 2999, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 727, 0, 0, 0 },
+ { TX_SPEAKER_BUCHERT, 2986, 0, 0, 0 },
+ { TX_MUD0_001, 690, 0, 0, 0 },
+ { TX_MUD0_003, 7333, 0, 0, 0 },
+ { TX_MUD0_004, 7962, 0, 0, 0 },
+ { TX_MUD0_005, 4373, 0, 0, 0 },
+ { TX_MUD0_006, 4091, 0, 0, 0 },
+ { TX_MUD0_007, 6698, 0, 0, 0 },
+ { TX_MUD0_008, 8489, 0, 0, 0 },
+ { TX_MUD0_009, 3167, 0, 0, 0 },
+ { TX_MUD0_010, 6572, 0, 0, 0 },
+ { TX_MUD0_011, 1774, 0, 0, 0 },
+ { TX_MUD0_012, 5833, 0, 0, 0 },
+ { TX_MUD0_013, 5700, 0, 0, 0 },
+ { TX_MUD0_014, 7508, 0, 0, 0 },
+ { TX_MUD0_015, 7108, 0, 0, 0 },
+ { TX_MUD0_016, 7243, 0, 0, 0 },
+ { TX_MUD0_017, 3644, 0, 0, 0 },
+ { TX_MUD0_018, 2523, 0, 0, 0 },
+ { TX_MUD0_019, 2473, 0, 0, 0 },
+ { TX_MUD0_020, 2423, 0, 0, 0 },
+ { TX_MUD0_021, 5215, 0, 0, 0 },
+ { TX_MUD0_022, 6751, 0, 0, 0 },
+ { TX_MUD0_023, 6970, 0, 0, 0 },
+ { TX_MUD0_024, 7671, 0, 0, 0 },
+ { TX_MUD0_025, 8568, 0, 0, 0 },
+ { TX_MUD0_026, 3693, 0, 0, 0 },
+ { TX_MUD0_027, 7440, 0, 0, 0 },
+ { TX_MUD0_028, 3258, 0, 0, 0 },
+ { TX_MUD0_029, 4528, 0, 0, 0 },
+ { TX_MUD0_030, 8093, 0, 0, 0 },
+ { TX_MUD0_031, 6649, 0, 0, 0 },
+ { TX_MUD0_032, 7581, 0, 0, 0 },
+ { TX_MUD0_033, 4188, 0, 0, 0 },
+ { TX_MUD0_034, 6861, 0, 0, 0 },
+ { TX_MUD0_035, 7889, 0, 0, 0 },
+ { TX_MUD0_036, 8345, 0, 0, 0 },
+ { TX_MUD0_037, 3064, 0, 0, 0 },
+ { TX_MUD0_038, 7179, 0, 0, 0 },
+ { TX_MUD0_039, 8416, 0, 0, 0 },
+ { TX_MUD0_040, 8007, 0, 0, 0 },
+ { TX_MUD0_041, 8265, 0, 0, 0 },
+ { TX_MUD0N000, 5404, 0, 0, 0 },
+ { TX_MUD0N001, 6253, 0, 0, 0 },
+ { TX_MUD0N002, 5513, 0, 0, 0 },
+ { TX_MUD0N003, 6478, 0, 0, 0 },
+ { TX_MUD0N004, 6117, 0, 0, 0 },
+ { TX_MUD0N005, 6374, 0, 0, 0 },
+ { TX_MUD0N006, 2573, 0, 0, 0 },
+ { TX_MUD0N007, 6183, 0, 0, 0 },
+ { TX_MUD0N008, 5330, 0, 0, 0 },
+ { TX_MUD0N009, 2781, 0, 0, 0 },
+ { TX_MUD0N010, 5139, 0, 0, 0 },
+ { TX_MUD0N011, 6036, 0, 0, 0 },
+ { TX_MUD0N012, 4711, 0, 0, 0 },
+ { TX_MUD0N013, 4816, 0, 0, 0 },
+ { TX_MUD0N014, 5599, 0, 0, 0 },
+ { TX_MUD0N015, 5067, 0, 0, 0 },
+ { TX_MUD0N016, 8799, 0, 0, 0 },
+ { TX_MUD0N019, 4899, 0, 0, 0 },
+ { TX_LOV1N007, 8778, 0, 0, 0 },
+ { TX_STATICU1, 737, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText mudd0Texts[] = {
diff --git a/engines/startrek/rooms/mudd1.cpp b/engines/startrek/rooms/mudd1.cpp
index 1043e537ab..3934b7baa6 100644
--- a/engines/startrek/rooms/mudd1.cpp
+++ b/engines/startrek/rooms/mudd1.cpp
@@ -123,54 +123,54 @@ enum mudd1TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets mudd1TextOffsets[] = {
- { TX_SPEAKER_KIRK, 3119, 0 },
- { TX_SPEAKER_MCCOY, 3130, 0 },
- { TX_SPEAKER_SPOCK, 3140, 0 },
- { TX_SPEAKER_UHURA, 3162, 0 },
- { TX_SPEAKER_BUCHERT, 3150, 0 },
- { TX_MUD1_001, 471, 0 },
- { TX_MUD1_003, 5160, 0 },
- { TX_MUD1_004, 5023, 0 },
- { TX_MUD1_005, 5885, 0 },
- { TX_MUD1_006, 5744, 0 },
- { TX_MUD1_007, 5231, 0 },
- { TX_MUD1_008, 5971, 0 },
- { TX_MUD1_009, 3561, 0 },
- { TX_MUD1_010, 3751, 0 },
- { TX_MUD1_011, 1546, 0 },
- { TX_MUD1_012, 6082, 0 },
- { TX_MUD1_013, 5815, 0 },
- { TX_MUD1_014, 6545, 0 },
- { TX_MUD1_015, 6647, 0 },
- { TX_MUD1_016, 6293, 0 },
- { TX_MUD1_017, 6236, 0 },
- { TX_MUD1_019, 5916, 0 },
- { TX_MUD1_020, 4092, 0 },
- { TX_MUD1_021, 4686, 0 },
- { TX_MUD1_022, 4582, 0 },
- { TX_MUD1_023, 4860, 0 },
- { TX_MUD1_024, 4478, 0 },
- { TX_MUD1_025, 3906, 0 },
- { TX_MUD1_026, 3473, 0 },
- { TX_MUD1_027, 4005, 0 },
- { TX_MUD1_028, 4309, 0 },
- { TX_MUD1N000, 6347, 0 },
- { TX_MUD1N001, 6413, 0 },
- { TX_MUD1N002, 3291, 0 },
- { TX_MUD1N003, 3411, 0 },
- { TX_MUD1N005, 5357, 0 },
- { TX_MUD1N006, 5666, 0 },
- { TX_MUD1N007, 2457, 0 },
- { TX_MUD1N008, 5577, 0 },
- { TX_MUD1N009, 5434, 0 },
- { TX_MUD1N010, 2649, 0 },
- { TX_MUD1N011, 3173, 0 },
- { TX_MUD1N012, 3348, 0 },
- { TX_MUD1N014, 3704, 0 },
- { TX_MUD1N015, 6499, 0 },
- { TX_MUD1N016, 6453, 0 },
- { TX_STATICU1, 5318, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 3119, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 3130, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 3140, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 3162, 0, 0, 0 },
+ { TX_SPEAKER_BUCHERT, 3150, 0, 0, 0 },
+ { TX_MUD1_001, 471, 0, 0, 0 },
+ { TX_MUD1_003, 5160, 0, 0, 0 },
+ { TX_MUD1_004, 5023, 0, 0, 0 },
+ { TX_MUD1_005, 5885, 0, 0, 0 },
+ { TX_MUD1_006, 5744, 0, 0, 0 },
+ { TX_MUD1_007, 5231, 0, 0, 0 },
+ { TX_MUD1_008, 5971, 0, 0, 0 },
+ { TX_MUD1_009, 3561, 0, 0, 0 },
+ { TX_MUD1_010, 3751, 0, 0, 0 },
+ { TX_MUD1_011, 1546, 0, 0, 0 },
+ { TX_MUD1_012, 6082, 0, 0, 0 },
+ { TX_MUD1_013, 5815, 0, 0, 0 },
+ { TX_MUD1_014, 6545, 0, 0, 0 },
+ { TX_MUD1_015, 6647, 0, 0, 0 },
+ { TX_MUD1_016, 6293, 0, 0, 0 },
+ { TX_MUD1_017, 6236, 0, 0, 0 },
+ { TX_MUD1_019, 5916, 0, 0, 0 },
+ { TX_MUD1_020, 4092, 0, 0, 0 },
+ { TX_MUD1_021, 4686, 0, 0, 0 },
+ { TX_MUD1_022, 4582, 0, 0, 0 },
+ { TX_MUD1_023, 4860, 0, 0, 0 },
+ { TX_MUD1_024, 4478, 0, 0, 0 },
+ { TX_MUD1_025, 3906, 0, 0, 0 },
+ { TX_MUD1_026, 3473, 0, 0, 0 },
+ { TX_MUD1_027, 4005, 0, 0, 0 },
+ { TX_MUD1_028, 4309, 0, 0, 0 },
+ { TX_MUD1N000, 6347, 0, 0, 0 },
+ { TX_MUD1N001, 6413, 0, 0, 0 },
+ { TX_MUD1N002, 3291, 0, 0, 0 },
+ { TX_MUD1N003, 3411, 0, 0, 0 },
+ { TX_MUD1N005, 5357, 0, 0, 0 },
+ { TX_MUD1N006, 5666, 0, 0, 0 },
+ { TX_MUD1N007, 2457, 0, 0, 0 },
+ { TX_MUD1N008, 5577, 0, 0, 0 },
+ { TX_MUD1N009, 5434, 0, 0, 0 },
+ { TX_MUD1N010, 2649, 0, 0, 0 },
+ { TX_MUD1N011, 3173, 0, 0, 0 },
+ { TX_MUD1N012, 3348, 0, 0, 0 },
+ { TX_MUD1N014, 3704, 0, 0, 0 },
+ { TX_MUD1N015, 6499, 0, 0, 0 },
+ { TX_MUD1N016, 6453, 0, 0, 0 },
+ { TX_STATICU1, 5318, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText mudd1Texts[] = {
diff --git a/engines/startrek/rooms/mudd2.cpp b/engines/startrek/rooms/mudd2.cpp
index 480d342e25..ba947b73f5 100644
--- a/engines/startrek/rooms/mudd2.cpp
+++ b/engines/startrek/rooms/mudd2.cpp
@@ -123,76 +123,76 @@ enum mudd2TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets mudd2TextOffsets[] = {
- { TX_SPEAKER_KIRK, 333, 0 },
- { TX_SPEAKER_MCCOY, 344, 0 },
- { TX_SPEAKER_SPOCK, 354, 0 },
- { TX_SPEAKER_UHURA, 376, 0 },
- { TX_SPEAKER_BUCHERT, 364, 0 },
- { TX_SPEAKER_MUDD, 386, 0 },
- { TX_MUD2_001, 5240, 0 },
- { TX_MUD2_002, 1977, 0 },
- { TX_MUD2_003, 8694, 0 },
- { TX_MUD2_004, 2392, 0 },
- { TX_MUD2_005, 8288, 0 },
- { TX_MUD2_006, 10058, 0 },
- { TX_MUD2_007, 9467, 0 },
- { TX_MUD2_008, 9763, 0 },
- { TX_MUD2_009, 1719, 0 },
- { TX_MUD2_010, 9121, 0 },
- { TX_MUD2_011, 9266, 0 },
- { TX_MUD2_012, 5126, 0 },
- { TX_MUD2_013, 5690, 0 },
- { TX_MUD2_014, 2729, 0 },
- { TX_MUD2_015, 5973, 0 },
- { TX_MUD2_016, 5875, 0 },
- { TX_MUD2_018, 1307, 0 },
- { TX_MUD2_019, 2458, 0 },
- { TX_MUD2_020, 2937, 0 },
- { TX_MUD2_021, 6114, 0 },
- { TX_MUD2_022, 3515, 0 },
- { TX_MUD2_023, 10226, 0 },
- { TX_MUD2_024, 10113, 0 },
- { TX_MUD2_025, 9366, 0 },
- { TX_MUD2_026, 4089, 0 },
- { TX_MUD2_027, 8547, 0 },
- { TX_MUD2_028, 9050, 0 },
- { TX_MUD2_029, 3045, 0 },
- { TX_MUD2_030, 2232, 0 },
- { TX_MUD2_031, 4278, 0 },
- { TX_MUD2_032, 3764, 0 },
- { TX_MUD2_033, 6423, 0 },
- { TX_MUD2_034, 3292, 0 },
- { TX_MUD2_035, 8400, 0 },
- { TX_MUD2_036, 8737, 0 },
- { TX_MUD2_037, 1165, 0 },
- { TX_MUD2_038, 8446, 0 },
- { TX_MUD2_039, 3202, 0 },
- { TX_MUD2_040, 9223, 0 },
- { TX_MUD2_042, 4656, 0 },
- { TX_MUD2_043, 4831, 0 },
- { TX_MUD2_044, 3575, 0 },
- { TX_MUD2_045, 6564, 0 },
- { TX_MUD2_046, 8342, 0 },
- { TX_MUD2_047, 9841, 0 },
- { TX_MUD2_048, 8883, 0 },
- { TX_MUD2_049, 3917, 0 },
- { TX_MUD2_050, 4442, 0 },
- { TX_MUD2_051, 4190, 0 },
- { TX_MUD2_052, 5521, 0 },
- { TX_MUD2_053, 4525, 0 },
- { TX_MUD2_054, 9535, 0 },
- { TX_MUD2_055, 8611, 0 },
- { TX_MUD2N000, 7954, 0 },
- { TX_MUD2N002, 8128, 0 },
- { TX_MUD2N003, 7795, 0 },
- { TX_MUD2N004, 8028, 0 },
- { TX_MUD2N005, 7449, 0 },
- { TX_MUD2N006, 7899, 0 },
- { TX_MUD2N007, 10590, 0 },
- { TX_MUD2N008, 2122, 0 },
- { TX_MUD2N011, 10479, 0 },
- { TX_STATICU1, 1756, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 333, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 344, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 354, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 376, 0, 0, 0 },
+ { TX_SPEAKER_BUCHERT, 364, 0, 0, 0 },
+ { TX_SPEAKER_MUDD, 386, 0, 0, 0 },
+ { TX_MUD2_001, 5240, 0, 0, 0 },
+ { TX_MUD2_002, 1977, 0, 0, 0 },
+ { TX_MUD2_003, 8694, 0, 0, 0 },
+ { TX_MUD2_004, 2392, 0, 0, 0 },
+ { TX_MUD2_005, 8288, 0, 0, 0 },
+ { TX_MUD2_006, 10058, 0, 0, 0 },
+ { TX_MUD2_007, 9467, 0, 0, 0 },
+ { TX_MUD2_008, 9763, 0, 0, 0 },
+ { TX_MUD2_009, 1719, 0, 0, 0 },
+ { TX_MUD2_010, 9121, 0, 0, 0 },
+ { TX_MUD2_011, 9266, 0, 0, 0 },
+ { TX_MUD2_012, 5126, 0, 0, 0 },
+ { TX_MUD2_013, 5690, 0, 0, 0 },
+ { TX_MUD2_014, 2729, 0, 0, 0 },
+ { TX_MUD2_015, 5973, 0, 0, 0 },
+ { TX_MUD2_016, 5875, 0, 0, 0 },
+ { TX_MUD2_018, 1307, 0, 0, 0 },
+ { TX_MUD2_019, 2458, 0, 0, 0 },
+ { TX_MUD2_020, 2937, 0, 0, 0 },
+ { TX_MUD2_021, 6114, 0, 0, 0 },
+ { TX_MUD2_022, 3515, 0, 0, 0 },
+ { TX_MUD2_023, 10226, 0, 0, 0 },
+ { TX_MUD2_024, 10113, 0, 0, 0 },
+ { TX_MUD2_025, 9366, 0, 0, 0 },
+ { TX_MUD2_026, 4089, 0, 0, 0 },
+ { TX_MUD2_027, 8547, 0, 0, 0 },
+ { TX_MUD2_028, 9050, 0, 0, 0 },
+ { TX_MUD2_029, 3045, 0, 0, 0 },
+ { TX_MUD2_030, 2232, 0, 0, 0 },
+ { TX_MUD2_031, 4278, 0, 0, 0 },
+ { TX_MUD2_032, 3764, 0, 0, 0 },
+ { TX_MUD2_033, 6423, 0, 0, 0 },
+ { TX_MUD2_034, 3292, 0, 0, 0 },
+ { TX_MUD2_035, 8400, 0, 0, 0 },
+ { TX_MUD2_036, 8737, 0, 0, 0 },
+ { TX_MUD2_037, 1165, 0, 0, 0 },
+ { TX_MUD2_038, 8446, 0, 0, 0 },
+ { TX_MUD2_039, 3202, 0, 0, 0 },
+ { TX_MUD2_040, 9223, 0, 0, 0 },
+ { TX_MUD2_042, 4656, 0, 0, 0 },
+ { TX_MUD2_043, 4831, 0, 0, 0 },
+ { TX_MUD2_044, 3575, 0, 0, 0 },
+ { TX_MUD2_045, 6564, 0, 0, 0 },
+ { TX_MUD2_046, 8342, 0, 0, 0 },
+ { TX_MUD2_047, 9841, 0, 0, 0 },
+ { TX_MUD2_048, 8883, 0, 0, 0 },
+ { TX_MUD2_049, 3917, 0, 0, 0 },
+ { TX_MUD2_050, 4442, 0, 0, 0 },
+ { TX_MUD2_051, 4190, 0, 0, 0 },
+ { TX_MUD2_052, 5521, 0, 0, 0 },
+ { TX_MUD2_053, 4525, 0, 0, 0 },
+ { TX_MUD2_054, 9535, 0, 0, 0 },
+ { TX_MUD2_055, 8611, 0, 0, 0 },
+ { TX_MUD2N000, 7954, 0, 0, 0 },
+ { TX_MUD2N002, 8128, 0, 0, 0 },
+ { TX_MUD2N003, 7795, 0, 0, 0 },
+ { TX_MUD2N004, 8028, 0, 0, 0 },
+ { TX_MUD2N005, 7449, 0, 0, 0 },
+ { TX_MUD2N006, 7899, 0, 0, 0 },
+ { TX_MUD2N007, 10590, 0, 0, 0 },
+ { TX_MUD2N008, 2122, 0, 0, 0 },
+ { TX_MUD2N011, 10479, 0, 0, 0 },
+ { TX_STATICU1, 1756, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText mudd2Texts[] = {
diff --git a/engines/startrek/rooms/mudd3.cpp b/engines/startrek/rooms/mudd3.cpp
index 96337562df..2854bfab2d 100644
--- a/engines/startrek/rooms/mudd3.cpp
+++ b/engines/startrek/rooms/mudd3.cpp
@@ -110,99 +110,99 @@ enum mudd3TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets mudd3TextOffsets[] = {
- { TX_SPEAKER_KIRK, 3778, 0 },
- { TX_SPEAKER_MCCOY, 3789, 0 },
- { TX_SPEAKER_SPOCK, 3799, 0 },
- { TX_SPEAKER_UHURA, 524, 0 },
- { TX_SPEAKER_BUCHERT, 3809, 0 },
- { TX_SPEAKER_MUDD, 3821, 0 },
- { TX_MUD3_002, 12100, 0 },
- { TX_MUD3_003, 487, 0 },
- { TX_MUD3_005, 13314, 0 },
- { TX_MUD3_006, 9361, 0 },
- { TX_MUD3_007, 7734, 0 },
- { TX_MUD3_008, 9718, 0 },
- { TX_MUD3_009, 8704, 0 },
- { TX_MUD3_010, 8569, 0 },
- { TX_MUD3_011, 11631, 0 },
- { TX_MUD3_012, 9147, 0 },
- { TX_MUD3_013, 12946, 0 },
- { TX_MUD3_014, 11167, 0 },
- { TX_MUD3_015, 5526, 0 },
- { TX_MUD3_016, 11915, 0 },
- { TX_MUD3_017, 4507, 0 },
- { TX_MUD3_018, 6344, 0 },
- { TX_MUD3_019, 12146, 0 },
- { TX_MUD3_020, 3473, 0 },
- { TX_MUD3_021, 6291, 0 },
- { TX_MUD3_022, 5312, 0 },
- { TX_MUD3_023, 11763, 0 },
- { TX_MUD3_024, 9282, 0 },
- { TX_MUD3_025, 11373, 0 },
- { TX_MUD3_026, 8287, 0 },
- { TX_MUD3_027, 7770, 0 },
- { TX_MUD3_028, 8134, 0 },
- { TX_MUD3_029, 12593, 0 },
- { TX_MUD3_030, 12257, 0 },
- { TX_MUD3_031, 8858, 0 },
- { TX_MUD3_032, 7050, 0 },
- { TX_MUD3_033, 11586, 0 },
- { TX_MUD3_034, 4190, 0 },
- { TX_MUD3_035, 3833, 0 },
- { TX_MUD3_037, 4647, 0 },
- { TX_MUD3_038, 4388, 0 },
- { TX_MUD3_039, 3907, 0 },
- { TX_MUD3_040, 4049, 0 },
- { TX_MUD3_041, 6156, 0 },
- { TX_MUD3_042, 5896, 0 },
- { TX_MUD3_043, 5086, 0 },
- { TX_MUD3_044, 4851, 0 },
- { TX_MUD3_046, 7649, 0 },
- { TX_MUD3_047, 5629, 0 },
- { TX_MUD3_048, 9448, 0 },
- { TX_MUD3_049, 7393, 0 },
- { TX_MUD3_050, 7152, 0 },
- { TX_MUD3_051, 9784, 0 },
- { TX_MUD3_052, 9015, 0 },
- { TX_MUD3_053, 7890, 0 },
- { TX_MUD3_054, 6745, 0 },
- { TX_MUD3_055, 11459, 0 },
- { TX_MUD3_056, 5448, 0 },
- { TX_MUD3_057, 11261, 0 },
- { TX_MUD3_058, 13030, 0 },
- { TX_MUD3_059, 13225, 0 },
- { TX_MUD3_060, 12512, 0 },
- { TX_MUD3_061, 12832, 0 },
- { TX_MUD3_062, 12375, 0 },
- { TX_MUD3_063, 8836, 0 },
- { TX_MUD3_064, 8794, 0 },
- { TX_MUD3_065, 8447, 0 },
- { TX_MUD3_066, 8633, 0 },
- { TX_MUD3_067, 12427, 0 },
- { TX_MUD3_069, 13141, 0 },
- { TX_MUD3_070, 11823, 0 },
- { TX_MUD3_071, 11966, 0 },
- { TX_MUD3N000, 8982, 0 },
- { TX_MUD3N002, 10865, 0 },
- { TX_MUD3N003, 11075, 0 },
- { TX_MUD3N004, 10800, 0 },
- { TX_MUD3N005, 10481, 0 },
- { TX_MUD3N006, 10993, 0 },
- { TX_MUD3N007, 10692, 0 },
- { TX_MUD3N008, 2490, 0 },
- { TX_MUD3N009, 10937, 0 },
- { TX_MUD3N010, 10640, 0 },
- { TX_MUD3N011, 4615, 0 },
- { TX_MUD3N012, 10570, 0 },
- { TX_MUD3N013, 2698, 0 },
- { TX_MUD3N014, 9939, 0 },
- { TX_MUD3N015, 4749, 0 },
- { TX_MUD3N017, 4331, 0 },
- { TX_MUD3N018, 10144, 0 },
- { TX_MUD3N019, 10095, 0 },
- { TX_MUD3N020, 10005, 0 },
- { TX_STATICU1, 534, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 3778, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 3789, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 3799, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 524, 0, 0, 0 },
+ { TX_SPEAKER_BUCHERT, 3809, 0, 0, 0 },
+ { TX_SPEAKER_MUDD, 3821, 0, 0, 0 },
+ { TX_MUD3_002, 12100, 0, 0, 0 },
+ { TX_MUD3_003, 487, 0, 0, 0 },
+ { TX_MUD3_005, 13314, 0, 0, 0 },
+ { TX_MUD3_006, 9361, 0, 0, 0 },
+ { TX_MUD3_007, 7734, 0, 0, 0 },
+ { TX_MUD3_008, 9718, 0, 0, 0 },
+ { TX_MUD3_009, 8704, 0, 0, 0 },
+ { TX_MUD3_010, 8569, 0, 0, 0 },
+ { TX_MUD3_011, 11631, 0, 0, 0 },
+ { TX_MUD3_012, 9147, 0, 0, 0 },
+ { TX_MUD3_013, 12946, 0, 0, 0 },
+ { TX_MUD3_014, 11167, 0, 0, 0 },
+ { TX_MUD3_015, 5526, 0, 0, 0 },
+ { TX_MUD3_016, 11915, 0, 0, 0 },
+ { TX_MUD3_017, 4507, 0, 0, 0 },
+ { TX_MUD3_018, 6344, 0, 0, 0 },
+ { TX_MUD3_019, 12146, 0, 0, 0 },
+ { TX_MUD3_020, 3473, 0, 0, 0 },
+ { TX_MUD3_021, 6291, 0, 0, 0 },
+ { TX_MUD3_022, 5312, 0, 0, 0 },
+ { TX_MUD3_023, 11763, 0, 0, 0 },
+ { TX_MUD3_024, 9282, 0, 0, 0 },
+ { TX_MUD3_025, 11373, 0, 0, 0 },
+ { TX_MUD3_026, 8287, 0, 0, 0 },
+ { TX_MUD3_027, 7770, 0, 0, 0 },
+ { TX_MUD3_028, 8134, 0, 0, 0 },
+ { TX_MUD3_029, 12593, 0, 0, 0 },
+ { TX_MUD3_030, 12257, 0, 0, 0 },
+ { TX_MUD3_031, 8858, 0, 0, 0 },
+ { TX_MUD3_032, 7050, 0, 0, 0 },
+ { TX_MUD3_033, 11586, 0, 0, 0 },
+ { TX_MUD3_034, 4190, 0, 0, 0 },
+ { TX_MUD3_035, 3833, 0, 0, 0 },
+ { TX_MUD3_037, 4647, 0, 0, 0 },
+ { TX_MUD3_038, 4388, 0, 0, 0 },
+ { TX_MUD3_039, 3907, 0, 0, 0 },
+ { TX_MUD3_040, 4049, 0, 0, 0 },
+ { TX_MUD3_041, 6156, 0, 0, 0 },
+ { TX_MUD3_042, 5896, 0, 0, 0 },
+ { TX_MUD3_043, 5086, 0, 0, 0 },
+ { TX_MUD3_044, 4851, 0, 0, 0 },
+ { TX_MUD3_046, 7649, 0, 0, 0 },
+ { TX_MUD3_047, 5629, 0, 0, 0 },
+ { TX_MUD3_048, 9448, 0, 0, 0 },
+ { TX_MUD3_049, 7393, 0, 0, 0 },
+ { TX_MUD3_050, 7152, 0, 0, 0 },
+ { TX_MUD3_051, 9784, 0, 0, 0 },
+ { TX_MUD3_052, 9015, 0, 0, 0 },
+ { TX_MUD3_053, 7890, 0, 0, 0 },
+ { TX_MUD3_054, 6745, 0, 0, 0 },
+ { TX_MUD3_055, 11459, 0, 0, 0 },
+ { TX_MUD3_056, 5448, 0, 0, 0 },
+ { TX_MUD3_057, 11261, 0, 0, 0 },
+ { TX_MUD3_058, 13030, 0, 0, 0 },
+ { TX_MUD3_059, 13225, 0, 0, 0 },
+ { TX_MUD3_060, 12512, 0, 0, 0 },
+ { TX_MUD3_061, 12832, 0, 0, 0 },
+ { TX_MUD3_062, 12375, 0, 0, 0 },
+ { TX_MUD3_063, 8836, 0, 0, 0 },
+ { TX_MUD3_064, 8794, 0, 0, 0 },
+ { TX_MUD3_065, 8447, 0, 0, 0 },
+ { TX_MUD3_066, 8633, 0, 0, 0 },
+ { TX_MUD3_067, 12427, 0, 0, 0 },
+ { TX_MUD3_069, 13141, 0, 0, 0 },
+ { TX_MUD3_070, 11823, 0, 0, 0 },
+ { TX_MUD3_071, 11966, 0, 0, 0 },
+ { TX_MUD3N000, 8982, 0, 0, 0 },
+ { TX_MUD3N002, 10865, 0, 0, 0 },
+ { TX_MUD3N003, 11075, 0, 0, 0 },
+ { TX_MUD3N004, 10800, 0, 0, 0 },
+ { TX_MUD3N005, 10481, 0, 0, 0 },
+ { TX_MUD3N006, 10993, 0, 0, 0 },
+ { TX_MUD3N007, 10692, 0, 0, 0 },
+ { TX_MUD3N008, 2490, 0, 0, 0 },
+ { TX_MUD3N009, 10937, 0, 0, 0 },
+ { TX_MUD3N010, 10640, 0, 0, 0 },
+ { TX_MUD3N011, 4615, 0, 0, 0 },
+ { TX_MUD3N012, 10570, 0, 0, 0 },
+ { TX_MUD3N013, 2698, 0, 0, 0 },
+ { TX_MUD3N014, 9939, 0, 0, 0 },
+ { TX_MUD3N015, 4749, 0, 0, 0 },
+ { TX_MUD3N017, 4331, 0, 0, 0 },
+ { TX_MUD3N018, 10144, 0, 0, 0 },
+ { TX_MUD3N019, 10095, 0, 0, 0 },
+ { TX_MUD3N020, 10005, 0, 0, 0 },
+ { TX_STATICU1, 534, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText mudd3Texts[] = {
diff --git a/engines/startrek/rooms/mudd4.cpp b/engines/startrek/rooms/mudd4.cpp
index 1b310a4d3d..e2e22760fc 100644
--- a/engines/startrek/rooms/mudd4.cpp
+++ b/engines/startrek/rooms/mudd4.cpp
@@ -141,102 +141,102 @@ enum mudd4TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets mudd4TextOffsets[] = {
- { TX_SPEAKER_KIRK, 4048, 0 },
- { TX_SPEAKER_MCCOY, 4059, 0 },
- { TX_SPEAKER_SPOCK, 4069, 0 },
- { TX_SPEAKER_UHURA, 491, 0 },
- { TX_SPEAKER_BUCHERT, 4079, 0 },
- { TX_SPEAKER_SCOTT, 4091, 0 },
- { TX_SPEAKER_MUDD, 4101, 0 },
- { TX_MUD4_001, 12511, 0 },
- { TX_MUD4_002, 6069, 0 },
- { TX_MUD4_004, 6134, 0 },
- { TX_MUD4_005, 11984, 0 },
- { TX_MUD4_006, 5958, 0 },
- { TX_MUD4_007, 6103, 0 },
- { TX_MUD4_008, 9263, 0 },
- { TX_MUD4_009, 9687, 0 },
- { TX_MUD4_010, 10886, 0 },
- { TX_MUD4_011, 10945, 0 },
- { TX_MUD4_012, 10793, 0 },
- { TX_MUD4_013, 4255, 0 },
- { TX_MUD4_014, 8571, 0 },
- { TX_MUD4_015, 12129, 0 },
- { TX_MUD4_016, 10051, 0 },
- { TX_MUD4_017, 8939, 0 },
- { TX_MUD4_018, 454, 0 },
- { TX_MUD4_019, 7470, 0 },
- { TX_MUD4_020, 7279, 0 },
- { TX_MUD4_021, 8726, 0 },
- { TX_MUD4_026, 9960, 0 },
- { TX_MUD4_029, 10391, 0 },
- { TX_MUD4_030, 10461, 0 },
- { TX_MUD4_034, 9772, 0 },
- { TX_MUD4_035, 11155, 0 },
- { TX_MUD4_036, 10357, 0 },
- { TX_MUD4_037, 9869, 0 },
- { TX_MUD4_046, 12235, 0 },
- { TX_MUD4_047, 12171, 0 },
- { TX_MUD4_050, 8178, 0 },
- { TX_MUD4_051, 12411, 0 },
- { TX_MUD4_063, 12072, 0 },
- { TX_MUD4_064, 10677, 0 },
- { TX_MUD4_065, 8267, 0 },
- { TX_MUD4_067, 10915, 0 },
- { TX_MUD4_069, 11221, 0 },
- { TX_MUD4_070, 10818, 0 },
- { TX_MUD4_071, 10145, 0 },
- { TX_MUD4_073, 11092, 0 },
- { TX_MUD4_076, 12314, 0 },
- { TX_MUD4_023, 7208, 0 },
- { TX_MUD4_024, 7106, 0 },
- { TX_MUD4_025, 6345, 0 },
- { TX_MUD4_027, 6588, 0 },
- { TX_MUD4_028, 6812, 0 },
- { TX_MUD4_031, 4607, 0 },
- { TX_MUD4_032, 9626, 0 },
- { TX_MUD4_033, 7060, 0 },
- { TX_MUD4_038, 5197, 0 },
- { TX_MUD4_039, 5224, 0 },
- { TX_MUD4_040, 5254, 0 },
- { TX_MUD4_041, 5285, 0 },
- { TX_MUD4_042, 7869, 0 },
- { TX_MUD4_043, 2510, 0 },
- { TX_MUD4_045, 7555, 0 },
- { TX_MUD4_048, 4377, 0 },
- { TX_MUD4_049, 5786, 0 },
- { TX_MUD4_052, 5840, 0 },
- { TX_MUD4_053, 5309, 0 },
- { TX_MUD4_054, 6219, 0 },
- { TX_MUD4_055, 5603, 0 },
- { TX_MUD4_056, 5523, 0 },
- { TX_MUD4_057, 4895, 0 },
- { TX_MUD4_058, 5023, 0 },
- { TX_MUD4_059, 4459, 0 },
- { TX_MUD4_060, 4676, 0 },
- { TX_MUD4_061, 4119, 0 },
- { TX_MUD4_062, 4288, 0 },
- { TX_MUD4_066, 8396, 0 },
- { TX_MUD4_068, 9395, 0 },
- { TX_MUD4_072, 9205, 0 },
- { TX_MUD4_074, 8881, 0 },
- { TX_MUD4_075, 7611, 0 },
- { TX_MUD4_A29, 7503, 0 },
- { TX_MUD4_S02, 6377, 0 },
- { TX_MUD4_S03, 7323, 0 },
- { TX_MUD4_S04, 6912, 0 },
- { TX_MUD4N000, 7801, 0 },
- { TX_MUD4N001, 11747, 0 },
- { TX_MUD4N003, 11615, 0 },
- { TX_MUD4N004, 11792, 0 },
- { TX_MUD4N005, 3106, 0 },
- { TX_MUD4N006, 11677, 0 },
- { TX_MUD4N007, 3298, 0 },
- { TX_MUD4N008, 8029, 0 },
- { TX_MUD4N011, 11912, 0 },
- { TX_MUD4N012, 11278, 0 },
- { TX_MUD4N013, 7985, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 4048, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 4059, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 4069, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 491, 0, 0, 0 },
+ { TX_SPEAKER_BUCHERT, 4079, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 4091, 0, 0, 0 },
+ { TX_SPEAKER_MUDD, 4101, 0, 0, 0 },
+ { TX_MUD4_001, 12511, 0, 0, 0 },
+ { TX_MUD4_002, 6069, 0, 0, 0 },
+ { TX_MUD4_004, 6134, 0, 0, 0 },
+ { TX_MUD4_005, 11984, 0, 0, 0 },
+ { TX_MUD4_006, 5958, 0, 0, 0 },
+ { TX_MUD4_007, 6103, 0, 0, 0 },
+ { TX_MUD4_008, 9263, 0, 0, 0 },
+ { TX_MUD4_009, 9687, 0, 0, 0 },
+ { TX_MUD4_010, 10886, 0, 0, 0 },
+ { TX_MUD4_011, 10945, 0, 0, 0 },
+ { TX_MUD4_012, 10793, 0, 0, 0 },
+ { TX_MUD4_013, 4255, 0, 0, 0 },
+ { TX_MUD4_014, 8571, 0, 0, 0 },
+ { TX_MUD4_015, 12129, 0, 0, 0 },
+ { TX_MUD4_016, 10051, 0, 0, 0 },
+ { TX_MUD4_017, 8939, 0, 0, 0 },
+ { TX_MUD4_018, 454, 0, 0, 0 },
+ { TX_MUD4_019, 7470, 0, 0, 0 },
+ { TX_MUD4_020, 7279, 0, 0, 0 },
+ { TX_MUD4_021, 8726, 0, 0, 0 },
+ { TX_MUD4_026, 9960, 0, 0, 0 },
+ { TX_MUD4_029, 10391, 0, 0, 0 },
+ { TX_MUD4_030, 10461, 0, 0, 0 },
+ { TX_MUD4_034, 9772, 0, 0, 0 },
+ { TX_MUD4_035, 11155, 0, 0, 0 },
+ { TX_MUD4_036, 10357, 0, 0, 0 },
+ { TX_MUD4_037, 9869, 0, 0, 0 },
+ { TX_MUD4_046, 12235, 0, 0, 0 },
+ { TX_MUD4_047, 12171, 0, 0, 0 },
+ { TX_MUD4_050, 8178, 0, 0, 0 },
+ { TX_MUD4_051, 12411, 0, 0, 0 },
+ { TX_MUD4_063, 12072, 0, 0, 0 },
+ { TX_MUD4_064, 10677, 0, 0, 0 },
+ { TX_MUD4_065, 8267, 0, 0, 0 },
+ { TX_MUD4_067, 10915, 0, 0, 0 },
+ { TX_MUD4_069, 11221, 0, 0, 0 },
+ { TX_MUD4_070, 10818, 0, 0, 0 },
+ { TX_MUD4_071, 10145, 0, 0, 0 },
+ { TX_MUD4_073, 11092, 0, 0, 0 },
+ { TX_MUD4_076, 12314, 0, 0, 0 },
+ { TX_MUD4_023, 7208, 0, 0, 0 },
+ { TX_MUD4_024, 7106, 0, 0, 0 },
+ { TX_MUD4_025, 6345, 0, 0, 0 },
+ { TX_MUD4_027, 6588, 0, 0, 0 },
+ { TX_MUD4_028, 6812, 0, 0, 0 },
+ { TX_MUD4_031, 4607, 0, 0, 0 },
+ { TX_MUD4_032, 9626, 0, 0, 0 },
+ { TX_MUD4_033, 7060, 0, 0, 0 },
+ { TX_MUD4_038, 5197, 0, 0, 0 },
+ { TX_MUD4_039, 5224, 0, 0, 0 },
+ { TX_MUD4_040, 5254, 0, 0, 0 },
+ { TX_MUD4_041, 5285, 0, 0, 0 },
+ { TX_MUD4_042, 7869, 0, 0, 0 },
+ { TX_MUD4_043, 2510, 0, 0, 0 },
+ { TX_MUD4_045, 7555, 0, 0, 0 },
+ { TX_MUD4_048, 4377, 0, 0, 0 },
+ { TX_MUD4_049, 5786, 0, 0, 0 },
+ { TX_MUD4_052, 5840, 0, 0, 0 },
+ { TX_MUD4_053, 5309, 0, 0, 0 },
+ { TX_MUD4_054, 6219, 0, 0, 0 },
+ { TX_MUD4_055, 5603, 0, 0, 0 },
+ { TX_MUD4_056, 5523, 0, 0, 0 },
+ { TX_MUD4_057, 4895, 0, 0, 0 },
+ { TX_MUD4_058, 5023, 0, 0, 0 },
+ { TX_MUD4_059, 4459, 0, 0, 0 },
+ { TX_MUD4_060, 4676, 0, 0, 0 },
+ { TX_MUD4_061, 4119, 0, 0, 0 },
+ { TX_MUD4_062, 4288, 0, 0, 0 },
+ { TX_MUD4_066, 8396, 0, 0, 0 },
+ { TX_MUD4_068, 9395, 0, 0, 0 },
+ { TX_MUD4_072, 9205, 0, 0, 0 },
+ { TX_MUD4_074, 8881, 0, 0, 0 },
+ { TX_MUD4_075, 7611, 0, 0, 0 },
+ { TX_MUD4_A29, 7503, 0, 0, 0 },
+ { TX_MUD4_S02, 6377, 0, 0, 0 },
+ { TX_MUD4_S03, 7323, 0, 0, 0 },
+ { TX_MUD4_S04, 6912, 0, 0, 0 },
+ { TX_MUD4N000, 7801, 0, 0, 0 },
+ { TX_MUD4N001, 11747, 0, 0, 0 },
+ { TX_MUD4N003, 11615, 0, 0, 0 },
+ { TX_MUD4N004, 11792, 0, 0, 0 },
+ { TX_MUD4N005, 3106, 0, 0, 0 },
+ { TX_MUD4N006, 11677, 0, 0, 0 },
+ { TX_MUD4N007, 3298, 0, 0, 0 },
+ { TX_MUD4N008, 8029, 0, 0, 0 },
+ { TX_MUD4N011, 11912, 0, 0, 0 },
+ { TX_MUD4N012, 11278, 0, 0, 0 },
+ { TX_MUD4N013, 7985, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText mudd4Texts[] = {
diff --git a/engines/startrek/rooms/mudd5.cpp b/engines/startrek/rooms/mudd5.cpp
index 92ced4a2a7..8aeb3e6392 100644
--- a/engines/startrek/rooms/mudd5.cpp
+++ b/engines/startrek/rooms/mudd5.cpp
@@ -102,66 +102,66 @@ enum mudd5TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets mudd5TextOffsets[] = {
- { TX_SPEAKER_KIRK, 2736, 0 },
- { TX_SPEAKER_MCCOY, 2747, 0 },
- { TX_SPEAKER_SPOCK, 2757, 0 },
- { TX_SPEAKER_UHURA, 646, 0 },
- { TX_SPEAKER_BUCHERT, 2767, 0 },
- { TX_SPEAKER_MUDD, 2779, 0 },
- { TX_MUD5_001, 3484, 0 },
- { TX_MUD5_002, 6809, 0 },
- { TX_MUD5_003, 609, 0 },
- { TX_MUD5_004, 7313, 0 },
- { TX_MUD5_005, 6045, 0 },
- { TX_MUD5_006, 5739, 0 },
- { TX_MUD5_007, 5037, 0 },
- { TX_MUD5_009, 3318, 0 },
- { TX_MUD5_010, 5829, 0 },
- { TX_MUD5_011, 2965, 0 },
- { TX_MUD5_012, 2481, 0 },
- { TX_MUD5_013, 5393, 0 },
- { TX_MUD5_014, 4477, 0 },
- { TX_MUD5_015, 3774, 0 },
- { TX_MUD5_016, 7112, 0 },
- { TX_MUD5_017, 7194, 0 },
- { TX_MUD5_018, 7524, 0 },
- { TX_MUD5_019, 4612, 0 },
- { TX_MUD5_020, 5276, 0 },
- { TX_MUD5_021, 4776, 0 },
- { TX_MUD5_022, 2791, 0 },
- { TX_MUD5_023, 7906, 0 },
- { TX_MUD5_024, 3359, 0 },
- { TX_MUD5_025, 3551, 0 },
- { TX_MUD5_026, 4382, 0 },
- { TX_MUD5_027, 4076, 0 },
- { TX_MUD5_028, 5137, 0 },
- { TX_MUD5_030, 3869, 0 },
- { TX_MUD5_031, 3192, 0 },
- { TX_MUD5_032, 6971, 0 },
- { TX_MUD5_033, 7022, 0 },
- { TX_MUD5_034, 5629, 0 },
- { TX_MUD5_035, 6005, 0 },
- { TX_MUD5_036, 6078, 0 },
- { TX_MUD5_037, 5884, 0 },
- { TX_MUD5_038, 5527, 0 },
- { TX_MUD5_039, 3928, 0 },
- { TX_MUD5_040, 7399, 0 },
- { TX_MUD2_002, 6142, 0 },
- { TX_MUD5N000, 7842, 0 },
- { TX_MUD5N001, 6351, 0 },
- { TX_MUD5N002, 6437, 0 },
- { TX_MUD5N003, 6718, 0 },
- { TX_MUD5N004, 6638, 0 },
- { TX_MUD5N005, 6557, 0 },
- { TX_MUD5N006, 7716, 0 },
- { TX_MUD5N007, 2122, 0 },
- { TX_MUD5N008, 4152, 0 },
- { TX_MUD5N009, 6270, 0 },
- { TX_MUD5N010, 8007, 0 },
- { TX_MUD5N011, 3084, 0 },
- { TX_MUD5N012, 4234, 0 },
- { TX_MUD5N105, 1928, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 2736, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 2747, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 2757, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 646, 0, 0, 0 },
+ { TX_SPEAKER_BUCHERT, 2767, 0, 0, 0 },
+ { TX_SPEAKER_MUDD, 2779, 0, 0, 0 },
+ { TX_MUD5_001, 3484, 0, 0, 0 },
+ { TX_MUD5_002, 6809, 0, 0, 0 },
+ { TX_MUD5_003, 609, 0, 0, 0 },
+ { TX_MUD5_004, 7313, 0, 0, 0 },
+ { TX_MUD5_005, 6045, 0, 0, 0 },
+ { TX_MUD5_006, 5739, 0, 0, 0 },
+ { TX_MUD5_007, 5037, 0, 0, 0 },
+ { TX_MUD5_009, 3318, 0, 0, 0 },
+ { TX_MUD5_010, 5829, 0, 0, 0 },
+ { TX_MUD5_011, 2965, 0, 0, 0 },
+ { TX_MUD5_012, 2481, 0, 0, 0 },
+ { TX_MUD5_013, 5393, 0, 0, 0 },
+ { TX_MUD5_014, 4477, 0, 0, 0 },
+ { TX_MUD5_015, 3774, 0, 0, 0 },
+ { TX_MUD5_016, 7112, 0, 0, 0 },
+ { TX_MUD5_017, 7194, 0, 0, 0 },
+ { TX_MUD5_018, 7524, 0, 0, 0 },
+ { TX_MUD5_019, 4612, 0, 0, 0 },
+ { TX_MUD5_020, 5276, 0, 0, 0 },
+ { TX_MUD5_021, 4776, 0, 0, 0 },
+ { TX_MUD5_022, 2791, 0, 0, 0 },
+ { TX_MUD5_023, 7906, 0, 0, 0 },
+ { TX_MUD5_024, 3359, 0, 0, 0 },
+ { TX_MUD5_025, 3551, 0, 0, 0 },
+ { TX_MUD5_026, 4382, 0, 0, 0 },
+ { TX_MUD5_027, 4076, 0, 0, 0 },
+ { TX_MUD5_028, 5137, 0, 0, 0 },
+ { TX_MUD5_030, 3869, 0, 0, 0 },
+ { TX_MUD5_031, 3192, 0, 0, 0 },
+ { TX_MUD5_032, 6971, 0, 0, 0 },
+ { TX_MUD5_033, 7022, 0, 0, 0 },
+ { TX_MUD5_034, 5629, 0, 0, 0 },
+ { TX_MUD5_035, 6005, 0, 0, 0 },
+ { TX_MUD5_036, 6078, 0, 0, 0 },
+ { TX_MUD5_037, 5884, 0, 0, 0 },
+ { TX_MUD5_038, 5527, 0, 0, 0 },
+ { TX_MUD5_039, 3928, 0, 0, 0 },
+ { TX_MUD5_040, 7399, 0, 0, 0 },
+ { TX_MUD2_002, 6142, 0, 0, 0 },
+ { TX_MUD5N000, 7842, 0, 0, 0 },
+ { TX_MUD5N001, 6351, 0, 0, 0 },
+ { TX_MUD5N002, 6437, 0, 0, 0 },
+ { TX_MUD5N003, 6718, 0, 0, 0 },
+ { TX_MUD5N004, 6638, 0, 0, 0 },
+ { TX_MUD5N005, 6557, 0, 0, 0 },
+ { TX_MUD5N006, 7716, 0, 0, 0 },
+ { TX_MUD5N007, 2122, 0, 0, 0 },
+ { TX_MUD5N008, 4152, 0, 0, 0 },
+ { TX_MUD5N009, 6270, 0, 0, 0 },
+ { TX_MUD5N010, 8007, 0, 0, 0 },
+ { TX_MUD5N011, 3084, 0, 0, 0 },
+ { TX_MUD5N012, 4234, 0, 0, 0 },
+ { TX_MUD5N105, 1928, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText mudd5Texts[] = {
diff --git a/engines/startrek/rooms/mudda.cpp b/engines/startrek/rooms/mudda.cpp
index bc0ff22f78..4375c704e8 100644
--- a/engines/startrek/rooms/mudda.cpp
+++ b/engines/startrek/rooms/mudda.cpp
@@ -34,17 +34,17 @@ enum muddTextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets muddTextOffsets[] = {
- { TX_SPEAKER_KIRK, 2941, 0 },
- { TX_SPEAKER_MCCOY, 2966, 0 },
- { TX_SPEAKER_SPOCK, 2976, 0 },
- { TX_MUD0_002, 8651, 0 },
- { TX_MUD0_018, 2523, 0 },
- { TX_MUD0_019, 2473, 0 },
- { TX_MUD0_020, 2423, 0 },
- { TX_MUD0N002, 5513, 0 },
- { TX_MUD0N006, 2573, 0 },
- { TX_MUD0N011, 6036, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 2941, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 2966, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 2976, 0, 0, 0 },
+ { TX_MUD0_002, 8651, 0, 0, 0 },
+ { TX_MUD0_018, 2523, 0, 0, 0 },
+ { TX_MUD0_019, 2473, 0, 0, 0 },
+ { TX_MUD0_020, 2423, 0, 0, 0 },
+ { TX_MUD0N002, 5513, 0, 0, 0 },
+ { TX_MUD0N006, 2573, 0, 0, 0 },
+ { TX_MUD0N011, 6036, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
// The functions here used to be independently implemented in each room of the MUDD
diff --git a/engines/startrek/rooms/sins0.cpp b/engines/startrek/rooms/sins0.cpp
index ad9db955e7..2f11d632ee 100644
--- a/engines/startrek/rooms/sins0.cpp
+++ b/engines/startrek/rooms/sins0.cpp
@@ -92,59 +92,59 @@ enum sins0TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets sins0TextOffsets[] = {
- { TX_SPEAKER_KIRK, 289, 0 },
- { TX_SPEAKER_MCCOY, 300, 0 },
- { TX_SPEAKER_SPOCK, 310, 0 },
- { TX_SPEAKER_SCOTT, 344, 0 },
- { TX_SPEAKER_UHURA, 334, 0 },
- { TX_SPEAKER_MOSHER, 320, 0 },
- { TX_SIN0N000, 3805, 0 },
- { TX_SIN0N001, 3994, 0 },
- { TX_SIN0N002, 3594, 0 },
- { TX_SIN0N003, 3694, 0 },
- { TX_SIN0N004, 3461, 0 },
- { TX_SIN0N005, 729, 0 },
- { TX_SIN0N006, 1252, 0 },
- { TX_SIN0N007, 3341, 0 },
- { TX_SIN0N008, 804, 0 },
- { TX_SIN0N009, 648, 0 },
- { TX_SIN0N010, 1377, 0 },
- { TX_SIN0N011, 2840, 0 },
- { TX_SIN0U069, 5389, 0 },
- { TX_SIN0U082, 1915, 0 },
- { TX_SIN0_001, 2544, 0 },
- { TX_SIN0_002, 5317, 0 },
- { TX_SIN0_003, 1986, 0 },
- { TX_SIN0_004, 5131, 0 },
- { TX_SIN0_005, 2356, 0 },
- { TX_SIN0_006, 2758, 0 },
- { TX_SIN0_007, 2108, 0 },
- { TX_SIN0_008, 4505, 0 },
- { TX_SIN0_009, 924, 0 },
- { TX_SIN0_010, 4922, 0 },
- { TX_SIN0_011, 1054, 0 },
- { TX_SIN0_012, 4742, 0 },
- { TX_SIN0_013, 4362, 0 },
- { TX_SIN0_014, 3214, 0 },
- { TX_SIN0_015, 2896, 0 },
- { TX_SIN0_016, 1750, 0 },
- { TX_SIN0_017, 1613, 0 },
- { TX_SIN0_018, 1476, 0 },
- { TX_SIN0_019, 4132, 0 },
- { TX_SIN0_020, 5506, 0 },
- { TX_SIN0_021, 2978, 0 },
- { TX_SIN0_022, 2715, 0 },
- { TX_SIN0_023, 4595, 0 },
- { TX_SIN0_024, 1197, 0 },
- { TX_SIN0_025, 4233, 0 },
- { TX_SIN0_026, 2634, 0 },
- { TX_SIN0_027, 3086, 0 },
- { TX_SIN0_028, 4421, 0 },
- { TX_SIN0_S01, 5200, 0 },
- { TX_SIN0_S48, 2023, 0 },
- { TX_SIN0_S49, 2430, 0 },
- { TX_SIN0_S50, 2175, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 289, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 300, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 310, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 344, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 334, 0, 0, 0 },
+ { TX_SPEAKER_MOSHER, 320, 0, 0, 0 },
+ { TX_SIN0N000, 3805, 0, 0, 0 },
+ { TX_SIN0N001, 3994, 0, 0, 0 },
+ { TX_SIN0N002, 3594, 0, 0, 0 },
+ { TX_SIN0N003, 3694, 0, 0, 0 },
+ { TX_SIN0N004, 3461, 0, 0, 0 },
+ { TX_SIN0N005, 729, 0, 0, 0 },
+ { TX_SIN0N006, 1252, 0, 0, 0 },
+ { TX_SIN0N007, 3341, 0, 0, 0 },
+ { TX_SIN0N008, 804, 0, 0, 0 },
+ { TX_SIN0N009, 648, 0, 0, 0 },
+ { TX_SIN0N010, 1377, 0, 0, 0 },
+ { TX_SIN0N011, 2840, 0, 0, 0 },
+ { TX_SIN0U069, 5389, 0, 0, 0 },
+ { TX_SIN0U082, 1915, 0, 0, 0 },
+ { TX_SIN0_001, 2544, 0, 0, 0 },
+ { TX_SIN0_002, 5317, 0, 0, 0 },
+ { TX_SIN0_003, 1986, 0, 0, 0 },
+ { TX_SIN0_004, 5131, 0, 0, 0 },
+ { TX_SIN0_005, 2356, 0, 0, 0 },
+ { TX_SIN0_006, 2758, 0, 0, 0 },
+ { TX_SIN0_007, 2108, 0, 0, 0 },
+ { TX_SIN0_008, 4505, 0, 0, 0 },
+ { TX_SIN0_009, 924, 0, 0, 0 },
+ { TX_SIN0_010, 4922, 0, 0, 0 },
+ { TX_SIN0_011, 1054, 0, 0, 0 },
+ { TX_SIN0_012, 4742, 0, 0, 0 },
+ { TX_SIN0_013, 4362, 0, 0, 0 },
+ { TX_SIN0_014, 3214, 0, 0, 0 },
+ { TX_SIN0_015, 2896, 0, 0, 0 },
+ { TX_SIN0_016, 1750, 0, 0, 0 },
+ { TX_SIN0_017, 1613, 0, 0, 0 },
+ { TX_SIN0_018, 1476, 0, 0, 0 },
+ { TX_SIN0_019, 4132, 0, 0, 0 },
+ { TX_SIN0_020, 5506, 0, 0, 0 },
+ { TX_SIN0_021, 2978, 0, 0, 0 },
+ { TX_SIN0_022, 2715, 0, 0, 0 },
+ { TX_SIN0_023, 4595, 0, 0, 0 },
+ { TX_SIN0_024, 1197, 0, 0, 0 },
+ { TX_SIN0_025, 4233, 0, 0, 0 },
+ { TX_SIN0_026, 2634, 0, 0, 0 },
+ { TX_SIN0_027, 3086, 0, 0, 0 },
+ { TX_SIN0_028, 4421, 0, 0, 0 },
+ { TX_SIN0_S01, 5200, 0, 0, 0 },
+ { TX_SIN0_S48, 2023, 0, 0, 0 },
+ { TX_SIN0_S49, 2430, 0, 0, 0 },
+ { TX_SIN0_S50, 2175, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText sins0Texts[] = {
diff --git a/engines/startrek/rooms/sins1.cpp b/engines/startrek/rooms/sins1.cpp
index 4060ed92b1..d3db4d9ffc 100644
--- a/engines/startrek/rooms/sins1.cpp
+++ b/engines/startrek/rooms/sins1.cpp
@@ -104,62 +104,62 @@ enum sins1TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets sins1TextOffsets[] = {
- { TX_SPEAKER_KIRK, 300, 0 },
- { TX_SPEAKER_MCCOY, 312, 0 },
- { TX_SPEAKER_SPOCK, 322, 0 },
- { TX_SPEAKER_MOSHER, 332, 0 },
- { TX_SPEAKER_SCOTT, 356, 0 },
- { TX_SPEAKER_UHURA, 346, 0 },
- { TX_SIN1_001, 2352, 0 },
- { TX_SIN1_002, 5887, 0 },
- { TX_SIN1_003, 4101, 0 },
- { TX_SIN1_004, 6100, 0 },
- { TX_SIN1_005, 3891, 0 },
- { TX_SIN1_006, 4283, 0 },
- { TX_SIN1_007, 3659, 0 },
- { TX_SIN1_008, 5648, 0 },
- { TX_SIN1_009, 1571, 0 },
- { TX_SIN1_010, 1341, 0 },
- { TX_SIN1_011, 2860, 0 },
- { TX_SIN1_012, 2268, 0 },
- { TX_SIN1_013, 6436, 0 },
- { TX_SIN1_014, 6257, 0 },
- { TX_SIN1_015, 4577, 0 },
- { TX_SIN1_016, 3301, 0 },
- { TX_SIN1_017, 3034, 0 },
- { TX_SIN1_018, 3428, 0 },
- { TX_SIN1_019, 1682, 0 },
- { TX_SIN1_020, 1162, 0 },
- { TX_SIN1_021, 1454, 0 },
- { TX_SIN1_022, 1900, 0 },
- { TX_SIN1_023, 1980, 0 },
- { TX_SIN1_024, 1801, 0 },
- { TX_SIN1_025, 4455, 0 },
- { TX_SIN1_026, 4813, 0 },
- { TX_SIN1_027, 4365, 0 },
- { TX_SIN1_028, 2195, 0 },
- { TX_SIN1_029, 4970, 0 },
- { TX_SIN1_030, 4713, 0 },
- { TX_SIN1_S10, 3583, 0 },
- { TX_SIN1_S17, 4180, 0 },
- { TX_SIN1_S18, 3706, 0 },
- { TX_SIN1_S20, 6016, 0 },
- { TX_SIN1_S51, 5702, 0 },
- { TX_SIN1_S85, 3974, 0 },
- { TX_SIN1U070, 6169, 0 },
- { TX_SIN1N000, 5548, 0 },
- { TX_SIN1N001, 738, 0 },
- { TX_SIN1N002, 5366, 0 },
- { TX_SIN1N003, 1014, 0 },
- { TX_SIN1N004, 5131, 0 },
- { TX_SIN1N005, 5023, 0 },
- { TX_SIN1N006, 5266, 0 },
- { TX_SIN1N007, 2065, 0 },
- { TX_SIN1N008, 5477, 0 },
- { TX_SIN1N009, 813, 0 },
- { TX_SIN1N010, 893, 0 },
- { TX_SIN1N011, 1089, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 300, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 312, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 322, 0, 0, 0 },
+ { TX_SPEAKER_MOSHER, 332, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 356, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 346, 0, 0, 0 },
+ { TX_SIN1_001, 2352, 0, 0, 0 },
+ { TX_SIN1_002, 5887, 0, 0, 0 },
+ { TX_SIN1_003, 4101, 0, 0, 0 },
+ { TX_SIN1_004, 6100, 0, 0, 0 },
+ { TX_SIN1_005, 3891, 0, 0, 0 },
+ { TX_SIN1_006, 4283, 0, 0, 0 },
+ { TX_SIN1_007, 3659, 0, 0, 0 },
+ { TX_SIN1_008, 5648, 0, 0, 0 },
+ { TX_SIN1_009, 1571, 0, 0, 0 },
+ { TX_SIN1_010, 1341, 0, 0, 0 },
+ { TX_SIN1_011, 2860, 0, 0, 0 },
+ { TX_SIN1_012, 2268, 0, 0, 0 },
+ { TX_SIN1_013, 6436, 0, 0, 0 },
+ { TX_SIN1_014, 6257, 0, 0, 0 },
+ { TX_SIN1_015, 4577, 0, 0, 0 },
+ { TX_SIN1_016, 3301, 0, 0, 0 },
+ { TX_SIN1_017, 3034, 0, 0, 0 },
+ { TX_SIN1_018, 3428, 0, 0, 0 },
+ { TX_SIN1_019, 1682, 0, 0, 0 },
+ { TX_SIN1_020, 1162, 0, 0, 0 },
+ { TX_SIN1_021, 1454, 0, 0, 0 },
+ { TX_SIN1_022, 1900, 0, 0, 0 },
+ { TX_SIN1_023, 1980, 0, 0, 0 },
+ { TX_SIN1_024, 1801, 0, 0, 0 },
+ { TX_SIN1_025, 4455, 0, 0, 0 },
+ { TX_SIN1_026, 4813, 0, 0, 0 },
+ { TX_SIN1_027, 4365, 0, 0, 0 },
+ { TX_SIN1_028, 2195, 0, 0, 0 },
+ { TX_SIN1_029, 4970, 0, 0, 0 },
+ { TX_SIN1_030, 4713, 0, 0, 0 },
+ { TX_SIN1_S10, 3583, 0, 0, 0 },
+ { TX_SIN1_S17, 4180, 0, 0, 0 },
+ { TX_SIN1_S18, 3706, 0, 0, 0 },
+ { TX_SIN1_S20, 6016, 0, 0, 0 },
+ { TX_SIN1_S51, 5702, 0, 0, 0 },
+ { TX_SIN1_S85, 3974, 0, 0, 0 },
+ { TX_SIN1U070, 6169, 0, 0, 0 },
+ { TX_SIN1N000, 5548, 0, 0, 0 },
+ { TX_SIN1N001, 738, 0, 0, 0 },
+ { TX_SIN1N002, 5366, 0, 0, 0 },
+ { TX_SIN1N003, 1014, 0, 0, 0 },
+ { TX_SIN1N004, 5131, 0, 0, 0 },
+ { TX_SIN1N005, 5023, 0, 0, 0 },
+ { TX_SIN1N006, 5266, 0, 0, 0 },
+ { TX_SIN1N007, 2065, 0, 0, 0 },
+ { TX_SIN1N008, 5477, 0, 0, 0 },
+ { TX_SIN1N009, 813, 0, 0, 0 },
+ { TX_SIN1N010, 893, 0, 0, 0 },
+ { TX_SIN1N011, 1089, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText sins1Texts[] = {
diff --git a/engines/startrek/rooms/sins2.cpp b/engines/startrek/rooms/sins2.cpp
index fb578d1d9d..20a0cc4f69 100644
--- a/engines/startrek/rooms/sins2.cpp
+++ b/engines/startrek/rooms/sins2.cpp
@@ -105,78 +105,78 @@ enum sins2TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets sins2TextOffsets[] = {
- { TX_SPEAKER_KIRK, 301, 0 },
- { TX_SPEAKER_MCCOY, 312, 0 },
- { TX_SPEAKER_SPOCK, 322, 0 },
- { TX_SPEAKER_MOSHER, 332, 0 },
- { TX_SPEAKER_SCOTT, 356, 0 },
- { TX_SPEAKER_UHURA, 346, 0 },
- { TX_SIN2_001, 4324, 0 },
- { TX_SIN2_002, 892, 0 },
- { TX_SIN2_003, 6723, 0 },
- { TX_SIN2_004, 5869, 0 },
- { TX_SIN2_005, 5052, 0 },
- { TX_SIN2_006, 8116, 0 },
- { TX_SIN2_007, 3070, 0 },
- { TX_SIN2_008, 5400, 0 },
- { TX_SIN2_009, 3770, 0 },
- { TX_SIN2_010, 4811, 0 },
- { TX_SIN2_012, 3514, 0 },
- { TX_SIN2_013, 8717, 0 },
- { TX_SIN2_014, 8458, 0 },
- { TX_SIN2_015, 1353, 0 },
- { TX_SIN2_016, 6980, 0 },
- { TX_SIN2_017, 8296, 0 },
- { TX_SIN2_019, 5806, 0 },
- { TX_SIN2_020, 2835, 0 },
- { TX_SIN2_021, 2303, 0 },
- { TX_SIN2_022, 3268, 0 },
- { TX_SIN2_023, 7064, 0 },
- { TX_SIN2_024, 4683, 0 },
- { TX_SIN2_025, 670, 0 },
- { TX_SIN2_026, 789, 0 },
- { TX_SIN2_027, 4101, 0 },
- { TX_SIN2_028, 3933, 0 },
- { TX_SIN2_029, 3302, 0 },
- { TX_SIN2_030, 7914, 0 },
- { TX_SIN2_031, 2586, 0 },
- { TX_SIN2_032, 1436, 0 },
- { TX_SIN2_033, 2936, 0 },
- { TX_SIN2_034, 2372, 0 },
- { TX_SIN2_035, 8953, 0 },
- { TX_SIN2_037, 3219, 0 },
- { TX_SIN2_038, 2687, 0 },
- { TX_SIN2_039, 6813, 0 },
- { TX_SIN2_040, 2170, 0 },
- { TX_SIN2_041, 1974, 0 },
- { TX_SIN2_042, 1064, 0 },
- { TX_SIN2_043, 1770, 0 },
- { TX_SIN2_044, 1127, 0 },
- { TX_SIN2_045, 3615, 0 },
- { TX_SIN2_046, 8820, 0 },
- { TX_SIN2_047, 7328, 0 },
- { TX_SIN2_048, 7795, 0 },
- { TX_SIN2_049, 7155, 0 },
- { TX_SIN2_050, 1639, 0 },
- { TX_SIN2_F12, 7608, 0 },
- { TX_SIN2_F26, 5591, 0 },
- { TX_SIN2_S05, 5116, 0 },
- { TX_SIN2_S16, 8179, 0 },
- { TX_SIN3_008, 8591, 0 },
- { TX_SIN1U070, 8370, 0 },
- { TX_SIN2N000, 6119, 0 },
- { TX_SIN2N001, 6301, 0 },
- { TX_SIN2N002, 6620, 0 },
- { TX_SIN2N003, 6359, 0 },
- { TX_SIN2N004, 6536, 0 },
- { TX_SIN2N005, 6451, 0 },
- { TX_SIN2N006, 5948, 0 },
- { TX_SIN2N007, 6060, 0 },
- { TX_SIN2N008, 7524, 0 },
- { TX_SIN2U085, 5252, 0 },
- { TX_SIN2U096, 5671, 0 },
- { TX_SIN2U097, 5445, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 301, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 312, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 322, 0, 0, 0 },
+ { TX_SPEAKER_MOSHER, 332, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 356, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 346, 0, 0, 0 },
+ { TX_SIN2_001, 4324, 0, 0, 0 },
+ { TX_SIN2_002, 892, 0, 0, 0 },
+ { TX_SIN2_003, 6723, 0, 0, 0 },
+ { TX_SIN2_004, 5869, 0, 0, 0 },
+ { TX_SIN2_005, 5052, 0, 0, 0 },
+ { TX_SIN2_006, 8116, 0, 0, 0 },
+ { TX_SIN2_007, 3070, 0, 0, 0 },
+ { TX_SIN2_008, 5400, 0, 0, 0 },
+ { TX_SIN2_009, 3770, 0, 0, 0 },
+ { TX_SIN2_010, 4811, 0, 0, 0 },
+ { TX_SIN2_012, 3514, 0, 0, 0 },
+ { TX_SIN2_013, 8717, 0, 0, 0 },
+ { TX_SIN2_014, 8458, 0, 0, 0 },
+ { TX_SIN2_015, 1353, 0, 0, 0 },
+ { TX_SIN2_016, 6980, 0, 0, 0 },
+ { TX_SIN2_017, 8296, 0, 0, 0 },
+ { TX_SIN2_019, 5806, 0, 0, 0 },
+ { TX_SIN2_020, 2835, 0, 0, 0 },
+ { TX_SIN2_021, 2303, 0, 0, 0 },
+ { TX_SIN2_022, 3268, 0, 0, 0 },
+ { TX_SIN2_023, 7064, 0, 0, 0 },
+ { TX_SIN2_024, 4683, 0, 0, 0 },
+ { TX_SIN2_025, 670, 0, 0, 0 },
+ { TX_SIN2_026, 789, 0, 0, 0 },
+ { TX_SIN2_027, 4101, 0, 0, 0 },
+ { TX_SIN2_028, 3933, 0, 0, 0 },
+ { TX_SIN2_029, 3302, 0, 0, 0 },
+ { TX_SIN2_030, 7914, 0, 0, 0 },
+ { TX_SIN2_031, 2586, 0, 0, 0 },
+ { TX_SIN2_032, 1436, 0, 0, 0 },
+ { TX_SIN2_033, 2936, 0, 0, 0 },
+ { TX_SIN2_034, 2372, 0, 0, 0 },
+ { TX_SIN2_035, 8953, 0, 0, 0 },
+ { TX_SIN2_037, 3219, 0, 0, 0 },
+ { TX_SIN2_038, 2687, 0, 0, 0 },
+ { TX_SIN2_039, 6813, 0, 0, 0 },
+ { TX_SIN2_040, 2170, 0, 0, 0 },
+ { TX_SIN2_041, 1974, 0, 0, 0 },
+ { TX_SIN2_042, 1064, 0, 0, 0 },
+ { TX_SIN2_043, 1770, 0, 0, 0 },
+ { TX_SIN2_044, 1127, 0, 0, 0 },
+ { TX_SIN2_045, 3615, 0, 0, 0 },
+ { TX_SIN2_046, 8820, 0, 0, 0 },
+ { TX_SIN2_047, 7328, 0, 0, 0 },
+ { TX_SIN2_048, 7795, 0, 0, 0 },
+ { TX_SIN2_049, 7155, 0, 0, 0 },
+ { TX_SIN2_050, 1639, 0, 0, 0 },
+ { TX_SIN2_F12, 7608, 0, 0, 0 },
+ { TX_SIN2_F26, 5591, 0, 0, 0 },
+ { TX_SIN2_S05, 5116, 0, 0, 0 },
+ { TX_SIN2_S16, 8179, 0, 0, 0 },
+ { TX_SIN3_008, 8591, 0, 0, 0 },
+ { TX_SIN1U070, 8370, 0, 0, 0 },
+ { TX_SIN2N000, 6119, 0, 0, 0 },
+ { TX_SIN2N001, 6301, 0, 0, 0 },
+ { TX_SIN2N002, 6620, 0, 0, 0 },
+ { TX_SIN2N003, 6359, 0, 0, 0 },
+ { TX_SIN2N004, 6536, 0, 0, 0 },
+ { TX_SIN2N005, 6451, 0, 0, 0 },
+ { TX_SIN2N006, 5948, 0, 0, 0 },
+ { TX_SIN2N007, 6060, 0, 0, 0 },
+ { TX_SIN2N008, 7524, 0, 0, 0 },
+ { TX_SIN2U085, 5252, 0, 0, 0 },
+ { TX_SIN2U096, 5671, 0, 0, 0 },
+ { TX_SIN2U097, 5445, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText sins2Texts[] = {
diff --git a/engines/startrek/rooms/sins3.cpp b/engines/startrek/rooms/sins3.cpp
index 3412faffd7..d586287d33 100644
--- a/engines/startrek/rooms/sins3.cpp
+++ b/engines/startrek/rooms/sins3.cpp
@@ -140,59 +140,59 @@ enum sins3TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets sins3TextOffsets[] = {
- { TX_SPEAKER_KIRK, 289, 0 },
- { TX_SPEAKER_MCCOY, 300, 0 },
- { TX_SPEAKER_SPOCK, 310, 0 },
- { TX_SPEAKER_MOSHER, 320, 0 },
- { TX_SPEAKER_UHURA, 334, 0 },
- { TX_SIN3_001, 3479, 0 },
- { TX_SIN3_002, 5966, 0 },
- { TX_SIN3_003, 870, 0 },
- { TX_SIN3_004, 6675, 0 },
- { TX_SIN3_005, 3812, 0 },
- { TX_SIN3_006, 4217, 0 },
- { TX_SIN3_007, 7257, 0 },
- { TX_SIN3_008, 7154, 0 },
- { TX_SIN3_009, 6769, 0 },
- { TX_SIN3_010, 7021, 0 },
- { TX_SIN3_011, 6146, 0 },
- { TX_SIN3_012, 3244, 0 },
- { TX_SIN3_013, 3392, 0 },
- { TX_SIN3_014, 6325, 0 },
- { TX_SIN3_015, 1632, 0 },
- { TX_SIN3_016, 1346, 0 },
- { TX_SIN3_017, 1158, 0 },
- { TX_SIN3_018, 1019, 0 },
- { TX_SIN3_019, 1518, 0 },
- { TX_SIN3_020, 6029, 0 },
- { TX_SIN3_021, 4924, 0 },
- { TX_SIN3_022, 6477, 0 },
- { TX_SIN3_023, 2190, 0 },
- { TX_SIN3_024, 3298, 0 },
- { TX_SIN3_025, 6885, 0 },
- { TX_SIN3_026, 6257, 0 },
- { TX_SIN3_027, 6389, 0 },
- { TX_SIN3U072, 6611, 0 },
- { TX_SIN3N000, 2293, 0 },
- { TX_SIN3N001, 5755, 0 },
- { TX_SIN3N002, 5836, 0 },
- { TX_SIN3N003, 5572, 0 },
- { TX_SIN3N004, 5651, 0 },
- { TX_SIN3N005, 2434, 0 },
- { TX_SIN3N006, 5307, 0 },
- { TX_SIN3N007, 1959, 0 },
- { TX_SIN3N008, 2358, 0 },
- { TX_SIN3N009, 5022, 0 },
- { TX_SIN3N010, 5480, 0 },
- { TX_SIN3N011, 1881, 0 },
- { TX_SIN3N012, 1816, 0 },
- { TX_SIN3N013, 2038, 0 },
- { TX_SIN3N014, 5404, 0 },
- { TX_SIN3_LASERSETTING001, 3605, 0 },
- { TX_SIN3_LASERSETTING100, 3675, 0 },
- { TX_SIN3_LASERSETTING010, 3640, 0 },
- { TX_SIN3_LASERCANCEL, 3710, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 289, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 300, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 310, 0, 0, 0 },
+ { TX_SPEAKER_MOSHER, 320, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 334, 0, 0, 0 },
+ { TX_SIN3_001, 3479, 0, 0, 0 },
+ { TX_SIN3_002, 5966, 0, 0, 0 },
+ { TX_SIN3_003, 870, 0, 0, 0 },
+ { TX_SIN3_004, 6675, 0, 0, 0 },
+ { TX_SIN3_005, 3812, 0, 0, 0 },
+ { TX_SIN3_006, 4217, 0, 0, 0 },
+ { TX_SIN3_007, 7257, 0, 0, 0 },
+ { TX_SIN3_008, 7154, 0, 0, 0 },
+ { TX_SIN3_009, 6769, 0, 0, 0 },
+ { TX_SIN3_010, 7021, 0, 0, 0 },
+ { TX_SIN3_011, 6146, 0, 0, 0 },
+ { TX_SIN3_012, 3244, 0, 0, 0 },
+ { TX_SIN3_013, 3392, 0, 0, 0 },
+ { TX_SIN3_014, 6325, 0, 0, 0 },
+ { TX_SIN3_015, 1632, 0, 0, 0 },
+ { TX_SIN3_016, 1346, 0, 0, 0 },
+ { TX_SIN3_017, 1158, 0, 0, 0 },
+ { TX_SIN3_018, 1019, 0, 0, 0 },
+ { TX_SIN3_019, 1518, 0, 0, 0 },
+ { TX_SIN3_020, 6029, 0, 0, 0 },
+ { TX_SIN3_021, 4924, 0, 0, 0 },
+ { TX_SIN3_022, 6477, 0, 0, 0 },
+ { TX_SIN3_023, 2190, 0, 0, 0 },
+ { TX_SIN3_024, 3298, 0, 0, 0 },
+ { TX_SIN3_025, 6885, 0, 0, 0 },
+ { TX_SIN3_026, 6257, 0, 0, 0 },
+ { TX_SIN3_027, 6389, 0, 0, 0 },
+ { TX_SIN3U072, 6611, 0, 0, 0 },
+ { TX_SIN3N000, 2293, 0, 0, 0 },
+ { TX_SIN3N001, 5755, 0, 0, 0 },
+ { TX_SIN3N002, 5836, 0, 0, 0 },
+ { TX_SIN3N003, 5572, 0, 0, 0 },
+ { TX_SIN3N004, 5651, 0, 0, 0 },
+ { TX_SIN3N005, 2434, 0, 0, 0 },
+ { TX_SIN3N006, 5307, 0, 0, 0 },
+ { TX_SIN3N007, 1959, 0, 0, 0 },
+ { TX_SIN3N008, 2358, 0, 0, 0 },
+ { TX_SIN3N009, 5022, 0, 0, 0 },
+ { TX_SIN3N010, 5480, 0, 0, 0 },
+ { TX_SIN3N011, 1881, 0, 0, 0 },
+ { TX_SIN3N012, 1816, 0, 0, 0 },
+ { TX_SIN3N013, 2038, 0, 0, 0 },
+ { TX_SIN3N014, 5404, 0, 0, 0 },
+ { TX_SIN3_LASERSETTING001, 3605, 0, 0, 0 },
+ { TX_SIN3_LASERSETTING100, 3675, 0, 0, 0 },
+ { TX_SIN3_LASERSETTING010, 3640, 0, 0, 0 },
+ { TX_SIN3_LASERCANCEL, 3710, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText sins3Texts[] = {
diff --git a/engines/startrek/rooms/sins4.cpp b/engines/startrek/rooms/sins4.cpp
index e331ec3e89..894d88f09e 100644
--- a/engines/startrek/rooms/sins4.cpp
+++ b/engines/startrek/rooms/sins4.cpp
@@ -111,65 +111,65 @@ enum sins4TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets sins4TextOffsets[] = {
- { TX_SPEAKER_KIRK, 289, 0 },
- { TX_SPEAKER_MCCOY, 300, 0 },
- { TX_SPEAKER_SPOCK, 310, 0 },
- { TX_SPEAKER_MOSHER, 320, 0 },
- { TX_SPEAKER_UHURA, 334, 0 },
- { TX_SIN4_001, 4229, 0 },
- { TX_SIN4_002, 5752, 0 },
- { TX_SIN4_003, 2846, 0 },
- { TX_SIN4_004, 4391, 0 },
- { TX_SIN4_005, 3275, 0 },
- { TX_SIN4_006, 5595, 0 },
- { TX_SIN4_007, 2628, 0 },
- { TX_SIN4_008, 1209, 0 },
- { TX_SIN4_009, 1086, 0 },
- { TX_SIN4_010, 2310, 0 },
- { TX_SIN4_011, 5410, 0 },
- { TX_SIN4_012, 6602, 0 },
- { TX_SIN4_013, 6150, 0 },
- { TX_SIN4_014, 6469, 0 },
- { TX_SIN4_015, 4545, 0 },
- { TX_SIN4_016, 5900, 0 },
- { TX_SIN4_017, 4727, 0 },
- { TX_SIN4_018, 998, 0 },
- { TX_SIN4_019, 4471, 0 },
- { TX_SIN4_020, 753, 0 },
- { TX_SIN4_021, 2206, 0 },
- { TX_SIN4_022, 1670, 0 },
- { TX_SIN4_023, 6070, 0 },
- { TX_SIN4_024, 4650, 0 },
- { TX_SIN4_025, 2795, 0 },
- { TX_SIN4_026, 5234, 0 },
- { TX_SIN4_027, 4999, 0 },
- { TX_SIN4_028, 4288, 0 },
- { TX_SIN4_029, 5974, 0 },
- { TX_SIN4_030, 6209, 0 },
- { TX_SIN4_031, 4812, 0 },
- { TX_SIN4_032, 5154, 0 },
- { TX_SIN4U073, 5836, 0 },
- { TX_SIN4U088, 2554, 0 },
- { TX_SIN4U100, 5521, 0 },
- { TX_SIN4U103, 2672, 0 },
- { TX_SIN4U105, 3134, 0 },
- { TX_SIN4U107, 2982, 0 },
- { TX_SIN4U83B, 5690, 0 },
- { TX_SIN4N000, 3857, 0 },
- { TX_SIN4N001, 3665, 0 },
- { TX_SIN4N002, 3389, 0 },
- { TX_SIN4N003, 3566, 0 },
- { TX_SIN4N004, 3480, 0 },
- { TX_SIN4N005, 3972, 0 },
- { TX_SIN4N006, 1354, 0 },
- { TX_SIN4N007, 4160, 0 },
- { TX_SIN4N008, 4091, 0 },
- { TX_SIN4N009, 1836, 0 },
- { TX_SIN4N010, 1927, 0 },
- { TX_SIN4N011, 2105, 0 },
- { TX_SIN4N012, 1619, 0 },
- { TX_SIN4N013, 2011, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 289, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 300, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 310, 0, 0, 0 },
+ { TX_SPEAKER_MOSHER, 320, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 334, 0, 0, 0 },
+ { TX_SIN4_001, 4229, 0, 0, 0 },
+ { TX_SIN4_002, 5752, 0, 0, 0 },
+ { TX_SIN4_003, 2846, 0, 0, 0 },
+ { TX_SIN4_004, 4391, 0, 0, 0 },
+ { TX_SIN4_005, 3275, 0, 0, 0 },
+ { TX_SIN4_006, 5595, 0, 0, 0 },
+ { TX_SIN4_007, 2628, 0, 0, 0 },
+ { TX_SIN4_008, 1209, 0, 0, 0 },
+ { TX_SIN4_009, 1086, 0, 0, 0 },
+ { TX_SIN4_010, 2310, 0, 0, 0 },
+ { TX_SIN4_011, 5410, 0, 0, 0 },
+ { TX_SIN4_012, 6602, 0, 0, 0 },
+ { TX_SIN4_013, 6150, 0, 0, 0 },
+ { TX_SIN4_014, 6469, 0, 0, 0 },
+ { TX_SIN4_015, 4545, 0, 0, 0 },
+ { TX_SIN4_016, 5900, 0, 0, 0 },
+ { TX_SIN4_017, 4727, 0, 0, 0 },
+ { TX_SIN4_018, 998, 0, 0, 0 },
+ { TX_SIN4_019, 4471, 0, 0, 0 },
+ { TX_SIN4_020, 753, 0, 0, 0 },
+ { TX_SIN4_021, 2206, 0, 0, 0 },
+ { TX_SIN4_022, 1670, 0, 0, 0 },
+ { TX_SIN4_023, 6070, 0, 0, 0 },
+ { TX_SIN4_024, 4650, 0, 0, 0 },
+ { TX_SIN4_025, 2795, 0, 0, 0 },
+ { TX_SIN4_026, 5234, 0, 0, 0 },
+ { TX_SIN4_027, 4999, 0, 0, 0 },
+ { TX_SIN4_028, 4288, 0, 0, 0 },
+ { TX_SIN4_029, 5974, 0, 0, 0 },
+ { TX_SIN4_030, 6209, 0, 0, 0 },
+ { TX_SIN4_031, 4812, 0, 0, 0 },
+ { TX_SIN4_032, 5154, 0, 0, 0 },
+ { TX_SIN4U073, 5836, 0, 0, 0 },
+ { TX_SIN4U088, 2554, 0, 0, 0 },
+ { TX_SIN4U100, 5521, 0, 0, 0 },
+ { TX_SIN4U103, 2672, 0, 0, 0 },
+ { TX_SIN4U105, 3134, 0, 0, 0 },
+ { TX_SIN4U107, 2982, 0, 0, 0 },
+ { TX_SIN4U83B, 5690, 0, 0, 0 },
+ { TX_SIN4N000, 3857, 0, 0, 0 },
+ { TX_SIN4N001, 3665, 0, 0, 0 },
+ { TX_SIN4N002, 3389, 0, 0, 0 },
+ { TX_SIN4N003, 3566, 0, 0, 0 },
+ { TX_SIN4N004, 3480, 0, 0, 0 },
+ { TX_SIN4N005, 3972, 0, 0, 0 },
+ { TX_SIN4N006, 1354, 0, 0, 0 },
+ { TX_SIN4N007, 4160, 0, 0, 0 },
+ { TX_SIN4N008, 4091, 0, 0, 0 },
+ { TX_SIN4N009, 1836, 0, 0, 0 },
+ { TX_SIN4N010, 1927, 0, 0, 0 },
+ { TX_SIN4N011, 2105, 0, 0, 0 },
+ { TX_SIN4N012, 1619, 0, 0, 0 },
+ { TX_SIN4N013, 2011, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText sins4Texts[] = {
diff --git a/engines/startrek/rooms/sins5.cpp b/engines/startrek/rooms/sins5.cpp
index 1ef1701ed5..1492fe5949 100644
--- a/engines/startrek/rooms/sins5.cpp
+++ b/engines/startrek/rooms/sins5.cpp
@@ -150,74 +150,74 @@ enum sins5TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets sins5TextOffsets[] = {
- { TX_SPEAKER_KIRK, 291, 0 },
- { TX_SPEAKER_MCCOY, 302, 0 },
- { TX_SPEAKER_SPOCK, 312, 0 },
- { TX_SPEAKER_MOSHER, 322, 0 },
- { TX_SPEAKER_SCOTT, 346, 0 },
- { TX_SPEAKER_COMPUTER, 356, 0 },
- { TX_SIN5_001, 1654, 0 },
- { TX_SIN5_002, 7449, 0 },
- { TX_SIN5_003, 1470, 0 },
- { TX_SIN5_004, 1562, 0 },
- { TX_SIN5_005, 3254, 0 },
- { TX_SIN5_006, 3938, 0 },
- { TX_SIN5_007, 4382, 0 },
- { TX_SIN5_008, 3069, 0 },
- { TX_SIN5_009, 5927, 0 },
- { TX_SIN5_010, 7984, 0 },
- { TX_SIN5_011, 8427, 0 },
- { TX_SIN5_012, 8584, 0 },
- { TX_SIN5_013, 803, 0 },
- { TX_SIN5_014, 8958, 0 },
- { TX_SIN5_015, 1751, 0 },
- { TX_SIN5_016, 7310, 0 },
- { TX_SIN5_017, 7201, 0 },
- { TX_SIN5_018, 7924, 0 },
- { TX_SIN5_019, 7818, 0 },
- { TX_SIN5_020, 3843, 0 },
- { TX_SIN5_021, 4169, 0 },
- { TX_SIN5_022, 5697, 0 },
- { TX_SIN5_023, 7621, 0 },
- { TX_SIN5_024, 8754, 0 },
- { TX_SIN5_025, 2638, 0 },
- { TX_SIN5_026, 3341, 0 },
- { TX_SIN5_027, 2019, 0 },
- { TX_SIN5_028, 1287, 0 },
- { TX_SIN5_029, 1119, 0 },
- { TX_SIN5_030, 942, 0 },
- { TX_SIN5_031, 5819, 0 },
- { TX_SIN5_032, 4269, 0 },
- { TX_SIN5_033, 7722, 0 },
- { TX_SIN5_034, 8228, 0 },
- { TX_SIN5_035, 9061, 0 },
- { TX_SIN5_036, 3673, 0 },
- { TX_SIN5_037, 4034, 0 },
- { TX_SIN5_038, 7529, 0 },
- { TX_SIN5_039, 2234, 0 },
- { TX_SIN5_040, 2785, 0 },
- { TX_SIN5_041, 2499, 0 },
- { TX_SIN5_042, 1887, 0 },
- { TX_SIN5_043, 4758, 0 },
- { TX_SIN5_044, 3551, 0 },
- { TX_SIN5_045, 9305, 0 },
- { TX_SIN5_046, 8108, 0 },
- { TX_SIN5_S19, 3149, 0 },
- { TX_SIN5N000, 6129, 0 },
- { TX_SIN5N001, 6373, 0 },
- { TX_SIN5N002, 6462, 0 },
- { TX_SIN5N003, 6964, 0 },
- { TX_SIN5N004, 4647, 0 },
- { TX_SIN5N005, 6017, 0 },
- { TX_SIN5N006, 6268, 0 },
- { TX_SIN5N007, 6524, 0 },
- { TX_SIN5N008, 6709, 0 },
- { TX_SIN5N009, 6839, 0 },
- { TX_SIN5N010, 6609, 0 },
- { TX_SIN5N011, 7092, 0 },
- { TX_SIN5N012, 5352, 0 },
- { TX_SIN5N013, 5579, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 291, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 302, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 312, 0, 0, 0 },
+ { TX_SPEAKER_MOSHER, 322, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 346, 0, 0, 0 },
+ { TX_SPEAKER_COMPUTER, 356, 0, 0, 0 },
+ { TX_SIN5_001, 1654, 0, 0, 0 },
+ { TX_SIN5_002, 7449, 0, 0, 0 },
+ { TX_SIN5_003, 1470, 0, 0, 0 },
+ { TX_SIN5_004, 1562, 0, 0, 0 },
+ { TX_SIN5_005, 3254, 0, 0, 0 },
+ { TX_SIN5_006, 3938, 0, 0, 0 },
+ { TX_SIN5_007, 4382, 0, 0, 0 },
+ { TX_SIN5_008, 3069, 0, 0, 0 },
+ { TX_SIN5_009, 5927, 0, 0, 0 },
+ { TX_SIN5_010, 7984, 0, 0, 0 },
+ { TX_SIN5_011, 8427, 0, 0, 0 },
+ { TX_SIN5_012, 8584, 0, 0, 0 },
+ { TX_SIN5_013, 803, 0, 0, 0 },
+ { TX_SIN5_014, 8958, 0, 0, 0 },
+ { TX_SIN5_015, 1751, 0, 0, 0 },
+ { TX_SIN5_016, 7310, 0, 0, 0 },
+ { TX_SIN5_017, 7201, 0, 0, 0 },
+ { TX_SIN5_018, 7924, 0, 0, 0 },
+ { TX_SIN5_019, 7818, 0, 0, 0 },
+ { TX_SIN5_020, 3843, 0, 0, 0 },
+ { TX_SIN5_021, 4169, 0, 0, 0 },
+ { TX_SIN5_022, 5697, 0, 0, 0 },
+ { TX_SIN5_023, 7621, 0, 0, 0 },
+ { TX_SIN5_024, 8754, 0, 0, 0 },
+ { TX_SIN5_025, 2638, 0, 0, 0 },
+ { TX_SIN5_026, 3341, 0, 0, 0 },
+ { TX_SIN5_027, 2019, 0, 0, 0 },
+ { TX_SIN5_028, 1287, 0, 0, 0 },
+ { TX_SIN5_029, 1119, 0, 0, 0 },
+ { TX_SIN5_030, 942, 0, 0, 0 },
+ { TX_SIN5_031, 5819, 0, 0, 0 },
+ { TX_SIN5_032, 4269, 0, 0, 0 },
+ { TX_SIN5_033, 7722, 0, 0, 0 },
+ { TX_SIN5_034, 8228, 0, 0, 0 },
+ { TX_SIN5_035, 9061, 0, 0, 0 },
+ { TX_SIN5_036, 3673, 0, 0, 0 },
+ { TX_SIN5_037, 4034, 0, 0, 0 },
+ { TX_SIN5_038, 7529, 0, 0, 0 },
+ { TX_SIN5_039, 2234, 0, 0, 0 },
+ { TX_SIN5_040, 2785, 0, 0, 0 },
+ { TX_SIN5_041, 2499, 0, 0, 0 },
+ { TX_SIN5_042, 1887, 0, 0, 0 },
+ { TX_SIN5_043, 4758, 0, 0, 0 },
+ { TX_SIN5_044, 3551, 0, 0, 0 },
+ { TX_SIN5_045, 9305, 0, 0, 0 },
+ { TX_SIN5_046, 8108, 0, 0, 0 },
+ { TX_SIN5_S19, 3149, 0, 0, 0 },
+ { TX_SIN5N000, 6129, 0, 0, 0 },
+ { TX_SIN5N001, 6373, 0, 0, 0 },
+ { TX_SIN5N002, 6462, 0, 0, 0 },
+ { TX_SIN5N003, 6964, 0, 0, 0 },
+ { TX_SIN5N004, 4647, 0, 0, 0 },
+ { TX_SIN5N005, 6017, 0, 0, 0 },
+ { TX_SIN5N006, 6268, 0, 0, 0 },
+ { TX_SIN5N007, 6524, 0, 0, 0 },
+ { TX_SIN5N008, 6709, 0, 0, 0 },
+ { TX_SIN5N009, 6839, 0, 0, 0 },
+ { TX_SIN5N010, 6609, 0, 0, 0 },
+ { TX_SIN5N011, 7092, 0, 0, 0 },
+ { TX_SIN5N012, 5352, 0, 0, 0 },
+ { TX_SIN5N013, 5579, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText sins5Texts[] = {
diff --git a/engines/startrek/rooms/trial0.cpp b/engines/startrek/rooms/trial0.cpp
index 03a59d34af..7e21514394 100644
--- a/engines/startrek/rooms/trial0.cpp
+++ b/engines/startrek/rooms/trial0.cpp
@@ -103,91 +103,91 @@ enum trial0TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets trial0TextOffsets[] = {
- { TX_SPEAKER_KIRK, 279, 0 },
- { TX_SPEAKER_MCCOY, 290, 0 },
- { TX_SPEAKER_SPOCK, 300, 0 },
- { TX_SPEAKER_UHURA, 324, 0 },
- { TX_SPEAKER_BENNIE, 310, 0 },
- { TX_SPEAKER_VLICT, 334, 0 },
- { TX_SPEAKER_QUETZECOATL, 354, 0 },
- { TX_SPEAKER_KLINGON_GUARD, 340, 0 },
- { TX_TRI0_001, 2728, 0 },
- { TX_TRI0_002, 2315, 0 },
- { TX_TRI0_003, 4950, 0 },
- { TX_TRI0_004, 1556, 0 },
- { TX_TRI0_006, 4097, 0 },
- { TX_TRI0_007, 7911, 0 },
- { TX_TRI0_008, 4721, 0 },
- { TX_TRI0_009, 5176, 0 },
- { TX_TRI0_010, 4268, 0 },
- { TX_TRI0_011, 1832, 0 },
- { TX_TRI0_013, 5423, 0 },
- { TX_TRI0_014, 5269, 0 },
- { TX_TRI0_015, 2067, 0 },
- { TX_TRI0_016, 1083, 0 },
- { TX_TRI0_017, 4409, 0 },
- { TX_TRI0_018, 1977, 0 },
- { TX_TRI0_019, 957, 0 },
- { TX_TRI0_020, 4570, 0 },
- { TX_TRI0_021, 1174, 0 },
- { TX_TRI0_022, 8073, 0 },
- { TX_TRI0_023, 3960, 0 },
- { TX_TRI0_024, 9850, 0 },
- { TX_TRI0_025, 8440, 0 },
- { TX_TRI0_026, 8636, 0 },
- { TX_TRI0_027, 9956, 0 },
- { TX_TRI0_028, 10033, 0 },
- { TX_TRI0_029, 9149, 0 },
- { TX_TRI0_030, 9268, 0 },
- { TX_TRI0_031, 8370, 0 },
- { TX_TRI0_034, 10125, 0 },
- { TX_TRI0_035, 9383, 0 },
- { TX_TRI0_036, 8794, 0 },
- { TX_TRI0_037, 9487, 0 },
- { TX_TRI0_038, 9621, 0 },
- { TX_TRI0_039, 3448, 0 },
- { TX_TRI0_040, 3765, 0 },
- { TX_TRI0_041, 3124, 0 },
- { TX_TRI0_042, 8269, 0 },
- { TX_TRI0_043, 2194, 0 },
- { TX_TRI0_044, 6132, 0 },
- { TX_TRI0_045, 5787, 0 },
- { TX_TRI0_046, 3831, 0 },
- { TX_TRI0_047, 1665, 0 },
- { TX_TRI0_048, 2981, 0 },
- { TX_TRI0_049, 6054, 0 },
- { TX_TRI0_050, 3269, 0 },
- { TX_TRI0_051, 5011, 0 },
- { TX_TRI0_052, 10206, 0 },
- { TX_TRI0_053, 831, 0 },
- { TX_TRI0_054, 1350, 0 },
- { TX_TRI0_055, 5619, 0 },
- { TX_TRI0_056, 2500, 0 },
- { TX_TRI0_057, 4878, 0 },
- { TX_TRI0_058, 653, 0 },
- { TX_TRI0_059, 3550, 0 },
- { TX_TRI0_060, 2851, 0 },
- { TX_TRI0_061, 2570, 0 },
- { TX_TRI0_062, 7660, 0 },
- { TX_TRI0_063, 8557, 0 },
- { TX_TRI0_064, 7945, 0 },
- { TX_TRI0_065, 7809, 0 },
- { TX_TRI0_066, 8227, 0 },
- { TX_TRI0_F24, 9031, 0 },
- { TX_TRI0_F24, 7748, 0 },
- { TX_TRI4_076, 8927, 0 },
- { TX_TRI0N000, 6620, 0 },
- { TX_TRI0N001, 6528, 0 },
- { TX_TRI0N002, 7287, 0 },
- { TX_TRI0N003, 7433, 0 },
- { TX_TRI0N004, 7021, 0 },
- { TX_TRI0N005, 7158, 0 },
- { TX_TRI0N006, 6778, 0 },
- { TX_TRI0N007, 6363, 0 },
- { TX_TRI0N008, 6941, 0 },
- { TX_TRI0N009, 7545, 0 },
- { TX_TRI0U075, 9675, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 279, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 290, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 300, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 324, 0, 0, 0 },
+ { TX_SPEAKER_BENNIE, 310, 0, 0, 0 },
+ { TX_SPEAKER_VLICT, 334, 0, 0, 0 },
+ { TX_SPEAKER_QUETZECOATL, 354, 0, 0, 0 },
+ { TX_SPEAKER_KLINGON_GUARD, 340, 0, 0, 0 },
+ { TX_TRI0_001, 2728, 0, 0, 0 },
+ { TX_TRI0_002, 2315, 0, 0, 0 },
+ { TX_TRI0_003, 4950, 0, 0, 0 },
+ { TX_TRI0_004, 1556, 0, 0, 0 },
+ { TX_TRI0_006, 4097, 0, 0, 0 },
+ { TX_TRI0_007, 7911, 0, 0, 0 },
+ { TX_TRI0_008, 4721, 0, 0, 0 },
+ { TX_TRI0_009, 5176, 0, 0, 0 },
+ { TX_TRI0_010, 4268, 0, 0, 0 },
+ { TX_TRI0_011, 1832, 0, 0, 0 },
+ { TX_TRI0_013, 5423, 0, 0, 0 },
+ { TX_TRI0_014, 5269, 0, 0, 0 },
+ { TX_TRI0_015, 2067, 0, 0, 0 },
+ { TX_TRI0_016, 1083, 0, 0, 0 },
+ { TX_TRI0_017, 4409, 0, 0, 0 },
+ { TX_TRI0_018, 1977, 0, 0, 0 },
+ { TX_TRI0_019, 957, 0, 0, 0 },
+ { TX_TRI0_020, 4570, 0, 0, 0 },
+ { TX_TRI0_021, 1174, 0, 0, 0 },
+ { TX_TRI0_022, 8073, 0, 0, 0 },
+ { TX_TRI0_023, 3960, 0, 0, 0 },
+ { TX_TRI0_024, 9850, 0, 0, 0 },
+ { TX_TRI0_025, 8440, 0, 0, 0 },
+ { TX_TRI0_026, 8636, 0, 0, 0 },
+ { TX_TRI0_027, 9956, 0, 0, 0 },
+ { TX_TRI0_028, 10033, 0, 0, 0 },
+ { TX_TRI0_029, 9149, 0, 0, 0 },
+ { TX_TRI0_030, 9268, 0, 0, 0 },
+ { TX_TRI0_031, 8370, 0, 0, 0 },
+ { TX_TRI0_034, 10125, 0, 0, 0 },
+ { TX_TRI0_035, 9383, 0, 0, 0 },
+ { TX_TRI0_036, 8794, 0, 0, 0 },
+ { TX_TRI0_037, 9487, 0, 0, 0 },
+ { TX_TRI0_038, 9621, 0, 0, 0 },
+ { TX_TRI0_039, 3448, 0, 0, 0 },
+ { TX_TRI0_040, 3765, 0, 0, 0 },
+ { TX_TRI0_041, 3124, 0, 0, 0 },
+ { TX_TRI0_042, 8269, 0, 0, 0 },
+ { TX_TRI0_043, 2194, 0, 0, 0 },
+ { TX_TRI0_044, 6132, 0, 0, 0 },
+ { TX_TRI0_045, 5787, 0, 0, 0 },
+ { TX_TRI0_046, 3831, 0, 0, 0 },
+ { TX_TRI0_047, 1665, 0, 0, 0 },
+ { TX_TRI0_048, 2981, 0, 0, 0 },
+ { TX_TRI0_049, 6054, 0, 0, 0 },
+ { TX_TRI0_050, 3269, 0, 0, 0 },
+ { TX_TRI0_051, 5011, 0, 0, 0 },
+ { TX_TRI0_052, 10206, 0, 0, 0 },
+ { TX_TRI0_053, 831, 0, 0, 0 },
+ { TX_TRI0_054, 1350, 0, 0, 0 },
+ { TX_TRI0_055, 5619, 0, 0, 0 },
+ { TX_TRI0_056, 2500, 0, 0, 0 },
+ { TX_TRI0_057, 4878, 0, 0, 0 },
+ { TX_TRI0_058, 653, 0, 0, 0 },
+ { TX_TRI0_059, 3550, 0, 0, 0 },
+ { TX_TRI0_060, 2851, 0, 0, 0 },
+ { TX_TRI0_061, 2570, 0, 0, 0 },
+ { TX_TRI0_062, 7660, 0, 0, 0 },
+ { TX_TRI0_063, 8557, 0, 0, 0 },
+ { TX_TRI0_064, 7945, 0, 0, 0 },
+ { TX_TRI0_065, 7809, 0, 0, 0 },
+ { TX_TRI0_066, 8227, 0, 0, 0 },
+ { TX_TRI0_F24, 9031, 0, 0, 0 },
+ { TX_TRI0_F24, 7748, 0, 0, 0 },
+ { TX_TRI4_076, 8927, 0, 0, 0 },
+ { TX_TRI0N000, 6620, 0, 0, 0 },
+ { TX_TRI0N001, 6528, 0, 0, 0 },
+ { TX_TRI0N002, 7287, 0, 0, 0 },
+ { TX_TRI0N003, 7433, 0, 0, 0 },
+ { TX_TRI0N004, 7021, 0, 0, 0 },
+ { TX_TRI0N005, 7158, 0, 0, 0 },
+ { TX_TRI0N006, 6778, 0, 0, 0 },
+ { TX_TRI0N007, 6363, 0, 0, 0 },
+ { TX_TRI0N008, 6941, 0, 0, 0 },
+ { TX_TRI0N009, 7545, 0, 0, 0 },
+ { TX_TRI0U075, 9675, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText trial0Texts[] = {
diff --git a/engines/startrek/rooms/trial1.cpp b/engines/startrek/rooms/trial1.cpp
index cacfb0f877..de906aba00 100644
--- a/engines/startrek/rooms/trial1.cpp
+++ b/engines/startrek/rooms/trial1.cpp
@@ -191,97 +191,97 @@ enum trial1TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets trial1TextOffsets[] = {
- { TX_SPEAKER_KIRK, 275, 0 },
- { TX_SPEAKER_MCCOY, 286, 0 },
- { TX_SPEAKER_SPOCK, 296, 0 },
- { TX_SPEAKER_UHURA, 320, 0 },
- { TX_SPEAKER_BENNIE, 306, 0 },
- { TX_SPEAKER_ENTITY, 330, 0 },
- { TX_TRI1_002, 7154, 0 },
- { TX_TRI1_003, 7575, 0 },
- { TX_TRI1_004, 6149, 0 },
- { TX_TRI1_005, 6076, 0 },
- { TX_TRI1_006, 7100, 0 },
- { TX_TRI1_007, 936, 0 },
- { TX_TRI1_008, 7619, 0 },
- { TX_TRI1_009, 6209, 0 },
- { TX_TRI1_010, 1276, 0 },
- { TX_TRI1_011, 6761, 0 },
- { TX_TRI1_012, 5106, 0 },
- { TX_TRI1_013, 5610, 0 },
- { TX_TRI1_014, 5737, 0 },
- { TX_TRI1_015, 10856, 0 },
- { TX_TRI1_016, 7808, 0 },
- { TX_TRI1_017, 4855, 0 },
- { TX_TRI1_018, 7936, 0 },
- { TX_TRI1_019, 3040, 0 },
- { TX_TRI1_020, 8025, 0 },
- { TX_TRI1_021, 4261, 0 },
- { TX_TRI1_022, 4596, 0 },
- { TX_TRI1_023, 4723, 0 },
- { TX_TRI1_024, 4387, 0 },
- { TX_TRI1_025, 4457, 0 },
- { TX_TRI1_026, 11067, 0 },
- { TX_TRI1_027, 9814, 0 },
- { TX_TRI1_029, 8075, 0 },
- { TX_TRI1_030, 8140, 0 },
- { TX_TRI1_031, 8211, 0 },
- { TX_TRI1_032, 865, 0 },
- { TX_TRI1_033, 10751, 0 },
- { TX_TRI1_034, 2991, 0 },
- { TX_TRI1_035, 9017, 0 },
- { TX_TRI1_036, 8488, 0 },
- { TX_TRI1_037, 9853, 0 },
- { TX_TRI1_038, 8412, 0 },
- { TX_TRI1_039, 8292, 0 },
- { TX_TRI1_040, 4132, 0 },
- { TX_TRI1_041, 5347, 0 },
- { TX_TRI1_042, 5488, 0 },
- { TX_TRI1_043, 4978, 0 },
- { TX_TRI1_044, 8651, 0 },
- { TX_TRI1_045, 10642, 0 },
- { TX_TRI1_046, 2905, 0 },
- { TX_TRI1_047, 695, 0 },
- { TX_TRI1_048, 3398, 0 },
- { TX_TRI1_049, 9712, 0 },
- { TX_TRI1_050, 9100, 0 },
- { TX_TRI1_051, 9218, 0 },
- { TX_TRI1_052, 9892, 0 },
- { TX_TRI1_053, 3193, 0 },
- { TX_TRI1_054, 9318, 0 },
- { TX_TRI1_055, 1502, 0 },
- { TX_TRI1_056, 648, 0 },
- { TX_TRI1_057, 1140, 0 },
- { TX_TRI1_J00, 2812, 0 },
- { TX_TRI1N000, 2606, 0 },
- { TX_TRI1N001, 2431, 0 },
- { TX_TRI1N002, 2527, 0 },
- { TX_TRI1N003, 1870, 0 },
- { TX_TRI1N004, 10811, 0 },
- //{ TX_TRI1N004, 3577, 0 }, // ignore duplicate line
- { TX_TRI1N005, 10082, 0 },
- { TX_TRI1N006, 2249, 0 },
- { TX_TRI1N007, 2714, 0 },
- { TX_TRI1N008, 3629, 0 },
- { TX_TRI1N009, 2340, 0 },
- { TX_TRI1N011, 2154, 0 },
- { TX_TRI1N012, 4065, 0 },
- { TX_TRI1N013, 10207, 0 },
- { TX_TRI1N014, 3932, 0 },
- { TX_TRI1N015, 2076, 0 },
- { TX_TRI1N016, 2004, 0 },
- { TX_TRI1N017, 1938, 0 },
- { TX_TRI1U068, 6299, 0 },
- { TX_TRI1U079, 7248, 0 },
- { TX_TRI1U080, 5936, 0 },
- { TX_TRI1U086, 6358, 0 },
- { TX_TRI1U090, 6011, 0 },
- { TX_TRI1U095, 7738, 0 },
- { TX_TRI1U098, 6613, 0 },
- { TX_TRI1U101, 6947, 0 },
- { TX_TRI1U102, 7379, 0 },
- { TX_TRI1U106, 6444, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 275, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 286, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 296, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 320, 0, 0, 0 },
+ { TX_SPEAKER_BENNIE, 306, 0, 0, 0 },
+ { TX_SPEAKER_ENTITY, 330, 0, 0, 0 },
+ { TX_TRI1_002, 7154, 0, 0, 0 },
+ { TX_TRI1_003, 7575, 0, 0, 0 },
+ { TX_TRI1_004, 6149, 0, 0, 0 },
+ { TX_TRI1_005, 6076, 0, 0, 0 },
+ { TX_TRI1_006, 7100, 0, 0, 0 },
+ { TX_TRI1_007, 936, 0, 0, 0 },
+ { TX_TRI1_008, 7619, 0, 0, 0 },
+ { TX_TRI1_009, 6209, 0, 0, 0 },
+ { TX_TRI1_010, 1276, 0, 0, 0 },
+ { TX_TRI1_011, 6761, 0, 0, 0 },
+ { TX_TRI1_012, 5106, 0, 0, 0 },
+ { TX_TRI1_013, 5610, 0, 0, 0 },
+ { TX_TRI1_014, 5737, 0, 0, 0 },
+ { TX_TRI1_015, 10856, 0, 0, 0 },
+ { TX_TRI1_016, 7808, 0, 0, 0 },
+ { TX_TRI1_017, 4855, 0, 0, 0 },
+ { TX_TRI1_018, 7936, 0, 0, 0 },
+ { TX_TRI1_019, 3040, 0, 0, 0 },
+ { TX_TRI1_020, 8025, 0, 0, 0 },
+ { TX_TRI1_021, 4261, 0, 0, 0 },
+ { TX_TRI1_022, 4596, 0, 0, 0 },
+ { TX_TRI1_023, 4723, 0, 0, 0 },
+ { TX_TRI1_024, 4387, 0, 0, 0 },
+ { TX_TRI1_025, 4457, 0, 0, 0 },
+ { TX_TRI1_026, 11067, 0, 0, 0 },
+ { TX_TRI1_027, 9814, 0, 0, 0 },
+ { TX_TRI1_029, 8075, 0, 0, 0 },
+ { TX_TRI1_030, 8140, 0, 0, 0 },
+ { TX_TRI1_031, 8211, 0, 0, 0 },
+ { TX_TRI1_032, 865, 0, 0, 0 },
+ { TX_TRI1_033, 10751, 0, 0, 0 },
+ { TX_TRI1_034, 2991, 0, 0, 0 },
+ { TX_TRI1_035, 9017, 0, 0, 0 },
+ { TX_TRI1_036, 8488, 0, 0, 0 },
+ { TX_TRI1_037, 9853, 0, 0, 0 },
+ { TX_TRI1_038, 8412, 0, 0, 0 },
+ { TX_TRI1_039, 8292, 0, 0, 0 },
+ { TX_TRI1_040, 4132, 0, 0, 0 },
+ { TX_TRI1_041, 5347, 0, 0, 0 },
+ { TX_TRI1_042, 5488, 0, 0, 0 },
+ { TX_TRI1_043, 4978, 0, 0, 0 },
+ { TX_TRI1_044, 8651, 0, 0, 0 },
+ { TX_TRI1_045, 10642, 0, 0, 0 },
+ { TX_TRI1_046, 2905, 0, 0, 0 },
+ { TX_TRI1_047, 695, 0, 0, 0 },
+ { TX_TRI1_048, 3398, 0, 0, 0 },
+ { TX_TRI1_049, 9712, 0, 0, 0 },
+ { TX_TRI1_050, 9100, 0, 0, 0 },
+ { TX_TRI1_051, 9218, 0, 0, 0 },
+ { TX_TRI1_052, 9892, 0, 0, 0 },
+ { TX_TRI1_053, 3193, 0, 0, 0 },
+ { TX_TRI1_054, 9318, 0, 0, 0 },
+ { TX_TRI1_055, 1502, 0, 0, 0 },
+ { TX_TRI1_056, 648, 0, 0, 0 },
+ { TX_TRI1_057, 1140, 0, 0, 0 },
+ { TX_TRI1_J00, 2812, 0, 0, 0 },
+ { TX_TRI1N000, 2606, 0, 0, 0 },
+ { TX_TRI1N001, 2431, 0, 0, 0 },
+ { TX_TRI1N002, 2527, 0, 0, 0 },
+ { TX_TRI1N003, 1870, 0, 0, 0 },
+ { TX_TRI1N004, 10811, 0, 0, 0 },
+ //{ TX_TRI1N004, 3577, 0, 0, 0 }, // ignore duplicate line
+ { TX_TRI1N005, 10082, 0, 0, 0 },
+ { TX_TRI1N006, 2249, 0, 0, 0 },
+ { TX_TRI1N007, 2714, 0, 0, 0 },
+ { TX_TRI1N008, 3629, 0, 0, 0 },
+ { TX_TRI1N009, 2340, 0, 0, 0 },
+ { TX_TRI1N011, 2154, 0, 0, 0 },
+ { TX_TRI1N012, 4065, 0, 0, 0 },
+ { TX_TRI1N013, 10207, 0, 0, 0 },
+ { TX_TRI1N014, 3932, 0, 0, 0 },
+ { TX_TRI1N015, 2076, 0, 0, 0 },
+ { TX_TRI1N016, 2004, 0, 0, 0 },
+ { TX_TRI1N017, 1938, 0, 0, 0 },
+ { TX_TRI1U068, 6299, 0, 0, 0 },
+ { TX_TRI1U079, 7248, 0, 0, 0 },
+ { TX_TRI1U080, 5936, 0, 0, 0 },
+ { TX_TRI1U086, 6358, 0, 0, 0 },
+ { TX_TRI1U090, 6011, 0, 0, 0 },
+ { TX_TRI1U095, 7738, 0, 0, 0 },
+ { TX_TRI1U098, 6613, 0, 0, 0 },
+ { TX_TRI1U101, 6947, 0, 0, 0 },
+ { TX_TRI1U102, 7379, 0, 0, 0 },
+ { TX_TRI1U106, 6444, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText trial1Texts[] = {
diff --git a/engines/startrek/rooms/trial2.cpp b/engines/startrek/rooms/trial2.cpp
index f9da24d692..2ed466964e 100644
--- a/engines/startrek/rooms/trial2.cpp
+++ b/engines/startrek/rooms/trial2.cpp
@@ -138,67 +138,67 @@ enum trial2TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets trial2TextOffsets[] = {
- { TX_SPEAKER_KIRK, 275, 0 },
- { TX_SPEAKER_MCCOY, 286, 0 },
- { TX_SPEAKER_SPOCK, 296, 0 },
- { TX_SPEAKER_UHURA, 320, 0 },
- { TX_SPEAKER_BENNIE, 306, 0 },
- { TX_TRI2_001, 1996, 0 },
- { TX_TRI2_002, 7658, 0 },
- { TX_TRI2_003, 7025, 0 },
- { TX_TRI2_004, 7098, 0 },
- { TX_TRI2_005, 832, 0 },
- { TX_TRI2_006, 7444, 0 },
- { TX_TRI2_007, 7158, 0 },
- { TX_TRI2_008, 1010, 0 },
- { TX_TRI2_009, 4913, 0 },
- { TX_TRI2_010, 8042, 0 },
- { TX_TRI2_011, 6217, 0 },
- //{ TX_TRI2_012, 7886, 0 }, // Ignore duplicate line
- { TX_TRI2_012, 7964, 0 },
- { TX_TRI2_013, 2252, 0 },
- { TX_TRI2_014, 5949, 0 },
- { TX_TRI2_015, 6076, 0 },
- { TX_TRI2_016, 5690, 0 },
- { TX_TRI2_017, 5810, 0 },
- { TX_TRI2_018, 8732, 0 },
- { TX_TRI2_019, 2118, 0 },
- { TX_TRI2_020, 4778, 0 },
- { TX_TRI2_021, 5194, 0 },
- { TX_TRI2_022, 8373, 0 },
- //{ TX_TRI2_023, 3777, 0 }, // Ignore duplicate line
- { TX_TRI2_023, 4481, 0 },
- { TX_TRI2_024, 1123, 0 },
- //{ TX_TRI2_025, 3473, 0 }, // Ignore duplicate line
- //{ TX_TRI2_025, 4173, 0 }, // Ignore duplicate line
- { TX_TRI2_025, 2852, 0 },
- { TX_TRI2_026, 6651, 0 },
- { TX_TRI2_027, 6490, 0 },
- { TX_TRI2_028, 8117, 0 },
- { TX_TRI2_029, 6351, 0 },
- { TX_TRI2_030, 880, 0 },
- //{ TX_TRI2_031, 8456, 0 }, // Ignore duplicate line
- { TX_TRI2_031, 8552, 0 },
- { TX_TRI2_032, 8648, 0 },
- { TX_TRI2_033, 2387, 0 },
- { TX_TRI2_034, 777, 0 },
- { TX_TRI2_F11, 8245, 0 },
- { TX_TRI2N000, 1730, 0 },
- { TX_TRI2N001, 1373, 0 },
- { TX_TRI2N002, 1579, 0 },
- { TX_TRI2N003, 1277, 0 },
- { TX_TRI2N004, 1663, 0 },
- { TX_TRI2N005, 1905, 0 },
- { TX_TRI2N006, 1474, 0 },
- { TX_TRI2N007, 1790, 0 },
- { TX_TRI2N008, 2624, 0 },
- { TX_TRI2U074, 7755, 0 },
- { TX_TRI2U081, 7600, 0 },
- { TX_TRI2U087, 7238, 0 },
- { TX_TRI2U091, 6960, 0 },
- { TX_TRI2U104, 7544, 0 },
- { TX_QUIET, 2478, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 275, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 286, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 296, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 320, 0, 0, 0 },
+ { TX_SPEAKER_BENNIE, 306, 0, 0, 0 },
+ { TX_TRI2_001, 1996, 0, 0, 0 },
+ { TX_TRI2_002, 7658, 0, 0, 0 },
+ { TX_TRI2_003, 7025, 0, 0, 0 },
+ { TX_TRI2_004, 7098, 0, 0, 0 },
+ { TX_TRI2_005, 832, 0, 0, 0 },
+ { TX_TRI2_006, 7444, 0, 0, 0 },
+ { TX_TRI2_007, 7158, 0, 0, 0 },
+ { TX_TRI2_008, 1010, 0, 0, 0 },
+ { TX_TRI2_009, 4913, 0, 0, 0 },
+ { TX_TRI2_010, 8042, 0, 0, 0 },
+ { TX_TRI2_011, 6217, 0, 0, 0 },
+ //{ TX_TRI2_012, 7886, 0, 0, 0 }, // Ignore duplicate line
+ { TX_TRI2_012, 7964, 0, 0, 0 },
+ { TX_TRI2_013, 2252, 0, 0, 0 },
+ { TX_TRI2_014, 5949, 0, 0, 0 },
+ { TX_TRI2_015, 6076, 0, 0, 0 },
+ { TX_TRI2_016, 5690, 0, 0, 0 },
+ { TX_TRI2_017, 5810, 0, 0, 0 },
+ { TX_TRI2_018, 8732, 0, 0, 0 },
+ { TX_TRI2_019, 2118, 0, 0, 0 },
+ { TX_TRI2_020, 4778, 0, 0, 0 },
+ { TX_TRI2_021, 5194, 0, 0, 0 },
+ { TX_TRI2_022, 8373, 0, 0, 0 },
+ //{ TX_TRI2_023, 3777, 0, 0, 0 }, // Ignore duplicate line
+ { TX_TRI2_023, 4481, 0, 0, 0 },
+ { TX_TRI2_024, 1123, 0, 0, 0 },
+ //{ TX_TRI2_025, 3473, 0, 0, 0 }, // Ignore duplicate line
+ //{ TX_TRI2_025, 4173, 0, 0, 0 }, // Ignore duplicate line
+ { TX_TRI2_025, 2852, 0, 0, 0 },
+ { TX_TRI2_026, 6651, 0, 0, 0 },
+ { TX_TRI2_027, 6490, 0, 0, 0 },
+ { TX_TRI2_028, 8117, 0, 0, 0 },
+ { TX_TRI2_029, 6351, 0, 0, 0 },
+ { TX_TRI2_030, 880, 0, 0, 0 },
+ //{ TX_TRI2_031, 8456, 0, 0, 0 }, // Ignore duplicate line
+ { TX_TRI2_031, 8552, 0, 0, 0 },
+ { TX_TRI2_032, 8648, 0, 0, 0 },
+ { TX_TRI2_033, 2387, 0, 0, 0 },
+ { TX_TRI2_034, 777, 0, 0, 0 },
+ { TX_TRI2_F11, 8245, 0, 0, 0 },
+ { TX_TRI2N000, 1730, 0, 0, 0 },
+ { TX_TRI2N001, 1373, 0, 0, 0 },
+ { TX_TRI2N002, 1579, 0, 0, 0 },
+ { TX_TRI2N003, 1277, 0, 0, 0 },
+ { TX_TRI2N004, 1663, 0, 0, 0 },
+ { TX_TRI2N005, 1905, 0, 0, 0 },
+ { TX_TRI2N006, 1474, 0, 0, 0 },
+ { TX_TRI2N007, 1790, 0, 0, 0 },
+ { TX_TRI2N008, 2624, 0, 0, 0 },
+ { TX_TRI2U074, 7755, 0, 0, 0 },
+ { TX_TRI2U081, 7600, 0, 0, 0 },
+ { TX_TRI2U087, 7238, 0, 0, 0 },
+ { TX_TRI2U091, 6960, 0, 0, 0 },
+ { TX_TRI2U104, 7544, 0, 0, 0 },
+ { TX_QUIET, 2478, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText trial2Texts[] = {
diff --git a/engines/startrek/rooms/trial3.cpp b/engines/startrek/rooms/trial3.cpp
index 5940ace91c..31c9e93677 100644
--- a/engines/startrek/rooms/trial3.cpp
+++ b/engines/startrek/rooms/trial3.cpp
@@ -108,58 +108,58 @@ enum trial3TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets trial3TextOffsets[] = {
- { TX_SPEAKER_KIRK, 275, 0 },
- { TX_SPEAKER_MCCOY, 286, 0 },
- { TX_SPEAKER_SPOCK, 296, 0 },
- { TX_SPEAKER_UHURA, 320, 0 },
- { TX_SPEAKER_BENNIE, 306, 0 },
- { TX_TRI3_001, 3318, 0 },
- { TX_TRI3_002, 2137, 0 },
- { TX_TRI3_003, 2204, 0 },
- { TX_TRI3_004, 1005, 0 },
- { TX_TRI3_005, 621, 0 },
- { TX_TRI3_006, 2056, 0 },
- { TX_TRI3_007, 1920, 0 },
- { TX_TRI3_008, 6462, 0 },
- { TX_TRI3_009, 4980, 0 },
- { TX_TRI3_010, 6219, 0 },
- { TX_TRI3_011, 5545, 0 },
- { TX_TRI3_012, 6306, 0 },
- { TX_TRI3_013, 4775, 0 },
- { TX_TRI3_014, 4855, 0 },
- { TX_TRI3_015, 4516, 0 },
- { TX_TRI3_016, 4636, 0 },
- { TX_TRI3_017, 6798, 0 },
- { TX_TRI3_018, 3449, 0 },
- { TX_TRI3_019, 683, 0 },
- { TX_TRI3_020, 892, 0 },
- { TX_TRI3_021, 6379, 0 },
- { TX_TRI3_022, 3386, 0 },
- { TX_TRI3_023, 5295, 0 },
- { TX_TRI3_024, 5155, 0 },
- { TX_TRI3_025, 742, 0 },
- { TX_TRI3_026, 6690, 0 },
- { TX_TRI3_027, 6590, 0 },
- { TX_TRI3_028, 5689, 0 },
- { TX_TRI3_029, 3537, 0 },
- { TX_TRI3_030, 545, 0 },
- { TX_TRI3_103, 6001, 0 },
- { TX_TRI3_104, 6074, 0 },
- { TX_TRI3_107, 6134, 0 },
- { TX_TRI3N000, 2819, 0 },
- { TX_TRI3N001, 2989, 0 },
- { TX_TRI3N002, 3074, 0 },
- { TX_TRI3N003, 4395, 0 },
- { TX_TRI3N004, 2898, 0 },
- { TX_TRI3N005, 3178, 0 },
- { TX_TRI3N006, 3664, 0 },
- { TX_TRI3N007, 3258, 0 },
- { TX_TRI3U067, 5795, 0 },
- { TX_TRI3U080, 2345, 0 },
- { TX_TRI3U084, 1801, 0 },
- { TX_TRI3U089, 5936, 0 },
- { TX_TRI3U099, 1970, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 275, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 286, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 296, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 320, 0, 0, 0 },
+ { TX_SPEAKER_BENNIE, 306, 0, 0, 0 },
+ { TX_TRI3_001, 3318, 0, 0, 0 },
+ { TX_TRI3_002, 2137, 0, 0, 0 },
+ { TX_TRI3_003, 2204, 0, 0, 0 },
+ { TX_TRI3_004, 1005, 0, 0, 0 },
+ { TX_TRI3_005, 621, 0, 0, 0 },
+ { TX_TRI3_006, 2056, 0, 0, 0 },
+ { TX_TRI3_007, 1920, 0, 0, 0 },
+ { TX_TRI3_008, 6462, 0, 0, 0 },
+ { TX_TRI3_009, 4980, 0, 0, 0 },
+ { TX_TRI3_010, 6219, 0, 0, 0 },
+ { TX_TRI3_011, 5545, 0, 0, 0 },
+ { TX_TRI3_012, 6306, 0, 0, 0 },
+ { TX_TRI3_013, 4775, 0, 0, 0 },
+ { TX_TRI3_014, 4855, 0, 0, 0 },
+ { TX_TRI3_015, 4516, 0, 0, 0 },
+ { TX_TRI3_016, 4636, 0, 0, 0 },
+ { TX_TRI3_017, 6798, 0, 0, 0 },
+ { TX_TRI3_018, 3449, 0, 0, 0 },
+ { TX_TRI3_019, 683, 0, 0, 0 },
+ { TX_TRI3_020, 892, 0, 0, 0 },
+ { TX_TRI3_021, 6379, 0, 0, 0 },
+ { TX_TRI3_022, 3386, 0, 0, 0 },
+ { TX_TRI3_023, 5295, 0, 0, 0 },
+ { TX_TRI3_024, 5155, 0, 0, 0 },
+ { TX_TRI3_025, 742, 0, 0, 0 },
+ { TX_TRI3_026, 6690, 0, 0, 0 },
+ { TX_TRI3_027, 6590, 0, 0, 0 },
+ { TX_TRI3_028, 5689, 0, 0, 0 },
+ { TX_TRI3_029, 3537, 0, 0, 0 },
+ { TX_TRI3_030, 545, 0, 0, 0 },
+ { TX_TRI3_103, 6001, 0, 0, 0 },
+ { TX_TRI3_104, 6074, 0, 0, 0 },
+ { TX_TRI3_107, 6134, 0, 0, 0 },
+ { TX_TRI3N000, 2819, 0, 0, 0 },
+ { TX_TRI3N001, 2989, 0, 0, 0 },
+ { TX_TRI3N002, 3074, 0, 0, 0 },
+ { TX_TRI3N003, 4395, 0, 0, 0 },
+ { TX_TRI3N004, 2898, 0, 0, 0 },
+ { TX_TRI3N005, 3178, 0, 0, 0 },
+ { TX_TRI3N006, 3664, 0, 0, 0 },
+ { TX_TRI3N007, 3258, 0, 0, 0 },
+ { TX_TRI3U067, 5795, 0, 0, 0 },
+ { TX_TRI3U080, 2345, 0, 0, 0 },
+ { TX_TRI3U084, 1801, 0, 0, 0 },
+ { TX_TRI3U089, 5936, 0, 0, 0 },
+ { TX_TRI3U099, 1970, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText trial3Texts[] = {
diff --git a/engines/startrek/rooms/trial4.cpp b/engines/startrek/rooms/trial4.cpp
index 4778f88416..22d1bf6b68 100644
--- a/engines/startrek/rooms/trial4.cpp
+++ b/engines/startrek/rooms/trial4.cpp
@@ -56,89 +56,89 @@ enum trial4TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets trial4TextOffsets[] = {
- { TX_SPEAKER_KIRK, 275, 0 },
- { TX_SPEAKER_MCCOY, 286, 0 },
- { TX_SPEAKER_SPOCK, 296, 0 },
- { TX_SPEAKER_UHURA, 320, 0 },
- { TX_SPEAKER_BENNIE, 306, 0 },
- { TX_SPEAKER_VLICT, 330, 0 },
- { TX_SPEAKER_QUETZECOATL, 336, 0 },
- { TX_TRI4_001, 6207, 0 },
- { TX_TRI4_002, 1353, 0 },
- { TX_TRI4_003, 8171, 0 },
- { TX_TRI4_004, 4857, 0 },
- { TX_TRI4_005, 3358, 0 },
- { TX_TRI4_006, 7836, 0 },
- { TX_TRI4_007, 8534, 0 },
- { TX_TRI4_008, 4678, 0 },
- { TX_TRI4_009, 1275, 0 },
- { TX_TRI4_010, 8300, 0 },
- { TX_TRI4_011, 6615, 0 },
- { TX_TRI4_012, 8639, 0 },
- { TX_TRI4_013, 2909, 0 },
- { TX_TRI4_014, 1572, 0 },
- { TX_TRI4_015, 3131, 0 },
- { TX_TRI4_016, 7008, 0 },
- { TX_TRI4_017, 5392, 0 },
- { TX_TRI4_018, 5178, 0 },
- { TX_TRI4_019, 4384, 0 },
- { TX_TRI4_020, 2094, 0 },
- { TX_TRI4_021, 5691, 0 },
- { TX_TRI4_022, 683, 0 },
- { TX_TRI4_023, 7415, 0 },
- { TX_TRI4_024, 7320, 0 },
- { TX_TRI4_025, 4550, 0 },
- { TX_TRI4_026, 7203, 0 },
- { TX_TRI4_027, 4994, 0 },
- { TX_TRI4_028, 5645, 0 },
- { TX_TRI4_029, 1992, 0 },
- { TX_TRI4_030, 2217, 0 },
- { TX_TRI4_031, 5790, 0 },
- { TX_TRI4_032, 922, 0 },
- { TX_TRI4_033, 1211, 0 },
- { TX_TRI4_034, 5077, 0 },
- { TX_TRI4_036, 6007, 0 },
- { TX_TRI4_037, 6412, 0 },
- { TX_TRI4_038, 7692, 0 },
- { TX_TRI4_039, 774, 0 },
- { TX_TRI4_040, 2495, 0 },
- { TX_TRI4_041, 3609, 0 },
- { TX_TRI4_042, 5425, 0 },
- { TX_TRI4_043, 1847, 0 },
- { TX_TRI4_044, 7742, 0 },
- { TX_TRI4_045, 8077, 0 },
- { TX_TRI4_046, 8440, 0 },
- { TX_TRI4_047, 8232, 0 },
- { TX_TRI4_048, 7893, 0 },
- { TX_TRI4_049, 8591, 0 },
- { TX_TRI4_050, 4077, 0 },
- { TX_TRI4_051, 3719, 0 },
- { TX_TRI4_052, 3412, 0 },
- { TX_TRI4_053, 3867, 0 },
- { TX_TRI4_054, 5579, 0 },
- { TX_TRI4_055, 7943, 0 },
- { TX_TRI4_056, 6073, 0 },
- { TX_TRI4_057, 7557, 0 },
- { TX_TRI4_058, 4919, 0 },
- { TX_TRI4_059, 6790, 0 },
- { TX_TRI4_060, 2709, 0 },
- { TX_TRI4_061, 538, 0 },
- { TX_TRI4_062, 1458, 0 },
- { TX_TRI4_063, 2409, 0 },
- { TX_TRI4_064, 1117, 0 },
- { TX_TRI4_065, 6859, 0 },
- { TX_TRI4_066, 1647, 0 },
- { TX_TRI4_067, 8347, 0 },
- { TX_TRI4_068, 5935, 0 },
- { TX_TRI4_069, 4761, 0 },
- { TX_TRI4_070, 4249, 0 },
- { TX_TRI4_071, 3269, 0 },
- { TX_TRI4_072, 3044, 0 },
- { TX_TRI4_073, 6495, 0 },
- { TX_TRI4_074, 7109, 0 },
- { TX_TRI4_075, 5301, 0 },
- { TX_TRI4_076, 6315, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 275, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 286, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 296, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 320, 0, 0, 0 },
+ { TX_SPEAKER_BENNIE, 306, 0, 0, 0 },
+ { TX_SPEAKER_VLICT, 330, 0, 0, 0 },
+ { TX_SPEAKER_QUETZECOATL, 336, 0, 0, 0 },
+ { TX_TRI4_001, 6207, 0, 0, 0 },
+ { TX_TRI4_002, 1353, 0, 0, 0 },
+ { TX_TRI4_003, 8171, 0, 0, 0 },
+ { TX_TRI4_004, 4857, 0, 0, 0 },
+ { TX_TRI4_005, 3358, 0, 0, 0 },
+ { TX_TRI4_006, 7836, 0, 0, 0 },
+ { TX_TRI4_007, 8534, 0, 0, 0 },
+ { TX_TRI4_008, 4678, 0, 0, 0 },
+ { TX_TRI4_009, 1275, 0, 0, 0 },
+ { TX_TRI4_010, 8300, 0, 0, 0 },
+ { TX_TRI4_011, 6615, 0, 0, 0 },
+ { TX_TRI4_012, 8639, 0, 0, 0 },
+ { TX_TRI4_013, 2909, 0, 0, 0 },
+ { TX_TRI4_014, 1572, 0, 0, 0 },
+ { TX_TRI4_015, 3131, 0, 0, 0 },
+ { TX_TRI4_016, 7008, 0, 0, 0 },
+ { TX_TRI4_017, 5392, 0, 0, 0 },
+ { TX_TRI4_018, 5178, 0, 0, 0 },
+ { TX_TRI4_019, 4384, 0, 0, 0 },
+ { TX_TRI4_020, 2094, 0, 0, 0 },
+ { TX_TRI4_021, 5691, 0, 0, 0 },
+ { TX_TRI4_022, 683, 0, 0, 0 },
+ { TX_TRI4_023, 7415, 0, 0, 0 },
+ { TX_TRI4_024, 7320, 0, 0, 0 },
+ { TX_TRI4_025, 4550, 0, 0, 0 },
+ { TX_TRI4_026, 7203, 0, 0, 0 },
+ { TX_TRI4_027, 4994, 0, 0, 0 },
+ { TX_TRI4_028, 5645, 0, 0, 0 },
+ { TX_TRI4_029, 1992, 0, 0, 0 },
+ { TX_TRI4_030, 2217, 0, 0, 0 },
+ { TX_TRI4_031, 5790, 0, 0, 0 },
+ { TX_TRI4_032, 922, 0, 0, 0 },
+ { TX_TRI4_033, 1211, 0, 0, 0 },
+ { TX_TRI4_034, 5077, 0, 0, 0 },
+ { TX_TRI4_036, 6007, 0, 0, 0 },
+ { TX_TRI4_037, 6412, 0, 0, 0 },
+ { TX_TRI4_038, 7692, 0, 0, 0 },
+ { TX_TRI4_039, 774, 0, 0, 0 },
+ { TX_TRI4_040, 2495, 0, 0, 0 },
+ { TX_TRI4_041, 3609, 0, 0, 0 },
+ { TX_TRI4_042, 5425, 0, 0, 0 },
+ { TX_TRI4_043, 1847, 0, 0, 0 },
+ { TX_TRI4_044, 7742, 0, 0, 0 },
+ { TX_TRI4_045, 8077, 0, 0, 0 },
+ { TX_TRI4_046, 8440, 0, 0, 0 },
+ { TX_TRI4_047, 8232, 0, 0, 0 },
+ { TX_TRI4_048, 7893, 0, 0, 0 },
+ { TX_TRI4_049, 8591, 0, 0, 0 },
+ { TX_TRI4_050, 4077, 0, 0, 0 },
+ { TX_TRI4_051, 3719, 0, 0, 0 },
+ { TX_TRI4_052, 3412, 0, 0, 0 },
+ { TX_TRI4_053, 3867, 0, 0, 0 },
+ { TX_TRI4_054, 5579, 0, 0, 0 },
+ { TX_TRI4_055, 7943, 0, 0, 0 },
+ { TX_TRI4_056, 6073, 0, 0, 0 },
+ { TX_TRI4_057, 7557, 0, 0, 0 },
+ { TX_TRI4_058, 4919, 0, 0, 0 },
+ { TX_TRI4_059, 6790, 0, 0, 0 },
+ { TX_TRI4_060, 2709, 0, 0, 0 },
+ { TX_TRI4_061, 538, 0, 0, 0 },
+ { TX_TRI4_062, 1458, 0, 0, 0 },
+ { TX_TRI4_063, 2409, 0, 0, 0 },
+ { TX_TRI4_064, 1117, 0, 0, 0 },
+ { TX_TRI4_065, 6859, 0, 0, 0 },
+ { TX_TRI4_066, 1647, 0, 0, 0 },
+ { TX_TRI4_067, 8347, 0, 0, 0 },
+ { TX_TRI4_068, 5935, 0, 0, 0 },
+ { TX_TRI4_069, 4761, 0, 0, 0 },
+ { TX_TRI4_070, 4249, 0, 0, 0 },
+ { TX_TRI4_071, 3269, 0, 0, 0 },
+ { TX_TRI4_072, 3044, 0, 0, 0 },
+ { TX_TRI4_073, 6495, 0, 0, 0 },
+ { TX_TRI4_074, 7109, 0, 0, 0 },
+ { TX_TRI4_075, 5301, 0, 0, 0 },
+ { TX_TRI4_076, 6315, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText trial4Texts[] = {
diff --git a/engines/startrek/rooms/trial5.cpp b/engines/startrek/rooms/trial5.cpp
index 185c0bc58a..fa56a66cbb 100644
--- a/engines/startrek/rooms/trial5.cpp
+++ b/engines/startrek/rooms/trial5.cpp
@@ -184,90 +184,90 @@ enum trial5TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets trial5TextOffsets[] = {
- { TX_SPEAKER_KIRK, 275, 0 },
- { TX_SPEAKER_MCCOY, 286, 0 },
- { TX_SPEAKER_SPOCK, 296, 0 },
- { TX_SPEAKER_BENNIE, 306, 0 },
- { TX_SPEAKER_UHURA, 320, 0 },
- { TX_SPEAKER_BIALBI, 393, 0 },
- { TX_SPEAKER_VLICT, 400, 0 },
- { TX_SPEAKER_VOICE, 378, 0 },
- { TX_SPEAKER_LIGHT_OF_WAR, 330, 0 },
- { TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 343, 0 },
- { TX_SPEAKER_LIGHT_OF_TRAVEL, 362, 0 },
- { TX_TRI5_001, 7210, 0 },
- { TX_TRI5_002, 1082, 0 },
- { TX_TRI5_003, 1947, 0 },
- { TX_TRI5_004, 3104, 0 },
- { TX_TRI5_005, 3664, 0 },
- { TX_TRI5_006, 2153, 0 },
- { TX_TRI5_007, 2591, 0 },
- { TX_TRI5_008, 2043, 0 },
- { TX_TRI5_009, 2488, 0 },
- { TX_TRI5_010, 5768, 0 },
- { TX_TRI5_011, 5944, 0 },
- { TX_TRI5_012, 14859, 0 },
- { TX_TRI5_013, 7481, 0 },
- { TX_TRI5_014, 1010, 0 },
- { TX_TRI5_015, 2409, 0 },
- { TX_TRI5_016, 7317, 0 },
- { TX_TRI5_017, 943, 0 },
- { TX_TRI5_018, 1917, 0 },
- { TX_TRI5_019, 2950, 0 },
- { TX_TRI5_020, 1447, 0 },
- { TX_TRI5_021, 3487, 0 },
- { TX_TRI5_022, 1699, 0 },
- { TX_TRI5_023, 2313, 0 },
- { TX_TRI5_024, 4276, 0 },
- { TX_TRI5_025, 3004, 0 },
- { TX_TRI5_026, 3285, 0 },
- { TX_TRI5_027, 1251, 0 },
- { TX_TRI5_028, 3554, 0 },
- { TX_TRI5_029, 1755, 0 },
- { TX_TRI5_030, 3179, 0 },
- { TX_TRI5_031, 1500, 0 },
- { TX_TRI5_032, 4001, 0 },
- { TX_TRI5_033, 3830, 0 },
- { TX_TRI5_034, 2752, 0 },
- { TX_TRI5_035, 4215, 0 },
- { TX_TRI5_036, 13018, 0 },
- { TX_TRI5_037, 13608, 0 },
- { TX_TRI5_038, 13684, 0 },
- { TX_TRI5_039, 13969, 0 },
- //{ TX_TRI5_039, 12698, 0 }, // Ignore duplicate line
- { TX_TRI5_040, 13379, 0 },
- { TX_TRI5_041, 13860, 0 },
- { TX_TRI5_042, 14630, 0 },
- { TX_TRI5_043, 14770, 0 },
- { TX_TRI5_044, 14223, 0 },
- { TX_TRI5_045, 14131, 0 },
- { TX_TRI5_046, 14343, 0 },
- { TX_TRI5_047, 13301, 0 },
- { TX_TRI5_048, 13150, 0 },
- { TX_TRI5_049, 13071, 0 },
- { TX_TRI5_050, 12880, 0 },
- { TX_TRI5_051, 7549, 0 },
- { TX_TRI5_052, 897, 0 },
- { TX_TRI5N002, 5594, 0 },
- { TX_TRI5N004, 5661, 0 },
- { TX_TRI5N005, 5313, 0 },
- { TX_TRI5N006, 7119, 0 },
- { TX_TRI5N007, 7905, 0 },
- { TX_TRI5N008, 5447, 0 },
- { TX_TRI5N009, 5381, 0 },
- { TX_TRI5N010, 5519, 0 },
- { TX_TRI5N011, 7659, 0 },
- { TX_TRI5N012, 7778, 0 },
- { TX_TRI5N013, 6041, 0 },
- { TX_TRI5N014, 6157, 0 },
- { TX_TRI5N015, 6273, 0 },
- { TX_TRI5N016, 6746, 0 },
- { TX_TRI5N017, 6865, 0 },
- { TX_TRI5N018, 6984, 0 },
- { TX_TRI5N019, 6389, 0 },
- { TX_TRI5N020, 6508, 0 },
- { TX_TRI5N021, 6627, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 275, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 286, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 296, 0, 0, 0 },
+ { TX_SPEAKER_BENNIE, 306, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 320, 0, 0, 0 },
+ { TX_SPEAKER_BIALBI, 393, 0, 0, 0 },
+ { TX_SPEAKER_VLICT, 400, 0, 0, 0 },
+ { TX_SPEAKER_VOICE, 378, 0, 0, 0 },
+ { TX_SPEAKER_LIGHT_OF_WAR, 330, 0, 0, 0 },
+ { TX_SPEAKER_LIGHT_OF_KNOWLEDGE, 343, 0, 0, 0 },
+ { TX_SPEAKER_LIGHT_OF_TRAVEL, 362, 0, 0, 0 },
+ { TX_TRI5_001, 7210, 0, 0, 0 },
+ { TX_TRI5_002, 1082, 0, 0, 0 },
+ { TX_TRI5_003, 1947, 0, 0, 0 },
+ { TX_TRI5_004, 3104, 0, 0, 0 },
+ { TX_TRI5_005, 3664, 0, 0, 0 },
+ { TX_TRI5_006, 2153, 0, 0, 0 },
+ { TX_TRI5_007, 2591, 0, 0, 0 },
+ { TX_TRI5_008, 2043, 0, 0, 0 },
+ { TX_TRI5_009, 2488, 0, 0, 0 },
+ { TX_TRI5_010, 5768, 0, 0, 0 },
+ { TX_TRI5_011, 5944, 0, 0, 0 },
+ { TX_TRI5_012, 14859, 0, 0, 0 },
+ { TX_TRI5_013, 7481, 0, 0, 0 },
+ { TX_TRI5_014, 1010, 0, 0, 0 },
+ { TX_TRI5_015, 2409, 0, 0, 0 },
+ { TX_TRI5_016, 7317, 0, 0, 0 },
+ { TX_TRI5_017, 943, 0, 0, 0 },
+ { TX_TRI5_018, 1917, 0, 0, 0 },
+ { TX_TRI5_019, 2950, 0, 0, 0 },
+ { TX_TRI5_020, 1447, 0, 0, 0 },
+ { TX_TRI5_021, 3487, 0, 0, 0 },
+ { TX_TRI5_022, 1699, 0, 0, 0 },
+ { TX_TRI5_023, 2313, 0, 0, 0 },
+ { TX_TRI5_024, 4276, 0, 0, 0 },
+ { TX_TRI5_025, 3004, 0, 0, 0 },
+ { TX_TRI5_026, 3285, 0, 0, 0 },
+ { TX_TRI5_027, 1251, 0, 0, 0 },
+ { TX_TRI5_028, 3554, 0, 0, 0 },
+ { TX_TRI5_029, 1755, 0, 0, 0 },
+ { TX_TRI5_030, 3179, 0, 0, 0 },
+ { TX_TRI5_031, 1500, 0, 0, 0 },
+ { TX_TRI5_032, 4001, 0, 0, 0 },
+ { TX_TRI5_033, 3830, 0, 0, 0 },
+ { TX_TRI5_034, 2752, 0, 0, 0 },
+ { TX_TRI5_035, 4215, 0, 0, 0 },
+ { TX_TRI5_036, 13018, 0, 0, 0 },
+ { TX_TRI5_037, 13608, 0, 0, 0 },
+ { TX_TRI5_038, 13684, 0, 0, 0 },
+ { TX_TRI5_039, 13969, 0, 0, 0 },
+ //{ TX_TRI5_039, 12698, 0, 0, 0 }, // Ignore duplicate line
+ { TX_TRI5_040, 13379, 0, 0, 0 },
+ { TX_TRI5_041, 13860, 0, 0, 0 },
+ { TX_TRI5_042, 14630, 0, 0, 0 },
+ { TX_TRI5_043, 14770, 0, 0, 0 },
+ { TX_TRI5_044, 14223, 0, 0, 0 },
+ { TX_TRI5_045, 14131, 0, 0, 0 },
+ { TX_TRI5_046, 14343, 0, 0, 0 },
+ { TX_TRI5_047, 13301, 0, 0, 0 },
+ { TX_TRI5_048, 13150, 0, 0, 0 },
+ { TX_TRI5_049, 13071, 0, 0, 0 },
+ { TX_TRI5_050, 12880, 0, 0, 0 },
+ { TX_TRI5_051, 7549, 0, 0, 0 },
+ { TX_TRI5_052, 897, 0, 0, 0 },
+ { TX_TRI5N002, 5594, 0, 0, 0 },
+ { TX_TRI5N004, 5661, 0, 0, 0 },
+ { TX_TRI5N005, 5313, 0, 0, 0 },
+ { TX_TRI5N006, 7119, 0, 0, 0 },
+ { TX_TRI5N007, 7905, 0, 0, 0 },
+ { TX_TRI5N008, 5447, 0, 0, 0 },
+ { TX_TRI5N009, 5381, 0, 0, 0 },
+ { TX_TRI5N010, 5519, 0, 0, 0 },
+ { TX_TRI5N011, 7659, 0, 0, 0 },
+ { TX_TRI5N012, 7778, 0, 0, 0 },
+ { TX_TRI5N013, 6041, 0, 0, 0 },
+ { TX_TRI5N014, 6157, 0, 0, 0 },
+ { TX_TRI5N015, 6273, 0, 0, 0 },
+ { TX_TRI5N016, 6746, 0, 0, 0 },
+ { TX_TRI5N017, 6865, 0, 0, 0 },
+ { TX_TRI5N018, 6984, 0, 0, 0 },
+ { TX_TRI5N019, 6389, 0, 0, 0 },
+ { TX_TRI5N020, 6508, 0, 0, 0 },
+ { TX_TRI5N021, 6627, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText trial5Texts[] = {
diff --git a/engines/startrek/rooms/tug0.cpp b/engines/startrek/rooms/tug0.cpp
index 5fad002d1a..60a4fd396c 100644
--- a/engines/startrek/rooms/tug0.cpp
+++ b/engines/startrek/rooms/tug0.cpp
@@ -121,80 +121,80 @@ enum tug0TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets tug0TextOffsets[] = {
- { TX_SPEAKER_KIRK, 9896, 0 },
- { TX_SPEAKER_MCCOY, 9907, 0 },
- { TX_SPEAKER_SPOCK, 9917, 0 },
- { TX_SPEAKER_CHRISTENSEN, 9927, 0 },
- { TX_SPEAKER_SIMPSON, 9943, 0 },
- { TX_SPEAKER_STARFLEET, 9959, 0 },
- { TX_SPEAKER_SCOTT, 9969, 0 },
- { TX_TUG0_001, 5358, 0 },
- { TX_TUG0_002, 2807, 0 },
- { TX_TUG0_003, 6532, 0 },
- { TX_TUG0_004, 6423, 0 },
- { TX_TUG0_005, 1215, 0 },
- { TX_TUG0_006, 8042, 0 },
- { TX_TUG0_007, 8362, 0 },
- { TX_TUG0_008, 1709, 0 },
- { TX_TUG0_009, 8667, 0 },
- { TX_TUG0_010, 2557, 0 },
- { TX_TUG0_011, 8189, 0 },
- { TX_TUG0_012, 9064, 0 },
- { TX_TUG0_013, 1403, 0 },
- { TX_TUG0_014, 1819, 0 },
- { TX_TUG0_015, 6862, 0 },
- { TX_TUG0_016, 6731, 0 },
- { TX_TUG0_017, 7106, 0 },
- { TX_TUG0_018, 7218, 0 },
- { TX_TUG0_019, 737, 0 },
- { TX_TUG0_020, 9705, 0 },
- { TX_TUG0_021, 3364, 0 },
- { TX_TUG0_022, 2612, 0 },
- { TX_TUG0_023, 6104, 0 },
- { TX_TUG0_024, 8445, 0 },
- { TX_TUG0_025, 8270, 0 },
- { TX_TUG0_026, 8961, 0 },
- { TX_TUG0_027, 6365, 0 },
- { TX_TUG0_028, 9470, 0 },
- { TX_TUG0_029, 1998, 0 },
- { TX_TUG0_030, 7391, 0 },
- { TX_TUG0_031, 9154, 0 },
- { TX_TUG0_032, 4852, 0 },
- { TX_TUG0_033, 3574, 0 },
- { TX_TUG0_034, 2228, 0 },
- { TX_TUG0_035, 5025, 0 },
- { TX_TUG0_036, 8121, 0 },
- { TX_TUG0_037, 6227, 0 },
- { TX_TUG0_038, 1564, 0 },
- { TX_TUG0_039, 2460, 0 },
- { TX_TUG0_040, 1136, 0 },
- { TX_TUG0_041, 3485, 0 },
- { TX_TUG0_042, 8510, 0 },
- { TX_TUG0_043, 1270, 0 },
- { TX_TUG0_F30, 8856, 0 },
- { TX_TUG0_F31, 3874, 0 },
- { TX_TUG0_S06, 6579, 0 },
- { TX_TUG0_S11, 6483, 0 },
- { TX_TUG0L006, 8741, 0 },
- { TX_TUG0L008, 3031, 0 },
- { TX_TUG0L009, 2860, 0 },
- { TX_TUG0L010, 3180, 0 },
- { TX_TUG0N000, 4358, 0 },
- { TX_TUG0N001, 944, 0 },
- { TX_TUG0N002, 581, 0 },
- { TX_TUG0N003, 7518, 0 },
- { TX_TUG0N004, 7787, 0 },
- { TX_TUG0N005, 7694, 0 },
- { TX_TUG0N006, 4643, 0 },
- { TX_TUG0N007, 7594, 0 },
- { TX_TUG0N008, 4556, 0 },
- { TX_TUG0N009, 9325, 0 },
- { TX_TUG0N010, 4706, 0 },
- { TX_TUG0N011, 7938, 0 },
- { TX_TUG0N012, 823, 0 },
- { TX_TUG0N013, 7857, 0 },
- { TX_TUG0N014, 625, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 9896, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 9907, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 9917, 0, 0, 0 },
+ { TX_SPEAKER_CHRISTENSEN, 9927, 0, 0, 0 },
+ { TX_SPEAKER_SIMPSON, 9943, 0, 0, 0 },
+ { TX_SPEAKER_STARFLEET, 9959, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 9969, 0, 0, 0 },
+ { TX_TUG0_001, 5358, 0, 0, 0 },
+ { TX_TUG0_002, 2807, 0, 0, 0 },
+ { TX_TUG0_003, 6532, 0, 0, 0 },
+ { TX_TUG0_004, 6423, 0, 0, 0 },
+ { TX_TUG0_005, 1215, 0, 0, 0 },
+ { TX_TUG0_006, 8042, 0, 0, 0 },
+ { TX_TUG0_007, 8362, 0, 0, 0 },
+ { TX_TUG0_008, 1709, 0, 0, 0 },
+ { TX_TUG0_009, 8667, 0, 0, 0 },
+ { TX_TUG0_010, 2557, 0, 0, 0 },
+ { TX_TUG0_011, 8189, 0, 0, 0 },
+ { TX_TUG0_012, 9064, 0, 0, 0 },
+ { TX_TUG0_013, 1403, 0, 0, 0 },
+ { TX_TUG0_014, 1819, 0, 0, 0 },
+ { TX_TUG0_015, 6862, 0, 0, 0 },
+ { TX_TUG0_016, 6731, 0, 0, 0 },
+ { TX_TUG0_017, 7106, 0, 0, 0 },
+ { TX_TUG0_018, 7218, 0, 0, 0 },
+ { TX_TUG0_019, 737, 0, 0, 0 },
+ { TX_TUG0_020, 9705, 0, 0, 0 },
+ { TX_TUG0_021, 3364, 0, 0, 0 },
+ { TX_TUG0_022, 2612, 0, 0, 0 },
+ { TX_TUG0_023, 6104, 0, 0, 0 },
+ { TX_TUG0_024, 8445, 0, 0, 0 },
+ { TX_TUG0_025, 8270, 0, 0, 0 },
+ { TX_TUG0_026, 8961, 0, 0, 0 },
+ { TX_TUG0_027, 6365, 0, 0, 0 },
+ { TX_TUG0_028, 9470, 0, 0, 0 },
+ { TX_TUG0_029, 1998, 0, 0, 0 },
+ { TX_TUG0_030, 7391, 0, 0, 0 },
+ { TX_TUG0_031, 9154, 0, 0, 0 },
+ { TX_TUG0_032, 4852, 0, 0, 0 },
+ { TX_TUG0_033, 3574, 0, 0, 0 },
+ { TX_TUG0_034, 2228, 0, 0, 0 },
+ { TX_TUG0_035, 5025, 0, 0, 0 },
+ { TX_TUG0_036, 8121, 0, 0, 0 },
+ { TX_TUG0_037, 6227, 0, 0, 0 },
+ { TX_TUG0_038, 1564, 0, 0, 0 },
+ { TX_TUG0_039, 2460, 0, 0, 0 },
+ { TX_TUG0_040, 1136, 0, 0, 0 },
+ { TX_TUG0_041, 3485, 0, 0, 0 },
+ { TX_TUG0_042, 8510, 0, 0, 0 },
+ { TX_TUG0_043, 1270, 0, 0, 0 },
+ { TX_TUG0_F30, 8856, 0, 0, 0 },
+ { TX_TUG0_F31, 3874, 0, 0, 0 },
+ { TX_TUG0_S06, 6579, 0, 0, 0 },
+ { TX_TUG0_S11, 6483, 0, 0, 0 },
+ { TX_TUG0L006, 8741, 0, 0, 0 },
+ { TX_TUG0L008, 3031, 0, 0, 0 },
+ { TX_TUG0L009, 2860, 0, 0, 0 },
+ { TX_TUG0L010, 3180, 0, 0, 0 },
+ { TX_TUG0N000, 4358, 0, 0, 0 },
+ { TX_TUG0N001, 944, 0, 0, 0 },
+ { TX_TUG0N002, 581, 0, 0, 0 },
+ { TX_TUG0N003, 7518, 0, 0, 0 },
+ { TX_TUG0N004, 7787, 0, 0, 0 },
+ { TX_TUG0N005, 7694, 0, 0, 0 },
+ { TX_TUG0N006, 4643, 0, 0, 0 },
+ { TX_TUG0N007, 7594, 0, 0, 0 },
+ { TX_TUG0N008, 4556, 0, 0, 0 },
+ { TX_TUG0N009, 9325, 0, 0, 0 },
+ { TX_TUG0N010, 4706, 0, 0, 0 },
+ { TX_TUG0N011, 7938, 0, 0, 0 },
+ { TX_TUG0N012, 823, 0, 0, 0 },
+ { TX_TUG0N013, 7857, 0, 0, 0 },
+ { TX_TUG0N014, 625, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText tug0Texts[] = {
diff --git a/engines/startrek/rooms/tug1.cpp b/engines/startrek/rooms/tug1.cpp
index 2f75d52b37..c11268bd3d 100644
--- a/engines/startrek/rooms/tug1.cpp
+++ b/engines/startrek/rooms/tug1.cpp
@@ -109,46 +109,46 @@ enum tug1TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets tug1TextOffsets[] = {
- { TX_SPEAKER_KIRK, 5549, 0 },
- { TX_SPEAKER_MCCOY, 5560, 0 },
- { TX_SPEAKER_SPOCK, 5570, 0 },
- { TX_SPEAKER_CHRISTENSEN, 5580, 0 },
- { TX_TUG1_001, 4050, 0 },
- { TX_TUG1_002, 751, 0 },
- { TX_TUG1_003, 4598, 0 },
- { TX_TUG1_004, 5380, 0 },
- { TX_TUG1_005, 4920, 0 },
- { TX_TUG1_006, 5788, 0 },
- { TX_TUG1_007, 4764, 0 },
- { TX_TUG1_008, 4106, 0 },
- { TX_TUG1_009, 1461, 0 },
- { TX_TUG1_010, 1233, 0 },
- { TX_TUG1_011, 4223, 0 },
- { TX_TUG1_012, 2253, 0 },
- { TX_TUG1_013, 5098, 0 },
- { TX_TUG1_014, 482, 0 },
- { TX_TUG1_015, 3075, 0 },
- { TX_TUG1_016, 2895, 0 },
- { TX_TUG1_017, 2426, 0 },
- { TX_TUG1_018, 3872, 0 },
- { TX_SIN3_012, 5745, 0 },
- { TX_TUG1L000, 5267, 0 },
- { TX_TUG1L005, 3312, 0 },
- { TX_TUG1N000, 1620, 0 },
- { TX_TUG1N001, 3693, 0 },
- { TX_TUG1N002, 3213, 0 },
- { TX_TUG1N003, 5596, 0 },
- { TX_TUG1N004, 2040, 0 },
- { TX_TUG1N005, 606, 0 },
- { TX_TUG1N006, 5638, 0 },
- { TX_TUG1N007, 2673, 0 },
- //{ TX_TUG1N007, 1017, 0 }, // ignore duplicate text
- { TX_TUG1N008, 2552, 0 },
- { TX_TUG1N009, 2107, 0 },
- { TX_TUG1N010, 3489, 0 },
- { TX_TUG1N011, 3594, 0 },
- { TX_TUG1N013, 5690, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 5549, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 5560, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 5570, 0, 0, 0 },
+ { TX_SPEAKER_CHRISTENSEN, 5580, 0, 0, 0 },
+ { TX_TUG1_001, 4050, 0, 0, 0 },
+ { TX_TUG1_002, 751, 0, 0, 0 },
+ { TX_TUG1_003, 4598, 0, 0, 0 },
+ { TX_TUG1_004, 5380, 0, 0, 0 },
+ { TX_TUG1_005, 4920, 0, 0, 0 },
+ { TX_TUG1_006, 5788, 0, 0, 0 },
+ { TX_TUG1_007, 4764, 0, 0, 0 },
+ { TX_TUG1_008, 4106, 0, 0, 0 },
+ { TX_TUG1_009, 1461, 0, 0, 0 },
+ { TX_TUG1_010, 1233, 0, 0, 0 },
+ { TX_TUG1_011, 4223, 0, 0, 0 },
+ { TX_TUG1_012, 2253, 0, 0, 0 },
+ { TX_TUG1_013, 5098, 0, 0, 0 },
+ { TX_TUG1_014, 482, 0, 0, 0 },
+ { TX_TUG1_015, 3075, 0, 0, 0 },
+ { TX_TUG1_016, 2895, 0, 0, 0 },
+ { TX_TUG1_017, 2426, 0, 0, 0 },
+ { TX_TUG1_018, 3872, 0, 0, 0 },
+ { TX_SIN3_012, 5745, 0, 0, 0 },
+ { TX_TUG1L000, 5267, 0, 0, 0 },
+ { TX_TUG1L005, 3312, 0, 0, 0 },
+ { TX_TUG1N000, 1620, 0, 0, 0 },
+ { TX_TUG1N001, 3693, 0, 0, 0 },
+ { TX_TUG1N002, 3213, 0, 0, 0 },
+ { TX_TUG1N003, 5596, 0, 0, 0 },
+ { TX_TUG1N004, 2040, 0, 0, 0 },
+ { TX_TUG1N005, 606, 0, 0, 0 },
+ { TX_TUG1N006, 5638, 0, 0, 0 },
+ { TX_TUG1N007, 2673, 0, 0, 0 },
+ //{ TX_TUG1N007, 1017, 0, 0, 0 }, // ignore duplicate text
+ { TX_TUG1N008, 2552, 0, 0, 0 },
+ { TX_TUG1N009, 2107, 0, 0, 0 },
+ { TX_TUG1N010, 3489, 0, 0, 0 },
+ { TX_TUG1N011, 3594, 0, 0, 0 },
+ { TX_TUG1N013, 5690, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText tug1Texts[] = {
diff --git a/engines/startrek/rooms/tug2.cpp b/engines/startrek/rooms/tug2.cpp
index 800390cda3..cf4a179461 100644
--- a/engines/startrek/rooms/tug2.cpp
+++ b/engines/startrek/rooms/tug2.cpp
@@ -154,88 +154,88 @@ enum tug2TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets tug2TextOffsets[] = {
- { TX_SPEAKER_KIRK, 14607, 0 },
- { TX_SPEAKER_MCCOY, 14618, 0 },
- { TX_SPEAKER_SPOCK, 14628, 0 },
- { TX_SPEAKER_CHRISTENSEN, 14638, 0 },
- { TX_SPEAKER_ELASI_GUARD, 14654, 0 },
- { TX_SPEAKER_MASADA_CREWMAN, 14666, 0 },
- { TX_TUG2_001, 7024, 0 },
- { TX_TUG2_002, 7078, 0 },
- { TX_TUG2_003, 3102, 0 },
- { TX_TUG2_004, 10763, 0 },
- { TX_TUG2_005, 7536, 0 },
- { TX_TUG2_006, 5335, 0 },
- { TX_TUG2_007, 2395, 0 },
- { TX_TUG2_008, 3462, 0 },
- { TX_TUG2_009, 2535, 0 },
- { TX_TUG2_010, 7256, 0 },
- { TX_TUG2_011, 2654, 0 },
- { TX_TUG2_012, 11592, 0 },
- { TX_TUG2_013, 11832, 0 },
- { TX_TUG2_014, 12010, 0 },
- //{ TX_TUG2_014, 12109, 0 }, // ignore duplicate text
- { TX_TUG2_015, 14235, 0 },
- //{ TX_TUG2_015, 14058, 0 }, // ignore duplicate text
- { TX_TUG2_016, 11045, 0 },
- { TX_TUG2_017, 11918, 0 },
- { TX_TUG2_018, 7168, 0 },
- { TX_TUG2_019, 13734, 0 },
- { TX_TUG2_020, 7601, 0 },
- { TX_TUG2_021, 6648, 0 },
- { TX_TUG2_022, 13822, 0 },
- { TX_TUG2_023, 3162, 0 },
- { TX_TUG2_024, 3370, 0 },
- { TX_TUG2_025, 14359, 0 },
- //{ TX_TUG2_025, 14447, 0 }, // ignore duplicate text
- { TX_TUG2_026, 13455, 0 },
- { TX_TUG2_027, 13594, 0 },
- { TX_TUG2_028, 5097, 0 },
- { TX_TUG2_029, 4791, 0 },
- { TX_TUG2_030, 4909, 0 },
- { TX_TUG2_112, 6475, 0 },
- { TX_TUG1_011, 7694, 0 },
- { TX_TUG2J000, 14729, 0 },
- { TX_TUG2J001, 14761, 0 },
- { TX_TUG2J002, 14803, 0 },
- { TX_TUG2J003, 7422, 0 },
- { TX_TUG2L002, 2177, 0 },
- { TX_TUG2L004, 7332, 0 },
- { TX_TUG2L007, 2762, 0 },
- { TX_TUG2L011, 2937, 0 },
- { TX_TUG2L085, 993, 0 },
- { TX_TUG2L086, 11680, 0 },
- //{ TX_TUG2L086, 11440, 0 }, // ignore duplicate text
- { TX_TUG2N000, 1579, 0 },
- { TX_TUG2N001, 1661, 0 },
- { TX_TUG2N002, 14681, 0 },
- { TX_TUG2N003, 6934, 0 },
- { TX_TUG2N004, 1288, 0 },
- { TX_TUG2N005, 1165, 0 },
- { TX_TUG2N006, 6266, 0 },
- { TX_TUG2N007, 1230, 0 },
- { TX_TUG2N009, 6329, 0 },
- { TX_TUG2N010, 2244, 0 },
- { TX_TUG2N011, 1059, 0 },
- { TX_TUG2N012, 6858, 0 },
- { TX_TUG2N013, 1723, 0 },
- { TX_TUG2N014, 1984, 0 },
- { TX_TUG2N015, 1779, 0 },
- { TX_TUG2N016, 2040, 0 },
- { TX_TUG2N017, 12453, 0 },
- { TX_TUG2N018, 12832, 0 },
- { TX_TUG2N019, 12246, 0 },
- { TX_TUG2N020, 12644, 0 },
- { TX_TUG2N021, 13004, 0 },
- { TX_TUG2N022, 13177, 0 },
- { TX_TUG2N023, 13339, 0 },
- { TX_TUG2N024, 1370, 0 },
- { TX_TUG2N025, 14846, 0 },
- { TX_TUG2N026, 4604, 0 },
- { TX_TUG2N037, 1922, 0 },
- { TX_TUG2N106, 1835, 0 },
- //{ TX_TUG2N106, 2096, 0 }, // ignore duplicate text
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 14607, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 14618, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 14628, 0, 0, 0 },
+ { TX_SPEAKER_CHRISTENSEN, 14638, 0, 0, 0 },
+ { TX_SPEAKER_ELASI_GUARD, 14654, 0, 0, 0 },
+ { TX_SPEAKER_MASADA_CREWMAN, 14666, 0, 0, 0 },
+ { TX_TUG2_001, 7024, 0, 0, 0 },
+ { TX_TUG2_002, 7078, 0, 0, 0 },
+ { TX_TUG2_003, 3102, 0, 0, 0 },
+ { TX_TUG2_004, 10763, 0, 0, 0 },
+ { TX_TUG2_005, 7536, 0, 0, 0 },
+ { TX_TUG2_006, 5335, 0, 0, 0 },
+ { TX_TUG2_007, 2395, 0, 0, 0 },
+ { TX_TUG2_008, 3462, 0, 0, 0 },
+ { TX_TUG2_009, 2535, 0, 0, 0 },
+ { TX_TUG2_010, 7256, 0, 0, 0 },
+ { TX_TUG2_011, 2654, 0, 0, 0 },
+ { TX_TUG2_012, 11592, 0, 0, 0 },
+ { TX_TUG2_013, 11832, 0, 0, 0 },
+ { TX_TUG2_014, 12010, 0, 0, 0 },
+ //{ TX_TUG2_014, 12109, 0, 0, 0 }, // ignore duplicate text
+ { TX_TUG2_015, 14235, 0, 0, 0 },
+ //{ TX_TUG2_015, 14058, 0, 0, 0 }, // ignore duplicate text
+ { TX_TUG2_016, 11045, 0, 0, 0 },
+ { TX_TUG2_017, 11918, 0, 0, 0 },
+ { TX_TUG2_018, 7168, 0, 0, 0 },
+ { TX_TUG2_019, 13734, 0, 0, 0 },
+ { TX_TUG2_020, 7601, 0, 0, 0 },
+ { TX_TUG2_021, 6648, 0, 0, 0 },
+ { TX_TUG2_022, 13822, 0, 0, 0 },
+ { TX_TUG2_023, 3162, 0, 0, 0 },
+ { TX_TUG2_024, 3370, 0, 0, 0 },
+ { TX_TUG2_025, 14359, 0, 0, 0 },
+ //{ TX_TUG2_025, 14447, 0, 0, 0 }, // ignore duplicate text
+ { TX_TUG2_026, 13455, 0, 0, 0 },
+ { TX_TUG2_027, 13594, 0, 0, 0 },
+ { TX_TUG2_028, 5097, 0, 0, 0 },
+ { TX_TUG2_029, 4791, 0, 0, 0 },
+ { TX_TUG2_030, 4909, 0, 0, 0 },
+ { TX_TUG2_112, 6475, 0, 0, 0 },
+ { TX_TUG1_011, 7694, 0, 0, 0 },
+ { TX_TUG2J000, 14729, 0, 0, 0 },
+ { TX_TUG2J001, 14761, 0, 0, 0 },
+ { TX_TUG2J002, 14803, 0, 0, 0 },
+ { TX_TUG2J003, 7422, 0, 0, 0 },
+ { TX_TUG2L002, 2177, 0, 0, 0 },
+ { TX_TUG2L004, 7332, 0, 0, 0 },
+ { TX_TUG2L007, 2762, 0, 0, 0 },
+ { TX_TUG2L011, 2937, 0, 0, 0 },
+ { TX_TUG2L085, 993, 0, 0, 0 },
+ { TX_TUG2L086, 11680, 0, 0, 0 },
+ //{ TX_TUG2L086, 11440, 0, 0, 0 }, // ignore duplicate text
+ { TX_TUG2N000, 1579, 0, 0, 0 },
+ { TX_TUG2N001, 1661, 0, 0, 0 },
+ { TX_TUG2N002, 14681, 0, 0, 0 },
+ { TX_TUG2N003, 6934, 0, 0, 0 },
+ { TX_TUG2N004, 1288, 0, 0, 0 },
+ { TX_TUG2N005, 1165, 0, 0, 0 },
+ { TX_TUG2N006, 6266, 0, 0, 0 },
+ { TX_TUG2N007, 1230, 0, 0, 0 },
+ { TX_TUG2N009, 6329, 0, 0, 0 },
+ { TX_TUG2N010, 2244, 0, 0, 0 },
+ { TX_TUG2N011, 1059, 0, 0, 0 },
+ { TX_TUG2N012, 6858, 0, 0, 0 },
+ { TX_TUG2N013, 1723, 0, 0, 0 },
+ { TX_TUG2N014, 1984, 0, 0, 0 },
+ { TX_TUG2N015, 1779, 0, 0, 0 },
+ { TX_TUG2N016, 2040, 0, 0, 0 },
+ { TX_TUG2N017, 12453, 0, 0, 0 },
+ { TX_TUG2N018, 12832, 0, 0, 0 },
+ { TX_TUG2N019, 12246, 0, 0, 0 },
+ { TX_TUG2N020, 12644, 0, 0, 0 },
+ { TX_TUG2N021, 13004, 0, 0, 0 },
+ { TX_TUG2N022, 13177, 0, 0, 0 },
+ { TX_TUG2N023, 13339, 0, 0, 0 },
+ { TX_TUG2N024, 1370, 0, 0, 0 },
+ { TX_TUG2N025, 14846, 0, 0, 0 },
+ { TX_TUG2N026, 4604, 0, 0, 0 },
+ { TX_TUG2N037, 1922, 0, 0, 0 },
+ { TX_TUG2N106, 1835, 0, 0, 0 },
+ //{ TX_TUG2N106, 2096, 0, 0, 0 }, // ignore duplicate text
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText tug2Texts[] = {
diff --git a/engines/startrek/rooms/tug3.cpp b/engines/startrek/rooms/tug3.cpp
index e28c11a91c..1558accb27 100644
--- a/engines/startrek/rooms/tug3.cpp
+++ b/engines/startrek/rooms/tug3.cpp
@@ -91,49 +91,49 @@ enum tug3TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets tug3TextOffsets[] = {
- { TX_SPEAKER_KIRK, 5426, 0 },
- { TX_SPEAKER_MCCOY, 5437, 0 },
- { TX_SPEAKER_SPOCK, 5447, 0 },
- { TX_SPEAKER_SULU, 5457, 0 },
- { TX_SPEAKER_SHIPS_COMPUTER, 5466, 0 },
- { TX_SPEAKER_CHRISTENSEN, 5482, 0 },
- { TX_SPEAKER_ELASI_CERETH, 5498, 0 },
- { TX_SPEAKER_ELASI_CLANSMAN, 5511, 0 },
- { TX_SPEAKER_STARFLEET, 5526, 0 },
- { TX_SPEAKER_SCOTT, 5536, 0 },
- { TX_TUG3_001, 4914, 0 },
- { TX_TUG3_002, 6171, 0 },
- { TX_TUG3_003, 6121, 0 },
- { TX_TUG3_004, 6026, 0 },
- { TX_TUG3_005, 5224, 0 },
- { TX_TUG3_006, 3810, 0 },
- { TX_TUG3_007, 3553, 0 },
- { TX_TUG3_008, 3349, 0 },
- { TX_TUG3_009, 3231, 0 },
- { TX_TUG3_011, 3117, 0 },
- { TX_TUG3_013, 3042, 0 },
- { TX_TUG3_015, 3618, 0 },
- { TX_TUG3_F27, 2224, 0 },
- { TX_TUG3_S07, 3867, 0 },
- { TX_TUG3_S08, 5282, 0 },
- { TX_TUG3L003, 3470, 0 },
- { TX_TUG3L080, 2701, 0 },
- { TX_TUG3L081, 792, 0 },
- { TX_TUG3L083, 2480, 0 },
- { TX_TUG3L084, 2057, 0 },
- { TX_TUG3N000, 5824, 0 },
- { TX_TUG3N001, 2845, 0 },
- { TX_TUG3N002, 5873, 0 },
- { TX_TUG3N003, 5634, 0 },
- { TX_TUG3N004, 5751, 0 },
- { TX_TUG3N005, 5694, 0 },
- { TX_TUG3N006, 4725, 0 },
- { TX_TUG3N007, 421, 0 },
- { TX_TUG3N008, 5547, 0 },
- { TX_COMPA180, 3724, 0 },
- { TX_COMPU181, 4618, 0 },
- { TX_COMPU182, 4535, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 5426, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 5437, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 5447, 0, 0, 0 },
+ { TX_SPEAKER_SULU, 5457, 0, 0, 0 },
+ { TX_SPEAKER_SHIPS_COMPUTER, 5466, 0, 0, 0 },
+ { TX_SPEAKER_CHRISTENSEN, 5482, 0, 0, 0 },
+ { TX_SPEAKER_ELASI_CERETH, 5498, 0, 0, 0 },
+ { TX_SPEAKER_ELASI_CLANSMAN, 5511, 0, 0, 0 },
+ { TX_SPEAKER_STARFLEET, 5526, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 5536, 0, 0, 0 },
+ { TX_TUG3_001, 4914, 0, 0, 0 },
+ { TX_TUG3_002, 6171, 0, 0, 0 },
+ { TX_TUG3_003, 6121, 0, 0, 0 },
+ { TX_TUG3_004, 6026, 0, 0, 0 },
+ { TX_TUG3_005, 5224, 0, 0, 0 },
+ { TX_TUG3_006, 3810, 0, 0, 0 },
+ { TX_TUG3_007, 3553, 0, 0, 0 },
+ { TX_TUG3_008, 3349, 0, 0, 0 },
+ { TX_TUG3_009, 3231, 0, 0, 0 },
+ { TX_TUG3_011, 3117, 0, 0, 0 },
+ { TX_TUG3_013, 3042, 0, 0, 0 },
+ { TX_TUG3_015, 3618, 0, 0, 0 },
+ { TX_TUG3_F27, 2224, 0, 0, 0 },
+ { TX_TUG3_S07, 3867, 0, 0, 0 },
+ { TX_TUG3_S08, 5282, 0, 0, 0 },
+ { TX_TUG3L003, 3470, 0, 0, 0 },
+ { TX_TUG3L080, 2701, 0, 0, 0 },
+ { TX_TUG3L081, 792, 0, 0, 0 },
+ { TX_TUG3L083, 2480, 0, 0, 0 },
+ { TX_TUG3L084, 2057, 0, 0, 0 },
+ { TX_TUG3N000, 5824, 0, 0, 0 },
+ { TX_TUG3N001, 2845, 0, 0, 0 },
+ { TX_TUG3N002, 5873, 0, 0, 0 },
+ { TX_TUG3N003, 5634, 0, 0, 0 },
+ { TX_TUG3N004, 5751, 0, 0, 0 },
+ { TX_TUG3N005, 5694, 0, 0, 0 },
+ { TX_TUG3N006, 4725, 0, 0, 0 },
+ { TX_TUG3N007, 421, 0, 0, 0 },
+ { TX_TUG3N008, 5547, 0, 0, 0 },
+ { TX_COMPA180, 3724, 0, 0, 0 },
+ { TX_COMPU181, 4618, 0, 0, 0 },
+ { TX_COMPU182, 4535, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText tug3Texts[] = {
diff --git a/engines/startrek/rooms/veng0.cpp b/engines/startrek/rooms/veng0.cpp
index 3352f5c837..bbd0d48c08 100644
--- a/engines/startrek/rooms/veng0.cpp
+++ b/engines/startrek/rooms/veng0.cpp
@@ -129,104 +129,104 @@ enum veng0TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng0TextOffsets[] = {
- { TX_SPEAKER_KIRK, 6590, 0 },
- { TX_SPEAKER_MCCOY, 6601, 0 },
- { TX_SPEAKER_SPOCK, 6611, 0 },
- { TX_SPEAKER_SCOTT, 6633, 0 },
- { TX_SPEAKER_CHEKOV, 6661, 0 },
- { TX_SPEAKER_PATTERSON, 6643, 0 },
- { TX_SPEAKER_KIJE, 6621, 0 },
- { TX_VEN0_001, 7593, 0 },
- { TX_VEN0_002, 7952, 0 },
- { TX_VEN0_003, 6809, 0 },
- { TX_VEN0_003, 6809, 0 },
- { TX_VEN0_004, 8768, 0 },
- { TX_VEN0_005, 1235, 0 },
- { TX_VEN0_006, 476, 0 },
- { TX_VEN0_007, 897, 0 },
- { TX_VEN0_008, 661, 0 },
- { TX_VEN0_009, 1392, 0 },
- { TX_VEN0_010, 1675, 0 },
- { TX_VEN0_011, 1600, 0 },
- { TX_VEN0_012, 8886, 0 },
- { TX_VEN0_013, 3075, 0 },
- { TX_VEN0_014, 7754, 0 },
- { TX_VEN0_014, 7754, 0 },
- { TX_VEN0_015, 2512, 0 },
- { TX_VEN0_016, 8838, 0 },
- { TX_VEN0_017, 1757, 0 },
- { TX_VEN0_018, 386, 0 },
- { TX_VEN0_019, 6848, 0 },
- { TX_VEN0_019, 6848, 0 },
- { TX_VEN0_020, 8101, 0 },
- { TX_VEN0_021, 2644, 0 },
- { TX_VEN0_022, 6730, 0 },
- { TX_VEN0_022, 6730, 0 },
- { TX_VEN0_023, 7666, 0 },
- { TX_VEN0_023, 7666, 0 },
- { TX_VEN0_024, 2827, 0 },
- { TX_VEN0_025, 2014, 0 },
- { TX_VEN0_026, 2209, 0 },
- { TX_VEN0_027, 2337, 0 },
- { TX_VEN0_028, 7849, 0 },
- { TX_VEN0_028, 7849, 0 },
- { TX_VEN0_029, 7997, 0 },
- { TX_VEN0_030, 994, 0 },
- { TX_VEN0_031, 8170, 0 },
- { TX_VEN0_033, 8723, 0 },
- { TX_VEN0_034, 9000, 0 },
- { TX_VEN0_035, 8473, 0 },
- { TX_VEN0_036, 7821, 0 },
- { TX_VEN0_036, 7821, 0 },
- { TX_VEN0_037, 2713, 0 },
- { TX_VEN0_038, 2969, 0 },
- { TX_VEN0_039, 1312, 0 },
- { TX_VEN0_32, 8399, 0 },
- { TX_VEN0_S12, 607, 0 },
- { TX_VEN0_S15, 1175, 0 },
- { TX_VEN0_S52, 719, 0 },
- { TX_VEN0_S54, 1535, 0 },
- { TX_VEN2_028, 6128, 0 },
- { TX_VEN2_066, 6206, 0 },
- { TX_VEN2_098, 5016, 0 },
- { TX_VENA_F32, 5246, 0 },
- { TX_VENA_F34, 5516, 0 },
- { TX_VENA_F40, 5111, 0 },
- { TX_MUD4_018, 5820, 0 },
- //{ TX_MUD4_018, 5953, 0 },
- //{ TX_BRIDU146, 5889, 0 },
- { TX_VEN0N000, 4471, 0 },
- { TX_VEN0N001, 7291, 0 },
- { TX_VEN0N001, 7291, 0 },
- { TX_VEN0N002, 7418, 0 },
- { TX_VEN0N002, 7418, 0 },
- { TX_VEN0N003, 7501, 0 },
- { TX_VEN0N003, 7501, 0 },
- { TX_VEN0N004, 7002, 0 },
- { TX_VEN0N004, 7002, 0 },
- { TX_VEN0N005, 7139, 0 },
- { TX_VEN0N005, 7139, 0 },
- { TX_VEN0N006, 7375, 0 },
- { TX_VEN0N006, 7375, 0 },
- { TX_VEN0N007, 3624, 0 },
- { TX_VEN0N008, 3348, 0 },
- { TX_VEN0N009, 3888, 0 },
- { TX_VEN0N010, 4175, 0 },
- { TX_VEN0N011, 4243, 0 },
- { TX_VEN0N012, 4351, 0 },
- { TX_VEN0N013, 4577, 0 },
- { TX_VEN0N015, 7209, 0 },
- { TX_VEN0N015, 7209, 0 },
- { TX_VEN0N016, 6697, 0 },
- { TX_VEN0N016, 6697, 0 },
- { TX_VEN0N017, 7103, 0 },
- { TX_VEN0N017, 7103, 0 },
- { TX_VEN0N018, 4653, 0 },
- { TX_VEN0N019, 3748, 0 },
- //{ TX_VEN2U093, 6021, 0 },
- { TX_VEN4N010, 5670, 0 },
- { TX_VEN6N007, 5735, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 6590, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 6601, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 6611, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 6633, 0, 0, 0 },
+ { TX_SPEAKER_CHEKOV, 6661, 0, 0, 0 },
+ { TX_SPEAKER_PATTERSON, 6643, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 6621, 0, 0, 0 },
+ { TX_VEN0_001, 7593, 0, 0, 0 },
+ { TX_VEN0_002, 7952, 0, 0, 0 },
+ { TX_VEN0_003, 6809, 0, 0, 0 },
+ { TX_VEN0_003, 6809, 0, 0, 0 },
+ { TX_VEN0_004, 8768, 0, 0, 0 },
+ { TX_VEN0_005, 1235, 0, 0, 0 },
+ { TX_VEN0_006, 476, 0, 0, 0 },
+ { TX_VEN0_007, 897, 0, 0, 0 },
+ { TX_VEN0_008, 661, 0, 0, 0 },
+ { TX_VEN0_009, 1392, 0, 0, 0 },
+ { TX_VEN0_010, 1675, 0, 0, 0 },
+ { TX_VEN0_011, 1600, 0, 0, 0 },
+ { TX_VEN0_012, 8886, 0, 0, 0 },
+ { TX_VEN0_013, 3075, 0, 0, 0 },
+ { TX_VEN0_014, 7754, 0, 0, 0 },
+ { TX_VEN0_014, 7754, 0, 0, 0 },
+ { TX_VEN0_015, 2512, 0, 0, 0 },
+ { TX_VEN0_016, 8838, 0, 0, 0 },
+ { TX_VEN0_017, 1757, 0, 0, 0 },
+ { TX_VEN0_018, 386, 0, 0, 0 },
+ { TX_VEN0_019, 6848, 0, 0, 0 },
+ { TX_VEN0_019, 6848, 0, 0, 0 },
+ { TX_VEN0_020, 8101, 0, 0, 0 },
+ { TX_VEN0_021, 2644, 0, 0, 0 },
+ { TX_VEN0_022, 6730, 0, 0, 0 },
+ { TX_VEN0_022, 6730, 0, 0, 0 },
+ { TX_VEN0_023, 7666, 0, 0, 0 },
+ { TX_VEN0_023, 7666, 0, 0, 0 },
+ { TX_VEN0_024, 2827, 0, 0, 0 },
+ { TX_VEN0_025, 2014, 0, 0, 0 },
+ { TX_VEN0_026, 2209, 0, 0, 0 },
+ { TX_VEN0_027, 2337, 0, 0, 0 },
+ { TX_VEN0_028, 7849, 0, 0, 0 },
+ { TX_VEN0_028, 7849, 0, 0, 0 },
+ { TX_VEN0_029, 7997, 0, 0, 0 },
+ { TX_VEN0_030, 994, 0, 0, 0 },
+ { TX_VEN0_031, 8170, 0, 0, 0 },
+ { TX_VEN0_033, 8723, 0, 0, 0 },
+ { TX_VEN0_034, 9000, 0, 0, 0 },
+ { TX_VEN0_035, 8473, 0, 0, 0 },
+ { TX_VEN0_036, 7821, 0, 0, 0 },
+ { TX_VEN0_036, 7821, 0, 0, 0 },
+ { TX_VEN0_037, 2713, 0, 0, 0 },
+ { TX_VEN0_038, 2969, 0, 0, 0 },
+ { TX_VEN0_039, 1312, 0, 0, 0 },
+ { TX_VEN0_32, 8399, 0, 0, 0 },
+ { TX_VEN0_S12, 607, 0, 0, 0 },
+ { TX_VEN0_S15, 1175, 0, 0, 0 },
+ { TX_VEN0_S52, 719, 0, 0, 0 },
+ { TX_VEN0_S54, 1535, 0, 0, 0 },
+ { TX_VEN2_028, 6128, 0, 0, 0 },
+ { TX_VEN2_066, 6206, 0, 0, 0 },
+ { TX_VEN2_098, 5016, 0, 0, 0 },
+ { TX_VENA_F32, 5246, 0, 0, 0 },
+ { TX_VENA_F34, 5516, 0, 0, 0 },
+ { TX_VENA_F40, 5111, 0, 0, 0 },
+ { TX_MUD4_018, 5820, 0, 0, 0 },
+ //{ TX_MUD4_018, 5953, 0, 0, 0 },
+ //{ TX_BRIDU146, 5889, 0, 0, 0 },
+ { TX_VEN0N000, 4471, 0, 0, 0 },
+ { TX_VEN0N001, 7291, 0, 0, 0 },
+ { TX_VEN0N001, 7291, 0, 0, 0 },
+ { TX_VEN0N002, 7418, 0, 0, 0 },
+ { TX_VEN0N002, 7418, 0, 0, 0 },
+ { TX_VEN0N003, 7501, 0, 0, 0 },
+ { TX_VEN0N003, 7501, 0, 0, 0 },
+ { TX_VEN0N004, 7002, 0, 0, 0 },
+ { TX_VEN0N004, 7002, 0, 0, 0 },
+ { TX_VEN0N005, 7139, 0, 0, 0 },
+ { TX_VEN0N005, 7139, 0, 0, 0 },
+ { TX_VEN0N006, 7375, 0, 0, 0 },
+ { TX_VEN0N006, 7375, 0, 0, 0 },
+ { TX_VEN0N007, 3624, 0, 0, 0 },
+ { TX_VEN0N008, 3348, 0, 0, 0 },
+ { TX_VEN0N009, 3888, 0, 0, 0 },
+ { TX_VEN0N010, 4175, 0, 0, 0 },
+ { TX_VEN0N011, 4243, 0, 0, 0 },
+ { TX_VEN0N012, 4351, 0, 0, 0 },
+ { TX_VEN0N013, 4577, 0, 0, 0 },
+ { TX_VEN0N015, 7209, 0, 0, 0 },
+ { TX_VEN0N015, 7209, 0, 0, 0 },
+ { TX_VEN0N016, 6697, 0, 0, 0 },
+ { TX_VEN0N016, 6697, 0, 0, 0 },
+ { TX_VEN0N017, 7103, 0, 0, 0 },
+ { TX_VEN0N017, 7103, 0, 0, 0 },
+ { TX_VEN0N018, 4653, 0, 0, 0 },
+ { TX_VEN0N019, 3748, 0, 0, 0 },
+ //{ TX_VEN2U093, 6021, 0, 0, 0 },
+ { TX_VEN4N010, 5670, 0, 0, 0 },
+ { TX_VEN6N007, 5735, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng0Texts[] = {
diff --git a/engines/startrek/rooms/veng1.cpp b/engines/startrek/rooms/veng1.cpp
index aaa34c21cc..6b5f77e907 100644
--- a/engines/startrek/rooms/veng1.cpp
+++ b/engines/startrek/rooms/veng1.cpp
@@ -145,70 +145,70 @@ enum veng1TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng1TextOffsets[] = {
- { TX_SPEAKER_KIRK, 7612, 0 },
- { TX_SPEAKER_MCCOY, 7623, 0 },
- { TX_SPEAKER_SPOCK, 7633, 0 },
- { TX_SPEAKER_KIJE, 7643, 0 },
- { TX_VEN0_016, 7429, 0 },
- //{ TX_VEN0_016, 7370, 0 }, // ignore duplicate line
- { TX_VEN1_001, 2202, 0 },
- { TX_VEN1_002, 2602, 0 },
- { TX_VEN1_004, 2493, 0 },
- { TX_VEN1_005, 2415, 0 },
- { TX_VEN1_006, 3777, 0 },
- { TX_VEN1_007, 3415, 0 },
- { TX_VEN1_008, 3016, 0 },
- { TX_VEN1_009, 3501, 0 },
- { TX_VEN1_010, 3889, 0 },
- { TX_VEN1_011, 938, 0 },
- { TX_VEN1_012, 3195, 0 },
- { TX_VEN1_013, 2293, 0 },
- { TX_VEN1_014, 3640, 0 },
- { TX_VEN1_015, 2777, 0 },
- { TX_VEN1_016, 2677, 0 },
- { TX_VEN1_F33, 4328, 0 },
- { TX_VEN2_028, 6888, 0 },
- { TX_VEN2_066, 6966, 0 },
- { TX_VEN2_098, 5776, 0 },
- { TX_VEN4_016, 7184, 0 },
- { TX_VENA_F32, 6006, 0 },
- { TX_VENA_F34, 6276, 0 },
- { TX_VENA_F40, 5871, 0 },
- { TX_DEM3_019, 7133, 0 },
- //{ TX_G_014, 7256, 0 },
- //{ TX_G_014, 7313, 0 },
- { TX_MUD4_018, 6580, 0 },
- //{ TX_MUD4_018, 6713, 0 }, // ignore duplicate line
- //{ TX_BRIDU146, 6649, 0 },
- { TX_VEN1N000, 1545, 0 },
- { TX_VEN1N001, 1453, 0 },
- { TX_VEN1N002, 1626, 0 },
- { TX_VEN1N003, 1840, 0 },
- { TX_VEN1N004, 1753, 0 },
- { TX_VEN1N005, 2002, 0 },
- { TX_VEN1N006, 5529, 0 },
- { TX_VEN1N007, 549, 0 },
- { TX_VEN1N008, 4906, 0 },
- { TX_VEN1N009, 4587, 0 },
- { TX_VEN1N010, 1284, 0 },
- { TX_VEN1N011, 5638, 0 },
- { TX_VEN1N012, 5108, 0 },
- { TX_VEN1N013, 4408, 0 },
- { TX_VEN1N014, 4500, 0 },
- { TX_VEN1N015, 5158, 0 },
- { TX_VEN1N016, 4074, 0 },
- { TX_VEN1N017, 4202, 0 },
- { TX_VEN1N018, 4680, 0 },
- { TX_VEN1N019, 1200, 0 },
- { TX_VEN1N020, 2108, 0 },
- { TX_VEN1N021, 1382, 0 },
- { TX_VEN1N022, 1100, 0 },
- { TX_VEN1N023, 5326, 0 },
- { TX_VEN2U093, 6781, 0 },
- { TX_VEN4N010, 6430, 0 },
- { TX_VEN4N014, 777, 0 },
- { TX_VEN6N007, 6495, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 7612, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 7623, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 7633, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 7643, 0, 0, 0 },
+ { TX_VEN0_016, 7429, 0, 0, 0 },
+ //{ TX_VEN0_016, 7370, 0, 0, 0 }, // ignore duplicate line
+ { TX_VEN1_001, 2202, 0, 0, 0 },
+ { TX_VEN1_002, 2602, 0, 0, 0 },
+ { TX_VEN1_004, 2493, 0, 0, 0 },
+ { TX_VEN1_005, 2415, 0, 0, 0 },
+ { TX_VEN1_006, 3777, 0, 0, 0 },
+ { TX_VEN1_007, 3415, 0, 0, 0 },
+ { TX_VEN1_008, 3016, 0, 0, 0 },
+ { TX_VEN1_009, 3501, 0, 0, 0 },
+ { TX_VEN1_010, 3889, 0, 0, 0 },
+ { TX_VEN1_011, 938, 0, 0, 0 },
+ { TX_VEN1_012, 3195, 0, 0, 0 },
+ { TX_VEN1_013, 2293, 0, 0, 0 },
+ { TX_VEN1_014, 3640, 0, 0, 0 },
+ { TX_VEN1_015, 2777, 0, 0, 0 },
+ { TX_VEN1_016, 2677, 0, 0, 0 },
+ { TX_VEN1_F33, 4328, 0, 0, 0 },
+ { TX_VEN2_028, 6888, 0, 0, 0 },
+ { TX_VEN2_066, 6966, 0, 0, 0 },
+ { TX_VEN2_098, 5776, 0, 0, 0 },
+ { TX_VEN4_016, 7184, 0, 0, 0 },
+ { TX_VENA_F32, 6006, 0, 0, 0 },
+ { TX_VENA_F34, 6276, 0, 0, 0 },
+ { TX_VENA_F40, 5871, 0, 0, 0 },
+ { TX_DEM3_019, 7133, 0, 0, 0 },
+ //{ TX_G_014, 7256, 0, 0, 0 },
+ //{ TX_G_014, 7313, 0, 0, 0 },
+ { TX_MUD4_018, 6580, 0, 0, 0 },
+ //{ TX_MUD4_018, 6713, 0, 0, 0 }, // ignore duplicate line
+ //{ TX_BRIDU146, 6649, 0, 0, 0 },
+ { TX_VEN1N000, 1545, 0, 0, 0 },
+ { TX_VEN1N001, 1453, 0, 0, 0 },
+ { TX_VEN1N002, 1626, 0, 0, 0 },
+ { TX_VEN1N003, 1840, 0, 0, 0 },
+ { TX_VEN1N004, 1753, 0, 0, 0 },
+ { TX_VEN1N005, 2002, 0, 0, 0 },
+ { TX_VEN1N006, 5529, 0, 0, 0 },
+ { TX_VEN1N007, 549, 0, 0, 0 },
+ { TX_VEN1N008, 4906, 0, 0, 0 },
+ { TX_VEN1N009, 4587, 0, 0, 0 },
+ { TX_VEN1N010, 1284, 0, 0, 0 },
+ { TX_VEN1N011, 5638, 0, 0, 0 },
+ { TX_VEN1N012, 5108, 0, 0, 0 },
+ { TX_VEN1N013, 4408, 0, 0, 0 },
+ { TX_VEN1N014, 4500, 0, 0, 0 },
+ { TX_VEN1N015, 5158, 0, 0, 0 },
+ { TX_VEN1N016, 4074, 0, 0, 0 },
+ { TX_VEN1N017, 4202, 0, 0, 0 },
+ { TX_VEN1N018, 4680, 0, 0, 0 },
+ { TX_VEN1N019, 1200, 0, 0, 0 },
+ { TX_VEN1N020, 2108, 0, 0, 0 },
+ { TX_VEN1N021, 1382, 0, 0, 0 },
+ { TX_VEN1N022, 1100, 0, 0, 0 },
+ { TX_VEN1N023, 5326, 0, 0, 0 },
+ { TX_VEN2U093, 6781, 0, 0, 0 },
+ { TX_VEN4N010, 6430, 0, 0, 0 },
+ { TX_VEN4N014, 777, 0, 0, 0 },
+ { TX_VEN6N007, 6495, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng1Texts[] = {
diff --git a/engines/startrek/rooms/veng2.cpp b/engines/startrek/rooms/veng2.cpp
index 5cb1fc8d29..6b4924cbf1 100644
--- a/engines/startrek/rooms/veng2.cpp
+++ b/engines/startrek/rooms/veng2.cpp
@@ -225,202 +225,202 @@ enum veng2TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng2TextOffsets[] = {
- { TX_SPEAKER_KIRK, 20603, 0 },
- { TX_SPEAKER_MCCOY, 20614, 0 },
- { TX_SPEAKER_SPOCK, 20624, 0 },
- { TX_SPEAKER_KIJE, 20719, 0 },
- { TX_SPEAKER_SCOTT, 20634, 0 },
- { TX_SPEAKER_CHEKOV, 20644, 0 },
- { TX_SPEAKER_ELASI_CAPTAIN, 20731, 0 },
- { TX_SPEAKER_PATTERSON, 20677, 0 },
- { TX_SPEAKER_UHURA, 20658, 0 },
- { TX_SPEAKER_ANDRADE, 20695, 0 },
- { TX_SPEAKER_ELASI_WEAPONS_MASTER, 20745, 0 },
- { TX_SPEAKER_ELASI_CREWMAN, 20766, 0 },
- { TX_VEN2_001, 12332, 0 },
- { TX_VEN2_002, 15643, 0 },
- { TX_VEN2_003, 13474, 0 },
- { TX_VEN2_003, 13295, 0 },
- { TX_VEN2_004, 6710, 0 },
- { TX_VEN2_005, 6633, 0 },
- { TX_VEN2_006, 1862, 0 },
- { TX_VEN2_007, 7242, 0 },
- { TX_VEN2_008, 2468, 0 },
- { TX_VEN2_009, 6954, 0 },
- { TX_VEN2_010, 1756, 0 },
- { TX_VEN2_011, 22026, 0 },
- { TX_VEN2_012, 21967, 0 },
- { TX_VEN2_013, 11534, 0 },
- { TX_VEN2_014, 11088, 0 },
- { TX_VEN2_015, 9563, 0 },
- { TX_VEN2_015, 22250, 0 },
- { TX_VEN2_016, 1372, 0 },
- { TX_VEN2_017, 8039, 0 },
- { TX_VEN2_018, 15028, 0 },
- { TX_VEN2_019, 1051, 0 },
- { TX_VEN2_020, 2081, 0 },
- { TX_VEN2_021, 2626, 0 },
- { TX_VEN2_022, 3046, 0 },
- { TX_VEN2_023, 22533, 0 },
- { TX_VEN2_024, 15934, 0 },
- { TX_VEN2_025, 10100, 0 },
- { TX_VEN2_026, 11332, 0 },
- { TX_VEN2_027, 1576, 0 },
- { TX_VEN2_028, 8928, 0 },
- { TX_VEN2_029, 9654, 0 },
- { TX_VEN2_029, 22325, 0 },
- { TX_VEN2_030, 17649, 0 },
- { TX_VEN2_031, 16748, 0 },
- { TX_VEN2_032, 1198, 0 },
- { TX_VEN2_033, 14498, 0 },
- { TX_VEN2_034, 14871, 0 },
- { TX_VEN2_035, 13922, 0 },
- { TX_VEN2_036, 22919, 0 },
- { TX_VEN2_037, 23214, 0 },
- { TX_VEN2_038, 17250, 0 },
- { TX_VEN2_039, 7091, 0 },
- { TX_VEN2_040, 9261, 0 },
- { TX_VEN2_041, 7154, 0 },
- { TX_VEN2_042, 1139, 0 },
- { TX_VEN2_043, 7956, 0 },
- { TX_VEN2_044, 3004, 0 },
- { TX_VEN2_045, 16134, 0 },
- { TX_VEN2_046, 7637, 0 },
- { TX_VEN2_047, 18668, 0 },
- { TX_VEN2_047, 19102, 0 },
- { TX_VEN2_048, 22718, 0 },
- { TX_VEN2_050, 13181, 0 },
- { TX_VEN2_051, 18177, 0 },
- { TX_VEN2_052, 14307, 0 },
- { TX_VEN2_053, 22827, 0 },
- { TX_VEN2_054, 10390, 0 },
- { TX_VEN2_055, 12792, 0 },
- { TX_VEN2_056, 18054, 0 },
- { TX_VEN2_057, 13554, 0 },
- { TX_VEN2_058, 10271, 0 },
- { TX_VEN2_059, 16593, 0 },
- { TX_VEN2_060, 18322, 0 },
- { TX_VEN2_061, 8589, 0 },
- { TX_VEN2_062, 12484, 0 },
- { TX_VEN2_063, 13376, 0 },
- { TX_VEN2_064, 12699, 0 },
- { TX_VEN2_065, 12924, 0 },
- { TX_VEN2_066, 9124, 0 },
- { TX_VEN2_067, 17887, 0 },
- { TX_VEN2_068, 13011, 0 },
- { TX_VEN2_069, 13740, 0 },
- { TX_VEN2_070, 7834, 0 },
- { TX_VEN2_071, 15497, 0 },
- { TX_VEN2_072, 2934, 0 },
- { TX_VEN2_073, 1295, 0 },
- { TX_VEN2_074, 16244, 0 },
- { TX_VEN2_075, 6898, 0 },
- { TX_VEN2_076, 1100, 0 },
- { TX_VEN2_077, 15137, 0 },
- { TX_VEN2_078, 7533, 0 },
- { TX_VEN2_079, 15779, 0 },
- { TX_VEN2_080, 15999, 0 },
- { TX_VEN2_081, 8104, 0 },
- { TX_VEN2_082, 8295, 0 },
- { TX_VEN2_083, 21010, 0 },
- { TX_VEN2_084, 21263, 0 },
- { TX_VEN2_085, 14671, 0 },
- { TX_VEN2_086, 7302, 0 },
- { TX_VEN2_087, 15414, 0 },
- { TX_VEN2_088, 14226, 0 },
- { TX_VEN2_089, 14584, 0 },
- { TX_VEN2_091, 14077, 0 },
- { TX_VEN2_092, 14813, 0 },
- { TX_VEN2_093, 995, 0 },
- { TX_VEN2_094, 7375, 0 },
- { TX_VEN2_096, 16473, 0 },
- { TX_VEN2_097, 21609, 0 },
- { TX_VEN2_098, 19583, 0 },
- { TX_VEN2_098, 8666, 0 },
- { TX_VEN2_099, 2384, 0 },
- { TX_VEN2_100, 9831, 0 },
- { TX_VEN2_101, 11009, 0 },
- { TX_VEN2_102, 2733, 0 },
- { TX_VEN2_103, 1799, 0 },
- { TX_VEN2_104, 10706, 0 },
- { TX_VEN2_105, 2512, 0 },
- { TX_VEN2_106, 11136, 0 },
- { TX_VEN2_107, 22443, 0 },
- { TX_VEN2_108, 9448, 0 },
- { TX_VEN2_109, 1454, 0 },
- { TX_VEN2_110, 22561, 0 },
- { TX_VEN2_111, 1956, 0 },
- { TX_VEN2_112, 2187, 0 },
- { TX_VEN2_113, 1620, 0 },
- { TX_VEN2_114, 9953, 0 },
- { TX_VEN2_115, 11383, 0 },
- { TX_VEN2_ELA, 22180, 0 },
- { TX_VEN2_ENT, 22215, 0 },
- { TX_VEN2_F28, 10925, 0 },
- { TX_VEN2_F29, 10850, 0 },
- { TX_VEN2_F35, 11997, 0 },
- { TX_VEN2_S09, 11713, 0 },
- { TX_VEN2_SHI, 21908, 0 },
- { TX_VEN2_TRA, 21931, 0 },
- { TX_VEN2_WEA, 21885, 0 },
- { TX_VEN4_017, 6826, 0 },
- { TX_VENA_F32, 19813, 0 },
- { TX_VENA_F34, 20083, 0 },
- { TX_VENA_F40, 19678, 0 },
- //{ TX_DEM6_015, 20930, 0 },
- { TX_VEN2N000, 4402, 0 },
- { TX_VEN2N001, 4341, 0 },
- { TX_VEN2N002, 3318, 0 },
- { TX_VEN2N003, 5479, 0 },
- { TX_VEN2N004, 6403, 0 },
- { TX_VEN2N005, 5275, 0 },
- { TX_VEN2N006, 5363, 0 },
- { TX_VEN2N007, 5177, 0 },
- { TX_VEN2N008, 4856, 0 },
- { TX_VEN2N009, 4957, 0 },
- { TX_VEN2N009, 5067, 0 },
- { TX_VEN2N010, 6159, 0 },
- { TX_VEN2N011, 20781, 0 },
- { TX_VEN2N012, 6331, 0 },
- { TX_VEN2N013, 19468, 0 },
- { TX_VEN2N015, 19034, 0 },
- { TX_VEN2N016, 17487, 0 },
- { TX_VEN2N017, 17096, 0 },
- { TX_VEN2N018, 20823, 0 },
- { TX_VEN2N019, 6259, 0 },
- { TX_VEN2N020, 4671, 0 },
- { TX_VEN2N021, 4553, 0 },
- { TX_VEN2N022, 3192, 0 },
- { TX_VEN2N023, 5574, 0 },
- { TX_VEN2N024, 4064, 0 },
- { TX_VEN2N025, 5766, 0 },
- { TX_VEN2N027, 3963, 0 },
- { TX_VEN2N027, 5673, 0 },
- { TX_VEN2N028, 10216, 0 },
- { TX_VEN2N029, 5898, 0 },
- { TX_VEN2N030, 12131, 0 },
- { TX_VEN2N030, 3479, 0 },
- { TX_VEN2N031, 6071, 0 },
- { TX_VEN2N031, 5983, 0 },
- { TX_VEN2N032, 23477, 0 },
- { TX_VEN2N032, 3824, 0 },
- { TX_VEN2N033, 4173, 0 },
- { TX_VEN2N033, 4257, 0 },
- { TX_VEN2N034, 4778, 0 },
- { TX_VEN2N035, 6492, 0 },
- { TX_VEN2N035, 3689, 0 },
- { TX_VEN2N038, 20875, 0 },
- { TX_VEN2N039, 18582, 0 },
- { TX_VEN2U093, 8821, 0 },
- { TX_VEN2U094, 11259, 0 },
- { TX_VEN4N010, 20237, 0 },
- { TX_VEN6N007, 20302, 0 },
- { TX_MUD4_018, 8758, 0 },
- { TX_VEN2_HAIL_ELASI, 9004, 0 },
- { TX_VEN2_HAIL_ENT, 9031, 0 },
- { TX_VEN2_CANCEL, 9063, 0 },
+ { TX_SPEAKER_KIRK, 20603, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 20614, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 20624, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 20719, 0, 0, 0 },
+ { TX_SPEAKER_SCOTT, 20634, 0, 0, 0 },
+ { TX_SPEAKER_CHEKOV, 20644, 0, 0, 0 },
+ { TX_SPEAKER_ELASI_CAPTAIN, 20731, 0, 0, 0 },
+ { TX_SPEAKER_PATTERSON, 20677, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 20658, 0, 0, 0 },
+ { TX_SPEAKER_ANDRADE, 20695, 0, 0, 0 },
+ { TX_SPEAKER_ELASI_WEAPONS_MASTER, 20745, 0, 0, 0 },
+ { TX_SPEAKER_ELASI_CREWMAN, 20766, 0, 0, 0 },
+ { TX_VEN2_001, 12332, 0, 0, 0 },
+ { TX_VEN2_002, 15643, 0, 0, 0 },
+ { TX_VEN2_003, 13474, 0, 0, 0 },
+ { TX_VEN2_003, 13295, 0, 0, 0 },
+ { TX_VEN2_004, 6710, 0, 0, 0 },
+ { TX_VEN2_005, 6633, 0, 0, 0 },
+ { TX_VEN2_006, 1862, 0, 0, 0 },
+ { TX_VEN2_007, 7242, 0, 0, 0 },
+ { TX_VEN2_008, 2468, 0, 0, 0 },
+ { TX_VEN2_009, 6954, 0, 0, 0 },
+ { TX_VEN2_010, 1756, 0, 0, 0 },
+ { TX_VEN2_011, 22026, 0, 0, 0 },
+ { TX_VEN2_012, 21967, 0, 0, 0 },
+ { TX_VEN2_013, 11534, 0, 0, 0 },
+ { TX_VEN2_014, 11088, 0, 0, 0 },
+ { TX_VEN2_015, 9563, 0, 0, 0 },
+ { TX_VEN2_015, 22250, 0, 0, 0 },
+ { TX_VEN2_016, 1372, 0, 0, 0 },
+ { TX_VEN2_017, 8039, 0, 0, 0 },
+ { TX_VEN2_018, 15028, 0, 0, 0 },
+ { TX_VEN2_019, 1051, 0, 0, 0 },
+ { TX_VEN2_020, 2081, 0, 0, 0 },
+ { TX_VEN2_021, 2626, 0, 0, 0 },
+ { TX_VEN2_022, 3046, 0, 0, 0 },
+ { TX_VEN2_023, 22533, 0, 0, 0 },
+ { TX_VEN2_024, 15934, 0, 0, 0 },
+ { TX_VEN2_025, 10100, 0, 0, 0 },
+ { TX_VEN2_026, 11332, 0, 0, 0 },
+ { TX_VEN2_027, 1576, 0, 0, 0 },
+ { TX_VEN2_028, 8928, 0, 0, 0 },
+ { TX_VEN2_029, 9654, 0, 0, 0 },
+ { TX_VEN2_029, 22325, 0, 0, 0 },
+ { TX_VEN2_030, 17649, 0, 0, 0 },
+ { TX_VEN2_031, 16748, 0, 0, 0 },
+ { TX_VEN2_032, 1198, 0, 0, 0 },
+ { TX_VEN2_033, 14498, 0, 0, 0 },
+ { TX_VEN2_034, 14871, 0, 0, 0 },
+ { TX_VEN2_035, 13922, 0, 0, 0 },
+ { TX_VEN2_036, 22919, 0, 0, 0 },
+ { TX_VEN2_037, 23214, 0, 0, 0 },
+ { TX_VEN2_038, 17250, 0, 0, 0 },
+ { TX_VEN2_039, 7091, 0, 0, 0 },
+ { TX_VEN2_040, 9261, 0, 0, 0 },
+ { TX_VEN2_041, 7154, 0, 0, 0 },
+ { TX_VEN2_042, 1139, 0, 0, 0 },
+ { TX_VEN2_043, 7956, 0, 0, 0 },
+ { TX_VEN2_044, 3004, 0, 0, 0 },
+ { TX_VEN2_045, 16134, 0, 0, 0 },
+ { TX_VEN2_046, 7637, 0, 0, 0 },
+ { TX_VEN2_047, 18668, 0, 0, 0 },
+ { TX_VEN2_047, 19102, 0, 0, 0 },
+ { TX_VEN2_048, 22718, 0, 0, 0 },
+ { TX_VEN2_050, 13181, 0, 0, 0 },
+ { TX_VEN2_051, 18177, 0, 0, 0 },
+ { TX_VEN2_052, 14307, 0, 0, 0 },
+ { TX_VEN2_053, 22827, 0, 0, 0 },
+ { TX_VEN2_054, 10390, 0, 0, 0 },
+ { TX_VEN2_055, 12792, 0, 0, 0 },
+ { TX_VEN2_056, 18054, 0, 0, 0 },
+ { TX_VEN2_057, 13554, 0, 0, 0 },
+ { TX_VEN2_058, 10271, 0, 0, 0 },
+ { TX_VEN2_059, 16593, 0, 0, 0 },
+ { TX_VEN2_060, 18322, 0, 0, 0 },
+ { TX_VEN2_061, 8589, 0, 0, 0 },
+ { TX_VEN2_062, 12484, 0, 0, 0 },
+ { TX_VEN2_063, 13376, 0, 0, 0 },
+ { TX_VEN2_064, 12699, 0, 0, 0 },
+ { TX_VEN2_065, 12924, 0, 0, 0 },
+ { TX_VEN2_066, 9124, 0, 0, 0 },
+ { TX_VEN2_067, 17887, 0, 0, 0 },
+ { TX_VEN2_068, 13011, 0, 0, 0 },
+ { TX_VEN2_069, 13740, 0, 0, 0 },
+ { TX_VEN2_070, 7834, 0, 0, 0 },
+ { TX_VEN2_071, 15497, 0, 0, 0 },
+ { TX_VEN2_072, 2934, 0, 0, 0 },
+ { TX_VEN2_073, 1295, 0, 0, 0 },
+ { TX_VEN2_074, 16244, 0, 0, 0 },
+ { TX_VEN2_075, 6898, 0, 0, 0 },
+ { TX_VEN2_076, 1100, 0, 0, 0 },
+ { TX_VEN2_077, 15137, 0, 0, 0 },
+ { TX_VEN2_078, 7533, 0, 0, 0 },
+ { TX_VEN2_079, 15779, 0, 0, 0 },
+ { TX_VEN2_080, 15999, 0, 0, 0 },
+ { TX_VEN2_081, 8104, 0, 0, 0 },
+ { TX_VEN2_082, 8295, 0, 0, 0 },
+ { TX_VEN2_083, 21010, 0, 0, 0 },
+ { TX_VEN2_084, 21263, 0, 0, 0 },
+ { TX_VEN2_085, 14671, 0, 0, 0 },
+ { TX_VEN2_086, 7302, 0, 0, 0 },
+ { TX_VEN2_087, 15414, 0, 0, 0 },
+ { TX_VEN2_088, 14226, 0, 0, 0 },
+ { TX_VEN2_089, 14584, 0, 0, 0 },
+ { TX_VEN2_091, 14077, 0, 0, 0 },
+ { TX_VEN2_092, 14813, 0, 0, 0 },
+ { TX_VEN2_093, 995, 0, 0, 0 },
+ { TX_VEN2_094, 7375, 0, 0, 0 },
+ { TX_VEN2_096, 16473, 0, 0, 0 },
+ { TX_VEN2_097, 21609, 0, 0, 0 },
+ { TX_VEN2_098, 19583, 0, 0, 0 },
+ { TX_VEN2_098, 8666, 0, 0, 0 },
+ { TX_VEN2_099, 2384, 0, 0, 0 },
+ { TX_VEN2_100, 9831, 0, 0, 0 },
+ { TX_VEN2_101, 11009, 0, 0, 0 },
+ { TX_VEN2_102, 2733, 0, 0, 0 },
+ { TX_VEN2_103, 1799, 0, 0, 0 },
+ { TX_VEN2_104, 10706, 0, 0, 0 },
+ { TX_VEN2_105, 2512, 0, 0, 0 },
+ { TX_VEN2_106, 11136, 0, 0, 0 },
+ { TX_VEN2_107, 22443, 0, 0, 0 },
+ { TX_VEN2_108, 9448, 0, 0, 0 },
+ { TX_VEN2_109, 1454, 0, 0, 0 },
+ { TX_VEN2_110, 22561, 0, 0, 0 },
+ { TX_VEN2_111, 1956, 0, 0, 0 },
+ { TX_VEN2_112, 2187, 0, 0, 0 },
+ { TX_VEN2_113, 1620, 0, 0, 0 },
+ { TX_VEN2_114, 9953, 0, 0, 0 },
+ { TX_VEN2_115, 11383, 0, 0, 0 },
+ { TX_VEN2_ELA, 22180, 0, 0, 0 },
+ { TX_VEN2_ENT, 22215, 0, 0, 0 },
+ { TX_VEN2_F28, 10925, 0, 0, 0 },
+ { TX_VEN2_F29, 10850, 0, 0, 0 },
+ { TX_VEN2_F35, 11997, 0, 0, 0 },
+ { TX_VEN2_S09, 11713, 0, 0, 0 },
+ { TX_VEN2_SHI, 21908, 0, 0, 0 },
+ { TX_VEN2_TRA, 21931, 0, 0, 0 },
+ { TX_VEN2_WEA, 21885, 0, 0, 0 },
+ { TX_VEN4_017, 6826, 0, 0, 0 },
+ { TX_VENA_F32, 19813, 0, 0, 0 },
+ { TX_VENA_F34, 20083, 0, 0, 0 },
+ { TX_VENA_F40, 19678, 0, 0, 0 },
+ //{ TX_DEM6_015, 20930, 0, 0, 0 },
+ { TX_VEN2N000, 4402, 0, 0, 0 },
+ { TX_VEN2N001, 4341, 0, 0, 0 },
+ { TX_VEN2N002, 3318, 0, 0, 0 },
+ { TX_VEN2N003, 5479, 0, 0, 0 },
+ { TX_VEN2N004, 6403, 0, 0, 0 },
+ { TX_VEN2N005, 5275, 0, 0, 0 },
+ { TX_VEN2N006, 5363, 0, 0, 0 },
+ { TX_VEN2N007, 5177, 0, 0, 0 },
+ { TX_VEN2N008, 4856, 0, 0, 0 },
+ { TX_VEN2N009, 4957, 0, 0, 0 },
+ { TX_VEN2N009, 5067, 0, 0, 0 },
+ { TX_VEN2N010, 6159, 0, 0, 0 },
+ { TX_VEN2N011, 20781, 0, 0, 0 },
+ { TX_VEN2N012, 6331, 0, 0, 0 },
+ { TX_VEN2N013, 19468, 0, 0, 0 },
+ { TX_VEN2N015, 19034, 0, 0, 0 },
+ { TX_VEN2N016, 17487, 0, 0, 0 },
+ { TX_VEN2N017, 17096, 0, 0, 0 },
+ { TX_VEN2N018, 20823, 0, 0, 0 },
+ { TX_VEN2N019, 6259, 0, 0, 0 },
+ { TX_VEN2N020, 4671, 0, 0, 0 },
+ { TX_VEN2N021, 4553, 0, 0, 0 },
+ { TX_VEN2N022, 3192, 0, 0, 0 },
+ { TX_VEN2N023, 5574, 0, 0, 0 },
+ { TX_VEN2N024, 4064, 0, 0, 0 },
+ { TX_VEN2N025, 5766, 0, 0, 0 },
+ { TX_VEN2N027, 3963, 0, 0, 0 },
+ { TX_VEN2N027, 5673, 0, 0, 0 },
+ { TX_VEN2N028, 10216, 0, 0, 0 },
+ { TX_VEN2N029, 5898, 0, 0, 0 },
+ { TX_VEN2N030, 12131, 0, 0, 0 },
+ { TX_VEN2N030, 3479, 0, 0, 0 },
+ { TX_VEN2N031, 6071, 0, 0, 0 },
+ { TX_VEN2N031, 5983, 0, 0, 0 },
+ { TX_VEN2N032, 23477, 0, 0, 0 },
+ { TX_VEN2N032, 3824, 0, 0, 0 },
+ { TX_VEN2N033, 4173, 0, 0, 0 },
+ { TX_VEN2N033, 4257, 0, 0, 0 },
+ { TX_VEN2N034, 4778, 0, 0, 0 },
+ { TX_VEN2N035, 6492, 0, 0, 0 },
+ { TX_VEN2N035, 3689, 0, 0, 0 },
+ { TX_VEN2N038, 20875, 0, 0, 0 },
+ { TX_VEN2N039, 18582, 0, 0, 0 },
+ { TX_VEN2U093, 8821, 0, 0, 0 },
+ { TX_VEN2U094, 11259, 0, 0, 0 },
+ { TX_VEN4N010, 20237, 0, 0, 0 },
+ { TX_VEN6N007, 20302, 0, 0, 0 },
+ { TX_MUD4_018, 8758, 0, 0, 0 },
+ { TX_VEN2_HAIL_ELASI, 9004, 0, 0, 0 },
+ { TX_VEN2_HAIL_ENT, 9031, 0, 0, 0 },
+ { TX_VEN2_CANCEL, 9063, 0, 0, 0 },
//TODO: TX_VEN2_090
- { -1, 0, 0 }
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng2Texts[] = {
diff --git a/engines/startrek/rooms/veng3.cpp b/engines/startrek/rooms/veng3.cpp
index a49739de66..2059d30c27 100644
--- a/engines/startrek/rooms/veng3.cpp
+++ b/engines/startrek/rooms/veng3.cpp
@@ -119,61 +119,61 @@ enum veng3TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng3TextOffsets[] = {
- { TX_SPEAKER_KIRK, 6893, 0 },
- { TX_SPEAKER_MCCOY, 6904, 0 },
- { TX_SPEAKER_SPOCK, 6914, 0 },
- { TX_SPEAKER_KIJE, 6924, 0 },
- { TX_BRIDU146, 5935, 0 },
- { TX_DEM3_019, 6419, 0 },
- { TX_MUD4_018, 5866, 0 },
- { TX_MUD4_018, 5999, 0 },
- { TX_VEN0_010, 496, 0 },
- { TX_VEN0_016, 6715, 0 },
- //{ TX_VEN0_016, 6656, 0 }, // Skip duplicate text
- { TX_VEN2U093, 6067, 0 },
- { TX_VEN2_028, 6174, 0 },
- { TX_VEN2_066, 6252, 0 },
- { TX_VEN2_098, 5062, 0 },
- { TX_VEN3N000, 2263, 0 },
- { TX_VEN3N001, 1954, 0 },
- { TX_VEN3N002, 2040, 0 },
- { TX_VEN3N003, 2347, 0 },
- { TX_VEN3N004, 2157, 0 },
- { TX_VEN3N005, 1842, 0 },
- { TX_VEN3N006, 706, 0 },
- { TX_VEN3N007, 1272, 0 },
- //{ TX_VEN3N007, 1020, 0 }, // Skip duplicate text
- { TX_VEN3N009, 1120, 0 },
- { TX_VEN3N010, 4721, 0 },
- { TX_VEN3N011, 1686, 0 },
- { TX_VEN3N012, 1362, 0 },
- { TX_VEN3N013, 1755, 0 },
- { TX_VEN3N014, 4926, 0 },
- { TX_VEN3_001, 4194, 0 },
- { TX_VEN3_002, 2482, 0 },
- { TX_VEN3_003, 4493, 0 },
- { TX_VEN3_004, 3569, 0 },
- { TX_VEN3_005, 4656, 0 },
- { TX_VEN3_006, 1589, 0 },
- { TX_VEN3_007, 3993, 0 },
- { TX_VEN3_008, 3134, 0 },
- { TX_VEN3_009, 3853, 0 },
- { TX_VEN3_010, 4071, 0 },
- { TX_VEN3_011, 3257, 0 },
- { TX_VEN3_012, 4434, 0 },
- { TX_VEN3_013, 1443, 0 },
- { TX_VEN3_014, 2826, 0 },
- { TX_VEN3_015, 3012, 0 },
- { TX_VEN3_016, 3482, 0 },
- { TX_VEN3_017, 3342, 0 },
- { TX_VEN3_018, 4582, 0 },
- { TX_VEN4N010, 5716, 0 },
- { TX_VEN4_016, 6470, 0 },
- { TX_VEN6N007, 5781, 0 },
- { TX_VENA_F32, 5292, 0 },
- { TX_VENA_F34, 5562, 0 },
- { TX_VENA_F40, 5157, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 6893, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 6904, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 6914, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 6924, 0, 0, 0 },
+ { TX_BRIDU146, 5935, 0, 0, 0 },
+ { TX_DEM3_019, 6419, 0, 0, 0 },
+ { TX_MUD4_018, 5866, 0, 0, 0 },
+ { TX_MUD4_018, 5999, 0, 0, 0 },
+ { TX_VEN0_010, 496, 0, 0, 0 },
+ { TX_VEN0_016, 6715, 0, 0, 0 },
+ //{ TX_VEN0_016, 6656, 0, 0, 0 }, // Skip duplicate text
+ { TX_VEN2U093, 6067, 0, 0, 0 },
+ { TX_VEN2_028, 6174, 0, 0, 0 },
+ { TX_VEN2_066, 6252, 0, 0, 0 },
+ { TX_VEN2_098, 5062, 0, 0, 0 },
+ { TX_VEN3N000, 2263, 0, 0, 0 },
+ { TX_VEN3N001, 1954, 0, 0, 0 },
+ { TX_VEN3N002, 2040, 0, 0, 0 },
+ { TX_VEN3N003, 2347, 0, 0, 0 },
+ { TX_VEN3N004, 2157, 0, 0, 0 },
+ { TX_VEN3N005, 1842, 0, 0, 0 },
+ { TX_VEN3N006, 706, 0, 0, 0 },
+ { TX_VEN3N007, 1272, 0, 0, 0 },
+ //{ TX_VEN3N007, 1020, 0, 0, 0 }, // Skip duplicate text
+ { TX_VEN3N009, 1120, 0, 0, 0 },
+ { TX_VEN3N010, 4721, 0, 0, 0 },
+ { TX_VEN3N011, 1686, 0, 0, 0 },
+ { TX_VEN3N012, 1362, 0, 0, 0 },
+ { TX_VEN3N013, 1755, 0, 0, 0 },
+ { TX_VEN3N014, 4926, 0, 0, 0 },
+ { TX_VEN3_001, 4194, 0, 0, 0 },
+ { TX_VEN3_002, 2482, 0, 0, 0 },
+ { TX_VEN3_003, 4493, 0, 0, 0 },
+ { TX_VEN3_004, 3569, 0, 0, 0 },
+ { TX_VEN3_005, 4656, 0, 0, 0 },
+ { TX_VEN3_006, 1589, 0, 0, 0 },
+ { TX_VEN3_007, 3993, 0, 0, 0 },
+ { TX_VEN3_008, 3134, 0, 0, 0 },
+ { TX_VEN3_009, 3853, 0, 0, 0 },
+ { TX_VEN3_010, 4071, 0, 0, 0 },
+ { TX_VEN3_011, 3257, 0, 0, 0 },
+ { TX_VEN3_012, 4434, 0, 0, 0 },
+ { TX_VEN3_013, 1443, 0, 0, 0 },
+ { TX_VEN3_014, 2826, 0, 0, 0 },
+ { TX_VEN3_015, 3012, 0, 0, 0 },
+ { TX_VEN3_016, 3482, 0, 0, 0 },
+ { TX_VEN3_017, 3342, 0, 0, 0 },
+ { TX_VEN3_018, 4582, 0, 0, 0 },
+ { TX_VEN4N010, 5716, 0, 0, 0 },
+ { TX_VEN4_016, 6470, 0, 0, 0 },
+ { TX_VEN6N007, 5781, 0, 0, 0 },
+ { TX_VENA_F32, 5292, 0, 0, 0 },
+ { TX_VENA_F34, 5562, 0, 0, 0 },
+ { TX_VENA_F40, 5157, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng3Texts[] = {
diff --git a/engines/startrek/rooms/veng4.cpp b/engines/startrek/rooms/veng4.cpp
index 3f40cddd0e..22ea99b968 100644
--- a/engines/startrek/rooms/veng4.cpp
+++ b/engines/startrek/rooms/veng4.cpp
@@ -113,52 +113,52 @@ enum veng4TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng4TextOffsets[] = {
- { TX_SPEAKER_KIRK, 4347, 0 },
- { TX_SPEAKER_MCCOY, 4358, 0 },
- { TX_SPEAKER_SPOCK, 4368, 0 },
- { TX_SPEAKER_KIJE, 4378, 0 },
- { TX_SPEAKER_BRITTANY_MARATA, 4390, 0 },
- { TX_VEN4_001, 4583, 0 },
- { TX_VEN4_002, 5485, 0 },
- { TX_VEN4_003, 6238, 0 },
- { TX_VEN4_004, 6005, 0 },
- { TX_VEN4_005, 4882, 0 },
- { TX_VEN4_006, 6124, 0 },
- { TX_VEN4_007, 4431, 0 },
- { TX_VEN4_008, 703, 0 },
- { TX_VEN4_009, 6387, 0 },
- { TX_VEN4_010, 1261, 0 },
- { TX_VEN4_011, 4486, 0 },
- { TX_VEN4_012, 6333, 0 },
- { TX_VEN4_013, 6482, 0 },
- { TX_VEN4_014, 5009, 0 },
- { TX_VEN4_015, 5636, 0 },
- { TX_VEN4_016, 6287, 0 },
- { TX_VEN4_017, 5576, 0 },
- { TX_VEN4_019, 5964, 0 },
- { TX_VEN4_020, 6043, 0 },
- { TX_VEN4_021, 6166, 0 },
- { TX_VEN4_022, 5894, 0 },
- { TX_VEN4N000, 4725, 0 },
- { TX_VEN4N001, 4831, 0 },
- { TX_VEN4N002, 4661, 0 },
- { TX_VEN4N003, 4779, 0 },
- { TX_VEN4N004, 1640, 0 },
- { TX_VEN4N005, 1498, 0 },
- { TX_VEN4N006, 5280, 0 },
- { TX_VEN4N007, 5074, 0 },
- { TX_VEN4N008, 5417, 0 },
- { TX_VEN4N009, 2090, 0 },
- { TX_VEN4N010, 3531, 0 },
- //{ TX_VEN4N010, 2019, 0 }, // ignore duplicate line
- { TX_VEN4N011, 2185, 0 },
- { TX_VEN4N012, 1926, 0 },
- { TX_VEN4N013, 5352, 0 },
- { TX_VEN4N014, 5192, 0 },
- { TX_VEN4N015, 2408, 0 },
- { TX_VEN4N016, 2628, 0 },
- { TX_VEN4N017, 1768, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 4347, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 4358, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 4368, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 4378, 0, 0, 0 },
+ { TX_SPEAKER_BRITTANY_MARATA, 4390, 0, 0, 0 },
+ { TX_VEN4_001, 4583, 0, 0, 0 },
+ { TX_VEN4_002, 5485, 0, 0, 0 },
+ { TX_VEN4_003, 6238, 0, 0, 0 },
+ { TX_VEN4_004, 6005, 0, 0, 0 },
+ { TX_VEN4_005, 4882, 0, 0, 0 },
+ { TX_VEN4_006, 6124, 0, 0, 0 },
+ { TX_VEN4_007, 4431, 0, 0, 0 },
+ { TX_VEN4_008, 703, 0, 0, 0 },
+ { TX_VEN4_009, 6387, 0, 0, 0 },
+ { TX_VEN4_010, 1261, 0, 0, 0 },
+ { TX_VEN4_011, 4486, 0, 0, 0 },
+ { TX_VEN4_012, 6333, 0, 0, 0 },
+ { TX_VEN4_013, 6482, 0, 0, 0 },
+ { TX_VEN4_014, 5009, 0, 0, 0 },
+ { TX_VEN4_015, 5636, 0, 0, 0 },
+ { TX_VEN4_016, 6287, 0, 0, 0 },
+ { TX_VEN4_017, 5576, 0, 0, 0 },
+ { TX_VEN4_019, 5964, 0, 0, 0 },
+ { TX_VEN4_020, 6043, 0, 0, 0 },
+ { TX_VEN4_021, 6166, 0, 0, 0 },
+ { TX_VEN4_022, 5894, 0, 0, 0 },
+ { TX_VEN4N000, 4725, 0, 0, 0 },
+ { TX_VEN4N001, 4831, 0, 0, 0 },
+ { TX_VEN4N002, 4661, 0, 0, 0 },
+ { TX_VEN4N003, 4779, 0, 0, 0 },
+ { TX_VEN4N004, 1640, 0, 0, 0 },
+ { TX_VEN4N005, 1498, 0, 0, 0 },
+ { TX_VEN4N006, 5280, 0, 0, 0 },
+ { TX_VEN4N007, 5074, 0, 0, 0 },
+ { TX_VEN4N008, 5417, 0, 0, 0 },
+ { TX_VEN4N009, 2090, 0, 0, 0 },
+ { TX_VEN4N010, 3531, 0, 0, 0 },
+ //{ TX_VEN4N010, 2019, 0, 0, 0 }, // ignore duplicate line
+ { TX_VEN4N011, 2185, 0, 0, 0 },
+ { TX_VEN4N012, 1926, 0, 0, 0 },
+ { TX_VEN4N013, 5352, 0, 0, 0 },
+ { TX_VEN4N014, 5192, 0, 0, 0 },
+ { TX_VEN4N015, 2408, 0, 0, 0 },
+ { TX_VEN4N016, 2628, 0, 0, 0 },
+ { TX_VEN4N017, 1768, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng4Texts[] = {
diff --git a/engines/startrek/rooms/veng5.cpp b/engines/startrek/rooms/veng5.cpp
index ee0867fb92..e284984396 100644
--- a/engines/startrek/rooms/veng5.cpp
+++ b/engines/startrek/rooms/veng5.cpp
@@ -105,58 +105,58 @@ enum veng5TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng5TextOffsets[] = {
- { TX_SPEAKER_KIRK, 5963, 0 },
- { TX_SPEAKER_MCCOY, 5974, 0 },
- { TX_SPEAKER_SPOCK, 5984, 0 },
- { TX_SPEAKER_KIJE, 5994, 0 },
- { TX_BRIDU146, 5020, 0 },
- { TX_DEM3_019, 5504, 0 },
- { TX_MUD4_018, 4951, 0 },
- { TX_MUD4_018, 5084, 0 },
- { TX_VEN0_016, 5741, 0 },
- //{ TX_VEN0_016, 5800, 0 }, // Skip duplicate text
- { TX_VEN2U093, 5152, 0 },
- { TX_VEN2_028, 5259, 0 },
- { TX_VEN2_066, 5337, 0 },
- { TX_VEN2_098, 4147, 0 },
- { TX_VEN4N010, 4801, 0 },
- { TX_VEN4_016, 5555, 0 },
- { TX_VEN5N000, 897, 0 },
- { TX_VEN5N001, 1206, 0 },
- { TX_VEN5N002, 1339, 0 },
- { TX_VEN5N003, 1270, 0 },
- { TX_VEN5N004, 1394, 0 },
- { TX_VEN5N005, 1474, 0 },
- { TX_VEN5N006, 1572, 0 },
- { TX_VEN5N007, 668, 0 },
- { TX_VEN5N008, 739, 0 },
- { TX_VEN5N009, 993, 0 },
- { TX_VEN5N010, 3993, 0 },
- { TX_VEN5_001, 3126, 0 },
- { TX_VEN5_002, 3695, 0 },
- { TX_VEN5_003, 2446, 0 },
- { TX_VEN5_004, 3021, 0 },
- { TX_VEN5_005, 372, 0 },
- { TX_VEN5_006, 3200, 0 },
- { TX_VEN5_007, 1672, 0 },
- { TX_VEN5_008, 2577, 0 },
- { TX_VEN5_009, 2869, 0 },
- { TX_VEN5_010, 2170, 0 },
- { TX_VEN5_011, 2024, 0 },
- { TX_VEN5_012, 2735, 0 },
- { TX_VEN5_013, 1780, 0 },
- { TX_VEN5_015, 3574, 0 },
- { TX_VEN5_016, 3764, 0 },
- { TX_VEN5_017, 3280, 0 },
- { TX_VEN5_018, 2095, 0 },
- { TX_VEN5_019, 2299, 0 },
- { TX_VEN5_R19, 3511, 0 },
- { TX_VEN5_R20, 3410, 0 },
- { TX_VEN6N007, 4866, 0 },
- { TX_VENA_F32, 4377, 0 },
- { TX_VENA_F34, 4647, 0 },
- { TX_VENA_F40, 4242, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 5963, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 5974, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 5984, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 5994, 0, 0, 0 },
+ { TX_BRIDU146, 5020, 0, 0, 0 },
+ { TX_DEM3_019, 5504, 0, 0, 0 },
+ { TX_MUD4_018, 4951, 0, 0, 0 },
+ { TX_MUD4_018, 5084, 0, 0, 0 },
+ { TX_VEN0_016, 5741, 0, 0, 0 },
+ //{ TX_VEN0_016, 5800, 0, 0, 0 }, // Skip duplicate text
+ { TX_VEN2U093, 5152, 0, 0, 0 },
+ { TX_VEN2_028, 5259, 0, 0, 0 },
+ { TX_VEN2_066, 5337, 0, 0, 0 },
+ { TX_VEN2_098, 4147, 0, 0, 0 },
+ { TX_VEN4N010, 4801, 0, 0, 0 },
+ { TX_VEN4_016, 5555, 0, 0, 0 },
+ { TX_VEN5N000, 897, 0, 0, 0 },
+ { TX_VEN5N001, 1206, 0, 0, 0 },
+ { TX_VEN5N002, 1339, 0, 0, 0 },
+ { TX_VEN5N003, 1270, 0, 0, 0 },
+ { TX_VEN5N004, 1394, 0, 0, 0 },
+ { TX_VEN5N005, 1474, 0, 0, 0 },
+ { TX_VEN5N006, 1572, 0, 0, 0 },
+ { TX_VEN5N007, 668, 0, 0, 0 },
+ { TX_VEN5N008, 739, 0, 0, 0 },
+ { TX_VEN5N009, 993, 0, 0, 0 },
+ { TX_VEN5N010, 3993, 0, 0, 0 },
+ { TX_VEN5_001, 3126, 0, 0, 0 },
+ { TX_VEN5_002, 3695, 0, 0, 0 },
+ { TX_VEN5_003, 2446, 0, 0, 0 },
+ { TX_VEN5_004, 3021, 0, 0, 0 },
+ { TX_VEN5_005, 372, 0, 0, 0 },
+ { TX_VEN5_006, 3200, 0, 0, 0 },
+ { TX_VEN5_007, 1672, 0, 0, 0 },
+ { TX_VEN5_008, 2577, 0, 0, 0 },
+ { TX_VEN5_009, 2869, 0, 0, 0 },
+ { TX_VEN5_010, 2170, 0, 0, 0 },
+ { TX_VEN5_011, 2024, 0, 0, 0 },
+ { TX_VEN5_012, 2735, 0, 0, 0 },
+ { TX_VEN5_013, 1780, 0, 0, 0 },
+ { TX_VEN5_015, 3574, 0, 0, 0 },
+ { TX_VEN5_016, 3764, 0, 0, 0 },
+ { TX_VEN5_017, 3280, 0, 0, 0 },
+ { TX_VEN5_018, 2095, 0, 0, 0 },
+ { TX_VEN5_019, 2299, 0, 0, 0 },
+ { TX_VEN5_R19, 3511, 0, 0, 0 },
+ { TX_VEN5_R20, 3410, 0, 0, 0 },
+ { TX_VEN6N007, 4866, 0, 0, 0 },
+ { TX_VENA_F32, 4377, 0, 0, 0 },
+ { TX_VENA_F34, 4647, 0, 0, 0 },
+ { TX_VENA_F40, 4242, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng5Texts[] = {
diff --git a/engines/startrek/rooms/veng6.cpp b/engines/startrek/rooms/veng6.cpp
index 34e5eef6ae..02ad63af77 100644
--- a/engines/startrek/rooms/veng6.cpp
+++ b/engines/startrek/rooms/veng6.cpp
@@ -151,76 +151,76 @@ enum veng6TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng6TextOffsets[] = {
- { TX_SPEAKER_KIRK, 8894, 0 },
- { TX_SPEAKER_MCCOY, 8905, 0 },
- { TX_SPEAKER_SPOCK, 8915, 0 },
- { TX_SPEAKER_KIJE, 8925, 0 },
- { TX_SPEAKER_COMPUTER, 8937, 0 },
- { TX_BRIDU146, 7831, 0 },
- { TX_COMPA185, 4008, 0 },
- { TX_DEM3_019, 8315, 0 },
- { TX_MUD1N014, 6550, 0 },
- { TX_MUD4_018, 7762, 0 },
- //{ TX_MUD4_018, 7895, 0 }, // Skip duplicate text
- { TX_VEN0N016, 2156, 0 },
- { TX_VEN0_016, 8552, 0 },
- //{ TX_VEN0_016, 8611, 0 }, // Skip duplicate text
- { TX_VEN2U093, 7963, 0 },
- { TX_VEN2_028, 8070, 0 },
- { TX_VEN2_066, 8148, 0 },
- { TX_VEN2_098, 6958, 0 },
- { TX_VEN4N010, 7612, 0 },
- { TX_VEN4_016, 8366, 0 },
- { TX_VEN5N007, 775, 0 },
- { TX_VEN6N000, 2099, 0 },
- { TX_VEN6N001, 1781, 0 },
- { TX_VEN6N002, 1999, 0 },
- { TX_VEN6N003, 1873, 0 },
- { TX_VEN6N005, 5276, 0 },
- { TX_VEN6N006, 4887, 0 },
- { TX_VEN6N007, 4998, 0 },
- { TX_VEN6N007, 7677, 0 },
- { TX_VEN6N008, 6615, 0 },
- { TX_VEN6N009, 1334, 0 },
- { TX_VEN6N010, 1253, 0 },
- { TX_VEN6N011, 845, 0 },
- { TX_VEN6N012, 1425, 0 },
- { TX_VEN6N013, 1052, 0 },
- { TX_VEN6N015, 976, 0 },
- { TX_VEN6N016, 8975, 0 },
- { TX_VEN6N018, 9063, 0 },
- { TX_VEN6N017, 1139, 0 },
- { TX_VEN6N019, 2207, 0 },
- { TX_VEN6N020, 3318, 0 },
- { TX_VEN6N022, 3710, 0 },
- { TX_VEN6N024, 6803, 0 },
- { TX_VEN6N025, 1536, 0 },
- { TX_VEN6_001, 5699, 0 },
- { TX_VEN6_002, 4457, 0 },
- { TX_VEN6_003, 4062, 0 },
- { TX_VEN6_005, 2298, 0 },
- { TX_VEN6_006, 6407, 0 },
- { TX_VEN6_007, 5830, 0 },
- { TX_VEN6_008, 2674, 0 },
- { TX_VEN6_009, 2457, 0 },
- { TX_VEN6_010, 5433, 0 },
- { TX_VEN6_011, 4737, 0 },
- { TX_VEN6_012, 3881, 0 },
- { TX_VEN6_013, 5972, 0 },
- { TX_VEN6_014, 2534, 0 },
- { TX_VEN6_015, 6196, 0 },
- { TX_VEN6_016, 4297, 0 },
- { TX_VEN6_017, 4105, 0 },
- { TX_VEN6_018, 2781, 0 },
- { TX_VEN6_019, 4596, 0 },
- { TX_VEN6_020, 5500, 0 },
- { TX_VEN6_021, 1616, 0 },
- { TX_VEN6_022, 9197, 0 },
- { TX_VEN6_023, 2954, 0 },
- { TX_VENA_F32, 7188, 0 },
- { TX_VENA_F34, 7458, 0 },
- { TX_VENA_F40, 7053, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 8894, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 8905, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 8915, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 8925, 0, 0, 0 },
+ { TX_SPEAKER_COMPUTER, 8937, 0, 0, 0 },
+ { TX_BRIDU146, 7831, 0, 0, 0 },
+ { TX_COMPA185, 4008, 0, 0, 0 },
+ { TX_DEM3_019, 8315, 0, 0, 0 },
+ { TX_MUD1N014, 6550, 0, 0, 0 },
+ { TX_MUD4_018, 7762, 0, 0, 0 },
+ //{ TX_MUD4_018, 7895, 0, 0, 0 }, // Skip duplicate text
+ { TX_VEN0N016, 2156, 0, 0, 0 },
+ { TX_VEN0_016, 8552, 0, 0, 0 },
+ //{ TX_VEN0_016, 8611, 0, 0, 0 }, // Skip duplicate text
+ { TX_VEN2U093, 7963, 0, 0, 0 },
+ { TX_VEN2_028, 8070, 0, 0, 0 },
+ { TX_VEN2_066, 8148, 0, 0, 0 },
+ { TX_VEN2_098, 6958, 0, 0, 0 },
+ { TX_VEN4N010, 7612, 0, 0, 0 },
+ { TX_VEN4_016, 8366, 0, 0, 0 },
+ { TX_VEN5N007, 775, 0, 0, 0 },
+ { TX_VEN6N000, 2099, 0, 0, 0 },
+ { TX_VEN6N001, 1781, 0, 0, 0 },
+ { TX_VEN6N002, 1999, 0, 0, 0 },
+ { TX_VEN6N003, 1873, 0, 0, 0 },
+ { TX_VEN6N005, 5276, 0, 0, 0 },
+ { TX_VEN6N006, 4887, 0, 0, 0 },
+ { TX_VEN6N007, 4998, 0, 0, 0 },
+ { TX_VEN6N007, 7677, 0, 0, 0 },
+ { TX_VEN6N008, 6615, 0, 0, 0 },
+ { TX_VEN6N009, 1334, 0, 0, 0 },
+ { TX_VEN6N010, 1253, 0, 0, 0 },
+ { TX_VEN6N011, 845, 0, 0, 0 },
+ { TX_VEN6N012, 1425, 0, 0, 0 },
+ { TX_VEN6N013, 1052, 0, 0, 0 },
+ { TX_VEN6N015, 976, 0, 0, 0 },
+ { TX_VEN6N016, 8975, 0, 0, 0 },
+ { TX_VEN6N018, 9063, 0, 0, 0 },
+ { TX_VEN6N017, 1139, 0, 0, 0 },
+ { TX_VEN6N019, 2207, 0, 0, 0 },
+ { TX_VEN6N020, 3318, 0, 0, 0 },
+ { TX_VEN6N022, 3710, 0, 0, 0 },
+ { TX_VEN6N024, 6803, 0, 0, 0 },
+ { TX_VEN6N025, 1536, 0, 0, 0 },
+ { TX_VEN6_001, 5699, 0, 0, 0 },
+ { TX_VEN6_002, 4457, 0, 0, 0 },
+ { TX_VEN6_003, 4062, 0, 0, 0 },
+ { TX_VEN6_005, 2298, 0, 0, 0 },
+ { TX_VEN6_006, 6407, 0, 0, 0 },
+ { TX_VEN6_007, 5830, 0, 0, 0 },
+ { TX_VEN6_008, 2674, 0, 0, 0 },
+ { TX_VEN6_009, 2457, 0, 0, 0 },
+ { TX_VEN6_010, 5433, 0, 0, 0 },
+ { TX_VEN6_011, 4737, 0, 0, 0 },
+ { TX_VEN6_012, 3881, 0, 0, 0 },
+ { TX_VEN6_013, 5972, 0, 0, 0 },
+ { TX_VEN6_014, 2534, 0, 0, 0 },
+ { TX_VEN6_015, 6196, 0, 0, 0 },
+ { TX_VEN6_016, 4297, 0, 0, 0 },
+ { TX_VEN6_017, 4105, 0, 0, 0 },
+ { TX_VEN6_018, 2781, 0, 0, 0 },
+ { TX_VEN6_019, 4596, 0, 0, 0 },
+ { TX_VEN6_020, 5500, 0, 0, 0 },
+ { TX_VEN6_021, 1616, 0, 0, 0 },
+ { TX_VEN6_022, 9197, 0, 0, 0 },
+ { TX_VEN6_023, 2954, 0, 0, 0 },
+ { TX_VENA_F32, 7188, 0, 0, 0 },
+ { TX_VENA_F34, 7458, 0, 0, 0 },
+ { TX_VENA_F40, 7053, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng6Texts[] = {
diff --git a/engines/startrek/rooms/veng7.cpp b/engines/startrek/rooms/veng7.cpp
index 2c016e1539..17e504f320 100644
--- a/engines/startrek/rooms/veng7.cpp
+++ b/engines/startrek/rooms/veng7.cpp
@@ -87,43 +87,43 @@ enum veng7TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng7TextOffsets[] = {
- { TX_SPEAKER_KIRK, 4142, 0 },
- { TX_SPEAKER_MCCOY, 4153, 0 },
- { TX_SPEAKER_SPOCK, 4163, 0 },
- { TX_SPEAKER_KIJE, 4173, 0 },
- { TX_BRIDU146, 3179, 0 },
- { TX_DEM3_019, 3663, 0 },
- { TX_MUD4_018, 3110, 0 },
- { TX_MUD4_018, 3243, 0 },
- { TX_VEN0N016, 708, 0 },
- { TX_VEN0_016, 3959, 0 },
- //{ TX_VEN0_016, 3900, 0 }, // Skip duplicate text
- { TX_VEN1_004, 1460, 0 },
- { TX_VEN2U093, 3311, 0 },
- { TX_VEN2_028, 3418, 0 },
- { TX_VEN2_066, 3496, 0 },
- { TX_VEN2_098, 2306, 0 },
- { TX_VEN4N010, 2960, 0 },
- { TX_VEN4_016, 3714, 0 },
- { TX_VEN6N007, 3025, 0 },
- { TX_VEN7N001, 525, 0 },
- { TX_VEN7N002, 1071, 0 },
- { TX_VEN7N003, 928, 0 },
- { TX_VEN7N004, 1023, 0 },
- { TX_VEN7N005, 976, 0 },
- { TX_VEN7N006, 1117, 0 },
- { TX_VEN7N007, 767, 0 },
- { TX_VEN7N008, 841, 0 },
- { TX_VEN7N009, 2161, 0 },
- { TX_VEN7_001, 1195, 0 },
- { TX_VEN7_003, 1902, 0 },
- { TX_VEN7_005, 1320, 0 },
- { TX_VEN7_006, 1706, 0 },
- { TX_VEN7_007, 1576, 0 },
- { TX_VENA_F32, 2536, 0 },
- { TX_VENA_F34, 2806, 0 },
- { TX_VENA_F40, 2401, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 4142, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 4153, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 4163, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 4173, 0, 0, 0 },
+ { TX_BRIDU146, 3179, 0, 0, 0 },
+ { TX_DEM3_019, 3663, 0, 0, 0 },
+ { TX_MUD4_018, 3110, 0, 0, 0 },
+ { TX_MUD4_018, 3243, 0, 0, 0 },
+ { TX_VEN0N016, 708, 0, 0, 0 },
+ { TX_VEN0_016, 3959, 0, 0, 0 },
+ //{ TX_VEN0_016, 3900, 0, 0, 0 }, // Skip duplicate text
+ { TX_VEN1_004, 1460, 0, 0, 0 },
+ { TX_VEN2U093, 3311, 0, 0, 0 },
+ { TX_VEN2_028, 3418, 0, 0, 0 },
+ { TX_VEN2_066, 3496, 0, 0, 0 },
+ { TX_VEN2_098, 2306, 0, 0, 0 },
+ { TX_VEN4N010, 2960, 0, 0, 0 },
+ { TX_VEN4_016, 3714, 0, 0, 0 },
+ { TX_VEN6N007, 3025, 0, 0, 0 },
+ { TX_VEN7N001, 525, 0, 0, 0 },
+ { TX_VEN7N002, 1071, 0, 0, 0 },
+ { TX_VEN7N003, 928, 0, 0, 0 },
+ { TX_VEN7N004, 1023, 0, 0, 0 },
+ { TX_VEN7N005, 976, 0, 0, 0 },
+ { TX_VEN7N006, 1117, 0, 0, 0 },
+ { TX_VEN7N007, 767, 0, 0, 0 },
+ { TX_VEN7N008, 841, 0, 0, 0 },
+ { TX_VEN7N009, 2161, 0, 0, 0 },
+ { TX_VEN7_001, 1195, 0, 0, 0 },
+ { TX_VEN7_003, 1902, 0, 0, 0 },
+ { TX_VEN7_005, 1320, 0, 0, 0 },
+ { TX_VEN7_006, 1706, 0, 0, 0 },
+ { TX_VEN7_007, 1576, 0, 0, 0 },
+ { TX_VENA_F32, 2536, 0, 0, 0 },
+ { TX_VENA_F34, 2806, 0, 0, 0 },
+ { TX_VENA_F40, 2401, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng7Texts[] = {
diff --git a/engines/startrek/rooms/veng8.cpp b/engines/startrek/rooms/veng8.cpp
index 0dbc058433..4feb703b03 100644
--- a/engines/startrek/rooms/veng8.cpp
+++ b/engines/startrek/rooms/veng8.cpp
@@ -129,75 +129,75 @@ enum veng8TextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets veng8TextOffsets[] = {
- { TX_SPEAKER_KIRK, 7744, 0 },
- { TX_SPEAKER_MCCOY, 7755, 0 },
- { TX_SPEAKER_SPOCK, 7765, 0 },
- { TX_SPEAKER_KIJE, 7779, 0 },
- { TX_BRIDU146, 7146, 0 },
- { TX_MUD4_018, 7077, 0 },
- //{ TX_MUD4_018, 7210, 0 }, // Skip duplicate text
- { TX_VEN2U093, 7278, 0 },
- { TX_VEN2_028, 7385, 0 },
- { TX_VEN2_066, 7463, 0 },
- { TX_VEN2_098, 6273, 0 },
- { TX_VEN4N010, 6927, 0 },
- { TX_VEN5N002, 1314, 0 },
- { TX_VEN5N004, 1369, 0 },
- { TX_VEN6N007, 6992, 0 },
- { TX_VEN8N000, 1449, 0 },
- { TX_VEN8N001, 1254, 0 },
- { TX_VEN8N003, 1079, 0 },
- { TX_VEN8N004, 695, 0 },
- { TX_VEN8N005, 1621, 0 },
- { TX_VEN8N006, 892, 0 },
- { TX_VEN8N007, 990, 0 },
- { TX_VEN8N008, 1173, 0 },
- { TX_VEN8N009, 805, 0 },
- { TX_VEN8N010, 1519, 0 },
- { TX_VEN8_001, 2288, 0 },
- { TX_VEN8_002, 1721, 0 },
- { TX_VEN8_003, 2892, 0 },
- { TX_VEN8_004, 4214, 0 },
- { TX_VEN8_005, 1809, 0 },
- { TX_VEN8_006, 1876, 0 },
- { TX_VEN8_007, 5851, 0 },
- { TX_VEN8_008, 5667, 0 },
- { TX_VEN8_009, 5092, 0 },
- //{ TX_VEN8_009, 3845, 0 }, // Skip duplicate text
- { TX_VEN8_010, 4795, 0 },
- { TX_VEN8_011, 3584, 0 },
- { TX_VEN8_012, 5371, 0 },
- { TX_VEN8_013, 4576, 0 },
- { TX_VEN8_014, 3169, 0 },
- { TX_VEN8_015, 4458, 0 },
- { TX_VEN8_016, 7815, 0 },
- { TX_VEN8_018, 2443, 0 },
- { TX_VEN8_020, 2215, 0 },
- { TX_VEN8_021, 2391, 0 },
- { TX_VEN8_023, 2628, 0 },
- { TX_VEN8_024, 7890, 0 },
- { TX_VEN8_025, 6123, 0 },
- { TX_VEN8_026, 3070, 0 },
- { TX_VEN8_027, 4359, 0 },
- { TX_VEN8_028, 2130, 0 },
- { TX_VEN8_029, 2050, 0 },
- { TX_VEN8_030, 3263, 0 },
- { TX_VEN8_031, 3429, 0 },
- { TX_VEN8_032, 1986, 0 },
- { TX_VEN8_033, 3717, 0 },
- { TX_VEN8_034, 2576, 0 },
- { TX_VEN8_035, 4984, 0 },
- { TX_VEN8_036, 2682, 0 },
- { TX_VEN8_037, 5258, 0 },
- { TX_VEN8_038, 5770, 0 },
- { TX_VEN8_039, 5455, 0 },
- { TX_VEN8_040, 2812, 0 },
- { TX_VEN8_041, 2757, 0 },
- { TX_VEN8_042, 4668, 0 },
- { TX_VENA_F32, 6503, 0 },
- { TX_VENA_F34, 6773, 0 },
- { TX_VENA_F40, 6368, 0 },
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 7744, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 7755, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 7765, 0, 0, 0 },
+ { TX_SPEAKER_KIJE, 7779, 0, 0, 0 },
+ { TX_BRIDU146, 7146, 0, 0, 0 },
+ { TX_MUD4_018, 7077, 0, 0, 0 },
+ //{ TX_MUD4_018, 7210, 0, 0, 0 }, // Skip duplicate text
+ { TX_VEN2U093, 7278, 0, 0, 0 },
+ { TX_VEN2_028, 7385, 0, 0, 0 },
+ { TX_VEN2_066, 7463, 0, 0, 0 },
+ { TX_VEN2_098, 6273, 0, 0, 0 },
+ { TX_VEN4N010, 6927, 0, 0, 0 },
+ { TX_VEN5N002, 1314, 0, 0, 0 },
+ { TX_VEN5N004, 1369, 0, 0, 0 },
+ { TX_VEN6N007, 6992, 0, 0, 0 },
+ { TX_VEN8N000, 1449, 0, 0, 0 },
+ { TX_VEN8N001, 1254, 0, 0, 0 },
+ { TX_VEN8N003, 1079, 0, 0, 0 },
+ { TX_VEN8N004, 695, 0, 0, 0 },
+ { TX_VEN8N005, 1621, 0, 0, 0 },
+ { TX_VEN8N006, 892, 0, 0, 0 },
+ { TX_VEN8N007, 990, 0, 0, 0 },
+ { TX_VEN8N008, 1173, 0, 0, 0 },
+ { TX_VEN8N009, 805, 0, 0, 0 },
+ { TX_VEN8N010, 1519, 0, 0, 0 },
+ { TX_VEN8_001, 2288, 0, 0, 0 },
+ { TX_VEN8_002, 1721, 0, 0, 0 },
+ { TX_VEN8_003, 2892, 0, 0, 0 },
+ { TX_VEN8_004, 4214, 0, 0, 0 },
+ { TX_VEN8_005, 1809, 0, 0, 0 },
+ { TX_VEN8_006, 1876, 0, 0, 0 },
+ { TX_VEN8_007, 5851, 0, 0, 0 },
+ { TX_VEN8_008, 5667, 0, 0, 0 },
+ { TX_VEN8_009, 5092, 0, 0, 0 },
+ //{ TX_VEN8_009, 3845, 0, 0, 0 }, // Skip duplicate text
+ { TX_VEN8_010, 4795, 0, 0, 0 },
+ { TX_VEN8_011, 3584, 0, 0, 0 },
+ { TX_VEN8_012, 5371, 0, 0, 0 },
+ { TX_VEN8_013, 4576, 0, 0, 0 },
+ { TX_VEN8_014, 3169, 0, 0, 0 },
+ { TX_VEN8_015, 4458, 0, 0, 0 },
+ { TX_VEN8_016, 7815, 0, 0, 0 },
+ { TX_VEN8_018, 2443, 0, 0, 0 },
+ { TX_VEN8_020, 2215, 0, 0, 0 },
+ { TX_VEN8_021, 2391, 0, 0, 0 },
+ { TX_VEN8_023, 2628, 0, 0, 0 },
+ { TX_VEN8_024, 7890, 0, 0, 0 },
+ { TX_VEN8_025, 6123, 0, 0, 0 },
+ { TX_VEN8_026, 3070, 0, 0, 0 },
+ { TX_VEN8_027, 4359, 0, 0, 0 },
+ { TX_VEN8_028, 2130, 0, 0, 0 },
+ { TX_VEN8_029, 2050, 0, 0, 0 },
+ { TX_VEN8_030, 3263, 0, 0, 0 },
+ { TX_VEN8_031, 3429, 0, 0, 0 },
+ { TX_VEN8_032, 1986, 0, 0, 0 },
+ { TX_VEN8_033, 3717, 0, 0, 0 },
+ { TX_VEN8_034, 2576, 0, 0, 0 },
+ { TX_VEN8_035, 4984, 0, 0, 0 },
+ { TX_VEN8_036, 2682, 0, 0, 0 },
+ { TX_VEN8_037, 5258, 0, 0, 0 },
+ { TX_VEN8_038, 5770, 0, 0, 0 },
+ { TX_VEN8_039, 5455, 0, 0, 0 },
+ { TX_VEN8_040, 2812, 0, 0, 0 },
+ { TX_VEN8_041, 2757, 0, 0, 0 },
+ { TX_VEN8_042, 4668, 0, 0, 0 },
+ { TX_VENA_F32, 6503, 0, 0, 0 },
+ { TX_VENA_F34, 6773, 0, 0, 0 },
+ { TX_VENA_F40, 6368, 0, 0, 0 },
+ { -1, 0, 0, 0, 0 }
};
extern const RoomText veng8Texts[] = {
diff --git a/engines/startrek/rooms/venga.cpp b/engines/startrek/rooms/venga.cpp
index 04180f2de4..acb029d4b1 100644
--- a/engines/startrek/rooms/venga.cpp
+++ b/engines/startrek/rooms/venga.cpp
@@ -34,27 +34,27 @@ enum vengTextIds {
// TODO: Finish floppy offsets
extern const RoomTextOffsets vengTextOffsets[] = {
- { TX_SPEAKER_KIRK, 6590, 0 },
- { TX_SPEAKER_MCCOY, 6601, 0 },
- { TX_SPEAKER_SPOCK, 6611, 0 },
- { TX_SPEAKER_UHURA, 6672, 0 },
- { TX_SPEAKER_ELASI_CAPTAIN, 6682, 0 },
- { TX_VEN2_098, 5016, 0 },
- { TX_VEN2_028, 6128, 0 },
- { TX_VEN2_066, 6206, 0 },
- { TX_VENA_F32, 5246, 0 },
- { TX_VENA_F34, 5516, 0 },
- { TX_VENA_F40, 5111, 0 },
- { TX_VEN6N007, 5735, 0 },
- { TX_VEN4N010, 5670, 0 },
- { TX_VEN2U093, 6021, 0 },
- { TX_MUD4_018, 5820, 0 },
- { TX_BRIDU146, 5889, 0 },
- //{ TX_DEM3_019, 0, 0 }, // Examining dead guy 1
- //{ TX_VEN4_016, 0, 0 }, // Examining dead guy 2
- //{ TX_G_014, 0, 0 }, // Examining dead guy 3
- { TX_VEN0_016, 8838, 0 }, // Examining dead guy 4
- { -1, 0, 0 }
+ { TX_SPEAKER_KIRK, 6590, 0, 0, 0 },
+ { TX_SPEAKER_MCCOY, 6601, 0, 0, 0 },
+ { TX_SPEAKER_SPOCK, 6611, 0, 0, 0 },
+ { TX_SPEAKER_UHURA, 6672, 0, 0, 0 },
+ { TX_SPEAKER_ELASI_CAPTAIN, 6682, 0, 0, 0 },
+ { TX_VEN2_098, 5016, 0, 0, 0 },
+ { TX_VEN2_028, 6128, 0, 0, 0 },
+ { TX_VEN2_066, 6206, 0, 0, 0 },
+ { TX_VENA_F32, 5246, 0, 0, 0 },
+ { TX_VENA_F34, 5516, 0, 0, 0 },
+ { TX_VENA_F40, 5111, 0, 0, 0 },
+ { TX_VEN6N007, 5735, 0, 0, 0 },
+ { TX_VEN4N010, 5670, 0, 0, 0 },
+ { TX_VEN2U093, 6021, 0, 0, 0 },
+ { TX_MUD4_018, 5820, 0, 0, 0 },
+ { TX_BRIDU146, 5889, 0, 0, 0 },
+ //{ TX_DEM3_019, 0, 0, 0, 0 }, // Examining dead guy 1
+ //{ TX_VEN4_016, 0, 0, 0, 0 }, // Examining dead guy 2
+ //{ TX_G_014, 0, 0, 0, 0 }, // Examining dead guy 3
+ { TX_VEN0_016, 8838, 0, 0, 0 }, // Examining dead guy 4
+ { -1, 0, 0, 0, 0 }
};
void Room::vengaTick() {
diff --git a/engines/startrek/text.h b/engines/startrek/text.h
index d844acf7d0..2a33224aac 100644
--- a/engines/startrek/text.h
+++ b/engines/startrek/text.h
@@ -73,6 +73,8 @@ struct RoomTextOffsets {
int16 id;
uint16 offsetEnglishCD;
uint16 offsetEnglishFloppy;
+ uint16 offsetFrenchCD;
+ uint16 offsetGermanCD;
};
struct RoomText {
More information about the Scummvm-git-logs
mailing list