--- np2/sound/tms3631c.c	2003/10/16 17:58:03	1.1.1.1
+++ np2/sound/tms3631c.c	2005/02/07 14:46:12	1.5
@@ -21,6 +21,7 @@ void tms3631_initialize(UINT rate) {
 	UINT	sft;
 
 	ZeroMemory(&tms3631cfg, sizeof(tms3631cfg));
+	sft = 0;
 	if (rate == 11025) {
 		sft = 0;
 	}
@@ -33,21 +34,21 @@ void tms3631_initialize(UINT rate) {
 	tms3631cfg.ratesft = sft;
 }
 
-void tms3631_setvol(const BYTE *vol) {
+void tms3631_setvol(const UINT8 *vol) {
 
 	UINT	i;
 	UINT	j;
 	SINT32	data;
 
-	tms3631cfg.left = (vol[0] & 15) << 6;
-	tms3631cfg.right = (vol[1] & 15) << 6;
+	tms3631cfg.left = (vol[0] & 15) << 5;
+	tms3631cfg.right = (vol[1] & 15) << 5;
 	vol += 2;
 	for (i=0; i<16; i++) {
 		data = 0;
 		for (j=0; j<4; j++) {
 			data += (vol[j] & 15) * ((i & (1 << j))?1:-1);
 		}
-		tms3631cfg.feet[i] = data << 6;
+		tms3631cfg.feet[i] = data << 5;
 	}
 }
 
@@ -59,12 +60,12 @@ void tms3631_reset(TMS3631 tms) {
 	ZeroMemory(tms, sizeof(_TMS3631));
 }
 
-void tms3631_setkey(TMS3631 tms, BYTE ch, BYTE key) {
+void tms3631_setkey(TMS3631 tms, REG8 ch, REG8 key) {
 
 	tms->ch[ch & 7].freq = tms3631_freqtbl[key & 0x3f] >> tms3631cfg.ratesft;
 }
 
-void tms3631_setenable(TMS3631 tms, BYTE enable) {
+void tms3631_setenable(TMS3631 tms, REG8 enable) {
 
 	tms->enable = enable;
 }