[Scummvm-git-logs] scummvm master -> a524f8931a42bfa1d483a5cbc7b4945d2ddf3a4b
dreammaster
noreply at scummvm.org
Sun May 17 06:25:56 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
65c6880bd6 MADS: PHANTOM: Implement ASound9 commands
a524f8931a MADS: PHANTOM: Remove ASound deprecated size params
Commit: 65c6880bd681f2ccd756f1c27d38105923939597
https://github.com/scummvm/scummvm/commit/65c6880bd681f2ccd756f1c27d38105923939597
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-17T16:15:56+10:00
Commit Message:
MADS: PHANTOM: Implement ASound9 commands
Changed paths:
engines/mads/core/sound_manager.cpp
engines/mads/madsv2/phantom/sound_phantom.cpp
diff --git a/engines/mads/core/sound_manager.cpp b/engines/mads/core/sound_manager.cpp
index 55ca90b6b06..c645dbda9ad 100644
--- a/engines/mads/core/sound_manager.cpp
+++ b/engines/mads/core/sound_manager.cpp
@@ -137,7 +137,6 @@ SoundDriver::SoundDriver(Audio::Mixer *mixer, OPL::OPL *opl, const Common::Path
}
SoundDriver::~SoundDriver() {
- Common::StackLock slock(_driverMutex);
_opl->stop();
}
diff --git a/engines/mads/madsv2/phantom/sound_phantom.cpp b/engines/mads/madsv2/phantom/sound_phantom.cpp
index f08bcc548d4..c66386d2f8b 100644
--- a/engines/mads/madsv2/phantom/sound_phantom.cpp
+++ b/engines/mads/madsv2/phantom/sound_phantom.cpp
@@ -1370,59 +1370,67 @@ int ASound9::command(int commandId, int param) {
return (this->*_commandList[commandId])();
}
+// commands 0–8: delegate to base ASound
int ASound9::command0() {
- return 0;
+ return ASound::command0();
}
-
int ASound9::command1() {
- return 0;
+ return ASound::command1();
}
-
int ASound9::command2() {
- return 0;
+ return ASound::command2();
}
-
int ASound9::command3() {
- return 0;
+ return ASound::command3();
}
-
int ASound9::command4() {
- return 0;
+ return ASound::command4();
}
-
int ASound9::command5() {
- return 0;
+ return ASound::command5();
}
-
int ASound9::command6() {
- return 0;
+ return ASound::command6();
}
-
int ASound9::command7() {
- return 0;
+ return ASound::command7();
}
-
int ASound9::command8() {
- return 0;
+ return ASound::command8();
}
int ASound9::command24() {
+ playSound(0x203E, 51);
+ playSound(0x2071, 46);
return 0;
}
int ASound9::command25() {
+ playSound(0x209F, 44);
+ playSound(0x20CB, 46);
return 0;
}
int ASound9::command26() {
+ playSound(0x20F9, 12);
return 0;
}
int ASound9::command27() {
+ playSound(0x2105, 81);
return 0;
}
int ASound9::command32() {
+ ASound::command1();
+ findFreeChannel(loadData(0x2B16, 86));
+ findFreeChannel(loadData(0x2B6C, 74));
+ findFreeChannel(loadData(0x2BB6, 722));
+ findFreeChannel(loadData(0x2E88, 16));
+ findFreeChannel(loadData(0x2E98, 11));
+ findFreeChannel(loadData(0x2EA3, 11));
+ findFreeChannel(loadData(0x2EAE, 9));
+ findFreeChannel(loadData(0x2EB7, 15));
return 0;
}
@@ -1431,58 +1439,132 @@ int ASound9::command33() {
}
int ASound9::command34() {
+ ASound::command1();
+ _channels[0]->load(loadData(0x31D0, 81));
+ _channels[1]->load(loadData(0x3221, 97));
+ _channels[2]->load(loadData(0x3282, 73));
+ _channels[3]->load(loadData(0x32CB, 79));
+ _channels[4]->load(loadData(0x331A, 79));
+ _channels[5]->load(loadData(0x3369, 71));
+ _channels[6]->load(loadData(0x33B0, 736));
return 0;
}
int ASound9::command35() {
+ ASound::command1();
+ _channels[0]->load(loadData(0x295E, 64));
+ _channels[1]->load(loadData(0x299E, 37));
+ _channels[2]->load(loadData(0x29C3, 37));
+ _channels[3]->load(loadData(0x29E8, 94));
+ _channels[4]->load(loadData(0x2A46, 95));
+ _channels[5]->load(loadData(0x2AA5, 59));
+ _channels[6]->load(loadData(0x2AE0, 54));
return 0;
}
int ASound9::command36() {
+ ASound::command1();
+ _channels[0]->load(loadData(0x30AA, 51));
+ _channels[1]->load(loadData(0x30DD, 44));
+ _channels[2]->load(loadData(0x3109, 52));
+ _channels[3]->load(loadData(0x313D, 56));
+ _channels[4]->load(loadData(0x3175, 38));
+ _channels[5]->load(loadData(0x319B, 53));
return 0;
}
int ASound9::command37() {
+ ASound::command1();
+ _channels[0]->load(loadData(0x2156, 80));
+ _channels[1]->load(loadData(0x21A6, 232));
+ _channels[2]->load(loadData(0x228E, 105));
+ _channels[3]->load(loadData(0x22F7, 90));
+ _channels[4]->load(loadData(0x2351, 599));
+ _channels[5]->load(loadData(0x25A8, 791));
+ _channels[6]->load(loadData(0x28BF, 159));
return 0;
}
int ASound9::command38() {
+ byte *pData = loadData(0x11BC, 699);
+ if (!isSoundActive(pData)) {
+ ASound::command1();
+ _channels[0]->load(pData);
+ _channels[1]->load(loadData(0x1477, 278));
+ _channels[2]->load(loadData(0x158D, 490));
+ _channels[3]->load(loadData(0x1777, 512));
+ _channels[4]->load(loadData(0x1977, 590));
+ _channels[5]->load(loadData(0x1BC5, 314));
+ _channels[6]->load(loadData(0x1CFF, 432));
+ _channels[7]->load(loadData(0x1EAF, 399));
+ }
return 0;
}
int ASound9::command39() {
+ byte *pData = loadData(0x0C36, 327);
+ if (!isSoundActive(pData)) {
+ ASound::command0();
+ _channels[0]->load(pData);
+ _channels[1]->load(loadData(0x0D7D, 211));
+ _channels[2]->load(loadData(0x0E50, 204));
+ _channels[3]->load(loadData(0x0F1C, 178));
+ _channels[4]->load(loadData(0x0FCE, 236));
+ _channels[5]->load(loadData(0x10BA, 258));
+ }
return 0;
}
int ASound9::command64() {
+ playSound(0x2EC6, 20);
return 0;
}
int ASound9::command65() {
+ playSound(0x2EDA, 10);
return 0;
}
int ASound9::command66() {
+ _channels[0]->load(loadData(0x2EE4, 42));
+ _channels[1]->load(loadData(0x2F0E, 48));
+ _channels[2]->load(loadData(0x2F3E, 48));
+ _channels[3]->load(loadData(0x2F6E, 48));
+ _channels[4]->load(loadData(0x2EE4, 42));
+ _channels[5]->load(loadData(0x2F0E, 48));
+ _channels[6]->load(loadData(0x2F3E, 48));
+ _channels[7]->load(loadData(0x2F6E, 48));
return 0;
}
int ASound9::command67() {
+ _channels[6]->load(loadData(0x2F9E, 31));
+ _channels[7]->load(loadData(0x2FBD, 15));
+ _channels[8]->load(loadData(0x2FCC, 31));
return 0;
}
int ASound9::command68() {
+ playSound(0x2FEB, 10);
return 0;
}
int ASound9::command69() {
+ playSound(0x2FF5, 38);
+ playSound(0x301B, 38);
+ playSound(0x3041, 26);
return 0;
}
int ASound9::command70() {
+ playSound(0x305B, 9);
+ playSound(0x3064, 9);
return 0;
}
int ASound9::command71() {
+ playSound(0x306D, 29);
+ playSound(0x308A, 32);
return 0;
}
Commit: a524f8931a42bfa1d483a5cbc7b4945d2ddf3a4b
https://github.com/scummvm/scummvm/commit/a524f8931a42bfa1d483a5cbc7b4945d2ddf3a4b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-05-17T16:24:34+10:00
Commit Message:
MADS: PHANTOM: Remove ASound deprecated size params
Changed paths:
engines/mads/madsv2/core/asound.cpp
engines/mads/madsv2/core/asound.h
engines/mads/madsv2/phantom/sound_phantom.cpp
diff --git a/engines/mads/madsv2/core/asound.cpp b/engines/mads/madsv2/core/asound.cpp
index 2a8d46376b4..188974a0089 100644
--- a/engines/mads/madsv2/core/asound.cpp
+++ b/engines/mads/madsv2/core/asound.cpp
@@ -236,8 +236,8 @@ void ASound::noise() {
noise_inner(i);
}
-void ASound::playSound(int offset, int size) {
- findFreeChannelFull(loadData(offset, size));
+void ASound::playSound(int offset) {
+ findFreeChannelFull(loadData(offset));
}
/* =========================================================================
diff --git a/engines/mads/madsv2/core/asound.h b/engines/mads/madsv2/core/asound.h
index aaae8503b6d..3686c1f11f1 100644
--- a/engines/mads/madsv2/core/asound.h
+++ b/engines/mads/madsv2/core/asound.h
@@ -345,7 +345,7 @@ protected:
/**
* Returns data for the specified offset.
*/
- byte *loadData(int offset, int /*size*/) {
+ byte *loadData(int offset) {
return &_soundData[offset];
}
@@ -470,7 +470,7 @@ public:
/**
* Plays a sound
*/
- void playSound(int offset, int size);
+ void playSound(int offset);
};
} // namespace MADSV2
diff --git a/engines/mads/madsv2/phantom/sound_phantom.cpp b/engines/mads/madsv2/phantom/sound_phantom.cpp
index c66386d2f8b..574e324ae9a 100644
--- a/engines/mads/madsv2/phantom/sound_phantom.cpp
+++ b/engines/mads/madsv2/phantom/sound_phantom.cpp
@@ -115,7 +115,7 @@ int ASound1::command(int commandId, int param) {
return (this->*_commandList[commandId])();
}
-// commands 0–8: delegate to base ASound
+// commands 0-8: delegate to base ASound
int ASound1::command0() { return ASound::command0(); }
int ASound1::command1() { return ASound::command1(); }
int ASound1::command2() { return ASound::command2(); }
@@ -128,56 +128,56 @@ int ASound1::command8() { return ASound::command8(); }
int ASound1::commandMusic0() {
ASound::command1();
- _channels[0]->load(loadData(0x1ECA, 245));
- _channels[1]->load(loadData(0x1FBF, 120));
- _channels[2]->load(loadData(0x2037, 183));
- _channels[3]->load(loadData(0x20EE, 173));
- _channels[4]->load(loadData(0x219B, 20));
- _channels[5]->load(loadData(0x21AF, 21));
+ _channels[0]->load(loadData(0x1ECA));
+ _channels[1]->load(loadData(0x1FBF));
+ _channels[2]->load(loadData(0x2037));
+ _channels[3]->load(loadData(0x20EE));
+ _channels[4]->load(loadData(0x219B));
+ _channels[5]->load(loadData(0x21AF));
return 0;
}
int ASound1::commandMusic1() {
ASound::command1();
- _channels[0]->load(loadData(0x3418, 211));
- _channels[1]->load(loadData(0x34EB, 176));
- _channels[2]->load(loadData(0x359B, 189));
- _channels[3]->load(loadData(0x3658, 15));
- _channels[4]->load(loadData(0x3667, 16));
- _channels[5]->load(loadData(0x3677, 17));
+ _channels[0]->load(loadData(0x3418));
+ _channels[1]->load(loadData(0x34EB));
+ _channels[2]->load(loadData(0x359B));
+ _channels[3]->load(loadData(0x3658));
+ _channels[4]->load(loadData(0x3667));
+ _channels[5]->load(loadData(0x3677));
return 0;
}
int ASound1::commandMusic2() {
ASound::command1();
- _channels[0]->load(loadData(0x3688, 499));
- _channels[1]->load(loadData(0x387B, 390));
- _channels[2]->load(loadData(0x3A01, 453));
- _channels[3]->load(loadData(0x3BC6, 363));
- _channels[4]->load(loadData(0x3D31, 16));
- _channels[5]->load(loadData(0x3D41, 17));
+ _channels[0]->load(loadData(0x3688));
+ _channels[1]->load(loadData(0x387B));
+ _channels[2]->load(loadData(0x3A01));
+ _channels[3]->load(loadData(0x3BC6));
+ _channels[4]->load(loadData(0x3D31));
+ _channels[5]->load(loadData(0x3D41));
return 0;
}
int ASound1::commandMusic3() {
ASound::command1();
- _channels[0]->load(loadData(0x3D52, 641));
- _channels[1]->load(loadData(0x3FD3, 556));
- _channels[2]->load(loadData(0x41FF, 13));
- _channels[3]->load(loadData(0x420C, 13));
- _channels[4]->load(loadData(0x4219, 16));
- _channels[5]->load(loadData(0x4229, 17));
+ _channels[0]->load(loadData(0x3D52));
+ _channels[1]->load(loadData(0x3FD3));
+ _channels[2]->load(loadData(0x41FF));
+ _channels[3]->load(loadData(0x420C));
+ _channels[4]->load(loadData(0x4219));
+ _channels[5]->load(loadData(0x4229));
return 0;
}
// ---------------------------------------------------------------------------
-// command16 – random background music
+// command16 - random background music
//
// If channel 0 is active and already playing one of the five known music
// pieces (identified by their starting offset in field_17), leave it alone.
// Otherwise pick a piece at random: the original uses getRandomNumber() & 7,
-// discarding 0 and indexing a four-entry table repeated twice (entries 1–3
-// -> pieces 1–3, entries 4–7 -> same pieces again with entry 4 wrapping to
+// discarding 0 and indexing a four-entry table repeated twice (entries 1-3
+// -> pieces 1-3, entries 4-7 -> same pieces again with entry 4 wrapping to
// piece 0). We reproduce this with a modulo-4 on a non-zero value.
// ---------------------------------------------------------------------------
int ASound1::command16() {
@@ -207,139 +207,139 @@ int ASound1::command16() {
}
// ---------------------------------------------------------------------------
-// commands 24–27 – upper channel pool
+// commands 24-27 - upper channel pool
// ---------------------------------------------------------------------------
int ASound1::command24() {
- playSound(0x173A, 51);
- playSound(0x176D, 46);
+ playSound(0x173A);
+ playSound(0x176D);
return 0;
}
int ASound1::command25() {
- playSound(0x179B, 44);
- playSound(0x17C7, 46);
+ playSound(0x179B);
+ playSound(0x17C7);
return 0;
}
int ASound1::command26() {
- playSound(0x17F5, 12);
+ playSound(0x17F5);
return 0;
}
int ASound1::command27() {
- playSound(0x1801, 81);
+ playSound(0x1801);
return 0;
}
// ---------------------------------------------------------------------------
-// commands 32–39
+// commands 32-39
// ---------------------------------------------------------------------------
-// command32 – no guard, no fade, load ch0–5
+// command32 - no guard, no fade, load ch0-5
int ASound1::command32() {
- _channels[0]->load(loadData(0x2522, 59));
- _channels[1]->load(loadData(0x255D, 52));
- _channels[2]->load(loadData(0x2591, 42));
- _channels[3]->load(loadData(0x25BB, 44));
- _channels[4]->load(loadData(0x25E7, 44));
- _channels[5]->load(loadData(0x2613, 89));
+ _channels[0]->load(loadData(0x2522));
+ _channels[1]->load(loadData(0x255D));
+ _channels[2]->load(loadData(0x2591));
+ _channels[3]->load(loadData(0x25BB));
+ _channels[4]->load(loadData(0x25E7));
+ _channels[5]->load(loadData(0x2613));
return 0;
}
-// command33 – isSoundActive guard, command1, load ch0–5
+// command33 - isSoundActive guard, command1, load ch0-5
int ASound1::command33() {
- byte *pData = loadData(0x266C, 701);
+ byte *pData = loadData(0x266C);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x2929, 500));
- _channels[2]->load(loadData(0x2B1D, 538));
- _channels[3]->load(loadData(0x2D37, 396));
- _channels[4]->load(loadData(0x2EC3, 368));
- _channels[5]->load(loadData(0x3033, 493));
+ _channels[1]->load(loadData(0x2929));
+ _channels[2]->load(loadData(0x2B1D));
+ _channels[3]->load(loadData(0x2D37));
+ _channels[4]->load(loadData(0x2EC3));
+ _channels[5]->load(loadData(0x3033));
}
return 0;
}
-// command34 – isSoundActive guard, stop(), load ch0–5
+// command34 - isSoundActive guard, stop(), load ch0-5
int ASound1::command34() {
- byte *pData = loadData(0x1852, 599);
+ byte *pData = loadData(0x1852);
if (!isSoundActive(pData)) {
stop();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x1AA9, 283));
- _channels[2]->load(loadData(0x1BC4, 301));
- _channels[3]->load(loadData(0x1CF1, 257));
- _channels[4]->load(loadData(0x1DF2, 204));
- _channels[5]->load(loadData(0x1EBE, 12));
+ _channels[1]->load(loadData(0x1AA9));
+ _channels[2]->load(loadData(0x1BC4));
+ _channels[3]->load(loadData(0x1CF1));
+ _channels[4]->load(loadData(0x1DF2));
+ _channels[5]->load(loadData(0x1EBE));
}
return 0;
}
-// command35 – isSoundActive guard, command2 (lower-bank fade),
-// load ch0–5
+// command35 - isSoundActive guard, command2 (lower-bank fade),
+// load ch0-5
int ASound1::command35() {
- byte *pData = loadData(0x0C36, 329);
+ byte *pData = loadData(0x0C36);
if (!isSoundActive(pData)) {
ASound::command2();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x0D7F, 201));
- _channels[2]->load(loadData(0x0E48, 200));
- _channels[3]->load(loadData(0x0F10, 162));
- _channels[4]->load(loadData(0x0FB2, 228));
- _channels[5]->load(loadData(0x1096, 250));
+ _channels[1]->load(loadData(0x0D7F));
+ _channels[2]->load(loadData(0x0E48));
+ _channels[3]->load(loadData(0x0F10));
+ _channels[4]->load(loadData(0x0FB2));
+ _channels[5]->load(loadData(0x1096));
}
return 0;
}
-// command36 – isSoundActive guard, command2 (lower-bank fade),
-// load ch0–5
+// command36 - isSoundActive guard, command2 (lower-bank fade),
+// load ch0-5
int ASound1::command36() {
- byte *pData = loadData(0x1190, 327);
+ byte *pData = loadData(0x1190);
if (!isSoundActive(pData)) {
ASound::command2();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x12D7, 211));
- _channels[2]->load(loadData(0x13AA, 204));
- _channels[3]->load(loadData(0x1476, 178));
- _channels[4]->load(loadData(0x1528, 236));
- _channels[5]->load(loadData(0x1614, 294));
+ _channels[1]->load(loadData(0x12D7));
+ _channels[2]->load(loadData(0x13AA));
+ _channels[3]->load(loadData(0x1476));
+ _channels[4]->load(loadData(0x1528));
+ _channels[5]->load(loadData(0x1614));
}
return 0;
}
-// command37 – isSoundActive guard, command1, four loadAny
+// command37 - isSoundActive guard, command1, four loadAny
// calls starting from channel 0
int ASound1::command37() {
- byte *pData = loadData(0x3220, 74);
+ byte *pData = loadData(0x3220);
if (!isSoundActive(pData)) {
ASound::command1();
findFreeChannel(pData);
- findFreeChannel(loadData(0x326A, 41));
- findFreeChannel(loadData(0x3293, 25));
- findFreeChannel(loadData(0x32AC, 14));
+ findFreeChannel(loadData(0x326A));
+ findFreeChannel(loadData(0x3293));
+ findFreeChannel(loadData(0x32AC));
}
return 0;
}
-// command38 – alias for commandMusic0; also the direct dispatch
+// command38 - alias for commandMusic0; also the direct dispatch
// target for command 38.
int ASound1::command38() {
return commandMusic0();
}
-// command39 – isSoundActive guard, command1, load ch0–5
+// command39 - isSoundActive guard, command1, load ch0-5
int ASound1::command39() {
- byte *pData = loadData(0x423A, 421);
+ byte *pData = loadData(0x423A);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x43DF, 280));
- _channels[2]->load(loadData(0x44F7, 246));
- _channels[3]->load(loadData(0x45ED, 268));
- _channels[4]->load(loadData(0x46F9, 438));
- _channels[5]->load(loadData(0x48AF, 0));
+ _channels[1]->load(loadData(0x43DF));
+ _channels[2]->load(loadData(0x44F7));
+ _channels[3]->load(loadData(0x45ED));
+ _channels[4]->load(loadData(0x46F9));
+ _channels[5]->load(loadData(0x48AF));
}
return 0;
}
@@ -351,25 +351,25 @@ int ASound1::command39() {
*-----------------------------------------------------------------------*/
const ASound2::CommandPtr ASound2::_commandList[73] = {
- // commands 0–8 (asound_commands1)
+ // commands 0-8 (asound_commands1)
&ASound2::command0, &ASound2::command1, &ASound2::command2, &ASound2::command3,
&ASound2::command4, &ASound2::command5, &ASound2::command6, &ASound2::command7,
&ASound2::command8,
- // 9–15 absent
+ // 9-15 absent
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
// command 16 (asound_commands2)
&ASound2::command16,
- // 17–23 absent
+ // 17-23 absent
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
- // commands 24–27 (asound_commands3)
+ // commands 24-27 (asound_commands3)
&ASound2::command24, &ASound2::command25, &ASound2::command26, &ASound2::command27,
- // 28–31 absent
+ // 28-31 absent
nullptr, nullptr, nullptr, nullptr,
- // commands 32–35 (asound_commands4)
+ // commands 32-35 (asound_commands4)
&ASound2::command32, &ASound2::command33, &ASound2::command34, &ASound2::command35,
- // 36–63 absent
+ // 36-63 absent
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
@@ -377,7 +377,7 @@ const ASound2::CommandPtr ASound2::_commandList[73] = {
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
- // commands 64–72 (asound_commands5)
+ // commands 64-72 (asound_commands5)
&ASound2::command64, &ASound2::command65, &ASound2::command66, &ASound2::command67,
&ASound2::command68, &ASound2::command69, &ASound2::command70, &ASound2::command71,
&ASound2::command72
@@ -398,7 +398,7 @@ int ASound2::command(int commandId, int param) {
return (this->*_commandList[commandId])();
}
-// commands 0–8: delegate to base ASound
+// commands 0-8: delegate to base ASound
int ASound2::command0() { return ASound::command0(); }
int ASound2::command1() { return ASound::command1(); }
int ASound2::command2() { return ASound::command2(); }
@@ -410,135 +410,135 @@ int ASound2::command7() { return ASound::command7(); }
int ASound2::command8() { return ASound::command8(); }
// ---------------------------------------------------------------------------
-// command16 – isSoundActive guard, command1, load ch0–5
+// command16 - isSoundActive guard, command1, load ch0-5
// ---------------------------------------------------------------------------
int ASound2::command16() {
- byte *pData = loadData(0x0C36, 88);
+ byte *pData = loadData(0x0C36);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x0C8E, 102));
- _channels[2]->load(loadData(0x0CF4, 90));
- _channels[3]->load(loadData(0x0D4E, 85));
- _channels[4]->load(loadData(0x0DA3, 14));
- _channels[5]->load(loadData(0x0DB1, 15));
+ _channels[1]->load(loadData(0x0C8E));
+ _channels[2]->load(loadData(0x0CF4));
+ _channels[3]->load(loadData(0x0D4E));
+ _channels[4]->load(loadData(0x0DA3));
+ _channels[5]->load(loadData(0x0DB1));
}
return 0;
}
// ---------------------------------------------------------------------------
-// commands 24–27 (asound_commands3) – upper channel pool
+// commands 24-27 (asound_commands3) - upper channel pool
// ---------------------------------------------------------------------------
int ASound2::command24() {
- playSound(0x1A4A, 51);
- playSound(0x1A7D, 46);
+ playSound(0x1A4A);
+ playSound(0x1A7D);
return 0;
}
int ASound2::command25() {
- playSound(0x1AAB, 44);
- playSound(0x1AD7, 46);
+ playSound(0x1AAB);
+ playSound(0x1AD7);
return 0;
}
int ASound2::command26() {
- playSound(0x1B05, 12);
+ playSound(0x1B05);
return 0;
}
int ASound2::command27() {
- playSound(0x1B11, 81);
+ playSound(0x1B11);
return 0;
}
// ---------------------------------------------------------------------------
-// commands 32–35 (asound_commands4)
+// commands 32-35 (asound_commands4)
// ---------------------------------------------------------------------------
-// command32 – command1, six loadAny calls from channel 0
+// command32 - command1, six loadAny calls from channel 0
int ASound2::command32() {
ASound::command1();
- findFreeChannel(loadData(0x1BE4, 211));
- findFreeChannel(loadData(0x1CB7, 359));
- findFreeChannel(loadData(0x1E1E, 170));
- findFreeChannel(loadData(0x1EC8, 16));
- findFreeChannel(loadData(0x1ED8, 23));
- findFreeChannel(loadData(0x1EEF, 19));
+ findFreeChannel(loadData(0x1BE4));
+ findFreeChannel(loadData(0x1CB7));
+ findFreeChannel(loadData(0x1E1E));
+ findFreeChannel(loadData(0x1EC8));
+ findFreeChannel(loadData(0x1ED8));
+ findFreeChannel(loadData(0x1EEF));
return 0;
}
-// command33 – isSoundActive guard, command1, load ch0–7
+// command33 - isSoundActive guard, command1, load ch0-7
int ASound2::command33() {
- byte *pData = loadData(0x1B62, 53);
+ byte *pData = loadData(0x1B62);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x1B97, 14));
- _channels[2]->load(loadData(0x1BA5, 14));
- _channels[3]->load(loadData(0x1BB3, 14));
- _channels[4]->load(loadData(0x1BC1, 4));
- _channels[5]->load(loadData(0x1BC5, 4));
- _channels[6]->load(loadData(0x1BC9, 12));
- _channels[7]->load(loadData(0x1BD5, 15));
+ _channels[1]->load(loadData(0x1B97));
+ _channels[2]->load(loadData(0x1BA5));
+ _channels[3]->load(loadData(0x1BB3));
+ _channels[4]->load(loadData(0x1BC1));
+ _channels[5]->load(loadData(0x1BC5));
+ _channels[6]->load(loadData(0x1BC9));
+ _channels[7]->load(loadData(0x1BD5));
}
return 0;
}
-// command34 – isSoundActive guard, command1, load ch0–6
+// command34 - isSoundActive guard, command1, load ch0-6
int ASound2::command34() {
- byte *pData = loadData(0x0DC0, 495);
+ byte *pData = loadData(0x0DC0);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x0FAF, 599));
- _channels[2]->load(loadData(0x1206, 404));
- _channels[3]->load(loadData(0x139A, 459));
- _channels[4]->load(loadData(0x1565, 718));
- _channels[5]->load(loadData(0x1833, 154));
- _channels[6]->load(loadData(0x18CD, 91));
+ _channels[1]->load(loadData(0x0FAF));
+ _channels[2]->load(loadData(0x1206));
+ _channels[3]->load(loadData(0x139A));
+ _channels[4]->load(loadData(0x1565));
+ _channels[5]->load(loadData(0x1833));
+ _channels[6]->load(loadData(0x18CD));
}
return 0;
}
-// command35 – isSoundActive guard, command1, load ch0–6
+// command35 - isSoundActive guard, command1, load ch0-6
int ASound2::command35() {
- byte *pData = loadData(0x1F02, 100);
+ byte *pData = loadData(0x1F02);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x1F66, 10));
- _channels[2]->load(loadData(0x1F70, 29));
- _channels[3]->load(loadData(0x1F8D, 65));
- _channels[4]->load(loadData(0x1FCE, 41));
- _channels[5]->load(loadData(0x1FF7, 55));
- _channels[6]->load(loadData(0x202E, 34));
+ _channels[1]->load(loadData(0x1F66));
+ _channels[2]->load(loadData(0x1F70));
+ _channels[3]->load(loadData(0x1F8D));
+ _channels[4]->load(loadData(0x1FCE));
+ _channels[5]->load(loadData(0x1FF7));
+ _channels[6]->load(loadData(0x202E));
}
return 0;
}
// ---------------------------------------------------------------------------
-// commands 64–72 (asound_commands5) – upper channel pool
+// commands 64-72 (asound_commands5) - upper channel pool
// ---------------------------------------------------------------------------
int ASound2::command64() {
- playSound(0x1928, 20);
+ playSound(0x1928);
return 0;
}
int ASound2::command65() {
- playSound(0x193C, 10);
+ playSound(0x193C);
return 0;
}
int ASound2::command66() {
- playSound(0x1946, 22);
- playSound(0x195C, 17);
+ playSound(0x1946);
+ playSound(0x195C);
return 0;
}
int ASound2::command67() {
- playSound(0x196D, 18);
+ playSound(0x196D);
return 0;
}
@@ -548,26 +548,26 @@ int ASound2::command68() {
}
int ASound2::command69() {
- playSound(0x197F, 38);
- playSound(0x19A5, 38);
- playSound(0x19CB, 26);
+ playSound(0x197F);
+ playSound(0x19A5);
+ playSound(0x19CB);
return 0;
}
int ASound2::command70() {
- playSound(0x19E5, 12);
- playSound(0x19F1, 14);
+ playSound(0x19E5);
+ playSound(0x19F1);
return 0;
}
int ASound2::command71() {
- playSound(0x19FF, 14);
+ playSound(0x19FF);
return 0;
}
int ASound2::command72() {
- playSound(0x1A0D, 3);
- playSound(0x1A10, 22);
+ playSound(0x1A0D);
+ playSound(0x1A10);
return 0;
}
@@ -578,26 +578,26 @@ int ASound2::command72() {
*-----------------------------------------------------------------------*/
const ASound3::CommandPtr ASound3::_commandList[77] = {
- // commands 0–8 (asound_commands1)
+ // commands 0-8 (asound_commands1)
&ASound3::command0, &ASound3::command1, &ASound3::command2, &ASound3::command3,
&ASound3::command4, &ASound3::command5, &ASound3::command6, &ASound3::command7,
&ASound3::command8,
- // 9–15 absent
+ // 9-15 absent
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
// command 16 (asound_commands2)
&ASound3::command16,
- // 17–23 absent
+ // 17-23 absent
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
- // commands 24–27 (asound_commands3)
+ // commands 24-27 (asound_commands3)
&ASound3::command24, &ASound3::command25, &ASound3::command26, &ASound3::command27,
- // 28–31 absent
+ // 28-31 absent
nullptr, nullptr, nullptr, nullptr,
- // commands 32–37 (asound_commands4)
+ // commands 32-37 (asound_commands4)
&ASound3::command32, &ASound3::command33, &ASound3::command34, &ASound3::command35,
&ASound3::command36, &ASound3::command37,
- // 38–63 absent
+ // 38-63 absent
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
@@ -605,7 +605,7 @@ const ASound3::CommandPtr ASound3::_commandList[77] = {
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr,
- // commands 64–75 (asound_commands5)
+ // commands 64-75 (asound_commands5)
&ASound3::command64, &ASound3::command65, &ASound3::command66, &ASound3::command67,
&ASound3::command68, &ASound3::command69, &ASound3::command70, &ASound3::command71,
&ASound3::command72, &ASound3::command73, &ASound3::command74, &ASound3::command75,
@@ -628,7 +628,7 @@ int ASound3::command(int commandId, int param) {
return (this->*_commandList[commandId])();
}
-// commands 0–8: delegate to base ASound
+// commands 0-8: delegate to base ASound
int ASound3::command0() { return ASound::command0(); }
int ASound3::command1() { return ASound::command1(); }
int ASound3::command2() { return ASound::command2(); }
@@ -640,219 +640,219 @@ int ASound3::command7() { return ASound::command7(); }
int ASound3::command8() { return ASound::command8(); }
// ---------------------------------------------------------------------------
-// sub_11CC6 – shared helper used by command34.
-// isSoundActive guard on 0xC36; if not active: command1, load ch0–7.
-// (The tiny ch6 and ch7 blocks — 4 bytes each — are very short sub-blocks
+// sub_11CC6 - shared helper used by command34.
+// isSoundActive guard on 0xC36; if not active: command1, load ch0-7.
+// (The tiny ch6 and ch7 blocks - 4 bytes each - are very short sub-blocks
// within the same composite sound.)
// ---------------------------------------------------------------------------
void ASound3::sub11CC6() {
- byte *pData = loadData(0x0C36, 53);
+ byte *pData = loadData(0x0C36);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x0C6B, 14));
- _channels[2]->load(loadData(0x0C79, 14));
- _channels[3]->load(loadData(0x0C87, 14));
- _channels[4]->load(loadData(0x0C95, 4));
- _channels[5]->load(loadData(0x0C99, 4));
- _channels[6]->load(loadData(0x0C9D, 12));
- _channels[7]->load(loadData(0x0CA9, 15));
+ _channels[1]->load(loadData(0x0C6B));
+ _channels[2]->load(loadData(0x0C79));
+ _channels[3]->load(loadData(0x0C87));
+ _channels[4]->load(loadData(0x0C95));
+ _channels[5]->load(loadData(0x0C99));
+ _channels[6]->load(loadData(0x0C9D));
+ _channels[7]->load(loadData(0x0CA9));
}
}
// ---------------------------------------------------------------------------
-// command16 – isSoundActive guard, command1, load ch0–5
+// command16 - isSoundActive guard, command1, load ch0-5
// ---------------------------------------------------------------------------
int ASound3::command16() {
- byte *pData = loadData(0x24F2, 172);
+ byte *pData = loadData(0x24F2);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x259E, 137));
- _channels[2]->load(loadData(0x2627, 135));
- _channels[3]->load(loadData(0x26AE, 179));
- _channels[4]->load(loadData(0x2761, 175));
- _channels[5]->load(loadData(0x2810, 186));
+ _channels[1]->load(loadData(0x259E));
+ _channels[2]->load(loadData(0x2627));
+ _channels[3]->load(loadData(0x26AE));
+ _channels[4]->load(loadData(0x2761));
+ _channels[5]->load(loadData(0x2810));
}
return 0;
}
// ---------------------------------------------------------------------------
-// commands 24–27 (asound_commands3) – upper channel pool
+// commands 24-27 (asound_commands3) - upper channel pool
// ---------------------------------------------------------------------------
int ASound3::command24() {
- playSound(0x2A7C, 51);
- playSound(0x2AAF, 46);
+ playSound(0x2A7C);
+ playSound(0x2AAF);
return 0;
}
int ASound3::command25() {
- playSound(0x2ADD, 44);
- playSound(0x2B09, 46);
+ playSound(0x2ADD);
+ playSound(0x2B09);
return 0;
}
int ASound3::command26() {
- playSound(0x2B37, 12);
+ playSound(0x2B37);
return 0;
}
int ASound3::command27() {
- playSound(0x2B43, 12);
+ playSound(0x2B43);
return 0;
}
// ---------------------------------------------------------------------------
-// commands 32–37 (asound_commands4)
+// commands 32-37 (asound_commands4)
// ---------------------------------------------------------------------------
-// command32 – isSoundActive guard, command1, load ch0–7
+// command32 - isSoundActive guard, command1, load ch0-7
int ASound3::command32() {
- byte *pData = loadData(0x2B94, 108);
+ byte *pData = loadData(0x2B94);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x2C00, 73));
- _channels[2]->load(loadData(0x2C49, 67));
- _channels[3]->load(loadData(0x2C8C, 151));
- _channels[4]->load(loadData(0x2D23, 171));
- _channels[5]->load(loadData(0x2DCE, 87));
- _channels[6]->load(loadData(0x2E25, 95));
- _channels[7]->load(loadData(0x2E84, 110));
+ _channels[1]->load(loadData(0x2C00));
+ _channels[2]->load(loadData(0x2C49));
+ _channels[3]->load(loadData(0x2C8C));
+ _channels[4]->load(loadData(0x2D23));
+ _channels[5]->load(loadData(0x2DCE));
+ _channels[6]->load(loadData(0x2E25));
+ _channels[7]->load(loadData(0x2E84));
}
return 0;
}
-// command33 – isSoundActive guard, command1, load ch0–6
+// command33 - isSoundActive guard, command1, load ch0-6
int ASound3::command33() {
- byte *pData = loadData(0x149E, 525);
+ byte *pData = loadData(0x149E);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x16AB, 648));
- _channels[2]->load(loadData(0x1933, 252));
- _channels[3]->load(loadData(0x1A2F, 502));
- _channels[4]->load(loadData(0x1C25, 680));
- _channels[5]->load(loadData(0x1ECD, 418));
- _channels[6]->load(loadData(0x206F, 3));
+ _channels[1]->load(loadData(0x16AB));
+ _channels[2]->load(loadData(0x1933));
+ _channels[3]->load(loadData(0x1A2F));
+ _channels[4]->load(loadData(0x1C25));
+ _channels[5]->load(loadData(0x1ECD));
+ _channels[6]->load(loadData(0x206F));
}
return 0;
}
-// command34 – calls sub11CC6 (loads ch0–7 if not active),
+// command34 - calls sub11CC6 (loads ch0-7 if not active),
// then unconditionally loads ch8 at 0x298E
int ASound3::command34() {
sub11CC6();
- _channels[8]->load(loadData(0x298E, 10));
+ _channels[8]->load(loadData(0x298E));
return 0;
}
-// command35 – isSoundActive guard, command1, load ch0–5
+// command35 - isSoundActive guard, command1, load ch0-5
int ASound3::command35() {
- byte *pData = loadData(0x0CB8, 413);
+ byte *pData = loadData(0x0CB8);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x0E55, 270));
- _channels[2]->load(loadData(0x0F63, 238));
- _channels[3]->load(loadData(0x1051, 264));
- _channels[4]->load(loadData(0x1159, 434));
- _channels[5]->load(loadData(0x130B, 403));
+ _channels[1]->load(loadData(0x0E55));
+ _channels[2]->load(loadData(0x0F63));
+ _channels[3]->load(loadData(0x1051));
+ _channels[4]->load(loadData(0x1159));
+ _channels[5]->load(loadData(0x130B));
}
return 0;
}
-// command36 – isSoundActive guard, command1, load ch0–5
+// command36 - isSoundActive guard, command1, load ch0-5
int ASound3::command36() {
- byte *pData = loadData(0x2072, 196);
+ byte *pData = loadData(0x2072);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x2136, 692));
- _channels[2]->load(loadData(0x23EA, 83));
- _channels[3]->load(loadData(0x243D, 24));
- _channels[4]->load(loadData(0x2455, 78));
- _channels[5]->load(loadData(0x24A3, 79));
+ _channels[1]->load(loadData(0x2136));
+ _channels[2]->load(loadData(0x23EA));
+ _channels[3]->load(loadData(0x243D));
+ _channels[4]->load(loadData(0x2455));
+ _channels[5]->load(loadData(0x24A3));
}
return 0;
}
-// command37 – single upper-pool voice
+// command37 - single upper-pool voice
int ASound3::command37() {
- playSound(0x298E, 10);
+ playSound(0x298E);
return 0;
}
// ---------------------------------------------------------------------------
-// commands 64–75 (asound_commands5)
+// commands 64-75 (asound_commands5)
// ---------------------------------------------------------------------------
int ASound3::command64() {
- _channels[6]->load(loadData(0x28CA, 50));
- _channels[8]->load(loadData(0x28FC, 29));
+ _channels[6]->load(loadData(0x28CA));
+ _channels[8]->load(loadData(0x28FC));
return 0;
}
int ASound3::command65() {
- _channels[6]->load(loadData(0x2919, 17));
- _channels[8]->load(loadData(0x292A, 13));
+ _channels[6]->load(loadData(0x2919));
+ _channels[8]->load(loadData(0x292A));
return 0;
}
int ASound3::command66() {
- _channels[6]->load(loadData(0x2937, 31));
- _channels[7]->load(loadData(0x2956, 15));
- _channels[8]->load(loadData(0x2965, 31));
+ _channels[6]->load(loadData(0x2937));
+ _channels[7]->load(loadData(0x2956));
+ _channels[8]->load(loadData(0x2965));
return 0;
}
int ASound3::command67() {
- playSound(0x2984, 10);
+ playSound(0x2984);
return 0;
}
int ASound3::command68() {
- playSound(0x2998, 22);
- playSound(0x29AE, 20);
- playSound(0x29C2, 22);
+ playSound(0x2998);
+ playSound(0x29AE);
+ playSound(0x29C2);
return 0;
}
int ASound3::command69() {
- playSound(0x29D8, 18);
+ playSound(0x29D8);
return 0;
}
int ASound3::command70() {
- playSound(0x2B4F, 15);
+ playSound(0x2B4F);
return 0;
}
int ASound3::command71() {
- playSound(0x2B5E, 54);
+ playSound(0x2B5E);
return 0;
}
int ASound3::command72() {
- _channels[7]->load(loadData(0x29EA, 17));
- _channels[8]->load(loadData(0x2A18, 17));
+ _channels[7]->load(loadData(0x29EA));
+ _channels[8]->load(loadData(0x2A18));
return 0;
}
int ASound3::command73() {
- playSound(0x2A44, 10);
+ playSound(0x2A44);
return 0;
}
int ASound3::command74() {
- playSound(0x2A4E, 46);
+ playSound(0x2A4E);
return 0;
}
int ASound3::command75() {
- _channels[7]->load(loadData(0x29FB, 29));
- _channels[8]->load(loadData(0x2A29, 27));
+ _channels[7]->load(loadData(0x29FB));
+ _channels[8]->load(loadData(0x2A29));
return 0;
}
@@ -863,21 +863,21 @@ int ASound3::command75() {
*-----------------------------------------------------------------------*/
const ASound4::CommandPtr ASound4::_commandList[71] = {
- // commands 0–8 (asound_commands1)
+ // commands 0-8 (asound_commands1)
&ASound4::command0, &ASound4::command1, &ASound4::command2, &ASound4::command3,
&ASound4::command4, &ASound4::command5, &ASound4::command6, &ASound4::command7,
&ASound4::command8,
- // 9–15 absent
+ // 9-15 absent
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
// command 16 (asound_commands2)
&ASound4::command16,
- // 17–23 absent
+ // 17-23 absent
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
- // commands 24–27 (asound_commands3)
+ // commands 24-27 (asound_commands3)
&ASound4::command24, &ASound4::command25, &ASound4::command26, &ASound4::command27,
- // 28–63 absent (the 0x20-range table has max=0, unreachable)
+ // 28-63 absent (the 0x20-range table has max=0, unreachable)
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
@@ -887,7 +887,7 @@ const ASound4::CommandPtr ASound4::_commandList[71] = {
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
- // commands 64–70 (asound_commands4)
+ // commands 64-70 (asound_commands4)
&ASound4::command64, &ASound4::command65, &ASound4::command66, &ASound4::command67,
&ASound4::command68, &ASound4::command69, &ASound4::command70
};
@@ -907,7 +907,7 @@ int ASound4::command(int commandId, int param) {
return (this->*_commandList[commandId])();
}
-// commands 0–8: delegate to base ASound
+// commands 0-8: delegate to base ASound
int ASound4::command0() { return ASound::command0(); }
int ASound4::command1() { return ASound::command1(); }
int ASound4::command2() { return ASound::command2(); }
@@ -919,33 +919,33 @@ int ASound4::command7() { return ASound::command7(); }
int ASound4::command8() { return ASound::command8(); }
// ---------------------------------------------------------------------------
-// command16 – isSoundActive guard, command1, load ch0–6
+// command16 - isSoundActive guard, command1, load ch0-6
// ---------------------------------------------------------------------------
int ASound4::command16() {
- byte *pData = loadData(0x0C36, 63);
+ byte *pData = loadData(0x0C36);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x0C75, 636));
- _channels[2]->load(loadData(0x0EF1, 40));
- _channels[3]->load(loadData(0x0F19, 40));
- _channels[4]->load(loadData(0x0F41, 38));
- _channels[5]->load(loadData(0x0F67, 41));
- _channels[6]->load(loadData(0x0F90, 106));
+ _channels[1]->load(loadData(0x0C75));
+ _channels[2]->load(loadData(0x0EF1));
+ _channels[3]->load(loadData(0x0F19));
+ _channels[4]->load(loadData(0x0F41));
+ _channels[5]->load(loadData(0x0F67));
+ _channels[6]->load(loadData(0x0F90));
}
return 0;
}
// ---------------------------------------------------------------------------
-// commands 24–27 (asound_commands3) – upper pool
+// commands 24-27 (asound_commands3) - upper pool
//
// commands 24 and 25 are both wired to the same handler,
// which loads two upper-pool sounds.
// ---------------------------------------------------------------------------
int ASound4::command24() {
- playSound(0x0FFA, 18);
- playSound(0x100C, 11);
+ playSound(0x0FFA);
+ playSound(0x100C);
return 0;
}
@@ -954,57 +954,57 @@ int ASound4::command25() {
}
int ASound4::command26() {
- playSound(0x119D, 12);
+ playSound(0x119D);
return 0;
}
int ASound4::command27() {
- playSound(0x11A9, 121);
+ playSound(0x11A9);
return 0;
}
// ---------------------------------------------------------------------------
-// commands 64–70 (asound_commands4, base 0x40)
+// commands 64-70 (asound_commands4, base 0x40)
// All entries use the upper pool
// ---------------------------------------------------------------------------
int ASound4::command64() {
- playSound(0x1017, 26);
- playSound(0x1031, 17);
+ playSound(0x1017);
+ playSound(0x1031);
return 0;
}
int ASound4::command65() {
- playSound(0x1042, 9);
- playSound(0x104B, 20);
+ playSound(0x1042);
+ playSound(0x104B);
return 0;
}
int ASound4::command66() {
- playSound(0x105F, 9);
- playSound(0x1068, 16);
+ playSound(0x105F);
+ playSound(0x1068);
return 0;
}
int ASound4::command67() {
- playSound(0x1078, 9);
- playSound(0x1081, 14);
+ playSound(0x1078);
+ playSound(0x1081);
return 0;
}
int ASound4::command68() {
- playSound(0x108F, 12);
+ playSound(0x108F);
return 0;
}
int ASound4::command69() {
- playSound(0x109B, 10);
+ playSound(0x109B);
return 0;
}
int ASound4::command70() {
- playSound(0x10A5, 3);
- playSound(0x10A8, 58);
+ playSound(0x10A5);
+ playSound(0x10A8);
return 0;
}
@@ -1015,33 +1015,33 @@ int ASound4::command70() {
*-----------------------------------------------------------------------*/
const ASound5::CommandPtr ASound5::_commandList[79] = {
- // commands 0–8 (asound_commands1)
+ // commands 0-8 (asound_commands1)
&ASound5::command0, &ASound5::command1, &ASound5::command2, &ASound5::command3,
&ASound5::command4, &ASound5::command5, &ASound5::command6, &ASound5::command7,
&ASound5::command8,
- // 9–15 absent
+ // 9-15 absent
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
// command 16 (asound_commands2)
&ASound5::command16,
- // 17–23 absent
+ // 17-23 absent
nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
- // commands 24–27 (asound_commands3)
+ // commands 24-27 (asound_commands3)
&ASound5::command24, &ASound5::command25, &ASound5::command26, &ASound5::command27,
- // 28–31 absent
+ // 28-31 absent
nullptr, nullptr, nullptr, nullptr,
- // commands 32–39 (asound_commands4)
+ // commands 32-39 (asound_commands4)
&ASound5::command32, &ASound5::command33, &ASound5::command34, &ASound5::command35,
&ASound5::command36, &ASound5::command37, &ASound5::command38, &ASound5::command39,
- // 40–63 absent
+ // 40-63 absent
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr,
- // commands 64–78 (asound_commands5)
+ // commands 64-78 (asound_commands5)
&ASound5::command64, &ASound5::command65, &ASound5::command66, &ASound5::command67,
&ASound5::command68, &ASound5::command69, &ASound5::command70, &ASound5::command71,
&ASound5::command72, &ASound5::command73, &ASound5::command74, &ASound5::command75,
@@ -1063,7 +1063,7 @@ int ASound5::command(int commandId, int param) {
return (this->*_commandList[commandId])();
}
-// commands 0–8: delegate to base ASound
+// commands 0-8: delegate to base ASound
int ASound5::command0() { return ASound::command0(); }
int ASound5::command1() { return ASound::command1(); }
int ASound5::command2() { return ASound::command2(); }
@@ -1075,245 +1075,245 @@ int ASound5::command7() { return ASound::command7(); }
int ASound5::command8() { return ASound::command8(); }
// ---------------------------------------------------------------------------
-// command16 – isSoundActive guard, command1, load ch0–5
+// command16 - isSoundActive guard, command1, load ch0-5
// ---------------------------------------------------------------------------
int ASound5::command16() {
- byte *pData = loadData(0x4142, 120);
+ byte *pData = loadData(0x4142);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x41BA, 146));
- _channels[2]->load(loadData(0x424C, 133));
- _channels[3]->load(loadData(0x42D1, 69));
- _channels[4]->load(loadData(0x4316, 152));
- _channels[5]->load(loadData(0x43AE, 14));
+ _channels[1]->load(loadData(0x41BA));
+ _channels[2]->load(loadData(0x424C));
+ _channels[3]->load(loadData(0x42D1));
+ _channels[4]->load(loadData(0x4316));
+ _channels[5]->load(loadData(0x43AE));
}
return 0;
}
// ---------------------------------------------------------------------------
-// commands 24–27 (asound_commands3) – upper pool
+// commands 24-27 (asound_commands3) - upper pool
// ---------------------------------------------------------------------------
int ASound5::command24() {
- playSound(0x51FA, 51);
- playSound(0x522D, 46);
+ playSound(0x51FA);
+ playSound(0x522D);
return 0;
}
int ASound5::command25() {
- playSound(0x525B, 44);
- playSound(0x5287, 46);
+ playSound(0x525B);
+ playSound(0x5287);
return 0;
}
int ASound5::command26() {
- playSound(0x52B5, 12);
+ playSound(0x52B5);
return 0;
}
// three upper-pool voices
int ASound5::command27() {
- playSound(0x4040, 10);
- playSound(0x404A, 23);
- playSound(0x4061, 25);
+ playSound(0x4040);
+ playSound(0x404A);
+ playSound(0x4061);
return 0;
}
// ---------------------------------------------------------------------------
-// commands 32–39 (asound_commands4)
+// commands 32-39 (asound_commands4)
// ---------------------------------------------------------------------------
// command1, eight loadAny (lower pool, AdlibChannel_loadAny)
int ASound5::command32() {
ASound::command1();
- findFreeChannel(loadData(0x43BC, 689));
- findFreeChannel(loadData(0x466D, 262));
- findFreeChannel(loadData(0x4773, 480));
- findFreeChannel(loadData(0x4953, 504));
- findFreeChannel(loadData(0x4B4B, 584));
- findFreeChannel(loadData(0x4D93, 308));
- findFreeChannel(loadData(0x4EC7, 426));
- findFreeChannel(loadData(0x5071, 357));
+ findFreeChannel(loadData(0x43BC));
+ findFreeChannel(loadData(0x466D));
+ findFreeChannel(loadData(0x4773));
+ findFreeChannel(loadData(0x4953));
+ findFreeChannel(loadData(0x4B4B));
+ findFreeChannel(loadData(0x4D93));
+ findFreeChannel(loadData(0x4EC7));
+ findFreeChannel(loadData(0x5071));
return 0;
}
-// isSoundActive guard, command1, load ch0–6
+// isSoundActive guard, command1, load ch0-6
int ASound5::command33() {
- byte *pData = loadData(0x21C6, 609);
+ byte *pData = loadData(0x21C6);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x2427, 652));
- _channels[2]->load(loadData(0x26B3, 272));
- _channels[3]->load(loadData(0x27C3, 558));
- _channels[4]->load(loadData(0x29F1, 712));
- _channels[5]->load(loadData(0x2CB9, 464));
- _channels[6]->load(loadData(0x2E89, 21));
+ _channels[1]->load(loadData(0x2427));
+ _channels[2]->load(loadData(0x26B3));
+ _channels[3]->load(loadData(0x27C3));
+ _channels[4]->load(loadData(0x29F1));
+ _channels[5]->load(loadData(0x2CB9));
+ _channels[6]->load(loadData(0x2E89));
}
return 0;
}
-// isSoundActive guard, command1, load ch0–5 (non-sequential)
+// isSoundActive guard, command1, load ch0-5 (non-sequential)
// ch1 and ch3 use data from the 0x4000 region; ch0/ch2/ch4 from 0x2E9E region
int ASound5::command34() {
- byte *pData = loadData(0x2E9E, 1521);
+ byte *pData = loadData(0x2E9E);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x4003, 7));
- _channels[2]->load(loadData(0x348F, 1424));
- _channels[3]->load(loadData(0x400A, 7));
- _channels[4]->load(loadData(0x3A1F, 1508));
- _channels[5]->load(loadData(0x4011, 9));
+ _channels[1]->load(loadData(0x4003));
+ _channels[2]->load(loadData(0x348F));
+ _channels[3]->load(loadData(0x400A));
+ _channels[4]->load(loadData(0x3A1F));
+ _channels[5]->load(loadData(0x4011));
}
return 0;
}
-// isSoundActive guard, command1, load ch0–5 (non-sequential)
+// isSoundActive guard, command1, load ch0-5 (non-sequential)
// ch1/ch3/ch5 use data from the 0x2196 region interleaved with ch0/ch2/ch4
int ASound5::command35() {
- byte *pData = loadData(0x1D0A, 320);
+ byte *pData = loadData(0x1D0A);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x2196, 18));
- _channels[2]->load(loadData(0x1E4A, 304));
- _channels[3]->load(loadData(0x21A8, 18));
- _channels[4]->load(loadData(0x1F7A, 540));
- _channels[5]->load(loadData(0x21BA, 12));
+ _channels[1]->load(loadData(0x2196));
+ _channels[2]->load(loadData(0x1E4A));
+ _channels[3]->load(loadData(0x21A8));
+ _channels[4]->load(loadData(0x1F7A));
+ _channels[5]->load(loadData(0x21BA));
}
return 0;
}
-// isSoundActive guard, command1, load ch0–5 (non-sequential)
+// isSoundActive guard, command1, load ch0-5 (non-sequential)
// ch4 and ch5 reuse blocks at 0x15EC and 0x18D9 that precede ch0's data
int ASound5::command36() {
- byte *pData = loadData(0x15F5, 740);
+ byte *pData = loadData(0x15F5);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x18E2, 326));
- _channels[2]->load(loadData(0x1A28, 561));
- _channels[3]->load(loadData(0x1C59, 177));
- _channels[4]->load(loadData(0x15EC, 9));
- _channels[5]->load(loadData(0x18D9, 9));
+ _channels[1]->load(loadData(0x18E2));
+ _channels[2]->load(loadData(0x1A28));
+ _channels[3]->load(loadData(0x1C59));
+ _channels[4]->load(loadData(0x15EC));
+ _channels[5]->load(loadData(0x18D9));
}
return 0;
}
-// isSoundActive guard, command1, load ch0–8
+// isSoundActive guard, command1, load ch0-8
int ASound5::command37() {
- byte *pData = loadData(0x1190, 397);
+ byte *pData = loadData(0x1190);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x131D, 378));
- _channels[2]->load(loadData(0x1497, 60));
- _channels[3]->load(loadData(0x14D3, 64));
- _channels[4]->load(loadData(0x1513, 44));
- _channels[5]->load(loadData(0x153F, 44));
- _channels[6]->load(loadData(0x156B, 50));
- _channels[7]->load(loadData(0x159D, 52));
- _channels[8]->load(loadData(0x15D1, 27));
+ _channels[1]->load(loadData(0x131D));
+ _channels[2]->load(loadData(0x1497));
+ _channels[3]->load(loadData(0x14D3));
+ _channels[4]->load(loadData(0x1513));
+ _channels[5]->load(loadData(0x153F));
+ _channels[6]->load(loadData(0x156B));
+ _channels[7]->load(loadData(0x159D));
+ _channels[8]->load(loadData(0x15D1));
}
return 0;
}
-// isSoundActive guard, command2 (lower-bank fade), load ch0–5
+// isSoundActive guard, command2 (lower-bank fade), load ch0-5
int ASound5::command38() {
- byte *pData = loadData(0x0C36, 329);
+ byte *pData = loadData(0x0C36);
if (!isSoundActive(pData)) {
ASound::command2();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x0D7F, 201));
- _channels[2]->load(loadData(0x0E48, 200));
- _channels[3]->load(loadData(0x0F10, 162));
- _channels[4]->load(loadData(0x0FB2, 228));
- _channels[5]->load(loadData(0x1096, 250));
+ _channels[1]->load(loadData(0x0D7F));
+ _channels[2]->load(loadData(0x0E48));
+ _channels[3]->load(loadData(0x0F10));
+ _channels[4]->load(loadData(0x0FB2));
+ _channels[5]->load(loadData(0x1096));
}
return 0;
}
-// isSoundActive guard, command3 (lower-bank fade only), load ch0–5
+// isSoundActive guard, command3 (lower-bank fade only), load ch0-5
int ASound5::command39() {
- byte *pData = loadData(0x5312, 599);
+ byte *pData = loadData(0x5312);
if (!isSoundActive(pData)) {
ASound::command3();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x5569, 275));
- _channels[2]->load(loadData(0x567C, 289));
- _channels[3]->load(loadData(0x579D, 243));
- _channels[4]->load(loadData(0x5890, 196));
- _channels[5]->load(loadData(0x5954, 206));
+ _channels[1]->load(loadData(0x5569));
+ _channels[2]->load(loadData(0x567C));
+ _channels[3]->load(loadData(0x579D));
+ _channels[4]->load(loadData(0x5890));
+ _channels[5]->load(loadData(0x5954));
}
return 0;
}
// ---------------------------------------------------------------------------
-// commands 64–78 (asound_commands5) – upper pool unless noted
+// commands 64-78 (asound_commands5) - upper pool unless noted
// ---------------------------------------------------------------------------
int ASound5::command64() {
- playSound(0x4101, 10);
+ playSound(0x4101);
return 0;
}
int ASound5::command65() {
- playSound(0x401A, 18);
+ playSound(0x401A);
return 0;
}
int ASound5::command66() {
- playSound(0x402C, 10);
+ playSound(0x402C);
return 0;
}
int ASound5::command67() {
- playSound(0x4036, 10);
+ playSound(0x4036);
return 0;
}
int ASound5::command68() {
- playSound(0x407A, 18);
+ playSound(0x407A);
return 0;
}
int ASound5::command69() {
- playSound(0x408C, 46);
+ playSound(0x408C);
return 0;
}
// also shared by command77 and command78
int ASound5::command70() {
- playSound(0x40BA, 14);
+ playSound(0x40BA);
return 0;
}
int ASound5::command71() {
- playSound(0x40C8, 10);
+ playSound(0x40C8);
return 0;
}
int ASound5::command72() {
- playSound(0x40D2, 10);
+ playSound(0x40D2);
return 0;
}
int ASound5::command73() {
- playSound(0x40DC, 11);
- playSound(0x40E7, 26);
+ playSound(0x40DC);
+ playSound(0x40E7);
return 0;
}
int ASound5::command74() {
- playSound(0x410B, 20);
+ playSound(0x410B);
return 0;
}
int ASound5::command75() {
- playSound(0x4129, 11);
- playSound(0x4134, 14);
+ playSound(0x4129);
+ playSound(0x4134);
return 0;
}
@@ -1328,7 +1328,7 @@ int ASound5::command77() {
}
int ASound5::command78() {
- playSound(0x411F, 10);
+ playSound(0x411F);
return 0;
}
@@ -1370,7 +1370,7 @@ int ASound9::command(int commandId, int param) {
return (this->*_commandList[commandId])();
}
-// commands 0–8: delegate to base ASound
+// commands 0-8: delegate to base ASound
int ASound9::command0() {
return ASound::command0();
}
@@ -1400,37 +1400,37 @@ int ASound9::command8() {
}
int ASound9::command24() {
- playSound(0x203E, 51);
- playSound(0x2071, 46);
+ playSound(0x203E);
+ playSound(0x2071);
return 0;
}
int ASound9::command25() {
- playSound(0x209F, 44);
- playSound(0x20CB, 46);
+ playSound(0x209F);
+ playSound(0x20CB);
return 0;
}
int ASound9::command26() {
- playSound(0x20F9, 12);
+ playSound(0x20F9);
return 0;
}
int ASound9::command27() {
- playSound(0x2105, 81);
+ playSound(0x2105);
return 0;
}
int ASound9::command32() {
ASound::command1();
- findFreeChannel(loadData(0x2B16, 86));
- findFreeChannel(loadData(0x2B6C, 74));
- findFreeChannel(loadData(0x2BB6, 722));
- findFreeChannel(loadData(0x2E88, 16));
- findFreeChannel(loadData(0x2E98, 11));
- findFreeChannel(loadData(0x2EA3, 11));
- findFreeChannel(loadData(0x2EAE, 9));
- findFreeChannel(loadData(0x2EB7, 15));
+ findFreeChannel(loadData(0x2B16));
+ findFreeChannel(loadData(0x2B6C));
+ findFreeChannel(loadData(0x2BB6));
+ findFreeChannel(loadData(0x2E88));
+ findFreeChannel(loadData(0x2E98));
+ findFreeChannel(loadData(0x2EA3));
+ findFreeChannel(loadData(0x2EAE));
+ findFreeChannel(loadData(0x2EB7));
return 0;
}
@@ -1440,131 +1440,131 @@ int ASound9::command33() {
int ASound9::command34() {
ASound::command1();
- _channels[0]->load(loadData(0x31D0, 81));
- _channels[1]->load(loadData(0x3221, 97));
- _channels[2]->load(loadData(0x3282, 73));
- _channels[3]->load(loadData(0x32CB, 79));
- _channels[4]->load(loadData(0x331A, 79));
- _channels[5]->load(loadData(0x3369, 71));
- _channels[6]->load(loadData(0x33B0, 736));
+ _channels[0]->load(loadData(0x31D0));
+ _channels[1]->load(loadData(0x3221));
+ _channels[2]->load(loadData(0x3282));
+ _channels[3]->load(loadData(0x32CB));
+ _channels[4]->load(loadData(0x331A));
+ _channels[5]->load(loadData(0x3369));
+ _channels[6]->load(loadData(0x33B0));
return 0;
}
int ASound9::command35() {
ASound::command1();
- _channels[0]->load(loadData(0x295E, 64));
- _channels[1]->load(loadData(0x299E, 37));
- _channels[2]->load(loadData(0x29C3, 37));
- _channels[3]->load(loadData(0x29E8, 94));
- _channels[4]->load(loadData(0x2A46, 95));
- _channels[5]->load(loadData(0x2AA5, 59));
- _channels[6]->load(loadData(0x2AE0, 54));
+ _channels[0]->load(loadData(0x295E));
+ _channels[1]->load(loadData(0x299E));
+ _channels[2]->load(loadData(0x29C3));
+ _channels[3]->load(loadData(0x29E8));
+ _channels[4]->load(loadData(0x2A46));
+ _channels[5]->load(loadData(0x2AA5));
+ _channels[6]->load(loadData(0x2AE0));
return 0;
}
int ASound9::command36() {
ASound::command1();
- _channels[0]->load(loadData(0x30AA, 51));
- _channels[1]->load(loadData(0x30DD, 44));
- _channels[2]->load(loadData(0x3109, 52));
- _channels[3]->load(loadData(0x313D, 56));
- _channels[4]->load(loadData(0x3175, 38));
- _channels[5]->load(loadData(0x319B, 53));
+ _channels[0]->load(loadData(0x30AA));
+ _channels[1]->load(loadData(0x30DD));
+ _channels[2]->load(loadData(0x3109));
+ _channels[3]->load(loadData(0x313D));
+ _channels[4]->load(loadData(0x3175));
+ _channels[5]->load(loadData(0x319B));
return 0;
}
int ASound9::command37() {
ASound::command1();
- _channels[0]->load(loadData(0x2156, 80));
- _channels[1]->load(loadData(0x21A6, 232));
- _channels[2]->load(loadData(0x228E, 105));
- _channels[3]->load(loadData(0x22F7, 90));
- _channels[4]->load(loadData(0x2351, 599));
- _channels[5]->load(loadData(0x25A8, 791));
- _channels[6]->load(loadData(0x28BF, 159));
+ _channels[0]->load(loadData(0x2156));
+ _channels[1]->load(loadData(0x21A6));
+ _channels[2]->load(loadData(0x228E));
+ _channels[3]->load(loadData(0x22F7));
+ _channels[4]->load(loadData(0x2351));
+ _channels[5]->load(loadData(0x25A8));
+ _channels[6]->load(loadData(0x28BF));
return 0;
}
int ASound9::command38() {
- byte *pData = loadData(0x11BC, 699);
+ byte *pData = loadData(0x11BC);
if (!isSoundActive(pData)) {
ASound::command1();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x1477, 278));
- _channels[2]->load(loadData(0x158D, 490));
- _channels[3]->load(loadData(0x1777, 512));
- _channels[4]->load(loadData(0x1977, 590));
- _channels[5]->load(loadData(0x1BC5, 314));
- _channels[6]->load(loadData(0x1CFF, 432));
- _channels[7]->load(loadData(0x1EAF, 399));
+ _channels[1]->load(loadData(0x1477));
+ _channels[2]->load(loadData(0x158D));
+ _channels[3]->load(loadData(0x1777));
+ _channels[4]->load(loadData(0x1977));
+ _channels[5]->load(loadData(0x1BC5));
+ _channels[6]->load(loadData(0x1CFF));
+ _channels[7]->load(loadData(0x1EAF));
}
return 0;
}
int ASound9::command39() {
- byte *pData = loadData(0x0C36, 327);
+ byte *pData = loadData(0x0C36);
if (!isSoundActive(pData)) {
ASound::command0();
_channels[0]->load(pData);
- _channels[1]->load(loadData(0x0D7D, 211));
- _channels[2]->load(loadData(0x0E50, 204));
- _channels[3]->load(loadData(0x0F1C, 178));
- _channels[4]->load(loadData(0x0FCE, 236));
- _channels[5]->load(loadData(0x10BA, 258));
+ _channels[1]->load(loadData(0x0D7D));
+ _channels[2]->load(loadData(0x0E50));
+ _channels[3]->load(loadData(0x0F1C));
+ _channels[4]->load(loadData(0x0FCE));
+ _channels[5]->load(loadData(0x10BA));
}
return 0;
}
int ASound9::command64() {
- playSound(0x2EC6, 20);
+ playSound(0x2EC6);
return 0;
}
int ASound9::command65() {
- playSound(0x2EDA, 10);
+ playSound(0x2EDA);
return 0;
}
int ASound9::command66() {
- _channels[0]->load(loadData(0x2EE4, 42));
- _channels[1]->load(loadData(0x2F0E, 48));
- _channels[2]->load(loadData(0x2F3E, 48));
- _channels[3]->load(loadData(0x2F6E, 48));
- _channels[4]->load(loadData(0x2EE4, 42));
- _channels[5]->load(loadData(0x2F0E, 48));
- _channels[6]->load(loadData(0x2F3E, 48));
- _channels[7]->load(loadData(0x2F6E, 48));
+ _channels[0]->load(loadData(0x2EE4));
+ _channels[1]->load(loadData(0x2F0E));
+ _channels[2]->load(loadData(0x2F3E));
+ _channels[3]->load(loadData(0x2F6E));
+ _channels[4]->load(loadData(0x2EE4));
+ _channels[5]->load(loadData(0x2F0E));
+ _channels[6]->load(loadData(0x2F3E));
+ _channels[7]->load(loadData(0x2F6E));
return 0;
}
int ASound9::command67() {
- _channels[6]->load(loadData(0x2F9E, 31));
- _channels[7]->load(loadData(0x2FBD, 15));
- _channels[8]->load(loadData(0x2FCC, 31));
+ _channels[6]->load(loadData(0x2F9E));
+ _channels[7]->load(loadData(0x2FBD));
+ _channels[8]->load(loadData(0x2FCC));
return 0;
}
int ASound9::command68() {
- playSound(0x2FEB, 10);
+ playSound(0x2FEB);
return 0;
}
int ASound9::command69() {
- playSound(0x2FF5, 38);
- playSound(0x301B, 38);
- playSound(0x3041, 26);
+ playSound(0x2FF5);
+ playSound(0x301B);
+ playSound(0x3041);
return 0;
}
int ASound9::command70() {
- playSound(0x305B, 9);
- playSound(0x3064, 9);
+ playSound(0x305B);
+ playSound(0x3064);
return 0;
}
int ASound9::command71() {
- playSound(0x306D, 29);
- playSound(0x308A, 32);
+ playSound(0x306D);
+ playSound(0x308A);
return 0;
}
More information about the Scummvm-git-logs
mailing list