1.30 release
[picodrive.git] / platform / gp2x / menu.c
index 7b18517..47b91b1 100644 (file)
 #include "gp2x.h"\r
 #include "emu.h"\r
 #include "menu.h"\r
+#include "fonts.h"\r
 #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
@@ -38,75 +41,7 @@ static char *gp2xKeyNames[] = {
 char menuErrorMsg[40] = {0, };\r
 \r
 \r
-static unsigned char fontdata8x8[] =\r
-{\r
-       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\r
-       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\r
-       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\r
-       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\r
-       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\r
-       0x3C,0x42,0x99,0xBD,0xBD,0x99,0x42,0x3C,0x3C,0x42,0x81,0x81,0x81,0x81,0x42,0x3C,\r
-       0xFE,0x82,0x8A,0xD2,0xA2,0x82,0xFE,0x00,0xFE,0x82,0x82,0x82,0x82,0x82,0xFE,0x00,\r
-       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x64,0x74,0x7C,0x38,0x00,0x00,\r
-       0x80,0xC0,0xF0,0xFC,0xF0,0xC0,0x80,0x00,0x01,0x03,0x0F,0x3F,0x0F,0x03,0x01,0x00,\r
-       0x18,0x3C,0x7E,0x18,0x7E,0x3C,0x18,0x00,0xEE,0xEE,0xEE,0xCC,0x00,0xCC,0xCC,0x00,\r
-       0x00,0x00,0x30,0x68,0x78,0x30,0x00,0x00,0x00,0x38,0x64,0x74,0x7C,0x38,0x00,0x00,\r
-       0x3C,0x66,0x7A,0x7A,0x7E,0x7E,0x3C,0x00,0x0E,0x3E,0x3A,0x22,0x26,0x6E,0xE4,0x40,\r
-       0x18,0x3C,0x7E,0x3C,0x3C,0x3C,0x3C,0x00,0x3C,0x3C,0x3C,0x3C,0x7E,0x3C,0x18,0x00,\r
-       0x08,0x7C,0x7E,0x7E,0x7C,0x08,0x00,0x00,0x10,0x3E,0x7E,0x7E,0x3E,0x10,0x00,0x00,\r
-       0x58,0x2A,0xDC,0xC8,0xDC,0x2A,0x58,0x00,0x24,0x66,0xFF,0xFF,0x66,0x24,0x00,0x00,\r
-       0x00,0x10,0x10,0x38,0x38,0x7C,0xFE,0x00,0xFE,0x7C,0x38,0x38,0x10,0x10,0x00,0x00,\r
-       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x18,0x00,0x18,0x18,0x00,\r
-       0x6C,0x6C,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x28,0x7C,0x28,0x7C,0x28,0x00,0x00,\r
-       0x10,0x38,0x60,0x38,0x0C,0x78,0x10,0x00,0x40,0xA4,0x48,0x10,0x24,0x4A,0x04,0x00,\r
-       0x18,0x34,0x18,0x3A,0x6C,0x66,0x3A,0x00,0x18,0x18,0x20,0x00,0x00,0x00,0x00,0x00,\r
-       0x30,0x60,0x60,0x60,0x60,0x60,0x30,0x00,0x0C,0x06,0x06,0x06,0x06,0x06,0x0C,0x00,\r
-       0x10,0x54,0x38,0x7C,0x38,0x54,0x10,0x00,0x00,0x18,0x18,0x7E,0x18,0x18,0x00,0x00,\r
-       0x00,0x00,0x00,0x00,0x18,0x18,0x30,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,\r
-       0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x04,0x08,0x10,0x20,0x40,0x00,0x00,\r
-       0x38,0x4C,0xC6,0xC6,0xC6,0x64,0x38,0x00,0x18,0x38,0x18,0x18,0x18,0x18,0x7E,0x00,\r
-       0x7C,0xC6,0x0E,0x3C,0x78,0xE0,0xFE,0x00,0x7E,0x0C,0x18,0x3C,0x06,0xC6,0x7C,0x00,\r
-       0x1C,0x3C,0x6C,0xCC,0xFE,0x0C,0x0C,0x00,0xFC,0xC0,0xFC,0x06,0x06,0xC6,0x7C,0x00,\r
-       0x3C,0x60,0xC0,0xFC,0xC6,0xC6,0x7C,0x00,0xFE,0xC6,0x0C,0x18,0x30,0x30,0x30,0x00,\r
-       0x78,0xC4,0xE4,0x78,0x86,0x86,0x7C,0x00,0x7C,0xC6,0xC6,0x7E,0x06,0x0C,0x78,0x00,\r
-       0x00,0x00,0x18,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x18,0x18,0x30,\r
-       0x1C,0x38,0x70,0xE0,0x70,0x38,0x1C,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00,\r
-       0x70,0x38,0x1C,0x0E,0x1C,0x38,0x70,0x00,0x7C,0xC6,0xC6,0x1C,0x18,0x00,0x18,0x00,\r
-       0x3C,0x42,0x99,0xA1,0xA5,0x99,0x42,0x3C,0x38,0x6C,0xC6,0xC6,0xFE,0xC6,0xC6,0x00,\r
-       0xFC,0xC6,0xC6,0xFC,0xC6,0xC6,0xFC,0x00,0x3C,0x66,0xC0,0xC0,0xC0,0x66,0x3C,0x00,\r
-       0xF8,0xCC,0xC6,0xC6,0xC6,0xCC,0xF8,0x00,0xFE,0xC0,0xC0,0xFC,0xC0,0xC0,0xFE,0x00,\r
-       0xFE,0xC0,0xC0,0xFC,0xC0,0xC0,0xC0,0x00,0x3E,0x60,0xC0,0xCE,0xC6,0x66,0x3E,0x00,\r
-       0xC6,0xC6,0xC6,0xFE,0xC6,0xC6,0xC6,0x00,0x7E,0x18,0x18,0x18,0x18,0x18,0x7E,0x00,\r
-       0x06,0x06,0x06,0x06,0xC6,0xC6,0x7C,0x00,0xC6,0xCC,0xD8,0xF0,0xF8,0xDC,0xCE,0x00,\r
-       0x60,0x60,0x60,0x60,0x60,0x60,0x7E,0x00,0xC6,0xEE,0xFE,0xFE,0xD6,0xC6,0xC6,0x00,\r
-       0xC6,0xE6,0xF6,0xFE,0xDE,0xCE,0xC6,0x00,0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00,\r
-       0xFC,0xC6,0xC6,0xC6,0xFC,0xC0,0xC0,0x00,0x7C,0xC6,0xC6,0xC6,0xDE,0xCC,0x7A,0x00,\r
-       0xFC,0xC6,0xC6,0xCE,0xF8,0xDC,0xCE,0x00,0x78,0xCC,0xC0,0x7C,0x06,0xC6,0x7C,0x00,\r
-       0x7E,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0xC6,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00,\r
-       0xC6,0xC6,0xC6,0xEE,0x7C,0x38,0x10,0x00,0xC6,0xC6,0xD6,0xFE,0xFE,0xEE,0xC6,0x00,\r
-       0xC6,0xEE,0x3C,0x38,0x7C,0xEE,0xC6,0x00,0x66,0x66,0x66,0x3C,0x18,0x18,0x18,0x00,\r
-       0xFE,0x0E,0x1C,0x38,0x70,0xE0,0xFE,0x00,0x3C,0x30,0x30,0x30,0x30,0x30,0x3C,0x00,\r
-       0x60,0x60,0x30,0x18,0x0C,0x06,0x06,0x00,0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00,\r
-       0x18,0x3C,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,\r
-       0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x06,0x3E,0x66,0x66,0x3C,0x00,\r
-       0x60,0x7C,0x66,0x66,0x66,0x66,0x7C,0x00,0x00,0x3C,0x66,0x60,0x60,0x66,0x3C,0x00,\r
-       0x06,0x3E,0x66,0x66,0x66,0x66,0x3E,0x00,0x00,0x3C,0x66,0x66,0x7E,0x60,0x3C,0x00,\r
-       0x1C,0x30,0x78,0x30,0x30,0x30,0x30,0x00,0x00,0x3E,0x66,0x66,0x66,0x3E,0x06,0x3C,\r
-       0x60,0x7C,0x76,0x66,0x66,0x66,0x66,0x00,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x00,\r
-       0x0C,0x00,0x1C,0x0C,0x0C,0x0C,0x0C,0x38,0x60,0x60,0x66,0x6C,0x78,0x6C,0x66,0x00,\r
-       0x38,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0xEC,0xFE,0xFE,0xFE,0xD6,0xC6,0x00,\r
-       0x00,0x7C,0x76,0x66,0x66,0x66,0x66,0x00,0x00,0x3C,0x66,0x66,0x66,0x66,0x3C,0x00,\r
-       0x00,0x7C,0x66,0x66,0x66,0x7C,0x60,0x60,0x00,0x3E,0x66,0x66,0x66,0x3E,0x06,0x06,\r
-       0x00,0x7E,0x70,0x60,0x60,0x60,0x60,0x00,0x00,0x3C,0x60,0x3C,0x06,0x66,0x3C,0x00,\r
-       0x30,0x78,0x30,0x30,0x30,0x30,0x1C,0x00,0x00,0x66,0x66,0x66,0x66,0x6E,0x3E,0x00,\r
-       0x00,0x66,0x66,0x66,0x66,0x3C,0x18,0x00,0x00,0xC6,0xD6,0xFE,0xFE,0x7C,0x6C,0x00,\r
-       0x00,0x66,0x3C,0x18,0x3C,0x66,0x66,0x00,0x00,0x66,0x66,0x66,0x66,0x3E,0x06,0x3C,\r
-       0x00,0x7E,0x0C,0x18,0x30,0x60,0x7E,0x00,0x0E,0x18,0x0C,0x38,0x0C,0x18,0x0E,0x00,\r
-       0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x00,0x70,0x18,0x30,0x1C,0x30,0x18,0x70,0x00,\r
-       0x00,0x00,0x76,0xDC,0x00,0x00,0x00,0x00,0x10,0x28,0x10,0x54,0xAA,0x44,0x00,0x00,\r
-};\r
-\r
-static void gp2x_text(unsigned char *screen, int x, int y, char *text, int color)\r
+static void gp2x_text(unsigned char *screen, int x, int y, const char *text, int color)\r
 {\r
        int i,l;\r
 \r
@@ -130,7 +65,7 @@ static void gp2x_text(unsigned char *screen, int x, int y, char *text, int color
 }\r
 \r
 // draws white text to current bbp15 screen\r
-void gp2x_text_out15(int x, int y, char *text)\r
+void gp2x_text_out15(int x, int y, const char *text)\r
 {\r
        int i,l;\r
        unsigned short *screen = gp2x_screen;\r
@@ -155,7 +90,7 @@ void gp2x_text_out15(int x, int y, char *text)
 }\r
 \r
 \r
-void gp2x_text_out8(int x, int y, char *texto, ...)\r
+void gp2x_text_out8(int x, int y, const char *texto, ...)\r
 {\r
        va_list args;\r
        char    buffer[512];\r
@@ -164,16 +99,16 @@ void gp2x_text_out8(int x, int y, char *texto, ...)
        vsprintf(buffer,texto,args);\r
        va_end(args);\r
 \r
-       gp2x_text(gp2x_screen,x,y,buffer,1);\r
+       gp2x_text(gp2x_screen,x,y,buffer,0xf0);\r
 }\r
 \r
 \r
-void gp2x_text_out8_2(int x, int y, char *texto, int color)\r
+void gp2x_text_out8_2(int x, int y, const char *texto, int color)\r
 {\r
        gp2x_text(gp2x_screen, x, y, texto, color);\r
 }\r
 \r
-void gp2x_text_out8_lim(int x, int y, char *texto, int max)\r
+void gp2x_text_out8_lim(int x, int y, const char *texto, int max)\r
 {\r
        char    buffer[320/8+1];\r
 \r
@@ -182,7 +117,50 @@ void gp2x_text_out8_lim(int x, int y, char *texto, int max)
        if (max < 0) max = 0;\r
        buffer[max] = 0;\r
 \r
-       gp2x_text(gp2x_screen,x,y,buffer,1);\r
+       gp2x_text(gp2x_screen,x,y,buffer,0xf0);\r
+}\r
+\r
+static void gp2x_smalltext8(int x, int y, const char *texto)\r
+{\r
+       int i;\r
+       unsigned char *src, *dst;\r
+\r
+       for (i = 0;; i++, x += 6)\r
+       {\r
+               unsigned char c = (unsigned char) texto[i];\r
+               int h = 8;\r
+\r
+               if (!c) break;\r
+\r
+               src = fontdata6x8[c];\r
+               dst = (unsigned char *)gp2x_screen + x + y*320;\r
+\r
+               while (h--)\r
+               {\r
+                       int w = 0x20;\r
+                       while (w)\r
+                       {\r
+                               if( *src & w ) *dst = 0xf0;\r
+                               dst++;\r
+                               w>>=1;\r
+                       }\r
+                       src++;\r
+\r
+                       dst += 320-6;\r
+               }\r
+       }\r
+}\r
+\r
+static void gp2x_smalltext8_lim(int x, int y, const char *texto, int max)\r
+{\r
+       char    buffer[320/6+1];\r
+\r
+       strncpy(buffer, texto, 320/6);\r
+       if (max > 320/6) max = 320/6;\r
+       if (max < 0) max = 0;\r
+       buffer[max] = 0;\r
+\r
+       gp2x_smalltext8(x, y, buffer);\r
 }\r
 \r
 \r
@@ -279,23 +257,24 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
        start = 12 - sel;\r
        n--; // exclude current dir (".")\r
 \r
-       memset(gp2x_screen, 0, 320*240);\r
+       //memset(gp2x_screen, 0, 320*240);\r
+       gp2x_pd_clone_buffer2();\r
 \r
        if(start - 2 >= 0)\r
-               gp2x_text_out8_lim(14, (start - 2)*10, curdir, 38);\r
+               gp2x_smalltext8_lim(14, (start - 2)*10, curdir, 53-2);\r
        for (i = 0; i < n; i++) {\r
                pos = start + i;\r
                if (pos < 0)  continue;\r
                if (pos > 23) break;\r
                if (namelist[i+1]->d_type == DT_DIR) {\r
-                       gp2x_text_out8_lim(14,   pos*10, "/", 1);\r
-                       gp2x_text_out8_lim(14+8, pos*10, namelist[i+1]->d_name, 37);\r
+                       gp2x_smalltext8_lim(14,   pos*10, "/", 1);\r
+                       gp2x_smalltext8_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3);\r
                } else {\r
-                       gp2x_text_out8_lim(14,   pos*10, namelist[i+1]->d_name, 38);\r
+                       gp2x_smalltext8_lim(14,   pos*10, namelist[i+1]->d_name, 53-2);\r
                }\r
        }\r
        gp2x_text_out8(5, 120, ">");\r
-       gp2x_video_flip();\r
+       gp2x_video_flip2();\r
 }\r
 \r
 static int scandir_cmp(const void *p1, const void *p2)\r
