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);
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
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, int is_key_config)
+unsigned long wait_for_input(unsigned int interesting, int is_key_config)
{
unsigned int ret;
static int repeats = 0, wait = 20;
return ret;
}
-static void menu_draw_begin(void)
+void menu_draw_begin(void)
{
// short *src = (short *)bg_buffer, *dst = (short *)menu_screen;
// int i;
}
-static void menu_draw_end(void)
+void menu_draw_end(void)
{
psp_video_flip(1);
}
return ret;
}
-// ------------ debug menu ------------
-
-char *debugString(void);
-void PicoDrawShowSpriteStats(unsigned short *screen, int stride);
-void PicoDrawShowPalette(unsigned short *screen, int stride);
-
-static void draw_main_debug(void)
-{
- char *p, *str = debugString();
- int len, line;
-
- menu_draw_begin();
-
- p = str;
- for (line = 0; line < 24; line++)
- {
- while (*p && *p != '\n') p++;
- len = p - str;
- if (len > 55) len = 55;
- smalltext_out16_lim(1, line*10, str, 0xffff, len);
- if (*p == 0) break;
- p++; str = p;
- }
-}
-
-static void draw_frame_debug(void)
-{
- char layer_str[48] = "layers: ";
- if (PicoDrawMask & PDRAW_LAYERB_ON) memcpy(layer_str + 8, "B", 1);
- if (PicoDrawMask & PDRAW_LAYERA_ON) memcpy(layer_str + 10, "A", 1);
- if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
- if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);
-
- memset(psp_screen, 0, 512*272*2);
- emu_forcedFrame(0);
- smalltext_out16(4, 264, layer_str, 0xffff);
-}
-
-static void debug_menu_loop(void)
-{
- int inp, mode = 0;
-
- while (1)
- {
- switch (mode)
- {
- case 0: draw_main_debug(); break;
- case 1: draw_frame_debug(); break;
- case 2: menu_draw_begin();
- PicoDrawShowSpriteStats((unsigned short *)psp_screen+512*16+80, 512); break;
- case 3: memset(psp_screen, 0, 512*272*2);
- PicoDrawShowPalette(psp_screen, 512); break;
- }
- menu_draw_end();
-
- inp = wait_for_input(BTN_X|BTN_CIRCLE|BTN_L|BTN_R|BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT, 0);
- if (inp & (BTN_X|BTN_CIRCLE)) return;
- if (inp & BTN_L) { mode--; if (mode < 0) mode = 3; }
- if (inp & BTN_R) { mode++; if (mode > 3) mode = 0; }
- if (mode == 1) {
- if (inp & BTN_LEFT) PicoDrawMask ^= PDRAW_LAYERB_ON;
- if (inp & BTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
- if (inp & BTN_DOWN) PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
- if (inp & BTN_UP) PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
- }
- }
-}
-
// ------------ patch/gg menu ------------
static void draw_patchlist(int sel)
static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx, int sel)
{
- int x, y, tl_y = 16+40, i;
+ int x, y, tl_y = 16+20, i;
menu_draw_begin();
if (player_idx >= 0) {
- text_out16(80+80, 16+20, "Player %i controls", player_idx + 1);
+ text_out16(80+80, 16, "Player %i controls", player_idx + 1);
x = 80+80;
} else {
- text_out16(80+80, 16+20, "Emulator controls");
+ text_out16(80+80, 16, "Emulator controls");
x = 80+40;
}
text_out16(x, y, "Done");
if (sel < opt_cnt) {
- 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");
+ text_out16(80+30, 225, "Press a button to bind/unbind");
+ text_out16(80+30, 235, "Use SELECT to clear");
+ text_out16(80+30, 245, "To bind UP/DOWN, hold SELECT");
+ text_out16(80+30, 255, "Select \"Done\" to exit");
} else {
- 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");
+ text_out16(80+30, 235, "Use Options -> Save cfg");
+ text_out16(80+30, 245, "to save controls");
+ text_out16(80+30, 255, "Press X or O to exit");
}
menu_draw_end();
}
}
}
+menu_entry ctrlopt_entries[] =
+{
+ { "Player 1", MB_NONE, MA_CTRL_PLAYER1, NULL, 0, 0, 0, 1, 0 },
+ { "Player 2", MB_NONE, MA_CTRL_PLAYER2, NULL, 0, 0, 0, 1, 0 },
+ { "Emulator controls", MB_NONE, MA_CTRL_EMU, NULL, 0, 0, 0, 1, 0 },
+ { "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoOpt, 0x020, 0, 0, 1, 1 },
+ { "Turbo rate", MB_RANGE, MA_CTRL_TURBO_RATE, ¤tConfig.turbo_rate, 0, 1, 30, 1, 1 },
+ { "Done", MB_NONE, MA_CTRL_DONE, NULL, 0, 0, 0, 1, 0 },
+};
+
+#define CTRLOPT_ENTRY_COUNT (sizeof(ctrlopt_entries) / sizeof(ctrlopt_entries[0]))
+const int ctrlopt_entry_count = CTRLOPT_ENTRY_COUNT;
+
static void draw_kc_sel(int menu_sel)
{
int tl_x = 80+25+40, tl_y = 16+60, y;
menu_draw_begin();
menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);
- text_out16(tl_x, y, "Player 1");
- text_out16(tl_x, (y+=10), "Player 2");
- text_out16(tl_x, (y+=10), "Emulator controls");
- text_out16(tl_x, (y+=10), "Done");
+ me_draw(ctrlopt_entries, ctrlopt_entry_count, tl_x, tl_y, NULL, NULL);
menu_draw_end();
}
{
int menu_sel = 3, menu_sel_max = 3;
unsigned long inp = 0;
- int is_6button = PicoOpt & POPT_6BTN_PAD;
+ menu_id selected_id;
while (1)
{
draw_kc_sel(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE, 0);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0);
+ selected_id = me_index2id(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, menu_sel);
+ if (inp & (BTN_LEFT|BTN_RIGHT)) // multi choise
+ me_process(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 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_CIRCLE) {
- switch (menu_sel) {
- case 0: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 0); return;
- case 1: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 1); return;
- case 2: key_config_loop(emuctrl_actions,
- sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;
- case 3: if (!rom_loaded) emu_WriteConfig(0); return;
+ int is_6button = PicoOpt & POPT_6BTN_PAD;
+ switch (selected_id) {
+ case MA_CTRL_PLAYER1: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 0); return;
+ case MA_CTRL_PLAYER2: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 1); return;
+ case MA_CTRL_EMU: key_config_loop(emuctrl_actions,
+ sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;
+ case MA_CTRL_DONE: if (!rom_loaded) emu_WriteConfig(0); return;
default: return;
}
}
menu_entry opt_entries[] =
{
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1, 1 },
- { "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x0080, 0, 0, 0, 1 },
+ { "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 },
{ "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1, 1 },
{ NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1, 1 },
{ "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x0004, 0, 0, 1, 1 },
{ NULL, MB_NONE, MA_OPT_SOUND_QUALITY, NULL, 0, 0, 0, 1, 1 },
- { "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoOpt, 0x0020, 0, 0, 1, 1 },
{ NULL, MB_NONE, MA_OPT_REGION, NULL, 0, 0, 0, 1, 1 },
{ "Use SRAM/BRAM savestates", MB_ONOFF, MA_OPT_SRAM_STATES, ¤tConfig.EmuOpt, 0x0001, 0, 0, 1, 1 },
{ NULL, MB_NONE, MA_OPT_CONFIRM_STATES,NULL, 0, 0, 0, 1, 1 },
}
}
-// warning: alignment
-static void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
{
unsigned int *dest = dst;
const unsigned int *srce = src;