X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fmenu.c;h=7acfa53da6edeef4e78b7fc0802d80098a808187;hb=71de3cd9bb3cad7630df5b1d2a0e56475995b025;hp=9b51d7c04daf0c61fae2e3f5cc79d6449a34f339;hpb=d524c827cd65b50aa2f72099d9ac24f4efa7aeef;p=picodrive.git

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index 9b51d7c..7acfa53 100644
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -13,9 +13,11 @@
 #include "gp2x.h"
 #include "emu.h"
 #include "menu.h"
-#include "fonts.h"
 #include "usbjoy.h"
-#include "asmutils.h"
+#include "../common/emu.h"
+#include "../common/menu.h"
+#include "../common/arm_utils.h"
+#include "../common/readpng.h"
 #include "version.h"
 
 #include <Pico/PicoInt.h>
@@ -26,313 +28,17 @@
 #error "need d_type for file browser
 #endif
 
-extern char romFileName[PATH_MAX];
-extern char *rom_data;
 extern int  mmuhack_status;
-extern int  state_slot;
-extern int  config_slot, config_slot_current;
 
-static char *gp2xKeyNames[] = {
+static const char *gp2xKeyNames[] = {
 	"UP",    "???",    "LEFT", "???",  "DOWN", "???", "RIGHT",    "???",
 	"START", "SELECT", "L",    "R",    "A",    "B",   "X",        "Y",
 	"???",   "???",    "???",  "???",  "???",  "???", "VOL DOWN", "VOL UP",
 	"???",   "???",    "???",  "PUSH", "???",  "???", "???",      "???"
 };
 
-char menuErrorMsg[40] = {0, };
-
-
-static void gp2x_text(unsigned char *screen, int x, int y, const char *text, int color)
-{
-	int i,l;
-
-	screen = screen + x + y*320;
-
-	for (i = 0; i < strlen(text); i++)
-	{
-		for (l=0;l<8;l++)
-		{
-			if(fontdata8x8[((text[i])*8)+l]&0x80) screen[l*320+0]=color;
-			if(fontdata8x8[((text[i])*8)+l]&0x40) screen[l*320+1]=color;
-			if(fontdata8x8[((text[i])*8)+l]&0x20) screen[l*320+2]=color;
-			if(fontdata8x8[((text[i])*8)+l]&0x10) screen[l*320+3]=color;
-			if(fontdata8x8[((text[i])*8)+l]&0x08) screen[l*320+4]=color;
-			if(fontdata8x8[((text[i])*8)+l]&0x04) screen[l*320+5]=color;
-			if(fontdata8x8[((text[i])*8)+l]&0x02) screen[l*320+6]=color;
-			if(fontdata8x8[((text[i])*8)+l]&0x01) screen[l*320+7]=color;
-		}
-		screen += 8;
-	}
-}
-
-// draws white text to current bbp15 screen
-void gp2x_text_out15(int x, int y, const char *text)
-{
-	int i,l;
-	unsigned short *screen = gp2x_screen;
-
-	screen = screen + x + y*320;
-
-	for (i = 0; i < strlen(text); i++)
-	{
-		for (l=0;l<8;l++)
-		{
-			if(fontdata8x8[((text[i])*8)+l]&0x80) screen[l*320+0]=0xffff;
-			if(fontdata8x8[((text[i])*8)+l]&0x40) screen[l*320+1]=0xffff;
-			if(fontdata8x8[((text[i])*8)+l]&0x20) screen[l*320+2]=0xffff;
-			if(fontdata8x8[((text[i])*8)+l]&0x10) screen[l*320+3]=0xffff;
-			if(fontdata8x8[((text[i])*8)+l]&0x08) screen[l*320+4]=0xffff;
-			if(fontdata8x8[((text[i])*8)+l]&0x04) screen[l*320+5]=0xffff;
-			if(fontdata8x8[((text[i])*8)+l]&0x02) screen[l*320+6]=0xffff;
-			if(fontdata8x8[((text[i])*8)+l]&0x01) screen[l*320+7]=0xffff;
-		}
-		screen += 8;
-	}
-}
-
-
-void gp2x_text_out8(int x, int y, const char *texto, ...)
-{
-	va_list args;
-	char    buffer[512];
-
-	va_start(args,texto);
-	vsprintf(buffer,texto,args);
-	va_end(args);
-
-	gp2x_text(gp2x_screen,x,y,buffer,0xf0);
-}
-
-
-void gp2x_text_out8_2(int x, int y, const char *texto, int color)
-{
-	gp2x_text(gp2x_screen, x, y, texto, color);
-}
-
-void gp2x_text_out8_lim(int x, int y, const char *texto, int max)
-{
-	char    buffer[320/8+1];
-
-	strncpy(buffer, texto, 320/8);
-	if (max > 320/8) max = 320/8;
-	if (max < 0) max = 0;
-	buffer[max] = 0;
-
-	gp2x_text(gp2x_screen,x,y,buffer,0xf0);
-}
-
-static void gp2x_smalltext8(int x, int y, const char *texto)
-{
-	int i;
-	unsigned char *src, *dst;
-
-	for (i = 0;; i++, x += 6)
-	{
-		unsigned char c = (unsigned char) texto[i];
-		int h = 8;
-
-		if (!c) break;
-
-		src = fontdata6x8[c];
-		dst = (unsigned char *)gp2x_screen + x + y*320;
-
-		while (h--)
-		{
-			int w = 0x20;
-			while (w)
-			{
-				if( *src & w ) *dst = 0xf0;
-				dst++;
-				w>>=1;
-			}
-			src++;
-
-			dst += 320-6;
-		}
-	}
-}
-
-static void gp2x_smalltext8_lim(int x, int y, const char *texto, int max)
-{
-	char    buffer[320/6+1];
-
-	strncpy(buffer, texto, 320/6);
-	if (max > 320/6) max = 320/6;
-	if (max < 0) max = 0;
-	buffer[max] = 0;
-
-	gp2x_smalltext8(x, y, buffer);
-}
-
-
-typedef enum
-{
-	MB_NONE = 1,		/* no auto processing */
-	MB_ONOFF,		/* ON/OFF setting */
-	MB_RANGE,		/* [min-max] setting */
-} menu_behavior;
-
-typedef enum
-{
-	MA_NONE = 1,
-	MA_MAIN_RESUME_GAME,
-	MA_MAIN_SAVE_STATE,
-	MA_MAIN_LOAD_STATE,
-	MA_MAIN_RESET_GAME,
-	MA_MAIN_LOAD_ROM,
-	MA_MAIN_OPTIONS,
-	MA_MAIN_CONTROLS,
-	MA_MAIN_CREDITS,
-	MA_MAIN_PATCHES,
-	MA_MAIN_EXIT,
-	MA_OPT_RENDERER,
-	MA_OPT_SCALING,
-	MA_OPT_ACC_TIMING,
-	MA_OPT_ACC_SPRITES,
-	MA_OPT_SHOW_FPS,
-	MA_OPT_FRAMESKIP,
-	MA_OPT_ENABLE_SOUND,
-	MA_OPT_SOUND_QUALITY,
-	MA_OPT_ARM940_SOUND,
-	MA_OPT_6BUTTON_PAD,
-	MA_OPT_REGION,
-	MA_OPT_SRAM_STATES,
-	MA_OPT_CONFIRM_STATES,
-	MA_OPT_SAVE_SLOT,
-	MA_OPT_CPU_CLOCKS,
-	MA_OPT_SCD_OPTS,
-	MA_OPT_ADV_OPTS,
-	MA_OPT_SAVECFG,
-	MA_OPT_SAVECFG_GAME,
-	MA_OPT_LOADCFG,
-	MA_OPT2_GAMMA,
-	MA_OPT2_A_SN_GAMMA,
-	MA_OPT2_VSYNC,
-	MA_OPT2_ENABLE_Z80,
-	MA_OPT2_ENABLE_YM2612,
-	MA_OPT2_ENABLE_SN76496,
-	MA_OPT2_GZIP_STATES,
-	MA_OPT2_NO_LAST_ROM,
-	MA_OPT2_RAMTIMINGS,
-	MA_OPT2_SQUIDGEHACK,
-	MA_OPT2_DONE,
-	MA_CDOPT_TESTBIOS_USA,
-	MA_CDOPT_TESTBIOS_EUR,
-	MA_CDOPT_TESTBIOS_JAP,
-	MA_CDOPT_LEDS,
-	MA_CDOPT_CDDA,
-	MA_CDOPT_PCM,
-	MA_CDOPT_READAHEAD,
-	MA_CDOPT_SAVERAM,
-	MA_CDOPT_SCALEROT_CHIP,
-	MA_CDOPT_BETTER_SYNC,
-	MA_CDOPT_DONE,
-} menu_id;
-
-typedef struct
-{
-	char *name;
-	menu_behavior beh;
-	menu_id id;
-	void *var;		/* for on-off settings */
-	int mask;
-	signed char min;	/* for ranged integer settings, to be sign-extended */
-	signed char max;
-	char enabled;
-} menu_entry;
-
-static int me_id2offset(const menu_entry *entries, int count, menu_id id)
-{
-	int i;
-	for (i = 0; i < count; i++)
-	{
-		if (entries[i].id == id) return i;
-	}
-
-	printf("%s: id %i not found\n", __FUNCTION__, id);
-	return 0;
-}
-
-static void me_enable(menu_entry *entries, int count, menu_id id, int enable)
-{
-	int i = me_id2offset(entries, count, id);
-	entries[i].enabled = enable;
-}
-
-static int me_count_enabled(const menu_entry *entries, int count)
-{
-	int i, ret = 0;
-
-	for (i = 0; i < count; i++)
-	{
-		if (entries[i].enabled) ret++;
-	}
-
-	return ret;
-}
-
-static menu_id me_index2id(const menu_entry *entries, int count, int index)
-{
-	int i;
-
-	for (i = 0; i < count; i++)
-	{
-		if (entries[i].enabled)
-		{
-			if (index == 0) break;
-			index--;
-		}
-	}
-	if (i >= count) i = count - 1;
-	return entries[i].id;
-}
-
-typedef void (me_draw_custom_f)(const menu_entry *entry, int x, int y, void *param);
-
-static void me_draw(const menu_entry *entries, int count, int x, int y, me_draw_custom_f *cust_draw, void *param)
-{
-	int i, y1 = y;
-
-	for (i = 0; i < count; i++)
-	{
-		if (!entries[i].enabled) continue;
-		if (entries[i].name == NULL)
-		{
-			if (cust_draw != NULL)
-				cust_draw(&entries[i], x, y1, param);
-			y1 += 10;
-			continue;
-		}
-		gp2x_text_out8(x, y1, entries[i].name);
-		if (entries[i].beh == MB_ONOFF)
-			gp2x_text_out8(x + 27*8, y1, (*(int *)entries[i].var & entries[i].mask) ? "ON" : "OFF");
-		else if (entries[i].beh == MB_RANGE)
-			gp2x_text_out8(x + 27*8, y1, "%i", *(int *)entries[i].var);
-		y1 += 10;
-	}
-}
-
-static int me_process(menu_entry *entries, int count, menu_id id, int is_next)
-{
-	int i = me_id2offset(entries, count, id);
-	menu_entry *entry = &entries[i];
-	switch (entry->beh)
-	{
-		case MB_ONOFF:
-			*(int *)entry->var ^= entry->mask;
-			return 1;
-		case MB_RANGE:
-			*(int *)entry->var += is_next ? 1 : -1;
-			if (*(int *)entry->var < (int)entry->min) *(int *)entry->var = (int)entry->min;
-			if (*(int *)entry->var > (int)entry->max) *(int *)entry->var = (int)entry->max;
-			return 1;
-		default:
-			return 0;
-	}
-}
-
-
-
+static void menu_darken_bg(void *dst, int pixels, int darker);
+static void menu_prepare_bg(int use_game_bg);
 
 static unsigned long inp_prev = 0;
 static int inp_prevjoy = 0;
@@ -418,10 +124,66 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
 	return ret;
 }
 