@@ -413,6 +392,187 @@ static char *romsel_loop(char *curr_path)
        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
@@ -460,7 +620,8 @@ static void draw_key_config(int curr_act, int is_p2)
                }\r
        }\r
 \r
-       memset(gp2x_screen, 0, 320*240);\r
+       //memset(gp2x_screen, 0, 320*240);\r
+       gp2x_pd_clone_buffer2();\r
        gp2x_text_out8(60, 40, "Action: %s", actionNames[curr_act]);\r
        gp2x_text_out8(60, 60, "Keys: %s", strkeys);\r
 \r
@@ -468,7 +629,7 @@ static void draw_key_config(int curr_act, int is_p2)
        gp2x_text_out8(30, 190, "Press a key to bind/unbind");\r
        gp2x_text_out8(30, 200, "Select \"Done\" action and");\r
        gp2x_text_out8(30, 210, "  press any key to finish");\r
-       gp2x_video_flip();\r
+       gp2x_video_flip2();\r
 }\r
 \r
 static void key_config_loop(int is_p2)\r
@@ -515,7 +676,8 @@ static void draw_kc_sel(int menu_sel)
        char joyname[36];\r
 \r
        y = tl_y;\r
-       memset(gp2x_screen, 0, 320*240);\r
+       //memset(gp2x_screen, 0, 320*240);\r
+       gp2x_pd_clone_buffer2();\r
        gp2x_text_out8(tl_x, y,       "Player 1");\r
        gp2x_text_out8(tl_x, (y+=10), "Player 2");\r
        gp2x_text_out8(tl_x, (y+=10), "Done");\r
