X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=221a3b869eb2ddc6e62d72d3f1e32a5a667fe0a9;hb=ee0f881e9f135db6ed9337b99f611b3cae955f8c;hp=c2e18fa853c2d762138ed42c4e1fadda0ee0e57d;hpb=5a31ef07776f196cbf25748eee78da65b2b89928;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index c2e18fa..221a3b8 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -12,11 +12,11 @@
 #include "fonts.h"
 #include "readpng.h"
 #include "lprintf.h"
-#include "common.h"
 #include "input.h"
 #include "emu.h"
 #include "plat.h"
 #include "posix.h"
+#include <version.h>
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
@@ -33,10 +33,14 @@ static int  menu_error_time = 0;
 static unsigned char *menu_font_data = NULL;
 static int menu_text_color = 0xffff; // default to white
 static int menu_sel_color = -1; // disabled
+
+/* note: these might become non-constant in future */
 #if MENU_X2
 static const int me_mfont_w = 16, me_mfont_h = 20;
+static const int me_sfont_w = 12, me_sfont_h = 20;
 #else
 static const int me_mfont_w = 8, me_mfont_h = 10;
+static const int me_sfont_w = 6, me_sfont_h = 10;
 #endif
 
 // draws text to current bbp16 screen
@@ -113,35 +117,41 @@ void text_out16(int x, int y, const char *texto, ...)
 	text_out16_(x,y,buffer,menu_text_color);
 }
 
-
+/* draws in 6x8 font, might multiply size by integer */
 static void smalltext_out16_(int x, int y, const char *texto, int color)
 {
-	int i;
 	unsigned char  *src;
 	unsigned short *dst;
+	int multiplier = me_sfont_w / 6;
+	int i;
 
-	for (i = 0;; i++, x += 6)
+	for (i = 0;; i++, x += me_sfont_w)
 	{
 		unsigned char c = (unsigned char) texto[i];
 		int h = 8;
 
-		if (!c) break;
+		if (!c || c == '\n')
+			break;
 
 		src = fontdata6x8[c];
 		dst = (unsigned short *)g_screen_ptr + x + y * g_screen_width;
 
 		while (h--)
 		{
-			int w = 0x20;
-			while (w)
+			int m, w2, h2;
+			for (h2 = multiplier; h2 > 0; h2--)
 			{
-				if( *src & w ) *dst = color;
-				dst++;
-				w>>=1;
+				for (m = 0x20; m; m >>= 1) {
+					if (*src & m)
+						for (w2 = multiplier; w2 > 0; w2--)
+							*dst++ = color;
+					else
+						dst += multiplier;
+				}
+
+				dst += g_screen_width - me_sfont_w;
 			}
 			src++;
-
-			dst += g_screen_width - 6;
 		}
 	}
 }
@@ -585,15 +595,15 @@ static void cdload_progress_cb(int percent)
 	int ln, len = percent * g_screen_width / 100;
 	unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;
 
-	memset(dst, 0xff, g_screen_width * (10 - 2) * 2);
+	memset(dst, 0xff, g_screen_width * (me_sfont_h - 2) * 2);
 
-	smalltext_out16(1, 3 * 10, "Processing CD image / MP3s", 0xffff);
-	smalltext_out16(1, 4 * 10, rom_fname_loaded, 0xffff);
-	dst += g_screen_width * 30;
+	smalltext_out16(1, 3 * me_sfont_h, "Processing CD image / MP3s", 0xffff);
+	smalltext_out16(1, 4 * me_sfont_h, rom_fname_loaded, 0xffff);
+	dst += g_screen_width * me_sfont_h * 3;
 
 	if (len > g_screen_width)
 		len = g_screen_width;
-	for (ln = (10 - 2); ln > 0; ln--, dst += g_screen_width)
+	for (ln = (me_sfont_h - 2); ln > 0; ln--, dst += g_screen_width)
 		memset(dst, 0xff, len * 2);
 
 	plat_video_menu_end();
@@ -610,12 +620,12 @@ void menu_romload_prepare(const char *rom_name)
 	/* fill both buffers, callbacks won't update in full */
 	plat_video_menu_begin();
 	smalltext_out16(1, 1, "Loading", 0xffff);
-	smalltext_out16(1, 10, p, 0xffff);
+	smalltext_out16(1, me_sfont_h, p, 0xffff);
 	plat_video_menu_end();
 
 	plat_video_menu_begin();
 	smalltext_out16(1, 1, "Loading", 0xffff);