+static void menu_flip(void)
+{
+	gp2x_video_flush_cache();
+	gp2x_video_flip2();
+}
+
+
+// --------- loading ROM screen ----------
+
+static void load_progress_cb(int percent)
+{
+	int ln, len = percent * 320 / 100;
+	unsigned short *dst = (unsigned short *)gp2x_screen + 320*20;
+
+	if (len > 320) len = 320;
+	for (ln = 10; ln > 0; ln--, dst += 320)
+		memset(dst, 0xff, len*2);
+	menu_flip();
+}
+
+void menu_romload_prepare(const char *rom_name)
+{
+	const char *p = rom_name + strlen(rom_name);
+	while (p > rom_name && *p != '/') p--;
+
+	if (rom_data) gp2x_pd_clone_buffer2();
+	else memset(gp2x_screen, 0, 320*240*2);
+
+	smalltext_out16(1, 1, "Loading", 0xffff);
+	smalltext_out16_lim(1, 10, p, 0xffff, 53);
+	gp2x_memcpy_buffers(3, gp2x_screen, 0, 320*240*2);
+	menu_flip();
+	PicoCartLoadProgressCB = load_progress_cb;
+}
 
+void menu_romload_end(void)
+{
+	PicoCartLoadProgressCB = NULL;
+	smalltext_out16(1, 30, "Starting emulation...", 0xffff);
+	menu_flip();
+}
 
 // -------------- ROM selector --------------
 