@@ -535,7 +697,7 @@ static void draw_kc_sel(int menu_sel)
        }\r
 \r
 \r
-       gp2x_video_flip();\r
+       gp2x_video_flip2();\r
 }\r
 \r
 static void kc_sel_loop(void)\r
@@ -562,19 +724,117 @@ static void kc_sel_loop(void)
 \r
 \r
 \r
+// --------- sega/mega cd options ----------\r
+\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_pd_clone_buffer2();\r
+\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 &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 (buggy,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
+       gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
+\r
+       if ((menu_sel == 0 && strcmp(b_us, "NOT FOUND")) ||\r
+               (menu_sel == 1 && strcmp(b_eu, "NOT FOUND")) ||\r
+               (menu_sel == 2 && strcmp(b_jp, "NOT FOUND")))\r
+                       gp2x_text_out8(tl_x, 220, "Press start to test selected BIOS");\r
+\r
+       gp2x_video_flip2();\r
+}\r
+\r
+static void cd_menu_loop_options(void)\r
+{\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 (find_bios(4, &bios)) { // US\r
+               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
+               strncpy(bios_us, p, 31); bios_us[31] = 0;\r
+       } else  strcpy(bios_us, "NOT FOUND");\r
+\r
+       if (find_bios(8, &bios)) { // EU\r
+               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
+               strncpy(bios_eu, p, 31); bios_eu[31] = 0;\r
+       } else  strcpy(bios_eu, "NOT FOUND");\r
+\r
+       if (find_bios(1, &bios)) { // JP\r
+               for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
+               strncpy(bios_jp, p, 31); bios_jp[31] = 0;\r
+       } else  strcpy(bios_jp, "NOT FOUND");\r
+\r
+       for(;;)\r
+       {\r
+               draw_cd_menu_options(menu_sel, bios_us, bios_eu, bios_jp);\r
+               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_B|GP2X_X|GP2X_A|GP2X_START);\r
+               if(inp & GP2X_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = 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  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
+               if(inp &  GP2X_START) { // BIOS testers\r
+                       switch (menu_sel) {\r
+                               case 0: if (find_bios(4, &bios)) { // test US\r
+                                               strcpy(romFileName, bios);\r
+                                               engineState = PGS_ReloadRom;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               case 1: if (find_bios(8, &bios)) { // test EU\r
+                                               strcpy(romFileName, bios);\r
+                                               engineState = PGS_ReloadRom;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                               case 2: if (find_bios(1, &bios)) { // test JP\r
+                                               strcpy(romFileName, bios);\r
+                                               engineState = PGS_ReloadRom;\r
+                                               return;\r
+                                       }\r
+                                       break;\r
+                       }\r
+               }\r
+       }\r
+}\r
 \r
-// --------- advanced options ----------\r
 \r
-// order must match that of currentConfig_t\r
-struct {\r
-       int EmuOpt;\r
-       int PicoOpt;\r
-       int PsndRate;\r
-       int PicoRegion;\r
-       int Frameskip;\r
-       int CPUclock;\r
-} tmp_opts;\r
-int tmp_gamma;\r
+// --------- advanced options ----------\r
 \r
 static void draw_amenu_options(int menu_sel)\r
 {\r
@@ -582,23 +842,25 @@ static void draw_amenu_options(int menu_sel)
        char *mms = mmuhack_status ? "active)  " : "inactive)";\r
 \r
        y = tl_y;\r
-       memset(gp2x_screen, 0, 320*240);\r
-       gp2x_text_out8(tl_x, y,       "Scale 32 column mode       %s", (tmp_opts.PicoOpt&0x100)?"ON":"OFF"); // 0\r
-       gp2x_text_out8(tl_x, (y+=10), "Gamma correction           %i.%02i", tmp_gamma / 100, tmp_gamma%100); // 1\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate Z80                %s", (tmp_opts.PicoOpt&0x004)?"ON":"OFF"); // 2\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM)        %s", (tmp_opts.PicoOpt&0x001)?"ON":"OFF"); // 3\r
-       gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG)      %s", (tmp_opts.PicoOpt&0x002)?"ON":"OFF"); // 4\r
-       gp2x_text_out8(tl_x, (y+=10), "gzip savestates            %s", (tmp_opts.EmuOpt &0x008)?"ON":"OFF"); // 5\r
-       gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit  %s", (tmp_opts.EmuOpt &0x020)?"ON":"OFF"); // 6\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+=10), "needs restart:");\r
-       gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings      %s", (tmp_opts.EmuOpt &0x100)?"ON":"OFF"); // 8\r
-       gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s",   mms, (tmp_opts.EmuOpt &0x010)?"ON":"OFF"); // 9\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), "Done");\r
 \r
        // draw cursor\r
        gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
 \r
-       gp2x_video_flip();\r
+       gp2x_video_flip2();\r
 }\r
 \r
 static void amenu_loop_options(void)\r
@@ -614,14 +876,14 @@ static void amenu_loop_options(void)
                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: tmp_opts.PicoOpt^=0x100; break;\r
-                               case  2: tmp_opts.PicoOpt^=0x004; break;\r
-                               case  3: tmp_opts.PicoOpt^=0x001; break;\r
-                               case  4: tmp_opts.PicoOpt^=0x002; break;\r
-                               case  5: tmp_opts.EmuOpt ^=0x008; break;\r
-                               case  6: tmp_opts.EmuOpt ^=0x020; break;\r
-                               case  8: tmp_opts.EmuOpt ^=0x100; break;\r
-                               case  9: tmp_opts.EmuOpt ^=0x010; break;\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
                        }\r
                }\r