-	smalltext_out16(1, 10, p, 0xffff);
+	smalltext_out16(1, me_sfont_h, p, 0xffff);
 	plat_video_menu_end();
 
 	PicoCartLoadProgressCB = load_progress_cb;
@@ -626,11 +636,49 @@ void menu_romload_prepare(const char *rom_name)
 void menu_romload_end(void)
 {
 	PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;
-	smalltext_out16(1, (cdload_called ? 6 : 3) * 10,
+	smalltext_out16(1, (cdload_called ? 6 : 3) * me_sfont_h,
 		"Starting emulation...", 0xffff);
 	plat_video_menu_end();
 }
 
+// -------------- del confirm ---------------
+
+static void do_delete(const char *fpath, const char *fname)
+{
+	int len, mid, inp;
+	const char *nm;
+	char tmp[64];
+
+	plat_video_menu_begin();
+
+	if (!rom_loaded)
+		menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);
+
+	len = strlen(fname);
+	if (len > g_screen_width/6)
+		len = g_screen_width/6;
+
+	mid = g_screen_width / 2;
+	text_out16(mid - me_mfont_w * 15 / 2,  8 * me_mfont_h, "About to delete");
+	smalltext_out16(mid - len * me_sfont_w / 2, 9 * me_mfont_h + 5, fname, 0xbdff);
+	text_out16(mid - me_mfont_w * 13 / 2, 11 * me_mfont_h, "Are you sure?");
+
+	nm = in_get_key_name(-1, -PBTN_MA3);
+	snprintf(tmp, sizeof(tmp), "(%s - confirm, ", nm);
+	len = strlen(tmp);
+	nm = in_get_key_name(-1, -PBTN_MBACK);
+	snprintf(tmp + len, sizeof(tmp) - len, "%s - cancel)", nm);
+	len = strlen(tmp);
+
+	text_out16(mid - me_mfont_w * len / 2, 12 * me_mfont_h, tmp);
+	plat_video_menu_end();
+
+	while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MA2));
+	inp = in_menu_wait(PBTN_MA3|PBTN_MBACK, 100);
+	if (inp & PBTN_MA3)
+		remove(fpath);
+}
+
 // -------------- ROM selector --------------
 
 // rrrr rggg gggb bbbb
@@ -651,9 +699,9 @@ static unsigned short file2color(const char *fname)
 
 static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 {
-	int max_cnt, start, i, pos;
+	int max_cnt, start, i, x, pos;
 
-	max_cnt = g_screen_height / 10;
+	max_cnt = g_screen_height / me_sfont_h;
 	start = max_cnt / 2 - sel;
 	n--; // exclude current dir (".")
 
@@ -664,21 +712,22 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 
 	menu_darken_bg((short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10, g_screen_width * 8, 0);
 
+	x = 5 + me_mfont_w + 1;
 	if (start - 2 >= 0)
-		smalltext_out16(14, (start - 2)*10, curdir, 0xffff);
+		smalltext_out16(14, (start - 2) * me_sfont_h, curdir, 0xffff);
 	for (i = 0; i < n; i++) {
 		pos = start + i;
 		if (pos < 0)  continue;
 		if (pos >= max_cnt) break;
 		if (namelist[i+1]->d_type == DT_DIR) {
-			smalltext_out16(14,   pos*10, "/", 0xfff6);
-			smalltext_out16(14+6, pos*10, namelist[i+1]->d_name, 0xfff6);
+			smalltext_out16(x, pos * me_sfont_h, "/", 0xfff6);
+			smalltext_out16(x + me_sfont_w, pos * me_sfont_h, namelist[i+1]->d_name, 0xfff6);
 		} else {
 			unsigned short color = file2color(namelist[i+1]->d_name);
-			smalltext_out16(14,   pos*10, namelist[i+1]->d_name, color);
+			smalltext_out16(x, pos * me_sfont_h, namelist[i+1]->d_name, color);
 		}
 	}
-	smalltext_out16(5, max_cnt/2 * 10, ">", 0xffff);
+	smalltext_out16(5, max_cnt/2 * me_sfont_h, ">", 0xffff);
 	plat_video_menu_end();
 }
 
@@ -777,7 +826,7 @@ rescan:
 					ret = rom_fname_reload;
 					break;
 				}