+// rrrr rggg gggb bbbb
+static unsigned short file2color(const char *fname)
+{
+	const char *ext = fname + strlen(fname) - 3;
+	static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso" };
+	static const char *other_exts[] = { "gmv", "pat" };
+	int i;
+
+	if (ext < fname) ext = fname;
+	for (i = 0; i < sizeof(rom_exts)/sizeof(rom_exts[0]); i++)
+		if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff;
+	for (i = 0; i < sizeof(other_exts)/sizeof(other_exts[0]); i++)
+		if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5;
+	return 0xffff;
+}
+
 static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 {
 	int start, i, pos;
@@ -429,24 +191,30 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 	start = 12 - sel;
 	n--; // exclude current dir (".")
 
-	//memset(gp2x_screen, 0, 320*240);
 	gp2x_pd_clone_buffer2();
 
+	if (rom_data == NULL) {
+		menu_darken_bg(gp2x_screen, 320*240, 0);
+	}
+
+	menu_darken_bg((char *)gp2x_screen + 320*120*2, 320*8, 0);
+
 	if(start - 2 >= 0)
-		gp2x_smalltext8_lim(14, (start - 2)*10, curdir, 53-2);
+		smalltext_out16_lim(14, (start - 2)*10, curdir, 0xffff, 53-2);
 	for (i = 0; i < n; i++) {
 		pos = start + i;
 		if (pos < 0)  continue;
 		if (pos > 23) break;
 		if (namelist[i+1]->d_type == DT_DIR) {
-			gp2x_smalltext8_lim(14,   pos*10, "/", 1);
-			gp2x_smalltext8_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3);
+			smalltext_out16_lim(14,   pos*10, "/", 0xfff6, 1);
+			smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xfff6, 53-3);
 		} else {
-			gp2x_smalltext8_lim(14,   pos*10, namelist[i+1]->d_name, 53-2);
+			unsigned short color = file2color(namelist[i+1]->d_name);
+			smalltext_out16_lim(14,   pos*10, namelist[i+1]->d_name, color, 53-2);
 		}
 	}
-	gp2x_text_out8(5, 120, ">");
-	gp2x_video_flip2();
+	text_out16(5, 120, ">");
+	menu_flip();
 }
 
 static int scandir_cmp(const void *p1, const void *p2)
@@ -605,11 +373,11 @@ static void draw_debug(void)
 		while (*p && *p != '\n') p++;
 		len = p - str;
 		if (len > 55) len = 55;
-		gp2x_smalltext8_lim(1, line*10, str, len);
+		smalltext_out16_lim(1, line*10, str, 0xffff, len);
 		if (*p == 0) break;
 		p++; str = p;
 	}
-	gp2x_video_flip2();
+	menu_flip();
 }
 
 static void debug_menu_loop(void)
@@ -622,7 +390,7 @@ static void debug_menu_loop(void)
 
 static void draw_patchlist(int sel)
 {
-	int start, i, pos;
+	int start, i, pos, active;
 
 	start = 12 - sel;
 
@@ -632,14 +400,15 @@ static void draw_patchlist(int sel)
 		pos = start + i;
 		if (pos < 0)  continue;
 		if (pos > 23) break;
-		gp2x_smalltext8_lim(14,     pos*10, PicoPatches[i].active ? "ON " : "OFF", 3);
-		gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-6);
+		active = PicoPatches[i].active;
+		smalltext_out16_lim(14,     pos*10, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff, 3);
+		smalltext_out16_lim(14+6*4, pos*10, PicoPatches[i].name, active ? 0xfff6 : 0xffff, 53-6);
 	}
 	pos = start + i;
-	if (pos < 24) gp2x_smalltext8_lim(14, pos*10, "done", 4);
+	if (pos < 24) smalltext_out16_lim(14, pos*10, "done", 0xffff, 4);
 
-	gp2x_text_out8(5, 120, ">");
-	gp2x_video_flip2();
+	text_out16(5, 120, ">");
+	menu_flip();
 }
 
 
@@ -668,8 +437,6 @@ static void patches_menu_loop(void)
 
 // ------------ savestate loader ------------
 
-static void menu_prepare_bg(void);
-
 static int state_slot_flags = 0;
 
 static void state_check_slots(void)