@@ -630,9 +892,9 @@ static void amenu_loop_options(void)
                        switch (menu_sel) {\r
                                case 1:\r
                                        while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
-                                               tmp_gamma += (inp & GP2X_LEFT) ? -1 : 1;\r
-                                               if (tmp_gamma <   1) tmp_gamma =   1;\r
-                                               if (tmp_gamma > 300) tmp_gamma = 300;\r
+                                               currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1;\r
+                                               if (currentConfig.gamma <   1) currentConfig.gamma =   1;\r
+                                               if (currentConfig.gamma > 300) currentConfig.gamma = 300;\r
                                                draw_amenu_options(menu_sel);\r
                                                usleep(18*1000);\r
                                        }\r
@@ -644,14 +906,26 @@ static void amenu_loop_options(void)
 \r
 // -------------- options --------------\r
 \r
-static char *region_name(unsigned int code)\r
+static const char *region_name(unsigned int code)\r
 {\r
-       char *names[] = { "Auto", "Japan NTSC", "Japan PAL", "USA", "Europe" };\r
-       int i = 0;\r
-       code <<= 1;\r
-       while((code >>=1)) i++;\r
-       if (i > 4) return "unknown";\r
-       return names[i];\r
+       static const char *names[] = { "Auto", "      Japan NTSC", "      Japan PAL", "      USA", "      Europe" };\r
+       static const char *names_short[] = { "", " JP", " JP", " US", " EU" };\r
+       int u, i = 0;\r
+       if (code) {\r
+               code <<= 1;\r
+               while((code >>= 1)) i++;\r
+               if (i > 4) return "unknown";\r
+               return names[i];\r
+       } else {\r
+               static char name[24];\r
+               strcpy(name, "Auto:");\r
+               for (u = 0; u < 3; u++) {\r
+                       i = 0; code = ((PicoAutoRgnOrder >> u*4) & 0xf) << 1;\r
+                       while((code >>= 1)) i++;\r
+                       strcat(name, names_short[i]);\r
+               }\r
+               return name;\r
+       }\r
 }\r
 \r
 static void draw_menu_options(int menu_sel)\r
