#include "emu.h"\r
#include "plat.h"\r
#include "posix.h"\r
+#include <version.h>\r
\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
state_slot_flags = 0;\r
\r
for (slot = 0; slot < 10; slot++) {\r
- if (emu_checkSaveFile(slot))\r
+ if (emu_check_save_file(slot))\r
state_slot_flags |= 1 << slot;\r
}\r
}\r
void *tmp_vram, *file;\r
char *fname;\r
\r
- fname = emu_GetSaveFName(1, 0, slot);\r
+ fname = emu_get_save_fname(1, 0, slot);\r
if (!fname) return;\r
\r
tmp_vram = malloc(sizeof(Pico.vram));\r
}\r
\r
/* do a frame and fetch menu bg */\r
- emu_forcedFrame(POPT_EN_SOFTSCALE);\r
+ pemu_forced_frame(POPT_EN_SOFTSCALE);\r
plat_video_menu_enter(1);\r
\r
memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
if (inp & PBTN_MOK) { // save/load\r
if (menu_sel < 10) {\r
state_slot = menu_sel;\r
- if (emu_SaveLoadGame(is_loading, 0)) {\r
+ if (emu_save_load_game(is_loading, 0)) {\r
me_update_msg(is_loading ? "Load failed" : "Save failed");\r
return 0;\r
}\r
// "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
me_bind_action emuctrl_actions[] =\r
{\r
- { "Load State ", 1<<28 },\r
- { "Save State ", 1<<27 },\r
- { "Prev Save Slot ", 1<<25 },\r
- { "Next Save Slot ", 1<<24 },\r
- { "Switch Renderer ", 1<<26 },\r
- { "Volume Down ", 1<<30 },\r
- { "Volume Up ", 1<<29 },\r
- { "Fast forward ", 1<<22 },\r
- { "Enter Menu ", 1<<23 },\r
- { "Pico Next page ", 1<<21 },\r
- { "Pico Prev page ", 1<<20 },\r
- { "Pico Switch input", 1<<19 },\r
- { NULL, 0 }\r
+ { "Load State ", PEV_STATE_LOAD },\r
+ { "Save State ", PEV_STATE_SAVE },\r
+ { "Prev Save Slot ", PEV_SSLOT_PREV },\r
+ { "Next Save Slot ", PEV_SSLOT_NEXT },\r
+ { "Switch Renderer ", PEV_SWITCH_RND },\r
+ { "Volume Down ", PEV_VOL_DOWN },\r
+ { "Volume Up ", PEV_VOL_UP },\r
+ { "Fast forward ", PEV_FF },\r
+ { "Enter Menu ", PEV_MENU },\r
+ { "Pico Next page ", PEV_PICO_PNEXT },\r
+ { "Pico Prev page ", PEV_PICO_PPREV },\r
+ { "Pico Switch input", PEV_PICO_SWINP },\r
+ { NULL, 0 }\r
};\r
\r
static int key_config_loop_wrap(menu_id id, int keys)\r
\r
// ------------ adv options menu ------------\r
\r
-// TODO FIXME fix if and mv\r
-static const char *mgn_aopt_sqhack(menu_id id, int *offs)\r
-{\r
- *offs = -10;\r
- sprintf(static_buff, "%s, %s", 111 ? " active" : "inactive",\r
- (currentConfig.EmuOpt & 0x10) ? "ON" : "OFF");\r
- return static_buff;\r
-}\r
-\r
static menu_entry e_menu_adv_options[] =\r
{\r
- mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_USE_SRAM),\r
+ mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_EN_SRAM),\r
mee_onoff ("Disable sprite limit", MA_OPT2_NO_SPRITE_LIM, PicoOpt, POPT_DIS_SPRITE_LIM),\r
mee_onoff ("Use second CPU for sound", MA_OPT_ARM940_SOUND, PicoOpt, POPT_EXT_FM),\r
mee_onoff ("Emulate Z80", MA_OPT2_ENABLE_Z80, PicoOpt, POPT_EN_Z80),\r
mee_onoff ("Emulate SN76496 (PSG)", MA_OPT2_ENABLE_SN76496,PicoOpt, POPT_EN_PSG),\r
mee_onoff ("gzip savestates", MA_OPT2_GZIP_STATES, currentConfig.EmuOpt, EOPT_GZIP_SAVES),\r
mee_onoff ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM, currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),\r
- mee_label ("- needs restart -"),\r
- mee_onoff ("craigix's RAM timings", MA_OPT2_RAMTIMINGS, currentConfig.EmuOpt, 0x0100),\r
- mee_onoff_cust("Squidgehack", MA_OPT2_SQUIDGEHACK, currentConfig.EmuOpt, 0x0010, mgn_aopt_sqhack),\r
+ mee_onoff ("RAM overclock", MA_OPT2_RAMTIMINGS, currentConfig.EmuOpt, EOPT_RAM_TIMINGS),\r
+ mee_onoff ("MMU hack", MA_OPT2_SQUIDGEHACK, currentConfig.EmuOpt, EOPT_MMUHACK),\r
mee_onoff ("SVP dynarec", MA_OPT2_SVP_DYNAREC, PicoOpt, POPT_EN_SVP_DRC),\r
mee_onoff ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),\r
mee_end,\r
\r
static const char *mgn_opt_scaling(menu_id id, int *offs)\r
{\r
- *offs = -12;\r
+ *offs = -13;\r
switch (currentConfig.scaling) {\r
- default: return " OFF";\r
- case 1: return "hw horizontal";\r
- case 2: return "hw horiz. + vert.";\r
- case 3: return "sw horizontal";\r
+ default: return " OFF";\r
+ case EOPT_SCALE_HW_H: return " hw horizontal";\r
+ case EOPT_SCALE_HW_HV: return "hw horiz. + vert";\r
+ case EOPT_SCALE_SW_H: return " sw horizontal";\r
}\r
}\r
\r
{\r
mee_range_cust("Scaling", MA_OPT_SCALING, currentConfig.scaling, 0, 3, mgn_opt_scaling),\r
mee_range_cust("Gamma correction", MA_OPT2_GAMMA, currentConfig.gamma, 1, 300, mgn_aopt_gamma),\r
- mee_onoff ("A_SN's gamma curve", MA_OPT2_A_SN_GAMMA, currentConfig.EmuOpt, 0x1000),\r
- mee_onoff ("Perfect vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, 0x2000),\r
+ mee_onoff ("A_SN's gamma curve", MA_OPT2_A_SN_GAMMA, currentConfig.EmuOpt, EOPT_A_SN_GAMMA),\r
+ mee_onoff ("Perfect vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, EOPT_PSYNC),\r
mee_end,\r
};\r
\r
switch (id) {\r
case MA_OPT_SAVECFG:\r
case MA_OPT_SAVECFG_GAME:\r
- if (emu_WriteConfig(id == MA_OPT_SAVECFG_GAME ? 1 : 0))\r
+ if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0))\r
me_update_msg("config saved");\r
else\r
me_update_msg("failed to write config");\r
break;\r
case MA_OPT_LOADCFG:\r
- ret = emu_ReadConfig(1, 1);\r
- if (!ret) ret = emu_ReadConfig(0, 1);\r
+ ret = emu_read_config(1, 1);\r
+ if (!ret) ret = emu_read_config(0, 1);\r
if (ret) me_update_msg("config loaded");\r
else me_update_msg("failed to load config");\r
break;\r
\r
static void mplayer_loop(void)\r
{\r
- emu_startSound();\r
+ pemu_sound_start();\r
\r
while (1)\r
{\r
PDebugZ80Frame();\r
if (in_menu_wait_any(0) & PBTN_MA3)\r
break;\r
- emu_waitSound();\r
+ pemu_sound_wait();\r
}\r
\r
- emu_endSound();\r
+ pemu_sound_stop();\r
}\r
\r
static void draw_text_debug(const char *str, int skip, int from)\r
if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);\r
\r
memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
- emu_forcedFrame(0);\r
+ pemu_forced_frame(0);\r
smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);\r
smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);\r
}\r
{\r
case 0: plat_video_menu_begin();\r
tmp = PDebugMain();\r
- emu_platformDebugCat(tmp);\r
+ plat_debug_cat(tmp);\r
draw_text_debug(tmp, 0, 0);\r
if (dumped) {\r
smalltext_out16(g_screen_width - 6 * me_sfont_h,\r
break;\r
case 1: draw_frame_debug(); break;\r
case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
- emu_forcedFrame(0);\r
+ pemu_forced_frame(0);\r
menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +\r
g_screen_width/2 - 320/2, g_screen_width); break;\r
break;\r
case MA_MAIN_RESET_GAME:\r
if (rom_loaded) {\r
- emu_ResetGame();\r
+ emu_reset_game();\r
return 1;\r
}\r
break;\r
if (ret_name == NULL)\r
return 0;\r
\r
- cd_type = emu_cdCheck(NULL, ret_name);\r
+ cd_type = emu_cd_check(NULL, ret_name);\r
if (cd_type != CIT_NOT_CD)\r
ret = Insert_CD(ret_name, cd_type);\r
if (ret != 0) {\r
\r
// ------------ util ------------\r
\r
+/* wiz for now, probably extend later */\r
+void menu_plat_setup(int is_wiz)\r
+{\r
+ int i;\r
+\r
+ if (!is_wiz)\r
+ return;\r
+\r
+ me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);\r
+ me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);\r
+ me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);\r
+\r
+ i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);\r
+ e_menu_gfx_options[i].max = 1; /* only off and sw */\r
+}\r
+\r
/* TODO: rename */\r
void menu_darken_bg(void *dst, int pixels, int darker)\r
{\r