Update @sneakernets's DMXOPL3 bank (2.11b + two commits)

3 files changed, 76 insertions, 75 deletions

diff --git a/fm_banks/adldata-cache.dat b/fm_banks/adldata-cache.dat
index 0b709f3..35d8035 100644
--- a/fm_banks/adldata-cache.dat
+++ b/fm_banks/adldata-cache.dat
diff --git a/fm_banks/wopl_files/DMXOPL3-by-sneakernets.wopl b/fm_banks/wopl_files/DMXOPL3-by-sneakernets.wopl
index 162ba2e..6cdf0c8 100644
--- a/fm_banks/wopl_files/DMXOPL3-by-sneakernets.wopl
+++ b/fm_banks/wopl_files/DMXOPL3-by-sneakernets.wopl
diff --git a/src/adldata.cpp b/src/adldata.cpp
index 58e1ec8..d43f33b 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[4424] =
+const adldata adl[4425] =
 { //    ,---------+-------- Wave select settings
   //    | ,-------ч-+------ Sustain/release rates
   //    | | ,-----ч-ч-+---- Attack/decay rates
@@ -4355,19 +4355,20 @@ const adldata adl[4424] =
     { 0x2F7F602,0x0F8F802, 0x00,0x88, 0xE, +12 },
     { 0x05476C1,0x30892C5, 0x80,0x08, 0x0, +0 },
     { 0x05477C1,0x30892C5, 0x00,0x08, 0xA, -2 },
-    { 0x017C604,0x017C604, 0x00,0x00, 0x1, +0 },
-    { 0x201F302,0x057AB09, 0x03,0x00, 0xC, +12 },
+    { 0x007C604,0x007C604, 0x08,0x08, 0x1, +0 },
+    { 0x201F302,0x057AB09, 0x03,0x07, 0xC, +12 },
     { 0x254F307,0x307F905, 0x04,0x08, 0x6, -5 },
     { 0x254F307,0x207F905, 0x04,0x08, 0x8, +0 },
-    { 0x016C604,0x016C604, 0x00,0x00, 0x1, +0 },
-    { 0x201F312,0x057AB09, 0x03,0x00, 0xC, +12 },
+    { 0x006C604,0x007C604, 0x08,0x08, 0x1, +0 },
+    { 0x201F312,0x057AB09, 0x03,0x07, 0xC, +12 },
     { 0x254D307,0x3288905, 0x04,0x03, 0xA, -5 },
-    { 0x016E614,0x016C614, 0x00,0x00, 0x1, +0 },
-    { 0x201F312,0x057AB09, 0x00,0x00, 0xC, +12 },
-    { 0x035C618,0x015C618, 0x00,0x00, 0x1, +0 },
-    { 0x001F312,0x047BB05, 0x03,0x00, 0xC, +12 },
-    { 0x015C618,0x015C618, 0x00,0x00, 0x1, +0 },
-    { 0x201F312,0x047BB09, 0x03,0x00, 0xC, +12 },
+    { 0x0015500,0x007C716, 0x0C,0x00, 0x0, +0 },
+    { 0x201F312,0x057AB09, 0x00,0x07, 0xC, +12 },
+    { 0x0015500,0x007C719, 0x0C,0x00, 0x0, +0 },
+    { 0x001F312,0x047BB05, 0x03,0x07, 0xC, +12 },
+    { 0x0015500,0x007C71B, 0x0C,0x00, 0x0, +0 },
+    { 0x201F312,0x047BB09, 0x03,0x07, 0xC, +12 },
+    { 0x0015500,0x007C71F, 0x0C,0x00, 0x0, +0 },
     { 0x210F509,0x305FE03, 0x8A,0x85, 0xE, +12 },
     { 0x200F508,0x305FE03, 0xC7,0x85, 0xC, +12 },
     { 0x2E1F119,0x3F3F11B, 0x04,0x0D, 0x8, +0 },
@@ -8922,74 +8923,74 @@ const struct adlinsdata adlins[4547] =
     {4334,4333, 25, 1,     33,    33,0.000000 },
     {4335,4336, 61, 1,     40,    40,0.000000 },
     {4337,4338, 37, 1,     53,    53,0.000000 },
-    {4339,4340, 15, 1,     93,    93,0.000000 },
+    {4339,4340, 15, 1,     80,    80,0.000000 },
     {4341,4342, 48, 1,     73,    73,-1.906250 },
-    {4343,4344, 19, 1,    160,   160,0.000000 },
+    {4343,4344, 19, 1,    120,   120,0.000000 },
     {4345,4345, 48, 0,     53,    53,0.000000 },
-    {4346,4347, 22, 1,    146,   146,0.000000 },
-    {4348,4349, 13, 1,     93,    93,0.000000 },
-    {4350,4351, 16, 1,    106,   106,0.000000 },
-    {4350,4351, 20, 1,    280,   280,0.000000 },
-    {4352,4353, 60, 1,    286,   286,0.062500 },
-    {4354,4354, 62, 0,   1726,  1726,0.000000 },
-    {4355,4356, 80, 1,    106,   106,0.125000 },
-    {4357,4357, 58, 0,     73,    73,0.000000 },
-    {4358,4359, 31, 1,    313,   313,0.000000 },
-    {4360,4360, 61, 0,    206,   206,0.000000 },
-    {4361,4362, 41, 1,    100,   100,0.000000 },
-    {4363,4364, 35, 1,    160,   160,0.000000 },
-    {4365,4366, 29, 1,     40,    40,0.000000 },
-    {4367,4368, 41, 1,    166,   166,0.000000 },
-    {4367,4368, 37, 1,    160,   160,0.000000 },
-    {4369,4370, 54, 1,     80,    80,0.000000 },
-    {4369,4371, 48, 1,     80,    80,0.000000 },
-    {4372,4373, 77, 1,     53,    53,0.000000 },
-    {4374,4375, 72, 1,     46,    46,0.000000 },
-    {4376,4376, 40, 0,    140,   140,0.000000 },
-    {4377,4377, 45, 0,    313,   313,0.000000 },
-    {4378,4378, 42, 0,  40000,     0,0.000000 },
-    {4379,4379, 73, 0,     60,    60,0.000000 },
-    {4380,4381, 68, 1,     40,    40,0.000000 },
-    {4382,4383, 18, 1,     60,    60,0.000000 },
-    {4384,4385, 18, 1,    106,   106,0.000000 },
-    {4386,4386, 90, 0,     80,    80,0.000000 },
-    {4387,4387, 90, 0,    306,   306,0.000000 },
-    {4388,4389, 64, 1,    233,   233,0.031250 },
-    {4390,4391, 80, 1,    140,   140,0.031250 },
-    {4392,4393, 64, 1,    606,   606,0.000000 },
-    {4394,4394, 67, 0,     20,    20,0.000000 },
-    {4395,4396, 50, 1,     53,    53,0.000000 },
-    {4397,4397, 36, 0,     66,    66,0.000000 },
-    {4398,4398,  0, 0,  40000,    20,0.000000 },
-    {4399,4399,  0, 0,  40000,     0,0.000000 },
-    {4400,4400,  0, 0,    360,   360,0.000000 },
-    {4401,4401,  0, 0,    586,   586,0.000000 },
-    {4402,4402,  0, 0,  40000,     0,0.000000 },
+    {4346,4347, 15, 1,     33,    33,0.000000 },
+    {4348,4349, 12, 1,     33,    33,0.000000 },
+    {4350,4351, 12, 1,     33,    33,0.000000 },
+    {4352,4351, 10, 1,     40,    40,0.000000 },
+    {4353,4354, 60, 1,    286,   286,0.062500 },
+    {4355,4355, 62, 0,   1726,  1726,0.000000 },
+    {4356,4357, 80, 1,    106,   106,0.125000 },
+    {4358,4358, 58, 0,     73,    73,0.000000 },
+    {4359,4360, 31, 1,    313,   313,0.000000 },
+    {4361,4361, 61, 0,    206,   206,0.000000 },
+    {4362,4363, 41, 1,    100,   100,0.000000 },
+    {4364,4365, 35, 1,    160,   160,0.000000 },
+    {4366,4367, 29, 1,     40,    40,0.000000 },
+    {4368,4369, 41, 1,    166,   166,0.000000 },
+    {4368,4369, 37, 1,    160,   160,0.000000 },
+    {4370,4371, 54, 1,     80,    80,0.000000 },
+    {4370,4372, 48, 1,     80,    80,0.000000 },
+    {4373,4374, 77, 1,     53,    53,0.000000 },
+    {4375,4376, 72, 1,     46,    46,0.000000 },
+    {4377,4377, 40, 0,    140,   140,0.000000 },
+    {4378,4378, 45, 0,    313,   313,0.000000 },
+    {4379,4379, 42, 0,  40000,     0,0.000000 },
+    {4380,4380, 73, 0,     60,    60,0.000000 },
+    {4381,4382, 68, 1,     40,    40,0.000000 },
+    {4383,4384, 18, 1,     60,    60,0.000000 },
+    {4385,4386, 18, 1,    106,   106,0.000000 },
+    {4387,4387, 90, 0,     80,    80,0.000000 },
+    {4388,4388, 90, 0,    306,   306,0.000000 },
+    {4389,4390, 64, 1,    233,   233,0.031250 },
+    {4391,4392, 80, 1,    140,   140,0.031250 },
+    {4393,4394, 64, 1,    606,   606,0.000000 },
+    {4395,4395, 67, 0,     20,    20,0.000000 },
+    {4396,4397, 50, 1,     53,    53,0.000000 },
+    {4398,4398, 36, 0,     66,    66,0.000000 },
+    {4399,4399,  0, 0,  40000,    20,0.000000 },
+    {4400,4400,  0, 0,  40000,     0,0.000000 },
+    {4401,4401,  0, 0,    360,   360,0.000000 },
+    {4402,4402,  0, 0,    586,   586,0.000000 },
     {4403,4403,  0, 0,  40000,     0,0.000000 },
     {4404,4404,  0, 0,  40000,     0,0.000000 },
-    {4405,4405,  0, 0,  40000,     6,0.000000 },
-    {4406,4406,  0, 0,  40000,     0,0.000000 },
-    {4407,4407,  0, 0,    146,   146,0.000000 },
-    {4407,4407, 73, 0,    886,   886,0.000000 },
-    {4408,4408,  0, 0,     40,     0,0.000000 },
-    {4409,4409,  0, 0,    486,     0,0.000000 },
-    {4410,4410,  0, 0,   1226,  1226,0.000000 },
-    {4411,4411,  0, 0,   1480,  1480,0.000000 },
-    {4412,4412,  0, 0,     46,    46,0.000000 },
-    {4413,4413,  0, 0,    126,   126,0.000000 },
-    {4413,4413, 12, 0,    106,   106,0.000000 },
-    {4414,4414,  0, 0,    160,   160,0.000000 },
-    {4414,4414,  1, 0,    153,   153,0.000000 },
-    {4415,4415,  0, 0,     20,    20,0.000000 },
-    {4415,4415, 23, 0,     26,    26,0.000000 },
-    {4416,4416,  0, 0,    140,   140,0.000000 },
-    {4417,4417,  0, 0,    486,   486,0.000000 },
-    {4418,4418,  0, 0,  40000,    13,0.000000 },
-    {4419,4419,  0, 0,  40000,     0,0.000000 },
-    {4420,4420,  0, 0,   1226,  1226,0.000000 },
-    {4421,4421,  0, 0,    766,   766,0.000000 },
-    {4422,4422,  0, 0,     93,    93,0.000000 },
-    {4423,4423,  0, 2,  40000,     0,0.000000 },
+    {4405,4405,  0, 0,  40000,     0,0.000000 },
+    {4406,4406,  0, 0,  40000,     6,0.000000 },
+    {4407,4407,  0, 0,  40000,     0,0.000000 },
+    {4408,4408,  0, 0,    146,   146,0.000000 },
+    {4408,4408, 73, 0,    886,   886,0.000000 },
+    {4409,4409,  0, 0,     40,     0,0.000000 },
+    {4410,4410,  0, 0,    486,     0,0.000000 },
+    {4411,4411,  0, 0,   1226,  1226,0.000000 },
+    {4412,4412,  0, 0,   1480,  1480,0.000000 },
+    {4413,4413,  0, 0,     46,    46,0.000000 },
+    {4414,4414,  0, 0,    126,   126,0.000000 },
+    {4414,4414, 12, 0,    106,   106,0.000000 },
+    {4415,4415,  0, 0,    160,   160,0.000000 },
+    {4415,4415,  1, 0,    153,   153,0.000000 },
+    {4416,4416,  0, 0,     20,    20,0.000000 },
+    {4416,4416, 23, 0,     26,    26,0.000000 },
+    {4417,4417,  0, 0,    140,   140,0.000000 },
+    {4418,4418,  0, 0,    486,   486,0.000000 },
+    {4419,4419,  0, 0,  40000,    13,0.000000 },
+    {4420,4420,  0, 0,  40000,     0,0.000000 },
+    {4421,4421,  0, 0,   1226,  1226,0.000000 },
+    {4422,4422,  0, 0,    766,   766,0.000000 },
+    {4423,4423,  0, 0,     93,    93,0.000000 },
+    {4424,4424,  0, 2,  40000,     0,0.000000 },
 };