-//				do_delete(rom_fname_reload, namelist[sel+1]->d_name); // TODO
+				do_delete(rom_fname_reload, namelist[sel+1]->d_name);
 				if (n > 0) {
 					while (n--) free(namelist[n]);
 					free(namelist);
@@ -855,14 +904,14 @@ static void draw_patchlist(int sel)
 		if (pos < 0) continue;
 		if (pos >= max_cnt) break;
 		active = PicoPatches[i].active;
-		smalltext_out16(14,     pos*10, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);
-		smalltext_out16(14+6*4, pos*10, PicoPatches[i].name,    active ? 0xfff6 : 0xffff);
+		smalltext_out16(14,     pos * me_sfont_h, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);
+		smalltext_out16(14+6*4, pos * me_sfont_h, PicoPatches[i].name,    active ? 0xfff6 : 0xffff);
 	}
 	pos = start + i;
 	if (pos < max_cnt)
-		smalltext_out16(14, pos * 10, "done", 0xffff);
+		smalltext_out16(14, pos * me_sfont_h, "done", 0xffff);
 
-	text_out16(5, max_cnt / 2 * 10, ">");
+	text_out16(5, max_cnt / 2 * me_sfont_h, ">");
 	plat_video_menu_end();
 }
 
@@ -900,7 +949,7 @@ static void state_check_slots(void)
 	state_slot_flags = 0;
 
 	for (slot = 0; slot < 10; slot++) {
-		if (emu_checkSaveFile(slot))
+		if (emu_check_save_file(slot))
 			state_slot_flags |= 1 << slot;
 	}
 }
@@ -913,7 +962,7 @@ static void draw_savestate_bg(int slot)
 	void *tmp_vram, *file;
 	char *fname;
 
-	fname = emu_GetSaveFName(1, 0, slot);
+	fname = emu_get_save_fname(1, 0, slot);
 	if (!fname) return;
 
 	tmp_vram = malloc(sizeof(Pico.vram));
@@ -948,7 +997,7 @@ static void draw_savestate_bg(int slot)
 	}
 
 	/* do a frame and fetch menu bg */
-	emu_forcedFrame(POPT_EN_SOFTSCALE);
+	pemu_forced_frame(POPT_EN_SOFTSCALE);
 	plat_video_menu_enter(1);
 
 	memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
@@ -965,7 +1014,7 @@ static void draw_savestate_menu(int menu_sel, int is_loading)
 	if (state_slot_flags & (1 << menu_sel))
 		draw_savestate_bg(menu_sel);
 
-	w = 13 * me_mfont_w + me_mfont_w * 2;
+	w = (13 + 2) * me_mfont_w;
 	h = (1+2+10+1) * me_mfont_h;
 	x = g_screen_width / 2 - w / 2;
 	if (x < 0) x = 0;
