--- np2/macos9/np2.cpp	2004/03/12 18:19:58	1.32
+++ np2/macos9/np2.cpp	2004/05/21 14:30:32	1.35
@@ -53,6 +53,11 @@ static	BYTE		scrnmode;
 #endif
 static	char	target[MAX_PATH] = DEFAULTPATH;
 
+#if !defined(SUPPORT_PC9821)
+static const char np2app[] = "np2";
+#else
+static const char np2app[] = "np21";
+#endif
 
 static const char np2resume[] = "sav";
 
@@ -123,7 +128,7 @@ static void MenuBarInit(void) {
 	if (!np2oscfg.I286SAVE) {
 		hmenu = GetMenuHandle(IDM_OTHER);
 		if (hmenu) {
-			DeleteMenuItem(hmenu, 10);
+			DeleteMenuItem(hmenu, 9);
 		}
 	}
 	InsertMenu(GetMenu(IDM_SASI1), -1);
@@ -151,6 +156,20 @@ static void MenuBarInit(void) {
 	EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));
 	EnableItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE));
 #endif
+
+	if (!(np2cfg.fddequip & 1)) {
+		DeleteMenu(IDM_FDD1);
+	}
+	if (!(np2cfg.fddequip & 2)) {
+		DeleteMenu(IDM_FDD2);
+	}
+	if (!(np2cfg.fddequip & 4)) {
+		DeleteMenu(IDM_FDD3);
+	}
+	if (!(np2cfg.fddequip & 8)) {
+		DeleteMenu(IDM_FDD4);
+	}
+
 	DrawMenuBar();
 }
 
@@ -731,7 +750,7 @@ static void processwait(UINT waitcnt) {
 
 static void getstatfilename(char *path, const char *ext, int size) {
 
-	file_cpyname(path, file_getcd("np2"), size);
+	file_cpyname(path, file_getcd(np2app), size);
 	file_catname(path, str_dot, size);
 	file_catname(path, ext, size);
 }
@@ -788,17 +807,22 @@ int main(int argc, char *argv[]) {
 
 	InitToolBox();
 	macossub_init();
-	MenuBarInit();
-
 	initload();
 
+	MenuBarInit();
+
 	TRACEINIT();
 
 	keystat_initialize();
 
 	SetRect(&wRect, np2oscfg.posx, np2oscfg.posy, 100, 100);
+#if !defined(SUPPORT_PC9821)
 	hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE,
 								noGrowDocProc, (WindowPtr)-1, TRUE, 0);
+#else
+	hWndMain = NewWindow(0, &wRect, "\pNeko Project 21", FALSE,
+								noGrowDocProc, (WindowPtr)-1, TRUE, 0);
+#endif
 	if (!hWndMain) {
 		TRACETERM();
 		macossub_term();