[Scummvm-git-logs] scummvm master -> 46bc80e7bb16d1cdb62ae7ca8a1778802cabbe9e
dreammaster
noreply at scummvm.org
Mon Aug 3 03:20:43 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
e8aac94a08 MADS: NEBULAR: Added quotes console command
f31cb04b90 MADS: NEBULAR: Janitorial convert quote_load params to decimal
46bc80e7bb MADS: NEBULAR: Demo uses different quote range in room 102
Commit: e8aac94a081bafe453a4d61847129b9ee47ec050
https://github.com/scummvm/scummvm/commit/e8aac94a081bafe453a4d61847129b9ee47ec050
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-03T12:56:59+10:00
Commit Message:
MADS: NEBULAR: Added quotes console command
Assisted-by: Claude Code:claude-opus-4.8
Changed paths:
engines/mads/console.cpp
engines/mads/console.h
diff --git a/engines/mads/console.cpp b/engines/mads/console.cpp
index c765ab60d1e..fd556faf787 100644
--- a/engines/mads/console.cpp
+++ b/engines/mads/console.cpp
@@ -20,6 +20,7 @@
*/
#include "mads/console.h"
+#include "mads/core/env.h"
#include "mads/core/imath.h"
#include "mads/core/kernel.h"
#include "mads/core/matte.h"
@@ -30,6 +31,7 @@ Console::Console() : GUI::Debugger() {
registerCmd("depth", WRAP_METHOD(Console, cmdDepth));
registerCmd("teleport", WRAP_METHOD(Console, cmdTeleport));
registerCmd("walkable", WRAP_METHOD(Console, cmdWalkable));
+ registerCmd("quotes", WRAP_METHOD(Console, cmdQuotes));
}
int strToInt(const char *s) {
@@ -75,6 +77,78 @@ bool Console::cmdTeleport(int argc, const char **argv) {
}
}
+bool Console::cmdQuotes(int argc, const char **argv) {
+ bool showAll = (argc >= 2) && !strcmp(argv[1], "all");
+ int quoteId = -1;
+ if (showAll) {
+ if (argc >= 3)
+ quoteId = strToInt(argv[2]);
+ } else if (argc >= 2) {
+ quoteId = strToInt(argv[1]);
+ }
+
+ bool found = false;
+
+ if (showAll) {
+ // Stream the whole quotes.dat file directly rather than going through
+ // quote_load(): its scratch buffer is sized for a handful of in-scene
+ // quotes, not the whole game's quote table, and it needs the caller to
+ // already know which Ids to ask for. A quote's Id is simply its
+ // 1-based position in the file, so nothing needs to be kept around
+ // afterwards - the stream is closed once we're done reading it.
+ Common::SeekableReadStream *handle = env_open("*quotes.dat", "rb");
+ if (!handle) {
+ debugPrintf("Could not open quotes.dat\n");
+ return true;
+ }
+
+ for (int id = 1; ; ++id) {
+ Common::String quoteStr = handle->readString();
+ if (handle->eos())
+ break;
+
+ if (quoteId == -1) {
+ debugPrintf("%d: %s\n", id, quoteStr.c_str());
+ } else if (id == quoteId) {
+ debugPrintf("%d: %s\n", id, quoteStr.c_str());
+ found = true;
+ break;
+ }
+ }
+
+ delete handle;
+ } else {
+ if (!kernel.quotes) {
+ debugPrintf("No quotes are currently loaded.\n");
+ return true;
+ }
+
+ // A quote list is a run of null-terminated strings, each immediately
+ // followed by a 2-byte quote Id, with the run ending on an empty string.
+ // See quote_string() in core/quote.cpp for the canonical traversal.
+ char *marker, *search;
+ for (marker = kernel.quotes; *marker; marker = search + 2) {
+ for (search = marker; *search; search++)
+ ;
+ search++;
+ int id = *((uint16 *)search);
+
+ if (quoteId == -1) {
+ debugPrintf("%d: %s\n", id, marker);
+ } else if (id == quoteId) {
+ debugPrintf("%d: %s\n", id, marker);
+ found = true;
+ break;
+ }
+ }
+ }
+
+ if (quoteId != -1 && !found)
+ debugPrintf("Quote %d not found.\n", quoteId);
+
+ return true;
+}
+
bool Console::cmdWalkable(int argc, const char **argv) {
const byte *srcP = scr_walk.data - 1;
byte *destP = scr_orig.data;
diff --git a/engines/mads/console.h b/engines/mads/console.h
index 821f6bde226..5b17ae58df1 100644
--- a/engines/mads/console.h
+++ b/engines/mads/console.h
@@ -33,6 +33,7 @@ private:
bool cmdTeleport(int argc, const char **argv);
bool cmdWalkable(int argc, const char **argv);
bool cmdDepth(int argc, const char **argv);
+ bool cmdQuotes(int argc, const char **argv);
public:
Console();
Commit: f31cb04b90669bcd1ad1692fc32c302c62b9a0b1
https://github.com/scummvm/scummvm/commit/f31cb04b90669bcd1ad1692fc32c302c62b9a0b1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-03T13:06:20+10:00
Commit Message:
MADS: NEBULAR: Janitorial convert quote_load params to decimal
Changed paths:
engines/mads/nebular/rooms/room101.cpp
engines/mads/nebular/rooms/room102.cpp
engines/mads/nebular/rooms/room104.cpp
engines/mads/nebular/rooms/room105.cpp
engines/mads/nebular/rooms/room106.cpp
engines/mads/nebular/rooms/room107.cpp
engines/mads/nebular/rooms/room108.cpp
engines/mads/nebular/rooms/room109.cpp
engines/mads/nebular/rooms/room202.cpp
engines/mads/nebular/rooms/room203.cpp
engines/mads/nebular/rooms/room205.cpp
engines/mads/nebular/rooms/room208.cpp
engines/mads/nebular/rooms/room209.cpp
engines/mads/nebular/rooms/room210.cpp
engines/mads/nebular/rooms/room211.cpp
engines/mads/nebular/rooms/room215.cpp
engines/mads/nebular/rooms/room304.cpp
engines/mads/nebular/rooms/room307.cpp
engines/mads/nebular/rooms/room308.cpp
engines/mads/nebular/rooms/room309.cpp
engines/mads/nebular/rooms/room311.cpp
engines/mads/nebular/rooms/room316.cpp
engines/mads/nebular/rooms/room318.cpp
engines/mads/nebular/rooms/room319.cpp
engines/mads/nebular/rooms/room320.cpp
engines/mads/nebular/rooms/room352.cpp
engines/mads/nebular/rooms/room361.cpp
engines/mads/nebular/rooms/room388.cpp
engines/mads/nebular/rooms/room389.cpp
engines/mads/nebular/rooms/room401.cpp
engines/mads/nebular/rooms/room402.cpp
engines/mads/nebular/rooms/room405.cpp
engines/mads/nebular/rooms/room406.cpp
engines/mads/nebular/rooms/room407.cpp
engines/mads/nebular/rooms/room411.cpp
engines/mads/nebular/rooms/room501.cpp
engines/mads/nebular/rooms/room508.cpp
engines/mads/nebular/rooms/room513.cpp
engines/mads/nebular/rooms/room602.cpp
engines/mads/nebular/rooms/room604.cpp
engines/mads/nebular/rooms/room607.cpp
engines/mads/nebular/rooms/room608.cpp
engines/mads/nebular/rooms/room609.cpp
engines/mads/nebular/rooms/room611.cpp
engines/mads/nebular/rooms/room612.cpp
engines/mads/nebular/rooms/room701.cpp
engines/mads/nebular/rooms/room703.cpp
engines/mads/nebular/rooms/room704.cpp
engines/mads/nebular/rooms/room705.cpp
engines/mads/nebular/rooms/room751.cpp
engines/mads/nebular/rooms/room803.cpp
diff --git a/engines/mads/nebular/rooms/room101.cpp b/engines/mads/nebular/rooms/room101.cpp
index 5678ad1aeca..7df56381496 100644
--- a/engines/mads/nebular/rooms/room101.cpp
+++ b/engines/mads/nebular/rooms/room101.cpp
@@ -129,7 +129,7 @@ static void room_101_init() {
kernel_seq_depth(g_sequence_ids[12], 4);
}
- kernel.quotes = quote_load(0x31, 0x32, 0x39, 0x36, 0x37, 0x38, 0);
+ kernel.quotes = quote_load(49, 50, 57, 54, 55, 56, 0);
if (global[kNeedToStandUp]) {
kernel_run_animation(kernel_full_name(101, 'S', -1, "", KERNEL_AA), 71);
diff --git a/engines/mads/nebular/rooms/room102.cpp b/engines/mads/nebular/rooms/room102.cpp
index 9173d61e384..be1414fe63e 100644
--- a/engines/mads/nebular/rooms/room102.cpp
+++ b/engines/mads/nebular/rooms/room102.cpp
@@ -130,7 +130,7 @@ static void room_102_init() {
local._chairDescrFl = false;
local._activeMsgFl = false;
- kernel.quotes = quote_load(0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0);
+ kernel.quotes = quote_load(59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 0);
if (previous_room == 101)
g_engine->_soundManager->command(20, 0);
diff --git a/engines/mads/nebular/rooms/room104.cpp b/engines/mads/nebular/rooms/room104.cpp
index 27449518ea8..0332c7b5a91 100644
--- a/engines/mads/nebular/rooms/room104.cpp
+++ b/engines/mads/nebular/rooms/room104.cpp
@@ -53,7 +53,7 @@ static void room_104_init() {
}
local._loseFl = false;
- kernel.quotes = quote_load(0x35, 0x34, 0);
+ kernel.quotes = quote_load(53, 52, 0);
local._kargShootingFl = false;
if (g_engine->getRandomNumber(1, 3) == 1) {
diff --git a/engines/mads/nebular/rooms/room105.cpp b/engines/mads/nebular/rooms/room105.cpp
index 7b099fb4e11..c0e992f6493 100644
--- a/engines/mads/nebular/rooms/room105.cpp
+++ b/engines/mads/nebular/rooms/room105.cpp
@@ -60,7 +60,7 @@ static void room_105_init() {
player.y = 147;
}
- kernel.quotes = quote_load(0x4A, 0x4B, 0x4C, 0x35, 0x34, 0);
+ kernel.quotes = quote_load(74, 75, 76, 53, 52, 0);
local._explosionFl = false;
section_1_music();
diff --git a/engines/mads/nebular/rooms/room106.cpp b/engines/mads/nebular/rooms/room106.cpp
index 59bb1034a76..e8d637f3c53 100644
--- a/engines/mads/nebular/rooms/room106.cpp
+++ b/engines/mads/nebular/rooms/room106.cpp
@@ -90,7 +90,7 @@ static void room_106_init() {
local._shadowFl = false;
local._firstEmergingFl = false;
- kernel.quotes = quote_load(0x31, 0x32, 0x34, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0);
+ kernel.quotes = quote_load(49, 50, 52, 77, 78, 79, 80, 81, 0);
section_1_music();
}
diff --git a/engines/mads/nebular/rooms/room107.cpp b/engines/mads/nebular/rooms/room107.cpp
index 91a2b449d8b..ca424119723 100644
--- a/engines/mads/nebular/rooms/room107.cpp
+++ b/engines/mads/nebular/rooms/room107.cpp
@@ -80,7 +80,7 @@ static void room_107_init() {
kernel_add_dynamic(words_manta_ray, words_swim_to, 0, g_sequence_ids[0], 0, 0, 0, 0);
}
- kernel.quotes = quote_load(0x4A, 0x4B, 0x4C, 0x35, 0x34, 0);
+ kernel.quotes = quote_load(74, 75, 76, 53, 52, 0);
local._shootingFl = false;
if (g_engine->getRandomNumber(1, 3) == 1) {
diff --git a/engines/mads/nebular/rooms/room108.cpp b/engines/mads/nebular/rooms/room108.cpp
index dd6f606b82c..167d2fb747e 100644
--- a/engines/mads/nebular/rooms/room108.cpp
+++ b/engines/mads/nebular/rooms/room108.cpp
@@ -64,7 +64,7 @@ static void room_108_init() {
player.y = 98;
}
- kernel.quotes = quote_load(0x4A, 0x4B, 0x4C, 0x35, 0x34, 0);
+ kernel.quotes = quote_load(74, 75, 76, 53, 52, 0);
section_1_music();
}
diff --git a/engines/mads/nebular/rooms/room109.cpp b/engines/mads/nebular/rooms/room109.cpp
index 98b08c1a849..f716bc876f7 100644
--- a/engines/mads/nebular/rooms/room109.cpp
+++ b/engines/mads/nebular/rooms/room109.cpp
@@ -106,7 +106,7 @@ static void room_109_init() {
pal_change_color(252, 50, 50, 63);
pal_change_color(253, 30, 30, 50);
- kernel.quotes = quote_load(0x53, 0x52, 0x54, 0x55, 0x56, 0x57, 0x58, 0);
+ kernel.quotes = quote_load(83, 82, 84, 85, 86, 87, 88, 0);
local._eatingFirstFish = (!player.been_here_before) && (previous_room < 110);
if (local._eatingFirstFish) {
diff --git a/engines/mads/nebular/rooms/room202.cpp b/engines/mads/nebular/rooms/room202.cpp
index f9a526ff4c7..972b1f061e2 100644
--- a/engines/mads/nebular/rooms/room202.cpp
+++ b/engines/mads/nebular/rooms/room202.cpp
@@ -109,7 +109,7 @@ static void room_202_init() {
kernel_dynamic_walk(idx, 246, 124, FACING_NORTH);
}
- kernel.quotes = quote_load(0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x62, 0x63, 0x64, 0x65, 0x66, 0x61, 0);
+ kernel.quotes = quote_load(92, 93, 94, 95, 96, 98, 99, 100, 101, 102, 97, 0);
local._activeMsgFl = false;
if (previous_room == KERNEL_RESTORING_GAME) {
diff --git a/engines/mads/nebular/rooms/room203.cpp b/engines/mads/nebular/rooms/room203.cpp
index 874f996ffa6..0ef82c896b1 100644
--- a/engines/mads/nebular/rooms/room203.cpp
+++ b/engines/mads/nebular/rooms/room203.cpp
@@ -76,7 +76,7 @@ static void room_203_init() {
}
}
- kernel.quotes = quote_load(0x67, 0x68, 0x69, 0x6A, 0x5A, 0);
+ kernel.quotes = quote_load(103, 104, 105, 106, 90, 0);
if (local._rhotundaEatFl) {
kernel_message_add(quote_string(kernel.quotes, g_engine->getRandomNumber(103, 106)), 0, 0, 0x1110, 120, 0, 34);
diff --git a/engines/mads/nebular/rooms/room205.cpp b/engines/mads/nebular/rooms/room205.cpp
index 6ec8522856a..ce32e9da937 100644
--- a/engines/mads/nebular/rooms/room205.cpp
+++ b/engines/mads/nebular/rooms/room205.cpp
@@ -80,8 +80,8 @@ static void room_205_init() {
}
local._beingKicked = false;
- kernel.quotes = quote_load(0x6B, 0x70, 0x71, 0x72, 0x5A, 0x74, 0x75, 0x76, 0x77, 0x78, 0x73, 0x79, 0x7A, 0x7B, 0x7C,
- 0x7D, 0x7E, 0x7F, 0x80, 0xAC, 0xAD, 0xAE, 0x6C, 0x6D, 0x6E, 0x6F, 0x2, 0);
+ kernel.quotes = quote_load(107, 112, 113, 114, 90, 116, 117, 118, 119, 120, 115, 121, 122, 123, 124,
+ 125, 126, 127, 128, 172, 173, 174, 108, 109, 110, 111, 2, 0);
local._dialog1.setup(0x2A, 0x5A, 0x78, 0x74, 0x75, 0x76, 0x77, 0);
if (!player.been_here_before)
diff --git a/engines/mads/nebular/rooms/room208.cpp b/engines/mads/nebular/rooms/room208.cpp
index 209cfbfd657..2da2f813be0 100644
--- a/engines/mads/nebular/rooms/room208.cpp
+++ b/engines/mads/nebular/rooms/room208.cpp
@@ -107,7 +107,7 @@ static void room_208_init() {
player.facing = FACING_NORTH;
}
- kernel.quotes = quote_load(0x81, 0x46, 0);
+ kernel.quotes = quote_load(129, 70, 0);
if ((previous_room == 207) && (global[kMonkeyStatus] == MONKEY_HAS_BINOCULARS)) {
int msgIndex = kernel_message_add(quote_string(kernel.quotes, 129), 0, 0, 0x1110, 120, 0, 34);
diff --git a/engines/mads/nebular/rooms/room209.cpp b/engines/mads/nebular/rooms/room209.cpp
index d1e87995995..274f77083ec 100644
--- a/engines/mads/nebular/rooms/room209.cpp
+++ b/engines/mads/nebular/rooms/room209.cpp
@@ -980,8 +980,8 @@ static void room_209_init() {
g_sprite_ids[6] = kernel_load_series(kernel_name('m', 6), 0);
g_sprite_ids[7] = kernel_load_series(kernel_name('m', 8), 0);
- kernel.quotes = quote_load(0x82, 0x83, 0x84, 0x9C, 0x97, 0x95, 0x99, 0x9E, 0x98, 0x9B, 0xA0, 0x96, 0x9F,
- 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x91, 0x92, 0x93, 0x94, 0x89, 0x85, 0x8A, 0x86, 0x87, 0x88, 0);
+ kernel.quotes = quote_load(130, 131, 132, 156, 151, 149, 153, 158, 152, 155, 160, 150, 159,
+ 139, 140, 141, 142, 143, 145, 146, 147, 148, 137, 133, 138, 134, 135, 136, 0);
pal_change_color(252, 63, 44, 30);
pal_change_color(253, 63, 20, 22);
diff --git a/engines/mads/nebular/rooms/room210.cpp b/engines/mads/nebular/rooms/room210.cpp
index eb169d05d1a..180cf45af7e 100644
--- a/engines/mads/nebular/rooms/room210.cpp
+++ b/engines/mads/nebular/rooms/room210.cpp
@@ -344,7 +344,7 @@ static void setDialogNode(int node) {
kernel_dump_all();
g_sprite_ids[1] = kernel_load_series(kernel_name('c', -1), 0);
- kernel.quotes = quote_load(0xE6, 0xE9, 0xEA, 0xE7, 0xE8, 0);
+ kernel.quotes = quote_load(230, 233, 234, 231, 232, 0);
kernel_run_animation(kernel_name('B', -1), 4);
break;
@@ -642,10 +642,10 @@ static void room_210_init() {
kernel_dynamic_cursor(local._doorway, CURSOR_UP);
}
- kernel.quotes = quote_load(0x5A, 0x73, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB8, 0xB7,
- 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA,
- 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC,
- 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0);
+ kernel.quotes = quote_load(90, 115, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 184, 183,
+ 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202,
+ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220,
+ 221, 222, 223, 224, 225, 226, 227, 228, 229, 0);
local._conv1.setup(0x2E, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0);
diff --git a/engines/mads/nebular/rooms/room211.cpp b/engines/mads/nebular/rooms/room211.cpp
index 80edfc6d54b..cebd774345a 100644
--- a/engines/mads/nebular/rooms/room211.cpp
+++ b/engines/mads/nebular/rooms/room211.cpp
@@ -79,7 +79,7 @@ static void room_211_init() {
pal_change_color(252, 63, 44, 30);
pal_change_color(253, 63, 20, 22);
- kernel.quotes = quote_load(0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 1, 0);
+ kernel.quotes = quote_load(161, 162, 163, 164, 165, 166, 167, 168, 151, 152, 153, 154, 155, 156, 157, 158, 1, 0);
if (global[kMonkeyStatus] == MONKEY_AMBUSH_READY)
kernel_random_messages_init(2, 0, 54, 0, 30, 13, 2, 0xFDFC, 60, 151, 152, 153, 154, 0);
diff --git a/engines/mads/nebular/rooms/room215.cpp b/engines/mads/nebular/rooms/room215.cpp
index 63e4a14d9a3..964e14b0b56 100644
--- a/engines/mads/nebular/rooms/room215.cpp
+++ b/engines/mads/nebular/rooms/room215.cpp
@@ -57,7 +57,7 @@ static void room_215_init() {
player.facing = FACING_NORTH;
}
- kernel.quotes = quote_load(0xA9, 0xAA, 0);
+ kernel.quotes = quote_load(169, 170, 0);
section_2_music();
}
diff --git a/engines/mads/nebular/rooms/room304.cpp b/engines/mads/nebular/rooms/room304.cpp
index 02d1adcca90..98648d1749b 100644
--- a/engines/mads/nebular/rooms/room304.cpp
+++ b/engines/mads/nebular/rooms/room304.cpp
@@ -72,7 +72,7 @@ static void room_304_init() {
}
section_3_music();
- kernel.quotes = quote_load(0xEB, 0xEC, 0);
+ kernel.quotes = quote_load(235, 236, 0);
}
static void room_304_daemon() {
diff --git a/engines/mads/nebular/rooms/room307.cpp b/engines/mads/nebular/rooms/room307.cpp
index 2c5fca19612..6de16ac810d 100644
--- a/engines/mads/nebular/rooms/room307.cpp
+++ b/engines/mads/nebular/rooms/room307.cpp
@@ -292,13 +292,13 @@ static void room_307_init() {
kernel_load_variant(1);
- kernel.quotes = quote_load(0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0x10C, 0x104, 0x106, 0x107, 0x108, 0x105,
- 0x109, 0x10A, 0x10B, 0x10D, 0x10E, 0x10F, 0x110, 0x111, 0x112, 0x113, 0x114, 0x115, 0x116, 0x117,
- 0x118, 0x119, 0x11A, 0x11B, 0x11C, 0x11D, 0x11E, 0x11F, 0x120, 0x121, 0x122, 0x123, 0x124, 0x125,
- 0x126, 0x127, 0x128, 0x129, 0x12A, 0x12B, 0x12C, 0x12D, 0x12E, 0x12F, 0x130, 0x131, 0x132, 0x133,
- 0x134, 0x135, 0x136, 0x137, 0x138, 0x139, 0x13A, 0x13B, 0x13C, 0x13D, 0x13E, 0x13F, 0x140, 0x141,
- 0x142, 0x143, 0x144, 0x145, 0x146, 0x147, 0x148, 0x149, 0x14A, 0x14B, 0x14C, 0x14D, 0x14E, 0x14F,
- 0x150, 0x151, 0x152, 0x153, 0);
+ kernel.quotes = quote_load(237, 238, 239, 240, 241, 242, 243, 268, 260, 262, 263, 264, 261,
+ 265, 266, 267, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+ 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
+ 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335,
+ 336, 337, 338, 339, 0);
local._dialog1.setup(0x3F, 0x113, 0x114, 0x115, -1);
local._dialog2.setup(0x40, 0x11A, 0x11B, 0x11C, 0x11D, 0x11E, 0x11F, 0x120, 0x121, 0x122, 0);
diff --git a/engines/mads/nebular/rooms/room308.cpp b/engines/mads/nebular/rooms/room308.cpp
index ffce4a66869..cbf8883bdef 100644
--- a/engines/mads/nebular/rooms/room308.cpp
+++ b/engines/mads/nebular/rooms/room308.cpp
@@ -64,7 +64,7 @@ static void room_308_init() {
kernel_run_animation(kernel_name('a', -1), 60);
section_3_music();
- kernel.quotes = quote_load(0xF4, 0xF5, 0xF6, 0);
+ kernel.quotes = quote_load(244, 245, 246, 0);
}
static void room_308_daemon() {
diff --git a/engines/mads/nebular/rooms/room309.cpp b/engines/mads/nebular/rooms/room309.cpp
index 4726ddddd9c..e6820770af6 100644
--- a/engines/mads/nebular/rooms/room309.cpp
+++ b/engines/mads/nebular/rooms/room309.cpp
@@ -82,7 +82,7 @@ static void room_309_init() {
section_3_music();
- kernel.quotes = quote_load(0xF7, 0xF8, 0xF9, 0x15C, 0x15D, 0x15E, 0);
+ kernel.quotes = quote_load(247, 248, 249, 348, 349, 350, 0);
}
static void room_309_daemon() {
diff --git a/engines/mads/nebular/rooms/room311.cpp b/engines/mads/nebular/rooms/room311.cpp
index 31d3e2297fe..f23342d24f8 100644
--- a/engines/mads/nebular/rooms/room311.cpp
+++ b/engines/mads/nebular/rooms/room311.cpp
@@ -47,7 +47,7 @@ static void room_311_init() {
kernel_seq_depth(g_sequence_ids[1], 15);
local._checkGuardFl = false;
- kernel.quotes = quote_load(0xFA, 0);
+ kernel.quotes = quote_load(250, 0);
if (previous_room == 391) {
global[kSexOfRex] = REX_MALE;
diff --git a/engines/mads/nebular/rooms/room316.cpp b/engines/mads/nebular/rooms/room316.cpp
index 2f1f6d3b32b..46180e922e0 100644
--- a/engines/mads/nebular/rooms/room316.cpp
+++ b/engines/mads/nebular/rooms/room316.cpp
@@ -306,7 +306,7 @@ static void room_316_init() {
}
section_3_music();
- kernel.quotes = quote_load(0xFD, 0);
+ kernel.quotes = quote_load(253, 0);
}
static void room_316_daemon() {
diff --git a/engines/mads/nebular/rooms/room318.cpp b/engines/mads/nebular/rooms/room318.cpp
index 6f3ac3c6abf..2045377fe8d 100644
--- a/engines/mads/nebular/rooms/room318.cpp
+++ b/engines/mads/nebular/rooms/room318.cpp
@@ -261,13 +261,13 @@ static void room_318_init() {
local._explosionFl = false;
}
- kernel.quotes = quote_load(0x18C, 0x18D, 0x18E, 0x18F, 0x191, 0x192, 0x193, 0x194, 0x195, 0x196,
- 0x197, 0x198, 0x199, 0x19A, 0x19B, 0x19C, 0x19E, 0x19F, 0x1A0, 0x1A1, 0x1A2, 0x1A3,
- 0x1A4, 0x1A5, 0x1A6, 0x1A7, 0x1A8, 0x1A9, 0x1AA, 0x1AB, 0x1AC, 0x1AD, 0x1AE, 0x1AF,
- 0x1B0, 0x1B1, 0x1B2, 0x1B3, 0x1B4, 0x1B5, 0x1B6, 0x1B7, 0x1B8, 0x1B9, 0x1BA, 0x1BB,
- 0x1BC, 0x1BD, 0x1BE, 0x1BF, 0x1C0, 0x1C1, 0x1C2, 0x1C3, 0x1C4, 0x1C5, 0x1C6, 0x1C7,
- 0x1C8, 0x1C9, 0x1CA, 0x1CB, 0x1CC, 0x1CD, 0x1CE, 0x1CF, 0x1D0, 0x1D1, 0x1D2, 0x1D3,
- 0x190, 0x19D, 0);
+ kernel.quotes = quote_load(396, 397, 398, 399, 401, 402, 403, 404, 405, 406,
+ 407, 408, 409, 410, 411, 412, 414, 415, 416, 417, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+ 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443,
+ 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455,
+ 456, 457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467,
+ 400, 413, 0);
if ((previous_room == KERNEL_RESTORING_GAME) || (((previous_room == 318) ||
(previous_room == KERNEL_STARTING_GAME)) && (!global[kAfterHavoc]))) {
diff --git a/engines/mads/nebular/rooms/room319.cpp b/engines/mads/nebular/rooms/room319.cpp
index aac1a69ce1c..1004b06ea17 100644
--- a/engines/mads/nebular/rooms/room319.cpp
+++ b/engines/mads/nebular/rooms/room319.cpp
@@ -112,11 +112,11 @@ static void room_319_init() {
local._dialog3.set(0x17D, 0x17E, 0x17F, 0x180, 0);
}
- kernel.quotes = quote_load(0x15F, 0x160, 0x161, 0x162, 0x163, 0x164, 0x16B, 0x16C, 0x16D,
- 0x16E, 0x16F, 0x170, 0x177, 0x178, 0x179, 0x17A, 0x17B, 0x17C, 0x165, 0x166,
- 0x167, 0x168, 0x169, 0x16A, 0x171, 0x172, 0x173, 0x174, 0x175, 0x176, 0x17D,
- 0x17E, 0x17F, 0x180, 0x181, 0x182, 0x183, 0x184, 0x185, 0x186, 0x187, 0x188,
- 0x189, 0x18A, 0x18B, 0);
+ kernel.quotes = quote_load(351, 352, 353, 354, 355, 356, 363, 364, 365,
+ 366, 367, 368, 375, 376, 377, 378, 379, 380, 357, 358,
+ 359, 360, 361, 362, 369, 370, 371, 372, 373, 374, 381,
+ 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392,
+ 393, 394, 395, 0);
pal_change_color(252, 63, 30, 2);
pal_change_color(253, 45, 15, 1);
diff --git a/engines/mads/nebular/rooms/room320.cpp b/engines/mads/nebular/rooms/room320.cpp
index 424dac9471e..1690011feb0 100644
--- a/engines/mads/nebular/rooms/room320.cpp
+++ b/engines/mads/nebular/rooms/room320.cpp
@@ -295,7 +295,7 @@ static void room_320_parser() {
g_sprite_ids[9] = kernel_load_series(kernel_name('m', 9), 0);
local._blinkFl = false;
setLeftView(2);
- kernel.quotes = quote_load(0xFE, 0);
+ kernel.quotes = quote_load(254, 0);
kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
kernel_run_animation(kernel_name('a', -1), 70);
g_engine->_soundManager->command(17, 0);
diff --git a/engines/mads/nebular/rooms/room352.cpp b/engines/mads/nebular/rooms/room352.cpp
index 816eef457cc..60ea22befb5 100644
--- a/engines/mads/nebular/rooms/room352.cpp
+++ b/engines/mads/nebular/rooms/room352.cpp
@@ -183,7 +183,7 @@ static void room_352_init() {
section_3_music();
- kernel.quotes = quote_load(0xFF, 0x100, 0x101, 0x102, 0x103, 0);
+ kernel.quotes = quote_load(255, 256, 257, 258, 259, 0);
}
static void room_352_pre_parser() {
diff --git a/engines/mads/nebular/rooms/room361.cpp b/engines/mads/nebular/rooms/room361.cpp
index 07102497f61..b23a9f12b32 100644
--- a/engines/mads/nebular/rooms/room361.cpp
+++ b/engines/mads/nebular/rooms/room361.cpp
@@ -265,7 +265,7 @@ static void room_361_init() {
player.y = 145;
}
- kernel.quotes = quote_load(0xFB, 0xFC, 0);
+ kernel.quotes = quote_load(251, 252, 0);
if (previous_room == 320)
kernel_message_teletype(kernel_message_player(0xFB, 0x78, 0), 4, true);
diff --git a/engines/mads/nebular/rooms/room388.cpp b/engines/mads/nebular/rooms/room388.cpp
index aa9796a898d..02882dd0e83 100644
--- a/engines/mads/nebular/rooms/room388.cpp
+++ b/engines/mads/nebular/rooms/room388.cpp
@@ -44,7 +44,7 @@ static void room_388_init() {
player.walker_visible = false;
pal_change_color(252, 63, 30, 20);
pal_change_color(253, 45, 15, 12);
- kernel.quotes = quote_load(0x154, 0x155, 0x156, 0x157, 0x158, 0);
+ kernel.quotes = quote_load(340, 341, 342, 343, 344, 0);
section_3_music();
}
diff --git a/engines/mads/nebular/rooms/room389.cpp b/engines/mads/nebular/rooms/room389.cpp
index beaadd1655a..a6e97672597 100644
--- a/engines/mads/nebular/rooms/room389.cpp
+++ b/engines/mads/nebular/rooms/room389.cpp
@@ -57,7 +57,7 @@ static void room_389_init() {
pal_change_color(252, 63, 37, 26);
pal_change_color(253, 45, 24, 17);
player.walker_visible = false;
- kernel.quotes = quote_load(0xF7, 0xF8, 0xF9, 0x159, 0x15A, 0x15B, 0);
+ kernel.quotes = quote_load(247, 248, 249, 345, 346, 347, 0);
section_3_music();
}
diff --git a/engines/mads/nebular/rooms/room401.cpp b/engines/mads/nebular/rooms/room401.cpp
index c411a5a4f61..41babec3f4e 100644
--- a/engines/mads/nebular/rooms/room401.cpp
+++ b/engines/mads/nebular/rooms/room401.cpp
@@ -62,7 +62,7 @@ static void room_401_init() {
player.facing = FACING_NORTH;
}
- kernel.quotes = quote_load(0x1D4, 0);
+ kernel.quotes = quote_load(468, 0);
section_4_music();
}
diff --git a/engines/mads/nebular/rooms/room402.cpp b/engines/mads/nebular/rooms/room402.cpp
index 6dd53abdcc5..39995711d74 100644
--- a/engines/mads/nebular/rooms/room402.cpp
+++ b/engines/mads/nebular/rooms/room402.cpp
@@ -480,12 +480,12 @@ static void room_402_init() {
local._conversationFl = false;
}
- kernel.quotes = quote_load(0x1D7, 0x1D8, 0x1D9, 0x1DA, 0x1DB, 0x1DC, 0x1DD, 0x1DE, 0x1DF, 0x1E2, 0x1E3, 0x1E6, 0x1E5, 0x1E7,
- 0x1E8, 0x1E9, 0x1EA, 0x1EF, 0x1F0, 0x1F1, 0x1F2, 0x1F3, 0x1F4, 0x1F5, 0x1F6, 0x1F7, 0x1F8, 0x1F9, 0x1FA, 0x1FB,
- 0x1FC, 0x1EB, 0x1EC, 0x1ED, 0x1EE, 0x1E4, 0x1FD, 0x1E0, 0x1E1, 0x1FE, 0x1FF, 0x200, 0x201, 0x202, 0x203, 0x204,
- 0x205, 0x206, 0x207, 0x208, 0x209, 0x20A, 0x20B, 0x20C, 0x20F, 0x20D, 0x20E, 0x210, 0x211, 0x212, 0x213, 0x214,
- 0x215, 0x237, 0x216, 0x219, 0x21A, 0x21B, 0x21C, 0x21D, 0x220, 0x223, 0x224, 0x227, 0x22A, 0x22D, 0x230, 0x233,
- 0x234, 0x235, 0x236, 0x238, 0x239, 0x23A, 0x23D, 0x23E, 0x23F, 0);
+ kernel.quotes = quote_load(471, 472, 473, 474, 475, 476, 477, 478, 479, 482, 483, 486, 485, 487,
+ 488, 489, 490, 495, 496, 497, 498, 499, 500, 501, 502, 503, 504, 505, 506, 507,
+ 508, 491, 492, 493, 494, 484, 509, 480, 481, 510, 511, 512, 513, 514, 515, 516,
+ 517, 518, 519, 520, 521, 522, 523, 524, 527, 525, 526, 528, 529, 530, 531, 532,
+ 533, 567, 534, 537, 538, 539, 540, 541, 544, 547, 548, 551, 554, 557, 560, 563,
+ 564, 565, 566, 568, 569, 570, 573, 574, 575, 0);
pal_change_color(250, 47, 41, 40);
pal_change_color(251, 50, 63, 55);
diff --git a/engines/mads/nebular/rooms/room405.cpp b/engines/mads/nebular/rooms/room405.cpp
index a7f343872a9..5e3c74273b0 100644
--- a/engines/mads/nebular/rooms/room405.cpp
+++ b/engines/mads/nebular/rooms/room405.cpp
@@ -67,7 +67,7 @@ static void room_405_init() {
inter_give_to_player(OBJ_SECURITY_CARD);
}
- kernel.quotes = quote_load(0x24F, 0);
+ kernel.quotes = quote_load(591, 0);
section_4_music();
}
diff --git a/engines/mads/nebular/rooms/room406.cpp b/engines/mads/nebular/rooms/room406.cpp
index 6d86c43584f..9c9d256d290 100644
--- a/engines/mads/nebular/rooms/room406.cpp
+++ b/engines/mads/nebular/rooms/room406.cpp
@@ -83,7 +83,7 @@ static void room_406_init() {
g_engine->_soundManager->command(19, 0);
}
- kernel.quotes = quote_load(0x24F, 0);
+ kernel.quotes = quote_load(591, 0);
local._hitStorageDoor = false;
section_4_music();
}
diff --git a/engines/mads/nebular/rooms/room407.cpp b/engines/mads/nebular/rooms/room407.cpp
index 6af99e03e4a..f8d45292375 100644
--- a/engines/mads/nebular/rooms/room407.cpp
+++ b/engines/mads/nebular/rooms/room407.cpp
@@ -54,7 +54,7 @@ static void room_407_init() {
player.facing = FACING_NORTH;
}
- kernel.quotes = quote_load(0x250, 0);
+ kernel.quotes = quote_load(592, 0);
section_4_music();
}
diff --git a/engines/mads/nebular/rooms/room411.cpp b/engines/mads/nebular/rooms/room411.cpp
index b0599be48b2..e6fa6622425 100644
--- a/engines/mads/nebular/rooms/room411.cpp
+++ b/engines/mads/nebular/rooms/room411.cpp
@@ -316,9 +316,9 @@ static void room_411_init() {
g_sequence_ids[1] = kernel_seq_forward(g_sprite_ids[1], false, 5, 0, 0, 0);
g_sequence_ids[2] = kernel_seq_forward(g_sprite_ids[2], false, 50, 0, 0, 0);
- kernel.quotes = quote_load(0x252, 0x25E, 0x25A, 0x256, 0x253, 0x25F, 0x25B, 0x257, 0x254, 0x260, 0x25C, 0x258, 0x255,
- 0x261, 0x25D, 0x259, 0x262, 0x267, 0x263, 0x26B, 0x26F, 0x268, 0x264, 0x26C, 0x270, 0x26A, 0x266, 0x26E,
- 0x272, 0x269, 0x265, 0x26D, 0x271, 0);
+ kernel.quotes = quote_load(594, 606, 602, 598, 595, 607, 603, 599, 596, 608, 604, 600, 597,
+ 609, 605, 601, 610, 615, 611, 619, 623, 616, 612, 620, 624, 618, 614, 622,
+ 626, 617, 613, 621, 625, 0);
local._dialog1.setup(0x5B, 0x252, 0x25E, 0x25A, 0x256, 0x262, -1);
local._dialog2.setup(0x5C, 0x253, 0x25F, 0x25B, 0x257, 0x262, -1);
diff --git a/engines/mads/nebular/rooms/room501.cpp b/engines/mads/nebular/rooms/room501.cpp
index 10ffee1e928..74006dddf37 100644
--- a/engines/mads/nebular/rooms/room501.cpp
+++ b/engines/mads/nebular/rooms/room501.cpp
@@ -138,7 +138,7 @@ static void room_501_init() {
}
section_5_music();
- kernel.quotes = quote_load(0x275, 0x276, 0x277, 0);
+ kernel.quotes = quote_load(629, 630, 631, 0);
if (!player.been_here_before)
kernel_timing_trigger(2, 90);
diff --git a/engines/mads/nebular/rooms/room508.cpp b/engines/mads/nebular/rooms/room508.cpp
index d90cc1c17a6..d29b7621ca1 100644
--- a/engines/mads/nebular/rooms/room508.cpp
+++ b/engines/mads/nebular/rooms/room508.cpp
@@ -91,7 +91,7 @@ static void room_508_init() {
}
section_5_music();
- kernel.quotes = quote_load(0x273, 0);
+ kernel.quotes = quote_load(627, 0);
if (kernel.teleported_in) {
inter_give_to_player(OBJ_COMPACT_CASE);
diff --git a/engines/mads/nebular/rooms/room513.cpp b/engines/mads/nebular/rooms/room513.cpp
index 479f60cc36f..180a9c716d0 100644
--- a/engines/mads/nebular/rooms/room513.cpp
+++ b/engines/mads/nebular/rooms/room513.cpp
@@ -66,7 +66,7 @@ static void room_513_init() {
if (kernel.teleported_in)
inter_give_to_player(OBJ_SECURITY_CARD);
- kernel.quotes = quote_load(0x278, 0);
+ kernel.quotes = quote_load(632, 0);
}
static void room_513_daemon() {
diff --git a/engines/mads/nebular/rooms/room602.cpp b/engines/mads/nebular/rooms/room602.cpp
index d63cbeb65c5..47de8ccdc3b 100644
--- a/engines/mads/nebular/rooms/room602.cpp
+++ b/engines/mads/nebular/rooms/room602.cpp
@@ -101,7 +101,7 @@ static void room_602_init() {
}
section_6_music();
- kernel.quotes = quote_load(0x2F1, 0x2F2, 0x2F3, 0);
+ kernel.quotes = quote_load(753, 754, 755, 0);
if (kernel.teleported_in) {
inter_give_to_player(OBJ_NOTE);
diff --git a/engines/mads/nebular/rooms/room604.cpp b/engines/mads/nebular/rooms/room604.cpp
index 6e241d7d414..d47d4971aa7 100644
--- a/engines/mads/nebular/rooms/room604.cpp
+++ b/engines/mads/nebular/rooms/room604.cpp
@@ -82,7 +82,7 @@ static void room_604_init() {
local._monsterActive = false;
section_6_music();
- kernel.quotes = quote_load(0x2E7, 0x2E8, 0x2E9, 0x2EA, 0x2EB, 0x2EC, 0x2ED, 0x2EE, 0x2EF, 0x2F0, 0);
+ kernel.quotes = quote_load(743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 0);
}
static void room_604_daemon() {
diff --git a/engines/mads/nebular/rooms/room607.cpp b/engines/mads/nebular/rooms/room607.cpp
index d74e6082430..49736a929b5 100644
--- a/engines/mads/nebular/rooms/room607.cpp
+++ b/engines/mads/nebular/rooms/room607.cpp
@@ -104,7 +104,7 @@ static void room_607_init() {
pal_change_color(252, 63, 44, 30);
pal_change_color(253, 63, 20, 22);
- kernel.quotes = quote_load(0x2F8, 0x2F7, 0x2F6, 0x2F9, 0x2FA, 0);
+ kernel.quotes = quote_load(760, 759, 758, 761, 762, 0);
}
static void room_607_daemon() {
diff --git a/engines/mads/nebular/rooms/room608.cpp b/engines/mads/nebular/rooms/room608.cpp
index 0e1d2b2129b..c1edf5b1434 100644
--- a/engines/mads/nebular/rooms/room608.cpp
+++ b/engines/mads/nebular/rooms/room608.cpp
@@ -301,7 +301,7 @@ static void room_608_init() {
if (kernel.teleported_in)
inter_give_to_player(OBJ_BONES);
- kernel.quotes = quote_load(0x2FB, 0x2FC, 0x2FE, 0x2FD, 0x2FF, 0x300, 0x301, 0x302, 0x303, 0x304, 0);
+ kernel.quotes = quote_load(763, 764, 766, 765, 767, 768, 769, 770, 771, 772, 0);
}
static void room_608_daemon() {
diff --git a/engines/mads/nebular/rooms/room609.cpp b/engines/mads/nebular/rooms/room609.cpp
index 4038ddbbf65..f9835b926d0 100644
--- a/engines/mads/nebular/rooms/room609.cpp
+++ b/engines/mads/nebular/rooms/room609.cpp
@@ -82,7 +82,7 @@ static void room_609_init() {
}
section_6_music();
- kernel.quotes = quote_load(0x305, 0x306, 0x307, 0x308, 0x309, 0);
+ kernel.quotes = quote_load(773, 774, 775, 776, 777, 0);
}
static void room_609_daemon() {
diff --git a/engines/mads/nebular/rooms/room611.cpp b/engines/mads/nebular/rooms/room611.cpp
index 26c8e254b86..fdfd59c904e 100644
--- a/engines/mads/nebular/rooms/room611.cpp
+++ b/engines/mads/nebular/rooms/room611.cpp
@@ -907,15 +907,15 @@ static void room_611_init() {
g_sprite_ids[2] = kernel_load_series(kernel_name('x', 1), 0);
g_sprite_ids[3] = kernel_load_series("*RXMRC_9", 0);
- kernel.quotes = quote_load(0x279, 0x27A, 0x27B, 0x27C, 0x27D, 0x27E, 0x27F, 0x280, 0x281, 0x282, 0x283, 0x284,
- 0x285, 0x286, 0x287, 0x288, 0x289, 0x28A, 0x28B, 0x28C, 0x28D, 0x28E, 0x28F, 0x290, 0x291, 0x292,
- 0x293, 0x294, 0x295, 0x296, 0x297, 0x298, 0x299, 0x29A, 0x29B, 0x29C, 0x29D, 0x29E, 0x29F, 0x2A0,
- 0x2A1, 0x2A2, 0x2A3, 0x2A4, 0x2A5, 0x2A6, 0x2A7, 0x2A8, 0x2A9, 0x2AA, 0x2AB, 0x2AC, 0x2AD, 0x2AE,
- 0x2AF, 0x2B0, 0x2B1, 0x2B2, 0x2B3, 0x2B4, 0x2B5, 0x2B6, 0x2B7, 0x2B8, 0x2B9, 0x2BA, 0x2BB, 0x2BC,
- 0x2BD, 0x2BE, 0x2BF, 0x2C0, 0x2C1, 0x2C2, 0x2C3, 0x2C4, 0x2C5, 0x2C6, 0x2C7, 0x2C8, 0x2C9, 0x2CA,
- 0x2CB, 0x2CC, 0x2CD, 0x2CE, 0x2CF, 0x2D0, 0x2D1, 0x2D2, 0x2D3, 0x2D4, 0x2D5, 0x2D6, 0x2D7, 0x2D8,
- 0x2D9, 0x2DA, 0x2DB, 0x2DC, 0x2DD, 0x2DE, 0x2DF, 0x2E0, 0x2E1, 0x2E2, 0x2E3, 0x2E4, 0x2E5, 0x2E6,
- 0x323, 0x324, 0);
+ kernel.quotes = quote_load(633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644,
+ 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658,
+ 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672,
+ 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686,
+ 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700,
+ 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714,
+ 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 727, 728,
+ 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742,
+ 803, 804, 0);
local._dialog1.setup(kConvHermit1, 0x287, 0x288, 0x289, 0x28A, 0x28B, 0x28C, 0x28D, 0x28E, 0x28F, 0x290,
0x291, 0x292, 0x293, 0x294, 0x295, 0x296, 0);
diff --git a/engines/mads/nebular/rooms/room612.cpp b/engines/mads/nebular/rooms/room612.cpp
index 7629d24d66d..5ee9a4eeaa0 100644
--- a/engines/mads/nebular/rooms/room612.cpp
+++ b/engines/mads/nebular/rooms/room612.cpp
@@ -130,7 +130,7 @@ static void room_612_init() {
if (kernel.teleported_in)
inter_give_to_player(OBJ_PADLOCK_KEY);
- kernel.quotes = quote_load(0x2F5, 0x2F4, 0);
+ kernel.quotes = quote_load(757, 756, 0);
}
static void room_612_daemon() {
diff --git a/engines/mads/nebular/rooms/room701.cpp b/engines/mads/nebular/rooms/room701.cpp
index babd3393517..7130e4cf31e 100644
--- a/engines/mads/nebular/rooms/room701.cpp
+++ b/engines/mads/nebular/rooms/room701.cpp
@@ -136,7 +136,7 @@ static void room_701_init() {
kernel_timing_trigger(60, 70);
}
- kernel.quotes = quote_load(0x310, 0x30F, 0);
+ kernel.quotes = quote_load(784, 783, 0);
section_7_music();
}
diff --git a/engines/mads/nebular/rooms/room703.cpp b/engines/mads/nebular/rooms/room703.cpp
index b84c32f9307..f9d252bdfc7 100644
--- a/engines/mads/nebular/rooms/room703.cpp
+++ b/engines/mads/nebular/rooms/room703.cpp
@@ -195,7 +195,7 @@ static void room_703_init() {
inter_give_to_player(OBJ_BONES);
}
- kernel.quotes = quote_load(0x311, 0x312, 0x313, 0x314, 0x315, 0);
+ kernel.quotes = quote_load(785, 786, 787, 788, 789, 0);
local._dialog1.setup(0x98, 0x311, 0x312, 0x313, 0x314, 0x315, 0);
section_7_music();
g_engine->_soundManager->command(28, 0);
diff --git a/engines/mads/nebular/rooms/room704.cpp b/engines/mads/nebular/rooms/room704.cpp
index bdfd1249f3f..bb689165444 100644
--- a/engines/mads/nebular/rooms/room704.cpp
+++ b/engines/mads/nebular/rooms/room704.cpp
@@ -168,7 +168,7 @@ static void room_704_init() {
if (kernel.teleported_in)
global[kMonsterAlive] = false;
- kernel.quotes = quote_load(0x311, 0x312, 0x313, 0x314, 0x315, 0);
+ kernel.quotes = quote_load(785, 786, 787, 788, 789, 0);
local._dialog1.setup(0x98, 0x311, 0x312, 0x313, 0x314, 0x315, 0);
section_7_music();
diff --git a/engines/mads/nebular/rooms/room705.cpp b/engines/mads/nebular/rooms/room705.cpp
index 77bc2a9d075..16555e0c73c 100644
--- a/engines/mads/nebular/rooms/room705.cpp
+++ b/engines/mads/nebular/rooms/room705.cpp
@@ -138,7 +138,7 @@ static void room_705_init() {
if (kernel.teleported_in)
inter_give_to_player(OBJ_BOTTLE);
- kernel.quotes = quote_load(0x311, 0x312, 0x313, 0x314, 0x315, 0);
+ kernel.quotes = quote_load(785, 786, 787, 788, 789, 0);
local._dialog1.setup(0x98, 0x311, 0x312, 0x313, 0x314, 0x315, 0);
section_7_music();
}
diff --git a/engines/mads/nebular/rooms/room751.cpp b/engines/mads/nebular/rooms/room751.cpp
index a8d0ed7fbe7..860053ff92e 100644
--- a/engines/mads/nebular/rooms/room751.cpp
+++ b/engines/mads/nebular/rooms/room751.cpp
@@ -97,7 +97,7 @@ static void room_751_init() {
}
section_7_music();
- kernel.quotes = quote_load(0x30A, 0x30B, 0x30C, 0x30D, 0x30E, 0);
+ kernel.quotes = quote_load(778, 779, 780, 781, 782, 0);
if (global[kTimebombTimer] > 0)
global[kTimebombTimer] = 10200;
diff --git a/engines/mads/nebular/rooms/room803.cpp b/engines/mads/nebular/rooms/room803.cpp
index 6bf9c4c3f86..27be387365d 100644
--- a/engines/mads/nebular/rooms/room803.cpp
+++ b/engines/mads/nebular/rooms/room803.cpp
@@ -38,7 +38,7 @@ static void room_803_init() {
g_sprite_ids[9] = kernel_load_series("*RXMBD_2", 0);
g_sprite_ids[6] = kernel_load_series(kernel_name('d', 1), 0);
- kernel.quotes = quote_load(0x31B, 0x31C, 0x31D, 0x31E, 0x31F, 0x320, 0x321, 0x322, 0);
+ kernel.quotes = quote_load(795, 796, 797, 798, 799, 800, 801, 802, 0);
if (global[kHoppyDead]) {
g_sprite_ids[7] = kernel_load_series(kernel_name('e', 1), 0);
Commit: 46bc80e7bb16d1cdb62ae7ca8a1778802cabbe9e
https://github.com/scummvm/scummvm/commit/46bc80e7bb16d1cdb62ae7ca8a1778802cabbe9e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-08-03T13:20:24+10:00
Commit Message:
MADS: NEBULAR: Demo uses different quote range in room 102
Changed paths:
engines/mads/nebular/rooms/room102.cpp
diff --git a/engines/mads/nebular/rooms/room102.cpp b/engines/mads/nebular/rooms/room102.cpp
index be1414fe63e..50e15fc5b6b 100644
--- a/engines/mads/nebular/rooms/room102.cpp
+++ b/engines/mads/nebular/rooms/room102.cpp
@@ -31,6 +31,8 @@ namespace MADS {
namespace RexNebular {
namespace Rooms {
+#define QUOTE_ID(INDEX) ((g_engine->isDemo() ? 11 : 59) + INDEX)
+
struct Scratch {
byte _fridgeOpenedFl;
byte _fridgeOpenedDescr;
@@ -47,7 +49,7 @@ static Scratch local;
static void addRandomMessage() {
kernel_message_purge();
kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
- int quoteId = g_engine->getRandomNumber(65, 69);
+ int quoteId = g_engine->getRandomNumber(QUOTE_ID(6), QUOTE_ID(10));
kernel_message_add(quote_string(kernel.quotes, quoteId), 0, 0, 0x1110, 120, 73, 34);
local._activeMsgFl = true;
}
@@ -130,7 +132,10 @@ static void room_102_init() {
local._chairDescrFl = false;
local._activeMsgFl = false;
- kernel.quotes = quote_load(59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 0);
+ int quote = QUOTE_ID(0);
+ kernel.quotes = quote_load(
+ quote + 0, quote + 1, quote + 2, quote + 3, quote + 4, quote + 5,
+ quote + 6, quote + 7, quote + 8, quote + 9, quote + 10, 0);
if (previous_room == 101)
g_engine->_soundManager->command(20, 0);
@@ -282,13 +287,13 @@ static void room_102_parser() {
if (player_said_2(walkto, refrigerator) && justOpenedFl) {
local._fridgeFirstOpenFl = false;
- int quoteId = g_engine->getRandomNumber(59, 63);
+ int quoteId = g_engine->getRandomNumber(QUOTE_ID(0), QUOTE_ID(4));
char *curQuote = quote_string(kernel.quotes, quoteId);
int width = font_string_width(kernel_message_font, curQuote, -1);
kernel_message_purge();
kernel.trigger_setup_mode = KERNEL_TRIGGER_DAEMON;
kernel_message_add(curQuote, 210, 60, 0x1110, 120, 73, 0);
- kernel_message_add(quote_string(kernel.quotes, 64), 214 + width, 60, 0x1110, 120, 73, 0);
+ kernel_message_add(quote_string(kernel.quotes, QUOTE_ID(5)), 214 + width, 60, 0x1110, 120, 73, 0);
local._activeMsgFl = true;
goto handled;
}
More information about the Scummvm-git-logs
mailing list