--- np2/statsave.c	2004/01/25 05:41:28	1.32
+++ np2/statsave.c	2004/01/27 03:24:18	1.34
@@ -57,7 +57,6 @@ enum {
 #if defined(CGWND_FONTPTR)
 	STATFLAG_CGW,
 #endif
-	STATFLAG_CLOCK,
 	STATFLAG_COM,
 	STATFLAG_DISK,
 	STATFLAG_DMA,
@@ -549,19 +548,6 @@ static int flagload_common(STFLAGH sfh, 
 }
 
 
-// ----- clock
-
-static int flagload_clock(STFLAGH sfh, const SFENTRY *tbl) {
-
-	int		ret;
-
-	ret = statflag_read(sfh, tbl->arg1, tbl->arg2);
-	sound_changeclock();
-	beep_changeclock();
-	return(ret);
-}
-
-
 // ---- memory
 
 static int flagsave_mem(STFLAGH sfh, const SFENTRY *tbl) {
@@ -1298,7 +1284,6 @@ static int flagload_disk(STFLAGH sfh, co
 			fdd_set(i, st.path, FTYPE_NONE, st.readonly);
 		}
 	}
-	sxsi_trash();
 	for (i=0x00; i<0x02; i++) {
 		ret |= statflag_read(sfh, &st, sizeof(st));
 		if (st.path[0]) {
@@ -1445,7 +1430,6 @@ const SFENTRY	*tblterm;
 		ret |= statflag_createsection(sffh, tbl);
 		switch(tbl->type) {
 			case STATFLAG_BIN:
-			case STATFLAG_CLOCK:
 			case STATFLAG_TERM:
 				ret |= flagsave_common(&sffh->sfh, tbl);
 				break;
@@ -1539,7 +1523,6 @@ const SFENTRY	*tblterm;
 #if defined(CGWND_FONTPTR)
 				case STATFLAG_CGW:
 #endif
-				case STATFLAG_CLOCK:
 				case STATFLAG_MEM:
 					ret |= flagcheck_versize(&sffh->sfh, tbl);
 					break;
@@ -1553,6 +1536,7 @@ const SFENTRY	*tblterm;
 				case STATFLAG_EGC:
 				case STATFLAG_EPSON:
 				case STATFLAG_EVT:
+				case STATFLAG_EXT:
 				case STATFLAG_GIJ:
 				case STATFLAG_FM:
 #if defined(SUPPORT_HOSTDRV)
@@ -1603,6 +1587,7 @@ const SFENTRY	*tblterm;
 	rs232c_midipanic();
 	mpu98ii_midipanic();
 	pc9861k_midipanic();
+	sxsi_trash();
 
 	ret |= flagload_common(&sffh->sfh, np2tbl);
 	nevent_init();
@@ -1621,7 +1606,6 @@ const SFENTRY	*tblterm;
 	cbuscore_reset();
 	fmboard_reset(pccore.sound);
 
-
 	done = FALSE;
 	while((!done) && (ret != STATFLAG_FAILURE)) {
 		ret |= statflag_readsection(sffh);
@@ -1649,10 +1633,6 @@ const SFENTRY	*tblterm;
 					break;
 #endif
 
-				case STATFLAG_CLOCK:
-					ret |= flagload_clock(&sffh->sfh, tbl);
-					break;
-
 				case STATFLAG_COM:
 					ret |= flagload_com(&sffh->sfh, tbl);
 					break;