@@ -680,7 +447,7 @@ static void state_check_slots(void)
 
 	for (slot = 0; slot < 10; slot++)
 	{
-		if (emu_check_save_file(slot))
+		if (emu_checkSaveFile(slot))
 		{
 			state_slot_flags |= 1 << slot;
 		}
@@ -708,10 +475,10 @@ static void draw_savestate_bg(int slot)
 
 	if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {
 		file = gzopen(fname, "rb");
-		emu_set_save_cbs(1);
+		emu_setSaveStateCbs(1);
 	} else {
 		file = fopen(fname, "rb");
-		emu_set_save_cbs(0);
+		emu_setSaveStateCbs(0);
 	}
 
 	if (file) {
@@ -729,9 +496,8 @@ static void draw_savestate_bg(int slot)
 		areaClose(file);
 	}
 
-	emu_forced_frame();
-	gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);
-	menu_prepare_bg();
+	emu_forcedFrame();
+	menu_prepare_bg(1);
 
 	memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
 	memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));
@@ -748,20 +514,19 @@ static void draw_savestate_menu(int menu_sel, int is_loading)
 		draw_savestate_bg(menu_sel);
 	gp2x_pd_clone_buffer2();
 
-	gp2x_text_out8(tl_x, 30, is_loading ? "Load state" : "Save state");
+	text_out16(tl_x, 30, is_loading ? "Load state" : "Save state");
+
+	menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 108);
 
 	/* draw all 10 slots */
 	y = tl_y;
 	for (i = 0; i < 10; i++, y+=10)
 	{
-		gp2x_text_out8(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");
+		text_out16(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");
 	}
-	gp2x_text_out8(tl_x, y, "back");
+	text_out16(tl_x, y, "back");
 
-	// draw cursor
-	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
-
-	gp2x_video_flip2();
+	menu_flip();
 }
 
 static int savestate_menu_loop(int is_loading)
@@ -847,33 +612,57 @@ static char *action_binds(int player_idx, int action_mask)
 		}
 	}
 
+	// limit..
+	strkeys[20] = 0;
+
 	return strkeys;
 }
 
-static void unbind_action(int action)
+static void unbind_action(int action, int pl_idx, int joy)
 {
 	int i, u;
 
-	for (i = 0; i < 32; i++)
-		currentConfig.KeyBinds[i] &= ~action;
-	for (u = 0; u < 4; u++)
-		for (i = 0; i < 32; i++)
-			currentConfig.JoyBinds[u][i] &= ~action;
+	if (joy <= 0)
+	{
+		for (i = 0; i < 32; i++) {
+			if (pl_idx >= 0 && (currentConfig.KeyBinds[i]&0x30000) != (pl_idx<<16)) continue;
+			currentConfig.KeyBinds[i] &= ~action;
+		}
+	}
+	if (joy < 0)
+	{
+		for (u = 0; u < 4; u++)
+			for (i = 0; i < 32; i++) {
+				if (pl_idx >= 0 && (currentConfig.JoyBinds[u][i]&0x30000) != (pl_idx<<16)) continue;
+				currentConfig.JoyBinds[u][i] &= ~action;
+			}
+	}
+	else if (joy > 0)
+	{
+		for (i = 0; i < 32; i++) {
+			if (pl_idx >= 0 && (currentConfig.JoyBinds[joy-1][i]&0x30000) != (pl_idx<<16)) continue;
+			currentConfig.JoyBinds[joy-1][i] &= ~action;
+		}
+	}
 }
 
-static int count_bound_keys(int action, int joy)
+static int count_bound_keys(int action, int pl_idx, int joy)
 {
 	int i, keys = 0;
 
 	if (joy)
 	{
-		for (i = 0; i < 32; i++)
+		for (i = 0; i < 32; i++) {
+			if (pl_idx >= 0 && (currentConfig.JoyBinds[joy-1][i]&0x30000) != (pl_idx<<16)) continue;
 			if (currentConfig.JoyBinds[joy-1][i] & action) keys++;
+		}
 	}
 	else
 	{
-		for (i = 0; i < 32; i++)
+		for (i = 0; i < 32; i++) {
+			if (pl_idx >= 0 && (currentConfig.KeyBinds[i]&0x30000) != (pl_idx<<16)) continue;
 			if (currentConfig.KeyBinds[i] & action) keys++;
+		}
 	}
 	return keys;
 }
@@ -886,33 +675,32 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i
 
 	gp2x_pd_clone_buffer2();
 	if (player_idx >= 0) {
-		gp2x_text_out8(80, 20, "Player %i controls", player_idx + 1);
-		x = 100;
+		text_out16(80, 20, "Player %i controls", player_idx + 1);
+		x = 80;
 	} else {
-		gp2x_text_out8(80, 20, "Emulator controls");
+		text_out16(80, 20, "Emulator controls");
 		x = 40;
 	}
 
+	menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 130);
+
 	y = tl_y;
 	for (i = 0; i < opt_cnt; i++, y+=10)
-		gp2x_text_out8(x, y, "%s : %s", opts[i].name, action_binds(player_idx, opts[i].mask));
+		text_out16(x, y, "%s : %s", opts[i].name, action_binds(player_idx, opts[i].mask));
 
-	gp2x_text_out8(x, y, "Done");
-
-	// draw cursor
-	gp2x_text_out8(x - 16, tl_y + sel*10, ">");
+	text_out16(x, y, "Done");
 
 	if (sel < opt_cnt) {
-		gp2x_text_out8(30, 190, "Press a button to bind/unbind");
-		gp2x_text_out8(30, 200, "Use SELECT to clear");
-		gp2x_text_out8(30, 210, "To bind UP/DOWN, hold SELECT");
-		gp2x_text_out8(30, 220, "Select \"Done\" to exit");
+		text_out16(30, 180, "Press a button to bind/unbind");
+		text_out16(30, 190, "Use SELECT to clear");
+		text_out16(30, 200, "To bind UP/DOWN, hold SELECT");
+		text_out16(30, 210, "Select \"Done\" to exit");
 	} else {
-		gp2x_text_out8(30, 200, "Use Options -> Save cfg");
-		gp2x_text_out8(30, 210, "to save controls");
-		gp2x_text_out8(30, 220, "Press B or X to exit");
+		text_out16(30, 190, "Use Options -> Save cfg");
+		text_out16(30, 200, "to save controls");
+		text_out16(30, 210, "Press B or X to exit");
 	}
-	gp2x_video_flip2();
+	menu_flip();
 }
 
 static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_idx)