@@ -659,35 +933,38 @@ static void draw_menu_options(int menu_sel)
        int tl_x = 25, tl_y = 40, y;\r
        char monostereo[8], strframeskip[8], *strrend;\r
 \r
-       strcpy(monostereo, (tmp_opts.PicoOpt&0x08)?"stereo":"mono");\r
-       if (tmp_opts.Frameskip < 0)\r
+       strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");\r
+       if (currentConfig.Frameskip < 0)\r
                 strcpy(strframeskip, "Auto");\r
-       else sprintf(strframeskip, "%i", tmp_opts.Frameskip);\r
-       if (tmp_opts.PicoOpt&0x10) {\r
+       else sprintf(strframeskip, "%i", currentConfig.Frameskip);\r
+       if (currentConfig.PicoOpt&0x10) {\r
                strrend = " 8bit fast";\r
-       } else if (tmp_opts.EmuOpt&0x80) {\r
+       } else if (currentConfig.EmuOpt&0x80) {\r
                strrend = "16bit accurate";\r
        } else {\r
                strrend = " 8bit accurate";\r
        }\r
 \r
        y = tl_y;\r
-       memset(gp2x_screen, 0, 320*240);\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", (tmp_opts.PicoOpt&0x040)?"ON":"OFF"); // 1\r
-       gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower)  %s", (tmp_opts.PicoOpt&0x080)?"ON":"OFF"); // 2\r
-       gp2x_text_out8(tl_x, (y+=10), "Show FPS                   %s", (tmp_opts.EmuOpt &0x002)?"ON":"OFF"); // 3\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), "Frameskip                  %s", strframeskip);\r
-       gp2x_text_out8(tl_x, (y+=10), "Enable sound               %s", (tmp_opts.EmuOpt &0x004)?"ON":"OFF"); // 5\r
-       gp2x_text_out8(tl_x, (y+=10), "Sound Quality:     %5iHz %s", tmp_opts.PsndRate, monostereo);\r
-       gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound  %s", (tmp_opts.PicoOpt&0x200)?"ON":"OFF"); // 7\r
-       gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (tmp_opts.PicoOpt&0x020)?"ON":"OFF"); // 8\r
-       gp2x_text_out8(tl_x, (y+=10), "Genesis Region:            %s", region_name(tmp_opts.PicoRegion));\r
-       gp2x_text_out8(tl_x, (y+=10), "Use SRAM savestates        %s", (tmp_opts.EmuOpt &0x001)?"ON":"OFF"); // 10\r
-       gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites    %s", (tmp_opts.EmuOpt &0x200)?"ON":"OFF"); // 11\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), "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), "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), "GP2X CPU clocks            %iMhz", tmp_opts.CPUclock);\r
-       gp2x_text_out8(tl_x, (y+=10), "[advanced options]");\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), "Save cfg as default");\r
        if (rom_data)\r
                gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only");\r
