Skip to content

Commit

Permalink
Allow the four extra OPL3 waveforms to be used (untested)
Browse files Browse the repository at this point in the history
  • Loading branch information
sagamusix committed Jul 8, 2018
1 parent 92e63a2 commit 5d6aca4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions player/snd_fm.c
Original file line number Diff line number Diff line change
Expand Up @@ -432,13 +432,13 @@ void OPL_Patch(int c, const unsigned char *D)
OPL_Byte(KSL_LEVEL+ Ope, D[2]);
OPL_Byte(ATTACK_DECAY+ Ope, D[4]);
OPL_Byte(SUSTAIN_RELEASE+ Ope, D[6]);
OPL_Byte(WAVE_SELECT+ Ope, D[8]&3);// 6 high bits used elsewhere
OPL_Byte(WAVE_SELECT+ Ope, D[8]&7);// 5 high bits used elsewhere

OPL_Byte(AM_VIB+ 3+Ope, D[1]);
OPL_Byte(KSL_LEVEL+ 3+Ope, D[3]);
OPL_Byte(ATTACK_DECAY+ 3+Ope, D[5]);
OPL_Byte(SUSTAIN_RELEASE+3+Ope, D[7]);
OPL_Byte(WAVE_SELECT+ 3+Ope, D[9]&3);// 6 high bits used elsewhere
OPL_Byte(WAVE_SELECT+ 3+Ope, D[9]&7);// 5 high bits used elsewhere

/* feedback, additive synthesis and Panning... */
OPL_Byte(FEEDBACK_CONNECTION+oplc,
Expand Down
4 changes: 2 additions & 2 deletions schism/page_samples.c
Original file line number Diff line number Diff line change
Expand Up @@ -797,14 +797,14 @@ static const struct {
{2, 7, B, 1, 4, 1 }, // carrier scale envelope flag
{2, 8, N, 3, 6, 2 }, // carrier level scaling (This is actually reversed bits...)
{2, 9, N, 1, 0, 4 }, // carrier frequency multiplier
{2, 10, N, 9, 0, 2 }, // carrier wave select
{2, 10, N, 9, 0, 3 }, // carrier wave select
{2, 11, B, 1, 6, 1 }, // carrier pitch vibrato
{2, 12, B, 1, 7, 1 }, // carrier volume vibrato

{3, 7, B, 0, 4, 1 }, // modulator scale envelope flag
{3, 8, N, 2, 6, 2 }, // modulator level scaling (This is actually reversed bits...)
{3, 9, N, 0, 0, 4 }, // modulator frequency multiplier
{3, 10, N, 8, 0, 2 }, // modulator wave select
{3, 10, N, 8, 0, 3 }, // modulator wave select
{3, 11, B, 0, 6, 1 }, // modulator pitch vibrato
{3, 12, B, 0, 7, 1 }, // modulator volume vibrato
};
Expand Down

0 comments on commit 5d6aca4

Please sign in to comment.