// don't like to use loads of #ifdefs, so duplicating GP2X code
// horribly instead
-//#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include <pspdisplay.h>
#include <pspgu.h>
#include <pspiofilemgr.h>
+#include <psputils.h>
#include "psp.h"
#include "emu.h"
#define pspKeyUnkn "???"
static const char * const pspKeyNames[] = {
- "SELECT", pspKeyUnkn, pspKeyUnkn, "START", "UP", "RIGHT", "DOWN", "LEFT",
- "L", "R", pspKeyUnkn, pspKeyUnkn, "TRIANGLE", "CIRCLE", "X", "SQUARE",
- "HOME", "HOLD", "WLAN_UP", "REMOTE", "VOLUP", "VOLDOWN", "SCREEN", "NOTE",
- pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn
+ "SELECT", pspKeyUnkn, pspKeyUnkn, "START", "UP", "RIGHT", "DOWN", "LEFT",
+ "L", "R", pspKeyUnkn, pspKeyUnkn, "TRIANGLE", "CIRCLE", "X", "SQUARE",
+ "HOME", "HOLD", "WLAN_UP", "REMOTE", "VOLUP", "VOLDOWN", "SCREEN", "NOTE",
+ pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, pspKeyUnkn, "NUB UP", "NUB RIGHT", "NUB DOWN", "NUB LEFT" // fake
};
-static unsigned char bg_buffer[480*272*2] __attribute__((aligned(16))); // TODO: move to vram?
+static unsigned short bg_buffer[480*272] __attribute__((aligned(16)));
#define menu_screen psp_screen
static void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
-static void menu_prepare_bg(int use_game_bg);
+static void menu_prepare_bg(int use_game_bg, int use_fg);
static unsigned int inp_prev = 0;
-static unsigned long wait_for_input(unsigned int interesting)
+static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
{
unsigned int ret;
static int repeats = 0, wait = 50;
- int release = 0, i;
+ int release = 0, count, i;
+
+ if (!is_key_config)
+ interesting |= (interesting & 0xf0) << 24; // also use analog
if (repeats == 2 || repeats == 4) wait /= 2;
if (repeats == 6) wait = 15;
psp_msleep(wait);
}
- while ( !((ret = psp_pad_read(1)) & interesting) ) {
+ for (count = 0; !((ret = psp_pad_read(1)) & interesting) && count < 100; count++) {
psp_msleep(50);
release = 1;
}
}
inp_prev = ret;
+ if (!is_key_config)
+ ret |= (ret & 0xf0000000) >> 24; // use analog as d-pad
+
// we don't need diagonals in menus
if ((ret&BTN_UP) && (ret&BTN_LEFT)) ret &= ~BTN_LEFT;
if ((ret&BTN_UP) && (ret&BTN_RIGHT)) ret &= ~BTN_RIGHT;
if (pos > 26) break;
if (namelist[i+1]->d_type & DT_DIR) {
smalltext_out16_lim(14, pos*10, "/", 0xd7ff, 1);
- smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xd7ff, 53-3);
+ smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xd7ff, 80-3);
} else {
unsigned short color = file2color(namelist[i+1]->d_name);
- smalltext_out16_lim(14, pos*10, namelist[i+1]->d_name, color, 53-2);
+ smalltext_out16_lim(14, pos*10, namelist[i+1]->d_name, color, 80-2);
}
}
text_out16(5, 130, ">");
for (;;)
{
draw_dirlist(curr_path, namelist, n, sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_X|BTN_CIRCLE);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_X|BTN_CIRCLE, 0);
if(inp & BTN_UP ) { sel--; if (sel < 0) sel = n-2; }
if(inp & BTN_DOWN) { sel++; if (sel > n-2) sel = 0; }
if(inp & BTN_LEFT) { sel-=10; if (sel < 0) sel = 0; }
if(inp & BTN_L) { sel-=24; if (sel < 0) sel = 0; }
if(inp & BTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }
if(inp & BTN_R) { sel+=24; if (sel > n-2) sel = n-2; }
- if(inp & BTN_X) { // enter dir/select
+ if(inp & BTN_CIRCLE) { // enter dir/select
if (namelist[sel+1]->d_type & DT_REG) {
strcpy(romFileName, curr_path);
strcat(romFileName, "/");
break;
}
}
- if(inp & BTN_CIRCLE) break; // cancel
+ if(inp & BTN_X) break; // cancel
}
if (n > 0) {
static void debug_menu_loop(void)
{
draw_debug();
- wait_for_input(BTN_X|BTN_CIRCLE);
+ wait_for_input(BTN_X|BTN_CIRCLE, 0);
}
// ------------ patch/gg menu ------------
for(;;)
{
draw_patchlist(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_X|BTN_CIRCLE);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_L|BTN_R|BTN_X|BTN_CIRCLE, 0);
if(inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }
if(inp & BTN_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }
if(inp &(BTN_LEFT|BTN_L)) { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }
if(inp &(BTN_RIGHT|BTN_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }
- if(inp & BTN_X) { // action
+ if(inp & BTN_CIRCLE) { // action
if (menu_sel < PicoPatchCount)
PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;
else return;
}
- if(inp & BTN_CIRCLE) return;
+ if(inp & BTN_X) return;
}
}
}
}
+static void *get_oldstate_for_preview(void)
+{
+ unsigned char *ptr = malloc(sizeof(Pico.vram) + sizeof(Pico.cram) + sizeof(Pico.vsram) + sizeof(Pico.video));
+ if (ptr == NULL) return NULL;
+
+ memcpy(ptr, Pico.vram, sizeof(Pico.vram));
+ memcpy(ptr + sizeof(Pico.vram), Pico.cram, sizeof(Pico.cram));
+ memcpy(ptr + sizeof(Pico.vram) + sizeof(Pico.cram), Pico.vsram, sizeof(Pico.vsram));
+ memcpy(ptr + sizeof(Pico.vram) + sizeof(Pico.cram) + sizeof(Pico.vsram), &Pico.video, sizeof(Pico.video));
+ return ptr;
+}
+
+static void restore_oldstate(void *ptrx)
+{
+ unsigned char *ptr = ptrx;
+ memcpy(Pico.vram, ptr, sizeof(Pico.vram));
+ memcpy(Pico.cram, ptr + sizeof(Pico.vram), sizeof(Pico.cram));
+ memcpy(Pico.vsram, ptr + sizeof(Pico.vram) + sizeof(Pico.cram), sizeof(Pico.vsram));
+ memcpy(&Pico.video,ptr + sizeof(Pico.vram) + sizeof(Pico.cram) + sizeof(Pico.vsram), sizeof(Pico.video));
+ free(ptrx);
+}
+
static void draw_savestate_bg(int slot)
{
- struct PicoVideo tmp_pv;
- unsigned short tmp_cram[0x40];
- unsigned short tmp_vsram[0x40];
- void *tmp_vram, *file;
+ void *file, *oldstate;
char *fname;
fname = emu_GetSaveFName(1, 0, slot);
if (!fname) return;
- tmp_vram = malloc(sizeof(Pico.vram));
- if (tmp_vram == NULL) return;
-
- memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram));
- memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram));
- memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));
- memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));
+ oldstate = get_oldstate_for_preview();
+ if (oldstate == NULL) return;
if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {
file = gzopen(fname, "rb");
}
emu_forcedFrame();
- menu_prepare_bg(1);
+ menu_prepare_bg(1, 0);
- memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
- memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));
- memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram));
- memcpy(&Pico.video, &tmp_pv, sizeof(Pico.video));
- free(tmp_vram);
+ restore_oldstate(oldstate);
}
static void draw_savestate_menu(int menu_sel, int is_loading)
for(;;)
{
draw_savestate_menu(menu_sel, is_loading);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE, 0);
if(inp & BTN_UP ) {
do {
menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max;
menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0;
} while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);
}
- if(inp & BTN_X) { // save/load
+ if(inp & BTN_CIRCLE) { // save/load
if (menu_sel < 10) {
state_slot = menu_sel;
- PicoStateProgressCB = emu_stateCb; /* also suitable for menu */
+ PicoStateProgressCB = emu_msg_cb; /* also suitable for menu */
if (emu_SaveLoadGame(is_loading, 0)) {
strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed");
return 1;
return 0;
} else return 1;
}
- if(inp & BTN_CIRCLE) return 1;
+ if(inp & BTN_X) return 1;
}
}
if (currentConfig.KeyBinds[i] & action_mask)
{
if (player_idx >= 0 && ((currentConfig.KeyBinds[i] >> 16) & 3) != player_idx) continue;
- if (strkeys[0]) { strcat(strkeys, " + "); strcat(strkeys, pspKeyNames[i]); break; }
+ if (strkeys[0]) {
+ strcat(strkeys, i >= 28 ? ", " : " + "); // nub "buttons" don't create combos
+ strcat(strkeys, pspKeyNames[i]);
+ break;
+ }
else strcpy(strkeys, pspKeyNames[i]);
}
}
text_out16(x, y, "Done");
if (sel < opt_cnt) {
- text_out16(80+30, 180, "Press a button to bind/unbind");
- text_out16(80+30, 190, "Use SELECT to clear");
- text_out16(80+30, 200, "To bind UP/DOWN, hold SELECT");
- text_out16(80+30, 210, "Select \"Done\" to exit");
+ text_out16(80+30, 220, "Press a button to bind/unbind");
+ text_out16(80+30, 230, "Use SELECT to clear");
+ text_out16(80+30, 240, "To bind UP/DOWN, hold SELECT");
+ text_out16(80+30, 250, "Select \"Done\" to exit");
} else {
- text_out16(80+30, 190, "Use Options -> Save cfg");
- text_out16(80+30, 200, "to save controls");
- text_out16(80+30, 210, "Press X or O to exit");
+ text_out16(80+30, 230, "Use Options -> Save cfg");
+ text_out16(80+30, 240, "to save controls");
+ text_out16(80+30, 250, "Press X or O to exit");
}
menu_draw_end();
}
for (;;)
{
draw_key_config(opts, opt_cnt, player_idx, sel);
- inp = wait_for_input(CONFIGURABLE_KEYS|BTN_SELECT);
+ inp = wait_for_input(CONFIGURABLE_KEYS|BTN_SELECT, 1);
if (!(inp & BTN_SELECT)) {
prev_select = 0;
if(inp & BTN_UP ) { sel--; if (sel < 0) sel = menu_sel_max; continue; }
{ "Prev Save Slot ", 1<<25 },
{ "Next Save Slot ", 1<<24 },
{ "Switch Renderer", 1<<26 },
- { "Volume Down ", 1<<30 },
- { "Volume Up ", 1<<29 },
};
static void kc_sel_loop(void)
while (1)
{
draw_kc_sel(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE, 0);
if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
- if (inp & BTN_X) {
+ if (inp & BTN_CIRCLE) {
switch (menu_sel) {
case 0: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 0); return;
case 1: key_config_loop(ctrl_actions, is_6button ? 12 : 8, 1); return;
default: return;
}
}
- if (inp & BTN_CIRCLE) return;
+ if (inp & BTN_X) return;
}
}
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")))
- text_out16(tl_x, 210, "Press start to test selected BIOS");
+ text_out16(tl_x, 250, "Press start to test selected BIOS");
menu_draw_end();
}
for(;;)
{
draw_cd_menu_options(menu_sel, &bios_names);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0);
if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);
}
}
}
- if (inp & BTN_X) { // toggleable options
+ if (inp & BTN_CIRCLE) { // toggleable options
if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, 1) &&
selected_id == MA_CDOPT_DONE) {
return;
break;
}
}
- if (inp & BTN_CIRCLE) return;
+ if (inp & BTN_X) return;
+ }
+}
+
+// --------- display options ----------
+
+menu_entry opt3_entries[] =
+{
+ { NULL, MB_NONE, MA_OPT3_SCALE, NULL, 0, 0, 0, 1 },
+ { NULL, MB_NONE, MA_OPT3_HSCALE32, NULL, 0, 0, 0, 1 },
+ { NULL, MB_NONE, MA_OPT3_HSCALE40, NULL, 0, 0, 0, 1 },
+ { NULL, MB_ONOFF, MA_OPT3_FILTERING, ¤tConfig.scaling, 1, 0, 0, 1 },
+ { NULL, MB_NONE, MA_OPT3_VSYNC, NULL, 0, 0, 0, 1 },
+ { "Set to unscaled centered", MB_NONE, MA_OPT3_PRES_NOSCALE, NULL, 0, 0, 0, 1 },
+ { "Set to fullscreen", MB_NONE, MA_OPT3_PRES_FULLSCR, NULL, 0, 0, 0, 1 },
+ { "done", MB_NONE, MA_OPT3_DONE, NULL, 0, 0, 0, 1 },
+};
+
+#define OPT3_ENTRY_COUNT (sizeof(opt3_entries) / sizeof(opt3_entries[0]))
+
+
+static void menu_opt3_cust_draw(const menu_entry *entry, int x, int y, void *param)
+{
+ switch (entry->id)
+ {
+ case MA_OPT3_SCALE:
+ text_out16(x, y, "Scale factor: %.2f", currentConfig.scale);
+ break;
+ case MA_OPT3_HSCALE32:
+ text_out16(x, y, "Hor. scale (for low res. games): %.2f", currentConfig.hscale32);
+ break;
+ case MA_OPT3_HSCALE40:
+ text_out16(x, y, "Hor. scale (for hi res. games): %.2f", currentConfig.hscale40);
+ break;
+ case MA_OPT3_FILTERING:
+ text_out16(x, y, "Bilinear filtering %s", currentConfig.scaling?"ON":"OFF");
+ break;
+ case MA_OPT3_VSYNC: {
+ char *val = " never";
+ if (currentConfig.EmuOpt & 0x2000)
+ val = (currentConfig.EmuOpt & 0x10000) ? "sometimes" : " always";
+ text_out16(x, y, "Wait for vsync (slow) %s", val);
+ break;
+ }
+ default: break;
+ }
+}
+
+static void menu_opt3_preview(int is_32col)
+{
+ void *oldstate = NULL;
+
+ if (rom_data == NULL || ((Pico.video.reg[12]&1)^1) != is_32col)
+ {
+ extern char bgdatac32_start[], bgdatac40_start[];
+ extern int bgdatac32_size, bgdatac40_size;
+ void *bgdata = is_32col ? bgdatac32_start : bgdatac40_start;
+ unsigned long insize = is_32col ? bgdatac32_size : bgdatac40_size, outsize = 65856;
+ int ret;
+ ret = uncompress((Bytef *)bg_buffer, &outsize, bgdata, insize);
+ if (ret == 0)
+ {
+ if (rom_data != NULL) oldstate = get_oldstate_for_preview();
+ memcpy(Pico.vram, bg_buffer, sizeof(Pico.vram));
+ memcpy(Pico.cram, (char *)bg_buffer + 0x10000, 0x40*2);
+ memcpy(Pico.vsram, (char *)bg_buffer + 0x10080, 0x40*2);
+ memcpy(&Pico.video,(char *)bg_buffer + 0x10100, 0x40);
+ }
+ else
+ lprintf("uncompress returned %i\n", ret);
+ }
+
+ memset32(psp_screen, 0, 512*272*2/4);
+ emu_forcedFrame();
+ menu_prepare_bg(1, 0);
+
+ if (oldstate) restore_oldstate(oldstate);
+}
+
+static void draw_dispmenu_options(int menu_sel)
+{
+ int tl_x = 80, tl_y = 16+50;
+
+ menu_draw_begin();
+
+ menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 316);
+
+ me_draw(opt3_entries, OPT3_ENTRY_COUNT, tl_x, tl_y, menu_opt3_cust_draw, NULL);
+
+ menu_draw_end();
+}
+
+static void dispmenu_loop_options(void)
+{
+ static int menu_sel = 0;
+ int menu_sel_max, is_32col = (Pico.video.reg[12]&1)^1;
+ unsigned long inp = 0;
+ menu_id selected_id;
+
+ menu_sel_max = me_count_enabled(opt3_entries, OPT3_ENTRY_COUNT) - 1;
+
+ for (;;)
+ {
+ draw_dispmenu_options(menu_sel);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0);
+ if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
+ if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
+ selected_id = me_index2id(opt3_entries, OPT3_ENTRY_COUNT, menu_sel);
+ if (selected_id == MA_OPT3_HSCALE40 && is_32col) { is_32col = 0; menu_opt3_preview(is_32col); }
+ if (selected_id == MA_OPT3_HSCALE32 && !is_32col) { is_32col = 1; menu_opt3_preview(is_32col); }
+
+ if (inp & (BTN_LEFT|BTN_RIGHT)) // multi choise
+ {
+ float *setting = NULL;
+ int tmp;
+ me_process(opt3_entries, OPT3_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0);
+ switch (selected_id) {
+ case MA_OPT3_SCALE: setting = ¤tConfig.scale; break;
+ case MA_OPT3_HSCALE40: setting = ¤tConfig.hscale40; is_32col = 0; break;
+ case MA_OPT3_HSCALE32: setting = ¤tConfig.hscale32; is_32col = 1; break;
+ case MA_OPT3_FILTERING:menu_opt3_preview(is_32col); break;
+ case MA_OPT3_VSYNC: tmp = ((currentConfig.EmuOpt>>13)&1) | ((currentConfig.EmuOpt>>15)&2);
+ tmp = (inp & BTN_LEFT) ? (tmp>>1) : ((tmp<<1)|1);
+ if (tmp > 3) tmp = 3;
+ currentConfig.EmuOpt &= ~0x12000;
+ currentConfig.EmuOpt |= ((tmp&2)<<15) | ((tmp&1)<<13);
+ break;
+ default: break;
+ }
+ if (setting != NULL) {
+ while ((inp = psp_pad_read(0)) & (BTN_LEFT|BTN_RIGHT)) {
+ *setting += (inp & BTN_LEFT) ? -0.01 : 0.01;
+ menu_opt3_preview(is_32col);
+ draw_dispmenu_options(menu_sel); // will wait vsync
+ }
+ }
+ }
+ if (inp & BTN_CIRCLE) { // toggleable options
+ me_process(opt3_entries, OPT3_ENTRY_COUNT, selected_id, 1);
+ switch (selected_id) {
+ case MA_OPT3_DONE:
+ return;
+ case MA_OPT3_PRES_NOSCALE:
+ currentConfig.scale = currentConfig.hscale40 = currentConfig.hscale32 = 1.0;
+ menu_opt3_preview(is_32col);
+ break;
+ case MA_OPT3_PRES_FULLSCR:
+ currentConfig.scale = 1.20;
+ currentConfig.hscale40 = 1.25;
+ currentConfig.hscale32 = 1.56;
+ menu_opt3_preview(is_32col);
+ break;
+ case MA_OPT3_FILTERING:
+ menu_opt3_preview(is_32col);
+ break;
+ default: break;
+ }
+ }
+ if (inp & BTN_X) return;
}
}
menu_entry opt2_entries[] =
{
- { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x0004, 0, 0, 1 },
- { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x0001, 0, 0, 1 },
- { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,¤tConfig.PicoOpt,0x0002, 0, 0, 1 },
-// { "Double buffering", MB_ONOFF, MA_OPT2_DBLBUFF, ¤tConfig.EmuOpt, 0x8000, 0, 0, 1 },
-// { "Wait for V-sync (slow)", MB_ONOFF, MA_OPT2_VSYNC, ¤tConfig.EmuOpt, 0x2000, 0, 0, 1 },
- { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x0008, 0, 0, 1 },
- { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x0020, 0, 0, 1 },
+ { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x00004, 0, 0, 1 },
+ { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x00001, 0, 0, 1 },
+ { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,¤tConfig.PicoOpt,0x00002, 0, 0, 1 },
+ { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1 },
+ { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1 },
+ { "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1 },
{ "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1 },
};
for(;;)
{
draw_amenu_options(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0);
if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
selected_id = me_index2id(opt2_entries, OPT2_ENTRY_COUNT, menu_sel);
if (inp & (BTN_LEFT|BTN_RIGHT)) { // multi choise
if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0) &&
selected_id == MA_OPT2_GAMMA) {
- while ((inp = psp_pad_read(1)) & (BTN_LEFT|BTN_RIGHT)) {
- currentConfig.gamma += (inp & BTN_LEFT) ? -1 : 1;
- if (currentConfig.gamma < 1) currentConfig.gamma = 1;
- if (currentConfig.gamma > 300) currentConfig.gamma = 300;
- draw_amenu_options(menu_sel);
- psp_msleep(18);
- }
+ // TODO?
}
}
- if (inp & BTN_X) { // toggleable options
+ if (inp & BTN_CIRCLE) { // toggleable options
if (!me_process(opt2_entries, OPT2_ENTRY_COUNT, selected_id, 1) &&
selected_id == MA_OPT2_DONE) {
return;
}
}
- if (inp & BTN_CIRCLE) return;
+ if (inp & BTN_X) return;
}
}
menu_entry opt_entries[] =
{
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1 },
- { "Scale low res mode", MB_ONOFF, MA_OPT_SCALING, ¤tConfig.scaling, 0x0001, 0, 3, 1 },
{ "Accurate timing (slower)", MB_ONOFF, MA_OPT_ACC_TIMING, ¤tConfig.PicoOpt, 0x0040, 0, 0, 1 },
{ "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, ¤tConfig.PicoOpt, 0x0080, 0, 0, 1 },
{ "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1 },
{ NULL, MB_NONE, MA_OPT_CONFIRM_STATES,NULL, 0, 0, 0, 1 },
{ "Save slot", MB_RANGE, MA_OPT_SAVE_SLOT, &state_slot, 0, 0, 9, 1 },
{ NULL, MB_NONE, MA_OPT_CPU_CLOCKS, NULL, 0, 0, 0, 1 },
+ { "[Display options]", MB_NONE, MA_OPT_DISP_OPTS, NULL, 0, 0, 0, 1 },
{ "[Sega/Mega CD options]", MB_NONE, MA_OPT_SCD_OPTS, NULL, 0, 0, 0, 1 },
- { "[advanced options]", MB_NONE, MA_OPT_ADV_OPTS, NULL, 0, 0, 0, 1 },
+ { "[Advanced options]", MB_NONE, MA_OPT_ADV_OPTS, NULL, 0, 0, 0, 1 },
{ NULL, MB_NONE, MA_OPT_SAVECFG, NULL, 0, 0, 0, 1 },
{ "Save cfg for current game only",MB_NONE,MA_OPT_SAVECFG_GAME,NULL, 0, 0, 0, 1 },
{ NULL, MB_NONE, MA_OPT_LOADCFG, NULL, 0, 0, 0, 1 },
{
case MA_OPT_RENDERER:
if (currentConfig.PicoOpt&0x10)
- str = " 8bit fast";
+ str = "fast";
else if (currentConfig.EmuOpt&0x80)
- str = "16bit accurate";
+ str = "accurate";
else
- str = " 8bit accurate";
- text_out16(x, y, "Renderer: %s", str);
+ str = " 8bit accurate"; // n/a
+ text_out16(x, y, "Renderer: %s", str);
break;
case MA_OPT_FRAMESKIP:
if (currentConfig.Frameskip < 0)
}
-
static void draw_menu_options(int menu_sel)
{
int tl_x = 80+25, tl_y = 16+24;
while (1)
{
draw_menu_options(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0);
if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
selected_id = me_index2id(opt_entries, OPT_ENTRY_COUNT, menu_sel);
if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0)) {
switch (selected_id) {
case MA_OPT_RENDERER:
- if (inp & BTN_LEFT) {
- if ((currentConfig.PicoOpt&0x10) || !(currentConfig.EmuOpt &0x80)) {
- currentConfig.PicoOpt&= ~0x10;
- currentConfig.EmuOpt |= 0x80;
- }
+ if ((currentConfig.PicoOpt&0x10) || !(currentConfig.EmuOpt &0x80)) {
+ currentConfig.PicoOpt&= ~0x10;
+ currentConfig.EmuOpt |= 0x80;
} else {
- if (!(currentConfig.PicoOpt&0x10) || (currentConfig.EmuOpt &0x80)) {
- currentConfig.PicoOpt|= 0x10;
- currentConfig.EmuOpt &= ~0x80;
- }
+ currentConfig.PicoOpt|= 0x10;
+ currentConfig.EmuOpt &= ~0x80;
}
break;
case MA_OPT_SOUND_QUALITY:
- if ((inp & BTN_RIGHT) && currentConfig.PsndRate == 44100 &&
- !(currentConfig.PicoOpt&0x08))
- {
- currentConfig.PsndRate = 11025;
- currentConfig.PicoOpt |= 8;
- } else if ((inp & BTN_LEFT) && currentConfig.PsndRate == 11025 &&
- (currentConfig.PicoOpt&0x08) && !(PicoMCD&1))
- {
- currentConfig.PsndRate = 44100;
- currentConfig.PicoOpt &= ~8;
- } else
- currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & BTN_RIGHT);
+ currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & BTN_RIGHT);
break;
case MA_OPT_REGION:
region_prevnext(inp & BTN_RIGHT);
}
}
}
- if (inp & BTN_X) {
+ if (inp & BTN_CIRCLE) {
if (!me_process(opt_entries, OPT_ENTRY_COUNT, selected_id, 1))
{
switch (selected_id)
{
+ case MA_OPT_DISP_OPTS:
+ dispmenu_loop_options();
+ break;
case MA_OPT_SCD_OPTS:
cd_menu_loop_options();
if (engineState == PGS_ReloadRom)
}
}
}
- if(inp & BTN_CIRCLE) {
+ if(inp & BTN_X) {
menu_options_save();
return 0; // done (update, no write)
}
y = tl_y;
text_out16(tl_x, y, "Credits:");
- text_out16(tl_x, (y+=10), "Dave: base code of PicoDrive");
+ text_out16(tl_x, (y+=10), "fDave: base code of PicoDrive");
+ text_out16(tl_x, (y+=10), "Chui: Fame/C");
+ text_out16(tl_x, (y+=10), "NJ: CZ80");
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), " Gens code, base of Fame/C, CZ80");
+ text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");
text_out16(tl_x, (y+=10), "Haze: Genesis hw info");
+ text_out16(tl_x, (y+=10), "ps2dev.org people: PSP SDK/code");
text_out16(tl_x, (y+=10), "ketchupgun: skin design");
menu_draw_end();
static void draw_menu_root(int menu_sel)
{
- const int tl_x = 80+70, tl_y = 16+70;
+ const int tl_x = 86+70, tl_y = 16+70;
+ char *stat = NULL;
menu_draw_begin();
- text_out16(tl_x, 16+20, "PicoDrive v" VERSION);
+ if ((currentConfig.EmuOpt&0x20000) && (stat = psp_get_status_line()))
+ text_out16(287, 12, "%s", stat);
+
+ text_out16(tl_x, 48, "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);
// error
- if (menuErrorMsg[0]) {
- // memset((char *)menu_screen + 321*224*2, 0, 321*16*2);
- text_out16(5, 258, menuErrorMsg);
- }
+ if (menuErrorMsg[0])
+ text_out16(10, 252, menuErrorMsg);
menu_draw_end();
}
for (;;)
{
draw_menu_root(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE|BTN_SELECT|BTN_L|BTN_R);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE|BTN_SELECT|BTN_L|BTN_R, 0);
if(inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if(inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
if((inp & (BTN_L|BTN_R)) == (BTN_L|BTN_R)) debug_menu_loop();
- if( inp & (BTN_SELECT|BTN_CIRCLE)) {
+ if( inp & (BTN_SELECT|BTN_X)) {
if (rom_data) {
- while (psp_pad_read(1) & (BTN_SELECT|BTN_CIRCLE)) psp_msleep(50); // wait until released
+ while (psp_pad_read(1) & (BTN_SELECT|BTN_X)) psp_msleep(50); // wait until released
engineState = PGS_Running;
break;
}
}
- if(inp & BTN_X) {
+ if(inp & BTN_CIRCLE) {
switch (me_index2id(main_entries, MAIN_ENTRY_COUNT, menu_sel))
{
case MA_MAIN_RESUME_GAME:
if (rom_data) {
- while (psp_pad_read(1) & BTN_X) psp_msleep(50);
+ while (psp_pad_read(1) & BTN_CIRCLE) psp_msleep(50);
engineState = PGS_Running;
return;
}
case MA_MAIN_CREDITS:
draw_menu_credits();
psp_msleep(500);
- inp = wait_for_input(BTN_X|BTN_CIRCLE);
+ inp = 0;
+ while (!(inp & (BTN_X|BTN_CIRCLE)))
+ inp = wait_for_input(BTN_X|BTN_CIRCLE, 0);
break;
case MA_MAIN_EXIT:
engineState = PGS_Quit;
}
}
-static void menu_prepare_bg(int use_game_bg)
+static void menu_prepare_bg(int use_game_bg, int use_fg)
{
- memset(bg_buffer, 0, sizeof(bg_buffer));
-
if (use_game_bg)
{
// darken the active framebuffer
- /*
- memset(bg_buffer, 0, 321*8*2);
- menu_darken_bg(bg_buffer + 321*8*2, (char *)giz_screen + 321*8*2, 321*224, 1);
- memset(bg_buffer + 321*232*2, 0, 321*8*2);
- */
+ unsigned short *dst = bg_buffer;
+ unsigned short *src = use_fg ? psp_video_get_active_fb() : psp_screen;
+ int i;
+ for (i = 272; i > 0; i--, dst += 480, src += 512)
+ menu_darken_bg(dst, src, 480, 1);
+ //memset32((int *)(bg_buffer + 480*264), 0, 480*8*2/4);
}
else
{
// should really only happen once, on startup..
+ memset32((int *)(void *)bg_buffer, 0, sizeof(bg_buffer)/4);
readpng(bg_buffer, "skin/background.png", READPNG_BG);
}
+ sceKernelDcacheWritebackAll();
}
static void menu_gfx_prepare(void)
{
- menu_prepare_bg(rom_data != NULL);
+ menu_prepare_bg(rom_data != NULL, 1);
menu_draw_begin();
menu_draw_end();
/* make sure action buttons are not pressed on entering menu */
draw_menu_tray(menu_sel);
- while (psp_pad_read(1) & BTN_X) psp_msleep(50);
+ while (psp_pad_read(1) & BTN_CIRCLE) psp_msleep(50);
for (;;)
{
draw_menu_tray(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X, 0);
if(inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if(inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
- if(inp & BTN_X ) {
+ if(inp & BTN_CIRCLE) {
switch (menu_sel) {
case 0: // select image
selfname = romsel_loop(curr_path);
notaz.gp2x.de / libpicofe.git / blobdiff