@@ -695,7 +972,7 @@ static void draw_menu_options(int menu_sel)
        // draw cursor\r
        gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
 \r
-       gp2x_video_flip();\r
+       gp2x_video_flip2();\r
 }\r
 \r
 static int sndrate_prevnext(int rate, int dir)\r
@@ -711,10 +988,32 @@ static int sndrate_prevnext(int rate, int dir)
        return rates[i];\r
 }\r
 \r
+static void region_prevnext(int right)\r
+{\r
+       // jp_ntsc=1, jp_pal=2, usa=4, eu=8\r
+       static int rgn_orders[] = { 0x148, 0x184, 0x814, 0x418, 0x841, 0x481 };\r
+       int i;\r
+       if (right) {\r
+               if (!currentConfig.PicoRegion) {\r
+                       for (i = 0; i < 6; i++)\r
+                               if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
+                       if (i < 5) PicoAutoRgnOrder = rgn_orders[i+1];\r
+                       else currentConfig.PicoRegion=1;\r
+               }\r
+               else currentConfig.PicoRegion<<=1;\r
+               if (currentConfig.PicoRegion > 8) currentConfig.PicoRegion = 8;\r
+       } else {\r
+               if (!currentConfig.PicoRegion) {\r
+                       for (i = 0; i < 6; i++)\r
+                               if (rgn_orders[i] == PicoAutoRgnOrder) break;\r
+                       if (i > 0) PicoAutoRgnOrder = rgn_orders[i-1];\r
+               }\r
+               else currentConfig.PicoRegion>>=1;\r
+       }\r
+}\r
+\r
 static void menu_options_save(void)\r
 {\r
-       memcpy(&currentConfig.EmuOpt, &tmp_opts.EmuOpt, sizeof(tmp_opts));\r
-       currentConfig.gamma = tmp_gamma;\r
        PicoOpt = currentConfig.PicoOpt;\r
        PsndRate = currentConfig.PsndRate;\r
        PicoRegionOverride = currentConfig.PicoRegion;\r
@@ -726,17 +1025,15 @@ static void menu_options_save(void)
        }\r
 }\r
 \r
