aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fm_banks/adldata-cache-x.datbin497466 -> 250326 bytes
-rw-r--r--src/adldata.cppx308
-rw-r--r--utils/gen_adldata/measurer.cpp15
3 files changed, 169 insertions, 154 deletions
diff --git a/fm_banks/adldata-cache-x.dat b/fm_banks/adldata-cache-x.dat
index 6d511b0..0bb23cf 100644
--- a/fm_banks/adldata-cache-x.dat
+++ b/fm_banks/adldata-cache-x.dat
Binary files differ
diff --git a/src/adldata.cppx b/src/adldata.cppx
index 2a3f1d3..f8db299 100644
--- a/src/adldata.cppx
+++ b/src/adldata.cppx
@@ -387,11 +387,11 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE0E,0x4F9,0x24A,{233,234}},
{0,0,0,0,0,0,0xE0E,0x391,0xF0,{235,236}},
{0,0,0,0,0,0,0xE0E,0x2572,0x97A,{237,238}},
- {0,0,0,0,0,0,0,0x9C40,0x49,{239,240}},
+ {0,0,0,0,0,0,0,0xD5,0x49,{239,240}},
{0,0,0,0,0,0,0xA0A,0x190,0xA0,{241,242}},
{0,0,0,0,0,0,0xE0E,0xC8,0x35,{237,243}},
{0,0,0,0,0,0,0xE0E,0x9C40,0xAD,{244,245}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x50,{246,247}},
+ {0,0,0,0,0,0,0xE0E,0x1CC,0x42,{246,247}},
{0,0,0,35,0,0,0x808,0x17C,0xA0,{248,249}},
{0,0,0,52,0,0,0x808,0x78,0x1A,{250,251}},
{0,0,0,48,0,0,0xE0E,0x11E,0x7E,{252,253}},
@@ -527,7 +527,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0x1,0,0x706,0x9C40,0x384,{577,578,579,580} },
{0,0,0,0,0,0,0,0x1CD4,0xC8,{581,582}},
{0,0,0,0,0,0,0,0x3C6,0x168,{583,584}},
- {0,0,0,0,0,0,0x606,0x9C40,0x7E,{585,586}},
+ {0,0,0,0,0,0,0x606,0x9C40,0x38A,{585,586}},
{0,0,0,0,0,0,0x404,0x9C40,0x2F1,{587,588}},
{0,0,0,0,0x1,0,0x100,0x3519,0xC8,{589,590,591,592} },
{0,0,0,0,0x1,0,0,0xA50,0xA0,{593,594,595,596} },
@@ -546,7 +546,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0xC8,0x49,{627,628}},
{0,0,0,0,0,0,0xE0E,0x1492,0x280,{629,630}},
{0,0,0,0,0,0,0xE0E,0xE9,0x35,{631,632}},
- {0,0,0,0,0,0,0x808,0x9C40,0x49,{633,634}},
+ {0,0,0,0,0,0,0x808,0x10E6,0x10A,{633,634}},
{0,0,0,0,0,0,0x606,0x9C40,0xCE,{635,636}},
{0,0,0,0,0x1,0,0xF0E,0x9C40,0xA6,{244,637,638,638} },
{0,0,0,0,0x1,0,0xE0E,0x1CC,0x3C,{639,640,641,642} },
@@ -583,7 +583,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,30,0,0,0xE0E,0x190,0xF0,{689,690}},
{0,0,0,35,0x1,0,0xF0E,0x251,0xA0,{691,692,254,255} },
{0,0,0,0,0,0,0xE0E,0x118,0x7E,{252,253}},
- {0,0,0,0,0,0,0,0xA56,0xA0,{693,694}},
+ {0,0,0,0,0,0,0,0xBA,0x1A,{693,694}},
{0,0,0,88,0,0,0xF0F,0x189,0x85,{695,696}},
{0,0,0,88,0,0,0xF0F,0x99,0x49,{697,698}},
{0,0,0,79,0,0,0xE0E,0xA42,0x3AC,{699,700}},
@@ -984,7 +984,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x1,0x9C40,0x49,{1068,1069}},
{0,0,0,0,0,0,0xE,0x9C40,0x49,{1070,1071}},
{0,0,0,0,0,0,0xE,0x1492,0x280,{629,630}},
- {0,0,0,0,0,0,0x8,0x9C40,0x49,{633,634}},
+ {0,0,0,0,0,0,0x8,0x10E6,0x10A,{633,634}},
{0,0,0,26,0,0,0x8,0x14B4,0x500,{917,923}},
{0,0,0,35,0,0,0xA,0xED1,0x39E,{915,916}},
{0,0,0,41,0,0,0x8,0x17C,0x99,{659,249}},
@@ -1048,7 +1048,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x6,0x3055,0x384,{1076,1077}},
{0,0,0,0,0,0,0,0xACE,0x5D,{1078,1079}},
{0,0,0,0,0,0,0xA,0x611,0x7E,{1080,1081}},
- {0,0,0,0,0,0,0x8,0x395E,0x29A,{1082,1083}},
+ {0,0,0,0,0,0,0x8,0xA50,0x39E,{1082,1083}},
{0,0,0,0,0,0,0,0x17C6,0x4F2,{1084,1085}},
{0,0,0,0,0,0,0xC,0x376,0x146,{1086,1087}},
{0,0,0,0,0,0,0x4,0x3C0,0x161,{1088,1089}},
@@ -1073,7 +1073,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xC,0x9C40,0x139,{1121,1122}},
{0,0,0,0,0,0,0xC,0x9C40,0x21,{1123,1124}},
{0,0,0,0,0,0,0xE,0x9C40,0x2E,{1125,1124}},
- {0,0,0,0,0,0,0xE,0x9C40,0x42,{1126,1127}},
+ {0,0,0,0,0,0,0xE,0x60A,0xA0,{1126,1127}},
{0,0,0,0,0,0,0xE,0x9C40,0,{1128,1124}},
{0,0,0,0,0,0,0xE,0x9C40,0x49,{1129,1130}},
{0,0,0,0,0,0,0xE,0x1CCD,0x1A,{1131,1132}},
@@ -1175,7 +1175,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE,0x139,0xC8,{1252,1253}},
{0,0,0,0,0,0,0xE,0x9C40,0x646,{1254,1255}},
{0,0,0,0,0,0,0,0x1561,0x49,{1256,1257}},
- {0,0,0,0,0,0,0,0x64,0x21,{1258,1259}},
+ {0,0,0,0,0,0,0,0x3CD,0xCE,{1258,1259}},
{0,0,0,0,0,0,0,0x1B72,0x459,{1260,1261}},
{0,0,0,0,0,0,0xC,0x898,0x2C2,{1262,1263}},
{0,0,0,0,0,0,0xA,0x279,0x64,{1264,1265}},
@@ -1195,14 +1195,14 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x2,0x9C40,0x49,{1241,1286}},
{0,0,0,0,0,0,0xC,0x9C40,0x42,{1287,1288}},
{0,0,0,0,0,0,0x2,0x9C40,0x99,{1289,1290}},
- {0,0,0,0,0,0,0xE,0x758,0x294,{1291,1292}},
+ {0,0,0,0,0,0,0xE,0x9C40,0x5D,{1291,1292}},
{0,0,0,0,0,0,0x2,0x9C40,0xCE,{1293,1294}},
{0,0,0,0,0,0,0xC,0x9C40,0x3C,{1295,1296}},
{0,0,0,0,0,0,0xE,0x9C40,0x2E,{1297,1124}},
{0,0,0,0,0,0,0xC,0x9C40,0x49,{1298,1130}},
{0,0,0,0,0,0,0x7,0x9C40,0x7E,{1299,1300}},
{0,0,0,0,0,0,0x6,0x9C40,0x1ED,{1301,1302}},
- {0,0,0,0,0,0,0xE,0x9C40,0x42,{1303,1304}},
+ {0,0,0,0,0,0,0xE,0x9C40,0xC1,{1303,1304}},
{0,0,0,0,0,0,0x2,0x550,0x1ED,{1305,1306}},
{0,0,0,0,0,0,0xA,0x9C40,0x50,{1307,1308}},
{0,0,0,0,0,0,0xE,0x758,0x294,{1309,1310}},
@@ -1213,7 +1213,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xC,0x9C40,0x42,{1319,1320}},
{0,0,0,0,0,0,0xE,0x9C40,0x42,{1321,1322}},
{0,0,0,0,0,0,0x6,0x3C6,0x14,{1114,1323}},
- {0,0,0,0,0,0,0xE,0xDC,0x1A,{1324,1325}},
+ {0,0,0,0,0,0,0xE,0x550,0x1E6,{1324,1325}},
{0,0,0,0,0,0,0x8,0x74A,0x286,{1326,1327}},
{0,0,0,0,0,0,0xA,0x3C6,0x161,{1328,1329}},
{0,0,0,0,0,0,0xE,0xF6,0xC8,{929,935}},
@@ -1268,7 +1268,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x6,0x14F0,0xA6,{1374,1375}},
{0,0,0,0,0,0,0xC,0x14C1,0xA0,{1376,1377}},
{0,0,0,0,0,0,0,0xA56,0xA0,{1378,1379}},
- {0,0,0,0,0,0,0,0x17C,0xA0,{1380,1381}},
+ {0,0,0,0,0,0,0,0x14A6,0x21,{1380,1381}},
{0,0,0,0,0,0,0,0x14A6,0xA0,{1382,1383}},
{0,0,0,0,0,0,0xE,0x1492,0x71,{1384,1385}},
{0,0,0,0,0,0,0,0x9C40,0,{1386,1387}},
@@ -1277,7 +1277,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xB,0x5CE,0x2A1,{1392,1393}},
{0,0,0,0,0,0,0x1,0x148C,0x1E0,{1394,1395}},
{0,0,0,0,0,0,0x5,0x29A,0xE9,{1396,1397}},
- {0,0,0,0,0,0,0,0x9C40,0x50,{1398,1399}},
+ {0,0,0,0,0,0,0,0x17C,0xA0,{1398,1399}},
{0,0,0,0,0,0,0xA,0xAE9,0x28D,{1400,1401}},
{0,0,0,0,0,0,0,0x460,0x111,{1402,1403}},
{0,0,0,0,0,0,0x7,0x9C40,0x49,{1404,1405}},
@@ -1312,8 +1312,8 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x9,0x369,0xC8,{1461,1462}},
{0,0,0,0,0,0,0xE,0x521,0x1BE,{1463,1464}},
{0,0,0,0,0,0,0,0x3D4,0x15A,{1465,1466}},
- {0,0,0,0,0,0,0xE,0x9C40,0x50,{1467,1468}},
- {0,0,0,0,0,0,0xE,0x9C40,0x50,{1469,1470}},
+ {0,0,0,0,0,0,0xE,0x9C40,0xBA,{1467,1468}},
+ {0,0,0,0,0,0,0xE,0x9C40,0x161,{1469,1470}},
{0,0,0,0,0,0,0xE,0x9C40,0x7E,{1471,1472}},
{0,0,0,0,0,0,0xE,0x9C40,0x7E,{1473,1474}},
{0,0,0,0,0,0,0x8,0x9C40,0x3C,{1475,1476}},
@@ -1328,7 +1328,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE,0x9C40,0x3C,{1493,1494}},
{0,0,0,0,0,0,0xE,0x9C40,0x71,{1495,1496}},
{0,0,0,0,0,0,0xE,0x9C40,0xBA,{1497,1498}},
- {0,0,0,0,0,0,0,0x9C40,0x49,{1499,1500}},
+ {0,0,0,0,0,0,0,0x9C40,0x50,{1499,1500}},
{0,0,0,0,0,0,0xA,0x9C40,0x49,{1501,1502}},
{0,0,0,0,0,0,0xC,0x9C40,0x50,{1503,1504}},
{0,0,0,0,0,0,0x8,0x9C40,0x5D,{1505,1506}},
@@ -1339,12 +1339,12 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x9C40,0x50,{1515,1516}},
{0,0,0,0,0,0,0,0x9C40,0x49,{1517,1518}},
{0,0,0,0,0,0,0,0x9C40,0x49,{1519,1520}},
- {0,0,0,0,0,0,0,0x9C40,0,{1521,1522}},
+ {0,0,0,0,0,0,0,0x9C40,0x50,{1521,1522}},
{0,0,0,0,0,0,0xE,0x9C40,0x50,{1523,1524}},
{0,0,0,0,0,0,0xE,0x9C40,0x50,{1525,1526}},
{0,0,0,0,0,0,0x1,0x9C40,0x5D,{1527,1528}},
{0,0,0,0,0,0,0,0x9C40,0x7E,{1529,1530}},
- {0,0,0,0,0,0,0xE,0x9C40,0x118,{1531,1532}},
+ {0,0,0,0,0,0,0xE,0x9C40,0x49,{1531,1532}},
{0,0,0,0,0,0,0xE,0x9C40,0x1A,{1533,1534}},
{0,0,0,0,0,0,0x2,0x9C40,0x49,{1535,1536}},
{0,0,0,0,0,0,0xE,0x9C40,0,{1537,1538}},
@@ -1358,12 +1358,12 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x9C40,0x50,{1553,1554}},
{0,0,0,0,0,0,0,0x9C40,0xA0,{1555,1556}},
{0,0,0,0,0,0,0x4,0x1EF0,0x161,{1557,1558}},
- {0,0,0,0,0,0,0xA,0x9C40,0x15A,{1559,1560}},
+ {0,0,0,0,0,0,0xA,0x9C40,0xAD,{1559,1560}},
{0,0,0,0,0,0,0xA,0x9C40,0x14D,{1561,1562}},
{0,0,0,0,0,0,0,0x146A,0x6A,{1563,1564}},
{0,0,0,0,0,0,0x7,0x9C40,0x125,{1565,1566}},
{0,0,0,0,0,0,0,0xE74,0x294,{1567,1568}},
- {0,0,0,0,0,0,0,0x2D0,0xF0,{1569,1570}},
+ {0,0,0,0,0,0,0,0x1C41,0x14D,{1569,1570}},
{0,0,0,0,0,0,0xE,0x1C70,0x294,{1571,1572}},
{0,0,0,0,0,0,0xC,0x9C40,0xE9,{1573,1574}},
{0,0,0,0,0,0,0xE,0x9C40,0x78,{1575,1576}},
@@ -1374,7 +1374,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x8,0x75E,0x161,{1585,1586}},
{0,0,0,0,0,0,0,0x2D0,0xF0,{1587,1588}},
{0,0,0,0,0,0,0x8,0x9C40,0x56,{1589,1590}},
- {0,0,0,0,0,0,0,0x154,0x50,{1591,1592}},
+ {0,0,0,0,0,0,0,0x9C40,0x5D,{1591,1592}},
{0,0,0,0,0,0,0xA,0x9C40,0x5D,{1593,1594}},
{0,0,0,0,0,0,0,0x9B6,0xC8,{1595,1596}},
{0,0,0,0,0,0,0xE,0xDC,0x35,{1597,1598}},
@@ -1443,7 +1443,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0xA56,0xA0,{1670,1671}},
{0,0,0,0,0,0,0,0xA50,0xA0,{1672,1673}},
{0,0,0,0,0,0,0x5,0x1CB2,0x85,{1,1674}},
- {0,0,0,0,0,0,0,0x460,0x10A,{1675,1676}},
+ {0,0,0,0,0,0,0,0x147E,0xA0,{1675,1676}},
{0,0,0,0,0,0,0xC,0xA2E,0x50,{1677,1678}},
{0,0,0,0,0,0,0,0x9C40,0,{1679,1680}},
{0,0,0,0,0,0,0x6,0x5CE,0x161,{1681,1682}},
@@ -1461,7 +1461,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x9C40,0x50,{1412,1703}},
{0,0,0,0,0,0,0xE,0x9C40,0x50,{1704,1705}},
{0,0,0,0,0,0,0,0x9C40,0x50,{1706,1707}},
- {0,0,0,0,0,0,0,0x556,0x56,{1708,1709}},
+ {0,0,0,0,0,0,0,0x9C40,0x50,{1708,1709}},
{0,0,0,0,0,0,0xE,0xA64,0x35,{1710,1711}},
{0,0,0,0,0,0,0,0x7AE,0x50,{1712,1713}},
{0,0,0,0,0,0,0x8,0x9C40,0,{1714,1715}},
@@ -1484,12 +1484,12 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE,0x9C40,0,{1746,1747}},
{0,0,0,0,0,0,0xC,0x9C40,0xAD,{1459,1748}},
{0,0,0,0,0,0,0x9,0x384,0xCE,{1749,1750}},
- {0,0,0,0,0,0,0xE,0x9C40,0x50,{1751,1752}},
+ {0,0,0,0,0,0,0xE,0x6B1,0x146,{1751,1752}},
{0,0,0,0,0,0,0,0x294,0xC8,{1753,1754}},
- {0,0,0,0,0,0,0,0x9C40,0x2E,{1755,1756}},
+ {0,0,0,0,0,0,0,0x9C40,0x5D,{1755,1756}},
{0,0,0,0,0,0,0xE,0x9C40,0x161,{1757,1758}},
- {0,0,0,0,0,0,0xE,0x9C40,0x56,{1759,1760}},
- {0,0,0,0,0,0,0xE,0x9C40,0x50,{1761,1762}},
+ {0,0,0,0,0,0,0xE,0x9C40,0,{1759,1760}},
+ {0,0,0,0,0,0,0xE,0x9C40,0x7E,{1761,1762}},
{0,0,0,0,0,0,0x6,0x9C40,0x3C,{467,468}},
{0,0,0,0,0,0,0,0x9C40,0x64,{1763,1764}},
{0,0,0,0,0,0,0,0x9C40,0x49,{1479,1765}},
@@ -1518,14 +1518,14 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE,0x9C40,0x50,{1808,1809}},
{0,0,0,0,0,0,0x1,0x9C40,0x5D,{1527,1810}},
{0,0,0,0,0,0,0,0x9C40,0x50,{1811,1812}},
- {0,0,0,0,0,0,0xE,0x9C40,0x118,{1813,1814}},
+ {0,0,0,0,0,0,0xE,0x9C40,0x49,{1813,1814}},
{0,0,0,0,0,0,0xE,0x9C40,0x1A,{1815,1816}},
{0,0,0,0,0,0,0xC,0x9C40,0x50,{1817,1818}},
{0,0,0,0,0,0,0x8,0x9C40,0,{1819,1820}},
{0,0,0,0,0,0,0,0x9C40,0,{1821,1822}},
{0,0,0,0,0,0,0,0x9C40,0x49,{1823,1824}},
{0,0,0,0,0,0,0xB,0x9C40,0x56,{1825,1826}},
- {0,0,0,0,0,0,0xE,0x3CA0,0xD5,{1827,1828}},
+ {0,0,0,0,0,0,0xE,0x9C40,0,{1827,1828}},
{0,0,0,0,0,0,0x5,0x9C40,0,{1829,1830}},
{0,0,0,0,0,0,0xE,0x9C40,0x118,{1831,1832}},
{0,0,0,0,0,0,0xC,0x9C40,0xCE,{1833,1834}},
@@ -1584,7 +1584,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x9C40,0x3C,{1920,1921}},
{0,0,0,0,0,0,0xE,0x9C40,0x50,{1922,1923}},
{0,0,0,0,0,0,0,0x7AE,0x50,{1924,1713}},
- {0,0,0,0,0,0,0,0x549,0x1A,{1925,1926}},
+ {0,0,0,0,0,0,0,0x9C40,0,{1925,1926}},
{0,0,0,0,0,0,0,0x75E,0x21,{1927,1928}},
{0,0,0,0,0,0,0,0x9C40,0,{1929,1930}},
{0,0,0,0,0,0,0xA,0x38F4,0x49,{1931,1932}},
@@ -1633,7 +1633,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE,0x9C40,0x2A1,{2007,2008}},
{0,0,0,0,0,0,0,0x9C40,0x168,{2009,2010}},
{0,0,0,0,0,0,0,0x1FA,0x21,{2011,2012}},
- {0,0,0,0,0,0,0xC,0x2342,0x2C9,{2013,2014}},
+ {0,0,0,0,0,0,0xC,0x521,0x49,{2013,2014}},
{0,0,0,0,0,0,0xA,0x9C40,0,{2015,2016}},
{0,0,0,0,0,0,0x8,0x9C40,0x8C,{2017,2018}},
{0,0,0,0,0,0,0x4,0x9C40,0,{2019,2020}},
@@ -1653,7 +1653,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x8,0x1D74,0xC8,{4,5}},
{0,0,0,0,0,0,0x6,0x1DB0,0x7E,{6,7}},
{0,0,0,0,0,0,0x8,0xA3C,0xA6,{10,11}},
- {0,0,0,0,0,0,0xA,0x9C40,0x265,{12,13}},
+ {0,0,0,0,0,0,0xA,0x1C12,0x56,{12,13}},
{0,0,0,0,0,0,0x2,0xA64,0x708,{16,17}},
{0,0,0,0,0,0,0x2,0x758,0x294,{18,19}},
{0,0,0,0,0,0,0x4,0x1FA,0xC8,{24,25}},
@@ -1694,8 +1694,8 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{12,12,0,0,0,0,0xA,0x9C40,0x49,{2104,2105}},
{12,12,0,0,0,0,0xC,0x9C40,0x49,{2106,2105}},
{12,12,0,0,0,0,0,0xE9C,0x42,{2107,2108}},
- {12,12,0,0,0,0,0,0x758,0x71,{2109,2110}},
- {12,12,0,0,0,0,0xA,0x9C40,0x49,{2111,2112}},
+ {12,12,0,0,0,0,0,0x3DA,0x5D,{2109,2110}},
+ {12,12,0,0,0,0,0xA,0xE59,0x28,{2111,2112}},
{12,12,0,0,0,0,0x8,0x9C40,0,{2113,2114}},
{0,12,0,0,0x3,-2,0,0x9C40,0x49,{2115,2116,2117,2118} },
{0,12,0,0,0,0,0xD,0x9C40,0x50,{2119,2120}},
@@ -1993,7 +1993,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x606,0x9C40,0x139,{2568,2569}},
{0,0,0,0,0,0,0x606,0x9C40,0x1ED,{1301,1302}},
{0,0,0,0,0,0,0xE0E,0x139,0xC8,{1252,1253}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x64,{2570,2571}},
+ {0,0,0,0,0,0,0xE0E,0x9C40,0x646,{2570,2571}},
{0,0,0,0,0,0,0xE0E,0x9C40,0,{438,2572}},
{0,0,0,0,0,0,0,0x1561,0x49,{2573,2574}},
{0,0,0,0,0,0,0xC0C,0x898,0x2C2,{1262,1263}},
@@ -2222,13 +2222,13 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x808,0x53C,0x1D9,{2943,2944}},
{0,0,0,0,0,0,0x202,0x9C40,0xA6,{2945,2946}},
{0,0,0,0,0,0,0x202,0x9C40,0xA6,{2947,1290}},
- {0,0,0,0,0,0,0x202,0xA71,0x398,{2948,2949}},
+ {0,0,0,0,0,0,0x202,0x9C40,0x819,{2948,2949}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x3C,{1140,1141}},
{0,0,0,0,0,0,0x202,0x9C40,0x49,{1241,1286}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x42,{1287,1288}},
{0,0,0,0,0,0,0,0x9C40,0x137A,{2950,2951}},
{0,0,0,0,0,0,0,0x9C40,0x4BD,{2952,2953}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x42,{1303,1304}},
+ {0,0,0,0,0,0,0xE0E,0x9C40,0xC1,{1303,1304}},
{0,0,0,0,0,0,0x202,0x550,0x1ED,{1305,2954}},
{0,0,0,0,0,0,0xE0E,0x1428,0x6BE,{2955,2956}},
{0,0,0,0,0,0,0xA0A,0xE38,0x4B6,{2957,2958}},
@@ -2331,7 +2331,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xC0C,0x9C40,0x78,{3094,3095}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x49,{3096,3097}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x49,{3098,3097}},
- {0,0,0,0,0,0,0,0x9C40,0x49,{3099,3100}},
+ {0,0,0,0,0,0,0,0x9C40,0x50,{3099,3100}},
{0,0,0,0,0,0,0xE0E,0x9C40,0,{3101,3102}},
{0,0,0,0,0,0,0xE0E,0x9C40,0x50,{3103,3100}},
{0,0,0,0,0,0,0xE0E,0x9C40,0x42,{3104,3105}},
@@ -2359,7 +2359,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x9C40,0x29A,{3145,3146}},
{0,0,0,0,0,0,0,0x9C40,0,{3147,3144}},
{0,0,0,0,0,0,0xE0E,0x9C40,0x391,{3148,3149}},
- {0,0,0,0,0,0,0,0x9C40,0,{3150,3151}},
+ {0,0,0,0,0,0,0,0xDB2,0x14D,{3150,3151}},
{-12,0,0,0,0,0,0xE0E,0x2B5,0xC1,{3152,3153}},
{0,0,0,0,0,0,0xE0E,0x550,0x35,{3154,3155}},
{-12,0,0,0,0,0,0,0x5C8,0x19D,{3156,3157}},
@@ -2396,7 +2396,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,63,0,0,0x404,0x201,0xCE,{3203,3204}},
{0,0,0,48,0,0,0xE0E,0x2A1,0xC8,{3211,3210}},
{0,0,0,68,0,0,0x404,0x1B8,0xB4,{3203,3204}},
- {0,0,0,60,0,0,0xE0E,0xAD,0x5D,{3212,3213}},
+ {0,0,0,60,0,0,0xE0E,0x6E0,0x280,{3212,3213}},
{0,0,0,60,0,0,0xE0E,0x2A1,0xC8,{3214,3215}},
{0,0,0,66,0,0,0xE0E,0x12C,0x78,{3216,3217}},
{0,0,0,60,0,0,0,0x2A1,0xCE,{3218,3210}},
@@ -2480,7 +2480,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x9C40,0,{352,3339}},
{0,0,0,0,0x4,0,0x202,0x9C40,0xE9,{3340,3341}},
{0,0,0,0,0,0,0,0x9C40,0,{3342,3343}},
- {0,0,0,0,0,0,0,0x19B4,0x4F2,{3344,3345}},
+ {0,0,0,0,0,0,0,0x9C40,0xC1,{3344,3345}},
{0,0,0,0,0,0,0,0x1FA,0xC8,{3346,3347}},
{0,0,0,0,0,0,0,0x729,0x294,{3348,3349}},
{0,0,0,0,0,0,0xA0B,0x9C40,0x12C,{3350,3351}},
@@ -2489,7 +2489,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0x4,0,0x606,0x5A6,0xF6,{3356,3357}},
{0,0,0,0,0,0,0xE0E,0x611,0x10A,{3307,3358}},
{0,0,0,0,0,0,0x808,0x9C40,0xA0,{3359,3360}},
- {0,0,0,0,0,0,0,0x74A,0x29A,{3361,3362}},
+ {0,0,0,0,0,0,0,0x9C40,0x6A,{3361,3362}},
{0,0,0,0,0,0,0xA0A,0x9C40,0xA0,{3287,3363}},
{0,0,0,41,0,0,0x808,0x182,0xA6,{248,3364}},
{0,0,0,70,0,0,0xE0E,0x64,0x1A,{3365,3366}},
@@ -2545,7 +2545,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x808,0x9C40,0x2E,{3447,3448}},
{0,0,0,0,0,0,0x606,0x9C40,0,{3449,3450}},
{0,0,0,0,0,0,0,0x9C40,0x2E,{3451,3448}},
- {0,0,0,0,0,0,0x606,0x9C40,0,{3452,3453}},
+ {0,0,0,0,0,0,0x606,0x9C40,0x2E,{3452,3453}},
{0,0,0,0,0,0,0x808,0x690,0xC1,{3454,3455}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x7E,{3456,3457}},
{0,0,0,0,0,0,0,0x9C40,0x5D,{3458,3459}},
@@ -2562,7 +2562,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xA0A,0x9C40,0x49,{3477,3478}},
{0,0,0,0,0,0,0xA0A,0x9C40,0x2E,{3479,3480}},
{0,0,0,0,0,0,0x808,0x9C40,0x42,{3481,121}},
- {0,0,0,0,0,0,0xA0A,0x9C40,0x2E,{3482,3483}},
+ {0,0,0,0,0,0,0xA0A,0x9C40,0x50,{3482,3483}},
{0,0,0,0,0,0,0xA0A,0x9C40,0x1A,{3484,3485}},
{0,0,0,0,0,0,0x808,0x9C40,0x370,{3486,3487}},
{0,0,0,0,0,0,0,0x9C40,0x175,{3488,3489}},
@@ -2602,7 +2602,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xA0A,0x9C40,0x42,{3553,3554}},
{0,0,0,0,0,0,0x202,0x9C40,0x2E,{3555,3556}},
{0,0,0,0,0,0,0x202,0x9C40,0x49,{3555,3557}},
- {0,0,0,0,0,0,0x202,0x9C40,0x2E,{3558,3559}},
+ {0,0,0,0,0,0,0x202,0x9C40,0x49,{3558,3559}},
{0,0,0,0,0,0,0x202,0x9C40,0x42,{3560,3561}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x49,{3562,3563}},
{0,0,0,0,0,0,0x808,0x9C40,0x49,{3564,3565}},
@@ -2798,8 +2798,8 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xC0C,0x9C40,0xAD,{1459,1460}},
{0,0,0,0,0,0,0x809,0x369,0xC8,{1461,1462}},
{0,0,0,0,0,0,0xE0E,0x521,0x1BE,{1463,1464}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x50,{1467,1468}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x50,{1469,1470}},
+ {0,0,0,0,0,0,0xE0E,0x9C40,0xBA,{1467,1468}},
+ {0,0,0,0,0,0,0xE0E,0x9C40,0x161,{1469,1470}},
{0,0,0,0,0,0,0xE0E,0x9C40,0x7E,{1471,1472}},
{0,0,0,0,0,0,0xE0E,0x9C40,0x7E,{1473,3800}},
{0,0,0,0,0,0,0x808,0x9C40,0x3C,{1475,1476}},
@@ -2810,7 +2810,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x606,0x9C40,0x35,{1489,1490}},
{0,0,0,0,0,0,0x808,0x9C40,0,{1491,3805}},
{0,0,0,0,0,0,0xE0E,0x9C40,0x3C,{1493,1494}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x50,{3806,3807}},
+ {0,0,0,0,0,0,0xE0E,0x9C40,0x78,{3806,3807}},
{0,0,0,0,0,0,0xE0E,0x9C40,0xBA,{1497,3808}},
{0,0,0,0,0,0,0,0x9C40,0x50,{1499,3809}},
{0,0,0,0,0,0,0xA0A,0x9C40,0x49,{1501,1502}},
@@ -2832,7 +2832,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xC0C,0x9C40,0xC8,{1551,1552}},
{0,0,0,0,0,0,0,0x9C40,0xA0,{3820,3821}},
{0,0,0,0,0,0,0x404,0x1EBA,0x15A,{1557,3822}},
- {0,0,0,0,0,0,0xA0A,0x9C40,0x15A,{1559,1560}},
+ {0,0,0,0,0,0,0xA0A,0x9C40,0xAD,{1559,1560}},
{0,0,0,0,0,0,0xA0A,0x9C40,0x14D,{3823,3824}},
{-12,0,0,0,0,0,0x607,0x9C40,0x11E,{1565,1566}},
{0,0,0,0,0,0,0xE0E,0x1C70,0x294,{1571,1572}},
@@ -2899,7 +2899,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x1,0x9C40,0x49,{3840,3841}},
{0,0,0,0,0,0,0,0xE81,0x168,{14,3842}},
{0,0,0,0,0,0,0,0x9C40,0x56,{2430,119}},
- {0,0,0,0,0,0,0x1,0x9C40,0x49,{3843,3844}},
+ {0,0,0,0,0,0,0x1,0x9C40,0xCE,{3843,3844}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x175,{3845,3846}},
{0,0,0,0,0,0,0,0xDAC,0x85,{3847,3848}},
{0,0,0,0,0,0,0x808,0xE4C,0x272,{3849,3850}},
@@ -3075,7 +3075,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xC0C,0x9C40,0x139,{1106,1120}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x139,{4032,1122}},
{0,0,0,0,0,0,0xA0A,0x9C40,0,{4033,4034}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x42,{1126,1127}},
+ {0,0,0,0,0,0,0xE0E,0x60A,0xA0,{1126,1127}},
{0,0,0,0,0,0,0xE0E,0x9C40,0,{4035,4036}},
{0,0,0,0,0,0,0xE0E,0x9C40,0,{1035,1036}},
{0,0,0,0,0,0,0xA0A,0x9C40,0,{4037,4038}},
@@ -3156,7 +3156,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE0E,0x668,0x49,{4129,4130}},
{0,0,0,0,0,0,0xA0A,0x17CD,0x6ED,{4131,4132}},
{0,0,0,0,0,0,0,0x19D5,0x4F2,{3337,4133}},
- {0,0,0,0,0,0,0xA0A,0x17CD,0x6ED,{4134,4135}},
+ {0,0,0,0,0,0,0xA0A,0x9C40,0x168,{4134,4135}},
{0,0,0,0,0,0,0x808,0x1DCA,0x506,{4136,4137}},
{0,0,0,0,0,0,0x607,0x9C40,0x71,{2586,4138}},
{0,0,0,0,0,0,0x404,0xA99,0x64,{4139,4140}},
@@ -3343,7 +3343,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE0E,0x9C40,0xBA,{1497,1498}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x50,{1503,1504}},
{0,0,0,0,0,0,0xA0A,0x9C40,0x49,{1511,1512}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x118,{1531,1532}},
+ {0,0,0,0,0,0,0xE0E,0x9C40,0x49,{1531,1532}},
{0,0,0,0,0,0,0x809,0x9C40,0x42,{1543,1544}},
{0,0,0,0,0,0,0x404,0x1EF0,0x161,{1557,1558}},
{0,0,0,0,0,0,0xA0A,0x9C40,0x14D,{1561,1562}},
@@ -3558,7 +3558,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0x1,0,0xD0C,0x9C40,0x49,{4684,4685,4686,4687} },
{0,0,0,0,0,0,0,0x9C40,0x56,{4688,4689}},
{0,0,0,0,0,0,0x405,0x9C40,0x49,{4690,544}},
- {0,0,0,0,0,0,0,0x9C40,0x56,{4691,4692}},
+ {0,0,0,0,0,0,0,0x1450,0x50,{4691,4692}},
{0,0,0,0,0,0,0xA0A,0x9C40,0,{4693,4694}},
{0,0,0,0,0x1,0,0xF0E,0x9C40,0x49,{4695,4696,4697,4698} },
{0,0,0,0,0x1,0,0x908,0x9C40,0x49,{4699,4700,559,4701} },
@@ -3739,7 +3739,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{-12,0,0,0,0x1,0,0xF0E,0x9C40,0x56,{5208,4356,5209,5210} },
{0,0,0,0,0,0,0xE0E,0x19AD,0x85,{5211,5212}},
{0,0,0,0,0,0,0xE0E,0x39FE,0x49,{5213,5206}},
- {0,0,0,0,0,0,0xE0E,0x19AD,0x85,{5214,5215}},
+ {0,0,0,0,0,0,0xE0E,0x141A,0x696,{5214,5215}},
{0,0,0,0,0x1,0,0x908,0x9C40,0x49,{5216,5217,5218,5219} },
{12,0,0,0,0x1,0,0,0x9C40,0x49,{5220,5221,5222,5223} },
{12,0,0,0,0x1,0,0xE0E,0x300C,0x50,{4235,4236,4237,5224} },
@@ -4189,7 +4189,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x8,0x550,0x1E0,{5448,5824}},
{0,0,0,0,0,0,0xE,0x9C40,0x49,{5825,5826}},
{0,0,0,0,0,0,0xE,0x9C40,0x49,{5827,5826}},
- {0,0,0,0,0,0,0xE,0x9C40,0x49,{5828,5829}},
+ {0,0,0,0,0,0,0xE,0x9C40,0x7E,{5828,5829}},
{0,0,0,0,0,0,0xE,0x9C40,0x7E,{5830,5831}},
{0,0,0,0,0,0,0x6,0x9C40,0x49,{5832,5833}},
{0,0,0,0,0,0,0x8,0x869,0x6A,{5834,5835}},
@@ -4341,7 +4341,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x8,0x9C40,0x56,{6053,6054}},
{0,0,0,0,0,0,0x8,0x9C40,0x56,{6055,6056}},
{0,0,0,0,0,0,0xA,0x1D52,0x64,{1230,6057}},
- {0,0,0,0,0,0,0x8,0x9C40,0x56,{6058,6059}},
+ {0,0,0,0,0,0,0x8,0x9C40,0x49,{6058,6059}},
{0,0,0,0,0,0,0x8,0x9C40,0,{6060,6061}},
{0,0,0,0,0,0,0xA,0x9C40,0,{6062,6063}},
{0,0,0,0,0,0,0x6,0x542,0x161,{6005,6064}},
@@ -4683,7 +4683,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x9C40,0xBA,{6615,6616}},
{0,0,0,0,0,0,0xA,0x9C40,0x49,{6617,6618}},
{0,0,0,0,0,0,0xE,0x9C40,0x168,{6619,170}},
- {0,0,0,0,0,0,0xA,0x9C40,0x49,{6620,6621}},
+ {0,0,0,0,0,0,0xA,0x9C40,0x1FA,{6620,6621}},
{0,0,0,0,0,0,0xC,0x9C40,0x56,{6622,6623}},
{0,0,0,0,0,0,0,0x9C40,0x1E6,{6624,6625}},
{0,0,-50,0,0,0,0x6,0x9C40,0,{6626,6627}},
@@ -4715,7 +4715,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x4,0x89E,0x15A,{6675,6676}},
{0,0,0,0,0,0,0xE,0x599,0x49,{6677,6678}},
{0,0,0,0,0,0,0xE,0x286,0xA6,{233,6679}},
- {0,0,0,0,0,0,0xE,0x599,0x49,{6680,6681}},
+ {0,0,0,0,0,0,0xE,0x111,0x56,{6680,6681}},
{0,0,0,0,0,0,0xE,0x25E4,0x50,{6682,6683}},
{0,0,0,0,0,0,0xE,0xF0,0x35,{6684,6685}},
{0,0,0,0,0,0,0xE,0x9C40,0x49,{6686,6687}},
@@ -4847,7 +4847,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x3EE,0x168,{6839,86}},
{0,0,0,0,0,0,0,0xEB0,0x50D,{6840,6841}},
{0,0,0,0,0,0,0xE,0x9C40,0x5D,{6842,466}},
- {0,0,0,0,0,0,0,0xEB0,0x50D,{6843,6844}},
+ {0,0,0,0,0,0,0,0x9C40,0x2A8,{6843,6844}},
{0,0,0,0,0,0,0xA,0x9C40,0x4CA,{6845,6846}},
{0,0,0,0,0,0,0xC,0x9C40,0x189,{6847,96}},
{0,0,0,0,0,0,0,0x9C40,0x1ED,{6848,6849}},
@@ -4895,51 +4895,51 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE,0x9C40,0,{6915,6916}},
{0,0,0,0,0,0,0xE,0x1FA,0xC8,{246,6917}},
{0,0,0,44,0,0,0xC,0xB4,0xDC,{6918,6919}},
- {0,0,0,34,0x8,0,0x8,0x182,0xA0,{6920,6921}},
- {0,0,0,64,0x8,0,0xE,0x78,0x3C,{6236,6237}},
- {0,0,0,19,0x10,0,0xE,0x12C,0x8C,{6922,6923}},
- {0,0,0,74,0x10,0,0xA,0xB4,0x99,{6924,6925}},
- {0,0,0,29,0x10,0,0xE,0x14D,0x92,{6926,6927}},
- {0,0,0,46,0x18,0,0,0x11E,0x85,{6243,6244}},
- {0,0,0,48,0x28,0,0x8,0x3B2,0x154,{6928,6929}},
- {0,0,0,49,0x18,0,0,0x118,0x85,{6243,6247}},
- {0,0,0,48,0x28,0,0x8,0x3B2,0x154,{6930,6929}},
- {0,0,0,52,0x18,0,0,0x201,0xC8,{6243,6250}},
- {0,0,0,48,0x28,0,0x8,0x3B2,0x154,{6931,6929}},
- {0,0,0,54,0x18,0,0,0x201,0xCE,{6243,6250}},
- {0,0,0,57,0x18,0,0,0x3B9,0x12C,{6253,6254}},
- {0,0,0,13,0x28,0,0xE,0x855,0x279,{6932,6933}},
- {0,0,0,60,0x18,0,0,0x1FA,0xC8,{6243,6250}},
- {0,0,0,56,0x28,0,0x8,0x3C6,0x168,{6934,6929}},
- {0,0,0,13,0x28,0,0xE,0x855,0x279,{6935,6933}},
- {0,0,0,113,0x8,0,0xE,0x3A5,0x1BE,{6936,6937}},
- {0,0,0,91,0x10,0,0xE,0xBA,0x6A,{6938,6939}},
- {0,0,0,13,0x28,0,0xE,0x855,0x279,{6940,6933}},
- {0,0,0,83,0x8,0,0xE,0xD5,0x6A,{6941,6942}},
- {0,0,0,19,0x8,0,0xE,0x92A,0x326,{6943,6944}},
- {0,0,0,54,0x28,0,0x8,0x3C6,0x168,{6934,6929}},
- {0,0,0,72,0x8,0,0,0x104,0x5D,{6268,6269}},
- {0,0,0,77,0x8,0,0,0xFD,0x5D,{6270,6271}},
- {0,0,0,70,0x8,0,0,0xCE,0x5D,{6272,6273}},
- {0,0,0,75,0x8,0,0,0xAD,0x5D,{6274,6275}},
- {0,0,0,69,0x8,0,0,0x196,0x78,{6276,6277}},
- {0,0,0,59,0x8,0,0xC,0x17C,0xA0,{6278,6279}},
- {0,0,0,48,0x8,0,0xC,0x175,0x28,{6280,6281}},
- {0,0,0,89,0x8,0,0,0x1B1,0xAD,{6282,6283}},
- {0,0,0,84,0x8,0,0,0x326,0xB4,{6282,6284}},
- {0,0,0,33,0x8,0,0xE,0xF0,0x35,{6285,6286}},
- {0,0,0,78,0x10,0,0xD,0x118,0x6A,{6945,6946}},
- {0,0,0,58,0x8,0,0xC,0x208,0xC8,{6288,6289}},
- {0,0,0,52,0x8,0,0xC,0x208,0xC1,{6290,6289}},
- {0,0,0,49,0x28,0,0xE,0x11E,0x42,{6947,6948}},
- {0,0,0,49,0x28,0,0xE,0x11E,0x42,{6949,6948}},
- {0,0,0,85,0x8,0,0x6,0xDC,0x6A,{6294,6295}},
- {0,0,0,68,0x8,0,0x6,0xAD,0x5D,{6296,6297}},
- {0,0,0,61,0x8,0,0x6,0xDC,0x6A,{6296,6297}},
+ {0,0,0,34,0x8,0,0x8,0x3E8,0xA,{6920,6921}},
+ {0,0,0,64,0x8,0,0xE,0x3E8,0xA,{6236,6237}},
+ {0,0,0,19,0x10,0,0xE,0x3E8,0xA,{6922,6923}},
+ {0,0,0,74,0x10,0,0xA,0x3E8,0xA,{6924,6925}},
+ {0,0,0,29,0x10,0,0xE,0x3E8,0xA,{6926,6927}},
+ {0,0,0,46,0x18,0,0,0x3E8,0xA,{6243,6244}},
+ {0,0,0,48,0x28,0,0x8,0x3E8,0xA,{6928,6929}},
+ {0,0,0,49,0x18,0,0,0x3E8,0xA,{6243,6247}},
+ {0,0,0,48,0x28,0,0x8,0x3E8,0xA,{6930,6929}},
+ {0,0,0,52,0x18,0,0,0x3E8,0xA,{6243,6250}},
+ {0,0,0,48,0x28,0,0x8,0x3E8,0xA,{6931,6929}},
+ {0,0,0,54,0x18,0,0,0x3E8,0xA,{6243,6250}},
+ {0,0,0,57,0x18,0,0,0x3E8,0xA,{6253,6254}},
+ {0,0,0,13,0x28,0,0xE,0x3E8,0xA,{6932,6933}},
+ {0,0,0,60,0x18,0,0,0x3E8,0xA,{6243,6250}},
+ {0,0,0,56,0x28,0,0x8,0x3E8,0xA,{6934,6929}},
+ {0,0,0,13,0x28,0,0xE,0x3E8,0xA,{6935,6933}},
+ {0,0,0,113,0x8,0,0xE,0x3E8,0xA,{6936,6937}},
+ {0,0,0,91,0x10,0,0xE,0x3E8,0xA,{6938,6939}},
+ {0,0,0,13,0x28,0,0xE,0x3E8,0xA,{6940,6933}},
+ {0,0,0,83,0x8,0,0xE,0x3E8,0xA,{6941,6942}},
+ {0,0,0,19,0x8,0,0xE,0x3E8,0xA,{6943,6944}},
+ {0,0,0,54,0x28,0,0x8,0x3E8,0xA,{6934,6929}},
+ {0,0,0,72,0x8,0,0,0x3E8,0xA,{6268,6269}},
+ {0,0,0,77,0x8,0,0,0x3E8,0xA,{6270,6271}},
+ {0,0,0,70,0x8,0,0,0x3E8,0xA,{6272,6273}},
+ {0,0,0,75,0x8,0,0,0x3E8,0xA,{6274,6275}},
+ {0,0,0,69,0x8,0,0,0x3E8,0xA,{6276,6277}},
+ {0,0,0,59,0x8,0,0xC,0x3E8,0xA,{6278,6279}},
+ {0,0,0,48,0x8,0,0xC,0x3E8,0xA,{6280,6281}},
+ {0,0,0,89,0x8,0,0,0x3E8,0xA,{6282,6283}},
+ {0,0,0,84,0x8,0,0,0x3E8,0xA,{6282,6284}},
+ {0,0,0,33,0x8,0,0xE,0x3E8,0xA,{6285,6286}},
+ {0,0,0,78,0x10,0,0xD,0x3E8,0xA,{6945,6946}},
+ {0,0,0,58,0x8,0,0xC,0x3E8,0xA,{6288,6289}},
+ {0,0,0,52,0x8,0,0xC,0x3E8,0xA,{6290,6289}},
+ {0,0,0,49,0x28,0,0xE,0x3E8,0xA,{6947,6948}},
+ {0,0,0,49,0x28,0,0xE,0x3E8,0xA,{6949,6948}},
+ {0,0,0,85,0x8,0,0x6,0x3E8,0xA,{6294,6295}},
+ {0,0,0,68,0x8,0,0x6,0x3E8,0xA,{6296,6297}},
+ {0,0,0,61,0x8,0,0x6,0x3E8,0xA,{6296,6297}},
{0,0,0,60,0,0,0xA,0xE9,0x35,{2373,6950}},
{0,0,0,60,0,0,0xA,0xF0,0x35,{6951,6952}},
- {0,0,0,100,0x8,0,0xA,0xC1,0x1A,{6301,6302}},
- {0,0,0,100,0x8,0,0xA,0x3C0,0x161,{6303,6953}},
+ {0,0,0,100,0x8,0,0xA,0x3E8,0xA,{6301,6302}},
+ {0,0,0,100,0x8,0,0xA,0x3E8,0xA,{6303,6953}},
{0,0,0,0,0,0,0x8,0x1C48,0x9CA,{6954,6955}},
{0,0,0,0,0,0,0x6,0x9C40,0x49,{4075,6956}},
{0,0,0,0,0,0,0xA,0x9C40,0,{6957,6958}},
@@ -4951,50 +4951,50 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0xAD,0xC1,{959,959}},
{0,0,0,0,0,0,0x7,0x118,0x7E,{1170,1170}},
{0,0,0,0,0,0,0xA,0x11E,0xB4,{6968,6968}},
- {0,0,0,47,0x8,0,0,0x33A,0x154,{693,1345}},
- {0,0,0,36,0x8,0,0,0x1CCD,0x92,{6969,6696}},
- {0,0,0,67,0x8,0,0xE,0x85,0x64,{6970,6971}},
- {0,0,0,60,0x10,0,0x2,0x92,0x99,{6972,6972}},
- {0,0,0,60,0x10,0,0x2,0x71,0xF0,{6973,6973}},
- {0,0,0,60,0x10,0,0x1,0xDC,0x71,{6974,6974}},
- {0,0,0,48,0x18,0,0x5,0x189,0x5D,{6701,6701}},
- {0,0,0,60,0x28,0,0xD,0x196,0x196,{6975,6975}},
- {0,0,0,52,0x18,0,0x5,0x189,0x5D,{6702,6701}},
- {0,0,0,60,0x28,0,0x3,0x1B1,0x146,{6976,6976}},
- {0,0,0,55,0x18,0,0x5,0x189,0x5D,{6701,6701}},
- {0,0,0,60,0x28,0,0x3,0x294,0x146,{6977,6977}},
- {0,0,0,60,0x18,0,0x5,0x189,0x5D,{6701,6701}},
- {0,0,0,64,0x18,0,0x5,0x189,0x5D,{6701,6701}},
- {0,0,0,60,0x20,0,0x5,0x3C6,0xCE,{6978,6978}},
- {0,0,0,67,0x18,0,0x5,0x154,0x5D,{6701,6701}},
- {0,0,0,60,0x28,0,0x3,0x1B1,0x146,{6979,6979}},
- {0,0,0,60,0x20,0,0xC,0x24A,0x64,{6980,6980}},
- {0,0,0,60,0x28,0,0xB,0x3E1,0x182,{6981,6981}},
- {0,0,0,60,0x28,0,0xB,0x898,0x3DA,{6982,6982}},
- {0,0,0,60,0x20,0,0x2,0x244,0x5D,{6983,6983}},
- {0,0,0,48,0x20,0,0xA,0xE2,0x5D,{6984,6984}},
- {0,0,0,60,0x20,0,0xB,0x154,0x154,{2392,2392}},
- {0,0,0,60,0x20,0,0xD,0x132,0xB4,{6985,6985}},
- {0,0,0,67,0x18,0,0x3,0x2DD,0x222,{6986,6986}},
- {0,0,0,62,0x18,0,0xB,0x3CD,0x2F1,{6986,6986}},
- {0,0,0,67,0x18,0,0xA,0x14D,0x78,{6987,6987}},
- {0,0,0,67,0x18,0,0xA,0x258,0xB4,{6988,6988}},
- {0,0,0,60,0x18,0,0xA,0x2C2,0xCE,{6988,6988}},
- {0,0,0,53,0x20,0,0xA,0xE2,0x64,{6984,6984}},
- {0,0,0,48,0x20,0,0xA,0xE2,0x64,{6989,6989}},
- {0,0,0,60,0x10,0,0xA,0x139,0x3C,{6990,6990}},
- {0,0,0,60,0x10,0,0xA,0xF6,0x2E,{2368,2368}},
- {0,0,0,79,0x18,0,0xB,0x1BE,0x8C,{6991,6991}},
- {0,0,0,79,0x18,0,0xB,0x5BA,0x1F4,{6992,6992}},
- {0,0,0,60,0x10,0,0xA,0x139,0x3C,{6993,6993}},
- {0,0,0,60,0x10,0,0xA,0x3D4,0x42,{6994,6994}},
- {0,0,0,91,0x18,0,0x2,0xAD,0x5D,{5780,5780}},
- {0,0,0,60,0x18,0,0x3,0xF6,0xC8,{6995,6995}},
- {0,0,0,53,0x18,0,0x3,0xC1,0x7E,{6996,6996}},
- {0,0,0,60,0x10,0,0xA,0xE9,0x35,{2373,2373}},
- {0,0,0,60,0x10,0,0xA,0xF0,0x35,{6951,6951}},
- {0,0,0,79,0x8,0,0x8,0xF6,0x1A,{743,6997}},
- {0,0,0,79,0x8,0,0x8,0x564,0x1E6,{743,6998}},
+ {0,0,0,47,0x8,0,0,0x3E8,0xA,{693,1345}},
+ {0,0,0,36,0x8,0,0,0x3E8,0xA,{6969,6696}},
+ {0,0,0,67,0x8,0,0xE,0x3E8,0xA,{6970,6971}},
+ {0,0,0,60,0x10,0,0x2,0x3E8,0xA,{6972,6972}},
+ {0,0,0,60,0x10,0,0x2,0x3E8,0xA,{6973,6973}},
+ {0,0,0,60,0x10,0,0x1,0x3E8,0xA,{6974,6974}},
+ {0,0,0,48,0x18,0,0x5,0x3E8,0xA,{6701,6701}},
+ {0,0,0,60,0x28,0,0xD,0x3E8,0xA,{6975,6975}},
+ {0,0,0,52,0x18,0,0x5,0x3E8,0xA,{6702,6701}},
+ {0,0,0,60,0x28,0,0x3,0x3E8,0xA,{6976,6976}},
+ {0,0,0,55,0x18,0,0x5,0x3E8,0xA,{6701,6701}},
+ {0,0,0,60,0x28,0,0x3,0x3E8,0xA,{6977,6977}},
+ {0,0,0,60,0x18,0,0x5,0x3E8,0xA,{6701,6701}},
+ {0,0,0,64,0x18,0,0x5,0x3E8,0xA,{6701,6701}},
+ {0,0,0,60,0x20,0,0x5,0x3E8,0xA,{6978,6978}},
+ {0,0,0,67,0x18,0,0x5,0x3E8,0xA,{6701,6701}},
+ {0,0,0,60,0x28,0,0x3,0x3E8,0xA,{6979,6979}},
+ {0,0,0,60,0x20,0,0xC,0x3E8,0xA,{6980,6980}},
+ {0,0,0,60,0x28,0,0xB,0x3E8,0xA,{6981,6981}},
+ {0,0,0,60,0x28,0,0xB,0x3E8,0xA,{6982,6982}},
+ {0,0,0,60,0x20,0,0x2,0x3E8,0xA,{6983,6983}},
+ {0,0,0,48,0x20,0,0xA,0x3E8,0xA,{6984,6984}},
+ {0,0,0,60,0x20,0,0xB,0x3E8,0xA,{2392,2392}},
+ {0,0,0,60,0x20,0,0xD,0x3E8,0xA,{6985,6985}},
+ {0,0,0,67,0x18,0,0x3,0x3E8,0xA,{6986,6986}},
+ {0,0,0,62,0x18,0,0xB,0x3E8,0xA,{6986,6986}},
+ {0,0,0,67,0x18,0,0xA,0x3E8,0xA,{6987,6987}},
+ {0,0,0,67,0x18,0,0xA,0x3E8,0xA,{6988,6988}},
+ {0,0,0,60,0x18,0,0xA,0x3E8,0xA,{6988,6988}},
+ {0,0,0,53,0x20,0,0xA,0x3E8,0xA,{6984,6984}},
+ {0,0,0,48,0x20,0,0xA,0x3E8,0xA,{6989,6989}},
+ {0,0,0,60,0x10,0,0xA,0x3E8,0xA,{6990,6990}},
+ {0,0,0,60,0x10,0,0xA,0x3E8,0xA,{2368,2368}},
+ {0,0,0,79,0x18,0,0xB,0x3E8,0xA,{6991,6991}},
+ {0,0,0,79,0x18,0,0xB,0x3E8,0xA,{6992,6992}},
+ {0,0,0,60,0x10,0,0xA,0x3E8,0xA,{6993,6993}},
+ {0,0,0,60,0x10,0,0xA,0x3E8,0xA,{6994,6994}},
+ {0,0,0,91,0x18,0,0x2,0x3E8,0xA,{5780,5780}},
+ {0,0,0,60,0x18,0,0x3,0x3E8,0xA,{6995,6995}},
+ {0,0,0,53,0x18,0,0x3,0x3E8,0xA,{6996,6996}},
+ {0,0,0,60,0x10,0,0xA,0x3E8,0xA,{2373,2373}},
+ {0,0,0,60,0x10,0,0xA,0x3E8,0xA,{6951,6951}},
+ {0,0,0,79,0x8,0,0x8,0x3E8,0xA,{743,6997}},
+ {0,0,0,79,0x8,0,0x8,0x3E8,0xA,{743,6998}},
{0,0,0,52,0,0,0xE,0x118,0x7E,{252,253}},
{0,0,0,48,0,0,0,0xAD,0x5D,{254,255}},
{0,0,0,58,0,0,0xE,0x11E,0x7E,{252,253}},
@@ -5236,7 +5236,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE,0x9C40,0x50,{3801,3802}},
{0,0,0,0,0,0,0xE,0x9C40,0x50,{3803,3804}},
{0,0,0,0,0,0,0x8,0x9C40,0,{1491,3805}},
- {0,0,0,0,0,0,0xE,0x9C40,0x50,{3806,3807}},
+ {0,0,0,0,0,0,0xE,0x9C40,0x78,{3806,3807}},
{0,0,0,0,0,0,0xE,0x9C40,0xBA,{1497,3808}},
{0,0,0,0,0,0,0xC,0x9C40,0x50,{1503,3810}},
{0,0,0,0,0,0,0xA,0x9C40,0x49,{3812,3813}},
@@ -5590,7 +5590,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x1,0x9C40,0x49,{7899,7900}},
{12,0,0,0,0,0,0xA,0x5A6,0x222,{7901,7902}},
{12,0,0,0,0,0,0x6,0x34E,0x1A,{1180,7903}},
- {12,0,0,0,0,0,0xA,0x5A6,0x222,{7904,7905}},
+ {12,0,0,0,0,0,0xA,0x9C40,0x3C,{7904,7905}},
{12,0,0,0,0,0,0x8,0x9C40,0x3C,{7906,7907}},
{-12,0,0,0,0,0,0x4,0x9C40,0x3C,{7908,7909}},
{12,0,0,0,0,0,0xE,0x9C40,0x42,{7910,7911}},
@@ -5776,7 +5776,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0x606,0x9C40,0x50,{2542,8077}},
{0,0,0,0,0,0,0xE0E,0x9C40,0,{8078,8079}},
{0,0,0,0,0,0,0xE0E,0x9C40,0,{8080,8079}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0,{8081,8082}},
+ {0,0,0,0,0,0,0xE0E,0x585,0x1A,{8081,8082}},
{0,0,0,0,0,0,0x202,0x9C40,0x49,{8083,8084}},
{0,0,0,0,0,0,0xE0E,0x9C40,0x49,{8085,8086}},
{0,0,0,0,0,0,0,0x3C6,0x146,{8087,8088}},
@@ -5804,7 +5804,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0,0x134C,0x294,{8124,8125}},
{0,0,0,0,0,0,0xE0E,0x9C40,0x49,{8126,8127}},
{0,0,0,0,0,0,0xE0E,0x146,0x1A,{8126,8128}},
- {0,0,0,0,0,0,0xE0E,0x9C40,0x49,{8129,8130}},
+ {0,0,0,0,0,0,0xE0E,0x9C40,0,{8129,8130}},
{0,0,0,0,0,0,0xE0E,0x201,0x1A,{8131,8132}},
{0,0,0,0,0,0,0xC0C,0x9C40,0x2EA,{8133,8134}},
{0,0,0,0,0,0,0xE0E,0x9C40,0xC8,{8135,8136}},
@@ -5829,7 +5829,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,0,0,0,0xE0E,0x11E,0x49,{8169,8170}},
{0,0,0,0,0,0,0xE0E,0x69D,0x10A,{8171,962}},
{0,0,0,0,0,0,0xA0A,0x69D,0x10A,{8171,962}},
- {0,0,0,0,0,0,0xE0E,0x11E,0x49,{8172,8173}},
+ {0,0,0,0,0,0,0xE0E,0x140,0xA0,{8172,8173}},
{0,0,0,0,0,0,0xC0C,0x9C40,0xA0,{8174,8175}},
{0,0,0,0,0,0,0xA0A,0x9C40,0x16E,{8176,8177}},
{0,0,0,0,0,0,0xE0E,0xF6,0x1A,{914,8178}},
@@ -5942,7 +5942,7 @@ const BanksDump::InstrumentEntry g_embeddedBanksInstruments[] =
{0,0,0,84,0,0,0xE0E,0x9C40,0x6A,{8343,8068}},
{0,0,0,55,0,0,0x606,0x9C40,0x92,{8339,859}},
{0,0,0,72,0,0,0xE0E,0xD5,0x35,{755,756}},
- {0,0,0,84,0,0,0xE0E,0x9C40,0x49,{8344,8345}},
+ {0,0,0,84,0,0,0xE0E,0x92,0x3C,{8344,8345}},
{0,0,0,54,0,0,0xE0E,0x11E,0x7E,{8346,8302}},
{0,0,0,60,0,0,0xE0E,0xF0,0x35,{8347,8348}},
{0,0,0,84,0,0,0xE0E,0x305,0x35,{8096,8349}},
diff --git a/utils/gen_adldata/measurer.cpp b/utils/gen_adldata/measurer.cpp
index 4ef615e..e39512d 100644
--- a/utils/gen_adldata/measurer.cpp
+++ b/utils/gen_adldata/measurer.cpp
@@ -145,6 +145,7 @@ struct TinySynth
unsigned m_actualNotesNum;
bool m_isReal4op;
bool m_isPseudo4op;
+ bool m_isRhythmMode;
int m_playNoteNum;
int8_t m_voice1Detune;
int16_t m_noteOffsets[2];
@@ -197,6 +198,7 @@ struct TinySynth
}
std::memset(m_x, 0, sizeof(m_x));
+ m_isRhythmMode = false;
m_playNoteNum = in.notenum >= 128 ? (in.notenum - 128) : in.notenum;
m_isReal4op = in.real4op && !in.pseudo4op;
m_isPseudo4op = in.pseudo4op;
@@ -231,6 +233,7 @@ struct TinySynth
{
bool isPseudo4ops = ((ins.instFlags & BanksDump::InstrumentEntry::WOPL_Ins_Pseudo4op) != 0);
bool is4ops = ((ins.instFlags & BanksDump::InstrumentEntry::WOPL_Ins_4op) != 0) && !isPseudo4ops;
+ m_isRhythmMode = ((ins.instFlags & BanksDump::InstrumentEntry::WOPL_RhythmModeMask) != 0);
size_t opsNum = (is4ops || isPseudo4ops) ? 4 : 2;
BanksDump::Operator ops[4];
assert(ins.ops[0] >= 0);
@@ -541,6 +544,18 @@ DurationInfo MeasureDurations(BanksDump &db, const BanksDump::InstrumentEntry &i
synth.setInstrument(db, ins);
synth.noteOn();
+ if(synth.m_isRhythmMode) // Skip rhythm-mode check
+ {
+ DurationInfo result;
+ std::memset(&result, 0, sizeof(DurationInfo));
+ result.ms_sound_kon = 1000;
+ result.ms_sound_koff = 10;
+ result.nosound = false;
+ db.instruments[ins.instId].delay_on_ms = result.ms_sound_kon;
+ db.instruments[ins.instId].delay_off_ms = result.ms_sound_koff;
+ return result;
+ }
+
#ifdef GEN_ADLDATA_DEEP_DEBUG
/*****************DEBUG******************/
char waveFileOut[80] = "";
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 03:35:04 +0000