@@ -937,16 +725,16 @@ static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_i
 			}
 			// if we are here, we want to bind/unbind something
 			if ((inp & GP2X_SELECT) && !prev_select)
-				unbind_action(opts[sel].mask);
+				unbind_action(opts[sel].mask, player_idx, -1);
 			prev_select = inp & GP2X_SELECT;
 			inp &= CONFIGURABLE_KEYS;
 			inp &= ~GP2X_SELECT;
 			for (i = 0; i < 32; i++)
 				if (inp & (1 << i)) {
-					if (count_bound_keys(opts[sel].mask, 0) >= 2)
+					if (count_bound_keys(opts[sel].mask, player_idx, 0) >= 2)
 					     currentConfig.KeyBinds[i] &= ~opts[sel].mask; // allow to unbind only
 					else currentConfig.KeyBinds[i] ^=  opts[sel].mask;
-					if (player_idx >= 0) {
+					if (player_idx >= 0 && (currentConfig.KeyBinds[i] & opts[sel].mask)) {
 						currentConfig.KeyBinds[i] &= ~(3 << 16);
 						currentConfig.KeyBinds[i] |= player_idx << 16;
 					}
@@ -956,12 +744,14 @@ static void key_config_loop(const bind_action_t *opts, int opt_cnt, int player_i
 		{
 			for (i = 0; i < 32; i++)
 				if (inp & (1 << i)) {
-					if (count_bound_keys(opts[sel].mask, joy) >= 1) // disallow combos for usbjoy
-					     currentConfig.JoyBinds[joy-1][i] &= ~opts[sel].mask;
-					else currentConfig.JoyBinds[joy-1][i] ^=  opts[sel].mask;
-					if (player_idx >= 0) {
-						currentConfig.JoyBinds[joy-1][i] &= ~(3 << 16);
-						currentConfig.JoyBinds[joy-1][i] |= player_idx << 16;
+					int *bind = &currentConfig.JoyBinds[joy-1][i];
+					if ((*bind & opts[sel].mask) && (player_idx < 0 || player_idx == ((*bind>>16)&3)))
+						currentConfig.JoyBinds[joy-1][i] &= ~opts[sel].mask;
+					else {
+						// override
+						unbind_action(opts[sel].mask, player_idx, joy);
+						*bind = opts[sel].mask;
+						if (player_idx >= 0) *bind |= player_idx << 16;
 					}
 				}
 		}
@@ -975,26 +765,25 @@ static void draw_kc_sel(int menu_sel)
 
 	y = tl_y;
 	gp2x_pd_clone_buffer2();
-	gp2x_text_out8(tl_x, y,       "Player 1");
-	gp2x_text_out8(tl_x, (y+=10), "Player 2");
-	gp2x_text_out8(tl_x, (y+=10), "Emulator controls");
-	gp2x_text_out8(tl_x, (y+=10), "Done");
+	menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);
 
-	// draw cursor
-	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
+	text_out16(tl_x, y,       "Player 1");
+	text_out16(tl_x, (y+=10), "Player 2");
+	text_out16(tl_x, (y+=10), "Emulator controls");
+	text_out16(tl_x, (y+=10), "Done");
 
 	tl_x = 25;
-	gp2x_text_out8(tl_x, (y=110), "USB joys detected:");
+	text_out16(tl_x, (y=110), "USB joys detected:");
 	if (num_of_joys > 0) {
 		for (i = 0; i < num_of_joys; i++) {
 			strncpy(joyname, joy_name(joys[i]), 33); joyname[33] = 0;
-			gp2x_text_out8(tl_x, (y+=10), "%i: %s", i+1, joyname);
+			text_out16(tl_x, (y+=10), "%i: %s", i+1, joyname);
 		}
 	} else {
-		gp2x_text_out8(tl_x, (y+=10), "none");
+		text_out16(tl_x, (y+=10), "none");
 	}
 
-	gp2x_video_flip2();
+	menu_flip();
 }
 
 
@@ -1020,13 +809,13 @@ static bind_action_t ctrl_actions[] =
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"
 static bind_action_t emuctrl_actions[] =
 {
-	{ "Volume Down    ", 1<<30 },
-	{ "Volume Up      ", 1<<29 },
 	{ "Load State     ", 1<<28 },
 	{ "Save State     ", 1<<27 },
-	{ "Switch Renderer", 1<<26 },
 	{ "Prev Save Slot ", 1<<25 },
 	{ "Next Save Slot ", 1<<24 },
+	{ "Switch Renderer", 1<<26 },
+	{ "Volume Down    ", 1<<30 },
+	{ "Volume Up      ", 1<<29 },
 	{ "Enter Menu     ", 1<<23 },
 };
 
@@ -1089,13 +878,13 @@ static void menu_cdopt_cust_draw(const menu_entry *entry, int x, int y, void *pa
 
 	switch (entry->id)
 	{
-		case MA_CDOPT_TESTBIOS_USA: gp2x_text_out8(x, y, "USA BIOS:     %s", bios_names->us); break;
-		case MA_CDOPT_TESTBIOS_EUR: gp2x_text_out8(x, y, "EUR BIOS:     %s", bios_names->eu); break;
-		case MA_CDOPT_TESTBIOS_JAP: gp2x_text_out8(x, y, "JAP BIOS:     %s", bios_names->jp); break;
+		case MA_CDOPT_TESTBIOS_USA: text_out16(x, y, "USA BIOS:     %s", bios_names->us); break;
+		case MA_CDOPT_TESTBIOS_EUR: text_out16(x, y, "EUR BIOS:     %s", bios_names->eu); break;
+		case MA_CDOPT_TESTBIOS_JAP: text_out16(x, y, "JAP BIOS:     %s", bios_names->jp); break;
 		case MA_CDOPT_READAHEAD:
 			if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);
 			else strcpy(ra_buff, "     OFF");
-			gp2x_text_out8(x, y, "ReadAhead buffer      %s", ra_buff);
+			text_out16(x, y, "ReadAhead buffer      %s", ra_buff);
 			break;
 		default:break;
 	}
@@ -1112,18 +901,17 @@ static void draw_cd_menu_options(int menu_sel, struct bios_names_t *bios_names)
 
 	gp2x_pd_clone_buffer2();
 
-	me_draw(cdopt_entries, CDOPT_ENTRY_COUNT, tl_x, tl_y, menu_cdopt_cust_draw, bios_names);
+	menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 246);
 
-	// draw cursor
-	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
+	me_draw(cdopt_entries, CDOPT_ENTRY_COUNT, tl_x, tl_y, menu_cdopt_cust_draw, bios_names);
 
 	selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);
 	if ((selected_id == MA_CDOPT_TESTBIOS_USA && strcmp(bios_names->us, "NOT FOUND")) ||
 		(selected_id == MA_CDOPT_TESTBIOS_EUR && strcmp(bios_names->eu, "NOT FOUND")) ||
 		(selected_id == MA_CDOPT_TESTBIOS_JAP && strcmp(bios_names->jp, "NOT FOUND")))