-static void menu_loop_options(void)\r
+static int menu_loop_options(void)\r
 {\r
-       int menu_sel = 0, menu_sel_max = 15;\r
+       int menu_sel = 0, menu_sel_max = 16;\r
        unsigned long inp = 0;\r
 \r
        if (rom_data) menu_sel_max++;\r
-       memcpy(&tmp_opts.EmuOpt, &currentConfig.EmuOpt, sizeof(tmp_opts));\r
-       tmp_gamma = currentConfig.gamma;\r
-       tmp_opts.PicoOpt = PicoOpt;\r
-       tmp_opts.PsndRate = PsndRate;\r
-       tmp_opts.PicoRegion = PicoRegionOverride;\r
+       currentConfig.PicoOpt = PicoOpt;\r
+       currentConfig.PsndRate = PsndRate;\r
+       currentConfig.PicoRegion = PicoRegionOverride;\r
 \r
        for(;;)\r
        {\r
@@ -746,60 +1043,62 @@ static void menu_loop_options(void)
                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: tmp_opts.PicoOpt^=0x040; break;\r
-                               case  2: tmp_opts.PicoOpt^=0x080; break;\r
-                               case  3: tmp_opts.EmuOpt ^=0x002; break;\r
-                               case  5: tmp_opts.EmuOpt ^=0x004; break;\r
-                               case  7: tmp_opts.PicoOpt^=0x200; break;\r
-                               case  8: tmp_opts.PicoOpt^=0x020; break;\r
-                               case 10: tmp_opts.EmuOpt ^=0x001; break;\r
-                               case 11: tmp_opts.EmuOpt ^=0x200; break;\r
-                               case 14: amenu_loop_options();    break;\r
-                               case 15: // done (save)\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
+                                       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
                                        menu_options_save();\r
-                                       emu_WriteConfig(0);\r
-                                       return;\r
-                               case 16: // done (save for current game)\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
                                        menu_options_save();\r
-                                       emu_WriteConfig(1);\r
-                                       return;\r
+                                       if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");\r
+                                       else strcpy(menuErrorMsg, "failed to write config");\r
+                                       return 1;\r
                        }\r
                }\r
