aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fm_banks/adldata-cache.datbin561392 -> 561392 bytes
-rw-r--r--src/adldata.cpp414
-rw-r--r--utils/gen_adldata/measurer.cpp2
3 files changed, 208 insertions, 208 deletions
diff --git a/fm_banks/adldata-cache.dat b/fm_banks/adldata-cache.dat
index 80914a3..da6028c 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 64280aa..5585089 100644
--- a/src/adldata.cpp
+++ b/src/adldata.cpp
@@ -4700,7 +4700,7 @@ const struct adlinsdata adlins[4678] =
{ 136, 136, 77, 0, 1586, 553, 0, 0 },
{ 143, 143, 60, 0, 173, 93, 0, 0 },
{ 144, 144, 65, 0, 213, 126, 0, 0 },
- { 145, 145, 59, 0, 173, 0, 0, 0 },
+ { 145, 145, 59, 0, 173, 140, 0, 0 },
{ 146, 146, 51, 0, 173, 100, 0, 0 },
{ 147, 147, 45, 0, 260, 206, 0, 0 },
{ 148, 148, 71, 0, 433, 180, 0, 0 },
@@ -4729,13 +4729,13 @@ const struct adlinsdata adlins[4678] =
{ 170, 170, 0, 0, 40000, 0, 0, 0 },
{ 171, 171, 0, 0, 40000, 73, 0, 0 },
{ 172, 173, 0, 4, 5886, 100, 0, 0 },
- { 174, 175, 0, 4, 6913, 0, 0, 0 },
- { 176, 177, 0, 4, 4873, 0, 0, 0 },
+ { 174, 175, 0, 4, 6913, 93, 0, 0 },
+ { 176, 177, 0, 4, 4873, 120, 0, 0 },
{ 178, 178, 0, 0, 40000, 0, 0, 0 },
{ 179, 180, 0, 4, 4626, 433, 0, 0 },
{ 181, 181, 0, 0, 2280, 746, 0, 0 },
{ 182, 182, 0, 0, 40000, 0, 0, 0 },
- { 183, 184, 0, 4, 620, 0, 0, 0 },
+ { 183, 184, 0, 4, 620, 233, 0, 0 },
{ 185, 186, 0, 4, 4626, 1546, 0, 0 },
{ 187, 187, 0, 0, 1166, 400, 0, 0 },
{ 188, 189, 0, 4, 40000, 60, 0, 0 },
@@ -4749,14 +4749,14 @@ const struct adlinsdata adlins[4678] =
{ 203, 204, 0, 4, 14686, 126, 0, 0 },
{ 205, 206, 0, 4, 9233, 153, 0, 0 },
{ 207, 208, 0, 4, 14640, 133, 0, 0 },
- { 209, 210, 0, 4, 4626, 0, 0, 0 },
+ { 209, 210, 0, 4, 4626, 106, 0, 0 },
{ 211, 212, 0, 4, 40000, 66, 0, 0 },
{ 213, 213, 0, 0, 40000, 73, 0, 0 },
- { 214, 215, 0, 4, 620, 0, 0, 0 },
+ { 214, 215, 0, 4, 620, 100, 0, 0 },
{ 216, 217, 0, 4, 4060, 100, 0, 0 },
{ 218, 219, 0, 4, 14513, 193, 0, 0 },
{ 220, 221, 0, 4, 2813, 106, 0, 0 },
- { 222, 223, 0, 4, 493, 0, 0, 0 },
+ { 222, 223, 0, 4, 493, 153, 0, 0 },
{ 224, 224, 0, 0, 40000, 0, 0, 0 },
{ 225, 226, 0, 4, 7993, 93, 0, 0 },
{ 227, 227, 0, 0, 40000, 0, 0, 0 },
@@ -4766,7 +4766,7 @@ const struct adlinsdata adlins[4678] =
{ 233, 234, 0, 4, 40000, 0, 0, 0 },
{ 235, 236, 0, 4, 993, 340, 0, 0 },
{ 235, 237, 0, 4, 3260, 1120, 0, 0 },
- { 46, 238, 0, 4, 6720, 0, 0, 0 },
+ { 46, 238, 0, 4, 6720, 1246, 0, 0 },
{ 239, 240, 0, 4, 40000, 140, 0, 0 },
{ 241, 242, 0, 4, 40000, 146, 0, 0 },
{ 243, 243, 0, 0, 40000, 100, 0, 0 },
@@ -4814,7 +4814,7 @@ const struct adlinsdata adlins[4678] =
{ 311, 312, 0, 4, 9100, 240, 0, 0 },
{ 313, 314, 0, 4, 7280, 326, 0, 0 },
{ 315, 316, 0, 4, 3553, 326, 0, 0 },
- { 317, 318, 0, 4, 6966, 0, 0, 0 },
+ { 317, 318, 0, 4, 6966, 2206, 0, 0 },
{ 107, 319, 0, 4, 1160, 406, 0, 0 },
{ 108, 320, 0, 4, 40000, 66, 0, 0 },
{ 109, 321, 0, 4, 720, 213, 0, 0 },
@@ -4831,7 +4831,7 @@ const struct adlinsdata adlins[4678] =
{ 336, 336, 0, 0, 12053, 660, 0, 0 },
{ 337, 337, 0, 0, 40000, 240, 0, 0 },
{ 338, 339, 0, 6, 6, 0, 0, 0 },
- { 340, 341, 0, 4, 560, 0, 0, 0 },
+ { 340, 341, 0, 4, 560, 73, 0, 0 },
{ 342, 342, 35, 0, 40000, 0, 0, 0 },
{ 343, 343, 0, 0, 180, 100, 0, 0 },
{ 344, 344, 35, 0, 340, 146, 0, 0 },
@@ -4855,15 +4855,15 @@ const struct adlinsdata adlins[4678] =
{ 357, 357, 36, 0, 146, 33, 0, 0 },
{ 358, 358, 48, 0, 213, 86, 0, 0 },
{ 358, 358, 36, 0, 246, 86, 0, 0 },
- { 359, 359, 36, 0, 113, 0, 0, 0 },
+ { 359, 359, 36, 0, 113, 53, 0, 0 },
{ 360, 360, 0, 0, 133, 40, 0, 0 },
{ 361, 361, 61, 0, 180, 26, 0, 0 },
{ 362, 362, 96, 0, 706, 266, 0, 0 },
{ 363, 363, 38, 0, 520, 193, 0, 0 },
{ 127, 127, 16, 0, 620, 233, 0, 0 },
- { 364, 365, 18, 4, 200, 0, 0, 0 },
+ { 364, 365, 18, 4, 200, 26, 0, 0 },
{ 366, 366, 30, 0, 406, 246, 0, 0 },
- { 367, 368, 35, 4, 200, 0, 0, 0 },
+ { 367, 368, 35, 4, 200, 100, 0, 0 },
{ 129, 129, 0, 0, 353, 153, 0, 0 },
{ 369, 369, 0, 0, 213, 13, 0, 0 },
{ 370, 370, 88, 0, 333, 113, 0, 0 },
@@ -4893,13 +4893,13 @@ const struct adlinsdata adlins[4678] =
{ 391, 392, 35, 4, 173, 46, 0, 0 },
{ 391, 393, 35, 4, 460, 66, 0, 0 },
{ 394, 394, 60, 0, 173, 20, 0, 0 },
- { 328, 328, 7, 0, 173, 0, 0, 0 },
+ { 328, 328, 7, 0, 173, 106, 0, 0 },
{ 395, 395, 90, 0, 193, 20, 0, 0 },
{ 396, 396, 90, 0, 793, 40, 0, 0 },
{ 397, 397, 35, 0, 253, 86, 0, 0 },
{ 398, 399, 5, 4, 1913, 226, 0, 0 },
{ 400, 400,103, 0, 713, 273, 0, 0 },
- { 401, 401, 3, 0, 100, 0, 0, 0 },
+ { 401, 401, 3, 0, 100, 26, 0, 0 },
{ 169, 169, 1, 0, 466, 413, 0, 0 },
{ 131, 131, 0, 0, 613, 226, 0, 0 },
{ 402, 402, 36, 0, 273, 53, 0, 0 },
@@ -4910,7 +4910,7 @@ const struct adlinsdata adlins[4678] =
{ 407, 407, 50, 0, 40000, 0, 0, 0 },
{ 408, 408, 50, 0, 793, 346, 0, 0 },
{ 409, 409, 83, 0, 120, 13, 0, 0 },
- { 410, 410, 72, 0, 433, 0, 0, 0 },
+ { 410, 410, 72, 0, 433, 193, 0, 0 },
{ 148, 148, 59, 0, 513, 200, 0, 0 },
{ 411, 411, 64, 0, 173, 93, 0, 0 },
{ 411, 411, 60, 0, 173, 93, 0, 0 },
@@ -4942,7 +4942,7 @@ const struct adlinsdata adlins[4678] =
{ 430, 430, 95, 0, 680, 80, 0, 0 },
{ 431, 431, 35, 0, 593, 140, 0, 0 },
{ 432, 432, 60, 0, 213, 133, 0, 0 },
- { 357, 357, 59, 0, 113, 0, 0, 0 },
+ { 357, 357, 59, 0, 113, 33, 0, 0 },
{ 432, 432, 44, 0, 213, 133, 0, 0 },
{ 433, 433, 41, 0, 713, 273, 0, 0 },
{ 434, 434, 97, 0, 113, 46, 0, 0 },
@@ -4970,7 +4970,7 @@ const struct adlinsdata adlins[4678] =
{ 445, 445, 90, 0, 233, 93, 0, 0 },
{ 446, 446, 46, 0, 133, 73, 0, 0 },
{ 447, 447, 48, 0, 333, 73, 0, 0 },
- { 448, 448, 85, 0, 106, 0, 0, 0 },
+ { 448, 448, 85, 0, 106, 33, 0, 0 },
{ 449, 449, 66, 0, 180, 26, 0, 0 },
{ 449, 449, 61, 0, 180, 26, 0, 0 },
{ 450, 450, 41, 0, 200, 66, 0, 0 },
@@ -4978,7 +4978,7 @@ const struct adlinsdata adlins[4678] =
{ 452, 452, 81, 0, 253, 26, 0, 0 },
{ 400, 400, 81, 0, 820, 306, 0, 0 },
{ 400, 400, 76, 0, 813, 300, 0, 0 },
- { 359, 359, 60, 0, 100, 0, 0, 0 },
+ { 359, 359, 60, 0, 100, 40, 0, 0 },
{ 453, 453, 53, 0, 40000, 0, 0, 0 },
{ 454, 454, 0, 2, 6, 0, 0, 0 },
{ 455, 455, 0, 0, 200, 20, 0, 0 },
@@ -5030,11 +5030,11 @@ const struct adlinsdata adlins[4678] =
{ 498, 498, 33, 0, 3773, 886, 0, 0 },
{ 498, 498, 38, 0, 3746, 860, 0, 0 },
{ 498, 498, 42, 0, 3793, 906, 0, 0 },
- { 499, 499, 24, 0, 266, 0, 0, 0 },
+ { 499, 499, 24, 0, 266, 160, 0, 0 },
{ 499, 499, 27, 0, 260, 153, 0, 0 },
{ 499, 499, 29, 0, 260, 153, 0, 0 },
{ 499, 499, 32, 0, 260, 153, 0, 0 },
- { 500, 500, 32, 0, 106, 0, 0, 0 },
+ { 500, 500, 32, 0, 106, 26, 0, 0 },
{ 501, 501, 53, 0, 373, 186, 0, 0 },
{ 501, 501, 57, 0, 380, 193, 0, 0 },
{ 502, 502, 60, 0, 286, 133, 0, 0 },
@@ -5045,8 +5045,8 @@ const struct adlinsdata adlins[4678] =
{ 506, 506, 48, 0, 826, 646, 0, 0 },
{ 507, 507, 48, 0, 266, 213, 0, 0 },
{ 132, 132, 72, 0, 126, 66, 0, 0 },
- { 508, 508, 72, 0, 106, 0, 0, 0 },
- { 509, 509, 72, 0, 100, 0, 0, 0 },
+ { 508, 508, 72, 0, 106, 46, 0, 0 },
+ { 509, 509, 72, 0, 100, 26, 0, 0 },
{ 510, 510, 63, 0, 1860, 633, 0, 0 },
{ 510, 510, 65, 0, 1853, 633, 0, 0 },
{ 511, 511, 79, 0, 1573, 553, 0, 0 },
@@ -5096,7 +5096,7 @@ const struct adlinsdata adlins[4678] =
{ 547, 547, 0, 0, 40000, 153, 0, 0 },
{ 135, 135, 49, 0, 3633, 1186, 0, 0 },
{ 548, 548, 35, 0, 2193, 80, 0, 0 },
- { 549, 549, 41, 0, 73, 0, 0, 0 },
+ { 549, 549, 41, 0, 73, 26, 0, 0 },
{ 366, 366, 38, 0, 406, 246, 0, 0 },
{ 550, 550, 39, 0, 106, 20, 0, 0 },
{ 551, 551, 49, 0, 200, 133, 0, 0 },
@@ -5110,7 +5110,7 @@ const struct adlinsdata adlins[4678] =
{ 554, 554, 61, 0, 400, 126, 0, 0 },
{ 554, 554, 68, 0, 353, 120, 0, 0 },
{ 555, 555, 36, 0, 146, 86, 0, 0 },
- { 555, 555, 60, 0, 113, 0, 0, 0 },
+ { 555, 555, 60, 0, 113, 53, 0, 0 },
{ 556, 556, 36, 0, 273, 53, 0, 0 },
{ 115, 115, 37, 0, 4580, 1513, 0, 0 },
{ 557, 557, 0, 0, 3806, 73, 0, 0 },
@@ -5314,7 +5314,7 @@ const struct adlinsdata adlins[4678] =
{ 697, 697, 0, 0, 40000, 0, 0, 0 },
{ 698, 698, 0, 0, 40000, 66, 0, 0 },
{ 699, 699, 0, 0, 40000, 66, 0, 0 },
- { 700, 700, 0, 0, 106, 0, 0, 0 },
+ { 700, 700, 0, 0, 106, 53, 0, 0 },
{ 701, 701, 0, 0, 40000, 200, 0, 0 },
{ 702, 702, 0, 0, 3913, 73, 0, 0 },
{ 703, 703, 0, 0, 40000, 73, 0, 0 },
@@ -5356,7 +5356,7 @@ const struct adlinsdata adlins[4678] =
{ 737, 737, 0, 2, 6, 0, 0, 0 },
{ 738, 738, 38, 0, 1020, 413, 0, 0 },
{ 739, 739, 44, 0, 220, 33, 0, 0 },
- { 500, 500, 58, 0, 100, 0, 0, 0 },
+ { 500, 500, 58, 0, 100, 26, 0, 0 },
{ 740, 740, 24, 0, 513, 206, 0, 0 },
{ 741, 741, 60, 0, 220, 26, 0, 0 },
{ 736, 736, 44, 0, 286, 20, 0, 0 },
@@ -5373,7 +5373,7 @@ const struct adlinsdata adlins[4678] =
{ 746, 746,102, 0, 960, 300, 0, 0 },
{ 747, 747, 80, 0, 1106, 126, 0, 0 },
{ 377, 377, 0, 0, 500, 760, 0, 0 },
- { 748, 748, 56, 0, 100, 0, 0, 0 },
+ { 748, 748, 56, 0, 100, 26, 0, 0 },
{ 749, 749, 0, 0, 973, 1300, 0, 0 },
{ 746, 746,100, 0, 960, 340, 0, 0 },
{ 750, 750, 40, 0, 626, 240, 0, 0 },
@@ -5381,7 +5381,7 @@ const struct adlinsdata adlins[4678] =
{ 751, 751, 29, 0, 206, 106, 0, 0 },
{ 750, 750, 29, 0, 633, 240, 0, 0 },
{ 750, 750, 22, 0, 640, 233, 0, 0 },
- { 500, 500, 0, 0, 106, 0, 0, 0 },
+ { 500, 500, 0, 0, 106, 26, 0, 0 },
{ 752, 752, 0, 0, 206, 26, 0, 0 },
{ 753, 753, 84, 0, 166, 20, 0, 0 },
{ 754, 754, 84, 0, 1580, 553, 0, 0 },
@@ -5521,7 +5521,7 @@ const struct adlinsdata adlins[4678] =
{ 884, 884, 36, 0, 233, 80, 0, 0 },
{ 885, 885, 48, 0, 193, 93, 0, 0 },
{ 885, 885, 36, 0, 226, 100, 0, 0 },
- { 886, 886, 36, 0, 113, 0, 0, 0 },
+ { 886, 886, 36, 0, 113, 53, 0, 0 },
{ 887, 887, 32, 0, 133, 40, 0, 0 },
{ 767, 767, 96, 0, 1760, 480, 0, 0 },
{ 888, 888, 30, 0, 246, 40, 0, 0 },
@@ -5561,7 +5561,7 @@ const struct adlinsdata adlins[4678] =
{ 907, 907, 41, 0, 333, 106, 0, 0 },
{ 908, 908, 81, 0, 160, 26, 0, 0 },
{ 400, 400, 10, 0, 1186, 413, 0, 0 },
- { 886, 886, 60, 0, 100, 0, 0, 0 },
+ { 886, 886, 60, 0, 100, 40, 0, 0 },
{ 873, 873, 53, 0, 846, 360, 0, 0 },
{ 909, 909, 0, 0, 5593, 340, 0, 0 },
{ 910, 910, 0, 0, 14646, 346, 0, 0 },
@@ -5667,7 +5667,7 @@ const struct adlinsdata adlins[4678] =
{1009,1009, 0, 0, 40000, 133, 0, 0 },
{1010,1010, 0, 0, 40000, 400, 0, 0 },
{1011,1011, 0, 0, 4473, 193, 0, 0 },
- {1012,1012, 0, 0, 1813, 0, 0, 0 },
+ {1012,1012, 0, 0, 1813, 120, 0, 0 },
{1013,1013, 0, 0, 3726, 353, 0, 0 },
{1014,1014, 0, 0, 4400, 373, 0, 0 },
{1015,1015, 0, 0, 953, 166, 0, 0 },
@@ -5917,12 +5917,12 @@ const struct adlinsdata adlins[4678] =
{1278,1278, 22, 0, 1880, 653, 0, 0 },
{1279,1279, 55, 0, 246, 120, 0, 0 },
{1279,1279, 48, 0, 286, 133, 0, 0 },
- {1280,1280, 0, 0, 40, 0, 0, 0 },
- {1281,1281, 49, 2, 40, 0, 0, 0 },
+ {1280,1280, 0, 0, 40, 93, 0, 0 },
+ {1281,1281, 49, 2, 40, 93, 0, 0 },
{1282,1282, 73, 0, 166, 33, 0, 0 },
{1282,1282, 68, 0, 166, 33, 0, 0 },
{1282,1282, 61, 0, 200, 40, 0, 0 },
- {1283,1283, 0, 0, 40, 0, 0, 0 },
+ {1283,1283, 0, 0, 40, 93, 0, 0 },
{1284,1284, 0, 0, 40000, 100, 0, 0 },
{1285,1285, 0, 0, 40000, 60, 0, 0 },
{1286,1286, 0, 0, 40000, 0, 0, 0 },
@@ -6070,7 +6070,7 @@ const struct adlinsdata adlins[4678] =
{1421,1421, 0, 0, 40000, 40, 0, 0 },
{1422,1422, 0, 0, 40000, 126, 0, 0 },
{1423,1423, 0, 0, 40000, 0, 0, 0 },
- {1424,1424, 0, 0, 13653, 0, 0, 0 },
+ {1424,1424, 0, 0, 13653, 4720, 0, 0 },
{1425,1425, 0, 0, 12533, 1953, 0, 0 },
{1426,1426, 0, 0, 973, 1280, 0, 0 },
{1427,1427, 0, 0, 40000, 426, 0, 0 },
@@ -6084,12 +6084,12 @@ const struct adlinsdata adlins[4678] =
{ 740, 740, 0, 0, 513, 200, 0, 0 },
{1435,1435, 0, 0, 40000, 5666, 0, 0 },
{ 739, 739, 48, 0, 213, 20, 0, 0 },
- { 500, 500, 55, 0, 100, 0, 0, 0 },
+ { 500, 500, 55, 0, 100, 26, 0, 0 },
{ 740, 740, 60, 0, 226, 113, 0, 0 },
- { 500, 500, 41, 0, 106, 0, 0, 0 },
+ { 500, 500, 41, 0, 106, 26, 0, 0 },
{1436,1436, 84, 0, 160, 26, 0, 0 },
{1437,1437, 84, 0, 386, 493, 0, 0 },
- { 500, 500, 48, 0, 100, 0, 0, 0 },
+ { 500, 500, 48, 0, 100, 26, 0, 0 },
{1438,1438, 15, 0, 340, 140, 0, 0 },
{ 752, 752, 49, 0, 173, 20, 0, 0 },
{1438,1438, 16, 0, 346, 146, 0, 0 },
@@ -6102,7 +6102,7 @@ const struct adlinsdata adlins[4678] =
{1441,1442, 0, 4, 7320, 193, 0, 0 },
{1443,1444, 0, 4, 11833, 320, 0, 0 },
{1445,1446, 0, 4, 9920, 326, 0, 0 },
- {1447,1448, 0, 4, 10133, 0, 0, 0 },
+ {1447,1448, 0, 4, 10133, 26, 0, 0 },
{1449,1450, 0, 4, 7373, 2486, 0, 0 },
{ 181,1451, 0, 4, 2313, 733, 0, 0 },
{1452,1453, 0, 4, 9213, 240, 0, 0 },
@@ -6116,8 +6116,8 @@ const struct adlinsdata adlins[4678] =
{1466,1467, 0, 4, 40000, 66, 0, 0 },
{1468,1469, 0, 4, 40000, 46, 0, 0 },
{ 35,1470, 0, 4, 40000, 46, 0, 0 },
- { 36,1471, 0, 4, 320, 0, 0, 0 },
- {1472,1473, 0, 4, 320, 0, 0, 0 },
+ { 36,1471, 0, 4, 320, 26, 0, 0 },
+ {1472,1473, 0, 4, 320, 26, 0, 0 },
{1474,1475, 0, 4, 7986, 93, 0, 0 },
{ 39,1476, 0, 4, 1046, 226, 0, 0 },
{1477,1476, 0, 4, 1046, 226, 0, 0 },
@@ -6151,7 +6151,7 @@ const struct adlinsdata adlins[4678] =
{1528,1529, 0, 4, 40000, 960, 0, 0 },
{ 111,1530, 0, 4, 1193, 433, 0, 0 },
{1531,1532, 0, 4, 220, 386, 0, 0 },
- { 115,1533, 0, 4, 2413, 0, 0, 0 },
+ { 115,1533, 0, 4, 2413, 1646, 0, 0 },
{1534,1535, 0, 4, 1853, 640, 0, 0 },
{1536,1537, 0, 4, 3006, 53, 0, 0 },
{1538,1539, 0, 4, 1506, 720, 0, 0 },
@@ -6160,57 +6160,57 @@ const struct adlinsdata adlins[4678] =
{1542,1543, 0, 4, 993, 93, 0, 0 },
{1544,1545, 0, 4, 293, 86, 0, 0 },
{1546,1547, 0, 4, 40000, 153, 0, 0 },
- { 364, 365, 44, 4, 120, 0, 0, 0 },
- { 129,1548, 48, 4, 173, 0, 0, 0 },
- { 367, 368, 58, 4, 173, 0, 0, 0 },
- { 129,1549, 60, 4, 173, 0, 0, 0 },
+ { 364, 365, 44, 4, 120, 26, 0, 0 },
+ { 129,1548, 48, 4, 173, 93, 0, 0 },
+ { 367, 368, 58, 4, 173, 93, 0, 0 },
+ { 129,1549, 60, 4, 173, 93, 0, 0 },
{1550,1551, 48, 4, 520, 200, 0, 0 },
- { 132,1552, 43, 4, 173, 0, 0, 0 },
+ { 132,1552, 43, 4, 173, 93, 0, 0 },
{1550,1551, 49, 4, 520, 200, 0, 0 },
{1553,1554, 43, 4, 160, 80, 0, 0 },
- {1550,1551, 51, 4, 513, 0, 0, 0 },
- { 134,1555, 43, 4, 1686, 0, 0, 0 },
- {1550,1551, 54, 4, 506, 0, 0, 0 },
- {1550,1551, 57, 4, 506, 0, 0, 0 },
- { 380, 381, 72, 4, 1573, 0, 0, 0 },
- {1550,1551, 60, 4, 513, 0, 0, 0 },
+ {1550,1551, 51, 4, 513, 206, 0, 0 },
+ { 134,1555, 43, 4, 1686, 613, 0, 0 },
+ {1550,1551, 54, 4, 506, 200, 0, 0 },
+ {1550,1551, 57, 4, 506, 200, 0, 0 },
+ { 380, 381, 72, 4, 1573, 553, 0, 0 },
+ {1550,1551, 60, 4, 513, 206, 0, 0 },
{1556,1557, 70, 4, 766, 306, 0, 0 },
- { 374, 375, 60, 4, 973, 0, 0, 0 },
- {1558,1559, 36, 4, 1126, 0, 0, 0 },
+ { 374, 375, 60, 4, 973, 360, 0, 0 },
+ {1558,1559, 36, 4, 1126, 420, 0, 0 },
{1560,1561, 65, 4, 293, 133, 0, 0 },
- {1562,1563, 84, 4, 1353, 0, 0, 0 },
- {1564,1565, 59, 4, 380, 0, 0, 0 },
+ {1562,1563, 84, 4, 1353, 300, 0, 0 },
+ {1564,1565, 59, 4, 380, 160, 0, 0 },
{1566,1567, 84, 4, 1586, 566, 0, 0 },
{1568,1569, 35, 4, 1320, 473, 0, 0 },
- {1570,1571, 44, 4, 406, 0, 0, 0 },
- {1572,1573, 67, 4, 246, 0, 0, 0 },
- {1574,1575, 66, 4, 286, 0, 0, 0 },
- { 145,1576, 59, 4, 140, 0, 0, 0 },
- {1577,1578, 51, 4, 326, 0, 0, 0 },
- {1579,1580, 45, 4, 233, 0, 0, 0 },
- {1581,1582, 71, 4, 433, 0, 0, 0 },
- { 149,1583, 60, 4, 280, 0, 0, 0 },
- {1584,1585, 58, 4, 166, 0, 0, 0 },
- {1586,1587, 53, 4, 173, 0, 0, 0 },
+ {1570,1571, 44, 4, 406, 93, 0, 0 },
+ {1572,1573, 67, 4, 246, 113, 0, 0 },
+ {1574,1575, 66, 4, 286, 193, 0, 0 },
+ { 145,1576, 59, 4, 140, 120, 0, 0 },
+ {1577,1578, 51, 4, 326, 340, 0, 0 },
+ {1579,1580, 45, 4, 233, 193, 0, 0 },
+ {1581,1582, 71, 4, 433, 180, 0, 0 },
+ { 149,1583, 60, 4, 280, 26, 0, 0 },
+ {1584,1585, 58, 4, 166, 93, 0, 0 },
+ {1586,1587, 53, 4, 173, 93, 0, 0 },
{ 397,1588, 64, 4, 213, 80, 0, 0 },
{1589,1590, 71, 4, 106, 53, 0, 0 },
{1591,1592, 61, 4, 973, 340, 0, 0 },
{1593,1594, 61, 4, 986, 340, 0, 0 },
{ 391, 392, 48, 4, 160, 46, 0, 0 },
{ 391, 393, 48, 4, 380, 60, 0, 0 },
- {1595,1596, 69, 4, 120, 0, 0, 0 },
- { 159,1597, 68, 4, 120, 0, 0, 0 },
- { 159,1597, 63, 4, 140, 0, 0, 0 },
+ {1595,1596, 69, 4, 120, 120, 0, 0 },
+ { 159,1597, 68, 4, 120, 120, 0, 0 },
+ { 159,1597, 63, 4, 140, 153, 0, 0 },
{1598,1599, 74, 4, 893, 273, 0, 0 },
{1600,1601, 60, 4, 1006, 306, 0, 0 },
- {1602,1603, 80, 4, 213, 0, 0, 0 },
- {1604,1605, 64, 4, 1346, 0, 0, 0 },
+ {1602,1603, 80, 4, 213, 106, 0, 0 },
+ {1604,1605, 64, 4, 1346, 486, 0, 0 },
{1606,1607, 69, 4, 120, 73, 0, 0 },
{ 398, 399, 55, 4, 1533, 193, 0, 0 },
- {1608,1609, 75, 4, 1560, 0, 0, 0 },
- {1610,1611, 68, 4, 120, 0, 0, 0 },
- {1612,1613, 48, 4, 333, 0, 0, 0 },
- {1614,1615, 53, 4, 593, 0, 0, 0 },
+ {1608,1609, 75, 4, 1560, 300, 0, 0 },
+ {1610,1611, 68, 4, 120, 120, 0, 0 },
+ {1612,1613, 48, 4, 333, 340, 0, 0 },
+ {1614,1615, 53, 4, 593, 620, 0, 0 },
{1616,1616, 0, 0, 40000, 1586, 0, 0 },
{1617,1617, 0, 0, 40000, 1226, 0, 0 },
{1618,1618, 0, 0, 4546, 766, 0, 0 },
@@ -6258,7 +6258,7 @@ const struct adlinsdata adlins[4678] =
{1660,1660, 0, 0, 40000, 5666, 0, 0 },
{1661,1661, 0, 0, 40000, 1613, 0, 0 },
{1662,1662, 0, 0, 3746, 1273, 0, 0 },
- {1663,1663, 0, 0, 13653, 0, 0, 0 },
+ {1663,1663, 0, 0, 13653, 4720, 0, 0 },
{1664,1664, 0, 0, 4640, 1553, 0, 0 },
{1665,1665, 0, 0, 40000, 680, 0, 0 },
{1666,1666, 0, 0, 6393, 426, 0, 0 },
@@ -6375,7 +6375,7 @@ const struct adlinsdata adlins[4678] =
{1769,1769, 0, 0, 40000, 0, 0, 0 },
{1770,1770, 0, 0, 40000, 2386, 0, 0 },
{1771,1771, 0, 0, 4380, 400, 0, 0 },
- {1772,1772, 0, 0, 853, 0, 0, 0 },
+ {1772,1772, 0, 0, 853, 220, 0, 0 },
{1773,1773, 0, 0, 3700, 93, 0, 0 },
{1774,1774, 0, 0, 1580, 300, 0, 0 },
{1775,1775, 0, 0, 453, 140, 0, 0 },
@@ -6397,7 +6397,7 @@ const struct adlinsdata adlins[4678] =
{1791,1791, 0, 0, 40000, 1253, 0, 0 },
{1792,1792, 0, 0, 626, 246, 0, 0 },
{1793,1793, 48, 0, 293, 120, 0, 0 },
- {1794,1794, 48, 0, 100, 0, 0, 0 },
+ {1794,1794, 48, 0, 100, 40, 0, 0 },
{1795,1795, 60, 0, 240, 133, 0, 0 },
{1796,1796, 60, 0, 160, 66, 0, 0 },
{1797,1797, 70, 0, 140, 33, 0, 0 },
@@ -6420,7 +6420,7 @@ const struct adlinsdata adlins[4678] =
{1807,1807, 48, 0, 1006, 20, 0, 0 },
{1808,1808, 56, 0, 120, 40, 0, 0 },
{1809,1809, 53, 0, 286, 133, 0, 0 },
- {1810,1810, 65, 0, 106, 0, 0, 0 },
+ {1810,1810, 65, 0, 106, 46, 0, 0 },
{1811,1811, 49, 0, 293, 133, 0, 0 },
{1811,1811, 43, 0, 293, 133, 0, 0 },
{ 386, 386, 65, 0, 1013, 673, 0, 0 },
@@ -6443,7 +6443,7 @@ const struct adlinsdata adlins[4678] =
{1824,1824, 67, 0, 273, 60, 0, 0 },
{1825,1825, 60, 0, 973, 360, 0, 0 },
{1825,1825, 72, 0, 806, 273, 0, 0 },
- { 401, 401, 62, 0, 46, 0, 0, 0 },
+ { 401, 401, 62, 0, 46, 33, 0, 0 },
{1826,1826, 48, 0, 126, 66, 0, 0 },
{1827,1827, 53, 0, 980, 353, 0, 0 },
{1828,1828, 60, 0, 293, 133, 0, 0 },
@@ -6494,13 +6494,13 @@ const struct adlinsdata adlins[4678] =
{1872,1872, 0, 0, 4220, 620, 0, 0 },
{1873,1873, 0, 0, 40000, 133, 0, 0 },
{1874,1874, 41, 0, 380, 153, 0, 0 },
- {1875,1875, 70, 0, 106, 0, 0, 0 },
+ {1875,1875, 70, 0, 106, 26, 0, 0 },
{1876,1876, 60, 0, 380, 206, 0, 0 },
- {1877,1877, 80, 0, 100, 0, 0, 0 },
- {1878,1878, 84, 0, 120, 0, 0, 0 },
+ {1877,1877, 80, 0, 100, 26, 0, 0 },
+ {1878,1878, 84, 0, 120, 60, 0, 0 },
{1879,1879, 72, 0, 500, 433, 0, 0 },
{1880,1880, 84, 0, 860, 553, 0, 0 },
- { 128, 128, 70, 0, 106, 0, 0, 0 },
+ { 128, 128, 70, 0, 106, 26, 0, 0 },
{ 132, 132, 60, 0, 146, 86, 0, 0 },
{1881,1882, 0, 4, 40000, 260, 0, 0 },
{1883,1883, 0, 0, 40000, 0, 0, 0 },
@@ -6653,7 +6653,7 @@ const struct adlinsdata adlins[4678] =
{ 352, 352, 51, 2, 6, 0, 0, 0 },
{2028,2028, 35, 0, 700, 253, 0, 0 },
{2028,2028, 36, 0, 706, 266, 0, 0 },
- {2029,2029, 47, 0, 100, 0, 0, 0 },
+ {2029,2029, 47, 0, 100, 33, 0, 0 },
{2030,2030, 38, 0, 346, 140, 0, 0 },
{2019,2019, 39, 0, 220, 106, 0, 0 },
{2031,2031, 45, 0, 286, 133, 0, 0 },
@@ -6667,8 +6667,8 @@ const struct adlinsdata adlins[4678] =
{2035,2035, 61, 0, 366, 146, 0, 0 },
{2036,2036, 56, 0, 1346, 473, 0, 0 },
{2037,2037, 60, 0, 213, 126, 0, 0 },
- { 144, 144, 59, 0, 213, 0, 0, 0 },
- {2038,2038, 59, 0, 106, 0, 0, 0 },
+ { 144, 144, 59, 0, 213, 126, 0, 0 },
+ {2038,2038, 59, 0, 106, 40, 0, 0 },
{ 169, 169, 51, 0, 380, 366, 0, 0 },
{ 169, 169, 45, 0, 380, 366, 0, 0 },
{2039,2039, 72, 0, 246, 20, 0, 0 },
@@ -6747,7 +6747,7 @@ const struct adlinsdata adlins[4678] =
{2111,2111, 0, 0, 40000, 240, 0, 0 },
{ 752, 752, 60, 0, 173, 20, 0, 0 },
{ 755, 755, 12, 0, 626, 240, 0, 0 },
- {2112,2112, 89, 0, 113, 0, 0, 0 },
+ {2112,2112, 89, 0, 113, 26, 0, 0 },
{2113,2113, 89, 0, 700, 266, 0, 0 },
{ 755, 755, 14, 0, 626, 240, 0, 0 },
{ 755, 755, 16, 0, 626, 246, 0, 0 },
@@ -6823,7 +6823,7 @@ const struct adlinsdata adlins[4678] =
{2165,2166, 0, 4, 7193, 3920, 0, 0 },
{2167,2168, 0, 4, 3746, 1253, 0, 0 },
{2169,2170, 0, 4, 6226, 2393, 0, 0 },
- {2171,2172, 0, 4, 18053, 0, 0, 0 },
+ {2171,2172, 0, 4, 18053, 226, 0, 0 },
{2173,2174, 0, 4, 40000, 713, 0, 0 },
{2175,2174, 0, 4, 40000, 733, 0, 0 },
{2176, 299, 0, 4, 40000, 273, 0, 0 },
@@ -6833,21 +6833,21 @@ const struct adlinsdata adlins[4678] =
{2183,2184, 0, 4, 7366, 200, 0, 0 },
{ 127, 127, 65, 0, 226, 120, 0, 0 },
{ 127, 127, 72, 0, 180, 100, 0, 0 },
- { 364, 365, 52, 4, 120, 0, 0, 0 },
- {2185,2186, 60, 4, 173, 0, 0, 0 },
- {1550,1551, 47, 4, 520, 0, 0, 0 },
- {1556,1557, 76, 4, 766, 0, 0, 0 },
- { 374, 375, 84, 4, 813, 0, 0, 0 },
- {1564,1565, 83, 4, 220, 0, 0, 0 },
+ { 364, 365, 52, 4, 120, 26, 0, 0 },
+ {2185,2186, 60, 4, 173, 93, 0, 0 },
+ {1550,1551, 47, 4, 520, 213, 0, 0 },
+ {1556,1557, 76, 4, 766, 306, 0, 0 },
+ { 374, 375, 84, 4, 813, 300, 0, 0 },
+ {1564,1565, 83, 4, 220, 106, 0, 0 },
{1568,1569, 24, 4, 1806, 620, 0, 0 },
{1556,1557, 77, 4, 760, 300, 0, 0 },
- {1572,1573, 60, 4, 280, 0, 0, 0 },
- {1574,1575, 65, 4, 286, 0, 0, 0 },
+ {1572,1573, 60, 4, 280, 126, 0, 0 },
+ {1574,1575, 65, 4, 286, 193, 0, 0 },
{ 391, 392, 44, 4, 160, 53, 0, 0 },
{ 391, 393, 40, 4, 460, 66, 0, 0 },
{1606,1607, 72, 4, 120, 73, 0, 0 },
{ 398, 399, 73, 4, 1286, 173, 0, 0 },
- {1608,1609, 70, 4, 1560, 0, 0, 0 },
+ {1608,1609, 70, 4, 1560, 300, 0, 0 },
{2187,2187, 0, 0, 40000, 353, 0, 0 },
{2188,2188, 0, 0, 40000, 333, 0, 0 },
{2189,2189, 0, 0, 5913, 2306, 0, 0 },
@@ -6930,13 +6930,13 @@ const struct adlinsdata adlins[4678] =
{2262,2262, 60, 0, 173, 93, 0, 0 },
{2263,2263, 0, 0, 2493, 866, 0, 0 },
{2264,2264, 24, 0, 173, 93, 0, 0 },
- {2265,2265, 36, 0, 140, 0, 0, 0 },
+ {2265,2265, 36, 0, 140, 66, 0, 0 },
{ 343, 343, 36, 0, 146, 80, 0, 0 },
{ 347, 347, 0, 0, 353, 133, 0, 0 },
{ 347, 347, 12, 0, 420, 146, 0, 0 },
{2266,2266, 12, 0, 346, 100, 0, 0 },
{2267,2267, 24, 0, 106, 46, 0, 0 },
- {2267,2267, 36, 0, 100, 0, 0, 0 },
+ {2267,2267, 36, 0, 100, 40, 0, 0 },
{2268,2268, 0, 0, 1006, 293, 0, 0 },
{2266,2266, 24, 0, 293, 93, 0, 0 },
{2269,2269, 88, 0, 1106, 120, 0, 0 },
@@ -6969,19 +6969,19 @@ const struct adlinsdata adlins[4678] =
{2294,2294, 0, 0, 40000, 253, 0, 0 },
{2295,2295, 0, 0, 2813, 333, 0, 0 },
{2296,2296, 0, 0, 40000, 3920, 0, 0 },
- {2297,2297, 79, 0, 113, 0, 0, 0 },
+ {2297,2297, 79, 0, 113, 113, 0, 0 },
{2297,2297, 72, 0, 126, 140, 0, 0 },
{2298,2298, 72, 0, 100, 26, 0, 0 },
- {2298,2298, 79, 0, 100, 0, 0, 0 },
+ {2298,2298, 79, 0, 100, 26, 0, 0 },
{ 554, 554, 60, 0, 400, 126, 0, 0 },
{2299,2299, 72, 0, 793, 173, 0, 0 },
{2300,2300, 84, 0, 226, 66, 0, 0 },
- { 555, 555, 66, 0, 113, 0, 0, 0 },
+ { 555, 555, 66, 0, 113, 53, 0, 0 },
{2301,2302, 35, 4, 2320, 800, 0, 0 },
- {2303,2304, 52, 4, 120, 0, 0, 0 },
- {2305,1548, 48, 4, 173, 0, 0, 0 },
+ {2303,2304, 52, 4, 120, 26, 0, 0 },
+ {2305,1548, 48, 4, 173, 93, 0, 0 },
{1595,1595, 58, 0, 146, 166, 0, 0 },
- {2305,1548, 60, 4, 173, 0, 0, 0 },
+ {2305,1548, 60, 4, 173, 93, 0, 0 },
{2306,2307, 47, 4, 1886, 700, 0, 0 },
{2306,2307, 43, 4, 1946, 740, 0, 0 },
{2306,2307, 49, 4, 1873, 686, 0, 0 },
@@ -6999,9 +6999,9 @@ const struct adlinsdata adlins[4678] =
{ 380, 381, 84, 4, 1580, 566, 0, 0 },
{1568,1568, 24, 0, 1833, 613, 0, 0 },
{2306,2307, 77, 4, 1586, 606, 0, 0 },
- {2311,2312, 60, 4, 280, 0, 0, 0 },
- {2313,2314, 65, 4, 506, 0, 0, 0 },
- {2315,2315, 59, 0, 106, 0, 0, 0 },
+ {2311,2312, 60, 4, 280, 126, 0, 0 },
+ {2313,2314, 65, 4, 506, 200, 0, 0 },
+ {2315,2315, 59, 0, 106, 40, 0, 0 },
{2316,2316, 51, 0, 386, 373, 0, 0 },
{1612,1612, 45, 0, 393, 380, 0, 0 },
{2317,2317, 71, 0, 446, 180, 0, 0 },
@@ -7019,12 +7019,12 @@ const struct adlinsdata adlins[4678] =
{1595,1595, 63, 0, 146, 166, 0, 0 },
{2325,2326, 74, 4, 380, 106, 0, 0 },
{2327,2328, 60, 4, 1020, 333, 0, 0 },
- {2329,2330, 80, 4, 453, 0, 0, 0 },
+ {2329,2330, 80, 4, 453, 560, 0, 0 },
{2331,2332, 64, 4, 1880, 640, 0, 0 },
{ 397, 397, 72, 0, 193, 80, 0, 0 },
- {2333,2334, 78, 4, 793, 0, 0, 0 },
- {1608,1609, 82, 4, 1560, 0, 0, 0 },
- {2315,2315, 48, 0, 106, 0, 0, 0 },
+ {2333,2334, 78, 4, 793, 306, 0, 0 },
+ {1608,1609, 82, 4, 1560, 300, 0, 0 },
+ {2315,2315, 48, 0, 106, 46, 0, 0 },
{2316,2316, 53, 0, 386, 373, 0, 0 },
{2335,2335, 0, 0, 3586, 1133, 0, 0 },
{2336,2337, 0, 4, 1180, 420, 0, 0 },
@@ -7055,7 +7055,7 @@ const struct adlinsdata adlins[4678] =
{2366,2366, 0, 0, 1333, 153, 0, 0 },
{2367,2367, 0, 0, 2093, 840, 0, 0 },
{2368,2368, 0, 0, 3700, 226, 0, 0 },
- {2369,2369, 0, 0, 3546, 0, 0, 0 },
+ {2369,2369, 0, 0, 3546, 1266, 0, 0 },
{2370,2370, 0, 0, 4606, 420, 0, 0 },
{2371,2371, 0, 0, 14366, 606, 0, 0 },
{2372,2372, 0, 0, 40000, 426, 0, 0 },
@@ -7103,11 +7103,11 @@ const struct adlinsdata adlins[4678] =
{2423,2424, 0, 4, 3640, 113, 0, 0 },
{2425,2426, 0, 4, 40000, 80, 0, 0 },
{2427,2427, 33, 0, 300, 246, 0, 0 },
- {2428,2429, 38, 4, 53, 0, 0, 0 },
- {2430,2430, 38, 0, 106, 0, 0, 0 },
+ {2428,2429, 38, 4, 53, 26, 0, 0 },
+ {2430,2430, 38, 0, 106, 46, 0, 0 },
{2431,2431, 38, 0, 340, 20, 0, 0 },
- {2432,2432, 40, 0, 73, 0, 0, 0 },
- {2433,2434, 41, 4, 293, 0, 0, 0 },
+ {2432,2432, 40, 0, 73, 40, 0, 0 },
+ {2433,2434, 41, 4, 293, 106, 0, 0 },
{2435,2435, 0, 0, 133, 73, 0, 0 },
{2435,2435, 41, 0, 133, 73, 0, 0 },
{2360,2360, 48, 0, 240, 100, 0, 0 },
@@ -7146,19 +7146,19 @@ const struct adlinsdata adlins[4678] =
{ 884, 884, 0, 0, 306, 73, 0, 0 },
{ 884, 884, 28, 0, 306, 73, 0, 0 },
{2464,2464, 29, 0, 226, 93, 0, 0 },
- { 886, 886, 31, 0, 113, 0, 0, 0 },
+ { 886, 886, 31, 0, 113, 53, 0, 0 },
{ 360, 360, 32, 0, 133, 40, 0, 0 },
{ 361, 361, 33, 0, 286, 80, 0, 0 },
{2453,2453, 34, 0, 2873, 813, 0, 0 },
{ 888, 888, 29, 0, 246, 46, 0, 0 },
- { 886, 886, 55, 0, 100, 0, 0, 0 },
+ { 886, 886, 55, 0, 100, 33, 0, 0 },
{ 890, 890, 48, 0, 240, 60, 0, 0 },
{ 884, 884, 58, 0, 146, 26, 0, 0 },
{2465,2465, 45, 0, 173, 93, 0, 0 },
{2465,2465, 43, 0, 173, 93, 0, 0 },
{2466,2466, 73, 0, 1633, 86, 0, 0 },
{2467,2467, 72, 0, 866, 553, 0, 0 },
- {2468,2468, 76, 0, 1380, 0, 0, 0 },
+ {2468,2468, 76, 0, 1380, 620, 0, 0 },
{2467,2467, 84, 0, 873, 560, 0, 0 },
{2468,2468, 36, 0, 1933, 880, 0, 0 },
{2469,2469, 65, 0, 300, 120, 0, 0 },
@@ -7188,8 +7188,8 @@ const struct adlinsdata adlins[4678] =
{2483,2483, 64, 0, 986, 353, 0, 0 },
{2483,2483, 73, 0, 813, 306, 0, 0 },
{2483,2483, 70, 0, 820, 306, 0, 0 },
- { 886, 886, 68, 0, 93, 0, 0, 0 },
- { 886, 886, 48, 0, 106, 0, 0, 0 },
+ { 886, 886, 68, 0, 93, 33, 0, 0 },
+ { 886, 886, 48, 0, 106, 40, 0, 0 },
{2484,2484, 0, 0, 40000, 0, 0, 0 },
{2485,2485, 0, 0, 3226, 753, 0, 0 },
{2486,2486, 0, 0, 1773, 553, 0, 0 },
@@ -7341,7 +7341,7 @@ const struct adlinsdata adlins[4678] =
{2613,2613, 0, 0, 40000, 0, 0, 0 },
{2614,2615, 0, 4, 40000, 73, 0, 0 },
{2616,2617, 0, 4, 40000, 66, 0, 0 },
- {2618,2619, 0, 4, 133, 0, 0, 0 },
+ {2618,2619, 0, 4, 133, 26, 0, 0 },
{2620,2621, 0, 4, 40000, 1280, 0, 0 },
{2622,2623, 0, 4, 40000, 160, 0, 0 },
{2624,2625, 0, 4, 40000, 0, 0, 0 },
@@ -7353,7 +7353,7 @@ const struct adlinsdata adlins[4678] =
{2634,2635, 0, 4, 40000, 773, 0, 0 },
{2636,2636, 0, 0, 40000, 320, 0, 0 },
{2637,2637, 0, 0, 1880, 73, 0, 0 },
- {2638,2639, 0, 4, 473, 0, 0, 0 },
+ {2638,2639, 0, 4, 473, 186, 0, 0 },
{2640,2641, 0, 4, 16946, 1193, 0, 0 },
{2642,2642, 0, 0, 40000, 720, 0, 0 },
{2643,2644, 0, 4, 1880, 40, 0, 0 },
@@ -7370,7 +7370,7 @@ const struct adlinsdata adlins[4678] =
{2659,2659, 35, 0, 306, 26, 0, 0 },
{2660,2660, 52, 0, 126, 26, 0, 0 },
{2661,2661, 60, 0, 286, 20, 0, 0 },
- {2662,2662, 58, 0, 113, 0, 0, 0 },
+ {2662,2662, 58, 0, 113, 26, 0, 0 },
{2663,2663, 60, 0, 380, 20, 0, 0 },
{2664,2664, 50, 0, 1640, 66, 0, 0 },
{2665,2665, 43, 0, 153, 20, 0, 0 },
@@ -7415,10 +7415,10 @@ const struct adlinsdata adlins[4678] =
{2704,2705, 0, 4, 40000, 73, 0, 0 },
{2706,2707, 0, 4, 40000, 73, 0, 0 },
{2708,2709, 0, 4, 40000, 73, 0, 0 },
- {2710,2711, 0, 4, 2053, 0, 0, 0 },
+ {2710,2711, 0, 4, 2053, 93, 0, 0 },
{2712,1473, 0, 4, 320, 26, 0, 0 },
{2713,2714, 0, 4, 573, 93, 0, 0 },
- {2715,2716, 0, 4, 6466, 0, 0, 0 },
+ {2715,2716, 0, 4, 6466, 353, 0, 0 },
{1478,2717, 0, 4, 40000, 146, 0, 0 },
{2718,2719, 0, 4, 40000, 66, 0, 0 },
{ 286,2720, 0, 4, 40000, 73, 0, 0 },
@@ -7428,25 +7428,25 @@ const struct adlinsdata adlins[4678] =
{2727,2724, 0, 4, 40000, 60, 0, 0 },
{1514,2728, 0, 4, 40000, 180, 0, 0 },
{2729,2730, 0, 4, 40000, 0, 0, 0 },
- {2731,2732, 0, 4, 473, 0, 0, 0 },
- {2733,2734, 0, 4, 733, 0, 0, 0 },
+ {2731,2732, 0, 4, 473, 186, 0, 0 },
+ {2733,2734, 0, 4, 733, 33, 0, 0 },
{2735,2736, 0, 4, 286, 40, 0, 0 },
{2737,2738, 0, 4, 40000, 73, 0, 0 },
{2739,2740, 0, 4, 1313, 746, 0, 0 },
{2741,2742, 0, 4, 1326, 700, 0, 0 },
{2743,2744, 0, 4, 40000, 0, 0, 0 },
- {2745,2746, 0, 4, 2046, 0, 0, 0 },
+ {2745,2746, 0, 4, 2046, 73, 0, 0 },
{2747,2747, 35, 0, 386, 166, 0, 0 },
{2748,2748, 60, 0, 493, 193, 0, 0 },
{2749,2749, 43, 0, 126, 66, 0, 0 },
{2750,2750, 0, 0, 3740, 1260, 0, 0 },
{2751,2752, 0, 4, 14833, 360, 0, 0 },
- {2753,2754, 0, 4, 10206, 0, 0, 0 },
+ {2753,2754, 0, 4, 10206, 273, 0, 0 },
{2755,2756, 0, 4, 18033, 146, 0, 0 },
{2757,2758, 0, 4, 14433, 326, 0, 0 },
{2759,2760, 0, 4, 14580, 626, 0, 0 },
{2761,2762, 0, 4, 14720, 300, 0, 0 },
- {2763,2764, 0, 4, 10426, 0, 0, 0 },
+ {2763,2764, 0, 4, 10426, 106, 0, 0 },
{2765,2766, 0, 4, 40000, 60, 0, 0 },
{2767,2768, 0, 4, 40000, 80, 0, 0 },
{2769,2770, 0, 4, 40000, 80, 0, 0 },
@@ -7457,7 +7457,7 @@ const struct adlinsdata adlins[4678] =
{2779,2780, 0, 4, 40000, 73, 0, 0 },
{2781,2782, 0, 4, 40000, 66, 0, 0 },
{2783,2784, 0, 4, 7220, 186, 0, 0 },
- {2785,2786, 0, 4, 10300, 0, 0, 0 },
+ {2785,2786, 0, 4, 10300, 113, 0, 0 },
{2787,2788, 0, 4, 40000, 246, 0, 0 },
{2789,2790, 0, 4, 9106, 746, 0, 0 },
{2791,2792, 0, 4, 7373, 666, 0, 0 },
@@ -7504,7 +7504,7 @@ const struct adlinsdata adlins[4678] =
{2870,2871, 0, 4, 7040, 186, 0, 0 },
{2872,2873, 0, 4, 4693, 106, 0, 0 },
{2874,2875, 0, 4, 40000, 73, 0, 0 },
- {2876,2877, 0, 4, 1633, 0, 0, 0 },
+ {2876,2877, 0, 4, 1633, 146, 0, 0 },
{2878,2879, 0, 4, 7266, 186, 0, 0 },
{2880,2881, 0, 4, 7340, 1246, 0, 0 },
{2882,2883, 0, 4, 4600, 93, 0, 0 },
@@ -7646,63 +7646,63 @@ const struct adlinsdata adlins[4678] =
{3025,3025, 74, 0, 453, 100, 0, 0 },
{3026,3026, 60, 0, 666, 33, 0, 0 },
{1593,1594, 35, 4, 1220, 413, 0, 0 },
- {1564,1565, 35, 4, 700, 0, 0, 0 },
+ {1564,1565, 35, 4, 700, 260, 0, 0 },
{ 248,3027, 0, 4, 40000, 126, 0, 0 },
{1445,3028, 0, 4, 9920, 326, 0, 0 },
- {1447,3029, 0, 4, 10133, 0, 0, 0 },
+ {1447,3029, 0, 4, 10133, 26, 0, 0 },
{1452,3030, 0, 4, 9213, 240, 0, 0 },
{1544,3031, 0, 4, 293, 86, 0, 0 },
{1546,3032, 0, 4, 40000, 153, 0, 0 },
{ 398, 399, 35, 4, 1906, 226, 0, 0 },
- {1550,3033, 35, 4, 66, 0, 0, 0 },
+ {1550,3033, 35, 4, 66, 26, 0, 0 },
{1556,1557, 35, 4, 1126, 426, 0, 0 },
{1558,1559, 35, 4, 1126, 413, 0, 0 },
{1570,1571, 35, 4, 493, 100, 0, 0 },
{1608,1609, 35, 4, 2286, 413, 0, 0 },
- {1595,1596, 35, 4, 220, 0, 0, 0 },
+ {1595,1596, 35, 4, 220, 260, 0, 0 },
{ 159,1597, 35, 4, 220, 273, 0, 0 },
- {1610,1611, 35, 4, 220, 0, 0, 0 },
+ {1610,1611, 35, 4, 220, 260, 0, 0 },
{ 397,1588, 35, 4, 253, 86, 0, 0 },
{1606,1607, 35, 4, 140, 60, 0, 0 },
- { 145,1576, 35, 4, 160, 0, 0, 0 },
- {1612,1613, 35, 4, 413, 0, 0, 0 },
- {1577,1578, 35, 4, 373, 0, 0, 0 },
- {1614,1615, 35, 4, 706, 0, 0, 0 },
+ { 145,1576, 35, 4, 160, 120, 0, 0 },
+ {1612,1613, 35, 4, 413, 440, 0, 0 },
+ {1577,1578, 35, 4, 373, 393, 0, 0 },
+ {1614,1615, 35, 4, 706, 760, 0, 0 },
{1550,1551, 35, 4, 620, 240, 0, 0 },
- { 364, 365, 35, 4, 146, 0, 0, 0 },
- { 129,1549, 35, 4, 200, 0, 0, 0 },
- { 132,1552, 35, 4, 213, 0, 0, 0 },
+ { 364, 365, 35, 4, 146, 26, 0, 0 },
+ { 129,1549, 35, 4, 200, 100, 0, 0 },
+ { 132,1552, 35, 4, 213, 106, 0, 0 },
{1553,1554, 35, 4, 206, 73, 0, 0 },
- { 129,1548, 35, 4, 200, 0, 0, 0 },
- { 134,1555, 35, 4, 2233, 0, 0, 0 },
+ { 129,1548, 35, 4, 200, 100, 0, 0 },
+ { 134,1555, 35, 4, 2233, 680, 0, 0 },
{1560,1561, 35, 4, 353, 146, 0, 0 },
- {1562,1563, 35, 4, 2013, 0, 0, 0 },
- {1572,1573, 35, 4, 346, 0, 0, 0 },
- {1574,1575, 35, 4, 360, 0, 0, 0 },
- {1581,1582, 35, 4, 620, 0, 0, 0 },
- { 149,1583, 35, 4, 326, 0, 0, 0 },
- {1584,1585, 35, 4, 200, 0, 0, 0 },
+ {1562,1563, 35, 4, 2013, 426, 0, 0 },
+ {1572,1573, 35, 4, 346, 153, 0, 0 },
+ {1574,1575, 35, 4, 360, 246, 0, 0 },
+ {1581,1582, 35, 4, 620, 246, 0, 0 },
+ { 149,1583, 35, 4, 326, 33, 0, 0 },
+ {1584,1585, 35, 4, 200, 100, 0, 0 },
{1591,1592, 35, 4, 1206, 413, 0, 0 },
- {1579,1580, 35, 4, 273, 0, 0, 0 },
- {1586,1587, 35, 4, 200, 0, 0, 0 },
+ {1579,1580, 35, 4, 273, 233, 0, 0 },
+ {1586,1587, 35, 4, 200, 100, 0, 0 },
{1589,1590, 35, 4, 120, 86, 0, 0 },
{1600,1601, 35, 4, 1246, 373, 0, 0 },
{1602,1603, 35, 4, 700, 273, 0, 0 },
{1604,1605, 35, 4, 2660, 926, 0, 0 },
{1598,1599, 35, 4, 1300, 400, 0, 0 },
- { 374, 375, 35, 4, 1186, 0, 0, 0 },
+ { 374, 375, 35, 4, 1186, 426, 0, 0 },
{1566,1567, 35, 4, 2333, 813, 0, 0 },
{2306,2307, 35, 4, 2360, 906, 0, 0 },
{3034, 339, 35, 6, 6, 0, 0, 0 },
- {2305,1548, 35, 4, 200, 0, 0, 0 },
+ {2305,1548, 35, 4, 200, 100, 0, 0 },
{1595,1595, 35, 0, 220, 273, 0, 0 },
- {2303,2304, 35, 4, 146, 0, 0, 0 },
+ {2303,2304, 35, 4, 146, 26, 0, 0 },
{1560,2308, 35, 4, 353, 233, 0, 0 },
{2309,2310, 35, 4, 2013, 433, 0, 0 },
{1568,1568, 35, 0, 1280, 453, 0, 0 },
{2311,2312, 35, 4, 346, 146, 0, 0 },
{2313,2314, 35, 4, 633, 240, 0, 0 },
- {2315,2315, 35, 0, 106, 0, 0, 0 },
+ {2315,2315, 35, 0, 106, 46, 0, 0 },
{2316,2316, 35, 0, 506, 453, 0, 0 },
{1612,1612, 35, 0, 526, 400, 0, 0 },
{2317,2317, 35, 0, 640, 253, 0, 0 },
@@ -7716,10 +7716,10 @@ const struct adlinsdata adlins[4678] =
{2324, 393, 35, 4, 460, 66, 0, 0 },
{2325,2326, 35, 4, 533, 133, 0, 0 },
{2327,2328, 35, 4, 1273, 406, 0, 0 },
- {2329,2330, 35, 4, 613, 0, 0, 0 },
+ {2329,2330, 35, 4, 613, 773, 0, 0 },
{2331,2332, 35, 4, 2340, 780, 0, 0 },
{3035,3036, 35, 4, 1193, 433, 0, 0 },
- {3037,3038, 35, 4, 1840, 0, 0, 0 },
+ {3037,3038, 35, 4, 1840, 340, 0, 0 },
{1564,1564, 35, 0, 713, 273, 0, 0 },
{3039,3039, 0, 0, 40000, 0, 0, 0 },
{3040,3040, 0, 0, 6100, 146, 0, 0 },
@@ -7840,7 +7840,7 @@ const struct adlinsdata adlins[4678] =
{3153,3153, 0, 0, 3586, 86, 0, 0 },
{3154,3154, 0, 0, 4626, 633, 0, 0 },
{3155,3155, 0, 0, 4293, 2286, 0, 0 },
- {3156,3156, 0, 0, 13653, 0, 0, 0 },
+ {3156,3156, 0, 0, 13653, 4720, 0, 0 },
{3157,3157, 0, 0, 1206, 426, 0, 0 },
{3158,3158, 0, 0, 653, 426, 0, 0 },
{3159,3159, 0, 0, 40000, 0, 0, 0 },
@@ -7914,7 +7914,7 @@ const struct adlinsdata adlins[4678] =
{3227,3227, 0, 0, 2353, 806, 0, 0 },
{3228,3228, 0, 0, 980, 360, 0, 0 },
{3229,3229, 0, 0, 1193, 413, 0, 0 },
- { 499, 499, 0, 0, 266, 0, 0, 0 },
+ { 499, 499, 0, 0, 266, 160, 0, 0 },
{3230,3230, 0, 0, 973, 360, 0, 0 },
{3231,3231, 0, 0, 273, 53, 0, 0 },
{3232,3232, 0, 0, 726, 220, 0, 0 },
@@ -8051,17 +8051,17 @@ const struct adlinsdata adlins[4678] =
{ 225,3362, 0, 4, 7993, 100, 0, 0 },
{3363,1545, 0, 4, 293, 86, 0, 0 },
{3364,1547, 0, 4, 40000, 180, 0, 0 },
- {3365,3366, 39, 4, 66, 0, 0, 0 },
- {3367, 368, 58, 4, 173, 0, 0, 0 },
+ {3365,3366, 39, 4, 66, 26, 0, 0 },
+ {3367, 368, 58, 4, 173, 93, 0, 0 },
{3368,1551, 48, 4, 520, 200, 0, 0 },
- {3368,3033, 49, 4, 53, 0, 0, 0 },
- {3368,3033, 51, 4, 53, 0, 0, 0 },
- {3368,3033, 54, 4, 60, 0, 0, 0 },
- {3368,3033, 57, 4, 60, 0, 0, 0 },
- {3368,3033, 60, 4, 60, 0, 0, 0 },
- {3369,3370, 70, 4, 773, 0, 0, 0 },
- {1564,1565, 80, 4, 220, 0, 0, 0 },
- {3371,1571, 44, 4, 413, 0, 0, 0 },
+ {3368,3033, 49, 4, 53, 26, 0, 0 },
+ {3368,3033, 51, 4, 53, 26, 0, 0 },
+ {3368,3033, 54, 4, 60, 26, 0, 0 },
+ {3368,3033, 57, 4, 60, 26, 0, 0 },
+ {3368,3033, 60, 4, 60, 26, 0, 0 },
+ {3369,3370, 70, 4, 773, 306, 0, 0 },
+ {1564,1565, 80, 4, 220, 106, 0, 0 },
+ {3371,1571, 44, 4, 413, 93, 0, 0 },
{3372,3372, 0, 0, 8366, 666, 0, 0 },
{3373,3373, 0, 0, 8366, 666, 0, 0 },
{3374,3374, 0, 0, 3773, 73, 0, 0 },
@@ -8195,7 +8195,7 @@ const struct adlinsdata adlins[4678] =
{3501,3501, 47, 0, 973, 93, 0, 0 },
{3502,3502, 64, 0, 126, 66, 0, 0 },
{3503,3503, 40, 0, 340, 146, 0, 0 },
- {3504,3504, 48, 0, 100, 0, 0, 0 },
+ {3504,3504, 48, 0, 100, 26, 0, 0 },
{3505,3505, 48, 0, 286, 133, 0, 0 },
{3506,3506, 46, 0, 466, 166, 0, 0 },
{3507,3507,111, 0, 226, 113, 0, 0 },
@@ -8336,7 +8336,7 @@ const struct adlinsdata adlins[4678] =
{3639,3639, 0, 0, 1873, 646, 0, 0 },
{3640,3640, 0, 0, 200, 260, 0, 0 },
{3641,3641, 0, 0, 1180, 393, 0, 0 },
- {3642,3642, 0, 0, 266, 0, 0, 0 },
+ {3642,3642, 0, 0, 266, 160, 0, 0 },
{3643,3643, 0, 0, 313, 126, 0, 0 },
{3644,3644, 0, 0, 406, 253, 0, 0 },
{3645,3645, 0, 0, 1013, 813, 0, 0 },
@@ -8476,7 +8476,7 @@ const struct adlinsdata adlins[4678] =
{3779,3779, 0, 2, 6, 0, 40, 0 },
{ 738, 738, 44, 0, 840, 340, 33, 0 },
{3780,3780, 36, 0, 7366, 140, 33, 0 },
- {3781,3781, 32, 0, 100, 0, 40, 0 },
+ {3781,3781, 32, 0, 100, 40, 40, 0 },
{2030,2030, 60, 0, 293, 126, 50, 0 },
{3782,3782, 24, 0, 100, 0, 40, 0 },
{3783,3783, 60, 0, 126, 73, 50, 0 },
@@ -8501,7 +8501,7 @@ const struct adlinsdata adlins[4678] =
{3519,3519, 60, 0, 1873, 653, 20, 0 },
{2037,2037, 44, 0, 213, 126, 40, 0 },
{ 144, 144, 44, 0, 213, 126, 40, 0 },
- {2038,2038, 44, 0, 106, 0, 40, 0 },
+ {2038,2038, 44, 0, 106, 46, 40, 0 },
{3792,3792, 44, 0, 380, 360, 40, 0 },
{3793,3793, 44, 0, 520, 206, 40, 0 },
{3794,3794, 45, 0, 273, 100, 40, 0 },
@@ -8536,12 +8536,12 @@ const struct adlinsdata adlins[4678] =
{3780,3780, 45, 0, 5900, 113, 20, 0 },
{3061,3061, 45, 0, 40000, 0, 40, 0 },
{3813,3813, 60, 0, 126, 226, 60, 0 },
- {3781,3781, 60, 0, 93, 0, 60, 0 },
+ {3781,3781, 60, 0, 93, 33, 60, 0 },
{3814,3814, 44, 0, 393, 86, 50, 0 },
{3815,3815, 57, 0, 166, 80, 127, 0 },
{3816,3816, 56, 0, 240, 100, 127, 0 },
- {3817,3817, 60, 0, 113, 0, 60, 0 },
- {3818,3818, 60, 0, 113, 0, 60, 0 },
+ {3817,3817, 60, 0, 113, 26, 60, 0 },
+ {3818,3818, 60, 0, 113, 26, 60, 0 },
{3061,3061, 45, 0, 40000, 0, 20, 0 },
{3517,3517, 45, 0, 213, 213, 20, 0 },
{3819,3819, 0, 0, 4033, 100, 0, 0 },
@@ -8555,8 +8555,8 @@ const struct adlinsdata adlins[4678] =
{3828,1172, 0, 1, 40000, 780, 0, 0.15625 },
{3829,3829, 0, 0, 40000, 60, 0, 0 },
{3830,3830, 0, 0, 566, 133, 0, 0 },
- {3831,3831, 32, 0, 146, 0, 0, 0 },
- {3832,3832, 36, 0, 273, 0, 0, 0 },
+ {3831,3831, 32, 0, 146, 33, 0, 0 },
+ {3832,3832, 36, 0, 273, 140, 0, 0 },
{3833,3833, 88, 0, 340, 120, 0, 0 },
{3834,3834, 0, 0, 9006, 240, 0, 0 },
{3835,3835, 0, 0, 9206, 246, 0, 0 },
@@ -8661,14 +8661,14 @@ const struct adlinsdata adlins[4678] =
{ 523, 523, 0, 0, 200, 260, 0, 0 },
{3934,3934, 0, 0, 340, 146, 0, 0 },
{3935,3935, 0, 0, 366, 260, 0, 0 },
- {3936,3936, 48, 0, 126, 0, 0, 0 },
+ {3936,3936, 48, 0, 126, 26, 0, 0 },
{3937,3937, 27, 0, 200, 106, 0, 0 },
{3938,3938, 40, 0, 1073, 800, 0, 0 },
- {3939,3939, 48, 0, 100, 0, 0, 0 },
+ {3939,3939, 48, 0, 100, 33, 0, 0 },
{3938,3938, 45, 0, 933, 666, 0, 0 },
{3940,3940, 48, 0, 140, 333, 0, 0 },
{3938,3938, 47, 0, 933, 666, 0, 0 },
- {3941,3941, 48, 0, 1840, 0, 0, 0 },
+ {3941,3941, 48, 0, 1840, 1373, 0, 0 },
{3938,3938, 49, 0, 953, 686, 0, 0 },
{3938,3938, 53, 0, 906, 686, 0, 0 },
{3938,3938, 56, 0, 913, 693, 0, 0 },
@@ -8691,7 +8691,7 @@ const struct adlinsdata adlins[4678] =
{ 142, 142, 84, 0, 386, 160, 0, 0 },
{3942,3942, 24, 0, 2313, 780, 0, 0 },
{ 137, 137, 77, 0, 1893, 660, 0, 0 },
- { 144, 144, 60, 0, 213, 0, 0, 0 },
+ { 144, 144, 60, 0, 213, 126, 0, 0 },
{ 145, 145, 65, 0, 180, 146, 0, 0 },
{ 146, 146, 59, 0, 173, 93, 0, 0 },
{ 147, 147, 51, 0, 266, 213, 0, 0 },
@@ -8717,9 +8717,9 @@ const struct adlinsdata adlins[4678] =
{ 169, 169, 68, 0, 340, 320, 0, 0 },
{ 131, 131, 48, 0, 520, 200, 0, 0 },
{3061,3061, 53, 0, 40000, 0, 0, 0 },
- {3943,3944, 0, 4, 2133, 0, 0, 0 },
+ {3943,3944, 0, 4, 2133, 333, 0, 0 },
{3945,3946, 0, 4, 8966, 393, 0, 0 },
- { 174,3947, 0, 4, 6946, 0, 0, 0 },
+ { 174,3947, 0, 4, 6946, 320, 0, 0 },
{3948,3949, 0, 4, 9320, 133, 0, 0 },
{ 9,3950, 0, 4, 1606, 426, 0, 0 },
{3951,3952, 0, 4, 18373, 240, 0, 0 },
@@ -8770,7 +8770,7 @@ const struct adlinsdata adlins[4678] =
{ 111,4024, 0, 4, 2300, 820, 0, 0 },
{4025,4026, 0, 4, 1013, 326, 0, 0 },
{4027,4028, 0, 1, 1220, 393, 0, 0.03125 },
- { 115,4029, 0, 4, 1813, 0, 0, 0 },
+ { 115,4029, 0, 4, 1813, 646, 0, 0 },
{4030,4031, 0, 1, 566, 146, 0, 0 },
{ 118,4032, 0, 4, 1553, 53, 0, 0 },
{4033,4033, 0, 0, 613, 60, 0, 0 },
@@ -8783,9 +8783,9 @@ const struct adlinsdata adlins[4678] =
{4041,4041, 28, 0, 193, 46, 0, 0 },
{4042,4043, 39, 1, 553, 126, 0, 0 },
{4042,4043, 33, 1, 553, 126, 0, 0 },
- {4044,4045, 63, 4, 166, 0, 0, 0 },
- {4046,4046, 15, 0, 113, 0, 0, 0 },
- {4047,4047, 36, 0, 106, 0, 0, 0 },
+ {4044,4045, 63, 4, 166, 93, 0, 0 },
+ {4046,4046, 15, 0, 113, 66, 0, 0 },
+ {4047,4047, 36, 0, 106, 53, 0, 0 },
{4047,4048, 36, 1, 480, 173, 0, 0.40625 },
{4049,4049, 35, 0, 706, 266, 0, 0 },
{4050,4051, 38, 1, 273, 106, 0, 0 },
@@ -8794,7 +8794,7 @@ const struct adlinsdata adlins[4678] =
{4056,4056, 48, 0, 180, 86, 0, 0 },
{4057,4058, 48, 1, 953, 346, 0, -1.90625 },
{4059,4059, 61, 1, 3200, 540, 0, 0.09375 },
- {3369,1557, 70, 4, 766, 0, 0, 0 },
+ {3369,1557, 70, 4, 766, 306, 0, 0 },
{4060,4061, 79, 1, 1306, 513, 0, 0.078125 },
{4062,4062, 62, 0, 5200, 466, 0, 0 },
{4063,4064, 67, 1, 2153, 1080, 0, 0.078125 },
@@ -8809,7 +8809,7 @@ const struct adlinsdata adlins[4678] =
{4073,4074, 68, 1, 153, 40, 0, 0 },
{4075,4076, 18, 1, 200, 80, 0, 0 },
{4077,4078, 18, 1, 253, 73, 0, 0 },
- {4079,4080, 64, 4, 1346, 0, 0, 0 },
+ {4079,4080, 64, 4, 1346, 33, 0, 0 },
{4081,4082, 64, 1, 373, 73, 0, 0.03125 },
{4083,4083, 67, 0, 106, 26, 0, 0 },
{ 844, 844,244, 2, 6, 0, 0, 0 },
@@ -8819,7 +8819,7 @@ const struct adlinsdata adlins[4678] =
{ 887, 887, 35, 0, 133, 46, 0, 0 },
{ 884, 884, 35, 0, 233, 80, 0, 0 },
{ 885, 885, 35, 0, 226, 86, 0, 0 },
- { 886, 886, 35, 0, 113, 0, 0, 0 },
+ { 886, 886, 35, 0, 113, 53, 0, 0 },
{ 361, 361, 35, 0, 286, 73, 0, 0 },
{ 767, 767, 35, 0, 3020, 786, 0, 0 },
{ 888, 888, 35, 0, 246, 53, 0, 0 },
@@ -8879,10 +8879,10 @@ const struct adlinsdata adlins[4678] =
{4117,4117, 0, 0, 40000, 926, 0, 0 },
{4118,4118, 0, 0, 2833, 200, 0, 0 },
{ 127, 127, 36, 0, 386, 166, 0, 0 },
- {4119,4119, 36, 0, 100, 0, 0, 0 },
+ {4119,4119, 36, 0, 100, 33, 0, 0 },
{2030,2030, 36, 0, 346, 140, 0, 0 },
{3782,3782, 48, 0, 93, 0, 0, 0 },
- {3783,3783, 36, 0, 146, 0, 0, 0 },
+ {3783,3783, 36, 0, 146, 86, 0, 0 },
{4120,4120, 48, 0, 1886, 653, 0, 0 },
{ 132, 132, 69, 0, 126, 66, 0, 0 },
{4120,4120, 52, 0, 1853, 626, 0, 0 },
@@ -9041,7 +9041,7 @@ const struct adlinsdata adlins[4678] =
{4347,4348, 38, 1, 340, 133, 0, 0 },
{4349,4350, 37, 1, 206, 93, 0, 0 },
{4351,4352, 15, 1, 346, 153, 10, 0 },
- {4353,4354,100, 1, 146, 0, 0, 0.140625 },
+ {4353,4354,100, 1, 146, 80, 0, 0.140625 },
{4355,4356, 19, 1, 553, 200, 10, 0 },
{4357,4358, 15, 1, 333, 153, 20, 0 },
{4359,4360, 12, 1, 340, 146, 20, 0 },
@@ -9069,8 +9069,8 @@ const struct adlinsdata adlins[4678] =
{4392,4392, 90, 0, 793, 40, 0, 0 },
{4393,4394, 80, 1, 406, 153, 0, 0.03125 },
{4395,4396, 64, 1, 1866, 606, 0, 0 },
- {4397,4398, 50, 1, 173, 0, 0, 0 },
- {4399,4399, 36, 0, 4646, 0, 0, 0 },
+ {4397,4398, 50, 1, 173, 126, 0, 0 },
+ {4399,4399, 36, 0, 4646, 1606, 0, 0 },
{4400,4400, 0, 0, 40000, 86, 0, 0 },
{4401,4401, 0, 0, 40000, 73, 0, 0 },
{4402,4402, 0, 0, 2433, 700, 0, 0 },
@@ -9187,13 +9187,13 @@ const struct adlinsdata adlins[4678] =
{4505,4505, 0, 0, 40000, 440, 0, 0 },
{1261,1261, 0, 0, 40000, 2960, 0, 0 },
{4506,4506, 37, 0, 973, 73, 0, -2 },
- {4507,4507, 48, 0, 106, 0, 0, -2 },
+ {4507,4507, 48, 0, 106, 26, 0, -2 },
{4508,4508, 48, 0, 286, 133, 0, -2 },
{4509,4509, 62, 0, 166, 60, 0, 0 },
{4510,4510, 44, 0, 980, 360, 0, 0 },
- {4511,4511, 80, 0, 100, 0, 0, 0 },
+ {4511,4511, 80, 0, 100, 33, 0, 0 },
{4510,4510, 50, 0, 980, 346, 0, 0 },
- {4512,4512, 48, 0, 106, 0, 0, -2 },
+ {4512,4512, 48, 0, 106, 46, 0, -2 },
{4510,4510, 55, 0, 973, 360, 0, 0 },
{4513,4513, 61, 0, 513, 20, 0, 0 },
{4510,4510, 58, 0, 966, 353, 0, 0 },
diff --git a/utils/gen_adldata/measurer.cpp b/utils/gen_adldata/measurer.cpp
index 7caf883..dc73363 100644
--- a/utils/gen_adldata/measurer.cpp
+++ b/utils/gen_adldata/measurer.cpp
@@ -323,7 +323,7 @@ DurationInfo MeasureDurations(const ins &in, OPLChipBase *chip)
audioHistory.reset(std::ceil(historyLength * g_outputRate));
for(unsigned period = 0;
- (period < peak_amplitude_time) && (period < max_period_on);
+ ((period < peak_amplitude_time) || (period == 0)) && (period < max_period_on);
++period)
{
for(unsigned i = 0; i < samples_per_interval;)
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 21:49:21 +0000