aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWohlstand <admin@wohlnet.ru>2020-08-21 14:58:12 +0300
committerWohlstand <admin@wohlnet.ru>2020-08-21 14:58:12 +0300
commitc20df9edf6c19a130dd794a9d6c82c93351afbcc (patch)
treef72525f3dac1e9cd59d0c5b0909dbc7cd38ff504
parent0f6e197d1f2243e1fb9415e1ea2209c39b972650 (diff)
downloadlibADLMIDI-c20df9edf6c19a130dd794a9d6c82c93351afbcc.tar.gz
libADLMIDI-c20df9edf6c19a130dd794a9d6c82c93351afbcc.tar.bz2
libADLMIDI-c20df9edf6c19a130dd794a9d6c82c93351afbcc.zip
Replace the second voice formula
Diffstat
-rw-r--r--fm_banks/adldata-cache.datbin570752 -> 572432 bytes
-rw-r--r--src/adldata.cpp541
-rw-r--r--src/adlmidi_cvt.hpp11
-rw-r--r--utils/gen_adldata/file_formats/load_op2.h7
-rw-r--r--utils/gen_adldata/file_formats/load_wopl.h10
5 files changed, 296 insertions, 273 deletions
diff --git a/fm_banks/adldata-cache.dat b/fm_banks/adldata-cache.dat
index f502b87..7a826d2 100644
--- a/fm_banks/adldata-cache.dat
+++ b/fm_banks/adldata-cache.dat
Binary files differ
diff --git a/src/adldata.cpp b/src/adldata.cpp
index 8b63b8b..6abbc2d 100644
--- a/src/adldata.cpp
+++ b/src/adldata.cpp
@@ -4,7 +4,7 @@
* FROM A NUMBER OF SOURCES, MOSTLY PC GAMES.
* PREPROCESSED, CONVERTED, AND POSTPROCESSED OFF-SCREEN.
*/
-const adldata adl[4578] =
+const adldata adl[4597] =
{ // ,---------+-------- Wave select settings
// | ,-------ч-+------ Sustain/release rates
// | | ,-----ч-ч-+---- Attack/decay rates
@@ -4492,24 +4492,27 @@ const adldata adl[4578] =
{ 0x023F331,0x09C4333, 0x45,0x25, 0x6, -12 },
{ 0x04CA700,0x04FC600, 0x00,0x2B, 0x0, -12 },
{ 0x0B5F704,0x002010C, 0x00,0x00, 0x8, +21 },
- { 0x050F113,0x076D201, 0x50,0x40, 0x6, +0 },
+ { 0x050F101,0x076D201, 0x4B,0x00, 0x6, +0 },
{ 0x050F113,0x076D201, 0x50,0x00, 0x6, +0 },
{ 0x054F113,0x076D201, 0x53,0x00, 0x6, +0 },
- { 0x054F113,0x076D201, 0x50,0x00, 0x6, +0 },
+ { 0x000F153,0x086D251, 0x4E,0x00, 0x6, +0 },
{ 0x0FFF92C,0x0FFC1A1, 0xD4,0x00, 0x0, +0 },
- { 0x050F101,0x07CD301, 0x4F,0x00, 0x6, +0 },
+ { 0x013FF34,0x0F7F423, 0x92,0x00, 0xA, +0 },
{ 0x030A131,0x074C216, 0x81,0x80, 0x8, +0 },
- { 0x0FFF201,0x0F8F101, 0x11,0x00, 0xA, +0 },
- { 0x011FAD6,0x0FCF161, 0x4D,0x00, 0x8, +0 },
+ { 0x0100132,0x0337212, 0x80,0x80, 0x8, +0 },
{ 0x011FA16,0x0F1F1E1, 0x4D,0x00, 0x8, +0 },
{ 0x011FAD6,0x0F5F561, 0x4D,0x00, 0x8, +0 },
{ 0x015DA45,0x0F6F361, 0x4E,0x80, 0x0, +0 },
{ 0x0F0FE04,0x0B5F6C2, 0x00,0x00, 0xE, -12 },
{ 0x004FE11,0x0BDF211, 0x11,0x00, 0x8, +0 },
- { 0x00FFF24,0x00FFF21, 0x80,0x80, 0x1, -12 },
+ { 0x0E5F82B,0x0FFC021, 0xCA,0x00, 0x0, -12 },
{ 0x0FFF92C,0x0FFC0A1, 0xD4,0x00, 0x0, -12 },
{ 0x0E5F8E2,0x00EC0E1, 0xCA,0x00, 0x8, +0 },
+ { 0x001B064,0x0877061, 0xC9,0x00, 0x2, +0 },
+ { 0x006F224,0x0065231, 0x4F,0x00, 0xE, +0 },
{ 0x0FD5524,0x02D5031, 0x54,0x00, 0xE, +0 },
+ { 0x055F101,0x074F111, 0x4D,0x02, 0x6, +0 },
+ { 0x056F101,0x076F111, 0x90,0x04, 0x6, +0 },
{ 0x0C8F253,0x0C5F211, 0x16,0x40, 0x4, +0 },
{ 0x0C8F253,0x0C5F211, 0x20,0x00, 0x4, +0 },
{ 0x0FFF111,0x3FFF054, 0x43,0x00, 0x8, +0 },
@@ -4525,17 +4528,22 @@ const adldata adl[4578] =
{ 0x0035171,0x0175423, 0x1C,0x00, 0xE, +0 },
{ 0x04CA800,0x04FD600, 0x0B,0x00, 0x0, +12 },
{ 0x075F502,0x0F3F201, 0x29,0x80, 0x0, +0 },
- { 0x0530900,0x094F702, 0x40,0x00, 0xE, -12 },
+ { 0x053F300,0x094F702, 0x7F,0x00, 0xF, -12 },
{ 0x01432F1,0x016F1E1, 0x18,0x00, 0x0, +0 },
{ 0x01432F1,0x01631E1, 0x18,0x00, 0x0, +0 },
{ 0x01132F1,0x014F1E1, 0x18,0x00, 0x0, +0 },
{ 0x0154011,0x03831F1, 0x92,0x00, 0x8, +0 },
{ 0x0948411,0x0F4F4E4, 0x03,0x40, 0x8, -12 },
{ 0x0577361,0x017A021, 0x19,0x00, 0xC, +0 },
- { 0x0585361,0x018A021, 0x19,0x00, 0xC, +0 },
+ { 0x0064131,0x036A061, 0x1F,0x00, 0xC, +0 },
{ 0x0565361,0x016A021, 0x19,0x00, 0xC, +0 },
{ 0x0035171,0x0675421, 0x1C,0x00, 0xE, +0 },
+ { 0x0A67121,0x096A121, 0x1B,0x00, 0xE, +0 },
{ 0x0576361,0x017A021, 0x1C,0x00, 0xC, +0 },
+ { 0x00A6321,0x00B6321, 0x1B,0x00, 0xC, +0 },
+ { 0x00E6321,0x00E6321, 0x16,0x00, 0xC, +0 },
+ { 0x00A6331,0x00B6321, 0x16,0x00, 0xC, +0 },
+ { 0x00A6320,0x00B6321, 0x1B,0x00, 0xC, +12 },
{ 0x0176E70,0x00E6B22, 0x8D,0x00, 0x2, +12 },
{ 0x00E7170,0x00E7823, 0x16,0x07, 0xE, +12 },
{ 0x0178731,0x00E8B22, 0x45,0x00, 0x2, +0 },
@@ -4544,39 +4552,50 @@ const adldata adl[4578] =
{ 0x0AFD6A1,0x02A60E2, 0x13,0x80, 0x2, +0 },
{ 0x02498A2,0x02A60E2, 0x1D,0x80, 0x2, -12 },
{ 0x04FD6A1,0x02A60E2, 0x13,0x80, 0x2, +0 },
- { 0x0BF7721,0x02A60A1, 0x19,0x80, 0x6, +0 },
+ { 0x1063F53,0x0075F00, 0x85,0x00, 0x6, +12 },
+ { 0x0C70CF5,0x0A560F6, 0x9A,0x80, 0xD, -31 },
{ 0x0E5F8E2,0x00E70E1, 0xCA,0x00, 0x8, +0 },
{ 0x30FF221,0x018F221, 0x1D,0x00, 0x0, +0 },
{ 0x0FFF041,0x0FFF001, 0x11,0x00, 0xA, +0 },
+ { 0x030F4A4,0x02A60E2, 0x12,0x8B, 0x2, -12 },
{ 0x0BDF101,0x39FF102, 0xCE,0x80, 0x0, +0 },
{ 0x0FFF141,0x0FFF001, 0x0E,0x09, 0xA, +0 },
- { 0x0867261,0x01450E1, 0xA7,0x80, 0x2, +0 },
- { 0x049F430,0x033F410, 0x90,0x00, 0xC, +12 },
- { 0x0F0F0CA,0x06459CC, 0x4E,0x00, 0xC, +0 },
+ { 0x033F507,0x025F061, 0x51,0x00, 0x6, +0 },
+ { 0x0114131,0x0132261, 0x8B,0x00, 0x6, +0 },
+ { 0x049F430,0x033F430, 0x90,0x00, 0xC, +12 },
+ { 0x021FF31,0x0159461, 0x8E,0x01, 0xA, +0 },
+ { 0x0F0F0CA,0x06459CC, 0x4E,0x00, 0xC, -12 },
{ 0x0152011,0x0F831F1, 0x43,0x00, 0x8, +0 },
{ 0x0152011,0x0F831F1, 0x92,0x00, 0x8, +0 },
{ 0x010FF34,0x004FF03, 0x91,0x00, 0xA, +0 },
- { 0x002A4B0,0x04240D7, 0x84,0x80, 0x0, +0 },
+ { 0x0411217,0x0311331, 0xC0,0x80, 0x6, +0 },
{ 0x032B6B3,0x031D1B0, 0x4A,0x00, 0xE, +12 },
+ { 0x055F503,0x033F321, 0x8F,0x80, 0x0, +0 },
+ { 0x053F173,0x003F171, 0x48,0x0B, 0x8, +0 },
+ { 0x0114131,0x0153261, 0x8B,0x00, 0x2, +0 },
{ 0x0978211,0x0F3F0E4, 0x03,0x40, 0x8, +0 },
{ 0x002A4B4,0x04240D7, 0x87,0x80, 0x6, +0 },
- { 0x0F0A133,0x0F37115, 0x85,0x80, 0x8, +0 },
- { 0x053F101,0x074F211, 0x4F,0x00, 0x6, +0 },
- { 0x0E8F80B,0x0F4C301, 0xCA,0x00, 0x0, +0 },
+ { 0x011A131,0x0457D16, 0x87,0x80, 0x8, +0 },
+ { 0x0530900,0x094F702, 0x40,0x00, 0xE, -12 },
{ 0x0FFF001,0x0F8F001, 0x11,0x00, 0xA, +0 },
{ 0x0EE7130,0x01E8823, 0x16,0x00, 0xE, +0 },
+ { 0x055F587,0x054F022, 0x91,0x00, 0x6, +0 },
{ 0x025DA09,0x015F101, 0x4E,0x00, 0xA, +0 },
{ 0x0FFF832,0x07FF511, 0x44,0x00, 0xE, +12 },
- { 0x0F33900,0x005FF00, 0x3F,0x00, 0x0, +12 },
+ { 0x0F33900,0x005FF00, 0x3F,0x00, 0x1, +12 },
{ 0x0FFF832,0x0F8F501, 0x44,0x00, 0xE, +0 },
{ 0x0F0F007,0x0DC5C00, 0x00,0x00, 0xE, +12 },
+ { 0x0160020,0x01550E2, 0x5B,0x80, 0xA, -12 },
+ { 0x053D10F,0x0562200, 0x40,0x0B, 0xE, +0 },
+ { 0x05BE51C,0x0FA5D0C, 0x1E,0x0B, 0xE, +0 },
{ 0x002A4B0,0x04240D7, 0xC4,0x89, 0x0, +0 },
- { 0x1111EF0,0x11121E2, 0x00,0xC0, 0x8, -12 },
+ { 0x053D100,0x0566200, 0x40,0x0B, 0xE, +0 },
+ { 0x0A0F406,0x046F600, 0x00,0x00, 0xE, +0 },
{ 0x0EFE800,0x0FFA500, 0x0D,0x00, 0x6, +12 },
{ 0x077F005,0x0EDFA00, 0x00,0x00, 0xE, +12 },
{ 0x0F0F006,0x0F7F700, 0x00,0x00, 0xE, +12 },
{ 0x1FFF005,0x0B9F800, 0x00,0x00, 0xE, +0 },
- { 0x0F33900,0x005FF00, 0x3F,0x00, 0x0, +0 },
+ { 0x0F33900,0x005FF00, 0x3F,0x00, 0x1, +0 },
{ 0x077F005,0x0FBFA00, 0x00,0x00, 0xE, +0 },
{ 0x077F005,0x0EAFA00, 0x00,0x00, 0xE, +12 },
{ 0x0FFF005,0x0FFF600, 0x00,0x06, 0xE, +0 },
@@ -4586,16 +4605,16 @@ const adldata adl[4578] =
{ 0x0F0F406,0x0F78700, 0x00,0x0D, 0xE, +0 },
{ 0x1FFF005,0x0B9F800, 0x00,0x00, 0x8, +0 },
{ 0x0F0F000,0x0F5F500, 0x00,0x09, 0xA, +0 },
- { 0x0590900,0x097F700, 0x40,0x00, 0x0, +24 },
+ { 0x0590900,0x097F700, 0x7F,0x00, 0x1, +24 },
{ 0x052F301,0x194F700, 0x40,0x00, 0x0, +12 },
- { 0x0530907,0x096F605, 0x40,0x00, 0xE, +0 },
+ { 0x0530907,0x096F605, 0x7F,0x00, 0xF, +0 },
{ 0x070F005,0x0E57A00, 0x00,0x10, 0xE, +12 },
{ 0x070F005,0x0E59A00, 0x00,0x10, 0xE, +12 },
{ 0x070F005,0x0E55A00, 0x00,0x10, 0xE, +12 },
{ 0x07BF003,0x07BF502, 0x8A,0x80, 0x8, +0 },
{ 0x07BF003,0x07BF402, 0x8A,0x80, 0x8, +0 },
};
-const struct adlinsdata adlins[4756] =
+const struct adlinsdata adlins[4770] =
{
{ 0, 0, 0, 0, 9006, 133, 0, 0 },
{ 1, 1, 0, 0, 9206, 146, 0, 0 },
@@ -5840,9 +5859,9 @@ const struct adlinsdata adlins[4756] =
{1129,1130, 0, 1, 40000, 146, 0, 0.15625 },
{1131,1131, 0, 0, 40000, 433, 0, 0 },
{1132,1132, 0, 0, 40000, 133, 0, 0 },
- {1133,1134, 0, 1, 40000, 126, 0, -0.046875 },
+ {1133,1134, 0, 1, 40000, 126, 0, -0.0625 },
{1135,1135, 0, 0, 40000, 113, 0, 0 },
- {1136,1137, 0, 1, 40000, 253, 0, 2.5e-05 },
+ {1136,1137, 0, 1, 40000, 253, 0, 0 },
{1138,1138, 0, 0, 18440, 240, 0, 0 },
{1139,1139, 0, 0, 5213, 886, 0, 0 },
{1140,1140, 0, 0, 1446, 113, 0, 0 },
@@ -5863,13 +5882,13 @@ const struct adlinsdata adlins[4756] =
{1156,1156, 0, 0, 40000, 220, 0, 0 },
{1157,1157, 0, 0, 40000, 140, 0, 0 },
{1158,1158, 0, 0, 40000, 380, 0, 0 },
- {1159,1160, 0, 1, 40000, 400, 0, 0.171875 },
+ {1159,1160, 0, 1, 40000, 400, 0, 0.15625 },
{1161,1161, 0, 0, 40000, 0, 0, 0 },
{1162,1162, 0, 0, 40000, 0, 0, 0 },
{1163,1163, 0, 0, 4733, 906, 0, 0 },
{1164,1165, 0, 1, 40000, 393, 0, -0.125 },
- {1166,1167, 0, 1, 40000, 366, 0, 0.078125 },
- {1168,1168, 0, 1, 40000, 2453, 0, -0.078125 },
+ {1166,1167, 0, 1, 40000, 366, 0, 0.0625 },
+ {1168,1168, 0, 1, 40000, 2453, 0, -0.09375 },
{1169,1170, 0, 1, 40000, 546, 0, 0.0625 },
{1171,1172, 0, 1, 40000, 786, 0, 0.15625 },
{1173,1173, 0, 0, 40000, 0, 0, 0 },
@@ -5879,8 +5898,8 @@ const struct adlinsdata adlins[4756] =
{1178,1178, 0, 0, 40000, 60, 0, 0 },
{1179,1179, 0, 0, 40000, 0, 0, 0 },
{1180,1180, 0, 0, 10653, 86, 0, 0 },
- {1181,1182, 0, 1, 40000, 0, 0, 2.5e-05 },
- {1183,1184, 0, 1, 40000, 86, 0, 0.046875 },
+ {1181,1182, 0, 1, 40000, 0, 0, 0 },
+ {1183,1184, 0, 1, 40000, 86, 0, 0.03125 },
{1185,1186, 0, 1, 40000, 0, 0, 0.09375 },
{1187,1188, 0, 1, 40000, 0, 0, 0.09375 },
{1189,1189, 0, 0, 40000, 133, 0, 0 },
@@ -5900,16 +5919,16 @@ const struct adlinsdata adlins[4756] =
{1203,1203, 0, 0, 40000, 233, 0, 0 },
{1204,1204, 0, 0, 40000, 100, 0, 0 },
{1205,1206, 0, 1, 40000, 266, 0, 0.03125 },
- {1207,1208, 0, 1, 40000, 260, 0, -2.5e-05 },
+ {1207,1208, 0, 1, 40000, 260, 0, -0.03125 },
{1209,1209, 0, 0, 40000, 146, 0, 0 },
{1210,1211, 0, 1, 40000, 60, 0, 0.03125 },
{1212,1212, 0, 0, 40000, 53, 0, 0 },
{1213,1214, 0, 1, 40000, 706, 0, -0.09375 },
- {1215,1216, 0, 1, 40000, 660, 0, -0.046875 },
+ {1215,1216, 0, 1, 40000, 660, 0, -0.0625 },
{1217,1217, 0, 0, 40000, 133, 0, 0 },
{1218,1219, 0, 1, 40000, 426, 0, 0.03125 },
{1220,1220, 0, 1, 40000, 0, 0, 0.03125 },
- {1221,1222, 0, 1, 40000, 260, 0, 0.171875 },
+ {1221,1222, 0, 1, 40000, 260, 0, 0.15625 },
{1223,1223, 0, 0, 40000, 0, 0, 0 },
{1224,1224, 0, 0, 6100, 1580, 0, 0 },
{1225,1150, 0, 1, 40000, 73, 0, -0.03125 },
@@ -8601,7 +8620,7 @@ const struct adlinsdata adlins[4756] =
{3821,3821, 0, 0, 40000, 0, 0, 0 },
{3822,3822, 0, 0, 10493, 160, 0, 0 },
{3823,3823, 0, 0, 40000, 740, 0, 0 },
- {3824,3825, 0, 1, 40000, 366, 0, 0.078125 },
+ {3824,3825, 0, 1, 40000, 366, 0, 0.0625 },
{3826,3826, 0, 0, 40000, 5100, 0, 0 },
{3827,3827, 0, 0, 40000, 766, 0, 0 },
{3828,1172, 0, 1, 40000, 780, 0, 0.15625 },
@@ -8851,7 +8870,7 @@ const struct adlinsdata adlins[4756] =
{3998,3999, 0, 4, 9320, 133, 0, 0 },
{ 9,4000, 0, 4, 1606, 426, 0, 0 },
{4001,4002, 0, 4, 18373, 240, 0, 0 },
- {4003,4004, 0, 1, 7440, 1100, 0, 0.0625 },
+ {4003,4004, 0, 1, 7440, 1100, 0, -1.9375 },
{ 15,4005, 0, 4, 5640, 1986, 0, 0 },
{4006,4007, 0, 4, 40000, 100, 0, 0 },
{4008,4009, 0, 4, 40000, 73, 0, 0 },
@@ -8879,7 +8898,7 @@ const struct adlinsdata adlins[4756] =
{4046,4047, 0, 4, 40000, 126, 0, 0 },
{4048,4049, 0, 4, 40000, 80, 0, 0 },
{4050,4051, 0, 4, 40000, 73, 0, 0 },
- {4052,4053, 0, 1, 40000, 86, 0, 0.046875 },
+ {4052,4053, 0, 1, 40000, 86, 0, -1.96875 },
{4054,4055, 0, 4, 40000, 86, 0, 0 },
{1503,4056, 0, 4, 40000, 93, 0, 0 },
{ 88,4057, 0, 4, 40000, 1220, 0, 0 },
@@ -8891,13 +8910,13 @@ const struct adlinsdata adlins[4756] =
{4063,4064, 0, 4, 40000, 420, 0, 0 },
{ 103,4065, 0, 4, 3673, 1240, 0, 0 },
{4066,4067, 0, 1, 6286, 380, 0, 0 },
- {4068,4069, 0, 1, 2220, 426, 0, 0.03125 },
+ {4068,4069, 0, 1, 2220, 426, 0, -1.96875 },
{ 107,4070, 0, 4, 2086, 760, 0, 0 },
- {4071,4072, 0, 1, 40000, 100, 0, 0.0625 },
+ {4071,4072, 0, 1, 40000, 100, 0, -1.9375 },
{ 110,4073, 0, 4, 40000, 100, 0, 0 },
{ 111,4074, 0, 4, 2300, 820, 0, 0 },
{4075,4076, 0, 4, 1013, 326, 0, 0 },
- {4077,4078, 0, 1, 1220, 393, 0, 0.03125 },
+ {4077,4078, 0, 1, 1220, 393, 0, -1.96875 },
{ 115,4079, 0, 4, 1813, 646, 0, 0 },
{4080,4081, 0, 1, 566, 146, 0, 0 },
{ 118,4082, 0, 4, 1553, 53, 0, 0 },
@@ -8914,19 +8933,19 @@ const struct adlinsdata adlins[4756] =
{4094,4095, 63, 4, 166, 93, 0, 0 },
{4096,4096, 15, 0, 113, 66, 0, 0 },
{4097,4097, 36, 0, 106, 53, 0, 0 },
- {4097,4098, 36, 1, 480, 173, 0, 0.40625 },
+ {4097,4098, 36, 1, 480, 173, 0, -1.59375 },
{4099,4099, 35, 0, 706, 266, 0, 0 },
{4100,4101, 38, 1, 273, 106, 0, 0 },
{4102,4103, 38, 1, 366, 133, 0, 0 },
- {4104,4105, 48, 1, 280, 133, 0, -1.90625 },
+ {4104,4105, 48, 1, 280, 133, 0, 0.09375 },
{4106,4106, 48, 0, 180, 86, 0, 0 },
- {4107,4108, 48, 1, 953, 346, 0, -1.90625 },
- {4109,4109, 61, 1, 3200, 540, 0, 0.09375 },
+ {4107,4108, 48, 1, 953, 346, 0, 0.09375 },
+ {4109,4109, 61, 1, 3200, 540, 0, -1.90625 },
{3369,1557, 70, 4, 766, 306, 0, 0 },
- {4110,4111, 79, 1, 1306, 513, 0, 0.078125 },
+ {4110,4111, 79, 1, 1306, 513, 0, -1.9375 },
{4112,4112, 62, 0, 5200, 466, 0, 0 },
- {4113,4114, 67, 1, 2153, 1080, 0, 0.078125 },
- {4115,4115, 62, 1, 3226, 573, 0, 0.09375 },
+ {4113,4114, 67, 1, 2153, 1080, 0, -1.9375 },
+ {4115,4115, 62, 1, 3226, 573, 0, -1.90625 },
{4116,4117, 54, 1, 286, 133, 0, 0 },
{4116,4118, 48, 1, 286, 126, 0, 0 },
{1589,1589, 71, 0, 106, 46, 0, 0 },
@@ -8938,7 +8957,7 @@ const struct adlinsdata adlins[4756] =
{4125,4126, 18, 1, 200, 80, 0, 0 },
{4127,4128, 18, 1, 253, 73, 0, 0 },
{4129,4130, 64, 4, 1346, 33, 0, 0 },
- {4131,4132, 64, 1, 373, 73, 0, 0.03125 },
+ {4131,4132, 64, 1, 373, 73, 0, -1.96875 },
{4133,4133, 67, 0, 106, 26, 0, 0 },
{ 844, 844,244, 2, 6, 0, 0, 0 },
{ 855, 855,244, 2, 6, 0, 0, 0 },
@@ -9043,69 +9062,69 @@ const struct adlinsdata adlins[4756] =
{3547,3547,109, 0, 5300, 1786, 0, 0 },
{4179,4179, 79, 0, 560, 313, 0, 0 },
{4180,4180, 0, 0, 10646, 73, 0, 0 },
- {4181,4182, 0, 1, 14166, 586, 0, 0.03125 },
- {4183,4184, 0, 1, 15553, 546, 0, 0.03125 },
- {4185,4186, 0, 1, 11746, 320, 0, 0.046875 },
- {4187,4188, 0, 1, 14706, 646, 0, 0.15625 },
- {4189,4190, 0, 1, 7320, 100, 0, 0.046875 },
- {4191,4192, 0, 1, 40000, 0, 0, 0.0625 },
+ {4181,4182, 0, 1, 14166, 586, 0, -1.96875 },
+ {4183,4184, 0, 1, 15553, 546, 0, -1.96875 },
+ {4185,4186, 0, 1, 11746, 320, 0, -1.96875 },
+ {4187,4188, 0, 1, 14706, 646, 0, -1.84375 },
+ {4189,4190, 0, 1, 7320, 100, 0, -1.96875 },
+ {4191,4192, 0, 1, 40000, 0, 0, -1.9375 },
{4193,4194, 0, 1, 13660, 260, 0, 0 },
{4195,4196, 0, 1, 15026, 133, 0, 0 },
- {4197,4198, 0, 1, 40000, 0, 0, 2.5e-05 },
+ {4197,4198, 0, 1, 40000, 0, 0, -2 },
{4199,4200, 0, 1, 4980, 3400, 0, 0 },
- {4201,4202, 0, 1, 7840, 2660, 0, 0.046875 },
+ {4201,4202, 0, 1, 7840, 2660, 0, -1.96875 },
{4203,4204, 0, 1, 8326, 180, 0, 0 },
{4205,4206, 0, 1, 1093, 140, 0, 0 },
{4207,4208, 0, 1, 2280, 400, 0, 0 },
- {4209,4210, 0, 1, 4553, 1486, 0, 0.03125 },
- {4211,4211, 0, 1, 40000, 0, 0, 0.03125 },
- {4212,4213, 0, 1, 40000, 60, 0, 0.15625 },
- {4214,4215, 0, 1, 40000, 93, 0, 0.078125 },
- {4216,4217, 0, 1, 40000, 86, 0, 0.15625 },
- {4218,4219, 0, 1, 40000, 520, 0, 0.03125 },
- {4220,4221, 0, 1, 40000, 140, 0, 0.0625 },
- {4222,4223, 0, 1, 40000, 133, 0, 0.140625 },
+ {4209,4210, 0, 1, 4553, 1486, 0, -1.96875 },
+ {4211,4211, 0, 1, 40000, 0, 0, -1.96875 },
+ {4212,4213, 0, 1, 40000, 60, 0, -1.84375 },
+ {4214,4215, 0, 1, 40000, 93, 0, -1.9375 },
+ {4216,4217, 0, 1, 40000, 86, 0, -1.84375 },
+ {4218,4219, 0, 1, 40000, 520, 0, -1.96875 },
+ {4220,4221, 0, 1, 40000, 140, 0, -1.9375 },
+ {4222,4223, 0, 1, 40000, 133, 0, -1.875 },
{4224,4225, 0, 1, 40000, 73, 0, 0 },
- {4226,4227, 0, 1, 40000, 346, 0, 0.109375 },
+ {4226,4227, 0, 1, 40000, 346, 0, -1.90625 },
{4228,4229, 0, 1, 3693, 86, 0, 0 },
- {4230,4231, 0, 1, 6586, 460, 0, 2.5e-05 },
+ {4230,4231, 0, 1, 6586, 460, 0, -2 },
{4232,4233, 0, 1, 4320, 93, 0, 0 },
- {4234,4235, 0, 1, 7346, 126, 0, 0.046875 },
+ {4234,4235, 0, 1, 7346, 126, 0, -1.96875 },
{4236,4237, 0, 1, 3633, 260, 0, 0 },
- {4238,4239, 0, 1, 40000, 126, 0, -1.95312 },
- {4240,4241, 0, 1, 40000, 126, 0, -1.9375 },
- {4242,4243, 0, 1, 40000, 46, 0, 0.234375 },
- {4244,4245, 0, 1, 40000, 0, 0, 0.03125 },
+ {4238,4239, 0, 1, 40000, 126, 0, 0.03125 },
+ {4240,4241, 0, 1, 40000, 126, 0, 0.0625 },
+ {4242,4243, 0, 1, 40000, 46, 0, -1.78125 },
+ {4244,4245, 0, 1, 40000, 0, 0, -1.96875 },
{4246,4247, 0, 1, 10320, 86, 0, 0 },
{4248,4249, 0, 1, 12933, 133, 0, 0 },
- {4250,4251, 0, 1, 11820, 240, 0, 0.046875 },
+ {4250,4251, 0, 1, 11820, 240, 0, -1.96875 },
{4252,4253, 0, 1, 3966, 166, 0, 0 },
{4254,4255, 0, 1, 40000, 0, 0, 0 },
{4256,4256, 0, 0, 2666, 160, 0, 0 },
- {4257,4258, 0, 1, 15046, 93, 0, 0.078125 },
+ {4257,4258, 0, 1, 15046, 93, 0, -1.9375 },
{4259,4260, 0, 1, 40000, 100, 0, 0 },
{4261,4261, 0, 0, 40000, 260, 0, 0 },
- {4262,4263, 0, 1, 40000, 126, 0, 2.5e-05 },
+ {4262,4263, 0, 1, 40000, 126, 0, -2 },
{4264,4264, 0, 0, 40000, 233, 0, 0 },
- {4265,4266, 0, 1, 40000, 440, 0, 0.078125 },
- {4267,4268, 0, 1, 2160, 606, 0, 0.109375 },
- {4269,4270, 0, 1, 14753, 2400, 0, 0.03125 },
- {4271,4272, 0, 1, 7680, 646, 0, 0.03125 },
- {4273,4274, 0, 1, 40000, 446, 0, 0.0625 },
- {4275,4276, 0, 1, 40000, 866, 0, -0.0625 },
- {4277,4277, 0, 1, 40000, 1220, 0, 0.078125 },
- {4278,4278, 0, 1, 40000, 1960, 0, 0.0625 },
- {4279,4280, 0, 1, 40000, 433, 0, 0.125 },
- {4281,4282, 0, 1, 40000, 140, 0, 0.140625 },
- {4283,4284, 0, 1, 40000, 806, 0, 0.109375 },
- {4285,4286, 0, 1, 2040, 486, 0, 0.125 },
+ {4265,4266, 0, 1, 40000, 440, 0, -1.9375 },
+ {4267,4268, 0, 1, 2160, 606, 0, -1.90625 },
+ {4269,4270, 0, 1, 14753, 2400, 0, -1.96875 },
+ {4271,4272, 0, 1, 7680, 646, 0, -1.96875 },
+ {4273,4274, 0, 1, 40000, 446, 0, -1.9375 },
+ {4275,4276, 0, 1, 40000, 866, 0, 1.9375 },
+ {4277,4277, 0, 1, 40000, 1220, 0, -1.9375 },
+ {4278,4278, 0, 1, 40000, 1960, 0, -1.9375 },
+ {4279,4280, 0, 1, 40000, 433, 0, -1.875 },
+ {4281,4282, 0, 1, 40000, 140, 0, -1.875 },
+ {4283,4284, 0, 1, 40000, 806, 0, -1.90625 },
+ {4285,4286, 0, 1, 2040, 486, 0, -1.875 },
{4287,4288, 0, 1, 40000, 86, 0, 0 },
- {4289,4290, 0, 1, 40000, 80, 0, 0.03125 },
+ {4289,4290, 0, 1, 40000, 80, 0, -1.96875 },
{4291,4291, 0, 0, 40000, 73, 0, 0 },
- {4292,4293, 0, 1, 40000, 400, 0, 0.0625 },
- {4294,4295, 0, 1, 40000, 120, 0, 0.0625 },
- {4296,4297, 0, 1, 40000, 0, 0, 0.09375 },
- {4298,4298, 0, 1, 40000, 0, 0, 0.125 },
+ {4292,4293, 0, 1, 40000, 400, 0, -1.9375 },
+ {4294,4295, 0, 1, 40000, 120, 0, -1.9375 },
+ {4296,4297, 0, 1, 40000, 0, 0, -1.90625 },
+ {4298,4298, 0, 1, 40000, 0, 0, -1.875 },
{4299,4300, 0, 1, 40000, 186, 0, 0 },
{4301,4301, 0, 0, 40000, 166, 0, 0 },
{4302,4302, 0, 0, 40000, 73, 0, 0 },
@@ -9117,35 +9136,35 @@ const struct adlinsdata adlins[4756] =
{4310,4310, 0, 0, 40000, 86, 0, 0 },
{4311,4311, 0, 0, 40000, 73, 0, 0 },
{4312,4312, 0, 0, 40000, 106, 0, 0 },
- {4313,4314, 0, 1, 40000, 186, 0, 0.03125 },
- {4315,4316, 0, 1, 40000, 0, 0, 0.03125 },
+ {4313,4314, 0, 1, 40000, 186, 0, -1.96875 },
+ {4315,4316, 0, 1, 40000, 0, 0, -1.96875 },
{4317,4317, 0, 0, 40000, 300, 0, 0 },
{4318,4318, 0, 0, 40000, 66, 0, 0 },
- {4319,4320, 0, 1, 40000, 73, 0, 0.125 },
- {4321,4322, 0, 1, 40000, 86, 0, 0.109375 },
- {4323,4324, 0, 1, 40000, 146, 0, 0.109375 },
- {4325,4326, 0, 1, 40000, 66, 0, -0.03125 },
+ {4319,4320, 0, 1, 40000, 73, 0, -1.875 },
+ {4321,4322, 0, 1, 40000, 86, 0, -1.90625 },
+ {4323,4324, 0, 1, 40000, 146, 0, -1.90625 },
+ {4325,4326, 0, 1, 40000, 66, 0, 1.96875 },
{4327,4327, 0, 0, 40000, 60, 0, 0 },
- {4328,4329, 0, 1, 40000, 213, 0, 0.15625 },
- {4330,4331, 0, 1, 40000, 66, 0, 0.125 },
- {4332,4333, 0, 1, 40000, 100, 0, 0.03125 },
- {4334,4335, 0, 1, 40000, 1513, 0, 0.078125 },
- {4336,4337, 0, 1, 40000, 353, 0, 0.109375 },
- {4338,4339, 0, 1, 40000, 133, 0, 0.078125 },
- {4340,4341, 0, 1, 40000, 746, 0, 0.140625 },
- {4342,4343, 0, 1, 40000, 0, 0, 0.109375 },
- {4344,4345, 0, 1, 5033, 1606, 0, 0.0625 },
- {4346,4347, 0, 1, 40000, 1146, 0, 0.09375 },
- {4348,4349, 0, 1, 40000, 1586, 0, 0.109375 },
- {4350,4351, 0, 1, 40000, 0, 0, 0.09375 },
- {4352,4353, 0, 1, 40000, 1006, 0, 0.125 },
- {4354,4354, 0, 1, 2680, 793, 0, 0.109375 },
- {4355,4356, 0, 1, 40000, 0, 0, -0.046875 },
- {4357,4358, 0, 1, 9000, 3186, 0, 0.125 },
- {4359,4360, 0, 1, 40000, 1073, 0, -0.078125 },
- {4361,4362, 0, 1, 40000, 2093, 0, 0.140625 },
- {4363,4364, 0, 1, 40000, 0, 0, 0.078125 },
- {4365,4366, 0, 1, 9580, 713, 0, 0.03125 },
+ {4328,4329, 0, 1, 40000, 213, 0, -1.84375 },
+ {4330,4331, 0, 1, 40000, 66, 0, -1.875 },
+ {4332,4333, 0, 1, 40000, 100, 0, -1.96875 },
+ {4334,4335, 0, 1, 40000, 1513, 0, -1.9375 },
+ {4336,4337, 0, 1, 40000, 353, 0, -1.90625 },
+ {4338,4339, 0, 1, 40000, 133, 0, -1.9375 },
+ {4340,4341, 0, 1, 40000, 746, 0, -1.875 },
+ {4342,4343, 0, 1, 40000, 0, 0, -1.90625 },
+ {4344,4345, 0, 1, 5033, 1606, 0, -1.9375 },
+ {4346,4347, 0, 1, 40000, 1146, 0, -1.90625 },
+ {4348,4349, 0, 1, 40000, 1586, 0, -1.90625 },
+ {4350,4351, 0, 1, 40000, 0, 0, -1.90625 },
+ {4352,4353, 0, 1, 40000, 1006, 0, -1.875 },
+ {4354,4354, 0, 1, 2680, 793, 0, -1.90625 },
+ {4355,4356, 0, 1, 40000, 0, 0, 1.9375 },
+ {4357,4358, 0, 1, 9000, 3186, 0, -1.875 },
+ {4359,4360, 0, 1, 40000, 1073, 0, 1.90625 },
+ {4361,4362, 0, 1, 40000, 2093, 0, -1.875 },
+ {4363,4364, 0, 1, 40000, 0, 0, -1.9375 },
+ {4365,4366, 0, 1, 9580, 713, 0, -1.96875 },
{4367,4367, 0, 0, 1166, 760, 0, 0 },
{4368,4369, 0, 1, 1186, 240, 0, 0 },
{4370,4370, 0, 0, 40000, 160, 0, 0 },
@@ -9155,7 +9174,7 @@ const struct adlinsdata adlins[4756] =
{4374,4374, 0, 0, 246, 93, 0, 0 },
{4375,4376, 0, 1, 1953, 393, 0, 0 },
{4377,4378, 0, 1, 4220, 133, 0, 0 },
- {4379,4380, 0, 1, 2873, 73, 0, 0.109375 },
+ {4379,4380, 0, 1, 2873, 73, 0, -1.90625 },
{4381,4382, 0, 1, 40000, 186, 0, 0 },
{4383,4383, 0, 0, 1573, 86, 0, 0 },
{4384,4385, 0, 1, 40000, 793, 0, 0 },
@@ -9169,20 +9188,20 @@ const struct adlinsdata adlins[4756] =
{4397,4398, 38, 1, 340, 133, 0, 0 },
{4399,4400, 37, 1, 206, 93, 0, 0 },
{4401,4402, 15, 1, 346, 153, 10, 0 },
- {4403,4404,100, 1, 146, 80, 0, 0.140625 },
+ {4403,4404,100, 1, 146, 80, 0, -1.875 },
{4405,4406, 19, 1, 553, 200, 10, 0 },
{4407,4408, 15, 1, 333, 153, 20, 0 },
{4409,4410, 12, 1, 340, 146, 20, 0 },
{4411,4412, 11, 1, 346, 146, 20, 0 },
- {4413,4414, 61, 1, 2706, 1033, 0, 0.09375 },
+ {4413,4414, 61, 1, 2706, 1033, 0, -1.90625 },
{4415,4412, 8, 1, 340, 146, 20, 0 },
- {4416,4417, 91, 1, 1166, 366, 0, -0.046875 },
+ {4416,4417, 91, 1, 1166, 366, 0, 1.9375 },
{4418,4418, 70, 0, 966, 346, 0, 0 },
- {4419,4420, 80, 1, 300, 93, 0, 0.125 },
+ {4419,4420, 80, 1, 300, 93, 0, -1.875 },
{4421,4421, 58, 0, 206, 53, 0, 0 },
- {4422,4414, 62, 1, 2333, 820, 0, 0.09375 },
+ {4422,4414, 62, 1, 2333, 820, 0, -1.90625 },
{4423,4424, 31, 1, 773, 200, 0, 0 },
- {4425,4417, 91, 1, 1160, 360, 0, -0.03125 },
+ {4425,4417, 91, 1, 1160, 360, 0, 1.96875 },
{4426,4427, 41, 1, 373, 113, 0, 0 },
{4428,4429, 35, 1, 406, 126, 0, 0 },
{4430,4431, 29, 1, 146, 106, 0, 0 },
@@ -9195,7 +9214,7 @@ const struct adlinsdata adlins[4756] =
{4440,4440, 36, 0, 620, 20, 0, 0 },
{4441,4441, 90, 0, 193, 20, 0, 0 },
{4442,4442, 90, 0, 793, 40, 0, 0 },
- {4443,4444, 80, 1, 406, 153, 0, 0.03125 },
+ {4443,4444, 80, 1, 406, 153, 0, -1.96875 },
{4445,4446, 64, 1, 1866, 606, 0, 0 },
{4447,4448, 50, 1, 173, 126, 0, 0 },
{4449,4449, 36, 0, 4646, 1606, 0, 0 },
@@ -9229,130 +9248,144 @@ const struct adlinsdata adlins[4756] =
{4473,4473, 0, 0, 40000, 0, 0, 0 },
{4474,4474, 0, 0, 246, 20, 0, 0 },
{4475,4475, 0, 2, 6, 0, 0, 0 },
- {4476,4476, 0, 0, 4946, 233, 0, 0 },
+ {4476,4476, 0, 0, 4946, 240, 0, 0 },
{4477,4477, 0, 0, 4946, 233, 0, 0 },
{4478,4478, 0, 0, 4953, 240, 0, 0 },
- {4479,4479, 0, 0, 4946, 233, 0, 0 },
+ {4479,4479, 0, 0, 4466, 200, 0, 0 },
{4480,4480, 0, 0, 18233, 46, 0, 0 },
- {4481,4481, 0, 0, 2386, 26, 0, 0 },
+ {4481,4481, 0, 0, 2360, 146, 0, 0 },
{4482,4482, 0, 0, 4640, 633, 0, 0 },
- {4483,4483, 0, 0, 18466, 100, 0, 0 },
- {4484,4484, 0, 0, 18440, 66, 0, -2 },
- {4485,4485, 0, 0, 18440, 6140, 0, -2 },
- {4486,4486, 0, 0, 1206, 433, 0, -2 },
- {4487,4487, 0, 0, 4626, 240, 0, 0 },
- {4488,4488, 0, 0, 726, 400, 0, 0 },
- {4489,4489, 0, 0, 5866, 73, 0, 0 },
+ {4483,4483, 0, 0, 4566, 1253, 0, 0 },
+ {4484,4484, 0, 0, 18440, 6140, 0, 0 },
+ {4485,4485, 0, 0, 1206, 433, 0, 0 },
+ {4486,4486, 0, 0, 4626, 240, 0, 0 },
+ {4487,4487, 0, 0, 726, 400, 0, 0 },
+ {4488,4488, 0, 0, 5866, 73, 0, 0 },
+ {4489,4489, 0, 0, 40000, 73, 0, 0 },
{4490,4490, 0, 0, 40000, 73, 0, 0 },
{4491,4491, 0, 0, 40000, 73, 0, 0 },
- {4492,4492, 0, 0, 40000, 73, 0, 0 },
- {4493,4493, 0, 0, 40000, 73, 0, 0 },
- {4494,4494, 0, 0, 6500, 346, 0, 0 },
- {4495,4495, 0, 0, 6506, 346, 0, 0 },
- {4496,4496, 0, 0, 40000, 66, 0, -2 },
- {4497,4497, 0, 0, 40000, 66, 0, -2 },
- {4498,4498, 0, 0, 40000, 0, 0, 0 },
- {4499,4499, 0, 0, 40000, 46, 0, 0 },
- {4500,4500, 0, 0, 40000, 0, 0, 0 },
- {4500,4500, 0, 0, 40000, 0, 0, -2 },
- {4501,4501, 0, 0, 2386, 26, 0, 0 },
- {4502,4502, 0, 0, 40000, 73, 0, -2 },
- {4503,4503, 0, 0, 5866, 26, 0, -2 },
- {4504,4504, 0, 0, 40000, 133, 0, 0 },
- {4505,4505, 0, 0, 40000, 133, 0, 0 },
- {4506,4506, 0, 0, 40000, 126, 0, 0 },
- {4507,4507, 0, 0, 253, 20, 0, 0 },
- {4508,4508, 0, 0, 8866, 1366, 0, 0 },
- {4509,4509, 0, 0, 1040, 766, 0, 0 },
- {4510,4510, 0, 0, 40000, 146, 0, -2 },
- {4511,4511, 0, 0, 40000, 153, 0, -2 },
- {4512,4512, 0, 0, 40000, 466, 0, -2 },
- {4513,4513, 0, 0, 40000, 66, 0, 0 },
- {4514,4514, 0, 0, 2333, 566, 0, 0 },
- {4515,4515, 0, 0, 40000, 140, 0, -2 },
- {4516,4516, 0, 0, 40000, 100, 0, -2 },
- {4517,4517, 0, 0, 40000, 226, 0, -2 },
- {4518,4518, 0, 0, 40000, 0, 0, 0 },
- {3712,3712, 0, 0, 40000, 226, 0, -2 },
- {4519,4519, 0, 0, 40000, 140, 0, -2 },
- {4520,4520, 0, 0, 40000, 66, 0, 0 },
- {4521,4521, 0, 0, 40000, 73, 0, 0 },
- {4522,4522, 0, 0, 40000, 73, 0, 0 },
- {4523,4523, 0, 0, 40000, 86, 0, -2 },
- {4524,4524, 0, 0, 40000, 80, 0, 0 },
- {4525,4525, 0, 0, 40000, 73, 0, -2 },
- {4526,4526, 0, 0, 40000, 80, 0, -2 },
- {4527,4527, 0, 0, 40000, 73, 0, -2 },
- {4528,4528, 0, 0, 40000, 73, 0, 0 },
+ {4492,4492, 0, 0, 40000, 146, 0, 0 },
+ {4493,4493, 0, 0, 40000, 200, 0, 0 },
+ {4494,4494, 0, 0, 40000, 73, 0, 0 },
+ {4495,4495, 0, 0, 8366, 626, 0, 0 },
+ {4496,4496, 0, 0, 7660, 180, 0, 0 },
+ {4497,4497, 0, 0, 6500, 346, 0, 0 },
+ {4498,4498, 0, 0, 6506, 346, 0, 0 },
+ {4499,4499, 0, 0, 40000, 66, 0, 0 },
+ {4500,4500, 0, 0, 40000, 66, 0, 0 },
+ {4501,4501, 0, 0, 40000, 0, 0, 0 },
+ {4502,4502, 0, 0, 40000, 46, 0, 0 },
+ {4503,4503, 0, 0, 40000, 0, 0, 0 },
+ {4504,4504, 0, 0, 2386, 26, 0, 0 },
+ {4505,4505, 0, 0, 40000, 73, 0, 0 },
+ {4506,4506, 0, 0, 5866, 26, 0, 0 },
+ {4507,4507, 0, 0, 40000, 133, 0, 0 },
+ {4508,4508, 0, 0, 40000, 133, 0, 0 },
+ {4509,4509, 0, 0, 40000, 126, 0, 0 },
+ {4510,4510, 0, 0, 253, 20, 0, 0 },
+ {4511,4511, 0, 0, 8866, 1366, 0, 0 },
+ {4512,4512, 0, 0, 1046, 766, 0, 0 },
+ {4513,4513, 0, 0, 40000, 146, 0, 0 },
+ {4514,4514, 0, 0, 40000, 153, 0, 0 },
+ {4515,4515, 0, 0, 40000, 466, 0, 0 },
+ {4516,4516, 0, 0, 40000, 66, 0, 0 },
+ {4517,4517, 0, 0, 2333, 566, 0, 0 },
+ {4518,4518, 0, 0, 40000, 140, 0, 0 },
+ {4519,4519, 0, 0, 40000, 220, 0, 0 },
+ {4520,4520, 0, 0, 40000, 226, 0, 0 },
+ {4521,4521, 0, 0, 40000, 0, 0, 0 },
+ {4522,4522, 0, 0, 40000, 0, 0, 0 },
+ {4523,4523, 0, 0, 40000, 140, 0, 0 },
+ {4524,4524, 0, 0, 40000, 73, 0, 0 },
+ {4525,4525, 0, 0, 40000, 73, 0, 0 },
+ {4526,4526, 0, 0, 40000, 73, 0, 0 },
+ {4527,4527, 0, 0, 40000, 73, 0, 0 },
+ {4528,4528, 0, 0, 40000, 66, 0, 0 },
{4529,4529, 0, 0, 40000, 73, 0, 0 },
- {4530,4530, 0, 0, 40000, 93, 0, 0 },
- {4531,4531, 0, 0, 40000, 73, 0, 0 },
- {4532,4532, 0, 0, 11946, 13, 0, 0 },
+ {4530,4530, 0, 0, 40000, 73, 0, 0 },
+ {4531,4531, 0, 0, 40000, 86, 0, 0 },
+ {4532,4532, 0, 0, 40000, 80, 0, 0 },
{4533,4533, 0, 0, 40000, 73, 0, 0 },
- {4503,4503, 0, 0, 5866, 26, 0, 0 },
- {4534,4534, 0, 0, 40000, 820, 0, 0 },
- {4535,4535, 0, 0, 2153, 873, 0, 0 },
- {1221,1221, 0, 0, 40000, 293, 0, 0.171875 },
- {4536,4536, 0, 0, 1620, 120, 0, 0 },
- {4537,4537, 0, 0, 15120, 93, 0, 0 },
- {4538,4538, 0, 0, 14613, 93, 0, 0 },
- {4539,4539, 0, 0, 2346, 793, 0, 0 },
- {4540,4540, 0, 0, 40000, 2380, 0, 0 },
- {4541,4541, 0, 0, 40000, 1280, 0, 0 },
- {4542,4542, 0, 0, 40000, 1460, 0, 0 },
- {4543,4543, 0, 0, 40000, 2513, 0, 0 },
- {4544,4544, 0, 0, 14840, 1266, 0, 0 },
- {4545,4545, 0, 0, 4513, 640, 0, 0 },
- {4546,4546, 0, 0, 4680, 806, 0, 0 },
- {4547,4547, 0, 0, 40000, 100, 0, 0 },
- {4548,4548, 0, 0, 40000, 66, 0, 0 },
- {4549,4549, 0, 0, 2420, 413, 0, 0 },
- {4550,4550, 0, 0, 406, 73, 0, -2 },
- {4551,4551, 0, 0, 1166, 400, 0, 0 },
- {4552,4552, 0, 0, 1213, 106, 0, 0 },
- {4553,4553, 0, 0, 273, 60, 0, -2 },
- {4554,4554, 0, 0, 40000, 2380, 0, 0 },
- {4555,4555, 0, 0, 40000, 440, 0, 0 },
- {1261,1261, 0, 0, 40000, 2960, 0, 0 },
- {4556,4556, 37, 0, 973, 73, 0, -2 },
- {4557,4557, 48, 0, 106, 26, 0, -2 },
- {4558,4558, 48, 0, 286, 133, 0, -2 },
- {4559,4559, 62, 0, 166, 60, 0, 0 },
- {4560,4560, 44, 0, 980, 360, 0, 0 },
- {4561,4561, 80, 0, 100, 33, 0, 0 },
- {4560,4560, 50, 0, 980, 346, 0, 0 },
- {4562,4562, 48, 0, 106, 46, 0, -2 },
- {4560,4560, 55, 0, 973, 360, 0, 0 },
- {4563,4563, 61, 0, 513, 20, 0, 0 },
- {4560,4560, 58, 0, 966, 353, 0, 0 },
- {4560,4560, 63, 0, 973, 353, 0, 0 },
- {4564,4564, 71, 0, 1366, 580, 0, 0 },
- {4560,4560, 72, 0, 820, 306, 0, 0 },
- {4565,4565, 70, 0, 1886, 666, 0, 0 },
- {4564,4564, 88, 0, 1353, 560, 0, 0 },
- {4566,4566, 76, 0, 1873, 653, 0, 0 },
- {4567,4567, 84, 0, 260, 113, 0, 0 },
- {4564,4564, 68, 0, 1366, 553, 0, 0 },
- {4568,4568, 72, 0, 153, 53, 0, 0 },
- {4569,4569, 28, 0, 1193, 413, 0, 0 },
- {4565,4565, 81, 0, 1353, 480, 0, 0 },
- {4570,4570, 58, 0, 246, 120, 0, -2 },
- {4570,4570, 55, 0, 246, 120, 0, -2 },
- {4570,4570, 44, 0, 246, 120, 0, -2 },
- {4570,4570, 49, 0, 246, 120, 0, -2 },
- {4570,4570, 40, 0, 286, 133, 0, -2 },
- {4571,4571, 55, 0, 740, 560, 0, -2 },
- {4571,4571, 48, 0, 893, 693, 0, -2 },
- {4572,4572, 52, 0, 513, 206, 0, 0 },
- {4572,4572, 45, 0, 513, 206, 0, 0 },
- {4573,4573, 48, 0, 173, 100, 0, -2 },
- {4574,4574, 48, 0, 120, 266, 0, -2 },
- {4575,4575, 48, 0, 253, 60, 0, -2 },
- {4550,4550, 73, 0, 160, 20, 0, -2 },
- {4550,4550, 68, 0, 160, 20, 0, -2 },
- {4550,4550, 63, 0, 193, 20, 0, -2 },
- {4576,4576,108, 0, 406, 26, 0, 0 },
- {4577,4577,108, 0, 740, 26, 0, 0 },
+ {4534,4534, 0, 0, 40000, 80, 0, 0 },
+ {4535,4535, 0, 0, 40000, 73, 0, 0 },
+ {4536,4536, 0, 0, 520, 120, 0, 0 },
+ {4537,4537, 0, 0, 40000, 433, 0, 0 },
+ {4538,4538, 0, 0, 40000, 73, 0, 0 },
+ {4539,4539, 0, 0, 40000, 93, 0, 0 },
+ {4540,4540, 0, 0, 40000, 73, 0, 0 },
+ {4541,4541, 0, 0, 40000, 73, 0, 0 },
+ {4542,4542, 0, 0, 11946, 13, 0, 0 },
+ {4543,4543, 0, 0, 40000, 73, 0, 0 },
+ {4544,4544, 0, 0, 40000, 426, 0, 0 },
+ {4545,4545, 0, 0, 40000, 1026, 0, 0 },
+ {4546,4546, 0, 0, 40000, 313, 0, 0 },
+ {4547,4547, 0, 0, 40000, 340, 0, 0 },
+ {4548,4548, 0, 0, 1620, 126, 0, 0 },
+ {4549,4549, 0, 0, 15120, 93, 0, 0 },
+ {4550,4550, 0, 0, 14613, 93, 0, 0 },
+ {4551,4551, 0, 0, 2346, 793, 0, 0 },
+ {4552,4552, 0, 0, 40000, 1820, 0, 0 },
+ {4553,4553, 0, 0, 40000, 1280, 0, 0 },
+ {4554,4554, 0, 0, 40000, 500, 0, 0 },
+ {4555,4555, 0, 0, 40000, 1240, 0, 0 },
+ {4556,4556, 0, 0, 40000, 386, 0, 0 },
+ {4557,4557, 0, 0, 40000, 1460, 0, 0 },
+ {4558,4558, 0, 0, 40000, 2513, 0, 0 },
+ {4559,4559, 0, 0, 746, 140, 0, 0 },
+ {4560,4560, 0, 0, 1040, 766, 0, 0 },
+ {4561,4561, 0, 0, 40000, 100, 0, 0 },
+ {4562,4562, 0, 0, 40000, 66, 0, 0 },
+ {4563,4563, 0, 0, 40000, 813, 0, 0 },
+ {4564,4564, 0, 0, 2420, 413, 0, 0 },
+ {4565,4565, 0, 0, 406, 73, 0, 0 },
+ {4566,4566, 0, 0, 1166, 400, 0, 0 },
+ {4567,4567, 0, 0, 1213, 106, 0, 0 },
+ {4568,4568, 0, 0, 273, 60, 0, 0 },
+ {4569,4569, 0, 0, 40000, 433, 0, 0 },
+ {4570,4570, 0, 0, 5180, 240, 0, 0 },
+ {4571,4571, 0, 0, 273, 60, 0, 0 },
+ {4572,4572, 0, 0, 40000, 2380, 0, 0 },
+ {4573,4573, 0, 0, 3793, 233, 0, 0 },
+ {4574,4574, 0, 0, 626, 240, 0, 0 },
+ {4575,4575, 37, 0, 973, 73, 0, 0 },
+ {4576,4576, 48, 0, 106, 26, 0, 0 },
+ {4577,4577, 48, 0, 286, 133, 0, 0 },
+ {4578,4578, 62, 0, 166, 60, 0, 0 },
+ {4579,4579, 44, 0, 980, 360, 0, 0 },
+ {4580,4580, 80, 0, 100, 33, 0, 0 },
+ {4579,4579, 50, 0, 980, 346, 0, 0 },
+ {4581,4581, 48, 0, 106, 46, 0, 0 },
+ {4579,4579, 55, 0, 973, 360, 0, 0 },
+ {4582,4582, 61, 0, 513, 20, 0, 0 },
+ {4579,4579, 58, 0, 966, 353, 0, 0 },
+ {4579,4579, 63, 0, 973, 353, 0, 0 },
+ {4583,4583, 71, 0, 1366, 580, 0, 0 },
+ {4579,4579, 72, 0, 820, 306, 0, 0 },
+ {4584,4584, 70, 0, 1886, 666, 0, 0 },
+ {4583,4583, 88, 0, 1353, 560, 0, 0 },
+ {4585,4585, 76, 0, 1873, 653, 0, 0 },
+ {4586,4586, 84, 0, 260, 113, 0, 0 },
+ {4583,4583, 68, 0, 1366, 553, 0, 0 },
+ {4587,4587, 72, 0, 153, 53, 0, 0 },
+ {4588,4588, 28, 0, 1193, 413, 0, 0 },
+ {4584,4584, 81, 0, 1353, 480, 0, 0 },
+ {4589,4589, 58, 0, 246, 120, 0, 0 },
+ {4589,4589, 55, 0, 246, 120, 0, 0 },
+ {4589,4589, 44, 0, 246, 120, 0, 0 },
+ {4589,4589, 49, 0, 246, 120, 0, 0 },
+ {4589,4589, 40, 0, 286, 133, 0, 0 },
+ {4590,4590, 55, 0, 740, 560, 0, 0 },
+ {4590,4590, 48, 0, 893, 693, 0, 0 },
+ {4591,4591, 52, 0, 513, 206, 0, 0 },
+ {4591,4591, 45, 0, 513, 206, 0, 0 },
+ {4592,4592, 48, 0, 173, 100, 0, 0 },
+ {4593,4593, 48, 0, 120, 266, 0, 0 },
+ {4594,4594, 48, 0, 253, 60, 0, 0 },
+ {4565,4565, 73, 0, 160, 20, 0, 0 },
+ {4565,4565, 68, 0, 160, 20, 0, 0 },
+ {4565,4565, 63, 0, 193, 20, 0, 0 },
+ {4595,4595,108, 0, 406, 26, 0, 0 },
+ {4596,4596,108, 0, 740, 26, 0, 0 },
};
@@ -9435,7 +9468,7 @@ const char* const banknames[76] =
"TMB (Default bank of Apogee Sound System)",
"WOPL (4op bank by James Alan Nguyen and Wohlstand)",
"TMB (Blood)",
- "TMB (Lee)",
+ "TMB (Rise of the Triad)",
"TMB (Nam)",
"WOPL (DMXOPL3 bank by Sneakernets)",
"EA (Cartooners)",
@@ -10777,20 +10810,20 @@ const unsigned short banks[75][256] =
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
},
{
-4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,4643,4644,3297,4641,4645,
-3300,4646,4647,3300,4648,4649,4649,4649, 868, 869, 870,4650,4651,4652,4653,4654,
-4655,4656,4657,4657,4658,4655,4659,4660,3844,4661,4662,4662,4663,4664,4665,4666,
-4667,4668,4669,4669,4670,4152,3324,4671,4672,4673,4674,4675,4676,4672,4672,4677,
-3331, 769,3332,3333,4678,4679,4680,4681,4682,4683,4684,4685,4686,4683,1300,4687,
-4688,4689,4683,4648,4690,4672,4691,4692,3349,4693,4694,4695,4696,1314,4697,4698,
-4699,4700,4701,4694,4694,1322,4702,4703,4704,4705,4706,4705,3297,4707,3844,4708,
-4709,1334,4709,4710,4711,4712, 792,4713,1341,1342,1343,1344,4714,4715,4716,1348,
+4632,4633,4634,4635,4636,4637,4638,3395,4639,4640,4641,4642,4643,3297,4640,4644,
+3300,4645,4646,3300,4647,4648,4649,4650,4651,4652, 870,4653,4654,4655,4656,4657,
+4658,4659,4659,4659,4660,4658,4661,4662,3844,4663,4664,4664,4665,4666,4667,4668,
+4669,4670,4671,4671,4672,4152,3324,4673,4674,4675,4676,4677,3861,4674,4678,4679,
+4680,4681,4682,4683,4684,4685,4686,4687,4688,4689,4690,4691,4692, 666,4693,4694,
+4695,4696,4697,4647,4698,4674,4699,4662,4700,4701,4702,4703,4704,3409,4705,4706,
+4707,4708,4709,4710,4711,4712,4713,4714,1919,4715,3490,4716,3297,4717,3844,4718,
+4719,1334,4720,4721,4722,4723, 792,4724,1341,4725,4726,4727,4728,4726,4729,4730,
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
- 295, 295, 295,4717,4717,4718,4719,4718,4720,4721,4722,4723,4724,4725,4726,4727,
-4728,4729,4730,4731,4732,4733,4734,4735,4736,4729,4737,4738,4739,4740,4741,4742,
-4743,4744,4745,4746,4747,4748,4749,4746,4747,4748,4750,4751,4752,4753,1375, 295,
-4754,4755, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295,4731,4731,4732,4733,4732,4734,4735,4736,4737,4738,4739,4740,4741,
+4742,4743,4744,4745,4746,4747,4748,4749,4750,4743,4751,4752,4753,4754,4755,4756,
+4757,4758,4759,4760,4761,4762,4763,4760,4761,4762,4764,4765,4766,4767,1375, 295,
+4768,4769, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
},
@@ -10868,7 +10901,7 @@ const AdlBankSetup adlbanksetup[75] =
{3, 0, 0, 0}, //Bank 67, TMB (Default bank of Apogee Sound System)
{0, 1, 1, 0}, //Bank 68, WOPL (4op bank by James Alan Nguyen and Wohlstand)
{3, 0, 0, 0}, //Bank 69, TMB (Blood)
- {3, 0, 0, 0}, //Bank 70, TMB (Lee)
+ {3, 0, 0, 0}, //Bank 70, TMB (Rise of the Triad)
{3, 0, 0, 0}, //Bank 71, TMB (Nam)
{0, 0, 0, 0}, //Bank 72, WOPL (DMXOPL3 bank by Sneakernets)
{1, 0, 0, 0}, //Bank 73, EA (Cartooners)
diff --git a/src/adlmidi_cvt.hpp b/src/adlmidi_cvt.hpp
index cb16eb0..3b2e07d 100644
--- a/src/adlmidi_cvt.hpp
+++ b/src/adlmidi_cvt.hpp
@@ -29,15 +29,12 @@ template <class WOPLI>
static void cvt_generic_to_FMIns(adlinsdata2 &ins, const WOPLI &in)
{
ins.voice2_fine_tune = 0.0;
- int8_t voice2_fine_tune = in.second_voice_detune;
+ int voice2_fine_tune = in.second_voice_detune;
+
if(voice2_fine_tune != 0)
{
- if(voice2_fine_tune == 1)
- ins.voice2_fine_tune = 0.000025;
- else if(voice2_fine_tune == -1)
- ins.voice2_fine_tune = -0.000025;
- else
- ins.voice2_fine_tune = voice2_fine_tune * (15.625 / 1000.0);
+ // Simulate behavior of DMX second voice detune
+ ins.voice2_fine_tune = (double)(((voice2_fine_tune + 128) >> 1) - 64) / 32.0;
}
ins.midi_velocity_offset = in.midi_velocity_offset;
diff --git a/utils/gen_adldata/file_formats/load_op2.h b/utils/gen_adldata/file_formats/load_op2.h
index feb85ed..86f1377 100644
--- a/utils/gen_adldata/file_formats/load_op2.h
+++ b/utils/gen_adldata/file_formats/load_op2.h
@@ -128,11 +128,8 @@ static bool LoadDoom(const char *fn, unsigned bank, const char *prefix)
else // Double instrument
{
tmp2.pseudo4op = true;
- tmp2.voice2_fine_tune = (((double)ins.finetune - 128.0) * 15.625) / 1000.0;
- if(ins.finetune == 129)
- tmp2.voice2_fine_tune = 0.000025;
- else if(ins.finetune == 127)
- tmp2.voice2_fine_tune = -0.000025;
+ // Simulate behavior of DMX second voice detune
+ tmp2.voice2_fine_tune = (double)((ins.finetune >> 1) - 64) / 32.0;
//printf("/*DOOM FINE TUNE (flags %000X instrument is %d) IS %d -> %lf*/\n", ins.flags, a, ins.finetune, tmp2.fine_tune);
size_t resno = InsertIns(tmp[0], tmp[1], tmp2, std::string(1, '\377') + name, name2);
SetBank(bank, (unsigned int)gmno, resno);
diff --git a/utils/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h
index cd8765e..d10d58f 100644
--- a/utils/gen_adldata/file_formats/load_wopl.h
+++ b/utils/gen_adldata/file_formats/load_wopl.h
@@ -176,15 +176,11 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix)
tmp[0].diff = false;
tmp[1].diff = real4op && !tmp2.pseudo4op;
- int8_t fine_tune = (int8_t)data[offset + 37];
+ int fine_tune = (int)data[offset + 37];
if(fine_tune != 0)
{
- if(fine_tune == 1)
- tmp2.voice2_fine_tune = 0.000025;
- else if(fine_tune == -1)
- tmp2.voice2_fine_tune = -0.000025;
- else
- tmp2.voice2_fine_tune = ((fine_tune * 15.625) / 1000.0);
+ // Simulate behavior of DMX second voice detune
+ tmp2.voice2_fine_tune = (double)((fine_tune >> 1) - 64) / 32.0;
}
uint32_t gmno = is_percussion ? i + 128 : i;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 13:10:39 +0000