diff options
| -rw-r--r-- | fm_banks/adldata-cache.dat | bin | 577832 -> 577832 bytes | |||
| -rw-r--r-- | src/adldata.cpp | 12 | ||||
| -rw-r--r-- | src/adldata.hh | 4 | ||||
| -rw-r--r-- | utils/gen_adldata/file_formats/load_wopl.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/fm_banks/adldata-cache.dat b/fm_banks/adldata-cache.dat Binary files differindex a6932ea..896fdbe 100644 --- a/fm_banks/adldata-cache.dat +++ b/fm_banks/adldata-cache.dat diff --git a/src/adldata.cpp b/src/adldata.cpp index c007c81..6606e1f 100644 --- a/src/adldata.cpp +++ b/src/adldata.cpp @@ -9175,15 +9175,15 @@ const struct adlinsdata adlins[4815] = {4337,4338, 61, 1, 153, 93, 0, 0 }, {4339,4340, 38, 1, 340, 133, 0, 0 }, {4341,4342, 37, 1, 206, 93, 0, 0 }, - {4343,4344, 15, 1, 346, 153, 0, 0 }, + {4343,4344, 15, 1, 346, 153, 10, 0 }, {4345,4346,100, 1, 146, 0, 0, 0.140625 }, - {4347,4348, 19, 1, 553, 200, 0, 0 }, + {4347,4348, 19, 1, 553, 200, 10, 0 }, {4349,4349, 48, 0, 180, 86, 0, 0 }, - {4350,4351, 15, 1, 333, 153, 0, 0 }, - {4352,4353, 12, 1, 340, 146, 0, 0 }, - {4354,4355, 11, 1, 346, 146, 0, 0 }, + {4350,4351, 15, 1, 333, 153, 20, 0 }, + {4352,4353, 12, 1, 340, 146, 20, 0 }, + {4354,4355, 11, 1, 346, 146, 20, 0 }, {4356,4357, 61, 1, 2706, 1033, 0, 0.09375 }, - {4358,4355, 8, 1, 340, 146, 0, 0 }, + {4358,4355, 8, 1, 340, 146, 20, 0 }, {4359,4360, 91, 1, 1166, 366, 0, -0.046875 }, {4361,4361, 70, 0, 966, 346, 0, 0 }, {4362,4363, 80, 1, 300, 93, 0, 0.125 }, diff --git a/src/adldata.hh b/src/adldata.hh index bb0e883..38a1d9f 100644 --- a/src/adldata.hh +++ b/src/adldata.hh @@ -106,9 +106,9 @@ extern const AdlBankSetup adlbanksetup[]; * @brief Conversion of storage formats */ inline adlinsdata2::adlinsdata2(const adlinsdata &d) - : tone(d.tone), flags(d.flags), midi_velocity_offset(d.midi_velocity_offset), + : tone(d.tone), flags(d.flags), ms_sound_kon(d.ms_sound_kon), ms_sound_koff(d.ms_sound_koff), - voice2_fine_tune(d.voice2_fine_tune) + midi_velocity_offset(d.midi_velocity_offset), voice2_fine_tune(d.voice2_fine_tune) { #ifdef DISABLE_EMBEDDED_BANKS std::memset(adl, 0, sizeof(adldata) * 2); diff --git a/utils/gen_adldata/file_formats/load_wopl.h b/utils/gen_adldata/file_formats/load_wopl.h index acc12e7..24b303e 100644 --- a/utils/gen_adldata/file_formats/load_wopl.h +++ b/utils/gen_adldata/file_formats/load_wopl.h @@ -171,7 +171,7 @@ static bool LoadWopl(const char *fn, unsigned bank, const char *prefix) tmp2.pseudo4op = (flags & (uint8_t)WOPL_Flags::Mode_DoubleVoice) != 0; tmp2.real4op = real4op && !tmp2.pseudo4op; tmp2.voice2_fine_tune = 0; - tmp2.midi_velocity_offset = 0; + tmp2.midi_velocity_offset = (int8_t)data[offset + 36]; tmp[0].diff = false; tmp[1].diff = real4op && !tmp2.pseudo4op; |