@@ -1018,7 +1067,7 @@ static int menu_loop_savestate(int is_loading)
 		if (inp & PBTN_MOK) { // save/load
 			if (menu_sel < 10) {
 				state_slot = menu_sel;
-				if (emu_SaveLoadGame(is_loading, 0)) {
+				if (emu_save_load_game(is_loading, 0)) {
 					me_update_msg(is_loading ? "Load failed" : "Save failed");
 					return 0;
 				}
@@ -1044,10 +1093,11 @@ static char *action_binds(int player_idx, int action_mask, int dev_id)
 	if (binds == NULL)
 		return static_buff;
 
-	count = in_get_dev_bind_count(dev_id);
+	count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
 	for (k = 0; k < count; k++)
 	{
 		const char *xname;
+		int len;
 		if (!(binds[k] & action_mask))
 			continue;
 
@@ -1055,9 +1105,12 @@ static char *action_binds(int player_idx, int action_mask, int dev_id)
 			continue;
 
 		xname = in_get_key_name(dev_id, k);
-		if (static_buff[0])
-			strncat(static_buff, " + ", sizeof(static_buff));
-		strncat(static_buff, xname, sizeof(static_buff));
+		len = strlen(static_buff);
+		if (len) {
+			strncat(static_buff, " + ", sizeof(static_buff) - len - 1);
+			len += 3;
+		}
+		strncat(static_buff, xname, sizeof(static_buff) - len - 1);
 	}
 
 	return static_buff;
@@ -1073,7 +1126,7 @@ static int count_bound_keys(int dev_id, int action_mask, int player_idx)
 	if (binds == NULL)
 		return 0;
 
-	count = in_get_dev_bind_count(dev_id);
+	count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
 	for (k = 0; k < count; k++)
 	{
 		if (!(binds[k] & action_mask))
@@ -1191,7 +1244,12 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 		for (is_down = 1; is_down; )
 			kc = in_update_keycode(&dev_id, &is_down, -1);
 
-		unbind = count_bound_keys(dev_id, opts[sel].mask, player_idx) >= 2;
+		i = count_bound_keys(dev_id, opts[sel].mask, player_idx);
+		unbind = (i > 0);
+
+		/* allow combos if device supports them */
+		if (i == 1 && in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))
+			unbind = 0;
 
 		in_bind_key(dev_id, kc, opts[sel].mask, unbind);
 		if (player_idx >= 0) {
@@ -1228,19 +1286,19 @@ me_bind_action me_ctrl_actions[15] =
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"
 me_bind_action emuctrl_actions[] =
 {
-	{ "Load State       ", 1<<28 },
-	{ "Save State       ", 1<<27 },
-	{ "Prev Save Slot   ", 1<<25 },
-	{ "Next Save Slot   ", 1<<24 },
-	{ "Switch Renderer  ", 1<<26 },
-	{ "Volume Down      ", 1<<30 },
-	{ "Volume Up        ", 1<<29 },
-	{ "Fast forward     ", 1<<22 },
-	{ "Enter Menu       ", 1<<23 },
-	{ "Pico Next page   ", 1<<21 },
-	{ "Pico Prev page   ", 1<<20 },
-	{ "Pico Switch input", 1<<19 },
-	{ NULL,                0     }
+	{ "Load State       ", PEV_STATE_LOAD },
+	{ "Save State       ", PEV_STATE_SAVE },
+	{ "Prev Save Slot   ", PEV_SSLOT_PREV },
+	{ "Next Save Slot   ", PEV_SSLOT_NEXT },
+	{ "Switch Renderer  ", PEV_SWITCH_RND },
+	{ "Volume Down      ", PEV_VOL_DOWN },
+	{ "Volume Up        ", PEV_VOL_UP },
+	{ "Fast forward     ", PEV_FF },
+	{ "Enter Menu       ", PEV_MENU },
+	{ "Pico Next page   ", PEV_PICO_PNEXT },
+	{ "Pico Prev page   ", PEV_PICO_PPREV },
+	{ "Pico Switch input", PEV_PICO_SWINP },
+	{ NULL,                0 }
 };
 
 static int key_config_loop_wrap(menu_id id, int keys)
@@ -1358,18 +1416,9 @@ static int menu_loop_cd_options(menu_id id, int keys)
 
 // ------------ adv options menu ------------
 
-// TODO FIXME fix if and mv
-static const char *mgn_aopt_sqhack(menu_id id, int *offs)
-{
-	*offs = -10;
-	sprintf(static_buff, "%s, %s", 111 ? "  active" : "inactive",
-		(currentConfig.EmuOpt & 0x10) ? "ON" : "OFF");
-	return static_buff;
-}
-
 static menu_entry e_menu_adv_options[] =
 {
-	mee_onoff     ("SRAM/BRAM saves",          MA_OPT_SRAM_STATES,    currentConfig.EmuOpt, EOPT_USE_SRAM),
+	mee_onoff     ("SRAM/BRAM saves",          MA_OPT_SRAM_STATES,    currentConfig.EmuOpt, EOPT_EN_SRAM),
 	mee_onoff     ("Disable sprite limit",     MA_OPT2_NO_SPRITE_LIM, PicoOpt, POPT_DIS_SPRITE_LIM),
 	mee_onoff     ("Use second CPU for sound", MA_OPT_ARM940_SOUND,   PicoOpt, POPT_EXT_FM),
 	mee_onoff     ("Emulate Z80",              MA_OPT2_ENABLE_Z80,    PicoOpt, POPT_EN_Z80),
@@ -1377,9 +1426,8 @@ static menu_entry e_menu_adv_options[] =
 	mee_onoff     ("Emulate SN76496 (PSG)",    MA_OPT2_ENABLE_SN76496,PicoOpt, POPT_EN_PSG),
 	mee_onoff     ("gzip savestates",          MA_OPT2_GZIP_STATES,   currentConfig.EmuOpt, EOPT_GZIP_SAVES),
 	mee_onoff     ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM,   currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),
-	mee_label     ("- needs restart -"),
-	mee_onoff     ("craigix's RAM timings",    MA_OPT2_RAMTIMINGS,    currentConfig.EmuOpt, 0x0100),
-	mee_onoff_cust("Squidgehack",              MA_OPT2_SQUIDGEHACK,   currentConfig.EmuOpt, 0x0010, mgn_aopt_sqhack),
+	mee_onoff     ("RAM overclock",            MA_OPT2_RAMTIMINGS,    currentConfig.EmuOpt, EOPT_RAM_TIMINGS),
+	mee_onoff     ("MMU hack",                 MA_OPT2_SQUIDGEHACK,   currentConfig.EmuOpt, EOPT_MMUHACK),
 	mee_onoff     ("SVP dynarec",              MA_OPT2_SVP_DYNAREC,   PicoOpt, POPT_EN_SVP_DRC),
 	mee_onoff     ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),
 	mee_end,
@@ -1396,12 +1444,12 @@ static int menu_loop_adv_options(menu_id id, int keys)
 
 static const char *mgn_opt_scaling(menu_id id, int *offs)
 {
-	*offs = -12;
+	*offs = -13;
 	switch (currentConfig.scaling) {
-		default: return "            OFF";
-		case 1:  return "hw horizontal";
-		case 2:  return "hw horiz. + vert.";
-		case 3:  return "sw horizontal";
+		default:               return "             OFF";
+		case EOPT_SCALE_HW_H:  return "   hw horizontal";
+		case EOPT_SCALE_HW_HV: return "hw horiz. + vert";
+		case EOPT_SCALE_SW_H:  return "   sw horizontal";
 	}
 }
 
@@ -1415,8 +1463,8 @@ static menu_entry e_menu_gfx_options[] =
 {
 	mee_range_cust("Scaling",                  MA_OPT_SCALING,        currentConfig.scaling, 0, 3, mgn_opt_scaling),
 	mee_range_cust("Gamma correction",         MA_OPT2_GAMMA,         currentConfig.gamma, 1, 300, mgn_aopt_gamma),
-	mee_onoff     ("A_SN's gamma curve",       MA_OPT2_A_SN_GAMMA,    currentConfig.EmuOpt, 0x1000),
-	mee_onoff     ("Perfect vsync",            MA_OPT2_VSYNC,         currentConfig.EmuOpt, 0x2000),
+	mee_onoff     ("A_SN's gamma curve",       MA_OPT2_A_SN_GAMMA,    currentConfig.EmuOpt, EOPT_A_SN_GAMMA),
+	mee_onoff     ("Perfect vsync",            MA_OPT2_VSYNC,         currentConfig.EmuOpt, EOPT_PSYNC),
 	mee_end,
 };
 
@@ -1539,14 +1587,14 @@ static int mh_saveloadcfg(menu_id id, int keys)
 	switch (id) {
 	case MA_OPT_SAVECFG:
 	case MA_OPT_SAVECFG_GAME:
-		if (emu_WriteConfig(id == MA_OPT_SAVECFG_GAME ? 1 : 0))
+		if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0))
 			me_update_msg("config saved");
 		else
 			me_update_msg("failed to write config");
 		break;
 	case MA_OPT_LOADCFG:
-		ret = emu_ReadConfig(1, 1);
-		if (!ret) ret = emu_ReadConfig(0, 1);
+		ret = emu_read_config(1, 1);
+		if (!ret) ret = emu_read_config(0, 1);
 		if (ret)  me_update_msg("config loaded");
 		else      me_update_msg("failed to load config");
 		break;
@@ -1645,11 +1693,7 @@ static menu_entry e_menu_options[] =
 	mee_onoff     ("Enable sound",             MA_OPT_ENABLE_SOUND,  currentConfig.EmuOpt, 0x004),
 	mee_cust      ("Sound Quality",            MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),
 	mee_cust      ("Confirm savestate",        MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),
-#if   defined(__GP2X__)
-	mee_range     ("GP2X CPU clocks",          MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 400),
-#elif defined(PSP)
-	mee_range     ("PSP CPU clock",            MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, )
-#endif
+	mee_range     (cpu_clk_name,               MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),
 	mee_handler   ("[Display options]",        menu_loop_gfx_options),
 	mee_handler   ("[Advanced options]",       menu_loop_adv_options),
 	mee_handler   ("[Sega/Mega CD options]",   menu_loop_cd_options),
@@ -1677,26 +1721,23 @@ static int menu_loop_options(menu_id id, int keys)
 
 // ------------ debug menu ------------
 
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <pico/debug.h>
 
 extern void SekStepM68k(void);
 
 static void mplayer_loop(void)
 {
-	emu_startSound();
+	pemu_sound_start();
 
 	while (1)
 	{
 		PDebugZ80Frame();
 		if (in_menu_wait_any(0) & PBTN_MA3)
 			break;
-		emu_waitSound();
+		pemu_sound_wait();
 	}
 
-	emu_endSound();
+	pemu_sound_stop();
 }
 
 static void draw_text_debug(const char *str, int skip, int from)
@@ -1707,17 +1748,21 @@ static void draw_text_debug(const char *str, int skip, int from)
 	p = str;
 	while (skip-- > 0)
 	{
-		while (*p && *p != '\n') p++;
-		if (*p == 0 || p[1] == 0) return;
+		while (*p && *p != '\n')
+			p++;
+		if (*p == 0 || p[1] == 0)
+			return;
 		p++;
 	}
 
 	str = p;
-	for (line = from; line < g_screen_height / 10; line++)
+	for (line = from; line < g_screen_height / me_sfont_h; line++)
 	{
-		while (*p && *p != '\n') p++;
-		smalltext_out16(1, line*10, str, 0xffff);
-		if (*p == 0) break;
+		smalltext_out16(1, line * me_sfont_h, str, 0xffff);
+		while (*p && *p != '\n')
+			p++;
+		if (*p == 0)
+			break;
 		p++; str = p;
 	}
 }
@@ -1731,8 +1776,9 @@ static void draw_frame_debug(void)
 	if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);
 
 	memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
