#include <pico/patch.h>\r
\r
static char static_buff[64];\r
-static char menu_error_msg[64] = { 0, };\r
+char menu_error_msg[64] = { 0, };\r
static int menu_error_time = 0;\r
\r
#ifndef UIQ3\r
}\r
}\r
\r
+ /* make sure action buttons are not pressed on entering menu */\r
+ draw_dirlist(curr_path, namelist, n, sel);\r
+ while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU))\r
+ ;\r
+\r
for (;;)\r
{\r
draw_dirlist(curr_path, namelist, n, sel);\r
return 0;\r
}\r
\r
+// ------------ 32X options menu ------------\r
+\r
+static menu_entry e_menu_32x_options[] =\r
+{\r
+ mee_onoff("32X enabled", MA_32XOPT_ENABLE_32X, PicoOpt, POPT_EN_32X),\r
+ mee_onoff("PWM sound", MA_32XOPT_PWM, PicoOpt, POPT_EN_PWM),\r
+};\r
+\r
+static int menu_loop_32x_options(menu_id id, int keys)\r
+{\r
+ static int sel = 0;\r
+ me_loop(e_menu_32x_options, &sel, NULL);\r
+ return 0;\r
+}\r
+\r
// ------------ adv options menu ------------\r
\r
static menu_entry e_menu_adv_options[] =\r
\r
static int mh_opt_render(menu_id id, int keys)\r
{\r
- plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 1);\r
+ plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 0, 1);\r
return 0;\r
}\r
\r
mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
mee_handler ("[Display options]", menu_loop_gfx_options),\r
mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options),\r
+ mee_handler ("[32X options]", menu_loop_32x_options),\r
mee_handler ("[Advanced options]", menu_loop_adv_options),\r
mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),\r
mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),\r
\r
me_loop(e_menu_options, &sel, NULL);\r
\r
- if (PicoRegionOverride)\r
- // force setting possibly changed..\r
- Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
-\r
return 0;\r
}\r
\r
\r
static void draw_frame_debug(void)\r
{\r
- char layer_str[48] = "layers: ";\r
+ char layer_str[48] = "layers: ";\r
if (PicoDrawMask & PDRAW_LAYERB_ON) memcpy(layer_str + 8, "B", 1);\r
if (PicoDrawMask & PDRAW_LAYERA_ON) memcpy(layer_str + 10, "A", 1);\r
if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);\r
if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);\r
+ if (PicoDrawMask & PDRAW_32X_ON) memcpy(layer_str + 26, "32x", 4);\r
\r
memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
pemu_forced_frame(0);\r
g_screen_width, spr_offs);\r
draw_text_debug(PDebugSpriteList(), spr_offs, 6);\r
break;\r
+ case 4: plat_video_menu_begin();\r
+ tmp = PDebug32x();\r
+ draw_text_debug(tmp, 0, 0);\r
+ break;\r
}\r
plat_video_menu_end();\r
\r
inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R |\r
PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, 70);\r
if (inp & PBTN_MBACK) return;\r
- if (inp & PBTN_L) { mode--; if (mode < 0) mode = 3; }\r
- if (inp & PBTN_R) { mode++; if (mode > 3) mode = 0; }\r
+ if (inp & PBTN_L) { mode--; if (mode < 0) mode = 4; }\r
+ if (inp & PBTN_R) { mode++; if (mode > 4) mode = 0; }\r
switch (mode)\r
{\r
case 0:\r
if (inp & PBTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;\r
if (inp & PBTN_DOWN) PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;\r
if (inp & PBTN_UP) PicoDrawMask ^= PDRAW_SPRITES_HI_ON;\r
+ if (inp & PBTN_MA2) PicoDrawMask ^= PDRAW_32X_ON;\r
if (inp & PBTN_MOK) {\r
PsndOut = NULL; // just in case\r
PicoSkipFrame = 1;\r
if (engineState == PGS_Menu)\r
engineState = PGS_Running;\r
/* wait until menu, ok, back is released */\r
- while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));\r
+ while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))\r
+ ;\r
}\r
\r
in_set_blocking(0);\r
e_menu_gfx_options,\r
e_menu_adv_options,\r
e_menu_cd_options,\r
+ e_menu_32x_options,\r
e_menu_keyconfig,\r
e_menu_hidden,\r
};\r