#include "usbjoy.h"\r
#include "version.h"\r
\r
-#include "Pico/PicoInt.h"\r
+#include <Pico/PicoInt.h>\r
+#include <Pico/Patch.h>\r
+#include <zlib/zlib.h>\r
\r
#ifndef _DIRENT_HAVE_D_TYPE\r
#error "need d_type for file browser\r
return alphasort(d1, d2);\r
}\r
\r
+static char *filter_exts[] = {\r
+ ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
+ ".jpg", ".gpe", ".cue"\r
+};\r
+\r
+static int scandir_filter(const struct dirent *ent)\r
+{\r
+ const char *p;\r
+ int i;\r
+\r
+ if (ent == NULL || ent->d_name == NULL) return 0;\r
+ if (strlen(ent->d_name) < 5) return 1;\r
+\r
+ p = ent->d_name + strlen(ent->d_name) - 4;\r
+\r
+ for (i = 0; i < sizeof(filter_exts)/sizeof(filter_exts[0]); i++)\r
+ {\r
+ if (strcmp(p, filter_exts[i]) == 0) return 0;\r
+ }\r
+\r
+ return 1;\r
+}\r
\r
static char *romsel_loop(char *curr_path)\r
{\r
fname = p+1;\r
}\r
\r
- n = scandir(curr_path, &namelist, 0, scandir_cmp);\r
+ n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);\r
if (n < 0) {\r
// try root\r
- n = scandir(curr_path, &namelist, 0, scandir_cmp);\r
+ n = scandir("/", &namelist, scandir_filter, scandir_cmp);\r
if (n < 0) {\r
// oops, we failed\r
printf("dir: "); printf(curr_path); printf("\n");\r
return ret;\r
}\r
\r
+// ------------ patch/gg menu ------------\r
+\r
+static void draw_patchlist(int sel)\r
+{\r
+ int start, i, pos;\r
+\r
+ start = 12 - sel;\r
+\r
+ gp2x_pd_clone_buffer2();\r
+\r
+ for (i = 0; i < PicoPatchCount; i++) {\r
+ pos = start + i;\r
+ if (pos < 0) continue;\r
+ if (pos > 23) break;\r
+ gp2x_smalltext8_lim(14, pos*10, PicoPatches[i].active ? "ON " : "OFF", 3);\r
+ gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-6);\r
+ }\r
+ pos = start + i;\r
+ if (pos < 24) gp2x_smalltext8_lim(14, pos*10, "done", 4);\r
+\r
+ gp2x_text_out8(5, 120, ">");\r
+ gp2x_video_flip2();\r
+}\r
+\r
+\r
+void patches_menu_loop(void)\r
+{\r
+ int menu_sel = 0;\r
+ unsigned long inp = 0;\r
+\r
+ for(;;)\r
+ {\r
+ draw_patchlist(menu_sel);\r
+ inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);\r
+ if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }\r
+ if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }\r
+ if(inp &(GP2X_LEFT|GP2X_L)) { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }\r
+ if(inp &(GP2X_RIGHT|GP2X_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }\r
+ if(inp & GP2X_B) { // action\r
+ if (menu_sel < PicoPatchCount)\r
+ PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;\r
+ else return;\r
+ }\r
+ if(inp & GP2X_X) return;\r
+ }\r
+\r
+}\r
+\r
+// ------------ savestate loader ------------\r
+\r
+static void menu_prepare_bg(void);\r
+\r
+static int state_slot_flags = 0;\r
+\r
+static void state_check_slots(void)\r
+{\r
+ int slot;\r
+\r
+ state_slot_flags = 0;\r
+\r
+ for (slot = 0; slot < 10; slot++)\r
+ {\r
+ if (emu_check_save_file(slot))\r
+ {\r
+ state_slot_flags |= 1 << slot;\r
+ }\r
+ }\r
+}\r
+\r
+static void draw_savestate_bg(int slot)\r
+{\r
+ struct PicoVideo tmp_pv;\r
+ unsigned short tmp_cram[0x40];\r
+ unsigned short tmp_vsram[0x40];\r
+ void *tmp_vram, *file;\r
+ char *fname;\r
+\r
+ fname = emu_GetSaveFName(1, 0, slot);\r
+ if (!fname) return;\r
+\r
+ tmp_vram = malloc(sizeof(Pico.vram));\r
+ if (tmp_vram == NULL) return;\r
+\r
+ memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram));\r
+ memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram));\r
+ memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));\r
+ memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));\r
+\r
+ if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {\r
+ file = gzopen(fname, "rb");\r
+ emu_set_save_cbs(1);\r
+ } else {\r
+ file = fopen(fname, "rb");\r
+ emu_set_save_cbs(0);\r
+ }\r
+\r
+ if (file) {\r
+ if (PicoMCD & 1) {\r
+ PicoCdLoadStateGfx(file);\r
+ } else {\r
+ areaSeek(file, 0x10020, SEEK_SET); // skip header and RAM in state file\r
+ areaRead(Pico.vram, 1, sizeof(Pico.vram), file);\r
+ areaSeek(file, 0x2000, SEEK_CUR);\r
+ areaRead(Pico.cram, 1, sizeof(Pico.cram), file);\r
+ areaRead(Pico.vsram, 1, sizeof(Pico.vsram), file);\r
+ areaSeek(file, 0x221a0, SEEK_SET);\r
+ areaRead(&Pico.video, 1, sizeof(Pico.video), file);\r
+ }\r
+ areaClose(file);\r
+ }\r
+\r
+ emu_forced_frame();\r
+ gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);\r
+ menu_prepare_bg();\r
+\r
+ memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
+ memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));\r
+ memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram));\r
+ memcpy(&Pico.video, &tmp_pv, sizeof(Pico.video));\r
+ free(tmp_vram);\r
+}\r
+\r
+static void draw_savestate_menu(int menu_sel, int is_loading)\r
+{\r
+ int tl_x = 25, tl_y = 60, y, i;\r
+\r
+ if (state_slot_flags & (1 << menu_sel))\r
+ draw_savestate_bg(menu_sel);\r
+ gp2x_pd_clone_buffer2();\r
+\r
+ gp2x_text_out8(tl_x, 30, is_loading ? "Load state" : "Save state");\r
+\r
+ /* draw all 10 slots */\r
+ y = tl_y;\r
+ for (i = 0; i < 10; i++, y+=10)\r
+ {\r
+ gp2x_text_out8(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");\r
+ }\r
+ gp2x_text_out8(tl_x, y, "back");\r
+\r
+ // draw cursor\r
+ gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
+\r
+ gp2x_video_flip2();\r
+}\r
+\r
+static int savestate_menu_loop(int is_loading)\r
+{\r
+ int menu_sel = 10, menu_sel_max = 10;\r
+ unsigned long inp = 0;\r
+\r
+ state_check_slots();\r
+\r
+ for(;;)\r
+ {\r
+ draw_savestate_menu(menu_sel, is_loading);\r
+ inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X);\r
+ if(inp & GP2X_UP ) {\r
+ do {\r
+ menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max;\r
+ } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
+ }\r
+ if(inp & GP2X_DOWN) {\r
+ do {\r
+ menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0;\r
+ } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
+ }\r
+ if(inp & GP2X_B) { // save/load\r
+ if (menu_sel < 10) {\r
+ state_slot = menu_sel;\r
+ if (emu_SaveLoadGame(is_loading, 0)) {\r
+ strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed");\r
+ return 1;\r
+ }\r
+ return 0;\r
+ } else return 1;\r
+ }\r
+ if(inp & GP2X_X) return 1;\r
+ }\r
+}\r
+\r
// -------------- key config --------------\r
\r
static char *usb_joy_key_name(int joy, int num)\r
static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_jp)\r
{\r
int tl_x = 25, tl_y = 60, y;\r
+ char ra_buff[16];\r
+\r
+ if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2);\r
+ else strcpy(ra_buff, " OFF");\r
\r
y = tl_y;\r
//memset(gp2x_screen, 0, 320*240);\r
gp2x_text_out8(tl_x, y, "USA BIOS: %s", b_us); // 0\r
gp2x_text_out8(tl_x, (y+=10), "EUR BIOS: %s", b_eu); // 1\r
gp2x_text_out8(tl_x, (y+=10), "JAP BIOS: %s", b_jp); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "CD LEDs %s", (currentConfig.EmuOpt &0x400)?"ON":"OFF"); // 3\r
- gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s) %s", (currentConfig.PicoOpt&0x800)?"ON":"OFF"); // 4\r
- gp2x_text_out8(tl_x, (y+=10), "PCM audio %s", (currentConfig.PicoOpt&0x400)?"ON":"OFF"); // 5\r
+ gp2x_text_out8(tl_x, (y+=10), "CD LEDs %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3\r
+ gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s) %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4\r
+ gp2x_text_out8(tl_x, (y+=10), "PCM audio %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5\r
+ gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer %s", ra_buff); // 6\r
+ gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow) %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 7\r
+ gp2x_text_out8(tl_x, (y+=10), "Better sync (slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 8\r
gp2x_text_out8(tl_x, (y+=10), "Done");\r
\r
// draw cursor\r
\r
static void cd_menu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 6;\r
+ int menu_sel = 0, menu_sel_max = 9;\r
unsigned long inp = 0;\r
char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;\r
\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
switch (menu_sel) {\r
- case 3: currentConfig.EmuOpt ^=0x400; break;\r
- case 4: currentConfig.PicoOpt^=0x800; break;\r
- case 5: currentConfig.PicoOpt^=0x400; break;\r
- case 6: return;\r
+ case 3: currentConfig.EmuOpt ^=0x0400; break;\r
+ case 4: currentConfig.PicoOpt^=0x0800; break;\r
+ case 5: currentConfig.PicoOpt^=0x0400; break;\r
+ case 6:\r
+ if (inp & GP2X_LEFT) {\r
+ PicoCDBuffers >>= 1;\r
+ if (PicoCDBuffers < 64) PicoCDBuffers = 0;\r
+ } else {\r
+ if (PicoCDBuffers < 64) PicoCDBuffers = 64;\r
+ else PicoCDBuffers <<= 1;\r
+ if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M\r
+ }\r
+ break;\r
+ case 7: currentConfig.PicoOpt^=0x1000; break;\r
+ case 8: currentConfig.PicoOpt^=0x2000; break;\r
+ case 9: return;\r
}\r
}\r
if(inp & (GP2X_X|GP2X_A)) return;\r
//memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
\r
- gp2x_text_out8(tl_x, y, "Scale 32 column mode %s", (currentConfig.PicoOpt&0x100)?"ON":"OFF"); // 0\r
- gp2x_text_out8(tl_x, (y+=10), "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 1\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 3\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 4\r
- gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 5\r
- gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 6\r
+ gp2x_text_out8(tl_x, y, "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 0\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 1\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3\r
+ gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4\r
+ gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\r
gp2x_text_out8(tl_x, (y+=10), "needs restart:");\r
- gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 8\r
- gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 9\r
+ gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 7\r
+ gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8\r
gp2x_text_out8(tl_x, (y+=10), "Done");\r
\r
// draw cursor\r
\r
static void amenu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 10;\r
+ int menu_sel = 0, menu_sel_max = 9;\r
unsigned long inp = 0;\r
\r
for(;;)\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
switch (menu_sel) {\r
- case 0: currentConfig.PicoOpt^=0x100; break;\r
- case 2: currentConfig.PicoOpt^=0x004; break;\r
- case 3: currentConfig.PicoOpt^=0x001; break;\r
- case 4: currentConfig.PicoOpt^=0x002; break;\r
- case 5: currentConfig.EmuOpt ^=0x008; break;\r
- case 6: currentConfig.EmuOpt ^=0x020; break;\r
- case 8: currentConfig.EmuOpt ^=0x100; break;\r
- case 9: currentConfig.EmuOpt ^=0x010; break;\r
- case 10: return;\r
+ case 1: currentConfig.PicoOpt^=0x004; break;\r
+ case 2: currentConfig.PicoOpt^=0x001; break;\r
+ case 3: currentConfig.PicoOpt^=0x002; break;\r
+ case 4: currentConfig.EmuOpt ^=0x008; break;\r
+ case 5: currentConfig.EmuOpt ^=0x020; break;\r
+ case 7: currentConfig.EmuOpt ^=0x100; break;\r
+ case 8: currentConfig.EmuOpt ^=0x010; break;\r
+ case 9: return;\r
}\r
}\r
if(inp & (GP2X_X|GP2X_A)) return;\r
if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
switch (menu_sel) {\r
- case 1:\r
+ case 0:\r
while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1;\r
if (currentConfig.gamma < 1) currentConfig.gamma = 1;\r
\r
static void draw_menu_options(int menu_sel)\r
{\r
- int tl_x = 25, tl_y = 40, y;\r
- char monostereo[8], strframeskip[8], *strrend;\r
+ int tl_x = 25, tl_y = 32, y;\r
+ char monostereo[8], strframeskip[8], *strrend, *strscaling;\r
\r
strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");\r
if (currentConfig.Frameskip < 0)\r
} else {\r
strrend = " 8bit accurate";\r
}\r
+ switch (currentConfig.scaling) {\r
+ default: strscaling = " OFF"; break;\r
+ case 1: strscaling = "hw horizontal"; break;\r
+ case 2: strscaling = "hw horiz. + vert."; break;\r
+ case 3: strscaling = "sw horizontal"; break;\r
+ }\r
\r
y = tl_y;\r
//memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
\r
gp2x_text_out8(tl_x, y, "Renderer: %s", strrend); // 0\r
- gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 1\r
- gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 3\r
+ gp2x_text_out8(tl_x, (y+=10), "Scaling: %s", strscaling); // 1\r
+ gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 2\r
+ gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 3\r
+ gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 4\r
gp2x_text_out8(tl_x, (y+=10), "Frameskip %s", strframeskip);\r
- gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 5\r
+ gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 6\r
gp2x_text_out8(tl_x, (y+=10), "Sound Quality: %5iHz %s", currentConfig.PsndRate, monostereo);\r
- gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 7\r
- gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 8\r
+ gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 8\r
+ gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9\r
gp2x_text_out8(tl_x, (y+=10), "Genesis Region: %s", region_name(currentConfig.PicoRegion));\r
- gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 10\r
- gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 11\r
- gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 12\r
+ gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11\r
+ gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 12\r
+ gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 13\r
gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks %iMhz", currentConfig.CPUclock);\r
gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");\r
- gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 15\r
+ gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 16\r
gp2x_text_out8(tl_x, (y+=10), "Save cfg as default");\r
if (rom_data)\r
gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only");\r
} else {\r
actionNames[8] = actionNames[9] = actionNames[10] = actionNames[11] = 0;\r
}\r
+ scaling_update();\r
}\r
\r
static int menu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 16;\r
+ int menu_sel = 0, menu_sel_max = 17;\r
unsigned long inp = 0;\r
\r
if (rom_data) menu_sel_max++;\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
switch (menu_sel) {\r
- case 1: currentConfig.PicoOpt^=0x040; break;\r
- case 2: currentConfig.PicoOpt^=0x080; break;\r
- case 3: currentConfig.EmuOpt ^=0x002; break;\r
- case 5: currentConfig.EmuOpt ^=0x004; break;\r
- case 7: currentConfig.PicoOpt^=0x200; break;\r
- case 8: currentConfig.PicoOpt^=0x020; break;\r
- case 10: currentConfig.EmuOpt ^=0x001; break;\r
- case 11: currentConfig.EmuOpt ^=0x200; break;\r
- case 14: cd_menu_loop_options();\r
+ case 2: currentConfig.PicoOpt^=0x040; break;\r
+ case 3: currentConfig.PicoOpt^=0x080; break;\r
+ case 4: currentConfig.EmuOpt ^=0x002; break;\r
+ case 6: currentConfig.EmuOpt ^=0x004; break;\r
+ case 8: currentConfig.PicoOpt^=0x200; break;\r
+ case 9: currentConfig.PicoOpt^=0x020; break;\r
+ case 11: currentConfig.EmuOpt ^=0x001; break;\r
+ case 12: currentConfig.EmuOpt ^=0x200; break;\r
+ case 15: cd_menu_loop_options();\r
if (engineState == PGS_ReloadRom)\r
return 0; // test BIOS\r
break;\r
- case 15: amenu_loop_options(); break;\r
- case 16: // done (update and write)\r
+ case 16: amenu_loop_options(); break;\r
+ case 17: // done (update and write)\r
menu_options_save();\r
if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");\r
else strcpy(menuErrorMsg, "failed to write config");\r
return 1;\r
- case 17: // done (update and write for current game)\r
+ case 18: // done (update and write for current game)\r
menu_options_save();\r
if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");\r
else strcpy(menuErrorMsg, "failed to write config");\r
else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
}\r
break;\r
- case 4:\r
+ case 1:\r
+ currentConfig.scaling += (inp & GP2X_LEFT) ? -1 : 1;\r
+ if (currentConfig.scaling < 0) currentConfig.scaling = 0;\r
+ if (currentConfig.scaling > 3) currentConfig.scaling = 3;\r
+ break;\r
+ case 5:\r
currentConfig.Frameskip += (inp & GP2X_LEFT) ? -1 : 1;\r
if (currentConfig.Frameskip < 0) currentConfig.Frameskip = -1;\r
if (currentConfig.Frameskip > 32) currentConfig.Frameskip = 32;\r
break;\r
- case 6:\r
+ case 7:\r
if ((inp & GP2X_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) {\r
currentConfig.PsndRate = 8000; currentConfig.PicoOpt|= 0x08;\r
} else if ((inp & GP2X_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) {\r
currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08;\r
} else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & GP2X_RIGHT);\r
break;\r
- case 9:\r
+ case 10:\r
region_prevnext(inp & GP2X_RIGHT);\r
break;\r
- case 12:\r
+ case 13:\r
if (inp & GP2X_RIGHT) {\r
state_slot++; if (state_slot > 9) state_slot = 0;\r
} else {state_slot--; if (state_slot < 0) state_slot = 9;\r
}\r
break;\r
- case 13:\r
+ case 14:\r
while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;\r
if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;\r
gp2x_text_out8(tl_x, (y+=10), "Configure controls");\r
gp2x_text_out8(tl_x, (y+=10), "Credits");\r
gp2x_text_out8(tl_x, (y+=10), "Exit");\r
+ if (PicoPatches)\r
+ gp2x_text_out8(tl_x, (y+=10), "Patches / GameGenie");\r
\r
// draw cursor\r
gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
}\r
\r
if (rom_data) menu_sel = menu_sel_min = 0;\r
+ if (PicoPatches) menu_sel_max = 9;\r
\r
- for(;;)\r
+ /* make sure action buttons are not pressed on entering menu */\r
+ draw_menu_root(menu_sel);\r
+ while (gp2x_joystick_read(1) & (GP2X_B|GP2X_X|GP2X_SELECT)) usleep(50*1000);\r
+\r
+ for (;;)\r
{\r
draw_menu_root(menu_sel);\r
inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);\r
break;\r
case 1: // save state\r
if (rom_data) {\r
- if(emu_SaveLoadGame(0, 0)) {\r
- strcpy(menuErrorMsg, "save failed");\r
+ if(savestate_menu_loop(0))\r
continue;\r
- }\r
engineState = PGS_Running;\r
return;\r
}\r
break;\r
case 2: // load state\r
if (rom_data) {\r
- if(emu_SaveLoadGame(1, 0)) {\r
- strcpy(menuErrorMsg, "load failed");\r
+ if(savestate_menu_loop(1))\r
continue;\r
- }\r
engineState = PGS_Running;\r
return;\r
}\r
case 8: // exit\r
engineState = PGS_Quit;\r
return;\r
+ case 9: // patches/gg\r
+ if (rom_data && PicoPatches) {\r
+ patches_menu_loop();\r
+ PicoPatchApply();\r
+ strcpy(menuErrorMsg, "Patches applied");\r
+ continue;\r
+ }\r
+ break;\r
}\r
}\r
menuErrorMsg[0] = 0; // clear error msg\r
}\r
\r
\r
-static void menu_gfx_prepare(void)\r
+static void menu_prepare_bg(void)\r
{\r
extern int localPal[0x100];\r
- int i;\r
+ int c, i;\r
\r
// don't clear old palette just for fun (but make it dark)\r
- for (i = 0x100-1; i >= 0; i--)\r
- localPal[i] = (localPal[i] >> 2) & 0x003f3f3f;\r
+ for (i = 0x100-1; i >= 0; i--) {\r
+ c = localPal[i];\r
+ localPal[i] = ((c >> 1) & 0x007f7f7f) - ((c >> 3) & 0x001f1f1f);\r
+ }\r
localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
localPal[0xf0] = 0x00ffffff;\r
\r
+ gp2x_video_setpalette(localPal, 0x100);\r
+}\r
+\r
+static void menu_gfx_prepare(void)\r
+{\r
+ menu_prepare_bg();\r
+\r
// switch to 8bpp\r
gp2x_video_changemode2(8);\r
- gp2x_video_RGB_setscaling(320, 240);\r
- gp2x_video_setpalette(localPal, 0x100);\r
+ gp2x_video_RGB_setscaling(0, 320, 240);\r
gp2x_video_flip2();\r
}\r
\r
notaz.gp2x.de / picodrive.git / blobdiff