--- np2/statsave.c	2004/02/18 06:52:33	1.36
+++ np2/statsave.c	2004/03/30 20:01:29	1.41
@@ -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
@@ -903,11 +906,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) {
@@ -1348,17 +1349,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();