-			gp2x_text_out8(tl_x, 220, "Press start to test selected BIOS");
+			text_out16(tl_x, 210, "Press start to test selected BIOS");
 
-	gp2x_video_flip2();
+	menu_flip();
 }
 
 static void cd_menu_loop_options(void)
@@ -1135,17 +923,17 @@ static void cd_menu_loop_options(void)
 	menu_id selected_id;
 	char *bios, *p;
 
-	if (find_bios(4, &bios)) { // US
+	if (emu_findBios(4, &bios)) { // US
 		for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
 		strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;
 	} else	strcpy(bios_names.us, "NOT FOUND");
 
-	if (find_bios(8, &bios)) { // EU
+	if (emu_findBios(8, &bios)) { // EU
 		for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
 		strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;
 	} else	strcpy(bios_names.eu, "NOT FOUND");
 
-	if (find_bios(1, &bios)) { // JP
+	if (emu_findBios(1, &bios)) { // JP
 		for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
 		strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;
 	} else	strcpy(bios_names.jp, "NOT FOUND");
@@ -1179,21 +967,21 @@ static void cd_menu_loop_options(void)
 		if (inp & GP2X_START) { // BIOS testers
 			switch (selected_id) {
 				case MA_CDOPT_TESTBIOS_USA:
-					if (find_bios(4, &bios)) { // test US
+					if (emu_findBios(4, &bios)) { // test US
 						strcpy(romFileName, bios);
 						engineState = PGS_ReloadRom;
 						return;
 					}
 					break;
 				case MA_CDOPT_TESTBIOS_EUR:
-					if (find_bios(8, &bios)) { // test EU
+					if (emu_findBios(8, &bios)) { // test EU
 						strcpy(romFileName, bios);
 						engineState = PGS_ReloadRom;
 						return;
 					}
 					break;
 				case MA_CDOPT_TESTBIOS_JAP:
-					if (find_bios(1, &bios)) { // test JP
+					if (emu_findBios(1, &bios)) { // test JP
 						strcpy(romFileName, bios);
 						engineState = PGS_ReloadRom;
 						return;
@@ -1214,7 +1002,7 @@ menu_entry opt2_entries[] =
 {
 	{ NULL,                        MB_NONE,  MA_OPT2_GAMMA,         NULL, 0, 0, 0, 1 },
 	{ "A_SN's gamma curve",        MB_ONOFF, MA_OPT2_A_SN_GAMMA,    &currentConfig.EmuOpt, 0x1000, 0, 0, 1 },
-	{ "Perfecf vsync",             MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1 },
+	{ "Perfect vsync",             MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1 },
 	{ "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &currentConfig.PicoOpt,0x0004, 0, 0, 1 },
 	{ "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &currentConfig.PicoOpt,0x0001, 0, 0, 1 },
 	{ "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&currentConfig.PicoOpt,0x0002, 0, 0, 1 },
@@ -1231,9 +1019,9 @@ menu_entry opt2_entries[] =
 static void menu_opt2_cust_draw(const menu_entry *entry, int x, int y, void *param)
 {
 	if (entry->id == MA_OPT2_GAMMA)
-		gp2x_text_out8(x, y, "Gamma correction           %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100);
+		text_out16(x, y, "Gamma correction           %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100);
 	else if (entry->id == MA_OPT2_SQUIDGEHACK)
-		gp2x_text_out8(x, y, "squidgehack (now %s %s", mmuhack_status ? "active)  " : "inactive)",
+		text_out16(x, y, "squidgehack (now %s %s", mmuhack_status ? "active)  " : "inactive)",
 			(currentConfig.EmuOpt&0x0010)?"ON":"OFF");
 }
 
@@ -1244,12 +1032,11 @@ static void draw_amenu_options(int menu_sel)
 
 	gp2x_pd_clone_buffer2();
 
-	me_draw(opt2_entries, OPT2_ENTRY_COUNT, tl_x, tl_y, menu_opt2_cust_draw, NULL);
+	menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 252);
 
-	// draw cursor
-	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
+	me_draw(opt2_entries, OPT2_ENTRY_COUNT, tl_x, tl_y, menu_opt2_cust_draw, NULL);
 
-	gp2x_video_flip2();
+	menu_flip();
 }
 
 static void amenu_loop_options(void)
@@ -1356,7 +1143,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
 				str = "16bit accurate";
 			else
 				str = " 8bit accurate";
-			gp2x_text_out8(x, y, "Renderer:            %s", str);
+			text_out16(x, y, "Renderer:            %s", str);
 			break;
 		case MA_OPT_SCALING:
 			switch (currentConfig.scaling) {
@@ -1365,20 +1152,20 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
 				case 2:  str = "hw horiz. + vert."; break;
 				case 3:  str = "sw horizontal";     break;
 			}
-			gp2x_text_out8(x, y, "Scaling:       %s", str);
+			text_out16(x, y, "Scaling:       %s", str);
 			break;
 		case MA_OPT_FRAMESKIP:
 			if (currentConfig.Frameskip < 0)
 			     strcpy(str24, "Auto");
 			else sprintf(str24, "%i", currentConfig.Frameskip);
-			gp2x_text_out8(x, y, "Frameskip                  %s", str24);
+			text_out16(x, y, "Frameskip                  %s", str24);
 			break;
 		case MA_OPT_SOUND_QUALITY:
 			str = (currentConfig.PicoOpt&0x08)?"stereo":"mono";
-			gp2x_text_out8(x, y, "Sound Quality:     %5iHz %s", currentConfig.PsndRate, str);
+			text_out16(x, y, "Sound Quality:     %5iHz %s", currentConfig.PsndRate, str);
 			break;
 		case MA_OPT_REGION:
-			gp2x_text_out8(x, y, "Region:              %s", region_name(currentConfig.PicoRegion));
+			text_out16(x, y, "Region:              %s", region_name(currentConfig.PicoRegion));
 			break;
 		case MA_OPT_CONFIRM_STATES:
 			switch ((currentConfig.EmuOpt >> 9) & 5) {
@@ -1387,18 +1174,18 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
 				case 4:  str = "loads";  break;
 				case 5:  str = "both";   break;
 			}
-			gp2x_text_out8(x, y, "Confirm savestate          %s", str);
+			text_out16(x, y, "Confirm savestate          %s", str);
 			break;
 		case MA_OPT_CPU_CLOCKS:
-			gp2x_text_out8(x, y, "GP2X CPU clocks            %iMhz", currentConfig.CPUclock);
+			text_out16(x, y, "GP2X CPU clocks            %iMhz", currentConfig.CPUclock);
 			break;
 		case MA_OPT_SAVECFG:
 			str24[0] = 0;
 			if (config_slot != 0) sprintf(str24, " (profile: %i)", config_slot);
-			gp2x_text_out8(x, y, "Save cfg as default%s", str24);
+			text_out16(x, y, "Save cfg as default%s", str24);
 			break;
 		case MA_OPT_LOADCFG:
-			gp2x_text_out8(x, y, "Load cfg from profile %i", config_slot);
+			text_out16(x, y, "Load cfg from profile %i", config_slot);
 			break;
 		default:
 			printf("%s: unimplemented (%i)\n", __FUNCTION__, entry->id);
@@ -1410,16 +1197,15 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
 
 static void draw_menu_options(int menu_sel)
 {
-	int tl_x = 25, tl_y = 32;
+	int tl_x = 25, tl_y = 24;
 
 	gp2x_pd_clone_buffer2();
 
-	me_draw(opt_entries, OPT_ENTRY_COUNT, tl_x, tl_y, menu_opt_cust_draw, NULL);
+	menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 284);
 
-	// draw cursor
-	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
+	me_draw(opt_entries, OPT_ENTRY_COUNT, tl_x, tl_y, menu_opt_cust_draw, NULL);
 
-	gp2x_video_flip2();
+	menu_flip();
 }
 
 static int sndrate_prevnext(int rate, int dir)
@@ -1466,9 +1252,8 @@ static void menu_options_save(void)
 	PicoRegionOverride = currentConfig.PicoRegion;
 	if (!(PicoOpt & 0x20)) {
 		// unbind XYZ MODE, just in case
-		unbind_action(0xf00);
+		unbind_action(0xf00, -1, -1);
 	}
-	scaling_update();
 }
 
 static int menu_loop_options(void)
@@ -1603,28 +1388,28 @@ static int menu_loop_options(void)
 
 static void draw_menu_credits(void)
 {
-	int tl_x = 15, tl_y = 70, y;
-	//memset(gp2x_screen, 0, 320*240);
+	int tl_x = 15, tl_y = 64, y;
 	gp2x_pd_clone_buffer2();
 
-	gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");
+	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");
 	y = tl_y;
-	gp2x_text_out8(tl_x, y, "Credits:");
-	gp2x_text_out8(tl_x, (y+=10), "Dave: Cyclone 68000 core,");
-	gp2x_text_out8(tl_x, (y+=10), "      base code of PicoDrive");
-	gp2x_text_out8(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");
-	gp2x_text_out8(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");
-	gp2x_text_out8(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");
-	gp2x_text_out8(tl_x, (y+=10), "Stephane Dallongeville:");
-	gp2x_text_out8(tl_x, (y+=10), "      opensource Gens");
-	gp2x_text_out8(tl_x, (y+=10), "Haze: Genesis hw info");
-	gp2x_text_out8(tl_x, (y+=10), "rlyeh and others: minimal SDK");
-	gp2x_text_out8(tl_x, (y+=10), "Squidge: squidgehack");
-	gp2x_text_out8(tl_x, (y+=10), "Dzz: ARM940 sample");
-	gp2x_text_out8(tl_x, (y+=10), "GnoStiC / Puck2099: USB joystick");
-	gp2x_text_out8(tl_x, (y+=10), "craigix: GP2X hardware");
-
-	gp2x_video_flip2();
+	text_out16(tl_x, y, "Credits:");
+	text_out16(tl_x, (y+=10), "fDave: Cyclone 68000 core,");
+	text_out16(tl_x, (y+=10), "      base code of PicoDrive");
+	text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");
+	text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");
+	text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");
+	text_out16(tl_x, (y+=10), "Stephane Dallongeville:");
+	text_out16(tl_x, (y+=10), "      opensource Gens");
+	text_out16(tl_x, (y+=10), "Haze: Genesis hw info");
+	text_out16(tl_x, (y+=10), "rlyeh and others: minimal SDK");
+	text_out16(tl_x, (y+=10), "Squidge: squidgehack");
+	text_out16(tl_x, (y+=10), "Dzz: ARM940 sample");
+	text_out16(tl_x, (y+=10), "GnoStiC / Puck2099: USB joystick");
+	text_out16(tl_x, (y+=10), "craigix: GP2X hardware");
+	text_out16(tl_x, (y+=10), "ketchupgun: skin design");
+
+	menu_flip();
 }
 
 
@@ -1652,15 +1437,18 @@ static void draw_menu_root(int menu_sel)
 
 	gp2x_pd_clone_buffer2();
 
-	gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION);
+	text_out16(tl_x, 20, "PicoDrive v" VERSION);
+
+	menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 146);
 
 	me_draw(main_entries, MAIN_ENTRY_COUNT, tl_x, tl_y, NULL, NULL);
 
-	// draw cursor
-	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
 	// error
-	if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg);
-	gp2x_video_flip2();
+	if (menuErrorMsg[0]) {
+		memset((char *)gp2x_screen + 320*224*2, 0, 320*16*2);
+		text_out16(5, 226, menuErrorMsg);
+	}
+	menu_flip();
 }
 
 
@@ -1669,18 +1457,6 @@ static void menu_loop_root(void)
 	static int menu_sel = 0;
 	int ret, menu_sel_max;
 	unsigned long inp = 0;
-	char curr_path[PATH_MAX], *selfname;
-	FILE *tstf;
-
-	if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )
-	{
-		fclose(tstf);
-		strcpy(curr_path, currentConfig.lastRomFile);
-	}
-	else
-	{
-		getcwd(curr_path, PATH_MAX);
-	}
 
 	me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_RESUME_GAME, rom_data != NULL);
 	me_enable(main_entries, MAIN_ENTRY_COUNT, MA_MAIN_SAVE_STATE,  rom_data != NULL);
@@ -1743,12 +1519,24 @@ static void menu_loop_root(void)
 					}
 					break;
 				case MA_MAIN_LOAD_ROM:
+				{
+					char curr_path[PATH_MAX], *selfname;
+					FILE *tstf;
+					if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )
+					{
+						fclose(tstf);
+						strcpy(curr_path, currentConfig.lastRomFile);
+					}
+					else
+						getcwd(curr_path, PATH_MAX);
 					selfname = romsel_loop(curr_path);
 					if (selfname) {
 						printf("selected file: %s\n", selfname);
 						engineState = PGS_ReloadRom;
+						return;
 					}
-					return;
+					break;
+				}
 				case MA_MAIN_OPTIONS:
 					ret = menu_loop_options();
 					if (ret == 1) continue; // status update
@@ -1783,31 +1571,55 @@ static void menu_loop_root(void)
 	}
 }
 
-
-static void menu_prepare_bg(void)
+static void menu_darken_bg(void *dst, int pixels, int darker)
 {
-	extern int localPal[0x100];
-	int c, i;
+	unsigned int *screen = dst;
+	pixels /= 2;
+	if (darker)
+	{
+		while (pixels--)
+		{
+			unsigned int p = *screen;
+			*screen++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);
+		}
+	}
+	else
+	{
+		while (pixels--)
+		{
+			unsigned int p = *screen;
+			*screen++ = (p&0xf79ef79e)>>1;
+		}
+	}
+}
 
-	// don't clear old palette just for fun (but make it dark)
-	for (i = 0x100-1; i >= 0; i--) {
-		c = localPal[i];
-		localPal[i] = ((c >> 1) & 0x007f7f7f) - ((c >> 3) & 0x001f1f1f);
+static void menu_prepare_bg(int use_game_bg)
+{
+	if (use_game_bg)
+	{
+		// darken the active framebuffer
+		memset(gp2x_screen, 0, 320*8*2);
+		menu_darken_bg((char *)gp2x_screen + 320*8*2, 320*224, 1);
+		memset((char *)gp2x_screen + 320*232*2, 0, 320*8*2);
+	}
+	else
+	{
+		// should really only happen once, on startup..
+		readpng(gp2x_screen, "skin/background.png", READPNG_BG);
 	}
-	localPal[0xe0] = 0x00000000; // reserved pixels for OSD
-	localPal[0xf0] = 0x00ffffff;
 
-	gp2x_video_setpalette(localPal, 0x100);
+	// copy to buffer2
+	gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);
 }
 
 static void menu_gfx_prepare(void)
 {
-	menu_prepare_bg();
+	menu_prepare_bg(rom_data != NULL);
 
-	// switch to 8bpp
-	gp2x_video_changemode2(8);
+	// switch to 16bpp
+	gp2x_video_changemode2(16);
 	gp2x_video_RGB_setscaling(0, 320, 240);
-	gp2x_video_flip2();
+	menu_flip();
 }
 
 
@@ -1826,20 +1638,20 @@ void menu_loop(void)
 static void draw_menu_tray(int menu_sel)
 {
 	int tl_x = 70, tl_y = 90, y;
-	memset(gp2x_screen, 0xe0, 320*240);
+	memset(gp2x_screen, 0, 320*240*2);
 
-	gp2x_text_out8(tl_x, 20, "The unit is about to");
-	gp2x_text_out8(tl_x, 30, "close the CD tray.");
+	text_out16(tl_x, 20, "The unit is about to");
+	text_out16(tl_x, 30, "close the CD tray.");
 
 	y = tl_y;
-	gp2x_text_out8(tl_x, y,       "Load new CD image");
-	gp2x_text_out8(tl_x, (y+=10), "Insert nothing");
+	text_out16(tl_x, y,       "Load new CD image");
+	text_out16(tl_x, (y+=10), "Insert nothing");
 
 	// draw cursor
-	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
+	text_out16(tl_x - 16, tl_y + menu_sel*10, ">");
 	// error
-	if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg);
-	gp2x_video_flip2();
+	if (menuErrorMsg[0]) text_out16(5, 226, menuErrorMsg);
+	menu_flip();
 }
 
 
@@ -1850,7 +1662,7 @@ int menu_loop_tray(void)
 	char curr_path[PATH_MAX], *selfname;
 	FILE *tstf;
 
-	gp2x_memset_all_buffers(0, 0xe0, 320*240);
+	gp2x_memset_all_buffers(0, 0, 320*240*2);
 	menu_gfx_prepare();
 
 	if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )
@@ -1879,7 +1691,7 @@ int menu_loop_tray(void)
 					selfname = romsel_loop(curr_path);
 					if (selfname) {
 						int ret = -1, cd_type;
-						cd_type = emu_cd_check(NULL);
+						cd_type = emu_cdCheck(NULL);
 						if (cd_type > 0)
 							ret = Insert_CD(romFileName, cd_type == 2);
 						if (ret != 0) {