--- np2/wince/sysmenu.cpp	2003/11/21 12:59:18	1.2
+++ np2/wince/sysmenu.cpp	2004/01/05 07:22:02	1.5
@@ -118,6 +118,44 @@ static void sys_cmd(MENUID id) {
 											(char *)mstr_scropt, dlgscr_cmd);
 			break;
 
+#if defined(WIN32_PLATFORM_PSPC)
+		case MID_CURDEF:
+			winkbd_bindcur(0);
+			np2oscfg.bindcur = 0;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_CUR1:
+			winkbd_bindcur(1);
+			np2oscfg.bindcur = 1;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_CUR2:
+			winkbd_bindcur(2);
+			np2oscfg.bindcur = 2;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_BTNDEF:
+			winkbd_bindbtn(0);
+			np2oscfg.bindbtn = 0;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_BTN1:
+			winkbd_bindbtn(1);
+			np2oscfg.bindbtn = 1;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_BTN2:
+			winkbd_bindbtn(2);
+			np2oscfg.bindbtn = 2;
+			update |= SYS_UPDATEOSCFG;
+			break;
+#endif
+
 		case MID_KEY:
 			np2cfg.KEY_MODE = 0;
 			keystat_resetjoykey();
@@ -136,6 +174,12 @@ static void sys_cmd(MENUID id) {
 			update |= SYS_UPDATECFG;
 			break;
 
+		case MID_MOUSEKEY:
+			np2cfg.KEY_MODE = 3;
+			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
+			break;
+
 		case MID_XSHIFT:
 			np2cfg.XSHIFT ^= 1;
 			keystat_forcerelease(0x70);
@@ -258,6 +302,15 @@ static void sys_cmd(MENUID id) {
 			update |= SYS_UPDATECFG;
 			break;
 
+		case MID_JASTSND:
+			np2oscfg.jastsnd ^= 1;
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case MID_SEEKSND:
+			np2cfg.MOTOR ^= 1;
+			update |= SYS_UPDATECFG;
+			break;
 #if 0
 		case IDM_SNDOPT:
 			winuienter();
@@ -265,11 +318,6 @@ static void sys_cmd(MENUID id) {
 			winuileave();
 			break;
 #endif
-		case MID_SEEKSND:
-			np2cfg.MOTOR ^= 1;
-			update |= SYS_UPDATECFG;
-			break;
-
 		case MID_MEM640:
 			np2cfg.EXTMEM = 0;
 			update |= SYS_UPDATECFG;
@@ -428,10 +476,22 @@ BOOL sysmenu_menuopen(UINT menutype, int
 	menusys_setcheck(MID_30FPS, (b == 2));
 	menusys_setcheck(MID_20FPS, (b == 3));
 	menusys_setcheck(MID_15FPS, (b == 4));
+#if defined(WIN32_PLATFORM_PSPC)
+	b = np2oscfg.bindcur;
+	menusys_setcheck(MID_CURDEF, (b == 0));
+	menusys_setcheck(MID_CUR1, (b == 1));
+	menusys_setcheck(MID_CUR2, (b == 2));
+	b = np2oscfg.bindbtn;
+	menusys_setcheck(MID_BTNDEF, (b == 0));
+	menusys_setcheck(MID_BTN1, (b == 1));
+	menusys_setcheck(MID_BTN2, (b == 2));
+#endif
+
 	b = np2cfg.KEY_MODE;
 	menusys_setcheck(MID_KEY, (b == 0));
 	menusys_setcheck(MID_JOY1, (b == 1));
 	menusys_setcheck(MID_JOY2, (b == 2));
+	menusys_setcheck(MID_MOUSEKEY, (b == 3));
 	b = np2cfg.XSHIFT;
 	menusys_setcheck(MID_XSHIFT, (b & 1));
 	menusys_setcheck(MID_XCTRL, (b & 2));
@@ -458,6 +518,7 @@ BOOL sysmenu_menuopen(UINT menutype, int
 	menusys_setcheck(MID_SPEAKBOARD, (b == 0x20));
 	menusys_setcheck(MID_SPARKBOARD, (b == 0x40));
 	menusys_setcheck(MID_AMD98, (b == 0x80));
+	menusys_setcheck(MID_JASTSND, (np2oscfg.jastsnd & 1));
 	menusys_setcheck(MID_SEEKSND, (np2cfg.MOTOR & 1));
 	b = np2cfg.EXTMEM;
 	menusys_setcheck(MID_MEM640, (b == 0));