|
@@ -99,14 +99,14 @@ static void play_drum(enum drums drum) NONBANKED {
|
99
|
99
|
switch (drum) {
|
100
|
100
|
case dKick:
|
101
|
101
|
NR41_REG = 0x2F; // length timer, higher value is shorter time (up to 0x3F)
|
102
|
|
- NR42_REG = 0xF0; // initially full volume, no volume changes over time
|
|
102
|
+ NR42_REG = (conf_get()->music_vol << 4) | 0x00; // initially full volume, no volume changes over time
|
103
|
103
|
NR43_REG = 0x11; // frequency distribution
|
104
|
104
|
NR44_REG = 0xC0; // trigger and enable length
|
105
|
105
|
break;
|
106
|
106
|
|
107
|
107
|
case dSnare:
|
108
|
108
|
NR41_REG = 0x00; // length timer, higher value is shorter time (up to 0x3F)
|
109
|
|
- NR42_REG = 0xF1; // initially full volume, then fade sound out
|
|
109
|
+ NR42_REG = (conf_get()->music_vol << 4) | 0x01; // initially full volume, then fade sound out
|
110
|
110
|
NR43_REG = 0x46; // frequency distribution
|
111
|
111
|
NR44_REG = 0xC0; // trigger and enable length
|
112
|
112
|
break;
|