--- np2/cbus/amd98.c	2003/12/08 00:55:30	1.6
+++ np2/cbus/amd98.c	2004/02/03 08:24:40	1.8
@@ -12,12 +12,12 @@ static void setamd98event(BOOL absolute)
 	SINT32	cnt;
 
 	if (pit.value[3] > 8) {						// º¬µò¤Ê¤·
-		cnt = pc.multiple * pit.value[3];
+		cnt = pccore.multiple * pit.value[3];
 	}
 	else {
-		cnt = pc.multiple << 16;
+		cnt = pccore.multiple << 16;
 	}
-	if (pc.baseclock == PCBASECLOCK25) {
+	if (pccore.baseclock == PCBASECLOCK25) {
 		cnt = cnt * 16 / 13;					// cnt * 2457600 / 1996800
 	}
 	nevent_set(NEVENT_MUSICGEN, cnt, amd98int, absolute);
@@ -81,6 +81,7 @@ static void IOOUTCALL amd_odb(UINT port,
 					psggen_setreg(&psg3, amd98.psg3reg,
 												psg1.reg.io2);
 				}
+#if 0
 				else if (amd98.psg3reg == 0x0f) {
 					int r;
 static const BYTE amdr[] = {0x01, 0x08, 0x10, 0x20, 0x06, 0x40};
@@ -91,6 +92,7 @@ static const BYTE amdr[] = {0x01, 0x08, 
 						}
 					}
 				}
+#endif
 			}
 		}
 		psg2.reg.io2 = dat;
@@ -126,6 +128,9 @@ void amd98_bind(void) {
 	psgpanset(&psg1);
 	psgpanset(&psg2);
 	psgpanset(&psg3);
+	psggen_restore(&psg1);
+	psggen_restore(&psg2);
+	psggen_restore(&psg3);
 	sound_streamregist(&psg1, (SOUNDCB)psggen_getpcm);
 	sound_streamregist(&psg2, (SOUNDCB)psggen_getpcm);
 	sound_streamregist(&psg3, (SOUNDCB)psggen_getpcm);