--- np2/statsave.c	2004/02/18 06:52:33	1.36
+++ np2/statsave.c	2004/07/01 11:42:54	1.42
@@ -8,7 +8,9 @@
 #include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"gdc_sub.h"
 #include	"cbuscore.h"
+#include	"ideio.h"
 #include	"sasiio.h"
 #include	"scsiio.h"
 #include	"pc9861k.h"
@@ -29,6 +31,7 @@
 #include	"keydisp.h"
 #include	"hostdrv.h"
 #include	"calendar.h"
+#include	"keystat.h"
 
 #if defined(MACOS)
 #define	CRCONST		str_cr
@@ -704,6 +707,8 @@ static int flagload_gij(STFLAGH sfh, con
 
 // ---- FM
 
+#if !defined(DISABLE_SOUND)
+
 enum {
 	FLAG_MG			= 0x0001,
 	FLAG_FM1A		= 0x0002,
@@ -903,11 +908,9 @@ static int flagload_fm(STFLAGH sfh, cons
 	}
 	if (saveflg & FLAG_CS4231) {
 		ret |= statflag_read(sfh, &cs4231, sizeof(cs4231));
-		cs4231.proc = cs4231dec[cs4231.reg.datafmt >> 4];
 	}
 
 	// 復元。 これ移動すること！
-	rhythm_update(&rhythm);
 	adpcm_update(&adpcm);
 	pcm86gen_update();
 	if (saveflg & FLAG_PCM86) {
@@ -919,6 +922,7 @@ static int flagload_fm(STFLAGH sfh, cons
 	(void)t;
 	return(ret);
 }
+#endif
 
 
 // ---- disk
@@ -1226,9 +1230,11 @@ const SFENTRY	*tblterm;
 				ret |= flagsave_ext(&sffh->sfh, tbl);
 				break;
 
+#if !defined(DISABLE_SOUND)
 			case STATFLAG_FM:
 				ret |= flagsave_fm(&sffh->sfh, tbl);
 				break;
+#endif
 
 			case STATFLAG_GIJ:
 				ret |= flagsave_gij(&sffh->sfh, tbl);
@@ -1296,7 +1302,9 @@ const SFENTRY	*tblterm;
 				case STATFLAG_EVT:
 				case STATFLAG_EXT:
 				case STATFLAG_GIJ:
+#if !defined(DISABLE_SOUND)
 				case STATFLAG_FM:
+#endif
 #if defined(SUPPORT_HOSTDRV)
 				case STATFLAG_HDRV:
 #endif
@@ -1348,17 +1356,15 @@ const SFENTRY	*tblterm;
 	sxsi_trash();
 
 	ret |= flagload_common(&sffh->sfh, np2tbl);
-	nevent_init();
 
 	CPU_RESET();
 	CPU_SETEXTSIZE((UINT32)pccore.extmem);
+	nevent_allreset();
 
 	sound_changeclock();
 	beep_changeclock();
 	sound_reset();
-#if defined(SUPPORT_WAVEMIX)
-	wavemix_bind();
-#endif
+	fddmtrsnd_bind();
 
 	iocore_reset();								// サウンドでpicを呼ぶので…
 	cbuscore_reset();
@@ -1419,9 +1425,11 @@ const SFENTRY	*tblterm;
 					ret |= flagload_ext(&sffh->sfh, tbl);
 					break;
 
+#if !defined(DISABLE_SOUND)
 				case STATFLAG_FM:
 					ret |= flagload_fm(&sffh->sfh, tbl);
 					break;
+#endif
 
 				case STATFLAG_GIJ:
 					ret |= flagload_gij(&sffh->sfh, tbl);