X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=359517a8d7dcf66f98ac1b1be491a8907b4a65c8;hb=4b811a8abecf3ca8ee0b8a02214982a87d013e2f;hp=b6bd019c3520becad5279154e58f0510689198c6;hpb=2951214ea65ce2e2ac40671511b8d5a9ea2d2842;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index b6bd019..359517a 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -30,6 +30,24 @@
 
 char menuErrorMsg[64] = { 0, };
 
+// PicoPad[] format: MXYZ SACB RLDU
+me_bind_action me_ctrl_actions[12] =
+{
+	{ "UP     ", 0x001 },
+	{ "DOWN   ", 0x002 },
+	{ "LEFT   ", 0x004 },
+	{ "RIGHT  ", 0x008 },
+	{ "A      ", 0x040 },
+	{ "B      ", 0x010 },
+	{ "C      ", 0x020 },
+	{ "START  ", 0x080 },
+	{ "MODE   ", 0x800 },
+	{ "X      ", 0x400 },
+	{ "Y      ", 0x200 },
+	{ "Z      ", 0x100 }
+};
+
+
 static unsigned char menu_font_data[10240];
 static int menu_text_color = 0xffff; // default to white
 static int menu_sel_color = -1; // disabled
@@ -164,7 +182,12 @@ static int parse_hex_color(char *buff)
 {
 	char *endp = buff;
 	int t = (int) strtoul(buff, &endp, 16);
-	if (endp != buff) return ((t>>8)&0xf800) | ((t>>5)&0x07e0) | ((t>>3)&0x1f);
+	if (endp != buff)
+#ifdef PSP
+		return ((t<<8)&0xf800) | ((t>>5)&0x07e0) | ((t>>19)&0x1f);
+#else
+		return ((t>>8)&0xf800) | ((t>>5)&0x07e0) | ((t>>3)&0x1f);
+#endif
 	return -1;
 }
 
@@ -220,7 +243,6 @@ void menu_init(void)
 				int tmp = parse_hex_color(buff+16);
 				if (tmp >= 0) menu_sel_color = tmp;
 				else lprintf("skin.txt: parse error for selection_color\n");
-				lprintf("sel color: %04x\n", menu_sel_color);
 			}
 			else
 				lprintf("skin.txt: parse error: %s\n", buff);
@@ -318,5 +340,25 @@ int me_process(menu_entry *entries, int count, menu_id id, int is_next)
 	}
 }
 
-
+const char *me_region_name(unsigned int code, int auto_order)
+{
+	static const char *names[] = { "Auto", "      Japan NTSC", "      Japan PAL", "      USA", "      Europe" };
+	static const char *names_short[] = { "", " JP", " JP", " US", " EU" };
+	int u, i = 0;
+	if (code) {
+		code <<= 1;
+		while((code >>= 1)) i++;
+		if (i > 4) return "unknown";
+		return names[i];
+	} else {
+		static char name[24];
+		strcpy(name, "Auto:");
+		for (u = 0; u < 3; u++) {
+			i = 0; code = ((auto_order >> u*4) & 0xf) << 1;
+			while((code >>= 1)) i++;
+			strcat(name, names_short[i]);
+		}
+		return name;
+	}
+}