-	emu_forcedFrame(0);
-	smalltext_out16(4, g_screen_height - 8, layer_str, 0xffff);
+	pemu_forced_frame(0);
+	smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);
+	smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);
 }
 
 static void debug_menu_loop(void)
@@ -1747,17 +1793,17 @@ static void debug_menu_loop(void)
 		{
 			case 0: plat_video_menu_begin();
 				tmp = PDebugMain();
-				emu_platformDebugCat(tmp);
+				plat_debug_cat(tmp);
 				draw_text_debug(tmp, 0, 0);
 				if (dumped) {
-					smalltext_out16(g_screen_width - 6 * me_mfont_h,
+					smalltext_out16(g_screen_width - 6 * me_sfont_h,
 						g_screen_height - me_mfont_h, "dumped", 0xffff);
 					dumped = 0;
 				}
 				break;
 			case 1: draw_frame_debug(); break;
 			case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
-				emu_forcedFrame(0);
+				pemu_forced_frame(0);
 				menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);
 				PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +
 					g_screen_width/2 - 320/2, g_screen_width); break;
@@ -1850,7 +1896,7 @@ static int main_menu_handler(menu_id id, int keys)
 		break;
 	case MA_MAIN_RESET_GAME:
 		if (rom_loaded) {
-			emu_ResetGame();
+			emu_reset_game();
 			return 1;
 		}
 		break;
@@ -1939,7 +1985,7 @@ static int mh_tray_load_cd(menu_id id, int keys)
 	if (ret_name == NULL)
 		return 0;
 
-	cd_type = emu_cdCheck(NULL, ret_name);
+	cd_type = emu_cd_check(NULL, ret_name);
 	if (cd_type != CIT_NOT_CD)
 		ret = Insert_CD(ret_name, cd_type);
 	if (ret != 0) {
@@ -1999,6 +2045,22 @@ void me_update_msg(const char *msg)
 
 // ------------ util ------------
 
+/* wiz for now, probably extend later */
+void menu_plat_setup(int is_wiz)
+{
+	int i;
+
+	if (!is_wiz)
+		return;
+
+	me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);
+	me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);
+	me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);
+
+	i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);
+	e_menu_gfx_options[i].max = 1;	/* only off and sw */
+}
+
 /* TODO: rename */
 void menu_darken_bg(void *dst, int pixels, int darker)
 {