-               if(inp & GP2X_X) return;  // done (no save)\r
-               if(inp & GP2X_A) {\r
+               if(inp & (GP2X_X|GP2X_A)) {\r
                        menu_options_save();\r
-                       return;  // done (save)\r
+                       return 0;  // done (update, no write)\r
                }\r
                if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
                        switch (menu_sel) {\r
                                case  0:\r
                                        if (inp & GP2X_LEFT) {\r
-                                               if      (  tmp_opts.PicoOpt&0x10) tmp_opts.PicoOpt&= ~0x10;\r
-                                               else if (!(tmp_opts.EmuOpt &0x80))tmp_opts.EmuOpt |=  0x80;\r
-                                               else if (  tmp_opts.EmuOpt &0x80) break;\r
+                                               if      (  currentConfig.PicoOpt&0x10) currentConfig.PicoOpt&= ~0x10;\r
+                                               else if (!(currentConfig.EmuOpt &0x80))currentConfig.EmuOpt |=  0x80;\r
+                                               else if (  currentConfig.EmuOpt &0x80) break;\r
                                        } else {\r
-                                               if      (  tmp_opts.PicoOpt&0x10) break;\r
-                                               else if (!(tmp_opts.EmuOpt &0x80))tmp_opts.PicoOpt|=  0x10;\r
-                                               else if (  tmp_opts.EmuOpt &0x80) tmp_opts.EmuOpt &= ~0x80;\r
+                                               if      (  currentConfig.PicoOpt&0x10) break;\r
+                                               else if (!(currentConfig.EmuOpt &0x80))currentConfig.PicoOpt|=  0x10;\r
+                                               else if (  currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
                                        }\r
                                        break;\r
                                case  4:\r
-                                       tmp_opts.Frameskip += (inp & GP2X_LEFT) ? -1 : 1;\r
-                                       if (tmp_opts.Frameskip < 0)  tmp_opts.Frameskip = -1;\r
-                                       if (tmp_opts.Frameskip > 32) tmp_opts.Frameskip = 32;\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
-                                       if ((inp & GP2X_RIGHT) && tmp_opts.PsndRate == 44100 && !(tmp_opts.PicoOpt&0x08)) {\r
-                                               tmp_opts.PsndRate = 8000;  tmp_opts.PicoOpt|= 0x08;\r
-                                       } else if ((inp & GP2X_LEFT) && tmp_opts.PsndRate == 8000 && (tmp_opts.PicoOpt&0x08)) {\r
-                                               tmp_opts.PsndRate = 44100; tmp_opts.PicoOpt&=~0x08;\r
-                                       } else tmp_opts.PsndRate = sndrate_prevnext(tmp_opts.PsndRate, inp & GP2X_RIGHT);\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
-                                       if (inp & GP2X_RIGHT) {\r
-                                               if (tmp_opts.PicoRegion) tmp_opts.PicoRegion<<=1; else tmp_opts.PicoRegion=1;\r
-                                               if (tmp_opts.PicoRegion > 8) tmp_opts.PicoRegion = 8;\r
-                                       } else  tmp_opts.PicoRegion>>=1;\r
+                                       region_prevnext(inp & GP2X_RIGHT);\r
                                        break;\r
                                case 12:\r
                                        if (inp & GP2X_RIGHT) {\r
@@ -809,8 +1108,8 @@ static void menu_loop_options(void)
                                        break;\r
                                case 13:\r
                                        while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
-                                               tmp_opts.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;\r
-                                               if (tmp_opts.CPUclock < 1) tmp_opts.CPUclock = 1;\r
+                                               currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;\r
+                                               if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;\r
                                                draw_menu_options(menu_sel);\r
                                                usleep(50*1000);\r
                                        }\r
@@ -825,7 +1124,8 @@ static void menu_loop_options(void)
 static void draw_menu_credits(void)\r
 {\r
        int tl_x = 15, tl_y = 70, y;\r
-       memset(gp2x_screen, 0, 320*240);\r
+       //memset(gp2x_screen, 0, 320*240);\r
+       gp2x_pd_clone_buffer2();\r
 \r
        gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
        y = tl_y;\r
@@ -844,7 +1144,7 @@ static void draw_menu_credits(void)
        gp2x_text_out8(tl_x, (y+=10), "GnoStiC / Puck2099: USB joystick");\r
        gp2x_text_out8(tl_x, (y+=10), "craigix: GP2X hardware");\r
 \r
-       gp2x_video_flip();\r
+       gp2x_video_flip2();\r
 }\r
 \r
 \r
@@ -853,7 +1153,8 @@ static void draw_menu_credits(void)
 static void draw_menu_root(int menu_sel)\r
 {\r
        int tl_x = 70, tl_y = 70, y;\r
-       memset(gp2x_screen, 0, 320*240);\r
+       //memset(gp2x_screen, 0, 320*240);\r
+       gp2x_pd_clone_buffer2();\r
 \r
        gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION);\r
 \r
@@ -866,23 +1167,25 @@ static void draw_menu_root(int menu_sel)
        } else {\r
                y += 30;\r
        }\r
-       gp2x_text_out8(tl_x, (y+=10), "Load new ROM");\r
+       gp2x_text_out8(tl_x, (y+=10), "Load new ROM/ISO");\r
        gp2x_text_out8(tl_x, (y+=10), "Change options");\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
        // error\r
        if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg);\r
-       gp2x_video_flip();\r
+       gp2x_video_flip2();\r
 }\r
 \r
 \r
 static void menu_loop_root(void)\r
 {\r
-       int menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;\r
+       int ret, menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;\r
        unsigned long inp = 0;\r
        char curr_path[PATH_MAX], *selfname;\r
        FILE *tstf;\r
@@ -898,6 +1201,7 @@ static void menu_loop_root(void)
        }\r
 \r
        if (rom_data) menu_sel = menu_sel_min = 0;\r
+       if (PicoPatches) menu_sel_max = 9;\r
 \r
        for(;;)\r
        {\r
@@ -919,20 +1223,16 @@ static void menu_loop_root(void)
                                        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
@@ -948,13 +1248,14 @@ static void menu_loop_root(void)
                                        selfname = romsel_loop(curr_path);\r
                                        if (selfname) {\r
                                                printf("selected file: %s\n", selfname);\r
-                                               strncpy(currentConfig.lastRomFile, selfname, sizeof(currentConfig.lastRomFile)-1);\r
-                                               currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;\r
                                                engineState = PGS_ReloadRom;\r
                                        }\r
                                        return;\r
                                case 5: // options\r
-                                       menu_loop_options();\r
+                                       ret = menu_loop_options();\r
+                                       if (ret == 1) continue; // status update\r
+                                       if (engineState == PGS_ReloadRom)\r
+                                               return; // BIOS test\r
                                        break;\r
                                case 6: // controls\r
                                        kc_sel_loop();\r
@@ -967,6 +1268,14 @@ static void menu_loop_root(void)
                                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
@@ -974,17 +1283,36 @@ static void menu_loop_root(void)
 }\r
 \r
 \r
-void menu_loop(void)\r
+static void menu_prepare_bg(void)\r
 {\r
-       int pal[2];\r
+       extern int localPal[0x100];\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
+               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_changemode(8);\r
+       gp2x_video_changemode2(8);\r
        gp2x_video_RGB_setscaling(320, 240);\r
-       // set pal\r
-       pal[0] = 0;\r
-       pal[1] = 0x00ffffff;\r
-       gp2x_video_setpalette(pal, 2);\r
+       gp2x_video_flip2();\r
+}\r
+\r
+\r
+void menu_loop(void)\r
+{\r
+       menu_gfx_prepare();\r
 \r
        menu_loop_root();\r
 \r